[Libreoffice-commits] core.git: basctl/source basic/source cui/source filter/source fpicker/test i18npool/source oox/source sd/source sfx2/source starmath/source svtools/source svx/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Wed Aug 26 12:24:52 PDT 2015
basctl/source/basicide/macrodlg.cxx | 3 -
basic/source/runtime/methods.cxx | 3 -
basic/source/sbx/sbxbase.cxx | 11 +--
cui/source/dialogs/hldocntp.cxx | 4 -
cui/source/dialogs/hldoctp.cxx | 10 +--
cui/source/dialogs/hlinettp.cxx | 10 +--
cui/source/dialogs/hlmailtp.cxx | 8 +-
cui/source/dialogs/hltpbase.cxx | 65 +++++++++++-----------
cui/source/inc/hltpbase.hxx | 3 -
cui/source/tabpages/numpages.cxx | 60 ++++++++------------
cui/source/tabpages/tpline.cxx | 8 +-
filter/source/msfilter/msdffimp.cxx | 3 -
fpicker/test/svdem.cxx | 4 -
i18npool/source/localedata/localedata.cxx | 10 +--
oox/source/drawingml/diagram/datamodelcontext.cxx | 22 +++----
sd/source/ui/func/fubullet.cxx | 8 +-
sd/source/ui/func/fuinsert.cxx | 6 +-
sd/source/ui/func/fumorph.cxx | 4 -
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/view/drviews4.cxx | 4 -
sd/source/ui/view/drviewse.cxx | 4 -
sd/source/ui/view/sdview2.cxx | 4 -
sd/source/ui/view/viewshe2.cxx | 2
sfx2/source/appl/impldde.cxx | 3 -
sfx2/source/control/thumbnailviewacc.cxx | 6 --
starmath/source/parse.cxx | 14 ++--
svtools/source/control/toolbarmenuacc.cxx | 6 --
svtools/source/control/valueacc.cxx | 6 --
svx/source/sidebar/nbdtmg.cxx | 25 +++-----
xmloff/source/draw/animexp.cxx | 8 +-
30 files changed, 142 insertions(+), 184 deletions(-)
New commits:
commit 43c00bc48978a2c148d6f0622f40d3b40a93eb6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 26 21:24:07 2015 +0200
Clean up aEmptyStr
Change-Id: I5befe9deac917a28e80ed193b67ff29b5ba35149
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 6d83133..d085c02 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -799,9 +799,8 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
void MacroChooser::UpdateFields()
{
SvTreeListEntry* pMacroEntry = m_pMacroBox->GetCurEntry();
- OUString aEmptyStr;
- m_pMacroNameEdit->SetText( aEmptyStr );
+ m_pMacroNameEdit->SetText( "" );
if ( pMacroEntry )
m_pMacroNameEdit->SetText( m_pMacroBox->GetEntryText( pMacroEntry ) );
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b7dcc98..09dddbb 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2869,8 +2869,7 @@ RTLFUNC(Dir)
}
else
{
- OUString aEmptyStr;
- rPar.Get(0)->PutString( aEmptyStr );
+ rPar.Get(0)->PutString( "" );
}
sal_uInt16 nFlags = 0;
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 8924c3f..086d399 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -156,7 +156,6 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
if( nSbxId == 0x65 ) // Dialog Id
return new SbxVariable;
- OUString aEmptyStr;
if( nCreator == SBXCR_SBX )
switch( nSbxId )
{
@@ -164,12 +163,12 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
case SBXID_VARIABLE: return new SbxVariable;
case SBXID_ARRAY: return new SbxArray;
case SBXID_DIMARRAY: return new SbxDimArray;
- case SBXID_OBJECT: return new SbxObject( aEmptyStr );
- case SBXID_COLLECTION: return new SbxCollection( aEmptyStr );
+ case SBXID_OBJECT: return new SbxObject( "" );
+ case SBXID_COLLECTION: return new SbxCollection( "" );
case SBXID_FIXCOLLECTION:
- return new SbxStdCollection( aEmptyStr, aEmptyStr );
- case SBXID_METHOD: return new SbxMethod( aEmptyStr, SbxEMPTY );
- case SBXID_PROPERTY: return new SbxProperty( aEmptyStr, SbxEMPTY );
+ return new SbxStdCollection( "", "" );
+ case SBXID_METHOD: return new SbxMethod( "", SbxEMPTY );
+ case SBXID_PROPERTY: return new SbxProperty( "", SbxEMPTY );
}
// Unknown type: go over the factories!
SbxAppData& r = GetSbxData_Impl();
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 55ff366..3acb9fe 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -290,7 +290,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
// get data from dialog-controls
OUString aStrNewName = m_pCbbPath->GetText();
- if ( aStrNewName == aEmptyStr )
+ if ( aStrNewName.isEmpty() )
aStrNewName = maStrInitURL;
@@ -330,7 +330,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
// current document
SfxViewFrame* pCurrentDocFrame = SfxViewFrame::Current();
- if ( aStrNewName != aEmptyStr )
+ if ( !aStrNewName.isEmpty() )
{
// get private-url
sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 5eb75ed..92c15d7 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -120,7 +120,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
OUString aStrPath ( m_pCbbPath->GetText() );
OUString aStrMark( m_pEdTarget->GetText() );
- if ( aStrPath != aEmptyStr )
+ if ( !aStrPath.isEmpty() )
{
INetURLObject aURL( aStrPath );
if ( aURL.GetProtocol() != INetProtocol::NotValid ) // maybe the path is already a valid
@@ -129,11 +129,11 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
osl::FileBase::getFileURLFromSystemPath( aStrPath, aStrURL );
//#105788# always create a URL even if it is not valid
- if( aStrURL == aEmptyStr )
+ if( aStrURL.isEmpty() )
aStrURL = aStrPath;
}
- if( aStrMark != aEmptyStr )
+ if( !aStrMark.isEmpty() )
{
aStrURL += OUString( sHash );
aStrURL += aStrMark;
@@ -238,7 +238,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void)
EnterWait();
if ( maStrURL.equalsIgnoreAsciiCase( sFileScheme ) )
- mpMarkWnd->RefreshTree ( aEmptyStr );
+ mpMarkWnd->RefreshTree ( "" );
else
mpMarkWnd->RefreshTree ( maStrURL );
@@ -283,7 +283,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void)
EnterWait();
if ( maStrURL.equalsIgnoreAsciiCase( sFileScheme ) )
- mpMarkWnd->RefreshTree ( aEmptyStr );
+ mpMarkWnd->RefreshTree ( "" );
else
mpMarkWnd->RefreshTree ( maStrURL );
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index a967710..c58df74 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -121,7 +121,7 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& rStrURL)
//do not show password and user in url
if(!aURL.GetUser().isEmpty() || !aURL.GetPass().isEmpty() )
- aURL.SetUserAndPass(aEmptyStr,aEmptyStr);
+ aURL.SetUserAndPass("", "");
}
// set URL-field
@@ -310,7 +310,7 @@ void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme)
void SvxHyperlinkInternetTp::RemoveImproperProtocol(const OUString& aProperScheme)
{
OUString aStrURL ( m_pCbbTarget->GetText() );
- if ( aStrURL != aEmptyStr )
+ if ( !aStrURL.isEmpty() )
{
OUString aStrScheme(GetSchemeFromURL(aStrURL));
if ( !aStrScheme.isEmpty() && aStrScheme != aProperScheme )
@@ -362,8 +362,8 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, v
{
if ( m_pEdLogin->GetText().toAsciiLowerCase().startsWith( sAnonymous ) )
{
- maStrOldUser = aEmptyStr;
- maStrOldPassword = aEmptyStr;
+ maStrOldUser.clear();
+ maStrOldPassword.clear();
}
else
{
@@ -418,7 +418,7 @@ void SvxHyperlinkInternetTp::RefreshMarkWindow()
{
EnterWait();
OUString aStrURL( CreateAbsoluteURL() );
- if ( aStrURL != aEmptyStr )
+ if ( !aStrURL.isEmpty() )
mpMarkWnd->RefreshTree ( aStrURL );
else
mpMarkWnd->SetError( LERR_DOCNOTOPEN );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 7b20fed..26febba 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -115,7 +115,7 @@ void SvxHyperlinkMailTp::FillDlgFields(const OUString& rStrURL)
}
else
{
- m_pEdSubject->SetText (aEmptyStr);
+ m_pEdSubject->SetText ("");
}
m_pCbbReceiver->SetText ( aStrURLc );
@@ -151,7 +151,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
// subject for EMail-url
if( aURL.GetProtocol() == INetProtocol::Mailto )
{
- if ( m_pEdSubject->GetText() != OUString(aEmptyStr) )
+ if ( !m_pEdSubject->GetText().isEmpty() )
{
OUString aQuery("subject=");
aQuery += m_pEdSubject->GetText();
@@ -212,10 +212,10 @@ void SvxHyperlinkMailTp::SetScheme(const OUString& rScheme)
void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme)
{
OUString aStrURL ( m_pCbbReceiver->GetText() );
- if ( aStrURL != aEmptyStr )
+ if ( !aStrURL.isEmpty() )
{
OUString aStrScheme = GetSchemeFromURL( aStrURL );
- if ( aStrScheme != aEmptyStr && aStrScheme != aProperScheme )
+ if ( !aStrScheme.isEmpty() && aStrScheme != aProperScheme )
{
aStrURL = aStrURL.copy( aStrScheme.getLength() );
m_pCbbReceiver->SetText ( aStrURL );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 8a51a43..bf221cd 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -36,6 +36,38 @@
using namespace ::ucbhelper;
+namespace {
+
+OUString CreateUiNameFromURL( const OUString& aStrURL )
+{
+ OUString aStrUiURL;
+ INetURLObject aURLObj( aStrURL );
+
+ switch(aURLObj.GetProtocol())
+ {
+ case INetProtocol::File:
+ osl::FileBase::getSystemPathFromFileURL(aURLObj.GetMainURL(INetURLObject::NO_DECODE), aStrUiURL);
+ break;
+ case INetProtocol::Ftp :
+ {
+ //remove password from name
+ INetURLObject aTmpURL(aURLObj);
+ aTmpURL.SetPass("");
+ aStrUiURL = aTmpURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ }
+ break;
+ default :
+ {
+ aStrUiURL = aURLObj.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS);
+ }
+ }
+ if(aStrUiURL.isEmpty())
+ return aStrURL;
+ return aStrUiURL;
+}
+
+}
+
//# ComboBox-Control for URL's with History and Autocompletion #
SvxHyperURLBox::SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart )
@@ -98,8 +130,7 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent,
mpBtScript ( NULL ),
mbIsCloseDisabled ( false ),
mpDialog ( pDlg ),
- mbStdControlsInit ( false ),
- aEmptyStr()
+ mbStdControlsInit ( false )
{
// create bookmark-window
mpMarkWnd = VclPtr<SvxHlinkDlgMarkWnd>::Create( this );
@@ -437,7 +468,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet)
{
// Set dialog-fields from create-itemset
- maStrInitURL = aEmptyStr;
+ maStrInitURL.clear();
const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
rItemSet.GetItem (SID_HYPERLINK_GETLINK));
@@ -475,34 +506,6 @@ bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet* rOut)
return true;
}
-OUString SvxHyperlinkTabPageBase::CreateUiNameFromURL( const OUString& aStrURL )
-{
- OUString aStrUiURL;
- INetURLObject aURLObj( aStrURL );
-
- switch(aURLObj.GetProtocol())
- {
- case INetProtocol::File:
- osl::FileBase::getSystemPathFromFileURL(aURLObj.GetMainURL(INetURLObject::NO_DECODE), aStrUiURL);
- break;
- case INetProtocol::Ftp :
- {
- //remove password from name
- INetURLObject aTmpURL(aURLObj);
- aTmpURL.SetPass(aEmptyStr);
- aStrUiURL = aTmpURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
- }
- break;
- default :
- {
- aStrUiURL = aURLObj.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS);
- }
- }
- if(aStrUiURL.isEmpty())
- return aStrURL;
- return aStrUiURL;
-}
-
// Activate / Deactivate Tabpage
void SvxHyperlinkTabPageBase::ActivatePage( const SfxItemSet& rItemSet )
{
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 8683ccb..15e8400 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -95,7 +95,6 @@ protected:
virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,
SvxLinkInsertMode& eMode ) = 0;
- OUString CreateUiNameFromURL( const OUString& aStrURL );
void GetDataFromCommonFields( OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,
@@ -103,8 +102,6 @@ protected:
DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script
- OUString aEmptyStr;
-
static OUString GetSchemeFromURL( const OUString& rStrURL );
inline void DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ad06c74..f1f5257 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -349,13 +349,12 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
{
SvxNumberFormat aFmt(pActNum->GetLevel(i));
aFmt.SetNumberingType(eNewType);
- OUString aEmptyStr;
if(cLocalPrefix == ' ')
- aFmt.SetPrefix( aEmptyStr );
+ aFmt.SetPrefix( "" );
else
aFmt.SetPrefix(_pSet->sPrefix);
if(cLocalSuffix == ' ')
- aFmt.SetSuffix( aEmptyStr );
+ aFmt.SetSuffix( "" );
else
aFmt.SetSuffix(_pSet->sSuffix);
aFmt.SetCharFormatName(sNumCharFmtName);
@@ -972,7 +971,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1;
sal_uInt16 nMask = 1;
- OUString aEmptyStr;
sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
@@ -980,8 +978,8 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
{
SvxNumberFormat aFmt(pActNum->GetLevel(i));
aFmt.SetNumberingType(nSetNumberingType);
- aFmt.SetPrefix( aEmptyStr );
- aFmt.SetSuffix( aEmptyStr );
+ aFmt.SetPrefix( "" );
+ aFmt.SetSuffix( "" );
aFmt.SetCharFormatName( sNumCharFmtName );
Graphic aGraphic;
@@ -1592,7 +1590,6 @@ void SvxNumOptionsTabPage::InitControls()
sal_uInt16 nMask = 1;
sal_uInt16 nLvl = SAL_MAX_UINT16;
sal_uInt16 nHighestLevel = 0;
- OUString aEmptyStr;
bool bBullColor = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_COLOR);
bool bBullRelSize = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_REL_SIZE);
@@ -1669,8 +1666,8 @@ void SvxNumOptionsTabPage::InitControls()
}
else
{
- m_pHeightMF->SetText(aEmptyStr);
- m_pWidthMF->SetText(aEmptyStr);
+ m_pHeightMF->SetText("");
+ m_pWidthMF->SetText("");
}
}
@@ -1690,7 +1687,7 @@ void SvxNumOptionsTabPage::InitControls()
}
else
{
- m_pAllLevelNF->SetText(aEmptyStr);
+ m_pAllLevelNF->SetText("");
}
if(bSameAdjust)
{
@@ -1711,7 +1708,7 @@ void SvxNumOptionsTabPage::InitControls()
if(bSameBulRelSize)
m_pBulRelSizeMF->SetValue(aNumFmtArr[nLvl]->GetBulletRelSize());
else
- m_pBulRelSizeMF->SetText(aEmptyStr);
+ m_pBulRelSizeMF->SetText("");
}
if(bBullColor)
{
@@ -1728,7 +1725,7 @@ void SvxNumOptionsTabPage::InitControls()
m_pStartED->SetValue(aNumFmtArr[nLvl]->GetStart());
}
else
- m_pStartED->SetText(aEmptyStr);
+ m_pStartED->SetText("");
break;
case SHOW_BULLET:
break;
@@ -1739,11 +1736,11 @@ void SvxNumOptionsTabPage::InitControls()
if(bSamePrefix)
m_pPrefixED->SetText(aNumFmtArr[nLvl]->GetPrefix());
else
- m_pPrefixED->SetText(aEmptyStr);
+ m_pPrefixED->SetText("");
if(bSameSuffix)
m_pSuffixED->SetText(aNumFmtArr[nLvl]->GetSuffix());
else
- m_pSuffixED->SetText(aEmptyStr);
+ m_pSuffixED->SetText("");
if(bSameCharFmt)
{
@@ -1891,7 +1888,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
OUString sSelectStyle;
bool bShowOrient = false;
bool bBmp = false;
- OUString aEmptyStr;
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
@@ -1906,10 +1902,10 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
{
bBmp |= 0 != aNumFmt.GetBrush();
aNumFmt.SetIncludeUpperLevels( sal_False );
- aNumFmt.SetSuffix( aEmptyStr );
- aNumFmt.SetPrefix( aEmptyStr );
+ aNumFmt.SetSuffix( "" );
+ aNumFmt.SetPrefix( "" );
if(!bBmp)
- aNumFmt.SetGraphic(aEmptyStr);
+ aNumFmt.SetGraphic("");
pActNum->SetLevel(i, aNumFmt);
SwitchNumberType(SHOW_BITMAP, bBmp );
bShowOrient = true;
@@ -1917,8 +1913,8 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
else if( SVX_NUM_CHAR_SPECIAL == nNumberingType )
{
aNumFmt.SetIncludeUpperLevels( sal_False );
- aNumFmt.SetSuffix( aEmptyStr );
- aNumFmt.SetPrefix( aEmptyStr );
+ aNumFmt.SetSuffix( "" );
+ aNumFmt.SetPrefix( "" );
if( !aNumFmt.GetBulletFont() )
aNumFmt.SetBulletFont(&aActBulletFont);
if( !aNumFmt.GetBulletChar() )
@@ -2340,14 +2336,13 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos();
OUString sEntry = m_pCharFmtLB->GetSelectEntry();
sal_uInt16 nMask = 1;
- OUString aEmptyStr;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
if( 0 == nEntryPos )
- aNumFmt.SetCharFormatName(aEmptyStr);
+ aNumFmt.SetCharFormatName("");
else
{
if(SVX_NUM_BITMAP != (aNumFmt.GetNumberingType()&(~LINK_TOKEN)))
@@ -3015,15 +3010,14 @@ void SvxNumPositionTabPage::InitControls()
else
bSetDistEmpty = true;
- const OUString aEmptyStr;
if(bSameDist)
SetMetricValue(*m_pDistNumMF, aNumFmtArr[nLvl]->GetCharTextDistance(), eCoreUnit);
else
- m_pDistNumMF->SetText(aEmptyStr);
+ m_pDistNumMF->SetText("");
if(bSameIndent)
SetMetricValue(*m_pIndentMF, - aNumFmtArr[nLvl]->GetFirstLineOffset(), eCoreUnit);
else
- m_pIndentMF->SetText(aEmptyStr);
+ m_pIndentMF->SetText("");
if(bSameAdjust)
{
@@ -3069,14 +3063,14 @@ void SvxNumPositionTabPage::InitControls()
}
else
{
- m_pListtabMF->SetText(aEmptyStr);
+ m_pListtabMF->SetText("");
}
}
else
{
m_pListtabFT->Enable( false );
m_pListtabMF->Enable( false );
- m_pListtabMF->SetText(aEmptyStr);
+ m_pListtabMF->SetText("");
}
if ( bSameAlignAt )
@@ -3087,7 +3081,7 @@ void SvxNumPositionTabPage::InitControls()
}
else
{
- m_pAlignedAtMF->SetText(aEmptyStr);
+ m_pAlignedAtMF->SetText("");
}
if ( bSameIndentAt )
@@ -3096,11 +3090,11 @@ void SvxNumPositionTabPage::InitControls()
}
else
{
- m_pIndentAtMF->SetText(aEmptyStr);
+ m_pIndentAtMF->SetText("");
}
if ( bSetDistEmpty )
- m_pDistBorderMF->SetText(aEmptyStr);
+ m_pDistBorderMF->SetText("");
bInInintControl = false;
}
@@ -3461,8 +3455,7 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
SetModified();
if(!m_pDistBorderMF->IsEnabled())
{
- OUString aEmptyStr;
- m_pDistBorderMF->SetText(aEmptyStr);
+ m_pDistBorderMF->SetText("");
}
return 0;
@@ -3500,11 +3493,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void )
}
}
- OUString aEmptyStr;
if(bSetValue)
SetMetricValue(*m_pDistBorderMF, nValue, eCoreUnit);
else
- m_pDistBorderMF->SetText(aEmptyStr);
+ m_pDistBorderMF->SetText("");
m_pDistBorderMF->Enable(bOn || bSingleSelection);
m_pDistBorderFT->Enable(bOn || bSingleSelection);
bLastRelative = bOn;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index ce672bf..1dc40a9 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -300,7 +300,6 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
PopupMenu* pPopup = new PopupMenu;
- OUString aEmptyStr;
sal_uInt32 i = 0;
nNumMenuGalleryItems = aGrfNames.size();
for(std::vector<OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i)
@@ -315,7 +314,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
pUIName = &aPhysicalName;
}
- SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH);
+ SvxBrushItem* pBrushItem = new SvxBrushItem(*it, "", GPOS_AREA, SID_ATTR_BRUSH);
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
@@ -374,7 +373,6 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
pView->ShowSdrPage(pPage);
PopupMenu* pPopup = new PopupMenu;
- OUString aEmptyStr;
// Generate invisible square to give all symbols a
// bitmap size, which is independent from specific glyph
@@ -390,7 +388,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
if(pObj==NULL)
break;
pObj=pObj->Clone();
- aGrfNames.push_back(aEmptyStr);
+ aGrfNames.push_back("");
pPage->NbcInsertObject(pObj);
if(pSymbolAttr)
{
@@ -428,7 +426,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
aBitmapEx.Scale(nScale, nScale);
}
Image aImage(aBitmapEx);
- pPopup->InsertItem(pInfo->nItemId,aEmptyStr,aImage);
+ pPopup->InsertItem(pInfo->nItemId,"",aImage);
}
pInvisibleSquare=pPage->RemoveObject(0);
SdrObject::Free(pInvisibleSquare);
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 97aeca8..f61869e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6423,8 +6423,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
else
{ // and unleash our filter
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
- OUString aEmptyStr;
- nRes = rGF.ImportGraphic( rData, aEmptyStr, *pGrStream, GRFILTER_FORMAT_DONTKNOW );
+ nRes = rGF.ImportGraphic( rData, "", *pGrStream, GRFILTER_FORMAT_DONTKNOW );
// SJ: I40472, sometimes the aspect ratio (aMtfSize100) does not match and we get scaling problems,
// then it is better to use the prefsize that is stored within the metafile. Bug #72846# for what the
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 929eee6..4a88b27 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -60,10 +60,6 @@ using namespace ::com::sun::star::lang;
// Forward declaration
void Main();
-String aEmptyStr;
-
-
-
SAL_IMPLEMENT_MAIN()
{
Reference< XMultiServiceFactory > xMS;
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 453df39..6a6eafd 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1385,8 +1385,6 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(R
Sequence< Reference<container::XIndexAccess> > aRet( nStyles );
- OUString aEmptyStr;
-
sal_Unicode const **** pStyle = p0;
for( i=0; i<nStyles; i++ )
{
@@ -1419,16 +1417,16 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(R
}
}
}
- level[j].sPrefix = aEmptyStr;
+ level[j].sPrefix.clear();
level[j].nNumType = 0;
- level[j].sSuffix = aEmptyStr;
+ level[j].sSuffix.clear();
level[j].cBulletChar = 0;
- level[j].sBulletFontName = aEmptyStr;
+ level[j].sBulletFontName.clear();
level[j].nParentNumbering = 0;
level[j].nLeftMargin = 0;
level[j].nSymbolTextDistance = 0;
level[j].nFirstLineOffset = 0;
- level[j].sTransliteration = aEmptyStr;
+ level[j].sTransliteration.clear();
level[j].nNatNum = 0;
aRet[i] = new OutlineNumbering( level, nLevels );
}
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index 209e718..6337ce8 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -141,18 +141,16 @@ public:
ContextHandler2( rParent ),
mrPoint( rPoint )
{
- OUString aEmptyStr;
-
- mrPoint.msColorTransformCategoryId = rAttribs.getString( XML_csCatId, aEmptyStr );
- mrPoint.msColorTransformTypeId = rAttribs.getString( XML_csTypeId, aEmptyStr );
- mrPoint.msLayoutCategoryId = rAttribs.getString( XML_loCatId, aEmptyStr );
- mrPoint.msLayoutTypeId = rAttribs.getString( XML_loTypeId, aEmptyStr );
- mrPoint.msPlaceholderText = rAttribs.getString( XML_phldrT, aEmptyStr );
- mrPoint.msPresentationAssociationId = rAttribs.getString( XML_presAssocID, aEmptyStr );
- mrPoint.msPresentationLayoutName = rAttribs.getString( XML_presName, aEmptyStr );
- mrPoint.msPresentationLayoutStyleLabel = rAttribs.getString( XML_presStyleLbl, aEmptyStr );
- mrPoint.msQuickStyleCategoryId = rAttribs.getString( XML_qsCatId, aEmptyStr );
- mrPoint.msQuickStyleTypeId = rAttribs.getString( XML_qsTypeId, aEmptyStr );
+ mrPoint.msColorTransformCategoryId = rAttribs.getString( XML_csCatId, "" );
+ mrPoint.msColorTransformTypeId = rAttribs.getString( XML_csTypeId, "" );
+ mrPoint.msLayoutCategoryId = rAttribs.getString( XML_loCatId, "" );
+ mrPoint.msLayoutTypeId = rAttribs.getString( XML_loTypeId, "" );
+ mrPoint.msPlaceholderText = rAttribs.getString( XML_phldrT, "" );
+ mrPoint.msPresentationAssociationId = rAttribs.getString( XML_presAssocID, "" );
+ mrPoint.msPresentationLayoutName = rAttribs.getString( XML_presName, "" );
+ mrPoint.msPresentationLayoutStyleLabel = rAttribs.getString( XML_presStyleLbl, "" );
+ mrPoint.msQuickStyleCategoryId = rAttribs.getString( XML_qsCatId, "" );
+ mrPoint.msQuickStyleTypeId = rAttribs.getString( XML_qsTypeId, "" );
mrPoint.mnCustomAngle = rAttribs.getInteger( XML_custAng, -1 );
mrPoint.mnPercentageNeighbourWidth = rAttribs.getInteger( XML_custLinFactNeighborX, -1 );
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index f0a59f6..4ef4f2c 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -124,12 +124,12 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
pOL->SetUpdateMode(false);
// remove old selected text
- pOV->InsertText( aEmptyStr );
+ pOV->InsertText( "" );
// prepare undo
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
- aEmptyStr );
+ "" );
// insert given text
OUString aStr( cMark );
@@ -250,14 +250,14 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
With that, we get unique attributes (and since there is no
DeleteSelected() in OutlinerView, it is deleted by inserting an
empty string). */
- pOV->InsertText( aEmptyStr );
+ pOV->InsertText( "" );
SfxItemSet aOldSet( mpDoc->GetPool(), EE_CHAR_FONTINFO, EE_CHAR_FONTINFO, 0 );
aOldSet.Put( pOV->GetAttribs() );
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
- aEmptyStr );
+ "" );
pOV->InsertText(aChars, true);
// set attributes (set font)
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index c468954..2d3c532 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -231,7 +231,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) )
{
DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell);
- INetBookmark aINetBookmark( aEmptyStr, aEmptyStr );
+ INetBookmark aINetBookmark( "", "" );
if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -240,7 +240,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
{
- pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+ pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
}
}
}
@@ -412,7 +412,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
else
{
ErrorHandler::HandleError(* new StringErrorInfo(ERRCODE_SFX_OLEGENERAL,
- aEmptyStr ) );
+ "" ) );
}
}
else
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 2e47df4..6eac885 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -411,7 +411,7 @@ void FuMorph::ImpInsertPolygons(
if ( bLineColor )
{
const basegfx::BColor aLineColor(basegfx::interpolate(aStartLineCol.getBColor(), aEndLineCol.getBColor(), fFactor));
- aSet.Put( XLineColorItem( aEmptyStr, Color(aLineColor)));
+ aSet.Put( XLineColorItem( "", Color(aLineColor)));
}
else if ( bIgnoreLine )
aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
@@ -420,7 +420,7 @@ void FuMorph::ImpInsertPolygons(
if ( bFillColor )
{
const basegfx::BColor aFillColor(basegfx::interpolate(aStartFillCol.getBColor(), aEndFillCol.getBColor(), fFactor));
- aSet.Put( XFillColorItem( aEmptyStr, Color(aFillColor)));
+ aSet.Put( XFillColorItem( "", Color(aFillColor)));
}
else if ( bIgnoreFill )
aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index c710bd5..51da996 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -50,8 +50,6 @@ namespace embed {
namespace sd {
-extern const OUString aEmptyStr;
-
class DrawDocShell;
class FrameView;
class LayerTabBar;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 0136d12..43dab6b 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -489,7 +489,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, false ) )
{
- INetBookmark aINetBookmark( aEmptyStr, aEmptyStr );
+ INetBookmark aINetBookmark( "", "" );
if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -498,7 +498,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
{
- InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+ InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
}
}
}
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 93bd8f5c..da65984 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -924,7 +924,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ),
nAction, false, nFormat ) )
{
- INetBookmark aINetBookmark( aEmptyStr, aEmptyStr );
+ INetBookmark aINetBookmark( "", "" );
if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -933,7 +933,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
{
- InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+ InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
}
}
}
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index d421072..87bfa36 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -338,7 +338,7 @@ void View::DoPaste (vcl::Window* pWindow)
{
if( !InsertData( aDataHelper, aPos, nDnDAction, false ) )
{
- INetBookmark aINetBookmark( aEmptyStr, aEmptyStr );
+ INetBookmark aINetBookmark( "", "" );
if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -347,7 +347,7 @@ void View::DoPaste (vcl::Window* pWindow)
( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
{
- pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+ pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
}
}
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index d40db5c..d1381fc 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -75,8 +75,6 @@ using namespace com::sun::star;
namespace sd {
-const OUString aEmptyStr;
-
/**
* adjust Thumbpos and VisibleSize
*/
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 70ed17d..d0a270c 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -191,8 +191,7 @@ bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
pRequest->Execute();
}
- OUString aEmptyStr;
- rData <<= aEmptyStr;
+ rData <<= OUString();
}
return 0 == pConnection->GetError();
}
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 598e303..445e703 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -262,9 +262,8 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
- const OUString aEmptyStr;
uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() );
- lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
+ lang::Locale aRet( "", "", "" );
if( xParent.is() )
{
@@ -809,9 +808,8 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
- const OUString aEmptyStr;
uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() );
- lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
+ lang::Locale aRet( "", "", "" );
if( xParent.is() )
{
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 59f5091..90bc9a5 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -384,8 +384,6 @@ void SmParser::NextToken()
static const sal_Int32 coNumContFlags =
coNumStartFlags & ~KParseTokens::IGNORE_LEADING_WS;
- static const OUString aEmptyStr;
-
sal_Int32 nBufLen = m_aBufferString.getLength();
ParseResult aRes;
sal_Int32 nRealStart;
@@ -405,16 +403,16 @@ void SmParser::NextToken()
aCC.setLanguageTag(LanguageTag(m_aDotLoc));
aRes = aCC.parsePredefinedToken(KParseType::ASC_NUMBER,
m_aBufferString, m_nBufferIndex,
- coNumStartFlags, aEmptyStr,
- coNumContFlags, aEmptyStr);
+ coNumStartFlags, "",
+ coNumContFlags, "");
aCC.setLanguageTag(aOldLoc);
if (aRes.TokenType == 0)
{
// Try again with the default token parsing.
aRes = aCC.parseAnyToken(m_aBufferString, m_nBufferIndex,
- coStartFlags, aEmptyStr,
- coContFlags, aEmptyStr);
+ coStartFlags, "",
+ coContFlags, "");
}
nRealStart = m_nBufferIndex + aRes.LeadingWhiteSpace;
@@ -651,9 +649,9 @@ void SmParser::NextToken()
ParseResult aTmpRes = aCC.parseAnyToken(
m_aBufferString, rnEndPos,
KParseTokens::ANY_LETTER,
- aEmptyStr,
+ "",
coUserDefinedCharContFlags,
- aEmptyStr );
+ "" );
sal_Int32 nTmpStart = rnEndPos + aTmpRes.LeadingWhiteSpace;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 7e32cbd..da71f3e 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -280,9 +280,8 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
- const OUString aEmptyStr;
Reference< XAccessible > xParent( getAccessibleParent() );
- Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
+ Locale aRet( "", "", "" );
if( xParent.is() )
{
@@ -761,8 +760,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat
Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
{
- const OUString aEmptyStr;
- Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
+ Locale aRet( "", "", "" );
Reference< XAccessible > xParent( getAccessibleParent() );
if( xParent.is() )
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 0421a5f..0f8a0a1 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -366,9 +366,8 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
- const OUString aEmptyStr;
uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() );
- lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
+ lang::Locale aRet( "", "", "" );
if( xParent.is() )
{
@@ -1004,9 +1003,8 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale()
throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
- const OUString aEmptyStr;
uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() );
- lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
+ lang::Locale aRet( "", "", "" );
if( xParent.is() )
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index b4289af..1300627 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -113,9 +113,8 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>&
}
const sal_Unicode cLocalPrefix = pNew->sPrefix.getLength() ? pNew->sPrefix[0] : 0;
const sal_Unicode cLocalSuffix = pNew->sSuffix.getLength() ? pNew->sSuffix[0] : 0;
- OUString aEmptyStr;
- if( cLocalPrefix == ' ') pNew->sPrefix=aEmptyStr;
- if( cLocalSuffix == ' ') pNew->sSuffix=aEmptyStr;
+ if( cLocalPrefix == ' ') pNew->sPrefix.clear();
+ if( cLocalSuffix == ' ') pNew->sSuffix.clear();
return pNew;
}
@@ -431,9 +430,8 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
aFmt.SetCharFormatName(sBulletCharFormatName);
- OUString aEmptyStr;
- aFmt.SetPrefix( aEmptyStr );
- aFmt.SetSuffix( aEmptyStr );
+ aFmt.SetPrefix( "" );
+ aFmt.SetSuffix( "" );
if (isResetSize) aFmt.SetBulletRelSize(45);
aNum.SetLevel(i, aFmt);
}
@@ -675,7 +673,6 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s
sGrfName= pEntry->sGrfName;
sal_uInt16 nMask = 1;
- OUString aEmptyStr;
sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP;
OUString sNumCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
@@ -684,8 +681,8 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s
{
SvxNumberFormat aFmt(aNum.GetLevel(i));
aFmt.SetNumberingType(nSetNumberingType);
- aFmt.SetPrefix( aEmptyStr );
- aFmt.SetSuffix( aEmptyStr );
+ aFmt.SetPrefix( "" );
+ aFmt.SetSuffix( "" );
aFmt.SetCharFormatName( sNumCharFmtName );
Graphic aGraphic;
@@ -1160,9 +1157,8 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
aFmt.SetCharFormatName(sBulletCharFormatName);
- OUString aEmptyStr;
- aFmt.SetPrefix( aEmptyStr );
- aFmt.SetSuffix( aEmptyStr );
+ aFmt.SetPrefix( "" );
+ aFmt.SetSuffix( "" );
if (isResetSize) aFmt.SetBulletRelSize(45);
aNum.SetLevel(i, aFmt);
}
@@ -1175,7 +1171,6 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
sGrfName= pEntry->sGrfName;
sal_uInt16 nMask = 1;
- OUString aEmptyStr;
sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP;
OUString sNumCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
@@ -1185,8 +1180,8 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
SvxNumberFormat aFmt(aNum.GetLevel(i));
if (SVX_NUM_BITMAP !=aFmt.GetNumberingType()) isResetSize=true;
aFmt.SetNumberingType(nSetNumberingType);
- aFmt.SetPrefix( aEmptyStr );
- aFmt.SetSuffix( aEmptyStr );
+ aFmt.SetPrefix( "" );
+ aFmt.SetSuffix( "" );
aFmt.SetCharFormatName( sNumCharFmtName );
if ( pCurrentBullets->nIndexDefault == (sal_uInt16)0xFFFF && pEntry->pGrfObj )
{
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 05c12cb..e174de1 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -311,8 +311,6 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
Reference< XPropertySet > xProps( xShape, UNO_QUERY );
if( xProps.is() )
{
- const OUString aEmptyStr;
-
Reference< XPropertySetInfo > xInfo( xProps->getPropertySetInfo() );
AnimationEffect eEffect;
XMLEffectHint aEffect;
@@ -371,7 +369,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
mpImpl->maEffects.push_back( aEffect );
aEffect.mnPathShapeId = -1;
- aEffect.maSoundURL = aEmptyStr;
+ aEffect.maSoundURL.clear();
}
xProps->getPropertyValue( mpImpl->msTextEffect ) >>= eEffect;
@@ -390,7 +388,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
mpImpl->maEffects.push_back( aEffect );
aEffect.mbTextEffect = false;
- aEffect.maSoundURL = aEmptyStr;
+ aEffect.maSoundURL.clear();
}
bool bDimPrev = false;
@@ -416,7 +414,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
}
mpImpl->maEffects.push_back( aEffect );
- aEffect.maSoundURL = aEmptyStr;
+ aEffect.maSoundURL.clear();
}
}
}
More information about the Libreoffice-commits
mailing list