1 files changed, 15 insertions, 11 deletions

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index ed94c0b0fa45..f5c79133434c 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -30,6 +30,7 @@
 #include <comphelper/lok.hxx>
 #include <sal/log.hxx>
 #include <sfx2/viewsh.hxx>
+#include <utility>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 namespace chart::sidebar {
@@ -38,6 +39,9 @@ namespace {
 
 OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel)
 {
+    if (!xModel.is())
+        return OUString();
+
     css::uno::Reference<css::frame::XController> xController(xModel->getCurrentController());
     css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(xController, css::uno::UNO_QUERY);
     if (!xSelectionSupplier.is())
@@ -77,16 +81,16 @@ css::uno::Reference<css::beans::XPropertySet> getPropSet(
 }
 
 ChartColorWrapper::ChartColorWrapper(
-        rtl::Reference<::chart::ChartModel> const & xModel,
+        rtl::Reference<::chart::ChartModel> xModel,
         SvxColorToolBoxControl* pControl,
-        const OUString& rName):
-    mxModel(xModel),
+        OUString aName):
+    mxModel(std::move(xModel)),
     mpControl(pControl),
-    maPropertyName(rName)
+    maPropertyName(std::move(aName))
 {
 }
 
-void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const svx::NamedThemedColor& rColor)
+void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const NamedColor& rColor)
 {
     css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
 
@@ -96,7 +100,7 @@ void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const svx:
         return;
     }
 
-    xPropSet->setPropertyValue(maPropertyName, css::uno::makeAny(rColor.m_aColor));
+    xPropSet->setPropertyValue(maPropertyName, css::uno::Any(rColor.m_aColor));
 }
 
 void ChartColorWrapper::updateModel(const rtl::Reference<::chart::ChartModel>& xModel)
@@ -106,7 +110,7 @@ void ChartColorWrapper::updateModel(const rtl::Reference<::chart::ChartModel>& x
 
 void ChartColorWrapper::updateData()
 {
-    static constexpr OUStringLiteral aLineColor = u"LineColor";
+    static constexpr OUString aLineColor = u"LineColor"_ustr;
     static const std::u16string_view aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"};
 
     css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
@@ -125,18 +129,18 @@ void ChartColorWrapper::updateData()
     SfxViewShell* pViewShell = SfxViewShell::Current();
     if (comphelper::LibreOfficeKit::isActive() && pViewShell && (maPropertyName == aLineColor))
     {
-        std::string sCommand = OUStringToOString(aUrl.Complete, RTL_TEXTENCODING_ASCII_US).getStr();
+        OString sCommand = OUStringToOString(aUrl.Complete, RTL_TEXTENCODING_ASCII_US);
         sal_Int32 nColor = -1;
         aEvent.State >>= nColor;
         pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
-                                               (sCommand + "=" + std::to_string(nColor)).c_str());
+                                               sCommand + "=" + OString::number(nColor));
     }
 }
 
 ChartLineStyleWrapper::ChartLineStyleWrapper(
-        rtl::Reference<::chart::ChartModel> const & xModel,
+        rtl::Reference<::chart::ChartModel> xModel,
         SvxLineStyleToolBoxControl* pControl)
-    : mxModel(xModel)
+    : mxModel(std::move(xModel))
     , mpControl(pControl)
 {
 }