[Libreoffice-commits] core.git: sw/inc sw/source

[Caolán McNamara (via logerrit)]

 sw/inc/viewopt.hxx                  |    3 +--
 sw/source/uibase/config/viewopt.cxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit df0c80eef320ceeedacfab27f4da4c4ddbebb4bf
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 12 12:03:35 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 12 16:47:29 2021 +0100

    we just use the OutputDevice api for SwViewOption::Init
    
    Change-Id: I36a52d0e02d6a2fa900abc579d7d1018fc5381f3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112388
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 006a3f9b3dd3..c1ae8daa452f 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -30,7 +30,6 @@
 #include "swdllapi.h"
 
 class SwRect;
-namespace vcl { class Window; }
 class OutputDevice;
 class SwDocShell;
 namespace svtools{ class ColorConfig;}
@@ -201,7 +200,7 @@ public:
             SwViewOption(const SwViewOption&);
             ~SwViewOption();
 
-    static void Init( vcl::Window const *pWin );        // Initializing of static data.
+    static void Init(const OutputDevice* pWin);        // Initializing of static data.
 
     ViewOptFlags1   GetCoreOptions() const {return m_nCoreOptions;}
     inline void     SetUIOptions( const SwViewOption& );
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index c58e734f83ab..99ad4caf97a1 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -323,7 +323,7 @@ SwViewOption::~SwViewOption()
 {
 }
 
-void SwViewOption::Init( vcl::Window const *pWin )
+void SwViewOption::Init(const OutputDevice* pWin)
 {
     if( !s_nPixelTwips && pWin )
     {