Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src

1 files changed, 67 insertions, 67 deletions

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 08fbf286883b..cb92e4d2f7ad 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -165,37 +165,37 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10;
                                     // flags for columns / rows
                                     // FILTERED always together with HIDDEN
                                     // FILTERED and MANUALSIZE only valid for rows
-const BYTE   CR_HIDDEN      = 1;
-const BYTE   CR_MANUALBREAK = 8;
-const BYTE   CR_FILTERED    = 16;
-const BYTE   CR_MANUALSIZE  = 32;
-const BYTE   CR_ALL         = (CR_HIDDEN | CR_MANUALBREAK | CR_FILTERED | CR_MANUALSIZE);
+const sal_uInt8   CR_HIDDEN      = 1;
+const sal_uInt8   CR_MANUALBREAK = 8;
+const sal_uInt8   CR_FILTERED    = 16;
+const sal_uInt8   CR_MANUALSIZE  = 32;
+const sal_uInt8   CR_ALL         = (CR_HIDDEN | CR_MANUALBREAK | CR_FILTERED | CR_MANUALSIZE);
 
-typedef BYTE ScBreakType;
+typedef sal_uInt8 ScBreakType;
 const ScBreakType BREAK_NONE   = 0;
 const ScBreakType BREAK_PAGE   = 1;
 const ScBreakType BREAK_MANUAL = 2;
 
 // insert/delete flags
-const USHORT IDF_NONE       = 0x0000;
-const USHORT IDF_VALUE      = 0x0001;   /// Numeric values (and numeric results if IDF_FORMULA is not set).
-const USHORT IDF_DATETIME   = 0x0002;   /// Dates, times, datetime values.
-const USHORT IDF_STRING     = 0x0004;   /// Strings (and string results if IDF_FORMULA is not set).
-const USHORT IDF_NOTE       = 0x0008;   /// Cell notes.
-const USHORT IDF_FORMULA    = 0x0010;   /// Formula cells.
-const USHORT IDF_HARDATTR   = 0x0020;   /// Hard cell attributes.
-const USHORT IDF_STYLES     = 0x0040;   /// Cell styles.
-const USHORT IDF_OBJECTS    = 0x0080;   /// Drawing objects.
-const USHORT IDF_EDITATTR   = 0x0100;   /// Rich-text attributes.
-const USHORT IDF_SPECIAL_BOOLEAN = 0x1000;
-const USHORT IDF_ATTRIB     = IDF_HARDATTR | IDF_STYLES;
-const USHORT IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
-const USHORT IDF_ALL        = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
-const USHORT IDF_NOCAPTIONS = 0x0200;   /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes.
-const USHORT IDF_ADDNOTES   = 0x0400;   /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes.
+const sal_uInt16 IDF_NONE       = 0x0000;
+const sal_uInt16 IDF_VALUE      = 0x0001;   /// Numeric values (and numeric results if IDF_FORMULA is not set).
+const sal_uInt16 IDF_DATETIME   = 0x0002;   /// Dates, times, datetime values.
+const sal_uInt16 IDF_STRING     = 0x0004;   /// Strings (and string results if IDF_FORMULA is not set).
+const sal_uInt16 IDF_NOTE       = 0x0008;   /// Cell notes.
+const sal_uInt16 IDF_FORMULA    = 0x0010;   /// Formula cells.
+const sal_uInt16 IDF_HARDATTR   = 0x0020;   /// Hard cell attributes.
+const sal_uInt16 IDF_STYLES     = 0x0040;   /// Cell styles.
+const sal_uInt16 IDF_OBJECTS    = 0x0080;   /// Drawing objects.
+const sal_uInt16 IDF_EDITATTR   = 0x0100;   /// Rich-text attributes.
+const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
+const sal_uInt16 IDF_ATTRIB     = IDF_HARDATTR | IDF_STYLES;
+const sal_uInt16 IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
+const sal_uInt16 IDF_ALL        = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
+const sal_uInt16 IDF_NOCAPTIONS = 0x0200;   /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes.
+const sal_uInt16 IDF_ADDNOTES   = 0x0400;   /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes.
 
 /// Copy flags for auto/series fill functions: do not touch notes and drawing objects.
-const USHORT IDF_AUTOFILL   = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
+const sal_uInt16 IDF_AUTOFILL   = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
 
 #define PASTE_NOFUNC        0
 #define PASTE_ADD           1
@@ -424,19 +424,19 @@ struct ScImportParam
     SCROW           nRow1;
     SCCOL           nCol2;
     SCROW           nRow2;
-    BOOL            bImport;
+    sal_Bool            bImport;
     String          aDBName;                    // alias of data base
     String          aStatement;
