loplugin:stringviewparam extend to new..

O[U]StringBuffer methods

Change-Id: I0ffbc33d54ae7c98b5652434f3370ee4f819f6f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110090
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 61 insertions, 61 deletions

diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 320282a5deb5..04c27782c375 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -441,7 +441,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
         aItemConverter.FillItemSet( aItemSet );
         ObjectPropertiesDialogParameter aDialogParameter(
             ObjectIdentifier::createClassifiedIdentifierWithParent(
-                objType, OUString(), m_aSelection.getSelectedCID()));
+                objType, u"", m_aSelection.getSelectedCID()));
         aDialogParameter.init( getModel() );
         ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get());
         SolarMutexGuard aGuard;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 666c9979830e..e7a35fef3410 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -327,7 +327,7 @@ wrapper::ItemConverter* createItemConverter(
 OUString lcl_getTitleCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel )
 {
     if( rDispatchCommand == "AllTitles")
-        return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" );
+        return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, u"ALLELEMENTS" );
 
     TitleHelper::eTitleType nTitleType( TitleHelper::MAIN_TITLE );
     if( rDispatchCommand == "SubTitle" )
@@ -350,7 +350,7 @@ OUString lcl_getTitleCIDForCommand( std::string_view rDispatchCommand, const uno
 OUString lcl_getAxisCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel )
 {
     if( rDispatchCommand == "DiagramAxisAll")
-        return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" );
+        return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, u"ALLELEMENTS" );
 
     sal_Int32   nDimensionIndex=0;
     bool        bMainAxis=true;
@@ -385,7 +385,7 @@ OUString lcl_getGridCIDForCommand( std::string_view rDispatchCommand, const uno:
     uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
 
     if( rDispatchCommand == "DiagramGridAll")
-        return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, "ALLELEMENTS" );
+        return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, u"ALLELEMENTS" );
 
     sal_Int32   nDimensionIndex=0;
     bool        bMainGrid=true;
@@ -429,7 +429,7 @@ OUString lcl_getErrorCIDForCommand( const ObjectType eDispatchType, const Object
     if( eSelectedType == eDispatchType )
         return rSelectedCID;
 
-    return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType, OUString(), rSelectedCID );
+    return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType, u"", rSelectedCID );
 }
 
 OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< XChartDocument > & xChartDocument, const OUString& rSelectedCID )
@@ -520,7 +520,7 @@ OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const un
             return rSelectedCID;
         else
             return ObjectIdentifier::createClassifiedIdentifierWithParent(
-                OBJECTTYPE_DATA_LABELS, OUString(), rSelectedCID );
+                OBJECTTYPE_DATA_LABELS, u"", rSelectedCID );
     }
     //data labels
     else if( rDispatchCommand == "FormatDataLabel" )
@@ -536,7 +536,7 @@ OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const un
                 OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" );
                 OUString aLabelsCID = ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle );
                 OUString aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
-                    OBJECTTYPE_DATA_LABEL, OUString(), aLabelsCID );
+                    OBJECTTYPE_DATA_LABEL, u"", aLabelsCID );
 
                 return ObjectIdentifier::createPointCID( aLabelCID_Stub, nPointIndex );
             }
@@ -631,7 +631,7 @@ OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const un
         if( eSelectedType == OBJECTTYPE_DATA_STOCK_LOSS )
             return rSelectedCID;
         else
-            return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, OUString());
+            return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, u"");
     }
     // stock gain
     else if( rDispatchCommand == "FormatStockGain" )
@@ -639,12 +639,12 @@ OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const un
         if( eSelectedType == OBJECTTYPE_DATA_STOCK_GAIN )
             return rSelectedCID;
         else
-            return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_GAIN, OUString() );
+            return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_GAIN, u"" );
     }
 
     return ObjectIdentifier::createClassifiedIdentifier(
         eObjectType,
-        OUString() ); // aParticleID
+        u"" ); // aParticleID
 }
 
 }
@@ -682,7 +682,7 @@ OUString lcl_getFormatCIDforSelectedCID( const OUString& rSelectedCID )
 
     // treat diagram as wall
     if( eObjectType==OBJECTTYPE_DIAGRAM )
