diff options
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/virdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 07590f373360..dbed1f08a455 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -421,7 +421,7 @@ protected: @param bRelease Determines whether to release the fonts of the physically released graphics device. */ - virtual void ImplReleaseGraphics( bool bRelease = true ) = 0; + virtual void ReleaseGraphics( bool bRelease = true ) = 0; public: /** Initialize the graphics device's data structures. diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index a51122e71bae..605c21a6d560 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -230,7 +230,6 @@ private: bool mbIsQueuePrinter; Link maErrorHdl; - void ImplReleaseFonts() SAL_OVERRIDE; SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); @@ -255,7 +254,8 @@ public: protected: virtual bool AcquireGraphics() const SAL_OVERRIDE; - virtual void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + virtual void ImplReleaseFonts() SAL_OVERRIDE; virtual long GetGradientStepCount( long nMinRect ) SAL_OVERRIDE; virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE; diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 16272703a592..87205c7d9f38 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -63,7 +63,7 @@ private: protected: virtual bool AcquireGraphics() const SAL_OVERRIDE; - virtual void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; public: /** Create a virtual device of size 1x1 diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d8d88558ae5f..39f9357aaf9d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -375,8 +375,6 @@ private: friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); - bool AcquireGraphics() const SAL_OVERRIDE; - void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; SAL_DLLPRIVATE WinBits ImplInitRes( const ResId& rResId ); SAL_DLLPRIVATE WindowResHeader ImplLoadResHeader( const ResId& rResId ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -566,6 +564,9 @@ protected: void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); void FireVclEvent( VclSimpleEvent* pEvent ); + virtual bool AcquireGraphics() const SAL_OVERRIDE; + virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + // FIXME: this is a hack to workaround missing layout functionality SAL_DLLPRIVATE void ImplAdjustNWFSizes(); |