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/afmtuno.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/afmtuno.hxx')
| -rw-r--r-- | sc/inc/afmtuno.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 983f3cf130d9..d78498f3a0fa 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -68,7 +68,7 @@ class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo > { private: - ScAutoFormatObj* GetObjectByIndex_Impl(USHORT nIndex); + ScAutoFormatObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); ScAutoFormatObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: @@ -145,19 +145,19 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper6< { private: SfxItemPropertySet aPropSet; - USHORT nFormatIndex; + sal_uInt16 nFormatIndex; - ScAutoFormatFieldObj* GetObjectByIndex_Impl(USHORT nIndex); + ScAutoFormatFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); public: - ScAutoFormatObj(USHORT nIndex); + ScAutoFormatObj(sal_uInt16 nIndex); virtual ~ScAutoFormatObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // per getImplementation gerufen: sal_Bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } - void InitFormat( USHORT nNewIndex ); + void InitFormat( sal_uInt16 nNewIndex ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -247,11 +247,11 @@ class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2< { private: SfxItemPropertySet aPropSet; - USHORT nFormatIndex; - USHORT nFieldIndex; + sal_uInt16 nFormatIndex; + sal_uInt16 nFieldIndex; public: - ScAutoFormatFieldObj(USHORT nFormat, USHORT nField); + ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField); virtual ~ScAutoFormatFieldObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); |