[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara (via logerrit)]

 include/svx/unoshtxt.hxx                               |    4 ++--
 svx/source/accessibility/AccessibleEmptyEditSource.cxx |    6 +++---
 svx/source/accessibility/AccessibleEmptyEditSource.hxx |    6 +++---
 svx/source/unodraw/unoshtxt.cxx                        |    8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 205f141a638a1906fd561629821293938385d5d3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 2 11:10:51 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 2 17:02:39 2019 +0200

    we only need an OutputDevice here, not a Window
    
    Change-Id: I2ba8f61b8dc8570677f3a8f955e3a2cd9bfcd98c
    Reviewed-on: https://gerrit.libreoffice.org/78391
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index 9acd57f6172c..33ba30d58d6e 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -37,7 +37,7 @@ class SvxTextForwarder;
 class SdrObject;
 class SdrModel;
 class SdrView;
-namespace vcl { class Window; }
+class OutputDevice;
 class SvxTextEditSourceImpl;
 class SdrText;
 
@@ -51,7 +51,7 @@ public:
 
         The window is necessary, since our views can display on multiple windows
      */
-    SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rViewWindow );
+    SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const OutputDevice& rViewWindow );
     SvxTextEditSource(const SvxTextEditSource&) = delete;
     SvxTextEditSource& operator=(const SvxTextEditSource&) = delete;
     virtual ~SvxTextEditSource() override;
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index dea02a4fc359..7f179a042608 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -53,7 +53,7 @@ namespace accessibility
          */
         AccessibleProxyEditSource_Impl( SdrObject&      rObj,
                                         SdrView&        rView,
-                                        const vcl::Window&   rViewWindow );
+                                        const OutputDevice&   rViewWindow );
 
         // from the SvxEditSource interface
         SvxTextForwarder*       GetTextForwarder() override;
@@ -169,7 +169,7 @@ namespace accessibility
 
     AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject&      rObj,
                                                                     SdrView&        rView,
-                                                                    const vcl::Window&   rViewWindow ) :
+                                                                    const OutputDevice&   rViewWindow ) :
         maEditSource( rObj, nullptr, rView, rViewWindow )
     {
     }
@@ -210,7 +210,7 @@ namespace accessibility
 
     AccessibleEmptyEditSource::AccessibleEmptyEditSource( SdrObject&    rObj,
                                                           SdrView&      rView,
-                                                          const vcl::Window& rViewWindow ) :
+                                                          const OutputDevice& rViewWindow ) :
         mpEditSource( new AccessibleEmptyEditSource_Impl() ),
         mrObj(rObj),
         mrView(rView),
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index beb3bdae9f9d..6cfceeda4645 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -28,7 +28,7 @@
 
 class SdrObject;
 class SdrView;
-namespace vcl { class Window; }
+class OutputDevice;
 
 namespace accessibility
 {
@@ -49,7 +49,7 @@ namespace accessibility
             Make sure you only create such an object if the shape _really_
             does not contain text.
         */
-        AccessibleEmptyEditSource(  SdrObject& rObj, SdrView& rView, const vcl::Window& rViewWindow );
+        AccessibleEmptyEditSource(  SdrObject& rObj, SdrView& rView, const OutputDevice& rViewWindow );
         virtual ~AccessibleEmptyEditSource() override;
 
         // from the SvxEditSource interface
@@ -81,7 +81,7 @@ namespace accessibility
 
         SdrObject&                      mrObj;
         SdrView&                        mrView;
-        const vcl::Window&                   mrViewWindow;
+        const OutputDevice&             mrViewWindow;
 
         bool                            mbEditSourceEmpty;
     };
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 33325a963cb4..0e8acc23db42 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -84,7 +84,7 @@ private:
     SdrObject*                      mpObject;           // TTTT could be reference (?)
     SdrText*                        mpText;
     SdrView*                        mpView;
-    VclPtr<const vcl::Window>       mpWindow;
+    VclPtr<const OutputDevice>      mpWindow;
     SdrModel*                       mpModel;            // TTTT probably not needed -> use SdrModel from SdrObject (?)
     std::unique_ptr<SdrOutliner>    mpOutliner;
     std::unique_ptr<SvxOutlinerForwarder> mpTextForwarder;
@@ -119,7 +119,7 @@ private:
 
 public:
     SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText );
-    SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow );
+    SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const OutputDevice& rWindow );
     virtual ~SvxTextEditSourceImpl() override;
 
     void acquire();
@@ -184,7 +184,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
 }
 
 
-SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow )
+SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const OutputDevice& rWindow )
   : maRefCount      ( 0 ),
     mpObject        ( &rObject ),
     mpText          ( pText ),
@@ -916,7 +916,7 @@ SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText )
 }
 
 
-SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rWindow )
+SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const OutputDevice& rWindow )
 {
     mpImpl = new SvxTextEditSourceImpl( rObj, pText, rView, rWindow );
 }