diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:56:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:56:44 +0100 |
| commit | 35ddbcbc42628c57c3e5fda1a3e221231d21803b (patch) | |
| tree | f74feb97b7ef5ebe743e1aa13e4505158cac8efd /include | |
| parent | 2d832c264801a8b1e155d33d1506af55dc6e207f (diff) | |
Fix merge conflicts
Change-Id: I6e099911afec9c4086f620b45656880135decff0
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/virdev.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 2713567b0608..2b82d2cf067a 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -113,7 +113,7 @@ public: virtual ~VirtualDevice(); - virtual void EnableRTL( bool bEnable = true ) SAL_OVERRIDE; + virtual void EnableRTL( bool bEnable = true ); bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); @@ -134,8 +134,8 @@ public: void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); - sal_uInt16 GetBitCount() const SAL_OVERRIDE; - sal_uInt16 GetAlphaBitCount() const SAL_OVERRIDE; + sal_uInt16 GetBitCount() const; + sal_uInt16 GetAlphaBitCount() const; private: SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 5751489fe1c7..ecd350eff67e 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -595,7 +595,7 @@ public: OutputDevice const* GetOutDev() const { return mpOutputDevice; }; OutputDevice* GetOutDev() { return mpOutputDevice; }; - virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; + virtual void EnableRTL ( bool bEnable = true ); virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); |