diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-05 17:12:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-05 17:29:13 +0200 |
| commit | 3d4609d944b6bba3a135233054a0c396b29d7679 (patch) | |
| tree | d1e1de7265da0e94ff4eeef6b34c7da5a29a10d6 | |
| parent | c570e6d5b2c41374daf30ed90cb6de527dfc801b (diff) | |
Some String -> OUString
...to get rid of having to additionally link some libs against tl from
27c6434fccfec5fb4184c1efa2057595c8716fad "fdo#46808, Replace usage of
SpecialConfigManager" again.
Change-Id: Ica161a4f0da320858b6a3901a5a6907737c779f4
| -rw-r--r-- | include/unotools/pathoptions.hxx | 6 | ||||
| -rw-r--r-- | unotools/source/config/pathoptions.cxx | 12 | ||||
| -rw-r--r-- | xmlhelp/Library_tvhlp1.mk | 1 | ||||
| -rw-r--r-- | xmlhelp/Library_ucpchelp1.mk | 1 |
4 files changed, 8 insertions, 12 deletions
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx index ad1d16d19c79..8b5f9da48733 100644 --- a/include/unotools/pathoptions.hxx +++ b/include/unotools/pathoptions.hxx @@ -117,9 +117,9 @@ public: void SetUserConfigPath( const String& rPath ); void SetWorkPath( const String& rPath ); - String SubstituteVariable( const String& rVar ) const; - String ExpandMacros( const String& rPath ) const; - String UseVariable( const String& rVar ) const; + 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 ); const LanguageTag& GetLanguageTag() const; sal_Bool IsReadonly() const; diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 8a56dab924d0..1cd2c54bdf3d 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -815,25 +815,23 @@ void SvtPathOptions::SetWorkPath( const String& rPath ) // ----------------------------------------------------------------------- -String SvtPathOptions::SubstituteVariable( const String& rVar ) const +OUString SvtPathOptions::SubstituteVariable( const OUString& rVar ) const { - String aRet = pImp->SubstVar( rVar ); - return aRet; + return pImp->SubstVar( rVar ); } // ----------------------------------------------------------------------- -String SvtPathOptions::ExpandMacros( const String& rPath ) const +OUString SvtPathOptions::ExpandMacros( const OUString& rPath ) const { return pImp->ExpandMacros( rPath ); } // ----------------------------------------------------------------------- -String SvtPathOptions::UseVariable( const String& rPath ) const +OUString SvtPathOptions::UseVariable( const OUString& rPath ) const { - String aRet = pImp->UsePathVariables( rPath ); - return aRet; + return pImp->UsePathVariables( rPath ); } // ----------------------------------------------------------------------- diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk index 9ef9f20f801c..58487dd61158 100644 --- a/xmlhelp/Library_tvhlp1.mk +++ b/xmlhelp/Library_tvhlp1.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,tvhlp1,\ cppu \ cppuhelper \ sal \ - tl \ utl \ i18nlangtag \ )) diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 0c4aab98a9b8..f559cb1f5360 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\ cppuhelper \ helplinker \ sal \ - tl \ ucbhelper \ utl \ i18nlangtag \ |