diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-27 17:15:25 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-27 17:17:33 +0100 |
| commit | 178b73da7186300c18f95c50a288a0827d635a8b (patch) | |
| tree | e151a19f250734b185ace23af9a93dfbe29667ad /sw | |
| parent | 94d7c1e4a1de95be0211eaea3c8733a6205384e9 (diff) | |
sw: get rid of no longer needed TOOLS_CONSTASCII_STRINGPARAM define
Change-Id: I595907d345c0438858e53ca76fbb2ae7d79743e6
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 406f6500a59d..c048e3eb053c 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!"); } |