make ResId->OUString the primary route

13 files changed, 130 insertions, 139 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5610637297e5..01d1c7de9867 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -291,68 +291,70 @@ namespace
         : public rtl::Static< String, WriterCompatibilityVersionOOo11 > {};
 }
 
-void ReplaceStringHookProc( UniString& rStr )
+rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
 {
-    static int nAll = 0, nPro = 0;
+    rtl::OUString sRet(rStr);
 
-    nAll++;
-    if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+    if ( sRet.indexOf( "%PRODUCT" ) != -1 )
     {
-        String rBrandName = BrandName::get();
-        String rVersion = Version::get();
-        String rAboutBoxVersion = AboutBoxVersion::get();
-        String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
-        String rExtension = Extension::get();
-        String rXMLFileFormatName = XMLFileFormatName::get();
-        String rXMLFileFormatVersion = XMLFileFormatVersion::get();
+        rtl::OUString sBrandName = BrandName::get();
+        rtl::OUString sVersion = Version::get();
+        rtl::OUString sAboutBoxVersion = AboutBoxVersion::get();
+        rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
+        rtl::OUString sExtension = Extension::get();
+        rtl::OUString sXMLFileFormatName = XMLFileFormatName::get();
+        rtl::OUString sXMLFileFormatVersion = XMLFileFormatVersion::get();
 
-        if ( !rBrandName.Len() )
+        if ( sBrandName.isEmpty() )
         {
-            rBrandName = utl::ConfigManager::getProductName();
-            rXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat();
-            rXMLFileFormatVersion =
+            sBrandName = utl::ConfigManager::getProductName();
+            sXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat();
+            sXMLFileFormatVersion =
                 utl::ConfigManager::getProductXmlFileFormatVersion();
-            rVersion = utl::ConfigManager::getProductVersion();
-            rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
-            rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
-            if ( !rExtension.Len() )
+            sVersion = utl::ConfigManager::getProductVersion();
+            sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
+            sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
+            if ( sExtension.isEmpty() )
             {
-                rExtension = utl::ConfigManager::getProductExtension();
+                sExtension = utl::ConfigManager::getProductExtension();
             }
         }
 
-        nPro++;
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
-        rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix );
-        rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion );
+        sRet = sRet.replaceAll( "%PRODUCTNAME", sBrandName );
+        sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion );
+        sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
+        sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
+        sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
+        sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATNAME", sXMLFileFormatName );
+        sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATVERSION", sXMLFileFormatVersion );
     }
-    if ( rStr.SearchAscii( "%OOOVENDOR" ) != STRING_NOTFOUND )
+
+    if ( sRet.indexOf( "%OOOVENDOR" ) != -1 )
     {
-        String rOOOVendor = OOOVendor::get();
+        rtl::OUString sOOOVendor = OOOVendor::get();
 
-        if ( !rOOOVendor.Len() )
+        if ( sOOOVendor.isEmpty() )
         {
-            rOOOVendor = utl::ConfigManager::getVendor();
+            sOOOVendor = utl::ConfigManager::getVendor();
         }
-        rStr.SearchAndReplaceAllAscii( "%OOOVENDOR" ,rOOOVendor );
+
+        sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor );
     }
 
-    if ( rStr.SearchAscii( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != STRING_NOTFOUND )
+    if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 )
     {
-        String rWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get();
-        if ( !rWriterCompatibilityVersionOOo11.Len() )
+        rtl::OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get();
+        if ( sWriterCompatibilityVersionOOo11.isEmpty() )
         {
-            rWriterCompatibilityVersionOOo11 =
+            sWriterCompatibilityVersionOOo11 =
                 utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1();
         }
 
-        rStr.SearchAndReplaceAllAscii( "%WRITERCOMPATIBILITYVERSIONOOO11",
-                                        rWriterCompatibilityVersionOOo11 );
+        sRet = sRet.replaceAll( "%WRITERCOMPATIBILITYVERSIONOOO11",
+                                        sWriterCompatibilityVersionOOo11 );
     }
+
+    return sRet;
 }
 
 static const char      pLastSyncFileName[]     = "lastsynchronized";
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 39f72782c323..d09b5012f0ba 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -53,14 +53,14 @@ namespace desktop
     //  __BOTTOM__
     //     [OK]
 
-    const char *aCmdLineHelp_version =
+    const char aCmdLineHelp_version[] =
         "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION\n"\
         "\n";
