[Libreoffice-commits] .: cui/source framework/source sc/source svx/source vcl/inc vcl/source

[Tor Lillqvist]

 cui/source/customize/cfg.cxx                |    1 +
 framework/source/services/backingwindow.cxx |    1 +
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx     |    1 +
 svx/source/dialog/_contdlg.cxx              |    1 +
 vcl/inc/vcl/toolbox.hxx                     |    2 --
 vcl/source/window/toolbox.cxx               |    2 --
 vcl/source/window/window.cxx                |    1 +
 7 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 10ff11e70c59d2e9cd9218faedef2b2b507f852f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jun 8 22:04:48 2012 +0300

    Do what the TODO said: Remove unused member and inclusion of vcl/virdev.hxx
    
    Add header back in a few C++ files elsewhere.
    
    Change-Id: I041ed39ff9bb26d1f42f3614ca50dbc085f13861

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index adaeaaa..c033c75 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -34,6 +34,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/virdev.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 1755b98..019619e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -40,6 +40,7 @@
 #include "vcl/mnemonic.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/virdev.hxx"
 
 #include "tools/urlobj.hxx"
 
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index e3e8700..df7b87b 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -28,6 +28,7 @@
 #include "tbzoomsliderctrl.hxx"
 #include <vcl/image.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/gradient.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index ddc11ed..db68e58 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -60,6 +60,7 @@
 #include <svx/svdopath.hxx>
 #include "svx/dlgutil.hxx"
 #include <vcl/svapp.hxx>
+#include <vcl/virdev.hxx>
 #include "dlgunit.hxx"
 
 SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index 75ff319..8e1270f 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -34,7 +34,6 @@
 #include <vcl/dockwin.hxx>
 #include <vcl/image.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/virdev.hxx>
 
 class UserDrawEvent;
 
@@ -176,7 +175,6 @@ class VCL_DLLPUBLIC ToolBox : public DockingWindow
 
 private:
     ImplToolBoxPrivateData*     mpData;
-    VirtualDevice*              mpBtnDev; // TODO: remove unused member
     ImplToolSizeArray*  mpFloatSizeAry;
     XubString           maCvtStr;
     XubString           maNextToolBoxStr;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 370eb0d..aeb2351 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -39,7 +39,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/spin.h>
 #include <vcl/toolbox.hxx>
 #include <vcl/bitmap.hxx>
@@ -1541,7 +1540,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
 
     // initialize variables
     ImplGetWindowImpl()->mbToolBox         = sal_True;
-    mpBtnDev          = NULL;
     mpFloatSizeAry    = NULL;
     mpData                = new ImplToolBoxPrivateData;
     mpFloatWin        = NULL;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a7c3d11..e55a092 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -56,6 +56,7 @@
 #include "vcl/gdimtf.hxx"
 #include "vcl/pdfextoutdevdata.hxx"
 #include "vcl/lazydelete.hxx"
+#include "vcl/virdev.hxx"
 
 // declare system types in sysdata.hxx
 #include "svsys.h"