[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/html/swhtml.cxx |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 178b73da7186300c18f95c50a288a0827d635a8b
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Feb 27 17:15:25 2013 +0100

    sw: get rid of no longer needed TOOLS_CONSTASCII_STRINGPARAM define
    
    Change-Id: I595907d345c0438858e53ca76fbb2ae7d79743e6

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 406f650..c048e3e 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -113,10 +113,6 @@
 #define HTML_SPTYPE_HORI 2
 #define HTML_SPTYPE_VERT 3
 
-#ifndef TOOLS_CONSTASCII_STRINGPARAM
-#define TOOLS_CONSTASCII_STRINGPARAM( constAsciiStr ) constAsciiStr, sizeof( constAsciiStr )-1
-#endif
-
 using editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
@@ -148,17 +144,17 @@ HTMLReader::HTMLReader()
 
 String HTMLReader::GetTemplateName() const
 {
-    String sTemplate(rtl::OUString("html"));
-    String sTemplateWithoutExt( sTemplate );
+    OUString sTemplate("html");
+    OUString sTemplateWithoutExt( sTemplate );
     // first search for OpenDocument Writer/Web template
-    sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".oth") );
+    sTemplate += ".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 );
+    sal_Bool bSet = aPathOpt.SearchFile( String().Assign(sTemplate), SvtPathOptions::PATH_TEMPLATE );
 
     if( !bSet )
     {
@@ -166,13 +162,13 @@ String HTMLReader::GetTemplateName() const
         sTemplate = sTemplateWithoutExt;
         // no OpenDocument Writer/Web template found.
         // search for OpenOffice.org Writer/Web template
-        sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".stw") );
-        bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
+        sTemplate += ".stw";
+        bSet = aPathOpt.SearchFile( String().Assign(sTemplate), SvtPathOptions::PATH_TEMPLATE );
     }
 
     if( !bSet )
     {
-        sTemplate.Erase();
+        sTemplate = "";
         OSL_ENSURE( !this,
             "Die html.vor befindet sich nicht mehr im definierten Directory!");
     }