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/inc/docpool.hxx | |
parent | Typo. (diff) | |
parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
download | core-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz core-12343c15568dcc2c9209d8ca41fda2263122448f.zip |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/docpool.hxx')
-rw-r--r-- | sc/inc/docpool.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 61e75afe4a3c..bbd81b59d305 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -40,28 +40,28 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool { SfxPoolItem** ppPoolDefaults; SfxItemPool* pSecondary; - static USHORT* pVersionMap1; - static USHORT* pVersionMap2; - static USHORT* pVersionMap3; - static USHORT* pVersionMap4; - static USHORT* pVersionMap5; - static USHORT* pVersionMap6; - static USHORT* pVersionMap7; - static USHORT* pVersionMap8; - static USHORT* pVersionMap9; - static USHORT* pVersionMap10; - static USHORT* pVersionMap11; + static sal_uInt16* pVersionMap1; + static sal_uInt16* pVersionMap2; + static sal_uInt16* pVersionMap3; + static sal_uInt16* pVersionMap4; + static sal_uInt16* pVersionMap5; + static sal_uInt16* pVersionMap6; + static sal_uInt16* pVersionMap7; + static sal_uInt16* pVersionMap8; + static sal_uInt16* pVersionMap9; + static sal_uInt16* pVersionMap10; + static sal_uInt16* pVersionMap11; public: - ScDocumentPool( SfxItemPool* pSecPool = NULL, BOOL bLoadRefCounts = FALSE ); + ScDocumentPool( SfxItemPool* pSecPool = NULL, sal_Bool bLoadRefCounts = false ); protected: virtual ~ScDocumentPool(); public: virtual SfxItemPool* Clone() const; - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; - virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); + virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); static void CheckRef( const SfxPoolItem& ); |