diff options
| author | Peter Rabi <prabi@caesar.elte.hu> | 2011-07-28 12:17:36 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-29 15:25:56 +0100 |
| commit | 97e8e603d3ffd94e1b0410be0e5f5b8cc8c70c7c (patch) | |
| tree | c0808ab241cf6f0427bce8b7d2c91f836d9ad7c1 | |
| parent | 498f30bf705dca891244e66a15cfdfba46e51781 (diff) | |
Clean-up of bugfix fdo#32895 for the -3-4 branch
Contributed under license LGPLv3+/MPL.
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
| -rw-r--r-- | sd/source/ui/dlg/TemplateScanner.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 4f7f61417..d6d38b5c7 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -40,6 +40,8 @@ #include <tools/debug.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <sfx2/doctempl.hxx> +#include <sfx2/templatelocnames.hrc> #include <com/sun/star/frame/XDocumentTemplates.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> @@ -262,11 +264,11 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) // first if necessary). if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_OASIS) - || (sContentType == IMPRESS_BIN_TEMPLATE) + || (sContentType == IMPRESS_BIN_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_B)) { - ::rtl::OUString sLocalisedTitle = ConvertResourceString( + ::rtl::OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString( STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle ); mpLastAddedEntry = new TemplateEntry(sLocalisedTitle, sTargetURL); mpTemplateDirectory->maEntries.push_back(mpLastAddedEntry); |