diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-06-08 22:04:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-06-09 23:51:08 +0300 |
| commit | 10ff11e70c59d2e9cd9218faedef2b2b507f852f (patch) | |
| tree | 4e0ab632ffa0b8ec84145fc089530037d3910b24 /vcl | |
| parent | 15201d37a48ba759ac2aa6f4f5b6bd15d53f0416 (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/toolbox.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 75ff319dbc12..8e1270ff8c77 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 370eb0d4cf69..aeb23517df35 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 a7c3d1165846..e55a0928d5a5 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" |