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/styleuno.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/styleuno.hxx')
| -rw-r--r-- | sc/inc/styleuno.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index a4735d596422..166405299bd4 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -56,8 +56,8 @@ class ScStyleObj; class ScStyleNameConversion { public: - static String DisplayToProgrammaticName( const String& rDispName, UINT16 nType ); - static String ProgrammaticToDisplayName( const String& rProgName, UINT16 nType ); + static String DisplayToProgrammaticName( const String& rDispName, sal_uInt16 nType ); + static String ProgrammaticToDisplayName( const String& rProgName, sal_uInt16 nType ); }; @@ -71,8 +71,8 @@ class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4< private: ScDocShell* pDocShell; - ScStyleFamilyObj* GetObjectByType_Impl(UINT16 Type) const; - ScStyleFamilyObj* GetObjectByIndex_Impl(UINT32 nIndex) const; + ScStyleFamilyObj* GetObjectByType_Impl(sal_uInt16 Type) const; + ScStyleFamilyObj* GetObjectByIndex_Impl(sal_uInt32 nIndex) const; ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; public: @@ -133,7 +133,7 @@ private: ScDocShell* pDocShell; SfxStyleFamily eFamily; // Family - ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); + ScStyleObj* GetObjectByIndex_Impl(sal_uInt32 nIndex); ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); public: |