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

Michael Meeks michael.meeks at collabora.com
Tue Apr 28 09:51:29 PDT 2015


 sw/inc/viewsh.hxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 433fb8c055ff93a9bb3567310d2dda6bbcc9d635
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Apr 28 17:57:39 2015 +0100

    Clean VclPtr and namespace usage.
    
    Change-Id: I75142b8f72bb05c8b386f7511e5c18d4775eecde

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index f093028..714e9d2 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -30,6 +30,7 @@
 #include <stack>
 #include <vcl/mapmod.hxx>
 #include <vcl/print.hxx>
+#include <vcl/vclptr.hxx>
 #define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 
@@ -128,7 +129,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
     SwViewShellImp *mpImp;           // Core-internals of SwViewShell.
                                      // The pointer is never 0.
 
-    VclPtr< ::vcl::Window> mpWin;     ///< = 0 during printing or pdf export
+    VclPtr<vcl::Window>   mpWin;     ///< = 0 during printing or pdf export
     VclPtr<OutputDevice>  mpOut;     ///< Window, Printer, VirtDev, ...
     VclPtr<OutputDevice>  mpTmpRef;  // Temporariy reference device. Is used
                                      // during (printer depending) prospect
@@ -186,7 +187,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
 
 protected:
     static ShellResource*   mpShellRes;      ///< Resources for the Shell.
-    static vcl::Window*          mpCareWindow;    ///< Avoid this window.
+    static vcl::Window*     mpCareWindow;    ///< Avoid this window.
 
     SwRect                  maVisArea;       ///< The modern version of VisArea.
     SwDoc                   *mpDoc;          ///< The document; never 0.


More information about the Libreoffice-commits mailing list