diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-24 17:52:38 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:07:52 +0100 |
| commit | 7acf94a7cfca389e73016ec337708498bc12cc3c (patch) | |
| tree | ea64b1dd7f8d30f90fbc5ce1049a47513630f381 /include/vcl | |
| parent | baf676996b8187e5300672b8e381ab7f86ce6fd0 (diff) | |
vcl: remove curious self referential OutputDevice ptr.
No need to pay a per-instance cost for this, also avoid a self
reference for every Window sub-class.
Change-Id: I040a0ede9481229e43a39bc23297969e90b95f5e
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/window.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 0ee581a9d298..a9ee87d2995e 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -416,10 +416,6 @@ private: WindowImpl* mpWindowImpl; - // This is a first attempt to start to remove the dependency of Window on - // OutputDevice - VclPtr<::OutputDevice> mpOutputDevice; - #ifdef DBG_UTIL friend const char* ::ImplDbgCheckWindow( const void* pObj ); #endif @@ -695,8 +691,8 @@ public: Window( vcl::Window* pParent, const ResId& rResId ); virtual ~Window(); - ::OutputDevice const* GetOutDev() const { return mpOutputDevice; }; - ::OutputDevice* GetOutDev() { return mpOutputDevice; }; + ::OutputDevice const* GetOutDev() const; + ::OutputDevice* GetOutDev(); virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ); |