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/fielduno.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/fielduno.hxx')
| -rw-r--r-- | sc/inc/fielduno.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index a4a1adedbaf4..0873c846db69 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -75,7 +75,7 @@ private: /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - ScCellFieldObj* GetObjectByIndex_Impl(INT32 Index) const; + ScCellFieldObj* GetObjectByIndex_Impl(sal_Int32 Index) const; public: ScCellFieldsObj(ScDocShell* pDocSh, const ScAddress& rPos); @@ -156,7 +156,7 @@ public: // called by getImplementation: void DeleteField(); - BOOL IsInserted() const { return pEditSource != NULL; } + sal_Bool IsInserted() const { return pEditSource != NULL; } SvxFieldItem CreateFieldItem(); void InitDoc( ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel ); @@ -267,8 +267,8 @@ class ScHeaderFieldsObj : public cppu::WeakImplHelper5< { private: ScHeaderFooterContentObj* pContentObj; - USHORT nPart; - UINT16 nType; + sal_uInt16 nPart; + sal_uInt16 nType; SvxEditSource* pEditSource; /// List of refresh listeners. @@ -276,11 +276,11 @@ private: /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - ScHeaderFieldObj* GetObjectByIndex_Impl(INT32 Index) const; + ScHeaderFieldObj* GetObjectByIndex_Impl(sal_Int32 Index) const; public: ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, - USHORT nP, USHORT nT); + sal_uInt16 nP, sal_uInt16 nT); virtual ~ScHeaderFieldsObj(); // XIndexAccess @@ -337,23 +337,23 @@ class ScHeaderFieldObj : public ScMutexHelper, private: const SfxItemPropertySet* pPropSet; ScHeaderFooterContentObj* pContentObj; - USHORT nPart; - UINT16 nType; + sal_uInt16 nPart; + sal_uInt16 nType; SvxEditSource* pEditSource; ESelection aSelection; sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted ScHeaderFieldObj(); // disabled public: - ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP, - USHORT nT, const ESelection& rSel); + ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, sal_uInt16 nP, + sal_uInt16 nT, const ESelection& rSel); virtual ~ScHeaderFieldObj(); // called by getImplementation: void DeleteField(); - BOOL IsInserted() const { return pEditSource != NULL; } + sal_Bool IsInserted() const { return pEditSource != NULL; } SvxFieldItem CreateFieldItem(); - void InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP, + void InitDoc( ScHeaderFooterContentObj* pContent, sal_uInt16 nP, const ESelection& rSel ); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( |