diff options
| author | Brij Mohan Lal Srivastava <contactbrijmohan@gmail.com> | 2014-11-12 14:24:10 +0530 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-14 09:20:38 +0100 |
| commit | d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch) | |
| tree | b373c084cb124434e0498867b24bc7bb333155dd /chart2 | |
| parent | f5e86ebc097f0f8bc5b282511149cb026710ecde (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 'chart2')
| -rw-r--r-- | chart2/source/controller/main/SelectionHelper.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/tools/InternalDataProvider.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/diagram/VDiagram.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index a7869d732156..8389fe4e932c 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -409,7 +409,7 @@ OUString SelectionHelper::getHitObjectCID( //accept only named objects while searching for the object to select if( !findNamedParent( pNewObj, aRet, true ) ) { - aRet = OUString(); + aRet.clear(); } OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 1452af7c5791..27de75e50672 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -542,7 +542,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co aElem = OUString(pElem, p-pElem); aRawElems.push_back(aElem); pElem = NULL; - aElem = OUString(); + aElem.clear(); ++p; // Skip '"'. if (p == pEnd) @@ -560,7 +560,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co aElem = OUString(pElem, p-pElem); aRawElems.push_back(aElem); pElem = NULL; - aElem = OUString(); + aElem.clear(); } else if (!pElem) pElem = p; diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 7cd278903c3e..9f5db9926456 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -497,7 +497,7 @@ void VDiagram::createShapes_3d() OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model if( !bAddFloorAndWall ) - aWallCID = OUString(); + aWallCID.clear(); uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) ); CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) ); |