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/stlpool.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/stlpool.hxx')
| -rw-r--r-- | sc/inc/stlpool.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 3da0a25351ce..8cf4b134c641 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -63,7 +63,7 @@ public: const String* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, - USHORT nMask = 0xffff, USHORT nPos = 0xffff ); + sal_uInt16 nMask = 0xffff, sal_uInt16 nPos = 0xffff ); protected: virtual ~ScStyleSheetPool(); @@ -72,7 +72,7 @@ protected: virtual SfxStyleSheetBase* Create( const String& rName, SfxStyleFamily eFamily, - USHORT nMask); + sal_uInt16 nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ); private: |