-    const char *aCmdLineHelp_head =
+    const char aCmdLineHelp_head[] =
         "Usage: %CMDNAME [options] [documents...]\n"\
         "\n"\
         "Options:\n";
-    const char *aCmdLineHelp_left =
+    const char aCmdLineHelp_left[] =
         "--minimized    \n"\
         "--invisible    \n"\
         "--norestore    \n"\
@@ -81,7 +81,7 @@ namespace desktop
         "--web          \n"\
         "-o             \n"\
         "-n             \n";
-    const char *aCmdLineHelp_right =
+    const char aCmdLineHelp_right[] =
         "keep startup bitmap minimized.\n"\
         "no startup screen, no default document and no UI.\n"\
         "suppress restart/restore after fatal errors.\n"\
@@ -102,7 +102,7 @@ namespace desktop
         "create new HTML document.\n"\
         "open documents regardless whether they are templates or not.\n"\
         "always open documents as new files (use as template).\n";
-    const char *aCmdLineHelp_bottom =
+    const char aCmdLineHelp_bottom[] =
         "--display <display>\n"\
         "      Specify X-Display to use in Unix/X11 versions.\n"
         "-p <documents...>\n"\
@@ -134,7 +134,7 @@ namespace desktop
         "          --print-to-file --printer-name nasty_lowres_printer --outdir /home/user *.doc\n"\
         "\nRemaining arguments will be treated as filenames or URLs of documents to open.\n\n";
 
-    void ReplaceStringHookProc( UniString& rStr );
+    rtl::OUString ReplaceStringHookProc(const rtl::OUString& rStr);
 
     void displayCmdlineHelp()
     {
@@ -145,7 +145,7 @@ namespace desktop
         String aHelpMessage_left(aCmdLineHelp_left, RTL_TEXTENCODING_ASCII_US);
         String aHelpMessage_right(aCmdLineHelp_right, RTL_TEXTENCODING_ASCII_US);
         String aHelpMessage_bottom(aCmdLineHelp_bottom, RTL_TEXTENCODING_ASCII_US);
-        ReplaceStringHookProc(aHelpMessage_version);
+        aHelpMessage_version = ReplaceStringHookProc(aHelpMessage_version);
         aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) );
 #ifdef UNX
         // on unix use console for output
@@ -181,8 +181,8 @@ namespace desktop
 
     void displayVersion()
     {
-        String aVersionMsg(aCmdLineHelp_version, RTL_TEXTENCODING_ASCII_US);
-        ReplaceStringHookProc(aVersionMsg);
+        rtl::OUString aVersionMsg(aCmdLineHelp_version);
+        aVersionMsg = ReplaceStringHookProc(aVersionMsg);
 #ifdef UNX
         fprintf(stdout, "%s", rtl::OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr());
 #else
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index c0ab4600b61e..d8d31503b1f3 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -100,41 +100,38 @@ namespace
         : public rtl::Static< String, Extension > {};
 }
 
-void ReplaceProductNameHookProc( String& rStr )
+rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr )
 {
-    static int nAll = 0, nPro = 0;
+    if (rStr.indexOf( "%PRODUCT" ) == -1)
+        return rStr;
 
-    nAll++;
-    if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+    rtl::OUString sProductName = ProductName::get();
+    rtl::OUString sVersion = Version::get();
+    rtl::OUString sAboutBoxVersion = AboutBoxVersion::get();
+    rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
+    rtl::OUString sExtension = Extension::get();
+    rtl::OUString sOOOVendor = OOOVendor::get();
+
+    if ( sProductName.isEmpty() )
     {
-        String rProductName = ProductName::get();
-        String rVersion = Version::get();
-        String rAboutBoxVersion = AboutBoxVersion::get();
-        String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
-        String rExtension = Extension::get();
-        String rOOOVendor = OOOVendor::get();
-
-        if ( !rProductName.Len() )
+        sProductName = utl::ConfigManager::getProductName();
+        sVersion = utl::ConfigManager::getProductVersion();
+        sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
+        sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
+        sOOOVendor = utl::ConfigManager::getVendor();
+        if ( sExtension.isEmpty() )
         {
-            rProductName = utl::ConfigManager::getProductName();
-            rVersion = utl::ConfigManager::getProductVersion();
-            rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
-            rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
-            rOOOVendor = utl::ConfigManager::getVendor();
-            if ( !rExtension.Len() )
-            {
-                rExtension = utl::ConfigManager::getProductExtension();
-            }
+            sExtension = utl::ConfigManager::getProductExtension();
         }
-
-        nPro++;
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
-        rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix );
-        rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
-        rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
     }
