Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4244
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/4244/1
String->OUString unotools's pathoptions and related stuff
Change-Id: Id301c9b224eaa4c7deb2532cf57ece5d876aebf5
---
M basic/source/basmgr/basmgr.cxx
M include/unotools/pathoptions.hxx
M sw/source/core/doc/tblafmt.cxx
M sw/source/filter/html/swhtml.cxx
M sw/source/ui/config/uinums.cxx
M sw/source/ui/dbui/mmlayoutpage.hxx
M sw/source/ui/inc/unotools.hxx
M sw/source/ui/index/cnttab.cxx
M sw/source/ui/utlui/unotools.cxx
M unotools/source/config/pathoptions.cxx
10 files changed, 167 insertions(+), 168 deletions(-)
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 8f52b1f..9d2fdbd 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -883,9 +883,8 @@
{
// Search lib in path
OUString aSearchFile = pInfo->GetRelStorageName();
- String aSearchFileOldFormat(aSearchFile);
SvtPathOptions aPathCFG;
- if( aPathCFG.SearchFile( aSearchFileOldFormat, SvtPathOptions::PATH_BASIC ) )
+ if( aPathCFG.SearchFile( aSearchFile, SvtPathOptions::PATH_BASIC ) )
{
pInfo->SetStorageName( aSearchFile );
}
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index 8b5f9da..03d19d8 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -68,59 +68,59 @@
virtual ~SvtPathOptions();
// get the paths, not const because of using a mutex
- const String& GetAddinPath() const;
- const String& GetAutoCorrectPath() const;
- const String& GetAutoTextPath() const;
- const String& GetBackupPath() const;
- const String& GetBasicPath() const;
- const String& GetBitmapPath() const;
- const String& GetConfigPath() const;
- const String& GetDictionaryPath() const;
- const String& GetFavoritesPath() const;
- const String& GetFilterPath() const;
- const String& GetGalleryPath() const;
- const String& GetGraphicPath() const;
- const String& GetHelpPath() const;
- const String& GetLinguisticPath() const;
- const String& GetModulePath() const;
- const String& GetPalettePath() const;
- const String& GetPluginPath() const;
- const String& GetStoragePath() const;
- const String& GetTempPath() const;
- const String& GetTemplatePath() const;
- const String& GetUserConfigPath() const;
- const String& GetWorkPath() const;
- const String& GetUIConfigPath() const;
- const String& GetFingerprintPath() const;
+ const OUString& GetAddinPath() const;
+ const OUString& GetAutoCorrectPath() const;
+ const OUString& GetAutoTextPath() const;
+ const OUString& GetBackupPath() const;
+ const OUString& GetBasicPath() const;
+ const OUString& GetBitmapPath() const;
+ const OUString& GetConfigPath() const;
+ const OUString& GetDictionaryPath() const;
+ const OUString& GetFavoritesPath() const;
+ const OUString& GetFilterPath() const;
+ const OUString& GetGalleryPath() const;
+ const OUString& GetGraphicPath() const;
+ const OUString& GetHelpPath() const;
+ const OUString& GetLinguisticPath() const;
+ const OUString& GetModulePath() const;
+ const OUString& GetPalettePath() const;
+ const OUString& GetPluginPath() const;
+ const OUString& GetStoragePath() const;
+ const OUString& GetTempPath() const;
+ const OUString& GetTemplatePath() const;
+ const OUString& GetUserConfigPath() const;
+ const OUString& GetWorkPath() const;
+ const OUString& GetUIConfigPath() const;
+ const OUString& GetFingerprintPath() const;
// set the paths
- void SetAddinPath( const String& rPath );
- void SetAutoCorrectPath( const String& rPath );
- void SetAutoTextPath( const String& rPath );
- void SetBackupPath( const String& rPath );
- void SetBasicPath( const String& rPath );
- void SetBitmapPath( const String& rPath );
- void SetConfigPath( const String& rPath );
- void SetDictionaryPath( const String& rPath );
- void SetFavoritesPath( const String& rPath );
- void SetFilterPath( const String& rPath );
- void SetGalleryPath( const String& rPath );
- void SetGraphicPath( const String& rPath );
- void SetHelpPath( const String& rPath );
- void SetLinguisticPath( const String& rPath );
- void SetModulePath( const String& rPath );
- void SetPalettePath( const String& rPath );
- void SetPluginPath( const String& rPath );
- void SetStoragePath( const String& rPath );
- void SetTempPath( const String& rPath );
- void SetTemplatePath( const String& rPath );
- void SetUserConfigPath( const String& rPath );
- void SetWorkPath( const String& rPath );
+ void SetAddinPath( const OUString& rPath );
+ void SetAutoCorrectPath( const OUString& rPath );
+ void SetAutoTextPath( const OUString& rPath );
+ void SetBackupPath( const OUString& rPath );
+ void SetBasicPath( const OUString& rPath );
+ void SetBitmapPath( const OUString& rPath );
+ void SetConfigPath( const OUString& rPath );
+ void SetDictionaryPath( const OUString& rPath );
+ void SetFavoritesPath( const OUString& rPath );
+ void SetFilterPath( const OUString& rPath );
+ void SetGalleryPath( const OUString& rPath );
+ void SetGraphicPath( const OUString& rPath );
+ void SetHelpPath( const OUString& rPath );
+ void SetLinguisticPath( const OUString& rPath );
+ void SetModulePath( const OUString& rPath );
+ void SetPalettePath( const OUString& rPath );
+ void SetPluginPath( const OUString& rPath );
+ void SetStoragePath( const OUString& rPath );
+ void SetTempPath( const OUString& rPath );
+ void SetTemplatePath( const OUString& rPath );
+ void SetUserConfigPath( const OUString& rPath );
+ void SetWorkPath( const OUString& rPath );
OUString SubstituteVariable( const OUString& rVar ) const;
OUString ExpandMacros( const OUString& rPath ) const;
OUString UseVariable( const OUString& rVar ) const;
- sal_Bool SearchFile( String& rIniFile, Paths ePath = PATH_USERCONFIG );
+ sal_Bool SearchFile( OUString& rIniFile, Paths ePath = PATH_USERCONFIG );
const LanguageTag& GetLanguageTag() const;
sal_Bool IsReadonly() const;
};
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 2031563..53ccd9a 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1122,7 +1122,7 @@
sal_Bool SwTableAutoFmtTbl::Load()
{
sal_Bool bRet = sal_False;
- String sNm(OUString(sAutoTblFmtName));
+ OUString sNm(OUString(sAutoTblFmtName));
SvtPathOptions aOpt;
if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
{
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4a5387b..11fe376 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -144,12 +144,12 @@
String HTMLReader::GetTemplateName() const
{
- String sTemplate("internal");
- sTemplate += INET_PATH_TOKEN;
- sTemplate.Append(String("html"));
- String sTemplateWithoutExt( sTemplate );
+ OUString sTemplate("internal");
+ sTemplate += OUString(INET_PATH_TOKEN);
+ sTemplate += "html";
+ OUString sTemplateWithoutExt( sTemplate );
// first search for OpenDocument Writer/Web template
- sTemplate.Append(String(".oth"));
+ sTemplate += ".oth";
SvtPathOptions aPathOpt;
// OpenDocument Writer/Web template (extension .oth)
@@ -160,7 +160,7 @@
// no OpenDocument Writer/Web template found.
// search for OpenOffice.org Writer/Web template
sTemplate = sTemplateWithoutExt;
- sTemplate.Append(String(".stw"));
+ sTemplate += ".stw";
bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
}
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index dc153b8..b13461f 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -91,7 +91,7 @@
for(sal_uInt16 i = 0; i < nMaxRules; ++i )
pNumRules[i] = 0;
- String sNm( sFileName );
+ OUString sNm( sFileName );
SvtPathOptions aOpt;
if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
{
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index ca16b1a..1e6e7a2 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -61,7 +61,7 @@
SwOneExampleFrame* m_pExampleFrame;
SwWrtShell* m_pExampleWrtShell;
- String m_sExampleURL;
+ OUString m_sExampleURL;
SwFrmFmt* m_pAddressBlockFormat;
bool m_bIsGreetingInserted;
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index 33a8cba..0986185 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -99,7 +99,7 @@
SwOneExampleFrame(Window& rWin,
sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT,
const Link* pInitalizedLink = 0,
- String* pURL = 0);
+ OUString* pURL = 0);
~SwOneExampleFrame();
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & GetControl()
{return _xControl; }
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 833b852..07ca23c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -487,11 +487,11 @@
if(!pExampleFrame && !bExampleCreated)
{
bExampleCreated = sal_True;
- String sTemplate(OUString("internal"));
- sTemplate += INET_PATH_TOKEN;
- sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM("idxexample") );
- String sTemplateWithoutExt( sTemplate );
- sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".odt") );
+ OUString sTemplate("internal");
+ sTemplate += OUString(INET_PATH_TOKEN);
+ sTemplate + "idxexample";
+ OUString sTemplateWithoutExt( sTemplate );
+ sTemplate += ".odt";
SvtPathOptions aOpt;
aOpt.SetTemplatePath(String("share/template/common"));
@@ -502,14 +502,14 @@
{
// 6.0 (extension .sxw)
sTemplate = sTemplateWithoutExt;
- sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".sxw") );
+ sTemplate += ".sxw";
bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
}
if( !bExist )
{
// 5.0 (extension .vor)
sTemplate = sTemplateWithoutExt;
- sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".sdw") );
+ sTemplate += ".sdw";
bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
}
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index a0fd65d..7d63db2 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -63,7 +63,7 @@
SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
sal_uInt32 nFlags,
const Link* pInitializedLink,
- String* pURL ) :
+ OUString* pURL ) :
aTopWindow(&rWin, this),
aMenuRes(SW_RES(RES_FRMEX_MENU)),
pModuleView(SW_MOD()->GetView()),
@@ -71,7 +71,7 @@
bIsInitialized(sal_False),
bServiceAvailable(sal_False)
{
- if (pURL && pURL->Len())
+ if (pURL && !pURL->isEmpty())
sArgumentURL = *pURL;
aTopWindow.SetPosSizePixel(Point(0, 0), rWin.GetSizePixel());
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 1cd2c54..bfa473a 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -104,7 +104,7 @@
{
private:
// Local variables to return const references
- std::vector< String > m_aPathArray;
+ std::vector< OUString > m_aPathArray;
Reference< XFastPropertySet > m_xPathSettings;
Reference< XStringSubstitution > m_xSubstVariables;
Reference< XMacroExpander > m_xMacroExpander;
@@ -112,63 +112,63 @@
VarNameToEnumMap m_aMapVarNamesToEnum;
LanguageTag m_aLanguageTag;
- String m_aEmptyString;
+ OUString m_aEmptyString;
mutable ::osl::Mutex m_aMutex;
public:
SvtPathOptions_Impl();
// get the paths, not const because of using a mutex
- const String& GetPath( SvtPathOptions::Paths );
- const String& GetAddinPath() { return GetPath( SvtPathOptions::PATH_ADDIN ); }
- const String& GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT );
}
- const String& GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); }
- const String& GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); }
- const String& GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); }
- const String& GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); }
- const String& GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); }
- const String& GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY ); }
- const String& GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); }
- const String& GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); }
- const String& GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); }
- const String& GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); }
- const String& GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); }
- const String& GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC ); }
- const String& GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); }
- const String& GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); }
- const String& GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); }
- const String& GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); }
- const String& GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); }
- const String& GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); }
- const String& GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); }
- const String& GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); }
- const String& GetUIConfigPath() { return GetPath( SvtPathOptions::PATH_UICONFIG ); }
- const String& GetFingerprintPath() { return GetPath( SvtPathOptions::PATH_FINGERPRINT );
}
+ const OUString& GetPath( SvtPathOptions::Paths );
+ const OUString& GetAddinPath() { return GetPath( SvtPathOptions::PATH_ADDIN ); }
+ const OUString& GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT
); }
+ const OUString& GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); }
+ const OUString& GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); }
+ const OUString& GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); }
+ const OUString& GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); }
+ const OUString& GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); }
+ const OUString& GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY );
}
+ const OUString& GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); }
+ const OUString& GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); }
+ const OUString& GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); }
+ const OUString& GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); }
+ const OUString& GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); }
+ const OUString& GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC );
}
+ const OUString& GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); }
+ const OUString& GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); }
+ const OUString& GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); }
+ const OUString& GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); }
+ const OUString& GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); }
+ const OUString& GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); }
+ const OUString& GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG );
}
+ const OUString& GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); }
+ const OUString& GetUIConfigPath() { return GetPath( SvtPathOptions::PATH_UICONFIG ); }
+ const OUString& GetFingerprintPath() { return GetPath( SvtPathOptions::PATH_FINGERPRINT
); }
// set the paths
- void SetPath( SvtPathOptions::Paths, const String& rNewPath );
- void SetAddinPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_ADDIN,
rPath ); }
- void SetAutoCorrectPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
- void SetAutoTextPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_AUTOTEXT, rPath ); }
- void SetBackupPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_BACKUP, rPath ); }
- void SetBasicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BASIC,
rPath ); }
- void SetBitmapPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_BITMAP, rPath ); }
- void SetConfigPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_CONFIG, rPath ); }
- void SetDictionaryPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_DICTIONARY, rPath ); }
- void SetFavoritesPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_FAVORITES, rPath ); }
- void SetFilterPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_FILTER, rPath ); }
- void SetGalleryPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_GALLERY, rPath ); }
- void SetGraphicPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_GRAPHIC, rPath ); }
- void SetHelpPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_HELP,
rPath ); }
- void SetLinguisticPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_LINGUISTIC, rPath ); }
- void SetModulePath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_MODULE, rPath ); }
- void SetPalettePath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_PALETTE, rPath ); }
- void SetPluginPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_PLUGIN, rPath ); }
- void SetStoragePath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_STORAGE, rPath ); }
- void SetTempPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMP,
rPath ); }
- void SetTemplatePath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_TEMPLATE, rPath ); }
- void SetUserConfigPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_USERCONFIG, rPath ); }
- void SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK,
rPath ); }
+ void SetPath( SvtPathOptions::Paths, const OUString& rNewPath );
+ void SetAddinPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_ADDIN, rPath ); }
+ void SetAutoCorrectPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
+ void SetAutoTextPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_AUTOTEXT, rPath ); }
+ void SetBackupPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_BACKUP, rPath ); }
+ void SetBasicPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_BASIC, rPath ); }
+ void SetBitmapPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_BITMAP, rPath ); }
+ void SetConfigPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_CONFIG, rPath ); }
+ void SetDictionaryPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_DICTIONARY, rPath ); }
+ void SetFavoritesPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_FAVORITES, rPath ); }
+ void SetFilterPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_FILTER, rPath ); }
+ void SetGalleryPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_GALLERY, rPath ); }
+ void SetGraphicPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_GRAPHIC, rPath ); }
+ void SetHelpPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_HELP,
rPath ); }
+ void SetLinguisticPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_LINGUISTIC, rPath ); }
+ void SetModulePath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_MODULE, rPath ); }
+ void SetPalettePath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_PALETTE, rPath ); }
+ void SetPluginPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_PLUGIN, rPath ); }
+ void SetStoragePath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_STORAGE, rPath ); }
+ void SetTempPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_TEMP,
rPath ); }
+ void SetTemplatePath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_TEMPLATE, rPath ); }
+ void SetUserConfigPath( const OUString& rPath ) { SetPath(
SvtPathOptions::PATH_USERCONFIG, rPath ); }
+ void SetWorkPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_WORK,
rPath ); }
OUString SubstVar( const OUString& rVar ) const;
OUString ExpandMacros( const OUString& rPath ) const;
@@ -233,7 +233,7 @@
// class SvtPathOptions_Impl ---------------------------------------------
-const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Paths ePath )
+const OUString& SvtPathOptions_Impl::GetPath( SvtPathOptions::Paths ePath )
{
if ( ePath >= SvtPathOptions::PATH_COUNT )
return m_aEmptyString;
@@ -272,7 +272,7 @@
return m_aEmptyString;
}
-void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const String& rNewPath )
+void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString& rNewPath )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -495,320 +495,320 @@
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetAddinPath() const
+const OUString& SvtPathOptions::GetAddinPath() const
{
return pImp->GetAddinPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetAutoCorrectPath() const
+const OUString& SvtPathOptions::GetAutoCorrectPath() const
{
return pImp->GetAutoCorrectPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetAutoTextPath() const
+const OUString& SvtPathOptions::GetAutoTextPath() const
{
return pImp->GetAutoTextPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetBackupPath() const
+const OUString& SvtPathOptions::GetBackupPath() const
{
return pImp->GetBackupPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetBasicPath() const
+const OUString& SvtPathOptions::GetBasicPath() const
{
return pImp->GetBasicPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetBitmapPath() const
+const OUString& SvtPathOptions::GetBitmapPath() const
{
return pImp->GetBitmapPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetConfigPath() const
+const OUString& SvtPathOptions::GetConfigPath() const
{
return pImp->GetConfigPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetDictionaryPath() const
+const OUString& SvtPathOptions::GetDictionaryPath() const
{
return pImp->GetDictionaryPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetFavoritesPath() const
+const OUString& SvtPathOptions::GetFavoritesPath() const
{
return pImp->GetFavoritesPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetFilterPath() const
+const OUString& SvtPathOptions::GetFilterPath() const
{
return pImp->GetFilterPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetGalleryPath() const
+const OUString& SvtPathOptions::GetGalleryPath() const
{
return pImp->GetGalleryPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetGraphicPath() const
+const OUString& SvtPathOptions::GetGraphicPath() const
{
return pImp->GetGraphicPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetHelpPath() const
+const OUString& SvtPathOptions::GetHelpPath() const
{
return pImp->GetHelpPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetLinguisticPath() const
+const OUString& SvtPathOptions::GetLinguisticPath() const
{
return pImp->GetLinguisticPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetFingerprintPath() const
+const OUString& SvtPathOptions::GetFingerprintPath() const
{
return pImp->GetFingerprintPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetModulePath() const
+const OUString& SvtPathOptions::GetModulePath() const
{
return pImp->GetModulePath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetPalettePath() const
+const OUString& SvtPathOptions::GetPalettePath() const
{
return pImp->GetPalettePath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetPluginPath() const
+const OUString& SvtPathOptions::GetPluginPath() const
{
return pImp->GetPluginPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetStoragePath() const
+const OUString& SvtPathOptions::GetStoragePath() const
{
return pImp->GetStoragePath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetTempPath() const
+const OUString& SvtPathOptions::GetTempPath() const
{
return pImp->GetTempPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetTemplatePath() const
+const OUString& SvtPathOptions::GetTemplatePath() const
{
return pImp->GetTemplatePath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetUserConfigPath() const
+const OUString& SvtPathOptions::GetUserConfigPath() const
{
return pImp->GetUserConfigPath();
}
-const String& SvtPathOptions::GetUIConfigPath() const
+const OUString& SvtPathOptions::GetUIConfigPath() const
{
return pImp->GetUIConfigPath();
}
// -----------------------------------------------------------------------
-const String& SvtPathOptions::GetWorkPath() const
+const OUString& SvtPathOptions::GetWorkPath() const
{
return pImp->GetWorkPath();
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetAddinPath( const String& rPath )
+void SvtPathOptions::SetAddinPath( const OUString& rPath )
{
pImp->SetAddinPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetAutoCorrectPath( const String& rPath )
+void SvtPathOptions::SetAutoCorrectPath( const OUString& rPath )
{
pImp->SetAutoCorrectPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetAutoTextPath( const String& rPath )
+void SvtPathOptions::SetAutoTextPath( const OUString& rPath )
{
pImp->SetAutoTextPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetBackupPath( const String& rPath )
+void SvtPathOptions::SetBackupPath( const OUString& rPath )
{
pImp->SetBackupPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetBasicPath( const String& rPath )
+void SvtPathOptions::SetBasicPath( const OUString& rPath )
{
pImp->SetBasicPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetBitmapPath( const String& rPath )
+void SvtPathOptions::SetBitmapPath( const OUString& rPath )
{
pImp->SetBitmapPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetConfigPath( const String& rPath )
+void SvtPathOptions::SetConfigPath( const OUString& rPath )
{
pImp->SetConfigPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetDictionaryPath( const String& rPath )
+void SvtPathOptions::SetDictionaryPath( const OUString& rPath )
{
pImp->SetDictionaryPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetFavoritesPath( const String& rPath )
+void SvtPathOptions::SetFavoritesPath( const OUString& rPath )
{
pImp->SetFavoritesPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetFilterPath( const String& rPath )
+void SvtPathOptions::SetFilterPath( const OUString& rPath )
{
pImp->SetFilterPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetGalleryPath( const String& rPath )
+void SvtPathOptions::SetGalleryPath( const OUString& rPath )
{
pImp->SetGalleryPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetGraphicPath( const String& rPath )
+void SvtPathOptions::SetGraphicPath( const OUString& rPath )
{
pImp->SetGraphicPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetHelpPath( const String& rPath )
+void SvtPathOptions::SetHelpPath( const OUString& rPath )
{
pImp->SetHelpPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetLinguisticPath( const String& rPath )
+void SvtPathOptions::SetLinguisticPath( const OUString& rPath )
{
pImp->SetLinguisticPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetModulePath( const String& rPath )
+void SvtPathOptions::SetModulePath( const OUString& rPath )
{
pImp->SetModulePath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetPalettePath( const String& rPath )
+void SvtPathOptions::SetPalettePath( const OUString& rPath )
{
pImp->SetPalettePath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetPluginPath( const String& rPath )
+void SvtPathOptions::SetPluginPath( const OUString& rPath )
{
pImp->SetPluginPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetStoragePath( const String& rPath )
+void SvtPathOptions::SetStoragePath( const OUString& rPath )
{
pImp->SetStoragePath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetTempPath( const String& rPath )
+void SvtPathOptions::SetTempPath( const OUString& rPath )
{
pImp->SetTempPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetTemplatePath( const String& rPath )
+void SvtPathOptions::SetTemplatePath( const OUString& rPath )
{
pImp->SetTemplatePath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetUserConfigPath( const String& rPath )
+void SvtPathOptions::SetUserConfigPath( const OUString& rPath )
{
pImp->SetUserConfigPath( rPath );
}
// -----------------------------------------------------------------------
-void SvtPathOptions::SetWorkPath( const String& rPath )
+void SvtPathOptions::SetWorkPath( const OUString& rPath )
{
pImp->SetWorkPath( rPath );
}
@@ -836,10 +836,10 @@
// -----------------------------------------------------------------------
-sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath )
+sal_Bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
{
// check parameter: empty inifile name?
- if ( !rIniFile.Len() )
+ if ( rIniFile.isEmpty() )
{
SAL_WARN( "unotools.config", "SvtPathOptions::SearchFile(): invalid parameter" );
return sal_False;
--
To view, visit https://gerrit.libreoffice.org/4244
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id301c9b224eaa4c7deb2532cf57ece5d876aebf5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud@gmail.com>
Context
- [PATCH] String->OUString unotools's pathoptions and related stuff · Norbert Thiebaud (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.