-        aFormatCID  = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() );
+        aFormatCID  = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, u"" );
 
     return aFormatCID;
 }
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 32762762e827..ff4d63fc16ea 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -206,7 +206,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD
     // Chart Area
     if( m_bOrderingForElementSelector )
     {
-        aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
+        aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) );
         if( xDiagram.is() )
         {
             aTopLevelContainer.push_back( aDiaOID );
@@ -268,7 +268,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD
 
     // Chart Area
     if( !m_bOrderingForElementSelector )
-        aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
+        aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) );
 
     if( ! aTopLevelContainer.empty())
         m_aChildMap[ ObjectHierarchy::getRootNodeOID() ] = aTopLevelContainer;
@@ -371,11 +371,11 @@ void ImplObjectHierarchy::createWallAndFloor(
     bool bHasWall = DiagramHelper::isSupportingFloorAndWall( xDiagram );
     if( bHasWall && bIsThreeD )
     {
-        rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );
+        rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, u"" ) );
 
         Reference< beans::XPropertySet > xFloor( xDiagram->getFloor());
         if( xFloor.is())
-            rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );
+            rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, u"" ) );
     }
 
 }
@@ -468,7 +468,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
                                     ( nStyle != css::chart::ErrorBarStyle::NONE ) )
                                 {
                                     aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierWithParent(
-                                            OBJECTTYPE_DATA_ERRORS_Y, OUString(), aSeriesParticle ) );
+                                            OBJECTTYPE_DATA_ERRORS_Y, u"", aSeriesParticle ) );
                                 }
                             }
 
@@ -481,7 +481,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
                                     ( nStyle != css::chart::ErrorBarStyle::NONE ) )
                                 {
                                     aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierWithParent(
-                                            OBJECTTYPE_DATA_ERRORS_X, OUString(), aSeriesParticle ) );
+                                            OBJECTTYPE_DATA_ERRORS_X, u"", aSeriesParticle ) );
                                 }
                             }
                         }
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 29c71c5c1097..dc3230749f57 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -242,7 +242,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper
 
         if ( !m_aSelectedOID.isAdditionalShape() )
         {
-            OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
+            OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) );//@todo read CID from model
 
             if ( !m_aSelectedOID.isAutoGeneratedObject() )
             {
@@ -251,7 +251,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper
 
             //check whether the diagram was hit but not selected (e.g. because it has no filling):
             OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
-            OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
+            OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, u"" ) );//@todo read CID from model
             bool bBackGroundHit = m_aSelectedOID.getObjectCID() == aPageCID || m_aSelectedOID.getObjectCID() == aWallCID || !m_aSelectedOID.isAutoGeneratedObject();
             if( bBackGroundHit )
             {
@@ -401,7 +401,7 @@ OUString SelectionHelper::getHitObjectCID(
         aRet.clear();
     }
 
-    OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
+    OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) );//@todo read CID from model
     //get page when nothing was hit
     if( aRet.isEmpty() && !pNewObj )
     {
@@ -426,7 +426,7 @@ OUString SelectionHelper::getHitObjectCID(
         }
         else if( bGetDiagramInsteadOf_Wall )
         {
-            OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
+            OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, u"" ) );//@todo read CID from model
 
             if( aRet == aWallCID )
             {
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 55a756c6edf3..fc887fc91aae 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -55,7 +55,7 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel)
         ChartController* pController = dynamic_cast<ChartController*>(xController.get());
         if (pController)
         {
-            pController->select( css::uno::Any( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+            pController->select( css::uno::Any( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) ) );
             xSelectionSupplier = css::uno::Reference<css::view::XSelectionSupplier>(xController, css::uno::UNO_QUERY);
             if (xSelectionSupplier.is())
                 aAny = xSelectionSupplier->getSelection();
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 6f534305359e..48895bd42bdd 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -115,8 +115,8 @@ public:
     static OUString createClassifiedIdentifierForParticles(
             const OUString& rParentParticle
           , const OUString& rChildParticle
-          , const OUString& rDragMethodServiceName = OUString()
-          , const OUString& rDragParameterString = OUString() );
+          , std::u16string_view rDragMethodServiceName = std::u16string_view()
+          , std::u16string_view rDragParameterString = std::u16string_view() );
 
     static OUString createClassifiedIdentifierForGrid(
           const css::uno::Reference< css::chart2::XAxis >& xAxis
@@ -147,20 +147,20 @@ public:
     static OUString createParticleForLegend(
         const css::uno::Reference< css::frame::XModel >& xChartModel );
 
-    static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle );
+    static OUString addChildParticle( const OUString& rParticle, std::u16string_view rChildParticle );
     static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex );
     static sal_Int32 getIndexFromParticleOrCID( const OUString& rParticleOrCID );
 
     static OUString createClassifiedIdentifier(
         enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES
-        , const OUString& rParticleID );//e.g. SeriesID
+        , std::u16string_view rParticleID );//e.g. SeriesID
 
     static OUString createClassifiedIdentifierWithParent(
         enum ObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID
-        , const OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object
-        , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
-        , const OUString& rDragMethodServiceName = OUString()
-        , const OUString& rDragParameterString = OUString()
+        , std::u16string_view rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object
+        , std::u16string_view rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
+        , std::u16string_view rDragMethodServiceName = std::u16string_view()
+        , std::u16string_view rDragParameterString = std::u16string_view()
         );
 
     static bool isCID( const OUString& rName );
