From cd42389ad67b403a07a0dda8e2a6e213def49251 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 17 Jan 2011 13:20:22 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from sc

---
 sc/inc/fielduno.hxx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'sc/inc/fielduno.hxx')

diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 584d62451cc6..d7630b468f34 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -74,7 +74,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);
@@ -155,7 +155,7 @@ public:
 
                             // per getImplementation gerufen:
     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 );
@@ -266,8 +266,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.
@@ -275,11 +275,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
@@ -336,23 +336,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();
 
                             // per getImplementation gerufen:
     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(
-- 
cgit