1 files changed, 9 insertions, 8 deletions
diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx
index c84e87af36ad..b9da29954a02 100644
--- a/chart2/source/inc/ControllerLockGuard.hxx
+++ b/chart2/source/inc/ControllerLockGuard.hxx
@@ -18,8 +18,9 @@
  */
 #pragma once
 
+#include <config_options.h>
 #include "charttoolsdllapi.hxx"
-#include <com/sun/star/uno/Reference.h>
+#include <rtl/ref.hxx>
 
 namespace chart
 {
@@ -36,14 +37,14 @@ namespace chart
     unlockControllers in the DTOR.  Using this ensures that controllers do not
     remain locked when leaving a function even in case an exception is thrown.
  */
-class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuardUNO
+class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ControllerLockGuardUNO
 {
 public:
-    explicit ControllerLockGuardUNO(const css::uno::Reference<css::frame::XModel>& xModel);
+    explicit ControllerLockGuardUNO(rtl::Reference<::chart::ChartModel> xModel);
     ~ControllerLockGuardUNO();
 
 private:
-    css::uno::Reference<css::frame::XModel> mxModel;
+    rtl::Reference<::chart::ChartModel> mxModel;
 };
 
 class ControllerLockGuard
@@ -62,17 +63,17 @@ private:
     Use the ControllerLockHelperGuard to lock/unlock the model during a block of
     instructions.
  */
-class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelper
+class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ControllerLockHelper
 {
 public:
-    explicit ControllerLockHelper(const css::uno::Reference<css::frame::XModel>& xModel);
+    explicit ControllerLockHelper(rtl::Reference<::chart::ChartModel> xModel);
     ~ControllerLockHelper();
 
     SAL_DLLPRIVATE void lockControllers();
     SAL_DLLPRIVATE void unlockControllers();
 
 private:
-    css::uno::Reference<css::frame::XModel> m_xModel;
+    rtl::Reference<::chart::ChartModel> m_xModel;
 };
 
 /** This guard calls lockControllers at the given ControllerLockHelper in the
@@ -80,7 +81,7 @@ private:
     do not remain locked when leaving a function even in case an exception is
     thrown.
  */
-class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelperGuard
+class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ControllerLockHelperGuard
 {
 public:
     explicit ControllerLockHelperGuard(ControllerLockHelper& rHelper);