[Libreoffice-commits] .: sd/source

[Andras Timar]

 sd/source/ui/dlg/TemplateScanner.cxx |   19 -------------------
 sd/source/ui/inc/TemplateScanner.hxx |   14 --------------
 2 files changed, 33 deletions(-)

New commits:
commit d59a1554f85d0228082ea65c4b97e4deeda76971
Author: Peter Rabi <prabi at caesar.elte.hu>
Date:   Mon Aug 1 09:59:13 2011 +0200

    Clean-up of bugfix fdo#32895 for the master branch
    
    Contributed under license LGPLv3+/MPL.

diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index d6d38b5..0b78988 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -31,9 +31,6 @@
 
 #include "TemplateScanner.hxx"
 
-#include <sfx2/templatelocnames.hrc>
-#include <sfx2/sfxresid.hxx>
-
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentconstants.hxx>
 
@@ -498,22 +495,6 @@ const TemplateEntry* TemplateScanner::GetLastAddedEntry (void) const
     return mpLastAddedEntry;
 }
 
-
-
-
-::rtl::OUString TemplateScanner::ConvertResourceString (
-    int nSourceResIds, int nDestResIds, int nCount, const ::rtl::OUString& rString )
-{
-    for( int i = 0; i < nCount; ++i )
-    {
-        if( rString == ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nSourceResIds + i) ) ) )
-        {
-            return ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nDestResIds + i) ) );
-        }
-    }
-    return rString;
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index db5dbe7..deb48ef 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -214,20 +214,6 @@ private:
             Returns one of the states ERROR, SCAN_ENTRY, or SCAN_FOLDER.
     */
     State ScanEntry (void);
-
-    /** Convert a resource string - a template name - to its localised pair if it exists.
-        @param nSourceResIds
-            Resource ID where the list of original en-US template names begin.
-        @param nDestResIds
-            Resource ID where the list of localised template names begin.
-        @param nCount
-            The number of names that have been localised.
-        @param rString
-            Name to be translated.
-        @return
-            The localised pair of rString or rString if the former does not exist.
-    */
-    ::rtl::OUString ConvertResourceString ( int nSourceResIds, int nDestResIds, int nCount, const ::rtl::OUString& rString );
 };
 
 } // end of namespace sd