Clean up sEmpty

Change-Id: If1b2bfe308caa2bce92e73d2c5c86ee273faed93

20 files changed, 40 insertions, 58 deletions

diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 7bbaa791470c..6178b190a165 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -518,8 +518,6 @@ private:
     const OUString sPropertyTooltip;
     const OUString sPropertyTextRange;
 
-    const OUString sEmpty;
-
     XMLPropertyState* pCombinedCharactersPropertyState;
 
 };
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 8dc14efc0d63..fc71a98efc85 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -405,8 +405,7 @@ void XMLDocumentSettingsContext::EndElement()
 
                 if ( sProp == "PrinterName" )
                 {
-                    OUString sEmpty;
-                    aSeqConfigProps[i].Value = uno::makeAny( sEmpty );
+                    aSeqConfigProps[i].Value = uno::makeAny( OUString() );
                     nFound++;
                 }
                 else if ( sProp == "PrinterSetup" )
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 3c4edf5047c2..5bba8272628c 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -402,7 +402,6 @@ void XMLSettingsExportHelper::exportIndexAccess(
     DBG_ASSERT(!rName.isEmpty(), "no name");
     DBG_ASSERT(rIndexed->getElementType().equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ),
                 "wrong IndexAccess" );
-    OUString sEmpty;
     if (rIndexed->hasElements())
     {
         m_rContext.AddAttribute( XML_NAME, rName );
@@ -410,7 +409,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
         sal_Int32 nCount = rIndexed->getCount();
         for (sal_Int32 i = 0; i < nCount; i++)
         {
-            exportMapEntry(rIndexed->getByIndex(i), sEmpty, false);
+            exportMapEntry(rIndexed->getByIndex(i), "", false);
         }
         m_rContext.EndElement( true );
     }
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index b355f038e9b7..c05fd934d954 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -301,7 +301,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
         if ( pNamespace )
         {
             NameSpaceMap::const_iterator aMapIter = aNameMap.find (nKey);
-            *pNamespace = aMapIter != aNameMap.end() ? (*aMapIter).second->sName : sEmpty;
+            *pNamespace = aMapIter != aNameMap.end() ? (*aMapIter).second->sName : OUString();
         }
     }
     else
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index feb4ac0bdfe7..cd6d9e93205e 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -196,9 +196,8 @@ void XMLErrors::AddRecord(
     }
     else
     {
-        OUString sEmpty;
         AddRecord( nId, rParams, rExceptionMessage,
-                   -1, -1, sEmpty, sEmpty );
+                   -1, -1, "", "" );
     }
 }
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 61c1c280a9a2..91f73b73e72e 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2390,8 +2390,7 @@ void SvXMLExport::SetError(
     sal_Int32 nId,
     const Sequence<OUString>& rMsgParams)
 {
-    OUString sEmpty;
-    SetError( nId, rMsgParams, sEmpty, NULL );
+    SetError( nId, rMsgParams, "", NULL );
 }
 
 void SvXMLExport::DisposingModel()
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 272505b0c06c..9108fc760ab0 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1796,8 +1796,7 @@ void SvXMLImport::SetError(
     sal_Int32 nId,
     const Sequence<OUString>& rMsgParams)
 {
-    OUString sEmpty;
-    SetError( nId, rMsgParams, sEmpty, NULL );
+    SetError( nId, rMsgParams, "", NULL );
 }
 
 void SvXMLImport::SetError(
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 373e116bf9a8..0efac45022cc 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -90,9 +90,8 @@ XMLFontStyleContextFontFace::XMLFontStyleContextFontFace( SvXMLImport& rImport,
     SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_FONT ),
     xStyles( &rStyles )
 {
-    OUString sEmpty;
-    aFamilyName <<= sEmpty;
-    aStyleName <<= sEmpty;
+    aFamilyName <<= OUString();
+    aStyleName <<= OUString();
     aFamily <<= (sal_Int16)awt::FontFamily::DONTKNOW;
     aPitch <<= (sal_Int16)awt::FontPitch::DONTKNOW;
     aEnc <<= (sal_Int16)rStyles.GetDfltCharset();
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 4a8de1db6e2d..def5eec8db00 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -78,7 +78,7 @@ XMLNumberFormatAttributesExportHelper::~XMLNumberFormatAttributesExportHelper()
 
 sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, OUString& sCurrency, bool& bIsStandard)
 {
-    XMLNumberFormat aFormat(sEmpty, nNumberFormat, 0);
+    XMLNumberFormat aFormat("", nNumberFormat, 0);
     XMLNumberFormatSet::iterator aItr(aNumberFormats.find(aFormat));
     XMLNumberFormatSet::iterator aEndItr(aNumberFormats.end());
     if (aItr != aEndItr)
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index d1ff59d97934..46d2d47d4af0 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -335,9 +335,8 @@ void SvXMLAutoStylePoolP::RegisterNames(
 OUString SvXMLAutoStylePoolP::Add( sal_Int32 nFamily,
                                   const vector< XMLPropertyState >& rProperties )
 {
-    OUString sEmpty;
     OUString sName;
-    pImpl->Add(sName, nFamily, sEmpty, rProperties );
+    pImpl->Add(sName, nFamily, "", rProperties );
     return sName;
 }
 
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 9730adb00076..767c7eb47a06 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -853,8 +853,7 @@ bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
             AddToTextElement_Impl( rString.copy( 0, nPos ) );
         }
         //  currency symbol (empty string -> default)
-        OUString sEmpty;
-        WriteCurrencyElement_Impl( sEmpty, sEmpty );
+        WriteCurrencyElement_Impl( "", "" );
         bRet = true;
 
         //  text after currency symbol
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 899252078adb..bce9924d6946 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -262,7 +262,6 @@ void XMLIndexTOCContext::EndElement()
     if( bValid )
     {
         // preliminaries
-        OUString sEmpty;
         rtl::Reference<XMLTextImportHelper> rHelper= GetImport().GetTextImport();
 
         // get rid of last paragraph (unless it's the only paragraph)
@@ -272,13 +271,13 @@ void XMLIndexTOCContext::EndElement()
         {
             rHelper->GetCursor()->goLeft(1, sal_True);
             rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                             sEmpty, sal_True);
+                                             "", sal_True);
         }
 
         // and delete second marker
         rHelper->GetCursor()->goRight(1, sal_True);
         rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                         sEmpty, sal_True);
