summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Rabi <prabi@caesar.elte.hu>2011-08-01 09:59:13 +0200
committerAndras Timar <atimar@suse.com>2011-08-01 10:31:34 +0200
commitd59a1554f85d0228082ea65c4b97e4deeda76971 (patch)
treeedeb195d198b6d7e63e0d0d53cf36ae89e8a65b5
parentc8ed7790ecf6fc84bb7fae15e5ffa86fc23e3231 (diff)
Clean-up of bugfix fdo#32895 for the master branch
Contributed under license LGPLv3+/MPL.
-rw-r--r--sd/source/ui/dlg/TemplateScanner.cxx19
-rw-r--r--sd/source/ui/inc/TemplateScanner.hxx14
2 files changed, 0 insertions, 33 deletions
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index d6d38b5c7..0b7898840 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 db5dbe75a..deb48ef05 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