diff options
| author | Andras Timar <atimar@suse.com> | 2011-07-22 21:53:52 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-07-22 21:53:52 +0200 |
| commit | 576591ca3dd1028f644116f81651a1179dc0da84 (patch) | |
| tree | 8811c5e9f54d74a89cad302048112c8b5b537f47 | |
| parent | 3ca0cf3b7f79c247e9f25ac7113dd6fbe9cf9d50 (diff) | |
take strings from sfx<lang>.res, don't duplicate them in sd<lang>.res
| -rw-r--r-- | sd/AllLangResTarget_sd.mk | 1 | ||||
| -rw-r--r-- | sd/source/ui/dlg/TemplateScanner.cxx | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index a6f256d00..68a5c6bf1 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -93,7 +93,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/slidesorter/view/SlsResource.src \ sd/source/ui/table/TableDesignPane.src \ sd/source/ui/view/DocumentRenderer.src \ - sfx2/source/doc/templatelocnames.src \ )) $(eval $(call gb_SrsTarget_add_templates,sd/res,\ diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index c1c271dd5..4f7f61417 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -32,7 +32,7 @@ #include "TemplateScanner.hxx" #include <sfx2/templatelocnames.hrc> -#include "sdresid.hxx" +#include <sfx2/sfxresid.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/documentconstants.hxx> @@ -504,9 +504,9 @@ const TemplateEntry* TemplateScanner::GetLastAddedEntry (void) const { for( int i = 0; i < nCount; ++i ) { - if( rString == ResId::toString( (const ResId)SdResId( (sal_uInt16)(nSourceResIds + i) ) ) ) + if( rString == ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nSourceResIds + i) ) ) ) { - return ResId::toString( (const ResId)SdResId( (sal_uInt16)(nDestResIds + i) ) ); + return ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nDestResIds + i) ) ); } } return rString; |