summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/shells
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-15 13:01:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-15 13:26:10 +0000
commitb0c72cb92cab00f9e030b4d5c29e5376dcf457ac (patch)
tree13e79f40102438c9463f442d1b78a7f8e3bd77cb /sw/source/ui/shells
parentRelated: #i17171# foul addition of MAX value to offset (diff)
downloadcore-b0c72cb92cab00f9e030b4d5c29e5376dcf457ac.tar.gz
core-b0c72cb92cab00f9e030b4d5c29e5376dcf457ac.zip
starting chopping out aEmptyOUStr
Change-Id: I4d944018bb471d78d6ebb3604d445b90899ea893
Diffstat (limited to 'sw/source/ui/shells')
-rw-r--r--sw/source/ui/shells/annotsh.cxx4
-rw-r--r--sw/source/ui/shells/basesh.cxx2
-rw-r--r--sw/source/ui/shells/grfsh.cxx8
-rw-r--r--sw/source/ui/shells/textfld.cxx6
-rw-r--r--sw/source/ui/shells/textsh1.cxx6
-rw-r--r--sw/source/ui/shells/textsh2.cxx2
6 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 60c8c5c30bff..1ce307aff932 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -893,8 +893,8 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() );
- pDlg->Insert( SOT_FORMAT_STRING, aEmptyOUStr );
- pDlg->Insert( SOT_FORMAT_RTF, aEmptyOUStr );
+ pDlg->Insert( SOT_FORMAT_STRING, OUString() );
+ pDlg->Insert( SOT_FORMAT_RTF, OUString() );
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 4b5d9f80aa4c..9720fcabf536 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -971,7 +971,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
const PolyPolygon aPoly( pDlg->GetPolyPolygon() );
rSh.SetGraphicPolygon( &aPoly );
if ( pDlg->IsGraphicChanged() )
- rSh.ReRead( aEmptyOUStr, aEmptyOUStr, &pDlg->GetGraphic());
+ rSh.ReRead( OUString(), OUString(), &pDlg->GetGraphic());
rSh.EndAction();
}
}
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 00e49bf7ac27..07efba61600a 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -90,7 +90,7 @@ namespace
virtual void Update( Graphic& aGraphic )
{
- m_pShell->ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic);
+ m_pShell->ReRead(OUString(), OUString(), (const Graphic*) &aGraphic);
}
};
}
@@ -161,7 +161,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aCrop.SetBottom( MM100_TO_TWIP( aScaledCropedRectangle.Bottom() ));
Graphic aCompressedGraphic( aDialog.GetCompressedGraphic() );
- rSh.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aCompressedGraphic);
+ rSh.ReRead(OUString(), OUString(), (const Graphic*) &aCompressedGraphic);
rSh.SetAttrItem(aCrop);
@@ -579,7 +579,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
GraphicObject aFilterObj( *pFilterObj );
if( SVX_GRAPHICFILTER_ERRCODE_NONE ==
SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj ))
- GetShell().ReRead( aEmptyOUStr, aEmptyOUStr,
+ GetShell().ReRead( OUString(), OUString(),
&aFilterObj.GetGraphic() );
}
}
@@ -800,7 +800,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
Graphic aGraphic = *rShell.GetGraphic();
GraphicNativeTransform aTransform(aGraphic);
aTransform.rotate(aRotation);
- rShell.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic);
+ rShell.ReRead(OUString(), OUString(), (const Graphic*) &aGraphic);
SwFlyFrmAttrMgr aManager(false, &rShell, rShell.IsFrmSelected() ? FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
Size aSize(aManager.GetSize().Height(), aManager.GetSize().Width());
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index c19ba32b57b5..80579cc1b3af 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -367,7 +367,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
// --> suggestion has to be removed before
GetView().GetEditWin().StopQuickHelp();
- SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyOUStr, 0);
+ SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, OUString(), 0);
aFldMgr.InsertFld( aData );
rSh.Push();
@@ -378,7 +378,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
if (pPostIt)
{
- SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyOUStr,false);
+ SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, OUString(), false);
SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
SwFmtFld* pSwFmtFld = aIter.First();
while( pSwFmtFld )
@@ -597,7 +597,7 @@ FIELD_INSERT:
if(!nInsertFormat)
nInsertFormat = aFldMgr.GetDefaultFormat(nInsertType, bIsText, rSh.GetNumberFormatter());
SwInsertFld_Data aData(nInsertType, nInsertSubType,
- aEmptyOUStr, aEmptyOUStr, nInsertFormat);
+ OUString(), OUString(), nInsertFormat);
aFldMgr.InsertFld(aData);
rReq.Done();
}
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 2a97cdb36421..5a3a2367c7f2 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -587,7 +587,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if ( pItem )
{
OUString sName = ((SfxStringItem*)pItem)->GetValue();
- rWrtSh.SetBookmark( KeyCode(), sName, aEmptyOUStr );
+ rWrtSh.SetBookmark( KeyCode(), sName, OUString() );
}
else
{
@@ -764,7 +764,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
if( !bDelSel && aFldMgr.GetCurFld() && TYP_FORMELFLD == aFldMgr.GetCurTypeId() )
- aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), aEmptyOUStr, sFormula );
+ aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), OUString(), sFormula );
else if( !sFormula.isEmpty() )
{
if( rWrtSh.IsCrsrInTbl() )
@@ -778,7 +778,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
SvNumberFormatter* pFormatter = rWrtSh.GetNumberFormatter();
sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM);
- SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, aEmptyOUStr, sFormula, nSysNumFmt);
+ SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, OUString(), sFormula, nSysNumFmt);
aFldMgr.InsertFld(aData);
}
}
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 703e89bf9920..8bda1565b497 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -206,7 +206,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
sDBName += sColumnName;
SwFldMgr aFldMgr(GetShellPtr());
- SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0);
+ SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, OUString(), 0);
if(pConnectionItem)
aData.aDBConnection = ((SfxUsrAnyItem*)pConnectionItem)->GetValue();
if(pColumnItem)