1 files changed, 9 insertions, 12 deletions
diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx
index b985558a3a0b..de04e4c91b4d 100644
--- a/chart2/source/controller/main/ToolbarController.cxx
+++ b/chart2/source/controller/main/ToolbarController.cxx
@@ -19,21 +19,18 @@ namespace com::sun::star::uno { class XComponentContext; }
 
 namespace chart {
 
-ChartToolbarController::ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties):
-    ChartToolbarControllerBase(m_aMutex)
+ChartToolbarController::ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties)
 {
-    css::uno::Reference<css::frame::XFrame> xFrame;
-    sal_Int32 nLength = rProperties.getLength();
-    for (sal_Int32 i = 0; i < nLength; ++i)
+    for (const auto& rProperty : rProperties)
     {
         css::beans::PropertyValue aPropValue;
-        rProperties[i] >>= aPropValue;
+        rProperty >>= aPropValue;
         if (aPropValue.Name == "Frame")
-            aPropValue.Value >>= xFrame;
+        {
+            mxFramesSupplier.set(aPropValue.Value, css::uno::UNO_QUERY);
+            break;
+        }
     }
-
-    css::uno::Reference<css::frame::XFramesSupplier> xFramesSupplier(xFrame, css::uno::UNO_QUERY);
-    mxFramesSupplier = xFramesSupplier;
 }
 
 ChartToolbarController::~ChartToolbarController()
@@ -100,7 +97,7 @@ void ChartToolbarController::update()
 
 OUString ChartToolbarController::getImplementationName()
 {
-    return "org.libreoffice.chart2.Chart2ToolboxController";
+    return u"org.libreoffice.chart2.Chart2ToolboxController"_ustr;
 }
 
 sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName)
@@ -110,7 +107,7 @@ sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName)
 
 css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames()
 {
-    return { "com.sun.star.frame.ToolbarController" };
+    return { u"com.sun.star.frame.ToolbarController"_ustr };
 }
 
 }