+
+    rtl::OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName );
+    sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion );
+    sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
+    sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
+    sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor );
+    sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
+    return sRet;
 }
 
 //==============================================================================
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 226e86cf2711..45854c26256c 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -75,7 +75,7 @@ COMPILER_AND_FLAGS=$(CC)
 COMPILER_AND_FLAGS+=-fvisibility=hidden
 .ENDIF
 
-BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' -j1
+BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)'
 
 OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index e521c331d711..571d44db090b 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -60,15 +60,15 @@ public:
     int Main();
     virtual sal_uInt16  Exception( sal_uInt16 nError );
 
-    static void ReadStringHook( String& );
+    static rtl::OUString ReadStringHook( const rtl::OUString& );
 };
 
 MyApp aMyApp;
 
-void MyApp::ReadStringHook( String& rStr )
+rtl::OUString MyApp::ReadStringHook( const rtl::OUString& rStr )
 {
-    rStr.SearchAndReplaceAllAscii(
-        "%PRODUCTNAME", utl::ConfigManager::getProductName() );
+    return rStr.replaceAll(
+        rtl::OUString("%PRODUCTNAME"), utl::ConfigManager::getProductName() );
 };
 
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9b7c2a5650ab..3b1f2a4f6f85 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1914,11 +1914,11 @@ void SmParser::Font()
 
 // gets number used as arguments in Math formulas (e.g. 'size' command)
 // Format: no negative numbers, must start with a digit, no exponent notation, ...
