diff options
| author | Andras Timar <atimar@suse.com> | 2013-03-17 15:21:04 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-18 14:08:10 +0000 |
| commit | 7ee2a988e5deee45f86ce41840934fc49ba2773a (patch) | |
| tree | 22f491050b85d02aa7c5f99c33589b8b21ba2f0a /sw | |
| parent | df77710e8137b2e4ddb60b4ca6919fd37ebe9654 (diff) | |
let LibreOffice find html.stw (regression from 1b0f7ee1)
Change-Id: I6ae07e61b67fa321e80605e6e3a6fcdd56012b95
Reviewed-on: https://gerrit.libreoffice.org/2791
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 8509ff88724a..fcee5a4cd969 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -148,15 +148,14 @@ HTMLReader::HTMLReader() String HTMLReader::GetTemplateName() const { - String sTemplate(rtl::OUString("html")); + String sTemplate(rtl::OUString("internal")); + sTemplate += INET_PATH_TOKEN; + sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") ); String sTemplateWithoutExt( sTemplate ); // first search for OpenDocument Writer/Web template sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".oth") ); - //Added path for the common HTML template SvtPathOptions aPathOpt; - const String sCommonTemplatePath("share/template/common/internal"); - aPathOpt.SetTemplatePath(sCommonTemplatePath); // OpenDocument Writer/Web template (extension .oth) sal_Bool bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); |