mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unotools: Use appropriate OUString functions on string constants

Browse Source 
Change-Id: I9762f913080b4bad0d9cd3d1c1b42b333b08f27e
This commit is contained in:
Stephan Bergmann
2014-12-18 13:38:27 +01:00
parent 484401bb5e
commit 994cc6c868
14 changed files with 105 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/unotools/compatibility.hxx
View File

@@ -47,21 +47,21 @@ enum CompatibilityOptions
@descr The method GetList() returns a list of property values. @descr The method GetList() returns a list of property values.
Use follow defines to separate values by names. Use follow defines to separate values by names.
*//*-*************************************************************************************************************/ *//*-*************************************************************************************************************/
#define COMPATIBILITY_PROPERTYNAME_NAME OUString( "Name" ) #define COMPATIBILITY_PROPERTYNAME_NAME "Name"
#define COMPATIBILITY_PROPERTYNAME_MODULE OUString( "Module" ) #define COMPATIBILITY_PROPERTYNAME_MODULE "Module"
#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS OUString( "UsePrinterMetrics" ) #define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS "UsePrinterMetrics"
#define COMPATIBILITY_PROPERTYNAME_ADDSPACING OUString( "AddSpacing" ) #define COMPATIBILITY_PROPERTYNAME_ADDSPACING "AddSpacing"
#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES OUString( "AddSpacingAtPages" ) #define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES "AddSpacingAtPages"
#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS OUString( "UseOurTabStopFormat" ) #define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS "UseOurTabStopFormat"
#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING OUString( "NoExternalLeading" ) #define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING "NoExternalLeading"
#define COMPATIBILITY_PROPERTYNAME_USELINESPACING OUString( "UseLineSpacing" ) #define COMPATIBILITY_PROPERTYNAME_USELINESPACING "UseLineSpacing"
#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING OUString( "AddTableSpacing" ) #define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING "AddTableSpacing"
#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING OUString( "UseObjectPositioning" ) #define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING "UseObjectPositioning"
#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING OUString( "UseOurTextWrapping" ) #define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING "UseOurTextWrapping"
#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE OUString( "ConsiderWrappingStyle" ) #define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE "ConsiderWrappingStyle"
#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE OUString( "ExpandWordSpace" ) #define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE "ExpandWordSpace"
#define COMPATIBILITY_DEFAULT_NAME OUString( "_default" ) #define COMPATIBILITY_DEFAULT_NAME "_default"
// forward declarations // forward declarations

8
include/unotools/dynamicmenuoptions.hxx
View File