-bool lcl_IsNumber(const UniString& rText)
+bool lcl_IsNumber(const rtl::OUString& rText)
 {
     bool bPoint = false;
-    const sal_Unicode* pBuffer = rText.GetBuffer();
-    for(xub_StrLen nPos = 0; nPos < rText.Len(); nPos++, pBuffer++)
+    const sal_Unicode* pBuffer = rText.getStr();
+    for(sal_Int32 nPos = 0; nPos < rText.getLength(); nPos++, pBuffer++)
     {
         const sal_Unicode cChar = *pBuffer;
         if(cChar == '.')
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 6ef90e9e7b97..3b651829bfcc 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -141,7 +141,6 @@ class SvLBoxBmp : public SvLBoxItem
 {
     Image aBmp;
 public:
-                    SvLBoxBmp( SvLBoxEntry*, sal_uInt16 nFlags, Image );
                     SvLBoxBmp();
     virtual         ~SvLBoxBmp();
     virtual sal_uInt16  IsA();
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 54241b5c37a2..8a540f27d8e7 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -280,13 +280,6 @@ void SvLBoxString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
 
 DBG_NAME(SvLBoxBmp);
 
-SvLBoxBmp::SvLBoxBmp( SvLBoxEntry* pEntry, sal_uInt16 nFlags, Image aBitmap ) :
-    SvLBoxItem( pEntry, nFlags )
-{
-    DBG_CTOR(SvLBoxBmp,0);
-    SetBitmap( pEntry, aBitmap);
-}
-
 SvLBoxBmp::SvLBoxBmp() : SvLBoxItem()
 {
     DBG_CTOR(SvLBoxBmp,0);
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 99d0bc45b022..2230556354ae 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -164,7 +164,7 @@ class ResId
     sal_uInt32     GetId()          const { return m_nResId & ~RSC_DONTRELEASE; }
     RSHEADER_TYPE* GetpResource()   const { return m_pResource; }
 
-    static TOOLS_DLLPUBLIC rtl::OUString toString(const ResId& aId);
+    static TOOLS_DLLPUBLIC rtl::OUString toString(const ResId& rId);
 };
 
 #endif // _RESID_HXX
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index dafbc35221f5..bb81d0d8a17e 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -63,7 +63,7 @@ public:
 // - ResMgr -
 // ----------
 
-typedef void (*ResHookProc)( UniString& rStr );
+typedef rtl::OUString (*ResHookProc)( const rtl::OUString& rStr );
 
 // ----------
 // - ResMgr -
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 107723554928..d4ba851c9dac 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -130,8 +130,6 @@ typedef struct _UniStringData
 
 class TOOLS_DLLPUBLIC UniString
 {
-    TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32 nLen );
-
 private:
     UniStringData*      mpData;
 
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index 144d9e41603a..94884db24c27 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -26,23 +26,6 @@
  *
  ************************************************************************/
 
-
-// =======================================================================
-
-void UniString::InitStringRes( const char* pUTF8Str, sal_Int32 nLen )
-{
-    DBG_CTOR( UniString, DbgCheckUniString );
-    OSL_ENSURE(nLen <= STRING_MAXLEN, "Overflowing UniString");
-
-    mpData = NULL;
-    rtl_string2UString( (rtl_uString **)(&mpData),
-                        pUTF8Str, nLen,
-                        RTL_TEXTENCODING_UTF8,
-                        RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
-                        RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
-                        RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
-}
-
 // =======================================================================
 
 UniString::UniString( const rtl::OString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
@@ -134,51 +117,71 @@ UniString& UniString::Assign( const rtl::OUString& rStr )
 
 // =======================================================================
 
+#include <rtl/ustrbuf.hxx>
 #include <tools/rc.hxx>
 #include <tools/rcid.h>
 
 UniString::UniString( const ResId& rResId )
+    : mpData(NULL)
 {
-    rResId.SetRT( RSC_STRING );
-    ResMgr* pResMgr = rResId.GetResMgr();
-    mpData = NULL;
-    if ( pResMgr && pResMgr->GetResource( rResId ) )
-    {
-        // String laden
-        RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass();
-        //sal_uInt32 nLen = pResHdr->GetLocalOff() - sizeof( RSHEADER_TYPE );
+    rtl::OUString sStr(ResId::toString(rResId));
 
-        sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) );
-        InitStringRes( (const char*)(pResHdr+1), nStringLen );
+    DBG_CTOR( UniString, DbgCheckUniString );
+
+    OSL_ENSURE(sStr.pData->length < STRING_MAXLEN,
+               "Overflowing rtl::OUString -> UniString cut to zero length");
 
-        sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
-            + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1;
-        nSize += nSize % 2;
-        pResMgr->Increment( nSize );
+    if (sStr.pData->length < STRING_MAXLEN)
+    {
+        mpData = reinterpret_cast< UniStringData * >(sStr.pData);
+        STRING_ACQUIRE((STRING_TYPE *)mpData);
     }
     else
     {
         STRING_NEW((STRING_TYPE **)&mpData);
+    }
+
+
+}
+
+rtl::OUString ResId::toString(const ResId& rResId)
+{
+    rResId.SetRT( RSC_STRING );
+    ResMgr* pResMgr = rResId.GetResMgr();
+
+    if ( !pResMgr || !pResMgr->GetResource( rResId ) )
+    {
+        rtl::OUString sRet;
 
 #if OSL_DEBUG_LEVEL > 0
-        *this = UniString::CreateFromAscii( "<resource id " );
-        Append( UniString::CreateFromInt32( rResId.GetId() ) );
-        AppendAscii( " not found>" );
+        sRet = rtl::OUStringBuffer().
+            appendAscii(RTL_CONSTASCII_STRINGPARAM("<resource id ")).
+            append(static_cast<sal_Int32>(rResId.GetId())).
+            appendAscii(RTL_CONSTASCII_STRINGPARAM(" not found>")).
+            makeStringAndClear();
 #endif
+
         if( pResMgr )
             pResMgr->PopContext();
+
+        return sRet;
     }
 
+    // String loading
+    RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass();
+
+    sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) );
+    rtl::OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8);
+
+    sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
+        + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1;
+    nSize += nSize % 2;
+    pResMgr->Increment( nSize );
 
     ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
     if ( pImplResHookProc )
-        pImplResHookProc( *this );
-}
-
-rtl::OUString ResId::toString(const ResId& aId)
-{
-    // TODO: Optimize this.
-    return rtl::OUString(UniString(aId));
+        sRet = pImplResHookProc(sRet);
+    return sRet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 0baf9f2bde49..43812d811404 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -141,7 +141,6 @@ SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(Sea
 StgCache::Pos2Page(int)
 StgHeader::SetClassId(ClsId const&)
 SvBorder::SvBorder(Rectangle const&, Rectangle const&)
-SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
 SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
 SvLBoxButtonData::SvLBoxButtonData()
 SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short)