use more concrete UNO types in sw

Change-Id: I2650eff8bd5bb222c123255a7e3cb4aa3c36fc10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 21 insertions, 13 deletions

diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index cfaef237b2c3..9c3a7efa35db 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -69,6 +69,7 @@ namespace com::sun::star::scanner { class XScannerManager2; }
 namespace com::sun::star::linguistic2 { class XLanguageGuessing; }
 namespace com::sun::star::linguistic2 { class XLinguServiceEventListener; }
 namespace ooo::vba { class XSinkCaller; }
+class SwLinguServiceEventListener;
 
 class SAL_DLLPUBLIC_RTTI SwModule final : public SfxModule, public SfxListener, public utl::ConfigurationListener
 {
@@ -103,7 +104,7 @@ class SAL_DLLPUBLIC_RTTI SwModule final : public SfxModule, public SfxListener,
     std::vector<OUString> m_pAuthorNames;
 
     // DictionaryList listener to trigger spellchecking or hyphenation
-    css::uno::Reference< css::linguistic2::XLinguServiceEventListener > m_xLinguServiceEventListener;
+    rtl::Reference< SwLinguServiceEventListener > m_xLinguServiceEventListener;
     css::uno::Reference< css::scanner::XScannerManager2 >    m_xScannerManager;
     css::uno::Reference< css::linguistic2::XLanguageGuessing >  m_xLanguageGuesser;
 
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 074c24d0e70b..f11781304814 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -46,6 +46,7 @@ class SwDoc;
 class SwFormat;
 class SwUnoInternalPaM;
 class SfxItemPropertySet;
+class SwXOLEListener;
 namespace com::sun::star::frame { class XModel; }
 
 class BaseFrameProperties_Impl;
@@ -275,7 +276,7 @@ typedef cppu::ImplInheritanceHelper
 
 class SW_DLLPUBLIC SwXTextEmbeddedObject final : public SwXTextEmbeddedObjectBaseClass
 {
-    css::uno::Reference<css::util::XModifyListener> m_xOLEListener;
+    rtl::Reference<SwXOLEListener> m_xOLEListener;
 
     friend class SwXFrame; // just for CreateXFrame
 
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 0ae5a914cda2..b607d53e9b4a 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -51,6 +51,7 @@ class SwXPageStyle;
 class SwXFrameStyle;
 class StyleFamilyEntry;
 class SwXStyleFamily;
+class SwXAutoStyleFamily;
 
 class SAL_DLLPUBLIC_RTTI SwXStyleFamilies final : public cppu::WeakImplHelper
 <
@@ -115,9 +116,9 @@ class SwXAutoStyles final :
     public SwUnoCollection
 {
     SwDocShell *m_pDocShell;
-    css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles;
-    css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles;
-    css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles;
+    rtl::Reference< SwXAutoStyleFamily > m_xAutoCharStyles;
+    rtl::Reference< SwXAutoStyleFamily > m_xAutoRubyStyles;
+    rtl::Reference< SwXAutoStyleFamily > m_xAutoParaStyles;
     virtual ~SwXAutoStyles() override;
 
 public:
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index f5f61ef9242a..68ce93ff4875 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -122,6 +122,7 @@ class SvXMLEmbeddedObjectHelper;
 class SwXFieldmark;
 class SwXSection;
 class SwXFieldMaster;
+class SvNumberFormatsSupplierObj;
 namespace com::sun::star::container { class XNameContainer; }
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::lang { struct Locale; }
@@ -188,7 +189,7 @@ private:
     rtl::Reference<SwFmDrawPage>                                m_xDrawPage;
 
     rtl::Reference<SwXBodyText>                                 m_xBodyText;
-    css::uno::Reference< css::uno::XAggregation >               m_xNumFormatAgg;
+    rtl::Reference< SvNumberFormatsSupplierObj >                m_xNumFormatAgg;
 
     rtl::Reference<SwXNumberingRulesCollection>                 mxXNumberingRules;
     rtl::Reference<SwXFootnotes>                                mxXFootnotes;
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 13680ffa5f8a..4383c8df7bfd 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -27,13 +27,14 @@
 
 class SwFlyFrame;
 class SwNoTextNode;
+class SwAccessibleNoTextHyperlink;
 
 class SwAccessibleNoTextFrame : public  SwAccessibleFrameBase,
                                 public css::accessibility::XAccessibleImage,
                                 public css::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink
 {
     friend class SwAccessibleNoTextHyperlink;
-    css::uno::Reference< css::accessibility::XAccessibleHyperlink > m_xHyperlink;
+    rtl::Reference< SwAccessibleNoTextHyperlink > m_xHyperlink;
     OUString msTitle;
     OUString msDesc;
 
diff --git a/sw/source/core/docnode/threadmanager.hxx b/sw/source/core/docnode/threadmanager.hxx
index ace0bc03164b..9e423accd48c 100644
--- a/sw/source/core/docnode/threadmanager.hxx
+++ b/sw/source/core/docnode/threadmanager.hxx
@@ -27,7 +27,7 @@
 #include <deque>
 #include <cppuhelper/weakref.hxx>
 #include <observablethread.hxx>
-
+#include "cancellablejob.hxx"
 #include <memory>
 
 namespace com::sun::star::util { class XCancellable; }
@@ -99,7 +99,7 @@ class ThreadManager final
         {
             oslInterlockedCount nThreadID;
             ::rtl::Reference< ObservableThread > pThread;
-            css::uno::Reference< css::util::XCancellable > aJob;
+            rtl::Reference< CancellableJob > aJob;
 
             tThreadData()
                 : nThreadID( 0 ),
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 30510384630f..9d22415ecec6 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -69,7 +69,7 @@ using namespace ::com::sun::star::ui::dialogs;
 
 struct SwMailMergeDlg_Impl {
     uno::Reference<runtime::XFormController> xFController;
-    uno::Reference<XSelectionChangeListener> xChgLstnr;
+    rtl::Reference<SwXSelChgLstnr_Impl> xChgLstnr;
     uno::Reference<XSelectionSupplier> xSelSupp;
 };
 
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 961637788f5a..87f1b9baeb99 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -29,6 +29,7 @@
 #include <vcl/svapp.hxx>
 
 class SwView;
+class SwXDispatch;
 
 class SwXDispatchProviderInterceptor final : public cppu::WeakImplHelper
 <
@@ -56,7 +57,7 @@ class SwXDispatchProviderInterceptor final : public cppu::WeakImplHelper
     css::uno::Reference< css::frame::XDispatchProvider>           m_xSlaveDispatcher;
     css::uno::Reference< css::frame::XDispatchProvider>           m_xMasterDispatcher;
 
-    css::uno::Reference< css::frame::XDispatch>                   m_xDispatch;
+    rtl::Reference<SwXDispatch>                                   m_xDispatch;
 
     SwView* m_pView;
 
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 758677f10b8c..6fb5214bbc44 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -32,6 +32,8 @@ class SwView;
 class SwViewOption;
 class SwPrintData;
 class SwDoc;
+class SwXViewSettings;
+class SwXPrintSettings;
 
 css::uno::Reference< css::uno::XInterface >  SAL_CALL SwXModule_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & );
 
@@ -43,8 +45,8 @@ class SwXModule final : public cppu::WeakImplHelper
 >
 {
 
-    css::uno::Reference< css::beans::XPropertySet >     mxViewSettings;
-    css::uno::Reference< css::beans::XPropertySet >     mxPrintSettings;
+    rtl::Reference< SwXViewSettings >     mxViewSettings;
+    rtl::Reference< SwXPrintSettings >    mxPrintSettings;
 
     virtual ~SwXModule() override;
 public: