diff options
Diffstat (limited to 'sc/inc')
117 files changed, 2865 insertions, 2865 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index f8c47ab24446..41afe64a1753 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -83,7 +83,7 @@ struct ScAddInArgDesc String aName; String aDescription; ScAddInArgumentType eType; - BOOL bOptional; + sal_Bool bOptional; }; class ScUnoAddInFuncData @@ -99,15 +99,15 @@ private: long nArgCount; ScAddInArgDesc* pArgDescs; long nCallerPos; - USHORT nCategory; + sal_uInt16 nCategory; rtl::OString sHelpId; mutable com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName> aCompNames; - mutable BOOL bCompInitialized; + mutable sal_Bool bCompInitialized; public: ScUnoAddInFuncData( const String& rNam, const String& rLoc, const String& rDesc, - USHORT nCat, const rtl::OString&, + sal_uInt16 nCat, const rtl::OString&, const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rFunc, const com::sun::star::uno::Any& rO, @@ -126,11 +126,11 @@ public: const ScAddInArgDesc* GetArguments() const { return pArgDescs; } long GetCallerPos() const { return nCallerPos; } const String& GetDescription() const { return aDescription; } - USHORT GetCategory() const { return nCategory; } + sal_uInt16 GetCategory() const { return nCategory; } const rtl::OString GetHelpId() const { return sHelpId; } const com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName>& GetCompNames() const; - BOOL GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const; + sal_Bool GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const; void SetFunction( const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rNewFunc, const com::sun::star::uno::Any& rNewObj ); @@ -149,7 +149,7 @@ private: ScAddInHashMap* pExactHashMap; // exact internal name ScAddInHashMap* pNameHashMap; // internal name upper ScAddInHashMap* pLocalHashMap; // localized name upper - BOOL bInitialized; + sal_Bool bInitialized; void Initialize(); void ReadConfiguration(); @@ -165,7 +165,7 @@ public: ~ScUnoAddInCollection(); /// User enetered name. rUpperName MUST already be upper case! - String FindFunction( const String& rUpperName, BOOL bLocalFirst ); + String FindFunction( const String& rUpperName, sal_Bool bLocalFirst ); // rName is the exact Name. // Only if bComplete is set, the function reference and argument types @@ -183,12 +183,12 @@ public: void LocalizeString( String& rName ); // modify rName - input: exact name long GetFuncCount(); - BOOL FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); + sal_Bool FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); - static BOOL FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ); + static sal_Bool FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ); - BOOL GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName ); - BOOL GetCalcName( const String& rExcelName, String& rRetCalcName ); + sal_Bool GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName ); + sal_Bool GetCalcName( const String& rExcelName, String& rRetCalcName ); // both leave rRet... unchanged, if no matching name is found }; @@ -200,10 +200,10 @@ private: com::sun::star::uno::Sequence<com::sun::star::uno::Any> aArgs; com::sun::star::uno::Sequence<com::sun::star::uno::Any> aVarArg; com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xCaller; - BOOL bValidCount; + sal_Bool bValidCount; // result: - USHORT nErrCode; - BOOL bHasString; + sal_uInt16 nErrCode; + sal_Bool bHasString; double fValue; String aString; ScMatrixRef xMatrix; @@ -218,12 +218,12 @@ public: long nParamCount ); ~ScUnoAddInCall(); - BOOL NeedsCaller() const; + sal_Bool NeedsCaller() const; void SetCaller( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& rInterface ); void SetCallerFromObjectShell( SfxObjectShell* pSh ); - BOOL ValidParamCount(); + sal_Bool ValidParamCount(); ScAddInArgumentType GetArgType( long nPos ); void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); @@ -231,10 +231,10 @@ public: void SetResult( const com::sun::star::uno::Any& rNewRes ); - USHORT GetErrCode() const { return nErrCode; } - BOOL HasString() const { return bHasString; } - BOOL HasMatrix() const { return ( xMatrix.Is() ); } - BOOL HasVarRes() const { return ( xVarRes.is() ); } + sal_uInt16 GetErrCode() const { return nErrCode; } + sal_Bool HasString() const { return bHasString; } + sal_Bool HasMatrix() const { return ( xMatrix.Is() ); } + sal_Bool HasVarRes() const { return ( xVarRes.is() ); } double GetValue() const { return fValue; } const String& GetString() const { return aString; } ScMatrixRef GetMatrix() const { return xMatrix; } diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 64dd9e3e7ea6..de29aa671fac 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -315,13 +315,13 @@ public: inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, + SC_DLLPUBLIC sal_uInt16 Parse( const String&, ScDocument* = NULL, const Details& rDetails = detailsOOOa1, ExternalInfo* pExtInfo = NULL, const ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL ); - SC_DLLPUBLIC void Format( String&, USHORT = 0, ScDocument* = NULL, + SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, ScDocument* = NULL, const Details& rDetails = detailsOOOa1) const; // The document for the maximum defined sheet number @@ -336,7 +336,7 @@ public: inline size_t hash() const; /// "A1" or "$A$1" or R1C1 or R[1]C[1] - String GetColRowString( bool bAbsolute = FALSE, + String GetColRowString( bool bAbsolute = sal_False, const Details& rDetails = detailsOOOa1) const; }; @@ -389,7 +389,7 @@ inline bool ScAddress::operator!=( const ScAddress& r ) const inline bool ScAddress::operator<( const ScAddress& r ) const { - // Same behavior as the old UINT32 nAddress < r.nAddress with encoded + // Same behavior as the old sal_uInt32 nAddress < r.nAddress with encoded // tab|col|row bit fields. if (nTab == r.nTab) { @@ -477,17 +477,17 @@ public: inline bool In( const ScAddress& ) const; // is Address& in Range? inline bool In( const ScRange& ) const; // is Range& in Range? - USHORT Parse( const String&, ScDocument* = NULL, + sal_uInt16 Parse( const String&, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1, ScAddress::ExternalInfo* pExtInfo = NULL, const ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL ); - USHORT ParseAny( const String&, ScDocument* = NULL, + sal_uInt16 ParseAny( const String&, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); - SC_DLLPUBLIC USHORT ParseCols( const String&, ScDocument* = NULL, + SC_DLLPUBLIC sal_uInt16 ParseCols( const String&, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); - SC_DLLPUBLIC USHORT ParseRows( const String&, ScDocument* = NULL, + SC_DLLPUBLIC sal_uInt16 ParseRows( const String&, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); /** Parse an Excel style reference up to and including the sheet name @@ -511,12 +511,12 @@ public: bOnlyAcceptSingle==true was given. */ const sal_Unicode* Parse_XL_Header( const sal_Unicode* pString, const ScDocument* pDoc, - String& rExternDocName, String& rStartTabName, String& rEndTabName, USHORT& nFlags, + String& rExternDocName, String& rStartTabName, String& rEndTabName, sal_uInt16& nFlags, bool bOnlyAcceptSingle, const ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL ); - SC_DLLPUBLIC void Format( String&, USHORT = 0, ScDocument* = NULL, + SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const; inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1, @@ -655,8 +655,8 @@ public: { aRange[0] = r1; aRange[1] = r2; } inline ScRangePair& operator= ( const ScRangePair& r ); - const ScRange& GetRange( USHORT n ) const { return aRange[n]; } - ScRange& GetRange( USHORT n ) { return aRange[n]; } + const ScRange& GetRange( sal_uInt16 n ) const { return aRange[n]; } + ScRange& GetRange( sal_uInt16 n ) { return aRange[n]; } inline int operator==( const ScRangePair& ) const; inline int operator!=( const ScRangePair& ) const; }; diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 9cb402a03764..e5fee96e5298 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -67,7 +67,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: @@ -144,19 +144,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); @@ -246,11 +246,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 ); diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 91fc43fc249a..04ac629cde92 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -46,22 +46,22 @@ public: void SetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; } FieldUnit GetAppMetric() const { return eMetric; } - void SetZoom( USHORT nNew ) { nZoom = nNew; } - USHORT GetZoom() const { return nZoom; } + void SetZoom( sal_uInt16 nNew ) { nZoom = nNew; } + sal_uInt16 GetZoom() const { return nZoom; } void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; } SvxZoomType GetZoomType() const { return eZoomType; } - void SetSynchronizeZoom( BOOL bNew ) { bSynchronizeZoom = bNew; } - BOOL GetSynchronizeZoom() const { return bSynchronizeZoom; } - USHORT GetLRUFuncListCount() const { return nLRUFuncCount; } - USHORT* GetLRUFuncList() const { return pLRUList; } - void SetLRUFuncList( const USHORT* pList, - const USHORT nCount ); - void SetStatusFunc( USHORT nNew ) { nStatusFunc = nNew; } - USHORT GetStatusFunc() const { return nStatusFunc; } - void SetAutoComplete( BOOL bNew ) { bAutoComplete = bNew; } - BOOL GetAutoComplete() const { return bAutoComplete; } - void SetDetectiveAuto( BOOL bNew ) { bDetectiveAuto = bNew; } - BOOL GetDetectiveAuto() const { return bDetectiveAuto; } + void SetSynchronizeZoom( sal_Bool bNew ) { bSynchronizeZoom = bNew; } + sal_Bool GetSynchronizeZoom() const { return bSynchronizeZoom; } + sal_uInt16 GetLRUFuncListCount() const { return nLRUFuncCount; } + sal_uInt16* GetLRUFuncList() const { return pLRUList; } + void SetLRUFuncList( const sal_uInt16* pList, + const sal_uInt16 nCount ); + void SetStatusFunc( sal_uInt16 nNew ) { nStatusFunc = nNew; } + sal_uInt16 GetStatusFunc() const { return nStatusFunc; } + void SetAutoComplete( sal_Bool bNew ) { bAutoComplete = bNew; } + sal_Bool GetAutoComplete() const { return bAutoComplete; } + void SetDetectiveAuto( sal_Bool bNew ) { bDetectiveAuto = bNew; } + sal_Bool GetDetectiveAuto() const { return bDetectiveAuto; } void SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; } sal_uInt32 GetTrackContentColor() const { return nTrackContentColor; } @@ -75,35 +75,35 @@ public: ScLkUpdMode GetLinkMode() const { return eLinkMode ;} void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} - void SetDefaultObjectSizeWidth(INT32 nNew) { nDefaultObjectSizeWidth = nNew; } - INT32 GetDefaultObjectSizeWidth() const { return nDefaultObjectSizeWidth; } - void SetDefaultObjectSizeHeight(INT32 nNew) { nDefaultObjectSizeHeight = nNew; } - INT32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; } + void SetDefaultObjectSizeWidth(sal_Int32 nNew) { nDefaultObjectSizeWidth = nNew; } + sal_Int32 GetDefaultObjectSizeWidth() const { return nDefaultObjectSizeWidth; } + void SetDefaultObjectSizeHeight(sal_Int32 nNew) { nDefaultObjectSizeHeight = nNew; } + sal_Int32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; } - void SetShowSharedDocumentWarning( BOOL bNew ) { mbShowSharedDocumentWarning = bNew; } - BOOL GetShowSharedDocumentWarning() const { return mbShowSharedDocumentWarning; } + void SetShowSharedDocumentWarning( sal_Bool bNew ) { mbShowSharedDocumentWarning = bNew; } + sal_Bool GetShowSharedDocumentWarning() const { return mbShowSharedDocumentWarning; } const ScAppOptions& operator= ( const ScAppOptions& rOpt ); private: FieldUnit eMetric; - USHORT nLRUFuncCount; - USHORT* pLRUList; + sal_uInt16 nLRUFuncCount; + sal_uInt16* pLRUList; SvxZoomType eZoomType; - USHORT nZoom; - BOOL bSynchronizeZoom; - USHORT nStatusFunc; - BOOL bAutoComplete; - BOOL bDetectiveAuto; + sal_uInt16 nZoom; + sal_Bool bSynchronizeZoom; + sal_uInt16 nStatusFunc; + sal_Bool bAutoComplete; + sal_Bool bDetectiveAuto; sal_uInt32 nTrackContentColor; sal_uInt32 nTrackInsertColor; sal_uInt32 nTrackDeleteColor; sal_uInt32 nTrackMoveColor; ScLkUpdMode eLinkMode; - INT32 nDefaultObjectSizeWidth; - INT32 nDefaultObjectSizeHeight; - BOOL mbShowSharedDocumentWarning; + sal_Int32 nDefaultObjectSizeWidth; + sal_Int32 nDefaultObjectSizeHeight; + sal_Bool mbShowSharedDocumentWarning; }; diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 46ce98709df1..77053b48bde0 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -48,17 +48,17 @@ private: String aOptions; String aSourceArea; ScRange aDestArea; - BOOL bAddUndo; - BOOL bInCreate; - BOOL bDoInsert; // wird fuer das erste Update auf FALSE gesetzt + sal_Bool bAddUndo; + sal_Bool bInCreate; + sal_Bool bDoInsert; // wird fuer das erste Update auf sal_False gesetzt - BOOL FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); + sal_Bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); public: TYPEINFO(); ScAreaLink( SfxObjectShell* pShell, const String& rFile, const String& rFilter, const String& rOpt, - const String& rArea, const ScRange& rDest, ULONG nRefresh ); + const String& rArea, const ScRange& rDest, sal_uLong nRefresh ); virtual ~ScAreaLink(); virtual void Closed(); @@ -67,16 +67,16 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - BOOL Refresh( const String& rNewFile, const String& rNewFilter, - const String& rNewArea, ULONG nNewRefresh ); + sal_Bool Refresh( const String& rNewFile, const String& rNewFilter, + const String& rNewArea, sal_uLong nNewRefresh ); - void SetInCreate(BOOL bSet) { bInCreate = bSet; } - void SetDoInsert(BOOL bSet) { bDoInsert = bSet; } + void SetInCreate(sal_Bool bSet) { bInCreate = bSet; } + void SetDoInsert(sal_Bool bSet) { bDoInsert = bSet; } void SetDestArea(const ScRange& rNew); void SetSource(const String& rDoc, const String& rFlt, const String& rOpt, const String& rArea); - BOOL IsEqual( const String& rFile, const String& rFilter, const String& rOpt, + sal_Bool IsEqual( const String& rFile, const String& rFilter, const String& rOpt, const String& rSource, const ScRange& rDest ) const; const String& GetFile() const { return aFileName; } diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 11b21bab0162..3e7b31258c38 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -52,12 +52,12 @@ class SvxBoxInfoItem; struct ScLineFlags { - BYTE nLeft; - BYTE nRight; - BYTE nTop; - BYTE nBottom; - BYTE nHori; - BYTE nVert; + sal_uInt8 nLeft; + sal_uInt8 nRight; + sal_uInt8 nTop; + sal_uInt8 nBottom; + sal_uInt8 nHori; + sal_uInt8 nVert; ScLineFlags() : nLeft(SC_LINE_EMPTY),nRight(SC_LINE_EMPTY),nTop(SC_LINE_EMPTY), nBottom(SC_LINE_EMPTY),nHori(SC_LINE_EMPTY),nVert(SC_LINE_EMPTY) {} @@ -94,13 +94,13 @@ friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScAttrIterator; friend class ScHorizontalAttrIterator; -friend void lcl_IterGetNumberFormat( ULONG& nFormat, +friend void lcl_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr, SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc ); - BOOL ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + sal_Bool ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, - BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ); + sal_Bool bLeft, SCCOL nDistRight, sal_Bool bTop, SCROW nDistBottom ); public: ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ); @@ -111,79 +111,79 @@ public: #ifdef DBG_UTIL void TestData() const; #endif - void Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE ); - BOOL Concat(SCSIZE nPos); + void Reset( const ScPatternAttr* pPattern, sal_Bool bAlloc = sal_True ); + sal_Bool Concat(SCSIZE nPos); const ScPatternAttr* GetPattern( SCROW nRow ) const; const ScPatternAttr* GetPatternRange( SCROW& rStartRow, SCROW& rEndRow, SCROW nRow ) const; - void MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, BOOL bDeep ) const; + void MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, sal_Bool bDeep ) const; void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, - SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const; + SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ) const; void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, - SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); + SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ); - void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); - void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE); + void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, sal_Bool bPutToPool = sal_False ); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, sal_Bool bPutToPool = sal_False); void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache ); void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, - const SvxBorderLine* pLine, BOOL bColorOnly ); + const SvxBorderLine* pLine, sal_Bool bColorOnly ); - void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); - void ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ); + void ChangeIndent( SCROW nStartRow, SCROW nEndRow, sal_Bool bIncrement ); /// Including current, may return -1 - SCsROW GetNextUnprotected( SCsROW nRow, BOOL bUp ) const; + SCsROW GetNextUnprotected( SCsROW nRow, sal_Bool bUp ) const; /// May return -1 if not found SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, - BOOL bUp, ScMarkArray* pMarkArray = NULL ); - BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, - BOOL bUp, ScMarkArray* pMarkArray = NULL ); + sal_Bool bUp, ScMarkArray* pMarkArray = NULL ); + sal_Bool SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, + sal_Bool bUp, ScMarkArray* pMarkArray = NULL ); - BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + sal_Bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ); + sal_Bool RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ); - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + sal_Bool Search( SCROW nRow, SCSIZE& nIndex ) const; - BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, - BOOL bLeft, BOOL bRight ) const; - bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, + sal_Bool HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, + sal_Bool bLeft, sal_Bool bRight ) const; + bool HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const; + sal_Bool ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, - BOOL bRefresh, BOOL bAttrs ); - BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); + sal_Bool bRefresh, sal_Bool bAttrs ); + sal_Bool RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + sal_Bool IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const; void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, - const ScPatternAttr* pWantedPattern, BOOL bDefault ); + const ScPatternAttr* pWantedPattern, sal_Bool bDefault ); void CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ); - BOOL IsEmpty() const; + sal_Bool IsEmpty() const; //UNUSED2008-05 SCROW GetFirstEntryPos() const; -//UNUSED2008-05 SCROW GetLastEntryPos( BOOL bIncludeBottom ) const; +//UNUSED2008-05 SCROW GetLastEntryPos( sal_Bool bIncludeBottom ) const; - BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; - BOOL GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const; - BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsVisibleEqual( const ScAttrArray& rOther, + sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const; + sal_Bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const; + sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool IsVisibleEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; - BOOL TestInsertRow( SCSIZE nSize ) const; + sal_Bool TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; + sal_Bool TestInsertRow( SCSIZE nSize ) const; void InsertRow( SCROW nStartRow, SCSIZE nSize ); void DeleteRow( SCROW nStartRow, SCSIZE nSize ); void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ); void DeleteArea( SCROW nStartRow, SCROW nEndRow ); void MoveTo( SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray ); void CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, - INT16 nStripFlags = 0 ); + sal_Int16 nStripFlags = 0 ); void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 96a0529c48a1..d72c41037ae2 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -54,7 +54,7 @@ class EditTextObject; class SvxBorderLine; -BOOL SC_DLLPUBLIC ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ); +sal_Bool SC_DLLPUBLIC ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ); //------------------------------------------------------------------------ @@ -73,12 +73,12 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; SCsCOL GetColMerge() const {return nColMerge; } SCsROW GetRowMerge() const {return nRowMerge; } - BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; } + sal_Bool IsMerged() const { return nColMerge>1 || nRowMerge>1; } inline ScMergeAttr& operator=(const ScMergeAttr& rMerge) { @@ -94,34 +94,34 @@ class SC_DLLPUBLIC ScMergeFlagAttr: public SfxInt16Item { public: ScMergeFlagAttr(); - ScMergeFlagAttr(INT16 nFlags); + ScMergeFlagAttr(sal_Int16 nFlags); ~ScMergeFlagAttr(); - BOOL IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } - BOOL IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } - BOOL IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; } + sal_Bool IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } + sal_Bool IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } + sal_Bool IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; } - BOOL HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; } - BOOL HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; } + sal_Bool HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; } + sal_Bool HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; } bool HasDPTable() const { return ( GetValue() & SC_MF_DP_TABLE ) != 0; } - BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; } + sal_Bool IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; } }; //------------------------------------------------------------------------ class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem { - BOOL bProtection; // Zelle schuetzen - BOOL bHideFormula; // Formel nicht Anzeigen - BOOL bHideCell; // Zelle nicht Anzeigen - BOOL bHidePrint; // Zelle nicht Ausdrucken + sal_Bool bProtection; // Zelle schuetzen + sal_Bool bHideFormula; // Formel nicht Anzeigen + sal_Bool bHideCell; // Zelle nicht Anzeigen + sal_Bool bHidePrint; // Zelle nicht Ausdrucken public: TYPEINFO(); ScProtectionAttr(); - ScProtectionAttr( BOOL bProtect, - BOOL bHFormula = FALSE, - BOOL bHCell = FALSE, - BOOL bHPrint = FALSE); + ScProtectionAttr( sal_Bool bProtect, + sal_Bool bHFormula = sal_False, + sal_Bool bHCell = sal_False, + sal_Bool bHPrint = sal_False); ScProtectionAttr( const ScProtectionAttr& ); ~ScProtectionAttr(); @@ -135,19 +135,19 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - BOOL GetProtection() const { return bProtection; } - BOOL SetProtection( BOOL bProtect); - BOOL GetHideFormula() const { return bHideFormula; } - BOOL SetHideFormula( BOOL bHFormula); - BOOL GetHideCell() const { return bHideCell; } - BOOL SetHideCell( BOOL bHCell); - BOOL GetHidePrint() const { return bHidePrint; } - BOOL SetHidePrint( BOOL bHPrint); + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + + sal_Bool GetProtection() const { return bProtection; } + sal_Bool SetProtection( sal_Bool bProtect); + sal_Bool GetHideFormula() const { return bHideFormula; } + sal_Bool SetHideFormula( sal_Bool bHFormula); + sal_Bool GetHideCell() const { return bHideCell; } + sal_Bool SetHideCell( sal_Bool bHCell); + sal_Bool GetHidePrint() const { return bHidePrint; } + sal_Bool SetHidePrint( sal_Bool bHPrint); inline ScProtectionAttr& operator=(const ScProtectionAttr& rProtection) { bProtection = rProtection.bProtection; @@ -171,10 +171,10 @@ class ScRangeItem : public SfxPoolItem public: TYPEINFO(); - inline ScRangeItem( const USHORT nWhich ); - inline ScRangeItem( const USHORT nWhich, + inline ScRangeItem( const sal_uInt16 nWhich ); + inline ScRangeItem( const sal_uInt16 nWhich, const ScRange& rRange, - const USHORT nNewFlags = 0 ); + const sal_uInt16 nNewFlags = 0 ); inline ScRangeItem( const ScRangeItem& rCpy ); inline ScRangeItem& operator=( const ScRangeItem &rCpy ); @@ -191,22 +191,22 @@ public: const ScRange& GetRange() const { return aRange; } void SetRange( const ScRange& rNew ) { aRange = rNew; } - USHORT GetFlags() const { return nFlags; } - void SetFlags( USHORT nNew ) { nFlags = nNew; } + sal_uInt16 GetFlags() const { return nFlags; } + void SetFlags( sal_uInt16 nNew ) { nFlags = nNew; } private: ScRange aRange; - USHORT nFlags; + sal_uInt16 nFlags; }; -inline ScRangeItem::ScRangeItem( const USHORT nWhichP ) +inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP ) : SfxPoolItem( nWhichP ), nFlags( SCR_INVALID ) // == ungueltige Area { } -inline ScRangeItem::ScRangeItem( const USHORT nWhichP, +inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP, const ScRange& rRange, - const USHORT nNew ) + const sal_uInt16 nNew ) : SfxPoolItem( nWhichP ), aRange( rRange ), nFlags( nNew ) { } @@ -229,9 +229,9 @@ class ScTableListItem : public SfxPoolItem public: TYPEINFO(); - inline ScTableListItem( const USHORT nWhich ); + inline ScTableListItem( const sal_uInt16 nWhich ); ScTableListItem( const ScTableListItem& rCpy ); -//UNUSED2008-05 ScTableListItem( const USHORT nWhich, const List& rList ); +//UNUSED2008-05 ScTableListItem( const sal_uInt16 nWhich, const List& rList ); ~ScTableListItem(); ScTableListItem& operator=( const ScTableListItem &rCpy ); @@ -245,15 +245,15 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; -//UNUSED2009-05 BOOL GetTableList( List& aList ) const; +//UNUSED2009-05 sal_Bool GetTableList( List& aList ) const; //UNUSED2009-05 void SetTableList( const List& aList ); public: - USHORT nCount; + sal_uInt16 nCount; SCTAB* pTabArr; }; -inline ScTableListItem::ScTableListItem( const USHORT nWhichP ) +inline ScTableListItem::ScTableListItem( const sal_uInt16 nWhichP ) : SfxPoolItem(nWhichP), nCount(0), pTabArr(NULL) {} @@ -272,7 +272,7 @@ class SC_DLLPUBLIC ScPageHFItem : public SfxPoolItem public: TYPEINFO(); - ScPageHFItem( USHORT nWhich ); + ScPageHFItem( sal_uInt16 nWhich ); ScPageHFItem( const ScPageHFItem& rItem ); ~ScPageHFItem(); @@ -280,10 +280,10 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const EditTextObject* GetLeftArea() const { return pLeftArea; } const EditTextObject* GetCenterArea() const { return pCenterArea; } @@ -306,15 +306,15 @@ class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem public: TYPEINFO(); - ScViewObjectModeItem( USHORT nWhich ); - ScViewObjectModeItem( USHORT nWhich, ScVObjMode eMode ); + ScViewObjectModeItem( sal_uInt16 nWhich ); + ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); ~ScViewObjectModeItem(); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -329,7 +329,7 @@ class ScDoubleItem : public SfxPoolItem { public: TYPEINFO(); - ScDoubleItem( USHORT nWhich, double nVal=0 ); + ScDoubleItem( sal_uInt16 nWhich, double nVal=0 ); ScDoubleItem( const ScDoubleItem& rItem ); ~ScDoubleItem(); @@ -337,7 +337,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; double GetValue() const { return nValue; } @@ -351,9 +351,9 @@ private: // ============================================================================ /** Member ID for "page scale to width" value in QueryValue() and PutValue(). */ -const BYTE SC_MID_PAGE_SCALETO_WIDTH = 1; +const sal_uInt8 SC_MID_PAGE_SCALETO_WIDTH = 1; /** Member ID for "page scale to height" value in QueryValue() and PutValue(). */ -const BYTE SC_MID_PAGE_SCALETO_HEIGHT = 2; +const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT = 2; /** Contains the "scale to width/height" attribute in page styles. */ @@ -388,8 +388,8 @@ public: XubString& rText, const IntlWrapper* = 0 ) const; - virtual BOOL QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ); private: sal_uInt16 mnWidth; diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 094f618fbc7c..384293e9b7d4 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -187,11 +187,11 @@ public: void SetRotateAngle( const SfxInt32Item& rRotateAngle ) { aRotateAngle.SetValue( rRotateAngle.GetValue() ); } void SetRotateMode( const SvxRotateModeItem& rRotateMode ) { aRotateMode.SetValue( rRotateMode.GetValue() ); } - BOOL Load( SvStream& rStream, const ScAfVersions& rVersions, USHORT nVer ); - BOOL Save( SvStream& rStream ); + sal_Bool Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer ); + sal_Bool Save( SvStream& rStream ); #ifdef READ_OLDVERS - BOOL LoadOld( SvStream& rStream, const ScAfVersions& rVersions ); + sal_Bool LoadOld( SvStream& rStream, const ScAfVersions& rVersions ); #endif }; @@ -200,21 +200,21 @@ class SC_DLLPUBLIC ScAutoFormatData : public ScDataObject { private: String aName; - USHORT nStrResId; + sal_uInt16 nStrResId; // common flags of Calc and Writer - BOOL bIncludeFont : 1; - BOOL bIncludeJustify : 1; - BOOL bIncludeFrame : 1; - BOOL bIncludeBackground : 1; + sal_Bool bIncludeFont : 1; + sal_Bool bIncludeJustify : 1; + sal_Bool bIncludeFrame : 1; + sal_Bool bIncludeBackground : 1; // Calc specific flags - BOOL bIncludeValueFormat : 1; - BOOL bIncludeWidthHeight : 1; + sal_Bool bIncludeValueFormat : 1; + sal_Bool bIncludeWidthHeight : 1; ScAutoFormatDataField** ppDataField; - SC_DLLPRIVATE ScAutoFormatDataField& GetField( USHORT nIndex ); - SC_DLLPRIVATE const ScAutoFormatDataField& GetField( USHORT nIndex ) const; + SC_DLLPRIVATE ScAutoFormatDataField& GetField( sal_uInt16 nIndex ); + SC_DLLPRIVATE const ScAutoFormatDataField& GetField( sal_uInt16 nIndex ) const; public: ScAutoFormatData(); @@ -226,56 +226,56 @@ public: void SetName( const String& rName ) { aName = rName; nStrResId = USHRT_MAX; } void GetName( String& rName ) const { rName = aName; } - BOOL GetIncludeValueFormat() const { return bIncludeValueFormat; } - BOOL GetIncludeFont() const { return bIncludeFont; } - BOOL GetIncludeJustify() const { return bIncludeJustify; } - BOOL GetIncludeFrame() const { return bIncludeFrame; } - BOOL GetIncludeBackground() const { return bIncludeBackground; } - BOOL GetIncludeWidthHeight() const { return bIncludeWidthHeight; } + sal_Bool GetIncludeValueFormat() const { return bIncludeValueFormat; } + sal_Bool GetIncludeFont() const { return bIncludeFont; } + sal_Bool GetIncludeJustify() const { return bIncludeJustify; } + sal_Bool GetIncludeFrame() const { return bIncludeFrame; } + sal_Bool GetIncludeBackground() const { return bIncludeBackground; } + sal_Bool GetIncludeWidthHeight() const { return bIncludeWidthHeight; } - void SetIncludeValueFormat( BOOL bValueFormat ) { bIncludeValueFormat = bValueFormat; } - void SetIncludeFont( BOOL bFont ) { bIncludeFont = bFont; } - void SetIncludeJustify( BOOL bJustify ) { bIncludeJustify = bJustify; } - void SetIncludeFrame( BOOL bFrame ) { bIncludeFrame = bFrame; } - void SetIncludeBackground( BOOL bBackground ) { bIncludeBackground = bBackground; } - void SetIncludeWidthHeight( BOOL bWidthHeight ) { bIncludeWidthHeight = bWidthHeight; } + void SetIncludeValueFormat( sal_Bool bValueFormat ) { bIncludeValueFormat = bValueFormat; } + void SetIncludeFont( sal_Bool bFont ) { bIncludeFont = bFont; } + void SetIncludeJustify( sal_Bool bJustify ) { bIncludeJustify = bJustify; } + void SetIncludeFrame( sal_Bool bFrame ) { bIncludeFrame = bFrame; } + void SetIncludeBackground( sal_Bool bBackground ) { bIncludeBackground = bBackground; } + void SetIncludeWidthHeight( sal_Bool bWidthHeight ) { bIncludeWidthHeight = bWidthHeight; } - const SfxPoolItem* GetItem( USHORT nIndex, USHORT nWhich ) const; - void PutItem( USHORT nIndex, const SfxPoolItem& rItem ); - void CopyItem( USHORT nToIndex, USHORT nFromIndex, USHORT nWhich ); + const SfxPoolItem* GetItem( sal_uInt16 nIndex, sal_uInt16 nWhich ) const; + void PutItem( sal_uInt16 nIndex, const SfxPoolItem& rItem ); + void CopyItem( sal_uInt16 nToIndex, sal_uInt16 nFromIndex, sal_uInt16 nWhich ); - const ScNumFormatAbbrev& GetNumFormat( USHORT nIndex ) const; + const ScNumFormatAbbrev& GetNumFormat( sal_uInt16 nIndex ) const; - BOOL IsEqualData( USHORT nIndex1, USHORT nIndex2 ) const; + sal_Bool IsEqualData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const; - void FillToItemSet( USHORT nIndex, SfxItemSet& rItemSet, ScDocument& rDoc ) const; - void GetFromItemSet( USHORT nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat ); + void FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, ScDocument& rDoc ) const; + void GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat ); - BOOL Load( SvStream& rStream, const ScAfVersions& rVersions ); - BOOL Save( SvStream& rStream ); + sal_Bool Load( SvStream& rStream, const ScAfVersions& rVersions ); + sal_Bool Save( SvStream& rStream ); #ifdef READ_OLDVERS - BOOL LoadOld( SvStream& rStream, const ScAfVersions& rVersions ); + sal_Bool LoadOld( SvStream& rStream, const ScAfVersions& rVersions ); #endif }; class SC_DLLPUBLIC ScAutoFormat : public ScSortedCollection { private: - BOOL bSaveLater; + sal_Bool bSaveLater; public: - ScAutoFormat( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE ); + ScAutoFormat( sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False ); ScAutoFormat( const ScAutoFormat& AutoFormat ); virtual ~ScAutoFormat(); virtual ScDataObject* Clone() const { return new ScAutoFormat( *this ); } - ScAutoFormatData* operator[]( const USHORT nIndex ) const {return (ScAutoFormatData*)At( nIndex );} + ScAutoFormatData* operator[]( const sal_uInt16 nIndex ) const {return (ScAutoFormatData*)At( nIndex );} virtual short Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const; - BOOL Load(); - BOOL Save(); - USHORT FindIndexPerName( const String& rName ) const; - void SetSaveLater( BOOL bSet ); - BOOL IsSaveLater() const { return bSaveLater; } + sal_Bool Load(); + sal_Bool Save(); + sal_uInt16 FindIndexPerName( const String& rName ) const; + void SetSaveLater( sal_Bool bSet ); + sal_Bool IsSaveLater() const { return bSaveLater; } }; diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index d5a066d522cc..7f0ee1934afb 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -33,43 +33,43 @@ #include "document.hxx" -static const INT32 nInt32Min = 0x80000000; -static const INT32 nInt32Max = 0x7fffffff; +static const sal_Int32 nInt32Min = 0x80000000; +static const sal_Int32 nInt32Max = 0x7fffffff; class ScBigAddress { - INT32 nRow; - INT32 nCol; - INT32 nTab; + sal_Int32 nRow; + sal_Int32 nCol; + sal_Int32 nTab; public: ScBigAddress() : nRow(0), nCol(0), nTab(0) {} - ScBigAddress( INT32 nColP, INT32 nRowP, INT32 nTabP ) + ScBigAddress( sal_Int32 nColP, sal_Int32 nRowP, sal_Int32 nTabP ) : nRow( nRowP ), nCol( nColP ), nTab( nTabP ) {} ScBigAddress( const ScBigAddress& r ) : nRow( r.nRow ), nCol( r.nCol ), nTab( r.nTab ) {} ScBigAddress( const ScAddress& r ) : nRow( r.Row() ), nCol( r.Col() ), nTab( r.Tab() ) {} - INT32 Col() const { return nCol; } - INT32 Row() const { return nRow; } - INT32 Tab() const { return nTab; } + sal_Int32 Col() const { return nCol; } + sal_Int32 Row() const { return nRow; } + sal_Int32 Tab() const { return nTab; } - void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) + void Set( sal_Int32 nColP, sal_Int32 nRowP, sal_Int32 nTabP ) { nCol = nColP; nRow = nRowP; nTab = nTabP; } - void SetCol( INT32 nColP ) { nCol = nColP; } - void SetRow( INT32 nRowP ) { nRow = nRowP; } - void SetTab( INT32 nTabP ) { nTab = nTabP; } - void IncCol( INT32 n = 1 ) { nCol += n; } - void IncRow( INT32 n = 1 ) { nRow += n; } - void IncTab( INT32 n = 1 ) { nTab += n; } - - void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const + void SetCol( sal_Int32 nColP ) { nCol = nColP; } + void SetRow( sal_Int32 nRowP ) { nRow = nRowP; } + void SetTab( sal_Int32 nTabP ) { nTab = nTabP; } + void IncCol( sal_Int32 n = 1 ) { nCol += n; } + void IncRow( sal_Int32 n = 1 ) { nRow += n; } + void IncTab( sal_Int32 n = 1 ) { nTab += n; } + + void GetVars( sal_Int32& nColP, sal_Int32& nRowP, sal_Int32& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } inline void PutInOrder( ScBigAddress& r ); - inline BOOL IsValid( const ScDocument* ) const; + inline sal_Bool IsValid( const ScDocument* ) const; inline ScAddress MakeAddress() const; ScBigAddress& operator=( const ScBigAddress& r ) @@ -88,7 +88,7 @@ public: inline void ScBigAddress::PutInOrder( ScBigAddress& r ) { - INT32 nTmp; + sal_Int32 nTmp; if ( r.nCol < nCol ) { nTmp = r.nCol; @@ -110,7 +110,7 @@ inline void ScBigAddress::PutInOrder( ScBigAddress& r ) } -inline BOOL ScBigAddress::IsValid( const ScDocument* pDoc ) const +inline sal_Bool ScBigAddress::IsValid( const ScDocument* pDoc ) const { //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab return ((0 <= nCol && nCol <= MAXCOL) @@ -186,32 +186,32 @@ public: : aStart( r ), aEnd( r ) {} ScBigRange( const ScAddress& r ) : aStart( r ), aEnd( r ) {} - ScBigRange( INT32 nCol, INT32 nRow, INT32 nTab ) + ScBigRange( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nTab ) : aStart( nCol, nRow, nTab ), aEnd( aStart ) {} - ScBigRange( INT32 nCol1, INT32 nRow1, INT32 nTab1, - INT32 nCol2, INT32 nRow2, INT32 nTab2 ) + ScBigRange( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nTab1, + sal_Int32 nCol2, sal_Int32 nRow2, sal_Int32 nTab2 ) : aStart( nCol1, nRow1, nTab1 ), aEnd( nCol2, nRow2, nTab2 ) {} - void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, - INT32 nCol2, INT32 nRow2, INT32 nTab2 ) + void Set( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nTab1, + sal_Int32 nCol2, sal_Int32 nRow2, sal_Int32 nTab2 ) { aStart.Set( nCol1, nRow1, nTab1 ); aEnd.Set( nCol2, nRow2, nTab2 ); } - void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, - INT32& nCol2, INT32& nRow2, INT32& nTab2 ) const + void GetVars( sal_Int32& nCol1, sal_Int32& nRow1, sal_Int32& nTab1, + sal_Int32& nCol2, sal_Int32& nRow2, sal_Int32& nTab2 ) const { aStart.GetVars( nCol1, nRow1, nTab1 ); aEnd.GetVars( nCol2, nRow2, nTab2 ); } - BOOL IsValid( const ScDocument* pDoc ) const + sal_Bool IsValid( const ScDocument* pDoc ) const { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); } inline ScRange MakeRange() const { return ScRange( aStart.MakeAddress(), aEnd.MakeAddress() ); } - inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? - inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? - inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? + inline sal_Bool In( const ScBigAddress& ) const; // ist Address& in Range? + inline sal_Bool In( const ScBigRange& ) const; // ist Range& in Range? + inline sal_Bool Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? ScBigRange& operator=( const ScBigRange& r ) { aStart = r.aStart; aEnd = r.aEnd; return *this; } @@ -225,7 +225,7 @@ public: }; -inline BOOL ScBigRange::In( const ScBigAddress& rAddr ) const +inline sal_Bool ScBigRange::In( const ScBigAddress& rAddr ) const { return aStart.Col() <= rAddr.Col() && rAddr.Col() <= aEnd.Col() && @@ -234,7 +234,7 @@ inline BOOL ScBigRange::In( const ScBigAddress& rAddr ) const } -inline BOOL ScBigRange::In( const ScBigRange& r ) const +inline sal_Bool ScBigRange::In( const ScBigRange& r ) const { return aStart.Col() <= r.aStart.Col() && r.aEnd.Col() <= aEnd.Col() && @@ -243,7 +243,7 @@ inline BOOL ScBigRange::In( const ScBigRange& r ) const } -inline BOOL ScBigRange::Intersects( const ScBigRange& r ) const +inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const { return !( Min( aEnd.Col(), r.aEnd.Col() ) < Max( aStart.Col(), r.aStart.Col() ) diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index cdba4e3a78bb..186d1f918409 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -47,7 +47,7 @@ private: public: TYPEINFO(); - ScHint( ULONG n, const ScAddress& a, ScBaseCell* p ) + ScHint( sal_uLong n, const ScAddress& a, ScBaseCell* p ) : SfxSimpleHint( n ), aAddress( a ), pCell( p ) {} ScBaseCell* GetCell() const { return pCell; } void SetCell( ScBaseCell* p ) { pCell = p; } diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 1e78f0a951be..770b3c1f5760 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -64,8 +64,8 @@ friend class FuncCollection; const ModuleData* pModuleData; String aInternalName; String aFuncName; - USHORT nNumber; - USHORT nParamCount; + sal_uInt16 nNumber; + sal_uInt16 nParamCount; ParamType eAsyncType; ParamType eParamType[MAXFUNCPARAM]; private: @@ -74,8 +74,8 @@ public: FuncData(const ModuleData*pModule, const String& rIName, const String& rFName, - USHORT nNo, - USHORT nCount, + sal_uInt16 nNo, + sal_uInt16 nCount, const ParamType* peType, ParamType eType); FuncData(const FuncData& rData); @@ -84,17 +84,17 @@ public: const String& GetModuleName() const; const String& GetInternalName() const { return aInternalName; } const String& GetFuncName() const { return aFuncName; } - USHORT GetParamCount() const { return nParamCount; } - ParamType GetParamType(USHORT nIndex) const { return eParamType[nIndex]; } + sal_uInt16 GetParamCount() const { return nParamCount; } + ParamType GetParamType(sal_uInt16 nIndex) const { return eParamType[nIndex]; } ParamType GetReturnType() const { return eParamType[0]; } ParamType GetAsyncType() const { return eAsyncType; } - BOOL Call(void** ppParam); - BOOL Unadvice(double nHandle); + sal_Bool Call(void** ppParam); + sal_Bool Unadvice(double nHandle); // Name und Beschreibung des Parameters nParam. // nParam==0 => Desc := Funktions-Beschreibung, // Name := n/a - BOOL GetParamDesc( String& aName, String& aDesc, USHORT nParam ); + sal_Bool GetParamDesc( String& aName, String& aDesc, sal_uInt16 nParam ); }; @@ -102,17 +102,17 @@ public: class FuncCollection : public ScSortedCollection { public: - FuncCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {} + FuncCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False) : ScSortedCollection ( nLim, nDel, bDup ) {} FuncCollection(const FuncCollection& rFuncCollection) : ScSortedCollection ( rFuncCollection ) {} virtual ScDataObject* Clone() const { return new FuncCollection(*this); } - FuncData* operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);} + FuncData* operator[]( const sal_uInt16 nIndex) const {return (FuncData*)At(nIndex);} virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - BOOL SearchFunc( const String& rName, USHORT& rIndex ) const; + sal_Bool SearchFunc( const String& rName, sal_uInt16& rIndex ) const; }; -BOOL InitExternalFunc(const rtl::OUString& rModuleName); +sal_Bool InitExternalFunc(const rtl::OUString& rModuleName); void ExitExternalFunc(); #endif diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index ad9ed02a0415..54e767cc0555 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -110,11 +110,11 @@ public: bool IsBlank( bool bIgnoreNotes = false ) const; // fuer Idle-Berechnung - inline USHORT GetTextWidth() const { return nTextWidth; } - inline void SetTextWidth( USHORT nNew ) { nTextWidth = nNew; } + inline sal_uInt16 GetTextWidth() const { return nTextWidth; } + inline void SetTextWidth( sal_uInt16 nNew ) { nTextWidth = nNew; } - inline BYTE GetScriptType() const { return nScriptType; } - inline void SetScriptType( BYTE nNew ) { nScriptType = nNew; } + inline sal_uInt8 GetScriptType() const { return nScriptType; } + inline void SetScriptType( sal_uInt8 nNew ) { nScriptType = nNew; } /** Returns true, if the cell contains a note. */ inline bool HasNote() const { return mpNote != 0; } @@ -150,15 +150,15 @@ public: ScAddress aPos = ScAddress() ); /** Error code if ScFormulaCell, else 0. */ - USHORT GetErrorCode() const; + sal_uInt16 GetErrorCode() const; /** ScFormulaCell with formula::svEmptyCell result, or ScNoteCell (may have been created due to reference to empty cell). */ - BOOL HasEmptyData() const; - BOOL HasValueData() const; - BOOL HasStringData() const; + sal_Bool HasEmptyData() const; + sal_Bool HasValueData() const; + sal_Bool HasStringData() const; String GetStringData() const; // nur echte Strings - static BOOL CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ); + static sal_Bool CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ); private: ScBaseCell& operator=( const ScBaseCell& ); @@ -168,9 +168,9 @@ private: SvtBroadcaster* mpBroadcaster; /// Broadcaster for changed values. Cell takes ownership! protected: - USHORT nTextWidth; - BYTE eCellType; // enum CellType - BYTE spart Speicher - BYTE nScriptType; + sal_uInt16 nTextWidth; + sal_uInt8 eCellType; // enum CellType - sal_uInt8 spart Speicher + sal_uInt8 nScriptType; }; // ============================================================================ @@ -298,19 +298,19 @@ private: ScFormulaCell* pNext; ScFormulaCell* pPreviousTrack; ScFormulaCell* pNextTrack; - ULONG nFormatIndex; // Number format set by calculation + sal_uLong nFormatIndex; // Number format set by calculation short nFormatType; // Number format type set by calculation - USHORT nSeenInIteration; // Iteration cycle in which the cell was last encountered - BYTE cMatrixFlag; // One of ScMatrixMode - BOOL bDirty : 1; // Must be (re)calculated - BOOL bChanged : 1; // Whether something changed regarding display/representation - BOOL bRunning : 1; // Already interpreting right now - BOOL bCompile : 1; // Must be (re)compiled - BOOL bSubTotal : 1; // Cell is part of or contains a SubTotal - BOOL bIsIterCell : 1; // Cell is part of a circular reference - BOOL bInChangeTrack : 1; // Cell is in ChangeTrack - BOOL bTableOpDirty : 1; // Dirty flag for TableOp - BOOL bNeedListening : 1; // Listeners need to be re-established after UpdateReference + sal_uInt16 nSeenInIteration; // Iteration cycle in which the cell was last encountered + sal_uInt8 cMatrixFlag; // One of ScMatrixMode + sal_Bool bDirty : 1; // Must be (re)calculated + sal_Bool bChanged : 1; // Whether something changed regarding display/representation + sal_Bool bRunning : 1; // Already interpreting right now + sal_Bool bCompile : 1; // Must be (re)compiled + sal_Bool bSubTotal : 1; // Cell is part of or contains a SubTotal + sal_Bool bIsIterCell : 1; // Cell is part of a circular reference + sal_Bool bInChangeTrack : 1; // Cell is in ChangeTrack + sal_Bool bTableOpDirty : 1; // Dirty flag for TableOp + sal_Bool bNeedListening : 1; // Listeners need to be re-established after UpdateReference enum ScInterpretTailParameter { @@ -336,7 +336,7 @@ public: /** Empty formula cell, or with a preconstructed token array. */ ScFormulaCell( ScDocument*, const ScAddress&, const ScTokenArray* = NULL, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, - BYTE = MM_NONE ); + sal_uInt8 = MM_NONE ); /** With formula string and grammar to compile with. formula::FormulaGrammar::GRAM_DEFAULT effectively isformula::FormulaGrammar::GRAM_NATIVE_UI that @@ -345,7 +345,7 @@ public: ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, const String& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, - BYTE cMatInd = MM_NONE ); + sal_uInt8 cMatInd = MM_NONE ); ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, const ScAddress& rPos, int nCloneFlags = SC_CLONECELL_DEFAULT ); @@ -355,27 +355,27 @@ public: const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; void SetDirty(); - inline void SetDirtyVar() { bDirty = TRUE; } + inline void SetDirtyVar() { bDirty = sal_True; } // If setting entire document dirty after load, no broadcasts but still append to FormulaTree. void SetDirtyAfterLoad(); - inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; } + inline void ResetTableOpDirtyVar() { bTableOpDirty = sal_False; } void SetTableOpDirty(); - BOOL IsDirtyOrInTableOpDirty() const; - BOOL GetDirty() const { return bDirty; } - BOOL NeedsListening() const { return bNeedListening; } - void SetNeedsListening( BOOL bVar ) { bNeedListening = bVar; } + sal_Bool IsDirtyOrInTableOpDirty() const; + sal_Bool GetDirty() const { return bDirty; } + sal_Bool NeedsListening() const { return bNeedListening; } + void SetNeedsListening( sal_Bool bVar ) { bNeedListening = bVar; } void Compile(const String& rFormula, - BOOL bNoListening = FALSE, + sal_Bool bNoListening = sal_False, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); - void CompileTokenArray( BOOL bNoListening = FALSE ); + void CompileTokenArray( sal_Bool bNoListening = sal_False ); void CompileXML( ScProgress& rProgress ); // compile temporary string tokens void CalcAfterLoad(); bool MarkUsedExternalReferences(); void Interpret(); - inline BOOL IsIterCell() const { return bIsIterCell; } - inline USHORT GetSeenInIteration() const { return nSeenInIteration; } + inline sal_Bool IsIterCell() const { return bIsIterCell; } + inline sal_uInt16 GetSeenInIteration() const { return nSeenInIteration; } - BOOL HasOneReference( ScRange& r ) const; + sal_Bool HasOneReference( ScRange& r ) const; /* Checks if the formula contains reference list that can be expressed by one reference (like A1;A2;A3:A5 -> A1:A5). The reference list is not required to be sorted (i.e. A3;A1;A2 is @@ -385,8 +385,8 @@ public: It is similar to HasOneReference(), but more general. */ bool HasRefListExpressibleAsOneReference(ScRange& rRange) const; - BOOL HasRelNameReference() const; - BOOL HasColRowName() const; + sal_Bool HasRelNameReference() const; + sal_Bool HasColRowName() const; void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& r, @@ -402,42 +402,42 @@ public: void UpdateInsertTab(SCTAB nTable); void UpdateInsertTabAbs(SCTAB nTable); - BOOL UpdateDeleteTab(SCTAB nTable, BOOL bIsMove = FALSE); + sal_Bool UpdateDeleteTab(SCTAB nTable, sal_Bool bIsMove = sal_False); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); void UpdateRenameTab(SCTAB nTable, const String& rName); - BOOL TestTabRefAbs(SCTAB nTable); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - BOOL IsRangeNameInUse(USHORT nIndex) const; - void FindRangeNamesInUse(std::set<USHORT>& rIndexes) const; + sal_Bool TestTabRefAbs(SCTAB nTable); + void UpdateCompile( sal_Bool bForceIfNameInUse = sal_False ); + sal_Bool IsRangeNameInUse(sal_uInt16 nIndex) const; + void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const; void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ); - BOOL IsSubTotal() const { return bSubTotal; } - BOOL IsChanged() const { return bChanged; } - void ResetChanged() { bChanged = FALSE; } - BOOL IsEmpty(); // formula::svEmptyCell result + sal_Bool IsSubTotal() const { return bSubTotal; } + sal_Bool IsChanged() const { return bChanged; } + void ResetChanged() { bChanged = sal_False; } + sal_Bool IsEmpty(); // formula::svEmptyCell result // display as empty string if formula::svEmptyCell result - BOOL IsEmptyDisplayedAsString(); - BOOL IsValue(); // also TRUE if formula::svEmptyCell + sal_Bool IsEmptyDisplayedAsString(); + sal_Bool IsValue(); // also sal_True if formula::svEmptyCell double GetValue(); double GetValueAlways(); // ignore errors void GetString( String& rString ); const ScMatrix* GetMatrix(); - BOOL GetMatrixOrigin( ScAddress& rPos ) const; + sal_Bool GetMatrixOrigin( ScAddress& rPos ) const; void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); - USHORT GetMatrixEdge( ScAddress& rOrgPos ); - USHORT GetErrCode(); // interpret first if necessary - USHORT GetRawError(); // don't interpret, just return code or result error + sal_uInt16 GetMatrixEdge( ScAddress& rOrgPos ); + sal_uInt16 GetErrCode(); // interpret first if necessary + sal_uInt16 GetRawError(); // don't interpret, just return code or result error short GetFormatType() const { return nFormatType; } - ULONG GetFormatIndex() const { return nFormatIndex; } - void GetFormatInfo( short& nType, ULONG& nIndex ) const + sal_uLong GetFormatIndex() const { return nFormatIndex; } + void GetFormatInfo( short& nType, sal_uLong& nIndex ) const { nType = nFormatType; nIndex = nFormatIndex; } - BYTE GetMatrixFlag() const { return cMatrixFlag; } + sal_uInt8 GetMatrixFlag() const { return cMatrixFlag; } ScTokenArray* GetCode() const { return pCode; } - BOOL IsRunning() const { return bRunning; } - void SetRunning( BOOL bVal ) { bRunning = bVal; } + sal_Bool IsRunning() const { return bRunning; } + void SetRunning( sal_Bool bVal ) { bRunning = bVal; } void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileDBFormula( sal_Bool bCreateFormulaString ); + void CompileNameFormula( sal_Bool bCreateFormulaString ); void CompileColRowNameFormula(); ScFormulaCell* GetPrevious() const { return pPrevious; } ScFormulaCell* GetNext() const { return pNext; } @@ -449,19 +449,19 @@ public: void SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint); - void SetCompile( BOOL bVal ) { bCompile = bVal; } + void SetCompile( sal_Bool bVal ) { bCompile = bVal; } ScDocument* GetDocument() const { return pDocument; } void SetMatColsRows( SCCOL nCols, SCROW nRows ); void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; // ob Zelle im ChangeTrack und nicht im echten Dokument ist - void SetInChangeTrack( BOOL bVal ) { bInChangeTrack = bVal; } - BOOL IsInChangeTrack() const { return bInChangeTrack; } + void SetInChangeTrack( sal_Bool bVal ) { bInChangeTrack = bVal; } + sal_Bool IsInChangeTrack() const { return bInChangeTrack; } // Zu Typ und Format das entsprechende Standardformat. // Bei Format "Standard" evtl. das in die Formelzelle // uebernommene Format. - ULONG GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const; + sal_uLong GetStandardFormat( SvNumberFormatter& rFormatter, sal_uLong nFormat ) const; // For import filters! void AddRecalcMode( formula::ScRecalcMode ); @@ -480,8 +480,8 @@ public: void SetHybridFormula( const String& r, const formula::FormulaGrammar::Grammar eGrammar ) { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; } - void SetErrCode( USHORT n ); - inline BOOL IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); } + void SetErrCode( sal_uInt16 n ); + inline sal_Bool IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); } EditTextObject* CreateURLObject() ; void GetURLResult( String& rURL, String& rCellText ); @@ -497,7 +497,7 @@ private: ScAddress aPos; public: ScDetectiveRefIter( ScFormulaCell* pCell ); - BOOL GetNextRef( ScRange& rRange ); + sal_Bool GetNextRef( ScRange& rRange ); }; // ============================================================================ diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index b0b445a5993d..0a9ce4542b2c 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -48,13 +48,13 @@ enum ScForceTextFmt { class SC_DLLPUBLIC ScCellFormat { public: - static void GetString( ScBaseCell* pCell, ULONG nFormat, String& rString, + static void GetString( ScBaseCell* pCell, sal_uLong nFormat, String& rString, Color** ppColor, SvNumberFormatter& rFormatter, - BOOL bNullVals = TRUE, - BOOL bFormula = FALSE, + sal_Bool bNullVals = sal_True, + sal_Bool bFormula = sal_False, ScForceTextFmt eForceTextFmt = ftDontForce ); - static void GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString, + static void GetInputString( ScBaseCell* pCell, sal_uLong nFormat, String& rString, SvNumberFormatter& rFormatter ); }; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index d3d02818b358..a72a9f729983 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -188,16 +188,16 @@ private: ScMarkData* pMarkData; ScRangeList aRanges; sal_Int64 nObjectId; - BOOL bChartColAsHdr; - BOOL bChartRowAsHdr; - BOOL bCursorOnly; - BOOL bGotDataChangedHint; + sal_Bool bChartColAsHdr; + sal_Bool bChartRowAsHdr; + sal_Bool bCursorOnly; + sal_Bool bGotDataChangedHint; XModifyListenerArr_Impl aValueListeners; DECL_LINK( ValueListenerHdl, SfxHint* ); private: - void PaintRanges_Impl( USHORT nPart ); + void PaintRanges_Impl( sal_uInt16 nPart ); ScRangeListRef GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const; void ForceChartListener_Impl(); ScMemChart* CreateMemChart_Impl() const; @@ -210,7 +210,7 @@ private: com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> QueryDifferences_Impl(const com::sun::star::table::CellAddress& aCompare, - BOOL bColumnDiff); + sal_Bool bColumnDiff); com::sun::star::uno::Reference<com::sun::star::uno::XInterface> Find_Impl(const com::sun::star::uno::Reference< com::sun::star::util::XSearchDescriptor>& xDesc, @@ -222,7 +222,7 @@ protected: // GetItemPropertyMap for derived classes must contain all entries, including base class virtual const SfxItemPropertyMap* GetItemPropertyMap(); virtual ::com::sun::star::beans::PropertyState GetOnePropertyState( - USHORT nItemWhich, const SfxItemPropertySimpleEntry* pEntry ); + sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry ); virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) throw(::com::sun::star::uno::RuntimeException); @@ -258,8 +258,8 @@ public: void SetNewRange(const ScRange& rNew); // fuer Cursor void SetNewRanges(const ScRangeList& rNew); - void SetCursorOnly(BOOL bSet); - BOOL IsCursorOnly() const { return bCursorOnly; } + void SetCursorOnly(sal_Bool bSet); + sal_Bool IsCursorOnly() const { return bCursorOnly; } // XSheetOperation virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) @@ -833,9 +833,9 @@ private: sal_Int16 nActionLockCount; private: - String GetInputString_Impl(BOOL bEnglish) const; + String GetInputString_Impl(sal_Bool bEnglish) const; String GetOutputString_Impl() const; - void SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish); + void SetString_Impl(const String& rString, sal_Bool bInterpret, sal_Bool bEnglish); double GetValue_Impl() const; void SetValue_Impl(double fValue); com::sun::star::table::CellContentType GetResultType_Impl(); @@ -1376,7 +1376,7 @@ private: ScRangeList aRanges; ScAddress aPos; ScMarkData* pMark; - BOOL bAtEnd; + sal_Bool bAtEnd; private: void Advance_Impl(); @@ -1459,8 +1459,8 @@ private: SCTAB nTab; ScAttrRectIterator* pIter; ScRange aNext; - BOOL bAtEnd; - BOOL bDirty; + sal_Bool bAtEnd; + sal_Bool bDirty; private: void Advance_Impl(); diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 62f30a17c62e..47558c5d53d9 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -73,7 +73,7 @@ class SC_DLLPUBLIC ScChartArray : public ScDataObject // nur noch String aName; ScDocument* pDocument; ScChartPositioner aPositioner; - BOOL bValid; // fuer Erzeugung aus SchMemChart + sal_Bool bValid; // fuer Erzeugung aus SchMemChart private: ScMemChart* CreateMemChartSingle(); @@ -95,14 +95,14 @@ public: void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } const ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); } - void SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); } - BOOL HasColHeaders() const { return aPositioner.HasColHeaders(); } - BOOL HasRowHeaders() const { return aPositioner.HasRowHeaders(); } - BOOL IsValid() const { return bValid; } + void SetHeaders(sal_Bool bCol, sal_Bool bRow) { aPositioner.SetHeaders(bCol, bRow); } + sal_Bool HasColHeaders() const { return aPositioner.HasColHeaders(); } + sal_Bool HasRowHeaders() const { return aPositioner.HasRowHeaders(); } + sal_Bool IsValid() const { return bValid; } void SetName(const String& rNew) { aName = rNew; } const String& GetName() const { return aName; } - BOOL operator==(const ScChartArray& rCmp) const; + sal_Bool operator==(const ScChartArray& rCmp) const; ScMemChart* CreateMemChart(); }; @@ -115,10 +115,10 @@ public: ScCollection( rColl ) {} virtual ScDataObject* Clone() const; - ScChartArray* operator[](USHORT nIndex) const + ScChartArray* operator[](sal_uInt16 nIndex) const { return (ScChartArray*)At(nIndex); } - BOOL operator==(const ScChartCollection& rCmp) const; + sal_Bool operator==(const ScChartCollection& rCmp) const; }; diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx index 7966e07d00f8..8ee894e6a55a 100644 --- a/sc/inc/charthelper.hxx +++ b/sc/inc/charthelper.hxx @@ -46,8 +46,8 @@ typedef ::std::vector< ScRangeList > ScRangeListVector; class ScChartHelper { public: - static USHORT DoUpdateAllCharts( ScDocument* pDoc ); - static USHORT DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc ); //use this to replace ScDBFunc::DoUpdateCharts in future + static sal_uInt16 DoUpdateAllCharts( ScDocument* pDoc ); + static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc ); //use this to replace ScDBFunc::DoUpdateCharts in future static void AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, ScDocument* pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartFromSdrObject( SdrObject* pObject ); static void GetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 26831970d5b7..f97344c8ca1e 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -75,9 +75,9 @@ private: ScChartUnoData* pUnoData; ScDocument* pDoc; - BOOL bUsed; // fuer ScChartListenerCollection::FreeUnused - BOOL bDirty; - BOOL bSeriesRangesScheduled; + sal_Bool bUsed; // fuer ScChartListenerCollection::FreeUnused + sal_Bool bDirty; + sal_Bool bSeriesRangesScheduled; // not implemented ScChartListener& operator=( const ScChartListener& ); @@ -98,34 +98,34 @@ public: com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener > GetUnoListener() const; com::sun::star::uno::Reference< com::sun::star::chart::XChartData > GetUnoSource() const; - BOOL IsUno() const { return (pUnoData != NULL); } + sal_Bool IsUno() const { return (pUnoData != NULL); } virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); void StartListeningTo(); void EndListeningTo(); void ChangeListening( const ScRangeListRef& rRangeListRef, - BOOL bDirty = FALSE ); + sal_Bool bDirty = sal_False ); void Update(); ScRangeListRef GetRangeList() const; void SetRangeList( const ScRangeListRef& rNew ); void SetRangeList( const ScRange& rNew ); - BOOL IsUsed() const { return bUsed; } - void SetUsed( BOOL bFlg ) { bUsed = bFlg; } - BOOL IsDirty() const { return bDirty; } - void SetDirty( BOOL bFlg ) { bDirty = bFlg; } + sal_Bool IsUsed() const { return bUsed; } + void SetUsed( sal_Bool bFlg ) { bUsed = bFlg; } + sal_Bool IsDirty() const { return bDirty; } + void SetDirty( sal_Bool bFlg ) { bDirty = bFlg; } void UpdateChartIntersecting( const ScRange& rRange ); // if chart series ranges are to be updated later on (e.g. DeleteTab, InsertTab) - void ScheduleSeriesRanges() { bSeriesRangesScheduled = TRUE; } + void ScheduleSeriesRanges() { bSeriesRangesScheduled = sal_True; } void UpdateScheduledSeriesRanges(); void UpdateSeriesRanges(); ExternalRefListener* GetExtRefListener(); void SetUpdateQueue(); - BOOL operator==( const ScChartListener& ); - BOOL operator!=( const ScChartListener& r ) + sal_Bool operator==( const ScChartListener& ); + sal_Bool operator!=( const ScChartListener& r ) { return !operator==( r ); } }; @@ -176,7 +176,7 @@ public: void ChangeListening( const String& rName, const ScRangeListRef& rRangeListRef, - BOOL bDirty = FALSE ); + sal_Bool bDirty = sal_False ); // FreeUnused nur wie in ScDocument::UpdateChartListenerCollection verwenden! void FreeUnused(); void FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, @@ -185,14 +185,14 @@ public: void UpdateDirtyCharts(); void SC_DLLPUBLIC SetDirty(); void SetDiffDirty( const ScChartListenerCollection&, - BOOL bSetChartRangeLists = FALSE ); + sal_Bool bSetChartRangeLists = sal_False ); void SetRangeDirty( const ScRange& rRange ); // z.B. Zeilen/Spalten void UpdateScheduledSeriesRanges(); void UpdateChartsContainingTab( SCTAB nTab ); - BOOL operator==( const ScChartListenerCollection& ); + sal_Bool operator==( const ScChartListenerCollection& ); /** * Start listening on hide/show change within specified cell range. A diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 84ffd2e877e2..ecd9b89d1dea 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -44,7 +44,7 @@ class ScChartPositionMap ScAddress** ppData; ScAddress** ppColHeader; ScAddress** ppRowHeader; - ULONG nCount; + sal_uLong nCount; SCCOL nColCount; SCROW nRowCount; @@ -61,17 +61,17 @@ class ScChartPositionMap public: - ULONG GetCount() const { return nCount; } + sal_uLong GetCount() const { return nCount; } SCCOL GetColCount() const { return nColCount; } SCROW GetRowCount() const { return nRowCount; } - BOOL IsValid( SCCOL nCol, SCROW nRow ) const + sal_Bool IsValid( SCCOL nCol, SCROW nRow ) const { return nCol < nColCount && nRow < nRowCount; } // Daten spaltenweise - ULONG GetIndex( SCCOL nCol, SCROW nRow ) const - { return (ULONG) nCol * nRowCount + nRow; } + sal_uLong GetIndex( SCCOL nCol, SCROW nRow ) const + { return (sal_uLong) nCol * nRowCount + nRow; } - const ScAddress* GetPosition( ULONG nIndex ) const + const ScAddress* GetPosition( sal_uLong nIndex ) const { if ( nIndex < nCount ) return ppData[ nIndex ]; @@ -120,9 +120,9 @@ class ScChartPositioner // nur noch Parameter-Struct ScChartGlue eGlue; SCCOL nStartCol; SCROW nStartRow; - BOOL bColHeaders; - BOOL bRowHeaders; - BOOL bDummyUpperLeft; + sal_Bool bColHeaders; + sal_Bool bRowHeaders; + sal_Bool bDummyUpperLeft; private: void CheckColRowHeaders(); @@ -143,15 +143,15 @@ public: void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } void SetRangeList( const ScRange& rNew ); - void SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; } - BOOL HasColHeaders() const { return bColHeaders; } - BOOL HasRowHeaders() const { return bRowHeaders; } - void SetDummyUpperLeft(BOOL bNew) { bDummyUpperLeft = bNew; } + void SetHeaders(sal_Bool bCol, sal_Bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; } + sal_Bool HasColHeaders() const { return bColHeaders; } + sal_Bool HasRowHeaders() const { return bRowHeaders; } + void SetDummyUpperLeft(sal_Bool bNew) { bDummyUpperLeft = bNew; } void SeteGlue(ScChartGlue eNew) { eGlue = eNew; } void SetStartCol(SCCOL nNew) { nStartCol = nNew; } void SetStartRow(SCROW nNew) { nStartRow = nNew; } - BOOL operator==(const ScChartPositioner& rCmp) const; + sal_Bool operator==(const ScChartPositioner& rCmp) const; void InvalidateGlue() { diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 6cf3d59314ef..3a0d9b82f41c 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -250,8 +250,8 @@ protected: // Bereichen ScChangeActionLinkEntry* pLinkDeleted; // Links zu geloeschten ScChangeActionLinkEntry* pLinkDependent; // Links zu abhaengigen - ULONG nAction; - ULONG nRejectAction; + sal_uLong nAction; + sal_uLong nRejectAction; ScChangeActionType eType; ScChangeActionState eState; @@ -262,8 +262,8 @@ protected: // only to be used in the XML import ScChangeAction( ScChangeActionType, const ScBigRange&, - const ULONG nAction, - const ULONG nRejectAction, + const sal_uLong nAction, + const sal_uLong nRejectAction, const ScChangeActionState eState, const DateTime& aDateTime, const String& aUser, @@ -271,15 +271,15 @@ protected: // only to be used in the XML import ScChangeAction( ScChangeActionType, const ScBigRange&, - const ULONG nAction); + const sal_uLong nAction); virtual ~ScChangeAction(); String GetRefString( const ScBigRange&, - ScDocument*, BOOL bFlag3D = FALSE ) const; + ScDocument*, sal_Bool bFlag3D = sal_False ) const; - void SetActionNumber( ULONG n ) { nAction = n; } - void SetRejectAction( ULONG n ) { nRejectAction = n; } + void SetActionNumber( sal_uLong n ) { nAction = n; } + void SetRejectAction( sal_uLong n ) { nRejectAction = n; } void SetUser( const String& r ) { aUser = r; } void SetType( ScChangeActionType e ) { eType = e; } void SetState( ScChangeActionState e ) { eState = e; } @@ -307,7 +307,7 @@ protected: return new ScChangeActionLinkEntry( GetDeletedInAddress(), p ); } - BOOL RemoveDeletedIn( const ScChangeAction* ); + sal_Bool RemoveDeletedIn( const ScChangeAction* ); void SetDeletedIn( ScChangeAction* ); ScChangeActionLinkEntry* AddDeleted( ScChangeAction* p ) @@ -331,15 +331,15 @@ protected: virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - INT32 nDx, INT32 nDy, INT32 nDz ); + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ); void Accept(); - virtual BOOL Reject( ScDocument* ) = 0; + virtual sal_Bool Reject( ScDocument* ) = 0; void RejectRestoreContents( ScChangeTrack*, SCsCOL nDx, SCsROW nDy ); // used in Reject() instead of IsRejectable() - BOOL IsInternalRejectable() const; + sal_Bool IsInternalRejectable() const; // Derived classes that hold a pointer to the // ChangeTrack must return that. Otherwise NULL. @@ -347,51 +347,51 @@ protected: public: - BOOL IsInsertType() const + sal_Bool IsInsertType() const { return eType == SC_CAT_INSERT_COLS || eType == SC_CAT_INSERT_ROWS || eType == SC_CAT_INSERT_TABS; } - BOOL IsDeleteType() const + sal_Bool IsDeleteType() const { return eType == SC_CAT_DELETE_COLS || eType == SC_CAT_DELETE_ROWS || eType == SC_CAT_DELETE_TABS; } - BOOL IsVirgin() const + sal_Bool IsVirgin() const { return eState == SC_CAS_VIRGIN; } - BOOL IsAccepted() const + sal_Bool IsAccepted() const { return eState == SC_CAS_ACCEPTED; } - BOOL IsRejected() const + sal_Bool IsRejected() const { return eState == SC_CAS_REJECTED; } // Action rejects another Action - BOOL IsRejecting() const + sal_Bool IsRejecting() const { return nRejectAction != 0; } // ob Action im Dokument sichtbar ist - BOOL IsVisible() const; + sal_Bool IsVisible() const; // ob Action anfassbar ist - BOOL IsTouchable() const; + sal_Bool IsTouchable() const; // ob Action ein Eintrag in Dialog-Root ist - BOOL IsDialogRoot() const; + sal_Bool IsDialogRoot() const; // ob ein Eintrag im Dialog aufklappbar sein soll - BOOL IsDialogParent() const; + sal_Bool IsDialogParent() const; // ob Action ein Delete ist, unter dem // aufgeklappt mehrere einzelne Deletes sind - BOOL IsMasterDelete() const; + sal_Bool IsMasterDelete() const; // ob Action akzeptiert/selektiert/abgelehnt // werden kann - BOOL IsClickable() const; + sal_Bool IsClickable() const; // ob Action abgelehnt werden kann - BOOL IsRejectable() const; + sal_Bool IsRejectable() const; const ScBigRange& GetBigRange() const { return aBigRange; } SC_DLLPUBLIC DateTime GetDateTime() const; // local time @@ -401,27 +401,27 @@ public: const String& GetComment() const { return aComment; } ScChangeActionType GetType() const { return eType; } ScChangeActionState GetState() const { return eState; } - ULONG GetActionNumber() const { return nAction; } - ULONG GetRejectAction() const { return nRejectAction; } + sal_uLong GetActionNumber() const { return nAction; } + sal_uLong GetRejectAction() const { return nRejectAction; } ScChangeAction* GetNext() const { return pNext; } ScChangeAction* GetPrev() const { return pPrev; } - BOOL IsDeletedIn() const + sal_Bool IsDeletedIn() const { return GetDeletedIn() != NULL; } - BOOL IsDeleted() const + sal_Bool IsDeleted() const { return IsDeleteType() || IsDeletedIn(); } - BOOL IsDeletedIn( const ScChangeAction* ) const; - BOOL IsDeletedInDelType( ScChangeActionType ) const; + sal_Bool IsDeletedIn( const ScChangeAction* ) const; + sal_Bool IsDeletedInDelType( ScChangeActionType ) const; void RemoveAllDeletedIn(); const ScChangeActionLinkEntry* GetFirstDeletedEntry() const { return pLinkDeleted; } const ScChangeActionLinkEntry* GetFirstDependentEntry() const { return pLinkDependent; } - BOOL HasDependent() const + sal_Bool HasDependent() const { return pLinkDependent != NULL; } - BOOL HasDeleted() const + sal_Bool HasDeleted() const { return pLinkDeleted != NULL; } // Description wird an String angehaengt. @@ -429,10 +429,10 @@ public: // eine Spalte/Zeile beruecksichtigt (fuer // Auflistung der einzelnen Eintraege). virtual void GetDescription( String&, ScDocument*, - BOOL bSplitRange = FALSE, bool bWarning = true ) const; + sal_Bool bSplitRange = sal_False, bool bWarning = true ) const; virtual void GetRefString( String&, ScDocument*, - BOOL bFlag3D = FALSE ) const; + sal_Bool bFlag3D = sal_False ) const; // fuer DocumentMerge altes Datum einer anderen // Action setzen, mit GetDateTimeUTC geholt @@ -444,10 +444,10 @@ public: { aComment = rStr; } // only to be used in the XML import - void SetDeletedInThis( ULONG nActionNumber, + void SetDeletedInThis( sal_uLong nActionNumber, const ScChangeTrack* pTrack ); // only to be used in the XML import - void AddDependent( ULONG nActionNumber, + void AddDependent( sal_uLong nActionNumber, const ScChangeTrack* pTrack ); #if DEBUG_CHANGETRACK String ToString( ScDocument* pDoc ) const; @@ -467,14 +467,14 @@ class ScChangeActionIns : public ScChangeAction virtual void AddContent( ScChangeActionContent* ) {} virtual void DeleteCellEntries() {} - virtual BOOL Reject( ScDocument* ); + virtual sal_Bool Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return 0; } public: - ScChangeActionIns(const ULONG nActionNumber, + ScChangeActionIns(const sal_uLong nActionNumber, const ScChangeActionState eState, - const ULONG nRejectingNumber, + const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, @@ -482,7 +482,7 @@ public: const ScChangeActionType eType); // only to use in the XML import virtual void GetDescription( String&, ScDocument*, - BOOL bSplitRange = FALSE, bool bWarning = true ) const; + sal_Bool bSplitRange = sal_False, bool bWarning = true ) const; }; @@ -565,16 +565,16 @@ class ScChangeActionDel : public ScChangeAction virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - INT32 nDx, INT32 nDy, INT32 nDz ); + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual sal_Bool Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } public: - ScChangeActionDel(const ULONG nActionNumber, + ScChangeActionDel(const sal_uLong nActionNumber, const ScChangeActionState eState, - const ULONG nRejectingNumber, + const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, @@ -586,17 +586,17 @@ public: // ob dieses das unterste einer Reihe (oder // auch einzeln) ist - BOOL IsBaseDelete() const; + sal_Bool IsBaseDelete() const; // ob dieses das oberste einer Reihe (oder // auch einzeln) ist - BOOL IsTopDelete() const; + sal_Bool IsTopDelete() const; // ob dieses ein Teil einer Reihe ist - BOOL IsMultiDelete() const; + sal_Bool IsMultiDelete() const; // ob es eine Col ist, die zu einem TabDelete gehoert - BOOL IsTabDeleteCol() const; + sal_Bool IsTabDeleteCol() const; SCsCOL GetDx() const { return nDx; } SCsROW GetDy() const { return nDy; } @@ -610,7 +610,7 @@ public: short GetCutOffCount() const { return nCutOff; } virtual void GetDescription( String&, ScDocument*, - BOOL bSplitRange = FALSE, bool bWarning = true ) const; + sal_Bool bSplitRange = sal_False, bool bWarning = true ) const; void SetCutOffInsert( ScChangeActionIns* p, short n ) { pCutOff = p; nCutOff = n; } // only to use in the XML import // this should be protected, but for the XML import it is public @@ -635,8 +635,8 @@ class ScChangeActionMove : public ScChangeAction ScBigRange aFromRange; ScChangeTrack* pTrack; ScChangeActionCellListEntry* pFirstCell; - ULONG nStartLastCut; // fuer PasteCut Undo - ULONG nEndLastCut; + sal_uLong nStartLastCut; // fuer PasteCut Undo + sal_uLong nEndLastCut; ScChangeActionMove( const ScRange& rFromRange, const ScRange& rToRange, @@ -655,16 +655,16 @@ class ScChangeActionMove : public ScChangeAction ScBigRange& GetFromRange() { return aFromRange; } - void SetStartLastCut( ULONG nVal ) { nStartLastCut = nVal; } - ULONG GetStartLastCut() const { return nStartLastCut; } - void SetEndLastCut( ULONG nVal ) { nEndLastCut = nVal; } - ULONG GetEndLastCut() const { return nEndLastCut; } + void SetStartLastCut( sal_uLong nVal ) { nStartLastCut = nVal; } + sal_uLong GetStartLastCut() const { return nStartLastCut; } + void SetEndLastCut( sal_uLong nVal ) { nEndLastCut = nVal; } + sal_uLong GetEndLastCut() const { return nEndLastCut; } virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - INT32 nDx, INT32 nDy, INT32 nDz ); + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual sal_Bool Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } @@ -672,9 +672,9 @@ protected: using ScChangeAction::GetRefString; public: - ScChangeActionMove(const ULONG nActionNumber, + ScChangeActionMove(const sal_uLong nActionNumber, const ScChangeActionState eState, - const ULONG nRejectingNumber, + const sal_uLong nRejectingNumber, const ScBigRange& aToBigRange, const String& aUser, const DateTime& aDateTime, @@ -685,13 +685,13 @@ public: { return pFirstCell; } // only to use in the XML export const ScBigRange& GetFromRange() const { return aFromRange; } - SC_DLLPUBLIC void GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const; + SC_DLLPUBLIC void GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nDz ) const; virtual void GetDescription( String&, ScDocument*, - BOOL bSplitRange = FALSE, bool bWarning = true ) const; + sal_Bool bSplitRange = sal_False, bool bWarning = true ) const; virtual void GetRefString( String&, ScDocument*, - BOOL bFlag3D = FALSE ) const; + sal_Bool bFlag3D = sal_False ) const; }; @@ -751,7 +751,7 @@ class ScChangeActionContent : public ScChangeAction static void GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, - ULONG nFormat ); + sal_uLong nFormat ); static void SetValue( String& rStr, ScBaseCell*& pCell, const ScAddress& rPos, @@ -760,15 +760,15 @@ class ScChangeActionContent : public ScChangeAction ScDocument* pToDoc ); static void SetValue( String& rStr, ScBaseCell*& pCell, - ULONG nFormat, + sal_uLong nFormat, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ); static void SetCell( String& rStr, ScBaseCell* pCell, - ULONG nFormat, const ScDocument* pDoc ); + sal_uLong nFormat, const ScDocument* pDoc ); - static BOOL NeedsNumberFormat( const ScBaseCell* ); + static sal_Bool NeedsNumberFormat( const ScBaseCell* ); void SetValueString( String& rValue, ScBaseCell*& pCell, const String& rStr, @@ -786,16 +786,16 @@ class ScChangeActionContent : public ScChangeAction virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - INT32 nDx, INT32 nDy, INT32 nDz ); + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual sal_Bool Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return 0; } // pRejectActions!=NULL: reject actions get // stacked, no SetNewValue, no Append - BOOL Select( ScDocument*, ScChangeTrack*, - BOOL bOldest, Stack* pRejectActions ); + sal_Bool Select( ScDocument*, ScChangeTrack*, + sal_Bool bOldest, Stack* pRejectActions ); void PutValueToDoc( ScBaseCell*, const String&, ScDocument*, SCsCOL nDx, SCsROW nDy ) const; @@ -816,9 +816,9 @@ public: pNextInSlot( NULL ), ppPrevInSlot( NULL ) {} - ScChangeActionContent(const ULONG nActionNumber, + ScChangeActionContent(const sal_uLong nActionNumber, const ScChangeActionState eState, - const ULONG nRejectingNumber, + const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, @@ -826,7 +826,7 @@ public: ScBaseCell* pOldCell, ScDocument* pDoc, const String& sOldValue); // to use for XML Import - ScChangeActionContent(const ULONG nActionNumber, + ScChangeActionContent(const sal_uLong nActionNumber, ScBaseCell* pNewCell, const ScBigRange& aBigRange, ScDocument* pDoc, @@ -836,7 +836,7 @@ public: ScChangeActionContent* GetNextContent() const { return pNextContent; } ScChangeActionContent* GetPrevContent() const { return pPrevContent; } ScChangeActionContent* GetTopContent() const; - BOOL IsTopContent() const + sal_Bool IsTopContent() const { return pNextContent == NULL; } virtual ScChangeActionLinkEntry* GetDeletedIn() const; @@ -850,7 +850,7 @@ public: void SetOldValue( const ScBaseCell*, const ScDocument* pFromDoc, ScDocument* pToDoc, - ULONG nFormat ); + sal_uLong nFormat ); void SetOldValue( const ScBaseCell*, const ScDocument* pFromDoc, ScDocument* pToDoc ); @@ -859,8 +859,8 @@ public: // Used in import filter AppendContentOnTheFly, // takes ownership of cells. void SetOldNewCells( ScBaseCell* pOldCell, - ULONG nOldFormat, ScBaseCell* pNewCell, - ULONG nNewFormat, ScDocument* pDoc ); + sal_uLong nOldFormat, ScBaseCell* pNewCell, + sal_uLong nNewFormat, ScDocument* pDoc ); // Use this only in the XML import, // takes ownership of cell. @@ -883,30 +883,30 @@ public: const ScBaseCell* GetOldCell() const { return pOldCell; } const ScBaseCell* GetNewCell() const { return pNewCell; } virtual void GetDescription( String&, ScDocument*, - BOOL bSplitRange = FALSE, bool bWarning = true ) const; + sal_Bool bSplitRange = sal_False, bool bWarning = true ) const; virtual void GetRefString( String&, ScDocument*, - BOOL bFlag3D = FALSE ) const; + sal_Bool bFlag3D = sal_False ) const; static ScChangeActionContentCellType GetContentCellType( const ScBaseCell* ); // NewCell - BOOL IsMatrixOrigin() const + sal_Bool IsMatrixOrigin() const { return GetContentCellType( GetNewCell() ) == SC_CACCT_MATORG; } - BOOL IsMatrixReference() const + sal_Bool IsMatrixReference() const { return GetContentCellType( GetNewCell() ) == SC_CACCT_MATREF; } // OldCell - BOOL IsOldMatrixOrigin() const + sal_Bool IsOldMatrixOrigin() const { return GetContentCellType( GetOldCell() ) == SC_CACCT_MATORG; } - BOOL IsOldMatrixReference() const + sal_Bool IsOldMatrixReference() const { return GetContentCellType( GetOldCell() ) == SC_CACCT_MATREF; @@ -924,7 +924,7 @@ class ScChangeActionReject : public ScChangeAction friend class ScChangeTrack; friend class ScChangeActionContent; - ScChangeActionReject( ULONG nReject ) + ScChangeActionReject( sal_uLong nReject ) : ScChangeAction( SC_CAT_REJECT, ScRange() ) { SetRejectAction( nReject ); @@ -934,14 +934,14 @@ class ScChangeActionReject : public ScChangeAction virtual void AddContent( ScChangeActionContent* ) {} virtual void DeleteCellEntries() {} - virtual BOOL Reject( ScDocument* ) { return FALSE; } + virtual sal_Bool Reject( ScDocument* ) { return sal_False; } virtual const ScChangeTrack* GetChangeTrack() const { return 0; } public: - ScChangeActionReject(const ULONG nActionNumber, + ScChangeActionReject(const sal_uLong nActionNumber, const ScChangeActionState eState, - const ULONG nRejectingNumber, + const sal_uLong nRejectingNumber, const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, @@ -965,8 +965,8 @@ struct ScChangeTrackMsgInfo DECL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo ) ScChangeTrackMsgType eMsgType; - ULONG nStartAction; - ULONG nEndAction; + sal_uLong nStartAction; + sal_uLong nEndAction; }; // MsgQueue fuer Benachrichtigung via ModifiedLink @@ -989,15 +989,15 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* ) // Intern generierte Actions beginnen bei diesem Wert (fast alle Bits gesetzt) // und werden runtergezaehlt, um sich in einer Table wertemaessig nicht mit den // "normalen" Actions in die Quere zu kommen. -#define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0) +#define SC_CHGTRACK_GENERATED_START ((sal_uInt32) 0xfffffff0) class ScChangeTrack : public utl::ConfigurationListener { friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW ); - friend BOOL ScChangeActionDel::Reject( ScDocument* pDoc ); + friend sal_Bool ScChangeActionDel::Reject( ScDocument* pDoc ); friend void ScChangeActionDel::DeleteCellEntries(); friend void ScChangeActionMove::DeleteCellEntries(); - friend BOOL ScChangeActionMove::Reject( ScDocument* pDoc ); + friend sal_Bool ScChangeActionMove::Reject( ScDocument* pDoc ); static const SCROW nContentRowsPerSlot; static const SCSIZE nContentSlots; @@ -1025,21 +1025,21 @@ class ScChangeTrack : public utl::ConfigurationListener ScChangeActionLinkEntry* pLinkMove; ScChangeTrackMsgInfo* pBlockModifyMsg; ScDocument* pDoc; - ULONG nActionMax; - ULONG nGeneratedMin; - ULONG nMarkLastSaved; - ULONG nStartLastCut; - ULONG nEndLastCut; - ULONG nLastMerge; + sal_uLong nActionMax; + sal_uLong nGeneratedMin; + sal_uLong nMarkLastSaved; + sal_uLong nStartLastCut; + sal_uLong nEndLastCut; + sal_uLong nLastMerge; ScChangeTrackMergeState eMergeState; - USHORT nLoadedFileFormatVersion; - BOOL bLoadSave; - BOOL bInDelete; - BOOL bInDeleteUndo; - BOOL bInDeleteTop; - BOOL bInPasteCut; - BOOL bUseFixDateTime; - BOOL bTime100thSeconds; + sal_uInt16 nLoadedFileFormatVersion; + sal_Bool bLoadSave; + sal_Bool bInDelete; + sal_Bool bInDeleteUndo; + sal_Bool bInDeleteTop; + sal_Bool bInPasteCut; + sal_Bool bUseFixDateTime; + sal_Bool bTime100thSeconds; // not implemented, prevent usage ScChangeTrack( const ScChangeTrack& ); @@ -1048,53 +1048,53 @@ class ScChangeTrack : public utl::ConfigurationListener #ifdef SC_CHGTRACK_CXX static SCROW InitContentRowsPerSlot(); - // TRUE if one is MM_FORMULA and the other is + // sal_True if one is MM_FORMULA and the other is // not, or if both are and range differs - static BOOL IsMatrixFormulaRangeDifferent( + static sal_Bool IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell, const ScBaseCell* pNewCell ); void Init(); void DtorClear(); - void SetLoadSave( BOOL bVal ) { bLoadSave = bVal; } + void SetLoadSave( sal_Bool bVal ) { bLoadSave = bVal; } void SetInDeleteRange( const ScRange& rRange ) { aInDeleteRange = rRange; } - void SetInDelete( BOOL bVal ) + void SetInDelete( sal_Bool bVal ) { bInDelete = bVal; } - void SetInDeleteTop( BOOL bVal ) + void SetInDeleteTop( sal_Bool bVal ) { bInDeleteTop = bVal; } - void SetInDeleteUndo( BOOL bVal ) + void SetInDeleteUndo( sal_Bool bVal ) { bInDeleteUndo = bVal; } - void SetInPasteCut( BOOL bVal ) + void SetInPasteCut( sal_Bool bVal ) { bInPasteCut = bVal; } void SetMergeState( ScChangeTrackMergeState eState ) { eMergeState = eState; } ScChangeTrackMergeState GetMergeState() const { return eMergeState; } - void SetLastMerge( ULONG nVal ) { nLastMerge = nVal; } - ULONG GetLastMerge() const { return nLastMerge; } + void SetLastMerge( sal_uLong nVal ) { nLastMerge = nVal; } + sal_uLong GetLastMerge() const { return nLastMerge; } void SetLastCutMoveRange( const ScRange&, ScDocument* ); // ModifyMsg blockweise und nicht einzeln erzeugen void StartBlockModify( ScChangeTrackMsgType, - ULONG nStartAction ); - void EndBlockModify( ULONG nEndAction ); + sal_uLong nStartAction ); + void EndBlockModify( sal_uLong nEndAction ); void AddDependentWithNotify( ScChangeAction* pParent, ScChangeAction* pDependent ); void Dependencies( ScChangeAction* ); - void UpdateReference( ScChangeAction*, BOOL bUndo ); + void UpdateReference( ScChangeAction*, sal_Bool bUndo ); void UpdateReference( ScChangeAction** ppFirstAction, - ScChangeAction* pAct, BOOL bUndo ); - void Append( ScChangeAction* pAppend, ULONG nAction ); + ScChangeAction* pAct, sal_Bool bUndo ); + void Append( ScChangeAction* pAppend, sal_uLong nAction ); SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, ScDocument* pRefDoc, SCsTAB nDz, - ULONG nRejectingInsert ); + sal_uLong nRejectingInsert ); void AppendOneDeleteRange( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, - ULONG nRejectingInsert ); + sal_uLong nRejectingInsert ); void LookUpContents( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); @@ -1118,8 +1118,8 @@ class ScChangeTrack : public utl::ConfigurationListener // ist nur bei Insert und Move (MasterType) // noetig, kann ansonsten NULL sein. // bRecursion == Aufruf aus Reject mit Table - BOOL Reject( ScChangeAction*, - ScChangeActionTable*, BOOL bRecursion ); + sal_Bool Reject( ScChangeAction*, + ScChangeActionTable*, sal_Bool bRecursion ); #endif // SC_CHGTRACK_CXX @@ -1128,7 +1128,7 @@ class ScChangeTrack : public utl::ConfigurationListener public: - static SCSIZE ComputeContentSlot( INT32 nRow ) + static SCSIZE ComputeContentSlot( sal_Int32 nRow ) { if ( nRow < 0 || nRow > MAXROW ) return nContentSlots - 1; @@ -1144,34 +1144,34 @@ public: ScChangeActionContent* GetFirstGenerated() const { return pFirstGeneratedDelContent; } ScChangeAction* GetFirst() const { return pFirst; } ScChangeAction* GetLast() const { return pLast; } - ULONG GetActionMax() const { return nActionMax; } - BOOL IsGenerated( ULONG nAction ) const + sal_uLong GetActionMax() const { return nActionMax; } + sal_Bool IsGenerated( sal_uLong nAction ) const { return nAction >= nGeneratedMin; } - ScChangeAction* GetAction( ULONG nAction ) const + ScChangeAction* GetAction( sal_uLong nAction ) const { return aTable.Get( nAction ); } - ScChangeAction* GetGenerated( ULONG nGenerated ) const + ScChangeAction* GetGenerated( sal_uLong nGenerated ) const { return aGeneratedTable.Get( nGenerated ); } - ScChangeAction* GetActionOrGenerated( ULONG nAction ) const + ScChangeAction* GetActionOrGenerated( sal_uLong nAction ) const { return IsGenerated( nAction ) ? GetGenerated( nAction ) : GetAction( nAction ); } - ULONG GetLastSavedActionNumber() const + sal_uLong GetLastSavedActionNumber() const { return nMarkLastSaved; } - void SetLastSavedActionNumber(ULONG nNew) + void SetLastSavedActionNumber(sal_uLong nNew) { nMarkLastSaved = nNew; } ScChangeAction* GetLastSaved() const { return aTable.Get( nMarkLastSaved ); } ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } - BOOL IsLoadSave() const { return bLoadSave; } + sal_Bool IsLoadSave() const { return bLoadSave; } const ScRange& GetInDeleteRange() const { return aInDeleteRange; } - BOOL IsInDelete() const { return bInDelete; } - BOOL IsInDeleteTop() const { return bInDeleteTop; } - BOOL IsInDeleteUndo() const { return bInDeleteUndo; } - BOOL IsInPasteCut() const { return bInPasteCut; } + sal_Bool IsInDelete() const { return bInDelete; } + sal_Bool IsInDeleteTop() const { return bInDeleteTop; } + sal_Bool IsInDeleteUndo() const { return bInDeleteUndo; } + sal_Bool IsInPasteCut() const { return bInPasteCut; } SC_DLLPUBLIC void SetUser( const String& ); const String& GetUser() const { return aUser; } const ScStrCollection& GetUserCollection() const @@ -1183,7 +1183,7 @@ public: // set this if the date/time set with // SetFixDateTime...() shall be applied to // appended actions - void SetUseFixDateTime( BOOL bVal ) + void SetUseFixDateTime( sal_Bool bVal ) { bUseFixDateTime = bVal; } // for MergeDocument, apply original date/time as UTC void SetFixDateTimeUTC( const DateTime& rDT ) @@ -1198,7 +1198,7 @@ public: // => no generation of deleted contents SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, ScDocument* pRefDoc, - ULONG& nStartAction, ULONG& nEndAction, + sal_uLong& nStartAction, sal_uLong& nEndAction, SCsTAB nDz = 0 ); // nDz: Multi-TabDel, LookUpContent ist // um -nDz verschoben zu suchen @@ -1211,14 +1211,14 @@ public: // alte Werte aus RefDoc/UndoDoc void AppendContentRange( const ScRange& rRange, ScDocument* pRefDoc, - ULONG& nStartAction, ULONG& nEndAction, + sal_uLong& nStartAction, sal_uLong& nEndAction, ScChangeActionClipMode eMode = SC_CACM_NONE ); // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus pOldCell, nOldFormat, // RefDoc==NULL => Doc void AppendContent( const ScAddress& rPos, const ScBaseCell* pOldCell, - ULONG nOldFormat, ScDocument* pRefDoc = NULL ); + sal_uLong nOldFormat, ScDocument* pRefDoc = NULL ); // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus pOldCell, Format aus Doc void AppendContent( const ScAddress& rPos, @@ -1227,7 +1227,7 @@ public: // alte Werte aus RefDoc/UndoDoc. // Alle Contents, wo im RefDoc eine Zelle steht. void AppendContentsIfInRefDoc( ScDocument* pRefDoc, - ULONG& nStartAction, ULONG& nEndAction ); + sal_uLong& nStartAction, sal_uLong& nEndAction ); // Meant for import filter, creates and inserts // an unconditional content action of the two @@ -1240,8 +1240,8 @@ public: SC_DLLPUBLIC ScChangeActionContent* AppendContentOnTheFly( const ScAddress& rPos, ScBaseCell* pOldCell, ScBaseCell* pNewCell, - ULONG nOldFormat = 0, - ULONG nNewFormat = 0 ); + sal_uLong nOldFormat = 0, + sal_uLong nNewFormat = 0 ); // die folgenden beiden nur benutzen wenn's // nicht anders geht (setzen nur String fuer @@ -1270,22 +1270,22 @@ public: pLastCutMove = NULL; } } - BOOL HasLastCut() const + sal_Bool HasLastCut() const { return nEndLastCut > 0 && nStartLastCut <= nEndLastCut && pLastCutMove; } - SC_DLLPUBLIC void Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false ); + SC_DLLPUBLIC void Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMerge = false ); // fuer MergeDocument, Referenzen anpassen, //! darf nur in einem temporaer geoeffneten //! Dokument verwendet werden, der Track //! ist danach verhunzt void MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false ); - void MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false ); - static BOOL MergeIgnore( const ScChangeAction&, ULONG nFirstMerge ); + void MergeOwn( ScChangeAction* pAct, sal_uLong nFirstMerge, bool bShared = false ); + static sal_Bool MergeIgnore( const ScChangeAction&, sal_uLong nFirstMerge ); // Abhaengige in Table einfuegen. // Bei Insert sind es echte Abhaengige, @@ -1302,25 +1302,25 @@ public: // der Abhaengigen flach eingefuegt. SC_DLLPUBLIC void GetDependents( ScChangeAction*, ScChangeActionTable&, - BOOL bListMasterDelete = FALSE, - BOOL bAllFlat = FALSE ) const; + sal_Bool bListMasterDelete = sal_False, + sal_Bool bAllFlat = sal_False ) const; // Reject visible Action (und abhaengige) - BOOL Reject( ScChangeAction*, bool bShared = false ); + sal_Bool Reject( ScChangeAction*, bool bShared = false ); // Accept visible Action (und abhaengige) - SC_DLLPUBLIC BOOL Accept( ScChangeAction* ); + SC_DLLPUBLIC sal_Bool Accept( ScChangeAction* ); void AcceptAll(); // alle Virgins - BOOL RejectAll(); // alle Virgins + sal_Bool RejectAll(); // alle Virgins // Selektiert einen Content von mehreren an // gleicher Position und akzeptiert diesen und // die aelteren, rejected die neueren. - // Mit bOldest==TRUE wird der erste OldValue + // Mit bOldest==sal_True wird der erste OldValue // einer Virgin-Content-Kette restauriert. - BOOL SelectContent( ScChangeAction*, - BOOL bOldest = FALSE ); + sal_Bool SelectContent( ScChangeAction*, + sal_Bool bOldest = sal_False ); // wenn ModifiedLink gesetzt, landen // Aenderungen in ScChangeTrackMsgQueue @@ -1330,30 +1330,30 @@ public: ScChangeTrackMsgQueue& GetMsgQueue() { return aMsgQueue; } void NotifyModified( ScChangeTrackMsgType eMsgType, - ULONG nStartAction, ULONG nEndAction ); + sal_uLong nStartAction, sal_uLong nEndAction ); - USHORT GetLoadedFileFormatVersion() const + sal_uInt16 GetLoadedFileFormatVersion() const { return nLoadedFileFormatVersion; } - ULONG AddLoadedGenerated(ScBaseCell* pOldCell, + sal_uLong AddLoadedGenerated(ScBaseCell* pOldCell, const ScBigRange& aBigRange, const String& sNewValue ); // only to use in the XML import void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected - void SetActionMax(ULONG nTempActionMax) + void SetActionMax(sal_uLong nTempActionMax) { nActionMax = nTempActionMax; } // only to use in the XML import void SetProtection( const com::sun::star::uno::Sequence< sal_Int8 >& rPass ) { aProtectPass = rPass; } com::sun::star::uno::Sequence< sal_Int8 > GetProtection() const { return aProtectPass; } - BOOL IsProtected() const + sal_Bool IsProtected() const { return aProtectPass.getLength() != 0; } // If time stamps of actions of this // ChangeTrack and a second one are to be // compared including 100th seconds. - void SetTime100thSeconds( BOOL bVal ) + void SetTime100thSeconds( sal_Bool bVal ) { bTime100thSeconds = bVal; } - BOOL IsTime100thSeconds() const + sal_Bool IsTime100thSeconds() const { return bTime100thSeconds; } void AppendCloned( ScChangeAction* pAppend ); diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index ddc0dcc14243..09794e885778 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -53,32 +53,32 @@ private: String aComment; ScRangeList aRangeList; ScChgsDateMode eDateMode; - BOOL bShowIt; - BOOL bIsDate; - BOOL bIsAuthor; - BOOL bIsComment; - BOOL bIsRange; - BOOL bEveryoneButMe; - BOOL bShowAccepted; - BOOL bShowRejected; + sal_Bool bShowIt; + sal_Bool bIsDate; + sal_Bool bIsAuthor; + sal_Bool bIsComment; + sal_Bool bIsRange; + sal_Bool bEveryoneButMe; + sal_Bool bShowAccepted; + sal_Bool bShowRejected; bool mbIsActionRange; - ULONG mnFirstAction; - ULONG mnLastAction; + sal_uLong mnFirstAction; + sal_uLong mnLastAction; public: ScChangeViewSettings() { pCommentSearcher=NULL; - bIsDate=FALSE; - bIsAuthor=FALSE; - bIsRange=FALSE; - bIsComment=FALSE; - bShowIt=FALSE; + bIsDate=sal_False; + bIsAuthor=sal_False; + bIsRange=sal_False; + bIsComment=sal_False; + bShowIt=sal_False; eDateMode=SCDM_DATE_BEFORE; - bEveryoneButMe=FALSE; - bShowAccepted=FALSE; - bShowRejected=FALSE; + bEveryoneButMe=sal_False; + bShowAccepted=sal_False; + bShowRejected=sal_False; mbIsActionRange = false; } @@ -86,11 +86,11 @@ public: ~ScChangeViewSettings(); - BOOL ShowChanges() const {return bShowIt;} - void SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;} + sal_Bool ShowChanges() const {return bShowIt;} + void SetShowChanges(sal_Bool nFlag=sal_True){bShowIt=nFlag;} - BOOL HasDate() const {return bIsDate;} - void SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;} + sal_Bool HasDate() const {return bIsDate;} + void SetHasDate(sal_Bool nFlag=sal_True) {bIsDate=nFlag;} void SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; } ScChgsDateMode GetTheDateMode() const { return eDateMode; } @@ -102,35 +102,35 @@ public: const DateTime& GetTheLastDateTime()const {return aLastDateTime;} - BOOL HasAuthor() const {return bIsAuthor;} - void SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;} + sal_Bool HasAuthor() const {return bIsAuthor;} + void SetHasAuthor(sal_Bool nFlag=sal_True) {bIsAuthor=nFlag;} String GetTheAuthorToShow()const {return aAuthorToShow;} void SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;} - BOOL HasComment() const {return bIsComment;} - void SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;} + sal_Bool HasComment() const {return bIsComment;} + void SetHasComment(sal_Bool nFlag=sal_True) {bIsComment=nFlag;} String GetTheComment()const {return aComment;} void SetTheComment(const String& aString); - BOOL IsValidComment(const String* pCommentStr) const; + sal_Bool IsValidComment(const String* pCommentStr) const; - BOOL IsEveryoneButMe() const {return bEveryoneButMe;} - void SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;} + sal_Bool IsEveryoneButMe() const {return bEveryoneButMe;} + void SetEveryoneButMe(sal_Bool nFlag=sal_True) {bEveryoneButMe=nFlag;} - BOOL HasRange() const {return bIsRange;} - void SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;} + sal_Bool HasRange() const {return bIsRange;} + void SetHasRange(sal_Bool nFlag=sal_True) {bIsRange=nFlag;} const ScRangeList& GetTheRangeList()const {return aRangeList;} void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;} - BOOL IsShowAccepted() const { return bShowAccepted; } - void SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; } + sal_Bool IsShowAccepted() const { return bShowAccepted; } + void SetShowAccepted( sal_Bool bVal ) { bShowAccepted = bVal; } - BOOL IsShowRejected() const { return bShowRejected; } - void SetShowRejected( BOOL bVal ) { bShowRejected = bVal; } + sal_Bool IsShowRejected() const { return bShowRejected; } + void SetShowRejected( sal_Bool bVal ) { bShowRejected = bVal; } ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); @@ -139,8 +139,8 @@ public: bool HasActionRange() const { return mbIsActionRange; } void SetHasActionRange( bool nFlag = true ) { mbIsActionRange = nFlag; } - void GetTheActionRange( ULONG& nFirst, ULONG& nLast ) const { nFirst = mnFirstAction; nLast = mnLastAction; } - void SetTheActionRange( ULONG nFirst, ULONG nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; } + void GetTheActionRange( sal_uLong& nFirst, sal_uLong& nLast ) const { nFirst = mnFirstAction; nLast = mnLastAction; } + void SetTheActionRange( sal_uLong nFirst, sal_uLong nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; } }; diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx index 167ab5929c6a..546765054012 100644 --- a/sc/inc/collect.hxx +++ b/sc/inc/collect.hxx @@ -57,29 +57,29 @@ public: class SC_DLLPUBLIC ScCollection : public ScDataObject { protected: - USHORT nCount; - USHORT nLimit; - USHORT nDelta; + sal_uInt16 nCount; + sal_uInt16 nLimit; + sal_uInt16 nDelta; ScDataObject** pItems; public: - ScCollection(USHORT nLim = 4, USHORT nDel = 4); + ScCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4); ScCollection(const ScCollection& rCollection); virtual ~ScCollection(); virtual ScDataObject* Clone() const; - void AtFree(USHORT nIndex); + void AtFree(sal_uInt16 nIndex); void Free(ScDataObject* pScDataObject); void FreeAll(); - BOOL AtInsert(USHORT nIndex, ScDataObject* pScDataObject); - virtual BOOL Insert(ScDataObject* pScDataObject); + sal_Bool AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject); + virtual sal_Bool Insert(ScDataObject* pScDataObject); - ScDataObject* At(USHORT nIndex) const; - virtual USHORT IndexOf(ScDataObject* pScDataObject) const; - USHORT GetCount() const; + ScDataObject* At(sal_uInt16 nIndex) const; + virtual sal_uInt16 IndexOf(ScDataObject* pScDataObject) const; + sal_uInt16 GetCount() const; - ScDataObject* operator[]( const USHORT nIndex) const {return At(nIndex);} + ScDataObject* operator[]( const sal_uInt16 nIndex) const {return At(nIndex);} ScCollection& operator=( const ScCollection& rCol ); }; @@ -87,25 +87,25 @@ public: class SC_DLLPUBLIC ScSortedCollection : public ScCollection { private: - BOOL bDuplicates; + sal_Bool bDuplicates; protected: // fuer ScStrCollection Load/Store - void SetDups( BOOL bVal ) { bDuplicates = bVal; } - BOOL IsDups() const { return bDuplicates; } + void SetDups( sal_Bool bVal ) { bDuplicates = bVal; } + sal_Bool IsDups() const { return bDuplicates; } public: - ScSortedCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE); + ScSortedCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False); ScSortedCollection(const ScSortedCollection& rScSortedCollection) : ScCollection(rScSortedCollection), bDuplicates(rScSortedCollection.bDuplicates) {} - virtual USHORT IndexOf(ScDataObject* pScDataObject) const; + virtual sal_uInt16 IndexOf(ScDataObject* pScDataObject) const; virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const = 0; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; - BOOL Search(ScDataObject* pScDataObject, USHORT& rIndex) const; - virtual BOOL Insert(ScDataObject* pScDataObject); - virtual BOOL InsertPos(ScDataObject* pScDataObject, USHORT& nIndex); + virtual sal_Bool IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + sal_Bool Search(ScDataObject* pScDataObject, sal_uInt16& rIndex) const; + virtual sal_Bool Insert(ScDataObject* pScDataObject); + virtual sal_Bool InsertPos(ScDataObject* pScDataObject, sal_uInt16& nIndex); - BOOL operator==(const ScSortedCollection& rCmp) const; + sal_Bool operator==(const ScSortedCollection& rCmp) const; }; @@ -132,13 +132,13 @@ class SvStream; class SC_DLLPUBLIC ScStrCollection : public ScSortedCollection { public: - ScStrCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : + ScStrCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False) : ScSortedCollection ( nLim, nDel, bDup ) {} ScStrCollection(const ScStrCollection& rScStrCollection) : ScSortedCollection ( rScStrCollection ) {} virtual ScDataObject* Clone() const; - StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);} + StrData* operator[]( const sal_uInt16 nIndex) const {return (StrData*)At(nIndex);} virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; }; @@ -150,13 +150,13 @@ class TypedStrData : public ScDataObject { public: TypedStrData( const String& rStr, double nVal = 0.0, - USHORT nType = SC_STRTYPE_STANDARD ) + sal_uInt16 nType = SC_STRTYPE_STANDARD ) : aStrValue(rStr), nValue(nVal), nStrType(nType) {} //UNUSED2008-05 TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 BOOL bAllStrings ); +//UNUSED2008-05 sal_Bool bAllStrings ); TypedStrData( const TypedStrData& rCpy ) : ScDataObject(), @@ -166,7 +166,7 @@ public: virtual ScDataObject* Clone() const; - BOOL IsStrData() const { return nStrType != 0; } + sal_Bool IsStrData() const { return nStrType != 0; } const String& GetString() const { return aStrValue; } double GetValue () const { return nValue; } @@ -175,16 +175,16 @@ private: String aStrValue; double nValue; - USHORT nStrType; // 0 = Value + sal_uInt16 nStrType; // 0 = Value }; class SC_DLLPUBLIC TypedScStrCollection : public ScSortedCollection { private: - BOOL bCaseSensitive; + sal_Bool bCaseSensitive; public: - TypedScStrCollection( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE ); + TypedScStrCollection( sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False ); TypedScStrCollection( const TypedScStrCollection& rCpy ) : ScSortedCollection( rCpy ) { bCaseSensitive = rCpy.bCaseSensitive; } @@ -193,12 +193,12 @@ public: virtual ScDataObject* Clone() const; virtual short Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const; - TypedStrData* operator[]( const USHORT nIndex) const; + TypedStrData* operator[]( const sal_uInt16 nIndex) const; - void SetCaseSensitive( BOOL bSet ); + void SetCaseSensitive( sal_Bool bSet ); - BOOL FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const; - BOOL GetExactMatch( String& rString ) const; + sal_Bool FindText( const String& rStart, String& rResult, sal_uInt16& rPos, sal_Bool bBack ) const; + sal_Bool GetExactMatch( String& rString ) const; }; #endif diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index af6292bbd830..36569d4efefb 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -72,18 +72,18 @@ class ScFlatBoolRowSegments; struct ScNeededSizeOptions { const ScPatternAttr* pPattern; - BOOL bFormula; - BOOL bSkipMerged; - BOOL bGetFont; - BOOL bTotalSize; + sal_Bool bFormula; + sal_Bool bSkipMerged; + sal_Bool bGetFont; + sal_Bool bTotalSize; ScNeededSizeOptions() { pPattern = NULL; - bFormula = FALSE; - bSkipMerged = TRUE; - bGetFont = TRUE; - bTotalSize = FALSE; + bFormula = sal_False; + bSkipMerged = sal_True; + bGetFont = sal_True; + bTotalSize = sal_False; } }; @@ -119,7 +119,7 @@ friend class ScHorizontalCellIterator; friend class ScHorizontalAttrIterator; public: -static BOOL bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln +static sal_Bool bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln public: ScColumn(); @@ -127,10 +127,10 @@ public: void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc); - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + sal_Bool Search( SCROW nRow, SCSIZE& nIndex ) const; ScBaseCell* GetCell( SCROW nRow ) const; void Insert( SCROW nRow, ScBaseCell* pCell ); - void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell ); + void Insert( SCROW nRow, sal_uLong nFormatIndex, ScBaseCell* pCell ); void Append( SCROW nRow, ScBaseCell* pCell ); void Delete( SCROW nRow ); void DeleteAtIndex( SCSIZE nIndex ); @@ -139,67 +139,67 @@ public: void SwapRow( SCROW nRow1, SCROW nRow2 ); void SwapCell( SCROW nRow, ScColumn& rCol); -//UNUSED2009-05 BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, -//UNUSED2009-05 BOOL bLeft, BOOL bRight ) const; - bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, +//UNUSED2009-05 sal_Bool HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, +//UNUSED2009-05 sal_Bool bLeft, sal_Bool bRight ) const; + bool HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const; + sal_Bool HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const; + sal_Bool ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, - BOOL bRefresh, BOOL bAttrs ); + sal_Bool bRefresh, sal_Bool bAttrs ); - BOOL IsEmptyVisData(BOOL bNotes) const; // ohne Broadcaster - BOOL IsEmptyData() const; - BOOL IsEmptyAttr() const; - BOOL IsEmpty() const; + sal_Bool IsEmptyVisData(sal_Bool bNotes) const; // ohne Broadcaster + sal_Bool IsEmptyData() const; + sal_Bool IsEmptyAttr() const; + sal_Bool IsEmpty() const; // nur Daten: - BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const; + sal_Bool IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const; SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const; - BOOL HasDataAt(SCROW nRow) const; - BOOL HasVisibleDataAt(SCROW nRow) const; + sal_Bool HasDataAt(SCROW nRow) const; + sal_Bool HasVisibleDataAt(SCROW nRow) const; SCROW GetFirstDataPos() const; SCROW GetLastDataPos() const; - SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster - SCROW GetFirstVisDataPos(BOOL bNotes) const; - BOOL GetPrevDataPos(SCROW& rRow) const; - BOOL GetNextDataPos(SCROW& rRow) const; + SCROW GetLastVisDataPos(sal_Bool bNotes) const; // ohne Broadcaster + SCROW GetFirstVisDataPos(sal_Bool bNotes) const; + sal_Bool GetPrevDataPos(SCROW& rRow) const; + sal_Bool GetNextDataPos(SCROW& rRow) const; void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster) - void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const; + void FindUsed( SCROW nStartRow, SCROW nEndRow, sal_Bool* pUsed ) const; SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const; - USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const; + sal_uInt16 GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const; + sal_Bool HasSelectionMatrixFragment(const ScMarkData& rMark) const; - BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; - BOOL GetLastVisibleAttr( SCROW& rLastRow ) const; - BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, + sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const; + sal_Bool GetLastVisibleAttr( SCROW& rLastRow ) const; + sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, SCROW nEndRow = MAXROW ) const; - BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const; - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; - BOOL TestInsertRow( SCSIZE nSize ) const; + sal_Bool TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; + sal_Bool TestInsertRow( SCSIZE nSize ) const; void InsertRow( SCROW nStartRow, SCSIZE nSize ); void DeleteRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag ); - void DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag ); - void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions); + void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDelFlag ); + void DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag ); + void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions); void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, - USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn& rColumn); + sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScColumn& rColumn); void StartListeningInArea( SCROW nRow1, SCROW nRow2 ); void BroadcastInArea( SCROW nRow1, SCROW nRow2 ); void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ); // Markierung von diesem Dokument - void MixMarked( const ScMarkData& rMark, USHORT nFunction, - BOOL bSkipEmpty, ScColumn& rSrcCol ); - void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, + void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction, + sal_Bool bSkipEmpty, ScColumn& rSrcCol ); + void MixData( SCROW nRow1, SCROW nRow2, sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScColumn& rSrcCol ); ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos, - SCSIZE nIndex, USHORT nFlags ) const; + SCSIZE nIndex, sal_uInt16 nFlags ) const; ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const; @@ -209,20 +209,20 @@ public: void UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, - BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow ); + sal_Bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow ); void UpdateAreaFunction( ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW nStartRow, SCROW nEndRow ); - void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, + void CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked, ScColumn& rColumn, const ScMarkData* pMarkData = NULL, - BOOL bAsLink = FALSE ); - void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, + sal_Bool bAsLink = sal_False ); + void UndoToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked, ScColumn& rColumn, const ScMarkData* pMarkData = NULL ); void CopyScenarioFrom( const ScColumn& rSrcCol ); void CopyScenarioTo( ScColumn& rDestCol ) const; - BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const; + sal_Bool TestCopyScenarioTo( const ScColumn& rDestCol ) const; void MarkScenarioIn( ScMarkData& rDestMark ) const; void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const; @@ -230,31 +230,31 @@ public: void SwapCol(ScColumn& rCol); void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol); - BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const; + sal_Bool HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const; - // TRUE = Zahlformat gesetzt - BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, + // sal_True = Zahlformat gesetzt + sal_Bool SetString( SCROW nRow, SCTAB nTab, const String& rString, formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO, SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true ); void SetValue( SCROW nRow, const double& rVal); - void SetError( SCROW nRow, const USHORT nError); + void SetError( SCROW nRow, const sal_uInt16 nError); void GetString( SCROW nRow, String& rString ) const; void GetInputString( SCROW nRow, String& rString ) const; double GetValue( SCROW nRow ) const; void GetFormula( SCROW nRow, String& rFormula, - BOOL bAsciiExport = FALSE ) const; + sal_Bool bAsciiExport = sal_False ) const; CellType GetCellType( SCROW nRow ) const; SCSIZE GetCellCount() const { return nCount; } - ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln - USHORT GetErrCode( SCROW nRow ) const; + sal_uLong GetWeightedCount() const; + sal_uLong GetCodeCount() const; // RPN-Code in Formeln + sal_uInt16 GetErrCode( SCROW nRow ) const; - BOOL HasStringData( SCROW nRow ) const; - BOOL HasValueData( SCROW nRow ) const; -//UNUSED2009-05 USHORT GetErrorData( SCROW nRow) const; - BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool HasStringData( SCROW nRow ) const; + sal_Bool HasValueData( SCROW nRow ) const; +//UNUSED2009-05 sal_uInt16 GetErrorData( SCROW nRow) const; + sal_Bool HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; /** Returns the pointer to a cell note object at the passed row. */ ScPostIt* GetNote( SCROW nRow ); @@ -283,38 +283,38 @@ public: ScDocument* pUndoDoc = NULL ); void UpdateInsertTab( SCTAB nTable); void UpdateInsertTabOnlyCells( SCTAB nTable); - void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL ); + void UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScColumn* pRefUndo = NULL ); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + void UpdateCompile( sal_Bool bForceIfNameInUse = sal_False ); void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); void SetTabNo(SCTAB nNewTab); - BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const; - void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const; + sal_Bool IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const; + void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const; void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap ); - const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const; + const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 nWhich ) const; const ScPatternAttr* GetPattern( SCROW nRow ) const; const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( SCROW nRow ) const; + sal_uLong GetNumberFormat( SCROW nRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; + void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, sal_Bool bDeep ) const; + void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, sal_Bool bDeep ) const; void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, - SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const; + SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ) const; void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, - SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); + SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ); void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr ); - void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); + void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, sal_Bool bPutToPool = sal_False ); void SetPatternArea( SCROW nStartRow, SCROW nEndRow, - const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); + const ScPatternAttr& rPatAttr, sal_Bool bPutToPool = sal_False ); void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); @@ -322,63 +322,63 @@ public: void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ); void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); void ApplySelectionLineStyle( const ScMarkData& rMark, - const SvxBorderLine* pLine, BOOL bColorOnly ); + const SvxBorderLine* pLine, sal_Bool bColorOnly ); const ScStyleSheet* GetStyle( SCROW nRow ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const; + const ScStyleSheet* GetAreaStyle( sal_Bool& rFound, SCROW nRow1, SCROW nRow2 ) const; void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + sal_Bool IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const; /// May return -1 if not found SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, - BOOL bUp, BOOL bInSelection, const ScMarkData& rMark ); - BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, - BOOL bUp, BOOL bInSelection, const ScMarkData& rMark ); + sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark ); + sal_Bool SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, + sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark ); - BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); + sal_Bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ); + sal_Bool RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ); void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); - void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); + void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark ); long GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bWidth, const ScNeededSizeOptions& rOptions ); - USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, + sal_Bool bWidth, const ScNeededSizeOptions& rOptions ); + sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bFormula, USHORT nOldWidth, + sal_Bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, - BOOL bSimpleTextImport ); - void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, + sal_Bool bSimpleTextImport ); + void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bShrink, USHORT nMinHeight, SCROW nMinStart ); + sal_Bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart ); private: long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, - BOOL bWidth ); + sal_Bool bWidth ); public: /// Including current, may return -1 - SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextUnprotected( SCROW nRow, sal_Bool bUp ) const; void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates); - BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); + sal_Bool GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit); //UNUSED2008-05 SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; void UpdateInsertTabAbs(SCTAB nNewPos); - BOOL TestTabRefAbs(SCTAB nTable); - BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; + sal_Bool TestTabRefAbs(SCTAB nTable); + sal_Bool GetNextSpellingCell(SCROW& nRow, sal_Bool bInSel, const ScMarkData& rData) const; void RemoveAutoSpellObj(); @@ -390,8 +390,8 @@ public: void SetRelNameDirty(); void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileDBFormula( sal_Bool bCreateFormulaString ); + void CompileNameFormula( sal_Bool bCreateFormulaString ); void CompileColRowNameFormula(); sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; @@ -399,7 +399,7 @@ public: SCROW nRowStart, SCROW nRowEnd ) const; private: - ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos); + ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos); //UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet ); }; @@ -414,7 +414,7 @@ public: ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW ); ~ScColumnIterator(); - BOOL Next( SCROW& rRow, ScBaseCell*& rpCell ); + sal_Bool Next( SCROW& rRow, ScBaseCell*& rpCell ); SCSIZE GetIndex() const; }; @@ -426,15 +426,15 @@ class ScMarkedDataIter // Daten in selektierten Bereichen durch ScMarkArrayIter* pMarkIter; SCROW nTop; SCROW nBottom; - BOOL bNext; - BOOL bAll; + sal_Bool bNext; + sal_Bool bAll; public: ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData, - BOOL bAllIfNone = FALSE ); + sal_Bool bAllIfNone = sal_False ); ~ScMarkedDataIter(); - BOOL Next( SCSIZE& rIndex ); + sal_Bool Next( SCSIZE& rIndex ); }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 7d045db3c2aa..27845bbc50cf 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -106,16 +106,16 @@ class ScTokenArray; /* OpCode eOp; // OpCode formula::StackVar eType; // type of data - USHORT nRefCnt; // reference count - BOOL bRaw; // not cloned yet and trimmed to real size + sal_uInt16 nRefCnt; // reference count + sal_Bool bRaw; // not cloned yet and trimmed to real size */ #endif #define SC_TOKEN_FIX_MEMBERS \ OpCode eOp; \ formula::StackVar eType; \ - USHORT nRefCnt; \ - BOOL bRaw; + sal_uInt16 nRefCnt; \ + sal_Bool bRaw; struct ScDoubleRawToken { @@ -126,7 +126,7 @@ public: { // union only to assure alignment identical to ScRawToken double nValue; struct { - BYTE cByte; + sal_uInt8 cByte; bool bHasForceArray; } sbyte; }; @@ -139,14 +139,14 @@ struct ScRawToken // Friends that use a temporary ScRawToken on the stack (and therefor need // the private dtor) and know what they're doing.. friend class ScTokenArray; - friend USHORT lcl_ScRawTokenOffset(); + friend sal_uInt16 lcl_ScRawTokenOffset(); private: SC_TOKEN_FIX_MEMBERS public: union { double nValue; struct { - BYTE cByte; + sal_uInt8 cByte; bool bHasForceArray; } sbyte; ScComplexRefData aRef; @@ -160,13 +160,13 @@ public: sal_Unicode cName[MAXSTRLEN+1]; } extname; ScMatrix* pMat; - USHORT nIndex; // index into name collection + sal_uInt16 nIndex; // index into name collection sal_Unicode cStr[ MAXSTRLEN+1 ]; // string (up to 255 characters + 0) short nJump[MAXJUMPCOUNT+1]; // If/Chose token }; //! other members not initialized - ScRawToken() : bRaw( TRUE ) {} + ScRawToken() : bRaw( sal_True ) {} private: ~ScRawToken() {} //! only delete via Delete() public: @@ -176,7 +176,7 @@ public: void NewOpCode( OpCode e ) { eOp = e; } void IncRef() { nRefCnt++; } void DecRef() { if( !--nRefCnt ) Delete(); } - USHORT GetRef() const { return nRefCnt; } + sal_uInt16 GetRef() const { return nRefCnt; } SC_DLLPUBLIC void Delete(); // Use these methods only on tokens that are not part of a token array, @@ -192,7 +192,7 @@ public: // These methods are ok to use, reference count not cleared. //UNUSED2008-05 ScComplexRefData& GetReference(); //UNUSED2008-05 void SetReference( ScComplexRefData& rRef ); - void SetName( USHORT n ); + void SetName( sal_uInt16 n ); void SetExternalSingleRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef ); void SetExternalDoubleRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef ); void SetExternalName( sal_uInt16 nFileId, const String& rName ); @@ -201,7 +201,7 @@ public: ScRawToken* Clone() const; // real copy! formula::FormulaToken* CreateToken() const; // create typified token - void Load( SvStream&, USHORT nVer ); + void Load( SvStream&, sal_uInt16 nVer ); static xub_StrLen GetStrLen( const sal_Unicode* pStr ); // as long as a "string" is an array static size_t GetStrLenBytes( xub_StrLen nLen ) @@ -227,7 +227,7 @@ public: struct Convention { const formula::FormulaGrammar::AddressConvention meConv; - const ULONG* mpCharTable; + const sal_uLong* mpCharTable; Convention( formula::FormulaGrammar::AddressConvention eConvP ); @@ -236,7 +236,7 @@ public: virtual void MakeRefStr( rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler, const ScComplexRefData& rRef, - BOOL bSingleRef ) const = 0; + sal_Bool bSingleRef ) const = 0; virtual ::com::sun::star::i18n::ParseResult parseAnyToken( const String& rFormula, xub_StrLen nSrcPos, @@ -316,7 +316,7 @@ private: ScRawTokenRef pRawToken; const CharClass* pCharClass; // which character classification is used for parseAnyToken - USHORT mnPredetectedReference; // reference when reading ODF, 0 (none), 1 (single) or 2 (double) + sal_uInt16 mnPredetectedReference; // reference when reading ODF, 0 (none), 1 (single) or 2 (double) SCsTAB nMaxTab; // last sheet in document sal_Int32 mnRangeOpPosInSymbol; // if and where a range operator is in symbol const Convention *pConv; @@ -325,24 +325,24 @@ private: bool mbExtendedErrorDetection; bool mbRewind; // whether symbol is to be rewound to some step during lexical analysis - BOOL NextNewToken(bool bInArray = false); + sal_Bool NextNewToken(bool bInArray = false); - virtual void SetError(USHORT nError); + virtual void SetError(sal_uInt16 nError); xub_StrLen NextSymbol(bool bInArray); - BOOL IsValue( const String& ); - BOOL IsOpCode( const String&, bool bInArray ); - BOOL IsOpCode2( const String& ); - BOOL IsString(); - BOOL IsReference( const String& ); - BOOL IsSingleReference( const String& ); - BOOL IsPredetectedReference( const String& ); - BOOL IsDoubleReference( const String& ); - BOOL IsMacro( const String& ); - BOOL IsNamedRange( const String& ); + sal_Bool IsValue( const String& ); + sal_Bool IsOpCode( const String&, bool bInArray ); + sal_Bool IsOpCode2( const String& ); + sal_Bool IsString(); + sal_Bool IsReference( const String& ); + sal_Bool IsSingleReference( const String& ); + sal_Bool IsPredetectedReference( const String& ); + sal_Bool IsDoubleReference( const String& ); + sal_Bool IsMacro( const String& ); + sal_Bool IsNamedRange( const String& ); bool IsExternalNamedRange( const String& rSymbol ); - BOOL IsDBRange( const String& ); - BOOL IsColRowName( const String& ); - BOOL IsBoolean( const String& ); + sal_Bool IsDBRange( const String& ); + sal_Bool IsColRowName( const String& ); + sal_Bool IsBoolean( const String& ); void AutoCorrectParsedSymbol(); void SetRelNameReference(); @@ -361,7 +361,7 @@ public: static void CheckTabQuotes( String& aTabName, const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO ); - static BOOL EnQuote( String& rStr ); + static sal_Bool EnQuote( String& rStr ); sal_Unicode GetNativeAddressSymbol( Convention::SpecialSymbolType eType ) const; @@ -370,7 +370,7 @@ public: //! _either_ CompileForFAP _or_ AutoCorrection, _not_ both // #i101512# SetCompileForFAP is in formula::FormulaCompiler - void SetAutoCorrection( BOOL bVal ) + void SetAutoCorrection( sal_Bool bVal ) { bAutoCorrect = bVal; bIgnoreErrors = bVal; } void SetCloseBrackets( bool bVal ) { mbCloseBrackets = bVal; } void SetRefConvention( const Convention *pConvP ); @@ -410,7 +410,7 @@ public: void SetExtendedErrorDetection( bool bVal ) { mbExtendedErrorDetection = bVal; } - BOOL IsCorrected() { return bCorrected; } + sal_Bool IsCorrected() { return bCorrected; } const String& GetCorrectedFormula() { return aCorrectedFormula; } // Use convention from this->aPos by default @@ -423,15 +423,15 @@ public: static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow ); - BOOL UpdateNameReference( UpdateRefMode eUpdateRefMode, + sal_Bool UpdateNameReference( UpdateRefMode eUpdateRefMode, const ScRange&, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, - BOOL& rChanged, BOOL bSharedFormula = FALSE); + sal_Bool& rChanged, sal_Bool bSharedFormula = sal_False); ScRangeData* UpdateReference( UpdateRefMode eUpdateRefMode, const ScAddress& rOldPos, const ScRange&, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, - BOOL& rChanged, BOOL& rRefSizeChanged ); + sal_Bool& rChanged, sal_Bool& rRefSizeChanged ); /// Only once for converted shared formulas, /// token array has to be compiled afterwards. @@ -439,24 +439,24 @@ public: const ScAddress& rOldPos, const ScRange&, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - ScRangeData* UpdateInsertTab(SCTAB nTable, BOOL bIsName ); - ScRangeData* UpdateDeleteTab(SCTAB nTable, BOOL bIsMove, BOOL bIsName, BOOL& bCompile); - ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, BOOL bIsName ); + ScRangeData* UpdateInsertTab(SCTAB nTable, sal_Bool bIsName ); + ScRangeData* UpdateDeleteTab(SCTAB nTable, sal_Bool bIsMove, sal_Bool bIsName, sal_Bool& bCompile); + ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, sal_Bool bIsName ); - BOOL HasModifiedRange(); + sal_Bool HasModifiedRange(); /** If the character is allowed as first character in sheet names or references, includes '$' and '?'. */ - static inline BOOL IsCharWordChar( String const & rStr, + static inline sal_Bool IsCharWordChar( String const & rStr, xub_StrLen nPos, const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO ) { sal_Unicode c = rStr.GetChar( nPos ); if (c < 128) { - return pConventions[eConv] ? static_cast<BOOL>( - (pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_CHAR_WORD) == SC_COMPILER_C_CHAR_WORD) : - FALSE; // no convention => assume invalid + return pConventions[eConv] ? static_cast<sal_Bool>( + (pConventions[eConv]->mpCharTable[ sal_uInt8(c) ] & SC_COMPILER_C_CHAR_WORD) == SC_COMPILER_C_CHAR_WORD) : + sal_False; // no convention => assume invalid } else return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); @@ -464,16 +464,16 @@ public: /** If the character is allowed in sheet names, thus may be part of a reference, includes '$' and '?' and such. */ - static inline BOOL IsWordChar( String const & rStr, + static inline sal_Bool IsWordChar( String const & rStr, xub_StrLen nPos, const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO ) { sal_Unicode c = rStr.GetChar( nPos ); if (c < 128) { - return pConventions[eConv] ? static_cast<BOOL>( - (pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_WORD) == SC_COMPILER_C_WORD) : - FALSE; // convention not known => assume invalid + return pConventions[eConv] ? static_cast<sal_Bool>( + (pConventions[eConv]->mpCharTable[ sal_uInt8(c) ] & SC_COMPILER_C_WORD) == SC_COMPILER_C_WORD) : + sal_False; // convention not known => assume invalid } else return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); @@ -481,11 +481,11 @@ public: /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... bits) for all known address conventions. If more than one bit is given - in nFlags, all bits must match. If bTestLetterNumeric is FALSE and - char>=128, no LetterNumeric test is done and FALSE is returned. */ + in nFlags, all bits must match. If bTestLetterNumeric is sal_False and + char>=128, no LetterNumeric test is done and sal_False is returned. */ static inline bool IsCharFlagAllConventions( String const & rStr, xub_StrLen nPos, - ULONG nFlags, + sal_uLong nFlags, bool bTestLetterNumeric = true ) { sal_Unicode c = rStr.GetChar( nPos ); @@ -495,7 +495,7 @@ public: ++nConv < formula::FormulaGrammar::CONV_LAST; ) { if (pConventions[nConv] && - ((pConventions[nConv]->mpCharTable[ UINT8(c) ] & nFlags) != nFlags)) + ((pConventions[nConv]->mpCharTable[ sal_uInt8(c) ] & nFlags) != nFlags)) return false; // convention not known => assume valid } @@ -509,16 +509,16 @@ public: private: // FormulaCompiler - virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const; + virtual String FindAddInFunction( const String& rUpperName, sal_Bool bLocalFirst ) const; virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const; virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const; virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, formula::FormulaGrammar::Grammar _eGrammar ) const; virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const; - virtual BOOL HandleExternalReference(const formula::FormulaToken& _aToken); - virtual BOOL HandleRange(); - virtual BOOL HandleSingleRef(); - virtual BOOL HandleDbData(); + virtual sal_Bool HandleExternalReference(const formula::FormulaToken& _aToken); + virtual sal_Bool HandleRange(); + virtual sal_Bool HandleSingleRef(); + virtual sal_Bool HandleDbData(); virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef ); virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, formula::FormulaToken* pTokenP); @@ -527,11 +527,11 @@ private: virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void LocalizeString( String& rName ); // modify rName - input: exact name - virtual BOOL IsImportingXML() const; + virtual sal_Bool IsImportingXML() const; /// Access the CharTable flags - inline ULONG GetCharTableFlags( sal_Unicode c ) - { return c < 128 ? pConv->mpCharTable[ UINT8(c) ] : 0; } + inline sal_uLong GetCharTableFlags( sal_Unicode c ) + { return c < 128 ? pConv->mpCharTable[ sal_uInt8(c) ] : 0; } }; SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); //CHINA001 diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index 3b6f35366976..ba7a351a3c49 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -51,7 +51,7 @@ template< typename A, typename D > class ScCompressedArrayIterator; typename A := access type, e.g. SCROW or SCCOL, must be a POD. - typename D := data type, e.g. USHORT or BYTE or whatever, may also be a + typename D := data type, e.g. sal_uInt16 or sal_uInt8 or whatever, may also be a struct or class. D::operator==() and D::operator=() must be implemented. Force template diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 75758841af7a..672f1dca688b 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -74,7 +74,7 @@ class SC_DLLPUBLIC ScConditionEntry { // gespeicherte Daten: ScConditionMode eOp; - USHORT nOptions; + sal_uInt16 nOptions; double nVal1; // eingegeben oder berechnet double nVal2; String aStrVal1; // eingegeben oder berechnet @@ -83,8 +83,8 @@ class SC_DLLPUBLIC ScConditionEntry String aStrNmsp2; // namespace to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar1; // grammar to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar2; // grammar to be used on (re)compilation, e.g. in XML import - BOOL bIsStr1; // um auch leere Strings zu erkennen - BOOL bIsStr2; + sal_Bool bIsStr1; // um auch leere Strings zu erkennen + sal_Bool bIsStr2; ScTokenArray* pFormula1; // eingegebene Formel ScTokenArray* pFormula2; ScAddress aSrcPos; // source position for formulas @@ -93,20 +93,20 @@ class SC_DLLPUBLIC ScConditionEntry ScFormulaCell* pFCell1; ScFormulaCell* pFCell2; ScDocument* pDoc; - BOOL bRelRef1; - BOOL bRelRef2; - BOOL bFirstRun; + sal_Bool bRelRef1; + sal_Bool bRelRef2; + sal_Bool bFirstRun; void MakeCells( const ScAddress& rPos ); void Compile( const String& rExpr1, const String& rExpr2, const String& rExprNmsp1, const String& rExprNmsp2, formula::FormulaGrammar::Grammar eGrammar1, formula::FormulaGrammar::Grammar eGrammar2, - BOOL bTextToReal ); + sal_Bool bTextToReal ); void Interpret( const ScAddress& rPos ); - BOOL IsValid( double nArg ) const; - BOOL IsValidStr( const String& rArg ) const; + sal_Bool IsValid( double nArg ) const; + sal_Bool IsValidStr( const String& rArg ) const; public: ScConditionEntry( ScConditionMode eOper, @@ -125,11 +125,11 @@ public: int operator== ( const ScConditionEntry& r ) const; - BOOL IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + sal_Bool IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; ScConditionMode GetOperation() const { return eOp; } - BOOL IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } - void SetIgnoreBlank(BOOL bSet); + sal_Bool IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } + void SetIgnoreBlank(sal_Bool bSet); ScAddress GetSrcPos() const { return aSrcPos; } ScAddress GetValidSrcPos() const; // adjusted to allow textual representation of expressions @@ -139,10 +139,10 @@ public: void SetFormula1( const ScTokenArray& rArray ); void SetFormula2( const ScTokenArray& rArray ); - String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, + String GetExpression( const ScAddress& rCursor, sal_uInt16 nPos, sal_uLong nNumFmt = 0, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - ScTokenArray* CreateTokenArry( USHORT nPos ) const; + ScTokenArray* CreateTokenArry( sal_uInt16 nPos ) const; void CompileAll(); void CompileXML(); @@ -210,8 +210,8 @@ class SC_DLLPUBLIC ScConditionalFormat ScRangeList* pAreas; // Bereiche fuer Paint sal_uInt32 nKey; // Index in Attributen ScCondFormatEntry** ppEntries; - USHORT nEntryCount; - BOOL bIsUsed; // temporaer beim Speichern + sal_uInt16 nEntryCount; + sal_Bool bIsUsed; // temporaer beim Speichern public: ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument); @@ -223,8 +223,8 @@ public: void AddEntry( const ScCondFormatEntry& rNew ); - BOOL IsEmpty() const { return (nEntryCount == 0); } - USHORT Count() const { return nEntryCount; } + sal_Bool IsEmpty() const { return (nEntryCount == 0); } + sal_uInt16 Count() const { return nEntryCount; } void CompileAll(); void CompileXML(); @@ -235,11 +235,11 @@ public: void SourceChanged( const ScAddress& rAddr ); - const ScCondFormatEntry* GetEntry( USHORT nPos ) const; + const ScCondFormatEntry* GetEntry( sal_uInt16 nPos ) const; const String& GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const; - BOOL EqualEntries( const ScConditionalFormat& r ) const; + sal_Bool EqualEntries( const ScConditionalFormat& r ) const; void DoRepaint( const ScRange* pModified ); void InvalidateArea(); @@ -247,15 +247,15 @@ public: sal_uInt32 GetKey() const { return nKey; } void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(sal_Bool bSet) { bIsUsed = bSet; } + sal_Bool IsUsed() const { return bIsUsed; } bool MarkUsedExternalReferences() const; // sortiert (per PTRARR) nach Index // operator== nur fuer die Sortierung - BOOL operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } + sal_Bool operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } + sal_Bool operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } }; // @@ -293,7 +293,7 @@ public: * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScConditionalFormatList& r ) const; // fuer Ref-Undo + sal_Bool operator==( const ScConditionalFormatList& r ) const; // fuer Ref-Undo }; #endif diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index 4eb30b12c432..866c2c1ec3d7 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -84,13 +84,13 @@ class ScConsData { private: ScSubTotalFunc eFunction; - BOOL bReference; - BOOL bColByName; - BOOL bRowByName; - BOOL bSubTitles; + sal_Bool bReference; + sal_Bool bColByName; + sal_Bool bRowByName; + sal_Bool bSubTitles; SCSIZE nColCount; SCSIZE nRowCount; - BOOL** ppUsed; + sal_Bool** ppUsed; double** ppSum; double** ppCount; double** ppSumSqr; @@ -101,7 +101,7 @@ private: SCSIZE nTitleCount; String** ppTitles; SCSIZE** ppTitlePos; - BOOL bCornerUsed; + sal_Bool bCornerUsed; String aCornerText; // nur bei bColByName && bRowByName public: @@ -109,9 +109,9 @@ public: ~ScConsData(); void SetSize( SCCOL nCols, SCROW nRows ); - void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef ); + void SetFlags( ScSubTotalFunc eFunc, sal_Bool bColName, sal_Bool bRowName, sal_Bool bRef ); - void InitData(BOOL bDelete=TRUE); + void InitData(sal_Bool bDelete=sal_True); void DeleteData(); void AddFields( ScDocument* pSrcDoc, SCTAB nTab, diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index c9a5305a05ca..e11066a8d8b6 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -85,8 +85,8 @@ class ScDataPilotItemObj; class ScDataPilotConversion { public: - static com::sun::star::sheet::GeneralFunction FirstFunc( USHORT nBits ); - static USHORT FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); + static com::sun::star::sheet::GeneralFunction FirstFunc( sal_uInt16 nBits ); + static sal_uInt16 FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); static void FillGroupInfo( ::com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo, diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 79902b367ac7..43c26b9fdb0d 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -121,7 +121,7 @@ class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6< private: SfxItemPropertySet aPropSet; - ScSubTotalFieldObj* GetObjectByIndex_Impl(USHORT nIndex); + ScSubTotalFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); public: ScSubTotalDescriptorBase(); @@ -260,10 +260,10 @@ class ScSubTotalFieldObj : public cppu::WeakImplHelper2< private: com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor> xRef; ScSubTotalDescriptorBase& rParent; - USHORT nPos; + sal_uInt16 nPos; public: - ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ); + ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ); virtual ~ScSubTotalFieldObj(); // XSubTotalField @@ -608,7 +608,7 @@ class ScDatabaseRangesObj : public cppu::WeakImplHelper4< private: ScDocShell* pDocShell; - ScDatabaseRangeObj* GetObjectByIndex_Impl(USHORT nIndex); + ScDatabaseRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); ScDatabaseRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 72356683d1a4..2398a142ee4e 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -53,70 +53,70 @@ private: SCROW nStartRow; SCCOL nEndCol; SCROW nEndRow; - BOOL bByRow; - BOOL bHasHeader; - BOOL bDoSize; - BOOL bKeepFmt; - BOOL bStripData; + sal_Bool bByRow; + sal_Bool bHasHeader; + sal_Bool bDoSize; + sal_Bool bKeepFmt; + sal_Bool bStripData; // SortParam - BOOL bSortCaseSens; - BOOL bIncludePattern; - BOOL bSortInplace; - BOOL bSortUserDef; - USHORT nSortUserIndex; + sal_Bool bSortCaseSens; + sal_Bool bIncludePattern; + sal_Bool bSortInplace; + sal_Bool bSortUserDef; + sal_uInt16 nSortUserIndex; SCTAB nSortDestTab; SCCOL nSortDestCol; SCROW nSortDestRow; - BOOL bDoSort[MAXSORT]; + sal_Bool bDoSort[MAXSORT]; SCCOLROW nSortField[MAXSORT]; - BOOL bAscending[MAXSORT]; + sal_Bool bAscending[MAXSORT]; ::com::sun::star::lang::Locale aSortLocale; String aSortAlgorithm; // QueryParam - BOOL bQueryInplace; - BOOL bQueryCaseSens; - BOOL bQueryRegExp; - BOOL bQueryDuplicate; + sal_Bool bQueryInplace; + sal_Bool bQueryCaseSens; + sal_Bool bQueryRegExp; + sal_Bool bQueryDuplicate; SCTAB nQueryDestTab; SCCOL nQueryDestCol; SCROW nQueryDestRow; - BOOL bDoQuery[MAXQUERY]; + sal_Bool bDoQuery[MAXQUERY]; SCCOLROW nQueryField[MAXQUERY]; ScQueryOp eQueryOp[MAXQUERY]; - BOOL bQueryByString[MAXQUERY]; + sal_Bool bQueryByString[MAXQUERY]; bool bQueryByDate[MAXQUERY]; String* pQueryStr[MAXQUERY]; double nQueryVal[MAXQUERY]; ScQueryConnect eQueryConnect[MAXQUERY]; - BOOL bIsAdvanced; // TRUE if created by advanced filter + sal_Bool bIsAdvanced; // sal_True if created by advanced filter ScRange aAdvSource; // source range // SubTotalParam - BOOL bSubRemoveOnly; - BOOL bSubReplace; - BOOL bSubPagebreak; - BOOL bSubCaseSens; - BOOL bSubDoSort; - BOOL bSubAscending; - BOOL bSubIncludePattern; - BOOL bSubUserDef; - USHORT nSubUserIndex; - BOOL bDoSubTotal[MAXSUBTOTAL]; + sal_Bool bSubRemoveOnly; + sal_Bool bSubReplace; + sal_Bool bSubPagebreak; + sal_Bool bSubCaseSens; + sal_Bool bSubDoSort; + sal_Bool bSubAscending; + sal_Bool bSubIncludePattern; + sal_Bool bSubUserDef; + sal_uInt16 nSubUserIndex; + sal_Bool bDoSubTotal[MAXSUBTOTAL]; SCCOL nSubField[MAXSUBTOTAL]; SCCOL nSubTotals[MAXSUBTOTAL]; SCCOL* pSubTotals[MAXSUBTOTAL]; ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Datenbank-Import - BOOL bDBImport; + sal_Bool bDBImport; String aDBName; String aDBStatement; - BOOL bDBNative; - BOOL bDBSelection; // nicht im Param: Wenn Selektion, Update sperren - BOOL bDBSql; // aDBStatement ist SQL und kein Name - BYTE nDBType; // enum DBObject (bisher nur dbTable, dbQuery) + sal_Bool bDBNative; + sal_Bool bDBSelection; // nicht im Param: Wenn Selektion, Update sperren + sal_Bool bDBSql; // aDBStatement ist SQL und kein Name + sal_uInt8 nDBType; // enum DBObject (bisher nur dbTable, dbQuery) - USHORT nIndex; // eindeutiger Index fuer Formeln - BOOL bAutoFilter; // AutoFilter? (nicht gespeichert) - BOOL bModified; // wird bei UpdateReference gesetzt/geloescht + sal_uInt16 nIndex; // eindeutiger Index fuer Formeln + sal_Bool bAutoFilter; // AutoFilter? (nicht gespeichert) + sal_Bool bModified; // wird bei UpdateReference gesetzt/geloescht using ScRefreshTimer::operator==; @@ -124,7 +124,7 @@ public: SC_DLLPUBLIC ScDBData(const String& rName, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - BOOL bByR = TRUE, BOOL bHasH = TRUE); + sal_Bool bByR = sal_True, sal_Bool bHasH = sal_True); ScDBData(const ScDBData& rData); ~ScDBData(); @@ -132,7 +132,7 @@ public: ScDBData& operator= (const ScDBData& rData); - BOOL operator== (const ScDBData& rData) const; + sal_Bool operator== (const ScDBData& rData) const; const String& GetName() const { return aName; } void GetName(String& rName) const { rName = aName; } @@ -141,20 +141,20 @@ public: SC_DLLPUBLIC void GetArea(ScRange& rRange) const; void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - BOOL IsByRow() const { return bByRow; } - void SetByRow(BOOL bByR) { bByRow = bByR; } - BOOL HasHeader() const { return bHasHeader; } - void SetHeader(BOOL bHasH) { bHasHeader = bHasH; } - void SetIndex(USHORT nInd) { nIndex = nInd; } - USHORT GetIndex() const { return nIndex; } - BOOL IsDoSize() const { return bDoSize; } - void SetDoSize(BOOL bSet) { bDoSize = bSet; } - BOOL IsKeepFmt() const { return bKeepFmt; } - void SetKeepFmt(BOOL bSet) { bKeepFmt = bSet; } - BOOL IsStripData() const { return bStripData; } - void SetStripData(BOOL bSet) { bStripData = bSet; } - -//UNUSED2008-05 BOOL IsBeyond(SCROW nMaxRow) const; + sal_Bool IsByRow() const { return bByRow; } + void SetByRow(sal_Bool bByR) { bByRow = bByR; } + sal_Bool HasHeader() const { return bHasHeader; } + void SetHeader(sal_Bool bHasH) { bHasHeader = bHasH; } + void SetIndex(sal_uInt16 nInd) { nIndex = nInd; } + sal_uInt16 GetIndex() const { return nIndex; } + sal_Bool IsDoSize() const { return bDoSize; } + void SetDoSize(sal_Bool bSet) { bDoSize = bSet; } + sal_Bool IsKeepFmt() const { return bKeepFmt; } + void SetKeepFmt(sal_Bool bSet) { bKeepFmt = bSet; } + sal_Bool IsStripData() const { return bStripData; } + void SetStripData(sal_Bool bSet) { bStripData = bSet; } + +//UNUSED2008-05 sal_Bool IsBeyond(SCROW nMaxRow) const; String GetSourceString() const; String GetOperations() const; @@ -164,7 +164,7 @@ public: SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const; SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam); - SC_DLLPUBLIC BOOL GetAdvancedQuerySource(ScRange& rSource) const; + SC_DLLPUBLIC sal_Bool GetAdvancedQuerySource(ScRange& rSource) const; SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource); void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; @@ -173,22 +173,22 @@ public: void GetImportParam(ScImportParam& rImportParam) const; void SetImportParam(const ScImportParam& rImportParam); - BOOL IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; - BOOL IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + sal_Bool IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const; + sal_Bool IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL HasImportParam() const { return bDBImport; } - BOOL HasQueryParam() const { return bDoQuery[0]; } - BOOL HasSortParam() const { return bDoSort[0]; } - BOOL HasSubTotalParam() const { return bDoSubTotal[0]; } + sal_Bool HasImportParam() const { return bDBImport; } + sal_Bool HasQueryParam() const { return bDoQuery[0]; } + sal_Bool HasSortParam() const { return bDoSort[0]; } + sal_Bool HasSubTotalParam() const { return bDoSubTotal[0]; } - BOOL HasImportSelection() const { return bDBSelection; } - void SetImportSelection(BOOL bSet) { bDBSelection = bSet; } + sal_Bool HasImportSelection() const { return bDBSelection; } + void SetImportSelection(sal_Bool bSet) { bDBSelection = bSet; } - BOOL HasAutoFilter() const { return bAutoFilter; } - void SetAutoFilter(BOOL bSet) { bAutoFilter = bSet; } + sal_Bool HasAutoFilter() const { return bAutoFilter; } + void SetAutoFilter(sal_Bool bSet) { bAutoFilter = bSet; } - BOOL IsModified() const { return bModified; } - void SetModified(BOOL bMod) { bModified = bMod; } + sal_Bool IsModified() const { return bModified; } + void SetModified(sal_Bool bMod) { bModified = bMod; } }; @@ -199,10 +199,10 @@ class SC_DLLPUBLIC ScDBCollection : public ScSortedCollection private: Link aRefreshHandler; ScDocument* pDoc; - USHORT nEntryIndex; // Zaehler fuer die eindeutigen Indizes + sal_uInt16 nEntryIndex; // Zaehler fuer die eindeutigen Indizes public: - ScDBCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) : + ScDBCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False, ScDocument* pDocument = NULL) : ScSortedCollection ( nLim, nDel, bDup ), pDoc ( pDocument ), nEntryIndex ( SC_START_INDEX_DB_COLL ) // oberhalb der Namen @@ -214,13 +214,13 @@ public: {} virtual ScDataObject* Clone() const { return new ScDBCollection(*this); } - ScDBData* operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);} + ScDBData* operator[]( const sal_uInt16 nIndex) const {return (ScDBData*)At(nIndex);} virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; - ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; + virtual sal_Bool IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL SearchName( const String& rName, USHORT& rIndex ) const; + sal_Bool SearchName( const String& rName, sal_uInt16& rIndex ) const; void DeleteOnTab( SCTAB nTab ); void UpdateReference(UpdateRefMode eUpdateRefMode, @@ -229,10 +229,10 @@ public: SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - ScDBData* FindIndex(USHORT nIndex); - USHORT GetEntryIndex() { return nEntryIndex; } - void SetEntryIndex(USHORT nInd) { nEntryIndex = nInd; } - virtual BOOL Insert(ScDataObject* pScDataObject); + ScDBData* FindIndex(sal_uInt16 nIndex); + sal_uInt16 GetEntryIndex() { return nEntryIndex; } + void SetEntryIndex(sal_uInt16 nInd) { nEntryIndex = nInd; } + virtual sal_Bool Insert(ScDataObject* pScDataObject); void SetRefreshHandler( const Link& rLink ) { aRefreshHandler = rLink; } diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx index 3071b542f4b6..2a3f2500d170 100644 --- a/sc/inc/dbdocutl.hxx +++ b/sc/inc/dbdocutl.hxx @@ -45,7 +45,7 @@ public: static void PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& xRow, long nRowPos, - long nType, BOOL bCurrency, BOOL* pSimpleFlag = NULL ); + long nType, sal_Bool bCurrency, sal_Bool* pSimpleFlag = NULL ); }; #endif diff --git a/sc/inc/dbtoken.hxx b/sc/inc/dbtoken.hxx index 1cdacfd97323..d19033e367e6 100644 --- a/sc/inc/dbtoken.hxx +++ b/sc/inc/dbtoken.hxx @@ -37,17 +37,17 @@ // aA - dump old/new token array // uU - dump old/new UPN array -BOOL DbgToken( char ); +sal_Bool DbgToken( char ); ScTokenArray* DbgMakeTokenArray - ( ScDocument* pDoc, SCTAB nTab, const String& r, USHORT& rErr ); -void DbgDumpTokenArray( const BYTE* pArr, USHORT nLen, const char* pMsg ); + ( ScDocument* pDoc, SCTAB nTab, const String& r, sal_uInt16& rErr ); +void DbgDumpTokenArray( const sal_uInt8* pArr, sal_uInt16 nLen, const char* pMsg ); void DbgDelTokenArray( ScTokenArray* ); formula::StackVar DbgInterpret( ScDocument* pDok, const ScTokenArray* pToken, SCCOL nCOL, SCROW nROW, SCTAB nTAB, formula::StackVar eformula::StackVar, char* &rStringErgPtr, double& rDoubleErg, - USHORT& rError, + sal_uInt16& rError, ScMatrix** ppMat); #endif diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 31055c270fbf..42798af66bba 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -83,10 +83,10 @@ SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW class ScDetOpList : public ScDetOpArr_Impl { - BOOL bHasAddError; // updated in Append + sal_Bool bHasAddError; // updated in Append public: - ScDetOpList() : bHasAddError(FALSE) {} + ScDetOpList() : bHasAddError(sal_False) {} ScDetOpList(const ScDetOpList& rList); ~ScDetOpList() {} @@ -94,11 +94,11 @@ public: void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL operator==( const ScDetOpList& r ) const; // fuer Ref-Undo + sal_Bool operator==( const ScDetOpList& r ) const; // fuer Ref-Undo void Append( ScDetOpData* pData ); - BOOL HasAddError() const { return bHasAddError; } + sal_Bool HasAddError() const { return bHasAddError; } }; diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 5c57d32af898..c13da22f7453 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -62,7 +62,7 @@ class SC_DLLPUBLIC ScDetectiveFunc static ColorData nArrowColor; static ColorData nErrorColor; static ColorData nCommentColor; - static BOOL bColorsInitialized; + static sal_Bool bColorsInitialized; ScDocument* pDoc; SCTAB nTab; @@ -85,80 +85,80 @@ class SC_DLLPUBLIC ScDetectiveFunc /** Returns the drawing layer rectangle for the passed cell address. */ Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const; - BOOL HasArrow( const ScAddress& rStart, + sal_Bool HasArrow( const ScAddress& rStart, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab ); - void DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ); + void DeleteArrowsAt( SCCOL nCol, SCROW nRow, sal_Bool bDestPnt ); void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - BOOL HasError( const ScRange& rRange, ScAddress& rErrPos ); + sal_Bool HasError( const ScRange& rRange, ScAddress& rErrPos ); void FillAttributes( ScDetectiveData& rData ); // called from DrawEntry/DrawAlienEntry and InsertObject - BOOL InsertArrow( SCCOL nCol, SCROW nRow, + sal_Bool InsertArrow( SCCOL nCol, SCROW nRow, SCCOL nRefStartCol, SCROW nRefStartRow, SCCOL nRefEndCol, SCROW nRefEndRow, - BOOL bFromOtherTab, BOOL bRed, + sal_Bool bFromOtherTab, sal_Bool bRed, ScDetectiveData& rData ); - BOOL InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, BOOL bRed, + sal_Bool InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, sal_Bool bRed, ScDetectiveData& rData ); // DrawEntry / DrawAlienEntry check for existing arrows and errors - BOOL DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, + sal_Bool DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, ScDetectiveData& rData ); - BOOL DrawAlienEntry( const ScRange& rRef, + sal_Bool DrawAlienEntry( const ScRange& rRef, ScDetectiveData& rData ); void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData ); - USHORT InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); - USHORT InsertPredLevelArea( const ScRange& rRef, - ScDetectiveData& rData, USHORT nLevel ); - USHORT FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel ); - USHORT FindPredLevelArea( const ScRange& rRef, - USHORT nLevel, USHORT nDeleteLevel ); + sal_uInt16 InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, sal_uInt16 nLevel ); + sal_uInt16 InsertPredLevelArea( const ScRange& rRef, + ScDetectiveData& rData, sal_uInt16 nLevel ); + sal_uInt16 FindPredLevel( SCCOL nCol, SCROW nRow, sal_uInt16 nLevel, sal_uInt16 nDeleteLevel ); + sal_uInt16 FindPredLevelArea( const ScRange& rRef, + sal_uInt16 nLevel, sal_uInt16 nDeleteLevel ); - USHORT InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); + sal_uInt16 InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, sal_uInt16 nLevel ); - USHORT InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - ScDetectiveData& rData, USHORT nLevel ); - USHORT FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - USHORT nLevel, USHORT nDeleteLevel ); + sal_uInt16 InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + ScDetectiveData& rData, sal_uInt16 nLevel ); + sal_uInt16 FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + sal_uInt16 nLevel, sal_uInt16 nDeleteLevel ); - BOOL FindFrameForObject( SdrObject* pObject, ScRange& rRange ); + sal_Bool FindFrameForObject( SdrObject* pObject, ScRange& rRange ); void Modified(); public: ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {} - BOOL ShowSucc( SCCOL nCol, SCROW nRow ); - BOOL ShowPred( SCCOL nCol, SCROW nRow ); - BOOL ShowError( SCCOL nCol, SCROW nRow ); + sal_Bool ShowSucc( SCCOL nCol, SCROW nRow ); + sal_Bool ShowPred( SCCOL nCol, SCROW nRow ); + sal_Bool ShowError( SCCOL nCol, SCROW nRow ); - BOOL DeleteSucc( SCCOL nCol, SCROW nRow ); - BOOL DeletePred( SCCOL nCol, SCROW nRow ); - BOOL DeleteAll( ScDetectiveDelete eWhat ); + sal_Bool DeleteSucc( SCCOL nCol, SCROW nRow ); + sal_Bool DeletePred( SCCOL nCol, SCROW nRow ); + sal_Bool DeleteAll( ScDetectiveDelete eWhat ); - BOOL MarkInvalid(BOOL& rOverflow); + sal_Bool MarkInvalid(sal_Bool& rOverflow); static void UpdateAllComments( ScDocument& rDoc ); // on all tables void UpdateAllArrowColors(); // on all tables - static BOOL IsNonAlienArrow( SdrObject* pObject ); + static sal_Bool IsNonAlienArrow( SdrObject* pObject ); ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab, - ScAddress& rPosition, ScRange& rSource, BOOL& rRedLine ); + ScAddress& rPosition, ScRange& rSource, sal_Bool& rRedLine ); void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, - const ScRange& rSource, BOOL bRedLine ); + const ScRange& rSource, sal_Bool bRedLine ); static ColorData GetArrowColor(); static ColorData GetErrorColor(); static ColorData GetCommentColor(); static void InitializeColors(); - static BOOL IsColorsInitialized(); + static sal_Bool IsColorsInitialized(); }; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index d995550a2f1d..e61d1f0281c8 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -64,15 +64,15 @@ private: SCSIZE nColPos; SCSIZE nAttrPos; - BOOL GetThis(); - BOOL GetThisCol(); + sal_Bool GetThis(); + sal_Bool GetThisCol(); public: ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable ); ~ScDocumentIterator(); - BOOL GetFirst(); - BOOL GetNext(); + sal_Bool GetFirst(); + sal_Bool GetNext(); ScBaseCell* GetCell(); const ScPatternAttr* GetPattern(); @@ -85,8 +85,8 @@ private: double fNextValue; ScDocument* pDoc; const ScAttrArray* pAttrArray; - ULONG nNumFormat; // fuer CalcAsShown - ULONG nNumFmtIndex; + sal_uLong nNumFormat; // fuer CalcAsShown + sal_uLong nNumFmtIndex; SCCOL nStartCol; SCROW nStartRow; SCTAB nStartTab; @@ -100,31 +100,31 @@ private: SCROW nNextRow; SCROW nAttrEndRow; short nNumFmtType; - BOOL bNumValid; - BOOL bSubTotal; - BOOL bNextValid; - BOOL bCalcAsShown; - BOOL bTextAsZero; + sal_Bool bNumValid; + sal_Bool bSubTotal; + sal_Bool bNextValid; + sal_Bool bCalcAsShown; + sal_Bool bTextAsZero; - BOOL GetThis(double& rValue, USHORT& rErr); + sal_Bool GetThis(double& rValue, sal_uInt16& rErr); public: //UNUSED2008-05 ScValueIterator(ScDocument* pDocument, //UNUSED2008-05 SCCOL nSCol, SCROW nSRow, SCTAB nSTab, //UNUSED2008-05 SCCOL nECol, SCROW nERow, SCTAB nETab, -//UNUSED2008-05 BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE); +//UNUSED2008-05 sal_Bool bSTotal = sal_False, sal_Bool bTextAsZero = sal_False); ScValueIterator(ScDocument* pDocument, - const ScRange& rRange, BOOL bSTotal = FALSE, - BOOL bTextAsZero = FALSE ); - void GetCurNumFmtInfo( short& nType, ULONG& nIndex ); + const ScRange& rRange, sal_Bool bSTotal = sal_False, + sal_Bool bTextAsZero = sal_False ); + void GetCurNumFmtInfo( short& nType, sal_uLong& nIndex ); /// Does NOT reset rValue if no value found! - BOOL GetFirst(double& rValue, USHORT& rErr); + sal_Bool GetFirst(double& rValue, sal_uInt16& rErr); /// Does NOT reset rValue if no value found! - BOOL GetNext(double& rValue, USHORT& rErr) + sal_Bool GetNext(double& rValue, sal_uInt16& rErr) { - return bNextValid ? ( bNextValid = FALSE, rValue = fNextValue, + return bNextValid ? ( bNextValid = sal_False, rValue = fNextValue, rErr = 0, nRow = nNextRow, - ++nColRow, bNumValid = FALSE, TRUE ) + ++nColRow, bNumValid = sal_False, sal_True ) : ( ++nRow, GetThis(rValue, rErr) ); } }; @@ -176,8 +176,8 @@ private: ScDBQueryParamInternal* mpParam; ScDocument* mpDoc; const ScAttrArray* pAttrArray; - ULONG nNumFormat; // for CalcAsShown - ULONG nNumFmtIndex; + sal_uLong nNumFormat; // for CalcAsShown + sal_uLong nNumFmtIndex; SCCOL nCol; SCROW nRow; SCSIZE nColRow; @@ -232,16 +232,16 @@ private: // SubTotalZeilen SCROW nRow; SCTAB nTab; SCSIZE nColRow; - BOOL bSubTotal; + sal_Bool bSubTotal; ScBaseCell* GetThis(); public: ScCellIterator(ScDocument* pDocument, SCCOL nSCol, SCROW nSRow, SCTAB nSTab, SCCOL nECol, SCROW nERow, SCTAB nETab, - BOOL bSTotal = FALSE); + sal_Bool bSTotal = sal_False); ScCellIterator(ScDocument* pDocument, - const ScRange& rRange, BOOL bSTotal = FALSE); + const ScRange& rRange, sal_Bool bSTotal = sal_False); ScBaseCell* GetFirst(); ScBaseCell* GetNext(); SCCOL GetCol() const { return nCol; } @@ -272,16 +272,16 @@ private: ScQueryParam aParam; ScDocument* pDoc; const ScAttrArray* pAttrArray; - ULONG nNumFormat; + sal_uLong nNumFormat; SCTAB nTab; SCCOL nCol; SCROW nRow; SCSIZE nColRow; SCROW nAttrEndRow; - BYTE nStopOnMismatch; - BYTE nTestEqualCondition; - BOOL bAdvanceQuery; - BOOL bIgnoreMismatchOnLeadingStrings; + sal_uInt8 nStopOnMismatch; + sal_uInt8 nTestEqualCondition; + sal_Bool bAdvanceQuery; + sal_Bool bIgnoreMismatchOnLeadingStrings; ScBaseCell* GetThis(); @@ -298,8 +298,8 @@ private: public: ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, - const ScQueryParam& aParam, BOOL bMod = TRUE); - // fuer bMod = FALSE muss der QueryParam + const ScQueryParam& aParam, sal_Bool bMod = sal_True); + // fuer bMod = sal_False muss der QueryParam // weiter aufgefuellt sein (bIsString) ScBaseCell* GetFirst(); ScBaseCell* GetNext(); @@ -308,7 +308,7 @@ public: // setzt alle Entry.nField einen weiter, wenn Spalte // wechselt, fuer ScInterpreter ScHLookup() - void SetAdvanceQueryParamEntryField( BOOL bVal ) + void SetAdvanceQueryParamEntryField( sal_Bool bVal ) { bAdvanceQuery = bVal; } void AdvanceQueryParamEntryField(); @@ -317,17 +317,17 @@ public: cell range is assumed to be sorted; stops on first value being greater than the queried value and GetFirst()/GetNext() return NULL. StoppedOnMismatch() - returns TRUE then. + returns sal_True then. However, the iterator's conditions are not set to end all queries, GetCol() and GetRow() return values for the non-matching cell, further GetNext() calls may be executed. */ - void SetStopOnMismatch( BOOL bVal ) + void SetStopOnMismatch( sal_Bool bVal ) { - nStopOnMismatch = sal::static_int_cast<BYTE>(bVal ? nStopOnMismatchEnabled : + nStopOnMismatch = sal::static_int_cast<sal_uInt8>(bVal ? nStopOnMismatchEnabled : nStopOnMismatchDisabled); } - BOOL StoppedOnMismatch() const + sal_Bool StoppedOnMismatch() const { return nStopOnMismatch == nStopOnMismatchExecuted; } /** If set, an additional test for SC_EQUAL condition is @@ -335,13 +335,13 @@ public: SC_GREATER_EQUAL conditions are to be tested. May be used where a cell range is assumed to be sorted to stop if an equal match is found. */ - void SetTestEqualCondition( BOOL bVal ) + void SetTestEqualCondition( sal_Bool bVal ) { - nTestEqualCondition = sal::static_int_cast<BYTE>(bVal ? + nTestEqualCondition = sal::static_int_cast<sal_uInt8>(bVal ? nTestEqualConditionEnabled : nTestEqualConditionDisabled); } - BOOL IsEqualConditionFulfilled() const + sal_Bool IsEqualConditionFulfilled() const { return nTestEqualCondition == nTestEqualConditionFulfilled; } /** In a range assumed to be sorted find either the last of @@ -359,7 +359,7 @@ public: @param bIgnoreMismatchOnLeadingStrings Normally strings are sorted behind numerical - values. If this parameter is TRUE, the search does + values. If this parameter is sal_True, the search does not stop when encountering a string and does not assume that no values follow anymore. If querying for a string a mismatch on the first @@ -371,9 +371,9 @@ public: iterator is not usable anymore except for obtaining the number format! */ - BOOL FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, BOOL bSearchForEqualAfterMismatch = FALSE, - BOOL bIgnoreMismatchOnLeadingStrings = TRUE ); + sal_Bool FindEqualOrSortedLastInRange( SCCOL& nFoundCol, + SCROW& nFoundRow, sal_Bool bSearchForEqualAfterMismatch = sal_False, + sal_Bool bIgnoreMismatchOnLeadingStrings = sal_True ); }; class ScDocAttrIterator // alle Attribut-Bereiche @@ -428,7 +428,7 @@ private: SCSIZE* pNextIndices; SCCOL nCol; SCROW nRow; - BOOL bMore; + sal_Bool bMore; public: ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, @@ -436,7 +436,7 @@ public: ~ScHorizontalCellIterator(); ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow ); - BOOL ReturnNext( SCCOL& rCol, SCROW& rRow ); + sal_Bool ReturnNext( SCCOL& rCol, SCROW& rRow ); private: void Advance(); @@ -462,7 +462,7 @@ private: const ScPatternAttr** ppPatterns; SCCOL nCol; SCROW nRow; - BOOL bRowEmpty; + sal_Bool bRowEmpty; public: ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, @@ -504,7 +504,7 @@ public: SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); ~ScUsedAreaIterator(); - BOOL GetNext(); + sal_Bool GetNext(); SCCOL GetStartCol() const { return nFoundStartCol; } SCCOL GetEndCol() const { return nFoundEndCol; } diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 6f6d4c859a5c..0c365fe06051 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -37,47 +37,47 @@ class SC_DLLPUBLIC ScDocOptions { double fIterEps; // Epsilon-Wert dazu - USHORT nIterCount; // Anzahl + sal_uInt16 nIterCount; // Anzahl sal_uInt16 nPrecStandardFormat; // precision for standard format - USHORT nDay; // Nulldatum: - USHORT nMonth; - USHORT nYear; - USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird - USHORT nTabDistance; // Abstand Standardtabulatoren - BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen - BOOL bIsIter; // Iteration bei cirk. Ref - BOOL bCalcAsShown; // berechnen wie angezeigt (Precision) - BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen - BOOL bDoAutoSpell; // Auto-Spelling - BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen - BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled + sal_uInt16 nDay; // Nulldatum: + sal_uInt16 nMonth; + sal_uInt16 nYear; + sal_uInt16 nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird + sal_uInt16 nTabDistance; // Abstand Standardtabulatoren + sal_Bool bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen + sal_Bool bIsIter; // Iteration bei cirk. Ref + sal_Bool bCalcAsShown; // berechnen wie angezeigt (Precision) + sal_Bool bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen + sal_Bool bDoAutoSpell; // Auto-Spelling + sal_Bool bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen + sal_Bool bFormulaRegexEnabled; // regular expressions in formulas enabled public: ScDocOptions(); ScDocOptions( const ScDocOptions& rCpy ); ~ScDocOptions(); - BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; } - void SetLookUpColRowNames( BOOL bVal ) { bLookUpColRowNames = bVal; } - BOOL IsAutoSpell() const { return bDoAutoSpell; } - void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; } - BOOL IsMatchWholeCell() const { return bMatchWholeCell; } - void SetMatchWholeCell( BOOL bVal ){ bMatchWholeCell = bVal; } - BOOL IsIgnoreCase() const { return bIsIgnoreCase; } - void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; } - BOOL IsIter() const { return bIsIter; } - void SetIter( BOOL bVal ) { bIsIter = bVal; } - USHORT GetIterCount() const { return nIterCount; } - void SetIterCount( USHORT nCount) { nIterCount = nCount; } + sal_Bool IsLookUpColRowNames() const { return bLookUpColRowNames; } + void SetLookUpColRowNames( sal_Bool bVal ) { bLookUpColRowNames = bVal; } + sal_Bool IsAutoSpell() const { return bDoAutoSpell; } + void SetAutoSpell( sal_Bool bVal ) { bDoAutoSpell = bVal; } + sal_Bool IsMatchWholeCell() const { return bMatchWholeCell; } + void SetMatchWholeCell( sal_Bool bVal ){ bMatchWholeCell = bVal; } + sal_Bool IsIgnoreCase() const { return bIsIgnoreCase; } + void SetIgnoreCase( sal_Bool bVal ) { bIsIgnoreCase = bVal; } + sal_Bool IsIter() const { return bIsIter; } + void SetIter( sal_Bool bVal ) { bIsIter = bVal; } + sal_uInt16 GetIterCount() const { return nIterCount; } + void SetIterCount( sal_uInt16 nCount) { nIterCount = nCount; } double GetIterEps() const { return fIterEps; } void SetIterEps( double fEps ) { fIterEps = fEps; } - void GetDate( USHORT& rD, USHORT& rM, USHORT& rY ) const + void GetDate( sal_uInt16& rD, sal_uInt16& rM, sal_uInt16& rY ) const { rD = nDay; rM = nMonth; rY = nYear;} - void SetDate (USHORT nD, USHORT nM, USHORT nY) + void SetDate (sal_uInt16 nD, sal_uInt16 nM, sal_uInt16 nY) { nDay = nD; nMonth = nM; nYear = nY; } - USHORT GetTabDistance() const { return nTabDistance;} - void SetTabDistance( USHORT nTabDist ) {nTabDistance = nTabDist;} + sal_uInt16 GetTabDistance() const { return nTabDistance;} + void SetTabDistance( sal_uInt16 nTabDist ) {nTabDistance = nTabDist;} void ResetDocOptions(); inline void CopyTo(ScDocOptions& rOpt); @@ -89,14 +89,14 @@ public: sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; } void SetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; } - BOOL IsCalcAsShown() const { return bCalcAsShown; } - void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; } + sal_Bool IsCalcAsShown() const { return bCalcAsShown; } + void SetCalcAsShown( sal_Bool bVal ) { bCalcAsShown = bVal; } - void SetYear2000( USHORT nVal ) { nYear2000 = nVal; } - USHORT GetYear2000() const { return nYear2000; } + void SetYear2000( sal_uInt16 nVal ) { nYear2000 = nVal; } + sal_uInt16 GetYear2000() const { return nYear2000; } - void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; } - BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; } + void SetFormulaRegexEnabled( sal_Bool bVal ) { bFormulaRegexEnabled = bVal; } + sal_Bool IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; } }; @@ -174,8 +174,8 @@ class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem { public: TYPEINFO(); -//UNUSED2008-05 ScTpCalcItem( USHORT nWhich ); - ScTpCalcItem( USHORT nWhich, +//UNUSED2008-05 ScTpCalcItem( sal_uInt16 nWhich ); + ScTpCalcItem( sal_uInt16 nWhich, const ScDocOptions& rOpt ); ScTpCalcItem( const ScTpCalcItem& rItem ); ~ScTpCalcItem(); diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 59bd70592725..7eebb5a834c5 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -39,28 +39,28 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool { SfxPoolItem** ppPoolDefaults; SfxItemPool* pSecondary; - static USHORT* pVersionMap1; - static USHORT* pVersionMap2; - static USHORT* pVersionMap3; - static USHORT* pVersionMap4; - static USHORT* pVersionMap5; - static USHORT* pVersionMap6; - static USHORT* pVersionMap7; - static USHORT* pVersionMap8; - static USHORT* pVersionMap9; - static USHORT* pVersionMap10; - static USHORT* pVersionMap11; + static sal_uInt16* pVersionMap1; + static sal_uInt16* pVersionMap2; + static sal_uInt16* pVersionMap3; + static sal_uInt16* pVersionMap4; + static sal_uInt16* pVersionMap5; + static sal_uInt16* pVersionMap6; + static sal_uInt16* pVersionMap7; + static sal_uInt16* pVersionMap8; + static sal_uInt16* pVersionMap9; + static sal_uInt16* pVersionMap10; + static sal_uInt16* pVersionMap11; public: - ScDocumentPool( SfxItemPool* pSecPool = NULL, BOOL bLoadRefCounts = FALSE ); + ScDocumentPool( SfxItemPool* pSecPool = NULL, sal_Bool bLoadRefCounts = sal_False ); protected: virtual ~ScDocumentPool(); public: virtual SfxItemPool* Clone() const; - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; - virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); + virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); static void CheckRef( const SfxPoolItem& ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index a840572b97dd..9a83a49b8c5e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -201,8 +201,8 @@ struct ScDocStat { String aDocName; SCTAB nTableCount; - ULONG nCellCount; - USHORT nPageCount; + sal_uLong nCellCount; + sal_uInt16 nPageCount; }; // The constant parameters to CopyBlockFromClip @@ -210,11 +210,11 @@ struct ScCopyBlockFromClipParams { ScDocument* pRefUndoDoc; ScDocument* pClipDoc; - USHORT nInsFlag; + sal_uInt16 nInsFlag; SCTAB nTabStart; SCTAB nTabEnd; - BOOL bAsLink; - BOOL bSkipAttrForEmpty; + sal_Bool bAsLink; + sal_Bool bSkipAttrForEmpty; }; @@ -229,10 +229,10 @@ struct ScSymbolStringCellEntry // ----------------------------------------------------------------------- // DDE link modes -const BYTE SC_DDE_DEFAULT = 0; -const BYTE SC_DDE_ENGLISH = 1; -const BYTE SC_DDE_TEXT = 2; -const BYTE SC_DDE_IGNOREMODE = 255; /// For usage in FindDdeLink() only! +const sal_uInt8 SC_DDE_DEFAULT = 0; +const sal_uInt8 SC_DDE_ENGLISH = 1; +const sal_uInt8 SC_DDE_TEXT = 2; +const sal_uInt8 SC_DDE_IGNOREMODE = 255; /// For usage in FindDdeLink() only! // ----------------------------------------------------------------------- @@ -359,77 +359,77 @@ private: importer. */ formula::FormulaGrammar::Grammar eXmlImportGrammar; - ULONG nFormulaCodeInTree; // FormelRPN im Formelbaum - ULONG nXMLImportedFormulaCount; // progress count during XML import - USHORT nInterpretLevel; // >0 wenn im Interpreter - USHORT nMacroInterpretLevel; // >0 wenn Macro im Interpreter - USHORT nInterpreterTableOpLevel; // >0 if in Interpreter TableOp + sal_uLong nFormulaCodeInTree; // FormelRPN im Formelbaum + sal_uLong nXMLImportedFormulaCount; // progress count during XML import + sal_uInt16 nInterpretLevel; // >0 wenn im Interpreter + sal_uInt16 nMacroInterpretLevel; // >0 wenn Macro im Interpreter + sal_uInt16 nInterpreterTableOpLevel; // >0 if in Interpreter TableOp SCTAB nMaxTableNumber; - USHORT nSrcVer; // Dateiversion (Laden/Speichern) + sal_uInt16 nSrcVer; // Dateiversion (Laden/Speichern) SCROW nSrcMaxRow; // Zeilenzahl zum Laden/Speichern - USHORT nFormulaTrackCount; - USHORT nHardRecalcState; // 0: soft, 1: hard-warn, 2: hard + sal_uInt16 nFormulaTrackCount; + sal_uInt16 nHardRecalcState; // 0: soft, 1: hard-warn, 2: hard SCTAB nVisibleTab; // fuer OLE etc. ScLkUpdMode eLinkMode; - BOOL bAutoCalc; // Automatisch Berechnen - BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled + sal_Bool bAutoCalc; // Automatisch Berechnen + sal_Bool bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled // ob noch ForcedFormulas berechnet werden muessen, // im Zusammenspiel mit ScDocShell SetDocumentModified, // AutoCalcShellDisabled und TrackFormulas - BOOL bForcedFormulaPending; - BOOL bCalculatingFormulaTree; - BOOL bIsClip; - BOOL bIsUndo; - BOOL bIsVisible; // set from view ctor + sal_Bool bForcedFormulaPending; + sal_Bool bCalculatingFormulaTree; + sal_Bool bIsClip; + sal_Bool bIsUndo; + sal_Bool bIsVisible; // set from view ctor - BOOL bIsEmbedded; // Embedded-Bereich anzeigen/anpassen ? + sal_Bool bIsEmbedded; // Embedded-Bereich anzeigen/anpassen ? // kein SetDirty bei ScFormulaCell::CompileTokenArray sondern am Ende // von ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip - BOOL bNoSetDirty; + sal_Bool bNoSetDirty; // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad - BOOL bInsertingFromOtherDoc; + sal_Bool bInsertingFromOtherDoc; bool bLoadingMedium; bool bImportingXML; // special handling of formula text - BOOL bXMLFromWrapper; // distinguish ScXMLImportWrapper from external component - BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE + sal_Bool bXMLFromWrapper; // distinguish ScXMLImportWrapper from external component + sal_Bool bCalcingAfterLoad; // in CalcAfterLoad TRUE // wenn temporaer keine Listener auf/abgebaut werden sollen - BOOL bNoListening; - BOOL bIdleDisabled; - BOOL bInLinkUpdate; // TableLink or AreaLink - BOOL bChartListenerCollectionNeedsUpdate; + sal_Bool bNoListening; + sal_Bool bIdleDisabled; + sal_Bool bInLinkUpdate; // TableLink or AreaLink + sal_Bool bChartListenerCollectionNeedsUpdate; // ob RC_FORCED Formelzellen im Dokument sind/waren (einmal an immer an) - BOOL bHasForcedFormulas; + sal_Bool bHasForcedFormulas; // ob das Doc gerade zerstoert wird (kein Notify-Tracking etc. mehr) - BOOL bInDtorClear; + sal_Bool bInDtorClear; // ob bei Spalte/Zeile einfuegen am Rand einer Referenz die Referenz // erweitert wird, wird in jedem UpdateReference aus InputOptions geholt, // gesetzt und am Ende von UpdateReference zurueckgesetzt - BOOL bExpandRefs; + sal_Bool bExpandRefs; // fuer Detektiv-Update, wird bei jeder Aenderung an Formeln gesetzt - BOOL bDetectiveDirty; + sal_Bool bDetectiveDirty; - BYTE nMacroCallMode; // Makros per Warnung-Dialog disabled? - BOOL bHasMacroFunc; // valid only after loading + sal_uInt8 nMacroCallMode; // Makros per Warnung-Dialog disabled? + sal_Bool bHasMacroFunc; // valid only after loading - BYTE nVisSpellState; + sal_uInt8 nVisSpellState; - BYTE nAsianCompression; - BYTE nAsianKerning; - BOOL bSetDrawDefaults; + sal_uInt8 nAsianCompression; + sal_uInt8 nAsianKerning; + sal_Bool bSetDrawDefaults; - BOOL bPastingDrawFromOtherDoc; + sal_Bool bPastingDrawFromOtherDoc; - BYTE nInDdeLinkUpdate; // originating DDE links (stacked bool) + sal_uInt8 nInDdeLinkUpdate; // originating DDE links (stacked bool) - BOOL bInUnoBroadcast; - BOOL bInUnoListenerCall; + sal_Bool bInUnoBroadcast; + sal_Bool bInUnoListenerCall; formula::FormulaGrammar::Grammar eGrammar; - mutable BOOL bStyleSheetUsageInvalid; + mutable sal_Bool bStyleSheetUsageInvalid; bool mbUndoEnabled; bool mbAdjustHeightEnabled; @@ -440,11 +440,11 @@ private: sal_Int16 mnNamedRangesLockCount; public: - SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen + SC_DLLPUBLIC sal_uLong GetCellCount() const; // alle Zellen SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const; - ULONG GetWeightedCount() const; // Formeln und Edit staerker gewichtet - ULONG GetCodeCount() const; // RPN-Code in Formeln - DECL_LINK( GetUserDefinedColor, USHORT * ); + sal_uLong GetWeightedCount() const; // Formeln und Edit staerker gewichtet + sal_uLong GetCodeCount() const; // RPN-Code in Formeln + DECL_LINK( GetUserDefinedColor, sal_uInt16 * ); // Numberformatter public: @@ -501,13 +501,13 @@ public: SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; void SetDBCollection( ScDBCollection* pNewDBCollection, - BOOL bRemoveAutoFilter = FALSE ); + sal_Bool bRemoveAutoFilter = sal_False ); ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, - BOOL bStartOnly = FALSE) const; + sal_Bool bStartOnly = sal_False) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; //UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 BOOL bStartOnly = FALSE) const; +//UNUSED2008-05 sal_Bool bStartOnly = sal_False) const; SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; SC_DLLPUBLIC ScDPCollection* GetDPCollection(); @@ -531,19 +531,19 @@ public: void EnsureGraphicNames(); SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); - BOOL HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL ); + sal_Bool HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const String& rChartName ); SC_DLLPUBLIC void GetChartRanges( const String& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); void SetChartRanges( const String& rChartName, const ::std::vector< ScRangeList >& rRanges ); void UpdateChartArea( const String& rChartName, const ScRange& rNewArea, - BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd ); + sal_Bool bColHeaders, sal_Bool bRowHeaders, sal_Bool bAdd ); void UpdateChartArea( const String& rChartName, const ScRangeListRef& rNewList, - BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd ); + sal_Bool bColHeaders, sal_Bool bRowHeaders, sal_Bool bAdd ); void GetOldChartParameters( const String& rName, - ScRangeList& rRanges, BOOL& rColHeaders, BOOL& rRowHeaders ); + ScRangeList& rRanges, sal_Bool& rColHeaders, sal_Bool& rRowHeaders ); ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > FindOleObjectByName( const String& rName ); @@ -553,19 +553,19 @@ public: SCTAB GetVisibleTab() const { return nVisibleTab; } SC_DLLPUBLIC void SetVisibleTab(SCTAB nTab) { nVisibleTab = nTab; } - SC_DLLPUBLIC BOOL HasTable( SCTAB nTab ) const; - SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const; - SC_DLLPUBLIC BOOL GetCodeName( SCTAB nTab, String& rName ) const; - SC_DLLPUBLIC BOOL SetCodeName( SCTAB nTab, const String& rName ); - SC_DLLPUBLIC BOOL GetTable( const String& rName, SCTAB& rTab ) const; + SC_DLLPUBLIC sal_Bool HasTable( SCTAB nTab ) const; + SC_DLLPUBLIC sal_Bool GetName( SCTAB nTab, String& rName ) const; + SC_DLLPUBLIC sal_Bool GetCodeName( SCTAB nTab, String& rName ) const; + SC_DLLPUBLIC sal_Bool SetCodeName( SCTAB nTab, const String& rName ); + SC_DLLPUBLIC sal_Bool GetTable( const String& rName, SCTAB& rTab ) const; SC_DLLPUBLIC inline SCTAB GetTableCount() const { return nMaxTableNumber; } SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; } SC_DLLPUBLIC ScDocProtection* GetDocProtection() const; SC_DLLPUBLIC void SetDocProtection(const ScDocProtection* pProtect); - SC_DLLPUBLIC BOOL IsDocProtected() const; - BOOL IsDocEditable() const; - SC_DLLPUBLIC BOOL IsTabProtected( SCTAB nTab ) const; + SC_DLLPUBLIC sal_Bool IsDocProtected() const; + sal_Bool IsDocEditable() const; + SC_DLLPUBLIC sal_Bool IsTabProtected( SCTAB nTab ) const; SC_DLLPUBLIC ScTableProtection* GetTabProtection( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabProtection(SCTAB nTab, const ScTableProtection* pProtect); void CopyTabProtection(SCTAB nTabSrc, SCTAB nTabDest); @@ -573,18 +573,18 @@ public: void LockTable(SCTAB nTab); void UnlockTable(SCTAB nTab); - BOOL IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + sal_Bool IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionEditable( const ScMarkData& rMark, - BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, + sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const; + sal_Bool IsSelectionEditable( const ScMarkData& rMark, + sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const; + sal_Bool HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) const; - BOOL GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); + sal_Bool GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); - BOOL IsEmbedded() const; + sal_Bool IsEmbedded() const; void GetEmbedded( ScRange& rRange ) const; void SetEmbedded( const ScRange& rRange ); void ResetEmbedded(); @@ -592,61 +592,61 @@ public: void SetEmbedded( const Rectangle& rRect ); // aus VisArea (1/100 mm) void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm - SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const; - SC_DLLPUBLIC BOOL ValidNewTabName( const String& rName ) const; + SC_DLLPUBLIC sal_Bool ValidTabName( const String& rName ) const; + SC_DLLPUBLIC sal_Bool ValidNewTabName( const String& rName ) const; SC_DLLPUBLIC void CreateValidTabName(String& rName) const; - SC_DLLPUBLIC BOOL InsertTab( SCTAB nPos, const String& rName, - BOOL bExternalDocument = FALSE ); - SC_DLLPUBLIC BOOL DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL ); - SC_DLLPUBLIC BOOL RenameTab( SCTAB nTab, const String& rName, - BOOL bUpdateRef = TRUE, - BOOL bExternalDocument = FALSE ); - BOOL MoveTab( SCTAB nOldPos, SCTAB nNewPos ); - BOOL CopyTab( SCTAB nOldPos, SCTAB nNewPos, + SC_DLLPUBLIC sal_Bool InsertTab( SCTAB nPos, const String& rName, + sal_Bool bExternalDocument = sal_False ); + SC_DLLPUBLIC sal_Bool DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL ); + SC_DLLPUBLIC sal_Bool RenameTab( SCTAB nTab, const String& rName, + sal_Bool bUpdateRef = sal_True, + sal_Bool bExternalDocument = sal_False ); + sal_Bool MoveTab( SCTAB nOldPos, SCTAB nNewPos ); + sal_Bool CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked = NULL ); - SC_DLLPUBLIC ULONG TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, - BOOL bInsertNew = TRUE, - BOOL bResultsOnly = FALSE ); + SC_DLLPUBLIC sal_uLong TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, + sal_Bool bInsertNew = sal_True, + sal_Bool bResultsOnly = sal_False ); SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); - SC_DLLPUBLIC void SetVisible( SCTAB nTab, BOOL bVisible ); - SC_DLLPUBLIC BOOL IsVisible( SCTAB nTab ) const; - BOOL IsStreamValid( SCTAB nTab ) const; - void SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock = FALSE ); + SC_DLLPUBLIC void SetVisible( SCTAB nTab, sal_Bool bVisible ); + SC_DLLPUBLIC sal_Bool IsVisible( SCTAB nTab ) const; + sal_Bool IsStreamValid( SCTAB nTab ) const; + void SetStreamValid( SCTAB nTab, sal_Bool bSet, sal_Bool bIgnoreLock = sal_False ); void LockStreamValid( bool bLock ); bool IsStreamValidLocked() const { return mbStreamValidLocked; } - BOOL IsPendingRowHeights( SCTAB nTab ) const; - void SetPendingRowHeights( SCTAB nTab, BOOL bSet ); - SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, BOOL bRTL ); - SC_DLLPUBLIC BOOL IsLayoutRTL( SCTAB nTab ) const; - BOOL IsNegativePage( SCTAB nTab ) const; - SC_DLLPUBLIC void SetScenario( SCTAB nTab, BOOL bFlag ); - SC_DLLPUBLIC BOOL IsScenario( SCTAB nTab ) const; + sal_Bool IsPendingRowHeights( SCTAB nTab ) const; + void SetPendingRowHeights( SCTAB nTab, sal_Bool bSet ); + SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, sal_Bool bRTL ); + SC_DLLPUBLIC sal_Bool IsLayoutRTL( SCTAB nTab ) const; + sal_Bool IsNegativePage( SCTAB nTab ) const; + SC_DLLPUBLIC void SetScenario( SCTAB nTab, sal_Bool bFlag ); + SC_DLLPUBLIC sal_Bool IsScenario( SCTAB nTab ) const; SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, String& rComment, - Color& rColor, USHORT& rFlags ) const; + Color& rColor, sal_uInt16& rFlags ) const; SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const String& rComment, - const Color& rColor, USHORT nFlags ); + const Color& rColor, sal_uInt16 nFlags ); SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor ); SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const; - void GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const; - SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const; - SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc. + void GetScenarioFlags( SCTAB nTab, sal_uInt16& rFlags ) const; + SC_DLLPUBLIC sal_Bool IsActiveScenario( SCTAB nTab ) const; + SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, sal_Bool bActive ); // nur fuer Undo etc. SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const; SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const; void SetGrammar( formula::FormulaGrammar::Grammar eGram ); - SC_DLLPUBLIC BYTE GetLinkMode( SCTAB nTab ) const; - BOOL IsLinked( SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt8 GetLinkMode( SCTAB nTab ) const; + sal_Bool IsLinked( SCTAB nTab ) const; SC_DLLPUBLIC const String& GetLinkDoc( SCTAB nTab ) const; const String& GetLinkFlt( SCTAB nTab ) const; const String& GetLinkOpt( SCTAB nTab ) const; SC_DLLPUBLIC const String& GetLinkTab( SCTAB nTab ) const; - ULONG GetLinkRefreshDelay( SCTAB nTab ) const; - void SetLink( SCTAB nTab, BYTE nMode, const String& rDoc, + sal_uLong GetLinkRefreshDelay( SCTAB nTab ) const; + void SetLink( SCTAB nTab, sal_uInt8 nMode, const String& rDoc, const String& rFilter, const String& rOptions, - const String& rTabName, ULONG nRefreshDelay ); - BOOL HasLink( const String& rDoc, + const String& rTabName, sal_uLong nRefreshDelay ); + sal_Bool HasLink( const String& rDoc, const String& rFilter, const String& rOptions ) const; - SC_DLLPUBLIC BOOL LinkExternalTab( SCTAB& nTab, const String& aDocTab, + SC_DLLPUBLIC sal_Bool LinkExternalTab( SCTAB& nTab, const String& aDocTab, const String& aFileName, const String& aTabName ); @@ -660,8 +660,8 @@ public: on first call. */ ScFormulaParserPool& GetFormulaParserPool() const; - BOOL HasDdeLinks() const; - BOOL HasAreaLinks() const; + sal_Bool HasDdeLinks() const; + sal_Bool HasAreaLinks() const; void UpdateExternalRefLinks(); void UpdateDdeLinks(); void UpdateAreaLinks(); @@ -669,19 +669,19 @@ public: // originating DDE links void IncInDdeLinkUpdate() { if ( nInDdeLinkUpdate < 255 ) ++nInDdeLinkUpdate; } void DecInDdeLinkUpdate() { if ( nInDdeLinkUpdate ) --nInDdeLinkUpdate; } - BOOL IsInDdeLinkUpdate() const { return nInDdeLinkUpdate != 0; } + sal_Bool IsInDdeLinkUpdate() const { return nInDdeLinkUpdate != 0; } SC_DLLPUBLIC void CopyDdeLinks( ScDocument* pDestDoc ) const; void DisconnectDdeLinks(); // Fuer StarOne Api: - USHORT GetDdeLinkCount() const; - BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); + sal_uInt16 GetDdeLinkCount() const; + sal_Bool UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); /** Tries to find a DDE link with the specified connection data. @param rnDdePos (out-param) Returns the index of the DDE link (does not include other links from link manager). @return true = DDE link found, rnDdePos valid. */ - SC_DLLPUBLIC bool FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, USHORT& rnDdePos ); + SC_DLLPUBLIC bool FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ); /** Returns the connection data of the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @@ -689,26 +689,26 @@ public: @param rTopic (out-param) The DDE topic. @param rItem (out-param) The DDE item. @return true = DDE link found, out-parameters valid. */ - bool GetDdeLinkData( USHORT nDdePos, String& rAppl, String& rTopic, String& rItem ) const; + bool GetDdeLinkData( sal_uInt16 nDdePos, String& rAppl, String& rTopic, String& rItem ) const; /** Returns the link mode of the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @param rnMode (out-param) The link mode of the specified DDE link. @return true = DDE link found, rnMode valid. */ - bool GetDdeLinkMode( USHORT nDdePos, BYTE& rnMode ) const; + bool GetDdeLinkMode( sal_uInt16 nDdePos, sal_uInt8& rnMode ) const; /** Returns the result matrix of the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @return The result matrix, if the DDE link has been found, 0 otherwise. */ - SC_DLLPUBLIC const ScMatrix* GetDdeLinkResultMatrix( USHORT nDdePos ) const; + SC_DLLPUBLIC const ScMatrix* GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const; /** Tries to find a DDE link or creates a new, if not extant. @param pResults If not 0, sets the matrix as as DDE link result matrix (also for existing links). @return true = DDE link found; false = Unpredictable error occured, no DDE link created. */ - SC_DLLPUBLIC bool CreateDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, ScMatrix* pResults = NULL ); + SC_DLLPUBLIC bool CreateDdeLink( const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode, ScMatrix* pResults = NULL ); /** Sets a result matrix for the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @param pResults The array containing all results of the DDE link (intrusive-ref-counted, do not delete). @return true = DDE link found and matrix set. */ - bool SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults ); + bool SetDdeLinkResultMatrix( sal_uInt16 nDdePos, ScMatrix* pResults ); SfxBindings* GetViewBindings(); @@ -735,13 +735,13 @@ public: void SetChartRangeList( const String& rChartName, const ScRangeListRef& rNewRangeListRef ); - BOOL HasControl( SCTAB nTab, const Rectangle& rMMRect ); + sal_Bool HasControl( SCTAB nTab, const Rectangle& rMMRect ); void InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect ); void StartAnimations( SCTAB nTab, Window* pWin ); - BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); - BOOL HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ); + sal_Bool HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); + sal_Bool HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ); const ScSheetEvents* GetSheetEvents( SCTAB nTab ) const; void SetSheetEvents( SCTAB nTab, const ScSheetEvents* pNew ); @@ -749,34 +749,34 @@ public: bool HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents = false ) const; // on any sheet bool HasAnyCalcNotification() const; - BOOL HasCalcNotification( SCTAB nTab ) const; + sal_Bool HasCalcNotification( SCTAB nTab ) const; void SetCalcNotification( SCTAB nTab ); void ResetCalcNotifications(); - SC_DLLPUBLIC ScOutlineTable* GetOutlineTable( SCTAB nTab, BOOL bCreate = FALSE ); - BOOL SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline ); + SC_DLLPUBLIC ScOutlineTable* GetOutlineTable( SCTAB nTab, sal_Bool bCreate = sal_False ); + sal_Bool SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline ); void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - BOOL DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); + sal_Bool DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); void RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); - BOOL TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam ); - BOOL HasSubTotalCells( const ScRange& rRange ); + sal_Bool TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam ); + sal_Bool HasSubTotalCells( const ScRange& rRange ); - SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); + SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, sal_Bool bForceTab = sal_False ); //UNUSED2009-05 SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, -//UNUSED2009-05 ULONG nFormatIndex, BOOL bForceTab = FALSE); +//UNUSED2009-05 sal_uLong nFormatIndex, sal_Bool bForceTab = sal_False); SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, - BOOL bForceTab = FALSE ); + sal_Bool bForceTab = sal_False ); SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, - ULONG nFormatIndex, BOOL bForceTab = FALSE); - // return TRUE = Zahlformat gesetzt - SC_DLLPUBLIC BOOL SetString( + sal_uLong nFormatIndex, sal_Bool bForceTab = sal_False); + // return sal_True = Zahlformat gesetzt + SC_DLLPUBLIC sal_Bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true ); SC_DLLPUBLIC void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError); + void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 nError); SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, @@ -792,7 +792,7 @@ public: SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); SC_DLLPUBLIC double GetValue( const ScAddress& ); SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ); - SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); + SC_DLLPUBLIC double RoundValueAsShown( double fVal, sal_uLong nFormat ); SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt32& rFormat ); SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; @@ -800,10 +800,10 @@ public: pointer passed is of type formula cell, the calculated number format of the formula cell is returned. pCell may be NULL. */ - SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, ULONG& nIndex, + SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, sal_uLong& nIndex, const ScAddress& rPos, const ScBaseCell* pCell ) const; void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula, - BOOL bAsciiExport = FALSE ) const; + sal_Bool bAsciiExport = sal_False ) const; SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const; SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const; SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; @@ -811,13 +811,13 @@ public: //UNUSED2008-05 void RefreshNoteFlags(); - SC_DLLPUBLIC BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - BOOL HasStringCells( const ScRange& rRange ) const; + SC_DLLPUBLIC sal_Bool HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); + SC_DLLPUBLIC sal_Bool HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC sal_Bool HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + sal_Bool HasStringCells( const ScRange& rRange ) const; /** Returns true, if there is any data to create a selection list for rPos. */ - BOOL HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + sal_Bool HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; /** Returns the pointer to a cell note object at the passed cell address. */ ScPostIt* GetNote( const ScAddress& rPos ); @@ -836,19 +836,19 @@ public: @param bForced True = always create all captions, false = skip when Undo is disabled. */ void InitializeAllNoteCaptions( bool bForced = false ); - BOOL ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, + sal_Bool ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark, - BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, + sal_Bool bRefresh = sal_False, sal_Bool bAttrs = sal_False ); + sal_Bool ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, - BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendMerge( ScRange& rRange, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendTotalMerge( ScRange& rRange ); - SC_DLLPUBLIC BOOL ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, + sal_Bool bRefresh = sal_False, sal_Bool bAttrs = sal_False ); + sal_Bool ExtendMerge( ScRange& rRange, sal_Bool bRefresh = sal_False, sal_Bool bAttrs = sal_False ); + sal_Bool ExtendTotalMerge( ScRange& rRange ); + SC_DLLPUBLIC sal_Bool ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL ExtendOverlapped( ScRange& rRange ); + SC_DLLPUBLIC sal_Bool ExtendOverlapped( ScRange& rRange ); - BOOL RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, + sal_Bool RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); SC_DLLPUBLIC void DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, @@ -858,20 +858,20 @@ public: SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true ); void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); - BOOL IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + sal_Bool IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const; - BOOL IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + sal_Bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - BOOL bLeftIsEmpty = FALSE, + sal_Bool bLeftIsEmpty = sal_False, ScRange* pLastRange = NULL, Rectangle* pLastMM = NULL ) const; - BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + sal_Bool IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + sal_Bool IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, - SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nMask ); - SC_DLLPUBLIC bool HasAttrib( const ScRange& rRange, USHORT nMask ); + SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nMask ); + SC_DLLPUBLIC bool HasAttrib( const ScRange& rRange, sal_uInt16 nMask ); void GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, const SvxBorderLine** ppLeft, @@ -905,18 +905,18 @@ public: void ClearLookupCaches(); // Automatisch Berechnen - void SetAutoCalc( BOOL bNewAutoCalc ); - BOOL GetAutoCalc() const { return bAutoCalc; } + void SetAutoCalc( sal_Bool bNewAutoCalc ); + sal_Bool GetAutoCalc() const { return bAutoCalc; } // Automatisch Berechnen in/von/fuer ScDocShell disabled - void SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; } - BOOL IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; } + void SetAutoCalcShellDisabled( sal_Bool bNew ) { bAutoCalcShellDisabled = bNew; } + sal_Bool IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; } // ForcedFormulas zu berechnen - void SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; } - BOOL IsForcedFormulaPending() const { return bForcedFormulaPending; } + void SetForcedFormulaPending( sal_Bool bNew ) { bForcedFormulaPending = bNew; } + sal_Bool IsForcedFormulaPending() const { return bForcedFormulaPending; } // if CalcFormulaTree() is currently running - BOOL IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } + sal_Bool IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } - USHORT GetErrCode( const ScAddress& ) const; + sal_uInt16 GetErrCode( const ScAddress& ) const; /** Shrink a range to only include data area. @@ -924,10 +924,10 @@ public: selection, but the bounds of the sheet's data area instead. - @returns TRUE if the area passed intersected the data - area, FALSE if not, in which case the values + @returns sal_True if the area passed intersected the data + area, sal_False if not, in which case the values obtained may be out of bounds, not in order or - unmodified. TRUE does not mean that there + unmodified. sal_True does not mean that there actually is any data within the selection. */ bool ShrinkToDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const; @@ -935,28 +935,28 @@ public: /** Shrink a range to only include used data area. @param o_bShrunk - Out parameter, TRUE if area was shrunk, FALSE if not. + Out parameter, sal_True if area was shrunk, sal_False if not. - @returns TRUE if there is any data, FALSE if not. + @returns sal_True if there is any data, sal_False if not. */ bool ShrinkToUsedDataArea( bool& o_bShrunk, SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; SC_DLLPUBLIC void GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, - SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const; - SC_DLLPUBLIC BOOL GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; - SC_DLLPUBLIC BOOL GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; - SC_DLLPUBLIC BOOL GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, - BOOL bNotes = TRUE ) const; - SC_DLLPUBLIC BOOL GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, - SCCOL& rEndCol, BOOL bNotes = TRUE ) const; - SC_DLLPUBLIC BOOL GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, - SCROW& rEndRow, BOOL bNotes = TRUE ) const; + SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bIncludeOld, bool bOnlyDown ) const; + SC_DLLPUBLIC sal_Bool GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; + SC_DLLPUBLIC sal_Bool GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; + SC_DLLPUBLIC sal_Bool GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, + sal_Bool bNotes = sal_True ) const; + SC_DLLPUBLIC sal_Bool GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, + SCCOL& rEndCol, sal_Bool bNotes = sal_True ) const; + SC_DLLPUBLIC sal_Bool GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, + SCROW& rEndRow, sal_Bool bNotes = sal_True ) const; void InvalidateTableArea(); - SC_DLLPUBLIC BOOL GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; + SC_DLLPUBLIC sal_Bool GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; /** * Find the maximum column position that contains printable data for the @@ -972,49 +972,49 @@ public: void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY ); SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, - BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ); + sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark ); - BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab, + sal_Bool GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab, const ScMarkData& rMark ); void LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); void LimitChartIfAll( ScRangeListRef& rRangeList ); - BOOL InsertRow( SCCOL nStartCol, SCTAB nStartTab, + sal_Bool InsertRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC BOOL InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); + SC_DLLPUBLIC sal_Bool InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, - ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL, + ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); void DeleteRow( const ScRange& rRange, - ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL ); - BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab, + ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL ); + sal_Bool InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC BOOL InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); + SC_DLLPUBLIC sal_Bool InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); void DeleteCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, - ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL, + ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); void DeleteCol( const ScRange& rRange, - ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL ); + ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL ); - BOOL CanInsertRow( const ScRange& rRange ) const; - BOOL CanInsertCol( const ScRange& rRange ) const; + sal_Bool CanInsertRow( const ScRange& rRange ) const; + sal_Bool CanInsertCol( const ScRange& rRange ) const; - void FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE ); - BOOL CanFitBlock( const ScRange& rOld, const ScRange& rNew ); + void FitBlock( const ScRange& rOld, const ScRange& rNew, sal_Bool bClear = sal_True ); + sal_Bool CanFitBlock( const ScRange& rOld, const ScRange& rNew ); - BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; } - BOOL IsUndo() const { return bIsUndo; } - BOOL IsClipboard() const { return bIsClip; } + sal_Bool IsClipOrUndo() const { return bIsClip || bIsUndo; } + sal_Bool IsUndo() const { return bIsUndo; } + sal_Bool IsClipboard() const { return bIsClip; } bool IsUndoEnabled() const { return mbUndoEnabled; } void EnableUndo( bool bVal ); @@ -1028,24 +1028,24 @@ public: void SetNamedRangesLockCount( sal_Int16 nCount ) { mnNamedRangesLockCount = nCount; } SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ); SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, SCTAB nTab ); - void SetCutMode( BOOL bCut ); - BOOL IsCutMode(); - void SetClipArea( const ScRange& rArea, BOOL bCut = FALSE ); + void SetCutMode( sal_Bool bCut ); + sal_Bool IsCutMode(); + void SetClipArea( const ScRange& rArea, sal_Bool bCut = sal_False ); - SC_DLLPUBLIC BOOL IsDocVisible() const { return bIsVisible; } - void SetDocVisible( BOOL bSet ); + SC_DLLPUBLIC sal_Bool IsDocVisible() const { return bIsVisible; } + void SetDocVisible( sal_Bool bSet ); - BOOL HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL ); + sal_Bool HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL ); void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark ); void DeleteObjectsInSelection( const ScMarkData& rMark ); void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - const ScMarkData& rMark, USHORT nDelFlag); + const ScMarkData& rMark, sal_uInt16 nDelFlag); void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - SCTAB nTab, USHORT nDelFlag); - void DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag); + SCTAB nTab, sal_uInt16 nDelFlag); + void DeleteAreaTab(const ScRange& rRange, sal_uInt16 nDelFlag); void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false, @@ -1062,20 +1062,20 @@ public: SCROW & rClipStartRow ); void StartListeningFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - const ScMarkData& rMark, USHORT nInsFlag ); + const ScMarkData& rMark, sal_uInt16 nInsFlag ); void BroadcastFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - const ScMarkData& rMark, USHORT nInsFlag ); + const ScMarkData& rMark, sal_uInt16 nInsFlag ); /** If pDestRanges is given it overrides rDestRange, rDestRange in this case is the overall encompassing range. */ void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, - USHORT nInsFlag, + sal_uInt16 nInsFlag, ScDocument* pRefUndoDoc = NULL, ScDocument* pClipDoc = NULL, - BOOL bResetCut = TRUE, - BOOL bAsLink = FALSE, - BOOL bIncludeFiltered = TRUE, - BOOL bSkipAttrForEmpty = FALSE, + sal_Bool bResetCut = sal_True, + sal_Bool bAsLink = sal_False, + sal_Bool bIncludeFiltered = sal_True, + sal_Bool bSkipAttrForEmpty = sal_False, const ScRangeList * pDestRanges = NULL ); void CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, @@ -1084,60 +1084,60 @@ public: bool bIncludeFiltered = true, bool bSkipAttrForEmpty = false); - void GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered); + void GetClipArea(SCCOL& nClipX, SCROW& nClipY, sal_Bool bIncludeFiltered); void GetClipStart(SCCOL& nClipX, SCROW& nClipY); - BOOL HasClipFilteredRows(); + sal_Bool HasClipFilteredRows(); - BOOL IsClipboardSource() const; + sal_Bool IsClipboardSource() const; - SC_DLLPUBLIC void TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink ); + SC_DLLPUBLIC void TransposeClip( ScDocument* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink ); ScClipParam& GetClipParam(); void SetClipParam(const ScClipParam& rParam); - void MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty, + void MixDocument( const ScRange& rRange, sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScDocument* pSrcDoc ); void FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, - USHORT nFlags, USHORT nFunction, - BOOL bSkipEmpty, BOOL bAsLink ); + sal_uInt16 nFlags, sal_uInt16 nFunction, + sal_Bool bSkipEmpty, sal_Bool bAsLink ); void FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, - USHORT nFlags, USHORT nFunction, - BOOL bSkipEmpty, BOOL bAsLink ); + sal_uInt16 nFlags, sal_uInt16 nFunction, + sal_Bool bSkipEmpty, sal_Bool bAsLink ); void TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ); SC_DLLPUBLIC void InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, - BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); + sal_Bool bColInfo = sal_False, sal_Bool bRowInfo = sal_False ); void AddUndoTab( SCTAB nTab1, SCTAB nTab2, - BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); + sal_Bool bColInfo = sal_False, sal_Bool bRowInfo = sal_False ); SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, - BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); + sal_Bool bColInfo = sal_False, sal_Bool bRowInfo = sal_False ); // nicht mehr benutzen: void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, - USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, - const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE); + sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc, + const ScMarkData* pMarks = NULL, sal_Bool bColRowFlags = sal_True); void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, - USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, + sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL); void CopyToDocument(const ScRange& rRange, - USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, - const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE); + sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc, + const ScMarkData* pMarks = NULL, sal_Bool bColRowFlags = sal_True); void UndoToDocument(const ScRange& rRange, - USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, + sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL); - void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario = FALSE ); - BOOL TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; + void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bNewScenario = sal_False ); + sal_Bool TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; void MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, - ScMarkData& rDestMark, BOOL bResetMark = TRUE, - USHORT nNeededBits = 0 ) const; - BOOL HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const; + ScMarkData& rDestMark, sal_Bool bResetMark = sal_True, + sal_uInt16 nNeededBits = 0 ) const; + sal_Bool HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const; SC_DLLPUBLIC const ScRangeList* GetScenarioRanges( SCTAB nTab ) const; SC_DLLPUBLIC void CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ); @@ -1145,7 +1145,7 @@ public: void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, - ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, + ScDocument* pUndoDoc = NULL, sal_Bool bIncludeDraw = sal_True, bool bUpdateNoteCaptionPos = true ); SC_DLLPUBLIC void UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc, @@ -1155,38 +1155,38 @@ public: void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, - ULONG nFillCount, FillDir eFillDir = FILL_TO_BOTTOM, + sal_uLong nFillCount, FillDir eFillDir = FILL_TO_BOTTOM, FillCmd eFillCmd = FILL_LINEAR, FillDateCmd eFillDateCmd = FILL_DAY, double nStepValue = 1.0, double nMaxValue = 1E307); String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); - BOOL GetSelectionFunction( ScSubTotalFunc eFunc, + sal_Bool GetSelectionFunction( ScSubTotalFunc eFunc, const ScAddress& rCursor, const ScMarkData& rMark, double& rResult ); - SC_DLLPUBLIC const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; + SC_DLLPUBLIC const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const; SC_DLLPUBLIC const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; - const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); - ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); + const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, sal_Bool bDeep = sal_True ); + ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, sal_Bool bDeep = sal_True ); const ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; + const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const; SC_DLLPUBLIC const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator(); - BOOL HasStringWeakCharacters( const String& rString ); - SC_DLLPUBLIC BYTE GetStringScriptType( const String& rString ); - SC_DLLPUBLIC BYTE GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ); - SC_DLLPUBLIC BYTE GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL ); + sal_Bool HasStringWeakCharacters( const String& rString ); + SC_DLLPUBLIC sal_uInt8 GetStringScriptType( const String& rString ); + SC_DLLPUBLIC sal_uInt8 GetCellScriptType( ScBaseCell* pCell, sal_uLong nNumberFormat ); + SC_DLLPUBLIC sal_uInt8 GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL ); - BOOL HasDetectiveOperations() const; + sal_Bool HasDetectiveOperations() const; void AddDetectiveOperation( const ScDetOpData& rData ); void ClearDetectiveOperations(); ScDetOpList* GetDetOpList() const { return pDetOpList; } void SetDetOpList(ScDetOpList* pNew); - BOOL HasDetectiveObjects(SCTAB nTab) const; + sal_Bool HasDetectiveObjects(SCTAB nTab) const; void GetSelectionFrame( const ScMarkData& rMark, SvxBoxItem& rLineOuter, @@ -1198,17 +1198,17 @@ public: const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark ); - SC_DLLPUBLIC ULONG AddCondFormat( const ScConditionalFormat& rNew ); - SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); - SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab ); - void ConditionalChanged( ULONG nKey ); + SC_DLLPUBLIC sal_uLong AddCondFormat( const ScConditionalFormat& rNew ); + SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges ); + SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab ); + void ConditionalChanged( sal_uLong nKey ); - SC_DLLPUBLIC ULONG AddValidationEntry( const ScValidationData& rNew ); + SC_DLLPUBLIC sal_uLong AddValidationEntry( const ScValidationData& rNew ); - SC_DLLPUBLIC const ScValidationData* GetValidationEntry( ULONG nIndex ) const; + SC_DLLPUBLIC const ScValidationData* GetValidationEntry( sal_uLong nIndex ) const; ScConditionalFormatList* GetCondFormList() const // Ref-Undo { return pCondFormList; } @@ -1242,36 +1242,36 @@ public: void ApplySelectionStyle( const ScStyleSheet& rStyle, const ScMarkData& rMark ); void ApplySelectionLineStyle( const ScMarkData& rMark, - const SvxBorderLine* pLine, BOOL bColorOnly ); + const SvxBorderLine* pLine, sal_Bool bColorOnly ); const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark ) const; - void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, + void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + sal_Bool IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const; - SC_DLLPUBLIC BOOL ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC sal_Bool ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - SCTAB nTab, INT16 nFlags ); - BOOL RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, + SCTAB nTab, sal_Int16 nFlags ); + sal_Bool RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - SCTAB nTab, INT16 nFlags ); + SCTAB nTab, sal_Int16 nFlags ); SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr, - BOOL bPutToPool = FALSE ); + sal_Bool bPutToPool = sal_False ); SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, - BOOL bPutToPool = FALSE ); + sal_Bool bPutToPool = sal_False ); void DeleteNumberFormat( const sal_uInt32* pDelKeys, sal_uInt32 nCount ); void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - USHORT nFormatNo, const ScMarkData& rMark ); + sal_uInt16 nFormatNo, const ScMarkData& rMark ); void GetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData ); - BOOL SearchAndReplace( const SvxSearchItem& rSearchItem, + sal_Bool SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, SCTAB& rTab, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc = NULL ); @@ -1281,50 +1281,50 @@ public: static void GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow ); - BOOL Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, + sal_Bool Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, const String& sValStr, double& nX); void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark ); - void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); + void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark ); + void DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const ScMarkData& rMark ); - SC_DLLPUBLIC void SetColWidth( SCCOL nCol, SCTAB nTab, USHORT nNewWidth ); - SC_DLLPUBLIC void SetRowHeight( SCROW nRow, SCTAB nTab, USHORT nNewHeight ); + SC_DLLPUBLIC void SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ); + SC_DLLPUBLIC void SetRowHeight( SCROW nRow, SCTAB nTab, sal_uInt16 nNewHeight ); SC_DLLPUBLIC void SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, - USHORT nNewHeight ); + sal_uInt16 nNewHeight ); SC_DLLPUBLIC void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, - USHORT nNewHeight ); - void SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bManual ); + sal_uInt16 nNewHeight ); + void SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_Bool bManual ); - SC_DLLPUBLIC USHORT GetColWidth( SCCOL nCol, SCTAB nTab ) const; - SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero = true ) const; - SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; - SC_DLLPUBLIC ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; - SCROW GetRowForHeight( SCTAB nTab, ULONG nHeight ) const; - ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const; - SC_DLLPUBLIC ULONG GetColOffset( SCCOL nCol, SCTAB nTab ) const; - SC_DLLPUBLIC ULONG GetRowOffset( SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt16 GetColWidth( SCCOL nCol, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero = true ) const; + SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; + SC_DLLPUBLIC sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; + SCROW GetRowForHeight( SCTAB nTab, sal_uLong nHeight ) const; + sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const; + SC_DLLPUBLIC sal_uLong GetColOffset( SCCOL nCol, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uLong GetRowOffset( SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC USHORT GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const; - SC_DLLPUBLIC USHORT GetOriginalHeight( SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt16 GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt16 GetOriginalHeight( SCROW nRow, SCTAB nTab ) const; - USHORT GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const; + sal_uInt16 GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const; SCROW GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const; - USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, + sal_uInt16 GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bFormula, + sal_Bool bFormula, const ScMarkData* pMarkData = NULL, - BOOL bSimpleTextImport = FALSE ); - SC_DLLPUBLIC BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra, + sal_Bool bSimpleTextImport = sal_False ); + SC_DLLPUBLIC sal_Bool SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nExtra, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bShrink ); + sal_Bool bShrink ); void UpdateAllRowHeights( OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, @@ -1333,20 +1333,20 @@ public: OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bWidth, BOOL bTotalSize = FALSE ); + sal_Bool bWidth, sal_Bool bTotalSize = sal_False ); - SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC void SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC void SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, sal_Bool bShow); + SC_DLLPUBLIC void ShowRow(SCROW nRow, SCTAB nTab, sal_Bool bShow); + SC_DLLPUBLIC void ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, sal_Bool bShow); + SC_DLLPUBLIC void SetColFlags( SCCOL nCol, SCTAB nTab, sal_uInt8 nNewFlags ); + SC_DLLPUBLIC void SetRowFlags( SCROW nRow, SCTAB nTab, sal_uInt8 nNewFlags ); + SC_DLLPUBLIC void SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt8 nNewFlags ); - SC_DLLPUBLIC BYTE GetColFlags( SCCOL nCol, SCTAB nTab ) const; - SC_DLLPUBLIC BYTE GetRowFlags( SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt8 GetColFlags( SCCOL nCol, SCTAB nTab ) const; + SC_DLLPUBLIC sal_uInt8 GetRowFlags( SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const; - SC_DLLPUBLIC ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab ); + SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, sal_uInt8> & GetRowFlagsArray( SCTAB nTab ) const; + SC_DLLPUBLIC ScBitMaskCompressedArray< SCROW, sal_uInt8> & GetRowFlagsArrayModifiable( SCTAB nTab ); SC_DLLPUBLIC void GetAllRowBreaks(::std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; SC_DLLPUBLIC void GetAllColBreaks(::std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; @@ -1404,11 +1404,11 @@ public: // returns whether to export a Default style for this col/row or not // nDefault is setted to one possition in the current row/col where the Default style is - BOOL GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); - BOOL GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); + sal_Bool GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); + sal_Bool GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); - BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ); - BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow ); + sal_Bool UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, sal_Bool bShow ); + sal_Bool UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_Bool bShow ); void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); @@ -1426,26 +1426,26 @@ public: void InvalidatePageBreaks(SCTAB nTab); void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); void RemoveManualBreaks( SCTAB nTab ); - BOOL HasManualBreaks( SCTAB nTab ) const; + sal_Bool HasManualBreaks( SCTAB nTab ) const; - BOOL IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL ); - BOOL RemovePageStyleInUse( const String& rStrPageStyle ); - BOOL RenamePageStyleInUse( const String& rOld, const String& rNew ); + sal_Bool IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL ); + sal_Bool RemovePageStyleInUse( const String& rStrPageStyle ); + sal_Bool RenamePageStyleInUse( const String& rOld, const String& rNew ); void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, const SfxItemSet& rChanges ); void PageStyleModified( SCTAB nTab, const String& rNewName ); - SC_DLLPUBLIC BOOL NeedPageResetAfterTab( SCTAB nTab ) const; + SC_DLLPUBLIC sal_Bool NeedPageResetAfterTab( SCTAB nTab ) const; // war vorher im PageStyle untergracht. Jetzt an jeder Tabelle: - SC_DLLPUBLIC BOOL HasPrintRange(); - SC_DLLPUBLIC USHORT GetPrintRangeCount( SCTAB nTab ); - SC_DLLPUBLIC const ScRange* GetPrintRange( SCTAB nTab, USHORT nPos ); + SC_DLLPUBLIC sal_Bool HasPrintRange(); + SC_DLLPUBLIC sal_uInt16 GetPrintRangeCount( SCTAB nTab ); + SC_DLLPUBLIC const ScRange* GetPrintRange( SCTAB nTab, sal_uInt16 nPos ); SC_DLLPUBLIC const ScRange* GetRepeatColRange( SCTAB nTab ); SC_DLLPUBLIC const ScRange* GetRepeatRowRange( SCTAB nTab ); /** Returns true, if the specified sheet is always printed. */ - BOOL IsPrintEntireSheet( SCTAB nTab ) const; + sal_Bool IsPrintEntireSheet( SCTAB nTab ) const; /** Removes all print ranges. */ SC_DLLPUBLIC void ClearPrintRanges( SCTAB nTab ); @@ -1470,7 +1470,7 @@ public: SC_DLLPUBLIC void CopyStdStylesFrom( ScDocument* pSrcDoc ); CharSet GetSrcCharSet() const { return eSrcSet; } - ULONG GetSrcVersion() const { return nSrcVer; } + sal_uLong GetSrcVersion() const { return nSrcVer; } SCROW GetSrcMaxRow() const { return nSrcMaxRow; } void SetSrcCharSet( CharSet eNew ) { eSrcSet = eNew; } @@ -1478,107 +1478,107 @@ public: void FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, SCTAB nTab, double nScaleX, double nScaleY, - BOOL bPageMode, BOOL bFormulaMode, + sal_Bool bPageMode, sal_Bool bFormulaMode, const ScMarkData* pMarkData = NULL ); SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; - void Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery ); - SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub ); - BOOL ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL ); - SC_DLLPUBLIC BOOL CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Sort( SCTAB nTab, const ScSortParam& rSortParam, sal_Bool bKeepQuery ); + SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, sal_Bool bKeepSub ); + sal_Bool ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, sal_Bool* pSpecial = NULL ); + SC_DLLPUBLIC sal_Bool CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam ); void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); - BOOL GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, + sal_Bool GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates); - SC_DLLPUBLIC BOOL GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, + SC_DLLPUBLIC sal_Bool GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates ); - BOOL GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, - TypedScStrCollection& rStrings, BOOL bLimit = FALSE ); - BOOL GetFormulaEntries( TypedScStrCollection& rStrings ); + sal_Bool GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, + TypedScStrCollection& rStrings, sal_Bool bLimit = sal_False ); + sal_Bool GetFormulaEntries( TypedScStrCollection& rStrings ); - BOOL HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); + sal_Bool HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + SC_DLLPUBLIC sal_Bool HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + SC_DLLPUBLIC sal_Bool HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); + SfxPrinter* GetPrinter( sal_Bool bCreateIfNotExist = sal_True ); void SetPrinter( SfxPrinter* pNewPrinter ); VirtualDevice* GetVirtualDevice_100th_mm(); SC_DLLPUBLIC OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... - void EraseNonUsedSharedNames(USHORT nLevel); - BOOL GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, - BOOL bInSel, const ScMarkData& rMark) const; + void EraseNonUsedSharedNames(sal_uInt16 nLevel); + sal_Bool GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, + sal_Bool bInSel, const ScMarkData& rMark) const; - BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, + sal_Bool ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, SCTAB nTab, - ScMarkData& rMark, BOOL bIsUndo); + ScMarkData& rMark, sal_Bool bIsUndo); void DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); void InvalidateTextWidth( const String& rStyleName ); void InvalidateTextWidth( SCTAB nTab ); - void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, BOOL bNumFormatChanged ); + void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, sal_Bool bNumFormatChanged ); - BOOL IdleCalcTextWidth(); - BOOL IdleCheckLinks(); + sal_Bool IdleCalcTextWidth(); + sal_Bool IdleCheckLinks(); - BOOL ContinueOnlineSpelling(); // TRUE = etwas gefunden + sal_Bool ContinueOnlineSpelling(); // sal_True = etwas gefunden void RepaintRange( const ScRange& rRange ); - BOOL IsIdleDisabled() const { return bIdleDisabled; } - void DisableIdle(BOOL bDo) { bIdleDisabled = bDo; } + sal_Bool IsIdleDisabled() const { return bIdleDisabled; } + void DisableIdle(sal_Bool bDo) { bIdleDisabled = bDo; } - BOOL IsDetectiveDirty() const { return bDetectiveDirty; } - void SetDetectiveDirty(BOOL bSet) { bDetectiveDirty = bSet; } + sal_Bool IsDetectiveDirty() const { return bDetectiveDirty; } + void SetDetectiveDirty(sal_Bool bSet) { bDetectiveDirty = bSet; } void RemoveAutoSpellObj(); void SetOnlineSpellPos( const ScAddress& rPos ); - SC_DLLPUBLIC BOOL SetVisibleSpellRange( const ScRange& rRange ); // TRUE = changed + SC_DLLPUBLIC sal_Bool SetVisibleSpellRange( const ScRange& rRange ); // sal_True = changed - BYTE GetMacroCallMode() const { return nMacroCallMode; } - void SetMacroCallMode(BYTE nNew) { nMacroCallMode = nNew; } + sal_uInt8 GetMacroCallMode() const { return nMacroCallMode; } + void SetMacroCallMode(sal_uInt8 nNew) { nMacroCallMode = nNew; } - BOOL GetHasMacroFunc() const { return bHasMacroFunc; } - void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; } + sal_Bool GetHasMacroFunc() const { return bHasMacroFunc; } + void SetHasMacroFunc(sal_Bool bSet) { bHasMacroFunc = bSet; } - BOOL CheckMacroWarn(); + sal_Bool CheckMacroWarn(); void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; } sal_Bool HasRangeOverflow() const { return nRangeOverflowType != 0; } SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; } // fuer Broadcasting/Listening - void SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; } - BOOL GetNoSetDirty() const { return bNoSetDirty; } - void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } - BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } + void SetNoSetDirty( sal_Bool bVal ) { bNoSetDirty = bVal; } + sal_Bool GetNoSetDirty() const { return bNoSetDirty; } + void SetInsertingFromOtherDoc( sal_Bool bVal ) { bInsertingFromOtherDoc = bVal; } + sal_Bool IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } void SetLoadingMedium( bool bVal ); void SetImportingXML( bool bVal ); bool IsImportingXML() const { return bImportingXML; } - void SetXMLFromWrapper( BOOL bVal ); - BOOL IsXMLFromWrapper() const { return bXMLFromWrapper; } - void SetCalcingAfterLoad( BOOL bVal ) { bCalcingAfterLoad = bVal; } - BOOL IsCalcingAfterLoad() const { return bCalcingAfterLoad; } - void SetNoListening( BOOL bVal ) { bNoListening = bVal; } - BOOL GetNoListening() const { return bNoListening; } + void SetXMLFromWrapper( sal_Bool bVal ); + sal_Bool IsXMLFromWrapper() const { return bXMLFromWrapper; } + void SetCalcingAfterLoad( sal_Bool bVal ) { bCalcingAfterLoad = bVal; } + sal_Bool IsCalcingAfterLoad() const { return bCalcingAfterLoad; } + void SetNoListening( sal_Bool bVal ) { bNoListening = bVal; } + sal_Bool GetNoListening() const { return bNoListening; } ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } ScChartListenerCollection* GetChartListenerCollection() const { return pChartListenerCollection; } void SetChartListenerCollection( ScChartListenerCollection*, - BOOL bSetChartRangeLists = FALSE ); + sal_Bool bSetChartRangeLists = sal_False ); void UpdateChart( const String& rName ); void RestoreChartListener( const String& rName ); SC_DLLPUBLIC void UpdateChartListenerCollection(); - BOOL IsChartListenerCollectionNeedsUpdate() const + sal_Bool IsChartListenerCollectionNeedsUpdate() const { return bChartListenerCollectionNeedsUpdate; } - void SetChartListenerCollectionNeedsUpdate( BOOL bFlg ) + void SetChartListenerCollectionNeedsUpdate( sal_Bool bFlg ) { bChartListenerCollectionNeedsUpdate = bFlg; } void AddOLEObjectToCollection(const String& rName); @@ -1588,15 +1588,15 @@ public: vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharacters(); void SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersTable> xNew ); - BYTE GetAsianCompression() const; // CharacterCompressionType values - BOOL IsValidAsianCompression() const; - void SetAsianCompression(BYTE nNew); + sal_uInt8 GetAsianCompression() const; // CharacterCompressionType values + sal_Bool IsValidAsianCompression() const; + void SetAsianCompression(sal_uInt8 nNew); - BOOL GetAsianKerning() const; - BOOL IsValidAsianKerning() const; - void SetAsianKerning(BOOL bNew); + sal_Bool GetAsianKerning() const; + sal_Bool IsValidAsianKerning() const; + void SetAsianKerning(sal_Bool bNew); - BYTE GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values + sal_uInt8 GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;} void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} @@ -1608,21 +1608,21 @@ private: void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const; - USHORT RowDifferences( SCROW nThisRow, SCTAB nThisTab, + sal_uInt16 RowDifferences( SCROW nThisRow, SCTAB nThisTab, ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab, SCCOL nMaxCol, SCCOLROW* pOtherCols ); - USHORT ColDifferences( SCCOL nThisCol, SCTAB nThisTab, + sal_uInt16 ColDifferences( SCCOL nThisCol, SCTAB nThisTab, ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab, SCROW nMaxRow, SCCOLROW* pOtherRows ); void FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow, - BOOL bColumns, + sal_Bool bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab, SCCOLROW nEndCol, SCCOLROW* pTranslate, - ScProgress* pProgress, ULONG nProAdd ); - BOOL OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, - USHORT nMaxTest ); + ScProgress* pProgress, sal_uLong nProAdd ); + sal_Bool OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, + sal_uInt16 nMaxTest ); DECL_LINK( TrackTimeHdl, Timer* ); @@ -1641,7 +1641,7 @@ public: */ void Broadcast( const ScHint& rHint ); /// deprecated - void Broadcast( ULONG nHint, const ScAddress& rAddr, + void Broadcast( sal_uLong nHint, const ScAddress& rAddr, ScBaseCell* pCell ); /// only area, no cell broadcast void AreaBroadcast( const ScHint& rHint ); @@ -1660,24 +1660,24 @@ public: SvtListener* pListener ); void PutInFormulaTree( ScFormulaCell* pCell ); void RemoveFromFormulaTree( ScFormulaCell* pCell ); - void CalcFormulaTree( BOOL bOnlyForced = FALSE, - BOOL bNoProgressBar = FALSE ); + void CalcFormulaTree( sal_Bool bOnlyForced = sal_False, + sal_Bool bNoProgressBar = sal_False ); void ClearFormulaTree(); void AppendToFormulaTrack( ScFormulaCell* pCell ); void RemoveFromFormulaTrack( ScFormulaCell* pCell ); - void TrackFormulas( ULONG nHintId = SC_HINT_DATACHANGED ); - USHORT GetFormulaTrackCount() const { return nFormulaTrackCount; } - BOOL IsInFormulaTree( ScFormulaCell* pCell ) const; - BOOL IsInFormulaTrack( ScFormulaCell* pCell ) const; - USHORT GetHardRecalcState() { return nHardRecalcState; } - void SetHardRecalcState( USHORT nVal ) { nHardRecalcState = nVal; } + void TrackFormulas( sal_uLong nHintId = SC_HINT_DATACHANGED ); + sal_uInt16 GetFormulaTrackCount() const { return nFormulaTrackCount; } + sal_Bool IsInFormulaTree( ScFormulaCell* pCell ) const; + sal_Bool IsInFormulaTrack( ScFormulaCell* pCell ) const; + sal_uInt16 GetHardRecalcState() { return nHardRecalcState; } + void SetHardRecalcState( sal_uInt16 nVal ) { nHardRecalcState = nVal; } void StartAllListeners(); const ScFormulaCell* GetFormulaTree() const { return pFormulaTree; } - BOOL HasForcedFormulas() const { return bHasForcedFormulas; } - void SetForcedFormulas( BOOL bVal ) { bHasForcedFormulas = bVal; } - ULONG GetFormulaCodeInTree() const { return nFormulaCodeInTree; } - BOOL IsInInterpreter() const { return nInterpretLevel != 0; } - USHORT GetInterpretLevel() { return nInterpretLevel; } + sal_Bool HasForcedFormulas() const { return bHasForcedFormulas; } + void SetForcedFormulas( sal_Bool bVal ) { bHasForcedFormulas = bVal; } + sal_uLong GetFormulaCodeInTree() const { return nFormulaCodeInTree; } + sal_Bool IsInInterpreter() const { return nInterpretLevel != 0; } + sal_uInt16 GetInterpretLevel() { return nInterpretLevel; } void IncInterpretLevel() { if ( nInterpretLevel < USHRT_MAX ) @@ -1688,8 +1688,8 @@ public: if ( nInterpretLevel ) nInterpretLevel--; } - BOOL IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } - USHORT GetMacroInterpretLevel() { return nMacroInterpretLevel; } + sal_Bool IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } + sal_uInt16 GetMacroInterpretLevel() { return nMacroInterpretLevel; } void IncMacroInterpretLevel() { if ( nMacroInterpretLevel < USHRT_MAX ) @@ -1700,8 +1700,8 @@ public: if ( nMacroInterpretLevel ) nMacroInterpretLevel--; } - BOOL IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } - USHORT GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } + sal_Bool IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } + sal_uInt16 GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } void IncInterpreterTableOpLevel() { if ( nInterpreterTableOpLevel < USHRT_MAX ) @@ -1714,27 +1714,27 @@ public: } // add a formula to be remembered for TableOp broadcasts void AddTableOpFormulaCell( ScFormulaCell* ); - void InvalidateLastTableOpParams() { aLastTableOpParams.bValid = FALSE; } + void InvalidateLastTableOpParams() { aLastTableOpParams.bValid = sal_False; } ScRecursionHelper& GetRecursionHelper() { if (!pRecursionHelper) pRecursionHelper = CreateRecursionHelperInstance(); return *pRecursionHelper; } - BOOL IsInDtorClear() const { return bInDtorClear; } - void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } - BOOL IsExpandRefs() { return bExpandRefs; } + sal_Bool IsInDtorClear() const { return bInDtorClear; } + void SetExpandRefs( sal_Bool bVal ) { bExpandRefs = bVal; } + sal_Bool IsExpandRefs() { return bExpandRefs; } SC_DLLPUBLIC void IncSizeRecalcLevel( SCTAB nTab ); SC_DLLPUBLIC void DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos = true ); - ULONG GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } - void IncXMLImportedFormulaCount( ULONG nVal ) + sal_uLong GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } + void IncXMLImportedFormulaCount( sal_uLong nVal ) { if ( nXMLImportedFormulaCount + nVal > nXMLImportedFormulaCount ) nXMLImportedFormulaCount += nVal; } - void DecXMLImportedFormulaCount( ULONG nVal ) + void DecXMLImportedFormulaCount( sal_uLong nVal ) { if ( nVal <= nXMLImportedFormulaCount ) nXMLImportedFormulaCount -= nVal; @@ -1745,8 +1745,8 @@ public: void StartTrackTimer(); void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileDBFormula( sal_Bool bCreateFormulaString ); + void CompileNameFormula( sal_Bool bCreateFormulaString ); void CompileColRowNameFormula(); /** Maximum string length of a column, e.g. for dBase export. @@ -1783,8 +1783,8 @@ public: ::com::sun::star::util::XModifyListener >& rListener, const ::com::sun::star::lang::EventObject& rEvent ); - void SetInLinkUpdate(BOOL bSet); // TableLink or AreaLink - BOOL IsInLinkUpdate() const; // including DdeLink + void SetInLinkUpdate(sal_Bool bSet); // TableLink or AreaLink + sal_Bool IsInLinkUpdate() const; // including DdeLink SC_DLLPUBLIC SfxItemPool* GetEditPool() const; SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; @@ -1797,16 +1797,16 @@ public: ScRefreshTimerControl * const * GetRefreshTimerControlAddress() const { return &pRefreshTimerControl; } - void SetPastingDrawFromOtherDoc( BOOL bVal ) + void SetPastingDrawFromOtherDoc( sal_Bool bVal ) { bPastingDrawFromOtherDoc = bVal; } - BOOL PastingDrawFromOtherDoc() const + sal_Bool PastingDrawFromOtherDoc() const { return bPastingDrawFromOtherDoc; } /// an ID unique to each document instance sal_uInt32 GetDocumentID() const; void InvalidateStyleSheetUsage() - { bStyleSheetUsageInvalid = TRUE; } + { bStyleSheetUsageInvalid = sal_True; } void GetSortParam( ScSortParam& rParam, SCTAB nTab ); void SetSortParam( ScSortParam& rParam, SCTAB nTab ); @@ -1848,9 +1848,9 @@ private: // CLOOK-Impl-Methoden void DeleteDrawLayer(); void DeleteColorTable(); - SC_DLLPUBLIC BOOL DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; - void DrawMovePage( USHORT nOldPos, USHORT nNewPos ); - void DrawCopyPage( USHORT nOldPos, USHORT nNewPos ); + SC_DLLPUBLIC sal_Bool DrawGetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const; + void DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos ); + void DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos ); void UpdateDrawPrinter(); void UpdateDrawLanguages(); @@ -1870,7 +1870,7 @@ private: // CLOOK-Impl-Methoden ScClipRangeNameData& rRangeNames, const ScRangeList& rDestRanges, const ScMarkData& rMark, SCCOL nXw, SCROW nYw); - BOOL HasPartOfMerged( const ScRange& rRange ); + sal_Bool HasPartOfMerged( const ScRange& rRange ); std::map< SCTAB, ScSortParam > mSheetSortParams; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 0e37ceb40b06..e152b4a88f97 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -109,7 +109,7 @@ private: ::cppu::OInterfaceContainerHelper maChangesListeners; - BOOL FillRenderMarkData( const com::sun::star::uno::Any& aSelection, + sal_Bool FillRenderMarkData( const com::sun::star::uno::Any& aSelection, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions, ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const; com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter(); @@ -335,7 +335,7 @@ private: ScDocShell* pDocShell; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > - GetObjectByIndex_Impl(INT32 nIndex) const; + GetObjectByIndex_Impl(sal_Int32 nIndex) const; public: ScDrawPagesObj(ScDocShell* pDocSh); @@ -802,7 +802,7 @@ private: ScDocShell* pDocShell; SCTAB nTab; - BOOL GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); + sal_Bool GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName); diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx index eab01d078081..dd02e0256a83 100644 --- a/sc/inc/dpcachetable.hxx +++ b/sc/inc/dpcachetable.hxx @@ -168,7 +168,7 @@ public: ScDPTableDataCache* GetCache() const; /** Fill the internal table from the cell range provided. This function assumes that the first row is the column header. */ - void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, + void fillTable( const ScQueryParam& rQuery, sal_Bool* pSpecial, bool bIgnoreEmptyRows, bool bRepeatIfEmpty ); /** Fill the internal table from database connection object. This function assumes that the first row is the column header. */ diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index 7de5947cc969..b1c00d0636c6 100755..100644 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -114,32 +114,32 @@ public: private: union { - ULONG nNumFormat; + sal_uLong nNumFormat; sal_Int32 mnDatePart; }; String aString; double fValue; - BYTE mbFlag; - //BOOL bHasValue: 1 ; - //BOOL bHasData: 1; - //BOOL bErr: 1; + sal_uInt8 mbFlag; + //sal_Bool bHasValue: 1 ; + //sal_Bool bHasData: 1; + //sal_Bool bErr: 1; friend class ScDPTableDataCache; public: ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){} - ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){} - ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ; - ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab ); + ScDPItemData( sal_uLong nNF, const String & rS, double fV, sal_uInt8 bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){} + ScDPItemData( const String& rS, double fV = 0.0, sal_Bool bHV = sal_False, const sal_uLong nNumFormat = 0 , sal_Bool bData = sal_True) ; + ScDPItemData( ScDocument* pDoc, SCROW nRow, sal_uInt16 nCol, sal_uInt16 nDocTab ); void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } -// void SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;} - BOOL IsCaseInsEqual( const ScDPItemData& r ) const; +// void SetValue ( double value , sal_uLong nNumFormat = 0 ) { bHasValue = sal_True; nNumFormat = 0;bHasData = sal_True; bDate = sal_False; fValue = value ;} + sal_Bool IsCaseInsEqual( const ScDPItemData& r ) const; size_t Hash() const; // exact equality - BOOL operator==( const ScDPItemData& r ) const; + sal_Bool operator==( const ScDPItemData& r ) const; // case insensitive equality static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); @@ -148,21 +148,21 @@ public: #endif public: - BOOL IsHasData() const ; - BOOL IsHasErr() const ; - BOOL IsValue() const; + sal_Bool IsHasData() const ; + sal_Bool IsHasErr() const ; + sal_Bool IsValue() const; String GetString() const ; double GetValue() const ; - ULONG GetNumFormat() const ; - BOOL HasStringData() const ; - BOOL IsDate() const; - BOOL HasDatePart() const; - void SetDate( BOOL b ) ; + sal_uLong GetNumFormat() const ; + sal_Bool HasStringData() const ; + sal_Bool IsDate() const; + sal_Bool HasDatePart() const; + void SetDate( sal_Bool b ) ; TypedStrData* CreateTypeString( ); sal_uInt8 GetType() const; - BYTE & GetFlag() throw() { return mbFlag; } - const BYTE & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); } + sal_uInt8 & GetFlag() throw() { return mbFlag; } + const sal_uInt8 & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); } }; class SC_DLLPUBLIC ScDPItemDataPool @@ -194,8 +194,8 @@ class ScTabViewShell; namespace ScDPGlobal { // used for core data - String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue ); - String GetFuncString( const String &rString, const USHORT nIndex ); + String GetFieldFuncString( const String& rSourceName, sal_uInt16 &rFuncMask, sal_Bool bIsValue ); + String GetFuncString( const String &rString, const sal_uInt16 nIndex ); com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> DP_GetMembers( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>&rSrc, long nField ); // common operation @@ -203,7 +203,7 @@ namespace ScDPGlobal Rectangle operator *( const Rectangle &rLeft, const std::pair<double,double> & rRight ); // used for DataPilot Panel ScDPInfoWnd* GetDPInfoWnd( ScTabViewShell *pViewShell ); - bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip = FALSE ); + bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, sal_uInt16 nEndTab, sal_Bool bExcludeClip = sal_False ); } #endif diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index a22b6fd6a2eb..b8fde6ecf4b7 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -235,11 +235,11 @@ public: // End Comments virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual ULONG GetNumberFormat(long nDim); + virtual sal_Bool getIsDataLayoutDimension(long nColumn); + virtual sal_Bool IsDateDimension(long nDim); + virtual sal_uLong GetNumberFormat(long nDim); virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ); virtual bool IsRepeatIfEmpty(); @@ -251,12 +251,12 @@ public: virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; - virtual BOOL IsBaseForGroup(long nDim) const; + virtual sal_Bool IsBaseForGroup(long nDim) const; virtual long GetGroupBase(long nGroupDim) const; - virtual BOOL IsNumOrDateGroup(long nDim) const; - virtual BOOL IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, + virtual sal_Bool IsNumOrDateGroup(long nDim) const; + virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual BOOL HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const; }; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index e1b88919dad6..8e15bd55068d 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -79,7 +79,7 @@ struct ScDPServiceDesc aServiceName( rServ ), aParSource( rSrc ), aParName( rNam ), aParUser( rUser ), aParPass( rPass ) { } - BOOL operator== ( const ScDPServiceDesc& rOther ) const + sal_Bool operator== ( const ScDPServiceDesc& rOther ) const { return aServiceName == rOther.aServiceName && aParSource == rOther.aParSource && aParName == rOther.aParName && @@ -104,28 +104,28 @@ private: // cached data com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource; ScDPOutput* pOutput; - BOOL bSettingsChanged; - BOOL bAlive; // FALSE if only used to hold settings + sal_Bool bSettingsChanged; + sal_Bool bAlive; // sal_False if only used to hold settings sal_uInt16 mnAutoFormatIndex; - BOOL bAllowMove; + sal_Bool bAllowMove; long nHeaderRows; // page fields plus filter button - bool mbHeaderLayout; // TRUE : grid, FALSE : standard + bool mbHeaderLayout; // sal_True : grid, sal_False : standard SC_DLLPRIVATE ScDPTableData* GetTableData(); SC_DLLPRIVATE void CreateObjects(); SC_DLLPRIVATE void CreateOutput(); - BOOL bRefresh; + sal_Bool bRefresh; long mnCacheId; public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - inline void SetRefresh() { bRefresh = TRUE; } + inline void SetRefresh() { bRefresh = sal_True; } const ScDPTableDataCache* GetCache() const; long GetCacheId() const; void SetCacheId( long nCacheId ); - ULONG RefreshCache(); + sal_uLong RefreshCache(); // End Comments ScDPObject( ScDocument* pD ); ScDPObject(const ScDPObject& r); @@ -133,15 +133,15 @@ public: virtual ScDataObject* Clone() const; - void SetAlive(BOOL bSet); - void SetAllowMove(BOOL bSet); + void SetAlive(sal_Bool bSet); + void SetAllowMove(sal_Bool bSet); void InvalidateData(); void InvalidateSource(); void Output( const ScAddress& rPos ); - ScRange GetNewOutputRange( BOOL& rOverflow ); + ScRange GetNewOutputRange( sal_Bool& rOverflow ); const ScRange GetOutputRangeByType( sal_Int32 nType ); void SetSaveData(const ScDPSaveData& rData); @@ -169,9 +169,9 @@ public: com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> GetSource(); - BOOL IsSheetData() const; - BOOL IsImportData() const { return(pImpDesc != NULL); } - BOOL IsServiceData() const { return(pServDesc != NULL); } + sal_Bool IsSheetData() const; + sal_Bool IsImportData() const { return(pImpDesc != NULL); } + sal_Bool IsServiceData() const { return(pServDesc != NULL); } void SetName(const String& rNew); const String& GetName() const { return aTableName; } @@ -186,19 +186,19 @@ public: bool IsDataDescriptionCell(const ScAddress& rPos); bool IsDimNameInUse(const ::rtl::OUString& rName) const; - String GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags = NULL ); - BOOL IsDuplicated( long nDim ); + String GetDimName( long nDim, sal_Bool& rIsDataLayout, sal_Int32* pFlags = NULL ); + sal_Bool IsDuplicated( long nDim ); long GetDimCount(); void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData); - long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); - BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, + long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient ); + sal_Bool GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop, long nDragDim, - Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ); - BOOL IsFilterButton( const ScAddress& rPos ); + Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos ); + sal_Bool IsFilterButton( const ScAddress& rPos ); - BOOL GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ + sal_Bool GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ const std::vector< ScDPGetPivotDataField >& rFilters ); - BOOL ParseFilters( ScDPGetPivotDataField& rTarget, + sal_Bool ParseFilters( ScDPGetPivotDataField& rTarget, std::vector< ScDPGetPivotDataField >& rFilters, const String& rFilterList ); @@ -208,24 +208,24 @@ public: void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); - BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; - BOOL FillLabelData(ScPivotParam& rParam); - void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); + sal_Bool FillOldParam(ScPivotParam& rParam, sal_Bool bForFile) const; + sal_Bool FillLabelData(ScPivotParam& rParam); + void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, sal_Bool bSetSource); - BOOL GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); - BOOL GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers ); + sal_Bool GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); + sal_Bool GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers ); sal_Int32 GetUsedHierarchy( sal_Int32 nDim ); - BOOL GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); - BOOL GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); + sal_Bool GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); + sal_Bool GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL RefsEqual( const ScDPObject& r ) const; + sal_Bool RefsEqual( const ScDPObject& r ) const; void WriteRefsTo( ScDPObject& r ) const; void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); @@ -245,22 +245,22 @@ public: void BuildAllDimensionMembers(); - static BOOL HasRegisteredSources(); + static sal_Bool HasRegisteredSources(); static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources(); static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> CreateSource( const ScDPServiceDesc& rDesc ); static void ConvertOrientation( ScDPSaveData& rSaveData, - PivotField* pFields, SCSIZE nCount, USHORT nOrient, + PivotField* pFields, SCSIZE nCount, sal_uInt16 nOrient, ScDocument* pDoc, SCROW nRow, SCTAB nTab, const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource, - BOOL bOldDefaults, + sal_Bool bOldDefaults, PivotField* pRefColFields = NULL, SCSIZE nRefColCount = 0, PivotField* pRefRowFields = NULL, SCSIZE nRefRowCount = 0, PivotField* pRefPageFields = NULL, SCSIZE nRefPageCount = 0 ); - static bool IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags ); + static bool IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags ); }; @@ -277,17 +277,17 @@ public: virtual ScDataObject* Clone() const; - ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} + ScDPObject* operator[](sal_uInt16 nIndex) const {return (ScDPObject*)At(nIndex);} ScDPObject* GetByName(const String& rName) const; void DeleteOnTab( SCTAB nTab ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL RefsEqual( const ScDPCollection& r ) const; + sal_Bool RefsEqual( const ScDPCollection& r ) const; void WriteRefsTo( ScDPCollection& r ) const; - String CreateNewName( USHORT nMin = 1 ) const; + String CreateNewName( sal_uInt16 nMin = 1 ) const; void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index e97a56a9ecf2..c4bb203ecbb8 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -80,7 +80,7 @@ private: com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier> xSource; ScAddress aStartPos; - BOOL bDoFilter; + sal_Bool bDoFilter; ScDPOutLevelData* pColFields; ScDPOutLevelData* pRowFields; ScDPOutLevelData* pPageFields; @@ -90,24 +90,24 @@ private: com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> > aData; - BOOL bResultsError; + sal_Bool bResultsError; bool mbHasDataLayout; String aDataDescription; // Number format related parameters - UINT32* pColNumFmt; - UINT32* pRowNumFmt; + sal_uInt32* pColNumFmt; + sal_uInt32* pRowNumFmt; long nColFmtCount; long nRowFmtCount; - UINT32 nSingleNumFmt; + sal_uInt32 nSingleNumFmt; // Output geometry related parameters - BOOL bSizesValid; - BOOL bSizeOverflow; + sal_Bool bSizesValid; + sal_Bool bSizeOverflow; long nColCount; long nRowCount; long nHeaderSize; - bool mbHeaderLayout; // TRUE : grid, FALSE : standard + bool mbHeaderLayout; // sal_True : grid, sal_False : standard SCCOL nTabStartCol; SCROW nTabStartRow; SCCOL nMemberStartCol; @@ -121,7 +121,7 @@ private: const com::sun::star::sheet::DataResult& rData ); void HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const com::sun::star::sheet::MemberResult& rData, - BOOL bColHeader, long nLevel ); + sal_Bool bColHeader, long nLevel ); void FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, bool bInTable, bool bPopup, bool bHasHiddenMember ); void CalcSizes(); @@ -135,7 +135,7 @@ public: ScDPOutput( ScDocument* pD, const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSrc, - const ScAddress& rPos, BOOL bFilter ); + const ScAddress& rPos, sal_Bool bFilter ); ~ScDPOutput(); void SetPosition( const ScAddress& rPos ); @@ -143,7 +143,7 @@ public: void Output(); //! Refresh? ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ); long GetHeaderRows(); - BOOL HasError(); // range overflow or exception from source + sal_Bool HasError(); // range overflow or exception from source void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); @@ -151,13 +151,13 @@ public: field region. */ bool GetDataResultPositionData(::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters, const ScAddress& rPos); - BOOL GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ + sal_Bool GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ const std::vector< ScDPGetPivotDataField >& rFilters ); - long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); - BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, + long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient ); + sal_Bool GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop, long nDragDim, - Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ); - BOOL IsFilterButton( const ScAddress& rPos ); + Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos ); + sal_Bool IsFilterButton( const ScAddress& rPos ); void GetMemberResultNames( ScStrCollection& rNames, long nDimension ); diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 8272b850b27e..8c4babc77da3 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -58,23 +58,23 @@ class ScDPSaveMember private: String aName; ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. - USHORT nVisibleMode; - USHORT nShowDetailsMode; + sal_uInt16 nVisibleMode; + sal_uInt16 nShowDetailsMode; public: ScDPSaveMember(const String& rName); ScDPSaveMember(const ScDPSaveMember& r); ~ScDPSaveMember(); - BOOL operator== ( const ScDPSaveMember& r ) const; + sal_Bool operator== ( const ScDPSaveMember& r ) const; const String& GetName() const { return aName; } - BOOL HasIsVisible() const; - SC_DLLPUBLIC void SetIsVisible(BOOL bSet); - BOOL GetIsVisible() const { return BOOL(nVisibleMode); } - BOOL HasShowDetails() const; - SC_DLLPUBLIC void SetShowDetails(BOOL bSet); - BOOL GetShowDetails() const { return BOOL(nShowDetailsMode); } + sal_Bool HasIsVisible() const; + SC_DLLPUBLIC void SetIsVisible(sal_Bool bSet); + sal_Bool GetIsVisible() const { return sal_Bool(nVisibleMode); } + sal_Bool HasShowDetails() const; + SC_DLLPUBLIC void SetShowDetails(sal_Bool bSet); + sal_Bool GetShowDetails() const { return sal_Bool(nShowDetailsMode); } void SetName( const String& rNew ); // used if the source member was renamed (groups) @@ -98,15 +98,15 @@ private: String* pSelectedPage; ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; - BOOL bIsDataLayout; - BOOL bDupFlag; - USHORT nOrientation; - USHORT nFunction; // enum GeneralFunction, for data dimensions + sal_Bool bIsDataLayout; + sal_Bool bDupFlag; + sal_uInt16 nOrientation; + sal_uInt16 nFunction; // enum GeneralFunction, for data dimensions long nUsedHierarchy; - USHORT nShowEmptyMode; //! at level - BOOL bSubTotalDefault; //! at level + sal_uInt16 nShowEmptyMode; //! at level + sal_Bool bSubTotalDefault; //! at level long nSubTotalCount; - USHORT* pSubTotalFuncs; // enum GeneralFunction + sal_uInt16* pSubTotalFuncs; // enum GeneralFunction ::com::sun::star::sheet::DataPilotFieldReference* pReferenceValue; ::com::sun::star::sheet::DataPilotFieldSortInfo* pSortInfo; // (level) ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pAutoShowInfo; // (level) @@ -119,32 +119,32 @@ private: MemberHash maMemberHash; MemberList maMemberList; public: - ScDPSaveDimension(const String& rName, BOOL bDataLayout); + ScDPSaveDimension(const String& rName, sal_Bool bDataLayout); ScDPSaveDimension(const ScDPSaveDimension& r); ~ScDPSaveDimension(); - BOOL operator== ( const ScDPSaveDimension& r ) const; + sal_Bool operator== ( const ScDPSaveDimension& r ) const; const MemberList& GetMembers() const { return maMemberList; } void AddMember(ScDPSaveMember* pMember); - void SetDupFlag(BOOL bSet) { bDupFlag = bSet; } - BOOL GetDupFlag() const { return bDupFlag; } + void SetDupFlag(sal_Bool bSet) { bDupFlag = bSet; } + sal_Bool GetDupFlag() const { return bDupFlag; } const String& GetName() const { return aName; } - BOOL IsDataLayout() const { return bIsDataLayout; } + sal_Bool IsDataLayout() const { return bIsDataLayout; } void SetName( const String& rNew ); // used if the source dim was renamed (groups) - void SetOrientation(USHORT nNew); - void SetSubTotals(long nCount, const USHORT* pFuncs); + void SetOrientation(sal_uInt16 nNew); + void SetSubTotals(long nCount, const sal_uInt16* pFuncs); long GetSubTotalsCount() const { return nSubTotalCount; } - USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; } + sal_uInt16 GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; } bool HasShowEmpty() const; - void SetShowEmpty(BOOL bSet); - BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); } - void SetFunction(USHORT nNew); // enum GeneralFunction - USHORT GetFunction() const { return nFunction; } + void SetShowEmpty(sal_Bool bSet); + sal_Bool GetShowEmpty() const { return sal_Bool(nShowEmptyMode); } + void SetFunction(sal_uInt16 nNew); // enum GeneralFunction + sal_uInt16 GetFunction() const { return nFunction; } void SetUsedHierarchy(long nNew); long GetUsedHierarchy() const { return nUsedHierarchy; } @@ -167,10 +167,10 @@ public: void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew); void SetCurrentPage( const String* pPage ); // NULL = no selection (all) - BOOL HasCurrentPage() const; + sal_Bool HasCurrentPage() const; const String& GetCurrentPage() const; - USHORT GetOrientation() const { return nOrientation; } + sal_uInt16 GetOrientation() const { return nOrientation; } ScDPSaveMember* GetExistingMemberByName(const String& rName); ScDPSaveMember* GetMemberByName(const String& rName); @@ -194,12 +194,12 @@ class ScDPSaveData private: List aDimList; ScDPDimensionSaveData* pDimensionData; // settings that create new dimensions - USHORT nColumnGrandMode; - USHORT nRowGrandMode; - USHORT nIgnoreEmptyMode; - USHORT nRepeatEmptyMode; - BOOL bFilterButton; // not passed to DataPilotSource - BOOL bDrillDown; // not passed to DataPilotSource + sal_uInt16 nColumnGrandMode; + sal_uInt16 nRowGrandMode; + sal_uInt16 nIgnoreEmptyMode; + sal_uInt16 nRepeatEmptyMode; + sal_Bool bFilterButton; // not passed to DataPilotSource + sal_Bool bDrillDown; // not passed to DataPilotSource // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance long mnCacheId; @@ -218,7 +218,7 @@ public: ScDPSaveData& operator= ( const ScDPSaveData& r ); - BOOL operator== ( const ScDPSaveData& r ) const; + sal_Bool operator== ( const ScDPSaveData& r ) const; SC_DLLPUBLIC void SetGrandTotalName(const ::rtl::OUString& rName); SC_DLLPUBLIC const ::rtl::OUString* GetGrandTotalName() const; @@ -238,25 +238,25 @@ public: void RemoveDimensionByName(const String& rName); - ScDPSaveDimension* GetInnermostDimension(USHORT nOrientation); + ScDPSaveDimension* GetInnermostDimension(sal_uInt16 nOrientation); ScDPSaveDimension* GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation); long GetDataDimensionCount() const; void SetPosition( ScDPSaveDimension* pDim, long nNew ); - SC_DLLPUBLIC void SetColumnGrand( BOOL bSet ); - BOOL GetColumnGrand() const { return BOOL(nColumnGrandMode); } - SC_DLLPUBLIC void SetRowGrand( BOOL bSet ); - BOOL GetRowGrand() const { return BOOL(nRowGrandMode); } - void SetIgnoreEmptyRows( BOOL bSet ); - BOOL GetIgnoreEmptyRows() const { return BOOL(nIgnoreEmptyMode); } - void SetRepeatIfEmpty( BOOL bSet ); - BOOL GetRepeatIfEmpty() const { return BOOL(nRepeatEmptyMode); } - - SC_DLLPUBLIC void SetFilterButton( BOOL bSet ); - BOOL GetFilterButton() const { return bFilterButton; } - SC_DLLPUBLIC void SetDrillDown( BOOL bSet ); - BOOL GetDrillDown() const { return bDrillDown; } + SC_DLLPUBLIC void SetColumnGrand( sal_Bool bSet ); + sal_Bool GetColumnGrand() const { return sal_Bool(nColumnGrandMode); } + SC_DLLPUBLIC void SetRowGrand( sal_Bool bSet ); + sal_Bool GetRowGrand() const { return sal_Bool(nRowGrandMode); } + void SetIgnoreEmptyRows( sal_Bool bSet ); + sal_Bool GetIgnoreEmptyRows() const { return sal_Bool(nIgnoreEmptyMode); } + void SetRepeatIfEmpty( sal_Bool bSet ); + sal_Bool GetRepeatIfEmpty() const { return sal_Bool(nRepeatEmptyMode); } + + SC_DLLPUBLIC void SetFilterButton( sal_Bool bSet ); + sal_Bool GetFilterButton() const { return bFilterButton; } + SC_DLLPUBLIC void SetDrillDown( sal_Bool bSet ); + sal_Bool GetDrillDown() const { return bDrillDown; } void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); @@ -264,7 +264,7 @@ public: // DataPilot Migration - Cache&&Performance void Refresh( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); - BOOL IsEmpty() const; + sal_Bool IsEmpty() const; inline long GetCacheId() const{ return mnCacheId; } inline void SetCacheId( long nCacheId ){ mnCacheId = nCacheId; } // End Comments diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 732e3d30e8df..0e41af8f17bb 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -47,12 +47,12 @@ struct ScImportSourceDesc { String aDBName; String aObject; - USHORT nType; // enum DataImportMode - BOOL bNative; + sal_uInt16 nType; // enum DataImportMode + sal_Bool bNative; - ScImportSourceDesc() : nType(0), bNative(FALSE) {} + ScImportSourceDesc() : nType(0), bNative(sal_False) {} - BOOL operator== ( const ScImportSourceDesc& rOther ) const + sal_Bool operator== ( const ScImportSourceDesc& rOther ) const { return aDBName == rOther.aDBName && aObject == rOther.aObject && nType == rOther.nType && @@ -77,10 +77,10 @@ public: virtual long GetColumnCount(); virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); + virtual sal_Bool getIsDataLayoutDimension(long nColumn); + virtual sal_Bool IsDateDimension(long nDim); virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ); virtual void CreateCacheTable(); virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rDataDims); diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index a8d80072c68a..198ee240c92c 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -55,13 +55,13 @@ struct ScSheetSourceDesc ScRange aSourceRange; ScQueryParam aQueryParam; - BOOL operator== ( const ScSheetSourceDesc& rOther ) const + sal_Bool operator== ( const ScSheetSourceDesc& rOther ) const { return aSourceRange == rOther.aSourceRange && aQueryParam == rOther.aQueryParam; } // Wang Xu Ming - DataPilot migration // Buffer&&Performance ScDPTableDataCache* CreateCache( ScDocument* pDoc, long nID = -1) const; - ULONG CheckValidate( ScDocument* pDoc ) const; + sal_uLong CheckValidate( ScDocument* pDoc ) const; ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const; ScDPTableDataCache* GetExistDPObjectCache ( ScDocument* pDoc ) const; long GetCacheId( ScDocument* pDoc, long nID ) const; @@ -73,9 +73,9 @@ class SC_DLLPUBLIC ScSheetDPData : public ScDPTableData { private: ScQueryParam aQuery; - BOOL* pSpecial; - BOOL bIgnoreEmptyRows; - BOOL bRepeatIfEmpty; + sal_Bool* pSpecial; + sal_Bool bIgnoreEmptyRows; + sal_Bool bRepeatIfEmpty; ScDPCacheTable aCacheTable; @@ -87,11 +87,11 @@ public: // End Comments virtual long GetColumnCount(); virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual ULONG GetNumberFormat(long nDim); + virtual sal_Bool getIsDataLayoutDimension(long nColumn); + virtual sal_Bool IsDateDimension(long nDim); + virtual sal_uLong GetNumberFormat(long nDim); virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ); virtual bool IsRepeatIfEmpty(); diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 6323434ca4ad..0496c8e94b79 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -80,9 +80,9 @@ namespace com { namespace sun { namespace star { namespace sheet { struct ScDPValueData { double fValue; - BYTE nType; + sal_uInt8 nType; - void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; } + void Set( double fV, sal_uInt8 nT ) { fValue = fV; nType = nT; } }; class ScDPResultMember; @@ -147,12 +147,12 @@ public: long GetCacheId() const; // End Comments virtual String getDimensionName(long nColumn) = 0; - virtual BOOL getIsDataLayoutDimension(long nColumn) = 0; - virtual BOOL IsDateDimension(long nDim) = 0; - virtual ULONG GetNumberFormat(long nDim); - virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset ); + virtual sal_Bool getIsDataLayoutDimension(long nColumn) = 0; + virtual sal_Bool IsDateDimension(long nDim) = 0; + virtual sal_uLong GetNumberFormat(long nDim); + virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); virtual void DisposeData() = 0; - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0; + virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ) = 0; virtual bool IsRepeatIfEmpty(); @@ -165,12 +165,12 @@ public: virtual const ScDPCacheTable& GetCacheTable() const = 0; // overloaded in ScDPGroupTableData: - virtual BOOL IsBaseForGroup(long nDim) const; + virtual sal_Bool IsBaseForGroup(long nDim) const; virtual long GetGroupBase(long nGroupDim) const; - virtual BOOL IsNumOrDateGroup(long nDim) const; - virtual BOOL IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, + virtual sal_Bool IsNumOrDateGroup(long nDim) const; + virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual BOOL HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const; // Wang Xu Ming -- 2009-8-17 diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx index 953c793093be..be9c0659996d 100644 --- a/sc/inc/dptablecache.hxx +++ b/sc/inc/dptablecache.hxx @@ -67,7 +67,7 @@ class SC_DLLPUBLIC ScDPTableDataCache std::vector<SCROW>* mpGlobalOrder; //Sorted members index std::vector<SCROW>* mpIndexOrder; //Index the sorted number std::vector<ScDPItemData*> mrLabelNames; //Source Label data - std::vector<BOOL> mbEmptyRow; //If empty row? + std::vector<sal_Bool> mbEmptyRow; //If empty row? mutable ScDPItemDataPool maAdditionalDatas; public: SCROW GetOrder( long nDim, SCROW nIndex ) const; @@ -79,26 +79,26 @@ public: SCCOL GetDimensionIndex( String sName) const; const ScDPItemData* GetSortedItemData( SCCOL nDim, SCROW nOrder ) const; - ULONG GetNumType ( ULONG nFormat ) const; - ULONG GetNumberFormat( long nDim ) const; - BOOL IsDateDimension( long nDim ) const ; - ULONG GetDimNumType( SCCOL nDim) const; + sal_uLong GetNumType ( sal_uLong nFormat ) const; + sal_uLong GetNumberFormat( long nDim ) const; + sal_Bool IsDateDimension( long nDim ) const ; + sal_uLong GetDimNumType( SCCOL nDim) const; SCROW GetDimMemberCount( SCCOL nDim ) const; SCROW GetSortedItemDataId( SCCOL nDim, SCROW nOrder ) const; const std::vector<ScDPItemData*>& GetDimMemberValues( SCCOL nDim )const; void SetId( long nId ){ mnID = nId;} - void AddRow( ScDPItemData* pRow, USHORT nCount ); + void AddRow( ScDPItemData* pRow, sal_uInt16 nCount ); bool InitFromDoc( ScDocument* pDoc, const ScRange& rRange ); bool InitFromDataBase (const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xRowSet, const Date& rNullDate); SCROW GetRowCount() const; - SCROW GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const; - String GetDimensionName( USHORT nColumn ) const; - bool IsEmptyMember( SCROW nRow, USHORT nColumn ) const; + SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, sal_Bool bRepeatIfEmpty ) const; + String GetDimensionName( sal_uInt16 nColumn ) const; + bool IsEmptyMember( SCROW nRow, sal_uInt16 nColumn ) const; bool IsRowEmpty( SCROW nRow ) const; bool IsValid() const; - bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial ); + bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, sal_Bool* pSpecial ); ScDocument* GetDoc() const;//ms-cache-core long GetColumnCount() const; @@ -106,7 +106,7 @@ public: const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const; - BOOL operator== ( const ScDPTableDataCache& r ) const; + sal_Bool operator== ( const ScDPTableDataCache& r ) const; //construction ScDPTableDataCache( ScDocument* pDoc ); @@ -116,7 +116,7 @@ public: protected: private: void AddLabel( ScDPItemData* pData); - BOOL AddData( long nDim, ScDPItemData* itemData ); + sal_Bool AddData( long nDim, ScDPItemData* itemData ); }; #endif //DPTABLECACHE_HXX diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 7f9720a4b143..33673cbc135e 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -184,14 +184,14 @@ public: void Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); - BOOL IsCalculated() const; + sal_Bool IsCalculated() const; double GetResult() const; - BOOL HasError() const; - BOOL HasData() const; + sal_Bool HasError() const; + sal_Bool HasData() const; void SetResult( double fNew ); - void SetEmpty( BOOL bSet ); + void SetEmpty( sal_Bool bSet ); void SetError(); double GetAuxiliary() const; @@ -211,7 +211,7 @@ class ScDPRowTotals { ScDPAggData aRowTotal; ScDPAggData aGrandTotal; - BOOL bIsInColRoot; + sal_Bool bIsInColRoot; public: ScDPRowTotals(); @@ -220,8 +220,8 @@ public: ScDPAggData* GetRowTotal( long nMeasure ); ScDPAggData* GetGrandTotal( long nMeasure ); - BOOL IsInColRoot() const { return bIsInColRoot; } - void SetInColRoot(BOOL bSet) { bIsInColRoot = bSet; } + sal_Bool IsInColRoot() const { return bIsInColRoot; } + void SetInColRoot(sal_Bool bSet) { bIsInColRoot = bSet; } }; // -------------------------------------------------------------------- @@ -263,12 +263,12 @@ typedef std::hash_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMem class ResultMembers { DimMemberHash maMemberHash; - BOOL mbHasHideDetailsMember; + sal_Bool mbHasHideDetailsMember; public: ScDPParentDimData* FindMember( const SCROW& nIndex ) const; void InsertMember( ScDPParentDimData* pNew ); - BOOL IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } - void SetHasHideDetailsMembers( BOOL b ) { mbHasHideDetailsMember=b; } + sal_Bool IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } + void SetHasHideDetailsMembers( sal_Bool b ) { mbHasHideDetailsMember=b; } ResultMembers(); virtual ~ResultMembers(); }; @@ -279,24 +279,24 @@ private: const ::std::vector<ScDPDimension*>& mppDim; const ::std::vector<ScDPLevel*>& mppLev; - BOOL mbRow; - BOOL mbInitChild; - BOOL mbAllChildren; + sal_Bool mbRow; + sal_Bool mbInitChild; + sal_Bool mbAllChildren; public: LateInitParams( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev, - BOOL bRow, BOOL bInitChild = TRUE , BOOL bAllChildren = FALSE); + sal_Bool bRow, sal_Bool bInitChild = sal_True , sal_Bool bAllChildren = sal_False); ~LateInitParams(); - void SetInitChild( BOOL b ) { mbInitChild = b; } - void SetInitAllChildren( BOOL b ) { mbAllChildren = b; } + void SetInitChild( sal_Bool b ) { mbInitChild = b; } + void SetInitAllChildren( sal_Bool b ) { mbAllChildren = b; } inline ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];} inline ScDPLevel* GetLevel( size_t nPos ) const { return mppLev[nPos];} - inline BOOL GetInitChild() const {return mbInitChild; } - inline BOOL GetInitAllChild() const { return mbAllChildren; } - inline BOOL IsRow() const { return mbRow; } - BOOL IsEnd( size_t nPos ) const ; + inline sal_Bool GetInitChild() const {return mbInitChild; } + inline sal_Bool GetInitAllChild() const { return mbAllChildren; } + inline sal_Bool IsRow() const { return mbRow; } + sal_Bool IsEnd( size_t nPos ) const ; }; // End Comments @@ -309,11 +309,11 @@ private: long nMeasCount; ScSubTotalFunc* pMeasFuncs; ::com::sun::star::sheet::DataPilotFieldReference* pMeasRefs; - USHORT* pMeasRefOrient; + sal_uInt16* pMeasRefOrient; String* pMeasNames; - BOOL bLateInit; - BOOL bDataAtCol; - BOOL bDataAtRow; + sal_Bool bLateInit; + sal_Bool bDataAtCol; + sal_Bool bDataAtRow; //! add "displayed values" settings mutable std::vector< ResultMembers* > mpDimMembers; @@ -323,20 +323,20 @@ public: void SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions, const ::com::sun::star::sheet::DataPilotFieldReference* pRefs, - const USHORT* pRefOrient, const String* pNames ); - void SetDataLayoutOrientation( USHORT nOrient ); - void SetLateInit( BOOL bSet ); + const sal_uInt16* pRefOrient, const String* pNames ); + void SetDataLayoutOrientation( sal_uInt16 nOrient ); + void SetLateInit( sal_Bool bSet ); long GetMeasureCount() const { return nMeasCount; } ScSubTotalFunc GetMeasureFunction(long nMeasure) const; - String GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; + String GetMeasureString(long nMeasure, sal_Bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; String GetMeasureDimensionName(long nMeasure) const; const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; - USHORT GetMeasureRefOrient(long nMeasure) const; + sal_uInt16 GetMeasureRefOrient(long nMeasure) const; - BOOL IsDataAtCol() const { return bDataAtCol; } - BOOL IsDataAtRow() const { return bDataAtRow; } - BOOL IsLateInit() const { return bLateInit; } + sal_Bool IsDataAtCol() const { return bDataAtCol; } + sal_Bool IsDataAtRow() const { return bDataAtRow; } + sal_Bool IsLateInit() const { return bLateInit; } long GetColStartMeasure() const; long GetRowStartMeasure() const; @@ -344,16 +344,16 @@ public: long GetCountForMeasure( long nMeas ) const { return ( nMeas == SC_DPMEASURE_ALL ) ? nMeasCount : 1; } - BOOL IsBaseForGroup( long nDim ) const; // any group + sal_Bool IsBaseForGroup( long nDim ) const; // any group long GetGroupBase( long nGroupDim ) const; - BOOL IsNumOrDateGroup( long nDim ) const; + sal_Bool IsNumOrDateGroup( long nDim ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - BOOL IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, + sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, long nBaseDataId, long nBaseIndex ) const; - BOOL IsInGroup( SCROW nGroupDataId, long nGroupIndex, + sal_Bool IsInGroup( SCROW nGroupDataId, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - BOOL HasCommonElement( SCROW nFirstDataId, long nFirstIndex, + sal_Bool HasCommonElement( SCROW nFirstDataId, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const; ResultMembers* GetDimResultMembers( long nDim , ScDPDimension* pDim , ScDPLevel* pLevel) const ; @@ -373,20 +373,20 @@ private: // End Comments ScDPResultDimension* pChildDimension; ScDPDataMember* pDataRoot; - BOOL bHasElements; - BOOL bForceSubTotal; - BOOL bHasHiddenDetails; - BOOL bInitialized; - BOOL bAutoHidden; + sal_Bool bHasElements; + sal_Bool bForceSubTotal; + sal_Bool bHasHiddenDetails; + sal_Bool bInitialized; + sal_Bool bAutoHidden; ScDPAggData aColTotal; // to store column totals - USHORT nMemberStep; // step to show details + sal_uInt16 nMemberStep; // step to show details public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance ScDPResultMember( const ScDPResultData* pData, const ScDPParentDimData& rParentDimData, - BOOL bForceSub ); //! Ref - ScDPResultMember( const ScDPResultData* pData, BOOL bForceSub ); + sal_Bool bForceSub ); //! Ref + ScDPResultMember( const ScDPResultData* pData, sal_Bool bForceSub ); // End Comments ~ScDPResultMember(); @@ -396,33 +396,33 @@ public: const ::std::vector<ScDPLevel*>& ppLev, size_t nPos, ScDPInitState& rInitState, - BOOL bInitChild = TRUE ); + sal_Bool bInitChild = sal_True ); void LateInitFrom( LateInitParams& rParams, const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState); - void CheckShowEmpty( BOOL bShow = FALSE ); + void CheckShowEmpty( sal_Bool bShow = sal_False ); // End Comments String GetName() const; void FillItemData( ScDPItemData& rData ) const; - BOOL IsValid() const; - BOOL IsVisible() const; + sal_Bool IsValid() const; + sal_Bool IsVisible() const; long GetSize(long nMeasure) const; - BOOL HasHiddenDetails() const; - BOOL IsSubTotalInTitle(long nMeasure) const; + sal_Bool HasHiddenDetails() const; + sal_Bool IsSubTotalInTitle(long nMeasure) const; -// BOOL SubTotalEnabled() const; +// sal_Bool SubTotalEnabled() const; long GetSubTotalCount( long* pUserSubStart = NULL ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - BOOL IsNamedItem( SCROW nIndex ) const; + sal_Bool IsNamedItem( SCROW nIndex ) const; bool IsValidEntry( const ::std::vector< SCROW >& aMembers ) const; // End Comments - void SetHasElements() { bHasElements = TRUE; } - void SetAutoHidden() { bAutoHidden = TRUE; } + void SetHasElements() { bHasElements = sal_True; } + void SetAutoHidden() { bAutoHidden = sal_True; } // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -433,7 +433,7 @@ public: // End Comments void FillMemberResults( com::sun::star::uno::Sequence< com::sun::star::sheet::MemberResult>* pSequences, - long& rPos, long nMeasure, BOOL bRoot, + long& rPos, long nMeasure, sal_Bool bRoot, const String* pMemberName, const String* pMemberCaption ); @@ -450,7 +450,7 @@ public: void SortMembers( ScDPResultMember* pRefMember ); void DoAutoShow( ScDPResultMember* pRefMember ); - void ResetResults( BOOL bRoot ); + void ResetResults( sal_Bool bRoot ); void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; @@ -466,7 +466,7 @@ public: const ScDPLevel* GetParentLevel() const { return aParentDimData.mpParentLevel; } //! Ref const ScDPMember* GetDPMember()const { return aParentDimData.mpMemberDesc; } //! Ref inline SCROW GetOrder() const { return aParentDimData.mnOrder; } //! Ref - inline BOOL IsRoot() const { return GetParentLevel() == NULL; } + inline sal_Bool IsRoot() const { return GetParentLevel() == NULL; } SCROW GetDataId( ) const ; // End Comments ScDPAggData* GetColTotal( long nMeasure ) const; @@ -491,33 +491,33 @@ public: void InitFrom( const ScDPResultDimension* pDim ); String GetName() const; - BOOL IsVisible() const; - BOOL HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const; + sal_Bool IsVisible() const; + sal_Bool HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - BOOL IsNamedItem( SCROW r ) const; + sal_Bool IsNamedItem( SCROW r ) const; // End Comments - BOOL HasHiddenDetails() const; + sal_Bool HasHiddenDetails() const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance void ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState ); // End Comments - BOOL HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const; + sal_Bool HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const; double GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const; const ScDPAggData* GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const; ScDPAggData* GetAggData( long nMeasure, const ScDPSubTotalState& rSubState ); void FillDataRow( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence, - long& rCol, long nMeasure, BOOL bIsSubTotalRow, + long& rCol, long nMeasure, sal_Bool bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, + void UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, sal_Bool bIsSubTotalRow, const ScDPSubTotalState& rSubState ); - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, sal_Bool bIsSubTotalRow, const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ); @@ -553,15 +553,15 @@ private: const ScDPResultData* pResultData; MemberArray maMemberArray; MemberHash maMemberHash; - BOOL bInitialized; + sal_Bool bInitialized; String aDimensionName; //! or ptr to IntDimension? - BOOL bIsDataLayout; //! or ptr to IntDimension? - BOOL bSortByData; - BOOL bSortAscending; + sal_Bool bIsDataLayout; //! or ptr to IntDimension? + sal_Bool bSortByData; + sal_Bool bSortAscending; long nSortMeasure; ScMemberSortOrder aMemberOrder; // used when sorted by measure - BOOL bAutoShow; - BOOL bAutoTopItems; + sal_Bool bAutoShow; + sal_Bool bAutoTopItems; long nAutoMeasure; long nAutoCount; @@ -586,12 +586,12 @@ public: void InitFrom( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev, size_t nPos, - ScDPInitState& rInitState , BOOL bInitChild = TRUE ); + ScDPInitState& rInitState , sal_Bool bInitChild = sal_True ); void LateInitFrom( LateInitParams& rParams, const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ); - void CheckShowEmpty( BOOL bShow = FALSE ); + void CheckShowEmpty( sal_Bool bShow = sal_False ); // End Comments long GetSize(long nMeasure) const; @@ -645,15 +645,15 @@ public: const ScMemberSortOrder& GetMemberOrder() const { return aMemberOrder; } ScMemberSortOrder& GetMemberOrder() { return aMemberOrder; } - BOOL IsDataLayout() const { return bIsDataLayout; } + sal_Bool IsDataLayout() const { return bIsDataLayout; } String GetName() const { return aDimensionName; } - BOOL IsSortByData() const { return bSortByData; } - BOOL IsSortAscending() const { return bSortAscending; } + sal_Bool IsSortByData() const { return bSortByData; } + sal_Bool IsSortAscending() const { return bSortAscending; } long GetSortMeasure() const { return nSortMeasure; } - BOOL IsAutoShow() const { return bAutoShow; } - BOOL IsAutoTopItems() const { return bAutoTopItems; } + sal_Bool IsAutoShow() const { return bAutoShow; } + sal_Bool IsAutoTopItems() const { return bAutoTopItems; } long GetAutoMeasure() const { return nAutoMeasure; } long GetAutoCount() const { return nAutoCount; } @@ -668,7 +668,7 @@ private: const ScDPResultData* pResultData; const ScDPResultDimension* pResultDimension; // column ScDPDataMembers aMembers; - BOOL bIsDataLayout; //! or ptr to IntDimension? + sal_Bool bIsDataLayout; //! or ptr to IntDimension? public: ScDPDataDimension( const ScDPResultData* pData ); @@ -682,12 +682,12 @@ public: // End Comments void FillDataRow( const ScDPResultDimension* pRefDim, com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence, - long nCol, long nMeasure, BOOL bIsSubTotalRow, + long nCol, long nMeasure, sal_Bool bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, + void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, sal_Bool bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, + void UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, sal_Bool bIsSubTotalRow, const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ) const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 18210f38e80e..cf0685636178 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -127,10 +127,10 @@ private: long nRowDimCount; long nDataDimCount; long nPageDimCount; - BOOL bColumnGrand; - BOOL bRowGrand; - BOOL bIgnoreEmptyRows; - BOOL bRepeatIfEmpty; + sal_Bool bColumnGrand; + sal_Bool bRowGrand; + sal_Bool bIgnoreEmptyRows; + sal_Bool bRepeatIfEmpty; long nDupCount; @@ -142,13 +142,13 @@ private: com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pRowResults; List aColLevelList; List aRowLevelList; - BOOL bResultOverflow; + sal_Bool bResultOverflow; ::std::auto_ptr<rtl::OUString> mpGrandTotalName; void CreateRes_Impl(); void FillMemberResults(); - void FillLevelList( USHORT nOrientation, List& rList ); + void FillLevelList( sal_uInt16 nOrientation, List& rList ); void FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow); /** @@ -175,8 +175,8 @@ public: void SetGrandTotalName(const ::rtl::OUString& rName); const ::rtl::OUString* GetGrandTotalName() const; - USHORT GetOrientation(long nColumn); - void SetOrientation(long nColumn, USHORT nNew); + sal_uInt16 GetOrientation(long nColumn); + void SetOrientation(long nColumn, sal_uInt16 nNew); long GetPosition(long nColumn); long GetDataDimensionCount(); @@ -189,13 +189,13 @@ public: long GetDataLayoutDim(){ return pData->GetColumnCount(); } SCROW GetMemberId( long nDim, const ScDPItemData& rData ); // End Comments - BOOL IsDataLayoutDimension(long nDim); - USHORT GetDataLayoutOrientation(); + sal_Bool IsDataLayoutDimension(long nDim); + sal_uInt16 GetDataLayoutOrientation(); - BOOL IsDateDimension(long nDim); - UINT32 GetNumberFormat(long nDim); + sal_Bool IsDateDimension(long nDim); + sal_uInt32 GetNumberFormat(long nDim); - BOOL SubTotalAllowed(long nColumn); //! move to ScDPResultData + sal_Bool SubTotalAllowed(long nColumn); //! move to ScDPResultData ScDPDimension* AddDuplicated(long nSource, const String& rNewName); long GetDupCount() const { return nDupCount; } @@ -285,15 +285,15 @@ public: virtual String getDataDescription(); //! ??? - virtual BOOL getColumnGrand() const; - virtual void setColumnGrand(BOOL bSet); - virtual BOOL getRowGrand() const; - virtual void setRowGrand(BOOL bSet); + virtual sal_Bool getColumnGrand() const; + virtual void setColumnGrand(sal_Bool bSet); + virtual sal_Bool getRowGrand() const; + virtual void setRowGrand(sal_Bool bSet); - virtual BOOL getIgnoreEmptyRows() const; - virtual void setIgnoreEmptyRows(BOOL bSet); - virtual BOOL getRepeatIfEmpty() const; - virtual void setRepeatIfEmpty(BOOL bSet); + virtual sal_Bool getIgnoreEmptyRows() const; + virtual void setIgnoreEmptyRows(sal_Bool bSet); + virtual sal_Bool getRepeatIfEmpty() const; + virtual void setRepeatIfEmpty(sal_Bool bSet); virtual void validate(); //! ??? virtual void disposeData(); @@ -353,14 +353,14 @@ private: long nDim; // dimension index (== column ID) ScDPHierarchies* pHierarchies; long nUsedHier; - USHORT nFunction; // enum GeneralFunction + sal_uInt16 nFunction; // enum GeneralFunction String aName; // if empty, take from source ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" - BOOL bHasSelectedPage; + sal_Bool bHasSelectedPage; String aSelectedPage; ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage sal_Bool mbHasHiddenMember; @@ -440,26 +440,26 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual USHORT getOrientation() const; - virtual void setOrientation(USHORT nNew); + virtual sal_uInt16 getOrientation() const; + virtual void setOrientation(sal_uInt16 nNew); virtual long getPosition() const; virtual void setPosition(long nNew); - virtual BOOL getIsDataLayoutDimension() const; - virtual USHORT getFunction() const; - virtual void setFunction(USHORT nNew); // for data dimension + virtual sal_Bool getIsDataLayoutDimension() const; + virtual sal_uInt16 getFunction() const; + virtual void setFunction(sal_uInt16 nNew); // for data dimension virtual long getUsedHierarchy() const; virtual void setUsedHierarchy(long nNew); - virtual BOOL isDuplicated() const; + virtual sal_Bool isDuplicated() const; - BOOL HasSelectedPage() const { return bHasSelectedPage; } + sal_Bool HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const; -//UNUSED2009-05 BOOL IsValidPage( const ScDPItemData& rData ); +//UNUSED2009-05 sal_Bool IsValidPage( const ScDPItemData& rData ); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - BOOL IsVisible( const ScDPItemData& rData ); + sal_Bool IsVisible( const ScDPItemData& rData ); // End Comments }; @@ -595,7 +595,7 @@ private: long nLev; ScDPMembers* pMembers; com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> aSubTotals; - BOOL bShowEmpty; + sal_Bool bShowEmpty; ::com::sun::star::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings ::com::sun::star::sheet::DataPilotFieldAutoShowInfo aAutoShowInfo; // stored user settings ::com::sun::star::sheet::DataPilotFieldLayoutInfo aLayoutInfo; // stored user settings @@ -603,7 +603,7 @@ private: ::std::vector<sal_Int32> aGlobalOrder; // result of sorting by name or position long nSortMeasure; // measure (index of data dimension) to sort by long nAutoMeasure; // measure (index of data dimension) for AutoShow - BOOL bEnableLayout; // enabled only for row fields, not for the innermost one + sal_Bool bEnableLayout; // enabled only for row fields, not for the innermost one public: ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ); @@ -676,31 +676,31 @@ public: virtual com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; virtual void setSubTotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction>& rNew); - virtual BOOL getShowEmpty() const; - virtual void setShowEmpty(BOOL bSet); + virtual sal_Bool getShowEmpty() const; + virtual void setShowEmpty(sal_Bool bSet); const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } void EvaluateSortOrder(); - void SetEnableLayout( BOOL bSet ); + void SetEnableLayout( sal_Bool bSet ); const ::std::vector<sal_Int32>& GetGlobalOrder() const { return aGlobalOrder; } ::std::vector<sal_Int32>& GetGlobalOrder() { return aGlobalOrder; } long GetSortMeasure() const { return nSortMeasure; } long GetAutoMeasure() const { return nAutoMeasure; } - BOOL IsOutlineLayout() const + sal_Bool IsOutlineLayout() const { return bEnableLayout && aLayoutInfo.LayoutMode != ::com::sun::star::sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT; } - BOOL IsSubtotalsAtTop() const + sal_Bool IsSubtotalsAtTop() const { return bEnableLayout && aLayoutInfo.LayoutMode == ::com::sun::star::sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP; } - BOOL IsAddEmpty() const { return bEnableLayout && aLayoutInfo.AddEmptyLines; } + sal_Bool IsAddEmpty() const { return bEnableLayout && aLayoutInfo.AddEmptyLines; } //! number format (for data fields and date fields) }; @@ -781,18 +781,18 @@ private: ::std::auto_ptr<rtl::OUString> mpLayoutName; sal_Int32 nPosition; // manual sorting - BOOL bVisible; - BOOL bShowDet; + sal_Bool bVisible; + sal_Bool bShowDet; public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, - SCROW nIndex /*const String& rN, double fV, BOOL bHV */); + SCROW nIndex /*const String& rN, double fV, sal_Bool bHV */); // End Comments virtual ~ScDPMember(); - BOOL IsNamedItem( const ScDPItemData& r ) const; + sal_Bool IsNamedItem( const ScDPItemData& r ) const; String GetNameStr() const; void FillItemData( ScDPItemData& rData ) const; // Wang Xu Ming -- 2009-8-17 @@ -800,7 +800,7 @@ public: // const ScDPItemData& GetItemData() const{ return maData; } const ScDPItemData& GetItemData() const; inline SCROW GetItemDataId() const { return mnDataId; } - BOOL IsNamedItem( SCROW nIndex ) const; + sal_Bool IsNamedItem( SCROW nIndex ) const; // End Comments SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; @@ -861,10 +861,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual BOOL getIsVisible() const; - virtual void setIsVisible(BOOL bSet); - virtual BOOL getShowDetails() const; - virtual void setShowDetails(BOOL bSet); + virtual sal_Bool getIsVisible() const; + virtual void setIsVisible(sal_Bool bSet); + virtual sal_Bool getShowDetails() const; + virtual void setShowDetails(sal_Bool bSet); sal_Int32 getPosition() const; void setPosition(sal_Int32 nNew); diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index ee4f48ad9cf5..b2111c1a33ca 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -38,19 +38,19 @@ public: SvxDrawToolItem( const SvxDrawToolItem& rDrawToolItem ) : SfxEnumItem( rDrawToolItem ){} - SvxDrawToolItem(USHORT nWhichP) : SfxEnumItem(nWhichP){} + SvxDrawToolItem(sal_uInt16 nWhichP) : SfxEnumItem(nWhichP){} virtual String GetValueText() const; - virtual String GetValueText(USHORT nVal) const; - virtual USHORT GetValueCount() const - {return((USHORT)SVX_SNAP_DRAW_TEXT);} + virtual String GetValueText(sal_uInt16 nVal) const; + virtual sal_uInt16 GetValueCount() const + {return((sal_uInt16)SVX_SNAP_DRAW_TEXT);} virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxDrawToolItem& operator=(const SvxDrawToolItem& rDrawTool) diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 9c39fc71e5af..30a5f1c55c90 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -40,7 +40,7 @@ class ScDrawLayer; class ScDrawPage: public FmFormPage { public: - ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, BOOL bMasterPage=FALSE); + ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, sal_Bool bMasterPage=sal_False); ~ScDrawPage(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index eed492c6e6c2..d4e48f6c24a7 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -83,7 +83,7 @@ private: ScAddress aOldEnd; ScAddress aNewStt; ScAddress aNewEnd; - BOOL bHasNew; + sal_Bool bHasNew; public: ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE, const ScAddress& rNS, const ScAddress& rNE ); @@ -102,9 +102,9 @@ private: String aName; ScDocument* pDoc; SdrUndoGroup* pUndoGroup; - BOOL bRecording; - BOOL bAdjustEnabled; - BOOL bHyphenatorSet; + sal_Bool bRecording; + sal_Bool bAdjustEnabled; + sal_Bool bHyphenatorSet; private: void MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove, @@ -129,37 +129,37 @@ public: //REMOVE void ReleasePictureStorage(); - BOOL HasObjects() const; + sal_Bool HasObjects() const; - BOOL ScAddPage( SCTAB nTab ); + sal_Bool ScAddPage( SCTAB nTab ); void ScRemovePage( SCTAB nTab ); void ScRenamePage( SCTAB nTab, const String& rNewName ); - void ScMovePage( USHORT nOldPos, USHORT nNewPos ); - // inkl. Inhalt, bAlloc=FALSE -> nur Inhalt - void ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ); + void ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos ); + // inkl. Inhalt, bAlloc=sal_False -> nur Inhalt + void ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool bAlloc ); ScDocument* GetDocument() const { return pDoc; } void UpdateBasic(); // DocShell-Basic in DrawPages setzen void UseHyphenator(); - BOOL GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; + sal_Bool GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const; // automatische Anpassungen - void EnableAdjust( BOOL bSet = TRUE ) { bAdjustEnabled = bSet; } + void EnableAdjust( sal_Bool bSet = sal_True ) { bAdjustEnabled = bSet; } void BeginCalcUndo(); SdrUndoGroup* GetCalcUndo(); - BOOL IsRecording() const { return bRecording; } + sal_Bool IsRecording() const { return bRecording; } void AddCalcUndo( SdrUndoAction* pUndo ); void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, - SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos = true ); + SCsCOL nDx,SCsROW nDy, sal_Bool bInsDel, bool bUpdateNoteCaptionPos = true ); void WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ); void HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ); - BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true ); + sal_Bool HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true ); void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 ); @@ -173,7 +173,7 @@ public: SCTAB nSourceTab, const Rectangle& rSourceRange, const ScAddress& rDestPos, const Rectangle& rDestRange ); - void SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true ); + void SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true ); // mirror or move between positive and negative positions for RTL void MirrorRTL( SdrObject* pObj ); @@ -187,7 +187,7 @@ public: // (ChartListenerCollection etc. must use GetPersistName directly) static String GetVisibleName( SdrObject* pObj ); - SdrObject* GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const; + SdrObject* GetNamedObject( const String& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const; // if pnCounter != NULL, the search for a name starts with this index + 1, // and the index really used is returned. String GetNewGraphicName( long* pnCounter = NULL ) const; @@ -198,7 +198,7 @@ public: static ScAnchorType GetAnchor( const SdrObject* ); // Positionen fuer Detektivlinien - static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE ); + static ScDrawObjData* GetObjData( SdrObject* pObj, sal_Bool bCreate=sal_False ); // The sheet information in ScDrawObjData isn't updated when sheets are inserted/deleted. // Use this method to get an object with positions on the specified sheet (should be the @@ -217,7 +217,7 @@ public: static IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const Window& rCmpWnd ); - static ScMacroInfo* GetMacroInfo( SdrObject* pObj, BOOL bCreate = FALSE ); + static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = sal_False ); private: static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index ed4423d629a8..fe9e6e0abf10 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -47,14 +47,14 @@ class SdrObject; class ScHeaderFooterChangedHint : public SfxHint { - USHORT nPart; + sal_uInt16 nPart; public: TYPEINFO(); - ScHeaderFooterChangedHint(USHORT nP); + ScHeaderFooterChangedHint(sal_uInt16 nP); ~ScHeaderFooterChangedHint(); - USHORT GetPart() const { return nPart; } + sal_uInt16 GetPart() const { return nPart; } }; @@ -87,8 +87,8 @@ public: class ScHeaderFooterEditSource : public ScSharedHeaderFooterEditSource { public: - ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, USHORT nP ); - ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, USHORT nP ); + ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, sal_uInt16 nP ); + ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, sal_uInt16 nP ); virtual ~ScHeaderFooterEditSource(); virtual SvxEditSource* Clone() const; @@ -140,7 +140,7 @@ private: ScAddress aCellPos; ScEditEngineDefaulter* pEditEngine; SvxEditEngineForwarder* pForwarder; - BOOL bDataValid; + sal_Bool bDataValid; SdrObject* GetCaptionObj(); public: diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index aefa789d2587..7c1273aad3d6 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -76,7 +76,7 @@ public: aScrPos(rScrPosPixel),pDev(pDevice), nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {} - Rectangle GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop ); + Rectangle GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForceToTop ); }; @@ -84,15 +84,15 @@ class ScEditAttrTester { ScEditEngineDefaulter* pEngine; SfxItemSet* pEditAttrs; - BOOL bNeedsObject; - BOOL bNeedsCellAttr; + sal_Bool bNeedsObject; + sal_Bool bNeedsCellAttr; public: ScEditAttrTester( ScEditEngineDefaulter* pEng ); ~ScEditAttrTester(); - BOOL NeedsObject() const { return bNeedsObject; } - BOOL NeedsCellAttr() const { return bNeedsCellAttr; } + sal_Bool NeedsObject() const { return bNeedsObject; } + sal_Bool NeedsCellAttr() const { return bNeedsCellAttr; } const SfxItemSet& GetAttribs() const { return *pEditAttrs; } }; @@ -103,11 +103,11 @@ class ScEnginePoolHelper protected: SfxItemPool* pEnginePool; SfxItemSet* pDefaults; - BOOL bDeleteEnginePool; - BOOL bDeleteDefaults; + sal_Bool bDeleteEnginePool; + sal_Bool bDeleteDefaults; ScEnginePoolHelper( SfxItemPool* pEnginePool, - BOOL bDeleteEnginePool = FALSE ); + sal_Bool bDeleteEnginePool = sal_False ); ScEnginePoolHelper( const ScEnginePoolHelper& rOrg ); virtual ~ScEnginePoolHelper(); }; @@ -122,17 +122,17 @@ public: /// bDeleteEnginePool: Engine becomes the owner of the pool /// and deletes it on destruction ScEditEngineDefaulter( SfxItemPool* pEnginePool, - BOOL bDeleteEnginePool = FALSE ); + sal_Bool bDeleteEnginePool = sal_False ); /// If rOrg.bDeleteEnginePool: pool gets cloned and will be /// deleted on destruction. Defaults are not set. ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg ); virtual ~ScEditEngineDefaulter(); /// Creates a copy of SfxItemSet if bRememberCopy set - void SetDefaults( const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); + void SetDefaults( const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); /// Becomes the owner of the SfxItemSet if bTakeOwnership set - void SetDefaults( SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); + void SetDefaults( SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); /// Set the item in the default ItemSet which is created /// if it doesn't exist yet. @@ -146,19 +146,19 @@ public: void SetText( const EditTextObject& rTextObject ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const EditTextObject& rTextObject, - const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); + const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const EditTextObject& rTextObject, - SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); + SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); /// Overwritten method to be able to apply defaults already set void SetText( const String& rText ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const String& rText, - const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); + const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); /// Current defaults are not applied, new defaults are applied void SetTextNewDefaults( const String& rText, - SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); + SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); /// Paragraph attributes that are not defaults are copied to /// character attributes and all paragraph attributes reset @@ -205,19 +205,19 @@ struct ScHeaderFieldData class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter { private: - BOOL bExecuteURL; + sal_Bool bExecuteURL; public: // pEnginePool = ScDocument.GetEnginePool() // pTextObjectPool = ScDocument.GetEditPool() ScFieldEditEngine( SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = NULL, - BOOL bDeleteEnginePool = FALSE ); + sal_Bool bDeleteEnginePool = sal_False ); - void SetExecuteURL(BOOL bSet) { bExecuteURL = bSet; } + void SetExecuteURL(sal_Bool bSet) { bExecuteURL = bSet; } - virtual void FieldClicked( const SvxFieldItem& rField, USHORT, USHORT ); - virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_uInt16, sal_uInt16 ); + virtual String CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); }; @@ -228,8 +228,8 @@ private: ScHeaderFieldData aData; public: - ScHeaderEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool = FALSE ); - virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = sal_False ); + virtual String CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetTitle(const String& rNew) { aData.aTitle = rNew; } void SetLongDocName(const String& rNew) { aData.aLongDocName = rNew; } @@ -252,7 +252,7 @@ public: // pTextObjectPool = ScDocument.GetEditPool() ScNoteEditEngine( SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = NULL, - BOOL bDeleteEnginePool = FALSE ); + sal_Bool bDeleteEnginePool = sal_False ); }; 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( diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx index 8dead5b4fb05..fbd1b8c20ec3 100644 --- a/sc/inc/fillinfo.hxx +++ b/sc/inc/fillinfo.hxx @@ -42,16 +42,16 @@ class ScPatternAttr; // ============================================================================ -const BYTE SC_ROTDIR_NONE = 0; -const BYTE SC_ROTDIR_STANDARD = 1; -const BYTE SC_ROTDIR_LEFT = 2; -const BYTE SC_ROTDIR_RIGHT = 3; -const BYTE SC_ROTDIR_CENTER = 4; +const sal_uInt8 SC_ROTDIR_NONE = 0; +const sal_uInt8 SC_ROTDIR_STANDARD = 1; +const sal_uInt8 SC_ROTDIR_LEFT = 2; +const sal_uInt8 SC_ROTDIR_RIGHT = 3; +const sal_uInt8 SC_ROTDIR_CENTER = 4; -const BYTE SC_CLIPMARK_NONE = 0; -const BYTE SC_CLIPMARK_LEFT = 1; -const BYTE SC_CLIPMARK_RIGHT = 2; -const BYTE SC_CLIPMARK_SIZE = 64; +const sal_uInt8 SC_CLIPMARK_NONE = 0; +const sal_uInt8 SC_CLIPMARK_LEFT = 1; +const sal_uInt8 SC_CLIPMARK_RIGHT = 2; +const sal_uInt8 SC_CLIPMARK_SIZE = 64; enum ScShadowPart { @@ -84,25 +84,25 @@ struct CellInfo ScShadowPart eHShadowPart : 4; // Schatten effektiv zum Zeichnen ScShadowPart eVShadowPart : 4; - BYTE nClipMark; - USHORT nWidth; - BYTE nRotateDir; - - BOOL bMarked : 1; - BOOL bEmptyCellText : 1; - - BOOL bMerged : 1; - BOOL bHOverlapped : 1; - BOOL bVOverlapped : 1; - BOOL bAutoFilter : 1; - BOOL bPushButton : 1; + sal_uInt8 nClipMark; + sal_uInt16 nWidth; + sal_uInt8 nRotateDir; + + sal_Bool bMarked : 1; + sal_Bool bEmptyCellText : 1; + + sal_Bool bMerged : 1; + sal_Bool bHOverlapped : 1; + sal_Bool bVOverlapped : 1; + sal_Bool bAutoFilter : 1; + sal_Bool bPushButton : 1; bool bPopupButton: 1; bool bFilterActive:1; - BOOL bPrinted : 1; // bei Bedarf (Pagebreak-Modus) + sal_Bool bPrinted : 1; // bei Bedarf (Pagebreak-Modus) - BOOL bHideGrid : 1; // output-intern - BOOL bEditEngine : 1; // output-intern + sal_Bool bHideGrid : 1; // output-intern + sal_Bool bEditEngine : 1; // output-intern }; const SCCOL SC_ROTMAX_NONE = SCCOL_MAX; @@ -113,15 +113,15 @@ struct RowInfo { CellInfo* pCellInfo; - USHORT nHeight; + sal_uInt16 nHeight; SCROW nRowNo; SCCOL nRotMaxCol; // SC_ROTMAX_NONE, wenn nichts - BOOL bEmptyBack; - BOOL bEmptyText; - BOOL bAutoFilter; - BOOL bPushButton; - BOOL bChanged; // TRUE, wenn nicht getestet + sal_Bool bEmptyBack; + sal_Bool bEmptyText; + sal_Bool bAutoFilter; + sal_Bool bPushButton; + sal_Bool bChanged; // sal_True, wenn nicht getestet inline explicit RowInfo() : pCellInfo( 0 ) {} @@ -136,7 +136,7 @@ struct ScTableInfo { svx::frame::Array maArray; RowInfo* mpRowInfo; - USHORT mnArrCount; + sal_uInt16 mnArrCount; bool mbPageMode; explicit ScTableInfo(); diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index ae0fd92f6858..c678e71535f6 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -41,9 +41,9 @@ class ScDocument; class ScRange; class SvNumberFormatter; -// Return-Werte Im-/Exportfilter (ULONG) +// Return-Werte Im-/Exportfilter (sal_uLong) -typedef ULONG FltError; +typedef sal_uLong FltError; //enum FltError { #define eERR_OK ERRCODE_NONE // kein Fehler, alles OK @@ -88,10 +88,10 @@ class ScHTMLImport; class ScEEAbsImport { public: virtual ~ScEEAbsImport() {} - virtual ULONG Read( SvStream& rStream, const String& rBaseURL ) = 0; + virtual sal_uLong Read( SvStream& rStream, const String& rBaseURL ) = 0; virtual ScRange GetRange() = 0; virtual void WriteToDocument( - BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, + sal_Bool bSizeColsRows = sal_False, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; }; @@ -107,14 +107,14 @@ class ScFormatFilterPlugin { // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0; + const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0; virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ) = 0; virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, - BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; + sal_Bool bCalcWidthHeight = sal_True, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; // various import helpers virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0; - virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight ) = 0; + virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, sal_Bool bCalcWidthHeight ) = 0; virtual String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName ) = 0; // various export filters @@ -123,10 +123,10 @@ class ScFormatFilterPlugin { #endif virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, CharSet eDest ) = 0; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const CharSet eDest, - UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0; + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest, - UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0; - virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, BOOL bAll, + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0; + virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, sal_Bool bAll, const String& rStreamPath, String& rNonConvertibleChars ) = 0; virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ) = 0; }; diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index 0efdfeeb5a30..b30ad8dba9f8 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -38,7 +38,7 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem { - BOOL bWK3Flag; + sal_Bool bWK3Flag; double fExcelColScale; double fExcelRowScale; @@ -50,7 +50,7 @@ public: virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); virtual void Commit(); - BOOL GetWK3Flag() const { return bWK3Flag; } + sal_Bool GetWK3Flag() const { return bWK3Flag; } double GetExcelColScale() const { return fExcelColScale; } double GetExcelRowScale() const { return fExcelRowScale; } diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 6b79f88f4263..f57b05350d67 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -84,12 +84,12 @@ class ScTableConditionalFormat : public cppu::WeakImplHelper5< private: List aEntries; - ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; + ScTableConditionalEntry* GetObjectByIndex_Impl(sal_uInt16 nIndex) const; void AddEntry_Impl(const ScCondFormatEntryItem& aEntry); ScTableConditionalFormat(); // disable public: - ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey, + ScTableConditionalFormat(ScDocument* pDoc, sal_uLong nKey, formula::FormulaGrammar::Grammar eGrammar); virtual ~ScTableConditionalFormat(); @@ -206,7 +206,7 @@ class ScTableValidationObj : public cppu::WeakImplHelper5< { private: SfxItemPropertySet aPropSet; - USHORT nMode; // enum ScConditionMode + sal_uInt16 nMode; // enum ScConditionMode String aExpr1; String aExpr2; String maExprNmsp1; @@ -217,14 +217,14 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2; ScAddress aSrcPos; String aPosString; // formula position as text - USHORT nValMode; // enum ScValidationMode - BOOL bIgnoreBlank; + sal_uInt16 nValMode; // enum ScValidationMode + sal_Bool bIgnoreBlank; sal_Int16 nShowList; - BOOL bShowInput; + sal_Bool bShowInput; String aInputTitle; String aInputMessage; - BOOL bShowError; - USHORT nErrorStyle; // enum ScValidErrorStyle + sal_Bool bShowError; + sal_uInt16 nErrorStyle; // enum ScValidErrorStyle String aErrorTitle; String aErrorMessage; @@ -232,7 +232,7 @@ private: ScTableValidationObj(); // disabled public: - ScTableValidationObj(ScDocument* pDoc, ULONG nKey, + ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, const formula::FormulaGrammar::Grammar eGrammar); virtual ~ScTableValidationObj(); diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index bd99cca8f5d9..b89f3da543ca 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -45,7 +45,7 @@ class ScFormulaResult double mfValue; // double result direct for performance and memory consumption const formula::FormulaToken* mpToken; // if not, result token obtained from interpreter }; - USHORT mnError; // error code + sal_uInt16 mnError; // error code bool mbToken :1; // whether content of union is a token bool mbEmpty :1; // empty cell result bool mbEmptyDisplayedAsString :1; // only if mbEmpty @@ -165,10 +165,10 @@ public: /** Get error code if set or GetCellResultType() is formula::svError or svUnknown, else 0. */ - inline USHORT GetResultError() const; + inline sal_uInt16 GetResultError() const; /** Set error code, don't touch token or double. */ - inline void SetResultError( USHORT nErr ); + inline void SetResultError( sal_uInt16 nErr ); /** Set direct double. Shouldn't be used externally except in ScFormulaCell for rounded CalcAsShown or SetErrCode(). If @@ -434,7 +434,7 @@ inline bool ScFormulaResult::IsMultiline() const } -inline USHORT ScFormulaResult::GetResultError() const +inline sal_uInt16 ScFormulaResult::GetResultError() const { if (mnError) return mnError; @@ -452,7 +452,7 @@ inline USHORT ScFormulaResult::GetResultError() const } -inline void ScFormulaResult::SetResultError( USHORT nErr ) +inline void ScFormulaResult::SetResultError( sal_uInt16 nErr ) { mnError = nErr; } diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index a46b8f52a638..b386b6522683 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -54,7 +54,7 @@ public: /** Returns mapping from visible arguments to real arguments, e.g. if of 4 parameters the second one is suppressed {0,2,3}. For VAR_ARGS parameters only one element is added to the end of the sequence. */ - virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ; + virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ; virtual void initArgumentInfo() const; virtual ::rtl::OUString getSignature() const ; virtual rtl::OString getHelpId() const ; @@ -90,16 +90,16 @@ public: variable arguments the number of fixed non-suppressed arguments plus VAR_ARGS, same as for nArgCount (variable arguments can't be suppressed). */ - USHORT GetSuppressedArgCount() const; + sal_uInt16 GetSuppressedArgCount() const; String *pFuncName; // Function name String *pFuncDesc; // Description of function String **ppDefArgNames; // Parameter name(s) String **ppDefArgDescs; // Description(s) of parameter(s) ParameterFlags *pDefArgFlags; // Flags for each parameter - USHORT nFIndex; // Unique function index - USHORT nCategory; // Function category - USHORT nArgCount; // All parameter count, suppressed and unsuppressed + sal_uInt16 nFIndex; // Unique function index + sal_uInt16 nCategory; // Function category + sal_uInt16 nArgCount; // All parameter count, suppressed and unsuppressed rtl::OString sHelpId; // HelpID of function bool bIncomplete :1; // Incomplete argument info (set for add-in info from configuration) bool bHasSuppressedArgs :1; // Whether there is any suppressed parameter. @@ -113,7 +113,7 @@ public: ScFunctionList(); ~ScFunctionList(); - ULONG GetCount() const + sal_uLong GetCount() const { return aFunctionList.Count(); } const ScFuncDesc* First() @@ -122,7 +122,7 @@ public: const ScFuncDesc* Next() { return (const ScFuncDesc*) aFunctionList.Next(); } - const ScFuncDesc* GetFunction( ULONG nIndex ) const + const ScFuncDesc* GetFunction( sal_uLong nIndex ) const { return (const ScFuncDesc*) aFunctionList.GetObject( nIndex ); } xub_StrLen GetMaxFuncNameLen() const @@ -160,8 +160,8 @@ public: static String GetCategoryName(sal_uInt32 _nCategoryNumber ); const ScFuncDesc* Get( const String& rFName ) const; - const ScFuncDesc* Get( USHORT nFIndex ) const; - const ScFuncDesc* First( USHORT nCategory = 0 ) const; + const ScFuncDesc* Get( sal_uInt16 nFIndex ) const; + const ScFuncDesc* First( sal_uInt16 nCategory = 0 ) const; const ScFuncDesc* Next() const; // formula::IFunctionManager diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 4413782a0e2f..deb337d27f06 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -48,15 +48,15 @@ class ScTempDocCache { private: ScDocument* pDoc; - BOOL bInUse; + sal_Bool bInUse; public: ScTempDocCache(); ~ScTempDocCache(); ScDocument* GetDocument() const { return pDoc; } - BOOL IsInUse() const { return bInUse; } - void SetInUse( BOOL bSet ) { bInUse = bSet; } + sal_Bool IsInUse() const { return bInUse; } + void SetInUse( sal_Bool bSet ) { bInUse = bSet; } void SetDocument( ScDocument* pNew ); void Clear(); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 8178eb4a01d2..d0df5e3e2426 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -201,38 +201,38 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10; // Flags fuer Spalten / Zeilen // FILTERED immer zusammen mit HIDDEN // FILTERED und MANUALSIZE nur fuer Zeilen moeglich -const BYTE CR_HIDDEN = 1; -//const BYTE CR_MARKED = 2; -//const BYTE CR_PAGEBREAK = 4; -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); - -typedef BYTE ScBreakType; +const sal_uInt8 CR_HIDDEN = 1; +//const sal_uInt8 CR_MARKED = 2; +//const sal_uInt8 CR_PAGEBREAK = 4; +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 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_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_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 @@ -468,19 +468,19 @@ struct ScImportParam SCROW nRow1; SCCOL nCol2; SCROW nRow2; - BOOL bImport; + sal_Bool bImport; String aDBName; // Alias der Datenbank String aStatement; - BOOL bNative; - BOOL bSql; // Statement oder Name? - BYTE nType; // enum DBObject + sal_Bool bNative; + sal_Bool bSql; // Statement oder 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; //UNUSED2009-05 void Clear (); }; @@ -600,24 +600,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; @@ -648,16 +648,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(); @@ -717,13 +717,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. */ @@ -803,8 +803,8 @@ namespace utl struct ScQueryEntry { - BOOL bDoQuery; - BOOL bQueryByString; + sal_Bool bDoQuery; + sal_Bool bQueryByString; bool bQueryByDate; SCCOLROW nField; ScQueryOp eOp; @@ -819,11 +819,11 @@ struct ScQueryEntry ~ScQueryEntry(); // legt ggbf. pSearchParam und pSearchText an, immer 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; }; // ----------------------------------------------------------------------- @@ -834,16 +834,16 @@ struct SC_DLLPUBLIC ScSubTotalParam SCROW nRow1; SCCOL nCol2; SCROW nRow2; - BOOL bRemoveOnly; - BOOL bReplace; // vorhandene Ergebnisse ersetzen - BOOL bPagebreak; // Seitenumbruch bei Gruppenwechsel - BOOL bCaseSens; // Gross-/Kleinschreibung - BOOL bDoSort; // vorher sortieren - BOOL bAscending; // aufsteigend sortieren - BOOL bUserDef; // Benutzer-def. Sort.Reihenfolge - USHORT nUserIndex; // Index auf Liste - BOOL bIncludePattern; // Formate mit sortieren - BOOL bGroupActive[MAXSUBTOTAL]; // aktive Gruppen + sal_Bool bRemoveOnly; + sal_Bool bReplace; // vorhandene Ergebnisse ersetzen + sal_Bool bPagebreak; // Seitenumbruch bei Gruppenwechsel + sal_Bool bCaseSens; // Gross-/Kleinschreibung + sal_Bool bDoSort; // vorher sortieren + sal_Bool bAscending; // aufsteigend sortieren + sal_Bool bUserDef; // Benutzer-def. Sort.Reihenfolge + sal_uInt16 nUserIndex; // Index auf Liste + sal_Bool bIncludePattern; // Formate mit sortieren + sal_Bool bGroupActive[MAXSUBTOTAL]; // aktive Gruppen SCCOL nField[MAXSUBTOTAL]; // zugehoeriges Feld SCCOL nSubTotals[MAXSUBTOTAL]; // Anzahl der SubTotals SCCOL* pSubTotals[MAXSUBTOTAL]; // Array der zu berechnenden Spalten @@ -853,12 +853,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 ); }; // ----------------------------------------------------------------------- @@ -870,21 +870,21 @@ struct ScConsolidateParam SCROW nRow; // bzw. Anfang des Zielbereiches SCTAB nTab; ScSubTotalFunc eFunction; // Berechnungsvorschrift - USHORT nDataAreaCount; // Anzahl der Datenbereiche + sal_uInt16 nDataAreaCount; // Anzahl der Datenbereiche ScArea** ppDataAreas; // Zeiger-Array auf Datenbereiche - BOOL bByCol; // nach Spalten - BOOL bByRow; // nach Zeilen - BOOL bReferenceData; // Quelldaten referenzieren + sal_Bool bByCol; // nach Spalten + sal_Bool bByRow; // nach Zeilen + sal_Bool bReferenceData; // Quelldaten referenzieren 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 ); }; // ----------------------------------------------------------------------- diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index fca3d184a4a2..dbae6a3a5944 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -37,17 +37,17 @@ class ScPaintHint : public SfxHint { ScRange aRange; - USHORT nParts; - BOOL bPrint; // Flag, ob auch Druck/Vorschau betroffen ist + sal_uInt16 nParts; + sal_Bool bPrint; // Flag, ob auch Druck/Vorschau betroffen ist ScPaintHint(); // disabled public: TYPEINFO(); - ScPaintHint( const ScRange& rRng, USHORT nPaint = PAINT_ALL ); + ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL ); ~ScPaintHint(); - void SetPrintFlag(BOOL bSet) { bPrint = bSet; } + void SetPrintFlag(sal_Bool bSet) { bPrint = bSet; } const ScRange& GetRange() const { return aRange; } SCCOL GetStartCol() const { return aRange.aStart.Col(); } @@ -56,8 +56,8 @@ public: SCCOL GetEndCol() const { return aRange.aEnd.Col(); } SCROW GetEndRow() const { return aRange.aEnd.Row(); } SCTAB GetEndTab() const { return aRange.aEnd.Tab(); } - USHORT GetParts() const { return nParts; } - BOOL GetPrintFlag() const { return bPrint; } + sal_uInt16 GetParts() const { return nParts; } + sal_Bool GetPrintFlag() const { return bPrint; } }; @@ -88,15 +88,15 @@ public: class ScPointerChangedHint : public SfxHint { - USHORT nFlags; + sal_uInt16 nFlags; public: TYPEINFO(); -//UNUSED2008-05 ScPointerChangedHint( USHORT nF ); +//UNUSED2008-05 ScPointerChangedHint( sal_uInt16 nF ); ~ScPointerChangedHint(); - USHORT GetFlags() const { return nFlags; } + sal_uInt16 GetFlags() const { return nFlags; } }; @@ -109,12 +109,12 @@ public: class ScLinkRefreshedHint : public SfxHint { - USHORT nLinkType; // SC_LINKREFTYPE_... + sal_uInt16 nLinkType; // SC_LINKREFTYPE_... String aUrl; // used for sheet links String aDdeAppl; // used for dde links: String aDdeTopic; String aDdeItem; - BYTE nDdeMode; + sal_uInt8 nDdeMode; ScAddress aDestPos; // used to identify area links //! also use source data for area links? @@ -124,15 +124,15 @@ public: ~ScLinkRefreshedHint(); void SetSheetLink( const String& rSourceUrl ); - void SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM ); + void SetDdeLink( const String& rA, const String& rT, const String& rI, sal_uInt8 nM ); void SetAreaLink( const ScAddress& rPos ); - USHORT GetLinkType() const { return nLinkType; } + sal_uInt16 GetLinkType() const { return nLinkType; } const String& GetUrl() const { return aUrl; } const String& GetDdeAppl() const { return aDdeAppl; } const String& GetDdeTopic() const { return aDdeTopic; } const String& GetDdeItem() const { return aDdeItem; } - BYTE GetDdeMode() const { return nDdeMode; } + sal_uInt8 GetDdeMode() const { return nDdeMode; } const ScAddress& GetDestPos() const { return aDestPos; } }; @@ -144,17 +144,17 @@ class ScAutoStyleHint : public SfxHint ScRange aRange; String aStyle1; String aStyle2; - ULONG nTimeout; + sal_uLong nTimeout; public: TYPEINFO(); ScAutoStyleHint( const ScRange& rR, const String& rSt1, - ULONG nT, const String& rSt2 ); + sal_uLong nT, const String& rSt2 ); ~ScAutoStyleHint(); const ScRange& GetRange() const { return aRange; } const String& GetStyle1() const { return aStyle1; } - UINT32 GetTimeout() const { return nTimeout; } + sal_uInt32 GetTimeout() const { return nTimeout; } const String& GetStyle2() const { return aStyle2; } }; diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 62e258b76500..b461900f7811 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -38,16 +38,16 @@ class SvStream; class ScInputOptions { private: - USHORT nMoveDir; // enum ScDirection - BOOL bMoveSelection; - BOOL bEnterEdit; - BOOL bExtendFormat; - BOOL bRangeFinder; - BOOL bExpandRefs; - BOOL bMarkHeader; - BOOL bUseTabCol; - BOOL bTextWysiwyg; - BOOL bReplCellsWarn; + sal_uInt16 nMoveDir; // enum ScDirection + sal_Bool bMoveSelection; + sal_Bool bEnterEdit; + sal_Bool bExtendFormat; + sal_Bool bRangeFinder; + sal_Bool bExpandRefs; + sal_Bool bMarkHeader; + sal_Bool bUseTabCol; + sal_Bool bTextWysiwyg; + sal_Bool bReplCellsWarn; public: ScInputOptions(); @@ -56,26 +56,26 @@ public: void SetDefaults(); - void SetMoveDir(USHORT nNew) { nMoveDir = nNew; } - USHORT GetMoveDir() const { return nMoveDir; } - void SetMoveSelection(BOOL bSet) { bMoveSelection = bSet; } - BOOL GetMoveSelection() const { return bMoveSelection; } - void SetEnterEdit(BOOL bSet) { bEnterEdit = bSet; } - BOOL GetEnterEdit() const { return bEnterEdit; } - void SetExtendFormat(BOOL bSet) { bExtendFormat = bSet; } - BOOL GetExtendFormat() const { return bExtendFormat; } - void SetRangeFinder(BOOL bSet) { bRangeFinder = bSet; } - BOOL GetRangeFinder() const { return bRangeFinder; } - void SetExpandRefs(BOOL bSet) { bExpandRefs = bSet; } - BOOL GetExpandRefs() const { return bExpandRefs; } - void SetMarkHeader(BOOL bSet) { bMarkHeader = bSet; } - BOOL GetMarkHeader() const { return bMarkHeader; } - void SetUseTabCol(BOOL bSet) { bUseTabCol = bSet; } - BOOL GetUseTabCol() const { return bUseTabCol; } - void SetTextWysiwyg(BOOL bSet) { bTextWysiwyg = bSet; } - BOOL GetTextWysiwyg() const { return bTextWysiwyg; } - void SetReplaceCellsWarn(BOOL bSet) { bReplCellsWarn = bSet; } - BOOL GetReplaceCellsWarn() const { return bReplCellsWarn; } + void SetMoveDir(sal_uInt16 nNew) { nMoveDir = nNew; } + sal_uInt16 GetMoveDir() const { return nMoveDir; } + void SetMoveSelection(sal_Bool bSet) { bMoveSelection = bSet; } + sal_Bool GetMoveSelection() const { return bMoveSelection; } + void SetEnterEdit(sal_Bool bSet) { bEnterEdit = bSet; } + sal_Bool GetEnterEdit() const { return bEnterEdit; } + void SetExtendFormat(sal_Bool bSet) { bExtendFormat = bSet; } + sal_Bool GetExtendFormat() const { return bExtendFormat; } + void SetRangeFinder(sal_Bool bSet) { bRangeFinder = bSet; } + sal_Bool GetRangeFinder() const { return bRangeFinder; } + void SetExpandRefs(sal_Bool bSet) { bExpandRefs = bSet; } + sal_Bool GetExpandRefs() const { return bExpandRefs; } + void SetMarkHeader(sal_Bool bSet) { bMarkHeader = bSet; } + sal_Bool GetMarkHeader() const { return bMarkHeader; } + void SetUseTabCol(sal_Bool bSet) { bUseTabCol = bSet; } + sal_Bool GetUseTabCol() const { return bUseTabCol; } + void SetTextWysiwyg(sal_Bool bSet) { bTextWysiwyg = bSet; } + sal_Bool GetTextWysiwyg() const { return bTextWysiwyg; } + void SetReplaceCellsWarn(sal_Bool bSet) { bReplCellsWarn = bSet; } + sal_Bool GetReplaceCellsWarn() const { return bReplCellsWarn; } const ScInputOptions& operator= ( const ScInputOptions& rOpt ); }; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 284d851a45da..fd74625dcd73 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -173,7 +173,7 @@ class ScSheetLinksObj : public cppu::WeakImplHelper4< private: ScDocShell* pDocShell; - ScSheetLinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScSheetLinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: @@ -228,7 +228,7 @@ class ScAreaLinkObj : public cppu::WeakImplHelper4< private: SfxItemPropertySet aPropSet; ScDocShell* pDocShell; - USHORT nPos; + sal_uInt16 nPos; XRefreshListenerArr_Impl aRefreshListeners; void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, @@ -238,7 +238,7 @@ private: void Refreshed_Impl(); public: - ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP); + ScAreaLinkObj(ScDocShell* pDocSh, sal_uInt16 nP); virtual ~ScAreaLinkObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -331,7 +331,7 @@ class ScAreaLinksObj : public cppu::WeakImplHelper3< private: ScDocShell* pDocShell; - ScAreaLinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScAreaLinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); public: ScAreaLinksObj(ScDocShell* pDocSh); @@ -448,7 +448,7 @@ class ScDDELinksObj : public cppu::WeakImplHelper4< private: ScDocShell* pDocShell; - ScDDELinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScDDELinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 431f995d27c2..9f212f5b74be 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -174,7 +174,7 @@ public: /** Insert query and result. @param bAvailable - Pass FALSE if the search didn't deliver a result. A subsequent + Pass sal_False if the search didn't deliver a result. A subsequent lookup() then will return Result::NOT_AVAILABLE. @returns successful insertion. */ diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 78bb2a6bba3d..46352e5b6ee0 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -36,7 +36,7 @@ struct ScMarkEntry { SCROW nRow; - BOOL bMarked; + sal_Bool bMarked; }; class ScMarkArray @@ -51,22 +51,22 @@ friend class ScDocument; // fuer FillInfo public: ScMarkArray(); ~ScMarkArray(); - void Reset( BOOL bMarked = FALSE ); - BOOL GetMark( SCROW nRow ) const; - void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); - BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; - BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; + void Reset( sal_Bool bMarked = sal_False ); + sal_Bool GetMark( SCROW nRow ) const; + void SetMarkArea( SCROW nStartRow, SCROW nEndRow, sal_Bool bMarked ); + sal_Bool IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; - BOOL HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } + sal_Bool HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + sal_Bool Search( SCROW nRow, SCSIZE& nIndex ) const; //UNUSED2009-05 void DeleteArea(SCROW nStartRow, SCROW nEndRow); /// Including current row, may return -1 if bUp and not found - SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; - SCROW GetMarkEnd( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextMarked( SCsROW nRow, sal_Bool bUp ) const; + SCROW GetMarkEnd( SCROW nRow, sal_Bool bUp ) const; }; @@ -78,7 +78,7 @@ public: ScMarkArrayIter( const ScMarkArray* pNewArray ); ~ScMarkArrayIter(); - BOOL Next( SCROW& rTop, SCROW& rBottom ); + sal_Bool Next( SCROW& rTop, SCROW& rBottom ); }; diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx index a982c8db47dd..3887a5da70eb 100644 --- a/sc/inc/markdata.hxx +++ b/sc/inc/markdata.hxx @@ -46,12 +46,12 @@ private: ScRange aMarkRange; // Bereich ScRange aMultiRange; // maximaler Bereich insgesamt ScMarkArray* pMultiSel; // Mehrfachselektion - BOOL bTabMarked[MAXTABCOUNT];// Tabelle selektiert - BOOL bMarked; // Rechteck markiert - BOOL bMultiMarked; // mehrfach markiert + sal_Bool bTabMarked[MAXTABCOUNT];// Tabelle selektiert + sal_Bool bMarked; // Rechteck markiert + sal_Bool bMultiMarked; // mehrfach markiert - BOOL bMarking; // Bereich wird aufgezogen -> kein MarkToMulti - BOOL bMarkIsNeg; // Aufheben bei Mehrfachselektion + sal_Bool bMarking; // Bereich wird aufgezogen -> kein MarkToMulti + sal_Bool bMarkIsNeg; // Aufheben bei Mehrfachselektion public: ScMarkData(); @@ -63,51 +63,51 @@ public: void ResetMark(); void SetMarkArea( const ScRange& rRange ); - void SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE ); + void SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark = sal_True ); void MarkToMulti(); void MarkToSimple(); - BOOL IsMarked() const { return bMarked; } - BOOL IsMultiMarked() const { return bMultiMarked; } + sal_Bool IsMarked() const { return bMarked; } + sal_Bool IsMultiMarked() const { return bMultiMarked; } void GetMarkArea( ScRange& rRange ) const; void GetMultiMarkArea( ScRange& rRange ) const; void SetAreaTab( SCTAB nTab ); - void SelectTable( SCTAB nTab, BOOL bNew ) { bTabMarked[nTab] = bNew; } - BOOL GetTableSelect( SCTAB nTab ) const { return bTabMarked[nTab]; } + void SelectTable( SCTAB nTab, sal_Bool bNew ) { bTabMarked[nTab] = bNew; } + sal_Bool GetTableSelect( SCTAB nTab ) const { return bTabMarked[nTab]; } void SelectOneTable( SCTAB nTab ); SCTAB GetSelectCount() const; SCTAB GetFirstSelected() const; - void SetMarkNegative( BOOL bFlag ) { bMarkIsNeg = bFlag; } - BOOL IsMarkNegative() const { return bMarkIsNeg; } - void SetMarking( BOOL bFlag ) { bMarking = bFlag; } - BOOL GetMarkingFlag() const { return bMarking; } + void SetMarkNegative( sal_Bool bFlag ) { bMarkIsNeg = bFlag; } + sal_Bool IsMarkNegative() const { return bMarkIsNeg; } + void SetMarking( sal_Bool bFlag ) { bMarking = bFlag; } + sal_Bool GetMarkingFlag() const { return bMarking; } // fuer FillInfo / Document etc. const ScMarkArray* GetArray() const { return pMultiSel; } - BOOL IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const; - void FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const; + sal_Bool IsCellMarked( SCCOL nCol, SCROW nRow, sal_Bool bNoSimple = sal_False ) const; + void FillRangeListWithMarks( ScRangeList* pList, sal_Bool bClear ) const; void ExtendRangeListTables( ScRangeList* pList ) const; - void MarkFromRangeList( const ScRangeList& rList, BOOL bReset ); + void MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset ); SCCOLROW GetMarkColumnRanges( SCCOLROW* pRanges ); SCCOLROW GetMarkRowRanges( SCCOLROW* pRanges ); - BOOL IsColumnMarked( SCCOL nCol ) const; - BOOL IsRowMarked( SCROW nRow ) const; - BOOL IsAllMarked( const ScRange& rRange ) const; // Multi + sal_Bool IsColumnMarked( SCCOL nCol ) const; + sal_Bool IsRowMarked( SCROW nRow ) const; + sal_Bool IsAllMarked( const ScRange& rRange ) const; // Multi /// May return -1 - SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const; - BOOL HasMultiMarks( SCCOL nCol ) const; - BOOL HasAnyMultiMarks() const; + SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, sal_Bool bUp ) const; + sal_Bool HasMultiMarks( SCCOL nCol ) const; + sal_Bool HasAnyMultiMarks() const; // Tabellen-Markierungen anpassen: void InsertTab( SCTAB nTab ); diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx index 23cd38e1f10a..3eb9aa10b18a 100644 --- a/sc/inc/navicfg.hxx +++ b/sc/inc/navicfg.hxx @@ -38,19 +38,19 @@ class ScNavipiCfg { private: - USHORT nListMode; - USHORT nDragMode; - USHORT nRootType; + sal_uInt16 nListMode; + sal_uInt16 nDragMode; + sal_uInt16 nRootType; public: ScNavipiCfg(); - void SetListMode(USHORT nNew); - USHORT GetListMode() const { return nListMode; } - void SetDragMode(USHORT nNew); - USHORT GetDragMode() const { return nDragMode; } - void SetRootType(USHORT nNew); - USHORT GetRootType() const { return nRootType; } + void SetListMode(sal_uInt16 nNew); + sal_uInt16 GetListMode() const { return nListMode; } + void SetDragMode(sal_uInt16 nNew); + sal_uInt16 GetDragMode() const { return nDragMode; } + void SetRootType(sal_uInt16 nNew); + sal_uInt16 GetRootType() const { return nRootType; } }; diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 82a49b3ba025..35ef69eea05e 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -47,7 +47,7 @@ class ScOutlineEntry : public ScDataObject public: ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, - bool bNewHidden = FALSE ); + bool bNewHidden = sal_False ); ScOutlineEntry( const ScOutlineEntry& rEntry ); virtual ScDataObject* Clone() const; @@ -73,7 +73,7 @@ public: virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - USHORT FindStart( SCCOLROW nMinStart ); + sal_uInt16 FindStart( SCCOLROW nMinStart ); }; @@ -82,46 +82,46 @@ class SC_DLLPUBLIC ScOutlineArray friend class ScSubOutlineIterator; private: - USHORT nDepth; + sal_uInt16 nDepth; ScOutlineCollection aCollections[SC_OL_MAXDEPTH]; - BOOL DecDepth(); - void FindEntry( SCCOLROW nSearchPos, USHORT& rFindLevel, USHORT& rFindIndex, - USHORT nMaxLevel = SC_OL_MAXDEPTH ); - void RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nLevel ); - void PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nStartLevel ); + sal_Bool DecDepth(); + void FindEntry( SCCOLROW nSearchPos, sal_uInt16& rFindLevel, sal_uInt16& rFindIndex, + sal_uInt16 nMaxLevel = SC_OL_MAXDEPTH ); + void RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_uInt16 nLevel ); + void PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_uInt16 nStartLevel ); public: ScOutlineArray(); ScOutlineArray( const ScOutlineArray& rArray ); - USHORT GetDepth() const { return nDepth; } + sal_uInt16 GetDepth() const { return nDepth; } - BOOL FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, - USHORT& rFindLevel ) const; + sal_Bool FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, + sal_uInt16& rFindLevel ) const; - BOOL Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, BOOL& rSizeChanged, - BOOL bHidden = FALSE, BOOL bVisible = TRUE ); - BOOL Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, BOOL& rSizeChanged ); + sal_Bool Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_Bool& rSizeChanged, + sal_Bool bHidden = sal_False, sal_Bool bVisible = sal_True ); + sal_Bool Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_Bool& rSizeChanged ); - ScOutlineEntry* GetEntry( USHORT nLevel, USHORT nIndex ) const; - USHORT GetCount( USHORT nLevel ) const; - ScOutlineEntry* GetEntryByPos( USHORT nLevel, SCCOLROW nPos ) const; + ScOutlineEntry* GetEntry( sal_uInt16 nLevel, sal_uInt16 nIndex ) const; + sal_uInt16 GetCount( sal_uInt16 nLevel ) const; + ScOutlineEntry* GetEntryByPos( sal_uInt16 nLevel, SCCOLROW nPos ) const; - BOOL GetEntryIndex( USHORT nLevel, SCCOLROW nPos, USHORT& rnIndex ) const; - BOOL GetEntryIndexInRange( - USHORT nLevel, SCCOLROW nBlockStart, SCCOLROW nBlockEnd, - USHORT& rnIndex ) const; + sal_Bool GetEntryIndex( sal_uInt16 nLevel, SCCOLROW nPos, sal_uInt16& rnIndex ) const; + sal_Bool GetEntryIndexInRange( + sal_uInt16 nLevel, SCCOLROW nBlockStart, SCCOLROW nBlockEnd, + sal_uInt16& rnIndex ) const; - void SetVisibleBelow( USHORT nLevel, USHORT nEntry, BOOL bValue, - BOOL bSkipHidden = FALSE ); + void SetVisibleBelow( sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bValue, + sal_Bool bSkipHidden = sal_False ); void GetRange( SCCOLROW& rStart, SCCOLROW& rEnd ) const; - void ExtendBlock( USHORT nLevel, SCCOLROW& rBlkStart, SCCOLROW& rBlkEnd ); + void ExtendBlock( sal_uInt16 nLevel, SCCOLROW& rBlkStart, SCCOLROW& rBlkEnd ); - BOOL TestInsertSpace( SCSIZE nSize, SCCOLROW nMaxVal ) const; + sal_Bool TestInsertSpace( SCSIZE nSize, SCCOLROW nMaxVal ) const; void InsertSpace( SCCOLROW nStartPos, SCSIZE nSize ); - BOOL DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize ); + sal_Bool DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize ); bool ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, ScTable& rTable, bool bCol ); @@ -144,12 +144,12 @@ public: const ScOutlineArray* GetRowArray() const { return &aRowOutline; } ScOutlineArray* GetRowArray() { return &aRowOutline; } - BOOL TestInsertCol( SCSIZE nSize ); + sal_Bool TestInsertCol( SCSIZE nSize ); void InsertCol( SCCOL nStartCol, SCSIZE nSize ); - BOOL DeleteCol( SCCOL nStartCol, SCSIZE nSize ); // TRUE: Undo nur ueber Original - BOOL TestInsertRow( SCSIZE nSize ); + sal_Bool DeleteCol( SCCOL nStartCol, SCSIZE nSize ); // TRUE: Undo nur ueber Original + sal_Bool TestInsertRow( SCSIZE nSize ); void InsertRow( SCROW nStartRow, SCSIZE nSize ); - BOOL DeleteRow( SCROW nStartRow, SCSIZE nSize ); + sal_Bool DeleteRow( SCROW nStartRow, SCSIZE nSize ); }; @@ -159,18 +159,18 @@ private: ScOutlineArray* pArray; SCCOLROW nStart; SCCOLROW nEnd; - USHORT nSubLevel; - USHORT nSubEntry; - USHORT nCount; - USHORT nDepth; + sal_uInt16 nSubLevel; + sal_uInt16 nSubEntry; + sal_uInt16 nCount; + sal_uInt16 nDepth; public: ScSubOutlineIterator( ScOutlineArray* pOutlineArray ); ScSubOutlineIterator( ScOutlineArray* pOutlineArray, - USHORT nLevel, USHORT nEntry ); + sal_uInt16 nLevel, sal_uInt16 nEntry ); ScOutlineEntry* GetNext(); - USHORT LastLevel() const; - USHORT LastEntry() const; + sal_uInt16 LastLevel() const; + sal_uInt16 LastEntry() const; void DeleteLast(); }; diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 83b23a3c9ef9..1cb39f8c48c8 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -36,7 +36,7 @@ class ScOptionsUtil { public: - static BOOL IsMetricSystem(); + static sal_Bool IsMetricSystem(); }; diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx index 935046e81a48..e449ad24c3c6 100644 --- a/sc/inc/pagepar.hxx +++ b/sc/inc/pagepar.hxx @@ -35,40 +35,40 @@ struct ScPageTableParam { - BOOL bCellContent; - BOOL bNotes; - BOOL bGrid; - BOOL bHeaders; - BOOL bCharts; - BOOL bObjects; - BOOL bDrawings; - BOOL bFormulas; - BOOL bNullVals; - BOOL bTopDown; - BOOL bLeftRight; - BOOL bSkipEmpty; - BOOL bScaleNone; - BOOL bScaleAll; - BOOL bScaleTo; - BOOL bScalePageNum; - USHORT nScaleAll; - USHORT nScaleWidth; - USHORT nScaleHeight; - USHORT nScalePageNum; - USHORT nFirstPageNo; + sal_Bool bCellContent; + sal_Bool bNotes; + sal_Bool bGrid; + sal_Bool bHeaders; + sal_Bool bCharts; + sal_Bool bObjects; + sal_Bool bDrawings; + sal_Bool bFormulas; + sal_Bool bNullVals; + sal_Bool bTopDown; + sal_Bool bLeftRight; + sal_Bool bSkipEmpty; + sal_Bool bScaleNone; + sal_Bool bScaleAll; + sal_Bool bScaleTo; + sal_Bool bScalePageNum; + sal_uInt16 nScaleAll; + sal_uInt16 nScaleWidth; + sal_uInt16 nScaleHeight; + sal_uInt16 nScalePageNum; + sal_uInt16 nFirstPageNo; ScPageTableParam(); ~ScPageTableParam(); - BOOL operator== ( const ScPageTableParam& r ) const; + sal_Bool operator== ( const ScPageTableParam& r ) const; void Reset (); }; struct ScPageAreaParam { - BOOL bPrintArea; - BOOL bRepeatRow; - BOOL bRepeatCol; + sal_Bool bPrintArea; + sal_Bool bRepeatRow; + sal_Bool bRepeatCol; ScRange aPrintArea; ScRange aRepeatRow; ScRange aRepeatCol; @@ -76,7 +76,7 @@ struct ScPageAreaParam ScPageAreaParam(); ~ScPageAreaParam(); - BOOL operator== ( const ScPageAreaParam& r ) const; + sal_Bool operator== ( const ScPageAreaParam& r ) const; void Reset (); }; diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx index 896fec2e88d9..63aa5eda8d31 100644 --- a/sc/inc/paramisc.hxx +++ b/sc/inc/paramisc.hxx @@ -47,7 +47,7 @@ struct ScSolveParam ~ScSolveParam(); ScSolveParam& operator= ( const ScSolveParam& r ); - BOOL operator== ( const ScSolveParam& r ) const; + sal_Bool operator== ( const ScSolveParam& r ) const; }; //----------------------------------------------------------------------- @@ -58,7 +58,7 @@ struct ScTabOpParam ScRefAddress aRefFormulaEnd; ScRefAddress aRefRowCell; ScRefAddress aRefColCell; - BYTE nMode; + sal_uInt8 nMode; ScTabOpParam() {}; ScTabOpParam( const ScTabOpParam& r ); @@ -66,11 +66,11 @@ struct ScTabOpParam const ScRefAddress& rFormulaEnd, const ScRefAddress& rRowCell, const ScRefAddress& rColCell, - BYTE nMd); + sal_uInt8 nMd); ~ScTabOpParam() {}; ScTabOpParam& operator= ( const ScTabOpParam& r ); - BOOL operator== ( const ScTabOpParam& r ) const; + sal_Bool operator== ( const ScTabOpParam& r ) const; }; #endif // SC_PARAMISC_HXX diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index b8929a450576..43844119804e 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -70,20 +70,20 @@ public: ~ScPatternAttr(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream& rStream, USHORT nVersion) const; - virtual SvStream& Store(SvStream& rStream, USHORT nItemVersion) const; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const; + virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const; virtual int operator==(const SfxPoolItem& rCmp) const; - const SfxPoolItem& GetItem( USHORT nWhichP ) const + const SfxPoolItem& GetItem( sal_uInt16 nWhichP ) const { return GetItemSet().Get(nWhichP); } - static const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet ); - const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet* pCondSet ) const; + static const SfxPoolItem& GetItem( sal_uInt16 nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet ); + const SfxPoolItem& GetItem( sal_uInt16 nWhich, const SfxItemSet* pCondSet ) const; // pWhich sind keine Ranges, sondern einzelne IDs, 0-terminiert - BOOL HasItemsSet( const USHORT* pWhich ) const; - void ClearItems( const USHORT* pWhich ); + sal_Bool HasItemsSet( const sal_uInt16* pWhich ) const; + void ClearItems( const sal_uInt16* pWhich ); void DeleteUnchanged( const ScPatternAttr* pOldAttrs ); @@ -96,14 +96,14 @@ public: OutputDevice* pOutDev = NULL, const Fraction* pScale = NULL, const SfxItemSet* pCondSet = NULL, - BYTE nScript = 0, const Color* pBackConfigColor = NULL, + sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL, const Color* pTextConfigColor = NULL ); /** Fills a font object from the own item set. */ void GetFont( Font& rFont, ScAutoFontColorMode eAutoMode, OutputDevice* pOutDev = NULL, const Fraction* pScale = NULL, const SfxItemSet* pCondSet = NULL, - BYTE nScript = 0, const Color* pBackConfigColor = NULL, + sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL, const Color* pTextConfigColor = NULL ) const; /** Converts all Calc items contained in rSrcSet to edit engine items and puts them into rEditSet. */ @@ -126,12 +126,12 @@ public: void UpdateStyleSheet(); void StyleToName(); - BOOL IsVisible() const; - BOOL IsVisibleEqual( const ScPatternAttr& rOther ) const; + sal_Bool IsVisible() const; + sal_Bool IsVisibleEqual( const ScPatternAttr& rOther ) const; /** If font is an old symbol font StarBats/StarMath with text encoding RTL_TEXTENC_SYMBOL */ - BOOL IsSymbolFont() const; + sal_Bool IsSymbolFont() const; //UNUSED2008-05 /** Create a FontToSubsFontConverter if needed for //UNUSED2008-05 this pattern, else return 0. @@ -144,14 +144,14 @@ public: //UNUSED2008-05 should be accomplished using the //UNUSED2008-05 ScFontToSubsFontConverter_AutoPtr //UNUSED2008-05 */ -//UNUSED2008-05 FontToSubsFontConverter GetSubsFontConverter( ULONG nFlags ) const; +//UNUSED2008-05 FontToSubsFontConverter GetSubsFontConverter( sal_uLong nFlags ) const; - ULONG GetNumberFormat( SvNumberFormatter* ) const; - ULONG GetNumberFormat( SvNumberFormatter* pFormatter, + sal_uLong GetNumberFormat( SvNumberFormatter* ) const; + sal_uLong GetNumberFormat( SvNumberFormatter* pFormatter, const SfxItemSet* pCondSet ) const; long GetRotateVal( const SfxItemSet* pCondSet ) const; - BYTE GetRotateDir( const SfxItemSet* pCondSet ) const; + sal_uInt8 GetRotateDir( const SfxItemSet* pCondSet ) const; }; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 489f272bc8ba..dbf54fb6ed82 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -77,11 +77,11 @@ typedef ::boost::shared_ptr<ScDPLabelData> ScDPLabelDataRef; struct PivotField { SCsCOL nCol; - USHORT nFuncMask; - USHORT nFuncCount; + sal_uInt16 nFuncMask; + sal_uInt16 nFuncCount; ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; - explicit PivotField( SCsCOL nNewCol = 0, USHORT nNewFuncMask = PIVOT_FUNC_NONE ); + explicit PivotField( SCsCOL nNewCol = 0, sal_uInt16 nNewFuncMask = PIVOT_FUNC_NONE ); bool operator==( const PivotField& r ) const; }; @@ -103,17 +103,17 @@ struct ScPivotParam SCSIZE nColCount; SCSIZE nRowCount; SCSIZE nDataCount; - BOOL bIgnoreEmptyRows; - BOOL bDetectCategories; - BOOL bMakeTotalCol; - BOOL bMakeTotalRow; + sal_Bool bIgnoreEmptyRows; + sal_Bool bDetectCategories; + sal_Bool bMakeTotalCol; + sal_Bool bMakeTotalRow; ScPivotParam(); ScPivotParam( const ScPivotParam& r ); ~ScPivotParam(); ScPivotParam& operator= ( const ScPivotParam& r ); - BOOL operator== ( const ScPivotParam& r ) const; + sal_Bool operator== ( const ScPivotParam& r ) const; //UNUSED2009-05 void Clear (); void ClearPivotArrays(); void SetLabelData (const ::std::vector<ScDPLabelDataRef>& r); @@ -139,7 +139,7 @@ struct ScDPLabelData ::rtl::OUString maName; /// Original name of the dimension. ::rtl::OUString maLayoutName; /// Layout name (display name) SCsCOL mnCol; - USHORT mnFuncMask; /// Page/Column/Row subtotal function. + sal_uInt16 mnFuncMask; /// Page/Column/Row subtotal function. sal_Int32 mnUsedHier; /// Used hierarchy. sal_Int32 mnFlags; /// Flags from the DataPilotSource dimension bool mbShowAll; /// true = Show all (also empty) results. @@ -181,11 +181,11 @@ struct ScDPLabelData struct ScDPFuncData { short mnCol; - USHORT mnFuncMask; + sal_uInt16 mnFuncMask; ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; - explicit ScDPFuncData( short nNewCol, USHORT nNewFuncMask ); - explicit ScDPFuncData( short nNewCol, USHORT nNewFuncMask, + explicit ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask ); + explicit ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask, const ::com::sun::star::sheet::DataPilotFieldReference& rFieldRef ); }; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index a4363e3adfbc..9141e477c4b7 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -79,9 +79,9 @@ public: @param bAlwaysCreateCaption Instead of a pointer to an existing caption object, the passed note data structure may contain a reference to an ScCaptionInitData structure containing information - about how to construct a missing caption object. If TRUE is passed, + about how to construct a missing caption object. If sal_True is passed, the caption drawing object will be created immediately from that - data. If FALSE is passed and the note is not visible, it will + data. If sal_False is passed and the note is not visible, it will continue to cache that data until the caption object is requested. */ explicit ScPostIt( @@ -93,9 +93,9 @@ public: /** Clones this note and its caption object, if specified. - @param bCloneCaption If TRUE is passed, clones the caption object and + @param bCloneCaption If sal_True is passed, clones the caption object and inserts it into the drawing layer of the destination document. If - FALSE is passed, the cloned note will refer to the old caption + sal_False is passed, the cloned note will refer to the old caption object (used e.g. in Undo documents to restore the pointer to the existing caption object). */ @@ -220,11 +220,11 @@ public: object. The rectangle may be empty, in this case the default position and size is used. - @param bAlwaysCreateCaption If TRUE is passed, the caption drawing - object will be created immediately. If FALSE is passed, the caption + @param bAlwaysCreateCaption If sal_True is passed, the caption drawing + object will be created immediately. If sal_False is passed, the caption drawing object will not be created if the note is not visible - (bShown = FALSE), but the cell note will cache the passed data. - MUST be set to FALSE outside of import filter implementations! + (bShown = sal_False), but the cell note will cache the passed data. + MUST be set to sal_False outside of import filter implementations! @return Pointer to the new cell note object if insertion was successful (i.e. the passed cell position was valid), null @@ -242,11 +242,11 @@ public: @param rNoteText The text used to create the note caption object. Must not be empty. - @param bAlwaysCreateCaption If TRUE is passed, the caption drawing - object will be created immediately. If FALSE is passed, the caption + @param bAlwaysCreateCaption If sal_True is passed, the caption drawing + object will be created immediately. If sal_False is passed, the caption drawing object will not be created if the note is not visible - (bShown = FALSE), but the cell note will cache the passed data. - MUST be set to FALSE outside of import filter implementations! + (bShown = sal_False), but the cell note will cache the passed data. + MUST be set to sal_False outside of import filter implementations! @return Pointer to the new cell note object if insertion was successful (i.e. the passed cell position was valid), null diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ec063d2d0e9b..1f8ad784f5a4 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -35,18 +35,18 @@ class SC_DLLPUBLIC ScPrintOptions { private: - BOOL bSkipEmpty; - BOOL bAllSheets; + sal_Bool bSkipEmpty; + sal_Bool bAllSheets; public: ScPrintOptions(); ScPrintOptions( const ScPrintOptions& rCpy ); ~ScPrintOptions(); - BOOL GetSkipEmpty() const { return bSkipEmpty; } - void SetSkipEmpty( BOOL bVal ) { bSkipEmpty = bVal; } - BOOL GetAllSheets() const { return bAllSheets; } - void SetAllSheets( BOOL bVal ) { bAllSheets = bVal; } + sal_Bool GetSkipEmpty() const { return bSkipEmpty; } + void SetSkipEmpty( sal_Bool bVal ) { bSkipEmpty = bVal; } + sal_Bool GetAllSheets() const { return bAllSheets; } + void SetAllSheets( sal_Bool bVal ) { bAllSheets = bVal; } void SetDefaults(); @@ -63,8 +63,8 @@ class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem { public: TYPEINFO(); -//UNUSED2008-05 ScTpPrintItem( USHORT nWhich ); - ScTpPrintItem( USHORT nWhich, +//UNUSED2008-05 ScTpPrintItem( sal_uInt16 nWhich ); + ScTpPrintItem( sal_uInt16 nWhich, const ScPrintOptions& rOpt ); ScTpPrintItem( const ScTpPrintItem& rItem ); ~ScTpPrintItem(); diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx index b28d04cf48bf..acca6b6a8c4c 100644 --- a/sc/inc/prnsave.hxx +++ b/sc/inc/prnsave.hxx @@ -42,21 +42,21 @@ class ScPrintSaverTab ScRangeVec maPrintRanges; // Array ScRange* mpRepeatCol; // einzeln ScRange* mpRepeatRow; // einzeln - BOOL mbEntireSheet; + sal_Bool mbEntireSheet; public: ScPrintSaverTab(); ~ScPrintSaverTab(); - void SetAreas( const ScRangeVec& rRanges, BOOL bEntireSheet ); + void SetAreas( const ScRangeVec& rRanges, sal_Bool bEntireSheet ); void SetRepeat( const ScRange* pCol, const ScRange* pRow ); const ScRangeVec& GetPrintRanges() const { return maPrintRanges; } - BOOL IsEntireSheet() const { return mbEntireSheet; } + sal_Bool IsEntireSheet() const { return mbEntireSheet; } const ScRange* GetRepeatCol() const { return mpRepeatCol; } const ScRange* GetRepeatRow() const { return mpRepeatRow; } - BOOL operator==( const ScPrintSaverTab& rCmp ) const; + sal_Bool operator==( const ScPrintSaverTab& rCmp ) const; }; class ScPrintRangeSaver @@ -72,7 +72,7 @@ public: ScPrintSaverTab& GetTabData(SCTAB nTab); const ScPrintSaverTab& GetTabData(SCTAB nTab) const; - BOOL operator==( const ScPrintRangeSaver& rCmp ) const; + sal_Bool operator==( const ScPrintRangeSaver& rCmp ) const; }; diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index a9cd3d2544bd..3db5c9cd726d 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -48,15 +48,15 @@ class SC_DLLPUBLIC ScProgress { private: static SfxProgress* pGlobalProgress; - static ULONG nGlobalRange; - static ULONG nGlobalPercent; - static BOOL bGlobalNoUserBreak; + static sal_uLong nGlobalRange; + static sal_uLong nGlobalPercent; + static sal_Bool bGlobalNoUserBreak; static ScProgress* pInterpretProgress; static ScProgress* pOldInterpretProgress; - static ULONG nInterpretProgress; - static BOOL bAllowInterpretProgress; + static sal_uLong nInterpretProgress; + static sal_Bool bAllowInterpretProgress; static ScDocument* pInterpretDoc; - static BOOL bIdleWasDisabled; + static sal_Bool bIdleWasDisabled; SfxProgress* pProgress; @@ -64,7 +64,7 @@ private: ScProgress( const ScProgress& ); ScProgress& operator=( const ScProgress& ); - static void CalcGlobalPercent( ULONG nVal ) + static void CalcGlobalPercent( sal_uLong nVal ) { nGlobalPercent = nGlobalRange ? nVal * 100 / nGlobalRange : 0; @@ -72,19 +72,19 @@ private: public: static SfxProgress* GetGlobalSfxProgress() { return pGlobalProgress; } - static BOOL IsUserBreak() { return !bGlobalNoUserBreak; } + static sal_Bool IsUserBreak() { return !bGlobalNoUserBreak; } static void CreateInterpretProgress( ScDocument* pDoc, - BOOL bWait = TRUE ); + sal_Bool bWait = sal_True ); static ScProgress* GetInterpretProgress() { return pInterpretProgress; } static void DeleteInterpretProgress(); - static ULONG GetInterpretCount() { return nInterpretProgress; } - static ULONG GetGlobalRange() { return nGlobalRange; } - static ULONG GetGlobalPercent() { return nGlobalPercent; } + static sal_uLong GetInterpretCount() { return nInterpretProgress; } + static sal_uLong GetGlobalRange() { return nGlobalRange; } + static sal_uLong GetGlobalPercent() { return nGlobalPercent; } ScProgress( SfxObjectShell* pObjSh, const String& rText, - ULONG nRange, BOOL bAllDocs = FALSE, - BOOL bWait = TRUE ); + sal_uLong nRange, sal_Bool bAllDocs = sal_False, + sal_Bool bWait = sal_True ); ~ScProgress(); #ifdef SC_PROGRESS_CXX @@ -94,7 +94,7 @@ public: // kann NULL sein! SfxProgress* GetSfxProgress() const { return pProgress; } - BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ) + sal_Bool SetStateText( sal_uLong nVal, const String &rVal, sal_uLong nNewRange = 0 ) { if ( pProgress ) { @@ -102,12 +102,12 @@ public: nGlobalRange = nNewRange; CalcGlobalPercent( nVal ); if ( !pProgress->SetStateText( nVal, rVal, nNewRange ) ) - bGlobalNoUserBreak = FALSE; + bGlobalNoUserBreak = sal_False; return bGlobalNoUserBreak; } - return TRUE; + return sal_True; } - BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ) + sal_Bool SetState( sal_uLong nVal, sal_uLong nNewRange = 0 ) { if ( pProgress ) { @@ -115,38 +115,38 @@ public: nGlobalRange = nNewRange; CalcGlobalPercent( nVal ); if ( !pProgress->SetState( nVal, nNewRange ) ) - bGlobalNoUserBreak = FALSE; + bGlobalNoUserBreak = sal_False; return bGlobalNoUserBreak; } - return TRUE; + return sal_True; } - BOOL SetStateCountDown( ULONG nVal ) + sal_Bool SetStateCountDown( sal_uLong nVal ) { if ( pProgress ) { CalcGlobalPercent( nGlobalRange - nVal ); if ( !pProgress->SetState( nGlobalRange - nVal ) ) - bGlobalNoUserBreak = FALSE; + bGlobalNoUserBreak = sal_False; return bGlobalNoUserBreak; } - return TRUE; + return sal_True; } - BOOL SetStateOnPercent( ULONG nVal ) + sal_Bool SetStateOnPercent( sal_uLong nVal ) { // nur wenn Prozent mehr als vorher if ( nGlobalRange && (nVal * 100 / nGlobalRange) > nGlobalPercent ) return SetState( nVal ); - return TRUE; + return sal_True; } - BOOL SetStateCountDownOnPercent( ULONG nVal ) + sal_Bool SetStateCountDownOnPercent( sal_uLong nVal ) { // nur wenn Prozent mehr als vorher if ( nGlobalRange && ((nGlobalRange - nVal) * 100 / nGlobalRange) > nGlobalPercent ) return SetStateCountDown( nVal ); - return TRUE; + return sal_True; } - ULONG GetState() + sal_uLong GetState() { if ( pProgress ) return pProgress->GetState(); diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 8e84f1e53e36..9ffe038b7255 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -82,7 +82,7 @@ struct ScQueryParamTable struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable { - BOOL bDestPers; // nicht gespeichert + sal_Bool bDestPers; // nicht gespeichert SCTAB nDestTab; SCCOL nDestCol; SCROW nDestRow; @@ -93,7 +93,7 @@ struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamT virtual ~ScQueryParam(); ScQueryParam& operator= ( const ScQueryParam& r ); - BOOL operator== ( const ScQueryParam& rOther ) const; + sal_Bool operator== ( const ScQueryParam& rOther ) const; void Clear(); void ClearDestParams(); void MoveToDest(); diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index e00fce10da1c..70c8658de5da 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -53,23 +53,23 @@ public: ScRangePtr pR = new ScRange( rRange ); Insert( pR, LIST_APPEND ); } - USHORT Parse( const String&, ScDocument* = NULL, - USHORT nMask = SCA_VALID, + sal_uInt16 Parse( const String&, ScDocument* = NULL, + sal_uInt16 nMask = SCA_VALID, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ); - void Format( String&, USHORT nFlags = 0, ScDocument* = NULL, + void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; - void Join( const ScRange&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, + void Join( const ScRange&, sal_Bool bIsInList = sal_False ); + sal_Bool UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); ScRange* Find( const ScAddress& ) const; - BOOL operator==( const ScRangeList& ) const; - BOOL operator!=( const ScRangeList& r ) const; - BOOL Intersects( const ScRange& ) const; - BOOL In( const ScRange& ) const; - ULONG GetCellCount() const; + sal_Bool operator==( const ScRangeList& ) const; + sal_Bool operator!=( const ScRangeList& r ) const; + sal_Bool Intersects( const ScRange& ) const; + sal_Bool In( const ScRange& ) const; + sal_uLong GetCellCount() const; }; SV_DECL_IMPL_REF( ScRangeList ); @@ -90,15 +90,15 @@ public: ScRangePair* pR = new ScRangePair( rRangePair ); Insert( pR, LIST_APPEND ); } - void Join( const ScRangePair&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, + void Join( const ScRangePair&, sal_Bool bIsInList = sal_False ); + sal_Bool UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void DeleteOnTab( SCTAB nTab ); ScRangePair* Find( const ScAddress& ) const; ScRangePair* Find( const ScRange& ) const; - ScRangePair** CreateNameSortedArray( ULONG& nCount, ScDocument* ) const; - BOOL operator==( const ScRangePairList& ) const; + ScRangePair** CreateNameSortedArray( sal_uLong& nCount, ScDocument* ) const; + sal_Bool operator==( const ScRangePairList& ) const; }; SV_DECL_IMPL_REF( ScRangePairList ); diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index a9f324b8b737..453530c0e1f6 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -47,7 +47,7 @@ namespace rtl { //------------------------------------------------------------------------ -typedef USHORT RangeType; +typedef sal_uInt16 RangeType; #define RT_NAME ((RangeType)0x0000) #define RT_DATABASE ((RangeType)0x0001) @@ -74,8 +74,8 @@ private: ScAddress aPos; RangeType eType; ScDocument* pDoc; - USHORT nIndex; - BOOL bModified; // wird bei UpdateReference gesetzt/geloescht + sal_uInt16 nIndex; + sal_Bool bModified; // wird bei UpdateReference gesetzt/geloescht // max row and column to use for wrapping of references. If -1 use the // application's default. @@ -83,7 +83,7 @@ private: SCCOL mnMaxCol; friend class ScRangeName; - ScRangeData( USHORT nIndex ); + ScRangeData( sal_uInt16 nIndex ); public: typedef ::std::map<sal_uInt16, sal_uInt16> IndexMap; @@ -109,45 +109,45 @@ public: virtual ScDataObject* Clone() const; - BOOL operator== (const ScRangeData& rData) const; + sal_Bool operator== (const ScRangeData& rData) const; void GetName( String& rName ) const { rName = aName; } const String& GetName( void ) const { return aName; } const String& GetUpperName( void ) const { return aUpperName; } ScAddress GetPos() const { return aPos; } // Der Index muss eindeutig sein. Ist er 0, wird ein neuer Index vergeben - void SetIndex( USHORT nInd ) { nIndex = nInd; } - USHORT GetIndex() const { return nIndex; } + void SetIndex( sal_uInt16 nInd ) { nIndex = nInd; } + sal_uInt16 GetIndex() const { return nIndex; } ScTokenArray* GetCode() { return pCode; } - USHORT GetErrCode(); - BOOL HasReferences() const; + sal_uInt16 GetErrCode(); + sal_Bool HasReferences() const; void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } ScDocument* GetDocument() const { return pDoc; } void SetType( RangeType nType ) { eType = nType; } void AddType( RangeType nType ) { eType = eType|nType; } RangeType GetType() const { return eType; } - BOOL HasType( RangeType nType ) const; + sal_Bool HasType( RangeType nType ) const; SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL IsModified() const { return bModified; } + sal_Bool IsModified() const { return bModified; } SC_DLLPUBLIC void GuessPosition(); void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; - BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; - BOOL IsValidReference( ScRange& rRef ) const; + SC_DLLPUBLIC sal_Bool IsReference( ScRange& rRef ) const; + sal_Bool IsReference( ScRange& rRef, const ScAddress& rPos ) const; + sal_Bool IsValidReference( ScRange& rRef ) const; -//UNUSED2009-05 BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; - BOOL IsRangeAtBlock( const ScRange& ) const; +//UNUSED2009-05 sal_Bool IsRangeAtCursor( const ScAddress&, sal_Bool bStartOnly ) const; + sal_Bool IsRangeAtBlock( const ScRange& ) const; - void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); + void UpdateTabRef(SCTAB nOldTable, sal_uInt16 nFlag, SCTAB nNewTable); void TransferTabRef( SCTAB nOldTab, SCTAB nNewTab ); void ValidateTabRefs(); @@ -155,7 +155,7 @@ public: void ReplaceRangeNamesInUse( const IndexMap& rMap ); static void MakeValidName( String& rName ); - SC_DLLPUBLIC static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); + SC_DLLPUBLIC static sal_Bool IsNameValid( const String& rName, ScDocument* pDoc ); SC_DLLPUBLIC void SetMaxRow(SCROW nRow); SCROW GetMaxRow() const; @@ -163,7 +163,7 @@ public: SCCOL GetMaxCol() const; }; -inline BOOL ScRangeData::HasType( RangeType nType ) const +inline sal_Bool ScRangeData::HasType( RangeType nType ) const { return ( ( eType & nType ) == nType ); } @@ -181,12 +181,12 @@ class ScRangeName : public ScSortedCollection { private: ScDocument* pDoc; - USHORT nSharedMaxIndex; + sal_uInt16 nSharedMaxIndex; using ScSortedCollection::Clone; // calcwarnings: shouldn't be used public: - ScRangeName(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, + ScRangeName(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False, ScDocument* pDocument = NULL) : ScSortedCollection ( nLim, nDel, bDup ), pDoc ( pDocument ), @@ -196,28 +196,28 @@ public: virtual ScDataObject* Clone(ScDocument* pDocP) const { return new ScRangeName(*this, pDocP); } - ScRangeData* operator[]( const USHORT nIndex) const + ScRangeData* operator[]( const sal_uInt16 nIndex) const { return (ScRangeData*)At(nIndex); } virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual sal_Bool IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; -//UNUSED2009-05 ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; +//UNUSED2009-05 ScRangeData* GetRangeAtCursor( const ScAddress&, sal_Bool bStartOnly ) const; SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; - SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; + SC_DLLPUBLIC sal_Bool SearchName( const String& rName, sal_uInt16& rPos ) const; // SearchNameUpper must be called with an upper-case search string - BOOL SearchNameUpper( const String& rUpperName, USHORT& rPos ) const; + sal_Bool SearchNameUpper( const String& rUpperName, sal_uInt16& rPos ) const; void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateTabRef(SCTAB nTable, USHORT nFlag, SCTAB nNewTable = 0); + void UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0); void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - virtual BOOL Insert(ScDataObject* pScDataObject); - SC_DLLPUBLIC ScRangeData* FindIndex(USHORT nIndex); - USHORT GetSharedMaxIndex() { return nSharedMaxIndex; } - void SetSharedMaxIndex(USHORT nInd) { nSharedMaxIndex = nInd; } - USHORT GetEntryIndex(); + virtual sal_Bool Insert(ScDataObject* pScDataObject); + SC_DLLPUBLIC ScRangeData* FindIndex(sal_uInt16 nIndex); + sal_uInt16 GetSharedMaxIndex() { return nSharedMaxIndex; } + void SetSharedMaxIndex(sal_uInt16 nInd) { nSharedMaxIndex = nInd; } + sal_uInt16 GetEntryIndex(); }; #endif diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx index 6238ea5f8050..735985df1779 100644 --- a/sc/inc/rangeseq.hxx +++ b/sc/inc/rangeseq.hxx @@ -39,21 +39,21 @@ class ScRange; class ScRangeToSequence { public: - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillLongArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillLongArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillDoubleArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillDoubleArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillStringArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillStringArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, SvNumberFormatter* pFormatter ); - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillMixedArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange, - BOOL bAllowNV = FALSE ); + sal_Bool bAllowNV = sal_False ); /** @param bDataTypes Additionally to the differentiation between string and double allow @@ -61,7 +61,7 @@ public: implementation of XFormulaParser. If <FALSE/>, boolean values are treated as ordinary double values 1 (true) and 0 (false). */ - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillMixedArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes = false ); }; @@ -106,7 +106,7 @@ class ScByteSequenceToString public: // rAny must contain Sequence<sal_Int8>, // may or may not contain 0-bytes at the end - static BOOL GetString( String& rString, const com::sun::star::uno::Any& rAny, + static sal_Bool GetString( String& rString, const com::sun::star::uno::Any& rAny, sal_uInt16 nEncoding ); }; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index ea5d2a901b54..d461315c2c34 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -56,7 +56,7 @@ public: ScRangeUtil() {} ~ScRangeUtil() {} - BOOL MakeArea ( const String& rAreaStr, + sal_Bool MakeArea ( const String& rAreaStr, ScArea& rArea, ScDocument* pDoc, SCTAB nTab, @@ -65,14 +65,14 @@ public: void CutPosString ( const String& theAreaStr, String& thePosStr ) const; - BOOL IsAbsTabArea ( const String& rAreaStr, + sal_Bool IsAbsTabArea ( const String& rAreaStr, ScDocument* pDoc, ScArea*** pppAreas = 0, - USHORT* pAreaCount = 0, - BOOL bAcceptCellRef = FALSE, + sal_uInt16* pAreaCount = 0, + sal_Bool bAcceptCellRef = sal_False, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL IsAbsArea ( const String& rAreaStr, + sal_Bool IsAbsArea ( const String& rAreaStr, ScDocument* pDoc, SCTAB nTab, String* pCompleteStr = 0, @@ -80,21 +80,21 @@ public: ScRefAddress* pEndPos = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL IsRefArea ( const String&, + sal_Bool IsRefArea ( const String&, ScDocument*, SCTAB, String* = 0, ScRefAddress* = 0 ) const - { return FALSE; } + { return sal_False; } - BOOL IsAbsPos ( const String& rPosStr, + sal_Bool IsAbsPos ( const String& rPosStr, ScDocument* pDoc, SCTAB nTab, String* pCompleteStr = 0, ScRefAddress* pPosTripel = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL MakeRangeFromName ( const String& rName, + sal_Bool MakeRangeFromName ( const String& rName, ScDocument* pDoc, SCTAB nCurTab, ScRange& rRange, @@ -282,8 +282,8 @@ public: ScArea( const ScArea& r ); ScArea& operator= ( const ScArea& r ); - BOOL operator== ( const ScArea& r ) const; - BOOL operator!= ( const ScArea& r ) const { return !( operator==(r) ); } + sal_Bool operator== ( const ScArea& r ) const; + sal_Bool operator!= ( const ScArea& r ) const { return !( operator==(r) ); } public: SCTAB nTab; @@ -304,16 +304,16 @@ class SC_DLLPUBLIC ScAreaNameIterator private: ScRangeName* pRangeName; ScDBCollection* pDBCollection; - BOOL bFirstPass; - USHORT nPos; + sal_Bool bFirstPass; + sal_uInt16 nPos; String aStrNoName; public: ScAreaNameIterator( ScDocument* pDoc ); ~ScAreaNameIterator() {} - BOOL Next( String& rName, ScRange& rRange ); - BOOL WasDBName() const { return !bFirstPass; } + sal_Bool Next( String& rName, ScRange& rRange ); + sal_Bool WasDBName() const { return !bFirstPass; } }; diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 348159c12ce1..0f56ef5b5ab4 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -133,11 +133,11 @@ class ScMultipleReadHeader { private: SvStream& rStream; - BYTE* pBuf; + sal_uInt8* pBuf; SvMemoryStream* pMemStream; - ULONG nEndPos; - ULONG nEntryEnd; - ULONG nTotalEnd; + sal_uLong nEndPos; + sal_uLong nEntryEnd; + sal_uLong nTotalEnd; public: ScMultipleReadHeader(SvStream& rNewStream); @@ -145,7 +145,7 @@ public: void StartEntry(); void EndEntry(); - ULONG BytesLeft() const; + sal_uLong BytesLeft() const; }; class ScMultipleWriteHeader @@ -153,9 +153,9 @@ class ScMultipleWriteHeader private: SvStream& rStream; SvMemoryStream aMemStream; - ULONG nDataPos; + sal_uLong nDataPos; sal_uInt32 nDataSize; - ULONG nEntryStart; + sal_uLong nEntryStart; public: ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0); diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx index 7b24e1a409b4..c15b31fd197b 100644 --- a/sc/inc/recursionhelper.hxx +++ b/sc/inc/recursionhelper.hxx @@ -39,9 +39,9 @@ class ScFormulaCell; struct ScFormulaRecursionEntry { ScFormulaCell* pCell; - BOOL bOldRunning; + sal_Bool bOldRunning; ScFormulaResult aPreviousResult; - ScFormulaRecursionEntry( ScFormulaCell* p, BOOL bR, + ScFormulaRecursionEntry( ScFormulaCell* p, sal_Bool bR, const ScFormulaResult & rRes ) : pCell(p), bOldRunning(bR), aPreviousResult( rRes) { @@ -57,8 +57,8 @@ class ScRecursionHelper ScFormulaRecursionList::iterator aInsertPos; ScFormulaRecursionList::iterator aLastIterationStart; ScRecursionInIterationStack aRecursionInIterationStack; - USHORT nRecursionCount; - USHORT nIteration; + sal_uInt16 nRecursionCount; + sal_uInt16 nIteration; bool bInRecursionReturn; bool bDoingRecursion; bool bInIterationReturn; @@ -81,7 +81,7 @@ class ScRecursionHelper public: ScRecursionHelper() { Init(); } - USHORT GetRecursionCount() const { return nRecursionCount; } + sal_uInt16 GetRecursionCount() const { return nRecursionCount; } void IncRecursionCount() { ++nRecursionCount; } void DecRecursionCount() { --nRecursionCount; } /// A pure recursion return, no iteration. @@ -96,7 +96,7 @@ class ScRecursionHelper } bool IsDoingRecursion() const { return bDoingRecursion; } void SetDoingRecursion( bool b ) { bDoingRecursion = b; } - void Insert( ScFormulaCell* p, BOOL bOldRunning, + void Insert( ScFormulaCell* p, sal_Bool bOldRunning, const ScFormulaResult & rRes ) { aRecursionFormulas.insert( aInsertPos, ScFormulaRecursionEntry( p, @@ -118,7 +118,7 @@ class ScRecursionHelper bInIterationReturn = b; } bool IsDoingIteration() const { return nIteration > 0; } - USHORT GetIteration() const { return nIteration; } + sal_uInt16 GetIteration() const { return nIteration; } bool & GetConvergingReference() { return bConverging; } void StartIteration() { diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index f42f930084be..a386263efaf8 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -37,10 +37,10 @@ struct OldSingleRefBools { - BYTE bRelCol; // Flag values (see further down), 2 bits each in file format - BYTE bRelRow; - BYTE bRelTab; - BYTE bOldFlag3D; // two BOOL flags (see further down) + sal_uInt8 bRelCol; // Flag values (see further down), 2 bits each in file format + sal_uInt8 bRelRow; + sal_uInt8 bRelTab; + sal_uInt8 bOldFlag3D; // two sal_Bool flags (see further down) }; #define SR_ABSOLUTE 0 // Absolute value @@ -48,7 +48,7 @@ struct OldSingleRefBools #define SR_RELATIVE 2 // Relative value as delta value (after release 3.1) #define SR_DELETED 3 // Deleted col/row/tab -#define SRF_3D 0x01 // 3D reference, was the BOOL (before build 304a) +#define SRF_3D 0x01 // 3D reference, was the sal_Bool (before build 304a) #define SRF_RELNAME 0x02 // Reference derived from RangeName with relative values #define SRF_BITS 0x03 // Mask of possible bits @@ -64,17 +64,17 @@ struct SC_DLLPUBLIC ScSingleRefData // Single reference (one address) int union { - BOOL bFlags; + sal_Bool bFlags; struct { - BOOL bColRel :1; - BOOL bColDeleted :1; - BOOL bRowRel :1; - BOOL bRowDeleted :1; - BOOL bTabRel :1; - BOOL bTabDeleted :1; - BOOL bFlag3D :1; // 3D-Ref - BOOL bRelName :1; // Reference derived from RangeName with relative values + sal_Bool bColRel :1; + sal_Bool bColDeleted :1; + sal_Bool bRowRel :1; + sal_Bool bRowDeleted :1; + sal_Bool bTabRel :1; + sal_Bool bTabDeleted :1; + sal_Bool bFlag3D :1; // 3D-Ref + sal_Bool bRelName :1; // Reference derived from RangeName with relative values }Flags; }; @@ -85,34 +85,34 @@ struct SC_DLLPUBLIC ScSingleRefData // Single reference (one address) int inline void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab ); // InitAddressRel: InitFlags and set address, everything relative to rPos inline void InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos ); - inline void SetColRel( BOOL bVal ) { Flags.bColRel = (bVal ? TRUE : FALSE ); } - inline BOOL IsColRel() const { return Flags.bColRel; } - inline void SetRowRel( BOOL bVal ) { Flags.bRowRel = (bVal ? TRUE : FALSE ); } - inline BOOL IsRowRel() const { return Flags.bRowRel; } - inline void SetTabRel( BOOL bVal ) { Flags.bTabRel = (bVal ? TRUE : FALSE ); } - inline BOOL IsTabRel() const { return Flags.bTabRel; } - - inline void SetColDeleted( BOOL bVal ) { Flags.bColDeleted = (bVal ? TRUE : FALSE ); } - inline BOOL IsColDeleted() const { return Flags.bColDeleted; } - inline void SetRowDeleted( BOOL bVal ) { Flags.bRowDeleted = (bVal ? TRUE : FALSE ); } - inline BOOL IsRowDeleted() const { return Flags.bRowDeleted; } - inline void SetTabDeleted( BOOL bVal ) { Flags.bTabDeleted = (bVal ? TRUE : FALSE ); } - inline BOOL IsTabDeleted() const { return Flags.bTabDeleted; } - inline BOOL IsDeleted() const { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); } - - inline void SetFlag3D( BOOL bVal ) { Flags.bFlag3D = (bVal ? TRUE : FALSE ); } - inline BOOL IsFlag3D() const { return Flags.bFlag3D; } - inline void SetRelName( BOOL bVal ) { Flags.bRelName = (bVal ? TRUE : FALSE ); } - inline BOOL IsRelName() const { return Flags.bRelName; } - - inline BOOL Valid() const; + inline void SetColRel( sal_Bool bVal ) { Flags.bColRel = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsColRel() const { return Flags.bColRel; } + inline void SetRowRel( sal_Bool bVal ) { Flags.bRowRel = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsRowRel() const { return Flags.bRowRel; } + inline void SetTabRel( sal_Bool bVal ) { Flags.bTabRel = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsTabRel() const { return Flags.bTabRel; } + + inline void SetColDeleted( sal_Bool bVal ) { Flags.bColDeleted = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsColDeleted() const { return Flags.bColDeleted; } + inline void SetRowDeleted( sal_Bool bVal ) { Flags.bRowDeleted = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsRowDeleted() const { return Flags.bRowDeleted; } + inline void SetTabDeleted( sal_Bool bVal ) { Flags.bTabDeleted = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsTabDeleted() const { return Flags.bTabDeleted; } + inline sal_Bool IsDeleted() const { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); } + + inline void SetFlag3D( sal_Bool bVal ) { Flags.bFlag3D = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsFlag3D() const { return Flags.bFlag3D; } + inline void SetRelName( sal_Bool bVal ) { Flags.bRelName = (bVal ? sal_True : sal_False ); } + inline sal_Bool IsRelName() const { return Flags.bRelName; } + + inline sal_Bool Valid() const; /// In external references nTab is -1 inline bool ValidExternal() const; void SmartRelAbs( const ScAddress& rPos ); void CalcRelFromAbs( const ScAddress& rPos ); void CalcAbsIfRel( const ScAddress& rPos ); - BOOL operator==( const ScSingleRefData& ) const; + sal_Bool operator==( const ScSingleRefData& ) const; bool operator!=( const ScSingleRefData& ) const; }; @@ -133,13 +133,13 @@ inline void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos ) { InitAddress( rAdr.Col(), rAdr.Row(), rAdr.Tab()); - SetColRel( TRUE ); - SetRowRel( TRUE ); - SetTabRel( TRUE ); + SetColRel( sal_True ); + SetRowRel( sal_True ); + SetTabRel( sal_True ); CalcRelFromAbs( rPos ); } -inline BOOL ScSingleRefData::Valid() const +inline sal_Bool ScSingleRefData::Valid() const { return nCol >= 0 && nCol <= MAXCOL && nRow >= 0 && nRow <= MAXROW && @@ -183,9 +183,9 @@ struct ScComplexRefData // Complex reference (a range) into the sheet { Ref1.CalcRelFromAbs( rPos ); Ref2.CalcRelFromAbs( rPos ); } inline void CalcAbsIfRel( const ScAddress& rPos ) { Ref1.CalcAbsIfRel( rPos ); Ref2.CalcAbsIfRel( rPos ); } - inline BOOL IsDeleted() const + inline sal_Bool IsDeleted() const { return Ref1.IsDeleted() || Ref2.IsDeleted(); } - inline BOOL Valid() const + inline sal_Bool Valid() const { return Ref1.Valid() && Ref2.Valid(); } /** In external references nTab is -1 for the start tab and -1 for the end tab if one sheet, or >=0 if more than one sheets. */ @@ -193,7 +193,7 @@ struct ScComplexRefData // Complex reference (a range) into the sheet /// Absolute references have to be up-to-date when calling this! void PutInOrder(); - inline BOOL operator==( const ScComplexRefData& r ) const + inline sal_Bool operator==( const ScComplexRefData& r ) const { return Ref1 == r.Ref1 && Ref2 == r.Ref2; } /** Enlarge range if reference passed is not within existing range. ScAddress position is used to calculate absolute references from diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index 2a8512848ef0..4ad28d354568 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -43,7 +43,7 @@ class ScRefreshTimerControl { private: ::vos::OMutex aMutex; - USHORT nBlockRefresh; + sal_uInt16 nBlockRefresh; public: #if SC_REFRESHTIMER_CONTROL_LIST @@ -52,14 +52,14 @@ public: ScRefreshTimerControl() : nBlockRefresh(0) {} - void SetAllowRefresh( BOOL b ) + void SetAllowRefresh( sal_Bool b ) { if ( b && nBlockRefresh ) --nBlockRefresh; - else if ( !b && nBlockRefresh < (USHORT)(~0) ) + else if ( !b && nBlockRefresh < (sal_uInt16)(~0) ) ++nBlockRefresh; } - BOOL IsRefreshAllowed() const { return !nBlockRefresh; } + sal_Bool IsRefreshAllowed() const { return !nBlockRefresh; } ::vos::OMutex& GetMutex() { return aMutex; } }; @@ -73,7 +73,7 @@ public: ~ScRefreshTimerProtector() { if ( ppControl && *ppControl ) - (*ppControl)->SetAllowRefresh( TRUE ); + (*ppControl)->SetAllowRefresh( sal_True ); } }; @@ -107,7 +107,7 @@ private: public: ScRefreshTimer() : ppControl(0) { SetTimeout( 0 ); } - ScRefreshTimer( ULONG nSeconds ) : ppControl(0) + ScRefreshTimer( sal_uLong nSeconds ) : ppControl(0) { SetTimeout( nSeconds * 1000 ); Start(); @@ -124,10 +124,10 @@ public: return *this; } - BOOL operator==( const ScRefreshTimer& r ) const + sal_Bool operator==( const ScRefreshTimer& r ) const { return GetTimeout() == r.GetTimeout(); } - BOOL operator!=( const ScRefreshTimer& r ) const + sal_Bool operator!=( const ScRefreshTimer& r ) const { return !ScRefreshTimer::operator==( r ); } void StartRefreshTimer() @@ -143,13 +143,13 @@ public: void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); } - ULONG GetRefreshDelay() const + sal_uLong GetRefreshDelay() const { return GetTimeout() / 1000; } void StopRefreshTimer() { Stop(); } - SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds ); + SC_DLLPUBLIC virtual void SetRefreshDelay( sal_uLong nSeconds ); SC_DLLPUBLIC virtual void Timeout(); }; diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 40711a200e19..247ee21fe76b 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -73,15 +73,15 @@ public: class AbstractScAutoFormatDlg : public VclAbstractDialog //add for ScAutoFormatDlg { public: - virtual USHORT GetIndex() const = 0 ; + virtual sal_uInt16 GetIndex() const = 0 ; virtual String GetCurrFormatName() = 0; }; class AbstractScColRowLabelDlg : public VclAbstractDialog //add for ScColRowLabelDlg { public: - virtual BOOL IsCol() = 0; - virtual BOOL IsRow() = 0; + virtual sal_Bool IsCol() = 0; + virtual sal_Bool IsRow() = 0; }; class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg @@ -93,8 +93,8 @@ public: class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog //add for ScDataPilotSourceTypeDlg { public: - virtual BOOL IsDatabase() const = 0; - virtual BOOL IsExternal() const = 0; + virtual sal_Bool IsDatabase() const = 0; + virtual sal_Bool IsExternal() const = 0; }; class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg @@ -117,7 +117,7 @@ class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteC { public: virtual void DisableObjects() = 0 ; - virtual USHORT GetDelContentsCmdBits() const = 0; + virtual sal_uInt16 GetDelContentsCmdBits() const = 0; }; class AbstractScFillSeriesDlg: public VclAbstractDialog //add for ScFillSeriesDlg @@ -130,13 +130,13 @@ public: virtual double GetStep() const = 0; virtual double GetMax() const = 0; virtual String GetStartStr() const = 0; - virtual void SetEdStartValEnabled(BOOL bFlag=FALSE) = 0; + virtual void SetEdStartValEnabled(sal_Bool bFlag=sal_False) = 0; }; class AbstractScGroupDlg : public VclAbstractDialog //add for ScGroupDlg { public: - virtual BOOL GetColsChecked() const = 0; + virtual sal_Bool GetColsChecked() const = 0; }; class AbstractScInsertCellDlg : public VclAbstractDialog //add for ScInsertCellDlg @@ -148,14 +148,14 @@ public: class AbstractScInsertContentsDlg : public VclAbstractDialog //add for ScInsertContentsDlg { public: - virtual USHORT GetInsContentsCmdBits() const = 0; - virtual USHORT GetFormulaCmdBits() const = 0 ; - virtual BOOL IsSkipEmptyCells() const = 0; - virtual BOOL IsLink() const = 0; - virtual void SetFillMode( BOOL bSet ) = 0; - virtual void SetOtherDoc( BOOL bSet ) = 0; - virtual BOOL IsTranspose() const = 0; - virtual void SetChangeTrack( BOOL bSet ) = 0; + virtual sal_uInt16 GetInsContentsCmdBits() const = 0; + virtual sal_uInt16 GetFormulaCmdBits() const = 0 ; + virtual sal_Bool IsSkipEmptyCells() const = 0; + virtual sal_Bool IsLink() const = 0; + virtual void SetFillMode( sal_Bool bSet ) = 0; + virtual void SetOtherDoc( sal_Bool bSet ) = 0; + virtual sal_Bool IsTranspose() const = 0; + virtual void SetChangeTrack( sal_Bool bSet ) = 0; virtual void SetCellShiftDisabled( int nDisable ) = 0; virtual InsCellCmd GetMoveMode() = 0; }; @@ -163,13 +163,13 @@ public: class AbstractScInsertTableDlg : public VclAbstractDialog //add for ScInsertTableDlg { public: - virtual BOOL GetTablesFromFile() = 0; - virtual BOOL GetTablesAsLink() = 0; - virtual const String* GetFirstTable( USHORT* pN = NULL ) = 0; + virtual sal_Bool GetTablesFromFile() = 0; + virtual sal_Bool GetTablesAsLink() = 0; + virtual const String* GetFirstTable( sal_uInt16* pN = NULL ) = 0; virtual ScDocShell* GetDocShellTables() = 0; - virtual BOOL IsTableBefore() = 0; - virtual USHORT GetTableCount() = 0; - virtual const String* GetNextTable( USHORT* pN = NULL ) = 0; + virtual sal_Bool IsTableBefore() = 0; + virtual sal_uInt16 GetTableCount() = 0; + virtual const String* GetNextTable( sal_uInt16* pN = NULL ) = 0; }; @@ -184,12 +184,12 @@ class AbstractScLinkedAreaDlg : public VclAbstractDialog2 //add for ScLinkedAre public: virtual void InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, - ULONG nRefresh ) = 0; + sal_uLong nRefresh ) = 0; virtual String GetURL() = 0; virtual String GetFilter() = 0; // may be empty virtual String GetOptions() = 0; // filter options virtual String GetSource() = 0; // separated by ";" - virtual ULONG GetRefresh() = 0; // 0 if disabled + virtual sal_uLong GetRefresh() = 0; // 0 if disabled }; class AbstractScMetricInputDlg : public VclAbstractDialog //add for ScMetricInputDlg @@ -201,17 +201,17 @@ public: class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDlg { public: - virtual USHORT GetSelectedDocument () const = 0; - virtual USHORT GetSelectedTable () const = 0; - virtual BOOL GetCopyTable () const = 0; - virtual void SetCopyTable (BOOL bFlag=TRUE) = 0; - virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0; + virtual sal_uInt16 GetSelectedDocument () const = 0; + virtual sal_uInt16 GetSelectedTable () const = 0; + virtual sal_Bool GetCopyTable () const = 0; + virtual void SetCopyTable (sal_Bool bFlag=sal_True) = 0; + virtual void EnableCopyTable (sal_Bool bFlag=sal_True) = 0; }; class AbstractScNameCreateDlg : public VclAbstractDialog //add for ScNameCreateDlg { public: - virtual USHORT GetFlags() const = 0; + virtual sal_uInt16 GetFlags() const = 0; }; class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg @@ -229,14 +229,14 @@ public: class AbstractScDPFunctionDlg : public VclAbstractDialog //add for ScDPFunctionDlg { public: - virtual USHORT GetFuncMask() const = 0; + virtual sal_uInt16 GetFuncMask() const = 0; virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const = 0; }; class AbstractScDPSubtotalDlg : public VclAbstractDialog //add for ScDPSubtotalDlg { public: - virtual USHORT GetFuncMask() const = 0; + virtual sal_uInt16 GetFuncMask() const = 0; virtual void FillLabelData( ScDPLabelData& rLabelData ) const = 0; }; @@ -264,20 +264,20 @@ class AbstractScNewScenarioDlg : public VclAbstractDialog //add for ScNewScenar public: virtual void SetScenarioData( const String& rName, const String& rComment, - const Color& rColor, USHORT nFlags ) = 0; + const Color& rColor, sal_uInt16 nFlags ) = 0; virtual void GetScenarioData( String& rName, String& rComment, - Color& rColor, USHORT& rFlags ) const = 0; + Color& rColor, sal_uInt16& rFlags ) const = 0; }; class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg { public: - virtual void Insert( const String& rString, BOOL bSelected ) = 0; - virtual USHORT GetSelectEntryCount() const = 0; + virtual void Insert( const String& rString, sal_Bool bSelected ) = 0; + virtual sal_uInt16 GetSelectEntryCount() const = 0; virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ) = 0; - virtual String GetSelectEntry(USHORT nPos) const = 0; - virtual USHORT GetSelectEntryPos(USHORT nPos) const = 0; + virtual String GetSelectEntry(sal_uInt16 nPos) const = 0; + virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0; }; class AbstractScStringInputDlg : public VclAbstractDialog //add for ScStringInputDlg @@ -324,27 +324,27 @@ public: int nId) = 0; virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg int nId, - BOOL bCol = FALSE, - BOOL bRow = FALSE) = 0; + sal_Bool bCol = sal_False, + sal_Bool bRow = sal_False) = 0; virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg const String& rStrTitle, const String& rStrLabel, int nId, - BOOL bColDefault = TRUE ) = 0; + sal_Bool bColDefault = sal_True ) = 0; virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg - virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, BOOL bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg + virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg const com::sun::star::uno::Sequence<rtl::OUString>& rServices, int nId ) = 0; - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = sal_False ) = 0 ; //add for ScDeleteCellDlg virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg - USHORT nCheckDefaults = 0 ) = 0; + sal_uInt16 nCheckDefaults = 0 ) = 0; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg ScDocument& rDocument, FillDir eFillDir, @@ -353,29 +353,29 @@ public: String aStartStr, double fStep, double fMax, - USHORT nPossDir, + sal_uInt16 nPossDir, int nId) = 0; virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg - USHORT nResId, + sal_uInt16 nResId, int nId, - BOOL bUnGroup = FALSE, - BOOL bRows = TRUE ) = 0; + sal_Bool bUnGroup = sal_False, + sal_Bool bRows = sal_True ) = 0; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg int nId, - BOOL bDisallowCellMove = FALSE ) = 0; + sal_Bool bDisallowCellMove = sal_False ) = 0; virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg int nId, - USHORT nCheckDefaults = 0, + sal_uInt16 nCheckDefaults = 0, const String* pStrTitle = NULL ) = 0; virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg SCTAB nTabCount, bool bFromFile, int nId) = 0; virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg - USHORT nResId, + sal_uInt16 nResId, const String& aTitle, const String& aLbTitle, List& aEntryList, @@ -383,12 +383,12 @@ public: virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg - USHORT nResId, // Ableitung fuer jeden Dialog! + sal_uInt16 nResId, // Ableitung fuer jeden Dialog! long nCurrent, long nDefault, int nId , FieldUnit eFUnit = FUNIT_MM, - USHORT nDecimals = 2, + sal_uInt16 nDecimals = 2, long nMaximum = 1000, long nMinimum = 0, long nFirst = 1, @@ -396,13 +396,13 @@ public: virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ) = 0; //add for ScMoveTableDlg - virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId ) = 0; //add for ScNameCreateDlg + virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId ) = 0; //add for ScNameCreateDlg virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList, //add for ScNamePasteDlg - int nId , BOOL bInsList=TRUE ) = 0; + int nId , sal_Bool bInsList=sal_True ) = 0; virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg - const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) = 0; + const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) = 0; virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, const ScDPLabelDataVec& rLabelVec, @@ -428,11 +428,11 @@ public: virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId, ScDPObject& rDPObj, - USHORT nOrient ) = 0; + sal_uInt16 nOrient ) = 0; virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg int nId, - BOOL bEdit = FALSE, BOOL bSheetProtected = FALSE ) = 0; + sal_Bool bEdit = sal_False, sal_Bool bSheetProtected = sal_False ) = 0; virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0; //add for ScShowTabDlg virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, //add for ScStringInputDlg @@ -451,12 +451,12 @@ public: virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, - BOOL bAscii = TRUE, + sal_Bool bAscii = sal_True, const ScImportOptions* pOptions = NULL, const String* pStrTitle = NULL, - BOOL bMultiByte = FALSE, - BOOL bOnlyDbtoolsEncodings = FALSE, - BOOL bImport = TRUE ) = 0; + sal_Bool bMultiByte = sal_False, + sal_Bool bOnlyDbtoolsEncodings = sal_False, + sal_Bool bImport = sal_True ) = 0; virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg Window* pParent, @@ -468,11 +468,11 @@ public: const SfxItemSet& rCoreSet, const String& rPageStyle, int nId, - USHORT nResId = RID_SCDLG_HFEDIT ) = 0; + sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0; virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg SfxStyleSheetBase& rStyleBase, - USHORT nRscId, + sal_uInt16 nRscId, int nId) = 0; virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg @@ -495,8 +495,8 @@ public: virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg const SfxItemSet* pArgSet,int nId ) = 0; // for tabpage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; }; #endif diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index a10c794b9c43..fde9c31ed326 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -67,7 +67,7 @@ public: static void Init(); // called directly after loading the DLL static void Exit(); // called directly befor unloading the DLL - static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, + static sal_uLong DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index b788672aa715..971b32336e6c 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -38,7 +38,7 @@ class SvStream; class ScInterpreter; class SvNumberFormatter; -typedef BYTE ScMatValType; +typedef sal_uInt8 ScMatValType; const ScMatValType SC_MATVAL_VALUE = 0x00; const ScMatValType SC_MATVAL_BOOLEAN = 0x01; const ScMatValType SC_MATVAL_STRING = 0x02; @@ -55,7 +55,7 @@ union ScMatrixValue const String& GetString() const { return pS ? *pS : EMPTY_STRING; } /// Only valid if ScMatrix methods indicate that this is no string! - USHORT GetError() const { return GetDoubleErrorValue( fVal); } + sal_uInt16 GetError() const { return GetDoubleErrorValue( fVal); } /// Only valid if ScMatrix methods indicate that this is a boolean bool GetBoolean() const { return fVal != 0.; } @@ -94,9 +94,9 @@ class SC_DLLPUBLIC ScMatrix { ScMatrixValue* pMat; ScMatValType* mnValType; - ULONG mnNonValue; // how many strings and empties + sal_uLong mnNonValue; // how many strings and empties ScInterpreter* pErrorInterpreter; - mutable ULONG nRefCnt; // reference count + mutable sal_uLong nRefCnt; // reference count SCSIZE nColCount; SCSIZE nRowCount; bool mbCloneIfConst; // Whether the matrix is cloned with a CloneIfConst() call. @@ -107,7 +107,7 @@ class SC_DLLPUBLIC ScMatrix void Clear(); // pStr may be NULL, bFlag MUST NOT be 0 - void PutStringEntry( const String* pStr, BYTE bFlag, SCSIZE nIndex ); + void PutStringEntry( const String* pStr, sal_uInt8 bFlag, SCSIZE nIndex ); // only delete via Delete() ~ScMatrix(); @@ -116,7 +116,7 @@ class SC_DLLPUBLIC ScMatrix ScMatrix( const ScMatrix& ); ScMatrix& operator=( const ScMatrix&); - void SetErrorAtInterpreter( USHORT nError) const; + void SetErrorAtInterpreter( sal_uInt16 nError) const; public: @@ -278,12 +278,12 @@ public: void PutString( const String& rStr, SCSIZE nIndex); void PutEmpty( SCSIZE nC, SCSIZE nR); void PutEmpty( SCSIZE nIndex); - /// Jump FALSE without path + /// Jump sal_False without path void PutEmptyPath( SCSIZE nC, SCSIZE nR); void PutEmptyPath( SCSIZE nIndex); - void PutError( USHORT nErrorCode, SCSIZE nC, SCSIZE nR ) + void PutError( sal_uInt16 nErrorCode, SCSIZE nC, SCSIZE nR ) { PutDouble( CreateDoubleError( nErrorCode ), nC, nR ); } - void PutError( USHORT nErrorCode, SCSIZE nIndex ) + void PutError( sal_uInt16 nErrorCode, SCSIZE nIndex ) { PutDouble( CreateDoubleError( nErrorCode ), nIndex ); } void PutBoolean( bool bVal, SCSIZE nC, SCSIZE nR); void PutBoolean( bool bVal, SCSIZE nIndex); @@ -296,15 +296,15 @@ public: @ATTENTION: MUST NOT be used if the element is a string! Use GetErrorIfNotString() instead if not sure. @returns 0 if no error, else one of err... constants */ - USHORT GetError( SCSIZE nC, SCSIZE nR) const; - USHORT GetError( SCSIZE nIndex) const + sal_uInt16 GetError( SCSIZE nC, SCSIZE nR) const; + sal_uInt16 GetError( SCSIZE nIndex) const { return pMat[nIndex].GetError(); } /** Use in ScInterpreter to obtain the error code, if any. @returns 0 if no error or string element, else one of err... constants */ - USHORT GetErrorIfNotString( SCSIZE nC, SCSIZE nR) const + sal_uInt16 GetErrorIfNotString( SCSIZE nC, SCSIZE nR) const { return IsValue( nC, nR) ? GetError( nC, nR) : 0; } - USHORT GetErrorIfNotString( SCSIZE nIndex) const + sal_uInt16 GetErrorIfNotString( SCSIZE nIndex) const { return IsValue( nIndex) ? GetError( nIndex) : 0; } /// @return 0.0 if empty or empty path, else value or DoubleError. @@ -314,7 +314,7 @@ public: { if ( pErrorInterpreter ) { - USHORT nError = GetDoubleErrorValue( pMat[nIndex].fVal); + sal_uInt16 nError = GetDoubleErrorValue( pMat[nIndex].fVal); if ( nError ) SetErrorAtInterpreter( nError); } @@ -339,56 +339,56 @@ public: const ScMatrixValue* Get( SCSIZE nC, SCSIZE nR, ScMatValType& nType) const; /// @return <TRUE/> if string or empty or empty path, in fact non-value. - BOOL IsString( SCSIZE nIndex ) const + sal_Bool IsString( SCSIZE nIndex ) const { return mnValType && IsNonValueType( mnValType[nIndex]); } /// @return <TRUE/> if string or empty or empty path, in fact non-value. - BOOL IsString( SCSIZE nC, SCSIZE nR ) const + sal_Bool IsString( SCSIZE nC, SCSIZE nR ) const { ValidColRowReplicated( nC, nR ); return mnValType && IsNonValueType( mnValType[ nC * nRowCount + nR ]); } /// @return <TRUE/> if empty or empty path. - BOOL IsEmpty( SCSIZE nIndex ) const + sal_Bool IsEmpty( SCSIZE nIndex ) const { return mnValType && ((mnValType[nIndex] & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY); } /// @return <TRUE/> if empty or empty path. - BOOL IsEmpty( SCSIZE nC, SCSIZE nR ) const + sal_Bool IsEmpty( SCSIZE nC, SCSIZE nR ) const { ValidColRowReplicated( nC, nR ); return mnValType && ((mnValType[ nC * nRowCount + nR ] & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY); } /// @return <TRUE/> if empty path. - BOOL IsEmptyPath( SCSIZE nC, SCSIZE nR ) const + sal_Bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const { ValidColRowReplicated( nC, nR ); return mnValType && ((mnValType[ nC * nRowCount + nR ] & SC_MATVAL_EMPTYPATH) == SC_MATVAL_EMPTYPATH); } /// @return <TRUE/> if empty path. - BOOL IsEmptyPath( SCSIZE nIndex ) const + sal_Bool IsEmptyPath( SCSIZE nIndex ) const { return mnValType && ((mnValType[nIndex] & SC_MATVAL_EMPTYPATH) == SC_MATVAL_EMPTYPATH); } /// @return <TRUE/> if value or boolean. - BOOL IsValue( SCSIZE nIndex ) const + sal_Bool IsValue( SCSIZE nIndex ) const { return !mnValType || IsValueType( mnValType[nIndex]); } /// @return <TRUE/> if value or boolean. - BOOL IsValue( SCSIZE nC, SCSIZE nR ) const + sal_Bool IsValue( SCSIZE nC, SCSIZE nR ) const { ValidColRowReplicated( nC, nR ); return !mnValType || IsValueType( mnValType[ nC * nRowCount + nR ]); } /// @return <TRUE/> if value or boolean or empty or empty path. - BOOL IsValueOrEmpty( SCSIZE nIndex ) const + sal_Bool IsValueOrEmpty( SCSIZE nIndex ) const { return !mnValType || IsValueType( mnValType[nIndex] ) || ((mnValType[nIndex] & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY); } /// @return <TRUE/> if value or boolean or empty or empty path. - BOOL IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const + sal_Bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const { ValidColRowReplicated( nC, nR ); return !mnValType || IsValueType( mnValType[ nC * nRowCount + nR ]) || @@ -397,18 +397,18 @@ public: } /// @return <TRUE/> if boolean. - BOOL IsBoolean( SCSIZE nIndex ) const + sal_Bool IsBoolean( SCSIZE nIndex ) const { return mnValType && IsBooleanType( mnValType[nIndex]); } /// @return <TRUE/> if boolean. - BOOL IsBoolean( SCSIZE nC, SCSIZE nR ) const + sal_Bool IsBoolean( SCSIZE nC, SCSIZE nR ) const { ValidColRowReplicated( nC, nR ); return mnValType && IsBooleanType( mnValType[ nC * nRowCount + nR ]); } /// @return <TRUE/> if entire matrix is numeric, including booleans, with no strings or empties - BOOL IsNumeric() const + sal_Bool IsNumeric() const { return 0 == mnNonValue; } void MatTrans( ScMatrix& mRes) const; diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index e1d9ab0fd4b9..b4ec23838225 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -139,15 +139,15 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener SfxErrorHandler* pErrorHdl; SvxErrorHandler* pSvxErrorHdl; ScFormEditData* pFormEditData; - USHORT nCurRefDlgId; - BOOL bIsWaterCan; - BOOL bIsInEditCommand; - BOOL bIsInExecuteDrop; + sal_uInt16 nCurRefDlgId; + sal_Bool bIsWaterCan; + sal_Bool bIsInEditCommand; + sal_Bool bIsInExecuteDrop; bool mbIsInSharedDocLoading; bool mbIsInSharedDocSaving; //<!--Added by PengYunQuan for Validity Cell Range Picker - std::map<USHORT, std::list<Window*> > m_mapRefWindow; + std::map<sal_uInt16, std::list<Window*> > m_mapRefWindow; //-->Added by PengYunQuan for Validity Cell Range Picker public: SFX_DECL_INTERFACE(SCID_APP) @@ -189,14 +189,14 @@ public: ScSelectionTransferObj* GetSelectionTransfer() const { return pSelTransfer; } void SetSelectionTransfer( ScSelectionTransferObj* pNew ); - void SetWaterCan( BOOL bNew ) { bIsWaterCan = bNew; } - BOOL GetIsWaterCan() const { return bIsWaterCan; } + void SetWaterCan( sal_Bool bNew ) { bIsWaterCan = bNew; } + sal_Bool GetIsWaterCan() const { return bIsWaterCan; } - void SetInEditCommand( BOOL bNew ) { bIsInEditCommand = bNew; } - BOOL IsInEditCommand() const { return bIsInEditCommand; } + void SetInEditCommand( sal_Bool bNew ) { bIsInEditCommand = bNew; } + sal_Bool IsInEditCommand() const { return bIsInEditCommand; } - void SetInExecuteDrop( BOOL bNew ) { bIsInExecuteDrop = bNew; } - BOOL IsInExecuteDrop() const { return bIsInExecuteDrop; } + void SetInExecuteDrop( sal_Bool bNew ) { bIsInExecuteDrop = bNew; } + sal_Bool IsInExecuteDrop() const { return bIsInExecuteDrop; } // Options: const ScViewOptions& GetViewOptions (); @@ -209,15 +209,15 @@ SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); void SetInputOptions ( const ScInputOptions& rOpt ); void SetPrintOptions ( const ScPrintOptions& rOpt ); - void InsertEntryToLRUList(USHORT nFIndex); + void InsertEntryToLRUList(sal_uInt16 nFIndex); void RecentFunctionsChanged(); - static void GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, - BOOL& rAutoSpell ); - static void SetAutoSpellProperty( BOOL bSet ); - static BOOL HasThesaurusLanguage( USHORT nLang ); + static void GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& rCjkLang, sal_uInt16& rCtlLang, + sal_Bool& rAutoSpell ); + static void SetAutoSpellProperty( sal_Bool bSet ); + static sal_Bool HasThesaurusLanguage( sal_uInt16 nLang ); - USHORT GetOptDigitLanguage(); // from CTL options + sal_uInt16 GetOptDigitLanguage(); // from CTL options ScNavipiCfg& GetNavipiCfg(); ScAddInCfg& GetAddInCfg(); @@ -229,15 +229,15 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO void ModifyOptions( const SfxItemSet& rOptSet ); // InputHandler: - BOOL IsEditMode(); // nicht bei SC_INPUT_TYPE - BOOL IsInputMode(); // auch bei SC_INPUT_TYPE + sal_Bool IsEditMode(); // nicht bei SC_INPUT_TYPE + sal_Bool IsInputMode(); // auch bei SC_INPUT_TYPE void SetInputMode( ScInputMode eMode ); - BOOL InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); - SC_DLLPUBLIC void InputEnterHandler( BYTE nBlockMode = 0 ); + sal_Bool InputKeyEvent( const KeyEvent& rKEvt, sal_Bool bStartEdit = sal_False ); + SC_DLLPUBLIC void InputEnterHandler( sal_uInt8 nBlockMode = 0 ); void InputCancelHandler(); void InputSelection( EditView* pView ); void InputChanged( EditView* pView ); - ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, BOOL bUseRef = TRUE ); + ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, sal_Bool bUseRef = sal_True ); void SetRefInputHdl( ScInputHandler* pNew ); ScInputHandler* GetRefInputHdl(); @@ -250,7 +250,7 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO void InputReplaceSelection( const String& rStr ); String InputGetFormulaStr(); void ActivateInputWindow( const String* pStr = NULL, - BOOL bMatrix = FALSE ); + sal_Bool bMatrix = sal_False ); void InitFormEditData(); void ClearFormEditData(); @@ -258,33 +258,33 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO // Referenzeingabe: //<!--Added by PengYunQuan for Validity Cell Range Picker - //void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL ); - SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL ); + //void SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewFrm = NULL ); + SC_DLLPUBLIC void SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewFrm = NULL ); //-->Added by PengYunQuan for Validity Cell Range Picker - BOOL IsModalMode(SfxObjectShell* pDocSh = NULL); - BOOL IsFormulaMode(); - BOOL IsRefDialogOpen(); - BOOL IsTableLocked(); + sal_Bool IsModalMode(SfxObjectShell* pDocSh = NULL); + sal_Bool IsFormulaMode(); + sal_Bool IsRefDialogOpen(); + sal_Bool IsTableLocked(); void SetReference( const ScRange& rRef, ScDocument* pDoc, const ScMarkData* pMarkData = NULL ); void AddRefEntry(); void EndReference(); - USHORT GetCurRefDlgId() const { return nCurRefDlgId; } + sal_uInt16 GetCurRefDlgId() const { return nCurRefDlgId; } //virtuelle Methoden fuer den Optionendialog - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ); + virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } bool IsInSharedDocLoading() const { return mbIsInSharedDocLoading; } void SetInSharedDocSaving( bool bNew ) { mbIsInSharedDocSaving = bNew; } bool IsInSharedDocSaving() const { return mbIsInSharedDocSaving; } - SC_DLLPUBLIC BOOL RegisterRefWindow( USHORT nSlotId, Window *pWnd ); - SC_DLLPUBLIC BOOL UnregisterRefWindow( USHORT nSlotId, Window *pWnd ); - SC_DLLPUBLIC BOOL IsAliveRefDlg( USHORT nSlotId, Window *pWnd ); - SC_DLLPUBLIC Window * Find1RefWindow( USHORT nSlotId, Window *pWndAncestor ); + SC_DLLPUBLIC sal_Bool RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); + SC_DLLPUBLIC sal_Bool UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); + SC_DLLPUBLIC sal_Bool IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd ); + SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ); SC_DLLPUBLIC Window * Find1RefWindow( Window *pWndAncestor ); }; diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx index 067e5f03e307..660404bda5a9 100644 --- a/sc/inc/scresid.hxx +++ b/sc/inc/scresid.hxx @@ -36,7 +36,7 @@ class SC_DLLPUBLIC ScResId : public ResId { public: - ScResId( USHORT nId ); // in scdll.cxx + ScResId( sal_uInt16 nId ); // in scdll.cxx }; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index ddbbf3108daf..74ae321bd409 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -76,7 +76,7 @@ private: ::com::sun::star::beans::XPropertyState* pShapePropertyState; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo; com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId; - BOOL bIsTextShape; + sal_Bool bIsTextShape; bool bInitializedNotifier; SdrObject* GetSdrObject() const throw(); diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index 650293893678..862d0271e617 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -46,22 +46,22 @@ struct SC_DLLPUBLIC ScSortParam SCROW nRow1; SCCOL nCol2; SCROW nRow2; - BOOL bHasHeader; - BOOL bByRow; - BOOL bCaseSens; - BOOL bUserDef; - USHORT nUserIndex; - BOOL bIncludePattern; - BOOL bInplace; + sal_Bool bHasHeader; + sal_Bool bByRow; + sal_Bool bCaseSens; + sal_Bool bUserDef; + sal_uInt16 nUserIndex; + sal_Bool bIncludePattern; + sal_Bool bInplace; SCTAB nDestTab; SCCOL nDestCol; SCROW nDestRow; - BOOL bDoSort[MAXSORT]; + sal_Bool bDoSort[MAXSORT]; SCCOLROW nField[MAXSORT]; - BOOL bAscending[MAXSORT]; + sal_Bool bAscending[MAXSORT]; ::com::sun::star::lang::Locale aCollatorLocale; String aCollatorAlgorithm; - USHORT nCompatHeader; + sal_uInt16 nCompatHeader; ScSortParam(); ScSortParam( const ScSortParam& r ); @@ -71,7 +71,7 @@ struct SC_DLLPUBLIC ScSortParam ScSortParam( const ScQueryParam&, SCCOL nCol ); ScSortParam& operator= ( const ScSortParam& r ); - BOOL operator== ( const ScSortParam& rOther ) const; + sal_Bool operator== ( const ScSortParam& rOther ) const; void Clear (); void MoveToDest(); diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 946a861231d9..81352c0a989e 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -64,7 +64,7 @@ public: const String* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, - USHORT nMask = 0xffff, USHORT nPos = 0xffff ); + sal_uInt16 nMask = 0xffff, sal_uInt16 nPos = 0xffff ); protected: virtual ~ScStyleSheetPool(); @@ -73,7 +73,7 @@ protected: virtual SfxStyleSheetBase* Create( const String& rName, SfxStyleFamily eFamily, - USHORT nMask); + sal_uInt16 nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ); private: diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 4e42be6e2563..087bf44d3b51 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -59,17 +59,17 @@ public: ScStyleSheet( const ScStyleSheet& rStyle ); - virtual BOOL SetParent ( const String& rParentName ); + virtual sal_Bool SetParent ( const String& rParentName ); virtual SfxItemSet& GetItemSet (); - virtual BOOL IsUsed () const; - virtual BOOL HasFollowSupport () const; - virtual BOOL HasParentSupport () const; + virtual sal_Bool IsUsed () const; + virtual sal_Bool HasFollowSupport () const; + virtual sal_Bool HasParentSupport () const; virtual const String& GetName() const; virtual const String& GetParent() const; virtual const String& GetFollow() const; - virtual BOOL SetName( const String& ); + virtual sal_Bool SetName( const String& ); void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; } @@ -82,7 +82,7 @@ protected: ScStyleSheet( const String& rName, ScStyleSheetPool& rPool, SfxStyleFamily eFamily, - USHORT nMask ); + sal_uInt16 nMask ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx index 6b44d8e4e3ef..311d8fe05b05 100644 --- a/sc/inc/strload.hxx +++ b/sc/inc/strload.hxx @@ -34,7 +34,7 @@ class ScRscStrLoader : public Resource { public: - ScRscStrLoader( USHORT nRsc, USHORT nStrId ) : + ScRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId ) : Resource( ScResId( nRsc ) ), theStr( ScResId( nStrId ) ) { FreeResource(); diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index a1dee10fd75d..8f9aa2ff0ab1 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; // Familie - ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); + ScStyleObj* GetObjectByIndex_Impl(sal_uInt32 nIndex); ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); public: diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index 4349c2759ae9..5a413c95e5ee 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -34,9 +34,9 @@ class SubTotal { public: - static BOOL SafePlus( double& fVal1, double fVal2); - static BOOL SafeMult( double& fVal1, double fVal2); - static BOOL SafeDiv( double& fVal1, double fVal2); + static sal_Bool SafePlus( double& fVal1, double fVal2); + static sal_Bool SafeMult( double& fVal1, double fVal2); + static sal_Bool SafeDiv( double& fVal1, double fVal2); }; @@ -45,10 +45,10 @@ struct ScFunctionData // zum Berechnen von einzelnen Funktione ScSubTotalFunc eFunc; double nVal; long nCount; - BOOL bError; + sal_Bool bError; ScFunctionData( ScSubTotalFunc eFn ) : - eFunc(eFn), nVal(0.0), nCount(0), bError(FALSE) {} + eFunc(eFn), nVal(0.0), nCount(0), bError(sal_False) {} }; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 02fd917d2db9..524919da5e39 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -111,20 +111,20 @@ private: String aName; String aCodeName; String aComment; - BOOL bScenario; - BOOL bLayoutRTL; - BOOL bLoadingRTL; + sal_Bool bScenario; + sal_Bool bLayoutRTL; + sal_Bool bLoadingRTL; String aLinkDoc; String aLinkFlt; String aLinkOpt; String aLinkTab; - ULONG nLinkRefreshDelay; - BYTE nLinkMode; + sal_uLong nLinkRefreshDelay; + sal_uInt8 nLinkMode; // Seitenformatvorlage String aPageStyle; - BOOL bPageSizeValid; + sal_Bool bPageSizeValid; Size aPageSizeTwips; // Groesse der Druck-Seite SCCOL nRepeatStartX; // Wiederholungszeilen/Spalten SCCOL nRepeatEndX; // REPEAT_NONE, wenn nicht benutzt @@ -133,11 +133,11 @@ private: ::std::auto_ptr<ScTableProtection> pTabProtection; - USHORT* pColWidth; + sal_uInt16* pColWidth; ::boost::shared_ptr<ScFlatUInt16RowSegments> mpRowHeights; - BYTE* pColFlags; - ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags; + sal_uInt8* pColFlags; + ScBitMaskCompressedArray< SCROW, sal_uInt8>* pRowFlags; ::boost::shared_ptr<ScFlatBoolColSegments> mpHiddenCols; ::boost::shared_ptr<ScFlatBoolRowSegments> mpHiddenRows; ::boost::shared_ptr<ScFlatBoolColSegments> mpFilteredCols; @@ -154,16 +154,16 @@ private: SCCOL nTableAreaX; SCROW nTableAreaY; - BOOL bTableAreaValid; + sal_Bool bTableAreaValid; // interne Verwaltung ------------------ - BOOL bVisible; - BOOL bStreamValid; - BOOL bPendingRowHeights; - BOOL bCalcNotification; + sal_Bool bVisible; + sal_Bool bStreamValid; + sal_Bool bPendingRowHeights; + sal_Bool bCalcNotification; SCTAB nTab; - USHORT nRecalcLvl; // Rekursionslevel Size-Recalc + sal_uInt16 nRecalcLvl; // Rekursionslevel Size-Recalc ScDocument* pDocument; utl::SearchParam* pSearchParam; utl::TextSearch* pSearchText; @@ -175,22 +175,22 @@ private: // SortierParameter um den Stackbedarf von Quicksort zu Minimieren ScSortParam aSortParam; CollatorWrapper* pSortCollator; - BOOL bGlobalKeepQuery; - BOOL bSharedNameInserted; + sal_Bool bGlobalKeepQuery; + sal_Bool bSharedNameInserted; ScRangeVec aPrintRanges; - BOOL bPrintEntireSheet; + sal_Bool bPrintEntireSheet; ScRange* pRepeatColRange; ScRange* pRepeatRowRange; - USHORT nLockCount; + sal_uInt16 nLockCount; ScRangeList* pScenarioRanges; Color aScenarioColor; Color aTabBgColor; - USHORT nScenarioFlags; - BOOL bActiveScenario; + sal_uInt16 nScenarioFlags; + sal_Bool bActiveScenario; bool mbPageBreaksValid; friend class ScDocument; // fuer FillInfo @@ -207,68 +207,68 @@ friend class ScAttrRectIterator; public: ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, - BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE ); + sal_Bool bColInfo = sal_True, sal_Bool bRowInfo = sal_True ); ~ScTable(); ScOutlineTable* GetOutlineTable() { return pOutlineTable; } SCSIZE GetCellCount(SCCOL nCol) const; - ULONG GetCellCount() const; - ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln + sal_uLong GetCellCount() const; + sal_uLong GetWeightedCount() const; + sal_uLong GetCodeCount() const; // RPN-Code in Formeln - BOOL SetOutlineTable( const ScOutlineTable* pNewOutline ); + sal_Bool SetOutlineTable( const ScOutlineTable* pNewOutline ); void StartOutlineTable(); void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - BOOL TestRemoveSubTotals( const ScSubTotalParam& rParam ); + sal_Bool TestRemoveSubTotals( const ScSubTotalParam& rParam ); void RemoveSubTotals( ScSubTotalParam& rParam ); - BOOL DoSubTotals( ScSubTotalParam& rParam ); + sal_Bool DoSubTotals( ScSubTotalParam& rParam ); const ScSheetEvents* GetSheetEvents() const { return pSheetEvents; } void SetSheetEvents( const ScSheetEvents* pNew ); - BOOL IsVisible() const { return bVisible; } - void SetVisible( BOOL bVis ); + sal_Bool IsVisible() const { return bVisible; } + void SetVisible( sal_Bool bVis ); - BOOL IsStreamValid() const { return bStreamValid; } - void SetStreamValid( BOOL bSet, BOOL bIgnoreLock = FALSE ); + sal_Bool IsStreamValid() const { return bStreamValid; } + void SetStreamValid( sal_Bool bSet, sal_Bool bIgnoreLock = sal_False ); - BOOL IsPendingRowHeights() const { return bPendingRowHeights; } - void SetPendingRowHeights( BOOL bSet ); + sal_Bool IsPendingRowHeights() const { return bPendingRowHeights; } + void SetPendingRowHeights( sal_Bool bSet ); - BOOL GetCalcNotification() const { return bCalcNotification; } - void SetCalcNotification( BOOL bSet ); + sal_Bool GetCalcNotification() const { return bCalcNotification; } + void SetCalcNotification( sal_Bool bSet ); - BOOL IsLayoutRTL() const { return bLayoutRTL; } - BOOL IsLoadingRTL() const { return bLoadingRTL; } - void SetLayoutRTL( BOOL bSet ); - void SetLoadingRTL( BOOL bSet ); + sal_Bool IsLayoutRTL() const { return bLayoutRTL; } + sal_Bool IsLoadingRTL() const { return bLoadingRTL; } + void SetLayoutRTL( sal_Bool bSet ); + void SetLoadingRTL( sal_Bool bSet ); - BOOL IsScenario() const { return bScenario; } - void SetScenario( BOOL bFlag ); + sal_Bool IsScenario() const { return bScenario; } + void SetScenario( sal_Bool bFlag ); void GetScenarioComment( String& rComment) const { rComment = aComment; } void SetScenarioComment( const String& rComment ) { aComment = rComment; } const Color& GetScenarioColor() const { return aScenarioColor; } void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } const Color& GetTabBgColor() const; void SetTabBgColor(const Color& rColor); - USHORT GetScenarioFlags() const { return nScenarioFlags; } - void SetScenarioFlags(USHORT nNew) { nScenarioFlags = nNew; } - void SetActiveScenario(BOOL bSet) { bActiveScenario = bSet; } - BOOL IsActiveScenario() const { return bActiveScenario; } + sal_uInt16 GetScenarioFlags() const { return nScenarioFlags; } + void SetScenarioFlags(sal_uInt16 nNew) { nScenarioFlags = nNew; } + void SetActiveScenario(sal_Bool bSet) { bActiveScenario = bSet; } + sal_Bool IsActiveScenario() const { return bActiveScenario; } - BYTE GetLinkMode() const { return nLinkMode; } - BOOL IsLinked() const { return nLinkMode != SC_LINK_NONE; } + sal_uInt8 GetLinkMode() const { return nLinkMode; } + sal_Bool IsLinked() const { return nLinkMode != SC_LINK_NONE; } const String& GetLinkDoc() const { return aLinkDoc; } const String& GetLinkFlt() const { return aLinkFlt; } const String& GetLinkOpt() const { return aLinkOpt; } const String& GetLinkTab() const { return aLinkTab; } - ULONG GetLinkRefreshDelay() const { return nLinkRefreshDelay; } + sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; } - void SetLink( BYTE nMode, const String& rDoc, const String& rFlt, - const String& rOpt, const String& rTab, ULONG nRefreshDelay ); + void SetLink( sal_uInt8 nMode, const String& rDoc, const String& rFlt, + const String& rOpt, const String& rTab, sal_uLong nRefreshDelay ); void GetName( String& rName ) const; void SetName( const String& rNewName ); @@ -282,7 +282,7 @@ public: void SetPageStyle( const String& rName ); void PageStyleModified( const String& rNewName ); - BOOL IsProtected() const; + sal_Bool IsProtected() const; void SetProtection(const ScTableProtection* pProtect); ScTableProtection* GetProtection(); @@ -295,25 +295,25 @@ public: void LockTable(); void UnlockTable(); - BOOL IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, - SCROW nRow2, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionEditable( const ScMarkData& rMark, - BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; + sal_Bool IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, + SCROW nRow2, sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const; + sal_Bool IsSelectionEditable( const ScMarkData& rMark, + sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; - BOOL HasSelectionMatrixFragment( const ScMarkData& rMark ) const; + sal_Bool HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; + sal_Bool HasSelectionMatrixFragment( const ScMarkData& rMark ) const; - BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; + sal_Bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; void PutCell( const ScAddress&, ScBaseCell* pCell ); -//UNUSED2009-05 void PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell); +//UNUSED2009-05 void PutCell( const ScAddress&, sal_uLong nFormatIndex, ScBaseCell* pCell); void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); - void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); - // TRUE = Zahlformat gesetzt - BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + void PutCell(SCCOL nCol, SCROW nRow, sal_uLong nFormatIndex, ScBaseCell* pCell); + // sal_True = Zahlformat gesetzt + sal_Bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true ); void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, USHORT nError); + void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError); void GetString( SCCOL nCol, SCROW nRow, String& rString ); void GetInputString( SCCOL nCol, SCROW nRow, String& rString ); @@ -325,7 +325,7 @@ public: } double GetValue( SCCOL nCol, SCROW nRow ); void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula, - BOOL bAsciiExport = FALSE ); + sal_Bool bAsciiExport = sal_False ); CellType GetCellType( const ScAddress& rPos ) const { @@ -357,53 +357,53 @@ public: @param bForced True = always create all captions, false = skip when Undo is disabled. */ void InitializeNoteCaptions( bool bForced = false ); - BOOL TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ); + sal_Bool TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ); void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ); void DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, - BOOL* pUndoOutline = NULL ); + sal_Bool* pUndoOutline = NULL ); - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); + sal_Bool TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); void InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); void DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, - BOOL* pUndoOutline = NULL ); + sal_Bool* pUndoOutline = NULL ); - void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag); + void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nDelFlag); void CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable, - BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions); + sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions); void CopyToClip(const ScRangeList& rRanges, ScTable* pTable, bool bKeepScenarioFlags, bool bCloneNoteCaptions); void CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, - USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable); + sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScTable* pTable); void StartListeningInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void BroadcastInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - USHORT nFlags, BOOL bMarked, ScTable* pDestTab, + sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL, - BOOL bAsLink = FALSE, BOOL bColRowFlags = TRUE); + sal_Bool bAsLink = sal_False, sal_Bool bColRowFlags = sal_True); void UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - USHORT nFlags, BOOL bMarked, ScTable* pDestTab, + sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL); void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - ScTable* pTransClip, USHORT nFlags, BOOL bAsLink ); + ScTable* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink ); // Markierung von diesem Dokument - void MixMarked( const ScMarkData& rMark, USHORT nFunction, - BOOL bSkipEmpty, ScTable* pSrcTab ); + void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction, + sal_Bool bSkipEmpty, ScTable* pSrcTab ); void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ); + sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScTable* pSrcTab ); void CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab ); void CopyScenarioFrom( const ScTable* pSrcTab ); void CopyScenarioTo( ScTable* pDestTab ) const; - BOOL TestCopyScenarioTo( const ScTable* pDestTab ) const; - void MarkScenarioIn( ScMarkData& rMark, USHORT nNeededBits ) const; - BOOL HasScenarioRange( const ScRange& rRange ) const; + sal_Bool TestCopyScenarioTo( const ScTable* pDestTab ) const; + void MarkScenarioIn( ScMarkData& rMark, sal_uInt16 nNeededBits ) const; + sal_Bool HasScenarioRange( const ScRange& rRange ) const; void InvalidateScenarioRanges(); const ScRangeList* GetScenarioRanges() const; @@ -412,21 +412,21 @@ public: void InvalidateTableArea(); void InvalidatePageBreaks(); - BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer - BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; - BOOL GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const; - BOOL GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, - SCCOL& rEndCol, BOOL bNotes ) const; - BOOL GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, - SCROW& rEndRow, BOOL bNotes ) const; + sal_Bool GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // sal_False = leer + sal_Bool GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; + sal_Bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes ) const; + sal_Bool GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, + SCCOL& rEndCol, sal_Bool bNotes ) const; + sal_Bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, + SCROW& rEndRow, sal_Bool bNotes ) const; - BOOL GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const; + sal_Bool GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const; void ExtendPrintArea( OutputDevice* pDev, SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow ); void GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, - BOOL bIncludeOld, bool bOnlyDown ) const; + sal_Bool bIncludeOld, bool bOnlyDown ) const; bool ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; @@ -436,24 +436,24 @@ public: void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY ); void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, - BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ); + sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark ); void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - BOOL HasData( SCCOL nCol, SCROW nRow ); - BOOL HasStringData( SCCOL nCol, SCROW nRow ); - BOOL HasValueData( SCCOL nCol, SCROW nRow ); -//UNUSED2008-05 USHORT GetErrorData(SCCOL nCol, SCROW nRow) const; - BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, + sal_Bool HasData( SCCOL nCol, SCROW nRow ); + sal_Bool HasStringData( SCCOL nCol, SCROW nRow ); + sal_Bool HasValueData( SCCOL nCol, SCROW nRow ); +//UNUSED2008-05 sal_uInt16 GetErrorData(SCCOL nCol, SCROW nRow) const; + sal_Bool HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; - USHORT GetErrCode( const ScAddress& rPos ) const + sal_uInt16 GetErrCode( const ScAddress& rPos ) const { return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetErrCode( rPos.Row() ) : 0; } -//UNUSED2008-05 USHORT GetErrCode( SCCOL nCol, SCROW nRow ) const; +//UNUSED2008-05 sal_uInt16 GetErrCode( SCCOL nCol, SCROW nRow ) const; void ResetChanged( const ScRange& rRange ); @@ -470,7 +470,7 @@ public: void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, - ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, bool bUpdateNoteCaptionPos = true ); + ScDocument* pUndoDoc = NULL, sal_Bool bIncludeDraw = sal_True, bool bUpdateNoteCaptionPos = true ); void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, @@ -483,18 +483,18 @@ public: void UpdateInsertTab(SCTAB nTable); //UNUSED2008-05 void UpdateInsertTabOnlyCells(SCTAB nTable); - void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); + void UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScTable* pRefUndo = NULL ); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + void UpdateCompile( sal_Bool bForceIfNameInUse = sal_False ); void SetTabNo(SCTAB nNewTab); - BOOL IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - USHORT nIndex) const; + sal_Bool IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + sal_uInt16 nIndex) const; void FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - std::set<USHORT>& rIndexes) const; + std::set<sal_uInt16>& rIndexes) const; void ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScRangeData::IndexMap& rMap ); void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, + sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, double nStepValue, double nMaxValue); String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); @@ -503,10 +503,10 @@ public: const ScMarkData& rMark ); void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - USHORT nFormatNo ); + sal_uInt16 nFormatNo ); void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData); void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // aus sw - BOOL SearchAndReplace(const SvxSearchItem& rSearchItem, + sal_Bool SearchAndReplace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); @@ -516,27 +516,27 @@ public: const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; -//UNUSED2009-05 BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; - bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const; - BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, +//UNUSED2009-05 sal_Bool HasLines( const ScRange& rRange, Rectangle& rSizes ) const; + bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nMask ) const; + sal_Bool HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const; + sal_Bool ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, - BOOL bRefresh, BOOL bAttrs ); - const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const; + sal_Bool bRefresh, sal_Bool bAttrs ); + const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, sal_uInt16 nWhich ) const; const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const; const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( const ScAddress& rPos ) const + sal_uLong GetNumberFormat( const ScAddress& rPos ) const { return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetNumberFormat( rPos.Row() ) : 0; } - ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; + sal_uLong GetNumberFormat( SCCOL nCol, SCROW nRow ) const; void MergeSelectionPattern( ScMergePatternState& rState, - const ScMarkData& rMark, BOOL bDeep ) const; + const ScMarkData& rMark, sal_Bool bDeep ) const; void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, - SCCOL nCol2, SCROW nRow2, BOOL bDeep ) const; + SCCOL nCol2, SCROW nRow2, sal_Bool bDeep ) const; void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCCOL nStartCol, SCROW nStartRow, @@ -549,12 +549,12 @@ public: void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr ); - void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) + void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, sal_Bool bPutToPool = sal_False ) { if (ValidColRow(rPos.Col(),rPos.Row())) aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool ); } - void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); + void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, sal_Bool bPutToPool = sal_False ); void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); @@ -562,38 +562,38 @@ public: void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); void ApplySelectionLineStyle( const ScMarkData& rMark, - const SvxBorderLine* pLine, BOOL bColorOnly ); + const SvxBorderLine* pLine, sal_Bool bColorOnly ); const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const; + const ScStyleSheet* GetAreaStyle( sal_Bool& rFound, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; - void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, + void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + sal_Bool IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const; - BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + sal_Bool ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags ); + sal_Bool RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags ); void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); - void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); + void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark ); const ScRange* GetRepeatColRange() const { return pRepeatColRange; } const ScRange* GetRepeatRowRange() const { return pRepeatRowRange; } void SetRepeatColRange( const ScRange* pNew ); void SetRepeatRowRange( const ScRange* pNew ); - USHORT GetPrintRangeCount() const { return static_cast< USHORT >( aPrintRanges.size() ); } - const ScRange* GetPrintRange(USHORT nPos) const; + sal_uInt16 GetPrintRangeCount() const { return static_cast< sal_uInt16 >( aPrintRanges.size() ); } + const ScRange* GetPrintRange(sal_uInt16 nPos) const; /** Returns true, if the sheet is always printed. */ - BOOL IsPrintEntireSheet() const { return bPrintEntireSheet; } + sal_Bool IsPrintEntireSheet() const { return bPrintEntireSheet; } /** Removes all print ranges. */ void ClearPrintRanges(); @@ -607,25 +607,25 @@ public: void FillPrintSaver( ScPrintSaverTab& rSaveTab ) const; void RestorePrintRanges( const ScPrintSaverTab& rSaveTab ); - USHORT GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, + sal_uInt16 GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bFormula, const ScMarkData* pMarkData, - BOOL bSimpleTextImport ); - BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra, + sal_Bool bFormula, const ScMarkData* pMarkData, + sal_Bool bSimpleTextImport ); + sal_Bool SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bForce, - ScProgress* pOuterProgress = NULL, ULONG nProgressStart = 0 ); + sal_Bool bForce, + ScProgress* pOuterProgress = NULL, sal_uLong nProgressStart = 0 ); long GetNeededSize( SCCOL nCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, - BOOL bWidth, BOOL bTotalSize ); - void SetColWidth( SCCOL nCol, USHORT nNewWidth ); - void SetRowHeight( SCROW nRow, USHORT nNewHeight ); - BOOL SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight, + sal_Bool bWidth, sal_Bool bTotalSize ); + void SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth ); + void SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight ); + sal_Bool SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight, double nPPTX, double nPPTY ); /** @@ -635,17 +635,17 @@ public: * Note that setting a new row height via this function will not * invalidate page breaks. */ - void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight ); + void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight ); // nPPT fuer Test auf Veraenderung - void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); + void SetManualHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bManual ); - USHORT GetColWidth( SCCOL nCol ) const; - SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const; - ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; - ULONG GetColOffset( SCCOL nCol ) const; - ULONG GetRowOffset( SCROW nRow ) const; + sal_uInt16 GetColWidth( SCCOL nCol ) const; + SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const; + sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const; + sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; + sal_uLong GetColOffset( SCCOL nCol ) const; + sal_uLong GetRowOffset( SCROW nRow ) const; /** * Get the last row such that the height of row 0 to the end row is as @@ -655,12 +655,12 @@ public: * * @return SCROW last row of the range within specified height. */ - SCROW GetRowForHeight(ULONG nHeight) const; + SCROW GetRowForHeight(sal_uLong nHeight) const; - USHORT GetOriginalWidth( SCCOL nCol ) const; - USHORT GetOriginalHeight( SCROW nRow ) const; + sal_uInt16 GetOriginalWidth( SCCOL nCol ) const; + sal_uInt16 GetOriginalHeight( SCROW nRow ) const; - USHORT GetCommonWidth( SCCOL nEndCol ); + sal_uInt16 GetCommonWidth( SCCOL nEndCol ); SCROW GetHiddenRowCount( SCROW nRow ); @@ -671,9 +671,9 @@ public: void ShowRows(SCROW nRow1, SCROW nRow2, bool bShow); void DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags); // if bSetFlags=false, no SetRowHidden/SetRowFiltered - void SetColFlags( SCCOL nCol, BYTE nNewFlags ); - void SetRowFlags( SCROW nRow, BYTE nNewFlags ); - void SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags ); + void SetColFlags( SCCOL nCol, sal_uInt8 nNewFlags ); + void SetRowFlags( SCROW nRow, sal_uInt8 nNewFlags ); + void SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags ); /// @return the index of the last row with any set flags (auto-pagebreak is ignored). SCROW GetLastFlaggedRow() const; @@ -683,18 +683,18 @@ public: /// @return the index of the last changed row (flags and row height, auto pagebreak is ignored). SCROW GetLastChangedRow() const; - BYTE GetColFlags( SCCOL nCol ) const; - BYTE GetRowFlags( SCROW nRow ) const; + sal_uInt8 GetColFlags( SCCOL nCol ) const; + sal_uInt8 GetRowFlags( SCROW nRow ) const; - const ScBitMaskCompressedArray< SCROW, BYTE> * GetRowFlagsArray() const + const ScBitMaskCompressedArray< SCROW, sal_uInt8> * GetRowFlagsArray() const { return pRowFlags; } - BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ); - BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ); + sal_Bool UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, sal_Bool bShow ); + sal_Bool UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, sal_Bool bShow ); void UpdatePageBreaks( const ScRange* pUserArea ); void RemoveManualBreaks(); - BOOL HasManualBreaks() const; + sal_Bool HasManualBreaks() const; void SetRowManualBreaks( const ::std::set<SCROW>& rBreaks ); void SetColManualBreaks( const ::std::set<SCCOL>& rBreaks ); @@ -758,20 +758,20 @@ public: void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void Sort(const ScSortParam& rSortParam, BOOL bKeepQuery); - BOOL ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam, - BOOL* pSpecial = NULL, ScBaseCell* pCell = NULL, - BOOL* pbTestEqualCondition = NULL ); + void Sort(const ScSortParam& rSortParam, sal_Bool bKeepQuery); + sal_Bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam, + sal_Bool* pSpecial = NULL, ScBaseCell* pCell = NULL, + sal_Bool* pbTestEqualCondition = NULL ); void TopTenQuery( ScQueryParam& ); - SCSIZE Query(ScQueryParam& rQueryParam, BOOL bKeepSub); - BOOL CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + SCSIZE Query(ScQueryParam& rQueryParam, sal_Bool bKeepSub); + sal_Bool CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates); void GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates ); - BOOL GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); + sal_Bool GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit); - BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + sal_Bool HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + sal_Bool HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); void DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); @@ -782,60 +782,60 @@ public: SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const; - void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); + void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges ); void IncRecalcLevel() { ++nRecalcLvl; } void DecRecalcLevel( bool bUpdateNoteCaptionPos = true ) { if (!--nRecalcLvl) SetDrawPageSize(true, bUpdateNoteCaptionPos); } - BOOL IsSortCollatorGlobal() const; + sal_Bool IsSortCollatorGlobal() const; void InitSortCollator( const ScSortParam& rPar ); void DestroySortCollator(); private: void FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, + sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - double nStepValue, double nMaxValue, USHORT nMinDigits, - BOOL bAttribs, ScProgress& rProgress ); + double nStepValue, double nMaxValue, sal_uInt16 nMinDigits, + sal_Bool bAttribs, ScProgress& rProgress ); void FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, FillCmd& rCmd, FillDateCmd& rDateCmd, - double& rInc, USHORT& rMinDigits, - ScUserListData*& rListData, USHORT& rListIndex); + double& rInc, sal_uInt16& rMinDigits, + ScUserListData*& rListData, sal_uInt16& rListIndex); void FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - ULONG nFillCount, FillDir eFillDir, ScProgress& rProgress ); + sal_uLong nFillCount, FillDir eFillDir, ScProgress& rProgress ); - BOOL ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, - BOOL bMarked, BOOL bUnprotected ); + sal_Bool ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, + sal_Bool bMarked, sal_Bool bUnprotected ); void AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - const ScPatternAttr& rAttr, USHORT nFormatNo); - void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData); - void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData); - BOOL SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, + const ScPatternAttr& rAttr, sal_uInt16 nFormatNo); + void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData& rData); + void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData); + sal_Bool SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + sal_Bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + sal_Bool SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + sal_Bool Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + sal_Bool ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + sal_Bool SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark); - BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - ScMarkData& rMark, BOOL bIsUndo); - BOOL SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); - BOOL ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + sal_Bool ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + ScMarkData& rMark, sal_Bool bIsUndo); + sal_Bool SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); + sal_Bool ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, ScDocument* pUndoDoc); // benutzen globalen SortParam: - BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); + sal_Bool IsSorted(SCCOLROW nStart, SCCOLROW nEnd); void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); void SwapCol(SCCOL nCol1, SCCOL nCol2); void SwapRow(SCROW nRow1, SCROW nRow2); - short CompareCell( USHORT nSort, + short CompareCell( sal_uInt16 nSort, ScBaseCell* pCell1, SCCOL nCell1Col, SCROW nCell1Row, ScBaseCell* pCell2, SCCOL nCell2Col, SCROW nCell2Row ); short Compare(SCCOLROW nIndex1, SCCOLROW nIndex2); @@ -844,26 +844,26 @@ private: void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi); void SortReorder( ScSortInfoArray*, ScProgress& ); - BOOL CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - BOOL CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + sal_Bool CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + sal_Bool CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); void GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr); - BOOL RefVisible(ScFormulaCell* pCell); + sal_Bool RefVisible(ScFormulaCell* pCell); - BOOL IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol); + sal_Bool IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol); - void IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd); - void FillFormula(ULONG& nFormulaCounter, BOOL bFirst, ScFormulaCell* pSrcCell, - SCCOL nDestCol, SCROW nDestRow, BOOL bLast ); + void IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillDateCmd eCmd); + void FillFormula(sal_uLong& nFormulaCounter, sal_Bool bFirst, ScFormulaCell* pSrcCell, + SCCOL nDestCol, SCROW nDestRow, sal_Bool bLast ); void UpdateInsertTabAbs(SCTAB nNewPos); - BOOL GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, + sal_Bool GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel, const ScMarkData& rMark) const; - BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ); + sal_Bool GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ); void SetDrawPageSize( bool bResetStreamValid = true, bool bUpdateNoteCaptionPos = true ); - BOOL TestTabRefAbs(SCTAB nTable); + sal_Bool TestTabRefAbs(SCTAB nTable); void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileDBFormula( sal_Bool bCreateFormulaString ); + void CompileNameFormula( sal_Bool bCreateFormulaString ); void CompileColRowNameFormula(); void StartListening( const ScAddress& rAddress, SvtListener* pListener ); @@ -881,7 +881,7 @@ private: // idle calculation of OutputDevice text width for cell // also invalidates script type, broadcasts for "calc as shown" void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, - BOOL bNumFormatChanged, BOOL bBroadcast ); + sal_Bool bNumFormatChanged, sal_Bool bBroadcast ); /** * In case the cell text goes beyond the column width, move the max column diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 72b4de611c2e..3f70a9cbed98 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -48,17 +48,17 @@ private: String aFileName; String aFilterName; String aOptions; - BOOL bInCreate; - BOOL bInEdit; - BOOL bAddUndo; - BOOL bDoPaint; + sal_Bool bInCreate; + sal_Bool bInEdit; + sal_Bool bAddUndo; + sal_Bool bDoPaint; public: TYPEINFO(); ScTableLink( ScDocShell* pDocSh, const String& rFile, - const String& rFilter, const String& rOpt, ULONG nRefresh ); + const String& rFilter, const String& rOpt, sal_uLong nRefresh ); ScTableLink( SfxObjectShell* pShell, const String& rFile, - const String& rFilter, const String& rOpt, ULONG nRefresh ); + const String& rFilter, const String& rOpt, sal_uLong nRefresh ); virtual ~ScTableLink(); virtual void Closed(); virtual void DataChanged( const String& rMimeType, @@ -66,17 +66,17 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - BOOL Refresh(const String& rNewFile, const String& rNewFilter, - const String* pNewOptions /* = NULL */, ULONG nNewRefresh ); - void SetInCreate(BOOL bSet) { bInCreate = bSet; } - void SetAddUndo(BOOL bSet) { bAddUndo = bSet; } - void SetPaint(BOOL bSet) { bDoPaint = bSet; } + sal_Bool Refresh(const String& rNewFile, const String& rNewFilter, + const String* pNewOptions /* = NULL */, sal_uLong nNewRefresh ); + void SetInCreate(sal_Bool bSet) { bInCreate = bSet; } + void SetAddUndo(sal_Bool bSet) { bAddUndo = bSet; } + void SetPaint(sal_Bool bSet) { bDoPaint = bSet; } const String& GetFileName() const { return aFileName; } const String& GetFilterName() const { return aFilterName; } const String& GetOptions() const { return aOptions; } - BOOL IsUsed() const; + sal_Bool IsUsed() const; DECL_LINK( RefreshHdl, ScTableLink* ); DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* ); @@ -95,11 +95,11 @@ private: public: ScDocumentLoader( const String& rFileName, String& rFilterName, String& rOptions, - UINT32 nRekCnt = 0, BOOL bWithInteraction = FALSE ); + sal_uInt32 nRekCnt = 0, sal_Bool bWithInteraction = sal_False ); ~ScDocumentLoader(); ScDocument* GetDocument(); ScDocShell* GetDocShell() { return pDocShell; } - BOOL IsError() const; + sal_Bool IsError() const; String GetTitle() const; void ReleaseDocRef(); // without calling DoClose @@ -110,10 +110,10 @@ public: @param bWithContent true = Tries to detect the filter by looking at the file contents. false = Detects filter by file name extension only (should be used in filter code only). - @return TRUE if a filter could be found, FALSE otherwise. */ - static BOOL GetFilterName( const String& rFileName, + @return sal_True if a filter could be found, sal_False otherwise. */ + static sal_Bool GetFilterName( const String& rFileName, String& rFilter, String& rOptions, - BOOL bWithContent, BOOL bWithInteraction ); + sal_Bool bWithContent, sal_Bool bWithInteraction ); static void RemoveAppPrefix( String& rFilterName ); }; diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx index 7baa461061fd..6589e51ee3bc 100644 --- a/sc/inc/tabopparams.hxx +++ b/sc/inc/tabopparams.hxx @@ -44,14 +44,14 @@ struct ScInterpreterTableOpParams ScAddress aFormulaPos; ::std::vector< ScFormulaCell* > aNotifiedFormulaCells; ::std::vector< ScAddress > aNotifiedFormulaPos; - BOOL bValid; - BOOL bRefresh; - BOOL bCollectNotifications; + sal_Bool bValid; + sal_Bool bRefresh; + sal_Bool bCollectNotifications; ScInterpreterTableOpParams() - : bValid( FALSE ) - , bRefresh( FALSE ) - , bCollectNotifications( TRUE ) + : bValid( sal_False ) + , bRefresh( sal_False ) + , bCollectNotifications( sal_True ) { } diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index e8ff73bf7d85..17889de08ad3 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -90,7 +90,7 @@ public: void AddListener( SfxListener& rListener ); void RemoveListener( SfxListener& rListener ); - void UpdateText( USHORT nPart, EditEngine& rSource ); + void UpdateText( sal_uInt16 nPart, EditEngine& rSource ); // XHeaderFooterContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL @@ -125,15 +125,15 @@ class ScHeaderFooterTextData : public SfxListener { private: ScHeaderFooterContentObj& rContentObj; - USHORT nPart; + sal_uInt16 nPart; ScEditEngineDefaulter* pEditEngine; SvxEditEngineForwarder* pForwarder; - BOOL bDataValid; - BOOL bInUpdate; + sal_Bool bDataValid; + sal_Bool bInUpdate; public: ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, - USHORT nP ); + sal_uInt16 nP ); ~ScHeaderFooterTextData(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -143,7 +143,7 @@ public: void UpdateData(); ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; } - USHORT GetPart() const { return nPart; } + sal_uInt16 GetPart() const { return nPart; } ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } }; @@ -164,7 +164,7 @@ private: public: ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, - USHORT nP ); + sal_uInt16 nP ); virtual ~ScHeaderFooterTextObj(); const SvxUnoText& GetUnoText(); @@ -376,10 +376,10 @@ protected: ScFieldEditEngine* pEditEngine; SvxEditEngineForwarder* pForwarder; ScSharedCellEditSource* pOriginalSource; - BOOL bDataValid; - BOOL bInUpdate; - BOOL bDirty; - BOOL bDoUpdate; + sal_Bool bDataValid; + sal_Bool bInUpdate; + sal_Bool bDirty; + sal_Bool bDoUpdate; protected: virtual void GetCellText(const ScAddress& rCellPos, String& rText); @@ -401,9 +401,9 @@ public: ScDocShell* GetDocShell() const { return pDocShell; } const ScAddress& GetCellPos() const { return aCellPos; } - void SetDirty(BOOL bValue) { bDirty = bValue; } - BOOL IsDirty() const { return bDirty; } - void SetDoUpdate(BOOL bValue) { bDoUpdate = bValue; } + void SetDirty(sal_Bool bValue) { bDirty = bValue; } + sal_Bool IsDirty() const { return bDirty; } + void SetDoUpdate(sal_Bool bValue) { bDoUpdate = bValue; } }; class ScCellTextObj : public ScCellTextData, public SvxUnoText diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index e4659921e7be..13a8038a4109 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -103,8 +103,8 @@ public: virtual const ScRefList* GetRefList() const; virtual ScRefList* GetRefList(); - virtual BOOL TextEqual( const formula::FormulaToken& rToken ) const; - virtual BOOL Is3DRef() const; // reference with 3D flag set + virtual sal_Bool TextEqual( const formula::FormulaToken& rToken ) const; + virtual sal_Bool Is3DRef() const; // reference with 3D flag set /** If rTok1 and rTok2 both are SingleRef or DoubleRef tokens, extend/merge ranges as needed for ocRange. @@ -112,7 +112,7 @@ public: The formula's position, used to calculate absolute positions from relative references. @param bReuseDoubleRef - If TRUE, a DoubleRef token is reused if passed as rTok1 or rTok2, + If sal_True, a DoubleRef token is reused if passed as rTok1 or rTok2, else a new DoubleRef token is created and returned. @return A reused or new'ed ScDoubleRefToken, or a NULL TokenRef if rTok1 or @@ -134,7 +134,7 @@ public: virtual ScSingleRefData& GetSingleRef(); virtual void CalcAbsIfRel( const ScAddress& ); virtual void CalcRelFromAbs( const ScAddress& ); - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScSingleRefToken(*this); } DECL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken ); @@ -163,7 +163,7 @@ public: virtual ScSingleRefData& GetSingleRef2(); virtual void CalcAbsIfRel( const ScAddress& ); virtual void CalcRelFromAbs( const ScAddress& ); - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScDoubleRefToken(*this); } DECL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken ); @@ -180,7 +180,7 @@ public: ScToken( r ), pMatrix( r.pMatrix ) {} virtual const ScMatrix* GetMatrix() const; virtual ScMatrix* GetMatrix(); - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScMatrixToken(*this); } }; @@ -198,13 +198,13 @@ public: ScExternalSingleRefToken( const ScExternalSingleRefToken& r ); virtual ~ScExternalSingleRefToken(); - virtual USHORT GetIndex() const; + virtual sal_uInt16 GetIndex() const; virtual const String& GetString() const; virtual const ScSingleRefData& GetSingleRef() const; virtual ScSingleRefData& GetSingleRef(); virtual void CalcAbsIfRel( const ScAddress& ); virtual void CalcRelFromAbs( const ScAddress& ); - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScExternalSingleRefToken(*this); } }; @@ -222,7 +222,7 @@ public: ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r ); virtual ~ScExternalDoubleRefToken(); - virtual USHORT GetIndex() const; + virtual sal_uInt16 GetIndex() const; virtual const String& GetString() const; virtual const ScSingleRefData& GetSingleRef() const; virtual ScSingleRefData& GetSingleRef(); @@ -232,7 +232,7 @@ public: virtual ScComplexRefData& GetDoubleRef(); virtual void CalcAbsIfRel( const ScAddress& ); virtual void CalcRelFromAbs( const ScAddress& ); - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScExternalDoubleRefToken(*this); } }; @@ -248,9 +248,9 @@ public: ScExternalNameToken( sal_uInt16 nFileId, const String& rName ); ScExternalNameToken( const ScExternalNameToken& r ); virtual ~ScExternalNameToken(); - virtual USHORT GetIndex() const; + virtual sal_uInt16 GetIndex() const; virtual const String& GetString() const; - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScExternalNameToken(*this); } }; @@ -268,7 +268,7 @@ public: ScToken( r ), pJumpMatrix( r.pJumpMatrix ) {} virtual ~ScJumpMatrixToken(); virtual ScJumpMatrix* GetJumpMatrix() const; - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScJumpMatrixToken(*this); } }; @@ -288,7 +288,7 @@ public: virtual void CalcRelFromAbs( const ScAddress& ); virtual const ScRefList* GetRefList() const; virtual ScRefList* GetRefList(); - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScRefListToken(*this); } }; @@ -310,7 +310,7 @@ public: bool IsDisplayedAsString() const { return bDisplayedAsString; } virtual double GetDouble() const; virtual const String & GetString() const; - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScEmptyCellToken(*this); } }; @@ -335,7 +335,7 @@ public: virtual double GetDouble() const; virtual const String & GetString() const; virtual const ScMatrix* GetMatrix() const; - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScMatrixCellResultToken(*this); } formula::StackVar GetUpperLeftType() const { @@ -372,7 +372,7 @@ public: if (xUpperLeft) xUpperLeft = xUpperLeft->Clone(); } - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScMatrixFormulaCellToken(*this); } void SetMatColsRows( SCCOL nC, SCROW nR ) { @@ -436,7 +436,7 @@ public: const String & GetFormula() const { return aFormula; } virtual double GetDouble() const; virtual const String & GetString() const; - virtual BOOL operator==( const formula::FormulaToken& rToken ) const; + virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual FormulaToken* Clone() const { return new ScHybridCellToken(*this); } }; diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 5ded8f4410d3..eb9318b86854 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -41,7 +41,7 @@ class ScMatrix; class SC_DLLPUBLIC ScTokenArray : public formula::FormulaTokenArray { friend class ScCompiler; - BOOL ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const; + sal_Bool ImplGetReference( ScRange& rRange, sal_Bool bValidOnly ) const; public: ScTokenArray(); @@ -51,15 +51,15 @@ public: ScTokenArray* Clone() const; /// True copy! /// Exactly and only one range (valid or deleted) - BOOL IsReference( ScRange& rRange ) const; + sal_Bool IsReference( ScRange& rRange ) const; /// Exactly and only one valid range (no #REF!s) - BOOL IsValidReference( ScRange& rRange ) const; + sal_Bool IsValidReference( ScRange& rRange ) const; /** Determines the extent of direct adjacent references. Only use with real functions, e.g. GetOuterFuncOpCode() == ocSum ! */ - BOOL GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, + sal_Bool GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, const ScAddress& rPos, ScDirection ); formula::FormulaToken* AddRawToken( const ScRawToken& ); diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index e21140699e4c..478d4b97e712 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -61,10 +61,10 @@ class ScUnitConverter : public ScStrCollection ScUnitConverter& operator=( const ScUnitConverter& ); public: - ScUnitConverter( USHORT nInit = 16, USHORT nDelta = 4 ); + ScUnitConverter( sal_uInt16 nInit = 16, sal_uInt16 nDelta = 4 ); virtual ~ScUnitConverter() {}; - BOOL GetValue( double& fValue, const String& rFromUnit, + sal_Bool GetValue( double& fValue, const String& rFromUnit, const String& rToUnit ) const; }; diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx index 175022a0ba14..2a1ffdbbbfc7 100644 --- a/sc/inc/unowids.hxx +++ b/sc/inc/unowids.hxx @@ -82,12 +82,12 @@ #define SC_WID_UNO_END ( SC_WID_UNO_START + 41 ) -inline BOOL IsScUnoWid( USHORT nWid ) +inline sal_Bool IsScUnoWid( sal_uInt16 nWid ) { return nWid >= SC_WID_UNO_START && nWid <= SC_WID_UNO_END; } -inline BOOL IsScItemWid( USHORT nWid ) +inline sal_Bool IsScItemWid( sal_uInt16 nWid ) { return nWid >= ATTR_STARTINDEX && nWid <= ATTR_ENDINDEX; // incl. page } diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index 7190cd189156..98caa8146c41 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -37,7 +37,7 @@ class SC_DLLPUBLIC ScUserListData : public ScDataObject { friend class ScUserList; String aStr; - USHORT nTokenCount; + sal_uInt16 nTokenCount; String* pSubStrings; String* pUpperSub; @@ -52,9 +52,9 @@ public: const String& GetString() const { return aStr; } void SetString( const String& rStr); - USHORT GetSubCount() const; - BOOL GetSubIndex(const String& rSubStr, USHORT& rIndex) const; - String GetSubStr(USHORT nIndex) const; + sal_uInt16 GetSubCount() const; + sal_Bool GetSubIndex(const String& rSubStr, sal_uInt16& rIndex) const; + String GetSubStr(sal_uInt16 nIndex) const; StringCompare Compare(const String& rSubStr1, const String& rSubStr2) const; StringCompare ICompare(const String& rSubStr1, const String& rSubStr2) const; }; @@ -63,28 +63,28 @@ public: class SC_DLLPUBLIC ScUserList : public ScCollection { public: - ScUserList( USHORT nLim = 4, USHORT nDel = 4); + ScUserList( sal_uInt16 nLim = 4, sal_uInt16 nDel = 4); ScUserList( const ScUserList& rUserList ) : ScCollection ( rUserList ) {} virtual ScDataObject* Clone() const; ScUserListData* GetData( const String& rSubStr ) const; /// If the list in rStr is already inserted - BOOL HasEntry( const String& rStr ) const; + sal_Bool HasEntry( const String& rStr ) const; - inline ScUserListData* operator[]( const USHORT nIndex) const; + inline ScUserListData* operator[]( const sal_uInt16 nIndex) const; inline ScUserList& operator= ( const ScUserList& r ); - BOOL operator==( const ScUserList& r ) const; - inline BOOL operator!=( const ScUserList& r ) const; + sal_Bool operator==( const ScUserList& r ) const; + inline sal_Bool operator!=( const ScUserList& r ) const; }; inline ScUserList& ScUserList::operator=( const ScUserList& r ) { return (ScUserList&)ScCollection::operator=( r ); } -inline ScUserListData* ScUserList::operator[]( const USHORT nIndex) const +inline ScUserListData* ScUserList::operator[]( const sal_uInt16 nIndex) const { return (ScUserListData*)At(nIndex); } -inline BOOL ScUserList::operator!=( const ScUserList& r ) const +inline sal_Bool ScUserList::operator!=( const ScUserList& r ) const { return !operator==( r ); } #endif diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 1bff57055f82..285f18a0c4d3 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -67,8 +67,8 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry sal_uInt32 nKey; // Index in Attributen ScValidationMode eDataMode; - BOOL bShowInput; - BOOL bShowError; + sal_Bool bShowInput; + sal_Bool bShowError; ScValidErrorStyle eErrorStyle; sal_Int16 mnListType; // selection list type: none, unsorted, sorted. String aInputTitle; @@ -76,12 +76,12 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry String aErrorTitle; String aErrorMessage; - BOOL bIsUsed; // temporaer beim Speichern + sal_Bool bIsUsed; // temporaer beim Speichern - BOOL DoMacro( const ScAddress& rPos, const String& rInput, + sal_Bool DoMacro( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; - BOOL DoScript( const ScAddress& rPos, const String& rInput, + sal_Bool DoScript( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; using ScConditionEntry::operator==; @@ -111,11 +111,11 @@ public: void SetError( const String& rTitle, const String& rMsg, ScValidErrorStyle eStyle ); - BOOL GetInput( String& rTitle, String& rMsg ) const + sal_Bool GetInput( String& rTitle, String& rMsg ) const { rTitle = aInputTitle; rMsg = aInputMessage; return bShowInput; } - BOOL GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const; + sal_Bool GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const; - BOOL HasErrMsg() const { return bShowError; } + sal_Bool HasErrMsg() const { return bShowError; } ScValidationMode GetDataMode() const { return eDataMode; } @@ -133,27 +133,27 @@ public: bool FillSelectionList( TypedScStrCollection& rStrings, const ScAddress& rPos ) const; // mit String: bei Eingabe, mit Zelle: fuer Detektiv / RC_FORCED - BOOL IsDataValid( const String& rTest, const ScPatternAttr& rPattern, + sal_Bool IsDataValid( const String& rTest, const ScPatternAttr& rPattern, const ScAddress& rPos ) const; - BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + sal_Bool IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; - // TRUE -> Abbruch - BOOL DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const; + // sal_True -> Abbruch + sal_Bool DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const; void DoCalcError( ScFormulaCell* pCell ) const; - BOOL IsEmpty() const; + sal_Bool IsEmpty() const; sal_uInt32 GetKey() const { return nKey; } void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(sal_Bool bSet) { bIsUsed = bSet; } + sal_Bool IsUsed() const { return bIsUsed; } - BOOL EqualEntries( const ScValidationData& r ) const; // fuer Undo + sal_Bool EqualEntries( const ScValidationData& r ) const; // fuer Undo // sortiert (per PTRARR) nach Index // operator== nur fuer die Sortierung - BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } + sal_Bool operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } + sal_Bool operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } private: /** Tries to fill the passed collection with list validation entries. @@ -206,7 +206,7 @@ public: * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo + sal_Bool operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo }; #endif diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 44625ad2aeb5..6277aeee21d9 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -68,8 +68,8 @@ enum ScVObjType VOBJ_TYPE_DRAW }; -#define MAX_OPT (USHORT)VOPT_BIGHANDLES+1 -#define MAX_TYPE (USHORT)VOBJ_TYPE_DRAW+1 +#define MAX_OPT (sal_uInt16)VOPT_BIGHANDLES+1 +#define MAX_TYPE (sal_uInt16)VOBJ_TYPE_DRAW+1 #define SC_STD_GRIDCOLOR COL_LIGHTGRAY @@ -102,8 +102,8 @@ public: void SetDefaults(); - void SetOption( ScViewOption eOpt, BOOL bNew = TRUE ) { aOptArr[eOpt] = bNew; } - BOOL GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } + void SetOption( ScViewOption eOpt, sal_Bool bNew = sal_True ) { aOptArr[eOpt] = bNew; } + sal_Bool GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } @@ -113,14 +113,14 @@ public: const ScGridOptions& GetGridOptions() const { return aGridOpt; } void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } - SvxGridItem* CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const; + SvxGridItem* CreateGridItem( sal_uInt16 nId = SID_ATTR_GRID_OPTIONS ) const; const ScViewOptions& operator= ( const ScViewOptions& rCpy ); int operator== ( const ScViewOptions& rOpt ) const; int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } private: - BOOL aOptArr [MAX_OPT]; + sal_Bool aOptArr [MAX_OPT]; ScVObjMode aModeArr [MAX_TYPE]; Color aGridCol; String aGridColName; @@ -135,8 +135,8 @@ class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem { public: TYPEINFO(); -//UNUSED2008-05 ScTpViewItem( USHORT nWhich ); - ScTpViewItem( USHORT nWhich, const ScViewOptions& rOpt ); +//UNUSED2008-05 ScTpViewItem( sal_uInt16 nWhich ); + ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt ); ScTpViewItem( const ScTpViewItem& rItem ); ~ScTpViewItem(); diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 0f03e0e9b111..2895574dc609 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -92,13 +92,13 @@ class ScViewPaneBase : public com::sun::star::sheet::XViewPane, { private: ScTabViewShell* pViewShell; - USHORT nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE + sal_uInt16 nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE protected: ::com::sun::star::awt::Rectangle GetVisArea() const; public: - ScViewPaneBase(ScTabViewShell* pViewSh, USHORT nP); + ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP); virtual ~ScViewPaneBase(); ScTabViewShell* GetViewShell() const { return pViewShell; } @@ -162,7 +162,7 @@ public: class ScViewPaneObj : public ScViewPaneBase, public cppu::OWeakObject { public: - ScViewPaneObj(ScTabViewShell* pViewSh, USHORT nP); + ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP); virtual ~ScViewPaneObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( @@ -200,11 +200,11 @@ private: SCTAB nPreviousTab; sal_Bool bDrawSelModeSet; - ScViewPaneObj* GetObjectByIndex_Impl(USHORT nIndex) const; - INT16 GetZoom(void) const; - void SetZoom(INT16 Zoom); - INT16 GetZoomType(void) const; - void SetZoomType(INT16 ZoomType); + ScViewPaneObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) const; + sal_Int16 GetZoom(void) const; + void SetZoom(sal_Int16 Zoom); + sal_Int16 GetZoomType(void) const; + void SetZoomType(sal_Int16 ZoomType); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetClickedObject(const Point& rPoint) const; void StartMouseListening(); diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx index b17435f23d7f..e181dcf70306 100644 --- a/sc/inc/waitoff.hxx +++ b/sc/inc/waitoff.hxx @@ -36,7 +36,7 @@ class ScWaitCursorOff { private: Window* pWin; - ULONG nWaiters; + sal_uLong nWaiters; public: ScWaitCursorOff( Window* pWin ); ~ScWaitCursorOff(); diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index 926b6ef50cd1..5b5061aac038 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -77,8 +77,8 @@ class ScXMLImportWrapper public: ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&); - BOOL Import(sal_Bool bStylesOnly, ErrCode& ); - BOOL Export(sal_Bool bStylesOnly); + sal_Bool Import(sal_Bool bStylesOnly, ErrCode& ); + sal_Bool Export(sal_Bool bStylesOnly); }; #endif diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 7c5e9a2f07cb..84d5070e2b8c 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -44,11 +44,11 @@ class ScNumFormatAbbrev public: ScNumFormatAbbrev(); ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat); - ScNumFormatAbbrev(ULONG nFormat, SvNumberFormatter& rFormatter); + ScNumFormatAbbrev(sal_uLong nFormat, SvNumberFormatter& rFormatter); void Load( SvStream& rStream, CharSet eByteStrSet ); // Laden der Zahlenformate void Save( SvStream& rStream, CharSet eByteStrSet ) const; // Speichern der Zahlenformate - void PutFormatIndex(ULONG nFormat, SvNumberFormatter& rFormatter); - ULONG GetFormatIndex( SvNumberFormatter& rFormatter); + void PutFormatIndex(sal_uLong nFormat, SvNumberFormatter& rFormatter); + sal_uLong GetFormatIndex( SvNumberFormatter& rFormatter); inline int operator==(const ScNumFormatAbbrev& rNumFormat) const { return ((sFormatstring == rNumFormat.sFormatstring) |