diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/filter/inc/xcl97esc.hxx | |
parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/filter/inc/xcl97esc.hxx')
-rw-r--r-- | sc/source/filter/inc/xcl97esc.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index d48933bdbb62..55f33b6033e4 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -114,7 +114,7 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, const Rectangle* pChildAnchor ); - virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); + virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ); virtual EscherExHostAppData* EnterAdditionalTextGroup(); /// Flush and merge PicStream into EscherStream @@ -152,7 +152,7 @@ private: XclEscherHostAppData* pCurrAppData; XclEscherClientData* pTheClientData; // always the same XclEscherClientTextbox* pAdditionalText; - USHORT nAdditionalText; + sal_uInt16 nAdditionalText; sal_uInt32 mnNextKey; bool mbIsRootDff; }; @@ -162,13 +162,13 @@ private: class XclEscherHostAppData : public EscherExHostAppData { private: - BOOL bStackedGroup; + sal_Bool bStackedGroup; public: - XclEscherHostAppData() : bStackedGroup( FALSE ) + XclEscherHostAppData() : bStackedGroup( false ) {} - inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; } - inline BOOL IsStackedGroup() const { return bStackedGroup; } + inline void SetStackedGroup( sal_Bool b ) { bStackedGroup = b; } + inline sal_Bool IsStackedGroup() const { return bStackedGroup; } }; |