diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 10:07:55 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:02 +0100 |
commit | 4ce70ccc2d62769b138144de7798bf839ddd00f2 (patch) | |
tree | f43d4aac494bcf5b5bf5ee02ac86ca1b4dda06d2 /unotools | |
parent | 9928fd7fc600efa620ad7c3b78c0b0051a4fa930 (diff) |
TODO: get rid of this in another incompatible build with SW project
Change-Id: Ic3fb0c8eb37317d55bcdc6abc7ff9843ba11fac6
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/inc/unotools/fontdefs.hxx | 11 | ||||
-rw-r--r-- | unotools/source/misc/fontdefs.cxx | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx index 84c38577ab07..df79a0f26eb2 100644 --- a/unotools/inc/unotools/fontdefs.hxx +++ b/unotools/inc/unotools/fontdefs.hxx @@ -39,17 +39,6 @@ namespace utl { UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, sal_uLong nFlags ); -// ----------------- -// - FontTokenName - -// ----------------- - -UNOTOOLS_DLLPUBLIC String GetFontToken( const String& rName, xub_StrLen nToken, xub_StrLen& rIndex ); -inline String GetFontToken( const String& rName, xub_StrLen nToken ) -{ - xub_StrLen nTempIndex = 0; - return GetFontToken( rName, nToken, nTempIndex ); -} - UNOTOOLS_DLLPUBLIC void AddTokenFontName( String& rName, const String& rNewToken ); struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const String&) const; }; diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index ed5aa94ad81b..445ea23b37bc 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -477,17 +477,6 @@ String GetNextFontToken( const String& rTokenStr, xub_StrLen& rIndex ) return String( rTokenStr, nTokenStart, nTokenLen ); } -// TODO: get rid of this in another incompatible build with SW project. -// SW's WW8 and RTF filters still use this (from fontcvt.hxx) -String GetFontToken( const String& rTokenStr, xub_StrLen nToken, xub_StrLen& rIndex ) -{ - // skip nToken Tokens - for( xub_StrLen i = 0; (i < nToken) && (rIndex != STRING_NOTFOUND); ++i ) - GetNextFontToken( rTokenStr, rIndex ); - - return GetNextFontToken( rTokenStr, rIndex ); -} - // ======================================================================= static bool ImplIsFontToken( const String& rName, const String& rToken ) |