[Libreoffice-commits] core.git: Branch 'feature/vclptr' - basctl/source filter/source include/sfx2 sc/inc sc/source svx/source

[Michael Meeks]

 basctl/source/basicide/basdoc.hxx         |    5 ++---
 filter/source/flash/swfwriter.cxx         |    1 -
 filter/source/flash/swfwriter.hxx         |    3 ++-
 include/sfx2/ipclient.hxx                 |    2 +-
 sc/inc/dociter.hxx                        |    1 +
 sc/inc/document.hxx                       |    2 +-
 sc/inc/editutil.hxx                       |    2 +-
 sc/source/ui/inc/AccessibleEditObject.hxx |    3 ++-
 svx/source/inc/fmexch.hxx                 |    5 +----
 9 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit efcce8fc8478207d58069ee992aab4ff7b07f619
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Apr 10 21:00:13 2015 +0100

    VclPtr: unfortunate includes needed for inlining ref/unref.
    
    Something of a compile time vs. run-time choice.
    
    Change-Id: I7e9db3a6f14d352e0b78abd5f22ccc593aceb001

diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 65bfb89..083049c 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -23,11 +23,10 @@
 #include <iderid.hxx>
 #include <sfx2/docfac.hxx>
 #include <svx/ifaceids.hxx>
-
+#include <vcl/vclptr.hxx>
+#include <sfx2/printer.hxx>
 #include <boost/scoped_ptr.hpp>
 
-class SfxPrinter;
-
 namespace basctl
 {
 
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 7df9404..9f80ca9 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -49,7 +49,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
     mnGlobalTransparency(0),
     mnJPEGCompressMode(nJPEGcompressMode)
 {
-    mpVDev = new VirtualDevice;
     mpVDev->EnableOutput( false );
 
     maMovieTempFile.EnableKillingFile();
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 2e98ab1..7864102 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <vcl/font.hxx>
 #include <vcl/gradient.hxx>
+#include <vcl/vclptr.hxx>
 #include <unotools/tempfile.hxx>
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
@@ -395,7 +396,7 @@ private:
     sal_uInt16 mnWhiteBackgroundShapeId;
     sal_uInt16 mnPageButtonId;
 
-    VclPtr<VirtualDevice> mpVDev;
+    VclPtrInstance<VirtualDevice> mpVDev;
 
     const tools::PolyPolygon* mpClipPolyPolygon;
 
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 5628218..9022f73 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -29,11 +29,11 @@
 #include <tools/gen.hxx>
 
 #include <sfx2/objsh.hxx>
+#include <vcl/window.hxx>
 
 class SfxInPlaceClient_Impl;
 class SfxViewShell;
 class SfxObjectShell;
-namespace vcl { class Window; }
 class Fraction;
 
 
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index a170fd2..5b32930 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -26,6 +26,7 @@
 #include "scdllapi.h"
 #include "cellvalue.hxx"
 #include "mtvelements.hxx"
+#include <vcl/vclptr.hxx>
 
 #include <memory>
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6e9e247..cec4ba9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -24,7 +24,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ref.hxx>
+#include <vcl/vclptr.hxx>
 #include "scdllapi.h"
 #include "rangelst.hxx"
 #include "rangenam.hxx"
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index bd76598..5e3a126 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -28,8 +28,8 @@
 #include <tools/time.hxx>
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
+#include <vcl/outdev.hxx>
 
-class OutputDevice;
 class ScDocument;
 class ScPatternAttr;
 class ScEditEngineDefaulter;
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index e420180..1c7c585 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include "global.hxx"
+#include <vcl/window.hxx>
 
 namespace accessibility
 {
@@ -188,7 +189,7 @@ public:
 private:
     accessibility::AccessibleTextHelper* mpTextHelper;
     EditView*      mpEditView;
-    VclPtr<vcl::Window>        mpWindow;
+    VclPtr<vcl::Window> mpWindow;
     EditObjectType meObjectType;
     bool           mbHasFocus;
 
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 8c2c6b2..09ab923 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -28,15 +28,12 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/form/XForms.hpp>
 #include <tools/link.hxx>
-
+#include <vcl/window.hxx>
 #include <svx/svxdllapi.h>
 
 class SvTreeListEntry;
-
-
 class SvTreeListBox;
 
-
 namespace svxform
 {