diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-26 22:59:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 08:00:32 +0200 |
| commit | 9c8fd7d1c5553e1e50dba7c7c32ef15fcdb0b49d (patch) | |
| tree | 345951559eba7aca1ead5ea9ff37450792a6833e /xmloff/source/core | |
| parent | a6050c32f30796743f9ab9b2a5c793ced9b8f747 (diff) | |
Clean up sEmpty
Change-Id: If1b2bfe308caa2bce92e73d2c5c86ee273faed93
Diffstat (limited to 'xmloff/source/core')
| -rw-r--r-- | xmloff/source/core/DocumentSettingsContext.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/SettingsExportHelper.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/nmspmap.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/core/xmlerror.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 3 |
6 files changed, 6 insertions, 11 deletions
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( |