-    BOOL            bNative;
-    BOOL            bSql;                       // statement or name?
-    BYTE            nType;                      // enum DBObject
+    sal_Bool            bNative;
+    sal_Bool            bSql;                       // statement or name?
+    sal_uInt8           nType;                      // enum DBObject
 
     ScImportParam();
     ScImportParam( const ScImportParam& r );
     ~ScImportParam();
 
     ScImportParam&  operator=   ( const ScImportParam& r );
-    BOOL            operator==  ( const ScImportParam& r ) const;
+    sal_Bool            operator==  ( const ScImportParam& r ) const;
 };
 
 struct ScStringHashCode
@@ -549,24 +549,24 @@ public:
     SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
     SC_DLLPUBLIC static ScUserList*         GetUserList();
     static void                 SetUserList( const ScUserList* pNewList );
-    SC_DLLPUBLIC static const String&       GetRscString( USHORT nIndex );
+    SC_DLLPUBLIC static const String&       GetRscString( sal_uInt16 nIndex );
     static void                 OpenURL( const String& rURL, const String& rTarget );
     SC_DLLPUBLIC static String              GetAbsDocName( const String& rFileName,
                                                 SfxObjectShell* pShell );
     SC_DLLPUBLIC static String              GetDocTabName( const String& rFileName,
                                                 const String& rTabName );
-    SC_DLLPUBLIC static ULONG               GetStandardFormat( SvNumberFormatter&,
-                                    ULONG nFormat, short nType );
-    SC_DLLPUBLIC static ULONG               GetStandardFormat( double, SvNumberFormatter&,
-                                    ULONG nFormat, short nType );
+    SC_DLLPUBLIC static sal_uLong               GetStandardFormat( SvNumberFormatter&,
+                                    sal_uLong nFormat, short nType );
+    SC_DLLPUBLIC static sal_uLong               GetStandardFormat( double, SvNumberFormatter&,
+                                    sal_uLong nFormat, short nType );
 
     SC_DLLPUBLIC static double              nScreenPPTX;
     SC_DLLPUBLIC static double              nScreenPPTY;
 
     static ScDocShellRef*   pDrawClipDocShellRef;
 
-    static USHORT           nDefFontHeight;
-    static USHORT           nStdRowHeight;
+    static sal_uInt16           nDefFontHeight;
+    static sal_uInt16           nStdRowHeight;
 
     SC_DLLPUBLIC static long                nLastRowHeightExtra;
     static long             nLastColWidthExtra;
@@ -593,16 +593,16 @@ public:
     static ScFunctionMgr*   GetStarCalcFunctionMgr();
     static void             ResetFunctionList();
 
