sw/source/filter/html/swhtml.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit 7ee2a988e5deee45f86ce41840934fc49ba2773a Author: Andras Timar <[email protected]> Date: Sun Mar 17 15:21:04 2013 +0100 let LibreOffice find html.stw (regression from 1b0f7ee1) Change-Id: I6ae07e61b67fa321e80605e6e3a6fcdd56012b95 Reviewed-on: https://gerrit.libreoffice.org/2791 Reviewed-by: Fridrich Strba <[email protected]> Reviewed-by: Michael Meeks <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Tested-by: Petr Mladek <[email protected]> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 8509ff8..fcee5a4 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 ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
