summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-26 22:24:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-27 08:00:32 +0200
commita6050c32f30796743f9ab9b2a5c793ced9b8f747 (patch)
treea2fa6d05708d1c99414893064adaee56460ac728 /svx
parent01ed4bf52db701c4e7824f4a92b5a3afa2a5ca4b (diff)
Clean up aEmpty
Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/passwd.cxx7
-rw-r--r--svx/source/svdraw/svdmodel.cxx9
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx11
-rw-r--r--svx/source/unodraw/unoshape.cxx5
4 files changed, 13 insertions, 19 deletions
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index ebb736cdbfbe..bca9ea1bc39c 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -27,13 +27,12 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void)
{
bool bOK = true;
short nRet = RET_OK;
- OUString aEmpty;
if ( m_pNewPasswdED->GetText() != m_pRepeatPasswdED->GetText() )
{
ScopedVclPtrInstance<MessageDialog>::Create(this, aRepeatPasswdErrStr)->Execute();
- m_pNewPasswdED->SetText( aEmpty );
- m_pRepeatPasswdED->SetText( aEmpty );
+ m_pNewPasswdED->SetText( "" );
+ m_pRepeatPasswdED->SetText( "" );
m_pNewPasswdED->GrabFocus();
bOK = false;
}
@@ -41,7 +40,7 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void)
if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
{
ScopedVclPtrInstance<MessageDialog>::Create(this, aOldPasswdErrStr)->Execute();
- m_pOldPasswdED->SetText( aEmpty );
+ m_pOldPasswdED->SetText( "" );
m_pOldPasswdED->GrabFocus();
bOK = false;
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ff9004e7cba1..5478cdc43d93 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -479,8 +479,7 @@ void SdrModel::BegUndo()
{
if( mpImpl->mpUndoManager )
{
- const OUString aEmpty;
- mpImpl->mpUndoManager->EnterListAction(aEmpty,aEmpty);
+ mpImpl->mpUndoManager->EnterListAction("","");
nUndoLevel++;
}
else if( IsUndoEnabled() )
@@ -501,8 +500,7 @@ void SdrModel::BegUndo(const OUString& rComment)
{
if( mpImpl->mpUndoManager )
{
- const OUString aEmpty;
- mpImpl->mpUndoManager->EnterListAction( rComment, aEmpty );
+ mpImpl->mpUndoManager->EnterListAction( rComment, "" );
nUndoLevel++;
}
else if( IsUndoEnabled() )
@@ -524,8 +522,7 @@ void SdrModel::BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrR
{
aComment = aComment.replaceFirst("%1", rObjDescr);
}
- const OUString aEmpty;
- mpImpl->mpUndoManager->EnterListAction( aComment,aEmpty );
+ mpImpl->mpUndoManager->EnterListAction( aComment,"" );
nUndoLevel++;
}
else if( IsUndoEnabled() )
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 0582dc24cf31..80575617116b 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -347,12 +347,11 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
{
SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
- OUString aEmpty;
- appendEntry(0, aEmpty, maImgDepth0);
- appendEntry(1, aEmpty, maImgDepth1);
- appendEntry(2, aEmpty, maImgDepth2);
- appendEntry(3, aEmpty, maImgDepth3);
- appendEntry(4, aEmpty, maImgDepth4);
+ appendEntry(0, "", maImgDepth0);
+ appendEntry(1, "", maImgDepth1);
+ appendEntry(2, "", maImgDepth2);
+ appendEntry(3, "", maImgDepth3);
+ appendEntry(4, "", maImgDepth4);
appendEntry(5, SVX_RESSTR(RID_SVXSTR_INFINITY), maImgDepthInfinity);
appendEntry(6, SVX_RESSTR(RID_SVXSTR_CUSTOM));
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index bea3c9c49d7f..35423a2f8b80 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1581,12 +1581,11 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
case XATTR_LINEEND:
case XATTR_LINESTART:
{
- const OUString aEmpty;
const basegfx::B2DPolyPolygon aEmptyPoly;
if( nWID == XATTR_LINEEND )
- rSet.Put( XLineEndItem( aEmpty, aEmptyPoly ) );
+ rSet.Put( XLineEndItem( "", aEmptyPoly ) );
else
- rSet.Put( XLineStartItem( aEmpty, aEmptyPoly ) );
+ rSet.Put( XLineStartItem( "", aEmptyPoly ) );
return true;
}