+                                         "", sal_True);
 
         // check for Redlines on our end node
         GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index ba6fd6bdd881..0c3201d9af83 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -158,7 +158,7 @@ void XMLSectionExport::ExportSectionStart(
         GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_STYLE_NAME,
                                      GetParaExport().Find(
                                      XML_STYLE_FAMILY_TEXT_SECTION,
-                                     xPropertySet, sEmpty ) );
+                                     xPropertySet, "" ) );
 
         // xml:id for RDF metadata
         GetExport().AddAttributeXmlId(rSection);
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index 9163ef2927f8..5a4d47bba2f7 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -130,8 +130,6 @@ class XMLSectionExport
     const OUString sIsCurrentlyVisible;
     const OUString sHeadingStyleName;
 
-    const OUString sEmpty;
-
     SvXMLExport& rExport;
     XMLTextParagraphExport& rParaExport;
 
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 2574fce93dc5..7bc8c1c33eb5 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -234,7 +234,7 @@ void XMLSectionImportContext::StartElement(
 
                 // and delete first marker (in section)
                 rHelper->GetText()->insertString(
-                    rHelper->GetCursorAsRange(), sEmpty, sal_True);
+                    rHelper->GetCursorAsRange(), "", sal_True);
 
                 // finally, check for redlines that should start at
                 // the section start node
@@ -339,13 +339,13 @@ void XMLSectionImportContext::EndElement()
     {
         rHelper->GetCursor()->goLeft(1, sal_True);
         rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                         sEmpty, sal_True);
+                                         "", sal_True);
     }
 
     // and delete second marker
     rHelper->GetCursor()->goRight(1, sal_True);
     rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                     sEmpty, sal_True);
+                                     "", sal_True);
 
     // check for redlines to our endnode
     rHelper->RedlineAdjustStartNodeCursor(false);
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index 7b4ab86042fc..4f14b80c7b69 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -58,7 +58,6 @@ class XMLSectionImportContext : public SvXMLImportContext
     const OUString sProtectionKey;
     const OUString sIsProtected;
     const OUString sIsCurrentlyVisible;