@@ -179,12 +179,12 @@ public:
 
     static OUString createSeriesSubObjectStub( ObjectType eSubObjectType
                     , const OUString& rSeriesParticle
-                    , const OUString& rDragMethodServiceName = OUString()
-                    , const OUString& rDragParameterString = OUString() );
+                    , std::u16string_view rDragMethodServiceName = std::u16string_view()
+                    , std::u16string_view rDragParameterString = std::u16string_view() );
     static OUString createPointCID( std::u16string_view rPointCID_Stub, sal_Int32 nIndex  );
 
-    static OUString createDataCurveCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
-    static OUString createDataCurveEquationCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex );
+    static OUString createDataCurveCID( std::u16string_view rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
+    static OUString createDataCurveEquationCID( std::u16string_view rSeriesParticle, sal_Int32 nCurveIndex );
 
     SAL_DLLPRIVATE static OUString getObjectID( const OUString& rCID );
     static OUString getParticleID( const OUString& rCID );
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 29f2b83efbec..64273763158e 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -62,8 +62,8 @@ namespace
 {
 
 OUString lcl_createClassificationStringForType( ObjectType eObjectType
-            , const OUString& rDragMethodServiceName
-            , const OUString& rDragParameterString
+            , std::u16string_view rDragMethodServiceName
+            , std::u16string_view rDragParameterString
             )
 {
     OUStringBuffer aRet;
@@ -81,14 +81,14 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType
         default:
             break;//empty string
     }
-    if( !rDragMethodServiceName.isEmpty() )
+    if( !rDragMethodServiceName.empty() )
     {
         if( !aRet.isEmpty() )
             aRet.append(":");
         aRet.append( m_aDragMethodEquals );
         aRet.append( rDragMethodServiceName );
 
-        if( !rDragParameterString.isEmpty() )
+        if( !rDragParameterString.empty() )
         {
             if( !aRet.isEmpty() )
                 aRet.append(":");
@@ -477,8 +477,8 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticle(
 OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
             const OUString& rParentParticle
           , const OUString& rChildParticle
-          , const OUString& rDragMethodServiceName
-          , const OUString& rDragParameterString )
+          , std::u16string_view rDragMethodServiceName
+          , std::u16string_view rDragParameterString )
 {
     ObjectType eObjectType( ObjectIdentifier::getObjectType( rChildParticle ) );
     if( eObjectType == OBJECTTYPE_UNKNOWN )
@@ -651,18 +651,18 @@ OUString ObjectIdentifier::createParticleForLegend(
 
 OUString ObjectIdentifier::createClassifiedIdentifier(
         enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES
-        , const OUString& rParticleID )//e.g. SeriesID
+        , std::u16string_view rParticleID )//e.g. SeriesID
 {
     return createClassifiedIdentifierWithParent(
-        eObjectType, rParticleID, OUString() );
+        eObjectType, rParticleID, u"" );
 }
 
 OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
         enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID
-        , const OUString& rParticleID //e.g. Point Index or SubGrid Index
-        , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
-        , const OUString& rDragMethodServiceName
-        , const OUString& rDragParameterString
+        , std::u16string_view rParticleID //e.g. Point Index or SubGrid Index
+        , std::u16string_view rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
+        , std::u16string_view rDragMethodServiceName
+        , std::u16string_view rDragParameterString
         )
         //, bool bIsMultiClickObject ) //e.g. true
 {
@@ -673,7 +673,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
     if(aRet.getLength() > static_cast<sal_Int32>(strlen(m_aProtocol)))
         aRet.append("/");
     aRet.append(rParentPartical);
-    if(!rParentPartical.isEmpty())
+    if(!rParentPartical.empty())
         aRet.append(":");
 
     aRet.append(getStringForType( eObjectType ));
@@ -1066,7 +1066,7 @@ ObjectType ObjectIdentifier::getObjectType() const
 }
 
 OUString ObjectIdentifier::createDataCurveCID(
-                                const OUString& rSeriesParticle
+                                std::u16string_view rSeriesParticle
                                 , sal_Int32 nCurveIndex
                                 , bool bAverageLine )
 {
@@ -1076,20 +1076,20 @@ OUString ObjectIdentifier::createDataCurveCID(
 }
 
 OUString ObjectIdentifier::createDataCurveEquationCID(
-                                const OUString& rSeriesParticle
+                                std::u16string_view rSeriesParticle
                                 , sal_Int32 nCurveIndex )
 {
     OUString aParticleID( OUString::number( nCurveIndex ) );
     return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle );
 }
 
-OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, const OUString& rChildParticle )
+OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, std::u16string_view rChildParticle )
 {
     OUStringBuffer aRet(rParticle);
 
-    if( !aRet.isEmpty() && !rChildParticle.isEmpty() )
+    if( !aRet.isEmpty() && !rChildParticle.empty() )
         aRet.append(":");
-    if( !rChildParticle.isEmpty() )
+    if( !rChildParticle.empty() )
         aRet.append(rChildParticle);
 
     return aRet.makeStringAndClear();
@@ -1114,8 +1114,8 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString& rParticle
 
 OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
                     , const OUString& rSeriesParticle
-                    , const OUString& rDragMethodServiceName
-                    , const OUString& rDragParameterString )
+                    , std::u16string_view rDragMethodServiceName
+                    , std::u16string_view rDragParameterString )
 {
     OUString aChildParticle = getStringForType( eSubObjectType ) + "=";
 
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 9c89d5450bb4..3294e3d04fd4 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -90,10 +90,10 @@ void CandleStickChart::createShapes()
         createGroupShape( m_xLogicTarget ));
     uno::Reference< drawing::XShapes > xLossTarget(
         createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier(
-            OBJECTTYPE_DATA_STOCK_LOSS, OUString() )));
+            OBJECTTYPE_DATA_STOCK_LOSS, u"" )));
     uno::Reference< drawing::XShapes > xGainTarget(
         createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier(
-            OBJECTTYPE_DATA_STOCK_GAIN, OUString() )));
+            OBJECTTYPE_DATA_STOCK_GAIN, u"" )));
     uno::Reference< drawing::XShapes > xTextTarget(
         m_pShapeFactory->createGroup2D( m_xFinalTarget ));
 
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index c89981bea282..670dfab90424 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -183,7 +183,7 @@ void VDiagram::createShapes_2d()
                 else
                 {
                     //CID for selection handling
-                    OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
+                    OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, u"" ) );//@todo read CID from model
                     xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::Any( aWallCID ) );
                 }
             }
