mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Change-Id: I6e099911afec9c4086f620b45656880135decff0
This commit is contained in:
Stephan Bergmann
2014-03-26 16:56:44 +01:00
parent 2d832c2648
commit 35ddbcbc42
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/vcl/virdev.hxx
View File

@@ -113,7 +113,7 @@ public:
virtual ~VirtualDevice(); 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 SetOutputSizePixel( const Size& rNewSize, bool bErase = true );
bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); 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 ); void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY );
sal_uInt16 GetBitCount() const SAL_OVERRIDE; sal_uInt16 GetBitCount() const;
sal_uInt16 GetAlphaBitCount() const SAL_OVERRIDE; sal_uInt16 GetAlphaBitCount() const;
private: private:
SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY );

2
include/vcl/window.hxx
View File

@@ -595,7 +595,7 @@ public:
OutputDevice const* GetOutDev() const { return mpOutputDevice; }; OutputDevice const* GetOutDev() const { return mpOutputDevice; };
OutputDevice* GetOutDev() { 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 MouseMove( const MouseEvent& rMEvt );
virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt );