1 files changed, 12 insertions, 16 deletions
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx
index 07551aefa1d7..7035ba916081 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -22,9 +22,6 @@
 #include <ObjectIdentifier.hxx>
 #include <TitleHelper.hxx>
 
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::frame { class XModel; }
-
 namespace chart
 {
 
@@ -35,34 +32,33 @@ class ObjectNameProvider
 {
 public:
     static OUString getName( ObjectType eObjectType, bool bPlural=false );
-    static OUString getAxisName( const OUString& rObjectCID
-                        , const css::uno::Reference< css::frame::XModel >& xChartModel  );
-    static OUString getGridName( const OUString& rObjectCID
-                        , const css::uno::Reference< css::frame::XModel >& xChartModel );
-    static OUString getTitleName( const OUString& rObjectCID
-                        , const css::uno::Reference< css::frame::XModel >& xChartModel );
+    static OUString getAxisName( std::u16string_view rObjectCID
+                        , const rtl::Reference<::chart::ChartModel>& xChartModel  );
+    static OUString getGridName( std::u16string_view rObjectCID
+                        , const rtl::Reference<::chart::ChartModel>& xChartModel );
+    static OUString getTitleName( std::u16string_view rObjectCID
+                        , const rtl::Reference<::chart::ChartModel>& xChartModel );
     static OUString getTitleNameByType( TitleHelper::eTitleType eType );
 
     static OUString getNameForCID(
-        const OUString& rObjectCID,
-        const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument );
+        std::u16string_view rObjectCID,
+        const rtl::Reference<::chart::ChartModel>& xChartDocument );
 
     static OUString getName_ObjectForSeries(
         ObjectType eObjectType,
-        const OUString& rSeriesCID,
-        const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument );
+        std::u16string_view rSeriesCID,
+        const rtl::Reference<::chart::ChartModel>& xChartDocument );
     static OUString getName_ObjectForAllSeries( ObjectType eObjectType );
 
     /** Provides help texts for the various chart elements.
         The parameter rObjectCID has to be a ClassifiedIdentifier - see class ObjectIdentifier.
      */
-    static OUString getHelpText( const OUString& rObjectCID, const css::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false );
-    static OUString getHelpText( const OUString& rObjectCID, const css::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
+    static OUString getHelpText( std::u16string_view rObjectCID, const rtl::Reference<::chart::ChartModel>& xChartModel, bool bVerbose=false );
 
     /** This is used for showing the currently selected object in the status bar
         (command "Context")
      */
-    static OUString getSelectedObjectText( const OUString & rObjectCID, const css::uno::Reference< css::chart2::XChartDocument >& xChartDocument );
+    static OUString getSelectedObjectText( std::u16string_view rObjectCID, const rtl::Reference<::chart::ChartModel>& xChartDocument );
 };
 
 } //namespace chart