@@ -30,10 +30,10 @@
@descr The method GetList() returns a list of property values. @descr The method GetList() returns a list of property values.
Use follow defines to separate values by names. Use follow defines to separate values by names.
*//*-*************************************************************************************************************/ *//*-*************************************************************************************************************/
#define DYNAMICMENU_PROPERTYNAME_URL OUString("URL") #define DYNAMICMENU_PROPERTYNAME_URL "URL"
#define DYNAMICMENU_PROPERTYNAME_TITLE OUString("Title") #define DYNAMICMENU_PROPERTYNAME_TITLE "Title"
#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER OUString("ImageIdentifier") #define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER "ImageIdentifier"
#define DYNAMICMENU_PROPERTYNAME_TARGETNAME OUString("TargetName") #define DYNAMICMENU_PROPERTYNAME_TARGETNAME "TargetName"
/*-************************************************************************************************************ /*-************************************************************************************************************
@descr You can use these enum values to specify right menu if you call our interface methods. @descr You can use these enum values to specify right menu if you call our interface methods.

10
include/unotools/historyoptions.hxx
View File

@@ -31,11 +31,11 @@
// The method GetList() returns a list of property values. // The method GetList() returns a list of property values.
// Use follow defines to separate values by names. // Use follow defines to separate values by names.
#define HISTORY_PROPERTYNAME_URL OUString("URL") #define HISTORY_PROPERTYNAME_URL "URL"
#define HISTORY_PROPERTYNAME_FILTER OUString("Filter") #define HISTORY_PROPERTYNAME_FILTER "Filter"
#define HISTORY_PROPERTYNAME_TITLE OUString("Title") #define HISTORY_PROPERTYNAME_TITLE "Title"
#define HISTORY_PROPERTYNAME_PASSWORD OUString("Password") #define HISTORY_PROPERTYNAME_PASSWORD "Password"
#define HISTORY_PROPERTYNAME_THUMBNAIL OUString("Thumbnail") #define HISTORY_PROPERTYNAME_THUMBNAIL "Thumbnail"
/// You can use these enum values to specify right history if you call our interface methods. /// You can use these enum values to specify right history if you call our interface methods.
enum EHistoryType enum EHistoryType

32
unotools/source/config/compatibility.cxx
View File

@@ -40,8 +40,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
#define ROOTNODE_OPTIONS OUString( "Office.Compatibility/" ) #define ROOTNODE_OPTIONS OUString( "Office.Compatibility/" )
#define PATHDELIMITER OUString( "/" ) #define PATHDELIMITER "/"
#define SETNODE_ALLFILEFORMATS OUString( "AllFileFormats" ) #define SETNODE_ALLFILEFORMATS "AllFileFormats"
#define PROPERTYNAME_NAME COMPATIBILITY_PROPERTYNAME_NAME #define PROPERTYNAME_NAME COMPATIBILITY_PROPERTYNAME_NAME
#define PROPERTYNAME_MODULE COMPATIBILITY_PROPERTYNAME_MODULE #define PROPERTYNAME_MODULE COMPATIBILITY_PROPERTYNAME_MODULE
@@ -356,7 +356,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
lValues[ nPosition++ ] >>= aItem.bExpandWordSpace; lValues[ nPosition++ ] >>= aItem.bExpandWordSpace;
m_aOptions.AppendEntry( aItem ); m_aOptions.AppendEntry( aItem );
if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) ) if ( !bDefaultFound && aItem.sName == COMPATIBILITY_DEFAULT_NAME )
{ {
SvtSysLocale aSysLocale; SvtSysLocale aSysLocale;
com::sun::star::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale(); com::sun::star::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale();
@@ -382,27 +382,27 @@ SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
void SvtCompatibilityOptions_Impl::SetDefault( const OUString & sName, bool bValue ) void SvtCompatibilityOptions_Impl::SetDefault( const OUString & sName, bool bValue )
{ {
if ( COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS.equals( sName ) ) if ( sName == COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS )
m_aDefOptions.SetUsePrtMetrics( bValue ); m_aDefOptions.SetUsePrtMetrics( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACING.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_ADDSPACING )
m_aDefOptions.SetAddSpacing( bValue ); m_aDefOptions.SetAddSpacing( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES )
m_aDefOptions.SetAddSpacingAtPages( bValue ); m_aDefOptions.SetAddSpacingAtPages( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS )
m_aDefOptions.SetUseOurTabStops( bValue ); m_aDefOptions.SetUseOurTabStops( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_NOEXTLEADING.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_NOEXTLEADING )
m_aDefOptions.SetNoExtLeading( bValue ); m_aDefOptions.SetNoExtLeading( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_USELINESPACING.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_USELINESPACING )
m_aDefOptions.SetUseLineSpacing( bValue ); m_aDefOptions.SetUseLineSpacing( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING )
m_aDefOptions.SetAddTableSpacing( bValue ); m_aDefOptions.SetAddTableSpacing( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING )
m_aDefOptions.SetUseObjPos( bValue ); m_aDefOptions.SetUseObjPos( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING )
m_aDefOptions.SetUseOurTextWrapping( bValue ); m_aDefOptions.SetUseOurTextWrapping( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE )
m_aDefOptions.SetConsiderWrappingStyle( bValue ); m_aDefOptions.SetConsiderWrappingStyle( bValue );
else if ( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE.equals( sName ) ) else if ( sName == COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE )
m_aDefOptions.SetExpandWordSpace( bValue ); m_aDefOptions.SetExpandWordSpace( bValue );
} }
@@ -429,7 +429,7 @@ void SvtCompatibilityOptions_Impl::Commit()
for( nItem = 0; nItem < nNewCount; ++nItem ) for( nItem = 0; nItem < nNewCount; ++nItem )
{ {
aItem = m_aOptions[ nItem ]; aItem = m_aOptions[ nItem ];
sNode = SETNODE_ALLFILEFORMATS + PATHDELIMITER + aItem.sName + PATHDELIMITER; sNode = SETNODE_ALLFILEFORMATS PATHDELIMITER + aItem.sName + PATHDELIMITER;
lPropertyValues[ OFFSET_MODULE - 1 ].Name = sNode + PROPERTYNAME_MODULE; lPropertyValues[ OFFSET_MODULE - 1 ].Name = sNode + PROPERTYNAME_MODULE;
lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Name = sNode + PROPERTYNAME_USEPRTMETRICS; lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Name = sNode + PROPERTYNAME_USEPRTMETRICS;
@@ -509,7 +509,7 @@ void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName,
m_aOptions.AppendEntry( aItem ); m_aOptions.AppendEntry( aItem );
// default item reset? // default item reset?
if ( _sName.equals( COMPATIBILITY_DEFAULT_NAME ) ) if ( _sName == COMPATIBILITY_DEFAULT_NAME )
m_aDefOptions = aItem; m_aDefOptions = aItem;
SetModified(); SetModified();

3
unotools/source/config/configmgr.cxx
View File

@@ -148,8 +148,7 @@ utl::ConfigManager::acquireTree(utl::ConfigItem & item) {
css::uno::Sequence< css::uno::Any > args(1); css::uno::Sequence< css::uno::Any > args(1);
args[0] <<= css::beans::NamedValue( args[0] <<= css::beans::NamedValue(
OUString("nodepath"), OUString("nodepath"),
css::uno::makeAny( css::uno::makeAny("/org.openoffice." + item.GetSubTreeName()));
OUString("/org.openoffice.") + item.GetSubTreeName()));
if ((item.GetMode() & CONFIG_MODE_ALL_LOCALES) != 0) { if ((item.GetMode() & CONFIG_MODE_ALL_LOCALES) != 0) {
args.realloc(2); args.realloc(2);
args[1] <<= css::beans::NamedValue(OUString("locale"), css::uno::makeAny(OUString("*"))); args[1] <<= css::beans::NamedValue(OUString("locale"), css::uno::makeAny(OUString("*")));

6
unotools/source/config/fontoptions.cxx
View File

@@ -33,9 +33,9 @@ using namespace ::com::sun::star::uno;
#define ROOTNODE_FONT OUString("Office.Common/Font") #define ROOTNODE_FONT OUString("Office.Common/Font")
#define PROPERTYNAME_REPLACEMENTTABLE OUString("Substitution/Replacement") #define PROPERTYNAME_REPLACEMENTTABLE "Substitution/Replacement"
#define PROPERTYNAME_FONTHISTORY OUString("View/History") #define PROPERTYNAME_FONTHISTORY "View/History"
#define PROPERTYNAME_FONTWYSIWYG OUString("View/ShowFontBoxWYSIWYG") #define PROPERTYNAME_FONTWYSIWYG "View/ShowFontBoxWYSIWYG"
#define PROPERTYHANDLE_REPLACEMENTTABLE 0 #define PROPERTYHANDLE_REPLACEMENTTABLE 0
#define PROPERTYHANDLE_FONTHISTORY 1 #define PROPERTYHANDLE_FONTHISTORY 1

4
unotools/source/config/localisationoptions.cxx
View File

@@ -34,8 +34,8 @@ using namespace ::com::sun::star::uno;
#define DEFAULT_AUTOMNEMONIC false #define DEFAULT_AUTOMNEMONIC false
#define DEFAULT_DIALOGSCALE 0 #define DEFAULT_DIALOGSCALE 0
#define PROPERTYNAME_AUTOMNEMONIC OUString("AutoMnemonic") #define PROPERTYNAME_AUTOMNEMONIC "AutoMnemonic"
#define PROPERTYNAME_DIALOGSCALE OUString("DialogScale") #define PROPERTYNAME_DIALOGSCALE "DialogScale"
#define PROPERTYHANDLE_AUTOMNEMONIC 0 #define PROPERTYHANDLE_AUTOMNEMONIC 0
#define PROPERTYHANDLE_DIALOGSCALE 1 #define PROPERTYHANDLE_DIALOGSCALE 1

76
unotools/source/config/moduleoptions.cxx
View File

@@ -50,16 +50,16 @@
NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ] NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ]
*//*-*************************************************************************************************************/ *//*-*************************************************************************************************************/
#define ROOTNODE_FACTORIES OUString("Setup/Office/Factories" ) #define ROOTNODE_FACTORIES OUString("Setup/Office/Factories" )
#define PATHSEPARATOR OUString("/" ) #define PATHSEPARATOR "/"
// Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is // Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is
// special code that uses hard coded strings to return them. // special code that uses hard coded strings to return them.
#define PROPERTYNAME_SHORTNAME OUString("ooSetupFactoryShortName" ) #define PROPERTYNAME_SHORTNAME "ooSetupFactoryShortName"
#define PROPERTYNAME_TEMPLATEFILE OUString("ooSetupFactoryTemplateFile" ) #define PROPERTYNAME_TEMPLATEFILE "ooSetupFactoryTemplateFile"
#define PROPERTYNAME_WINDOWATTRIBUTES OUString("ooSetupFactoryWindowAttributes") #define PROPERTYNAME_WINDOWATTRIBUTES "ooSetupFactoryWindowAttributes"
#define PROPERTYNAME_EMPTYDOCUMENTURL OUString("ooSetupFactoryEmptyDocumentURL") #define PROPERTYNAME_EMPTYDOCUMENTURL "ooSetupFactoryEmptyDocumentURL"
#define PROPERTYNAME_DEFAULTFILTER OUString("ooSetupFactoryDefaultFilter" ) #define PROPERTYNAME_DEFAULTFILTER "ooSetupFactoryDefaultFilter"
#define PROPERTYNAME_ICON OUString("ooSetupFactoryIcon" ) #define PROPERTYNAME_ICON "ooSetupFactoryIcon"
#define PROPERTYHANDLE_SHORTNAME 0 #define PROPERTYHANDLE_SHORTNAME 0
#define PROPERTYHANDLE_TEMPLATEFILE 1 #define PROPERTYHANDLE_TEMPLATEFILE 1
@@ -70,16 +70,16 @@
#define PROPERTYCOUNT 6 #define PROPERTYCOUNT 6
#define FACTORYNAME_WRITER OUString("com.sun.star.text.TextDocument" ) #define FACTORYNAME_WRITER "com.sun.star.text.TextDocument"
#define FACTORYNAME_WRITERWEB OUString("com.sun.star.text.WebDocument" ) #define FACTORYNAME_WRITERWEB "com.sun.star.text.WebDocument"
#define FACTORYNAME_WRITERGLOBAL OUString("com.sun.star.text.GlobalDocument" ) #define FACTORYNAME_WRITERGLOBAL "com.sun.star.text.GlobalDocument"
#define FACTORYNAME_CALC OUString("com.sun.star.sheet.SpreadsheetDocument" ) #define FACTORYNAME_CALC "com.sun.star.sheet.SpreadsheetDocument"
#define FACTORYNAME_DRAW OUString("com.sun.star.drawing.DrawingDocument" ) #define FACTORYNAME_DRAW "com.sun.star.drawing.DrawingDocument"
#define FACTORYNAME_IMPRESS OUString("com.sun.star.presentation.PresentationDocument") #define FACTORYNAME_IMPRESS "com.sun.star.presentation.PresentationDocument"
#define FACTORYNAME_MATH OUString("com.sun.star.formula.FormulaProperties" ) #define FACTORYNAME_MATH "com.sun.star.formula.FormulaProperties"
#define FACTORYNAME_CHART OUString("com.sun.star.chart2.ChartDocument" ) #define FACTORYNAME_CHART "com.sun.star.chart2.ChartDocument"
#define FACTORYNAME_DATABASE OUString("com.sun.star.sdb.OfficeDatabaseDocument" ) #define FACTORYNAME_DATABASE "com.sun.star.sdb.OfficeDatabaseDocument"
#define FACTORYNAME_STARTMODULE OUString("com.sun.star.frame.StartModule" ) #define FACTORYNAME_STARTMODULE "com.sun.star.frame.StartModule"
#define FACTORYCOUNT 10 #define FACTORYCOUNT 10
@@ -102,12 +102,12 @@ struct FactoryInfo
void free() void free()
{ {
bInstalled = false; bInstalled = false;
sFactory = ""; sFactory.clear();
sShortName = ""; sShortName.clear();
sTemplateFile = ""; sTemplateFile.clear();
sWindowAttributes = ""; sWindowAttributes.clear();
sEmptyDocumentURL = ""; sEmptyDocumentURL.clear();
sDefaultFilter = ""; sDefaultFilter.clear();
nIcon = 0; nIcon = 0;
bChangedTemplateFile = false; bChangedTemplateFile = false;
bChangedWindowAttributes = false; bChangedWindowAttributes = false;
@@ -712,12 +712,12 @@ css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const
for( sal_Int32 nName=0; nName<nCount; ++nName ) for( sal_Int32 nName=0; nName<nCount; ++nName )
{ {
pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_SHORTNAME; pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_SHORTNAME;
pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_TEMPLATEFILE; pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_TEMPLATEFILE;
pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_WINDOWATTRIBUTES; pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_WINDOWATTRIBUTES;
pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_EMPTYDOCUMENTURL; pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_EMPTYDOCUMENTURL;
pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_DEFAULTFILTER; pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_DEFAULTFILTER;
pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_ICON; pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_ICON;
nPropStart += PROPERTYCOUNT; nPropStart += PROPERTYCOUNT;
} }
@@ -1134,23 +1134,23 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const OU
SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const OUString& sName) SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const OUString& sName)
{ {
if (sName.equals(FACTORYNAME_WRITERGLOBAL)) if (sName == FACTORYNAME_WRITERGLOBAL)
return E_WRITERGLOBAL; return E_WRITERGLOBAL;
if (sName.equals(FACTORYNAME_WRITERWEB)) if (sName == FACTORYNAME_WRITERWEB)
return E_WRITERWEB; return E_WRITERWEB;
if (sName.equals(FACTORYNAME_WRITER)) if (sName == FACTORYNAME_WRITER)
return E_WRITER; return E_WRITER;
if (sName.equals(FACTORYNAME_CALC)) if (sName == FACTORYNAME_CALC)
return E_CALC; return E_CALC;
if (sName.equals(FACTORYNAME_DRAW)) if (sName == FACTORYNAME_DRAW)
return E_DRAW; return E_DRAW;
if (sName.equals(FACTORYNAME_IMPRESS)) if (sName == FACTORYNAME_IMPRESS)
return E_IMPRESS; return E_IMPRESS;
if (sName.equals(FACTORYNAME_MATH)) if (sName == FACTORYNAME_MATH)
return E_MATH; return E_MATH;
if (sName.equals(FACTORYNAME_CHART)) if (sName == FACTORYNAME_CHART)
return E_CHART; return E_CHART;
if (sName.equals(FACTORYNAME_DATABASE)) if (sName == FACTORYNAME_DATABASE)
return E_DATABASE; return E_DATABASE;
return E_UNKNOWN_FACTORY; return E_UNKNOWN_FACTORY;

15
unotools/source/config/optionsdlg.cxx
View File

@@ -32,10 +32,9 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
#define CFG_FILENAME OUString( "Office.OptionsDialog" ) #define CFG_FILENAME OUString( "Office.OptionsDialog" )
#define ROOT_NODE OUString( "OptionsDialogGroups" ) #define ROOT_NODE "OptionsDialogGroups"
#define PAGES_NODE OUString( "Pages" ) #define PAGES_NODE "Pages"
#define OPTIONS_NODE OUString( "Options" ) #define OPTIONS_NODE "Options"
#define PROPERTY_HIDE OUString( "Hide" )
static SvtOptionsDlgOptions_Impl* pOptions = NULL; static SvtOptionsDlgOptions_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0; static sal_Int32 nRefCount = 0;
@@ -135,7 +134,7 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
} }
Sequence< OUString > lResult( nLen ); Sequence< OUString > lResult( nLen );
lResult[0] = OUString( sNode + PROPERTY_HIDE ); lResult[0] = OUString( sNode + "Hide" );
if ( _eType != NT_Option ) if ( _eType != NT_Option )
lResult[1] = OUString( sNode + sSet ); lResult[1] = OUString( sNode + sSet );
@@ -162,15 +161,15 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
OUString getGroupPath( const OUString& _rGroup ) OUString getGroupPath( const OUString& _rGroup )
{ {
return OUString( ROOT_NODE + "/" + _rGroup + "/" ); return OUString( ROOT_NODE "/" + _rGroup + "/" );
} }
OUString getPagePath( const OUString& _rPage ) OUString getPagePath( const OUString& _rPage )
{ {
return OUString( PAGES_NODE + "/" + _rPage + "/" ); return OUString( PAGES_NODE "/" + _rPage + "/" );
} }
OUString getOptionPath( const OUString& _rOption ) OUString getOptionPath( const OUString& _rOption )
{ {
return OUString( OPTIONS_NODE + "/" + _rOption + "/" ); return OUString( OPTIONS_NODE "/" + _rOption + "/" );
} }
bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const

