1 files changed, 8 insertions, 9 deletions
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 1b867cb562f8..863436c3bab0 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -19,10 +19,9 @@
 
 #include "StatusBarCommandDispatch.hxx"
 #include <ObjectNameProvider.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
 #include <ChartModel.hxx>
+#include <utility>
 
 using namespace ::com::sun::star;
 
@@ -34,10 +33,10 @@ namespace chart
 
 StatusBarCommandDispatch::StatusBarCommandDispatch(
     const Reference< uno::XComponentContext > & xContext,
-    const rtl::Reference<::chart::ChartModel> & xModel,
+    rtl::Reference<::chart::ChartModel> xModel,
     const Reference< view::XSelectionSupplier > & xSelSupp ) :
         impl::StatusBarCommandDispatch_Base( xContext ),
-        m_xChartModel( xModel  ),
+        m_xChartModel(std::move( xModel  )),
         m_xSelectionSupplier( xSelSupp ),
         m_bIsModified( false )
 {}
@@ -66,18 +65,18 @@ void StatusBarCommandDispatch::fireStatusEvent(
     bool bFireContext(  bFireAll || rURL == ".uno:Context" );
     bool bFireModified( bFireAll || rURL == ".uno:ModifiedStatus" );
 
-    if( bFireContext )
+    if( bFireContext && m_xChartModel.is())
     {
         uno::Any aArg;
         aArg <<= ObjectNameProvider::getSelectedObjectText( m_aSelectedOID.getObjectCID(), m_xChartModel );
-        fireStatusEventForURL( ".uno:Context", aArg, true, xSingleListener );
+        fireStatusEventForURL( u".uno:Context"_ustr, aArg, true, xSingleListener );
     }
     if( bFireModified )
     {
         uno::Any aArg;
         if( m_bIsModified )
-            aArg <<= OUString("*");
-        fireStatusEventForURL( ".uno:ModifiedStatus", aArg, true, xSingleListener );
+            aArg <<= u"*"_ustr;
+        fireStatusEventForURL( u".uno:ModifiedStatus"_ustr, aArg, true, xSingleListener );
     }
 }
 
@@ -91,7 +90,7 @@ void SAL_CALL StatusBarCommandDispatch::dispatch(
 
 // ____ WeakComponentImplHelperBase ____
 /// is called when this is disposed
-void SAL_CALL StatusBarCommandDispatch::disposing()
+void StatusBarCommandDispatch::disposing(std::unique_lock<std::mutex>& /*rGuard*/)
 {
     m_xChartModel.clear();
     m_xSelectionSupplier.clear();