diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-01 10:33:48 -0500 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 07:31:30 +0000 |
| commit | 6a08067902ddc0ec61a7c7b4b0035b303f643a50 (patch) | |
| tree | cd49d1824cd169d9d224925b836eaa70de27414e /include/unotools/fontdefs.hxx | |
| parent | 82a1d75ee59c46e6bb361b98c520cc4eff2e770c (diff) | |
OUString convertion for unotools
Change-Id: Ifae7f344e3827875e32afa3cda23c771f5735707
Reviewed-on: https://gerrit.libreoffice.org/4659
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'include/unotools/fontdefs.hxx')
| -rw-r--r-- | include/unotools/fontdefs.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index e57abd491057..1e88372a1548 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -21,7 +21,7 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <tools/string.hxx> +#include <tools/solar.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -43,7 +43,7 @@ UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, sal_uLong nF UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewToken ); -struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const String&) const; }; +struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const OUString&) const; }; // --------------- // - ConvertChar - @@ -57,7 +57,7 @@ public: sal_Unicode (*mpCvtFunc)( sal_Unicode ); sal_Unicode RecodeChar( sal_Unicode c ) const; void RecodeString( OUString& rStra, sal_Int32 nIndex, sal_Int32 nLen ) const; - static const ConvertChar* GetRecodeData( const String& rOrgFontName, const String& rMapFontName ); + static const ConvertChar* GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName ); }; |