diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-03-23 19:27:45 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-03-25 12:25:18 +0000 |
commit | 03568b2e2405fc44435b95720f3680ab1daea836 (patch) | |
tree | 391a54edd21b9173f9255c1cc4f8f06652bf65ca /include | |
parent | 977aae0cdec71577cbdc74baea228a5f267e7fd8 (diff) |
fdo#74702 Move GetBitCount() and GetAlphaBitCount into correct classes
GetBitCount() works differently for VirtualDevices. GetAlphaBitCount()
is really only used by VirtualDevice, so moved functionality from
OutputDevice to VirtualDevice.
Change-Id: Ic00e32f1fa385542bcce8c9475f0ea5eb9a077f9
Reviewed-on: https://gerrit.libreoffice.org/8722
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/outdev.hxx | 6 | ||||
-rw-r--r-- | include/vcl/virdev.hxx | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c86a8ac80f7c..fbeae4bafa0b 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1409,16 +1409,16 @@ public: sal_Int32* pKashidaPosDropped // invalid kashida positions (out) ) const; - sal_uInt16 GetBitCount() const; + virtual sal_uInt16 GetBitCount() const; - bool GetTextIsRTL( const OUString&, sal_Int32 nIndex, sal_Int32 nLen ) const; + bool GetTextIsRTL( const OUString&, sal_Int32 nIndex, sal_Int32 nLen ) const; /** Query the existence and depth of the alpha channel @return 0, if no alpha channel available, and the bit depth of the alpha channel otherwise. */ - sal_uInt16 GetAlphaBitCount() const; + virtual sal_uInt16 GetAlphaBitCount() const; sal_uLong GetColorCount() const; void Push( sal_uInt16 nFlags = PUSH_ALL ); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 145179bfa73e..e5e5c54eda6f 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -134,6 +134,9 @@ public: void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); + sal_uInt16 GetBitCount() const; + sal_uInt16 GetAlphaBitCount() const; + private: SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); |