12
unotools/source/config/syslocaleoptions.cxx
View File

@@ -101,12 +101,12 @@ public:
#define ROOTNODE_SYSLOCALE OUString("Setup/L10N") #define ROOTNODE_SYSLOCALE OUString("Setup/L10N")
#define PROPERTYNAME_LOCALE OUString("ooSetupSystemLocale") #define PROPERTYNAME_LOCALE "ooSetupSystemLocale"
#define PROPERTYNAME_UILOCALE OUString("ooLocale") #define PROPERTYNAME_UILOCALE "ooLocale"
#define PROPERTYNAME_CURRENCY OUString("ooSetupCurrency") #define PROPERTYNAME_CURRENCY "ooSetupCurrency"
#define PROPERTYNAME_DECIMALSEPARATOR OUString("DecimalSeparatorAsLocale") #define PROPERTYNAME_DECIMALSEPARATOR "DecimalSeparatorAsLocale"
#define PROPERTYNAME_DATEPATTERNS OUString("DateAcceptancePatterns") #define PROPERTYNAME_DATEPATTERNS "DateAcceptancePatterns"
#define PROPERTYNAME_IGNORELANGCHANGE OUString("IgnoreLanguageChange") #define PROPERTYNAME_IGNORELANGCHANGE "IgnoreLanguageChange"
#define PROPERTYHANDLE_LOCALE 0 #define PROPERTYHANDLE_LOCALE 0
#define PROPERTYHANDLE_UILOCALE 1 #define PROPERTYHANDLE_UILOCALE 1

8
unotools/source/i18n/localedatawrapper.cxx
View File

@@ -116,20 +116,20 @@ const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const
void LocaleDataWrapper::invalidateData() void LocaleDataWrapper::invalidateData()
{ {
aCurrSymbol = ""; aCurrSymbol.clear();
aCurrBankSymbol = ""; aCurrBankSymbol.clear();
nDateFormat = nLongDateFormat = nDateFormatInvalid; nDateFormat = nLongDateFormat = nDateFormatInvalid;
nCurrPositiveFormat = nCurrNegativeFormat = nCurrDigits = nCurrFormatInvalid; nCurrPositiveFormat = nCurrNegativeFormat = nCurrDigits = nCurrFormatInvalid;
if ( bLocaleDataItemValid ) if ( bLocaleDataItemValid )
{ {
for (sal_Int32 j=0; j<LocaleItem::COUNT; ++j) for (sal_Int32 j=0; j<LocaleItem::COUNT; ++j)
aLocaleItem[j] = ""; aLocaleItem[j].clear();
bLocaleDataItemValid = false; bLocaleDataItemValid = false;
} }
if ( bReservedWordValid ) if ( bReservedWordValid )
{ {
for ( sal_Int16 j=0; j<reservedWords::COUNT; ++j ) for ( sal_Int16 j=0; j<reservedWords::COUNT; ++j )
aReservedWord[j] = ""; aReservedWord[j].clear();
bReservedWordValid = false; bReservedWordValid = false;
} }
xDefaultCalendar.reset(); xDefaultCalendar.reset();

2
unotools/source/misc/datetime.cxx
View File

@@ -162,7 +162,7 @@ namespace
else if (i_str[io_index] == '+' || i_str[io_index] == '-') // other timezones indicator else if (i_str[io_index] == '+' || i_str[io_index] == '-') // other timezones indicator
{ {
++io_index; ++io_index;
o_strInt = ""; o_strInt.clear();
for (; io_index < i_str.getLength(); ++io_index) for (; io_index < i_str.getLength(); ++io_index)
{ {
const sal_Unicode c = i_str[io_index]; const sal_Unicode c = i_str[io_index];

6
unotools/source/ucbhelper/localfilehelper.cxx
View File

@@ -39,7 +39,7 @@ namespace utl
bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ) bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn )
{ {
rReturn = ""; rReturn.clear();
Reference< XUniversalContentBroker > pBroker( Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create( UniversalContentBroker::create(
@@ -58,7 +58,7 @@ bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUStr
bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ) bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn )
{ {
rReturn = ""; rReturn.clear();
Reference< XUniversalContentBroker > pBroker( Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create( UniversalContentBroker::create(
comphelper::getProcessComponentContext() ) ); comphelper::getProcessComponentContext() ) );
@@ -93,7 +93,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString&
bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& rReturn) bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& rReturn)
{ {
rReturn = ""; rReturn.clear();
Reference< XUniversalContentBroker > pBroker( Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create( UniversalContentBroker::create(
comphelper::getProcessComponentContext() ) ); comphelper::getProcessComponentContext() ) );

3
unotools/source/ucbhelper/ucblockbytes.cxx
View File

@@ -973,8 +973,7 @@ static bool UCBOpenContentSync(
OUString() ); OUString() );
aExcep.Server = aURL.GetHost(); aExcep.Server = aURL.GetHost();
aExcep.Classification = InteractionClassification_ERROR; aExcep.Classification = InteractionClassification_ERROR;
aExcep.Message = aExcep.Message = "server not responding after five seconds";
OUString( "server not responding after five seconds");
Any request; Any request;
request <<= aExcep; request <<= aExcep;
ucbhelper::InteractionRequest *ir = ucbhelper::InteractionRequest *ir =