basic/source/classes/sb.cxx | 11 +--
connectivity/source/drivers/evoab2/NTables.cxx | 3
connectivity/source/drivers/kab/KTables.cxx | 3
connectivity/source/drivers/macab/MacabTables.cxx | 3
cui/source/customize/macropg.cxx | 5 -
cui/source/dialogs/hyphen.cxx | 5 -
cui/source/dialogs/linkdlg.cxx | 5 -
cui/source/dialogs/passwdomdlg.cxx | 13 +--
cui/source/options/optlingu.cxx | 6 -
cui/source/tabpages/autocdlg.cxx | 10 +-
dbaccess/source/core/api/KeySet.cxx | 6 -
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 6 -
dbaccess/source/ui/app/AppController.cxx | 3
dbaccess/source/ui/browser/formadapter.cxx | 6 -
dbaccess/source/ui/querydesign/querydlg.cxx | 3
desktop/source/app/officeipcthread.cxx | 15 +---
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 7 -
editeng/source/uno/unofield.cxx | 3
editeng/source/uno/unotext.cxx | 6 -
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 3
fpicker/source/office/iodlg.cxx | 5 -
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 3
framework/source/uielement/fontmenucontroller.cxx | 3
framework/source/uielement/langselectionmenucontroller.cxx | 3
framework/source/uielement/langselectionstatusbarcontroller.cxx | 5 -
framework/source/uielement/menubarmanager.cxx | 3
include/svtools/unoevent.hxx | 2
include/vcl/toolbox.hxx | 2
include/xmloff/numehelp.hxx | 1
include/xmloff/txtimp.hxx | 2
jvmfwk/source/elements.cxx | 7 -
linguistic/source/spelldta.cxx | 3
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 8 --
lotuswordpro/source/filter/lwpsilverbullet.cxx | 21 ++---
oox/source/drawingml/diagram/diagram.cxx | 10 +-
oox/source/drawingml/shape.cxx | 3
oox/source/ppt/dgmimport.cxx | 7 -
reportdesign/source/filter/xml/xmlExport.cxx | 3
sax/test/sax/testwriter.cxx | 7 -
sc/source/core/data/documen3.cxx | 3
sc/source/core/data/table3.cxx | 4 -
sc/source/core/data/validat.cxx | 3
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 15 +---
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 1
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 3
sc/source/filter/xml/xmlimprt.cxx | 8 +-
sc/source/filter/xml/xmlimprt.hxx | 1
sc/source/filter/xml/xmlstyli.cxx | 6 -
sc/source/filter/xml/xmlstyli.hxx | 1
sc/source/filter/xml/xmlwrap.cxx | 5 -
sc/source/ui/app/inputhdl.cxx | 5 -
sc/source/ui/docshell/tablink.cxx | 3
sc/source/ui/drawfunc/fuins1.cxx | 5 -
sc/source/ui/miscdlgs/solveroptions.cxx | 3
sc/source/ui/undo/undotab.cxx | 3
sc/source/ui/unoobj/cellsuno.cxx | 9 --
sc/source/ui/unoobj/chart2uno.cxx | 6 +
sc/source/ui/unoobj/dapiuno.cxx | 6 -
sc/source/ui/unoobj/dispuno.cxx | 5 -
sc/source/ui/view/viewfun3.cxx | 9 --
sc/source/ui/view/viewfun7.cxx | 6 -
sd/source/core/EffectMigration.cxx | 3
sd/source/core/stlpool.cxx | 4 -
sd/source/filter/ppt/pptinanimations.cxx | 3
sfx2/source/appl/newhelp.cxx | 3
sfx2/source/appl/shutdowniconw32.cxx | 16 +---
sfx2/source/bastyp/sfxhtml.cxx | 4 -
sfx2/source/dialog/dinfdlg.cxx | 5 -
sfx2/source/dialog/templdlg.cxx | 23 ++----
sfx2/source/doc/doctempl.cxx | 9 +-
svtools/source/control/inettbc.cxx | 14 +--
svtools/source/uno/unoevent.cxx | 11 +--
svx/source/dialog/passwd.cxx | 7 -
svx/source/sidebar/nbdtmg.cxx | 2
svx/source/svdraw/svdmodel.cxx | 9 --
svx/source/tbxctrls/extrusioncontrols.cxx | 11 +--
svx/source/unodraw/unoshape.cxx | 5 -
sw/source/core/edit/edtox.cxx | 3
sw/source/core/unocore/unoevent.cxx | 2
sw/source/uibase/uiview/view2.cxx | 3
unotools/source/config/dynamicmenuoptions.cxx | 9 +-
vbahelper/source/msforms/vbacontrol.cxx | 6 -
vbahelper/source/vbahelper/vbahelper.cxx | 3
vcl/source/window/toolbox2.cxx | 6 -
xmloff/inc/txtflde.hxx | 2
xmloff/source/core/DocumentSettingsContext.cxx | 3
xmloff/source/core/SettingsExportHelper.cxx | 3
xmloff/source/core/nmspmap.cxx | 2
xmloff/source/core/xmlerror.cxx | 3
xmloff/source/core/xmlexp.cxx | 3
xmloff/source/core/xmlimp.cxx | 3
xmloff/source/draw/shapeexport.cxx | 9 --
xmloff/source/style/XMLFontStylesContext.cxx | 5 -
xmloff/source/style/numehelp.cxx | 2
xmloff/source/style/xmlaustp.cxx | 3
xmloff/source/style/xmlnumfe.cxx | 3
xmloff/source/text/XMLIndexTOCContext.cxx | 5 -
xmloff/source/text/XMLSectionExport.cxx | 2
xmloff/source/text/XMLSectionExport.hxx | 2
xmloff/source/text/XMLSectionImportContext.cxx | 6 -
xmloff/source/text/XMLSectionImportContext.hxx | 1
xmloff/source/text/txtflde.cxx | 36
+++++-----
xmloff/source/text/txtimp.cxx | 8 --
xmloff/source/text/txtimppr.cxx | 3
xmloff/source/text/txtparae.cxx | 3
105 files changed, 239 insertions(+), 359 deletions(-)
New commits:
commit 3e1020136c6dab023c54e5f8c67795787d63d99a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Aug 27 08:00:03 2015 +0200
Simplify ToolBox::GetQuickHelpText
Change-Id: I2801f54cecf9c8b7d43f8e1c1699cfd7fdd918e3
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index bda8d0b..7fe0bd1 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -437,7 +437,7 @@ public:
using Window::SetQuickHelpText;
void SetQuickHelpText( sal_uInt16 nItemId, const OUString&
rText );
using Window::GetQuickHelpText;
- const OUString& GetQuickHelpText( sal_uInt16 nItemId ) const;
+ OUString GetQuickHelpText( sal_uInt16 nItemId ) const;
void SetHelpText( sal_uInt16 nItemId, const OUString& rText
);
const OUString& GetHelpText( sal_uInt16 nItemId ) const;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 4e1e7b0..0d48a67 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1577,16 +1577,14 @@ void ToolBox::SetQuickHelpText( sal_uInt16 nItemId,
const OUString& rText )
pItem->maQuickHelpText = rText;
}
-const OUString& ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const
+OUString ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const
{
- static const OUString sEmpty;
-
ImplToolItem* pItem = ImplGetItem( nItemId );
if ( pItem )
return pItem->maQuickHelpText;
else
- return sEmpty;
+ return "";
}
void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
commit c491f941baf69697f5812a26654881b35ad426e2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 26 23:44:02 2015 +0200
Use a more meaningful name for the out-arg of GetHelpId
Change-Id: I5fca36f79aa98606770c77dad5b757288bd47842
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index a45bbaa..a5949a8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -748,7 +748,6 @@ void SdStyleSheetPool::CopyLayoutSheets(const OUString&
rLayoutName, SdStyleShee
std::vector<OUString> aNameList;
CreateLayoutSheetNames(rLayoutName,aNameList);
- OUString sEmpty;
for (std::vector<OUString>::const_iterator it = aNameList.begin(); it !=
aNameList.end(); ++it)
{
pSheet = Find(*it, SD_STYLE_FAMILY_MASTERPAGE);
@@ -760,7 +759,8 @@ void SdStyleSheetPool::CopyLayoutSheets(const OUString&
rLayoutName, SdStyleShee
{
// In the case one comes with Methusalem-Docs.
SfxStyleSheetBase& rNewSheet = Make(*it,
SD_STYLE_FAMILY_MASTERPAGE);
- rNewSheet.SetHelpId( sEmpty, pSourceSheet->GetHelpId( sEmpty )
);
+ OUString file;
+ rNewSheet.SetHelpId( file, pSourceSheet->GetHelpId( file ) );
rNewSheet.GetItemSet().Put(pSourceSheet->GetItemSet());
rCreatedSheets.push_back( SdStyleSheetRef( static_cast<
SdStyleSheet* >( &rNewSheet ) ) );
}
commit b71b5c85f1a9ebd30fb23e3ea0fc6db235586da3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 26 23:10:17 2015 +0200
Clean up sEmptyURL
Change-Id: I63e2f5055a87593708f672341b5849554b4db6fb
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 7ed11ef..51d2c95 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2826,9 +2826,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
else
{
// export empty href for empty placeholders to be valid ODF
- OUString sEmptyURL;
-
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sEmptyURL
);
+ mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, "" );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE,
XML_SIMPLE );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW,
XML_EMBED );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE,
XML_ONLOAD );
commit 336d9a01d779510752af7ea84aba7cb95e1cb4b8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 26 23:03:58 2015 +0200
Clean up emptyString
Change-Id: I5350322e5c957127fe125e633b31b2492410995e
diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index f078ea8..752cedc 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.cxx
@@ -657,7 +657,6 @@ void OSaxWriterTest::testPerformance(const Reference<
XExtendedDocumentHandler
// for performance testing
sal_Int32 i2;
OUString huhu( "huhu" );
- OUString emptyString;
const int ITERATIONS = 125;
for( i2 = 0 ; i2 < ITERATIONS ; i2 ++ )
{
@@ -665,17 +664,17 @@ void OSaxWriterTest::testPerformance(const Reference<
XExtendedDocumentHandler
OUString::valueOf( i2 ), rList );
for( sal_Int32 i = 0 ; i < 450 ; i ++ )
{
- r->ignorableWhitespace( emptyString );
+ r->ignorableWhitespace( "" );
r->startElement( huhu , rList );
r->characters( testParagraph );
- r->ignorableWhitespace( emptyString );
+ r->ignorableWhitespace( "" );
r->endElement( huhu );
}
}
for( i2 = ITERATIONS-1 ; i2 >= 0 ; i2-- )
{
- r->ignorableWhitespace( emptyString );
+ r->ignorableWhitespace( "" );
r->endElement( OUString( "tag" ) + OUString::valueOf( i2 ) );
}
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx
b/vbahelper/source/vbahelper/vbahelper.cxx
index 50abee2..aa72b3c 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -140,7 +140,6 @@ dispatchRequests (const uno::Reference< frame::XModel>&
xModel, const OUString &
{
util::URL url;
url.Complete = aUrl;
- OUString emptyString( "" );
uno::Reference<frame::XController> xController =
xModel->getCurrentController();
uno::Reference<frame::XFrame> xFrame = xController->getFrame();
uno::Reference<frame::XDispatchProvider> xDispatchProvider
(xFrame,uno::UNO_QUERY_THROW);
@@ -156,7 +155,7 @@ dispatchRequests (const uno::Reference< frame::XModel>&
xModel, const OUString &
return;
}
- uno::Reference<frame::XDispatch> xDispatcher =
xDispatchProvider->queryDispatch(url,emptyString,0);
+ uno::Reference<frame::XDispatch> xDispatcher =
xDispatchProvider->queryDispatch(url,"",0);
uno::Sequence<beans::PropertyValue> dispatchProps(1);
commit 9c8fd7d1c5553e1e50dba7c7c32ef15fcdb0b49d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 26 22:59:12 2015 +0200
Clean up sEmpty
Change-Id: If1b2bfe308caa2bce92e73d2c5c86ee273faed93
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx
b/connectivity/source/drivers/evoab2/NTables.cxx
index fe20ab6..dd18ee8 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -51,7 +51,6 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
Sequence< OUString > aTypes(1);
aTypes[0] = "TABLE";
- OUString sEmpty;
Reference< XResultSet > xResult =
m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
@@ -67,7 +66,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
aName,
xRow->getString(4),
xRow->getString(5),
- sEmpty);
+ "");
xRet = pRet;
}
}
diff --git a/connectivity/source/drivers/kab/KTables.cxx
b/connectivity/source/drivers/kab/KTables.cxx
index 7aa95c0..c74523a 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -43,7 +43,6 @@ sdbcx::ObjectType KabTables::createObject(const OUString&
_rName)
Sequence< OUString > aTypes(1);
aTypes[0] = "%";
- OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema,
aName, aTypes);
@@ -59,7 +58,7 @@ sdbcx::ObjectType KabTables::createObject(const OUString&
_rName)
aName,
xRow->getString(4),
xRow->getString(5),
- sEmpty);
+ "");
xRet = pRet;
}
}
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx
b/connectivity/source/drivers/macab/MacabTables.cxx
index 7a685f8..a334002 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -43,7 +43,6 @@ sdbcx::ObjectType MacabTables::createObject(const OUString&
_rName)
Sequence< OUString > aTypes(1);
aTypes[0] = "%";
- OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema,
aName, aTypes);
@@ -59,7 +58,7 @@ sdbcx::ObjectType MacabTables::createObject(const OUString&
_rName)
aName,
xRow->getString(4),
xRow->getString(5),
- sEmpty);
+ "");
xRet = pRet;
}
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 6f58102..6338147 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -398,14 +398,13 @@ void _SvxMacroTabPage::Reset( const SfxItemSet* )
try
{
- OUString sEmpty;
if( m_xAppEvents.is() )
{
EventsHash::iterator h_itEnd = m_appEventsHash.end();
EventsHash::iterator h_it = m_appEventsHash.begin();
for ( ; h_it != h_itEnd; ++h_it )
{
- h_it->second.second = sEmpty;
+ h_it->second.second.clear();
}
}
if( m_xDocEvents.is() && bDocModified )
@@ -414,7 +413,7 @@ void _SvxMacroTabPage::Reset( const SfxItemSet* )
EventsHash::iterator h_it = m_docEventsHash.begin();
for ( ; h_it != h_itEnd; ++h_it )
{
- h_it->second.second = sEmpty;
+ h_it->second.second.clear();
}
// if we have a valid XModifiable (in the case of doc events)
// call setModified(true)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f404fa2..10cfb0c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1805,13 +1805,12 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry(
OUString& rTxt, sal_uInt16 nCol )
if( !pCheckButtonData )
pCheckButtonData = new SvLBoxButtonData(m_pLinguOptionsCLB);
- OUString sEmpty;
if (CBCOL_FIRST == nCol)
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(
pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
if (CBCOL_SECOND == nCol)
pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
- pEntry, 0, sEmpty))); // empty column
+ pEntry, 0, ""))); // empty column
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
pEntry, 0, Image(), Image(), false)));
pEntry->AddItem(std::unique_ptr<BrwString_Impl>(new BrwString_Impl(
@@ -1940,11 +1939,10 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry(
OUString& rTxt, sal_uInt16 nCol
pCheckButtonData->SetLink( m_pModulesCLB->GetCheckButtonHdl() );
}
- OUString sEmpty;
if (CBCOL_FIRST == nCol)
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry,
SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
if (CBCOL_SECOND == nCol)
- pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, sEmpty))); // empty column
+ pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, ""))); // empty column
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
pEntry, 0, Image(), Image(), false)));
pEntry->AddItem(std::unique_ptr<BrwStringDic_Impl>(new
BrwStringDic_Impl(pEntry, 0, rTxt)));
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 7487c6d..b5aa5bd 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -477,14 +477,13 @@ SvTreeListEntry*
OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
pEntry, 0, Image(), Image(), false)));
- OUString sEmpty;
if (nCol == CBCOL_SECOND)
- pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, sEmpty)));
+ pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, "")));
else
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry,
SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
if (nCol == CBCOL_FIRST)
- pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, sEmpty)));
+ pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, "")));
else
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry,
SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
pEntry->AddItem(std::unique_ptr<OfaImpBrwString>(new OfaImpBrwString(
pEntry, 0, rTxt)));
@@ -1800,14 +1799,13 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString&
rTxt, sal_uInt16 nCol)
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)));
- OUString sEmpty;
if (nCol == CBCOL_SECOND)
- pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, sEmpty)));
+ pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, "")));
else
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry,
SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
if (nCol == CBCOL_FIRST)
- pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, sEmpty)));
+ pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry,
0, "")));
else
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(
pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 060f028..429ff30 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -549,8 +549,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow&
_rInsertRow ,const ORowSetRow
::dbtools::throwSQLException( DBACORE_RESSTRING(
RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection );
// now create end execute the prepared statement
- OUString sEmpty;
- executeUpdate(_rInsertRow
,_rOriginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions);
+ executeUpdate(_rInsertRow
,_rOriginalRow,aSql.makeStringAndClear(),"",aIndexColumnPositions);
}
void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow&
_rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const
::std::vector<sal_Int32>& _aIndexColumnPositions)
@@ -657,8 +656,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow&
_rInsertRow,const connectivi
aValues[aValues.getLength() - 1] = ')';
aSql.append(aValues.makeStringAndClear());
// now create,fill and execute the prepared statement
- OUString sEmpty;
- executeInsert(_rInsertRow,aSql.makeStringAndClear(),sEmpty,bRefetch);
+ executeInsert(_rInsertRow,aSql.makeStringAndClear(),"",bRefetch);
}
void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString&
i_sSQL,const OUString& i_sTableName,bool bRefetch )
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index e97ebf0..c2a18e1 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1617,8 +1617,7 @@ void OSingleSelectQueryComposer::setConditionByColumn(
const Reference< XPropert
if ( nType != DataType::BOOLEAN && DataType::BIT != nType )
{
- OUString sEmpty;
- lcl_addFilterCriteria_throw(filterOperator,sEmpty,aSQL);
+ lcl_addFilterCriteria_throw(filterOperator,"",aSQL);
}
switch(nType)
@@ -1690,8 +1689,7 @@ void OSingleSelectQueryComposer::setConditionByColumn(
const Reference< XPropert
sal_Int32 nFilterOp = filterOperator;
if ( filterOperator != SQLFilterOperator::SQLNULL &&
filterOperator != SQLFilterOperator::NOT_SQLNULL )
nFilterOp = SQLFilterOperator::SQLNULL;
- OUString sEmpty;
- lcl_addFilterCriteria_throw(nFilterOp,sEmpty,aSQL);
+ lcl_addFilterCriteria_throw(nFilterOp,"",aSQL);
}
// Attach filter
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index d6f67c3..e2ac957 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1064,9 +1064,8 @@ void OApplicationController::Execute(sal_uInt16 _nId,
const Sequence< PropertyVa
::std::vector<SotClipboardFormatId> aFormatIds;
getSupportedFormats(getContainer()->getElementType(),aFormatIds);
const ::std::vector<SotClipboardFormatId>::iterator
aEnd = aFormatIds.end();
- OUString sEmpty;
for (::std::vector<SotClipboardFormatId>::iterator
aIter = aFormatIds.begin();aIter != aEnd; ++aIter)
- pDlg->Insert(*aIter,sEmpty);
+ pDlg->Insert(*aIter,"");
const TransferableDataHelper& rClipboard =
getViewClipboard();
pasteFormat(pDlg->GetFormat(rClipboard.GetTransferable()));
diff --git a/dbaccess/source/ui/browser/formadapter.cxx
b/dbaccess/source/ui/browser/formadapter.cxx
index 87c8a5a..43e481e 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -142,9 +142,8 @@ void SbaXFormAdapter::StartListening()
if (m_aPropertiesChangeListeners.getLength())
{
Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm,
UNO_QUERY);
- OUString sEmpty;
if (xBroadcaster.is())
-
xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>(&sEmpty,
1), &m_aPropertiesChangeListeners);
+
xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>{""},
&m_aPropertiesChangeListeners);
}
// log off ourself
@@ -1257,9 +1256,8 @@ void SAL_CALL
SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUStr
if (m_aPropertiesChangeListeners.getLength() == 1)
{
Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm,
UNO_QUERY);
- OUString sEmpty;
if (xBroadcaster.is())
- xBroadcaster->addPropertiesChangeListener(Sequence<
OUString>(&sEmpty, 1), &m_aPropertiesChangeListeners);
+ xBroadcaster->addPropertiesChangeListener(Sequence< OUString>{""},
&m_aPropertiesChangeListeners);
}
}
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx
b/dbaccess/source/ui/querydesign/querydlg.cxx
index cb9dff4..6d4d2ad 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -204,8 +204,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
m_pTableControl->lateInit();
m_pCBNatural->Check(false);
m_pTableControl->enableRelation(false);
- OUString sEmpty;
- m_pConnData->AppendConnLine(sEmpty,sEmpty);
+ m_pConnData->AppendConnLine("","");
m_pPB_OK->Enable(true);
}
break;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index d6619ad..0f8715c 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -929,14 +929,13 @@ void UpdateDialog::initDescription()
void UpdateDialog::clearDescription()
{
- OUString sEmpty;
m_pPublisherLabel->Hide();
m_pPublisherLink->Hide();
- m_pPublisherLink->SetText( sEmpty );
- m_pPublisherLink->SetURL( sEmpty );
+ m_pPublisherLink->SetText( "" );
+ m_pPublisherLink->SetURL( "" );
m_pReleaseNotesLabel->Hide();
m_pReleaseNotesLink->Hide();
- m_pReleaseNotesLink->SetURL( sEmpty );
+ m_pReleaseNotesLink->SetURL( "" );
m_pDescriptions->SetText("");
}
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx
b/framework/source/uielement/langselectionmenucontroller.cxx
index 5d89a00..6cb7728 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -200,7 +200,6 @@ void LanguageSelectionMenuController::fillPopupMenu(
Reference< css::awt::XPopup
sal_Int16 nItemId = 1; // in this control the item id is not important
for executing the command
const OUString sAsterisk("*"); // multiple languages in current selection
- const OUString sEmpty; // 'no language found' from language guessing
const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE
));
std::set< OUString >::const_iterator it;
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
@@ -208,7 +207,7 @@ void LanguageSelectionMenuController::fillPopupMenu(
Reference< css::awt::XPopup
const OUString & rStr( *it );
if (rStr != sNone &&
rStr != sAsterisk &&
- rStr != sEmpty)
+ !rStr.isEmpty()) // 'no language found' from language guessing
{
pPopupMenu->InsertItem( nItemId, rStr );
aCmd = aCmd_Language;
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 2f2ab79..ea8a106 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -149,7 +149,6 @@ throw (css::uno::RuntimeException, std::exception)
// add first few entries to main menu
sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
const OUString sAsterisk("*"); // multiple languages in current selection
- const OUString sEmpty; // 'no language found' from language guessing
const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE
));
std::map< sal_Int16, OUString > aLangMap;
std::set< OUString >::const_iterator it;
@@ -158,7 +157,7 @@ throw (css::uno::RuntimeException, std::exception)
const OUString & rStr( *it );
if ( rStr != sNone &&
rStr != sAsterisk &&
- rStr != sEmpty)
+ !rStr.isEmpty()) // 'no language found' from language guessing
{
DBG_ASSERT( MID_LANG_SEL_1 <= nItemId && nItemId <= MID_LANG_SEL_9,
"nItemId outside of expected range!" );
@@ -186,7 +185,7 @@ throw (css::uno::RuntimeException, std::exception)
const OUString & rStr( *it );
if( rStr != sNone &&
rStr != sAsterisk &&
- rStr != sEmpty)
+ !rStr.isEmpty()) // 'no language found' from language guessing
{
DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <=
MID_LANG_PARA_9,
"nItemId outside of expected range!" );
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index 1a4ce96..5f15a43 100644
--- a/include/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
@@ -73,8 +73,6 @@ class SVT_DLLPUBLIC SvBaseEventDescriptor : public
cppu::WeakImplHelper2
const OUString sServiceName;
protected:
- const OUString sEmpty;
-
/// last element is 0, 0
const SvEventDescription* mpSupportedMacroItems;
sal_Int16 mnMacroItems;
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 053772d..81477e9 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -67,7 +67,6 @@ class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper
{
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >
xNumberFormats;
SvXMLExport* pExport;
- const OUString sEmpty;
const OUString sStandardFormat;
const OUString sType;
const OUString sAttrValue;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index ca0ce7a..923514a 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -709,7 +709,7 @@ public:
/// get the last open redline ID
OUString GetOpenRedlineId();
/// modify the last open redline ID
- void SetOpenRedlineId( OUString& rId);
+ void SetOpenRedlineId( OUString const & rId);
/// reset the last open redline ID
void ResetOpenRedlineId();
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 901a4bd..0273068 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -617,10 +617,9 @@ void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool
bAutoSelect)
else
{
m_javaInfo->m_bEmptyNode = true;
- OUString sEmpty;
- m_javaInfo->sVendor = sEmpty;
- m_javaInfo->sLocation = sEmpty;
- m_javaInfo->sVersion = sEmpty;
+ m_javaInfo->sVendor.clear();
+ m_javaInfo->sLocation.clear();
+ m_javaInfo->sVersion.clear();
m_javaInfo->nFeatures = 0;
m_javaInfo->nRequirements = 0;
m_javaInfo->arVendorData = rtl::ByteSequence();
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 26c2551..42c816c 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -835,7 +835,6 @@ void ORptExport::exportContainer(const Reference<
XSection>& _xSection)
sal_Int32 nFormatKey = xFormattedField->getFormatKey();
XMLNumberFormatAttributesExportHelper
aHelper(GetNumberFormatsSupplier(),*this);
bool bIsStandard = false;
- OUString sEmpty;
sal_Int16 nCellType =
aHelper.GetCellType(nFormatKey,bIsStandard);
// "Standard" means "no format set, value could be
anything",
// so don't set a format attribute in this case.
@@ -843,7 +842,7 @@ void ORptExport::exportContainer(const Reference<
XSection>& _xSection)
if (!bIsStandard)
{
if ( nCellType == util::NumberFormat::TEXT )
- aHelper.SetNumberFormatAttributes(sEmpty,
sEmpty);
+ aHelper.SetNumberFormatAttributes("", "");
else
aHelper.SetNumberFormatAttributes(nFormatKey,
0.0, false);
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 0287e66..0b292e6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -106,7 +106,7 @@ bool SplitString( const OUString &sWhole,
i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
// Get prefix element
- OUString sEmpty, sUser = "-";
+ OUString sUser = "-";
ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken(
KParseType::IDENTNAME, sWhole, 0,
KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
@@ -120,7 +120,7 @@ bool SplitString( const OUString &sWhole,
sUser = aLocaleItem.decimalSeparator;
ParseResult aPRNum = ScGlobal::pCharClass->parsePredefinedToken(
KParseType::ANY_NUMBER, sWhole, aPRPre.EndPos,
- KParseTokens::ANY_NUMBER, sEmpty, KParseTokens::ANY_NUMBER, sUser );
+ KParseTokens::ANY_NUMBER, "", KParseTokens::ANY_NUMBER, sUser );
if ( aPRNum.EndPos == aPRPre.EndPos )
return false;
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index f88bf6e..7606526 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -117,7 +117,7 @@ SvXMLImportContext
*XMLTableHeaderFooterContext::CreateChildContext(
if( xHeaderFooterContent.is() )
{
uno::Reference < text::XText >
xText(xHeaderFooterContent->getCenterText());
- xText->setString(sEmpty);
+ xText->setString("");
xTextCursor.set(xText->createTextCursor());
xOldTextCursor.set(GetImport().GetTextImport()->GetCursor());
GetImport().GetTextImport()->SetCursor( xTextCursor );
@@ -154,7 +154,7 @@ SvXMLImportContext
*XMLTableHeaderFooterContext::CreateChildContext(
}
if (xText.is())
{
- xText->setString(sEmpty);
+ xText->setString("");
//SvXMLImport aSvXMLImport( GetImport() );
uno::Reference < text::XTextCursor >
xTempTextCursor(xText->createTextCursor());
pContext = new XMLHeaderFooterRegionContext( GetImport(),
nPrefix, rLocalName, xAttrList, xTempTextCursor);
@@ -176,7 +176,7 @@ void XMLTableHeaderFooterContext::EndElement()
if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) )
{
GetImport().GetTextImport()->GetText()->insertString(
- GetImport().GetTextImport()->GetCursorAsRange(), sEmpty,
+ GetImport().GetTextImport()->GetCursorAsRange(), "",
true );
}
GetImport().GetTextImport()->ResetCursor();
@@ -186,11 +186,11 @@ void XMLTableHeaderFooterContext::EndElement()
if (xHeaderFooterContent.is())
{
if (!bContainsLeft)
- xHeaderFooterContent->getLeftText()->setString(sEmpty);
+ xHeaderFooterContent->getLeftText()->setString("");
if (!bContainsCenter)
- xHeaderFooterContent->getCenterText()->setString(sEmpty);
+ xHeaderFooterContent->getCenterText()->setString("");
if (!bContainsRight)
- xHeaderFooterContent->getRightText()->setString(sEmpty);
+ xHeaderFooterContent->getRightText()->setString("");
xPropSet->setPropertyValue( sCont, uno::makeAny(xHeaderFooterContent)
);
}
@@ -243,9 +243,8 @@ void XMLHeaderFooterRegionContext::EndElement()
//GetImport().GetTextImport()->GetCursor()->gotoEnd(sal_False);
if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) )
{
- OUString sEmpty;
GetImport().GetTextImport()->GetText()->insertString(
- GetImport().GetTextImport()->GetCursorAsRange(), sEmpty,
+ GetImport().GetTextImport()->GetCursorAsRange(), "",
true );
}
GetImport().GetTextImport()->ResetCursor();
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index abcc468..3f89046 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -43,7 +43,6 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext
const OUString sShareContent;
const OUString sContent;
const OUString sContentLeft;
- const OUString sEmpty;
OUString sCont;
bool bDisplay;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 1499f34..9bed201 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -1218,9 +1218,8 @@ void ScXMLChangeCellContext::EndElement()
//GetImport().GetTextImport()->GetCursor()->gotoEnd(sal_False);
if( GetImport().GetTextImport()->GetCursor()->goLeft( 1,
sal_True ) )
{
- OUString sEmpty;
GetImport().GetTextImport()->GetText()->insertString(
- GetImport().GetTextImport()->GetCursorAsRange(),
sEmpty,
+ GetImport().GetTextImport()->GetCursorAsRange(), "",
sal_True );
}
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 61953d7..b92e562 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2899,7 +2899,7 @@ void ScXMLImport::SetStyleToRange(const ScRange& rRange,
const OUString* pStyleN
if (pCurrency)
sPrevCurrency = *pCurrency;
else if (!sPrevCurrency.isEmpty())
- sPrevCurrency = sEmpty;
+ sPrevCurrency.clear();
}
else if ((nCellType != nPrevCellType) ||
((pStyleName && !pStyleName->equals(sPrevStyleName)) ||
@@ -2912,11 +2912,11 @@ void ScXMLImport::SetStyleToRange(const ScRange&
rRange, const OUString* pStyleN
if (pStyleName)
sPrevStyleName = *pStyleName;
else if(!sPrevStyleName.isEmpty())
- sPrevStyleName = sEmpty;
+ sPrevStyleName.clear();
if (pCurrency)
sPrevCurrency = *pCurrency;
else if(!sPrevCurrency.isEmpty())
- sPrevCurrency = sEmpty;
+ sPrevCurrency.clear();
}
table::CellRangeAddress aCellRange;
aCellRange.StartColumn = rRange.aStart.Col();
@@ -2952,7 +2952,7 @@ ScMyStyleNumberFormats*
ScXMLImport::GetStyleNumberFormats()
void ScXMLImport::SetStylesToRangesFinished()
{
SetStyleToRanges();
- sPrevStyleName = sEmpty;
+ sPrevStyleName.clear();
}
// XImporter
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 413b783..ae5ffe1 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -954,7 +954,6 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
com::sun::star::uno::Reference
<com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges;
- OUString sEmpty;
OUString sPrevStyleName;
OUString sPrevCurrency;
sal_uInt32 nSolarMutexLocked;
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 76056e1..0f9b7f2 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -1034,9 +1034,9 @@ void ScMasterPageContext::ClearContent(const OUString&
rContent)
uno::Reference < sheet::XHeaderFooterContent >
xHeaderFooterContent(xPropSet->getPropertyValue( rContent ), uno::UNO_QUERY);
if (xHeaderFooterContent.is())
{
- xHeaderFooterContent->getLeftText()->setString(sEmpty);
- xHeaderFooterContent->getCenterText()->setString(sEmpty);
- xHeaderFooterContent->getRightText()->setString(sEmpty);
+ xHeaderFooterContent->getLeftText()->setString("");
+ xHeaderFooterContent->getCenterText()->setString("");
+ xHeaderFooterContent->getRightText()->setString("");
xPropSet->setPropertyValue( rContent,
uno::makeAny(xHeaderFooterContent) );
}
}
diff --git a/sc/source/filter/xml/xmlstyli.hxx
b/sc/source/filter/xml/xmlstyli.hxx
index 10bf52a..ca856bd 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -218,7 +218,6 @@ namespace com { namespace sun { namespace star {
class ScMasterPageContext : public XMLTextMasterPageContext
{
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>
xPropSet;
- const OUString sEmpty;
bool bContainsRightHeader;
bool bContainsRightFooter;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 4f96f25..77afa83 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -324,7 +324,6 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode&
rError )
uno::Reference<xml::sax::XParser> xXMLParser =
xml::sax::Parser::create(xContext);
// get filter
- OUString sEmpty;
uno::Reference<frame::XModel> xModel = mrDocShell.GetModel();
/** property map for export info set */
@@ -499,7 +498,7 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode&
rError )
xContext, xModel, xXMLParser, aParserInput,
bOasis ?
OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter")
:
OUString("com.sun.star.comp.Calc.XMLSettingsImporter"),
- "settings.xml", sEmpty, aSettingsArgs, false);
+ "settings.xml", "", aSettingsArgs, false);
SAL_INFO( "sc.filter", "settings import end" );
}
@@ -513,7 +512,7 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode&
rError )
bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter")
: OUString("com.sun.star.comp.Calc.XMLStylesImporter"),
OUString("styles.xml"),
- sEmpty, aStylesArgs, true);
+ "", aStylesArgs, true);
SAL_INFO( "sc.filter", "styles import end" );
}
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx
b/sc/source/ui/miscdlgs/solveroptions.cxx
index b539260..5593a07 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -247,7 +247,6 @@ void ScSolverOptionsDialog::FillListBox()
m_pLbSettings->SetUpdateMode(false);
m_pLbSettings->Clear();
- OUString sEmpty;
if (!mpCheckButtonData)
mpCheckButtonData = new SvLBoxButtonData(m_pLbSettings);
@@ -281,7 +280,7 @@ void ScSolverOptionsDialog::FillListBox()
// value entry
pEntry = new SvTreeListEntry;
pEntry->AddItem(std::unique_ptr<SvLBoxString>(
- new SvLBoxString(pEntry, 0, sEmpty))); // empty column
+ new SvLBoxString(pEntry, 0, ""))); // empty column
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)));
std::unique_ptr<ScSolverOptionsString> pItem(
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index b0da8b4..f2106fc 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1194,13 +1194,12 @@ void BookmarksBox_Impl::dispose()
// save bookmarks to configuration
SvtHistoryOptions aHistOpt;
aHistOpt.Clear( eHELPBOOKMARKS );
- OUString sEmpty;
sal_uInt16 nCount = GetEntryCount();
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
OUString aTitle = GetEntry(i);
OUString* pURL = static_cast<OUString*>(GetEntryData(i));
- aHistOpt.AppendItem(eHELPBOOKMARKS, *pURL, sEmpty, aTitle, sEmpty,
boost::none);
+ aHistOpt.AppendItem(eHELPBOOKMARKS, *pURL, "", aTitle, "",
boost::none);
delete pURL;
}
ListBox::dispose();
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 5b40bba..266a23d 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -118,7 +118,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap,
const OUString& rBase
sal_uInt16 nShape = IMAP_OBJ_RECTANGLE;
std::vector<sal_uInt32> aCoords;
- OUString aName, aHRef, aAlt, aTarget, sEmpty;
+ OUString aName, aHRef, aAlt, aTarget;
bool bNoHRef = false;
SvxMacroTableDtor aMacroTbl;
@@ -171,7 +171,7 @@ IMAPOBJ_SETEVENT:
if( !sTmp.isEmpty() )
{
sTmp = convertLineEnd(sTmp, GetSystemLineEnd());
- aMacroTbl.Insert( nEvent, SvxMacro( sTmp, sEmpty,
eScrpType ));
+ aMacroTbl.Insert( nEvent, SvxMacro( sTmp, "", eScrpType ));
}
}
break;
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index cb113b1..842a073 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -50,7 +50,6 @@ SvBaseEventDescriptor::SvBaseEventDescriptor( const
SvEventDescription* pSupport
sScript("Script"),
sNone("None"),
sServiceName(sAPI_ServiceName),
- sEmpty(),
mpSupportedMacroItems(pSupportedMacroItems),
mnMacroItems(0)
{
@@ -86,7 +85,7 @@ void SvBaseEventDescriptor::replaceByName(
rElement >>= aSequence;
// perform replace (in subclass)
- SvxMacro aMacro(sEmpty,sEmpty);
+ SvxMacro aMacro("","");
getMacroFromAny(aMacro, rElement);
replaceByName(nMacroID, aMacro);
}
@@ -106,7 +105,7 @@ Any SvBaseEventDescriptor::getByName(
// perform get (in subclass)
Any aAny;
- SvxMacro aMacro( sEmpty, sEmpty );
+ SvxMacro aMacro( "", "" );
getByName(aMacro, nMacroID);
getAnyFromMacro(aAny, aMacro);
return aAny;
@@ -338,7 +337,7 @@ void SvBaseEventDescriptor::getMacroFromAny(
if (bNone)
{
// return empty macro
- rMacro = SvxMacro( sEmpty, sEmpty );
+ rMacro = SvxMacro( "", "" );
}
else
{
@@ -411,7 +410,7 @@ void SvEventDescriptor::getByName(
rMacro = rItem.GetMacro(nEvent);
else
{
- SvxMacro aEmptyMacro(sEmpty, sEmpty);
+ SvxMacro aEmptyMacro("", "");
rMacro = aEmptyMacro;
}
}
@@ -547,7 +546,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable(
const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent;
if (hasById(nEvent))
{
- SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro(sEmpty,
sEmpty));
+ SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro("", ""));
getByName(rMacro, nEvent);
}
}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 1300627..d4d647f 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -645,7 +645,7 @@ bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule&
aNum, sal_uInt16 nIndex
GrfBulDataRelation* pEntry = aGrfDataLst[nIndex];
if ( !aGrfName.isEmpty() )
pEntry->sGrfName = aGrfName;
- //pEntry->sDescription = sEmpty;
+ //pEntry->sDescription.clear();
pEntry->nGallaryIndex = (sal_uInt16)0xFFFF;
pEntry->bIsCustomized = true;
OUString aStrFromRES = SVX_RESSTR(
RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 8d596e8..1638517 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -314,10 +314,9 @@ void SwEditShell::ApplyAutoMark()
sal_Int32 nSrchFlags = SearchFlags::LEV_RELAXED;
- OUString sEmpty;
SearchOptions aSearchOpt(
SearchAlgorithms_ABSOLUTE, nSrchFlags,
- sEmpty, sEmpty,
+ "", "",
SvtSysLocale().GetLanguageTag().getLocale(),
nLEV_Other, nLEV_Longer, nLEV_Shorter,
nTransliterationFlags );
diff --git a/sw/source/core/unocore/unoevent.cxx
b/sw/source/core/unocore/unoevent.cxx
index aed1588..791cad3 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -136,7 +136,7 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFormat(
const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent;
if (hasById(nEvent))
{
- SvxMacro aMacro(sEmpty, sEmpty);
+ SvxMacro aMacro("", "");
getByName(aMacro, nEvent);
aFormat.SetMacro(nEvent, aMacro);
}
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index a85fbf9..a050e58 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -2073,8 +2073,7 @@ void SwView::ExecuteInsertDoc( SfxRequest& rRequest,
const SfxPoolItem* pItem )
if ( !pItem )
{
- OUString sEmpty;
- InsertDoc( nSlot, sEmpty, sEmpty );
+ InsertDoc( nSlot, "", "" );
}
else
{
diff --git a/unotools/source/config/dynamicmenuoptions.cxx
b/unotools/source/config/dynamicmenuoptions.cxx
index c8ba910..c16b8a2 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -99,7 +99,7 @@ class SvtDynMenu
// The while-loop starts with pointer on internal member
list lSetupEntries, change to
// lUserEntries then and stop after that with NULL!
// Separator entries will be packed in another way then
normal entries! We define
- // special strings "sEmpty" and "sSeparator" to perform too
...
+ // special string "sSeparator" to perform too ...
Sequence< Sequence< PropertyValue > > GetList() const
{
sal_Int32 nSetupCount =
(sal_Int32)lSetupEntries.size();
@@ -108,7 +108,6 @@ class SvtDynMenu
Sequence< PropertyValue > lProperties ( PROPERTYCOUNT
);
Sequence< Sequence< PropertyValue > > lResult (
nSetupCount+nUserCount );
OUString sSeparator (
"private:separator" );
- OUString sEmpty;
const vector< SvtDynMenuEntry >* pList =
&lSetupEntries;
lProperties[OFFSET_URL ].Name = PROPERTYNAME_URL;
@@ -125,9 +124,9 @@ class SvtDynMenu
if( pItem->sURL == sSeparator )
{
lProperties[OFFSET_URL ].Value <<=
sSeparator;
- lProperties[OFFSET_TITLE ].Value <<= sEmpty;
- lProperties[OFFSET_IMAGEIDENTIFIER ].Value <<= sEmpty;
- lProperties[OFFSET_TARGETNAME ].Value <<= sEmpty;
+ lProperties[OFFSET_TITLE ].Value <<=
OUString();
+ lProperties[OFFSET_IMAGEIDENTIFIER ].Value <<=
OUString();
+ lProperties[OFFSET_TARGETNAME ].Value <<=
OUString();
}
else
{
diff --git a/vbahelper/source/msforms/vbacontrol.cxx
b/vbahelper/source/msforms/vbacontrol.cxx
index 84f9852..910829b 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -318,7 +318,6 @@ ScVbaControl::getControlSource() throw
(uno::RuntimeException, std::exception)
void SAL_CALL
ScVbaControl::setControlSource( const OUString& _controlsource ) throw
(uno::RuntimeException, std::exception)
{
- OUString sEmpty;
// afaik this is only relevant for Excel documents ( and we need to set up
a
// reference tab in case no Sheet is specified in "_controlsource"
// Can't use the active sheet either, code may of course access
@@ -352,7 +351,7 @@ ScVbaControl::setControlSource( const OUString&
_controlsource ) throw (uno::Run
break;
}
- svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, _controlsource, sEmpty, sal_uInt16( nRefTab ) );
+ svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, _controlsource, "", sal_uInt16( nRefTab ) );
}
OUString SAL_CALL
@@ -383,8 +382,7 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException,
std::exception)
void SAL_CALL
ScVbaControl::setRowSource( const OUString& _rowsource ) throw
(uno::RuntimeException, std::exception)
{
- OUString sEmpty;
- svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, sEmpty, _rowsource );
+ svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, "", _rowsource );
}
OUString SAL_CALL
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 7bbaa79..6178b19 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 8dc14ef..fc71a98 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 3c4edf5..5bba827 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 b355f03..c05fd93 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 feb4ac0..cd6d9e9 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 61c1c28..91f73b7 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 272505b..9108fc7 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 373e116..0efac45 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 4a8de1d..def5eec 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 d1ff59d..46d2d47 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 9730adb..767c7eb 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 8992520..bce9924 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 ba6fd6b..0c3201d 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 9163ef2..5a4d47b 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 2574fce..7bc8c1c 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 7b4ab86..4f14b80 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 c20f226..5c75139 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 88c868c..faa8975 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 7e65d79..1780433 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 226d7e0..f7f0a8f 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);
commit a6050c32f30796743f9ab9b2a5c793ced9b8f747
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 26 22:24:36 2015 +0200
Clean up aEmpty
Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0fb82bf..2dc69d6 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -415,21 +415,20 @@ SbxBase* SbiFactory::Create( sal_uInt16 nSbxId,
sal_uInt32 nCreator )
{
if( nCreator == SBXCR_SBX )
{
- OUString aEmpty;
switch( nSbxId )
{
case SBXID_BASIC:
return new StarBASIC( NULL );
case SBXID_BASICMOD:
- return new SbModule( aEmpty );
+ return new SbModule( "" );
case SBXID_BASICPROP:
- return new SbProperty( aEmpty, SbxVARIANT, NULL );
+ return new SbProperty( "", SbxVARIANT, NULL );
case SBXID_BASICMETHOD:
- return new SbMethod( aEmpty, SbxVARIANT, NULL );
+ return new SbMethod( "", SbxVARIANT, NULL );
case SBXID_JSCRIPTMOD:
- return new SbJScriptModule( aEmpty );
+ return new SbJScriptModule( "" );
case SBXID_JSCRIPTMETH:
- return new SbJScriptMethod( aEmpty, SbxVARIANT, NULL );
+ return new SbJScriptMethod( "", SbxVARIANT, NULL );
}
}
return NULL;
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 1f4185d..9b7dd37 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -172,11 +172,10 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
nPos = nIdx == -1 ? 0 : nIdx + 1;
nPos1 = nPos; //save for later use in 2) below
const OUString aTmp( sal_Unicode( HYPH_POS_CHAR ) );
- const OUString aEmpty;
while (nPos != -1)
{
nPos++;
- aTxt = aTxt.replaceFirst( aTmp, aEmpty, &nPos);
+ aTxt = aTxt.replaceFirst( aTmp, "", &nPos);
}
// 2) remove all hyphenation positions from the start that are not
considered by the core
@@ -189,7 +188,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
while (nPos != -1)
{
nPos++;
- aLeft = aLeft.replaceFirst( aTmp, aEmpty, &nPos );
+ aLeft = aLeft.replaceFirst( aTmp, "", &nPos );
if (nPos != -1)
++m_nHyphenationPositionsOffset;
}
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 39a753e..d59c115 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -496,9 +496,8 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl,
Button*, void )
m_pPbChangeSource->Disable();
m_pPbBreakLink->Disable();
- OUString aEmpty;
- m_pFtFullSourceName->SetText( aEmpty );
- m_pFtFullTypeName->SetText( aEmpty );
+ m_pFtFullSourceName->SetText( "" );
+ m_pFtFullTypeName->SetText( "" );
}
if( pLinkMgr && pLinkMgr->GetPersist() )
pLinkMgr->GetPersist()->SetModified();
diff --git a/cui/source/dialogs/passwdomdlg.cxx
b/cui/source/dialogs/passwdomdlg.cxx
index ab2285d..bd1b07b 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -117,18 +117,17 @@ IMPL_LINK_NOARG_TYPED( PasswordToOpenModifyDialog_Impl,
OkBtnClickHdl, Button *,
Edit* pEdit = !bToOpenMatch ? m_pPasswdToOpenED :
m_pPasswdToModifyED;
Edit* pRepeatEdit = !bToOpenMatch? m_pReenterPasswdToOpenED :
m_pReenterPasswdToModifyED;
- OUString aEmpty;
if (nMismatch == 1)
{
- pEdit->SetText( aEmpty );
- pRepeatEdit->SetText( aEmpty );
+ pEdit->SetText( "" );
+ pRepeatEdit->SetText( "" );
}
else if (nMismatch == 2)
{
- m_pPasswdToOpenED->SetText( aEmpty );
- m_pReenterPasswdToOpenED->SetText( aEmpty );
- m_pPasswdToModifyED->SetText( aEmpty );
- m_pReenterPasswdToModifyED->SetText( aEmpty );
+ m_pPasswdToOpenED->SetText( "" );
+ m_pReenterPasswdToOpenED->SetText( "" );
+ m_pPasswdToModifyED->SetText( "" );
+ m_pReenterPasswdToModifyED->SetText( "" );
}
pEdit->GrabFocus();
}
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 71fcfc3..c406336 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1066,16 +1066,15 @@ bool OfficeIPCThread::ExecuteCmdLineRequests(
ProcessDocumentsRequest& aRequest
static DispatchWatcher::DispatchList aDispatchList;
- OUString aEmpty;
// Create dispatch list for dispatch watcher
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter,
DispatchWatcher::REQUEST_INFILTER, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList,
DispatchWatcher::REQUEST_OPEN, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aViewList,
DispatchWatcher::REQUEST_VIEW, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aStartList,
DispatchWatcher::REQUEST_START, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintList,
DispatchWatcher::REQUEST_PRINT, aEmpty, aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter,
DispatchWatcher::REQUEST_INFILTER, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList,
DispatchWatcher::REQUEST_OPEN, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aViewList,
DispatchWatcher::REQUEST_VIEW, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aStartList,
DispatchWatcher::REQUEST_START, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintList,
DispatchWatcher::REQUEST_PRINT, "", aRequest.aModule );
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintToList,
DispatchWatcher::REQUEST_PRINTTO, aRequest.aPrinterName, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl,
aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, aEmpty,
aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl,
aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, aEmpty,
aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl,
aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, "",
aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl,
aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, "", aRequest.aModule
);
AddConversionsToDispatchList( aDispatchList, aRequest.aCwdUrl,
aRequest.aConversionList, aRequest.aConversionParams, aRequest.aPrinterName,
aRequest.aModule, aRequest.aConversionOut, aRequest.bTextCat );
bool bShutdown( false );
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index dd6bf43..31a3287 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -453,7 +453,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const
throw()
OUString aContent;
OUString aFirstName;
OUString aLastName;
- OUString aEmpty;
// do we have CurrentPresentation given?
// mimic behaviour of writer, which means:
@@ -476,7 +475,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const
throw()
}
// #92009# pass fixed attribute to constructor
- pData = new SvxAuthorField( aFirstName, aLastName, aEmpty,
+ pData = new SvxAuthorField( aFirstName, aLastName, "",
mpImpl->mbBoolean1 ? SVXAUTHORTYPE_FIX :
SVXAUTHORTYPE_VAR );
if( !mpImpl->mbBoolean2 )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 7b35d6e..b008c43 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -377,8 +377,7 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString()
}
else
{
- const OUString aEmpty;
- return aEmpty;
+ return "";
}
}
@@ -1864,8 +1863,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter(
const uno::Reference< text
if( bAbsorb )
{
- const OUString aEmpty;
- pForwarder->QuickInsertText( aEmpty, aRange );
+ pForwarder->QuickInsertText( "", aRange );
aRange.nEndPos = aRange.nStartPos;
aRange.nEndPara = aRange.nStartPara;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 693e37f..c05c7ae 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -131,8 +131,7 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox* rURLBox,
const OUString& rURL )
else
{
rURLBox->SetBaseURL( sInstPath );
- OUString aEmpty;
- rURLBox->SetText( aEmpty );
+ rURLBox->SetText( "" );
}
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6b87579..156d103 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2268,7 +2268,6 @@ std::vector<OUString> SvtFileDialog::GetPathList() const
bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString&
rFilter )
{
- OUString aEmpty;
OUString aReversePath = comphelper::string::reverseString(rPath);
sal_Int32 nQuestionMarkPos = rPath.indexOf( '?' );
sal_Int32 nWildCardPos = rPath.indexOf( FILEDIALOG_DEF_WILDCARD );
@@ -2284,7 +2283,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString&
rPath, OUString& rFilt
nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos );
}
- rFilter = aEmpty;
+ rFilter.clear();
if ( nWildCardPos != -1 )
{
@@ -2331,7 +2330,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString&
rPath, OUString& rFilt
else
{
rFilter = rPath;
- rPath = aEmpty;
+ rPath.clear();
}
}
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 54f3069..08d947e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -348,11 +348,10 @@ void
VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
rRequest->getArgumentOrDefault(PROP_FILTER_GROUP, css::uno::Sequence<
css::beans::StringPair >());
// SYNCHRONIZED->
- OUString aEmpty;
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( m_lFilters.numFilter() > 0 && aFilterGroup.getLength() > 0 )
- m_lFilters.addFilter( STRING_SEPARATOR, aEmpty, sal_True );
+ m_lFilters.addFilter( STRING_SEPARATOR, "", sal_True );
::sal_Int32 c = aFilterGroup.getLength();
::sal_Int32 i = 0;
diff --git a/framework/source/uielement/fontmenucontroller.cxx
b/framework/source/uielement/fontmenucontroller.cxx
index 7117648..70229e9 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -156,7 +156,6 @@ void SAL_CALL FontMenuController::itemActivated( const
css::awt::MenuEvent& ) th
// find new font name and set check mark!
sal_uInt16 nChecked = 0;
sal_uInt16 nItemCount = m_xPopupMenu->getItemCount();
- OUString aEmpty;
for( sal_uInt16 i = 0; i < nItemCount; i++ )
{
sal_uInt16 nItemId = m_xPopupMenu->getItemId( i );
@@ -169,7 +168,7 @@ void SAL_CALL FontMenuController::itemActivated( const
css::awt::MenuEvent& ) th
// TODO: must be replaced by implementation of VCL, when available
sal_Int32 nIndex = aText.indexOf( (sal_Unicode)'~' );
if ( nIndex >= 0 )
- aText = aText.replaceAt( nIndex, 1, aEmpty );
+ aText = aText.replaceAt( nIndex, 1, "" );
// TODO: must be replaced by implementation of VCL, when available
if ( aText == m_aFontFamilyName )
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 946571e..421cb05 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1150,7 +1150,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
framework::AddonMenuManager::MergeAddonHelpMenu( rFrame,
static_cast<MenuBar *>(pMenu), m_xContext );
}
- OUString aEmpty;
bool bAccessibilityEnabled(
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
sal_uInt16 nItemCount = pMenu->GetItemCount();
OUString aItemCommand;
@@ -1190,7 +1189,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
if (!pMenu->GetHelpCommand(nItemId).isEmpty())
{
aModuleIdentifier = pMenu->GetHelpCommand( nItemId );
- pMenu->SetHelpCommand( nItemId, aEmpty );
+ pMenu->SetHelpCommand( nItemId, "" );
}
if ( m_xPopupMenuControllerFactory.is() &&
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index f1d5d7b..34c9312 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -110,7 +110,6 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
Reference< XSearchableDictionaryList > &rxDicList,
sal_Int16 nLanguage )
{
- static const OUString aEmpty;
bool bSthRemoved = false;
sal_Int32 nLen = rSeq.getLength();
OUString *pEntries = rSeq.getArray();
@@ -120,7 +119,7 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
pEntries[i], nLanguage, false, true ) );
if (xNegEntry.is())
{
- pEntries[i] = aEmpty;
+ pEntries[i].clear();
bSthRemoved = true;
}
}
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 2c7a86e..34f9c56 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -100,25 +100,23 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr()
OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara,
LwpBulletOverride* pBullOver,
LwpIndentOverride* pIndent)
{
- OUString aEmpty;
-
if(!pPara || !pIndent || !pBullOver)
{
- return aEmpty;
+ return "";
}
LwpSilverBullet* pSilverBullet = pPara->GetSilverBullet();
if (!pSilverBullet)
{
assert(false);
- return aEmpty;
+ return "";
}
LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
if (!pBulletPara)
{
assert(false);
- return aEmpty;
+ return "";
}
LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx
b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 3ae7567..a695c90 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -189,12 +189,10 @@ void LwpSilverBullet::RegisterStyle()
*/
OUString LwpSilverBullet::GetBulletFontName()
{
- OUString aEmpty;
-
//foundry has been set?
if (!m_pFoundry)
{
- return aEmpty;
+ return "";
}
LwpFontManager& rFontMgr = m_pFoundry->GetFontManger();
@@ -205,7 +203,7 @@ OUString LwpSilverBullet::GetBulletFontName()
//final fontid is valid?
if (nFinalFont > 255 || nFinalFont == 0)
{
- return aEmpty;
+ return "";
}
//get font name from font manager.
@@ -251,12 +249,10 @@ LwpPara* LwpSilverBullet::GetBulletPara()
*/
OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
{
- OUString aEmpty;
-
if (!pParaNumber)
{
assert(false);
- return aEmpty;
+ return "";
}
OUString strNumChar("1");
@@ -303,7 +299,7 @@ OUString
LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
}
break;
case NUMCHAR_none:
- strNumChar = aEmpty;
+ strNumChar.clear();
break;
default:
break;
@@ -359,7 +355,7 @@ sal_uInt16 LwpSilverBullet::GetDisplayLevel(sal_uInt8 nPos)
*/
OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
{
- OUString aRet, aEmpty;
+ OUString aRet;
sal_uInt16 nHideBit = (1 << nPos);
bool bDivisionName = false;
bool bSectionName = false;
@@ -367,7 +363,7 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
LwpFrib* pParaFrib = m_pBulletPara->GetFribs().GetFribs();
if (!pParaFrib)
{
- return aEmpty;
+ return "";
}
while (pParaFrib)
@@ -377,7 +373,7 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
ModifierInfo* pMoInfo = pParaFrib->GetModifiers();
if (!pMoInfo)
{
- return aEmpty;
+ return "";
}
sal_uInt16 nHideLevels = pMoInfo->aTxtAttrOverride.GetHideLevels();
sal_uInt16 nType =
static_cast<LwpFribDocVar*>(pParaFrib)->GetType();
@@ -435,11 +431,10 @@ OUString LwpSilverBullet::GetDivisionName()
OUString LwpSilverBullet::GetSectionName()
{
- OUString aEmpty;
LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY).get());
if (!pStory)
{
- return aEmpty;
+ return "";
}
return pStory->GetSectionName();
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 5618be8..ef8b389 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -500,15 +500,13 @@ void loadDiagram( const ShapePtr& pShape,
DiagramLayoutPtr pLayout( new DiagramLayout() );
pDiagram->setLayout( pLayout );
- OUString aEmpty;
-
// data
if( rXDataModelDom.is() )
importFragment(rFilter,
rXDataModelDom,
"OOXData",
pDiagram,
- new DiagramDataFragmentHandler( rFilter, aEmpty, pData
));
+ new DiagramDataFragmentHandler( rFilter, "", pData ));
// layout
if( rXLayoutDom.is() )
@@ -516,7 +514,7 @@ void loadDiagram( const ShapePtr& pShape,
rXLayoutDom,
"OOXLayout",
pDiagram,
- new DiagramLayoutFragmentHandler( rFilter, aEmpty,
pLayout ));
+ new DiagramLayoutFragmentHandler( rFilter, "", pLayout
));
// style
if( rXQStyleDom.is() )
@@ -524,7 +522,7 @@ void loadDiagram( const ShapePtr& pShape,
rXQStyleDom,
"OOXStyle",
pDiagram,
- new DiagramQStylesFragmentHandler( rFilter, aEmpty,
pDiagram->getStyles() ));
+ new DiagramQStylesFragmentHandler( rFilter, "",
pDiagram->getStyles() ));
// colors
if( rXColorStyleDom.is() )
@@ -532,7 +530,7 @@ void loadDiagram( const ShapePtr& pShape,
rXColorStyleDom,
"OOXColor",
pDiagram,
- new ColorFragmentHandler( rFilter, aEmpty,
pDiagram->getColors() ));
+ new ColorFragmentHandler( rFilter, "",
pDiagram->getColors() ));
// diagram loaded. now lump together & attach to shape
pDiagram->addTo(pShape);
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f4e2e41..ec57a0c 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -581,8 +581,7 @@ Reference< XShape > Shape::createAndInsert(
uno::Reference< text::XText > xText( mxShape, uno::UNO_QUERY );
if ( xText.is() )
{
- OUString aEmpty;
- xText->setString( aEmpty );
+ xText->setString( "" );
}
}
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 4cf8b2b..1e70c42 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -62,7 +62,6 @@ bool QuickDiagrammingImport::importDocument() throw
(css::uno::RuntimeException,
file:///<path-to-oox-module>/source/dump/pptxdumper.ini. */
OOX_DUMP_FILE( ::oox::dump::pptx::Dumper );
- OUString aEmpty;
OUString aFragmentPath = getFragmentPathFromFirstTypeFromOfficeDoc(
"diagramLayout" );
Reference<drawing::XShapes> xParentShape(getParentShape(),
@@ -71,10 +70,10 @@ bool QuickDiagrammingImport::importDocument() throw
(css::uno::RuntimeException,
new oox::drawingml::Shape( "com.sun.star.drawing.DiagramShape" ) );
drawingml::loadDiagram(pShape,
*this,
- aEmpty,
+ "",
aFragmentPath,
- aEmpty,
- aEmpty);
+ "",
+ "");
oox::drawingml::ThemePtr pTheme(
new oox::drawingml::Theme());
basegfx::B2DHomMatrix aMatrix;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 2353e91..2b8dc9a 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1947,7 +1947,6 @@ void ScDocument::SetExtDocOptions( ScExtDocOptions*
pNewOptions )
void ScDocument::DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow )
{
- OUString aEmpty;
OUStringBuffer aTotal;
OUString aCellStr;
SCCOL nCol;
@@ -1963,7 +1962,7 @@ void ScDocument::DoMergeContents( SCTAB nTab, SCCOL
nStartCol, SCROW nStartRow,
aTotal.append(aCellStr);
}
if (nCol != nStartCol || nRow != nStartRow)
- SetString(nCol,nRow,nTab,aEmpty);
+ SetString(nCol,nRow,nTab,"");
}
SetString(nStartCol,nStartRow,nTab,aTotal.makeStringAndClear());
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index bb19d02..42d06a6 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -125,8 +125,7 @@ ScValidationData::~ScValidationData()
bool ScValidationData::IsEmpty() const
{
- OUString aEmpty;
- ScValidationData aDefault( SC_VALID_ANY, SC_COND_EQUAL, aEmpty, aEmpty,
GetDocument(), ScAddress() );
+ ScValidationData aDefault( SC_VALID_ANY, SC_COND_EQUAL, "", "",
GetDocument(), ScAddress() );
return EqualEntries( aDefault );
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f1b1837..777c8b8 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2991,15 +2991,14 @@ void ScInputHandler::ClearText()
DataChanging(); // Cannot be new
- OUString aEmpty;
if (pTableView)
{
- pTableView->GetEditEngine()->SetText( aEmpty );
+ pTableView->GetEditEngine()->SetText( "" );
pTableView->SetSelection( ESelection(0,0, 0,0) );
}
if (pTopView)
{
- pTopView->GetEditEngine()->SetText( aEmpty );
+ pTopView->GetEditEngine()->SetText( "" );
pTopView->SetSelection( ESelection(0,0, 0,0) );
}
diff --git a/sc/source/ui/docshell/tablink.cxx
b/sc/source/ui/docshell/tablink.cxx
index 742b79a..3239b5a 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -97,12 +97,11 @@ ScTableLink::~ScTableLink()
// Verbindung aufheben
StopRefreshTimer();
- OUString aEmpty;
ScDocument& rDoc = pImpl->m_pDocSh->GetDocument();
SCTAB nCount = rDoc.GetTableCount();
for (SCTAB nTab=0; nTab<nCount; nTab++)
if (rDoc.IsLinked(nTab) && aFileName.equals(rDoc.GetLinkDoc(nTab)))
- rDoc.SetLink( nTab, SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty,
0 );
+ rDoc.SetLink( nTab, SC_LINK_NONE, "", "", "", "", 0 );
delete pImpl;
}
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 0c94d8b..7670949f 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -106,14 +106,13 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
//sal_Int8 nAction(DND_ACTION_MOVE);
//Point aPos;
const OUString
aBeginUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
- const OUString aEmpty;
SdrObject* pResult = pDrawView->ApplyGraphicToObject(
*pPickObj,
rGraphic,
aBeginUndo,
- bAsLink ? rFileName : aEmpty,
- bAsLink ? rFilterName : aEmpty);
+ bAsLink ? rFileName : OUString(),
+ bAsLink ? rFilterName : OUString());
if(pResult)
{
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index e6acdbd..f18acd2 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1086,12 +1086,11 @@ OUString ScUndoRemoveLink::GetComment() const
void ScUndoRemoveLink::DoChange( bool bLink ) const
{
ScDocument& rDoc = pDocShell->GetDocument();
- OUString aEmpty;
for (sal_uInt16 i=0; i<nCount; i++)
if (bLink) // establish link
rDoc.SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions,
pTabNames[i], nRefreshDelay );
else // remove link
- rDoc.SetLink( pTabs[i], SC_LINK_NONE, aEmpty, aEmpty, aEmpty,
aEmpty, 0 );
+ rDoc.SetLink( pTabs[i], SC_LINK_NONE, "", "", "", "", 0 );
pDocShell->UpdateLinks();
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 7895ef9..a2c83b4 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7588,8 +7588,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode(
sheet::SheetLinkMode nLinkMode )
OUString aUrl(getLinkUrl());
OUString aSheet(getLinkSheetName());
- OUString aEmpty;
- link( aUrl, aSheet, aEmpty, aEmpty, nLinkMode );
+ link( aUrl, aSheet, "", "", nLinkMode );
}
OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException,
std::exception)
@@ -7612,8 +7611,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const
OUString& aLinkUrl )
sheet::SheetLinkMode eMode = getLinkMode();
OUString aSheet(getLinkSheetName());
- OUString aEmpty;
- link( aLinkUrl, aSheet, aEmpty, aEmpty, eMode );
+ link( aLinkUrl, aSheet, "", "", eMode );
}
OUString SAL_CALL ScTableSheetObj::getLinkSheetName()
throw(uno::RuntimeException, std::exception)
@@ -7636,8 +7634,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const
OUString& aLinkSheetName
sheet::SheetLinkMode eMode = getLinkMode();
OUString aUrl(getLinkUrl());
- OUString aEmpty;
- link( aUrl, aLinkSheetName, aEmpty, aEmpty, eMode );
+ link( aUrl, aLinkSheetName, "", "", eMode );
}
void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString&
aSheetName,
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 5373bf8..f99622c 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1999,7 +1999,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
OUString aNewLabel;
OUString aOldValues;
OUString aNewValues;
- OUString aEmpty;
for( sal_Int32 nNewIndex = 0; nNewIndex <
aNewSequences.getLength(); nNewIndex++ )
{
@@ -2010,7 +2009,10 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
if( xOld.is() && xNew.is() )
{
- aOldLabel = aNewLabel = aOldValues = aNewValues =
aEmpty;
+ aOldLabel.clear();
+ aNewLabel.clear();
+ aOldValues.clear();
+ aNewValues.clear();
if( xOld.is() && xOld->getLabel().is() )
aOldLabel =
xOld->getLabel()->getSourceRangeRepresentation();
if( xNew.is() && xNew->getLabel().is() )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 715cec1..fa9d99d 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
