summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorBrij Mohan Lal Srivastava <contactbrijmohan@gmail.com>2014-11-12 14:24:10 +0530
committerStephan Bergmann <sbergman@redhat.com>2014-11-14 09:20:38 +0100
commitd32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch)
treeb373c084cb124434e0498867b24bc7bb333155dd /xmloff
parentf5e86ebc097f0f8bc5b282511149cb026710ecde (diff)
fdo#86023 - O[U]String needs a 'clear' method
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx4
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx4
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx2
-rw-r--r--xmloff/source/core/nmspmap.cxx2
-rw-r--r--xmloff/source/style/numehelp.cxx2
-rw-r--r--xmloff/source/style/prstylei.cxx2
-rw-r--r--xmloff/source/style/xmlnumi.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.cxx2
-rw-r--r--xmloff/source/text/txtexppr.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx2
13 files changed, 15 insertions, 15 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 28e338f9552b..3c488a6bf467 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1060,12 +1060,12 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
OSL_ASSERT( msRowTrans.isEmpty() );
pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true ));
- msColTrans = OUString();
+ msColTrans.clear();
}
else if( !msRowTrans.isEmpty() )
{
pTableContext->setRowPermutation( lcl_getNumberSequenceFromString( msRowTrans, true ));
- msRowTrans = OUString();
+ msRowTrans.clear();
}
}
pContext = pTableContext;
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index cc3c27f684fa..8d1258bbeb71 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -230,7 +230,7 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPr
{
SvXMLImportContext *pContext = 0;
- rProp.Name = OUString();
+ rProp.Name.clear();
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
@@ -532,7 +532,7 @@ void XMLConfigItemContext::Characters( const OUString& rChars )
{
sChars = msValue;
sChars += sTrimmedChars;
- msValue = OUString();
+ msValue.clear();
}
else
{
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index 72b9893288e0..76b92f1bde22 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -58,7 +58,7 @@ void XMLBase64ImportContext::Characters( const OUString& rChars )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
- sBase64CharsLeft = OUString();
+ sBase64CharsLeft.clear();
}
else
{
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 000b3f04e8f2..d1aa755ce6f7 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -311,7 +311,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
if( -1L == nColonPos )
{
// case: no ':' found -> default namespace
- xEntry->sPrefix = OUString();
+ (xEntry->sPrefix).clear();
xEntry->sName = rAttrName;
}
else
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 6f00634c3d41..482857ffcfcc 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -526,7 +526,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
OUString sCurrency;
sal_Int16 nTypeKey = GetCellType(nNumberFormat, sCurrency, bIsStandard);
if(!bExportCurrencySymbol)
- sCurrency = OUString();
+ sCurrency.clear();
WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue, nNamespace);
}
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index a8c5aa4ab85b..8ac833da93e7 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -448,7 +448,7 @@ void XMLPropStyleContext::Finish( bool bOverwrite )
if( !sParent.isEmpty() )
sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
if( !sParent.isEmpty() && !xFamilies->hasByName( sParent ) )
- sParent = OUString();
+ sParent.clear();
if( sParent != mxStyle->getParentStyle() )
{
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 72081d694a92..57f4c49d63eb 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -446,7 +446,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties()
|| ((300 == nUPD) && (nBuildId <= 9573))))
{
// #i93908# OOo < 3.4 wrote a bogus suffix for bullet chars
- sSuffix = OUString(); // clear it
+ sSuffix.clear(); // clear it
}
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 9231870a3f93..91717d8717ca 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1242,7 +1242,7 @@ void XMLTextFrameContext_Impl::Characters( const OUString& rChars )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
- sBase64CharsLeft = OUString();
+ sBase64CharsLeft.clear();
}
else
{
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index f8f47206ecb5..969be43bd4de 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -161,7 +161,7 @@ void XMLTextMarkImportContext::StartElement(
{
if (!FindName(GetImport(), xAttrList))
{
- m_sBookmarkName = OUString();
+ m_sBookmarkName.clear();
}
if (IsXMLToken(GetLocalName(), XML_FIELDMARK_END))
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 9dc4e7112070..7bfdbe318137 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -200,7 +200,7 @@ void XMLTextNumRuleInfo::Set(
}
}
- msListLabelString = OUString();
+ msListLabelString.clear();
if ( bExportTextNumberElement &&
xPropSetInfo->hasPropertyByName( msListLabelStringProp ) )
{
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 98638907015d..5fc9cc4b397b 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -57,7 +57,7 @@ void XMLTextExportPropertySetMapper::handleElementItem(
pThis->maDropCapExport.exportXML( rProperty.maValue, bDropWholeWord,
sDropCharStyle );
pThis->bDropWholeWord = false;
- pThis->sDropCharStyle = OUString();
+ (pThis->sDropCharStyle).clear();
break;
case CTF_TABSTOP:
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 05bbfb78a8c4..a5d715a16e2d 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1457,7 +1457,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
xPropSet->setPropertyValue( rPropName, makeAny(sStyleName) );
}
else
- sStyleName = OUString();
+ sStyleName.clear();
}
/* The outline level needs to be only applied as list level, if the heading
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 3a7c16db35d4..6eb17d4de451 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -984,7 +984,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
if (bMoveProtect || bSizeProtect || !aProtectAttrValue.isEmpty())
{
if( (bMoveProtect ||bSizeProtect) && IsXMLToken( aProtectAttrValue, XML_NONE ) )
- aProtectAttrValue = OUString();
+ aProtectAttrValue.clear();
const OUString& rPosition = GetXMLToken( XML_POSITION );
if( bMoveProtect && -1 == aProtectAttrValue.indexOf( rPosition ) )