-    static String           GetErrorString(USHORT nErrNumber);
-    static String           GetLongErrorString(USHORT nErrNumber);
-    static BOOL             EETextObjEqual( const EditTextObject* pObj1,
+    static String           GetErrorString(sal_uInt16 nErrNumber);
+    static String           GetLongErrorString(sal_uInt16 nErrNumber);
+    static sal_Bool             EETextObjEqual( const EditTextObject* pObj1,
                                             const EditTextObject* pObj2 );
-    static BOOL             CheckWidthInvalidate( BOOL& bNumFormatChanged,
+    static sal_Bool             CheckWidthInvalidate( sal_Bool& bNumFormatChanged,
                                                   const SfxItemSet& rNewAttrs,
                                                   const SfxItemSet& rOldAttrs );
-    static BOOL             HasAttrChanged( const SfxItemSet& rNewAttrs,
+    static sal_Bool             HasAttrChanged( const SfxItemSet& rNewAttrs,
                                             const SfxItemSet& rOldAttrs,
-                                            const USHORT      nWhich );
+                                            const sal_uInt16      nWhich );
 
     static ScUnitConverter* GetUnitConverter();
 
@@ -662,13 +662,13 @@ SC_DLLPUBLIC    static const sal_Unicode* FindUnquoted( const sal_Unicode* pStri
     /// a "ReadOnly" formatter for UNO/XML export
     static  SvNumberFormatter*  GetEnglishFormatter();
 
-    static BOOL IsSystemRTL();                      // depending on system language
+    static sal_Bool IsSystemRTL();                      // depending on system language
     static LanguageType GetEditDefaultLanguage();   // for EditEngine::SetDefaultLanguage
-    SC_DLLPUBLIC static BYTE    GetDefaultScriptType();             // for all WEAK characters
+    SC_DLLPUBLIC static sal_uInt8   GetDefaultScriptType();             // for all WEAK characters
     /** Map ATTR_((CJK|CTL)_)?FONT_... to proper WhichIDs.
         If more than one SCRIPTTYPE_... values are or'ed together, prefers
         first COMPLEX, then ASIAN */
-    SC_DLLPUBLIC static USHORT GetScriptedWhichID( BYTE nScriptType, USHORT nWhich );
+    SC_DLLPUBLIC static sal_uInt16 GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhich );
 
     /** Adds a language item to the item set, if the number format item contains
         a language that differs from its parent's language. */
@@ -740,8 +740,8 @@ namespace utl
 
 struct ScQueryEntry
 {
-    BOOL            bDoQuery;
-    BOOL            bQueryByString;
+    sal_Bool            bDoQuery;
+    sal_Bool            bQueryByString;
     bool            bQueryByDate;
     SCCOLROW        nField;
     ScQueryOp       eOp;
@@ -756,11 +756,11 @@ struct ScQueryEntry
     ~ScQueryEntry();
 
     // creates pSearchParam and pSearchText if necessary, always RegExp!
-    utl::TextSearch*    GetSearchTextPtr( BOOL bCaseSens );
+    utl::TextSearch*    GetSearchTextPtr( sal_Bool bCaseSens );
 
     void            Clear();
     ScQueryEntry&   operator=( const ScQueryEntry& r );
-    BOOL            operator==( const ScQueryEntry& r ) const;
+    sal_Bool            operator==( const ScQueryEntry& r ) const;
 };
 
 struct SC_DLLPUBLIC ScSubTotalParam
@@ -769,16 +769,16 @@ struct SC_DLLPUBLIC ScSubTotalParam
     SCROW           nRow1;
     SCCOL           nCol2;
     SCROW           nRow2;
-    BOOL            bRemoveOnly;
-    BOOL            bReplace;                   // replace existing results
-    BOOL            bPagebreak;                 // page break at change of group
-    BOOL            bCaseSens;                  //
-    BOOL            bDoSort;                    // presort
-    BOOL            bAscending;                 // sort ascending
-    BOOL            bUserDef;                   // sort user defined
-    USHORT          nUserIndex;                 // index into list
-    BOOL            bIncludePattern;            // sort formats
-    BOOL            bGroupActive[MAXSUBTOTAL];  // active groups
+    sal_Bool            bRemoveOnly;
+    sal_Bool            bReplace;                   // replace existing results
+    sal_Bool            bPagebreak;                 // page break at change of group
+    sal_Bool            bCaseSens;                  //
+    sal_Bool            bDoSort;                    // presort
+    sal_Bool            bAscending;                 // sort ascending
+    sal_Bool            bUserDef;                   // sort user defined
+    sal_uInt16          nUserIndex;                 // index into list
+    sal_Bool            bIncludePattern;            // sort formats
+    sal_Bool            bGroupActive[MAXSUBTOTAL];  // active groups
     SCCOL           nField[MAXSUBTOTAL];        // associated field
     SCCOL           nSubTotals[MAXSUBTOTAL];    // number of SubTotals
     SCCOL*          pSubTotals[MAXSUBTOTAL];    // array of columns to be calculated
@@ -788,12 +788,12 @@ struct SC_DLLPUBLIC ScSubTotalParam
     ScSubTotalParam( const ScSubTotalParam& r );
 
     ScSubTotalParam&    operator=       ( const ScSubTotalParam& r );
-    BOOL                operator==      ( const ScSubTotalParam& r ) const;
+    sal_Bool                operator==      ( const ScSubTotalParam& r ) const;
     void                Clear           ();
-    void                SetSubTotals    ( USHORT                nGroup,
+    void                SetSubTotals    ( sal_uInt16                nGroup,
                                           const SCCOL*          ptrSubTotals,
                                           const ScSubTotalFunc* ptrFuncions,
-                                          USHORT                nCount );
+                                          sal_uInt16                nCount );
 };
 
 class ScArea;
@@ -804,21 +804,21 @@ struct ScConsolidateParam
     SCROW           nRow;                   // or start of destination area respectively
     SCTAB           nTab;
     ScSubTotalFunc  eFunction;
-    USHORT          nDataAreaCount;         // number of data areas
+    sal_uInt16          nDataAreaCount;         // number of data areas
     ScArea**        ppDataAreas;            // array of pointers into data areas
-    BOOL            bByCol;
-    BOOL            bByRow;
-    BOOL            bReferenceData;         // reference source data
+    sal_Bool            bByCol;
+    sal_Bool            bByRow;
+    sal_Bool            bReferenceData;         // reference source data
 
     ScConsolidateParam();
     ScConsolidateParam( const ScConsolidateParam& r );
     ~ScConsolidateParam();
 
     ScConsolidateParam& operator=       ( const ScConsolidateParam& r );
-    BOOL                operator==      ( const ScConsolidateParam& r ) const;
+    sal_Bool                operator==      ( const ScConsolidateParam& r ) const;
     void                Clear           (); // = ClearDataAreas()+Members
     void                ClearDataAreas  ();
-    void                SetAreas        ( ScArea* const* ppAreas, USHORT nCount );
+    void                SetAreas        ( ScArea* const* ppAreas, sal_uInt16 nCount );
 };
 
 #endif