-    const OUString sEmpty;
 
     OUString sXmlId;
     OUString sStyleName;
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index c20f22682603..5c7513906b30 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1127,7 +1127,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         // show style, unless name will be shown
         ProcessValueAndType(IsStringField(nToken, rPropSet),
                             GetIntProperty(sPropertyNumberFormat, rPropSet),
-                            sEmpty, sEmpty, 0.0, // values not used
+                            "", "", 0.0, // values not used
                             false,
                             bExportValueType,
                             !bCmd,
@@ -1168,7 +1168,7 @@ void XMLTextFieldExport::ExportFieldHelper(
                        bCmd);
         ProcessValueAndType(IsStringField(nToken, rPropSet),
                             GetIntProperty(sPropertyNumberFormat, rPropSet),
-                            sEmpty, sEmpty, 0.0, // values not used
+                            "", "", 0.0, // values not used
                             false, false, !bCmd,
                             ! GetOptionalBoolProperty(
                                  sPropertyIsFixedLanguage,
@@ -1251,7 +1251,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         {
             ProcessValueAndType(false,
                                 GetIntProperty(sPropertyNumberFormat,rPropSet),
-                                sEmpty, sEmpty, 0.0, // not used
+                                "", "", 0.0, // not used
                                 false, false, true,
                                 ! GetOptionalBoolProperty(
                                     sPropertyIsFixedLanguage,
@@ -1293,7 +1293,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         {
             ProcessValueAndType(false,
                                 GetIntProperty(sPropertyNumberFormat,rPropSet),
-                                sEmpty, sEmpty, 0.0, // not used
+                                "", "", 0.0, // not used
                                 false, false, true,
                                 ! GetOptionalBoolProperty(
                                     sPropertyIsFixedLanguage,
@@ -1398,7 +1398,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         ProcessCommandType(GetIntProperty(sPropertyDataCommandType, rPropSet));
         ProcessString(XML_CONDITION, XML_NAMESPACE_OOOW,
                       GetStringProperty(sPropertyCondition, rPropSet));
-        DBG_ASSERT(sPresentation.equals(sEmpty),
+        DBG_ASSERT(sPresentation.isEmpty(),
                    "Unexpected presentation for database next field");
         ExportDataBaseElement(XML_DATABASE_NEXT, OUString(),
                               rPropSet, xPropSetInfo);
@@ -1412,7 +1412,7 @@ void XMLTextFieldExport::ExportFieldHelper(
                       GetStringProperty(sPropertyCondition, rPropSet));
         ProcessInteger(XML_ROW_NUMBER,
                        GetIntProperty(sPropertySetNumber, rPropSet));
-        DBG_ASSERT(sPresentation.equals(sEmpty),
+        DBG_ASSERT(sPresentation.isEmpty(),
                    "Unexpected presentation for database select field");
         ExportDataBaseElement(XML_DATABASE_ROW_SELECT, OUString(),
                               rPropSet, xPropSetInfo);
@@ -1432,7 +1432,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         {
             ProcessValueAndType(false,  // doesn't happen for text
                                 GetIntProperty(sPropertyNumberFormat,rPropSet),
-                                sEmpty, sEmpty, 0.0, // not used
+                                "", "", 0.0, // not used
                                 false, false, true, false);
         }
         ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet),
@@ -1457,7 +1457,7 @@ void XMLTextFieldExport::ExportFieldHelper(
     case FIELD_ID_DOCINFO_PRINT_DATE:
         ProcessValueAndType(false,
                             GetIntProperty(sPropertyNumberFormat, rPropSet),
-                            sEmpty, sEmpty, 0.0,
+                            "", "", 0.0,
                             false, false, true,
                             ! GetOptionalBoolProperty(
                                     sPropertyIsFixedLanguage,
@@ -1488,7 +1488,7 @@ void XMLTextFieldExport::ExportFieldHelper(
     {
         ProcessValueAndType(false,  // doesn't happen for text
                                 GetIntProperty(sPropertyNumberFormat,rPropSet),
-                                sEmpty, sEmpty, 0.0, // not used
+                                "", "", 0.0, // not used
                                 false, false, true,
                                 ! GetOptionalBoolProperty(
                                     sPropertyIsFixedLanguage,
@@ -1549,7 +1549,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         ProcessBoolean(XML_IS_HIDDEN,
                        GetBoolProperty(sPropertyIsHidden, rPropSet),
                        false);
-        DBG_ASSERT(sPresentation.equals(sEmpty),
+        DBG_ASSERT(sPresentation.isEmpty(),
                    "Unexpected presentation for hidden paragraph field");
         ExportElement(XML_HIDDEN_PARAGRAPH);
         break;
@@ -1593,7 +1593,7 @@ void XMLTextFieldExport::ExportFieldHelper(
                        GetBoolProperty(sPropertyOn, rPropSet), true);
         ProcessIntegerDef(XML_PAGE_ADJUST,
                        GetInt16Property(sPropertyOffset, rPropSet), 0);
-        DBG_ASSERT(sPresentation.equals(sEmpty),
+        DBG_ASSERT(sPresentation.isEmpty(),
                    "Unexpected presentation page variable field");
         ExportElement(XML_PAGE_VARIABLE_SET);
         break;
@@ -1709,7 +1709,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         ProcessString(XML_LANGUAGE,
                       GetStringProperty(sPropertyScriptType, rPropSet),
                       true, XML_NAMESPACE_SCRIPT);
-        DBG_ASSERT(sPresentation.equals(sEmpty),
+        DBG_ASSERT(sPresentation.isEmpty(),
                    "Unexpected presentation for script field");
         if (GetBoolProperty(sPropertyURLContent, rPropSet))
         {
@@ -1728,7 +1728,7 @@ void XMLTextFieldExport::ExportFieldHelper(
     case FIELD_ID_ANNOTATION:
     {
         // check for empty presentation (just in case)
-        DBG_ASSERT(sPresentation.equals(sEmpty),
+        DBG_ASSERT(sPresentation.isEmpty(),
                    "Unexpected presentation for annotation field");
 
         // annotation element + content
@@ -1818,7 +1818,7 @@ void XMLTextFieldExport::ExportFieldHelper(
                         GetBoolProperty(sPropertyIsShowFormula, rPropSet) );
         ProcessValueAndType( false,
                              GetIntProperty(sPropertyNumberFormat, rPropSet),
-                             sEmpty, sEmpty, 0.0f,
+                             "", "", 0.0f,
                              false, false, true,
                              false );
         ExportElement( XML_TABLE_FORMULA, sPresentation );
@@ -2026,7 +2026,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
                 ProcessValueAndType(
                     bIsString,
                     GetIntProperty(sPropertyNumberFormat, xFieldPropSet),
-                    sEmpty, sEmpty, 0.0,
+                    "", "", 0.0,
                     false, true, false, false);
             }
             else
@@ -2039,7 +2039,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
                 // from NumberFormats
                 ProcessValueAndType(
                     bIsString,
-                    0, sEmpty, sEmpty, 0.0,
+                    0, "", "", 0.0,
                     false, true, false, false);
             }
 
@@ -2120,7 +2120,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
                 // expression:
                 ProcessValueAndType(
                     false,
-                    0, sEmpty, sEmpty,
+                    0, "", "",
                     GetDoubleProperty(sPropertyValue, xPropSet),
                     true,
                     true,
@@ -2343,7 +2343,7 @@ void XMLTextFieldExport::ExportMetaField(
         // style:data-style-name
         ProcessValueAndType(false,
             GetIntProperty(sPropertyNumberFormat, i_xMeta),
-            sEmpty, sEmpty, 0.0, false, false, true,
+            "", "", 0.0, false, false, true,
             false  );
 
         // text:meta-field without xml:id is invalid
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 88c868ca819b..faa8975cbe7d 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1181,9 +1181,8 @@ void XMLTextImportHelper::DeleteParagraph()
     {
         if (m_xImpl->m_xCursor->goLeft( 1, sal_True ))
         {
-            OUString sEmpty;
             m_xImpl->m_xText->insertString(m_xImpl->m_xCursorAsRange,
-                                           sEmpty, sal_True);
+                                           "", sal_True);
         }
     }
 }
@@ -2779,15 +2778,14 @@ OUString XMLTextImportHelper::GetOpenRedlineId()
     return m_xImpl->m_sOpenRedlineIdentifier;
 }
 
-void XMLTextImportHelper::SetOpenRedlineId( OUString& rId)
+void XMLTextImportHelper::SetOpenRedlineId( OUString const & rId)
 {
     m_xImpl->m_sOpenRedlineIdentifier = rId;
 }
 
 void XMLTextImportHelper::ResetOpenRedlineId()
 {
-    OUString sEmpty;
-    SetOpenRedlineId(sEmpty);
+    SetOpenRedlineId("");
 }
 
 void
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 7e65d799d74b..17804337a0d0 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -190,12 +190,11 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
 {
     if( pFontFamilyName )
     {
-        OUString sEmpty;
         Any aAny;
 
         if( !pFontStyleName )
         {
-            aAny <<= sEmpty;
+            aAny <<= OUString();
     #if OSL_DEBUG_LEVEL > 0
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                                 pFontFamilyName->mnIndex + 1 );
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 226d7e04a48e..f7f0a8fe6866 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3675,9 +3675,8 @@ void XMLTextParagraphExport::exportRuby(
 
             // ruby style
             GetExport().CheckAttrList();
-            OUString sEmpty;
             OUString sStyleName(Find( XML_STYLE_FAMILY_TEXT_RUBY, rPropSet,
-                                        sEmpty ));
+                                        "" ));
             DBG_ASSERT(!sStyleName.isEmpty(), "I can't find the style!");
             GetExport().AddAttribute(XML_NAMESPACE_TEXT,
                                      XML_STYLE_NAME, sStyleName);