diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-07-12 12:25:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-07-12 14:41:35 +0200 |
| commit | d8dbf1b5dbfa0db2d765063a1d848d031835398a (patch) | |
| tree | 0afe6c5fed33be4f42d61c36e92afc697a2e3eba /vcl/inc/headless | |
| parent | b00a99e4af0cf47642a139778a230cc61d1347d9 (diff) | |
Turn basebmp::Format into a proper enum
Change-Id: I4067c5039c7b5c74a1c144721dd7260de54dd2bf
Diffstat (limited to 'vcl/inc/headless')
| -rw-r--r-- | vcl/inc/headless/svpbmp.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/headless/svpframe.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index f769cf5e5687..d081e2e648b4 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -26,7 +26,7 @@ #include <salbmp.hxx> -#define SVP_DEFAULT_BITMAP_FORMAT basebmp::Format::TWENTYFOUR_BIT_TC_MASK +#define SVP_DEFAULT_BITMAP_FORMAT basebmp::FORMAT_TWENTYFOUR_BIT_TC_MASK class SvpSalBitmap : public SalBitmap { @@ -58,7 +58,7 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); virtual bool GetSystemData( BitmapSystemData& rData ); - static sal_uInt32 getBitCountFromScanlineFormat( sal_Int32 nFormat ); + static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat ); }; #endif diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 4a052c079197..64853308d94e 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -43,7 +43,7 @@ class SvpSalFrame : public SalFrame bool m_bVisible; bool m_bDamageTracking; bool m_bTopDown; - sal_Int32 m_nScanlineFormat; + basebmp::Format m_nScanlineFormat; long m_nMinWidth; long m_nMinHeight; long m_nMaxWidth; @@ -60,7 +60,7 @@ public: SalFrame* pParent, sal_uLong nSalFrameStyle, bool bTopDown, - sal_Int32 nScanlineFormat, + basebmp::Format nScanlineFormat, SystemParentData* pSystemParent = NULL ); virtual ~SvpSalFrame(); diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index c0fdb4e4e853..e2d9b735776c 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -60,7 +60,7 @@ class SvpSalGraphics : public SalGraphics // headless backend, i.e. not on iOS. basebmp::Color m_aTextColor; ServerFont* m_pServerFont[ MAX_FALLBACK ]; - sal_uInt32 m_eTextFmt; + basebmp::Format m_eTextFmt; #endif basebmp::BitmapDeviceSharedPtr m_aClipMap; |