@@ -480,7 +480,7 @@ void VDiagram::createShapes_3d()
         if( m_xDiagram.is() )
             xWallProp.set( m_xDiagram->getWall() );
 
-        OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
+        OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, u"" ) );//@todo read CID from model
         if( !bAddFloorAndWall )
             aWallCID.clear();
         uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) );
@@ -622,7 +622,7 @@ void VDiagram::createShapes_3d()
         }
         else
         {
-            OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );//@todo read CID from model
+            OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, u"" ) );//@todo read CID from model
             ShapeFactory::setShapeName( xShape, aFloorCID );
         }
     }
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 56a64d349e6f..e449680daf4c 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2358,7 +2358,7 @@ void formatPage(
         tPropertyNameValueMap aNameValueMap;
         PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage );
 
-        OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) );
         aNameValueMap.emplace( "Name", uno::Any( aCID ) ); //CID OUString
 
         tNameSequence aNames;
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index d3c4dcd857e8..35606be26fa0 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -353,7 +353,7 @@ void VDataSeries::setParticle( const OUString& rSeriesParticle )
     m_aPointCID_Stub = ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT, m_aSeriesParticle );
 
     m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
-                        OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() );
+                        OBJECTTYPE_DATA_LABEL, u"", getLabelsCID() );
 }
 OUString VDataSeries::getErrorBarsCID(bool bYError) const
 {