summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorBrij Mohan Lal Srivastava <contactbrijmohan@gmail.com>2014-11-12 14:24:10 +0530
committerStephan Bergmann <sbergman@redhat.com>2014-11-14 09:20:38 +0100
commitd32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch)
treeb373c084cb124434e0498867b24bc7bb333155dd /svx
parentf5e86ebc097f0f8bc5b282511149cb026710ecde (diff)
fdo#86023 - O[U]String needs a 'clear' method
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/datanavi.cxx2
-rw-r--r--svx/source/inc/fmcontrolbordermanager.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/items/drawitem.cxx12
-rw-r--r--svx/source/items/grfitem.cxx2
-rw-r--r--svx/source/items/numinf.cxx2
-rw-r--r--svx/source/items/pageitem.cxx4
-rw-r--r--svx/source/svdraw/svdmark.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx4
-rw-r--r--svx/source/xoutdev/xattr2.cxx32
17 files changed, 39 insertions, 39 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 92a70e40cc40..59bbbb7a95b9 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -170,7 +170,7 @@ namespace svx
const sal_Unicode cSeparator = sal_Unicode(11);
const OUString sSeparator(&cSeparator, 1);
- m_sCompatibleFormat = OUString();
+ m_sCompatibleFormat.clear();
m_sCompatibleFormat += _rDatasource;
m_sCompatibleFormat += sSeparator;
m_sCompatibleFormat += _rCommand;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index bd51defa89d3..c7a218447045 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2892,7 +2892,7 @@ bool DbFilterField::commitControl()
case ::com::sun::star::form::FormComponentType::CHECKBOX:
return true;
case ::com::sun::star::form::FormComponentType::LISTBOX:
- aText = OUString();
+ aText.clear();
if (static_cast<ListBox*>(m_pWindow)->GetSelectEntryCount())
{
sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 461c11d1cf24..a9813718e8d0 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2339,7 +2339,7 @@ namespace svxform
if ( bIsChecked && sTemp.isEmpty() )
sTemp = TRUE_VALUE;
else if ( !bIsChecked && !sTemp.isEmpty() )
- sTemp = OUString();
+ sTemp.clear();
m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) );
}
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 5d9eb264a3e8..b4dee519966c 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -100,7 +100,7 @@ namespace svxform
BorderDescriptor::clear();
UnderlineDescriptor::clear();
xControl.clear();
- sOriginalHelpText = OUString();
+ sOriginalHelpText.clear();
}
};
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index d01a620f5cc9..694609caacc3 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -567,7 +567,7 @@ public:
virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement) SAL_OVERRIDE;
virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const SAL_OVERRIDE;
- virtual void Invalidate() SAL_OVERRIDE { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); }
+ virtual void Invalidate() SAL_OVERRIDE { IndexAccessIterator::Invalidate(); m_sCurrentValue.clear(); }
};
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index d221873862f7..295067326353 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -284,7 +284,7 @@ private:
SdrUnoObj*& _rpControl,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxDataSource = NULL,
const OUString& _rDataSourceName = OUString(),
- const OUString& _rCommand= OUString(),
+ const OUString& _rCommand = OUString(),
const sal_Int32 _nCommandType = -1
);
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index d21a57b217d3..ba185ced9d5f 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -56,7 +56,7 @@ bool SvxColorListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -119,7 +119,7 @@ bool SvxGradientListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -167,7 +167,7 @@ bool SvxHatchListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -210,7 +210,7 @@ bool SvxBitmapListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -252,7 +252,7 @@ bool SvxDashListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -293,7 +293,7 @@ bool SvxLineEndListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 44ef7f8f4bea..4e485f04f052 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -129,7 +129,7 @@ bool SvxGrfCrop::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/,
OUString &rText, const IntlWrapper* pIntl ) const
{
- rText = OUString();
+ rText.clear();
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 36665d3789d5..4cc527b6ce7c 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -123,7 +123,7 @@ bool SvxNumberInfoItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index c051c0a61bc9..80447b992892 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -89,7 +89,7 @@ bool SvxPageItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
OUString cpDelimTmp = OUString(cpDelim);
switch ( ePres )
@@ -285,7 +285,7 @@ bool SvxSetItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 3897d2f3d757..692219355848 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -642,7 +642,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
if(!nMarkPtObjAnz)
{
- rName = OUString();
+ rName.clear();
rNameOk = true;
}
else if(!rNameOk)
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index e5a6e670e4d0..fea86370ea5a 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -1030,7 +1030,7 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr)
case FUNIT_NONE :
case FUNIT_CUSTOM :
{
- rStr = OUString();
+ rStr.clear();
break;
}
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 63e0cf3558ba..d42073403081 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -153,7 +153,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
{
if ( !aFontWorkShapeType.equals( aType ) ) // different FontWorkShapeTypes selected ?
{
- aFontWorkShapeType = OUString();
+ aFontWorkShapeType.clear();
break;
}
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 263ec03e8b7d..3f8c7b7447e7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1532,7 +1532,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
if( rValue >>= aStreamURL )
{
if( !aStreamURL.startsWith( UNO_NAME_GRAPHOBJ_URLPKGPREFIX ) )
- aStreamURL = OUString();
+ aStreamURL.clear();
if( mpObj.is() )
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 9d0abd5388de..81e167d5107e 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -449,7 +449,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
if( !maShapeName.isEmpty() )
{
mpObj->SetName( maShapeName );
- maShapeName = OUString();
+ maShapeName.clear();
}
}
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index b5586b3378d1..6b307c398747 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -378,7 +378,7 @@ bool XLineStyleItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
@@ -2130,7 +2130,7 @@ bool XFillStyleItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index eb478fef5142..ac87203aa363 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -62,7 +62,7 @@ bool XLineTransparenceItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -112,7 +112,7 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const
bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
@@ -316,7 +316,7 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const
bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
@@ -420,7 +420,7 @@ bool XFillTransparenceItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -489,7 +489,7 @@ bool XGradientStepCountItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
rText += OUString::number(GetValue());
return true;
@@ -525,7 +525,7 @@ bool XFillBmpTileItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -561,7 +561,7 @@ bool XFillBmpPosItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -602,7 +602,7 @@ bool XFillBmpSizeXItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -643,7 +643,7 @@ bool XFillBmpSizeYItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -684,7 +684,7 @@ bool XFillBmpSizeLogItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -720,7 +720,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -756,7 +756,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -790,7 +790,7 @@ bool XFillBmpStretchItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -826,7 +826,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -862,7 +862,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -891,7 +891,7 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
{
- rText = OUString();
+ rText.clear();
return true;
}