[PATCH libreoffice-4-0-2] let LibreOffice find html.stw (regression from 1b0f7ee1)

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2791

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/2791/1

let LibreOffice find html.stw (regression from 1b0f7ee1)

Change-Id: I6ae07e61b67fa321e80605e6e3a6fcdd56012b95
---
M sw/source/filter/html/swhtml.cxx
1 file changed, 3 insertions(+), 4 deletions(-)



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 @@
 
 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 );
 

-- 
To view, visit https://gerrit.libreoffice.org/2791
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ae07e61b67fa321e80605e6e3a6fcdd56012b95
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Andras Timar <ati...@suse.com>

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice