summaryrefslogtreecommitdiff
path: root/xmloff/source/core
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-18 13:40:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-18 14:12:39 +0100
commit05575c31e1f962636125ff8c42c3e2409a9edb6c (patch)
tree0fa44d2899f95ae21676ee51a57eb34b38e965e0 /xmloff/source/core
parentfb4fec646d20388539c8d294f3e2bc20d0903a2b (diff)
xmloff: Use appropriate OUString functions on string constants
Change-Id: I349e0c2575d9a5154ac7002d129a1851a3df7687
Diffstat (limited to 'xmloff/source/core')
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx30
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx2
3 files changed, 17 insertions, 17 deletions
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index f49e9383a27a..5e3fc42739e2 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -767,27 +767,27 @@ void XMLConfigItemMapIndexedContext::EndElement()
for ( sal_Int32 j = 0 ; j < XML_FORBIDDEN_CHARACTER_MAX ; j++ )
{
- if (pForChar->Name.equals ( "Language" ) )
+ if (pForChar->Name == "Language")
{
pForChar->Value >>= aLocale.Language;
bHaveLanguage = true;
}
- else if (pForChar->Name.equals ( "Country" ) )
+ else if (pForChar->Name == "Country")
{
pForChar->Value >>= aLocale.Country;
bHaveCountry = true;
}
- else if (pForChar->Name.equals ( "Variant" ) )
+ else if (pForChar->Name == "Variant")
{
pForChar->Value >>= aLocale.Variant;
bHaveVariant = true;
}
- else if (pForChar->Name.equals ( "BeginLine" ) )
+ else if (pForChar->Name == "BeginLine")
{
pForChar->Value >>= aForbid.beginLine;
bHaveBegin = true;
}
- else if (pForChar->Name.equals ( "EndLine" ) )
+ else if (pForChar->Name == "EndLine")
{
pForChar->Value >>= aForbid.endLine;
bHaveEnd = true;
@@ -839,52 +839,52 @@ void XMLConfigItemMapIndexedContext::EndElement()
for ( sal_Int32 j = 0 ; j < XML_SYMBOL_DESCRIPTOR_MAX ; j++ )
{
- if (pSymbol->Name.equals ( "Name" ) )
+ if (pSymbol->Name == "Name")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sName;
bHaveName = true;
}
- else if (pSymbol->Name.equals ( "ExportName" ) )
+ else if (pSymbol->Name == "ExportName")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sExportName;
bHaveExportName = true;
}
- else if (pSymbol->Name.equals ( "FontName" ) )
+ else if (pSymbol->Name == "FontName")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sFontName;
bHaveFontName = true;
}
- else if (pSymbol->Name.equals ( "CharSet" ) )
+ else if (pSymbol->Name == "CharSet")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nCharSet;
bHaveCharSet = true;
}
- else if (pSymbol->Name.equals ( "Family" ) )
+ else if (pSymbol->Name == "Family")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nFamily;
bHaveFamily = true;
}
- else if (pSymbol->Name.equals ( "Pitch" ) )
+ else if (pSymbol->Name == "Pitch")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nPitch;
bHavePitch = true;
}
- else if (pSymbol->Name.equals ( "Weight" ) )
+ else if (pSymbol->Name == "Weight")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nWeight;
bHaveWeight = true;
}
- else if (pSymbol->Name.equals ( "Italic" ) )
+ else if (pSymbol->Name == "Italic")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nItalic;
bHaveItalic = true;
}
- else if (pSymbol->Name.equals ( "SymbolSet" ) )
+ else if (pSymbol->Name == "SymbolSet")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sSymbolSet;
bHaveSymbolSet = true;
}
- else if (pSymbol->Name.equals ( "Character" ) )
+ else if (pSymbol->Name == "Character")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nCharacter;
bHaveCharacter = true;
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 939b48ba5e48..807804a52f90 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -184,7 +184,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
if( nPrfx == XML_NAMESPACE_MATH &&
IsXMLToken( rLName, XML_MATH ) )
{
- sFilterService = OUString( XML_IMPORT_FILTER_MATH );
+ sFilterService = XML_IMPORT_FILTER_MATH;
aName = SvGlobalName(SO3_SM_CLASSID);
}
else if( nPrfx == XML_NAMESPACE_OFFICE &&
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 9b49b827d082..2c78e1a1b082 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1958,7 +1958,7 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectUR
if( (getExportFlags() & EXPORT_EMBEDDED) == 0 )
sRet = mxGraphicResolver->resolveGraphicObjectURL( rGraphicObjectURL );
else
- sRet = "";
+ sRet.clear();
}
else
sRet = GetRelativeReference( sRet );