diff options
Diffstat (limited to 'sw/inc')
183 files changed, 4255 insertions, 4255 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 333c591243ad..209fea22da72 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -148,7 +148,7 @@ class SwTaggedPDFHelper // This will be incremented for each BeginTag() call. // It denotes the number of tags to close during EndStructureElements(); - BYTE nEndStructureElement; + sal_uInt8 nEndStructureElement; // If an already existing tag is reopened for follows of flow frames, // this value stores the tag id which has to be restored. diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 693a24466b9d..e35c31cf2697 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -91,10 +91,10 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } @param rVal the value @param nMId - @retval TRUE putting of value was successful - @retval FALSE else + @retval sal_True putting of value was successful + @retval sal_False else */ - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, USHORT nWhich) = 0; + virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) = 0; // rufe das Update der Expression Felder auf; alle Ausdruecke werden // neu berechnet. @@ -105,10 +105,10 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } @param rDstFmtFld field to update @param rSrcFld field containing the new values @param pMsgHnt - @param bUpdateTblFlds TRUE: update table fields, too. + @param bUpdateTblFlds sal_True: update table fields, too. - @retval TRUE update was successful - @retval FALSE else + @retval sal_True update was successful + @retval sal_False else */ virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0; @@ -151,7 +151,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } SwNode (see parameter pChk) is (?) part of the private data structure of SwDoc and should not be exposed */ - virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen) = 0; + virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) = 0; /** */ @@ -162,7 +162,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } // eine erzeugte Liste aller Felder mit uebergegeben werden. // (ist die Adresse != 0, und der Pointer == 0 wird eine neue // Liste returnt.) - virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt) = 0; + virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0; /** */ diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index c3e6855f3c81..44fd8c148044 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -58,7 +58,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; } /** FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): */ - virtual void UpdateLinks(BOOL bUI) = 0; + virtual void UpdateLinks(sal_Bool bUI) = 0; /** SS fuers Linken von Dokumentteilen */ diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index ed893dc1cf4a..078b405f0ce4 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -49,7 +49,7 @@ class SwNode; class String; -typedef USHORT RedlineMode_t; +typedef sal_uInt16 RedlineMode_t; namespace nsRedlineMode_t { const RedlineMode_t REDLINE_NONE = 0; // no RedlineMode @@ -70,7 +70,7 @@ namespace nsRedlineMode_t const RedlineMode_t REDLINE_DONTCOMBINE_REDLINES = 0x400; } -typedef USHORT RedlineType_t; +typedef sal_uInt16 RedlineType_t; namespace nsRedlineType_t { // die RedlineTypen gehen von 0 bis 127 @@ -92,16 +92,16 @@ class IDocumentRedlineAccess { // Static helper functions public: - static bool IsShowChanges(const USHORT eM) + static bool IsShowChanges(const sal_uInt16 eM) { return (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); } - static bool IsHideChanges(const USHORT eM) + static bool IsHideChanges(const sal_uInt16 eM) { return nsRedlineMode_t::REDLINE_SHOW_INSERT == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); } - static bool IsShowOriginal(const USHORT eM) + static bool IsShowOriginal(const sal_uInt16 eM) { return nsRedlineMode_t::REDLINE_SHOW_DELETE == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); } - static bool IsRedlineOn(const USHORT eM) + static bool IsRedlineOn(const sal_uInt16 eM) { return nsRedlineMode_t::REDLINE_ON == (eM & (nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE )); } public: diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 25b1c57f9a0b..214b9769ed32 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -129,7 +129,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd a list of forbidden characters. */ virtual const com::sun::star::i18n::ForbiddenCharacters* - getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const = 0; + getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const = 0; /** Set the forbidden characters. @@ -139,7 +139,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd @param rForbiddenCharacters [in] the new list of forbidden characters for language lang. */ - virtual void setForbiddenCharacters(/*[in]*/ USHORT nLang, + virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0; /** Get the forbidden character table and creates one if necessary. diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 485a9a5733f7..17000a4657c7 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -156,7 +156,7 @@ class SwPostItMgr: public SfxListener SwEditWin* mpEditWin; std::list< SwSidebarItem*> mvPostItFlds; std::vector<SwPostItPageItem*> mPages; - ULONG mnEventId; + sal_uLong mnEventId; bool mbWaitingForCalcRects; sw::sidebarwindows::SwSidebarWin* mpActivePostIt; bool mbLayout; @@ -184,7 +184,7 @@ class SwPostItMgr: public SfxListener const Rectangle aBorder, long lNeededHeight); void CheckForRemovedPostIts(); - bool ArrowEnabled(USHORT aDirection,unsigned long aPage) const; + bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const; bool BorderOverPageBorder(unsigned long aPage) const; bool HasScrollbars() const; void Focus(SfxBroadcaster& rBC); @@ -247,11 +247,11 @@ class SwPostItMgr: public SfxListener Rectangle GetTopScrollRect(const unsigned long aPage) const; bool IsHit(const Point &aPointPixel); - Color GetArrowColor(USHORT aDirection,unsigned long aPage) const; + Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const; sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const; - sw::sidebarwindows::SwSidebarWin* GetNextPostIt( USHORT aDirection, + sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection, sw::sidebarwindows::SwSidebarWin* aPostIt); long GetNextBorder(); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 729dc18a780b..00649f211f51 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -98,7 +98,7 @@ class SwSidebarWin : public Window long GetPostItTextHeight(); - void SwitchToPostIt(USHORT aDirection); + void SwitchToPostIt(sal_uInt16 aDirection); virtual void SwitchToFieldPos(); virtual sal_uInt32 MoveCaret() = 0; @@ -112,7 +112,7 @@ class SwSidebarWin : public Window virtual Date GetDate() = 0; virtual Time GetTime() = 0; - void ExecuteCommand(USHORT nSlot); + void ExecuteCommand(sal_uInt16 nSlot); void InitControls(); void HidePostIt(); void DoResize(); @@ -130,8 +130,8 @@ class SwSidebarWin : public Window void ResetAttributes(); void SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition); - void SetReadonly(BOOL bSet); - BOOL IsReadOnly() { return mbReadonly;} + void SetReadonly(sal_Bool bSet); + sal_Bool IsReadOnly() { return mbReadonly;} bool IsPreview() { return nFlags & PB_Preview;} void SetColor(Color aColorDark,Color aColorLight, Color aColorAnchor); @@ -204,7 +204,7 @@ class SwSidebarWin : public Window SwView& mrView; const SwPostItBits nFlags; - ULONG mnEventId; + sal_uLong mnEventId; OutlinerView* mpOutlinerView; Outliner* mpOutliner; diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index c5d052f660b2..0ad636adf67f 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -59,12 +59,12 @@ class SwApplet_Impl String sAlt; public: - static USHORT GetOptionType( const String& rName, BOOL bApplet ); - SwApplet_Impl( SfxItemPool& rPool, USHORT nWhich1, USHORT nWhich2 ); + static sal_uInt16 GetOptionType( const String& rName, sal_Bool bApplet ); + SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {} ~SwApplet_Impl(); void CreateApplet( const String& rCode, const String& rName, - BOOL bMayScript, const String& rCodeBase, + sal_Bool bMayScript, const String& rCodeBase, const String& rBaseURL ); #ifdef SOLAR_JAVA sal_Bool CreateApplet( const String& rBaseURL ); diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx index 92959457e534..1bb40de8ba91 100644 --- a/sw/inc/SwGetPoolIdFromName.hxx +++ b/sw/inc/SwGetPoolIdFromName.hxx @@ -30,7 +30,7 @@ /* When using the NameMapper to translate pool ids to UI or programmatic * names, this enum is used to define which family is required */ -typedef USHORT SwGetPoolIdFromName; +typedef sal_uInt16 SwGetPoolIdFromName; namespace nsSwGetPoolIdFromName { diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index 33f5cfd85e49..b24f867120ef 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -35,7 +35,7 @@ class SwMsgPoolItem; class SwUndoField : public SwUndo { - ULONG nNodeIndex; + sal_uLong nNodeIndex; xub_StrLen nOffset; protected: @@ -51,12 +51,12 @@ class SwUndoFieldFromDoc : public SwUndoField { SwField * pOldField, * pNewField; SwMsgPoolItem * pHnt; - BOOL bUpdate; + sal_Bool bUpdate; public: SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField, const SwField & aNewField, - SwMsgPoolItem * pHnt, BOOL bUpdate, + SwMsgPoolItem * pHnt, sal_Bool bUpdate, SwUndoId nId = UNDO_FIELD ); virtual ~SwUndoFieldFromDoc(); @@ -68,13 +68,13 @@ public: class SwUndoFieldFromAPI : public SwUndoField { com::sun::star::uno::Any aOldVal, aNewVal; - USHORT nWhich; + sal_uInt16 nWhich; public: SwUndoFieldFromAPI(const SwPosition & rPos, const com::sun::star::uno::Any & rOldVal, const com::sun::star::uno::Any & rNewVal, - USHORT nWhich); + sal_uInt16 nWhich); virtual ~SwUndoFieldFromAPI(); virtual void Undo(SwUndoIter & rIt); diff --git a/sw/inc/SwUndoFmt.hxx b/sw/inc/SwUndoFmt.hxx index ea23724fa817..157d87d2f26d 100644 --- a/sw/inc/SwUndoFmt.hxx +++ b/sw/inc/SwUndoFmt.hxx @@ -44,8 +44,8 @@ protected: SwDoc * pDoc; mutable String sNewName; SfxItemSet * pNewSet; - USHORT nId; // FmtId related - BOOL bAuto; + sal_uInt16 nId; // FmtId related + sal_Bool bAuto; public: @@ -70,8 +70,8 @@ protected: SwDoc * pDoc; String sOldName; SfxItemSet aOldSet; - USHORT nId; // FmtId related - BOOL bAuto; + sal_uInt16 nId; // FmtId related + sal_Bool bAuto; public: SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc); @@ -172,7 +172,7 @@ public: class SwUndoFrmFmtCreate : public SwUndoFmtCreate { - BOOL bAuto; + sal_Bool bAuto; public: SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom, diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx index 79be20d8cc07..08256b4c5e79 100644 --- a/sw/inc/accessibilityoptions.hxx +++ b/sw/inc/accessibilityoptions.hxx @@ -31,23 +31,23 @@ struct SwAccessibilityOptions { - BOOL bIsAlwaysAutoColor :1; - BOOL bIsStopAnimatedText :1; - BOOL bIsStopAnimatedGraphics :1; + sal_Bool bIsAlwaysAutoColor :1; + sal_Bool bIsStopAnimatedText :1; + sal_Bool bIsStopAnimatedGraphics :1; SwAccessibilityOptions() : - bIsAlwaysAutoColor(FALSE), - bIsStopAnimatedText(FALSE), - bIsStopAnimatedGraphics(FALSE) {} + bIsAlwaysAutoColor(sal_False), + bIsStopAnimatedText(sal_False), + bIsStopAnimatedGraphics(sal_False) {} - inline BOOL IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; } - inline void SetAlwaysAutoColor( BOOL b ) { bIsAlwaysAutoColor = b; } + inline sal_Bool IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; } + inline void SetAlwaysAutoColor( sal_Bool b ) { bIsAlwaysAutoColor = b; } - inline BOOL IsStopAnimatedGraphics() const { return bIsStopAnimatedText;} - inline void SetStopAnimatedGraphics( BOOL b ) { bIsStopAnimatedText = b; } + inline sal_Bool IsStopAnimatedGraphics() const { return bIsStopAnimatedText;} + inline void SetStopAnimatedGraphics( sal_Bool b ) { bIsStopAnimatedText = b; } - inline BOOL IsStopAnimatedText() const { return bIsStopAnimatedGraphics; } - inline void SetStopAnimatedText( BOOL b ) { bIsStopAnimatedGraphics = b;} + inline sal_Bool IsStopAnimatedText() const { return bIsStopAnimatedGraphics; } + inline void SetStopAnimatedText( sal_Bool b ) { bIsStopAnimatedGraphics = b;} }; #endif diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx index 8dda01f28493..af0cb98e4e6f 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -43,27 +43,27 @@ class SwAutoCompleteWord SvPtrarr aLRULst; SwAutoCompleteWord_Impl* pImpl; - USHORT nMaxCount, nMinWrdLen; - BOOL bLockWordLst; + sal_uInt16 nMaxCount, nMinWrdLen; + sal_Bool bLockWordLst; void DocumentDying(const SwDoc& rDoc); public: - SwAutoCompleteWord( USHORT nWords = 500, USHORT nMWrdLen = 10 ); + SwAutoCompleteWord( sal_uInt16 nWords = 500, sal_uInt16 nMWrdLen = 10 ); ~SwAutoCompleteWord(); - BOOL InsertWord( const String& rWord, SwDoc& rDoc ); + sal_Bool InsertWord( const String& rWord, SwDoc& rDoc ); - BOOL GetRange( const String& rWord, USHORT& rStt, USHORT& rEnd ) const; + sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd ) const; - const String& operator[]( USHORT n ) const { return *aWordLst[ n ]; } + const String& operator[]( sal_uInt16 n ) const { return *aWordLst[ n ]; } - BOOL IsLockWordLstLocked() const { return bLockWordLst; } - void SetLockWordLstLocked( BOOL bFlag ) { bLockWordLst = bFlag; } + sal_Bool IsLockWordLstLocked() const { return bLockWordLst; } + void SetLockWordLstLocked( sal_Bool bFlag ) { bLockWordLst = bFlag; } - void SetMaxCount( USHORT n ); + void SetMaxCount( sal_uInt16 n ); - USHORT GetMinWordLen() const { return nMinWrdLen; } - void SetMinWordLen( USHORT n ); + sal_uInt16 GetMinWordLen() const { return nMinWrdLen; } + void SetMinWordLen( sal_uInt16 n ); const SvStringsISortDtor& GetWordList() const { return aWordLst; } void CheckChangedList( const SvStringsISortDtor& rNewLst ); diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 71f8a201243f..03ef2af83cea 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -41,11 +41,11 @@ class SwAuthDataArr; class SwAuthEntry { String aAuthFields[AUTH_FIELD_END]; - USHORT nRefCount; + sal_uInt16 nRefCount; public: SwAuthEntry() : nRefCount(0){} SwAuthEntry( const SwAuthEntry& rCopy ); - BOOL operator==(const SwAuthEntry& rComp); + sal_Bool operator==(const SwAuthEntry& rComp); inline const String& GetAuthorField(ToxAuthorityField ePos)const; inline void SetAuthorField(ToxAuthorityField ePos, @@ -53,7 +53,7 @@ public: void AddRef() { ++nRefCount; } void RemoveRef() { --nRefCount; } - USHORT GetRefCount() { return nRefCount; } + sal_uInt16 GetRefCount() { return nRefCount; } }; /* -----------------20.10.99 16:49------------------- @@ -61,10 +61,10 @@ public: struct SwTOXSortKey { ToxAuthorityField eField; - BOOL bSortAscending; + sal_Bool bSortAscending; SwTOXSortKey() : eField(AUTH_FIELD_END), - bSortAscending(TRUE){} + bSortAscending(sal_True){} }; /* -----------------14.09.99 16:15------------------- @@ -81,8 +81,8 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType SortKeyArr* m_pSortKeyArr; sal_Unicode m_cPrefix; sal_Unicode m_cSuffix; - BOOL m_bIsSequence :1; - BOOL m_bSortByDocument :1; + sal_Bool m_bIsSequence :1; + sal_Bool m_bSortByDocument :1; LanguageType m_eLanguage; String m_sSortAlgorithm; @@ -97,14 +97,14 @@ public: virtual SwFieldType* Copy() const; virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } SwDoc* GetDoc(){ return m_pDoc; } void RemoveField(long nHandle); long AddField(const String& rFieldContents); - BOOL AddField(long nHandle); + sal_Bool AddField(long nHandle); void DelSequenceArray() { m_pSequArr->Remove(0, m_pSequArr->Count()); @@ -117,13 +117,13 @@ public: bool ChangeEntryContent(const SwAuthEntry* pNewEntry); // import interface - USHORT AppendField(const SwAuthEntry& rInsert); - long GetHandle(USHORT nPos); + sal_uInt16 AppendField(const SwAuthEntry& rInsert); + long GetHandle(sal_uInt16 nPos); - USHORT GetSequencePos(long nHandle); + sal_uInt16 GetSequencePos(long nHandle); - BOOL IsSequence() const {return m_bIsSequence;} - void SetSequence(BOOL bSet) + sal_Bool IsSequence() const {return m_bIsSequence;} + void SetSequence(sal_Bool bSet) { DelSequenceArray(); m_bIsSequence = bSet; @@ -137,16 +137,16 @@ public: sal_Unicode GetPrefix() const { return m_cPrefix;} sal_Unicode GetSuffix() const { return m_cSuffix;} - BOOL IsSortByDocument() const {return m_bSortByDocument;} - void SetSortByDocument(BOOL bSet) + sal_Bool IsSortByDocument() const {return m_bSortByDocument;} + void SetSortByDocument(sal_Bool bSet) { DelSequenceArray(); m_bSortByDocument = bSet; } - USHORT GetSortKeyCount() const ; - const SwTOXSortKey* GetSortKey(USHORT nIdx) const ; - void SetSortKeys(USHORT nKeyCount, SwTOXSortKey nKeys[]); + sal_uInt16 GetSortKeyCount() const ; + const SwTOXSortKey* GetSortKey(sal_uInt16 nIdx) const ; + void SetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey nKeys[]); //initui.cxx static const String& GetAuthFieldName(ToxAuthorityField eType); @@ -180,8 +180,8 @@ public: virtual void SetPar1(const String& rStr); virtual SwFieldType* ChgTyp( SwFieldType* ); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); long GetHandle() const { return m_nHandle; } diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx index f8fe69818439..06ffbe633ac2 100644 --- a/sw/inc/authratr.hxx +++ b/sw/inc/authratr.hxx @@ -37,13 +37,13 @@ class SW_DLLPUBLIC AuthorCharAttr { public: - USHORT nItemId; - USHORT nAttr; + sal_uInt16 nItemId; + sal_uInt16 nAttr; ColorData nColor; AuthorCharAttr(); - inline BOOL operator == ( const AuthorCharAttr& rAttr ) const + inline sal_Bool operator == ( const AuthorCharAttr& rAttr ) const { return nItemId == rAttr.nItemId && nAttr == rAttr.nAttr && nColor == rAttr.nColor; diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index 31a98adef990..731dddd2e3fe 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -39,19 +39,19 @@ class BigPtrEntry { friend class BigPtrArray; BlockInfo* pBlock; - USHORT nOffset; + sal_uInt16 nOffset; public: virtual ~BigPtrEntry() {} protected: BigPtrEntry() : pBlock(0), nOffset(0) {} - inline ULONG GetPos() const; + inline sal_uLong GetPos() const; inline BigPtrArray& GetArray() const; }; typedef BigPtrEntry* ElementPtr; -typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs ); +typedef sal_Bool (*FnForEach)( const ElementPtr&, void* pArgs ); // 1000 Eintr„ge pro Block = etwas weniger als 4K #define MAXENTRY 1000 @@ -67,51 +67,51 @@ typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs ); struct BlockInfo { // Block-Info: BigPtrArray* pBigArr; // in diesem Array steht der Block ElementPtr* pData; // Datenblock - ULONG nStart, nEnd; // Start- und EndIndex - USHORT nElem; // Anzahl Elemente + sal_uLong nStart, nEnd; // Start- und EndIndex + sal_uInt16 nElem; // Anzahl Elemente }; class SW_DLLPUBLIC BigPtrArray { BlockInfo** ppInf; // Block-Infos - ULONG nSize; // Anzahl Elemente - USHORT nMaxBlock; // akt. max Anzahl Bloecke - USHORT nBlock; // Anzahl Bloecke - USHORT nCur; // letzter Block + sal_uLong nSize; // Anzahl Elemente + sal_uInt16 nMaxBlock; // akt. max Anzahl Bloecke + sal_uInt16 nBlock; // Anzahl Bloecke + sal_uInt16 nCur; // letzter Block - USHORT Index2Block( ULONG ) const; // Blocksuche - BlockInfo* InsBlock( USHORT ); // Block einfuegen - void BlockDel( USHORT ); // es wurden Bloecke geloescht - void UpdIndex( USHORT ); // Indexe neu berechnen + sal_uInt16 Index2Block( sal_uLong ) const; // Blocksuche + BlockInfo* InsBlock( sal_uInt16 ); // Block einfuegen + void BlockDel( sal_uInt16 ); // es wurden Bloecke geloescht + void UpdIndex( sal_uInt16 ); // Indexe neu berechnen protected: // fuelle alle Bloecke auf. // Der short gibt in Prozent an, wie voll die Bloecke werden sollen. // Der ReturnWert besagt, das irgendetwas "getan" wurde - USHORT Compress( short = COMPRESSLVL ); + sal_uInt16 Compress( short = COMPRESSLVL ); public: BigPtrArray(); ~BigPtrArray(); - ULONG Count() const { return nSize; } + sal_uLong Count() const { return nSize; } - void Insert( const ElementPtr& r, ULONG pos ); - void Remove( ULONG pos, ULONG n = 1 ); - void Move( ULONG from, ULONG to ); - void Replace( ULONG pos, const ElementPtr& r); + void Insert( const ElementPtr& r, sal_uLong pos ); + void Remove( sal_uLong pos, sal_uLong n = 1 ); + void Move( sal_uLong from, sal_uLong to ); + void Replace( sal_uLong pos, const ElementPtr& r); - ElementPtr operator[]( ULONG ) const; + ElementPtr operator[]( sal_uLong ) const; void ForEach( FnForEach fn, void* pArgs = NULL ) { ForEach( 0, nSize, fn, pArgs ); } - void ForEach( ULONG nStart, ULONG nEnd, FnForEach fn, void* pArgs = NULL ); + void ForEach( sal_uLong nStart, sal_uLong nEnd, FnForEach fn, void* pArgs = NULL ); }; -inline ULONG BigPtrEntry::GetPos() const +inline sal_uLong BigPtrEntry::GetPos() const { DBG_ASSERT( this == pBlock->pData[ nOffset ], "Element nicht im Block" ); return pBlock->nStart + nOffset; diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 4c016593fab6..9427b4d26c6e 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -108,8 +108,8 @@ public: return *m_pForbidden; } - USHORT GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const; - USHORT GetAllScriptsOfText( const String& rTxt ) const; + sal_uInt16 GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const; + sal_uInt16 GetAllScriptsOfText( const String& rTxt ) const; }; #define SW_BREAKITER() SwBreakIt::Get() diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 6ce5e181947a..407688df2a5f 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -65,14 +65,14 @@ class SW_DLLPUBLIC SwClient friend class SwClientIter; SwClient *pLeft, *pRight; // fuer die AVL-Sortierung - BOOL bModifyLocked : 1; // wird in SwModify::Modify benutzt, + sal_Bool bModifyLocked : 1; // wird in SwModify::Modify benutzt, // eigentlich ein Member des SwModify // aber aus Platzgruenden hier. - BOOL bInModify : 1; // ist in einem Modify. (Debug!!!) - BOOL bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden" - BOOL bInCache : 1; // Ist im BorderAttrCache des Layout, + sal_Bool bInModify : 1; // ist in einem Modify. (Debug!!!) + sal_Bool bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden" + sal_Bool bInCache : 1; // Ist im BorderAttrCache des Layout, // Traegt sich dann im Modify aus! - BOOL bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung + sal_Bool bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung protected: SwModify *pRegisteredIn; @@ -92,17 +92,17 @@ public: //werden. TYPEINFO(); - void LockModify() { bModifyLocked = TRUE; } - void UnlockModify() { bModifyLocked = FALSE; } - void SetInCache( BOOL bNew ) { bInCache = bNew; } - void SetInSwFntCache( BOOL bNew ) { bInSwFntCache = bNew; } - BOOL IsModifyLocked() const { return bModifyLocked; } - BOOL IsInDocDTOR() const { return bInDocDTOR; } - BOOL IsInCache() const { return bInCache; } - BOOL IsInSwFntCache() const { return bInSwFntCache; } + void LockModify() { bModifyLocked = sal_True; } + void UnlockModify() { bModifyLocked = sal_False; } + void SetInCache( sal_Bool bNew ) { bInCache = bNew; } + void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; } + sal_Bool IsModifyLocked() const { return bModifyLocked; } + sal_Bool IsInDocDTOR() const { return bInDocDTOR; } + sal_Bool IsInCache() const { return bInCache; } + sal_Bool IsInSwFntCache() const { return bInSwFntCache; } // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; private: SwClient( const SwClient& ); @@ -111,7 +111,7 @@ private: inline SwClient::SwClient() : pLeft(0), pRight(0), pRegisteredIn(0) -{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = FALSE; } +{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = sal_False; } // ---------- @@ -144,13 +144,13 @@ public: const SwClient* GetDepends() const { return pRoot; } // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; - void SetInDocDTOR() { bInDocDTOR = TRUE; } + void SetInDocDTOR() { bInDocDTOR = sal_True; } - void CheckCaching( const USHORT nWhich ); + void CheckCaching( const sal_uInt16 nWhich ); - BOOL IsLastDepend() const + sal_Bool IsLastDepend() const { return pRoot && !pRoot->pLeft && !pRoot->pRight; } private: @@ -185,7 +185,7 @@ public: virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue ); // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem & ) const; + virtual sal_Bool GetInfo( SfxPoolItem & ) const; private: // forbidden and not implemented (see @ SwClient). diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 4db19fc9a29d..996f6edb2b2a 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -133,7 +133,7 @@ public: // Strings sonderbehandeln - BOOL GetBool() const; + sal_Bool GetBool() const; // Strings sonderbehandeln BOOLs sonderbehandeln double GetDouble() const; SwSbxValue& MakeDouble(); @@ -163,9 +163,9 @@ struct SwCalcExp : public SwHash }; SwHash* Find( const String& rSrch, SwHash** ppTable, - USHORT nTblSize, USHORT* pPos = 0 ); + sal_uInt16 nTblSize, sal_uInt16* pPos = 0 ); -void DeleteHashTable( SwHash** ppTable, USHORT nTblSize ); +void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize ); // falls _CalcOp != 0, dann ist das ein gueltiger Operator struct _CalcOp; @@ -190,7 +190,7 @@ class SwCalc const LocaleDataWrapper* pLclData; CharClass* pCharClass; - USHORT nListPor; + sal_uInt16 nListPor; SwCalcOper eCurrOper; SwCalcOper eCurrListOper; SwCalcError eError; @@ -201,7 +201,7 @@ class SwCalc SwSbxValue Term(); SwSbxValue Prim(); - BOOL ParseTime( USHORT*, USHORT*, USHORT* ); + sal_Bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); String GetColumnName( const String& rName ); String GetDBName( const String& rName ); @@ -215,20 +215,20 @@ public: ~SwCalc(); SwSbxValue Calculate( const String &rStr ); - String GetStrResult( const SwSbxValue& rValue, BOOL bRound = TRUE ); - String GetStrResult( double, BOOL bRound = TRUE ); + String GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True ); + String GetStrResult( double, sal_Bool bRound = sal_True ); SwCalcExp* VarInsert( const String& r ); - SwCalcExp* VarLook( const String &rStr, USHORT ins = 0 ); + SwCalcExp* VarLook( const String &rStr, sal_uInt16 ins = 0 ); void VarChange( const String& rStr, const SwSbxValue& rValue ); void VarChange( const String& rStr, double ); SwHash** GetVarTable() { return VarTable; } - BOOL Push( const VoidPtr pPtr ); + sal_Bool Push( const VoidPtr pPtr ); void Pop( const VoidPtr pPtr ); void SetCalcError( SwCalcError eErr ) { eError = eErr; } - BOOL IsCalcError() const { return 0 != eError; } + sal_Bool IsCalcError() const { return 0 != eError; } static bool Str2Double( const String& rStr, xub_StrLen& rPos, double& rVal, @@ -236,7 +236,7 @@ public: static bool Str2Double( const String& rStr, xub_StrLen& rPos, double& rVal, SwDoc *const pDoc ); - SW_DLLPUBLIC static BOOL IsValidVarName( const String& rStr, + SW_DLLPUBLIC static sal_Bool IsValidVarName( const String& rStr, String* pValidName = 0 ); }; diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index d91c20409d0a..8e99f943360f 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -53,8 +53,8 @@ struct CollName { // const char* pStr; - ULONG nCnd; - ULONG nSubCond; + sal_uLong nCnd; + sal_uLong nSubCond; }; //*********************************************************** @@ -63,8 +63,8 @@ struct CollName { struct CommandStruct { - ULONG nCnd; - ULONG nSubCond; + sal_uLong nCnd; + sal_uLong nSubCond; }; //*********************************************************** @@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem String sStyles[COND_COMMAND_COUNT]; public: - SwCondCollItem(USHORT nWhich = FN_COND_COLL); + SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL); ~SwCondCollItem(); TYPEINFO(); @@ -91,8 +91,8 @@ public: static const CommandStruct* GetCmds(); - const String& GetStyle(USHORT nPos) const; - void SetStyle( const String* pStyle, USHORT nPos); + const String& GetStyle(sal_uInt16 nPos) const; + void SetStyle( const String* pStyle, sal_uInt16 nPos); }; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index b870da64231f..30f5f3bdc925 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -36,10 +36,10 @@ class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item { - BOOL bAuto; // automatisch vergebenes Flag + sal_Bool bAuto; // automatisch vergebenes Flag public: - SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT, - BOOL bAuto = FALSE ); + SwTblBoxNumFormat( sal_uInt32 nFormat = NUMBERFORMAT_TEXT, + sal_Bool bAuto = sal_False ); // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; @@ -52,8 +52,8 @@ public: return *this; } - BOOL GetAutoFlag() const { return bAuto; } - void SetAutoFlag( BOOL bFlag = TRUE ) { bAuto = bFlag; } + sal_Bool GetAutoFlag() const { return bAuto; } + void SetAutoFlag( sal_Bool bFlag = sal_True ) { bAuto = bFlag; } }; class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula @@ -110,20 +110,20 @@ public: //*************************************************************************** -inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const +inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(sal_Bool bInP) const { return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } -inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const +inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) const { return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); } -inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const +inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(sal_Bool bInP) const { return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); } //*************************************************************************** -inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const +inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(sal_Bool bInP) const { return aSet.GetTblBoxNumFmt(bInP); } -inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const +inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(sal_Bool bInP) const { return aSet.GetTblBoxFormula(bInP); } -inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const +inline const SwTblBoxValue &SwFmt::GetTblBoxValue(sal_Bool bInP) const { return aSet.GetTblBoxValue(bInP); } #endif diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index df24004a64fb..169058938f56 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -43,7 +43,7 @@ class String; class SwTblCalcPara { const SwTableBox* pLastTblBox; - USHORT nStackCnt, nMaxSize; + sal_uInt16 nStackCnt, nMaxSize; public: SwTableSortBoxes *pBoxStk; // Stack fuers erkennen von Rekursionen ! @@ -53,9 +53,9 @@ public: SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable ); ~SwTblCalcPara(); - BOOL CalcWithStackOverflow(); - BOOL IsStackOverFlow() const { return nMaxSize == nStackCnt; } - BOOL IncStackCnt() { return nMaxSize == ++nStackCnt; } + sal_Bool CalcWithStackOverflow(); + sal_Bool IsStackOverFlow() const { return nMaxSize == nStackCnt; } + sal_Bool IncStackCnt() { return nMaxSize == ++nStackCnt; } void DecStackCnt() { if( nStackCnt ) --nStackCnt; } void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; } }; @@ -98,7 +98,7 @@ protected: String sFormel; // akt. Formel NameType eNmType; // akt. Darstellungs Art - BOOL bValidValue; // TRUE: Formel neu berechnen + sal_Bool bValidValue; // sal_True: Formel neu berechnen // suche den Node, in dem die Formel steht: // TextFeld -> TextNode, @@ -114,7 +114,7 @@ protected: *rCalcPara.pTbl, &rCalcPara ); } - static USHORT GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox ); + static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox ); public: @@ -138,25 +138,25 @@ public: void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd ); // ist gerade eine intern Darstellung aktiv - BOOL IsIntrnlName() const { return eNmType == INTRNL_NAME; } + sal_Bool IsIntrnlName() const { return eNmType == INTRNL_NAME; } // erfrage die akt. Darstellung der Formel NameType GetNameType() const { return eNmType; } // erfrage/setze das Flag, ob der akt. Wert gueltig ist - BOOL IsValid() const { return bValidValue; } - inline void ChgValid( BOOL bNew ) { bValidValue = bNew; } + sal_Bool IsValid() const { return bValidValue; } + inline void ChgValid( sal_Bool bNew ) { bValidValue = bNew; } const String& GetFormula() const { return sFormel; } void SetFormula( const String& rNew ) { sFormel = rNew; - bValidValue = FALSE; + bValidValue = sal_False; eNmType = EXTRNL_NAME; } - USHORT GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes ); + sal_uInt16 GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes ); // sind alle Boxen gueltig, auf die sich die Formel bezieht? - BOOL HasValidBoxes() const; + sal_Bool HasValidBoxes() const; }; diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index f9c4e113ea61..ba0040797a74 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -36,79 +36,79 @@ * AMA 12.10.94: Umstellung auf SvxItems. ******************************************************************************/ -inline const SvxPostureItem &SwAttrSet::GetPosture(BOOL bInP) const +inline const SvxPostureItem &SwAttrSet::GetPosture(sal_Bool bInP) const { return (const SvxPostureItem&)Get( RES_CHRATR_POSTURE,bInP); } -inline const SvxPostureItem &SwAttrSet::GetCJKPosture(BOOL bInP) const +inline const SvxPostureItem &SwAttrSet::GetCJKPosture(sal_Bool bInP) const { return (const SvxPostureItem&)Get( RES_CHRATR_CJK_POSTURE,bInP); } -inline const SvxPostureItem &SwAttrSet::GetCTLPosture(BOOL bInP) const +inline const SvxPostureItem &SwAttrSet::GetCTLPosture(sal_Bool bInP) const { return (const SvxPostureItem&)Get( RES_CHRATR_CTL_POSTURE,bInP); } -inline const SvxWeightItem &SwAttrSet::GetWeight(BOOL bInP) const +inline const SvxWeightItem &SwAttrSet::GetWeight(sal_Bool bInP) const { return (const SvxWeightItem&)Get( RES_CHRATR_WEIGHT,bInP); } -inline const SvxWeightItem &SwAttrSet::GetCJKWeight(BOOL bInP) const +inline const SvxWeightItem &SwAttrSet::GetCJKWeight(sal_Bool bInP) const { return (const SvxWeightItem&)Get( RES_CHRATR_CJK_WEIGHT,bInP); } -inline const SvxWeightItem &SwAttrSet::GetCTLWeight(BOOL bInP) const +inline const SvxWeightItem &SwAttrSet::GetCTLWeight(sal_Bool bInP) const { return (const SvxWeightItem&)Get( RES_CHRATR_CTL_WEIGHT,bInP); } -inline const SvxShadowedItem &SwAttrSet::GetShadowed(BOOL bInP) const +inline const SvxShadowedItem &SwAttrSet::GetShadowed(sal_Bool bInP) const { return (const SvxShadowedItem&)Get( RES_CHRATR_SHADOWED,bInP); } -inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(BOOL bInP) const +inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(sal_Bool bInP) const { return (const SvxAutoKernItem&)Get( RES_CHRATR_AUTOKERN,bInP); } -inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(BOOL bInP) const +inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(sal_Bool bInP) const { return (const SvxWordLineModeItem&)Get( RES_CHRATR_WORDLINEMODE,bInP); } -inline const SvxContourItem &SwAttrSet::GetContour(BOOL bInP) const +inline const SvxContourItem &SwAttrSet::GetContour(sal_Bool bInP) const { return (const SvxContourItem&)Get( RES_CHRATR_CONTOUR,bInP); } -inline const SvxKerningItem &SwAttrSet::GetKerning(BOOL bInP) const +inline const SvxKerningItem &SwAttrSet::GetKerning(sal_Bool bInP) const { return (const SvxKerningItem&)Get( RES_CHRATR_KERNING,bInP); } -inline const SvxUnderlineItem &SwAttrSet::GetUnderline(BOOL bInP) const +inline const SvxUnderlineItem &SwAttrSet::GetUnderline(sal_Bool bInP) const { return (const SvxUnderlineItem&)Get( RES_CHRATR_UNDERLINE,bInP); } -inline const SvxOverlineItem &SwAttrSet::GetOverline(BOOL bInP) const +inline const SvxOverlineItem &SwAttrSet::GetOverline(sal_Bool bInP) const { return (const SvxOverlineItem&)Get( RES_CHRATR_OVERLINE,bInP); } -inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(BOOL bInP) const +inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(sal_Bool bInP) const { return (const SvxCrossedOutItem&)Get( RES_CHRATR_CROSSEDOUT,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetSize(BOOL bInP) const +inline const SvxFontHeightItem &SwAttrSet::GetSize(sal_Bool bInP) const { return (const SvxFontHeightItem&)Get( RES_CHRATR_FONTSIZE,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(BOOL bInP) const +inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(sal_Bool bInP) const { return (const SvxFontHeightItem&)Get( RES_CHRATR_CJK_FONTSIZE,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(BOOL bInP) const +inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(sal_Bool bInP) const { return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); } -inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const +inline const SvxPropSizeItem &SwAttrSet::GetPropSize(sal_Bool bInP) const { return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); } -inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const +inline const SvxFontItem &SwAttrSet::GetFont(sal_Bool bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); } -inline const SvxFontItem &SwAttrSet::GetCJKFont(BOOL bInP) const +inline const SvxFontItem &SwAttrSet::GetCJKFont(sal_Bool bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); } -inline const SvxFontItem &SwAttrSet::GetCTLFont(BOOL bInP) const +inline const SvxFontItem &SwAttrSet::GetCTLFont(sal_Bool bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_CTL_FONT,bInP); } -inline const SvxColorItem &SwAttrSet::GetColor(BOOL bInP) const +inline const SvxColorItem &SwAttrSet::GetColor(sal_Bool bInP) const { return (const SvxColorItem&)Get( RES_CHRATR_COLOR,bInP); } -inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(BOOL bInP) const +inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(sal_Bool bInP) const { return (const SvxCharSetColorItem&)Get( RES_CHRATR_CHARSETCOLOR,bInP); } -inline const SvxLanguageItem &SwAttrSet::GetLanguage(BOOL bInP) const +inline const SvxLanguageItem &SwAttrSet::GetLanguage(sal_Bool bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_LANGUAGE,bInP); } -inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(BOOL bInP) const +inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(sal_Bool bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_CJK_LANGUAGE,bInP); } -inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(BOOL bInP) const +inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(sal_Bool bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); } -inline const SvxEscapementItem &SwAttrSet::GetEscapement(BOOL bInP) const +inline const SvxEscapementItem &SwAttrSet::GetEscapement(sal_Bool bInP) const { return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); } -inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const +inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(sal_Bool bInP) const { return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); } -inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const +inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(sal_Bool bInP) const { return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); } -inline const SvxBlinkItem &SwAttrSet::GetBlink(BOOL bInP) const +inline const SvxBlinkItem &SwAttrSet::GetBlink(sal_Bool bInP) const { return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); } -inline const SvxBrushItem &SwAttrSet::GetChrBackground( BOOL bInP ) const +inline const SvxBrushItem &SwAttrSet::GetChrBackground( sal_Bool bInP ) const { return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); } -inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( BOOL bInP ) const +inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( sal_Bool bInP ) const { return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); } -inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( BOOL bInP ) const +inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( sal_Bool bInP ) const { return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); } -inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( BOOL bInP ) const +inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( sal_Bool bInP ) const { return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); } -inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( BOOL bInP ) const +inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( sal_Bool bInP ) const { return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); } -inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( BOOL bInP ) const +inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( sal_Bool bInP ) const { return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); } -inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const +inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( sal_Bool bInP ) const { return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); } /****************************************************************************** @@ -116,63 +116,63 @@ inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const * AMA: 12.10.94: Umstellung auf SvxItems. ******************************************************************************/ -inline const SvxPostureItem &SwFmt::GetPosture(BOOL bInP) const +inline const SvxPostureItem &SwFmt::GetPosture(sal_Bool bInP) const { return aSet.GetPosture(bInP); } -inline const SvxWeightItem &SwFmt::GetWeight(BOOL bInP) const +inline const SvxWeightItem &SwFmt::GetWeight(sal_Bool bInP) const { return aSet.GetWeight(bInP); } -inline const SvxShadowedItem &SwFmt::GetShadowed(BOOL bInP) const +inline const SvxShadowedItem &SwFmt::GetShadowed(sal_Bool bInP) const { return aSet.GetShadowed(bInP); } -inline const SvxAutoKernItem &SwFmt::GetAutoKern(BOOL bInP) const +inline const SvxAutoKernItem &SwFmt::GetAutoKern(sal_Bool bInP) const { return aSet.GetAutoKern(bInP); } -inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(BOOL bInP) const +inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(sal_Bool bInP) const { return aSet.GetWordLineMode(bInP); } -inline const SvxContourItem &SwFmt::GetContour(BOOL bInP) const +inline const SvxContourItem &SwFmt::GetContour(sal_Bool bInP) const { return aSet.GetContour(bInP); } -inline const SvxKerningItem &SwFmt::GetKerning(BOOL bInP) const +inline const SvxKerningItem &SwFmt::GetKerning(sal_Bool bInP) const { return aSet.GetKerning(bInP); } -inline const SvxUnderlineItem &SwFmt::GetUnderline(BOOL bInP) const +inline const SvxUnderlineItem &SwFmt::GetUnderline(sal_Bool bInP) const { return aSet.GetUnderline(bInP); } -inline const SvxOverlineItem &SwFmt::GetOverline(BOOL bInP) const +inline const SvxOverlineItem &SwFmt::GetOverline(sal_Bool bInP) const { return aSet.GetOverline(bInP); } -inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(BOOL bInP) const +inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(sal_Bool bInP) const { return aSet.GetCrossedOut(bInP); } -inline const SvxFontHeightItem &SwFmt::GetSize(BOOL bInP) const +inline const SvxFontHeightItem &SwFmt::GetSize(sal_Bool bInP) const { return aSet.GetSize(bInP); } -inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const +inline const SvxPropSizeItem &SwFmt::GetPropSize(sal_Bool bInP) const { return aSet.GetPropSize(bInP); } -inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const +inline const SvxFontItem &SwFmt::GetFont(sal_Bool bInP) const { return aSet.GetFont(bInP); } -inline const SvxFontItem &SwFmt::GetCJKFont(BOOL bInP) const +inline const SvxFontItem &SwFmt::GetCJKFont(sal_Bool bInP) const { return aSet.GetCJKFont(bInP); } -inline const SvxFontItem &SwFmt::GetCTLFont(BOOL bInP) const +inline const SvxFontItem &SwFmt::GetCTLFont(sal_Bool bInP) const { return aSet.GetCTLFont(bInP); } -inline const SvxColorItem &SwFmt::GetColor(BOOL bInP) const +inline const SvxColorItem &SwFmt::GetColor(sal_Bool bInP) const { return aSet.GetColor(bInP); } - inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(BOOL bInP) const + inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(sal_Bool bInP) const { return aSet.GetCharSetColor(bInP); } -inline const SvxLanguageItem &SwFmt::GetLanguage(BOOL bInP) const +inline const SvxLanguageItem &SwFmt::GetLanguage(sal_Bool bInP) const { return aSet.GetLanguage(bInP); } -inline const SvxEscapementItem &SwFmt::GetEscapement(BOOL bInP) const +inline const SvxEscapementItem &SwFmt::GetEscapement(sal_Bool bInP) const { return aSet.GetEscapement(bInP); } -inline const SvxCaseMapItem &SwFmt::GetCaseMap(BOOL bInP) const +inline const SvxCaseMapItem &SwFmt::GetCaseMap(sal_Bool bInP) const { return aSet.GetCaseMap(bInP); } -inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(BOOL bInP) const +inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(sal_Bool bInP) const { return aSet.GetNoHyphenHere(bInP); } -inline const SvxBlinkItem &SwFmt::GetBlink(BOOL bInP) const +inline const SvxBlinkItem &SwFmt::GetBlink(sal_Bool bInP) const { return aSet.GetBlink(bInP); } -inline const SvxBrushItem &SwFmt::GetChrBackground(BOOL bInP) const +inline const SvxBrushItem &SwFmt::GetChrBackground(sal_Bool bInP) const { return aSet.GetChrBackground(bInP); } -inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( BOOL bInP ) const +inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( sal_Bool bInP ) const { return aSet.GetEmphasisMark(bInP); } -inline const SvxTwoLinesItem &SwFmt::Get2Lines( BOOL bInP ) const +inline const SvxTwoLinesItem &SwFmt::Get2Lines( sal_Bool bInP ) const { return aSet.Get2Lines(bInP); } -inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( BOOL bInP ) const +inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( sal_Bool bInP ) const { return aSet.GetCharScaleW(bInP); } -inline const SvxCharRotateItem &SwFmt::GetCharRotate( BOOL bInP ) const +inline const SvxCharRotateItem &SwFmt::GetCharRotate( sal_Bool bInP ) const { return aSet.GetCharRotate(bInP); } -inline const SvxCharReliefItem &SwFmt::GetCharRelief( BOOL bInP ) const +inline const SvxCharReliefItem &SwFmt::GetCharRelief( sal_Bool bInP ) const { return aSet.GetCharRelief(bInP); } -inline const SvxCharHiddenItem &SwFmt::GetCharHidden( BOOL bInP ) const +inline const SvxCharHiddenItem &SwFmt::GetCharHidden( sal_Bool bInP ) const { return aSet.GetCharHidden(bInP); } #endif diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index a3e4b22a0b88..3b018fcff186 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -51,8 +51,8 @@ public: namespace CharFmt { extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr ); - extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, USHORT nWhich ); - extern BOOL IsItemIncluded( const USHORT nWhich, const SwTxtAttr *pAttr ); + extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich ); + extern sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ); } #endif diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 5d63c866c68d..195b76f163d1 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -67,7 +67,7 @@ public: class SW_DLLPUBLIC SwChapterField : public SwField { friend class SwChapterFieldType; - BYTE nLevel; + sal_uInt8 nLevel; String sTitle, sNumber, sPre, sPost; virtual String Expand() const; @@ -79,24 +79,24 @@ public: // --> OD 2008-02-14 #i53420# // void ChangeExpansion( const SwFrm*, // const SwTxtNode*, -// BOOL bSrchNum = FALSE); +// sal_Bool bSrchNum = sal_False); void ChangeExpansion( const SwFrm*, const SwCntntNode*, - BOOL bSrchNum = FALSE); + sal_Bool bSrchNum = sal_False); // <-- - void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum); + void ChangeExpansion(const SwTxtNode &rNd, sal_Bool bSrchNum); - inline BYTE GetLevel() const; - inline void SetLevel(BYTE); + inline sal_uInt8 GetLevel() const; + inline void SetLevel(sal_uInt8); inline const String& GetNumber() const; inline const String& GetTitle() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; -inline BYTE SwChapterField::GetLevel() const { return nLevel; } -inline void SwChapterField::SetLevel(BYTE nLev) { nLevel = nLev; } +inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; } +inline void SwChapterField::SetLevel(sal_uInt8 nLev) { nLevel = nLev; } inline const String& SwChapterField::GetNumber() const { return sNumber; } inline const String& SwChapterField::GetTitle() const { return sTitle; } diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 22cb3613502e..567bc5746c8b 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -139,7 +139,7 @@ struct SwContentAtPos } // befindet sich der Node in einem geschuetzten Bereich? - BOOL IsInProtectSect() const; + sal_Bool IsInProtectSect() const; bool IsInRTLText()const; }; @@ -160,7 +160,7 @@ class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify friend class SwChgLinkFlag; //Braucht den Crsr als IntrnlCrsr. - friend BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); + friend sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); public: // public, damit defaultet werden kann !! @@ -204,9 +204,9 @@ private: long nUpDownX; // versuche den Cursor bei Up/Down immer in // der gleichen Spalte zu bewegen long nLeftFrmPos; - ULONG nAktNode; // save CursorPos at Start-Action + sal_uLong nAktNode; // save CursorPos at Start-Action xub_StrLen nAktCntnt; - USHORT nAktNdTyp; + sal_uInt16 nAktNdTyp; bool bAktSelection; /* @@ -215,8 +215,8 @@ private: * auf den akt. Cursor kein Update. Dadurch koennen "komplizierte" * Cursorbewegungen (ueber Find()) realisiert werden. */ - USHORT nCrsrMove; - USHORT nBasicActionCnt; // Actions, die vom Basic geklammert wurden + sal_uInt16 nCrsrMove; + sal_uInt16 nBasicActionCnt; // Actions, die vom Basic geklammert wurden CrsrMoveState eMvState; // Status fuers Crsr-Travelling - GetCrsrOfst // --> OD 2008-04-02 #refactorlists# @@ -224,35 +224,35 @@ private: int nMarkedListLevel; // <-- - BOOL bHasFocus : 1; // Shell ist in einem Window "aktiv" - BOOL bSVCrsrVis : 1; // SV-Cursor Un-/Sichtbar - BOOL bChgCallFlag : 1; // Attributaenderung innerhalb von + sal_Bool bHasFocus : 1; // Shell ist in einem Window "aktiv" + sal_Bool bSVCrsrVis : 1; // SV-Cursor Un-/Sichtbar + sal_Bool bChgCallFlag : 1; // Attributaenderung innerhalb von // Start- und EndAction - BOOL bVisPortChgd : 1; // befindet sich im VisPortChg-Aufruf + sal_Bool bVisPortChgd : 1; // befindet sich im VisPortChg-Aufruf // (wird im Invalidate vom Cursor benutzt) - BOOL bCallChgLnk : 1; // Flag fuer abgeleitete Klassen: - // TRUE -> ChgLnk callen + sal_Bool bCallChgLnk : 1; // Flag fuer abgeleitete Klassen: + // sal_True -> ChgLnk callen // Zugriff nur ueber SwChgLinkFlag - BOOL bAllProtect : 1; // Flag fuer Bereiche - // TRUE -> alles geschuetzt / versteckt - BOOL bInCMvVisportChgd : 1; // Flag fuer CrsrMoves - // TRUE -> die Sicht wurde verschoben - BOOL bGCAttr : 1; // TRUE -> es existieren nichtaufgespannte Attr. - BOOL bIgnoreReadonly : 1; // TRUE -> Beim naechsten EndAction trotz + sal_Bool bAllProtect : 1; // Flag fuer Bereiche + // sal_True -> alles geschuetzt / versteckt + sal_Bool bInCMvVisportChgd : 1; // Flag fuer CrsrMoves + // sal_True -> die Sicht wurde verschoben + sal_Bool bGCAttr : 1; // sal_True -> es existieren nichtaufgespannte Attr. + sal_Bool bIgnoreReadonly : 1; // sal_True -> Beim naechsten EndAction trotz // Readonly den Crsr sichtbar machen. - BOOL bSelTblCells : 1; // TRUE -> Zellen uebers InputWin selektieren - BOOL bAutoUpdateCells : 1; // TRUE -> Zellen werden autoformatiert - BOOL bBasicHideCrsr : 1; // TRUE -> HideCrsr vom Basic - BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor darf in ReadOnly-Bereiche - BOOL bOverwriteCrsr : 1; // TRUE -> show Overwrite Crsr + sal_Bool bSelTblCells : 1; // sal_True -> Zellen uebers InputWin selektieren + sal_Bool bAutoUpdateCells : 1; // sal_True -> Zellen werden autoformatiert + sal_Bool bBasicHideCrsr : 1; // sal_True -> HideCrsr vom Basic + sal_Bool bSetCrsrInReadOnly : 1;// sal_True -> Cursor darf in ReadOnly-Bereiche + sal_Bool bOverwriteCrsr : 1; // sal_True -> show Overwrite Crsr // OD 11.02.2003 #100556# - flag to allow/avoid execution of marcos (default: true) bool mbMacroExecAllowed : 1; - SW_DLLPRIVATE void UpdateCrsr( USHORT eFlags + SW_DLLPRIVATE void UpdateCrsr( sal_uInt16 eFlags =SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE, - BOOL bIdleEnd = FALSE ); + sal_Bool bIdleEnd = sal_False ); SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ); @@ -273,21 +273,21 @@ private: // <- #i27615# // private method(s) accessed from public inline method(s) must be exported. - BOOL LeftRight( BOOL, USHORT, USHORT, BOOL ); - SW_DLLPRIVATE BOOL UpDown( BOOL, USHORT ); - SW_DLLPRIVATE BOOL LRMargin( BOOL, BOOL bAPI = FALSE ); - SW_DLLPRIVATE BOOL IsAtLRMargin( BOOL, BOOL bAPI = FALSE ) const; + sal_Bool LeftRight( sal_Bool, sal_uInt16, sal_uInt16, sal_Bool ); + SW_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 ); + SW_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False ); + SW_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const; SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const; -typedef BOOL (SwCursor:: *FNCrsr)(); - SW_DLLPRIVATE BOOL CallCrsrFN( FNCrsr ); +typedef sal_Bool (SwCursor:: *FNCrsr)(); + SW_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr ); - SW_DLLPRIVATE const SwRedline* _GotoRedline( USHORT nArrPos, BOOL bSelect ); + SW_DLLPRIVATE const SwRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect ); protected: - inline SwMoveFnCollection* MakeFindRange( USHORT, USHORT, SwPaM* ) const; + inline SwMoveFnCollection* MakeFindRange( sal_uInt16, sal_uInt16, SwPaM* ) const; /* * Compare-Methode for the StackCursor and the current Cursor. @@ -309,11 +309,11 @@ protected: const xub_StrLen nOffset = 0 ); // --> FME 2004-07-30 #i32329# Enhanced table selection - BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); + sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); // <-- // --> FME 2005-01-31 #i41424# Only update the marked number levels if necessary - bool SetInFrontOfLabel( BOOL bNew ); + bool SetInFrontOfLabel( sal_Bool bNew ); // <-- void RefreshBlockCursor(); @@ -334,7 +334,7 @@ public: // neuen Cusror erzeugen und den alten anhaengen SwPaM * CreateCrsr(); // loesche den aktuellen Cursor und der folgende wird zum Aktuellen - BOOL DestroyCrsr(); + sal_Bool DestroyCrsr(); // TableCursor in normale Cursor verwandeln, Tablemode aufheben void TblCrsrToCursor(); // enter block mode, change normal cursor into block cursor @@ -347,8 +347,8 @@ public: // only for usage in special cases allowed! void ExtendedSelectAll(); - SwPaM* GetCrsr( BOOL bMakeTblCrsr = TRUE ) const; - inline SwCursor* GetSwCrsr( BOOL bMakeTblCrsr = TRUE ) const; + SwPaM* GetCrsr( sal_Bool bMakeTblCrsr = sal_True ) const; + inline SwCursor* GetSwCrsr( sal_Bool bMakeTblCrsr = sal_True ) const; // nur den akt. Cursor returnen SwShellCrsr* _GetCrsr() { return pCurCrsr; } const SwShellCrsr* _GetCrsr() const { return pCurCrsr; } @@ -367,43 +367,43 @@ public: // Start der Klammerung, SV-Cursor und selektierte Bereiche hiden void StartAction(); // Ende der Klammerung, SV-Cursor und selektierte Bereiche anzeigen - void EndAction( const BOOL bIdleEnd = FALSE ); + void EndAction( const sal_Bool bIdleEnd = sal_False ); // Basiscursortravelling long GetUpDownX() const { return nUpDownX; } - BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE ) - { return LeftRight( TRUE, nCnt, nMode, bAllowVisual ); } - BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE ) - { return LeftRight( FALSE, nCnt, nMode, bAllowVisual ); } - BOOL Up( USHORT nCnt = 1 ) { return UpDown( TRUE, nCnt ); } - BOOL Down( USHORT nCnt = 1 ) { return UpDown( FALSE, nCnt ); } - BOOL LeftMargin() { return LRMargin( TRUE ); } - BOOL RightMargin(BOOL bAPI = FALSE) { return LRMargin( FALSE, bAPI ); } - BOOL SttEndDoc( BOOL bStt ); - - BOOL MovePage( SwWhichPage, SwPosPage ); - BOOL MovePara( SwWhichPara, SwPosPara ); - BOOL MoveSection( SwWhichSection, SwPosSection ); - BOOL MoveTable( SwWhichTable, SwPosTable ); - BOOL MoveColumn( SwWhichColumn, SwPosColumn ); - BOOL MoveRegion( SwWhichRegion, SwPosRegion ); + sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False ) + { return LeftRight( sal_True, nCnt, nMode, bAllowVisual ); } + sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False ) + { return LeftRight( sal_False, nCnt, nMode, bAllowVisual ); } + sal_Bool Up( sal_uInt16 nCnt = 1 ) { return UpDown( sal_True, nCnt ); } + sal_Bool Down( sal_uInt16 nCnt = 1 ) { return UpDown( sal_False, nCnt ); } + sal_Bool LeftMargin() { return LRMargin( sal_True ); } + sal_Bool RightMargin(sal_Bool bAPI = sal_False) { return LRMargin( sal_False, bAPI ); } + sal_Bool SttEndDoc( sal_Bool bStt ); + + sal_Bool MovePage( SwWhichPage, SwPosPage ); + sal_Bool MovePara( SwWhichPara, SwPosPara ); + sal_Bool MoveSection( SwWhichSection, SwPosSection ); + sal_Bool MoveTable( SwWhichTable, SwPosTable ); + sal_Bool MoveColumn( SwWhichColumn, SwPosColumn ); + sal_Bool MoveRegion( SwWhichRegion, SwPosRegion ); // die Suchfunktionen - ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt, - BOOL bSearchInNotes, + sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, + sal_Bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnde, - BOOL& bCancel, - FindRanges eRng, int bReplace = FALSE ); + sal_Bool& bCancel, + FindRanges eRng, int bReplace = sal_False ); - ULONG Find( const SwTxtFmtColl& rFmtColl, + sal_uLong Find( const SwTxtFmtColl& rFmtColl, SwDocPositions eStart, SwDocPositions eEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 ); - ULONG Find( const SfxItemSet& rSet, BOOL bNoCollections, + sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections, SwDocPositions eStart, SwDocPositions eEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges eRng, const com::sun::star::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); @@ -412,7 +412,7 @@ public: // returnt // CRSR_POSCHG: wenn der ob der SPoint vom Layout korrigiert wurde. // CRSR_POSOLD: wenn der Crsr nicht veraendert wurde - int SetCrsr( const Point &rPt, BOOL bOnlyText = FALSE, bool bBlock = true ); + int SetCrsr( const Point &rPt, sal_Bool bOnlyText = sal_False, bool bBlock = true ); /* @@ -431,35 +431,35 @@ public: // Bereiche inline void SetMark(); - inline BOOL HasMark(); + inline sal_Bool HasMark(); void ClearMark(); /** Ensure point and mark of the current PaM are in a specific order. - @param bPointFirst TRUE: If the point is behind the mark then - swap the PaM. FALSE: If the mark is behind the point then swap + @param bPointFirst sal_True: If the point is behind the mark then + swap the PaM. sal_False: If the mark is behind the point then swap the PaM. */ - void NormalizePam(BOOL bPointFirst = TRUE); + void NormalizePam(sal_Bool bPointFirst = sal_True); void SwapPam(); - BOOL ChgCurrPam( const Point & rPt, - BOOL bTstOnly = TRUE, //Nur testen, nicht setzen - BOOL bTstHit = FALSE ); //Nur genaue Treffer + sal_Bool ChgCurrPam( const Point & rPt, + sal_Bool bTstOnly = sal_True, //Nur testen, nicht setzen + sal_Bool bTstHit = sal_False ); //Nur genaue Treffer void KillPams(); // erzeuge eine Kopie vom Cursor und speicher diese im Stack void Push(); /* * Loescht einen Cursor (gesteuert durch bOldCrsr) - * - vom Stack oder ( bOldCrsr = TRUE ) + * - vom Stack oder ( bOldCrsr = sal_True ) * - den aktuellen und der auf dem Stack stehende wird zum aktuellen * * Return: es war auf dem Stack noch einer vorhanden */ - BOOL Pop( BOOL bOldCrsr = TRUE ); + sal_Bool Pop( sal_Bool bOldCrsr = sal_True ); /* * Verbinde zwei Cursor miteinander. * Loesche vom Stack den obersten und setzen dessen Mark im Aktuellen. @@ -468,11 +468,11 @@ public: #if !defined(DBG_UTIL) void SttCrsrMove() { ++nCrsrMove; StartAction(); } - void EndCrsrMove( const BOOL bIdleEnd = FALSE ) + void EndCrsrMove( const sal_Bool bIdleEnd = sal_False ) { EndAction( bIdleEnd ); --nCrsrMove; } #else void SttCrsrMove(); - void EndCrsrMove( const BOOL bIdleEnd = FALSE ); + void EndCrsrMove( const sal_Bool bIdleEnd = sal_False ); #endif /* @@ -481,34 +481,34 @@ public: * tierten Bereiche wieder angezeigt. (Bereiche muessen neu berechnet * werden!) */ - BOOL HasShFcs() const { return bHasFocus; } + sal_Bool HasShFcs() const { return bHasFocus; } void ShLooseFcs(); - void ShGetFcs( BOOL bUpdate = TRUE ); + void ShGetFcs( sal_Bool bUpdate = sal_True ); // Methoden zum Anzeigen bzw. Verstecken des sichtbaren Text-Cursors void ShowCrsr(); void HideCrsr(); // Methoden zum Anzeigen bzw. Verstecken der selektierten Bereiche mit // dem sichtbaren Cursor - void ShowCrsrs( BOOL bCrsrVis ); + void ShowCrsrs( sal_Bool bCrsrVis ); void HideCrsrs(); - BOOL IsOverwriteCrsr() const { return bOverwriteCrsr; } - void SetOverwriteCrsr( BOOL bFlag ) { bOverwriteCrsr = bFlag; } + sal_Bool IsOverwriteCrsr() const { return bOverwriteCrsr; } + void SetOverwriteCrsr( sal_Bool bFlag ) { bOverwriteCrsr = bFlag; } // gebe den aktuellen Frame, in dem der Cursor steht, zurueck - SwCntntFrm *GetCurrFrm( const BOOL bCalcFrm = TRUE ) const; + SwCntntFrm *GetCurrFrm( const sal_Bool bCalcFrm = sal_True ) const; - //TRUE wenn der Crsr wenn der Crsr wegen Readonly gehidet ist, - //FALSE wenn der arbeitet (trotz Readonly). - BOOL IsCrsrReadonly() const; + //sal_True wenn der Crsr wenn der Crsr wegen Readonly gehidet ist, + //sal_False wenn der arbeitet (trotz Readonly). + sal_Bool IsCrsrReadonly() const; // Cursor steht in etwas geschuetztem oder in die Selektion umspannt // etwas geschuetztes. - BOOL HasReadonlySel() const; + sal_Bool HasReadonlySel() const; // darf der Cursor in ReadOnlyBereiche? - BOOL IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; } - void SetReadOnlyAvailable( BOOL bFlag ); - BOOL IsOverReadOnlyPos( const Point& rPt ) const; + sal_Bool IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; } + void SetReadOnlyAvailable( sal_Bool bFlag ); + sal_Bool IsOverReadOnlyPos( const Point& rPt ) const; // Methoden fuer aFlyMacroLnk void SetFlyMacroLnk( const Link& rLnk ) { aFlyMacroLnk = rLnk; } @@ -527,21 +527,21 @@ public: // Abfrage, ob der aktuelle Cursor eine Selektion aufspannt, // also, ob Mark gesetzt und SPoint und Mark unterschiedlich sind. - BOOL HasSelection() const; + sal_Bool HasSelection() const; // Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor // aufgespannt oder nicht der einzigste ist. - inline BOOL IsSelection() const; + inline sal_Bool IsSelection() const; // returns if multiple cursors are available - inline BOOL IsMultiSelection() const; + inline sal_Bool IsMultiSelection() const; // Abfrage, ob ein kompletter Absatz selektiert wurde - BOOL IsSelFullPara() const; + sal_Bool IsSelFullPara() const; // Abfrage, ob die Selektion in einem Absatz ist - inline BOOL IsSelOnePara() const; + inline sal_Bool IsSelOnePara() const; //Sollte fuer das Clipboard der WaitPtr geschaltet werden. - BOOL ShouldWait() const; + sal_Bool ShouldWait() const; /* * liefert das SRectangle, auf dem der Cursor steht. @@ -551,27 +551,27 @@ public: * liefert zurueck, ob der Cursor sich ganz oder teilweise im * sichtbaren Bereich befindet. */ - BOOL IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } + sal_Bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } // gebe die aktuelle Seitennummer zurueck: - // TRUE: in der der Cursor steht - // FALSE: die am oberen Rand sichtbar ist - void GetPageNum( USHORT &rnPhyNum, USHORT &rnVirtNum, - BOOL bAtCrsrPos = TRUE, const BOOL bCalcFrm = TRUE ); + // sal_True: in der der Cursor steht + // sal_False: die am oberen Rand sichtbar ist + void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, + sal_Bool bAtCrsrPos = sal_True, const sal_Bool bCalcFrm = sal_True ); // bestimme in welche Richtung "leere Seiten" behandelt werden! // (wird benutzt im PhyPage.. ) - USHORT GetNextPrevPageNum( BOOL bNext = TRUE ); + sal_uInt16 GetNextPrevPageNum( sal_Bool bNext = sal_True ); // setze den Cursor auf die Seite "nPage" an den Anfang - BOOL GotoPage( USHORT nPage ); + sal_Bool GotoPage( sal_uInt16 nPage ); // gebe alle Dokumentseiten zurueck - USHORT GetPageCnt(); + sal_uInt16 GetPageCnt(); // Gehe zur naechsten Selection - BOOL GoNextCrsr(); + sal_Bool GoNextCrsr(); // gehe zur vorherigen Selection - BOOL GoPrevCrsr(); + sal_Bool GoPrevCrsr(); // at CurCrsr.SPoint ::sw::mark::IMark* SetBookmark( @@ -603,51 +603,51 @@ public: String GetText() const; // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen - inline const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const; + inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const; // erfrage die Document - Layout - Position vom akt. Crsr - inline Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const; - inline BOOL IsCrsrPtAtEnd() const; + inline Point& GetCrsrDocPos( sal_Bool bPoint = sal_True ) const; + inline sal_Bool IsCrsrPtAtEnd() const; inline const SwPaM* GetTblCrs() const; inline SwPaM* GetTblCrs(); - BOOL IsTblComplex() const; - BOOL IsTblComplexForChart(); + sal_Bool IsTblComplex() const; + sal_Bool IsTblComplexForChart(); // erfrage die akt. TabellenSelektion als Text String GetBoxNms() const; // setze Crsr in die naechsten/vorherigen Celle - BOOL GoNextCell( BOOL bAppendLine = TRUE ); - BOOL GoPrevCell(); + sal_Bool GoNextCell( sal_Bool bAppendLine = sal_True ); + sal_Bool GoPrevCell(); // gehe zu dieser Box (wenn vorhanden und in Tabelle!) - BOOL GotoTable( const String& rName ); + sal_Bool GotoTable( const String& rName ); // select a table row, column or box (based on the current cursor) - BOOL SelTblRow() { return _SelTblRowOrCol( true ); } - BOOL SelTblCol() { return _SelTblRowOrCol( false ); } - BOOL SelTblBox(); + sal_Bool SelTblRow() { return _SelTblRowOrCol( true ); } + sal_Bool SelTblCol() { return _SelTblRowOrCol( false ); } + sal_Bool SelTblBox(); // --> FME 2004-07-30 #i32329# Enhanced table selection - BOOL SelTbl(); + sal_Bool SelTbl(); // <-- // zum naechsten/vorhergehenden Punkt auf gleicher Ebene - BOOL GotoNextNum(); - BOOL GotoPrevNum(); + sal_Bool GotoNextNum(); + sal_Bool GotoPrevNum(); // zu diesem Gliederungspunkt - BOOL GotoOutline( const String& rName ); + sal_Bool GotoOutline( const String& rName ); // zum naechsten/vorhergehenden oder angegebenen OultineNode - void GotoOutline( USHORT nIdx ); + void GotoOutline( sal_uInt16 nIdx ); // suche die "Outline-Position" im Nodes-Array vom akt. Kaiptel - USHORT GetOutlinePos( BYTE nLevel = UCHAR_MAX ); + sal_uInt16 GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX ); // selektiere den angeben Bereich von OutlineNodes. Optional - // inclusive der Childs. Die USHORT sind die Positionen im + // inclusive der Childs. Die sal_uInt16 sind die Positionen im // OutlineNds-Array!! (EditShell) - BOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos, - BOOL bWithChilds = FALSE ); + sal_Bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos, + sal_Bool bWithChilds = sal_False ); - BOOL GotoNextOutline(); // naechster Node mit Outline-Num. - BOOL GotoPrevOutline(); // vorheriger Node mit Outline-Num. + sal_Bool GotoNextOutline(); // naechster Node mit Outline-Num. + sal_Bool GotoPrevOutline(); // vorheriger Node mit Outline-Num. /** Delivers the current shell cursor @@ -673,131 +673,131 @@ public: // ist der Crsr in einer Tabelle und ist die Selection ueber // zwei Spalten - BOOL IsTableMode() const { return 0 != pTblCrsr; } + sal_Bool IsTableMode() const { return 0 != pTblCrsr; } // erfrage den Tabellen Crsr; ausserhalb von Tabellen immer 0 const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; } SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; } - USHORT UpdateTblSelBoxes(); + sal_uInt16 UpdateTblSelBoxes(); - BOOL GotoFtnTxt(); // springe aus dem Content zur Fussnote - BOOL GotoFtnAnchor(); // springe aus der Fussnote zum Anker - BOOL GotoPrevFtnAnchor(); - BOOL GotoNextFtnAnchor(); + sal_Bool GotoFtnTxt(); // springe aus dem Content zur Fussnote + sal_Bool GotoFtnAnchor(); // springe aus der Fussnote zum Anker + sal_Bool GotoPrevFtnAnchor(); + sal_Bool GotoNextFtnAnchor(); - BOOL GotoFlyAnchor(); // springe aus dem Rahmen zum Anker - BOOL GotoHeaderTxt(); // springe aus dem Content zum Header - BOOL GotoFooterTxt(); // springe aus dem Content zum Footer + sal_Bool GotoFlyAnchor(); // springe aus dem Rahmen zum Anker + sal_Bool GotoHeaderTxt(); // springe aus dem Content zum Header + sal_Bool GotoFooterTxt(); // springe aus dem Content zum Footer // springe in den Header/Footer des angegebenen oder akt. PageDesc - BOOL SetCrsrInHdFt( USHORT nDescNo = USHRT_MAX, - BOOL bInHeader = TRUE ); - // is point of cursor in header/footer. pbInHeader return TRUE if it is + sal_Bool SetCrsrInHdFt( sal_uInt16 nDescNo = USHRT_MAX, + sal_Bool bInHeader = sal_True ); + // is point of cursor in header/footer. pbInHeader return sal_True if it is // in a headerframe otherwise in a footerframe - BOOL IsInHeaderFooter( BOOL* pbInHeader = 0 ) const; + sal_Bool IsInHeaderFooter( sal_Bool* pbInHeader = 0 ) const; // springe zum naechsten Verzeichnis [mit dem Namen] - BOOL GotoNextTOXBase( const String* = 0 ); + sal_Bool GotoNextTOXBase( const String* = 0 ); // springe zum vorherigen Verzeichnis [mit dem Namen] - BOOL GotoPrevTOXBase( const String* = 0 ); - BOOL GotoTOXMarkBase(); // springe zum Verzeichnis vom TOXMark + sal_Bool GotoPrevTOXBase( const String* = 0 ); + sal_Bool GotoTOXMarkBase(); // springe zum Verzeichnis vom TOXMark // springe zum naechsten (vorherigen) Verzeichniseintrag - BOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE ); + sal_Bool GotoNxtPrvTOXMark( sal_Bool bNext = sal_True ); // Zur naechsten/ vorherigen Verzeichnismarke dieses Typs traveln const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir ); // springe zum naechsten (vorherigen) Tabellenformel // optional auch nur zu kaputten Formeln springen - BOOL GotoNxtPrvTblFormula( BOOL bNext = TRUE, - BOOL bOnlyErrors = FALSE ); + sal_Bool GotoNxtPrvTblFormula( sal_Bool bNext = sal_True, + sal_Bool bOnlyErrors = sal_False ); // jump to the next / previous hyperlink - inside text and also // on graphics - BOOL SelectNxtPrvHyperlink( BOOL bNext = TRUE ); + sal_Bool SelectNxtPrvHyperlink( sal_Bool bNext = sal_True ); // springe zu dieser Refmark - BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0, - USHORT nSeqNo = 0 ); + sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0, + sal_uInt16 nSeqNo = 0 ); // hole vom Start/Ende der akt. Selection das nte Zeichen - sal_Unicode GetChar( BOOL bEnd = TRUE, long nOffset = 0 ); + sal_Unicode GetChar( sal_Bool bEnd = sal_True, long nOffset = 0 ); // erweiter die akt. Selection am Anfang/Ende um n Zeichen - BOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 ); + sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, xub_StrLen nCount = 1 ); // setze nur den sichtbaren Cursor an die angegebene Dokument-Pos. - // returnt FALSE: wenn der ob der SPoint vom Layout korrigiert wurde. + // returnt sal_False: wenn der ob der SPoint vom Layout korrigiert wurde. // (wird zum Anzeigen von Drag&Drop/Copy-Cursor benoetigt) - BOOL SetVisCrsr( const Point &rPt ); + sal_Bool SetVisCrsr( const Point &rPt ); inline void UnSetVisCrsr(); // springe zum nachsten/vorherigen Feld des entsprechenden Types - BOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext, - USHORT nSubType = USHRT_MAX, - USHORT nResType = USHRT_MAX ); + sal_Bool MoveFldType( const SwFieldType* pFldType, sal_Bool bNext, + sal_uInt16 nSubType = USHRT_MAX, + sal_uInt16 nResType = USHRT_MAX ); // springe genau zu diesem Feld - BOOL GotoFld( const SwFmtFld& rFld ); + sal_Bool GotoFld( const SwFmtFld& rFld ); // returne die Anzahl der Cursor im Ring (Flag besagt ob man nur // aufgepspannte haben will - sprich etwas selektiert ist (Basic)) - USHORT GetCrsrCnt( BOOL bAll = TRUE ) const; + sal_uInt16 GetCrsrCnt( sal_Bool bAll = sal_True ) const; // Char Travelling - Methoden (in crstrvl1.cxx) - BOOL GoStartWord(); - BOOL GoEndWord(); - BOOL GoNextWord(); - BOOL GoPrevWord(); - BOOL GoNextSentence(); - BOOL GoPrevSentence(); - BOOL GoStartSentence(); - BOOL GoEndSentence(); - BOOL SelectWord( const Point* pPt = 0 ); - BOOL ExpandToSentenceBorders(); + sal_Bool GoStartWord(); + sal_Bool GoEndWord(); + sal_Bool GoNextWord(); + sal_Bool GoPrevWord(); + sal_Bool GoNextSentence(); + sal_Bool GoPrevSentence(); + sal_Bool GoStartSentence(); + sal_Bool GoEndSentence(); + sal_Bool SelectWord( const Point* pPt = 0 ); + sal_Bool ExpandToSentenceBorders(); // Position vom akt. Cursor erfragen - BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const; - BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsStartSentence() const; - BOOL IsEndSentence() const; - BOOL IsSttPara() const; - BOOL IsEndPara() const; - BOOL IsStartOfDoc() const; - BOOL IsEndOfDoc() const; - BOOL IsInFrontOfLabel() const; - BOOL IsAtLeftMargin() const { return IsAtLRMargin( TRUE ); } - BOOL IsAtRightMargin(BOOL bAPI = FALSE) const { return IsAtLRMargin( FALSE, bAPI ); } + sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const; + sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + sal_Bool IsStartSentence() const; + sal_Bool IsEndSentence() const; + sal_Bool IsSttPara() const; + sal_Bool IsEndPara() const; + sal_Bool IsStartOfDoc() const; + sal_Bool IsEndOfDoc() const; + sal_Bool IsInFrontOfLabel() const; + sal_Bool IsAtLeftMargin() const { return IsAtLRMargin( sal_True ); } + sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const { return IsAtLRMargin( sal_False, bAPI ); } // loesche alle erzeugten Crsr, setze den Tabellen-Crsr und den letzten // Cursor auf seinen TextNode (oder StartNode?). // Beim naechsten ::GetCrsr werden sie wieder alle erzeugt. // Wird fuers Drag&Drop/ClipBorad-Paste in Tabellen benoetigt. - BOOL ParkTblCrsr(); + sal_Bool ParkTblCrsr(); // gibt es nicht aufgespannte Attribute? - BOOL IsGCAttr() const { return bGCAttr; } - void ClearGCAttr() { bGCAttr = FALSE; } - void UpdateAttr() { bGCAttr = TRUE; } + sal_Bool IsGCAttr() const { return bGCAttr; } + void ClearGCAttr() { bGCAttr = sal_False; } + void UpdateAttr() { bGCAttr = sal_True; } // ist das gesamte Dokument geschuetzt/versteckt?? (fuer UI,..) - BOOL IsAllProtect() const { return bAllProtect; } + sal_Bool IsAllProtect() const { return bAllProtect; } #ifdef SW_CRSR_TIMER - // setze das Flag am VisCrsr, ob dieser ueber Timer getriggert (TRUE) - // oder direkt (FALSE) angezeigt wird. (default ist Timer getriggert) - BOOL ChgCrsrTimerFlag( BOOL bTimerOn = TRUE ); + // setze das Flag am VisCrsr, ob dieser ueber Timer getriggert (sal_True) + // oder direkt (sal_False) angezeigt wird. (default ist Timer getriggert) + sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True ); #endif - BOOL BasicActionPend() const { return nBasicActionCnt != nStartAction; } + sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; } // springe zum benannten Bereich - BOOL GotoRegion( const String& rName ); + sal_Bool GotoRegion( const String& rName ); // zeige die aktuelle Selektion an virtual void MakeSelVisible(); // setzte den Cursor auf einen NICHT geschuetzten/versteckten Node - BOOL FindValidCntntNode( BOOL bOnlyText = FALSE ); + sal_Bool FindValidCntntNode( sal_Bool bOnlyText = sal_False ); - BOOL GetContentAtPos( const Point& rPt, + sal_Bool GetContentAtPos( const Point& rPt, SwContentAtPos& rCntntAtPos, - BOOL bSetCrsr = FALSE, + sal_Bool bSetCrsr = sal_False, SwRect* pFldRect = 0 ); // --> OD 2008-06-19 #i90516# @@ -816,40 +816,40 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ) const; - BOOL IsPageAtPos( const Point &rPt ) const; + sal_Bool IsPageAtPos( const Point &rPt ) const; // Attribut selelktieren - BOOL SelectTxtAttr( USHORT nWhich, BOOL bExpand, const SwTxtAttr* pAttr = 0 ); - BOOL GotoINetAttr( const SwTxtINetFmt& rAttr ); + sal_Bool SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const SwTxtAttr* pAttr = 0 ); + sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr ); const SwFmtINetFmt* FindINetAttr( const String& rName ) const; - BOOL CheckTblBoxCntnt( const SwPosition* pPos = 0 ); + sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 ); void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); void ClearTblBoxCntnt(); - BOOL EndAllTblBoxEdit(); + sal_Bool EndAllTblBoxEdit(); // wird gerufen, wenn eine Tabellenselektion im UpdateCrsr erzeugt wird, // ohne das die UI davon etaws weiss virtual void NewCoreSelection(); - void SetSelTblCells( BOOL bFlag ) { bSelTblCells = bFlag; } - BOOL IsSelTblCells() const { return bSelTblCells; } + void SetSelTblCells( sal_Bool bFlag ) { bSelTblCells = bFlag; } + sal_Bool IsSelTblCells() const { return bSelTblCells; } - BOOL IsAutoUpdateCells() const { return bAutoUpdateCells; } - void SetAutoUpdateCells( BOOL bFlag ) { bAutoUpdateCells = bFlag; } + sal_Bool IsAutoUpdateCells() const { return bAutoUpdateCells; } + void SetAutoUpdateCells( sal_Bool bFlag ) { bAutoUpdateCells = bFlag; } - BOOL GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode, + sal_Bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode, SwRect& rRect, short& rOrient ); - BOOL SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ); + sal_Bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ); const SwRedline* SelNextRedline(); const SwRedline* SelPrevRedline(); - const SwRedline* GotoRedline( USHORT nArrPos, BOOL bSelect = FALSE ); + const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False ); // is cursor or the point in/over a vertical formatted text? - BOOL IsInVerticalText( const Point* pPt = 0 ) const; + sal_Bool IsInVerticalText( const Point* pPt = 0 ) const; // is cursor or the point in/over a right to left formatted text? - BOOL IsInRightToLeftText( const Point* pPt = 0 ) const; + sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const; // If the current cursor position is inside a hidden range, the hidden range // is selected and true is returned: @@ -886,12 +886,12 @@ public: // Cursor Inlines: inline SwMoveFnCollection* SwCrsrShell::MakeFindRange( - USHORT nStt, USHORT nEnd, SwPaM* pPam ) const + sal_uInt16 nStt, sal_uInt16 nEnd, SwPaM* pPam ) const { return pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam ); } -inline SwCursor* SwCrsrShell::GetSwCrsr( BOOL bMakeTblCrsr ) const +inline SwCursor* SwCrsrShell::GetSwCrsr( sal_Bool bMakeTblCrsr ) const { return (SwCursor*)GetCrsr( bMakeTblCrsr ); } @@ -900,35 +900,35 @@ inline SwPaM* SwCrsrShell::GetStkCrsr() const { return pCrsrStk; } inline void SwCrsrShell::SetMark() { pCurCrsr->SetMark(); } -inline BOOL SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); } +inline sal_Bool SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); } -inline BOOL SwCrsrShell::IsSelection() const +inline sal_Bool SwCrsrShell::IsSelection() const { return IsTableMode() || pCurCrsr->HasMark() || pCurCrsr->GetNext() != pCurCrsr; } -inline BOOL SwCrsrShell::IsMultiSelection() const +inline sal_Bool SwCrsrShell::IsMultiSelection() const { return pCurCrsr->GetNext() != pCurCrsr; } -inline BOOL SwCrsrShell::IsSelOnePara() const +inline sal_Bool SwCrsrShell::IsSelOnePara() const { return pCurCrsr == pCurCrsr->GetNext() && pCurCrsr->GetPoint()->nNode == pCurCrsr->GetMark()->nNode; } -inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const +inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( sal_Bool bIsPtInTbl ) const { return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode(); } -inline BOOL SwCrsrShell::IsCrsrPtAtEnd() const +inline sal_Bool SwCrsrShell::IsCrsrPtAtEnd() const { return pCurCrsr->End() == pCurCrsr->GetPoint(); } -inline Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const +inline Point& SwCrsrShell::GetCrsrDocPos( sal_Bool bPoint ) const { return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos(); } @@ -946,7 +946,7 @@ inline SwPaM* SwCrsrShell::GetTblCrs() inline void SwCrsrShell::UnSetVisCrsr() { pVisCrsr->Hide(); - pVisCrsr->SetDragCrsr( FALSE ); + pVisCrsr->SetDragCrsr( sal_False ); } #endif // _CRSRSH_HXX diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx index 84d9650c5eca..c89d871c9940 100644 --- a/sw/inc/crsskip.hxx +++ b/sw/inc/crsskip.hxx @@ -35,8 +35,8 @@ // the same, but in complex text cell skip over legatures and char skip // into it. // These defines exist only to cut off the dependicies to I18N project. -const USHORT CRSR_SKIP_CHARS = 0; -const USHORT CRSR_SKIP_CELLS = 1; -const USHORT CRSR_SKIP_HIDDEN = 2; +const sal_uInt16 CRSR_SKIP_CHARS = 0; +const sal_uInt16 CRSR_SKIP_CELLS = 1; +const sal_uInt16 CRSR_SKIP_HIDDEN = 2; #endif diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index de32f44c8f85..cf2e55118ab7 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -44,10 +44,10 @@ enum SwFillMode struct SwFillCrsrPos { SwRect aCrsr; // Position und Groesse des Shadowcursors - USHORT nParaCnt; // Anzahl der einzufuegenden Absaetze - USHORT nTabCnt; // Anzahl der Tabs bzw. Groesse des Einzugs - USHORT nSpaceCnt; // Anzahl der einzufuegenden Leerzeichen - USHORT nColumnCnt; // Anzahl der notwendigen Spaltenumbrueche + sal_uInt16 nParaCnt; // Anzahl der einzufuegenden Absaetze + sal_uInt16 nTabCnt; // Anzahl der Tabs bzw. Groesse des Einzugs + sal_uInt16 nSpaceCnt; // Anzahl der einzufuegenden Leerzeichen + sal_uInt16 nColumnCnt; // Anzahl der notwendigen Spaltenumbrueche sal_Int16 eOrient; // Absatzausrichtung SwFillMode eMode; // Gewuenschte Auffuellregel SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) : @@ -69,7 +69,7 @@ struct Sw2LinesPos SwRect aLine; // Position and size of the line SwRect aPortion; // Position and size of the multi portion SwRect aPortion2; // needed for nested multi portions - BYTE nMultiType; // Multiportion type + sal_uInt8 nMultiType; // Multiportion type }; /** @@ -110,8 +110,8 @@ struct Sw2LinesPos struct SwSpecialPos { xub_StrLen nCharOfst; - USHORT nLineOfst; - BYTE nExtendRange; + sal_uInt16 nLineOfst; + sal_uInt8 nExtendRange; // #i27615# SwSpecialPos() : nCharOfst(0), nLineOfst(0), @@ -138,32 +138,32 @@ struct SwCrsrMoveState SwSpecialPos* pSpecialPos; // for positions inside fields Point aRealHeight; // enthaelt dann die Position/Hoehe des Cursors CrsrMoveState eState; - BYTE nCursorBidiLevel; - BOOL bStop :1; - BOOL bRealHeight :1; // Soll die reale Hoehe berechnet werden? - BOOL bFieldInfo :1; // Sollen Felder erkannt werden? - BOOL bPosCorr :1; // Point musste korrigiert werden - BOOL bFtnNoInfo :1; // Fussnotennumerierung erkannt - BOOL bExactOnly :1; // GetCrsrOfst nur nach Exakten Treffern + sal_uInt8 nCursorBidiLevel; + sal_Bool bStop :1; + sal_Bool bRealHeight :1; // Soll die reale Hoehe berechnet werden? + sal_Bool bFieldInfo :1; // Sollen Felder erkannt werden? + sal_Bool bPosCorr :1; // Point musste korrigiert werden + sal_Bool bFtnNoInfo :1; // Fussnotennumerierung erkannt + sal_Bool bExactOnly :1; // GetCrsrOfst nur nach Exakten Treffern // suchen lassen, sprich niemals in das // GetCntntPos laufen. - BOOL bFillRet :1; // wird nur im FillModus temp. genutzt - BOOL bSetInReadOnly :1; // ReadOnlyBereiche duerfen betreten werden - BOOL bRealWidth :1; // Calculation of the width required - BOOL b2Lines :1; // Check 2line portions and fill p2Lines - BOOL bNoScroll :1; // No scrolling of undersized textframes - BOOL bPosMatchesBounds :1; // GetCrsrOfst should not return the next + sal_Bool bFillRet :1; // wird nur im FillModus temp. genutzt + sal_Bool bSetInReadOnly :1; // ReadOnlyBereiche duerfen betreten werden + sal_Bool bRealWidth :1; // Calculation of the width required + sal_Bool b2Lines :1; // Check 2line portions and fill p2Lines + sal_Bool bNoScroll :1; // No scrolling of undersized textframes + sal_Bool bPosMatchesBounds :1; // GetCrsrOfst should not return the next // position if screen position is inside second // have of bound rect - BOOL bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <-- + sal_Bool bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <-- // #i27615# /** cursor in front of label */ - BOOL bInFrontOfLabel :1; - BOOL bInNumPortion :1; // point is in number portion #i23726# + sal_Bool bInFrontOfLabel :1; + sal_Bool bInNumPortion :1; // point is in number portion #i23726# int nInNumPostionOffset; // distance from number portion's start SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) : @@ -172,20 +172,20 @@ struct SwCrsrMoveState pSpecialPos( NULL ), eState( eSt ), nCursorBidiLevel( 0 ), - bStop( FALSE ), - bRealHeight( FALSE ), - bFieldInfo( FALSE ), - bPosCorr( FALSE ), - bFtnNoInfo( FALSE ), - bExactOnly( FALSE ), - bSetInReadOnly( FALSE ), - bRealWidth( FALSE ), - b2Lines( FALSE ), - bNoScroll( FALSE ), - bPosMatchesBounds( FALSE ), - bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <-- - bInFrontOfLabel( FALSE ), // #i27615# - bInNumPortion(FALSE), // #i26726# + bStop( sal_False ), + bRealHeight( sal_False ), + bFieldInfo( sal_False ), + bPosCorr( sal_False ), + bFtnNoInfo( sal_False ), + bExactOnly( sal_False ), + bSetInReadOnly( sal_False ), + bRealWidth( sal_False ), + b2Lines( sal_False ), + bNoScroll( sal_False ), + bPosMatchesBounds( sal_False ), + bCntntCheck( sal_False ), // --> FME 2005-05-13 #i43742# <-- + bInFrontOfLabel( sal_False ), // #i27615# + bInNumPortion(sal_False), // #i26726# nInNumPostionOffset(0) // #i26726# {} SwCrsrMoveState( SwFillCrsrPos *pInitFill ) : @@ -193,20 +193,20 @@ struct SwCrsrMoveState pSpecialPos( NULL ), eState( MV_SETONLYTEXT ), nCursorBidiLevel( 0 ), - bStop( FALSE ), - bRealHeight( FALSE ), - bFieldInfo( FALSE ), - bPosCorr( FALSE ), - bFtnNoInfo( FALSE ), - bExactOnly( FALSE ), - bSetInReadOnly( FALSE ), - bRealWidth( FALSE ), - b2Lines( FALSE ), - bNoScroll( FALSE ), - bPosMatchesBounds( FALSE ), - bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <-- - bInFrontOfLabel( FALSE ), // #i27615# - bInNumPortion(FALSE), // #i23726# + bStop( sal_False ), + bRealHeight( sal_False ), + bFieldInfo( sal_False ), + bPosCorr( sal_False ), + bFtnNoInfo( sal_False ), + bExactOnly( sal_False ), + bSetInReadOnly( sal_False ), + bRealWidth( sal_False ), + b2Lines( sal_False ), + bNoScroll( sal_False ), + bPosMatchesBounds( sal_False ), + bCntntCheck( sal_False ), // --> FME 2005-05-13 #i43742# <-- + bInFrontOfLabel( sal_False ), // #i27615# + bInNumPortion(sal_False), // #i23726# nInNumPostionOffset(0) // #i23726# {} }; diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx index a99df015a7c1..b015337b4085 100644 --- a/sw/inc/cshtyp.hxx +++ b/sw/inc/cshtyp.hxx @@ -49,19 +49,19 @@ extern SwPosPage fnPageStart, fnPageEnd; // Richtungsparameter fuer MovePara ( wird in SwPaM initialisiert ) typedef SwMoveFnCollection* SwPosPara; -typedef BOOL (*SwWhichPara)( SwPaM&, SwPosPara ); +typedef sal_Bool (*SwWhichPara)( SwPaM&, SwPosPara ); extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext; extern SwPosPara fnParaStart, fnParaEnd; // Richtungsparameter fuer MoveSection typedef SwMoveFnCollection* SwPosSection; -typedef BOOL (*SwWhichSection)( SwPaM&, SwPosSection ); +typedef sal_Bool (*SwWhichSection)( SwPaM&, SwPosSection ); extern SwWhichSection fnSectionPrev, fnSectionCurr, fnSectionNext; extern SwPosSection fnSectionStart, fnSectionEnd; // Richtungsparameter fuer MoveTable typedef SwMoveFnCollection* SwPosTable; -typedef BOOL (*SwWhichTable)( SwPaM&, SwPosTable, BOOL bInReadOnly ); +typedef sal_Bool (*SwWhichTable)( SwPaM&, SwPosTable, sal_Bool bInReadOnly ); extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext; extern SwPosTable fnTableStart, fnTableEnd; @@ -73,7 +73,7 @@ extern SwPosColumn fnColumnStart, fnColumnEnd; // Richtungsparameter fuer MoveRegion (Bereiche!) typedef SwMoveFnCollection* SwPosRegion; -typedef BOOL (*SwWhichRegion)( SwPaM&, SwPosRegion, BOOL bInReadOnly ); +typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly ); extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip; extern SwPosRegion fnRegionStart, fnRegionEnd; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index c13c766e1147..135553da1b64 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -60,8 +60,8 @@ public: const String& GetColumnName() const {return sColumn;} const SwDBData& GetDBData() const {return aDBData;} - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -74,16 +74,16 @@ class SW_DLLPUBLIC SwDBField : public SwValueField { String aContent; String sFieldCode; // contains Word's field code - USHORT nSubType; - BOOL bIsInBodyTxt : 1; - BOOL bValidValue : 1; - BOOL bInitialized : 1; + sal_uInt16 nSubType; + sal_Bool bIsInBodyTxt : 1; + sal_Bool bValidValue : 1; + sal_Bool bInitialized : 1; virtual String Expand() const; virtual SwField* Copy() const; public: - SwDBField(SwDBFieldType*, ULONG nFmt = 0); + SwDBField(SwDBFieldType*, sal_uLong nFmt = 0); virtual ~SwDBField(); virtual SwFieldType* ChgTyp( SwFieldType* ); @@ -91,13 +91,13 @@ public: // Der aktuelle Text inline void SetExpansion(const String& rStr); - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nType); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); virtual String GetFieldName() const; // fuer Berechnungen in Ausdruecken - void ChgValue( double d, BOOL bVal ); + void ChgValue( double d, sal_Bool bVal ); // Evaluierung ueber den DBMgr String rauspulen void Evaluate(); @@ -107,11 +107,11 @@ public: void InitContent(); void InitContent(const String& rExpansion); - inline void ChgBodyTxtFlag( BOOL bIsInBody ); + inline void ChgBodyTxtFlag( sal_Bool bIsInBody ); - inline BOOL IsInitialized() const { return bInitialized; } - inline void ClearInitialized() { bInitialized = FALSE; } - inline void SetInitialized() { bInitialized = TRUE; } + inline sal_Bool IsInitialized() const { return bInitialized; } + inline void ClearInitialized() { bInitialized = sal_False; } + inline void SetInitialized() { bInitialized = sal_True; } // Name erfragen virtual const String& GetPar1() const; @@ -124,15 +124,15 @@ public: // DBName inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; inline void SwDBField::SetExpansion(const String& rStr) { aContent = rStr; } // wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt) -inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody ) +inline void SwDBField::ChgBodyTxtFlag( sal_Bool bIsInBody ) { bIsInBodyTxt = bIsInBody; } /*-------------------------------------------------------------------- @@ -142,13 +142,13 @@ inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody ) class SW_DLLPUBLIC SwDBNameInfField : public SwField { SwDBData aDBData; - USHORT nSubType; + sal_uInt16 nSubType; protected: const SwDBData& GetDBData() const {return aDBData;} SwDBData& GetDBData() {return aDBData;} - SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, ULONG nFmt = 0); + SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0); public: // DBName @@ -159,10 +159,10 @@ public: virtual String GetFieldName() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nType); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); }; @@ -186,7 +186,7 @@ public: class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField { String aCond; - BOOL bCondValid; + sal_Bool bCondValid; public: SwDBNextSetField( SwDBNextSetFieldType*, @@ -196,20 +196,20 @@ public: virtual SwField* Copy() const; void Evaluate(SwDoc*); - inline void SetCondValid(BOOL bCond); - inline BOOL IsCondValid() const; + inline void SetCondValid(sal_Bool bCond); + inline sal_Bool IsCondValid() const; // Condition virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; -inline BOOL SwDBNextSetField::IsCondValid() const +inline sal_Bool SwDBNextSetField::IsCondValid() const { return bCondValid; } -inline void SwDBNextSetField::SetCondValid(BOOL bCond) +inline void SwDBNextSetField::SetCondValid(sal_Bool bCond) { bCondValid = bCond; } /*-------------------------------------------------------------------- @@ -235,7 +235,7 @@ class SwDBNumSetField : public SwDBNameInfField { String aCond; String aPar2; - BOOL bCondValid; + sal_Bool bCondValid; public: SwDBNumSetField(SwDBNumSetFieldType*, const String& rCond, const String& rDBNum, const SwDBData& rDBData); @@ -243,8 +243,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - inline BOOL IsCondValid() const; - inline void SetCondValid(BOOL bCond); + inline sal_Bool IsCondValid() const; + inline void SetCondValid(sal_Bool bCond); void Evaluate(SwDoc*); // Condition @@ -256,14 +256,14 @@ public: virtual void SetPar2(const String& rStr); // Die Datensatznummer steht in nFormat !! - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; -inline BOOL SwDBNumSetField::IsCondValid() const +inline sal_Bool SwDBNumSetField::IsCondValid() const { return bCondValid; } -inline void SwDBNumSetField::SetCondValid(BOOL bCond) +inline void SwDBNumSetField::SetCondValid(sal_Bool bCond) { bCondValid = bCond; } /*-------------------------------------------------------------------- @@ -276,7 +276,7 @@ class SwDBNameFieldType : public SwFieldType public: SwDBNameFieldType(SwDoc*); - String Expand(ULONG) const; + String Expand(sal_uLong) const; virtual SwFieldType* Copy() const; }; @@ -287,12 +287,12 @@ public: class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField { public: - SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, ULONG nFmt = 0); + SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); virtual String Expand() const; virtual SwField* Copy() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -316,7 +316,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField long nNumber; public: - SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, ULONG nFmt = 0); + SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); virtual String Expand() const; virtual SwField* Copy() const; @@ -324,8 +324,8 @@ public: inline long GetSetNumber() const; inline void SetSetNumber(long nNum); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; inline long SwDBSetNumberField::GetSetNumber() const diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index fd2f694f5e3f..bc017ddbec5b 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -112,16 +112,16 @@ struct SwDSParam : public SwDBData ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSelection; - BOOL bScrollable; - BOOL bEndOfDB; - BOOL bAfterSelection; + sal_Bool bScrollable; + sal_Bool bEndOfDB; + sal_Bool bAfterSelection; long nSelectionIndex; SwDSParam(const SwDBData& rData) : SwDBData(rData), - bScrollable(FALSE), - bEndOfDB(FALSE), - bAfterSelection(FALSE), + bScrollable(sal_False), + bEndOfDB(sal_False), + bAfterSelection(sal_False), nSelectionIndex(0) {} @@ -131,16 +131,16 @@ struct SwDSParam : public SwDBData SwDBData(rData), xResultSet(xResSet), aSelection(rSelection), - bScrollable(TRUE), - bEndOfDB(FALSE), - bAfterSelection(FALSE), + bScrollable(sal_True), + bEndOfDB(sal_False), + bAfterSelection(sal_False), nSelectionIndex(0) {} void CheckEndOfDB() { if(bEndOfDB) - bAfterSelection = TRUE; + bAfterSelection = sal_True; } }; typedef SwDSParam* SwDSParamPtr; @@ -148,7 +148,7 @@ SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0, 5) struct SwMergeDescriptor { - USHORT nMergeType; + sal_uInt16 nMergeType; SwWrtShell& rSh; const ::svx::ODataAccessDescriptor& rDescriptor; String sSaveToFilter; //export filter to save resulting files @@ -174,7 +174,7 @@ struct SwMergeDescriptor ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintOptions; - SwMergeDescriptor( USHORT nType, SwWrtShell& rShell, ::svx::ODataAccessDescriptor& rDesc ) : + SwMergeDescriptor( sal_uInt16 nType, SwWrtShell& rShell, ::svx::ODataAccessDescriptor& rDesc ) : nMergeType(nType), rSh(rShell), rDescriptor(rDesc), @@ -200,21 +200,21 @@ friend class SwConnectionDisposedListener_Impl; String sEMailAddrFld; // Mailing: Spaltenname der E-Mail Adresse String sSubject; // Mailing: Subject String sAttached; // Mailing: Attachte Files - USHORT nMergeType; - BOOL bInitDBFields : 1; // TRUE: Datenbank an Feldern beim Mergen - BOOL bSingleJobs : 1; // Einzelne Druckjobs bei Aufruf aus Basic - BOOL bCancel : 1; // Serienbrief-Save abgebrochen - - BOOL bInMerge : 1; //merge process active - BOOL bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API) - BOOL bMergeLock : 1; // prevent update of database fields while document is + sal_uInt16 nMergeType; + sal_Bool bInitDBFields : 1; // sal_True: Datenbank an Feldern beim Mergen + sal_Bool bSingleJobs : 1; // Einzelne Druckjobs bei Aufruf aus Basic + sal_Bool bCancel : 1; // Serienbrief-Save abgebrochen + + sal_Bool bInMerge : 1; //merge process active + sal_Bool bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API) + sal_Bool bMergeLock : 1; // prevent update of database fields while document is // actually printed at the ViewShell SwDSParamArr aDataSourceParams; SwNewDBMgr_Impl* pImpl; const SwXMailMerge* pMergeEvtSrc; // != 0 if mail merge events are to be send - SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, BOOL bCreate); - SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, BOOL bCreate); + SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate); + SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, sal_Bool bCreate); SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * ); @@ -226,36 +226,36 @@ friend class SwConnectionDisposedListener_Impl; SW_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh); // merge to file _and_ merge to e-Mail - SW_DLLPRIVATE BOOL MergeMailFiles(SwWrtShell* pSh, + SW_DLLPRIVATE sal_Bool MergeMailFiles(SwWrtShell* pSh, const SwMergeDescriptor& rMergeDescriptor ); - SW_DLLPRIVATE BOOL ToNextRecord(SwDSParam* pParam); + SW_DLLPRIVATE sal_Bool ToNextRecord(SwDSParam* pParam); public: SwNewDBMgr(); ~SwNewDBMgr(); // Art des aktellen Mergens. Siehe DBMgrOptions-enum - inline USHORT GetMergeType() const { return nMergeType; } - inline void SetMergeType( USHORT nTyp ) { nMergeType = nTyp; } + inline sal_uInt16 GetMergeType() const { return nMergeType; } + inline void SetMergeType( sal_uInt16 nTyp ) { nMergeType = nTyp; } // MailMergeEvent source const SwXMailMerge * GetMailMergeEvtSrc() const { return pMergeEvtSrc; } void SetMailMergeEvtSrc( const SwXMailMerge *pSrc ) { pMergeEvtSrc = pSrc; } - inline BOOL IsMergeSilent() const { return bMergeSilent != 0; } - inline void SetMergeSilent( BOOL bVal ) { bMergeSilent = bVal; } + inline sal_Bool IsMergeSilent() const { return bMergeSilent != 0; } + inline void SetMergeSilent( sal_Bool bVal ) { bMergeSilent = bVal; } // Mischen von Datensaetzen in Felder - BOOL MergeNew( const SwMergeDescriptor& rMergeDesc ); - BOOL Merge(SwWrtShell* pSh); + sal_Bool MergeNew( const SwMergeDescriptor& rMergeDesc ); + sal_Bool Merge(SwWrtShell* pSh); // Datenbankfelder mit fehlendem Datenbankname initialisieren - inline BOOL IsInitDBFields() const { return bInitDBFields; } - inline void SetInitDBFields(BOOL b) { bInitDBFields = b; } + inline sal_Bool IsInitDBFields() const { return bInitDBFields; } + inline void SetInitDBFields(sal_Bool b) { bInitDBFields = b; } // Serienbriefe einzelnd oder alle zusammen drucken/speichern - inline BOOL IsSingleJobs() const { return bSingleJobs; } - inline void SetSingleJobs(BOOL b) { bSingleJobs = b; } + inline sal_Bool IsSingleJobs() const { return bSingleJobs; } + inline void SetSingleJobs(sal_Bool b) { bSingleJobs = b; } // Mailing // email-Daten setzen @@ -265,22 +265,22 @@ public: // Listbox mit allen Tabellennamen einer Datenbank fuellen - BOOL GetTableNames(ListBox* pListBox, const String& rDBName ); + sal_Bool GetTableNames(ListBox* pListBox, const String& rDBName ); // Listbox mit allen Spaltennamen einer Datenbanktabelle fuellen - BOOL GetColumnNames(ListBox* pListBox, - const String& rDBName, const String& rTableName, BOOL bAppend = FALSE); - BOOL GetColumnNames(ListBox* pListBox, + sal_Bool GetColumnNames(ListBox* pListBox, + const String& rDBName, const String& rTableName, sal_Bool bAppend = sal_False); + sal_Bool GetColumnNames(ListBox* pListBox, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - const String& rTableName, BOOL bAppend = FALSE); + const String& rTableName, sal_Bool bAppend = sal_False); - ULONG GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, + sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn, SvNumberFormatter* pNFmtr, long nLanguage ); - ULONG GetColumnFmt( const String& rDBName, + sal_uLong GetColumnFmt( const String& rDBName, const String& rTableName, const String& rColNm, SvNumberFormatter* pNFmtr, @@ -289,25 +289,25 @@ public: const String& rTableName, const String& rColNm ); - inline BOOL IsInMerge() const { return bInMerge; } + inline sal_Bool IsInMerge() const { return bInMerge; } void EndMerge(); void ExecuteFormLetter(SwWrtShell& rSh, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, - BOOL bWithDataSourceBrowser = FALSE); + sal_Bool bWithDataSourceBrowser = sal_False); void InsertText(SwWrtShell& rSh, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties); // check if a data source is open - BOOL IsDataSourceOpen(const String& rDataSource, + sal_Bool IsDataSourceOpen(const String& rDataSource, const String& rTableOrQuery, sal_Bool bMergeOnly); // open the source while fields are updated - for the calculator only! - BOOL OpenDataSource(const String& rDataSource, const String& rTableOrQuery, + sal_Bool OpenDataSource(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1, bool bCreate = false); sal_uInt32 GetSelectedRecordId(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1); - BOOL GetColumnCnt(const String& rSourceName, const String& rTableName, + sal_Bool GetColumnCnt(const String& rSourceName, const String& rTableName, const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, String& rResult, double* pNumber); //create and store or find an already stored connection to a data source for use @@ -316,19 +316,19 @@ public: RegisterConnection(::rtl::OUString& rSource); const SwDSParam* CreateDSData(const SwDBData& rData) - {return FindDSData(rData, TRUE);} + {return FindDSData(rData, sal_True);} const SwDSParamArr& GetDSParamArray() const {return aDataSourceParams;} //close all data sources - after fields were updated - void CloseAll(BOOL bIncludingMerge = TRUE); + void CloseAll(sal_Bool bIncludingMerge = sal_True); - BOOL GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage, + sal_Bool GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage, String &rResult, double *pNumber, sal_uInt32 *pFormat); - BOOL ToNextMergeRecord(); - BOOL ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1); + sal_Bool ToNextMergeRecord(); + sal_Bool ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1); - BOOL ExistsNextRecord()const; + sal_Bool ExistsNextRecord()const; sal_uInt32 GetSelectedRecordId(); sal_Bool ToRecordId(sal_Int32 nSet); @@ -346,7 +346,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> GetColumnSupplier(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>, const String& rTableOrQuery, - BYTE eTableOrQuery = SW_DB_SELECT_UNKNOWN); + sal_uInt8 eTableOrQuery = SW_DB_SELECT_UNKNOWN); static ::com::sun::star::uno::Sequence<rtl::OUString> GetExistingDatabaseNames(); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 5406fb042e95..7d5fec3e37c0 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -84,8 +84,8 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ); // OD 2004-03-31 #i26791# - change return type SwContact* GetUserCall( const SdrObject* ); -// liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist -BOOL IsMarqueeTextObj( const SdrObject& rObj ); +// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist +sal_Bool IsMarqueeTextObj( const SdrObject& rObj ); //Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte) class SwContact : public SdrObjUserCall, public SwClient @@ -346,7 +346,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; virtual ::basegfx::B2DPolyPolygon TakeContour() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; - virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const; + virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; virtual void NbcMove(const Size& rSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); @@ -421,7 +421,7 @@ class SwDrawContact : public SwContact // method <_Changed(..)> bool mbUserCallActive : 1; // event type, which is handled for <mpSdrObjHandledByCurrentUserCall>. - // Note: value only valid, if <mbUserCallActive> is TRUE. + // Note: value only valid, if <mbUserCallActive> is sal_True. SdrUserCallType meEventTypeOfCurrentUserCall; friend class NestedUserCallHdl; diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 87b8a9f53dea..6fb7a76c3728 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -45,35 +45,35 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType ::sfx2::SvBaseLinkRef refLink; SwDoc* pDoc; - USHORT nRefCnt; - BOOL bCRLFFlag : 1; - BOOL bDeleted : 1; + sal_uInt16 nRefCnt; + sal_Bool bCRLFFlag : 1; + sal_Bool bDeleted : 1; SW_DLLPRIVATE void _RefCntChgd(); public: SwDDEFieldType( const String& rName, const String& rCmd, - USHORT = sfx2::LINKUPDATE_ONCALL ); + sal_uInt16 = sfx2::LINKUPDATE_ONCALL ); ~SwDDEFieldType(); const String& GetExpansion() const { return aExpansion; } void SetExpansion( const String& rStr ) { aExpansion = rStr, - bCRLFFlag = FALSE; } + bCRLFFlag = sal_False; } virtual SwFieldType* Copy() const; virtual const String& GetName() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); String GetCmd() const; void SetCmd( const String& rStr ); - USHORT GetType() const { return refLink->GetUpdateMode(); } - void SetType( USHORT nType ) { refLink->SetUpdateMode( nType ); } + sal_uInt16 GetType() const { return refLink->GetUpdateMode(); } + void SetType( sal_uInt16 nType ) { refLink->SetUpdateMode( nType ); } - BOOL IsDeleted() const { return bDeleted; } - void SetDeleted( BOOL b ) { bDeleted = b; } + sal_Bool IsDeleted() const { return bDeleted; } + void SetDeleted( sal_Bool b ) { bDeleted = b; } void UpdateNow() { refLink->Update(); } void Disconnect() { refLink->Disconnect(); } @@ -88,7 +88,7 @@ public: void IncRefCnt() { if( !nRefCnt++ && pDoc ) _RefCntChgd(); } void DecRefCnt() { if( !--nRefCnt && pDoc ) _RefCntChgd(); } - void SetCRLFDelFlag( BOOL bFlag = TRUE ) { bCRLFFlag = bFlag; } + void SetCRLFDelFlag( sal_Bool bFlag = sal_True ) { bCRLFFlag = bFlag; } }; /*-------------------------------------------------------------------- diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 736fbb70a3b5..34d060850a3c 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -458,43 +458,43 @@ private: SdrLayerID nInvisibleHell; SdrLayerID nInvisibleControls; - bool mbGlossDoc : 1; //TRUE: ist ein Textbaustein Dokument - bool mbModified : 1; //TRUE: Dokument ist veraendert - bool mbDtor : 1; //TRUE: ist im SwDoc DTOR + bool mbGlossDoc : 1; //sal_True: ist ein Textbaustein Dokument + bool mbModified : 1; //sal_True: Dokument ist veraendert + bool mbDtor : 1; //sal_True: ist im SwDoc DTOR // leider auch temporaer von // SwSwgReader::InLayout(), wenn fehlerhafte // Frames geloescht werden muessen - bool mbUndo : 1; // TRUE: Undo eingeschaltet - bool mbGroupUndo : 1; // TRUE: Undos werden gruppiert - bool mbPageNums : 1; // TRUE: es gibt virtuelle Seitennummern - bool mbLoaded : 1; // TRUE: ein geladenes Doc - bool mbUpdateExpFld : 1; // TRUE: Expression-Felder updaten - bool mbNewDoc : 1; // TRUE: neues Doc - bool mbNewFldLst : 1; // TRUE: Felder-Liste neu aufbauen - bool mbCopyIsMove : 1; // TRUE: Copy ist ein verstecktes Move - bool mbNoDrawUndoObj : 1; // TRUE: keine DrawUndoObjecte speichern - bool mbVisibleLinks : 1; // TRUE: Links werden sichtbar eingefuegt - bool mbBrowseMode : 1; // TRUE: Dokument im BrowseModus anzeigen - bool mbInReading : 1; // TRUE: Dokument wird gerade gelesen - bool mbInXMLImport : 1; // TRUE: During xml import, attribute portion building is not necessary - bool mbUpdateTOX : 1; // TRUE: nach Dokument laden die TOX Updaten - bool mbInLoadAsynchron : 1; // TRUE: Dokument wird gerade asynchron geladen - bool mbHTMLMode : 1; // TRUE: Dokument ist im HTMLMode - bool mbInCallModified : 1; // TRUE: im Set/Reset-Modified Link - bool mbIsGlobalDoc : 1; // TRUE: es ist ein GlobalDokument - bool mbGlblDocSaveLinks : 1; // TRUE: im GlobalDoc. gelinkte Sect. mit speichern - bool mbIsLabelDoc : 1; // TRUE: es ist ein Etiketten-Dokument - bool mbIsAutoFmtRedline : 1; // TRUE: die Redlines werden vom Autoformat aufgezeichnet - bool mbOLEPrtNotifyPending : 1; // TRUE: Printer ist geaendert und beim + bool mbUndo : 1; // sal_True: Undo eingeschaltet + bool mbGroupUndo : 1; // sal_True: Undos werden gruppiert + bool mbPageNums : 1; // sal_True: es gibt virtuelle Seitennummern + bool mbLoaded : 1; // sal_True: ein geladenes Doc + bool mbUpdateExpFld : 1; // sal_True: Expression-Felder updaten + bool mbNewDoc : 1; // sal_True: neues Doc + bool mbNewFldLst : 1; // sal_True: Felder-Liste neu aufbauen + bool mbCopyIsMove : 1; // sal_True: Copy ist ein verstecktes Move + bool mbNoDrawUndoObj : 1; // sal_True: keine DrawUndoObjecte speichern + bool mbVisibleLinks : 1; // sal_True: Links werden sichtbar eingefuegt + bool mbBrowseMode : 1; // sal_True: Dokument im BrowseModus anzeigen + bool mbInReading : 1; // sal_True: Dokument wird gerade gelesen + bool mbInXMLImport : 1; // sal_True: During xml import, attribute portion building is not necessary + bool mbUpdateTOX : 1; // sal_True: nach Dokument laden die TOX Updaten + bool mbInLoadAsynchron : 1; // sal_True: Dokument wird gerade asynchron geladen + bool mbHTMLMode : 1; // sal_True: Dokument ist im HTMLMode + bool mbInCallModified : 1; // sal_True: im Set/Reset-Modified Link + bool mbIsGlobalDoc : 1; // sal_True: es ist ein GlobalDokument + bool mbGlblDocSaveLinks : 1; // sal_True: im GlobalDoc. gelinkte Sect. mit speichern + bool mbIsLabelDoc : 1; // sal_True: es ist ein Etiketten-Dokument + bool mbIsAutoFmtRedline : 1; // sal_True: die Redlines werden vom Autoformat aufgezeichnet + bool mbOLEPrtNotifyPending : 1; // sal_True: Printer ist geaendert und beim // Erzeugen der ::com::sun::star::sdbcx::View ist eine Benachrichtigung // der OLE-Objekte PrtOLENotify() notwendig. bool mbAllOLENotify : 1; // True: Benachrichtigung aller Objekte ist notwendig bool mbIsRedlineMove : 1; // True: die Redlines werden in/aus der Section verschoben bool mbInsOnlyTxtGlssry : 1; // True: insert 'only text' glossary into doc bool mbContains_MSVBasic : 1; // True: MS-VBasic exist is in our storage - bool mbPurgeOLE : 1; // TRUE: Purge OLE-Objects - bool mbKernAsianPunctuation : 1; // TRUE: kerning also for ASIAN punctuation - bool mbReadlineChecked : 1; // TRUE: if the query was already shown + bool mbPurgeOLE : 1; // sal_True: Purge OLE-Objects + bool mbKernAsianPunctuation : 1; // sal_True: kerning also for ASIAN punctuation + bool mbReadlineChecked : 1; // sal_True: if the query was already shown bool mbLinksUpdated : 1; // OD 2005-02-11 #i38810# // flag indicating, that the links have been updated. bool mbClipBoard : 1; // true: this document represents the clipboard @@ -502,7 +502,7 @@ private: // (clipboard docs only) #ifdef DBG_UTIL - bool mbXMLExport : 1; // TRUE: during XML export + bool mbXMLExport : 1; // sal_True: during XML export #endif // --> OD 2006-03-21 #b6375613# @@ -521,59 +521,59 @@ private: // HISTORY OF THE COMPATIBILITY FLAGS: // // SO5: - // mbParaSpaceMax def = FALSE, TRUE since SO8 - // mbParaSpaceMaxAtPages def = FALSE, TRUE since SO8 + // mbParaSpaceMax def = sal_False, sal_True since SO8 + // mbParaSpaceMaxAtPages def = sal_False, sal_True since SO8 // // SO6: - // mbTabCompat def = FALSE, TRUE since SO8 + // mbTabCompat def = sal_False, sal_True since SO8 // // SO7: - // mbUseVirtualDevice def = TRUE - // mbAddFlyOffsets def = FALSE, hidden + // mbUseVirtualDevice def = sal_True + // mbAddFlyOffsets def = sal_False, hidden // // SO7pp1: - // bOldNumbering def = FALSE, hidden + // bOldNumbering def = sal_False, hidden // // SO8: - // mbAddExternalLeading def = TRUE - // mbUseHiResolutionVirtualDevice def = TRUE, hidden - // mbOldLineSpacing def = FALSE - // mbAddParaSpacingToTableCells def = TRUE - // mbUseFormerObjectPos def = FALSE - // mbUseFormerTextWrapping def = FALSE - // mbConsiderWrapOnObjPos def = FALSE + // mbAddExternalLeading def = sal_True + // mbUseHiResolutionVirtualDevice def = sal_True, hidden + // mbOldLineSpacing def = sal_False + // mbAddParaSpacingToTableCells def = sal_True + // mbUseFormerObjectPos def = sal_False + // mbUseFormerTextWrapping def = sal_False + // mbConsiderWrapOnObjPos def = sal_False // // SO8pp1: - // mbIgnoreFirstLineIndentInNumbering def = FALSE, hidden - // mbDoNotJustifyLinesWithManualBreak def = FALSE, hidden - // mbDoNotResetParaAttrsForNumFont def = FALSE, hidden + // mbIgnoreFirstLineIndentInNumbering def = sal_False, hidden + // mbDoNotJustifyLinesWithManualBreak def = sal_False, hidden + // mbDoNotResetParaAttrsForNumFont def = sal_False, hidden // // SO8pp3 - // mbDoNotCaptureDrawObjsOnPage def = FALSE, hidden + // mbDoNotCaptureDrawObjsOnPage def = sal_False, hidden // - Relevant for drawing objects, which don't follow the text flow, but // whose position is outside the page area: - // FALSE: Such drawing objects are captured on the page area of its anchor. - // TRUE: Such drawing objects can leave the page area, they aren't captured. - // mbTableRowKeep def = FALSE, hidden - // mbIgnoreTabsAndBlanksForLineCalculation def = FALSE, hidden - // mbClipAsCharacterAnchoredWriterFlyFrame def = FALSE, hidden + // sal_False: Such drawing objects are captured on the page area of its anchor. + // sal_True: Such drawing objects can leave the page area, they aren't captured. + // mbTableRowKeep def = sal_False, hidden + // mbIgnoreTabsAndBlanksForLineCalculation def = sal_False, hidden + // mbClipAsCharacterAnchoredWriterFlyFrame def = sal_False, hidden // - Introduced in order to re-activate clipping of as-character anchored // Writer fly frames in method <SwFlyInCntFrm::MakeAll()> for documents, // which are created with version prior SO8/OOo 2.0 // // SO8pp4 - // mbUnixForceZeroExtLeading def = FALSE, hidden + // mbUnixForceZeroExtLeading def = sal_False, hidden // // SO8pu8 - // mbOldPrinterMetrics def = FALSE, hidden + // mbOldPrinterMetrics def = sal_False, hidden // // SO9 // #i24363# tab stops relative to indent - // mbTabRelativeToIndent def = TRUE, hidden + // mbTabRelativeToIndent def = sal_True, hidden // #i89181# suppress tab stop at left indent for paragraphs in lists, whose // list level position and space mode equals LABEL_ALIGNMENT and whose list // label is followed by a tab character. - // mbTabAtLeftIndentForParagraphsInList def = FALSE, hidden + // mbTabAtLeftIndentForParagraphsInList def = sal_False, hidden bool mbParaSpaceMax : 1; bool mbParaSpaceMaxAtPages : 1; @@ -587,7 +587,7 @@ private: bool mbUseFormerObjectPos : 1; // OD 2004-03-12 #i11860# bool mbUseFormerTextWrapping : 1; // FME 2005-05-11 #108724# bool mbConsiderWrapOnObjPos : 1; // OD 2004-05-05 #i28701# - // TRUE: object positioning algorithm has consider the wrapping style of // the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos' + // sal_True: object positioning algorithm has consider the wrapping style of // the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos' bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972# // non-ui-compatibility flags: @@ -650,7 +650,7 @@ private: sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms ); // --> OD 2005-01-13 #i40550# - typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, BOOL, BOOL ); + typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool, sal_Bool ); // <-- SwFmt* CopyFmt( const SwFmt& rFmt, const SvPtrarr& rFmtArr, FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt ); @@ -704,8 +704,8 @@ private: // Charts der angegebenen Tabelle updaten void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const; - BOOL _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, - USHORT nMode ); + sal_Bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, + sal_uInt16 nMode ); // unser eigener 'IdlTimer' ruft folgende Methode DECL_LINK( DoIdleJobs, Timer * ); @@ -713,9 +713,9 @@ private: DECL_LINK( DoUpdateAllCharts, Timer * ); DECL_LINK( DoUpdateModifiedOLE, Timer * ); - SwFmt *_MakeCharFmt(const String &, SwFmt *, BOOL, BOOL ); - SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL ); - SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL ); + SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool ); + SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool ); + SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool ); void InitTOXTypes(); void Paste( const SwDoc& ); @@ -750,8 +750,8 @@ public: */ virtual bool get(/*[in]*/ DocumentSettingId id) const; virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value); - virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const; - virtual void setForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ); + virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const; + virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ); virtual vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable(); virtual const vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const; virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const; @@ -850,7 +850,7 @@ public: virtual void SetVisibleLinks(bool bFlag); virtual sfx2::LinkManager& GetLinkManager(); virtual const sfx2::LinkManager& GetLinkManager() const; - virtual void UpdateLinks(BOOL bUI); + virtual void UpdateLinks(sal_Bool bUI); virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const; virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue); virtual ::sfx2::SvLinkSource* CreateLinkSource(const String& rItem); @@ -867,7 +867,7 @@ public: virtual void RemoveFldType(sal_uInt16 nFld); virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB); virtual void InsDeletedFldType(SwFieldType &); - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, USHORT nWhich); + virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich); virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds); virtual void UpdateRefFlds(SfxPoolItem* pHt); virtual void UpdateTblFlds(SfxPoolItem* pHt); @@ -878,9 +878,9 @@ public: virtual void UnlockExpFlds(); virtual bool IsExpFldsLocked() const; virtual SwDocUpdtFld& GetUpdtFlds() const; - virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen); + virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen); virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime); - virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt); + virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt); virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld); virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld); virtual bool IsNewFldLst() const; @@ -1100,18 +1100,18 @@ public: // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist /* #109161# new parameter bCalledFromShell - TRUE: An existing adjust item at pAnchorPos is propagated to + sal_True: An existing adjust item at pAnchorPos is propagated to the content node of the new fly section. That propagation only takes place if there is no adjust item in the paragraph style for the new fly section. - FALSE: no propagation + sal_False: no propagation */ SwFlyFrmFmt* MakeFlySection( RndStdIds eAnchorType, const SwPosition* pAnchorPos, const SfxItemSet* pSet = 0, SwFrmFmt *pParent = 0, - BOOL bCalledFromShell = FALSE ); + sal_Bool bCalledFromShell = sal_False ); SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, const SwSelBoxes* pSelBoxes = 0, SwFrmFmt *pParent = 0 ); @@ -1226,7 +1226,7 @@ public: const SvUShortsSort* = 0, const bool bSendDataChangedEvents = true ); // <-- - void RstTxtAttrs(const SwPaM &rRg, BOOL bInclRefToxMark = FALSE ); + void RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark = sal_False ); // Setze das Attribut im angegebenen Format. Ist Undo aktiv, wird // das alte in die Undo-History aufgenommen @@ -1235,7 +1235,7 @@ public: // --> OD 2008-02-12 #newlistlevelattrs# // method to reset a certain attribute at the given format - void ResetAttrAtFormat( const USHORT nWhichId, + void ResetAttrAtFormat( const sal_uInt16 nWhichId, SwFmt& rChangedFormat ); // <-- @@ -1274,18 +1274,18 @@ public: void RemoveAllFmtLanguageDependencies(); SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom, - BOOL bBroadcast = FALSE, BOOL bAuto = TRUE); - void DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast = FALSE ); + sal_Bool bBroadcast = sal_False, sal_Bool bAuto = sal_True); + void DelFrmFmt( SwFrmFmt *pFmt, sal_Bool bBroadcast = sal_False ); SwFrmFmt* FindFrmFmtByName( const String& rName ) const { return (SwFrmFmt*)FindFmtByName( (SvPtrarr&)*pFrmFmtTbl, rName ); } // --> OD 2005-01-13 #i40550# SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom, - BOOL bBroadcast = FALSE, - BOOL bAuto = TRUE ); + sal_Bool bBroadcast = sal_False, + sal_Bool bAuto = sal_True ); // <-- - void DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE); - void DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE); + void DelCharFmt(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False); + void DelCharFmt(SwCharFmt* pFmt, sal_Bool bBroadcast = sal_False); SwCharFmt* FindCharFmtByName( const String& rName ) const { return (SwCharFmt*)FindFmtByName( (SvPtrarr&)*pCharFmtTbl, rName ); } @@ -1296,14 +1296,14 @@ public: // --> OD 2005-01-13 #i40550# SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName, SwTxtFmtColl *pDerivedFrom, - BOOL bBroadcast = FALSE, - BOOL bAuto = TRUE ); + sal_Bool bBroadcast = sal_False, + sal_Bool bAuto = sal_True ); // <-- SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName, SwTxtFmtColl *pDerivedFrom, - BOOL bBroadcast = FALSE); - void DelTxtFmtColl(sal_uInt16 nFmt, BOOL bBroadcast = FALSE); - void DelTxtFmtColl( SwTxtFmtColl* pColl, BOOL bBroadcast = FALSE ); + sal_Bool bBroadcast = sal_False); + void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False); + void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = sal_False ); // --> OD 2007-11-06 #i62675# // Add 4th optional parameter <bResetListAttrs>. // 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard @@ -1410,18 +1410,18 @@ public: SwPageDesc& _GetPageDesc( sal_uInt16 i ) const { return *aPageDescs[i]; } void ChgPageDesc( const String & rName, const SwPageDesc& ); void ChgPageDesc( sal_uInt16 i, const SwPageDesc& ); - BOOL FindPageDesc( const String & rName, sal_uInt16 * pFound ); + sal_Bool FindPageDesc( const String & rName, sal_uInt16 * pFound ); // -> #116530# - void DelPageDesc( const String & rName, BOOL bBroadcast = FALSE); - void DelPageDesc( sal_uInt16 i, BOOL bBroadcast = FALSE ); + void DelPageDesc( const String & rName, sal_Bool bBroadcast = sal_False); + void DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast = sal_False ); // <- #116530# void PreDelPageDesc(SwPageDesc * pDel); // #i7983# // -> #116530# sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0, - BOOL bRegardLanguage = TRUE, - BOOL bBroadcast = FALSE); + sal_Bool bRegardLanguage = sal_True, + sal_Bool bBroadcast = sal_False); void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily, - USHORT nOp); + sal_uInt16 nOp); // <- #116530# @@ -1443,7 +1443,7 @@ public: const SwTOXBase& rTOX, const SfxItemSet* pSet = 0, sal_Bool bExpand = sal_False ); - const SwTOXBaseSection* InsertTableOf( ULONG nSttNd, ULONG nEndNd, + const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, const SwTOXBase& rTOX, const SfxItemSet* pSet = 0 ); const SwTOXBase* GetCurTOX( const SwPosition& rPos ) const; @@ -1533,7 +1533,7 @@ public: // arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren // --> OD 2005-02-18 #i42921# - re-use unused 3rd parameter // --> OD 2008-02-08 #newlistlevelattrs# - // Add optional parameter <bResetIndentAttrs> - default value FALSE. + // Add optional parameter <bResetIndentAttrs> - default value sal_False. // If <bResetIndentAttrs> equals true, the indent attributes "before text" // and "first line indent" are additionally reset at the provided PaM, if // the list style makes use of the new list level attributes. @@ -1582,7 +1582,7 @@ public: // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode> sal_uInt16 MakeNumRule( const String &rName, const SwNumRule* pCpy = 0, - BOOL bBroadcast = FALSE, + sal_Bool bBroadcast = sal_False, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode = SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); // <-- @@ -1592,8 +1592,8 @@ public: // loeschen geht nur, wenn die ::com::sun::star::chaos::Rule niemand benutzt! // #106897# sal_Bool RenameNumRule(const String & aOldName, const String & aNewName, - BOOL bBroadcast = FALSE); - sal_Bool DelNumRule( const String& rName, BOOL bBroadCast = FALSE ); + sal_Bool bBroadcast = sal_False); + sal_Bool DelNumRule( const String& rName, sal_Bool bBroadCast = sal_False ); String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const; void UpdateNumRule(); // alle invaliden Updaten @@ -1615,12 +1615,12 @@ public: OD 2008-03-18 #refactorlists# - add output parameter <sListId> \param rPos position to start search - \param bForward - TRUE: search forward - - FALSE: search backward - \param bNum - TRUE: search for enumeration - - FALSE: search for itemize - \param bOutline - TRUE: search for outline numbering rule - - FALSE: search for non-outline numbering rule + \param bForward - sal_True: search forward + - sal_False: search backward + \param bNum - sal_True: search for enumeration + - sal_False: search for itemize + \param bOutline - sal_True: search for outline numbering rule + - sal_False: search for non-outline numbering rule \param nNonEmptyAllowed number of non-empty paragraphs allowed between rPos and found paragraph @@ -1666,20 +1666,20 @@ public: // Positionen der Spalten!! (nicht deren Breite!) /* #109161# new parameter bCalledFromShell: - TRUE: called from shell -> propagate existing adjust item at + sal_True: called from shell -> propagate existing adjust item at rPos to every new cell. A existing adjust item in the table heading or table contents paragraph style prevent that propagation. - FALSE: do not propagate + sal_False: do not propagate */ const SwTable* InsertTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER const SwPosition& rPos, sal_uInt16 nRows, sal_uInt16 nCols, short eAdjust, const SwTableAutoFmt* pTAFmt = 0, const SvUShorts* pColArr = 0, - BOOL bCalledFromShell = FALSE, - BOOL bNewModel = TRUE ); + sal_Bool bCalledFromShell = sal_False, + sal_Bool bNewModel = sal_True ); // steht der Index in einer Tabelle, dann returne den TableNode sonst 0 SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ); @@ -1724,7 +1724,7 @@ public: const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ) const; - void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const SwCursor* pCrsr, + void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); @@ -1732,14 +1732,14 @@ public: void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld, const SwTableBox *pStart, sal_Bool bCurRowOnly); - void SetRowsToRepeat( SwTable &rTable, USHORT nSet ); + void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet ); // AutoFormat fuer die Tabelle/TabellenSelection sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ); // Erfrage wie attributiert ist sal_Bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ); // setze das InsertDB als Tabelle Undo auf: - void AppendUndoForInsertFromDB( const SwPaM& rPam, BOOL bIsTable ); + void AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable ); // setze die Spalten/Zeilen/ZTellen Breite/Hoehe sal_Bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff ); @@ -1792,7 +1792,7 @@ public: // returne dieses. SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator, const String& rNumberingSeparator, - const sal_Bool bBefore, const sal_uInt16 nId, const ULONG nIdx, + const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx, const String& rCharacterStyle, const sal_Bool bCpyBrd = sal_True ); SwFlyFrmFmt* InsertDrawLabel( @@ -1907,7 +1907,7 @@ public: //restore the invisible content if it's available on the undo stack sal_Bool RestoreInvisibleContent(); // replace fields by text - mailmerge support - BOOL ConvertFieldsToText(); + sal_Bool ConvertFieldsToText(); // erzeuge Anhand der vorgebenen Collection Teildokumente // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene @@ -2008,10 +2008,10 @@ public: void SetContainsMSVBasic( bool bFlag ) { mbContains_MSVBasic = bFlag; } // Interface for the list of Ruby - texts/attributes - USHORT FillRubyList( const SwPaM& rPam, SwRubyList& rList, - USHORT nMode ); - USHORT SetRubyList( const SwPaM& rPam, const SwRubyList& rList, - USHORT nMode ); + sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList, + sal_uInt16 nMode ); + sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList, + sal_uInt16 nMode ); void ReadLayoutCache( SvStream& rStream ); void WriteLayoutCache( SvStream& rStream ); @@ -2036,12 +2036,12 @@ public: @param sListId list Id of the list whose level has to be marked/unmarked @param nListLevel level to mark - @param bValue - TRUE mark the level - - FALSE unmark the level + @param bValue - sal_True mark the level + - sal_False unmark the level */ void MarkListLevel( const String& sListId, const int nListLevel, - const BOOL bValue ); + const sal_Bool bValue ); /** Marks/Unmarks a list level of a certain list @@ -2050,19 +2050,19 @@ public: @param rList list whose level has to be marked/unmarked @param nListLevel level to mark - @param bValue - TRUE mark the level - - FALSE unmark the level + @param bValue - sal_True mark the level + - sal_False unmark the level */ void MarkListLevel( SwList& rList, const int nListLevel, - const BOOL bValue ); + const sal_Bool bValue ); // <- #i27615# // Change a format undoable. void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet); void RenameFmt(SwFmt & rFmt, const String & sNewName, - BOOL bBroadcast = FALSE); + sal_Bool bBroadcast = sal_False); // Change a TOX undoable. void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew); @@ -2088,7 +2088,7 @@ public: String GetPaMDescr(const SwPaM & rPaM) const; // -> #i23726# - BOOL IsFirstOfNumRule(SwPosition & rPos); + sal_Bool IsFirstOfNumRule(SwPosition & rPos); // <- #i23726# // --> #i31958# access methods for XForms model(s) diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 2b5ad3fd5203..015e8bee557a 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -91,28 +91,28 @@ SV_DECL_PTRARR_SORT_DEL( _SwRedlineTbl, SwRedlinePtr, 0, 16 ) class SwRedlineTbl : private _SwRedlineTbl { public: - SwRedlineTbl( BYTE nSize = 0, BYTE nG = 16 ) + SwRedlineTbl( sal_uInt8 nSize = 0, sal_uInt8 nG = 16 ) : _SwRedlineTbl( nSize, nG ) {} ~SwRedlineTbl() {} - BOOL SavePtrInArr( SwRedlinePtr p ) { return _SwRedlineTbl::Insert( p ); } + sal_Bool SavePtrInArr( SwRedlinePtr p ) { return _SwRedlineTbl::Insert( p ); } - BOOL Insert( SwRedlinePtr& p, BOOL bIns = TRUE ); - BOOL Insert( SwRedlinePtr& p, USHORT& rInsPos, BOOL bIns = TRUE ); - BOOL InsertWithValidRanges( SwRedlinePtr& p, USHORT* pInsPos = 0 ); + sal_Bool Insert( SwRedlinePtr& p, sal_Bool bIns = sal_True ); + sal_Bool Insert( SwRedlinePtr& p, sal_uInt16& rInsPos, sal_Bool bIns = sal_True ); + sal_Bool InsertWithValidRanges( SwRedlinePtr& p, sal_uInt16* pInsPos = 0 ); - void Remove( USHORT nP, USHORT nL = 1 ); - void DeleteAndDestroy( USHORT nP, USHORT nL=1 ); + void Remove( sal_uInt16 nP, sal_uInt16 nL = 1 ); + void DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL=1 ); // suche den naechsten oder vorherigen Redline mit dergleichen Seq.No // Mit dem Lookahead kann die Suche eingeschraenkt werden. 0 oder // USHRT_MAX suchen im gesamten Array. - USHORT FindNextOfSeqNo( USHORT nSttPos, USHORT nLookahead = 20 ) const; - USHORT FindPrevOfSeqNo( USHORT nSttPos, USHORT nLookahead = 20 ) const; - USHORT FindNextSeqNo( USHORT nSeqNo, USHORT nSttPos, - USHORT nLookahead = 20 ) const; - USHORT FindPrevSeqNo( USHORT nSeqNo, USHORT nSttPos, - USHORT nLookahead = 20 ) const; + sal_uInt16 FindNextOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const; + sal_uInt16 FindPrevOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const; + sal_uInt16 FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos, + sal_uInt16 nLookahead = 20 ) const; + sal_uInt16 FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos, + sal_uInt16 nLookahead = 20 ) const; using _SwRedlineTbl::Count; using _SwRedlineTbl::operator[]; diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 3dd338a5e129..1b6091668c67 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -99,28 +99,28 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener SW_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium ); SW_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - SW_DLLPRIVATE virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + SW_DLLPRIVATE virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); // DocInfo dem Doc melden // SW_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &); // OLE-Geraffel - SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, USHORT); + SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16); // Methoden fuer StyleSheets - SW_DLLPRIVATE USHORT Edit( const String &rName, const String& rParent, USHORT nFamily, - USHORT nMask, BOOL bNew, - BOOL bColumn = FALSE, + SW_DLLPRIVATE sal_uInt16 Edit( const String &rName, const String& rParent, sal_uInt16 nFamily, + sal_uInt16 nMask, sal_Bool bNew, + sal_Bool bColumn = sal_False, SwWrtShell* pActShell = 0, - BOOL bBasic = FALSE ); - SW_DLLPRIVATE USHORT Delete(const String &rName, USHORT nFamily); - SW_DLLPRIVATE USHORT ApplyStyles(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0, - USHORT nMode = 0 ); - SW_DLLPRIVATE USHORT DoWaterCan( const String &rName, USHORT nFamily); - SW_DLLPRIVATE USHORT UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0); - SW_DLLPRIVATE USHORT MakeByExample(const String &rName, - USHORT nFamily, USHORT nMask, SwWrtShell* pShell = 0); + sal_Bool bBasic = sal_False ); + SW_DLLPRIVATE sal_uInt16 Delete(const String &rName, sal_uInt16 nFamily); + SW_DLLPRIVATE sal_uInt16 ApplyStyles(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0, + sal_uInt16 nMode = 0 ); + SW_DLLPRIVATE sal_uInt16 DoWaterCan( const String &rName, sal_uInt16 nFamily); + SW_DLLPRIVATE sal_uInt16 UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0); + SW_DLLPRIVATE sal_uInt16 MakeByExample(const String &rName, + sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0); SW_DLLPRIVATE void InitDraw(); SW_DLLPRIVATE void SubInitNew(); // fuer InitNew und HtmlSourceModus @@ -162,14 +162,14 @@ public: // OLE-Geraffel virtual void SetVisArea( const Rectangle &rRect ); - virtual Rectangle GetVisArea( USHORT nAspect ) const; + virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; virtual Printer *GetDocumentPrinter(); virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); - virtual ULONG GetMiscStatus() const; + virtual sal_uLong GetMiscStatus() const; virtual void PrepareReload(); - virtual void SetModified( BOOL = TRUE ); + virtual void SetModified( sal_Bool = sal_True ); // Dispatcher void Execute(SfxRequest &); @@ -192,24 +192,24 @@ public: void UpdateChildWindows(); // globaler IO - virtual BOOL Save(); + virtual sal_Bool Save(); // fuer VorlagenPI virtual SfxStyleSheetBasePool* GetStyleSheetPool(); // Fuer Organizer - virtual BOOL Insert(SfxObjectShell &rSource, - USHORT nSourceIdx1, - USHORT nSourceIdx2, - USHORT nSourceIdx3, - USHORT& nIdx1, - USHORT& nIdx2, - USHORT& nIdx3, - USHORT& nRemovedIdx); - - virtual BOOL Remove(USHORT nIdx1, - USHORT nIdx2 = INDEX_IGNORE, - USHORT nIdx3 = INDEX_IGNORE); + virtual sal_Bool Insert(SfxObjectShell &rSource, + sal_uInt16 nSourceIdx1, + sal_uInt16 nSourceIdx2, + sal_uInt16 nSourceIdx3, + sal_uInt16& nIdx1, + sal_uInt16& nIdx2, + sal_uInt16& nIdx3, + sal_uInt16& nRemovedIdx); + + virtual sal_Bool Remove(sal_uInt16 nIdx1, + sal_uInt16 nIdx2 = INDEX_IGNORE, + sal_uInt16 nIdx3 = INDEX_IGNORE); virtual Bitmap GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode ); @@ -247,11 +247,11 @@ public: virtual void LoadStyles( SfxObjectShell& rSource ); - void _LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocument ); + void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument ); // Seitenvorlagedialog anzeigen, ggf. auf Spaltenpage void FormatPage( const String& rPage, - BOOL bColumn = FALSE, + sal_Bool bColumn = sal_False, SwWrtShell* pActShell = 0 ); // --> OD 2006-11-07 #i59688# @@ -275,13 +275,13 @@ public: //Activate wait cursor for all windows of this document //Optionally all dispatcher could be Locked //Usually locking should be done using the class: SwWaitObject! - void EnterWait( BOOL bLockDispatcher ); - void LeaveWait( BOOL bLockDispatcher ); + void EnterWait( sal_Bool bLockDispatcher ); + void LeaveWait( sal_Bool bLockDispatcher ); - void ToggleBrowserMode(BOOL bOn, SwView* pView = 0); + void ToggleBrowserMode(sal_Bool bOn, SwView* pView = 0); - ULONG LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt, - BOOL bUnoCall ); + sal_uLong LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt, + sal_Bool bUnoCall ); void InvalidateModel(); void ReactivateModel(); diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx index edcf4abad52a..5d40357524c8 100644 --- a/sw/inc/docstat.hxx +++ b/sw/inc/docstat.hxx @@ -33,17 +33,17 @@ struct SW_DLLPUBLIC SwDocStat { - USHORT nTbl; - USHORT nGrf; - USHORT nOLE; - ULONG nPage; + sal_uInt16 nTbl; + sal_uInt16 nGrf; + sal_uInt16 nOLE; + sal_uLong nPage; /// paragraphs for document statistic: non-empty and non-hidden ones - ULONG nPara; + sal_uLong nPara; /// all paragraphs, including empty/hidden ones - ULONG nAllPara; - ULONG nWord; - ULONG nChar; - BOOL bModified; + sal_uLong nAllPara; + sal_uLong nWord; + sal_uLong nChar; + sal_Bool bModified; SwDocStat(); void Reset(); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 91c44278878d..d8840a72a8d7 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -74,7 +74,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase SwDoc& rDoc; SfxItemSet aCoreSet; - BOOL bPhysical; + sal_Bool bPhysical; // leere Huelse zum richtigen StyleSheet (Core) machen @@ -87,7 +87,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase FillPhysical }; - SW_DLLPRIVATE BOOL FillStyleSheet( FillStyleType eFType ); + SW_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType ); protected: virtual ~SwDocStyleSheet(); @@ -97,20 +97,20 @@ public: const String& rName, SwDocStyleSheetPool& rPool, SfxStyleFamily eFam, - USHORT nMask); + sal_uInt16 nMask); SwDocStyleSheet( const SwDocStyleSheet& ); void Reset(); - void SetMask(USHORT nMsk) { nMask = nMsk; } + void SetMask(sal_uInt16 nMsk) { nMask = nMsk; } void SetFamily(SfxStyleFamily eFam) { nFamily = eFam; } - BOOL IsPhysical() const { return bPhysical; } - void SetPhysical(BOOL bPhys); + sal_Bool IsPhysical() const { return bPhysical; } + void SetPhysical(sal_Bool bPhys); // --> OD 2008-02-11 #newlistlevelattrs# - // add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value FALSE, + // add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value sal_False, // which indicates that the indent attributes at a paragraph style should // be reset in case that a list style is applied to the paragraph style and // no indent attributes are applied. @@ -127,8 +127,8 @@ public: virtual const String& GetParent() const; virtual const String& GetFollow() const; - virtual ULONG GetHelpId( String& rFile ); - virtual void SetHelpId( const String& r, ULONG nId ); + virtual sal_uLong GetHelpId( String& rFile ); + virtual void SetHelpId( const String& r, sal_uLong nId ); // Vorbelegen der member ohne physikalischen Zugriff // wird vom StyleSheetPool benutzt @@ -138,13 +138,13 @@ public: void PresetParent(const String& rName){ aParent = rName; } void PresetFollow(const String& rName){ aFollow = rName; } - virtual BOOL SetName( const String& rStr); - virtual BOOL SetParent( const String& rStr); - virtual BOOL SetFollow( const String& rStr); + virtual sal_Bool SetName( const String& rStr); + virtual sal_Bool SetParent( const String& rStr); + virtual sal_Bool SetFollow( const String& rStr); - virtual BOOL HasFollowSupport() const; - virtual BOOL HasParentSupport() const; - virtual BOOL HasClearParentSupport() const; + virtual sal_Bool HasFollowSupport() const; + virtual sal_Bool HasParentSupport() const; + virtual sal_Bool HasClearParentSupport() const; virtual String GetDescription(); virtual String GetDescription(SfxMapUnit eUnit); @@ -155,7 +155,7 @@ public: const SwNumRule* GetNumRule(); void SetNumRule(const SwNumRule& rRule); - virtual BOOL IsUsed() const; + virtual sal_Bool IsUsed() const; }; /*-------------------------------------------------------------------- @@ -167,21 +167,21 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener rtl::Reference< SwDocStyleSheet > mxIterSheet; rtl::Reference< SwDocStyleSheet > mxStyleSheet; SwPoolFmtList aLst; - USHORT nLastPos; - BOOL bFirstCalled; + sal_uInt16 nLastPos; + sal_Bool bFirstCalled; void AppendStyleList(const SvStringsDtor& rLst, - BOOL bUsed, - USHORT nSection, + sal_Bool bUsed, + sal_uInt16 nSection, char cType); public: SwStyleSheetIterator( SwDocStyleSheetPool* pBase, - SfxStyleFamily eFam, USHORT n=0xFFFF ); + SfxStyleFamily eFam, sal_uInt16 n=0xFFFF ); virtual ~SwStyleSheetIterator(); - virtual USHORT Count(); - virtual SfxStyleSheetBase *operator[](USHORT nIdx); + virtual sal_uInt16 Count(); + virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase* First(); virtual SfxStyleSheetBase* Next(); virtual SfxStyleSheetBase* Find(const UniString& rStr); @@ -197,34 +197,34 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool { rtl::Reference< SwDocStyleSheet > mxStyleSheet; SwDoc& rDoc; - BOOL bOrganizer : 1; // TRUE: fuer den Organizer + sal_Bool bOrganizer : 1; // sal_True: fuer den Organizer - virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, USHORT nMask); + virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, sal_uInt16 nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); using SfxStyleSheetBasePool::Find; public: - SwDocStyleSheetPool( SwDoc&, BOOL bOrganizer = FALSE ); + SwDocStyleSheetPool( SwDoc&, sal_Bool bOrganizer = sal_False ); virtual void Replace( SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ); - virtual SfxStyleSheetBase& Make(const String&, SfxStyleFamily, USHORT nMask, USHORT nPos = 0xffff); + virtual SfxStyleSheetBase& Make(const String&, SfxStyleFamily, sal_uInt16 nMask, sal_uInt16 nPos = 0xffff); virtual SfxStyleSheetBase* Find( const String&, SfxStyleFamily eFam, - USHORT n=0xFFFF ); + sal_uInt16 n=0xFFFF ); - virtual BOOL SetParent( SfxStyleFamily eFam, const String &rStyle, + virtual sal_Bool SetParent( SfxStyleFamily eFam, const String &rStyle, const String &rParent ); virtual void Remove( SfxStyleSheetBase* pStyle); - void SetOrganizerMode( BOOL bMode ) { bOrganizer = bMode; } - BOOL IsOrganizerMode() const { return bOrganizer; } + void SetOrganizerMode( sal_Bool bMode ) { bOrganizer = bMode; } + sal_Bool IsOrganizerMode() const { return bOrganizer; } virtual SfxStyleSheetIterator* CreateIterator( SfxStyleFamily, - USHORT nMask ); + sal_uInt16 nMask ); SwDoc& GetDoc() const { return rDoc; } diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 3607ad0cd970..af61eeec61dd 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -150,15 +150,15 @@ enum SwJumpEditFormat class SwPageNumberFieldType : public SwFieldType { sal_Int16 nNumberingType; - USHORT nNum, nMax; - BOOL bVirtuell; + sal_uInt16 nNum, nMax; + sal_Bool bVirtuell; public: SwPageNumberFieldType(); String& Expand( sal_uInt32 nFmt, short nOff, const String&, String& rRet ) const; - void ChangeExpansion( SwDoc* pDoc, USHORT nNum, USHORT nMax, - BOOL bVirtPageNum, const sal_Int16* pNumFmt = 0 ); + void ChangeExpansion( SwDoc* pDoc, sal_uInt16 nNum, sal_uInt16 nMax, + sal_Bool bVirtPageNum, const sal_Int16* pNumFmt = 0 ); virtual SwFieldType* Copy() const; }; @@ -169,11 +169,11 @@ public: class SW_DLLPUBLIC SwPageNumberField : public SwField { String sUserStr; - USHORT nSubType; + sal_uInt16 nSubType; short nOffset; public: - SwPageNumberField(SwPageNumberFieldType*, USHORT nSub = PG_RANDOM, + SwPageNumberField(SwPageNumberFieldType*, sal_uInt16 nSub = PG_RANDOM, sal_uInt32 nFmt = 0, short nOff = 0); virtual String Expand() const; @@ -182,10 +182,10 @@ public: virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual USHORT GetSubType() const; - // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_uInt16 GetSubType() const; + // virtual void SetSubType(sal_uInt16 nSub); // OM: entfernt, da unbenoetigt und gefaehrlich + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); const String& GetUserString() const { return sUserStr; } void SetUserString( const String& rS ) { sUserStr = rS; } @@ -200,7 +200,7 @@ class SwAuthorFieldType : public SwFieldType public: SwAuthorFieldType(); - String Expand(ULONG) const; + String Expand(sal_uLong) const; virtual SwFieldType* Copy() const; }; @@ -221,8 +221,8 @@ public: inline void SetExpansion(const String& rStr) { aContent = rStr; } inline const String& GetContent() const { return aContent; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -235,7 +235,7 @@ class SwFileNameFieldType : public SwFieldType public: SwFileNameFieldType(SwDoc*); - String Expand(ULONG) const; + String Expand(sal_uLong) const; virtual SwFieldType* Copy() const; }; @@ -256,8 +256,8 @@ public: inline void SetExpansion(const String& rStr) { aContent = rStr; } inline const String& GetContent() const { return aContent; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -270,7 +270,7 @@ class SwTemplNameFieldType : public SwFieldType public: SwTemplNameFieldType(SwDoc*); - String Expand(ULONG) const; + String Expand(sal_uLong) const; virtual SwFieldType* Copy() const; }; @@ -285,8 +285,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; @@ -301,7 +301,7 @@ class SwDocStatFieldType : public SwFieldType public: SwDocStatFieldType(SwDoc*); - String Expand(USHORT nSubType, sal_uInt32 nFmt) const; + String Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const; virtual SwFieldType* Copy() const; inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; } @@ -313,21 +313,21 @@ public: class SW_DLLPUBLIC SwDocStatField : public SwField { - USHORT nSubType; + sal_uInt16 nSubType; public: SwDocStatField( SwDocStatFieldType*, - USHORT nSubType = 0, sal_uInt32 nFmt = 0); + sal_uInt16 nSubType = 0, sal_uInt32 nFmt = 0); void ChangeExpansion( const SwFrm* pFrm ); virtual String Expand() const; virtual SwField* Copy() const; - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nSub); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nSub); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -336,14 +336,14 @@ public: class SwHiddenTxtFieldType : public SwFieldType { - BOOL bHidden; + sal_Bool bHidden; public: - SwHiddenTxtFieldType(BOOL bSetHidden = TRUE); + SwHiddenTxtFieldType(sal_Bool bSetHidden = sal_True); virtual SwFieldType* Copy() const; - void SetHiddenFlag( BOOL bSetHidden = TRUE ); - inline BOOL GetHiddenFlag() const { return bHidden; } + void SetHiddenFlag( sal_Bool bSetHidden = sal_True ); + inline sal_Bool GetHiddenFlag() const { return bHidden; } }; /*-------------------------------------------------------------------- @@ -352,39 +352,39 @@ public: class SwHiddenTxtField : public SwField { - String aTRUETxt; // Text wenn Bedingung TRUE + String aTRUETxt; // Text wenn Bedingung sal_True String aFALSETxt; // Wenn Bedingung falsch String aContent; // Ausgewerteter DB-Text String aCond; // Bedingung - USHORT nSubType; + sal_uInt16 nSubType; - BOOL bCanToggle : 1; // kann das Feld einzeln getoggelt werden? - BOOL bIsHidden : 1; // ist es nicht sichtbar? - BOOL bValid : 1; // DB-Feld evaluiert? + sal_Bool bCanToggle : 1; // kann das Feld einzeln getoggelt werden? + sal_Bool bIsHidden : 1; // ist es nicht sichtbar? + sal_Bool bValid : 1; // DB-Feld evaluiert? virtual String Expand() const; virtual SwField* Copy() const; public: SwHiddenTxtField( SwHiddenTxtFieldType*, - BOOL bConditional, + sal_Bool bConditional, const String& rCond, const String& rTxt, - BOOL bHidden = FALSE, - USHORT nSubType = TYP_HIDDENTXTFLD); + sal_Bool bHidden = sal_False, + sal_uInt16 nSubType = TYP_HIDDENTXTFLD); SwHiddenTxtField( SwHiddenTxtFieldType*, const String& rCond, const String& rTrue, const String& rFalse, - USHORT nSubType = TYP_HIDDENTXTFLD); + sal_uInt16 nSubType = TYP_HIDDENTXTFLD); virtual String GetFieldName() const; void Evaluate(SwDoc*); - inline void SetValue(BOOL bHidden) { bIsHidden = bHidden; } + inline void SetValue(sal_Bool bHidden) { bIsHidden = bHidden; } String GetColumnName(const String& rName); String GetDBName(const String& rName, SwDoc *pDoc); @@ -397,10 +397,10 @@ public: virtual String GetPar2() const; - virtual USHORT GetSubType() const; - // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_uInt16 GetSubType() const; + // virtual void SetSubType(sal_uInt16 nSub); // OM: entfernt, da unbenoetigt und gefaehrlich + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -422,7 +422,7 @@ public: class SwHiddenParaField : public SwField { String aCond; - BOOL bIsHidden:1; + sal_Bool bIsHidden:1; public: // Direkte Eingabe alten Wert loeschen SwHiddenParaField(SwHiddenParaFieldType*, const String& rCond); @@ -430,14 +430,14 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - void SetHidden(BOOL bHidden) { bIsHidden = bHidden; } - BOOL IsHidden() const { return bIsHidden; } + void SetHidden(sal_Bool bHidden) { bIsHidden = bHidden; } + sal_Bool IsHidden() const { return bIsHidden; } // Bedingung erfragen/setzen virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -462,7 +462,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField { String aMacro; String aText; - BOOL bIsScriptURL; + sal_Bool bIsScriptURL; virtual String Expand() const; virtual SwField* Copy() const; @@ -486,14 +486,14 @@ public: // Macrotext virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); static void CreateMacroString( String& rMacro, const String& rMacroName, const String& rLibraryName ); - static BOOL isScriptURL( const String& str ); + static sal_Bool isScriptURL( const String& str ); }; @@ -549,8 +549,8 @@ public: sal_uInt32 GetNumberOfParagraphs() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); virtual String GetDescription() const; }; @@ -563,13 +563,13 @@ class SwDocInfoFieldType : public SwValueFieldType public: SwDocInfoFieldType(SwDoc* pDc); - String Expand(USHORT nSubType, sal_uInt32 nFormat, USHORT nLang, const String& rName) const; + String Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, sal_uInt16 nLang, const String& rName) const; virtual SwFieldType* Copy() const; }; class SW_DLLPUBLIC SwDocInfoField : public SwValueField { - USHORT nSubType; + sal_uInt16 nSubType; String aContent; String aName; @@ -577,18 +577,18 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField virtual SwField* Copy() const; public: - SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, const String& rName, sal_uInt32 nFmt=0); - SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, const String& rName, const String& rValue, sal_uInt32 nFmt=0); + SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const String& rName, sal_uInt32 nFmt=0); + SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const String& rName, const String& rValue, sal_uInt32 nFmt=0); - virtual void SetSubType(USHORT); - virtual USHORT GetSubType() const; - virtual void SetLanguage(USHORT nLng); + virtual void SetSubType(sal_uInt16); + virtual sal_uInt16 GetSubType() const; + virtual void SetLanguage(sal_uInt16 nLng); virtual String GetFieldName() const; String GetName() const { return aName; } void SetName( const String& rName ) { aName = rName; } inline void SetExpansion(const String& rStr) { aContent = rStr; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -604,28 +604,28 @@ public: inline void SetData(const String& rStr) { aData = rStr; } - String Expand(USHORT nSubType, sal_uInt32 nFormat) const; + String Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const; virtual SwFieldType* Copy() const; }; class SwExtUserField : public SwField { String aContent; - USHORT nType; + sal_uInt16 nType; public: - SwExtUserField(SwExtUserFieldType*, USHORT nSub, sal_uInt32 nFmt=0); + SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0); virtual String Expand() const; virtual SwField* Copy() const; - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nSub); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nSub); inline void SetExpansion(const String& rStr) { aContent = rStr; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; @@ -650,11 +650,11 @@ public: class SwRefPageSetField : public SwField { short nOffset; - BOOL bOn; + sal_Bool bOn; public: SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0, - BOOL bOn = TRUE ); + sal_Bool bOn = sal_True ); virtual String Expand() const; virtual SwField* Copy() const; @@ -662,12 +662,12 @@ public: virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - BOOL IsOn() const { return bOn; } + sal_Bool IsOn() const { return bOn; } short GetOffset() const { return nOffset; } void SetOffset( short nOff ) { nOffset = nOff; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -687,7 +687,7 @@ public: // ueberlagert, um alle RefPageGet-Felder zu updaten virtual void Modify( SfxPoolItem *, SfxPoolItem * ); - USHORT MakeSetList( _SetGetExpFlds& rTmpLst ); + sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst ); SwDoc* GetDoc() const { return pDoc; } }; @@ -708,8 +708,8 @@ public: void SetText( const String& rTxt ) { sTxt = rTxt; } void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld ); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -748,8 +748,8 @@ public: SwCharFmt* GetCharFmt() const { return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -775,11 +775,11 @@ class SwScriptField : public SwField String sCode; // der Code als Text // der Code als JavaCode ? - BOOL bCodeURL; // Code enthaelt URL eines Scripts + sal_Bool bCodeURL; // Code enthaelt URL eines Scripts public: SwScriptField( SwScriptFieldType*, const String& rType, - const String& rCode, BOOL bURL=FALSE ); + const String& rCode, sal_Bool bURL=sal_False ); virtual String GetDescription() const; @@ -793,10 +793,10 @@ public: virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - BOOL IsCodeURL() const { return bCodeURL; } - void SetCodeURL( BOOL bURL ) { bCodeURL = bURL; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + sal_Bool IsCodeURL() const { return bCodeURL; } + void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; } + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -831,8 +831,8 @@ public: virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index 6b791acf178a..84a1b2c99ba1 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -42,18 +42,18 @@ class SwDPage : public FmFormPage, public SdrObjUserCall SwDoc& rDoc; public: - SwDPage(SwDrawDocument& rNewModel, BOOL bMasterPage=FALSE); + SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage=sal_False); ~SwDPage(); // #i3694# // This GetOffset() method is not needed anymore, it even leads to errors. // virtual Point GetOffset() const; - virtual SdrObject* ReplaceObject( SdrObject* pNewObj, ULONG nObjNum ); + virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum ); virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle *pRect) const; - BOOL RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); + sal_Bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); }; diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx index dd3187614ec4..23e63a8483d8 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -42,14 +42,14 @@ enum GlobalDocContentType { class SwGlblDocContent { GlobalDocContentType eType; - ULONG nDocPos; + sal_uLong nDocPos; union { const SwTOXBase* pTOX; const SwSection* pSect; } PTR; public: - SwGlblDocContent( ULONG nPos ); + SwGlblDocContent( sal_uLong nPos ); SwGlblDocContent( const SwTOXBaseSection* pTOX ); SwGlblDocContent( const SwSection* pSect ); @@ -59,7 +59,7 @@ public: { return GLBLDOC_SECTION == eType ? PTR.pSect : 0; } const SwTOXBase* GetTOX() const { return GLBLDOC_TOXBASE == eType ? PTR.pTOX : 0; } - ULONG GetDocPos() const { return nDocPos; } + sal_uLong GetDocPos() const { return nDocPos; } // fuers Sortieren inline int operator==( const SwGlblDocContent& rCmp ) const diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index 60d6fbe99419..16a2a3ecb2f5 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -52,15 +52,15 @@ class SwNodeIndex; struct SwPamRange { - ULONG nStart, nEnd; + sal_uLong nStart, nEnd; SwPamRange() : nStart( 0 ), nEnd( 0 ) {} - SwPamRange( ULONG nS, ULONG nE ) : nStart( nS ), nEnd( nE ) {} + SwPamRange( sal_uLong nS, sal_uLong nE ) : nStart( nS ), nEnd( nE ) {} - BOOL operator==( const SwPamRange& rRg ) - { return nStart == rRg.nStart ? TRUE : FALSE; } - BOOL operator<( const SwPamRange& rRg ) - { return nStart < rRg.nStart ? TRUE : FALSE; } + sal_Bool operator==( const SwPamRange& rRg ) + { return nStart == rRg.nStart ? sal_True : sal_False; } + sal_Bool operator<( const SwPamRange& rRg ) + { return nStart < rRg.nStart ? sal_True : sal_False; } }; SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0, 1 ) @@ -71,11 +71,11 @@ public: SwPamRanges( const SwPaM& rRing ); void Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 ); - SwPaM& SetPam( USHORT nArrPos, SwPaM& rPam ); + SwPaM& SetPam( sal_uInt16 nArrPos, SwPaM& rPam ); - USHORT Count() const + sal_uInt16 Count() const { return _SwPamRanges::Count(); } - SwPamRange operator[]( USHORT nPos ) const + SwPamRange operator[]( sal_uInt16 nPos ) const { return _SwPamRanges::operator[](nPos); } }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 85201ff9b5b9..4b979416cc31 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -147,7 +147,7 @@ SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0, 5 ) #define CNT_TXT 0x0001 #define CNT_GRF 0x0002 #define CNT_OLE 0x0010 -/* Teste einen USHORT auf eine bestimmte Inhaltsform */ +/* Teste einen sal_uInt16 auf eine bestimmte Inhaltsform */ #define CNT_HasTxt(USH) ((USH)&CNT_TXT) #define CNT_HasGrf(USH) ((USH)&CNT_GRF) #define CNT_HasOLE(USH) ((USH)&CNT_OLE) @@ -171,7 +171,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell */ SW_DLLPRIVATE SwGrfNode *_GetGrfNode() const ; - SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, BOOL* pUndo = 0 ); + SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 ); SW_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet ); @@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell public: // Editieren (immer auf allen selektierten Bereichen) - void Insert( sal_Unicode, BOOL bOnlyCurrCrsr = FALSE ); + void Insert( sal_Unicode, sal_Bool bOnlyCurrCrsr = sal_False ); void Insert2( const String &, const bool bForceExpandHints = false ); void Overwrite( const String & ); @@ -190,14 +190,14 @@ public: // ein ( nicht \& ) // z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&" // --> "xx\t<Tab>..zzz..&" - BOOL Replace( const String& rNewStr, BOOL bRegExpRplc = FALSE ); + sal_Bool Replace( const String& rNewStr, sal_Bool bRegExpRplc = sal_False ); // loescht den Inhalt aller Bereiche; // werden ganze Nodes selektiert, werden die Nodes geloescht long Delete(); // remove a complete paragraph - BOOL DelFullPara(); + sal_Bool DelFullPara(); // change text to Upper/Lower/Hiragana/Katagana/... void TransliterateText( sal_uInt32 nType ); @@ -207,16 +207,16 @@ public: // loesche den nicht sichtbaren Content aus dem Document, wie z.B.: // versteckte Bereiche, versteckte Absaetze - BOOL RemoveInvisibleContent(); + sal_Bool RemoveInvisibleContent(); // replace fields by text - mailmerge support - BOOL ConvertFieldsToText(); + sal_Bool ConvertFieldsToText(); // set all numbering start points to a fixed value - mailmerge support void SetNumberingRestart(); // embedded alle lokalen Links (Bereiche/Grafiken) - USHORT GetLinkUpdMode(BOOL bDocSettings = FALSE) const; - void SetLinkUpdMode( USHORT nMode ); + sal_uInt16 GetLinkUpdMode(sal_Bool bDocSettings = sal_False) const; + void SetLinkUpdMode( sal_uInt16 nMode ); // kopiere den Inhalt aller Bereiche an die akt. Cursor-Position // in die angegebene Shell @@ -228,19 +228,19 @@ public: // der FEShell stehen! // kopiere alle Selectionen und das Doc //JP 21.10.96: und fuer die SVX-Autokorrektur - BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 ); + sal_Bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 ); - long SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE ); + long SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True ); sal_Bool AppendTxtNode(); void AutoFmtBySplitNode(); // ist der Cursor in einem INetAttribut, dann wird das komplett // geloescht; inclusive des Hinweistextes (wird beim Drag&Drop gebraucht) - BOOL DelINetAttrWithText(); + sal_Bool DelINetAttrWithText(); // ist der Cursor am Ende einer Zeichenvorlage, an der das DontExpand-Flag - // noch nicht gesetzt ist, wird dies gesetzt ( => return TRUE; ) - BOOL DontExpandFmt(); + // noch nicht gesetzt ist, wird dies gesetzt ( => return sal_True; ) + sal_Bool DontExpandFmt(); // Anwenden / Entfernen von Attributen // liefert Attribute im angeforderten AttributSet. Wenn nicht eindeutig @@ -249,42 +249,42 @@ public: // Renaming method to <GetCurAttr(..)> indicating that the attributes at // the current cursors are retrieved. // Introduce 2nd optional parameter <bMergeIndentValuesOfNumRule>. - // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of + // If <bMergeIndentValuesOfNumRule> == sal_True, the indent attributes of // the corresponding list level of an applied list style is merged into // the requested item set as a LR-SPACE item, if corresponding node has not // its own indent attributes and the position-and-space mode of the list // level is SvxNumberFormat::LABEL_ALIGNMENT. - BOOL GetCurAttr( SfxItemSet& , + sal_Bool GetCurAttr( SfxItemSet& , const bool bMergeIndentValuesOfNumRule = false ) const; // <-- - void SetAttr( const SfxPoolItem&, USHORT nFlags = 0 ); - void SetAttr( const SfxItemSet&, USHORT nFlags = 0 ); + void SetAttr( const SfxPoolItem&, sal_uInt16 nFlags = 0 ); + void SetAttr( const SfxItemSet&, sal_uInt16 nFlags = 0 ); // Setze das Attribut als neues default Attribut im Dokument. void SetDefault( const SfxPoolItem& ); // Erfrage das Default Attribut vom Dokument. - const SfxPoolItem& GetDefault( USHORT nFmtHint ) const; + const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const; void ResetAttr( const SvUShortsSort* pAttrs = 0 ); void GCAttr(); // returns the scripttpye of the selection - USHORT GetScriptType() const; + sal_uInt16 GetScriptType() const; // returns the language at current cursor position - USHORT GetCurLang() const; + sal_uInt16 GetCurLang() const; // TABLE - USHORT GetTblFrmFmtCount( BOOL bUsed = FALSE ) const; - SwFrmFmt& GetTblFrmFmt(USHORT nFmt, BOOL bUsed = FALSE ) const; + sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed = sal_False ) const; + SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed = sal_False ) const; String GetUniqueTblName() const; // CHAR - USHORT GetCharFmtCount() const; - SwCharFmt& GetCharFmt(USHORT nFmt) const; + sal_uInt16 GetCharFmtCount() const; + SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const; SwCharFmt* GetCurCharFmt() const; - void FillByEx(SwCharFmt*, BOOL bReset = FALSE); + void FillByEx(SwCharFmt*, sal_Bool bReset = sal_False); SwCharFmt* MakeCharFmt( const String& rName, SwCharFmt* pDerivedFrom = 0 ); SwCharFmt* FindCharFmtByName( const String& rName ) const; @@ -301,8 +301,8 @@ public: // TXT SwTxtFmtColl& GetDfltTxtFmtColl() const; - USHORT GetTxtFmtCollCount() const; - SwTxtFmtColl& GetTxtFmtColl( USHORT nTxtFmtColl) const; + sal_uInt16 GetTxtFmtCollCount() const; + SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const; SwTxtFmtColl* GetCurTxtFmtColl() const; // --> OD 2007-11-06 #i62675# // Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)> @@ -311,24 +311,24 @@ public: // <-- SwTxtFmtColl *MakeTxtFmtColl(const String &rFmtCollName, SwTxtFmtColl *pDerivedFrom = 0); - void FillByEx(SwTxtFmtColl*, BOOL bReset = FALSE); + void FillByEx(SwTxtFmtColl*, sal_Bool bReset = sal_False); SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const; // Gebe die "Auto-Collection" mit der Id zurueck. Existiert // sie noch nicht, dann erzuege sie - SwTxtFmtColl* GetTxtCollFromPool( USHORT nId ); + SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId ); // return das geforderte automatische Format - Basis-Klasse ! - SwFmt* GetFmtFromPool( USHORT nId ); + SwFmt* GetFmtFromPool( sal_uInt16 nId ); // returne die geforderte automatische Seiten-Vorlage - SwPageDesc* GetPageDescFromPool( USHORT nId ); + SwPageDesc* GetPageDescFromPool( sal_uInt16 nId ); // erfrage ob die Absatz-/Zeichen-/Rahmen-/Seiten - Vorlage benutzt wird - BOOL IsUsed( const SwModify& ) const; + sal_Bool IsUsed( const SwModify& ) const; // returne das geforderte automatische Format - SwFrmFmt* GetFrmFmtFromPool( USHORT nId ) + SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) { return (SwFrmFmt*)SwEditShell::GetFmtFromPool( nId ); } - SwCharFmt* GetCharFmtFromPool( USHORT nId ) + SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) { return (SwCharFmt*)SwEditShell::GetFmtFromPool( nId ); } // Felder @@ -337,12 +337,12 @@ public: void UpdateFlds( SwField & ); // ein einzelnes Feld - USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const; - SwFieldType* GetFldType(USHORT nId, USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const; - SwFieldType* GetFldType(USHORT nResId, const String& rName) const; + sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const; + SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const; + SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName) const; - void RemoveFldType(USHORT nId, USHORT nResId = USHRT_MAX); - void RemoveFldType(USHORT nResId, const String& rName); + void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX); + void RemoveFldType(sal_uInt16 nResId, const String& rName); void FieldToText( SwFieldType* pType ); @@ -357,16 +357,16 @@ public: void GetAllUsedDB( SvStringsDtor& rDBNameList, SvStringsDtor* pAllDBNames = 0 ); - BOOL IsAnyDatabaseFieldInDoc()const; + sal_Bool IsAnyDatabaseFieldInDoc()const; //check whether DB fields point to an available data source and returns it - BOOL IsFieldDataSourceAvailable(String& rUsedDataSource) const; - void UpdateExpFlds(BOOL bCloseDB = FALSE);// nur alle ExpressionFelder updaten - void SetFixFields( BOOL bOnlyTimeDate = FALSE, + sal_Bool IsFieldDataSourceAvailable(String& rUsedDataSource) const; + void UpdateExpFlds(sal_Bool bCloseDB = sal_False);// nur alle ExpressionFelder updaten + void SetFixFields( sal_Bool bOnlyTimeDate = sal_False, const DateTime* pNewDateTime = 0 ); void LockExpFlds(); void UnlockExpFlds(); - SwFldUpdateFlags GetFldUpdateFlags(BOOL bDocSettings = FALSE) const; + SwFldUpdateFlags GetFldUpdateFlags(sal_Bool bDocSettings = sal_False) const; void SetFldUpdateFlags( SwFldUpdateFlags eFlags ); // fuer die Evaluierung der DBFelder (neuer DB-Manager) @@ -375,7 +375,7 @@ public: SwFieldType* InsertFldType(const SwFieldType &); // Aenderungen am Dokument? - BOOL IsModified() const; + sal_Bool IsModified() const; void SetModified(); void ResetModified(); void SetUndoNoResetModified(); @@ -388,31 +388,31 @@ public: void DeleteTOXMark(SwTOXMark* pMark); // Alle Markierungen am aktuellen SPoint ermitteln - USHORT GetCurTOXMarks(SwTOXMarks& rMarks) const ; + sal_uInt16 GetCurTOXMarks(SwTOXMarks& rMarks) const ; // Verzeichnis einfuegen, und bei Bedarf erneuern void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - BOOL UpdateTableOf(const SwTOXBase& rTOX, + sal_Bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); const SwTOXBase* GetCurTOX() const; - const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate = FALSE ); + const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False ); void SetDefaultTOXBase(const SwTOXBase& rBase); - BOOL IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const; - void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly); + sal_Bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const; + void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, sal_Bool bReadonly); - USHORT GetTOXCount() const; - const SwTOXBase* GetTOX( USHORT nPos ) const; - BOOL DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes = FALSE ); + sal_uInt16 GetTOXCount() const; + const SwTOXBase* GetTOX( sal_uInt16 nPos ) const; + sal_Bool DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes = sal_False ); // nach einlesen einer Datei alle Verzeichnisse updaten - void SetUpdateTOX( BOOL bFlag = TRUE ); - BOOL IsUpdateTOX() const; + void SetUpdateTOX( sal_Bool bFlag = sal_True ); + sal_Bool IsUpdateTOX() const; // Verzeichnis-Typen verwalten - USHORT GetTOXTypeCount(TOXTypes eTyp) const; - const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const; + sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const; + const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; void InsertTOXType(const SwTOXType& rTyp); //AutoMark file @@ -421,25 +421,25 @@ public: void ApplyAutoMark(); // Schluessel fuer die Indexverwaltung - USHORT GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const; + sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const; void SetOutlineNumRule(const SwNumRule&); const SwNumRule* GetOutlineNumRule() const; // Gliederung - hoch-/runterstufen - BOOL OutlineUpDown( short nOffset = 1 ); + sal_Bool OutlineUpDown( short nOffset = 1 ); // Gliederung - hoch-/runtermoven - BOOL MoveOutlinePara( short nOffset = 1); + sal_Bool MoveOutlinePara( short nOffset = 1); // Outlines and SubOutline are protected ? - BOOL IsProtectedOutlinePara() const; + sal_Bool IsProtectedOutlinePara() const; // Numerierung Aufzaehlunglisten - // liefert Regelwerk der aktuellen Aufzaehlung (FALSE sonst) + // liefert Regelwerk der aktuellen Aufzaehlung (sal_False sonst) const SwNumRule* GetCurNumRule() const; // setzt, wenn noch keine Numerierung, sonst wird geaendert // arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren // --> OD 2008-02-08 #newlistlevelattrs# - // Add optional parameter <bResetIndentAttrs> (default value FALSE). + // Add optional parameter <bResetIndentAttrs> (default value sal_False). // If <bResetIndentAttrs> equals true, the indent attributes "before text" // and "first line indent" are additionally reset at the current selection, // if the list style makes use of the new list level attributes. @@ -447,7 +447,7 @@ public: // introduce parameters <bCreateNewList> and <sContinuedListId> // <bCreateNewList> indicates, if a new list is created by applying the // given list style. - // If <bCreateNewList> equals FALSE, <sContinuedListId> may contain the + // If <bCreateNewList> equals sal_False, <sContinuedListId> may contain the // list Id of a list, which has to be continued by applying the given list style void SetCurNumRule( const SwNumRule&, const bool bCreateNewList /*= false*/, @@ -455,16 +455,16 @@ public: const bool bResetIndentAttrs = false ); // <-- // Absaetze ohne Numerierung, aber mit Einzuegen - BOOL NoNum(); + sal_Bool NoNum(); // Loeschen, Splitten der Aufzaehlungsliste void DelNumRules(); // Hoch-/Runterstufen - BOOL NumUpDown( BOOL bDown = TRUE ); + sal_Bool NumUpDown( sal_Bool bDown = sal_True ); // Hoch-/Runtermoven sowohl innerhalb als auch ausserhalb von Numerierungen - BOOL MoveParagraph( long nOffset = 1); - BOOL MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft ); + sal_Bool MoveParagraph( long nOffset = 1); + sal_Bool MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft ); // No-/Numerierung ueber Delete/Backspace ein/abschalten #115901# - BOOL NumOrNoNum( BOOL bDelete = FALSE, BOOL bChkStart = TRUE); + sal_Bool NumOrNoNum( sal_Bool bDelete = sal_False, sal_Bool bChkStart = sal_True); // -> #i23726# // --> OD 2008-06-09 #i90078# // Remove unused default parameter <nLevel> and <bRelative>. @@ -473,17 +473,17 @@ public: // Adjust method name void SetIndent(short nIndent, const SwPosition & rPos); // <-- - BOOL IsFirstOfNumRule() const; - BOOL IsFirstOfNumRule(const SwPaM & rPaM) const; + sal_Bool IsFirstOfNumRule() const; + sal_Bool IsFirstOfNumRule(const SwPaM & rPaM) const; // <- #i23726# - BOOL IsNoNum( BOOL bChkStart = TRUE ) const; + sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const; // returne den Num-Level des Nodes, in dem sich der Point vom // Cursor befindet. Return kann sein : // - NO_NUMBERING, 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1 // --> OD 2008-02-29 #refactorlists# - removed <pHasChilds> -// BYTE GetNumLevel( BOOL* pHasChilds = 0 ) const; - BYTE GetNumLevel() const; +// sal_uInt8 GetNumLevel( sal_Bool* pHasChilds = 0 ) const; + sal_uInt8 GetNumLevel() const; // <-- // detect highest and lowest level to check moving of outline levels void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower ); @@ -493,21 +493,21 @@ public: int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei // -> i29560 - BOOL HasNumber() const; - BOOL HasBullet() const; + sal_Bool HasNumber() const; + sal_Bool HasBullet() const; // <- i29560 - String GetUniqueNumRuleName( const String* pChkStr = 0, BOOL bAutoNum = TRUE ) const; + String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const; void ChgNumRuleFmts( const SwNumRule& rRule ); // setze und erfrage, ob an aktueller PointPos eine Numerierung mit // dem StartFlag startet - void SetNumRuleStart( BOOL bFlag = TRUE ); - BOOL IsNumRuleStart() const; - void SetNodeNumStart( USHORT nStt ); + void SetNumRuleStart( sal_Bool bFlag = sal_True ); + sal_Bool IsNumRuleStart() const; + void SetNodeNumStart( sal_uInt16 nStt ); // --> OD 2008-02-29 #refactorlists# - USHORT GetNodeNumStart() const; + sal_uInt16 GetNodeNumStart() const; // <-- - BOOL ReplaceNumRule( const String& rOldRule, const String& rNewRule ); + sal_Bool ReplaceNumRule( const String& rOldRule, const String& rNewRule ); // Searches for a text node with a numbering rule. // --> OD 2008-03-18 #refactorlists# - add output parameter <sListId> // in case a list style is found, <sListId> holds the list id, to which the @@ -522,10 +522,10 @@ public: // Undo // UndoHistory am Dokument pflegen // bei Save, SaveAs, Create wird UndoHistory zurueckgesetzt ??? - void DoUndo( BOOL bOn = TRUE ); - BOOL DoesUndo() const; - void DoGroupUndo( BOOL bUn = TRUE ); - BOOL DoesGroupUndo() const; + void DoUndo( sal_Bool bOn = sal_True ); + sal_Bool DoesUndo() const; + void DoGroupUndo( sal_Bool bUn = sal_True ); + sal_Bool DoesGroupUndo() const; void DelAllUndoObj(); // macht rueckgaengig: @@ -539,8 +539,8 @@ public: String GetUndoIdsStr( String* pUndoStr = 0, SwUndoIds *pUndoIds = 0) const; // abfragen/setzen der Anzahl von wiederherstellbaren Undo-Actions - static USHORT GetUndoActionCount(); - static void SetUndoActionCount( USHORT nNew ); + static sal_uInt16 GetUndoActionCount(); + static void SetUndoActionCount( sal_uInt16 nNew ); // Redo // liefert die Id der letzten Redofaehigen Aktion zurueck @@ -557,11 +557,11 @@ public: // 0 letzte Aktion, sonst Aktionen bis zum Start der Klammerung nUndoId // mit KillPaMs, ClearMark - BOOL Undo(SwUndoId nUndoId = UNDO_EMPTY, USHORT nCnt = 1 ); + sal_Bool Undo(SwUndoId nUndoId = UNDO_EMPTY, sal_uInt16 nCnt = 1 ); // wiederholt - USHORT Repeat( USHORT nCount ); + sal_uInt16 Repeat( sal_uInt16 nCount ); // wiederholt - USHORT Redo( USHORT nCnt = 1 ); + sal_uInt16 Redo( sal_uInt16 nCnt = 1 ); // fuer alle Sichten auf dieses Dokument void StartAllAction(); void EndAllAction(); @@ -570,17 +570,17 @@ public: void CalcLayout(); // Inhaltsform bestimmen, holen, liefert Type am CurCrsr->SPoint - USHORT GetCntType() const; - BOOL HasOtherCnt() const; // gibt es Rahmen, Fussnoten, ... + sal_uInt16 GetCntType() const; + sal_Bool HasOtherCnt() const; // gibt es Rahmen, Fussnoten, ... /* Anwenden der ViewOptions mit Start-/EndAction */ inline void ApplyViewOptions( const SwViewOption &rOpt ); // Text innerhalb der Selektion erfragen - // Returnwert liefert FALSE, wenn der selektierte Bereich + // Returnwert liefert sal_False, wenn der selektierte Bereich // zu gross ist, um in den Stringpuffer kopiert zu werden // oder andere Fehler auftreten - BOOL GetSelectedText( String &rBuf, + sal_Bool GetSelectedText( String &rBuf, int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK ); /* @@ -589,11 +589,11 @@ public: * gleiche Graphic zeigt), sonst gibt's was auf die Finger */ // --> OD 2005-02-09 #119353# - robust - const Graphic* GetGraphic( BOOL bWait = TRUE ) const; + const Graphic* GetGraphic( sal_Bool bWait = sal_True ) const; const GraphicObject* GetGraphicObj() const; // <-- - BOOL IsGrfSwapOut( BOOL bOnlyLinked = FALSE ) const; - USHORT GetGraphicType() const; + sal_Bool IsGrfSwapOut( sal_Bool bOnlyLinked = sal_False ) const; + sal_uInt16 GetGraphicType() const; const PolyPolygon *GetGraphicPolygon() const; void SetGraphicPolygon( const PolyPolygon *pPoly ); @@ -604,9 +604,9 @@ public: /* * liefert die Groesse einer Graphic in Twips, wenn der Cursor - * auf einer Graphic steht; BOOL liefert FALSE, wenn s.o. + * auf einer Graphic steht; sal_Bool liefert sal_False, wenn s.o. */ - BOOL GetGrfSize(Size&) const; + sal_Bool GetGrfSize(Size&) const; /* * liefert den Namen und den Filter einer Graphic, wenn der Cursor * auf einer Graphic steht, sonst gibt's was auf die Finger! @@ -632,7 +632,7 @@ public: // remove default parameter, because method always called this default value Graphic GetIMapGraphic() const; //liefert eine Graphic fuer alle Flys! // <-- - const SwFlyFrmFmt* FindFlyByName( const String& rName, BYTE nNdTyp = 0 ) const; + const SwFlyFrmFmt* FindFlyByName( const String& rName, sal_uInt8 nNdTyp = 0 ) const; //liefert ein ClientObject, wenn CurCrsr->Point() auf einen //SwOLENode zeigt (und Mark nicht gesetzt ist oder auf das @@ -640,7 +640,7 @@ public: //Finger. svt::EmbeddedObjectRef& GetOLEObject() const; //Gibt es ein OleObject mit diesem Namen (SwFmt)? - BOOL HasOLEObj( const String &rName ) const; + sal_Bool HasOLEObj( const String &rName ) const; //Liefert den Pointer auf die Daten des Chart, indem sich der Crsr //befindet. @@ -657,14 +657,14 @@ public: void InsertGlossary( SwTextBlocks& rGlossary, const String& ); // aktuelle Selektion zum Textbaustein machen und ins // Textbausteindokument einfuegen, einschliesslich Vorlagen - USHORT MakeGlossary( SwTextBlocks& rToFill, const String& rName, - const String& rShortName, BOOL bSaveRelFile = FALSE, + sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const String& rName, + const String& rShortName, sal_Bool bSaveRelFile = sal_False, const String* pOnlyTxt=0 ); // speicher den gesamten Inhalt des Docs als Textbaustein - USHORT SaveGlossaryDoc( SwTextBlocks& rGlossary, const String& rName, + sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const String& rName, const String& rShortName, - BOOL bSaveRelFile = FALSE, - BOOL bOnlyTxt = FALSE ); + sal_Bool bSaveRelFile = sal_False, + sal_Bool bOnlyTxt = sal_False ); // Linguistik // Selektionen sichern @@ -672,7 +672,7 @@ public: // Selektionen wiederherstellen void HyphEnd(); com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> - HyphContinue( USHORT* pPageCnt, USHORT* pPageSt ); + HyphContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); // zu trennendes Wort ignorieren void HyphIgnore(); @@ -682,30 +682,30 @@ public: //Tabelle const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts, // ALL_TBL_INS_ATTR - USHORT nRows, USHORT nCols, + sal_uInt16 nRows, sal_uInt16 nCols, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, const SwTableAutoFmt* pTAFmt = 0 ); void InsertDDETable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER SwDDEFieldType* pDDEType, - USHORT nRows, USHORT nCols, + sal_uInt16 nRows, sal_uInt16 nCols, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL ); void UpdateTable(); void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName ); SwFrmFmt *GetTableFmt(); - BOOL TextToTable( const SwInsertTableOptions& rInsTblOpts, //ALL_TBL_INS_ATTR + sal_Bool TextToTable( const SwInsertTableOptions& rInsTblOpts, //ALL_TBL_INS_ATTR sal_Unicode cCh, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, const SwTableAutoFmt* pTAFmt = 0 ); - BOOL TableToText( sal_Unicode cCh ); - BOOL IsTextToTableAvailable() const; + sal_Bool TableToText( sal_Unicode cCh ); + sal_Bool IsTextToTableAvailable() const; - BOOL GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const; + sal_Bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const; void SetTblBoxFormulaAttrs( const SfxItemSet& rSet ); - BOOL IsTableBoxTextFormat() const; + sal_Bool IsTableBoxTextFormat() const; String GetTableBoxText() const; // Change Modus erfragen/setzen @@ -713,15 +713,15 @@ public: void SetTblChgMode( TblChgMode eMode ); // Tabelle an der Cursor Position aufsplitten - BOOL SplitTable( USHORT eMode ); + sal_Bool SplitTable( sal_uInt16 eMode ); // Tabellen verbinden // CanMerge kann feststellen, ob Prev oder Next moeglich ist. Wird // der Pointer pChkNxtPrv uebergeben, wird festgestellt in welche // Richtung es moeglich ist. - BOOL CanMergeTable( BOOL bWithPrev = TRUE, BOOL* pChkNxtPrv = 0 ) const; - BOOL MergeTable( BOOL bWithPrev = TRUE, USHORT nMode = 0 ); + sal_Bool CanMergeTable( sal_Bool bWithPrev = sal_True, sal_Bool* pChkNxtPrv = 0 ) const; + sal_Bool MergeTable( sal_Bool bWithPrev = sal_True, sal_uInt16 nMode = 0 ); // setze das InsertDB als Tabelle Undo auf: - void AppendUndoForInsertFromDB( BOOL bIsTable ); + void AppendUndoForInsertFromDB( sal_Bool bIsTable ); /* functions used for spell checking and text conversion @@ -733,7 +733,7 @@ public: // Selektionen wiederherstellen void SpellEnd( SwConversionArgs *pConvArgs = 0, bool bRestoreSelection = true ); ::com::sun::star::uno::Any SpellContinue( - USHORT* pPageCnt, USHORT* pPageSt, + sal_uInt16* pPageCnt, sal_uInt16* pPageSt, SwConversionArgs *pConvArgs = 0 ); // spells on a sentence basis - the SpellPortions are needed @@ -750,9 +750,9 @@ public: // check SwSpellIter data to see if the last sentence got grammar checked bool HasLastSentenceGotGrammarChecked() const; // Is text conversion active somewhere else? - BOOL HasConvIter() const; + sal_Bool HasConvIter() const; // Is hyphenation active somewhere else? - BOOL HasHyphIter() const; + sal_Bool HasHyphIter() const; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > @@ -773,12 +773,12 @@ public: // returne die Namen aller im Doc gesetzten Referenzen // Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark // gesetzt ist - USHORT GetRefMarks( SvStringsDtor* = 0 ) const; + sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const; // rufe die Autokorrektur auf - void AutoCorrect( SvxAutoCorrect& rACorr, BOOL bInsertMode = TRUE, + void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True, sal_Unicode cChar = ' ' ); - BOOL GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord ); + sal_Bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord ); // dann setze nach entsprechenden Regeln unsere Vorlagen void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 ); @@ -789,49 +789,49 @@ public: // errechnet die Selektion String Calculate(); - BOOL InsertURL( const SwFmtINetFmt& rFmt, const String& rStr, - BOOL bKeepSelection = FALSE ); - USHORT GetINetAttrs( SwGetINetAttrs& rArr ); + sal_Bool InsertURL( const SwFmtINetFmt& rFmt, const String& rStr, + sal_Bool bKeepSelection = sal_False ); + sal_uInt16 GetINetAttrs( SwGetINetAttrs& rArr ); //SS Fuer holen/ersetzen DropCap-Inhalt - String GetDropTxt( const USHORT nChars ) const; + String GetDropTxt( const sal_uInt16 nChars ) const; void ReplaceDropTxt( const String &rStr ); // may an outline be moved or copied? // Check whether it's in text body, not in table, and not read-only (move) - BOOL IsOutlineMovable( USHORT nIdx ) const; - BOOL IsOutlineCopyable( USHORT nIdx ) const; + sal_Bool IsOutlineMovable( sal_uInt16 nIdx ) const; + sal_Bool IsOutlineCopyable( sal_uInt16 nIdx ) const; - USHORT GetLineCount( BOOL bActPos = TRUE ); + sal_uInt16 GetLineCount( sal_Bool bActPos = sal_True ); // erfrage und setze den Fussnoten-Text/Nummer. Set.. auf akt. SSelection! - BOOL GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); + sal_Bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); bool SetCurFtn( const SwFmtFtn& rFillFtn ); bool HasFtns( bool bEndNotes = false ) const; -//z.Zt nicht benoetigt USHORT GetFtnCnt( BOOL bEndNotes = FALSE ) const; +//z.Zt nicht benoetigt sal_uInt16 GetFtnCnt( sal_Bool bEndNotes = sal_False ) const; // gebe Liste aller Fussnoten und deren Anfangstexte - USHORT GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false ); + sal_uInt16 GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false ); SwSection const* InsertSection( SwSectionData & rNewData, SfxItemSet const*const = 0 ); - BOOL IsInsRegionAvailable() const; + sal_Bool IsInsRegionAvailable() const; const SwSection* GetCurrSection() const; // liefert wie GetCurrSection() den aktuellen Bereich, allerdings geht diese Funktion // ueber die Frames und erwischt dabei auch den Bereich, wenn der Cursor in einer // Fussnote steht, deren Referenz in einem spaltigen Bereich steckt. // Wenn man bOutOfTab setzt, wird der Bereich gesucht, // der die Tabelle umfasst, nicht etwa ein innerer. - const SwSection* GetAnySection( BOOL bOutOfTab = FALSE, const Point* pPt = 0 ) const; + const SwSection* GetAnySection( sal_Bool bOutOfTab = sal_False, const Point* pPt = 0 ) const; - USHORT GetSectionFmtCount() const; - USHORT GetSectionFmtPos( const SwSectionFmt& ) const; - const SwSectionFmt& GetSectionFmt(USHORT nFmt) const; - void DelSectionFmt( USHORT nFmt ); + sal_uInt16 GetSectionFmtCount() const; + sal_uInt16 GetSectionFmtPos( const SwSectionFmt& ) const; + const SwSectionFmt& GetSectionFmt(sal_uInt16 nFmt) const; + void DelSectionFmt( sal_uInt16 nFmt ); void UpdateSection(sal_uInt16 const nSect, SwSectionData &, SfxItemSet const*const = 0); - BOOL IsAnySectionInDoc( BOOL bChkReadOnly = FALSE, - BOOL bChkHidden = FALSE, - BOOL BChkTOX = FALSE ) const; + sal_Bool IsAnySectionInDoc( sal_Bool bChkReadOnly = sal_False, + sal_Bool bChkHidden = sal_False, + sal_Bool BChkTOX = sal_False ) const; String GetUniqueSectionName( const String* pChkStr = 0 ) const; @@ -841,7 +841,7 @@ public: // search inside the cursor selection for full selected sections. // if any part of section in the selection return 0. // if more than one in the selection return the count - USHORT GetFullSelectedSectionCount() const; + sal_uInt16 GetFullSelectedSectionCount() const; // special insert: Insert a new text node just before or after a section or // table, if the cursor is positioned at the start/end of said @@ -852,16 +852,16 @@ public: bool CanSpecialInsert() const; // Optimierung UI - void SetNewDoc(BOOL bNew = TRUE); + void SetNewDoc(sal_Bool bNew = sal_True); sfx2::LinkManager& GetLinkManager(); inline const sfx2::LinkManager& GetLinkManager() const; // linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von // Numerierungen), optional kann man "um" den Offset stufen oder "auf" - // die Position gestuft werden (bModulus = TRUE) - BOOL IsMoveLeftMargin( BOOL bRight = TRUE, BOOL bModulus = TRUE ) const; - void MoveLeftMargin( BOOL bRight = TRUE, BOOL bModulus = TRUE ); + // die Position gestuft werden (bModulus = sal_True) + sal_Bool IsMoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True ) const; + void MoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True ); // Numberformatter vom Doc erfragen SvNumberFormatter* GetNumberFormatter(); @@ -869,36 +869,36 @@ public: { return ((SwEditShell*)this)->GetNumberFormatter(); } // Schnitstellen fuers GlobalDokument - BOOL IsGlobalDoc() const; - void SetGlblDocSaveLinks( BOOL bFlag = TRUE ); - BOOL IsGlblDocSaveLinks() const; - USHORT GetGlobalDocContent( SwGlblDocContents& rArr ) const; - BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos, + sal_Bool IsGlobalDoc() const; + void SetGlblDocSaveLinks( sal_Bool bFlag = sal_True ); + sal_Bool IsGlblDocSaveLinks() const; + sal_uInt16 GetGlobalDocContent( SwGlblDocContents& rArr ) const; + sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos, SwSectionData & rNew ); - BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos, + sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos, const SwTOXBase& rTOX ); - BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos ); - BOOL DeleteGlobalDocContent( const SwGlblDocContents& rArr, - USHORT nPos ); - BOOL MoveGlobalDocContent( const SwGlblDocContents& rArr , - USHORT nFromPos, USHORT nToPos, - USHORT nNewPos ); - BOOL GotoGlobalDocContent( const SwGlblDocContent& rPos ); + sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos ); + sal_Bool DeleteGlobalDocContent( const SwGlblDocContents& rArr, + sal_uInt16 nPos ); + sal_Bool MoveGlobalDocContent( const SwGlblDocContents& rArr , + sal_uInt16 nFromPos, sal_uInt16 nToPos, + sal_uInt16 nNewPos ); + sal_Bool GotoGlobalDocContent( const SwGlblDocContent& rPos ); // alles fuers Redlining - USHORT GetRedlineMode() const; - void SetRedlineMode( USHORT eMode ); - BOOL IsRedlineOn() const; - USHORT GetRedlineCount() const; - const SwRedline& GetRedline( USHORT nPos ) const; - BOOL AcceptRedline( USHORT nPos ); - BOOL RejectRedline( USHORT nPos ); + sal_uInt16 GetRedlineMode() const; + void SetRedlineMode( sal_uInt16 eMode ); + sal_Bool IsRedlineOn() const; + sal_uInt16 GetRedlineCount() const; + const SwRedline& GetRedline( sal_uInt16 nPos ) const; + sal_Bool AcceptRedline( sal_uInt16 nPos ); + sal_Bool RejectRedline( sal_uInt16 nPos ); // suche das Redline zu diesem Data und returne die Pos im Array // USHRT_MAX wird returnt, falls nicht vorhanden - USHORT FindRedlineOfData( const SwRedlineData& ) const; + sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const; // Kommentar am Redline an der Position setzen - BOOL SetRedlineComment( const String& rS ); + sal_Bool SetRedlineComment( const String& rS ); const SwRedline* GetCurrRedline() const; // Redline Anzeigeattribute wurden geaendert, Views updaten @@ -920,13 +920,13 @@ public: void SetLineNumberInfo( const SwLineNumberInfo& rInfo); // Etiketten: Bereiche synchronisieren - void SetLabelDoc( BOOL bFlag = TRUE ); - BOOL IsLabelDoc() const; + void SetLabelDoc( sal_Bool bFlag = sal_True ); + sal_Bool IsLabelDoc() const; // Schnittstelle fuer die TextInputDaten - ( fuer die Texteingabe // von japanischen/chinesischen Zeichen) SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); - String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE); + String DeleteExtTextInput( SwExtTextInput* pDel = 0, sal_Bool bInsText = sal_True); // SwExtTextInput* GetExtTextInput() const; void SetExtTextInputData( const CommandExtTextInputData& ); @@ -935,7 +935,7 @@ public: // returns a scaling factor of selected text. Used for the rotated // character attribut dialog. - USHORT GetScalingOfSelectedText() const; + sal_uInt16 GetScalingOfSelectedText() const; // ctor/dtor SwEditShell( SwDoc&, Window*, const SwViewOption *pOpt = 0 ); diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx index 222de5caaa10..31002c1875c8 100644 --- a/sw/inc/errhdl.hxx +++ b/sw/inc/errhdl.hxx @@ -33,7 +33,7 @@ #include <sal/types.h> #include "swdllapi.h" -extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam +extern sal_Bool bAssert; // sal_True, wenn eine ASSERT-Box hochkam // ----------------------------------------------------------------------- @@ -41,8 +41,8 @@ extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam // wo der Fehler auftrat. // Die Funktion darf nicht direkt benutzt werden! // ----------------------------------------------------------------------- -SW_DLLPUBLIC void AssertFail( const sal_Char*, const sal_Char*, USHORT ); -SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT ); +SW_DLLPUBLIC void AssertFail( const sal_Char*, const sal_Char*, sal_uInt16 ); +SW_DLLPUBLIC void AssertFail( sal_uInt16, const sal_Char*, sal_uInt16 ); #define ASSERT( cond, message ) \ if( !(cond) ) { \ @@ -58,7 +58,7 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT ); #define ASSERT_ID( cond, id ) \ if( !(cond) ) { \ const char *_pFileName = __FILE__; \ - ::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \ + ::AssertFail( (sal_uInt16)id, _pFileName, __LINE__ ); \ } diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 32fdbe202462..38d9c56b3213 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -47,14 +47,14 @@ class SwEditShell; const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos, const SwFrm& rFrm ); // Wandlung Address -> Adressen -void ReplacePoint(String& sTmpName, BOOL bWithCommandType = FALSE); +void ReplacePoint(String& sTmpName, sal_Bool bWithCommandType = sal_False); struct _SeqFldLstElem { String sDlgEntry; - USHORT nSeqNo; + sal_uInt16 nSeqNo; - _SeqFldLstElem( const String& rStr, USHORT nNo ) + _SeqFldLstElem( const String& rStr, sal_uInt16 nNo ) : sDlgEntry( rStr ), nSeqNo( nNo ) {} }; @@ -65,8 +65,8 @@ class SW_DLLPUBLIC SwSeqFldList : public _SwSeqFldList public: SwSeqFldList() : _SwSeqFldList( 10, 10 ) {} - BOOL InsertSort( _SeqFldLstElem* ); - BOOL SeekEntry( const _SeqFldLstElem& , USHORT* pPos = 0 ); + sal_Bool InsertSort( _SeqFldLstElem* ); + sal_Bool SeekEntry( const _SeqFldLstElem& , sal_uInt16* pPos = 0 ); }; /*-------------------------------------------------------------------- @@ -93,8 +93,8 @@ public: class SW_DLLPUBLIC SwGetExpField : public SwFormulaField { String sExpand; - BOOL bIsInBodyTxt; - USHORT nSubType; + sal_Bool bIsInBodyTxt; + sal_uInt16 nSubType; bool bLateInitialization; // #i82544# @@ -103,18 +103,18 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField public: SwGetExpField( SwGetExpFieldType*, const String& rFormel, - USHORT nSubType = nsSwGetSetExpType::GSE_EXPR, ULONG nFmt = 0); + sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0); virtual void SetValue( const double& rVal ); - virtual void SetLanguage(USHORT nLng); + virtual void SetLanguage(sal_uInt16 nLng); inline const String& GetExpStr() const; inline void ChgExpStr(const String& rExpand); // wird von der Formatierung abgefragt - inline BOOL IsInBodyTxt() const; + inline sal_Bool IsInBodyTxt() const; // wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt) - inline void ChgBodyTxtFlag( BOOL bIsInBody ); + inline void ChgBodyTxtFlag( sal_Bool bIsInBody ); // fuer Felder in Header/Footer/Footnotes/Flys: // (wird nur von der Formatierung aufgerufen!!) void ChangeExpansion( const SwFrm&, const SwTxtFld& ); @@ -125,12 +125,12 @@ public: virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nType); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); - static USHORT GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc); + static sal_uInt16 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc); // #i82544# void SetLateInitialization() { bLateInitialization = true;} }; @@ -142,11 +142,11 @@ inline const String& SwGetExpField::GetExpStr() const { return sExpand; } // wird von der Formatierung abgefragt -inline BOOL SwGetExpField::IsInBodyTxt() const +inline sal_Bool SwGetExpField::IsInBodyTxt() const { return bIsInBodyTxt; } // wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt) -inline void SwGetExpField::ChgBodyTxtFlag( BOOL bIsInBody ) +inline void SwGetExpField::ChgBodyTxtFlag( sal_Bool bIsInBody ) { bIsInBodyTxt = bIsInBody; } @@ -162,59 +162,59 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType const SwNode* pOutlChgNd; // sal_Unicode cDelim; String sDelim; - USHORT nType; - BYTE nLevel; - BOOL bDeleted; + sal_uInt16 nType; + sal_uInt8 nLevel; + sal_Bool bDeleted; public: SwSetExpFieldType( SwDoc* pDoc, const String& rName, - USHORT nType = nsSwGetSetExpType::GSE_EXPR ); + sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR ); virtual SwFieldType* Copy() const; virtual const String& GetName() const; - inline void SetType(USHORT nTyp); - inline USHORT GetType() const; + inline void SetType(sal_uInt16 nTyp); + inline sal_uInt16 GetType() const; - void SetSeqFormat(ULONG nFormat); - ULONG GetSeqFormat(); + void SetSeqFormat(sal_uLong nFormat); + sal_uLong GetSeqFormat(); - BOOL IsDeleted() const { return bDeleted; } - void SetDeleted( BOOL b ) { bDeleted = b; } + sal_Bool IsDeleted() const { return bDeleted; } + void SetDeleted( sal_Bool b ) { bDeleted = b; } // ueberlagert, weil das Set-Field selbst dafuer sorgt, das // es aktualisiert wird. virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); inline const String& GetSetRefName() const; - USHORT SetSeqRefNo( SwSetExpField& rFld ); + sal_uInt16 SetSeqRefNo( SwSetExpField& rFld ); - USHORT GetSeqFldList( SwSeqFldList& rList ); - String MakeSeqName( USHORT nSeqNo ); + sal_uInt16 GetSeqFldList( SwSeqFldList& rList ); + String MakeSeqName( sal_uInt16 nSeqNo ); // Seqencefelder ggfs. Kapitelweise numerieren // sal_Unicode GetDelimiter() const { return cDelim; } // void SetDelimiter( sal_Unicode c ) { cDelim = c; } const String& GetDelimiter() const { return sDelim; } void SetDelimiter( const String& s ) { sDelim = s; } - BYTE GetOutlineLvl() const { return nLevel; } - void SetOutlineLvl( BYTE n ) { nLevel = n; } + sal_uInt8 GetOutlineLvl() const { return nLevel; } + void SetOutlineLvl( sal_uInt8 n ) { nLevel = n; } void SetChapter( SwSetExpField& rFld, const SwNode& rNd ); // Member nur fuers SwDoc::UpdateExpFld - wird nur waehrend der Laufzeit // von SequencefeldTypen benoetigt!!! const SwNode* GetOutlineChgNd() const { return pOutlChgNd; } void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; -inline void SwSetExpFieldType::SetType( USHORT nTyp ) +inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp ) { nType = nTyp; EnableFormat( !(nType & (nsSwGetSetExpType::GSE_SEQ|nsSwGetSetExpType::GSE_STRING))); } -inline USHORT SwSetExpFieldType::GetType() const +inline sal_uInt16 SwSetExpFieldType::GetType() const { return nType; } inline const String& SwSetExpFieldType::GetSetRefName() const @@ -230,15 +230,15 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField String sExpand; String aPText; String aSeqText; - BOOL bInput; - USHORT nSeqNo; - USHORT nSubType; + sal_Bool bInput; + sal_uInt16 nSeqNo; + sal_uInt16 nSubType; virtual String Expand() const; virtual SwField* Copy() const; public: - SwSetExpField(SwSetExpFieldType*, const String& rFormel, ULONG nFmt = 0); + SwSetExpField(SwSetExpFieldType*, const String& rFormel, sal_uLong nFmt = 0); virtual void SetValue( const double& rVal ); @@ -249,19 +249,19 @@ public: inline void SetPromptText(const String& rStr); inline const String& GetPromptText() const; - inline void SetInputFlag(BOOL bInp); - inline BOOL GetInputFlag() const; + inline void SetInputFlag(sal_Bool bInp); + inline sal_Bool GetInputFlag() const; virtual String GetFieldName() const; - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nType); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); - inline BOOL IsSequenceFld() const; + inline sal_Bool IsSequenceFld() const; // fuer SequenceFelder - logische Nummer - inline void SetSeqNumber( USHORT n ) { nSeqNo = n; } - inline USHORT GetSeqNumber() const { return nSeqNo; } + inline void SetSeqNumber( sal_uInt16 n ) { nSeqNo = n; } + inline sal_uInt16 GetSeqNumber() const { return nSeqNo; } // Der Name nur erfragen virtual const String& GetPar1() const; @@ -269,8 +269,8 @@ public: // Die Formel virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; inline const String& SwSetExpField::GetExpStr() const @@ -285,13 +285,13 @@ inline void SwSetExpField::SetPromptText(const String& rStr) inline const String& SwSetExpField::GetPromptText() const { return aPText; } -inline void SwSetExpField::SetInputFlag(BOOL bInp) +inline void SwSetExpField::SetInputFlag(sal_Bool bInp) { bInput = bInp; } -inline BOOL SwSetExpField::GetInputFlag() const +inline sal_Bool SwSetExpField::GetInputFlag() const { return bInput; } -inline BOOL SwSetExpField::IsSequenceFld() const +inline sal_Bool SwSetExpField::IsSequenceFld() const { return 0 != (nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType*)GetTyp())->GetType()); } /*-------------------------------------------------------------------- @@ -319,7 +319,7 @@ class SW_DLLPUBLIC SwInputField : public SwField String aPText; String aHelp; String aToolTip; - USHORT nSubType; + sal_uInt16 nSubType; virtual String Expand() const; virtual SwField* Copy() const; @@ -327,8 +327,8 @@ class SW_DLLPUBLIC SwInputField : public SwField public: // Direkte Eingabe ueber Dialog alten Wert loeschen SwInputField(SwInputFieldType*, const String& rContent , - const String& rPrompt, USHORT nSubType = 0, - ULONG nFmt = 0); + const String& rPrompt, sal_uInt16 nSubType = 0, + sal_uLong nFmt = 0); virtual String GetFieldName() const; @@ -346,12 +346,12 @@ public: virtual String GetToolTip() const; virtual void SetToolTip(const String & rStr); - virtual BOOL isFormField() const; + virtual sal_Bool isFormField() const; - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nSub); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nSub); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -361,20 +361,20 @@ public: class SwInputFieldList { public: - SwInputFieldList( SwEditShell* pShell, BOOL bBuildTmpLst = FALSE ); + SwInputFieldList( SwEditShell* pShell, sal_Bool bBuildTmpLst = sal_False ); ~SwInputFieldList(); - USHORT Count() const; - SwField* GetField(USHORT nId); + sal_uInt16 Count() const; + SwField* GetField(sal_uInt16 nId); - void GotoFieldPos(USHORT nId); + void GotoFieldPos(sal_uInt16 nId); void PushCrsr(); void PopCrsr(); // vergleiche TmpLst mit akt Feldern. Alle neue kommen in die SortLst // damit sie geupdatet werden koennen. Returnt die Anzahl. // (Fuer Textbausteine: nur seine Input-Felder aktualisieren) - USHORT BuildSortLst(); + sal_uInt16 BuildSortLst(); // Alle unselektierten Felder aus Liste entfernen void RemoveUnselectedFlds(); @@ -406,7 +406,7 @@ public: class SwTblField : public SwValueField, public SwTableFormula { String sExpand; - USHORT nSubType; + sal_uInt16 nSubType; virtual String Expand() const; virtual SwField* Copy() const; @@ -418,11 +418,11 @@ class SwTblField : public SwValueField, public SwTableFormula public: SwTblField( SwTblFieldType*, const String& rFormel, - USHORT nSubType = 0, ULONG nFmt = 0); + sal_uInt16 nSubType = 0, sal_uLong nFmt = 0); virtual void SetValue( const double& rVal ); - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nType); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); const String& GetExpStr() const { return sExpand; } void ChgExpStr(const String& rStr) { sExpand = rStr; } @@ -435,8 +435,8 @@ public: // Die Formel virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx index b3a07efa1906..dba9bb5b5e2c 100644 --- a/sw/inc/extinput.hxx +++ b/sw/inc/extinput.hxx @@ -40,8 +40,8 @@ class SwExtTextInput : public SwPaM { SvUShorts aAttrs; String sOverwriteText; - BOOL bInsText : 1; - BOOL bIsOverwriteCursor : 1; + sal_Bool bInsText : 1; + sal_Bool bIsOverwriteCursor : 1; LanguageType eInputLanguage; public: SwExtTextInput( const SwPaM& rPam, Ring* pRing = 0 ); @@ -49,9 +49,9 @@ public: void SetInputData( const CommandExtTextInputData& rData ); const SvUShorts& GetAttrs() const { return aAttrs; } - void SetInsText( BOOL bFlag ) { bInsText = bFlag; } - BOOL IsOverwriteCursor() const { return bIsOverwriteCursor; } - void SetOverwriteCursor( BOOL bFlag ); + void SetInsText( sal_Bool bFlag ) { bInsText = bFlag; } + sal_Bool IsOverwriteCursor() const { return bIsOverwriteCursor; } + void SetOverwriteCursor( sal_Bool bFlag ); void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;} }; diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index ee557e8eeaba..0b9cc9150227 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -69,12 +69,12 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 ); // an das SwTxtCharFmt weiterleiten (vom SwClient) virtual void Modify( SfxPoolItem*, SfxPoolItem* ); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); } diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 873b28225204..3beaff17ade8 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -72,41 +72,41 @@ namespace svx // return values for GetFrmType() und GetSelFrmType(). //! values can be combined via logival or -#define FRMTYPE_NONE (USHORT) 0 -#define FRMTYPE_PAGE (USHORT) 1 -#define FRMTYPE_HEADER (USHORT) 2 -#define FRMTYPE_FOOTER (USHORT) 4 -#define FRMTYPE_BODY (USHORT) 8 -#define FRMTYPE_COLUMN (USHORT) 16 -#define FRMTYPE_TABLE (USHORT) 32 -#define FRMTYPE_FLY_FREE (USHORT) 64 -#define FRMTYPE_FLY_ATCNT (USHORT) 128 -#define FRMTYPE_FLY_INCNT (USHORT) 256 -#define FRMTYPE_FOOTNOTE (USHORT) 512 -#define FRMTYPE_FTNPAGE (USHORT) 1024 -#define FRMTYPE_FLY_ANY (USHORT) 2048 -#define FRMTYPE_DRAWOBJ (USHORT) 4096 -#define FRMTYPE_COLSECT (USHORT) 8192 -#define FRMTYPE_COLSECTOUTTAB (USHORT) 16384 +#define FRMTYPE_NONE (sal_uInt16) 0 +#define FRMTYPE_PAGE (sal_uInt16) 1 +#define FRMTYPE_HEADER (sal_uInt16) 2 +#define FRMTYPE_FOOTER (sal_uInt16) 4 +#define FRMTYPE_BODY (sal_uInt16) 8 +#define FRMTYPE_COLUMN (sal_uInt16) 16 +#define FRMTYPE_TABLE (sal_uInt16) 32 +#define FRMTYPE_FLY_FREE (sal_uInt16) 64 +#define FRMTYPE_FLY_ATCNT (sal_uInt16) 128 +#define FRMTYPE_FLY_INCNT (sal_uInt16) 256 +#define FRMTYPE_FOOTNOTE (sal_uInt16) 512 +#define FRMTYPE_FTNPAGE (sal_uInt16) 1024 +#define FRMTYPE_FLY_ANY (sal_uInt16) 2048 +#define FRMTYPE_DRAWOBJ (sal_uInt16) 4096 +#define FRMTYPE_COLSECT (sal_uInt16) 8192 +#define FRMTYPE_COLSECTOUTTAB (sal_uInt16) 16384 #define FRMTYPE_ANYCOLSECT ( FRMTYPE_COLSECT | FRMTYPE_COLSECTOUTTAB ) //! values can be combined via logival or -#define GOTOOBJ_DRAW_CONTROL (USHORT) 1 -#define GOTOOBJ_DRAW_SIMPLE (USHORT) 2 -#define GOTOOBJ_DRAW_ANY (USHORT) 3 -#define GOTOOBJ_FLY_FRM (USHORT) 4 -#define GOTOOBJ_FLY_GRF (USHORT) 8 -#define GOTOOBJ_FLY_OLE (USHORT) 16 -#define GOTOOBJ_FLY_ANY (USHORT) 28 -#define GOTOOBJ_GOTO_ANY (USHORT) 31 +#define GOTOOBJ_DRAW_CONTROL (sal_uInt16) 1 +#define GOTOOBJ_DRAW_SIMPLE (sal_uInt16) 2 +#define GOTOOBJ_DRAW_ANY (sal_uInt16) 3 +#define GOTOOBJ_FLY_FRM (sal_uInt16) 4 +#define GOTOOBJ_FLY_GRF (sal_uInt16) 8 +#define GOTOOBJ_FLY_OLE (sal_uInt16) 16 +#define GOTOOBJ_FLY_ANY (sal_uInt16) 28 +#define GOTOOBJ_GOTO_ANY (sal_uInt16) 31 //! values can be combined via logival or -#define FLYPROTECT_CONTENT (USHORT) 1 // kann verodert werden! -#define FLYPROTECT_SIZE (USHORT) 2 -#define FLYPROTECT_POS (USHORT) 4 -#define FLYPROTECT_PARENT (USHORT) 8 // nur Parents untersuchen -#define FLYPROTECT_FIXED (USHORT) 16 // nur nicht aufhebbarer Schutz +#define FLYPROTECT_CONTENT (sal_uInt16) 1 // kann verodert werden! +#define FLYPROTECT_SIZE (sal_uInt16) 2 +#define FLYPROTECT_POS (sal_uInt16) 4 +#define FLYPROTECT_PARENT (sal_uInt16) 8 // nur Parents untersuchen +#define FLYPROTECT_FIXED (sal_uInt16) 16 // nur nicht aufhebbarer Schutz // z.B. durch OLE-Server, gilt auch // fuer Dialog @@ -187,7 +187,7 @@ class SdrDropMarkerOverlay; class SW_DLLPUBLIC SwFEShell : public SwEditShell { SdrDropMarkerOverlay *pChainFrom, *pChainTo; - BOOL bCheckForOLEInCaption; + sal_Bool bCheckForOLEInCaption; SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const; SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; @@ -205,26 +205,26 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const; //0 == in keiner Spalte - SW_DLLPRIVATE USHORT _GetCurColNum( const SwFrm *pFrm, + SW_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm, SwGetCurColNumPara* pPara ) const; SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const; SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const; - SW_DLLPRIVATE BOOL ImpEndCreate(); + SW_DLLPRIVATE sal_Bool ImpEndCreate(); SW_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const; // Methoden fuers kopieren von DrawObjecten - SW_DLLPRIVATE BOOL CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, - const Point& rInsPt, BOOL bIsMove, - BOOL bSelectInsert ); + SW_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, + const Point& rInsPt, sal_Bool bIsMove, + sal_Bool bSelectInsert ); // get list of marked SdrObjects; // helper method for GetSelFrmType, IsSelContainsControl SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const; - SW_DLLPRIVATE BOOL CheckHeadline( bool bRepeat ) const; + SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const; using SwEditShell::Copy; @@ -238,15 +238,15 @@ public: virtual ~SwFEShell(); // Copy und Paste Methoden fuer das interne Clipboard - BOOL Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 ); - BOOL Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames = sal_False); + sal_Bool Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 ); + sal_Bool Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames = sal_False); //paste some pages into another doc - used in mailmerge - BOOL PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPage); + sal_Bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage); // Copy-Methode fuer Drag&Drop - BOOL Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt, - BOOL bIsMove = FALSE, BOOL bSelectInsert = TRUE ); + sal_Bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt, + sal_Bool bIsMove = sal_False, sal_Bool bSelectInsert = sal_True ); - void SelectFlyFrm( SwFlyFrm& rFrm, BOOL bNew = FALSE ); + void SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew = sal_False ); // befindet sich der selektierte Rahmen innerhalb eines anderen? const SwFrmFmt* IsFlyInFly(); @@ -255,14 +255,14 @@ public: //Wenn ein Objekt angegeben wurde, so wird genau diese Markiert (anstatt //ueber die Position zu suchen. - BOOL SelectObj( const Point& rSelPt, BYTE nFlag = 0, SdrObject *pObj = 0 ); + sal_Bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 ); void DelSelectedObj(); //Selektion nach oben unten bewegen (Z-Order). - //TRUE == ganz nach oben/unten - //FALSE == einen ueberholen - void SelectionToTop ( BOOL bTop = TRUE ); - void SelectionToBottom( BOOL bBottom = TRUE ); + //sal_True == ganz nach oben/unten + //sal_False == einen ueberholen + void SelectionToTop ( sal_Bool bTop = sal_True ); + void SelectionToBottom( sal_Bool bBottom = sal_True ); short GetLayerId() const; //1 Heaven, 0 Hell, -1 Uneindeutig void SelectionToHeaven(); //Ueber dem Dokument @@ -279,7 +279,7 @@ public: // the draw object. sal_Bool ShouldObjectBeSelected(const Point& rPt); - sal_Bool MoveAnchor( USHORT nDir ); + sal_Bool MoveAnchor( sal_uInt16 nDir ); // Returns if Upper of frame at current position is section frame // Currently only used by the rules. To be replaced by something more @@ -288,10 +288,10 @@ public: //Returnwerte siehe oben FrmType. //pPt: Crsr bzw. DocPos; bStopAtFly: Bei Flys anhalten oder ueber den Anchor weitergehen - // Obgleich (0,TRUE) eine Art Standard ist, sind die Parameter nicht defaultet, damit + // Obgleich (0,sal_True) eine Art Standard ist, sind die Parameter nicht defaultet, damit // bei jeder Benutzung insbesondere das bStopAtFly bewusst genutzt wird. - USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const; - USHORT GetSelFrmType() const; //Selektion (Drawing) + sal_uInt16 GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const; + sal_uInt16 GetSelFrmType() const; //Selektion (Drawing) /** #108784# check whether selected frame contains a control; * companion method to GetSelFrmType, used for preventing @@ -323,9 +323,9 @@ public: // Groesse von Drawobjekten setzen void SetObjRect( const SwRect& rRect ); - long BeginDrag( const Point *pPt, BOOL bProp ); - long Drag ( const Point *pPt, BOOL bProp ); - long EndDrag ( const Point *pPt, BOOL bProp ); + long BeginDrag( const Point *pPt, sal_Bool bProp ); + long Drag ( const Point *pPt, sal_Bool bProp ); + long EndDrag ( const Point *pPt, sal_Bool bProp ); void BreakDrag(); //Methoden fuer die Statuszeile. @@ -348,13 +348,13 @@ public: const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const; //Welcher Schutz ist am selektierten Objekt gesetzt? - //!! returns several flags in BYTE - BYTE IsSelObjProtected( USHORT /*FLYPROTECT_...*/ eType ) const; + //!! returns several flags in sal_uInt8 + sal_uInt8 IsSelObjProtected( sal_uInt16 /*FLYPROTECT_...*/ eType ) const; //Liefert neben der Grafik in rName bei gelinkten Grafiken den Namen mit //Pfad und sonst den Grafiknamen. rbLink ist TRU bei gelinkten Grafiken. const Graphic *GetGrfAtPos( const Point &rDocPos, - String &rName, BOOL &rbLink ) const; + String &rName, sal_Bool &rbLink ) const; // --> OD 2009-07-13 #i73249# const String GetObjTitle() const; @@ -365,33 +365,33 @@ public: //SS fuer Rahmen -------------------------------------------- - BOOL IsFrmSelected() const; - BOOL GetFlyFrmAttr( SfxItemSet &rSet ) const; - BOOL SetFlyFrmAttr( SfxItemSet &rSet ); - BOOL ResetFlyFrmAttr( USHORT nWhich, const SfxItemSet* pSet = 0 ); - const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, BOOL bAnchValid = FALSE, + sal_Bool IsFrmSelected() const; + sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const; + sal_Bool SetFlyFrmAttr( SfxItemSet &rSet ); + sal_Bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 ); + const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, sal_Bool bAnchValid = sal_False, SwFrmFmt *pParent = 0 ); void SetFlyPos( const Point &rAbsPos); - Point FindAnchorPos( const Point &rAbsPos, BOOL bMoveIt = FALSE ); + Point FindAnchorPos( const Point &rAbsPos, sal_Bool bMoveIt = sal_False ); // determines whether a frame or its environment is vertically formatted and right-to-left - BOOL IsFrmVertical(BOOL bEnvironment, BOOL& bRightToLeft) const; + sal_Bool IsFrmVertical(sal_Bool bEnvironment, sal_Bool& bRightToLeft) const; SwFrmFmt* GetCurFrmFmt() const; //Wenn Rahmen, dann Rahmenvorlage, sonst 0 - void SetFrmFmt( SwFrmFmt *pFmt, BOOL bKeepOrient = FALSE, Point* pDocPos = 0 ); //Wenn Rahmen, dann Rahmenvorlage setzen + void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bKeepOrient = sal_False, Point* pDocPos = 0 ); //Wenn Rahmen, dann Rahmenvorlage setzen const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); } // finde/loeschen den Fly, in dem der Cursor steht SwFrmFmt* WizzardGetFly(); //Selebstaendiges selektieren von Flys - BOOL GotoNextFly( USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY ) - { return GotoObj( TRUE, eType ); } - BOOL GotoPrevFly( USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY) - { return GotoObj( FALSE, eType); } + sal_Bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY ) + { return GotoObj( sal_True, eType ); } + sal_Bool GotoPrevFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY) + { return GotoObj( sal_False, eType); } //iterieren ueber Flys - fuer Basic-Collections - USHORT GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const; - const SwFrmFmt* GetFlyNum(USHORT nIdx, FlyCntType eType = FLYCNTTYPE_ALL) const; + sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const; + const SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL) const; //Wenn ein fly selectiert ist, zieht er den Crsr in den ersten CntntFrm const SwFrmFmt* SelFlyGrabCrsr(); @@ -429,8 +429,8 @@ public: void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; // check resize of OLE-Object - BOOL IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; } - void SetCheckForOLEInCaption( BOOL bFlag ) { bCheckForOLEInCaption = bFlag; } + sal_Bool IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; } + void SetCheckForOLEInCaption( sal_Bool bFlag ) { bCheckForOLEInCaption = bFlag; } // setze am selektierten FlyFrame einen Namen void SetFlyName( const String& rName ); @@ -445,8 +445,8 @@ public: String GetUniqueFrameName() const; // springe zum benannten Rahmen (Grafik/OLE) - BOOL GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, - BOOL bSelFrame = TRUE ); + sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, + sal_Bool bSelFrame = sal_True ); // steht an der Position eine Grafik mit einer URL ? const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, String* pURL = 0, String *pTargetFrameName = 0, @@ -470,16 +470,16 @@ public: void CheckUnboundObjects(); //Achtung: Uneindeutikeiten bei Mehrfachselektionen. - BOOL GetObjAttr( SfxItemSet &rSet ) const; - BOOL SetObjAttr( const SfxItemSet &rSet ); + sal_Bool GetObjAttr( SfxItemSet &rSet ) const; + sal_Bool SetObjAttr( const SfxItemSet &rSet ); - const SdrObject* GetBestObject( BOOL bNext, USHORT eType = GOTOOBJ_DRAW_ANY, BOOL bFlat = TRUE, const ::svx::ISdrObjectFilter* pFilter = NULL ); - BOOL GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY); + const SdrObject* GetBestObject( sal_Bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, sal_Bool bFlat = sal_True, const ::svx::ISdrObjectFilter* pFilter = NULL ); + sal_Bool GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY); //Setzen vom DragMode (z.B. Rotate), tut nix bei Rahmenselektion. - void SetDragMode( UINT16 eSdrDragMode ); + void SetDragMode( sal_uInt16 eSdrDragMode ); - USHORT IsObjSelected() const; //Liefert gleich die Anzahl der Objekte, + sal_uInt16 IsObjSelected() const; //Liefert gleich die Anzahl der Objekte, //zaehlt aber nicht die Objekte in Gruppen. sal_Bool IsObjSelected( const SdrObject& rObj ) const; @@ -496,22 +496,22 @@ public: //selektiert. //Mit BreakCreate wird der Vorgang abgebrochen, dann ist kein Objekt //mehr selektiert. - BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ); - BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, UINT32 eObjInventor, const Point &); + sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ); + sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &); void MoveCreate ( const Point &rPos ); - BOOL EndCreate ( UINT16 eSdrCreateCmd ); + sal_Bool EndCreate ( sal_uInt16 eSdrCreateCmd ); void BreakCreate(); - BOOL IsDrawCreate() const; - void CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, USHORT nSlotId); + sal_Bool IsDrawCreate() const; + void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId); // Funktionen f�r Rubberbox, um Draw-Objekte zu selektieren - BOOL BeginMark( const Point &rPos ); + sal_Bool BeginMark( const Point &rPos ); void MoveMark ( const Point &rPos ); - BOOL EndMark (); + sal_Bool EndMark (); void BreakMark(); //Gruppe erzeugen, aufloesen, nix bei Rahmenselektion. - BOOL IsGroupSelected(); //Kann auch eine Mischselektion sein! + sal_Bool IsGroupSelected(); //Kann auch eine Mischselektion sein! void GroupSelection(); //Hinterher ist die Gruppe selektiert. void UnGroupSelection(); //Die Einzelobjekte sind Selektiert //Es koennen noch immer Gruppen dabei sein. @@ -519,25 +519,25 @@ public: // OD 27.06.2003 #108784# - change return type. bool IsGroupAllowed() const; - void MirrorSelection( BOOL bHorizontal ); //Bei FALSE Vertikal + void MirrorSelection( sal_Bool bHorizontal ); //Bei sal_False Vertikal //frmatr.hxx. Hier kein enum wg. Abhaengigkeiten - //Der BOOL ist nur fuer internen Gebrauch! Anker wird nur - anhand der + //Der sal_Bool ist nur fuer internen Gebrauch! Anker wird nur - anhand der //aktuellen Dokumentposition - neu gesetzt aber nicht umgesetzt. - void ChgAnchor( int eAnchorId, BOOL bSameOnly = FALSE, - BOOL bPosCorr = TRUE ); + void ChgAnchor( int eAnchorId, sal_Bool bSameOnly = sal_False, + sal_Bool bPosCorr = sal_True ); - BOOL SetDrawingAttr( SfxItemSet &rSet ); + sal_Bool SetDrawingAttr( SfxItemSet &rSet ); // hole die selectierten DrawObj als Grafik (MetaFile/Bitmap) // Return-Wert besagt ob konvertiert wurde!! - BOOL GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const; + sal_Bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const; - void Paste( SvStream& rStm, USHORT nAction, const Point* pPt = 0 ); - BOOL Paste( const Graphic &rGrf ); - BOOL Paste( SotDataObject& rObj, const Point& rPt ); + void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 ); + sal_Bool Paste( const Graphic &rGrf ); + sal_Bool Paste( SotDataObject& rObj, const Point& rPt ); - BOOL IsAlignPossible() const; + sal_Bool IsAlignPossible() const; void SetCalcFieldValueHdl(Outliner* pOutliner); void Insert(const String& rGrfName, @@ -551,7 +551,7 @@ public: void InsertDrawObj( SdrObject& rDrawObj, const Point& rInsertPosition ); - BOOL ReplaceSdrObj( const String& rGrfName, const String& rFltName, + sal_Bool ReplaceSdrObj( const String& rGrfName, const String& rFltName, const Graphic* pGrf = 0 ); // --> #i972# @@ -566,26 +566,26 @@ public: //------------------------------------------ //Auskunft ueber naechstliegenden Inhalt zum uebergebenen Point - Point GetCntntPos( const Point& rPoint, BOOL bNext ) const; + Point GetCntntPos( const Point& rPoint, sal_Bool bNext ) const; //convert document position into position relative to the current page Point GetRelativePagePosition(const Point& rDocPos); //Layout-Selektion Hiden/Zeigen und aufruf an die CrsrSh weiterreichen. void ShLooseFcs(); - void ShGetFcs( BOOL bUpdate = TRUE ); + void ShGetFcs( sal_Bool bUpdate = sal_True ); //PageDescriptor-Schnittstelle void ChgCurPageDesc( const SwPageDesc& ); - USHORT GetCurPageDesc( const BOOL bCalcFrm = TRUE ) const; - USHORT GetMousePageDesc( const Point &rPt ) const; - USHORT GetPageDescCnt() const; + sal_uInt16 GetCurPageDesc( const sal_Bool bCalcFrm = sal_True ) const; + sal_uInt16 GetMousePageDesc( const Point &rPt ) const; + sal_uInt16 GetPageDescCnt() const; SwPageDesc* FindPageDescByName( const String& rName, - BOOL bGetFromPool = FALSE, - USHORT* pPos = 0 ); + sal_Bool bGetFromPool = sal_False, + sal_uInt16* pPos = 0 ); - const SwPageDesc& GetPageDesc( USHORT i ) const; - void ChgPageDesc( USHORT i, const SwPageDesc& ); + const SwPageDesc& GetPageDesc( sal_uInt16 i ) const; + void ChgPageDesc( sal_uInt16 i, const SwPageDesc& ); // if inside all selection only one PageDesc, return this. // Otherwise return 0 pointer const SwPageDesc* GetSelectedPageDescs() const; @@ -597,37 +597,37 @@ public: //Seitennummer der Seite in der der Point liegt, 0 wenn keine //getroffen ist. - USHORT GetPageNumber( const Point &rPoint ) const; - BOOL GetPageNumber( long nYPos, BOOL bAtCrsrPos, USHORT& rPhyNum, USHORT& rVirtNum, String &rDisplay ) const; + sal_uInt16 GetPageNumber( const Point &rPoint ) const; + sal_Bool GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, String &rDisplay ) const; SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&, const SfxItemSet* pFlyAttrSet = 0, const SfxItemSet* pGrfAttrSet = 0, SwFrmFmt* = 0 ); - BOOL FinishOLEObj(); // Server wird beendet + sal_Bool FinishOLEObj(); // Server wird beendet //Attribute der Tabelle besorgen/setzen. void GetTblAttr( SfxItemSet & ) const; void SetTblAttr( const SfxItemSet & ); //Tabelle vollstaendig selektiert? - BOOL HasWholeTabSelection() const; + sal_Bool HasWholeTabSelection() const; //Ist der Inhalt einer Tabellenzelle oder mindestens eine Tabellenzelle //vollstaendig selektiert ist - BOOL HasBoxSelection() const; + sal_Bool HasBoxSelection() const; - BOOL InsertRow( USHORT nCnt, BOOL bBehind ); - BOOL InsertCol( USHORT nCnt, BOOL bBehind ); // 0 == am Ende - BOOL DeleteCol(); - BOOL DeleteRow(); + sal_Bool InsertRow( sal_uInt16 nCnt, sal_Bool bBehind ); + sal_Bool InsertCol( sal_uInt16 nCnt, sal_Bool bBehind ); // 0 == am Ende + sal_Bool DeleteCol(); + sal_Bool DeleteRow(); - BOOL DeleteTblSel(); //Aktuelle Selektion, ggf. die ganze Tabelle. + sal_Bool DeleteTblSel(); //Aktuelle Selektion, ggf. die ganze Tabelle. - USHORT MergeTab(); //Merged selektierte Tabellenteile zusammen + sal_uInt16 MergeTab(); //Merged selektierte Tabellenteile zusammen //Fehler ueber enum zurueck // Zelle Vertikal oder Horizontal splitten. - BOOL SplitTab( BOOL nVert = TRUE, USHORT nCnt = 1, BOOL bSameHeight = FALSE ); - BOOL Sort(const SwSortOptions&); //Sortieren. + sal_Bool SplitTab( sal_Bool nVert = sal_True, sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False ); + sal_Bool Sort(const SwSortOptions&); //Sortieren. void SetRowHeight( const SwFmtFrmSize &rSz ); //Der Pointer muss vom Aufrufer zerstoert werden wenn != 0 @@ -636,34 +636,34 @@ public: void SetRowSplit( const SwFmtRowSplit &rSz ); void GetRowSplit( SwFmtRowSplit *&rpSz ) const; - void SetBoxAlign( USHORT nOrient ); - USHORT GetBoxAlign() const; //USHRT_MAX fuer uneindeutig! + void SetBoxAlign( sal_uInt16 nOrient ); + sal_uInt16 GetBoxAlign() const; //USHRT_MAX fuer uneindeutig! //Ausgleichen der Zeilenhoehen. Mit bTstOnly festellen ob mehr als eine //Zeile markiert ist. - BOOL BalanceRowHeight( BOOL bTstOnly ); + sal_Bool BalanceRowHeight( sal_Bool bTstOnly ); void SetTabBorders( const SfxItemSet& rSet ); void GetTabBorders( SfxItemSet& rSet) const; - void SetTabLineStyle(const Color* pColor, BOOL bSetLine = FALSE, const SvxBorderLine* pBorderLine = NULL); + void SetTabLineStyle(const Color* pColor, sal_Bool bSetLine = sal_False, const SvxBorderLine* pBorderLine = NULL); void SetTabBackground( const SvxBrushItem &rNew ); void GetTabBackground( SvxBrushItem &rToFill ) const; void SetBoxBackground( const SvxBrushItem &rNew ); - BOOL GetBoxBackground( SvxBrushItem &rToFill ) const; //FALSE uneindeutig + sal_Bool GetBoxBackground( SvxBrushItem &rToFill ) const; //sal_False uneindeutig void SetBoxDirection( const SvxFrameDirectionItem& rNew ); - BOOL GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //FALSE uneindeutig + sal_Bool GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //sal_False uneindeutig void SetRowBackground( const SvxBrushItem &rNew ); - BOOL GetRowBackground( SvxBrushItem &rToFill ) const; //FALSE uneindeutig + sal_Bool GetRowBackground( SvxBrushItem &rToFill ) const; //sal_False uneindeutig - BYTE WhichMouseTabCol( const Point &rPt ) const; + sal_uInt8 WhichMouseTabCol( const Point &rPt ) const; void GetTabCols( SwTabCols &rToFill ) const; //Spalten- und Randinfo. - void SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly = TRUE ); + void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly = sal_True ); void GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const; - void SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly, + void SetMouseTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly, const Point &rPt ); // --> FME 2004-07-30 #i20126# Enhanced table selection @@ -673,82 +673,82 @@ public: // #i24134# adjustment of table rows via Ruler void GetTabRows( SwTabCols &rToFill ) const; - void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly ); + void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly ); void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const; - void SetMouseTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const Point &rPt ); + void SetMouseTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const Point &rPt ); void ProtectCells(); //Falls eine Tabselektion besteht, wird sie ver- // nichtet, wenn der Cursor nicht in Readonly darf void UnProtectCells(); // auf die Tabellenselektin void UnProtectTbls(); //bei allen Tabellen in der Selektion den Schutz aufheben - BOOL HasTblAnyProtection( const String* pTblName = 0, - BOOL* pFullTblProtection = 0 ); - BOOL CanUnProtectCells() const; + sal_Bool HasTblAnyProtection( const String* pTblName = 0, + sal_Bool* pFullTblProtection = 0 ); + sal_Bool CanUnProtectCells() const; - USHORT GetRowsToRepeat() const; - void SetRowsToRepeat( USHORT nNumOfRows ); - USHORT GetVirtPageNum( const BOOL bCalcFrm = TRUE ); + sal_uInt16 GetRowsToRepeat() const; + void SetRowsToRepeat( sal_uInt16 nNumOfRows ); + sal_uInt16 GetVirtPageNum( const sal_Bool bCalcFrm = sal_True ); //returns the number of table rows currently selected //if the selection start at the top of the table - USHORT GetRowSelectionFromTop() const; + sal_uInt16 GetRowSelectionFromTop() const; - BOOL IsInRepeatedHeadline() const { return CheckHeadline( true ); } - BOOL IsInHeadline() const { return CheckHeadline( false ); } + sal_Bool IsInRepeatedHeadline() const { return CheckHeadline( true ); } + sal_Bool IsInHeadline() const { return CheckHeadline( false ); } //Stellt die Breiten der Zellen so ein, dass der Inhalt moeglichst //nicht umgebrochen werden muss. //bBalance sorgt fuer einen Ausgleich der markierten Spalten. - void AdjustCellWidth( BOOL bBalance = FALSE ); + void AdjustCellWidth( sal_Bool bBalance = sal_False ); //Nicht erlaubt, wenn nur leere Zellen selektiert sind. - BOOL IsAdjustCellWidthAllowed( BOOL bBalance = FALSE ) const; + sal_Bool IsAdjustCellWidthAllowed( sal_Bool bBalance = sal_False ) const; //Ausgleich der Zellenbreiten, mit bTstOnly feststellen, ob mehr als //eine Zelle markiert ist. - BOOL BalanceCellWidth( BOOL bTstOnly ); + sal_Bool BalanceCellWidth( sal_Bool bTstOnly ); // AutoFormat fuer die Tabelle/TabellenSelection - BOOL SetTableAutoFmt( const SwTableAutoFmt& rNew ); + sal_Bool SetTableAutoFmt( const SwTableAutoFmt& rNew ); // Erfrage wie attributiert ist - BOOL GetTableAutoFmt( SwTableAutoFmt& rGet ); + sal_Bool GetTableAutoFmt( SwTableAutoFmt& rGet ); // aender eine Zellenbreite/-Hoehe/Spaltenbreite/Zeilenhoehe - BOOL SetColRowWidthHeight( USHORT eType, USHORT nDiff = 283 ); + sal_Bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 ); // Autosumme - BOOL GetAutoSum( String& rFml ) const; + sal_Bool GetAutoSum( String& rFml ) const; //Phy: Tatsaechliche Seitenanzahl. //Virt: Vom User evtl. gesetzten Offset mit einbeziehen. - USHORT GetPhyPageNum(); + sal_uInt16 GetPhyPageNum(); // Setzt an der aktuellen Postion einen neuen Page Offset - void SetNewPageOffset( USHORT nOffset ); - void SetPageOffset( USHORT nOffset ); //Aendert den letzten Page Offset - USHORT GetPageOffset() const; //Liefert den letzten Page Offset + void SetNewPageOffset( sal_uInt16 nOffset ); + void SetPageOffset( sal_uInt16 nOffset ); //Aendert den letzten Page Offset + sal_uInt16 GetPageOffset() const; //Liefert den letzten Page Offset //SS fuer Beschriftungen void InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator, const String& rNumberSeparator, - const BOOL bBefore, const USHORT nId, + const sal_Bool bBefore, const sal_uInt16 nId, const String& rCharacterStyle, - const BOOL bCpyBrd = TRUE ); + const sal_Bool bCpyBrd = sal_True ); //Das Lineal will auch noch etwas von uns wissen. - USHORT GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == in keiner Spalte - USHORT GetCurMouseColNum( const Point &rPt, + sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == in keiner Spalte + sal_uInt16 GetCurMouseColNum( const Point &rPt, SwGetCurColNumPara* pPara = 0 ) const; - USHORT GetCurTabColNum() const; //0 == in keiner Tabelle - USHORT GetCurMouseTabColNum( const Point &rPt ) const; - USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte + sal_uInt16 GetCurTabColNum() const; //0 == in keiner Tabelle + sal_uInt16 GetCurMouseTabColNum( const Point &rPt ) const; + sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte - BOOL IsTableRightToLeft() const; - BOOL IsMouseTableRightToLeft( const Point &rPt ) const; - BOOL IsTableVertical() const; + sal_Bool IsTableRightToLeft() const; + sal_Bool IsMouseTableRightToLeft( const Point &rPt ) const; + sal_Bool IsTableVertical() const; - BOOL IsLastCellInRow() const; + sal_Bool IsLastCellInRow() const; // Die Breite des aktuellen Bereichs fuer Spaltendialog long GetSectionWidth( SwFmt& rFmt ) const; void GetConnectableFrmFmts - (SwFrmFmt & rFmt, const String & rReference, BOOL bSuccessors, + (SwFrmFmt & rFmt, const String & rReference, sal_Bool bSuccessors, ::std::vector< String > & aPrevPageVec, ::std::vector< String > & aThisPageVec, ::std::vector< String > & aNextPageVec, @@ -787,7 +787,7 @@ public: // -> #i23726# SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot); - BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); + sal_Bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); // <- #i23726# // --> OD 2005-02-21 #i42921# bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index fd570f623eaf..fc375b3401c3 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -193,7 +193,7 @@ enum SwVarFormat }; -typedef USHORT SwGetSetExpType; +typedef sal_uInt16 SwGetSetExpType; namespace nsSwGetSetExpType { const SwGetSetExpType GSE_STRING = 0x0001; // String @@ -203,7 +203,7 @@ namespace nsSwGetSetExpType const SwGetSetExpType GSE_FORMULA = 0x0010; // Formel } -typedef USHORT SwExtendedSubType; +typedef sal_uInt16 SwExtendedSubType; namespace nsSwExtendedSubType { const SwExtendedSubType SUB_CMD = 0x0100; // Kommando anzeigen @@ -234,17 +234,17 @@ enum SwDateTimeSubType }; -extern USHORT __FAR_DATA aTypeTab[]; +extern sal_uInt16 __FAR_DATA aTypeTab[]; /*-------------------------------------------------------------------- Beschreibung: Allgemeine Tools --------------------------------------------------------------------*/ -String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM); +String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM); void SetErrorStr(const String& rStr); -//String ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang); -//String ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang); -String FormatNumber(USHORT nNum, sal_uInt32 nFormat); +//String ExpandDate(const Date& rDate, sal_uLong nFmt, sal_uInt16 nLang); +//String ExpandTime(const Time& rTime, sal_uLong nFmt, sal_uInt16 nLang); +String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat); /*-------------------------------------------------------------------- Beschreibung: Instanzen von SwFields und Abgeleiteten kommen 0-n mal vor. @@ -257,7 +257,7 @@ DBG_NAMEEX(SwFieldType) class SW_DLLPUBLIC SwFieldType : public SwModify { - USHORT nWhich; + sal_uInt16 nWhich; friend void _FinitUI(); // um den Pointer zu loeschen! static SvStringsDtor* pFldNames; @@ -266,22 +266,22 @@ class SW_DLLPUBLIC SwFieldType : public SwModify protected: // single argument ctors shall be explicit. - explicit SwFieldType( USHORT nWhichId ); + explicit SwFieldType( sal_uInt16 nWhichId ); public: #ifdef DBG_UTIL virtual ~SwFieldType(); #endif - static const String& GetTypeStr( USHORT nTypeId ); + static const String& GetTypeStr( sal_uInt16 nTypeId ); // nur in abgeleiteten Klassen virtual const String& GetName() const; virtual SwFieldType* Copy() const = 0; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); - USHORT Which() const { return nWhich; } + sal_uInt16 Which() const { return nWhich; } inline void UpdateFlds() const; }; @@ -302,8 +302,8 @@ class SW_DLLPUBLIC SwField { private: mutable String m_Cache; /// #i85766# cached expansion (for clipboard) - USHORT nLang; // Immer ueber SetLanguage aendern! - BOOL bIsAutomaticLanguage; + sal_uInt16 nLang; // Immer ueber SetLanguage aendern! + sal_Bool bIsAutomaticLanguage; sal_uInt32 nFormat; SwFieldType* pType; @@ -314,7 +314,7 @@ private: protected: void SetFormat(sal_uInt32 nSet) {nFormat = nSet;} - SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM); + SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM); public: virtual ~SwField(); @@ -340,7 +340,7 @@ public: SwField * CopyField() const; // ResId - USHORT Which() const + sal_uInt16 Which() const #ifndef DBG_UTIL { return pType->Which(); } #else @@ -348,13 +348,13 @@ public: #endif // TYP_ID - USHORT GetTypeId() const; - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT); + sal_uInt16 GetTypeId() const; + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16); // Sprache an der Feldposition - inline USHORT GetLanguage() const; - virtual void SetLanguage(USHORT nLng); + inline sal_uInt16 GetLanguage() const; + virtual void SetLanguage(sal_uInt16 nLng); // Parameter fuer Dialog und BASIC erfragen inline sal_uInt32 GetFormat() const; @@ -367,15 +367,15 @@ public: virtual void SetPar1(const String& rStr); virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); // hat das Feld eine Action auf dem ClickHandler ? (z.B. INetFelder,..) - BOOL HasClickHdl() const; + sal_Bool HasClickHdl() const; // ist es ein Fix-Feld? - BOOL IsFixed() const; + sal_Bool IsFixed() const; - BOOL IsAutomaticLanguage() const { return bIsAutomaticLanguage;} - void SetAutomaticLanguage(BOOL bSet){bIsAutomaticLanguage = bSet;} + sal_Bool IsAutomaticLanguage() const { return bIsAutomaticLanguage;} + void SetAutomaticLanguage(sal_Bool bSet){bIsAutomaticLanguage = bSet;} virtual String GetDescription() const; }; @@ -386,7 +386,7 @@ inline SwFieldType* SwField::GetTyp() const inline sal_uInt32 SwField::GetFormat() const { return nFormat; } -inline USHORT SwField::GetLanguage() const +inline sal_uInt16 SwField::GetLanguage() const { return nLang; } /*-------------------------------------------------------------------- @@ -397,20 +397,20 @@ inline USHORT SwField::GetLanguage() const class SwValueFieldType : public SwFieldType { SwDoc* pDoc; - BOOL bUseFormat; // Numberformatter verwenden + sal_Bool bUseFormat; // Numberformatter verwenden protected: - SwValueFieldType( SwDoc* pDocPtr, USHORT nWhichId ); + SwValueFieldType( SwDoc* pDocPtr, sal_uInt16 nWhichId ); SwValueFieldType( const SwValueFieldType& rTyp ); public: inline SwDoc* GetDoc() const { return pDoc; } inline void SetDoc(SwDoc* pNewDoc) { pDoc = pNewDoc; } - inline BOOL UseFormat() const { return bUseFormat; } - inline void EnableFormat(BOOL bFormat = TRUE) { bUseFormat = bFormat; } + inline sal_Bool UseFormat() const { return bUseFormat; } + inline void EnableFormat(sal_Bool bFormat = sal_True) { bUseFormat = bFormat; } - String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const; + String ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const; void DoubleToString(String &rValue, const double &rVal, LanguageType eLng) const; void DoubleToString(String &rValue, const double &rVal, sal_uInt32 nFmt) const; }; @@ -421,23 +421,23 @@ class SW_DLLPUBLIC SwValueField : public SwField // String sExpand; protected: - SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 ); + SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 ); SwValueField( const SwValueField& rFld ); public: virtual ~SwValueField(); virtual SwFieldType* ChgTyp( SwFieldType* ); - virtual void SetLanguage(USHORT nLng); + virtual void SetLanguage(sal_uInt16 nLng); // os: wozu war das denn da? -// virtual void ChangeFormat(ULONG n); +// virtual void ChangeFormat(sal_uLong n); inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); } virtual double GetValue() const; virtual void SetValue( const double& rVal ); - inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const + inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const { return ((SwValueFieldType*)GetTyp())->ExpandValue(rVal, nFmt, nLng); } static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt); diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 1196f0f1264d..b5f7292d32ba 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -112,37 +112,37 @@ public: class SW_DLLPUBLIC SwDateTimeField : public SwValueField { - USHORT nSubType; + sal_uInt16 nSubType; long nOffset; // Offset in Minuten virtual String Expand() const; virtual SwField* Copy() const; public: - SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSubType = DATEFLD, - ULONG nFmt = 0, USHORT nLng = 0); + SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD, + sal_uLong nFmt = 0, sal_uInt16 nLng = 0); - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nSub); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nSub); virtual double GetValue() const; virtual void SetPar2(const String& rStr); virtual String GetPar2() const; - inline BOOL IsDate() const + inline sal_Bool IsDate() const { return (nSubType & DATEFLD) != 0; } inline void SetOffset(long nMinutes) { nOffset = nMinutes; } inline long GetOffset() const { return nOffset; } - Date GetDate(BOOL bUseOffset = FALSE) const; - Time GetTime(BOOL bUseOffset = FALSE) const; + Date GetDate(sal_Bool bUseOffset = sal_False) const; + Time GetTime(sal_Bool bUseOffset = sal_False) const; void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); }; #endif // SW_FLDDAT_HXX diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index e3e40a82b940..b18a8fa22b9b 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -220,10 +220,10 @@ public: @param rItem the item to be set - @retval TRUE the selected item was successfully set - @retval TRUE failure (empty selection) + @retval sal_True the selected item was successfully set + @retval sal_True failure (empty selection) */ - BOOL SetSelectedItem(const String & rItem); + sal_Bool SetSelectedItem(const String & rItem); /** Sets the name of the field. @@ -256,7 +256,7 @@ public: - FIELD_PROP_PAR3 Get the help text of the field. - FIELD_PROP_PAR4 Get the tool tip of the field. */ - virtual BOOL QueryValue(com::sun::star::uno::Any &rVal, USHORT nWhichId) const; + virtual sal_Bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const; /** API: Sets a property value on the dropdown field. @@ -268,7 +268,7 @@ public: - FIELD_PROP_PAR3 Set the help text of the field. - FIELD_PROP_PAR4 Set the tool tip of the field. */ - virtual BOOL PutValue(const com::sun::star::uno::Any &rVal, USHORT nWhichId); + virtual sal_Bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId); }; #endif diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index c2ebb0d81950..488e49ad2f9e 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -40,18 +40,18 @@ class SW_DLLPUBLIC SwPosFlyFrm const SwFrmFmt* pFrmFmt; // das FlyFrmFmt // SwPosition* pPos; // Position in den ContentNode SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node - UINT32 nOrdNum; + sal_uInt32 nOrdNum; public: - SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, USHORT nArrPos ); + SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos ); virtual ~SwPosFlyFrm(); // virtual fuer die Writer (DLL !!) // operatoren fuer das Sort-Array - BOOL operator==( const SwPosFlyFrm& ); - BOOL operator<( const SwPosFlyFrm& ); + sal_Bool operator==( const SwPosFlyFrm& ); + sal_Bool operator<( const SwPosFlyFrm& ); const SwFrmFmt& GetFmt() const { return *pFrmFmt; } const SwNodeIndex& GetNdIndex() const { return *pNdIdx; } - UINT32 GetOrdNum() const { return nOrdNum; } + sal_uInt32 GetOrdNum() const { return nOrdNum; } }; typedef SwPosFlyFrm* SwPosFlyFrmPtr; diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 3b505952e4d9..3c91bad86b60 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -35,7 +35,7 @@ struct SwPosition; class IntlWrapper; -#define IVER_FMTANCHOR_LONGIDX ((USHORT)1) +#define IVER_FMTANCHOR_LONGIDX ((sal_uInt16)1) //FlyAnchor, Anker des Freifliegenden Rahmen ---- @@ -45,14 +45,14 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem //Index fuer Absatzgebundene Rahmen. //Position fuer Zeichengebundene Rahmen RndStdIds nAnchorId; - USHORT nPageNum; //Seitennummer bei Seitengeb. Rahmen. + sal_uInt16 nPageNum; //Seitennummer bei Seitengeb. Rahmen. // OD 2004-05-05 #i28701# - getting anchor positions ordered sal_uInt32 mnOrder; static sal_uInt32 mnOrderCounter; public: - SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, USHORT nPageNum = 0 ); + SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 ); SwFmtAnchor( const SwFmtAnchor &rCpy ); ~SwFmtAnchor(); @@ -68,24 +68,24 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 ); RndStdIds GetAnchorId() const { return nAnchorId; } - USHORT GetPageNum() const { return nPageNum; } + sal_uInt16 GetPageNum() const { return nPageNum; } const SwPosition *GetCntntAnchor() const { return pCntntAnchor; } // OD 2004-05-05 #i28701# sal_uInt32 GetOrder() const; void SetType( RndStdIds nRndId ) { nAnchorId = nRndId; } - void SetPageNum( USHORT nNew ) { nPageNum = nNew; } + void SetPageNum( sal_uInt16 nNew ) { nPageNum = nNew; } void SetAnchor( const SwPosition *pPos ); }; -inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const +inline const SwFmtAnchor &SwAttrSet::GetAnchor(sal_Bool bInP) const { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); } - inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const + inline const SwFmtAnchor &SwFmt::GetAnchor(sal_Bool bInP) const { return aSet.GetAnchor(bInP); } #endif diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index a230943f2ab0..ce16b775b82d 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -40,7 +40,7 @@ class SwFmtAutoFmt: public SfxPoolItem boost::shared_ptr<SfxItemSet> mpHandle; public: - SwFmtAutoFmt( USHORT nWhich = RES_TXTATR_AUTOFMT ); + SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT ); // single argument ctors shall be explicit. virtual ~SwFmtAutoFmt(); @@ -63,8 +63,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 ); void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; } const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; } diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 63dbe1f57dc6..8feb5293c141 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem { public: - SwFmtNoBalancedColumns( BOOL bFlag = FALSE ) + SwFmtNoBalancedColumns( sal_Bool bFlag = sal_False ) : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} // "pure virtual Methoden" vom SfxPoolItem @@ -44,10 +44,10 @@ public: }; -inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const +inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(sal_Bool bInP) const { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); } -inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const +inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(sal_Bool bInP) const { return aSet.GetBalancedColumns( bInP ); } #endif diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 1efcd900f358..8a649ed5b80f 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -37,31 +37,31 @@ class SwColumn { - USHORT nWish; //Wunschbreite incl. Raender. + sal_uInt16 nWish; //Wunschbreite incl. Raender. //Verhaelt sich proportional zum Verhaeltniss: //Wunschbreite der Umgebung / aktuelle Breite der Spalte - USHORT nUpper; //Oberer Rand - USHORT nLower; //Unterer Rand - USHORT nLeft; //Linker Rand - USHORT nRight; //Rechter Rand + sal_uInt16 nUpper; //Oberer Rand + sal_uInt16 nLower; //Unterer Rand + sal_uInt16 nLeft; //Linker Rand + sal_uInt16 nRight; //Rechter Rand public: SwColumn(); - BOOL operator==( const SwColumn & ); + sal_Bool operator==( const SwColumn & ); - void SetWishWidth( USHORT nNew ) { nWish = nNew; } - void SetUpper( USHORT nNew ) { nUpper = nNew; } - void SetLower( USHORT nNew ) { nLower = nNew; } - void SetLeft ( USHORT nNew ) { nLeft = nNew; } - void SetRight( USHORT nNew ) { nRight = nNew; } + void SetWishWidth( sal_uInt16 nNew ) { nWish = nNew; } + void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } + void SetLower( sal_uInt16 nNew ) { nLower = nNew; } + void SetLeft ( sal_uInt16 nNew ) { nLeft = nNew; } + void SetRight( sal_uInt16 nNew ) { nRight = nNew; } - USHORT GetWishWidth() const { return nWish; } - USHORT GetUpper() const { return nUpper; } - USHORT GetLower() const { return nLower; } - USHORT GetLeft () const { return nLeft; } - USHORT GetRight() const { return nRight; } + sal_uInt16 GetWishWidth() const { return nWish; } + sal_uInt16 GetUpper() const { return nUpper; } + sal_uInt16 GetLower() const { return nLower; } + sal_uInt16 GetLeft () const { return nLeft; } + sal_uInt16 GetRight() const { return nRight; } }; typedef SwColumn* SwColumnPtr; @@ -78,17 +78,17 @@ enum SwColLineAdj class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem { // Pen aPen; //Pen fuer die Linine zwischen den Spalten - ULONG nLineWidth; //width of the separator line + sal_uLong nLineWidth; //width of the separator line Color aLineColor; //color of the separator line - BYTE nLineHeight; //Prozentuale Hoehe der Linien + sal_uInt8 nLineHeight; //Prozentuale Hoehe der Linien //(Relativ zu der Hoehe der Spalten incl. UL). SwColLineAdj eAdj; //Linie wird oben, mittig oder unten ausgerichtet. SwColumns aColumns; //Informationen fuer die einzelnen Spalten. - USHORT nWidth; //Gesamtwunschbreite aller Spalten. + sal_uInt16 nWidth; //Gesamtwunschbreite aller Spalten. - BOOL bOrtho; //Nur wenn dieses Flag gesetzt ist wird beim setzen + sal_Bool bOrtho; //Nur wenn dieses Flag gesetzt ist wird beim setzen //der GutterWidth eine 'optische Verteilung' //vorgenommen. //Es muss zurueckgesetzt werden wenn an den @@ -97,7 +97,7 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem //gemischt (optisch verteilt). //Das Flag ist initial gesetzt. - SW_DLLPRIVATE void Calc( USHORT nGutterWidth, USHORT nAct ); + SW_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ); public: SwFmtCol(); @@ -115,64 +115,64 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 SwColumns &GetColumns() const { return aColumns; } SwColumns &GetColumns() { return aColumns; } - USHORT GetNumCols() const { return aColumns.Count(); } + sal_uInt16 GetNumCols() const { return aColumns.Count(); } // const Pen& GetLinePen() const { return aPen; } - ULONG GetLineWidth() const { return nLineWidth;} + sal_uLong GetLineWidth() const { return nLineWidth;} const Color& GetLineColor() const { return aLineColor;} SwColLineAdj GetLineAdj() const { return eAdj; } - BOOL IsOrtho() const { return bOrtho; } - USHORT GetWishWidth() const { return nWidth; } - BYTE GetLineHeight()const { return nLineHeight; } + sal_Bool IsOrtho() const { return bOrtho; } + sal_uInt16 GetWishWidth() const { return nWidth; } + sal_uInt8 GetLineHeight()const { return nLineHeight; } //Return USHRT_MAX wenn uneindeutig. //Return die kleinste Breite wenn bMin True ist. - USHORT GetGutterWidth( BOOL bMin = FALSE ) const; + sal_uInt16 GetGutterWidth( sal_Bool bMin = sal_False ) const; // void SetLinePen( const Pen& rNew ) { aPen = rNew; } - void SetLineWidth(ULONG nLWidth) { nLineWidth = nLWidth;} + void SetLineWidth(sal_uLong nLWidth) { nLineWidth = nLWidth;} void SetLineColor(const Color& rCol ) { aLineColor = rCol;} - void SetLineHeight( BYTE nNew ) { nLineHeight = nNew; } + void SetLineHeight( sal_uInt8 nNew ) { nLineHeight = nNew; } void SetLineAdj( SwColLineAdj eNew ){ eAdj = eNew; } - void SetWishWidth( USHORT nNew ) { nWidth = nNew; } + void SetWishWidth( sal_uInt16 nNew ) { nWidth = nNew; } //Mit dieser Funktion koennen die Spalten (immer wieder) initialisert //werden. Das Ortho Flag wird automatisch gesetzt. - void Init( USHORT nNumCols, USHORT nGutterWidth, USHORT nAct ); + void Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); //Stellt die Raender fuer die Spalten in aColumns ein. //Wenn das Flag bOrtho gesetzt ist, werden die Spalten neu optisch //verteilt. Ist das Flag nicht gesetzt werden die Spaltenbreiten nicht //veraendert und die Raender werden einfach eingestellt. - void SetGutterWidth( USHORT nNew, USHORT nAct ); + void SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct ); //Verteilt ebenfalls automatisch neu wenn das Flag gesetzt wird; //nur dann wird auch der zweite Param. benoetigt und beachtet. - void SetOrtho( BOOL bNew, USHORT nGutterWidth, USHORT nAct ); + void SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); //Fuer den Reader - void _SetOrtho( BOOL bNew ) { bOrtho = bNew; } + void _SetOrtho( sal_Bool bNew ) { bOrtho = bNew; } //Berechnet die aktuelle Breite der Spalte nCol. //Das Verhaeltniss von Wunschbreite der Spalte zum Returnwert ist //proportional zum Verhaeltniss des Gesamtwunschwertes zu nAct. - USHORT CalcColWidth( USHORT nCol, USHORT nAct ) const; + sal_uInt16 CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const; //Wie oben, aber es wir die Breite der PrtArea - also das was fuer //den Anwender die Spalte ist - geliefert. - USHORT CalcPrtColWidth( USHORT nCol, USHORT nAct ) const; + sal_uInt16 CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const; }; -inline const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const +inline const SwFmtCol &SwAttrSet::GetCol(sal_Bool bInP) const { return (const SwFmtCol&)Get( RES_COL,bInP); } -inline const SwFmtCol &SwFmt::GetCol(BOOL bInP) const +inline const SwFmtCol &SwFmt::GetCol(sal_Bool bInP) const { return aSet.GetCol(bInP); } #endif diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 55e2212985c0..28252ff1c99c 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -59,7 +59,7 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); } SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); } @@ -77,10 +77,10 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy ) } -inline const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const +inline const SwFmtChain &SwAttrSet::GetChain(sal_Bool bInP) const { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } -inline const SwFmtChain &SwFmt::GetChain(BOOL bInP) const +inline const SwFmtChain &SwFmt::GetChain(sal_Bool bInP) const { return aSet.GetChain(bInP); } #endif diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 0f8449cac766..af4e8a3f3b8f 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -56,10 +56,10 @@ public: void SetNewCntntIdx( const SwNodeIndex *pIdx ); }; -inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const +inline const SwFmtCntnt &SwAttrSet::GetCntnt(sal_Bool bInP) const { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } -inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const +inline const SwFmtCntnt &SwFmt::GetCntnt(sal_Bool bInP) const { return aSet.GetCntnt(bInP); } #endif diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index aba9b8533c0a..f7725cb6294a 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -38,16 +38,16 @@ class SwFmtColl : public SwFmt { protected: SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName, - const USHORT* pWhichRanges, SwFmtColl* pDerFrom, - USHORT nFmtWhich ) + const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, + sal_uInt16 nFmtWhich ) : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich ) - { SetAuto( FALSE ); } + { SetAuto( sal_False ); } SwFmtColl( SwAttrPool& rPool, const String &rFmtName, - const USHORT* pWhichRanges, SwFmtColl* pDerFrom, - USHORT nFmtWhich ) + const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, + sal_uInt16 nFmtWhich ) : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich ) - { SetAuto( FALSE ); } + { SetAuto( sal_False ); } private: @@ -68,14 +68,14 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl // <-- protected: - //BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei + //sal_uInt8 nOutlineLevel; //<-#outline level, removed by zhaojianwei bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei SwTxtFmtColl *pNextTxtFmtColl; SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName, SwTxtFmtColl* pDerFrom = 0, - USHORT nFmtWh = RES_TXTFMTCOLL ) + sal_uInt16 nFmtWh = RES_TXTFMTCOLL ) : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh ), // --> OD 2007-01-24 #i73790# @@ -87,7 +87,7 @@ protected: SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName, SwTxtFmtColl* pDerFrom = 0, - USHORT nFmtWh = RES_TXTFMTCOLL ) + sal_uInt16 nFmtWh = RES_TXTFMTCOLL ) : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh ), // --> OD 2007-01-24 #i73790# @@ -106,7 +106,7 @@ public: inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext); SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; } - BOOL IsAtDocNodeSet() const; + sal_Bool IsAtDocNodeSet() const; // --> OD 2006-11-22 #i71574# //<-#outline level,zhaojianwei @@ -125,14 +125,14 @@ public: // --> OD 2008-03-04 #refactorlists# // override to recognize changes on the <SwNumRuleItem> and register/unregister // the paragragh style at the corresponding <SwNumRule> instance - virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr ); - virtual BOOL SetFmtAttr( const SfxItemSet& rSet ); - virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); + virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr ); + virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet ); + virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); // <-- // --> OD 2007-01-24 #i73790# // override <ResetAllFmtAttr()> to stay assigned to list level of outline style - virtual USHORT ResetAllFmtAttr(); + virtual sal_uInt16 ResetAllFmtAttr(); inline bool StayAssignedToListLevelOfOutlineStyle() const { @@ -152,15 +152,15 @@ public: Attset fuer die Char-Attribute angelegt werden; damit die Vererbung und der Zugriff auf die gesetzen Attribute richtig funktioniert!! - virtual BOOL SetDerivedFrom( SwFmtColl* pDerFrom = 0 ); + virtual sal_Bool SetDerivedFrom( SwFmtColl* pDerFrom = 0 ); inline SwCharFmt* GetCharFmt() const; - inline BOOL IsCharFmtSet() const; + inline sal_Bool IsCharFmtSet() const; void SetCharFmt(SwCharFmt *); void ResetCharFmt(); -inline BOOL SwTxtFmtColl::IsCharFmtSet() const +inline sal_Bool SwTxtFmtColl::IsCharFmtSet() const { - return aCharDepend.GetRegisteredIn() ? TRUE : FALSE; + return aCharDepend.GetRegisteredIn() ? sal_True : sal_False; } inline SwCharFmt* SwTxtFmtColl::GetCharFmt() const { @@ -220,10 +220,10 @@ enum Master_CollConditions class SW_DLLPUBLIC SwCollCondition : public SwClient { - ULONG nCondition; + sal_uLong nCondition; union { - ULONG nSubCondition; + sal_uLong nSubCondition; String* pFldExpression; } aSubCondition; @@ -231,9 +231,9 @@ public: TYPEINFO(); //Bereits in Basisklasse Client drin. - SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond, - ULONG nSubCond = 0 ); - SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond, + SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, + sal_uLong nSubCond = 0 ); + SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, const String& rSubExp ); virtual ~SwCollCondition(); @@ -248,12 +248,12 @@ public: int operator!=( const SwCollCondition& rCmp ) const { return ! (*this == rCmp); } - ULONG GetCondition() const { return nCondition; } - ULONG GetSubCondition() const { return aSubCondition.nSubCondition; } + sal_uLong GetCondition() const { return nCondition; } + sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; } const String* GetFldExpression() const { return aSubCondition.pFldExpression; } - void SetCondition( ULONG nCond, ULONG nSubCond ); + void SetCondition( sal_uLong nCond, sal_uLong nSubCond ); SwTxtFmtColl* GetTxtFmtColl() const { return (SwTxtFmtColl*)GetRegisteredIn(); } }; @@ -287,7 +287,7 @@ public: const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const; const SwFmtCollConditions& GetCondColls() const { return aCondColls; } void InsertCondition( const SwCollCondition& rCond ); - BOOL RemoveCondition( const SwCollCondition& rCond ); + sal_Bool RemoveCondition( const SwCollCondition& rCond ); void SetConditions( const SwFmtCollConditions& ); }; diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index b3b98373905e..476708948e60 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -38,8 +38,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem { public: - SwFmtEditInReadonly( USHORT nId = RES_EDIT_IN_READONLY, - BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {} + SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY, + sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -50,10 +50,10 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const +inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(sal_Bool bInP) const { return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); } -inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const +inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(sal_Bool bInP) const { return aSet.GetEditInReadonly(bInP); } #endif diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 0e1932f9605b..a6289406c505 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -69,7 +69,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; const SwField *GetFld() const { return pField; } SwField *GetFld() { return pField; } @@ -87,8 +87,8 @@ public: const SwTxtFld *GetTxtFld() const { return pTxtAttr; } SwTxtFld *GetTxtFld() { return pTxtAttr; } - BOOL IsFldInDoc() const; - BOOL IsProtect() const; + sal_Bool IsFldInDoc() const; + sal_Bool IsProtect() const; }; class SW_DLLPUBLIC SwFmtFldHint : public SfxHint diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 5a5792978c93..878b59e5ccf6 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -38,7 +38,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem { public: - SwFmtFollowTextFlow( BOOL bFlag = FALSE ) + SwFmtFollowTextFlow( sal_Bool bFlag = sal_False ) : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {} TYPEINFO(); @@ -55,10 +55,10 @@ public: #if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 -inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(BOOL bInP) const +inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(sal_Bool bInP) const { return (const SwFmtFollowTextFlow&)Get( RES_FOLLOW_TEXT_FLOW, bInP ); } -inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(BOOL bInP) const +inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(sal_Bool bInP) const { return aSet.GetFollowTextFlow( bInP ); } #endif diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index a79788555c72..04647edc1e68 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -51,7 +51,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; @@ -62,10 +62,10 @@ inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy ) return *this; } -inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const +inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(sal_Bool bInP) const { return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); } -inline const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const +inline const SwFmtFillOrder &SwFmt::GetFillOrder(sal_Bool bInP) const { return aSet.GetFillOrder(bInP); } #endif diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index df6d99910e91..ec3b7458ef6a 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -52,8 +52,8 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem Size aSize; SwFrmSize eFrmHeightType; SwFrmSize eFrmWidthType; - BYTE nWidthPercent; //Fuer Tabellen kann die Breite in Prozent - BYTE nHeightPercent; //angegeben sein. + sal_uInt8 nWidthPercent; //Fuer Tabellen kann die Breite in Prozent + sal_uInt8 nHeightPercent; //angegeben sein. //Fuer Rahmen koennen Hoehe und/oder Breite //in Prozent angegeben sein. Wenn nur eine //der Angaben in Prozent angeben ist, kann @@ -80,8 +80,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); SwFrmSize GetHeightSizeType() const { return eFrmHeightType; } void SetHeightSizeType( SwFrmSize eSize ) { eFrmHeightType = eSize; } @@ -97,16 +97,16 @@ public: void SetHeight( const SwTwips nNew ) { aSize.Height() = nNew; } void SetWidth ( const SwTwips nNew ) { aSize.Width() = nNew; } - BYTE GetHeightPercent() const{ return nHeightPercent; } - BYTE GetWidthPercent() const { return nWidthPercent; } - void SetHeightPercent( BYTE n ) { nHeightPercent = n; } - void SetWidthPercent ( BYTE n ) { nWidthPercent = n; } + sal_uInt8 GetHeightPercent() const{ return nHeightPercent; } + sal_uInt8 GetWidthPercent() const { return nWidthPercent; } + void SetHeightPercent( sal_uInt8 n ) { nHeightPercent = n; } + void SetWidthPercent ( sal_uInt8 n ) { nWidthPercent = n; } }; -inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const +inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(sal_Bool bInP) const { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); } -inline const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const +inline const SwFmtFrmSize &SwFmt::GetFrmSize(sal_Bool bInP) const { return aSet.GetFrmSize(bInP); } #endif diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 381703302585..9a470ddfa1df 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwFmtFtn: public SfxPoolItem friend class SwTxtFtn; SwTxtFtn* pTxtAttr; //mein TextAttribut String aNumber; //Benutzerdefinierte 'Nummer' - USHORT nNumber; //Automatische Nummerierung + sal_uInt16 nNumber; //Automatische Nummerierung bool m_bEndNote; // is it an End note? // geschuetzter CopyCtor @@ -57,11 +57,11 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; const String &GetNumStr() const { return aNumber; } - const USHORT &GetNumber() const { return nNumber; } + const sal_uInt16 &GetNumber() const { return nNumber; } bool IsEndNote() const { return m_bEndNote;} void SetNumStr( const String& rStr ) { aNumber = rStr; } - void SetNumber( USHORT nNo ) { nNumber = nNo; } + void SetNumber( sal_uInt16 nNo ) { nNumber = nNo; } void SetEndNote( bool b ); void SetNumber( const SwFmtFtn& rFtn ) @@ -73,7 +73,7 @@ public: void GetFtnText( String& rStr ) const; // returnt den anzuzeigenden String der Fuss-/Endnote - String GetViewNumStr( const SwDoc& rDoc, BOOL bInclStrs = FALSE ) const; + String GetViewNumStr( const SwDoc& rDoc, sal_Bool bInclStrs = sal_False ) const; }; diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index f44cbc0f12c5..f3472108de97 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -48,11 +48,11 @@ class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem String sPrefix; String sSuffix; SvxNumberType aFmt; - USHORT nOffset; + sal_uInt16 nOffset; protected: - SwFmtFtnEndAtTxtEnd( USHORT nWhichL, SwFtnEndPosEnum ePos ) - : SfxEnumItem( nWhichL, sal::static_int_cast< USHORT >(ePos) ), nOffset( 0 ) + SwFmtFtnEndAtTxtEnd( sal_uInt16 nWhichL, SwFtnEndPosEnum ePos ) + : SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 ) {} SwFmtFtnEndAtTxtEnd( const SwFmtFtnEndAtTxtEnd& rAttr ) : SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ), @@ -61,12 +61,12 @@ protected: {} public: - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual int operator==( const SfxPoolItem& ) 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 ); // will be used at time?? // void FillVariable( SbxVariable &rVar, @@ -81,7 +81,7 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - inline BOOL IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } + inline sal_Bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr ); @@ -90,8 +90,8 @@ public: const SvxNumberType& GetSwNumType() const { return aFmt; } - USHORT GetOffset() const { return nOffset; } - void SetOffset( USHORT nOff ) { nOffset = nOff; } + sal_uInt16 GetOffset() const { return nOffset; } + void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; } const String& GetPrefix() const { return sPrefix; } void SetPrefix(const String& rSet) { sPrefix = rSet; } @@ -122,15 +122,15 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; -inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const +inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(sal_Bool bInP) const { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); } -inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const +inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(sal_Bool bInP) const { return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); } -inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(BOOL bInP) const +inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(sal_Bool bInP) const { return aSet.GetFtnAtTxtEnd(bInP); } -inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const +inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(sal_Bool bInP) const { return aSet.GetEndAtTxtEnd(bInP); } #endif diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 14c71d6a0264..c8773d61d1d5 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -41,10 +41,10 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient { - BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes) + sal_Bool bActive; //Nur zur Steuerung (Erzeugung des Inhaltes) public: - SwFmtHeader( BOOL bOn = FALSE ); + SwFmtHeader( sal_Bool bOn = sal_False ); SwFmtHeader( SwFrmFmt *pHeaderFmt ); SwFmtHeader( const SwFmtHeader &rCpy ); ~SwFmtHeader(); @@ -64,8 +64,8 @@ public: const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)pRegisteredIn; } SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)pRegisteredIn; } - BOOL IsActive() const { return bActive; } - void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } + sal_Bool IsActive() const { return bActive; } + void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; } }; //Fusszeile, fuer Seitenformate @@ -73,10 +73,10 @@ public: class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient { - BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes) + sal_Bool bActive; //Nur zur Steuerung (Erzeugung des Inhaltes) public: - SwFmtFooter( BOOL bOn = FALSE ); + SwFmtFooter( sal_Bool bOn = sal_False ); SwFmtFooter( SwFrmFmt *pFooterFmt ); SwFmtFooter( const SwFmtFooter &rCpy ); ~SwFmtFooter(); @@ -96,18 +96,18 @@ public: const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)pRegisteredIn; } SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)pRegisteredIn; } - BOOL IsActive() const { return bActive; } - void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } + sal_Bool IsActive() const { return bActive; } + void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; } }; -inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const +inline const SwFmtHeader &SwAttrSet::GetHeader(sal_Bool bInP) const { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } -inline const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const +inline const SwFmtFooter &SwAttrSet::GetFooter(sal_Bool bInP) const { return (const SwFmtFooter&)Get( RES_FOOTER,bInP); } -inline const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const +inline const SwFmtHeader &SwFmt::GetHeader(sal_Bool bInP) const { return aSet.GetHeader(bInP); } -inline const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const +inline const SwFmtFooter &SwFmt::GetFooter(sal_Bool bInP) const { return aSet.GetFooter(bInP); } #endif diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 75fc863b147d..bfb6d35d2e76 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -49,8 +49,8 @@ class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem String aName; // Name des Links SvxMacroTableDtor* pMacroTbl; SwTxtINetFmt* pTxtAttr; // mein TextAttribut - USHORT nINetId; - USHORT nVisitedId; + sal_uInt16 nINetId; + sal_uInt16 nVisitedId; public: SwFmtINetFmt( const String& rURL, const String& rTarget ); SwFmtINetFmt( const SwFmtINetFmt& rAttr ); @@ -68,10 +68,10 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 SwTxtINetFmt* GetTxtINetFmt() const { return pTxtAttr; } @@ -90,19 +90,19 @@ public: const String& GetVisitedFmt() const { return aVisitedFmt; } void SetVisitedFmt( const String& rNm ) { aVisitedFmt = rNm; } - USHORT GetINetFmtId() const { return nINetId; } - void SetINetFmtId( USHORT nNew ) { nINetId = nNew; } + sal_uInt16 GetINetFmtId() const { return nINetId; } + void SetINetFmtId( sal_uInt16 nNew ) { nINetId = nNew; } - USHORT GetVisitedFmtId() const { return nVisitedId; } - void SetVisitedFmtId( USHORT nNew ) { nVisitedId = nNew; } + sal_uInt16 GetVisitedFmtId() const { return nVisitedId; } + void SetVisitedFmtId( sal_uInt16 nNew ) { nVisitedId = nNew; } // setze eine neue oder loesche die akt. MakroTabelle void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 ); const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; } // setze / erfrage ein Makro - void SetMacro( USHORT nEvent, const SvxMacro& rMacro ); - const SvxMacro* GetMacro( USHORT nEvent ) const; + void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ); + const SvxMacro* GetMacro( sal_uInt16 nEvent ) const; }; diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 7ae0e80d0350..fb04ec8ed94d 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -37,8 +37,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem { - ULONG nStartValue :24; //Startwert fuer den Absatz, 0 == kein Startwert - ULONG bCountLines :1; //Zeilen des Absatzes sollen mitgezaehlt werden. + sal_uLong nStartValue :24; //Startwert fuer den Absatz, 0 == kein Startwert + sal_uLong bCountLines :1; //Zeilen des Absatzes sollen mitgezaehlt werden. public: SwFmtLineNumber(); @@ -54,17 +54,17 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); - ULONG GetStartValue() const { return nStartValue; } - BOOL IsCount() const { return bCountLines != 0; } + sal_uLong GetStartValue() const { return nStartValue; } + sal_Bool IsCount() const { return bCountLines != 0; } - void SetStartValue( ULONG nNew ) { nStartValue = nNew; } - void SetCountLines( BOOL b ) { bCountLines = b; } + void SetStartValue( sal_uLong nNew ) { nStartValue = nNew; } + void SetCountLines( sal_Bool b ) { bCountLines = b; } }; -inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const +inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(sal_Bool bInP) const { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); } #endif diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index cfe9172ea02f..1ac109d067ef 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -37,7 +37,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem { public: - SwFmtLayoutSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} + SwFmtLayoutSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -48,10 +48,10 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const +inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(sal_Bool bInP) const { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); } -inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const +inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(sal_Bool bInP) const { return aSet.GetLayoutSplit(bInP); } #endif diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index d09df11bb1aa..b486434d19df 100755 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -108,12 +108,12 @@ private: SwTxtMeta * GetTxtAttr() { return m_pTxtAttr; } void SetTxtAttr(SwTxtMeta * const i_pTxtAttr); - explicit SwFmtMeta( const USHORT i_nWhich ); + explicit SwFmtMeta( const sal_uInt16 i_nWhich ); public: // takes ownership explicit SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta, - const USHORT i_nWhich ); + const sal_uInt16 i_nWhich ); virtual ~SwFmtMeta(); // SfxPoolItem @@ -123,7 +123,7 @@ public: /// notify clients registered at m_pMeta that this meta is being (re-)moved void NotifyChangeTxtNode(SwTxtNode *const pTxtNode); - static SwFmtMeta * CreatePoolDefault( const USHORT i_nWhich ); + static SwFmtMeta * CreatePoolDefault( const sal_uInt16 i_nWhich ); ::sw::Meta * GetMeta() { return m_pMeta.get(); } /// this method <em>must</em> be called when the hint is actually copied void DoCopy( SwFmtMeta & rOriginalMeta ); diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 098177d4bd9b..aa6389992a3d 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -39,7 +39,7 @@ class IntlWrapper; -#define IVER_VERTORIENT_REL ((USHORT)0x0001) +#define IVER_VERTORIENT_REL ((sal_uInt16)0x0001) class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem { @@ -60,8 +60,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); sal_Int16 GetVertOrient() const { return eOrient; } sal_Int16 GetRelationOrient() const { return eRelation; } @@ -75,19 +75,19 @@ public: //SwFmtHoriOrient, wie und woran orientiert -- // sich der FlyFrm in der Hoizontalen ---------- -#define IVER_HORIORIENT_TOGGLE ((USHORT)0x0001) -#define IVER_HORIORIENT_REL ((USHORT)0x0002) +#define IVER_HORIORIENT_TOGGLE ((sal_uInt16)0x0001) +#define IVER_HORIORIENT_REL ((sal_uInt16)0x0002) class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem { SwTwips nXPos; //Enthaelt _immer_ die aktuelle RelPos. sal_Int16 eOrient; sal_Int16 eRelation; - BOOL bPosToggle : 1; // auf geraden Seiten Position spiegeln + sal_Bool bPosToggle : 1; // auf geraden Seiten Position spiegeln public: TYPEINFO(); SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE, - sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, BOOL bPos = FALSE ); + sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, sal_Bool bPos = sal_False ); inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); // "pure virtual Methoden" vom SfxPoolItem @@ -98,8 +98,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); sal_Int16 GetHoriOrient() const { return eOrient; } sal_Int16 GetRelationOrient() const { return eRelation; } @@ -109,8 +109,8 @@ public: SwTwips GetPos() const { return nXPos; } void SetPos( SwTwips nNew ) { nXPos = nNew; } - BOOL IsPosToggle() const { return bPosToggle; } - void SetPosToggle( BOOL bNew ) { bPosToggle = bNew; } + sal_Bool IsPosToggle() const { return bPosToggle; } + void SetPosToggle( sal_Bool bNew ) { bPosToggle = bNew; } }; inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy ) @@ -129,14 +129,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } -inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const +inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(sal_Bool bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } -inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const +inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(sal_Bool bInP) const { return (const SwFmtHoriOrient&)Get( RES_HORI_ORIENT,bInP); } -inline const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const +inline const SwFmtVertOrient &SwFmt::GetVertOrient(sal_Bool bInP) const { return aSet.GetVertOrient(bInP); } -inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const +inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(sal_Bool bInP) const { return aSet.GetHoriOrient(bInP); } #endif diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 47ad826bc875..8305b9b98954 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -42,17 +42,17 @@ class IntlWrapper; //Pagedescriptor //Client vom SwPageDesc der durch das Attribut "beschrieben" wird. -#define IVER_FMTPAGEDESC_NOAUTO ((USHORT)0x0001) -#define IVER_FMTPAGEDESC_LONGPAGE ((USHORT)0x0002) +#define IVER_FMTPAGEDESC_NOAUTO ((sal_uInt16)0x0001) +#define IVER_FMTPAGEDESC_LONGPAGE ((sal_uInt16)0x0002) class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient { // diese "Doc"-Funktion ist friend, um nach dem kopieren das // Auto-Flag setzen zu koennen !! - friend BOOL InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, USHORT, + friend sal_Bool InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, sal_uInt16, SwHistory* ); - USHORT nNumOffset; // Seitennummer Offset - USHORT nDescNameIdx; // SW3-Reader: Stringpool-Index des Vorlagennamens + sal_uInt16 nNumOffset; // Seitennummer Offset + sal_uInt16 nDescNameIdx; // SW3-Reader: Stringpool-Index des Vorlagennamens SwModify* pDefinedIn; // Verweis auf das Objekt, in dem das // Attribut gesetzt wurde (CntntNode/Format) @@ -72,16 +72,16 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); SwPageDesc *GetPageDesc() { return (SwPageDesc*)GetRegisteredIn(); } const SwPageDesc *GetPageDesc() const { return (SwPageDesc*)GetRegisteredIn(); } - USHORT GetNumOffset() const { return nNumOffset; } - void SetNumOffset( USHORT nNum ) { nNumOffset = nNum; } + sal_uInt16 GetNumOffset() const { return nNumOffset; } + void SetNumOffset( sal_uInt16 nNum ) { nNumOffset = nNum; } // erfrage/setze, wo drin das Attribut verankert ist inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -89,10 +89,10 @@ public: }; -inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const +inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(sal_Bool bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } -inline const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const +inline const SwFmtPageDesc &SwFmt::GetPageDesc(sal_Bool bInP) const { return aSet.GetPageDesc(bInP); } #endif diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 11efcc20546f..8f0606b87ac2 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -37,7 +37,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem { public: - SwFmtRowSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} + SwFmtRowSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -48,10 +48,10 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(BOOL bInP) const +inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(sal_Bool bInP) const { return (const SwFmtRowSplit&)Get( RES_ROW_SPLIT,bInP); } -inline const SwFmtRowSplit &SwFmt::GetRowSplit(BOOL bInP) const +inline const SwFmtRowSplit &SwFmt::GetRowSplit(sal_Bool bInP) const { return aSet.GetRowSplit(bInP); } #endif diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index c60169140870..76f2156bcfdd 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -40,9 +40,9 @@ class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem String sRubyTxt; // the ruby txt String sCharFmtName; // name of the charformat SwTxtRuby* pTxtAttr; // the TextAttribut - USHORT nCharFmtId; // PoolId of the charformat - USHORT nPosition; // Position of the Ruby-Character - USHORT nAdjustment; // specific adjustment of the Ruby-Ch. + sal_uInt16 nCharFmtId; // PoolId of the charformat + sal_uInt16 nPosition; // Position of the Ruby-Character + sal_uInt16 nAdjustment; // specific adjustment of the Ruby-Ch. public: SwFmtRuby( const String& rRubyTxt ); @@ -61,10 +61,10 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 SwTxtRuby* GetTxtRuby() const { return pTxtAttr; } @@ -76,14 +76,14 @@ public: const String& GetCharFmtName() const { return sCharFmtName; } void SetCharFmtName( const String& rNm ) { sCharFmtName = rNm; } - USHORT GetCharFmtId() const { return nCharFmtId; } - void SetCharFmtId( USHORT nNew ) { nCharFmtId = nNew; } + sal_uInt16 GetCharFmtId() const { return nCharFmtId; } + void SetCharFmtId( sal_uInt16 nNew ) { nCharFmtId = nNew; } - USHORT GetPosition() const { return nPosition; } - void SetPosition( USHORT nNew ) { nPosition = nNew; } + sal_uInt16 GetPosition() const { return nPosition; } + void SetPosition( sal_uInt16 nNew ) { nPosition = nNew; } - USHORT GetAdjustment() const { return nAdjustment; } - void SetAdjustment( USHORT nNew ) { nAdjustment = nNew; } + sal_uInt16 GetAdjustment() const { return nAdjustment; } + void SetAdjustment( sal_uInt16 nNew ) { nAdjustment = nNew; } }; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 889c7adc6b5e..f9ceb522a2c5 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -43,9 +43,9 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem { - BOOL bAnchorOnly :1; - BOOL bContour :1; - BOOL bOutside :1; + sal_Bool bAnchorOnly :1; + sal_Bool bContour :1; + sal_Bool bOutside :1; public: SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL ); SwFmtSurround( const SwFmtSurround & ); @@ -54,24 +54,24 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); SwSurround GetSurround()const { return SwSurround( GetValue() ); } - BOOL IsAnchorOnly() const { return bAnchorOnly; } - BOOL IsContour() const { return bContour; } - BOOL IsOutside() const { return bOutside; } - void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( USHORT( eNew ) ); } - void SetAnchorOnly( BOOL bNew ) { bAnchorOnly = bNew; } - void SetContour( BOOL bNew ) { bContour = bNew; } - void SetOutside( BOOL bNew ) { bOutside = bNew; } + sal_Bool IsAnchorOnly() const { return bAnchorOnly; } + sal_Bool IsContour() const { return bContour; } + sal_Bool IsOutside() const { return bOutside; } + void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( sal_uInt16( eNew ) ); } + void SetAnchorOnly( sal_Bool bNew ) { bAnchorOnly = bNew; } + void SetContour( sal_Bool bNew ) { bContour = bNew; } + void SetOutside( sal_Bool bNew ) { bOutside = bNew; } }; inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) @@ -83,10 +83,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) return *this; } -inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const +inline const SwFmtSurround &SwAttrSet::GetSurround(sal_Bool bInP) const { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } -inline const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const +inline const SwFmtSurround &SwFmt::GetSurround(sal_Bool bInP) const { return aSet.GetSurround(bInP); } #endif diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index ae2828899f1d..86241fb60649 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -44,7 +44,7 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem String sName; // Name des Anchors ImageMap *pMap; //ClientSide Images - BOOL bIsServerMap; //mit der URL eine ServerSideImageMap + sal_Bool bIsServerMap; //mit der URL eine ServerSideImageMap SwFmtURL& operator=( const SwFmtURL& ); @@ -64,16 +64,16 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; } - void SetURL( const String &rURL, BOOL bServerMap ); + void SetURL( const String &rURL, sal_Bool bServerMap ); void SetMap( const ImageMap *pM ); //Pointer wird kopiert! const String &GetTargetFrameName()const { return sTargetFrameName; } const String &GetURL() const { return sURL; } - BOOL IsServerMap() const { return bIsServerMap; } + sal_Bool IsServerMap() const { return bIsServerMap; } const ImageMap *GetMap() const { return pMap; } ImageMap *GetMap() { return pMap; } @@ -82,10 +82,10 @@ public: }; -inline const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const +inline const SwFmtURL &SwAttrSet::GetURL(sal_Bool bInP) const { return (const SwFmtURL&)Get( RES_URL,bInP); } -inline const SwFmtURL &SwFmt::GetURL(BOOL bInP) const +inline const SwFmtURL &SwFmt::GetURL(sal_Bool bInP) const { return aSet.GetURL(bInP); } #endif diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 031292514a47..1959ff1abf9f 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -56,8 +56,8 @@ public: virtual int operator==( const SfxPoolItem& _rAttr ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) 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 ); // direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); @@ -68,10 +68,10 @@ public: // <-- }; -inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(BOOL bInP) const +inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(sal_Bool bInP) const { return (const SwFmtWrapInfluenceOnObjPos&)Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP); } - inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(BOOL bInP) const + inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(sal_Bool bInP) const { return aSet.GetWrapInfluenceOnObjPos(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index d1a33db7b246..d6e51aa6a617 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -50,25 +50,25 @@ class SW_DLLPUBLIC SwFmt : public SwModify String aFmtName; SwAttrSet aSet; - USHORT nWhichId; - USHORT nFmtId; // Format-ID fuer Lesen/Schreiben - USHORT nPoolFmtId; // Id-fuer "automatich" erzeugte Formate + sal_uInt16 nWhichId; + sal_uInt16 nFmtId; // Format-ID fuer Lesen/Schreiben + sal_uInt16 nPoolFmtId; // Id-fuer "automatich" erzeugte Formate // (ist keine harte Attributierung !!) - USHORT nPoolHelpId; // HelpId fuer diese Pool-Vorlage - BYTE nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen - BOOL bWritten : 1; // TRUE: bereits geschrieben - BOOL bAutoFmt : 1; // FALSE: es handelt sich um eine Vorlage - // ist dflt immer auf TRUE ! - BOOL bFmtInDTOR : 1; // TRUE: das Format wird geloscht. Damit man in + sal_uInt16 nPoolHelpId; // HelpId fuer diese Pool-Vorlage + sal_uInt8 nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen + sal_Bool bWritten : 1; // sal_True: bereits geschrieben + sal_Bool bAutoFmt : 1; // sal_False: es handelt sich um eine Vorlage + // ist dflt immer auf sal_True ! + sal_Bool bFmtInDTOR : 1; // sal_True: das Format wird geloscht. Damit man in // der FmtChg-Message das erkennen kann!!! - BOOL bAutoUpdateFmt : 1; // TRUE: am Format werden die Attribute + sal_Bool bAutoUpdateFmt : 1; // sal_True: am Format werden die Attribute // eines kompletten Absatzes gesetzt (UI-seitig!) protected: SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - const USHORT* pWhichRanges, SwFmt *pDrvdFrm, USHORT nFmtWhich ); - SwFmt( SwAttrPool& rPool, const String &rFmtNm, const USHORT* pWhichRanges, - SwFmt *pDrvdFrm, USHORT nFmtWhich ); + const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); + SwFmt( SwAttrPool& rPool, const String &rFmtNm, const sal_uInt16* pWhichRanges, + SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); SwFmt( const SwFmt& rFmt ); public: @@ -78,44 +78,44 @@ public: SwFmt &operator=(const SwFmt&); // fuer die Abfrage der Writer-Funktionen - USHORT Which() const { return nWhichId; } + sal_uInt16 Which() const { return nWhichId; } virtual void Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue ); // erfrage vom Format Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // kopiere Attribute; auch ueber Dokumentgrenzen hinweg - void CopyAttrs( const SwFmt&, BOOL bReplace=TRUE ); + void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True ); // loesche alle Attribute, die nicht in rFmt stehen void DelDiffs( const SfxItemSet& rSet ); void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); } // Umhaengen des Formats (0 = Default) - BOOL SetDerivedFrom(SwFmt *pDerivedFrom = 0); + sal_Bool SetDerivedFrom(SwFmt *pDerivedFrom = 0); - // Ist bInParents FALSE, + // Ist bInParents sal_False, // wird nur in diesem Format nach dem Attribut gesucht. - inline const SfxPoolItem& GetFmtAttr( USHORT nWhich, - BOOL bInParents = TRUE ) const; - inline SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE, + inline const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich, + sal_Bool bInParents = sal_True ) const; + inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True, const SfxPoolItem **ppItem = 0 ) const; // --> OD 2008-03-03 #refactorlists# // methods renamed and made virtual - virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr ); - virtual BOOL SetFmtAttr( const SfxItemSet& rSet ); - virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); + virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr ); + virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet ); + virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); // <-- // --> OD 2007-01-24 #i73790# // Method renamed and made virtual // Nimmt alle Hints aus dem Delta-Array, // liefert die Anzahl der geloeschten Hints - virtual USHORT ResetAllFmtAttr(); + virtual sal_uInt16 ResetAllFmtAttr(); // <-- inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; } - inline BOOL IsDefault() const { return DerivedFrom() == 0; } + inline sal_Bool IsDefault() const { return DerivedFrom() == 0; } inline const String& GetName() const { return aFmtName; } void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False ); @@ -157,153 +157,153 @@ public: IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess(); // erfragen und setzen der Poolvorlagen-Id's - USHORT GetPoolFmtId() const { return nPoolFmtId; } - void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; } + sal_uInt16 GetPoolFmtId() const { return nPoolFmtId; } + void SetPoolFmtId( sal_uInt16 nId ) { nPoolFmtId = nId; } // erfragen und setzen der Hilfe-Id's fuer die Document-Vorlagen - USHORT GetPoolHelpId() const { return nPoolHelpId; } - void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; } - BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; } - void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; } + sal_uInt16 GetPoolHelpId() const { return nPoolHelpId; } + void SetPoolHelpId( sal_uInt16 nId ) { nPoolHelpId = nId; } + sal_uInt8 GetPoolHlpFileId() const { return nPoolHlpFileId; } + void SetPoolHlpFileId( sal_uInt8 nId ) { nPoolHlpFileId = nId; } // erfrage die Attribut-Beschreibung, returnt den reingereichten String void GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); } // Das Format-ID fuer Lesen/Schreiben: - void ResetWritten() { bWritten = FALSE; } + void ResetWritten() { bWritten = sal_False; } // Abfragen/Setzen vom AutoFmt-Flag - BOOL IsAuto() const { return bAutoFmt; } - void SetAuto( BOOL bNew = FALSE ) { bAutoFmt = bNew; } + sal_Bool IsAuto() const { return bAutoFmt; } + void SetAuto( sal_Bool bNew = sal_False ) { bAutoFmt = bNew; } // Abfragen/Setzen vom bAutoUpdateFmt-Flag - BOOL IsAutoUpdateFmt() const { return bAutoUpdateFmt; } - void SetAutoUpdateFmt( BOOL bNew = TRUE ) { bAutoUpdateFmt = bNew; } + sal_Bool IsAutoUpdateFmt() const { return bAutoUpdateFmt; } + void SetAutoUpdateFmt( sal_Bool bNew = sal_True ) { bAutoUpdateFmt = bNew; } - BOOL IsFmtInDTOR() const { return bFmtInDTOR; } + sal_Bool IsFmtInDTOR() const { return bFmtInDTOR; } - // GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in + // GetMethoden: das Bool gibt an, ob nur im Set (sal_False) oder auch in // den Parents gesucht werden soll. Wird nichts gefunden, // wird das deflt. Attribut returnt. // Charakter-Attribute - impl. steht im charatr.hxx // AMA 12.10.94: Umstellung von SwFmt... auf Svx... - inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const; - inline const SvxShadowedItem &GetShadowed( BOOL = TRUE ) const; - inline const SvxAutoKernItem &GetAutoKern( BOOL = TRUE ) const; - inline const SvxWordLineModeItem &GetWordLineMode( BOOL = TRUE ) const; - inline const SvxContourItem &GetContour( BOOL = TRUE ) const; - inline const SvxKerningItem &GetKerning( BOOL = TRUE ) const; - inline const SvxUnderlineItem &GetUnderline( BOOL = TRUE ) const; - inline const SvxOverlineItem &GetOverline( BOOL = TRUE ) const; - inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const; - inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const; - inline const SvxFontItem &GetFont( BOOL = TRUE ) const; - inline const SvxColorItem &GetColor( BOOL = TRUE ) const; - inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const; - inline const SvxEscapementItem &GetEscapement( BOOL = TRUE ) const; - inline const SvxCaseMapItem &GetCaseMap( BOOL = TRUE ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( BOOL = TRUE ) const; - inline const SvxBlinkItem &GetBlink( BOOL = TRUE ) const; - inline const SvxBrushItem &GetChrBackground( BOOL = TRUE ) const; - - inline const SvxFontItem &GetCJKFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCJKSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCJKLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCJKPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCJKWeight( BOOL = TRUE ) const; - inline const SvxFontItem &GetCTLFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCTLSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCTLLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCTLPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCTLWeight( BOOL = TRUE ) const; - inline const SfxBoolItem &GetWritingDirection( BOOL = TRUE ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const; - inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const; - inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const; - inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const; - inline const SvxCharHiddenItem &GetCharHidden( BOOL = TRUE ) const; + inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const; + inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const; + inline const SvxAutoKernItem &GetAutoKern( sal_Bool = sal_True ) const; + inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const; + inline const SvxContourItem &GetContour( sal_Bool = sal_True ) const; + inline const SvxKerningItem &GetKerning( sal_Bool = sal_True ) const; + inline const SvxUnderlineItem &GetUnderline( sal_Bool = sal_True ) const; + inline const SvxOverlineItem &GetOverline( sal_Bool = sal_True ) const; + inline const SvxCrossedOutItem &GetCrossedOut( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetSize( sal_Bool = sal_True ) const; + inline const SvxPropSizeItem &GetPropSize( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetFont( sal_Bool = sal_True ) const; + inline const SvxColorItem &GetColor( sal_Bool = sal_True ) const; + inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetLanguage( sal_Bool = sal_True ) const; + inline const SvxEscapementItem &GetEscapement( sal_Bool = sal_True ) const; + inline const SvxCaseMapItem &GetCaseMap( sal_Bool = sal_True ) const; + inline const SvxNoHyphenItem &GetNoHyphenHere( sal_Bool = sal_True ) const; + inline const SvxBlinkItem &GetBlink( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetChrBackground( sal_Bool = sal_True ) const; + + inline const SvxFontItem &GetCJKFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCJKSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCJKLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCJKPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCJKWeight( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetCTLFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCTLSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCTLLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCTLPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCTLWeight( sal_Bool = sal_True ) const; + inline const SfxBoolItem &GetWritingDirection( sal_Bool = sal_True ) const; + inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const; + inline const SvxTwoLinesItem &Get2Lines( sal_Bool = sal_True ) const; + inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const; + inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; + inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; + inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; // Frame-Attribute - impl. steht im frmatr.hxx, - inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - inline const SwFmtCol &GetCol( BOOL = TRUE ) const; - inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - inline const SvxBoxItem &GetBox( BOOL = TRUE ) const; - inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - inline const SwFmtURL &GetURL( BOOL = TRUE ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; - inline const SwFmtRowSplit &GetRowSplit( BOOL = TRUE ) const; - inline const SwFmtChain &GetChain( BOOL = TRUE ) const; - inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; - inline const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const; - inline const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const; - inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const; + inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; + inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const; + inline const SwFmtHeader &GetHeader( sal_Bool = sal_True ) const; + inline const SwFmtFooter &GetFooter( sal_Bool = sal_True ) const; + inline const SwFmtSurround &GetSurround( sal_Bool = sal_True ) const; + inline const SwFmtHoriOrient &GetHoriOrient( sal_Bool = sal_True ) const; + inline const SwFmtAnchor &GetAnchor( sal_Bool = sal_True ) const; + inline const SwFmtCol &GetCol( sal_Bool = sal_True ) const; + inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const; + inline const SvxLRSpaceItem &GetLRSpace( sal_Bool = sal_True ) const; + inline const SvxULSpaceItem &GetULSpace( sal_Bool = sal_True ) const; + inline const SwFmtCntnt &GetCntnt( sal_Bool = sal_True ) const; + inline const SvxPrintItem &GetPrint( sal_Bool = sal_True ) const; + inline const SvxOpaqueItem &GetOpaque( sal_Bool = sal_True ) const; + inline const SvxProtectItem &GetProtect( sal_Bool = sal_True ) const; + inline const SwFmtVertOrient &GetVertOrient( sal_Bool = sal_True ) const; + inline const SvxBoxItem &GetBox( sal_Bool = sal_True ) const; + inline const SvxFmtKeepItem &GetKeep( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetBackground( sal_Bool = sal_True ) const; + inline const SvxShadowItem &GetShadow( sal_Bool = sal_True ) const; + inline const SwFmtPageDesc &GetPageDesc( sal_Bool = sal_True ) const; + inline const SvxFmtBreakItem &GetBreak( sal_Bool = sal_True ) const; + inline const SvxMacroItem &GetMacro( sal_Bool = sal_True ) const; + inline const SwFmtURL &GetURL( sal_Bool = sal_True ) const; + inline const SwFmtEditInReadonly &GetEditInReadonly( sal_Bool = sal_True ) const; + inline const SwFmtLayoutSplit &GetLayoutSplit( sal_Bool = sal_True ) const; + inline const SwFmtRowSplit &GetRowSplit( sal_Bool = sal_True ) const; + inline const SwFmtChain &GetChain( sal_Bool = sal_True ) const; + inline const SwFmtLineNumber &GetLineNumber( sal_Bool = sal_True ) const; + inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const; + inline const SvxFrameDirectionItem &GetFrmDir( sal_Bool = sal_True ) const; + inline const SwTextGridItem &GetTextGrid( sal_Bool = sal_True ) const; + inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const; // OD 18.09.2003 #i18732# - inline const SwFmtFollowTextFlow &GetFollowTextFlow(BOOL = TRUE) const; + inline const SwFmtFollowTextFlow &GetFollowTextFlow(sal_Bool = sal_True) const; // OD 2004-05-05 #i28701# - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const; + inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const; // Grafik-Attribute - impl. steht im grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; - inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const; - inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const; - inline const SwContrastGrf &GetContrastGrf(BOOL = TRUE ) const; - inline const SwChannelRGrf &GetChannelRGrf(BOOL = TRUE ) const; - inline const SwChannelGGrf &GetChannelGGrf(BOOL = TRUE ) const; - inline const SwChannelBGrf &GetChannelBGrf(BOOL = TRUE ) const; - inline const SwGammaGrf &GetGammaGrf(BOOL = TRUE ) const; - inline const SwInvertGrf &GetInvertGrf(BOOL = TRUE ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(BOOL = TRUE ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(BOOL = TRUE ) const; + inline const SwMirrorGrf &GetMirrorGrf( sal_Bool = sal_True ) const; + inline const SwCropGrf &GetCropGrf( sal_Bool = sal_True ) const; + inline const SwRotationGrf &GetRotationGrf(sal_Bool = sal_True ) const; + inline const SwLuminanceGrf &GetLuminanceGrf(sal_Bool = sal_True ) const; + inline const SwContrastGrf &GetContrastGrf(sal_Bool = sal_True ) const; + inline const SwChannelRGrf &GetChannelRGrf(sal_Bool = sal_True ) const; + inline const SwChannelGGrf &GetChannelGGrf(sal_Bool = sal_True ) const; + inline const SwChannelBGrf &GetChannelBGrf(sal_Bool = sal_True ) const; + inline const SwGammaGrf &GetGammaGrf(sal_Bool = sal_True ) const; + inline const SwInvertGrf &GetInvertGrf(sal_Bool = sal_True ) const; + inline const SwTransparencyGrf &GetTransparencyGrf(sal_Bool = sal_True ) const; + inline const SwDrawModeGrf &GetDrawModeGrf(sal_Bool = sal_True ) const; // Paragraph-Attribute - impl. steht im paratr.hxx - inline const SvxLineSpacingItem &GetLineSpacing( BOOL = TRUE ) const; - inline const SvxAdjustItem &GetAdjust( BOOL = TRUE ) const; - inline const SvxFmtSplitItem &GetSplit( BOOL = TRUE ) const; - inline const SwRegisterItem &GetRegister( BOOL = TRUE ) const; - inline const SwNumRuleItem &GetNumRule( BOOL = TRUE ) const; - inline const SvxWidowsItem &GetWidows( BOOL = TRUE ) const; - inline const SvxOrphansItem &GetOrphans( BOOL = TRUE ) const; - inline const SvxTabStopItem &GetTabStops( BOOL = TRUE ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( BOOL = TRUE ) const; - inline const SwFmtDrop &GetDrop( BOOL = TRUE ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(BOOL = TRUE) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(BOOL = TRUE) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const; - inline const SvxParaGridItem &GetParaGrid(BOOL = TRUE) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const; + inline const SvxLineSpacingItem &GetLineSpacing( sal_Bool = sal_True ) const; + inline const SvxAdjustItem &GetAdjust( sal_Bool = sal_True ) const; + inline const SvxFmtSplitItem &GetSplit( sal_Bool = sal_True ) const; + inline const SwRegisterItem &GetRegister( sal_Bool = sal_True ) const; + inline const SwNumRuleItem &GetNumRule( sal_Bool = sal_True ) const; + inline const SvxWidowsItem &GetWidows( sal_Bool = sal_True ) const; + inline const SvxOrphansItem &GetOrphans( sal_Bool = sal_True ) const; + inline const SvxTabStopItem &GetTabStops( sal_Bool = sal_True ) const; + inline const SvxHyphenZoneItem &GetHyphenZone( sal_Bool = sal_True ) const; + inline const SwFmtDrop &GetDrop( sal_Bool = sal_True ) const; + inline const SvxScriptSpaceItem &GetScriptSpace(sal_Bool = sal_True) const; + inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const; + inline const SvxForbiddenRuleItem &GetForbiddenRule(sal_Bool = sal_True) const; + inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const; + inline const SvxParaGridItem &GetParaGrid(sal_Bool = sal_True) const; + inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const; // TabellenBox-Attribute - impl. steht im cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; - inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; + inline const SwTblBoxNumFormat &GetTblBoxNumFmt( sal_Bool = sal_True ) const; + inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; + inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; /** SwFmt::IsBackgroundTransparent - for feature #99657# @@ -334,8 +334,8 @@ public: // --------------- inline Implementierungen ------------------------ -inline const SfxPoolItem& SwFmt::GetFmtAttr( USHORT nWhich, - BOOL bInParents ) const +inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, + sal_Bool bInParents ) const { return aSet.Get( nWhich, bInParents ); } @@ -347,7 +347,7 @@ inline void SwFmt::SetName( const sal_Char* pNewName, SetName( aTmp, bBroadcast ); } -inline SfxItemState SwFmt::GetItemState( USHORT nWhich, BOOL bSrchInParent, +inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, const SfxPoolItem **ppItem ) const { return aSet.GetItemState( nWhich, bSrchInParent, ppItem ); diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 93f7a60123c5..94deef35e018 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -37,31 +37,31 @@ * Implementierung der FrameAttribut Methoden vom SwAttrSet ******************************************************************************/ -inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const +inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(sal_Bool bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } -inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const +inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(sal_Bool bInP) const { return (const SvxLRSpaceItem&)Get( RES_LR_SPACE,bInP); } -inline const SvxULSpaceItem &SwAttrSet::GetULSpace(BOOL bInP) const +inline const SvxULSpaceItem &SwAttrSet::GetULSpace(sal_Bool bInP) const { return (const SvxULSpaceItem&)Get( RES_UL_SPACE,bInP); } -inline const SvxPrintItem &SwAttrSet::GetPrint(BOOL bInP) const +inline const SvxPrintItem &SwAttrSet::GetPrint(sal_Bool bInP) const { return (const SvxPrintItem&)Get( RES_PRINT,bInP); } -inline const SvxOpaqueItem &SwAttrSet::GetOpaque(BOOL bInP) const +inline const SvxOpaqueItem &SwAttrSet::GetOpaque(sal_Bool bInP) const { return (const SvxOpaqueItem&)Get( RES_OPAQUE,bInP); } -inline const SvxProtectItem &SwAttrSet::GetProtect(BOOL bInP) const +inline const SvxProtectItem &SwAttrSet::GetProtect(sal_Bool bInP) const { return (const SvxProtectItem&)Get( RES_PROTECT,bInP); } -inline const SvxBoxItem &SwAttrSet::GetBox(BOOL bInP) const +inline const SvxBoxItem &SwAttrSet::GetBox(sal_Bool bInP) const { return (const SvxBoxItem&)Get( RES_BOX,bInP); } -inline const SvxFmtKeepItem &SwAttrSet::GetKeep(BOOL bInP) const +inline const SvxFmtKeepItem &SwAttrSet::GetKeep(sal_Bool bInP) const { return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); } -inline const SvxBrushItem &SwAttrSet::GetBackground(BOOL bInP) const +inline const SvxBrushItem &SwAttrSet::GetBackground(sal_Bool bInP) const { return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); } -inline const SvxShadowItem &SwAttrSet::GetShadow(BOOL bInP) const +inline const SvxShadowItem &SwAttrSet::GetShadow(sal_Bool bInP) const { return (const SvxShadowItem&)Get( RES_SHADOW,bInP); } -inline const SvxFmtBreakItem &SwAttrSet::GetBreak(BOOL bInP) const +inline const SvxFmtBreakItem &SwAttrSet::GetBreak(sal_Bool bInP) const { return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); } -inline const SvxMacroItem &SwAttrSet::GetMacro(BOOL bInP) const +inline const SvxMacroItem &SwAttrSet::GetMacro(sal_Bool bInP) const { return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); } -inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(BOOL bInP) const +inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(sal_Bool bInP) const { return (const SvxFrameDirectionItem&)Get( RES_FRAMEDIR,bInP); } @@ -69,31 +69,31 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(BOOL bInP) const * Implementierung der FrameAttribut Methoden vom SwFmt ******************************************************************************/ -inline const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const +inline const SvxPaperBinItem &SwFmt::GetPaperBin(sal_Bool bInP) const { return aSet.GetPaperBin(bInP); } -inline const SvxLRSpaceItem &SwFmt::GetLRSpace(BOOL bInP) const +inline const SvxLRSpaceItem &SwFmt::GetLRSpace(sal_Bool bInP) const { return aSet.GetLRSpace(bInP); } -inline const SvxULSpaceItem &SwFmt::GetULSpace(BOOL bInP) const +inline const SvxULSpaceItem &SwFmt::GetULSpace(sal_Bool bInP) const { return aSet.GetULSpace(bInP); } -inline const SvxPrintItem &SwFmt::GetPrint(BOOL bInP) const +inline const SvxPrintItem &SwFmt::GetPrint(sal_Bool bInP) const { return aSet.GetPrint(bInP); } -inline const SvxOpaqueItem &SwFmt::GetOpaque(BOOL bInP) const +inline const SvxOpaqueItem &SwFmt::GetOpaque(sal_Bool bInP) const { return aSet.GetOpaque(bInP); } -inline const SvxProtectItem &SwFmt::GetProtect(BOOL bInP) const +inline const SvxProtectItem &SwFmt::GetProtect(sal_Bool bInP) const { return aSet.GetProtect(bInP); } -inline const SvxBoxItem &SwFmt::GetBox(BOOL bInP) const +inline const SvxBoxItem &SwFmt::GetBox(sal_Bool bInP) const { return aSet.GetBox(bInP); } -inline const SvxFmtKeepItem &SwFmt::GetKeep(BOOL bInP) const +inline const SvxFmtKeepItem &SwFmt::GetKeep(sal_Bool bInP) const { return aSet.GetKeep(bInP); } -inline const SvxBrushItem &SwFmt::GetBackground(BOOL bInP) const +inline const SvxBrushItem &SwFmt::GetBackground(sal_Bool bInP) const { return aSet.GetBackground(bInP); } -inline const SvxShadowItem &SwFmt::GetShadow(BOOL bInP) const +inline const SvxShadowItem &SwFmt::GetShadow(sal_Bool bInP) const { return aSet.GetShadow(bInP); } -inline const SvxFmtBreakItem &SwFmt::GetBreak(BOOL bInP) const +inline const SvxFmtBreakItem &SwFmt::GetBreak(sal_Bool bInP) const { return aSet.GetBreak(bInP); } -inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const +inline const SvxMacroItem &SwFmt::GetMacro(sal_Bool bInP) const { return aSet.GetMacro(bInP); } -inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const +inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(sal_Bool bInP) const { return aSet.GetFrmDir(bInP); } #endif //_FRMATR_HXX diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 4829775cf0fb..16c72e1a9d19 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -58,15 +58,15 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt protected: SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm, USHORT nFmtWhich = RES_FRMFMT, - const USHORT* pWhichRange = 0 ) + SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich ) {} SwFrmFmt( SwAttrPool& rPool, const String &rFmtNm, - SwFrmFmt *pDrvdFrm, USHORT nFmtWhich = RES_FRMFMT, - const USHORT* pWhichRange = 0 ) + SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich ) {} @@ -94,9 +94,9 @@ public: // Gibt die tatsaechlche Groesse des Frames zurueck bzw. ein leeres // Rechteck, wenn kein Layout existiert. Wird pPoint angegeben, dann // wird der am dichtesten liegende Frame gesucht. - SwRect FindLayoutRect( const BOOL bPrtArea = FALSE, + SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False, const Point* pPoint = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; // Sucht das SdrObject. Der SdrObjUserCall ist Client vom Format. // Der UserCall kennt sein SdrObject. @@ -116,7 +116,7 @@ public: const SdrObject *FindRealSdrObject() const { return ((SwFrmFmt*)this)->FindRealSdrObject(); } - BOOL IsLowerOf( const SwFrmFmt& rFmt ) const; + sal_Bool IsLowerOf( const SwFrmFmt& rFmt ) const; // --> OD 2004-07-27 #i31698# enum tLayoutDir @@ -182,14 +182,14 @@ public: virtual void MakeFrms(); SwFlyFrm* GetFrm( const Point* pDocPos = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; virtual Graphic MakeGraphic( ImageMap* pMap = NULL ); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // --> OD 2009-07-14 #i73249# const String GetObjTitle() const; diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index aa5ecc829364..9e645ee32e3c 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -52,7 +52,7 @@ public: void UpdateFtn( const SwNodeIndex& rStt ); // ab Pos. alle Updaten void UpdateAllFtn(); // alle Fussnoten updaten - SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, USHORT* pPos = 0 ) const; + SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, sal_uInt16* pPos = 0 ) const; }; @@ -69,8 +69,8 @@ public: static const SwSectionNode* FindSectNdWithEndAttr( const SwTxtFtn& rTxtFtn ); - USHORT GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd ); - USHORT ChkNumber( const SwTxtFtn& rTxtFtn ); + sal_uInt16 GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd ); + sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn ); }; diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index c3b9f7c7dc13..6a5a5c583eba 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -50,7 +50,7 @@ protected: bool m_bEndNote; public: SvxNumberType aFmt; - USHORT nFtnOffset; + sal_uInt16 nFtnOffset; void ChgPageDesc( SwPageDesc *pDesc ); SwPageDesc *GetPageDesc( SwDoc &rDoc ) const; @@ -70,7 +70,7 @@ public: virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); SwEndNoteInfo & operator=(const SwEndNoteInfo&); - BOOL operator==( const SwEndNoteInfo &rInf ) const; + sal_Bool operator==( const SwEndNoteInfo &rInf ) const; SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0); SwEndNoteInfo(const SwEndNoteInfo&); @@ -107,7 +107,7 @@ public: SwFtnInfo& operator=(const SwFtnInfo&); - BOOL operator==( const SwFtnInfo &rInf ) const; + sal_Bool operator==( const SwFtnInfo &rInf ) const; SwFtnInfo(SwTxtFmtColl* pTxtColl = 0); SwFtnInfo(const SwFtnInfo&); diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index bee336490450..28c24e16b48a 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -52,11 +52,11 @@ RES_MIRROR_GRAPH_END class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem { - BOOL bGrfToggle; // auf geraden Seiten Grafiken spiegeln + sal_Bool bGrfToggle; // auf geraden Seiten Grafiken spiegeln public: SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT ) - : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< USHORT >(eMiro) ), bGrfToggle( sal_False ) + : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< sal_uInt16 >(eMiro) ), bGrfToggle( sal_False ) {} SwMirrorGrf( const SwMirrorGrf &rMirrorGrf ) : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()), @@ -67,7 +67,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // pure virtual-Methiden von SfxEnumItem - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -75,10 +75,10 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 ); inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) { @@ -87,8 +87,8 @@ public: return *this; } - inline BOOL IsGrfToggle() const { return bGrfToggle; } - inline void SetGrfToggle( BOOL bNew ) { bGrfToggle = bNew; } + inline sal_Bool IsGrfToggle() const { return bGrfToggle; } + inline void SetGrfToggle( sal_Bool bNew ) { bGrfToggle = bNew; } }; @@ -127,10 +127,10 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; } const Size& GetUnrotatedSize() const { return aUnrotatedSize; } @@ -171,7 +171,7 @@ public: class SwChannelGrf : public SfxInt16Item { protected: - SwChannelGrf( sal_Int16 nVal, USHORT nWhichL ) + SwChannelGrf( sal_Int16 nVal, sal_uInt16 nWhichL ) : SfxInt16Item( nWhichL, nVal ) {} @@ -236,10 +236,10 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) 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 double& GetValue() const { return nValue; } @@ -276,16 +276,16 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); }; class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem { public: - SwDrawModeGrf( USHORT nMode = 0 ) + SwDrawModeGrf( sal_uInt16 nMode = 0 ) : SfxEnumItem( RES_GRFATR_DRAWMODE, nMode ) {} @@ -293,17 +293,17 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // pure virtual-Methiden von SfxEnumItem - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); }; @@ -312,58 +312,58 @@ public: * Implementierung der GrafikAttribut Methoden vom SwAttrSet ******************************************************************************/ -inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const +inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(sal_Bool bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } -inline const SwCropGrf &SwAttrSet::GetCropGrf(BOOL bInP) const +inline const SwCropGrf &SwAttrSet::GetCropGrf(sal_Bool bInP) const { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); } -inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const +inline const SwRotationGrf &SwAttrSet::GetRotationGrf(sal_Bool bInP) const { return (const SwRotationGrf&)Get( RES_GRFATR_ROTATION,bInP); } -inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(BOOL bInP) const +inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(sal_Bool bInP) const { return (const SwLuminanceGrf&)Get( RES_GRFATR_LUMINANCE,bInP); } -inline const SwContrastGrf &SwAttrSet::GetContrastGrf(BOOL bInP) const +inline const SwContrastGrf &SwAttrSet::GetContrastGrf(sal_Bool bInP) const { return (const SwContrastGrf&)Get( RES_GRFATR_CONTRAST,bInP); } -inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(BOOL bInP) const +inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(sal_Bool bInP) const { return (const SwChannelRGrf&)Get( RES_GRFATR_CHANNELR,bInP); } -inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(BOOL bInP) const +inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(sal_Bool bInP) const { return (const SwChannelGGrf&)Get( RES_GRFATR_CHANNELG,bInP); } -inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(BOOL bInP) const +inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(sal_Bool bInP) const { return (const SwChannelBGrf&)Get( RES_GRFATR_CHANNELB,bInP); } -inline const SwGammaGrf &SwAttrSet::GetGammaGrf(BOOL bInP) const +inline const SwGammaGrf &SwAttrSet::GetGammaGrf(sal_Bool bInP) const { return (const SwGammaGrf&)Get( RES_GRFATR_GAMMA,bInP); } -inline const SwInvertGrf &SwAttrSet::GetInvertGrf(BOOL bInP) const +inline const SwInvertGrf &SwAttrSet::GetInvertGrf(sal_Bool bInP) const { return (const SwInvertGrf&)Get( RES_GRFATR_INVERT,bInP); } -inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(BOOL bInP) const +inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(sal_Bool bInP) const { return (const SwTransparencyGrf&)Get( RES_GRFATR_TRANSPARENCY,bInP); } -inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const +inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(sal_Bool bInP) const { return (const SwDrawModeGrf&)Get( RES_GRFATR_DRAWMODE,bInP); } /****************************************************************************** * Implementierung der GrafikAttribut Methoden vom SwFmt ******************************************************************************/ -inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const +inline const SwMirrorGrf &SwFmt::GetMirrorGrf(sal_Bool bInP) const { return aSet.GetMirrorGrf(bInP); } -inline const SwCropGrf &SwFmt::GetCropGrf(BOOL bInP) const +inline const SwCropGrf &SwFmt::GetCropGrf(sal_Bool bInP) const { return aSet.GetCropGrf(bInP); } -inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const +inline const SwRotationGrf &SwFmt::GetRotationGrf(sal_Bool bInP) const { return aSet.GetRotationGrf(bInP); } -inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(BOOL bInP) const +inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(sal_Bool bInP) const { return aSet.GetLuminanceGrf( bInP); } -inline const SwContrastGrf &SwFmt::GetContrastGrf(BOOL bInP) const +inline const SwContrastGrf &SwFmt::GetContrastGrf(sal_Bool bInP) const { return aSet.GetContrastGrf( bInP); } -inline const SwChannelRGrf &SwFmt::GetChannelRGrf(BOOL bInP) const +inline const SwChannelRGrf &SwFmt::GetChannelRGrf(sal_Bool bInP) const { return aSet.GetChannelRGrf( bInP); } -inline const SwChannelGGrf &SwFmt::GetChannelGGrf(BOOL bInP) const +inline const SwChannelGGrf &SwFmt::GetChannelGGrf(sal_Bool bInP) const { return aSet.GetChannelGGrf( bInP); } -inline const SwChannelBGrf &SwFmt::GetChannelBGrf(BOOL bInP) const +inline const SwChannelBGrf &SwFmt::GetChannelBGrf(sal_Bool bInP) const { return aSet.GetChannelBGrf( bInP); } -inline const SwGammaGrf &SwFmt::GetGammaGrf(BOOL bInP) const +inline const SwGammaGrf &SwFmt::GetGammaGrf(sal_Bool bInP) const { return aSet.GetGammaGrf( bInP); } -inline const SwInvertGrf &SwFmt::GetInvertGrf(BOOL bInP) const +inline const SwInvertGrf &SwFmt::GetInvertGrf(sal_Bool bInP) const { return aSet.GetInvertGrf( bInP); } -inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(BOOL bInP) const +inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(sal_Bool bInP) const { return aSet.GetTransparencyGrf( bInP); } -inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(BOOL bInP) const +inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(sal_Bool bInP) const { return aSet.GetDrawModeGrf(bInP); } diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 3d5ed332455e..0a4103688335 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -37,8 +37,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwHeaderAndFooterEatSpacingItem : public SfxBoolItem { public: - SwHeaderAndFooterEatSpacingItem( USHORT nId = RES_HEADER_FOOTER_EAT_SPACING, - BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {} + SwHeaderAndFooterEatSpacingItem( sal_uInt16 nId = RES_HEADER_FOOTER_EAT_SPACING, + sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -49,10 +49,10 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(BOOL bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const { return (const SwHeaderAndFooterEatSpacingItem&)Get( RES_HEADER_FOOTER_EAT_SPACING,bInP); } -inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(BOOL bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const { return aSet.GetHeaderAndFooterEatSpacing(bInP); } #endif diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 7f794757aa26..7b60590db033 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -51,8 +51,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion // SwPaM or SwPosition by replace operations!) sal_Int32 nUnitOffset; - USHORT nPageCount; // page count for progress bar - USHORT nPageStart; // first checked page + sal_uInt16 nPageCount; // page count for progress bar + sal_uInt16 nPageStart; // first checked page sal_Bool bIsDrawObj; sal_Bool bIsStart; @@ -83,8 +83,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion SwPaM *pCrsr ); void ChangeText_impl( const String &rNewText, sal_Bool bKeepAttributes ); - inline BOOL IsDrawObj() { return bIsDrawObj; } - inline void SetDrawObj( BOOL bNew ) { bIsDrawObj = bNew; } + inline sal_Bool IsDrawObj() { return bIsDrawObj; } + inline void SetDrawObj( sal_Bool bNew ) { bIsDrawObj = bNew; } protected: virtual void GetNextPortion( ::rtl::OUString& rNextPortion, diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 8a6f536ad46b..c7aa3638d90a 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -379,48 +379,48 @@ RES_FLTRATTR_END #define RES_WHICHHINT_END HINT_END -inline bool isATR(const USHORT nWhich) +inline bool isATR(const sal_uInt16 nWhich) { return (RES_CHRATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich); } -inline bool isCHRATR(const USHORT nWhich) +inline bool isCHRATR(const sal_uInt16 nWhich) { return (RES_CHRATR_BEGIN <= nWhich) && (RES_CHRATR_END > nWhich); } -inline bool isTXTATR_WITHEND(const USHORT nWhich) +inline bool isTXTATR_WITHEND(const sal_uInt16 nWhich) { return (RES_TXTATR_WITHEND_BEGIN <= nWhich) && (RES_TXTATR_WITHEND_END > nWhich); } -inline bool isTXTATR_NOEND(const USHORT nWhich) +inline bool isTXTATR_NOEND(const sal_uInt16 nWhich) { return (RES_TXTATR_NOEND_BEGIN <= nWhich) && (RES_TXTATR_NOEND_END > nWhich); } -inline bool isTXTATR(const USHORT nWhich) +inline bool isTXTATR(const sal_uInt16 nWhich) { return (RES_TXTATR_BEGIN <= nWhich) && (RES_TXTATR_END > nWhich); } -inline bool isPARATR(const USHORT nWhich) +inline bool isPARATR(const sal_uInt16 nWhich) { return (RES_PARATR_BEGIN <= nWhich) && (RES_PARATR_END > nWhich); } -inline bool isPARATR_LIST(const USHORT nWhich) +inline bool isPARATR_LIST(const sal_uInt16 nWhich) { return (RES_PARATR_LIST_BEGIN <= nWhich) && (RES_PARATR_LIST_END > nWhich); } -inline bool isFRMATR(const USHORT nWhich) +inline bool isFRMATR(const sal_uInt16 nWhich) { return (RES_FRMATR_BEGIN <= nWhich) && (RES_FRMATR_END > nWhich); } -inline bool isGRFATR(const USHORT nWhich) +inline bool isGRFATR(const sal_uInt16 nWhich) { return (RES_GRFATR_BEGIN <= nWhich) && (RES_GRFATR_END > nWhich); } -inline bool isBOXATR(const USHORT nWhich) +inline bool isBOXATR(const sal_uInt16 nWhich) { return (RES_BOXATR_BEGIN <= nWhich) && (RES_BOXATR_END > nWhich); } -inline bool isUNKNOWNATR(const USHORT nWhich) +inline bool isUNKNOWNATR(const sal_uInt16 nWhich) { return (RES_UNKNOWNATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich); } @@ -442,9 +442,9 @@ typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ]; extern SwDfltAttrTab __FAR_DATA aAttrTab; extern SfxItemInfo __FAR_DATA aSlotTab[]; -SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich ); +SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich ); -SW_DLLPUBLIC USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript ); +SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript ); // return for the given TextAttribut without an end the correct character. // This function returns @@ -456,31 +456,31 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ); // alle Sets stehen im init.cxx // AttrSet-Range fuer die 3 Break-Attribute -extern USHORT __FAR_DATA aBreakSetRange[]; +extern sal_uInt16 __FAR_DATA aBreakSetRange[]; // AttrSet-Range fuer die TxtFmtColl -extern USHORT __FAR_DATA aTxtFmtCollSetRange[]; +extern sal_uInt16 __FAR_DATA aTxtFmtCollSetRange[]; // AttrSet-Range fuer die GrfFmtColl -extern USHORT __FAR_DATA aGrfFmtCollSetRange[]; +extern sal_uInt16 __FAR_DATA aGrfFmtCollSetRange[]; // AttrSet-Range fuer die TextNode -SW_DLLPUBLIC extern USHORT __FAR_DATA aTxtNodeSetRange[]; +SW_DLLPUBLIC extern sal_uInt16 __FAR_DATA aTxtNodeSetRange[]; // AttrSet-Range fuer die NoTxtNode -extern USHORT __FAR_DATA aNoTxtNodeSetRange[]; +extern sal_uInt16 __FAR_DATA aNoTxtNodeSetRange[]; // AttrSet-Range fuer die SwTable -extern USHORT __FAR_DATA aTableSetRange[]; +extern sal_uInt16 __FAR_DATA aTableSetRange[]; // AttrSet-Range fuer die SwTableLine -extern USHORT __FAR_DATA aTableLineSetRange[]; +extern sal_uInt16 __FAR_DATA aTableLineSetRange[]; // AttrSet-Range fuer die SwTableBox -extern USHORT __FAR_DATA aTableBoxSetRange[]; +extern sal_uInt16 __FAR_DATA aTableBoxSetRange[]; // AttrSet-Range fuer die SwFrmFmt -SW_DLLPUBLIC extern USHORT __FAR_DATA aFrmFmtSetRange[]; +SW_DLLPUBLIC extern sal_uInt16 __FAR_DATA aFrmFmtSetRange[]; // AttrSet-Range fuer die SwCharFmt -extern USHORT __FAR_DATA aCharFmtSetRange[]; +extern sal_uInt16 __FAR_DATA aCharFmtSetRange[]; // AttrSet-Range fuer die character autostyles -extern USHORT __FAR_DATA aCharAutoFmtSetRange[]; +extern sal_uInt16 __FAR_DATA aCharAutoFmtSetRange[]; // AttrSet-Range fuer die SwPageDescFmt -extern USHORT __FAR_DATA aPgFrmFmtSetRange[]; +extern sal_uInt16 __FAR_DATA aPgFrmFmtSetRange[]; // check if ID is InRange of AttrSet-Ids -BOOL IsInRange( const USHORT* pRange, const USHORT nId ); +sal_Bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId ); #endif diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index b706dbdeab21..8476d8542f70 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -48,7 +48,7 @@ class SwHistory; class SwMsgPoolItem : public SfxPoolItem { public: - SwMsgPoolItem( USHORT nWhich ); + SwMsgPoolItem( sal_uInt16 nWhich ); // "Overhead" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; @@ -65,7 +65,7 @@ class SwPtrMsgPoolItem : public SwMsgPoolItem public: void * pObject; - SwPtrMsgPoolItem( USHORT nId, void * pObj ) + SwPtrMsgPoolItem( sal_uInt16 nId, void * pObj ) : SwMsgPoolItem( nId ), pObject( pObj ) {} }; @@ -116,8 +116,8 @@ class SwUpdateAttr: public SwMsgPoolItem public: xub_StrLen nStart; xub_StrLen nEnd; - USHORT nWhichAttr; - SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, USHORT nW ); + sal_uInt16 nWhichAttr; + SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, sal_uInt16 nW ); }; @@ -161,10 +161,10 @@ public: const String* pNewTblNm; // Split: der Name der neuen Tabelle } DATA; SwHistory* pHistory; - USHORT nSplitLine; // Split: ab dieser BaseLine wird gespl. + sal_uInt16 nSplitLine; // Split: ab dieser BaseLine wird gespl. TableFmlUpdtFlags eFlags; - BOOL bModified : 1; - BOOL bBehindSplitLine : 1; + sal_Bool bModified : 1; + sal_Bool bBehindSplitLine : 1; SwTableFmlUpdate( const SwTable* ); }; @@ -186,7 +186,7 @@ public: */ class SwAttrSetChg: public SwMsgPoolItem { - BOOL bDelSet; + sal_Bool bDelSet; SwAttrSet* pChgSet; // was sich veraendert hat const SwAttrSet* pTheChgdSet; // wird nur zum Vergleichen gebraucht !! public: @@ -201,8 +201,8 @@ public: // wo es sich geaendert hat const SwAttrSet* GetTheChgdSet() const { return pTheChgdSet; } - USHORT Count() const { return pChgSet->Count(); } - void ClearItem( USHORT nWhichL = 0 ) + sal_uInt16 Count() const { return pChgSet->Count(); } + void ClearItem( sal_uInt16 nWhichL = 0 ) #ifndef DBG_UTIL { pChgSet->ClearItem( nWhichL ); } #else @@ -253,7 +253,7 @@ public: // // erzeuge die Liste aller Nodes der NumRule in dem angegebenem Doc // // Der Code steht im docnum.cxx // // #111955# -// void MakeList( SwDoc& rDoc, BOOL bOutline = FALSE ); +// void MakeList( SwDoc& rDoc, sal_Bool bOutline = sal_False ); // const SwTxtNodeTable& GetTxtNodeList() const { return aList; } //}; @@ -276,7 +276,7 @@ public: const String& GetString() const { return sStr; } - SwStringMsgPoolItem( USHORT nId, const String& rStr ) + SwStringMsgPoolItem( sal_uInt16 nId, const String& rStr ) : SwMsgPoolItem( nId ), sStr( rStr ) {} }; diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index ef16a2a89b86..cf95a232d9df 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -60,15 +60,15 @@ class SwHTMLTableLayoutCnts // Inhalt durchgefuehrt wurde. Dazu werden sie mit einer Soll-Vorgabe // verglichen. Wird 255 erreicht laufen sie bei 0 weiter. So wird // eine Reinitialisierung bei jedem Resize vermieden. - BYTE nPass1Done; // Wieoft wurde Pass 1 aufgerufen? - BYTE nWidthSet; // Wieoft wurde die Breite gesetzt? + sal_uInt8 nPass1Done; // Wieoft wurde Pass 1 aufgerufen? + sal_uInt8 nWidthSet; // Wieoft wurde die Breite gesetzt? - BOOL bNoBreakTag; // <NOBR>-Tag ueber gesamten Inhalt + sal_Bool bNoBreakTag; // <NOBR>-Tag ueber gesamten Inhalt public: SwHTMLTableLayoutCnts( const SwStartNode* pSttNd, SwHTMLTableLayout* pTab, - BOOL bNoBreakTag, SwHTMLTableLayoutCnts* pNxt ); + sal_Bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt ); ~SwHTMLTableLayoutCnts(); @@ -82,13 +82,13 @@ public: // Ermitteln des naechsten Knotens SwHTMLTableLayoutCnts *GetNext() const { return pNext; } - void SetWidthSet( BYTE nRef ) { nWidthSet = nRef; } - BOOL IsWidthSet( BYTE nRef ) const { return nRef==nWidthSet; } + void SetWidthSet( sal_uInt8 nRef ) { nWidthSet = nRef; } + sal_Bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; } - void SetPass1Done( BYTE nRef ) { nPass1Done = nRef; } - BOOL IsPass1Done( BYTE nRef ) const { return nRef==nPass1Done; } + void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; } + sal_Bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; } - BOOL HasNoBreakTag() const { return bNoBreakTag; } + sal_Bool HasNoBreakTag() const { return bNoBreakTag; } }; /* */ @@ -97,19 +97,19 @@ class SwHTMLTableLayoutCell { SwHTMLTableLayoutCnts *pContents; // der Inhalt der Zelle - USHORT nRowSpan; // ROWSPAN der Zelle - USHORT nColSpan; // COLSPAN der Zelle - USHORT nWidthOption;// angegebene Breite der Zelle in Twip oder % + sal_uInt16 nRowSpan; // ROWSPAN der Zelle + sal_uInt16 nColSpan; // COLSPAN der Zelle + sal_uInt16 nWidthOption;// angegebene Breite der Zelle in Twip oder % - BOOL bPrcWidthOption : 1;// nWidth ist %-Angabe - BOOL bNoWrapOption : 1; // NOWRAP-Option + sal_Bool bPrcWidthOption : 1;// nWidth ist %-Angabe + sal_Bool bNoWrapOption : 1; // NOWRAP-Option public: SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts, - USHORT nRSpan, USHORT nCSpan, - USHORT nWidthOpt, BOOL bPrcWdthOpt, - BOOL nNWrapOpt ); + sal_uInt16 nRSpan, sal_uInt16 nCSpan, + sal_uInt16 nWidthOpt, sal_Bool bPrcWdthOpt, + sal_Bool nNWrapOpt ); ~SwHTMLTableLayoutCell(); @@ -120,14 +120,14 @@ public: inline void SetProtected(); // ROWSPAN/COLSPAN der Zelle Setzen/Ermitteln - void SetRowSpan( USHORT nRSpan ) { nRowSpan = nRSpan; } - USHORT GetRowSpan() const { return nRowSpan; } - USHORT GetColSpan() const { return nColSpan; } + void SetRowSpan( sal_uInt16 nRSpan ) { nRowSpan = nRSpan; } + sal_uInt16 GetRowSpan() const { return nRowSpan; } + sal_uInt16 GetColSpan() const { return nColSpan; } - USHORT GetWidthOption() const { return nWidthOption; } - BOOL IsPrcWidthOption() const { return bPrcWidthOption; } + sal_uInt16 GetWidthOption() const { return nWidthOption; } + sal_Bool IsPrcWidthOption() const { return bPrcWidthOption; } - BOOL HasNoWrapOption() const { return bNoWrapOption; } + sal_Bool HasNoWrapOption() const { return bNoWrapOption; } }; /* */ @@ -135,53 +135,53 @@ public: class SwHTMLTableLayoutColumn { // Zwischenwerte von AutoLayoutPass1 - ULONG nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign; + sal_uLong nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign; // Ergebnisse von AutoLayoutPass1 - ULONG nMin, nMax; + sal_uLong nMin, nMax; // Ergibnisse von Pass 2 - USHORT nAbsColWidth; // in Twips - USHORT nRelColWidth; // in Twips bzw. relativ zu USHRT_MAX + sal_uInt16 nAbsColWidth; // in Twips + sal_uInt16 nRelColWidth; // in Twips bzw. relativ zu USHRT_MAX - USHORT nWidthOption; // Optionen von <COL> oder <TD>/<TH> + sal_uInt16 nWidthOption; // Optionen von <COL> oder <TD>/<TH> - BOOL bRelWidthOption : 1; - BOOL bLeftBorder : 1; + sal_Bool bRelWidthOption : 1; + sal_Bool bLeftBorder : 1; public: - SwHTMLTableLayoutColumn( USHORT nColWidthOpt, BOOL bRelColWidthOpt, - BOOL bLBorder ); + SwHTMLTableLayoutColumn( sal_uInt16 nColWidthOpt, sal_Bool bRelColWidthOpt, + sal_Bool bLBorder ); ~SwHTMLTableLayoutColumn() {} - inline void MergeCellWidthOption( USHORT nWidth, BOOL bPrc ); - inline void SetWidthOption( USHORT nWidth, BOOL bRelWidth, BOOL bTest ); + inline void MergeCellWidthOption( sal_uInt16 nWidth, sal_Bool bPrc ); + inline void SetWidthOption( sal_uInt16 nWidth, sal_Bool bRelWidth, sal_Bool bTest ); - USHORT GetWidthOption() const { return nWidthOption; } - BOOL IsRelWidthOption() const { return bRelWidthOption; } + sal_uInt16 GetWidthOption() const { return nWidthOption; } + sal_Bool IsRelWidthOption() const { return bRelWidthOption; } - inline void MergeMinMaxNoAlign( ULONG nMin, ULONG nMax, ULONG nAbsMin ); - ULONG GetMinNoAlign() const { return nMinNoAlign; } - ULONG GetMaxNoAlign() const { return nMaxNoAlign; } - ULONG GetAbsMinNoAlign() const { return nAbsMinNoAlign; } - inline void ClearPass1Info( BOOL bWidthOpt ); + inline void MergeMinMaxNoAlign( sal_uLong nMin, sal_uLong nMax, sal_uLong nAbsMin ); + sal_uLong GetMinNoAlign() const { return nMinNoAlign; } + sal_uLong GetMaxNoAlign() const { return nMaxNoAlign; } + sal_uLong GetAbsMinNoAlign() const { return nAbsMinNoAlign; } + inline void ClearPass1Info( sal_Bool bWidthOpt ); - inline void SetMinMax( ULONG nMin, ULONG nMax ); - void SetMax( ULONG nVal ) { nMax = nVal; } - void AddToMin( ULONG nVal ) { nMin += nVal; } - void AddToMax( ULONG nVal ) { nMax += nVal; } - ULONG GetMin() const { return nMin; } - ULONG GetMax() const { return nMax; } + inline void SetMinMax( sal_uLong nMin, sal_uLong nMax ); + void SetMax( sal_uLong nVal ) { nMax = nVal; } + void AddToMin( sal_uLong nVal ) { nMin += nVal; } + void AddToMax( sal_uLong nVal ) { nMax += nVal; } + sal_uLong GetMin() const { return nMin; } + sal_uLong GetMax() const { return nMax; } - void SetAbsColWidth( USHORT nWidth ) { nAbsColWidth = nWidth; } - USHORT GetAbsColWidth() const { return nAbsColWidth; } + void SetAbsColWidth( sal_uInt16 nWidth ) { nAbsColWidth = nWidth; } + sal_uInt16 GetAbsColWidth() const { return nAbsColWidth; } - void SetRelColWidth( USHORT nWidth ) { nRelColWidth = nWidth; } - USHORT GetRelColWidth() const { return nRelColWidth; } + void SetRelColWidth( sal_uInt16 nWidth ) { nRelColWidth = nWidth; } + sal_uInt16 GetRelColWidth() const { return nRelColWidth; } - BOOL HasLeftBorder() const { return bLeftBorder; } + sal_Bool HasLeftBorder() const { return bLeftBorder; } }; /* */ @@ -197,65 +197,65 @@ class SwHTMLTableLayout SwTableBox *pLeftFillerBox; // linke Filler-Zelle (nur Tab in Tab) SwTableBox *pRightFillerBox; // rechte Filler-Zelle (nur Tab-in Tab) - ULONG nMin; // minimale Breite der Tabelle (Twips) - ULONG nMax; // maximale Breite der Tabelle (Twips) + sal_uLong nMin; // minimale Breite der Tabelle (Twips) + sal_uLong nMax; // maximale Breite der Tabelle (Twips) - USHORT nRows; // Anzahl Zeilen - USHORT nCols; // Anzahl Spalten + sal_uInt16 nRows; // Anzahl Zeilen + sal_uInt16 nCols; // Anzahl Spalten - USHORT nLeftMargin; // Abstand zum linken Rand (aus Absatz) - USHORT nRightMargin; // Abstand zum rechten Rand (aus Absatz) + sal_uInt16 nLeftMargin; // Abstand zum linken Rand (aus Absatz) + sal_uInt16 nRightMargin; // Abstand zum rechten Rand (aus Absatz) - USHORT nInhAbsLeftSpace; // von umgebender Zelle geerbter Abstand, - USHORT nInhAbsRightSpace; // der Zellen zugeschlagen wurde + sal_uInt16 nInhAbsLeftSpace; // von umgebender Zelle geerbter Abstand, + sal_uInt16 nInhAbsRightSpace; // der Zellen zugeschlagen wurde - USHORT nRelLeftFill; // relative Breiten der Zellen zur - USHORT nRelRightFill; // Ausrichtung von Tabellen in Tabellen + sal_uInt16 nRelLeftFill; // relative Breiten der Zellen zur + sal_uInt16 nRelRightFill; // Ausrichtung von Tabellen in Tabellen - USHORT nRelTabWidth; // Die relative Breite der Tabelle + sal_uInt16 nRelTabWidth; // Die relative Breite der Tabelle - USHORT nWidthOption; // die Breite der Tabelle (in Twip oder %) - USHORT nCellPadding; // Abstand zum Inhalt (in Twip) - USHORT nCellSpacing; // Absatnd zwischen Zellen (in Twip) - USHORT nBorder; // Dicke der ausseren Umrandung bzw. + sal_uInt16 nWidthOption; // die Breite der Tabelle (in Twip oder %) + sal_uInt16 nCellPadding; // Abstand zum Inhalt (in Twip) + sal_uInt16 nCellSpacing; // Absatnd zwischen Zellen (in Twip) + sal_uInt16 nBorder; // Dicke der ausseren Umrandung bzw. // Platz, den Netscape hierfuer einrechnet. - USHORT nLeftBorderWidth; - USHORT nRightBorderWidth; - USHORT nInhLeftBorderWidth; - USHORT nInhRightBorderWidth; - USHORT nBorderWidth; + sal_uInt16 nLeftBorderWidth; + sal_uInt16 nRightBorderWidth; + sal_uInt16 nInhLeftBorderWidth; + sal_uInt16 nInhRightBorderWidth; + sal_uInt16 nBorderWidth; - USHORT nDelayedResizeAbsAvail; // Param fuer's verzoegerte Resize - USHORT nLastResizeAbsAvail; + sal_uInt16 nDelayedResizeAbsAvail; // Param fuer's verzoegerte Resize + sal_uInt16 nLastResizeAbsAvail; - BYTE nPass1Done; // Vorgabe-Werte fuer die einzelen - BYTE nWidthSet; // Schleifen-Durchlauefe + sal_uInt8 nPass1Done; // Vorgabe-Werte fuer die einzelen + sal_uInt8 nWidthSet; // Schleifen-Durchlauefe SvxAdjust eTableAdjust; // Die Ausrichtung der Tabelle - BOOL bColsOption : 1; // Tabelle besitzt eine COLS-Option - BOOL bColTags : 1; // Tabelle besitzt COL/COLGRP-Tags - BOOL bPrcWidthOption : 1; // Breite ist eine %-Angabe - BOOL bUseRelWidth : 1; // SwTable bekommt relative Breite + sal_Bool bColsOption : 1; // Tabelle besitzt eine COLS-Option + sal_Bool bColTags : 1; // Tabelle besitzt COL/COLGRP-Tags + sal_Bool bPrcWidthOption : 1; // Breite ist eine %-Angabe + sal_Bool bUseRelWidth : 1; // SwTable bekommt relative Breite - BOOL bMustResize : 1; // Tabelle muss in der Breite ang. werden - BOOL bExportable : 1; // Layout kann zum Export genutzt werden - BOOL bBordersChanged : 1; // Umrandung wurde geaendert - BOOL bMayBeInFlyFrame : 1; // Die Tabelle koennte im Rahmen sein + sal_Bool bMustResize : 1; // Tabelle muss in der Breite ang. werden + sal_Bool bExportable : 1; // Layout kann zum Export genutzt werden + sal_Bool bBordersChanged : 1; // Umrandung wurde geaendert + sal_Bool bMayBeInFlyFrame : 1; // Die Tabelle koennte im Rahmen sein - BOOL bDelayedResizeRecalc : 1; // Param fuer's verzoegerte Resize - BOOL bMustNotResize : 1; // Die Tabelle darf nicht reseized werden - BOOL bMustNotRecalc : 1; // Tabelle darf nicht an Inhalt angepasst + sal_Bool bDelayedResizeRecalc : 1; // Param fuer's verzoegerte Resize + sal_Bool bMustNotResize : 1; // Die Tabelle darf nicht reseized werden + sal_Bool bMustNotRecalc : 1; // Tabelle darf nicht an Inhalt angepasst // werden -// USHORT GetLeftBorderWidth( USHORT nCol ) const; -// USHORT GetRightBorderWidth( USHORT nCol, USHORT nColSpan ) const; +// sal_uInt16 GetLeftBorderWidth( sal_uInt16 nCol ) const; +// sal_uInt16 GetRightBorderWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; - void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin, - USHORT nCol, USHORT nColSpan, - BOOL bSwBorders=TRUE ) const; - void SetBoxWidth( SwTableBox *pBox, USHORT nCol, USHORT nColSpan ) const; + void AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax, sal_uLong& rAbsMin, + sal_uInt16 nCol, sal_uInt16 nColSpan, + sal_Bool bSwBorders=sal_True ) const; + void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const; const SwStartNode *GetAnyBoxStartNode() const; SwFrmFmt *FindFlyFrmFmt() const; @@ -263,68 +263,68 @@ class SwHTMLTableLayout void ClearPass1Info() { nMin = nMax = 0; } - void _Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE ); + void _Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False ); DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* ); - static USHORT GetBrowseWidthByVisArea( const SwDoc& rDoc ); + static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: SwHTMLTableLayout( const SwTable *pSwTbl, - USHORT nRows, USHORT nCols, BOOL bColsOpt, BOOL ColTgs, - USHORT nWidth, BOOL bPrcWidth, USHORT nBorderOpt, - USHORT nCellPad, USHORT nCellSp, SvxAdjust eAdjust, - USHORT nLMargin, USHORT nRMargin, USHORT nBWidth, - USHORT nLeftBWidth, USHORT nRightBWidth, - USHORT nInhLeftBWidth, USHORT nInhRightBWidth ); + sal_uInt16 nRows, sal_uInt16 nCols, sal_Bool bColsOpt, sal_Bool ColTgs, + sal_uInt16 nWidth, sal_Bool bPrcWidth, sal_uInt16 nBorderOpt, + sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust, + sal_uInt16 nLMargin, sal_uInt16 nRMargin, sal_uInt16 nBWidth, + sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth, + sal_uInt16 nInhLeftBWidth, sal_uInt16 nInhRightBWidth ); ~SwHTMLTableLayout(); - USHORT GetLeftCellSpace( USHORT nCol, USHORT nColSpan, - BOOL bSwBorders=TRUE ) const; - USHORT GetRightCellSpace( USHORT nCol, USHORT nColSpan, - BOOL bSwBorders=TRUE ) const; - inline USHORT GetInhCellSpace( USHORT nCol, USHORT nColSpan ) const; + sal_uInt16 GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, + sal_Bool bSwBorders=sal_True ) const; + sal_uInt16 GetRightCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, + sal_Bool bSwBorders=sal_True ) const; + inline sal_uInt16 GetInhCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; - inline void SetInhBorderWidths( USHORT nLeft, USHORT nRight ); + inline void SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ); - void GetAvail( USHORT nCol, USHORT nColSpan, USHORT& rAbsAvail, - USHORT& rRelAvail ) const; + void GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan, sal_uInt16& rAbsAvail, + sal_uInt16& rRelAvail ) const; void AutoLayoutPass1(); - void AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail, - USHORT nAbsLeftSpace, USHORT nAbsRightSpace, - USHORT nParentInhSpace ); - void SetWidths( BOOL bCallPass2=FALSE, USHORT nAbsAvail=0, - USHORT nRelAvail=0, USHORT nAbsLeftSpace=0, - USHORT nAbsRightSpace=0, - USHORT nParentInhSpace=0 ); + void AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAvail, + sal_uInt16 nAbsLeftSpace, sal_uInt16 nAbsRightSpace, + sal_uInt16 nParentInhSpace ); + void SetWidths( sal_Bool bCallPass2=sal_False, sal_uInt16 nAbsAvail=0, + sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0, + sal_uInt16 nAbsRightSpace=0, + sal_uInt16 nParentInhSpace=0 ); - inline SwHTMLTableLayoutColumn *GetColumn( USHORT nCol ) const; - inline void SetColumn( SwHTMLTableLayoutColumn *pCol, USHORT nCol ); + inline SwHTMLTableLayoutColumn *GetColumn( sal_uInt16 nCol ) const; + inline void SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol ); - inline SwHTMLTableLayoutCell *GetCell( USHORT nRow, USHORT nCol ) const; - inline void SetCell( SwHTMLTableLayoutCell *pCell, USHORT nRow, USHORT nCol ); + inline SwHTMLTableLayoutCell *GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const; + inline void SetCell( SwHTMLTableLayoutCell *pCell, sal_uInt16 nRow, sal_uInt16 nCol ); void SetLeftFillerBox( SwTableBox *pBox ) { pLeftFillerBox = pBox; } void SetRightFillerBox( SwTableBox *pBox ) { pRightFillerBox = pBox; } - ULONG GetMin() const { return nMin; } - ULONG GetMax() const { return nMax; } - USHORT GetRelLeftFill() const { return nRelLeftFill; } - USHORT GetRelRightFill() const { return nRelRightFill; } + sal_uLong GetMin() const { return nMin; } + sal_uLong GetMax() const { return nMax; } + sal_uInt16 GetRelLeftFill() const { return nRelLeftFill; } + sal_uInt16 GetRelRightFill() const { return nRelRightFill; } inline long GetBrowseWidthMin() const; - BOOL HasColsOption() const { return bColsOption; } - BOOL HasColTags() const { return bColTags; } + sal_Bool HasColsOption() const { return bColsOption; } + sal_Bool HasColTags() const { return bColTags; } - BOOL IsTopTable() const { return pSwTable != 0; } + sal_Bool IsTopTable() const { return pSwTable != 0; } - void SetMustResize( BOOL bSet ) { bMustResize = bSet; } - void SetMustNotResize( BOOL bSet ) { bMustNotResize = bSet; } - void SetMustNotRecalc( BOOL bSet ) { bMustNotRecalc = bSet; } + void SetMustResize( sal_Bool bSet ) { bMustResize = bSet; } + void SetMustNotResize( sal_Bool bSet ) { bMustNotResize = bSet; } + void SetMustNotRecalc( sal_Bool bSet ) { bMustNotRecalc = bSet; } // Neueberechnung der Tabellenbreiten fuer die uebergebene verfuegbare // Breite. @@ -340,41 +340,41 @@ public: // eventuell noch asstehende Resize-Aufrufe werden nicht mehr // ausgefuehrt. // - Der Rueckgabewert gibt an, ob sich die Tabelle geaendert hat. - BOOL Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE, BOOL bForce=FALSE, - ULONG nDelay=0 ); + sal_Bool Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False, sal_Bool bForce=sal_False, + sal_uLong nDelay=0 ); - void BordersChanged( USHORT nAbsAvail, BOOL bRecalc=FALSE ); + void BordersChanged( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False ); // Ermitteln der verfuegbaren Breite. Das geht nur, wenn ein Layout // oder eine ViewShell vorhanden ist. Sonst wird 0 zurueckgegeben. // (Wird vom HTML-Filter benoetigt, da der nicht an das Layout kommt.) - static USHORT GetBrowseWidth( const SwDoc& rDoc ); + static sal_uInt16 GetBrowseWidth( const SwDoc& rDoc ); // Ermitteln der verfuegbaren Breite uber den Tabellen-Frame - USHORT GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const; + sal_uInt16 GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const; // Ermitteln der verfuegbaren Breite uber den Tabellen-Frame oder // das statische GetBrowseWidth, wenn kein Layout existiert. - USHORT GetBrowseWidthByTable( const SwDoc& rDoc ) const; + sal_uInt16 GetBrowseWidthByTable( const SwDoc& rDoc ) const; // Fuer Export - USHORT GetWidthOption() const { return nWidthOption; } - BOOL HasPrcWidthOption() const { return bPrcWidthOption; } + sal_uInt16 GetWidthOption() const { return nWidthOption; } + sal_Bool HasPrcWidthOption() const { return bPrcWidthOption; } - USHORT GetCellPadding() const { return nCellPadding; } - USHORT GetCellSpacing() const { return nCellSpacing; } - USHORT GetBorder() const { return nBorder; } + sal_uInt16 GetCellPadding() const { return nCellPadding; } + sal_uInt16 GetCellSpacing() const { return nCellSpacing; } + sal_uInt16 GetBorder() const { return nBorder; } - USHORT GetRowCount() const { return nRows; } - USHORT GetColCount() const { return nCols; } + sal_uInt16 GetRowCount() const { return nRows; } + sal_uInt16 GetColCount() const { return nCols; } - void SetExportable( BOOL bSet ) { bExportable = bSet; } - BOOL IsExportable() const { return bExportable; } + void SetExportable( sal_Bool bSet ) { bExportable = bSet; } + sal_Bool IsExportable() const { return bExportable; } - BOOL HaveBordersChanged() const { return bBordersChanged; } + sal_Bool HaveBordersChanged() const { return bBordersChanged; } - void SetMayBeInFlyFrame( BOOL bSet ) { bMayBeInFlyFrame = bSet; } - BOOL MayBeInFlyFrame() const { return bMayBeInFlyFrame; } + void SetMayBeInFlyFrame( sal_Bool bSet ) { bMayBeInFlyFrame = bSet; } + sal_Bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; } }; /* */ @@ -389,8 +389,8 @@ inline void SwHTMLTableLayoutCell::SetProtected() /* */ -inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin, - ULONG nCMax, ULONG nAbsMin ) +inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin, + sal_uLong nCMax, sal_uLong nAbsMin ) { if( nCMin > nMinNoAlign ) nMinNoAlign = nCMin; @@ -400,19 +400,19 @@ inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin, nAbsMinNoAlign = nAbsMin; } -inline void SwHTMLTableLayoutColumn::ClearPass1Info( BOOL bWidthOpt ) +inline void SwHTMLTableLayoutColumn::ClearPass1Info( sal_Bool bWidthOpt ) { nMinNoAlign = nMaxNoAlign = nAbsMinNoAlign = MINLAY; nMin = nMax = 0; if( bWidthOpt ) { nWidthOption = 0; - bRelWidthOption = FALSE; + bRelWidthOption = sal_False; } } inline void SwHTMLTableLayoutColumn::MergeCellWidthOption( - USHORT nWidth, BOOL bRel ) + sal_uInt16 nWidth, sal_Bool bRel ) { if( !nWidthOption || (bRel==bRelWidthOption && nWidthOption < nWidth) ) @@ -422,7 +422,7 @@ inline void SwHTMLTableLayoutColumn::MergeCellWidthOption( } } -inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx ) +inline void SwHTMLTableLayoutColumn::SetMinMax( sal_uLong nMn, sal_uLong nMx ) { nMin = nMn; nMax = nMx; @@ -430,25 +430,25 @@ inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx ) /* */ -inline USHORT SwHTMLTableLayout::GetInhCellSpace( USHORT nCol, - USHORT nColSpan ) const +inline sal_uInt16 SwHTMLTableLayout::GetInhCellSpace( sal_uInt16 nCol, + sal_uInt16 nColSpan ) const { - USHORT nSpace = 0; + sal_uInt16 nSpace = 0; if( nCol==0 ) - nSpace = nSpace + sal::static_int_cast< USHORT >(nInhAbsLeftSpace); + nSpace = nSpace + sal::static_int_cast< sal_uInt16 >(nInhAbsLeftSpace); if( nCol+nColSpan==nCols ) - nSpace = nSpace + sal::static_int_cast< USHORT >(nInhAbsRightSpace); + nSpace = nSpace + sal::static_int_cast< sal_uInt16 >(nInhAbsRightSpace); return nSpace; } -inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( USHORT nCol ) const +inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol ) const { return aColumns[nCol]; } inline void SwHTMLTableLayoutColumn::SetWidthOption( - USHORT nWidth, BOOL bRelWidth, BOOL bTest ) + sal_uInt16 nWidth, sal_Bool bRelWidth, sal_Bool bTest ) { if( bTest && bRelWidthOption==bRelWidth ) { @@ -460,18 +460,18 @@ inline void SwHTMLTableLayoutColumn::SetWidthOption( bRelWidthOption = bRelWidth; } -inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, USHORT nCol ) +inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol ) { aColumns[nCol] = pCol; } -inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( USHORT nRow, USHORT nCol ) const +inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const { return aCells[nRow*nCols+nCol]; } inline void SwHTMLTableLayout::SetCell( SwHTMLTableLayoutCell *pCell, - USHORT nRow, USHORT nCol ) + sal_uInt16 nRow, sal_uInt16 nCol ) { aCells[nRow*nCols+nCol] = pCell; } @@ -481,7 +481,7 @@ inline long SwHTMLTableLayout::GetBrowseWidthMin() const return (long)( (!nWidthOption || bPrcWidthOption) ? nMin : nRelTabWidth ); } -void SwHTMLTableLayout::SetInhBorderWidths( USHORT nLeft, USHORT nRight ) +void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ) { nInhLeftBorderWidth = nLeft; nInhRightBorderWidth = nRight; diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index 5b9dd827108e..fd5ba88b0a69 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -80,22 +80,22 @@ public: INLINE xub_StrLen operator+=( const SwIndex& ); INLINE xub_StrLen operator-=( const SwIndex& ); - INLINE BOOL operator<( const SwIndex& ) const; - INLINE BOOL operator<=( const SwIndex& ) const; - INLINE BOOL operator>( const SwIndex& ) const; - INLINE BOOL operator>=( const SwIndex& ) const; - BOOL operator==( const SwIndex& rSwIndex ) const + INLINE sal_Bool operator<( const SwIndex& ) const; + INLINE sal_Bool operator<=( const SwIndex& ) const; + INLINE sal_Bool operator>( const SwIndex& ) const; + INLINE sal_Bool operator>=( const SwIndex& ) const; + sal_Bool operator==( const SwIndex& rSwIndex ) const { return (nIndex == rSwIndex.nIndex) && (pArray == rSwIndex.pArray); } - BOOL operator!=( const SwIndex& rSwIndex ) const + sal_Bool operator!=( const SwIndex& rSwIndex ) const { return (nIndex != rSwIndex.nIndex) || (pArray != rSwIndex.pArray); } - BOOL operator<( xub_StrLen nWert ) const { return nIndex < nWert; } - BOOL operator<=( xub_StrLen nWert ) const { return nIndex <= nWert; } - BOOL operator>( xub_StrLen nWert ) const { return nIndex > nWert; } - BOOL operator>=( xub_StrLen nWert ) const { return nIndex >= nWert; } - BOOL operator==( xub_StrLen nWert ) const { return nIndex == nWert; } - BOOL operator!=( xub_StrLen nWert ) const { return nIndex != nWert; } + sal_Bool operator<( xub_StrLen nWert ) const { return nIndex < nWert; } + sal_Bool operator<=( xub_StrLen nWert ) const { return nIndex <= nWert; } + sal_Bool operator>( xub_StrLen nWert ) const { return nIndex > nWert; } + sal_Bool operator>=( xub_StrLen nWert ) const { return nIndex >= nWert; } + sal_Bool operator==( xub_StrLen nWert ) const { return nIndex == nWert; } + sal_Bool operator!=( xub_StrLen nWert ) const { return nIndex != nWert; } INLINE SwIndex& operator=( xub_StrLen ); SwIndex& operator=( const SwIndex & ); @@ -134,7 +134,7 @@ protected: void ChkArr(); - BOOL HasAnyIndex() const { return 0 != pFirst; } + sal_Bool HasAnyIndex() const { return 0 != pFirst; } public: SwIndexReg(); @@ -189,19 +189,19 @@ inline xub_StrLen SwIndex::operator-=( const SwIndex& rIndex ) return ChgValue( *this, nIndex - rIndex.nIndex ).nIndex; } -inline BOOL SwIndex::operator<( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator<( const SwIndex& rIndex ) const { return nIndex < rIndex.nIndex; } -inline BOOL SwIndex::operator<=( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator<=( const SwIndex& rIndex ) const { return nIndex <= rIndex.nIndex; } -inline BOOL SwIndex::operator>( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator>( const SwIndex& rIndex ) const { return nIndex > rIndex.nIndex; } -inline BOOL SwIndex::operator>=( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator>=( const SwIndex& rIndex ) const { return nIndex >= rIndex.nIndex; } diff --git a/sw/inc/inetfld.hxx b/sw/inc/inetfld.hxx index de3f81c49e31..4160928ea8ce 100644 --- a/sw/inc/inetfld.hxx +++ b/sw/inc/inetfld.hxx @@ -74,7 +74,7 @@ class SwINetField : public SwField public: // Direkte Eingabe alten Wert loeschen - SwINetField( SwINetFieldType* pTyp, USHORT nFmt, + SwINetField( SwINetFieldType* pTyp, sal_uInt16 nFmt, const String& rURL, const String& rText ); virtual ~SwINetField(); @@ -101,8 +101,8 @@ public: const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; } // setze / erfrage ein Makro - void SetMacro( USHORT nEvent, const SvxMacro& rMacro ); - const SvxMacro* GetMacro( USHORT nEvent ) const; + void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ); + const SvxMacro* GetMacro( sal_uInt16 nEvent ) const; }; diff --git a/sw/inc/io.hxx b/sw/inc/io.hxx index b0e6f0fce00b..66af95e9a28a 100644 --- a/sw/inc/io.hxx +++ b/sw/inc/io.hxx @@ -60,7 +60,7 @@ public: // ctor oeffnet File im BinearMode, dtor schliesst es BinaryFile(const String &, int eOpenMode); ~BinaryFile(); - BOOL Ok() const { + sal_Bool Ok() const { return -1 != fd; } operator int() const { return fd; } @@ -167,7 +167,7 @@ public: return aStr; } - BOOL Ok(); + sal_Bool Ok(); }; diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 22ecd7bb0a36..2fb66559b98d 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -56,9 +56,9 @@ struct SwIoDetect { const sal_Char* pName; - USHORT nLen; + sal_uInt16 nLen; - inline SwIoDetect( const sal_Char *pN, USHORT nL ) + inline SwIoDetect( const sal_Char *pN, sal_uInt16 nL ) : pName( pN ), nLen( nL ) {} @@ -67,7 +67,7 @@ struct SwIoDetect return pName && rNm.EqualsAscii( pName, 0, nLen ); } - const sal_Char* IsReader( const sal_Char* pHeader, ULONG nLen_, + const sal_Char* IsReader( const sal_Char* pHeader, sal_uLong nLen_, const String &rFileName, const String& rUserData ) const; }; @@ -109,17 +109,17 @@ public: // Feststellen ob das File in dem vorgegebenen Format vorliegt. // Z.z werden nur unsere eigene Filter unterstuetzt!! - static BOOL IsFileFilter( SfxMedium& rMedium, const String& rFmtName, + static sal_Bool IsFileFilter( SfxMedium& rMedium, const String& rFmtName, const SfxFilter** ppFlt = 0 ); - static BOOL IsValidStgFilter( SotStorage& , const SfxFilter& ); - static BOOL IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); + static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& ); + static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); - static bool IsDetectableText( const sal_Char* pBuf, ULONG &rLen, + static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false ); // static bool IsDetectableW4W(const String& rFileName, const String& rUserData); - static const SfxFilter* GetTextFilter( const sal_Char* pBuf, ULONG nLen ); + static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen ); static const String GetSubStorageName( const SfxFilter& rFltr ); }; diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx index 0188267c0497..9dfa8c3a43b7 100644 --- a/sw/inc/itabenum.hxx +++ b/sw/inc/itabenum.hxx @@ -31,21 +31,21 @@ namespace tabopts { - const USHORT DEFAULT_BORDER = 0x01; - const USHORT HEADLINE = 0x02; -// const USHORT REPEAT = 0x04; -// const USHORT HEADLINE_REPEAT = 0x06; // Headline + Repeat - const USHORT SPLIT_LAYOUT = 0x08; - const USHORT HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT; - const USHORT ALL_TBL_INS_ATTR = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT; + const sal_uInt16 DEFAULT_BORDER = 0x01; + const sal_uInt16 HEADLINE = 0x02; +// const sal_uInt16 REPEAT = 0x04; +// const sal_uInt16 HEADLINE_REPEAT = 0x06; // Headline + Repeat + const sal_uInt16 SPLIT_LAYOUT = 0x08; + const sal_uInt16 HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT; + const sal_uInt16 ALL_TBL_INS_ATTR = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT; } struct SwInsertTableOptions { - USHORT mnInsMode; - USHORT mnRowsToRepeat; + sal_uInt16 mnInsMode; + sal_uInt16 mnRowsToRepeat; - SwInsertTableOptions( USHORT nInsMode, USHORT nRowsToRepeat ) : + SwInsertTableOptions( sal_uInt16 nInsMode, sal_uInt16 nRowsToRepeat ) : mnInsMode( nInsMode ), mnRowsToRepeat( nRowsToRepeat ) {}; }; diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 079fbeee4cf5..51d6a8c18c9a 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -50,15 +50,15 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient //purpose of derivation fr { SvxNumberType aType; //e.g. roman linenumbers String aDivider; //String for aditional interval (vert. lines user defined) - USHORT nPosFromLeft; //Position for paint - USHORT nCountBy; //Paint only for every n line - USHORT nDividerCountBy; //Interval for display of an user defined + sal_uInt16 nPosFromLeft; //Position for paint + sal_uInt16 nCountBy; //Paint only for every n line + sal_uInt16 nDividerCountBy; //Interval for display of an user defined //string every n lines LineNumberPosition ePos; //Where should the display occur (number and divicer) - BOOL bPaintLineNumbers; //Should anything be displayed? - BOOL bCountBlankLines; //Count empty lines? - BOOL bCountInFlys; //Count also within FlyFrames? - BOOL bRestartEachPage; //Restart counting at the first paragraph of each page + sal_Bool bPaintLineNumbers; //Should anything be displayed? + sal_Bool bCountBlankLines; //Count empty lines? + sal_Bool bCountInFlys; //Count also within FlyFrames? + sal_Bool bRestartEachPage; //Restart counting at the first paragraph of each page //(even on follows when paragraphs are splitted) public: @@ -66,7 +66,7 @@ public: SwLineNumberInfo(const SwLineNumberInfo&); SwLineNumberInfo& operator=(const SwLineNumberInfo&); - BOOL operator==( const SwLineNumberInfo& rInf ) const; + sal_Bool operator==( const SwLineNumberInfo& rInf ) const; SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const; void SetCharFmt( SwCharFmt* ); @@ -76,29 +76,29 @@ public: const String &GetDivider() const { return aDivider; } void SetDivider( const String &r ) { aDivider = r; } - USHORT GetDividerCountBy() const { return nDividerCountBy; } - void SetDividerCountBy( USHORT n ) { nDividerCountBy = n; } + sal_uInt16 GetDividerCountBy() const { return nDividerCountBy; } + void SetDividerCountBy( sal_uInt16 n ) { nDividerCountBy = n; } - USHORT GetPosFromLeft() const { return nPosFromLeft; } - void SetPosFromLeft( USHORT n) { nPosFromLeft = n; } + sal_uInt16 GetPosFromLeft() const { return nPosFromLeft; } + void SetPosFromLeft( sal_uInt16 n) { nPosFromLeft = n; } - USHORT GetCountBy() const { return nCountBy; } - void SetCountBy( USHORT n) { nCountBy = n; } + sal_uInt16 GetCountBy() const { return nCountBy; } + void SetCountBy( sal_uInt16 n) { nCountBy = n; } LineNumberPosition GetPos() const { return ePos; } void SetPos( LineNumberPosition eP ){ ePos = eP; } - BOOL IsPaintLineNumbers() const { return bPaintLineNumbers; } - void SetPaintLineNumbers( BOOL b ){ bPaintLineNumbers = b; } + sal_Bool IsPaintLineNumbers() const { return bPaintLineNumbers; } + void SetPaintLineNumbers( sal_Bool b ){ bPaintLineNumbers = b; } - BOOL IsCountBlankLines() const { return bCountBlankLines; } - void SetCountBlankLines( BOOL b ) { bCountBlankLines = b; } + sal_Bool IsCountBlankLines() const { return bCountBlankLines; } + void SetCountBlankLines( sal_Bool b ) { bCountBlankLines = b; } - BOOL IsCountInFlys() const { return bCountInFlys; } - void SetCountInFlys( BOOL b ) { bCountInFlys = b; } + sal_Bool IsCountInFlys() const { return bCountInFlys; } + void SetCountInFlys( sal_Bool b ) { bCountInFlys = b; } - BOOL IsRestartEachPage() const { return bRestartEachPage; } - void SetRestartEachPage( BOOL b ) { bRestartEachPage = b; } + sal_Bool IsRestartEachPage() const { return bRestartEachPage; } + void SetRestartEachPage( sal_Bool b ) { bRestartEachPage = b; } virtual void Modify( SfxPoolItem*, SfxPoolItem* ); }; diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index 2c97c4da1c9c..a080440a55ea 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -56,7 +56,7 @@ class SwList void ValidateListTree(); void MarkListLevel( const int nListLevel, - const BOOL bValue ); + const sal_Bool bValue ); bool IsListLevelMarked( const int nListLevel ) const; diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index a6ebc3d11761..7a3f27bb0eed 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -40,26 +40,26 @@ class ViewShell; class SwDoc; class SwDocShell; -extern void ScrollMDI(ViewShell* pVwSh, const SwRect &, USHORT nRangeX, USHORT nRangeY); -extern BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect &); +extern void ScrollMDI(ViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY); +extern sal_Bool IsScrollMDI(ViewShell* pVwSh, const SwRect &); extern void SizeNotify(ViewShell* pVwSh, const Size &); //Update der Statusleiste, waehrend einer Action. extern void PageNumNotify( ViewShell* pVwSh, - USHORT nPhyNum, - USHORT nVirtNum, + sal_uInt16 nPhyNum, + sal_uInt16 nVirtNum, const UniString& rPg ); enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END }; extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG ); -SW_DLLPUBLIC void StartProgress ( USHORT nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 ); +SW_DLLPUBLIC void StartProgress ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 ); SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = 0 ); SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell ); -void SetProgressText ( USHORT nMessId, SwDocShell *pDocShell ); +void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell ); void RescheduleProgress( SwDocShell *pDocShell ); -void EnableCmdInterface(BOOL bEnable = TRUE); +void EnableCmdInterface(sal_Bool bEnable = sal_True); LAYOUT_NS Dialog* GetSearchDialog(); @@ -72,7 +72,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc ); // ChgMode fuer Tabellen aus der Konfiguration lesen TblChgMode GetTblChgDefaultMode(); -BOOL JumpToSwMark( ViewShell* pVwSh, const UniString& rMark ); +sal_Bool JumpToSwMark( ViewShell* pVwSh, const UniString& rMark ); #endif diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index c5d67217ab2a..279c54a5d435 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -66,7 +66,7 @@ class SwRevisionConfig : public utl::ConfigItem //Revision/TextDisplay/Delete/Color AuthorCharAttr aFormatAttr; //Revision/TextDisplay/ChangeAttribute/Attribute //Revision/TextDisplay/ChangeAttribute/Color - USHORT nMarkAlign; //Revision/LinesChanged/Mark + sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark Color aMarkColor; //Revision/LinesChanged/Color const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); @@ -117,10 +117,10 @@ class SwTableConfig : public utl::ConfigItem { friend class SwModuleOptions; - USHORT nTblHMove; //int Table/Shift/Row - USHORT nTblVMove; //int Table/Shift/Column - USHORT nTblHInsert; //int Table/Insert/Row - USHORT nTblVInsert; //int Table/Insert/Column + sal_uInt16 nTblHMove; //int Table/Shift/Row + sal_uInt16 nTblVMove; //int Table/Shift/Column + sal_uInt16 nTblHInsert; //int Table/Insert/Row + sal_uInt16 nTblVInsert; //int Table/Insert/Column TblChgMode eTblChgMode; //int Table/Change/Effect sal_Bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatische Zahlenerkennung @@ -145,13 +145,13 @@ class SwMiscConfig : public utl::ConfigItem friend class SwModuleOptions; String sWordDelimiter; // Statistics/WordNumber/Delimiter - BOOL bDefaultFontsInCurrDocOnly; // DefaultFont/Document - BOOL bShowIndexPreview ; // Index/ShowPreview - BOOL bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink - BOOL bNumAlignSize; // Numbering/Graphic/KeepRatio - BOOL bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs - BOOL bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation - BOOL bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' + sal_Bool bDefaultFontsInCurrDocOnly; // DefaultFont/Document + sal_Bool bShowIndexPreview ; // Index/ShowPreview + sal_Bool bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink + sal_Bool bNumAlignSize; // Numbering/Graphic/KeepRatio + sal_Bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs + sal_Bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation + sal_Bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats String sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) String sMailingPath; // FormLetter/FileOutput/Path @@ -183,7 +183,7 @@ class SW_DLLPUBLIC SwModuleOptions SwMiscConfig aMiscConfig; //fiscus: don't show tips of text fields - it's not part of the configuration! - BOOL bHideFieldTips : 1; + sal_Bool bHideFieldTips : 1; public: SwModuleOptions(); @@ -192,20 +192,20 @@ public: void SetTblMode( TblChgMode eSet ) { aTableConfig.eTblChgMode = eSet; aTableConfig.SetModified();} - USHORT GetTblHMove() const { return aTableConfig.nTblHMove;} - void SetTblHMove( USHORT nSet ) { aTableConfig.nTblHMove = nSet; + sal_uInt16 GetTblHMove() const { return aTableConfig.nTblHMove;} + void SetTblHMove( sal_uInt16 nSet ) { aTableConfig.nTblHMove = nSet; aTableConfig.SetModified();} - USHORT GetTblVMove() const { return aTableConfig.nTblVMove;} - void SetTblVMove( USHORT nSet ) { aTableConfig.nTblVMove = nSet; + sal_uInt16 GetTblVMove() const { return aTableConfig.nTblVMove;} + void SetTblVMove( sal_uInt16 nSet ) { aTableConfig.nTblVMove = nSet; aTableConfig.SetModified();} - USHORT GetTblHInsert() const {return aTableConfig.nTblHInsert;} - void SetTblHInsert( USHORT nSet ) { aTableConfig.nTblHInsert = nSet; + sal_uInt16 GetTblHInsert() const {return aTableConfig.nTblHInsert;} + void SetTblHInsert( sal_uInt16 nSet ) { aTableConfig.nTblHInsert = nSet; aTableConfig.SetModified();} - USHORT GetTblVInsert() const {return aTableConfig.nTblVInsert;} - void SetTblVInsert( USHORT nSet ) { aTableConfig.nTblVInsert = nSet; + sal_uInt16 GetTblVInsert() const {return aTableConfig.nTblVInsert;} + void SetTblVInsert( sal_uInt16 nSet ) { aTableConfig.nTblVInsert = nSet; aTableConfig.SetModified();} const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; } @@ -220,17 +220,17 @@ public: void SetFormatAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aFormatAttr = rAttr; aRevisionConfig.SetModified();} - USHORT GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; } - void SetMarkAlignMode(USHORT nMode) { aRevisionConfig.nMarkAlign = nMode; + sal_uInt16 GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; } + void SetMarkAlignMode(sal_uInt16 nMode) { aRevisionConfig.nMarkAlign = nMode; aRevisionConfig.SetModified();} const Color& GetMarkAlignColor() const { return aRevisionConfig.aMarkColor; } void SetMarkAlignColor(const Color &rColor) { aRevisionConfig.aMarkColor = rColor; aRevisionConfig.SetModified();} - BOOL IsInsWithCaption(BOOL bHTML) const - { return bHTML ? FALSE : aInsertConfig.bInsWithCaption; } - void SetInsWithCaption( BOOL bHTML, BOOL b ) + sal_Bool IsInsWithCaption(sal_Bool bHTML) const + { return bHTML ? sal_False : aInsertConfig.bInsWithCaption; } + void SetInsWithCaption( sal_Bool bHTML, sal_Bool b ) { if(!bHTML) aInsertConfig.bInsWithCaption = b; aInsertConfig.SetModified();} @@ -245,60 +245,60 @@ public: } } - BOOL IsInsTblFormatNum(BOOL bHTML) const + sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; } - void SetInsTblFormatNum( BOOL bHTML, BOOL b ) + void SetInsTblFormatNum( sal_Bool bHTML, sal_Bool b ) { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - BOOL IsInsTblChangeNumFormat(BOOL bHTML) const + sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; } - void SetInsTblChangeNumFormat( BOOL bHTML, BOOL b ) + void SetInsTblChangeNumFormat( sal_Bool bHTML, sal_Bool b ) { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - BOOL IsInsTblAlignNum(BOOL bHTML) const + sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; } - void SetInsTblAlignNum( BOOL bHTML, BOOL b ) + void SetInsTblAlignNum( sal_Bool bHTML, sal_Bool b ) { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();;} - SwInsertTableOptions GetInsTblFlags(BOOL bHTML) const + SwInsertTableOptions GetInsTblFlags(sal_Bool bHTML) const { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;} - void SetInsTblFlags( BOOL bHTML, const SwInsertTableOptions& rOpts ) { + void SetInsTblFlags( sal_Bool bHTML, const SwInsertTableOptions& rOpts ) { bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts); bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();} - const InsCaptionOpt* GetCapOption(BOOL bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); - BOOL SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt); + const InsCaptionOpt* GetCapOption(sal_Bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); + sal_Bool SetCapOption(sal_Bool bHTML, const InsCaptionOpt* pOpt); - BOOL IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } - void SetGrfToGalleryAsLnk( BOOL b ) { aMiscConfig.bGrfToGalleryAsLnk = b; + sal_Bool IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } + void SetGrfToGalleryAsLnk( sal_Bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; aMiscConfig.SetModified();} sal_Int16 GetMailingFormats() const { return aMiscConfig.nMailingFormats;} void SetMailingFormats( sal_Int16 nSet ) { aMiscConfig.nMailingFormats = nSet; aMiscConfig.SetModified();} - BOOL IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } - void SetSinglePrintJob( BOOL b ) { aMiscConfig.bSinglePrintJob = b; + sal_Bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } + void SetSinglePrintJob( sal_Bool b ) { aMiscConfig.bSinglePrintJob = b; aMiscConfig.SetModified();} - BOOL IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } - void SetNumAlignSize( BOOL b ) { aMiscConfig.bNumAlignSize = b; + sal_Bool IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } + void SetNumAlignSize( sal_Bool b ) { aMiscConfig.bNumAlignSize = b; aMiscConfig.SetModified();} - BOOL IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } - void SetIsNameFromColumn( BOOL bSet ) + sal_Bool IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } + void SetIsNameFromColumn( sal_Bool bSet ) { aMiscConfig.SetModified(); aMiscConfig.bIsNameFromColumn = bSet; } - BOOL IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} - void SetAskForMailMerge(BOOL bSet) + sal_Bool IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} + void SetAskForMailMerge(sal_Bool bSet) { aMiscConfig.SetModified(); aMiscConfig.bAskForMailMergeInPrint = bSet; @@ -322,22 +322,22 @@ public: aMiscConfig.SetModified();} //convert word delimiter from or to user interface - static String ConvertWordDelimiter(const String& rDelim, BOOL bFromUI); + static String ConvertWordDelimiter(const String& rDelim, sal_Bool bFromUI); - BOOL IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} - void SetShowIndexPreview(BOOL bSet) + sal_Bool IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} + void SetShowIndexPreview(sal_Bool bSet) {aMiscConfig.bShowIndexPreview = bSet; aMiscConfig.SetModified();} - BOOL IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} - void SetDefaultFontInCurrDocOnly(BOOL bSet) + sal_Bool IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} + void SetDefaultFontInCurrDocOnly(sal_Bool bSet) { aMiscConfig.bDefaultFontsInCurrDocOnly = bSet; aMiscConfig.SetModified(); } - BOOL IsHideFieldTips() const {return bHideFieldTips;} - void SetHideFieldTips(BOOL bSet) {bHideFieldTips = bSet;} + sal_Bool IsHideFieldTips() const {return bHideFieldTips;} + void SetHideFieldTips(sal_Bool bSet) {bHideFieldTips = bSet;} }; #endif diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index dd822a11dfdd..74a9bb215b37 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -78,7 +78,7 @@ struct SwPosition; // -------------------- typedef SwNode * SwNodePtr; -typedef BOOL (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); +typedef sal_Bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0, 10 ) @@ -94,7 +94,7 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray void InsertNode( const SwNodePtr pNode, const SwNodeIndex& rPos ); void InsertNode( const SwNodePtr pNode, - ULONG nPos ); + sal_uLong nPos ); // <-- @@ -106,27 +106,27 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray mutable SwOutlineNodes* pOutlineNds; // Array aller GliederiungsNodes - BOOL bInNodesDel : 1; // falls rekursiv aufgerufen wird + sal_Bool bInNodesDel : 1; // falls rekursiv aufgerufen wird // Num/Outline nicht aktualisierem - BOOL bInDelUpdOutl : 1; // Flags fuers aktualisieren von Outl. - BOOL bInDelUpdNum : 1; // Flags fuers aktualisieren von Outl. + sal_Bool bInDelUpdOutl : 1; // Flags fuers aktualisieren von Outl. + sal_Bool bInDelUpdNum : 1; // Flags fuers aktualisieren von Outl. // fuer dier Verwaltung der Indizies void RegisterIndex( SwNodeIndex& rIdx ); void DeRegisterIndex( SwNodeIndex& rIdx ); - void RemoveNode( ULONG nDelPos, ULONG nLen, BOOL bDel ); + void RemoveNode( sal_uLong nDelPos, sal_uLong nLen, sal_Bool bDel ); // Aktionen auf die Nodes void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd ); - void DelNodes( const SwNodeIndex& rStart, ULONG nCnt = 1 ); + void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 ); - void ChgNode( SwNodeIndex& rDelPos, ULONG nSize, - SwNodeIndex& rInsPos, BOOL bNewFrms ); + void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize, + SwNodeIndex& rInsPos, sal_Bool bNewFrms ); void UpdtOutlineIdx( const SwNode& ); // Update ab Node alle OutlineNodes void _CopyNodes( const SwNodeRange&, const SwNodeIndex&, - BOOL bNewFrms = TRUE, BOOL bTblInsDummyNode = FALSE ) const; + sal_Bool bNewFrms = sal_True, sal_Bool bTblInsDummyNode = sal_False ) const; void _DelDummyNodes( const SwNodeRange& rRg ); protected: @@ -138,20 +138,20 @@ public: typedef ::std::vector<SwNodeRange> NodeRanges_t; typedef ::std::vector<NodeRanges_t> TableRanges_t; - SwNodePtr operator[]( ULONG n ) const + SwNodePtr operator[]( sal_uLong n ) const { return (SwNodePtr)BigPtrArray::operator[] ( n ); } //JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die // neue Schnittstelle angepasst werden inline SwNodePtr operator[]( const SwNodeIndex& rIdx ) const; - ULONG Count() const { return BigPtrArray::Count(); } + sal_uLong Count() const { return BigPtrArray::Count(); } void ForEach( FnForEach_SwNodes fnForEach, void* pArgs = 0 ) { BigPtrArray::ForEach( 0, BigPtrArray::Count(), (FnForEach) fnForEach, pArgs ); } - void ForEach( ULONG nStt, ULONG nEnd, FnForEach_SwNodes fnForEach, void* pArgs = 0 ) + void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach, void* pArgs = 0 ) { BigPtrArray::ForEach( nStt, nEnd, (FnForEach) fnForEach, pArgs ); } @@ -174,23 +174,23 @@ public: // ist das NodesArray das normale vom Doc? (nicht das UndoNds, .. ) // Implementierung steht im doc.hxx (weil man dazu Doc kennen muss) ! - BOOL IsDocNodes() const; + sal_Bool IsDocNodes() const; - USHORT GetSectionLevel(const SwNodeIndex &rIndex) const; - void Delete(const SwNodeIndex &rPos, ULONG nNodes = 1); + sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex) const; + void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1); - BOOL _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, - BOOL bNewFrms = TRUE ); + sal_Bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, + sal_Bool bNewFrms = sal_True ); void MoveRange( SwPaM&, SwPosition&, SwNodes& rNodes ); void _Copy( const SwNodeRange& rRg, const SwNodeIndex& rInsPos, - BOOL bNewFrms = TRUE ) const + sal_Bool bNewFrms = sal_True ) const { _CopyNodes( rRg, rInsPos, bNewFrms ); } void SectionUp( SwNodeRange *); void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode ); - BOOL CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; + sal_Bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; void GoStartOfSection(SwNodeIndex *) const; void GoEndOfSection(SwNodeIndex *) const; @@ -204,11 +204,11 @@ public: SwNode* GoPreviousWithFrm(SwNodeIndex *) const; // zum naechsten Content-Node, der nicht geschuetzt oder versteckt ist - // (beides auf FALSE ==> GoNext/GoPrevious!!!) - SwCntntNode* GoNextSection( SwNodeIndex *, int bSkipHidden = TRUE, - int bSkipProtect = TRUE ) const; - SwCntntNode* GoPrevSection( SwNodeIndex *, int bSkipHidden = TRUE, - int bSkipProtect = TRUE ) const; + // (beides auf sal_False ==> GoNext/GoPrevious!!!) + SwCntntNode* GoNextSection( SwNodeIndex *, int bSkipHidden = sal_True, + int bSkipProtect = sal_True ) const; + SwCntntNode* GoPrevSection( SwNodeIndex *, int bSkipHidden = sal_True, + int bSkipProtect = sal_True ) const; // erzeuge ein leere Section von Start und EndNode. Darf nur gerufen // werden, wenn eine neue Section mit Inhalt erzeugt werden soll. @@ -231,7 +231,7 @@ public: const Graphic* pGraphic, SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0, - BOOL bDelayed = FALSE ); // in ndgrf.cxx + sal_Bool bDelayed = sal_False ); // in ndgrf.cxx SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, @@ -251,7 +251,7 @@ public: // Array aller GliederiungsNodes; const SwOutlineNodes& GetOutLineNds() const; - //void UpdateOutlineNode( const SwNode&, BYTE nOldLevel, BYTE nNewLevel );//#outline level,removed by zhaojianwei + //void UpdateOutlineNode( const SwNode&, sal_uInt8 nOldLevel, sal_uInt8 nNewLevel );//#outline level,removed by zhaojianwei // alle Nodes Updaten - Rule/Format-Aenderung void UpdateOutlineNode(SwNode & rNd); @@ -267,8 +267,8 @@ public: */ SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, - USHORT nBoxes, SwTxtFmtColl* pCntntTxtColl, - USHORT nLines = 0, USHORT nRepeat = 0, + sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl, + sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0, SwTxtFmtColl* pHeadlineTxtColl = 0, const SwAttrSet * pAttrSet = 0); @@ -291,30 +291,30 @@ public: /*, SwUndo... pUndo*/ ); // erzeuge aus der Tabelle wieder normalen Text - BOOL TableToText( const SwNodeRange& rRange, sal_Unicode cCh, + sal_Bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, SwUndoTblToTxt* = 0 ); // steht im untbl.cxx und darf nur vom Undoobject gerufen werden - SwTableNode* UndoTableToText( ULONG nStt, ULONG nEnd, + SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd, const SwTblToTxtSaves& rSavedData ); // fuege in der Line, vor der InsPos eine neue Box ein. Das Format // wird von der nachfolgenden (vorhergenden;wenn an Ende) genommen // in der Line muss schon eine Box vorhanden sein ! - BOOL InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, + sal_Bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, // Formate fuer den TextNode der Box SwTxtFmtColl*, const SfxItemSet* pAutoAttr, - USHORT nInsPos, USHORT nCnt = 1 ); + sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); // Splittet eine Tabelle in der Grund-Zeile, in der der Index steht. // Alle GrundZeilen dahinter wandern in eine neue Tabelle/-Node. - // Ist das Flag bCalcNewSize auf TRUE, wird fuer beide neuen Tabellen + // Ist das Flag bCalcNewSize auf sal_True, wird fuer beide neuen Tabellen // die neue SSize aus dem Max der Boxen errechnet; vorrausgesetzt, // die SSize ist "absolut" gesetzt (LONG_MAX) // (Wird zur Zeit nur fuer den RTF-Parser benoetigt) - SwTableNode* SplitTable( const SwNodeIndex& rPos, BOOL bAfter = TRUE, - BOOL bCalcNewSize = FALSE ); + SwTableNode* SplitTable( const SwNodeIndex& rPos, sal_Bool bAfter = sal_True, + sal_Bool bCalcNewSize = sal_False ); // fuegt 2 Tabellen, die hintereinander stehen, wieder zusammen - BOOL MergeTable( const SwNodeIndex& rPos, BOOL bWithPrev = TRUE, - USHORT nMode = 0, SwHistory* pHistory = 0 ); + sal_Bool MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev = sal_True, + sal_uInt16 nMode = 0, SwHistory* pHistory = 0 ); // fuege eine neue SwSection ein SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx, diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 748dceed0c83..fb1c1d4c8c33 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -57,16 +57,16 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode // name or package url) String aLowResGrf; // HTML: LowRes Grafik (Ersatzdarstellung bis // die normale (HighRes) geladen ist. - BOOL bTransparentFlagValid :1; - BOOL bInSwapIn :1; - - BOOL bGrafikArrived :1; - BOOL bChgTwipSize :1; - BOOL bChgTwipSizeFromPixel :1; - BOOL bLoadLowResGrf :1; - BOOL bFrameInPaint :1; //Um Start-/EndActions im Paint (ueber + sal_Bool bTransparentFlagValid :1; + sal_Bool bInSwapIn :1; + + sal_Bool bGrafikArrived :1; + sal_Bool bChgTwipSize :1; + sal_Bool bChgTwipSizeFromPixel :1; + sal_Bool bLoadLowResGrf :1; + sal_Bool bFrameInPaint :1; //Um Start-/EndActions im Paint (ueber //SwapIn zu verhindern. - BOOL bScaleImageMap :1; //Image-Map in SetTwipSize skalieren + sal_Bool bScaleImageMap :1; //Image-Map in SetTwipSize skalieren // --> OD 2007-01-19 #i73788# boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; @@ -91,8 +91,8 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode SwAttrSet* pAutoAttr = 0 ); void InsertLink( const String& rGrfName, const String& rFltName ); - BOOL ImportGraphic( SvStream& rStrm ); - BOOL HasStreamName() const { return aGrfObj.HasUserData(); } + sal_Bool ImportGraphic( SvStream& rStrm ); + sal_Bool HasStreamName() const { return aGrfObj.HasUserData(); } // --> OD 2005-05-04 #i48434# - adjust return type and rename method to // indicate that its an private one. // --> OD 2005-08-17 #i53025# @@ -157,22 +157,22 @@ public: #ifndef _FESHVIEW_ONLY_INLINE_NEEDED void SetTwipSize( const Size& rSz ); - BOOL IsTransparent() const; + sal_Bool IsTransparent() const; - inline BOOL IsAnimated() const { return aGrfObj.IsAnimated(); } + inline sal_Bool IsAnimated() const { return aGrfObj.IsAnimated(); } - inline BOOL IsChgTwipSize() const { return bChgTwipSize; } - inline BOOL IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } - inline void SetChgTwipSize( BOOL b, BOOL bFromPx=FALSE ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; } + inline sal_Bool IsChgTwipSize() const { return bChgTwipSize; } + inline sal_Bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } + inline void SetChgTwipSize( sal_Bool b, sal_Bool bFromPx=sal_False ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; } - inline BOOL IsGrafikArrived() const { return bGrafikArrived; } - inline void SetGrafikArrived( BOOL b ) { bGrafikArrived = b; } + inline sal_Bool IsGrafikArrived() const { return bGrafikArrived; } + inline void SetGrafikArrived( sal_Bool b ) { bGrafikArrived = b; } - inline BOOL IsFrameInPaint() const { return bFrameInPaint; } - inline void SetFrameInPaint( BOOL b ) { bFrameInPaint = b; } + inline sal_Bool IsFrameInPaint() const { return bFrameInPaint; } + inline void SetFrameInPaint( sal_Bool b ) { bFrameInPaint = b; } - inline BOOL IsScaleImageMap() const { return bScaleImageMap; } - inline void SetScaleImageMap( BOOL b ) { bScaleImageMap = b; } + inline sal_Bool IsScaleImageMap() const { return bScaleImageMap; } + inline void SetScaleImageMap( sal_Bool b ) { bScaleImageMap = b; } #endif // steht in ndcopy.cxx virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; @@ -180,32 +180,32 @@ public: // erneutes Einlesen, falls Graphic nicht Ok ist. Die // aktuelle wird durch die neue ersetzt. - BOOL ReRead( const String& rGrfName, const String& rFltName, + sal_Bool ReRead( const String& rGrfName, const String& rFltName, const Graphic* pGraphic = 0, const GraphicObject* pGrfObj = 0, - BOOL bModify = TRUE ); + sal_Bool bModify = sal_True ); // Laden der Grafik unmittelbar vor der Anzeige - short SwapIn( BOOL bWaitForData = FALSE ); + short SwapIn( sal_Bool bWaitForData = sal_False ); // Entfernen der Grafik, um Speicher freizugeben short SwapOut(); // Zugriff auf den Storage-Streamnamen void SetStreamName( const String& r ) { aGrfObj.SetUserData( r ); } void SetNewStreamName( const String& r ) { aNewStrmName = r; } // is this node selected by any shell? - BOOL IsSelected() const; + sal_Bool IsSelected() const; #endif // Der Grafik sagen, dass sich der Node im Undobereich befindet - virtual BOOL SavePersistentData(); - virtual BOOL RestorePersistentData(); + virtual sal_Bool SavePersistentData(); + virtual sal_Bool RestorePersistentData(); #ifndef _FESHVIEW_ONLY_INLINE_NEEDED // Abfrage der Link-Daten - BOOL IsGrfLink() const { return refLink.Is(); } - inline BOOL IsLinkedFile() const; - inline BOOL IsLinkedDDE() const; + sal_Bool IsGrfLink() const { return refLink.Is(); } + inline sal_Bool IsLinkedFile() const; + inline sal_Bool IsLinkedDDE() const; ::sfx2::SvBaseLinkRef GetLink() const { return refLink; } - BOOL GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; + sal_Bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; void ReleaseLink(); // Skalieren einer Image-Map: Die Image-Map wird um den Faktor @@ -243,11 +243,11 @@ inline const SwGrfNode *SwNode::GetGrfNode() const } #ifndef _FESHVIEW_ONLY_INLINE_NEEDED -inline BOOL SwGrfNode::IsLinkedFile() const +inline sal_Bool SwGrfNode::IsLinkedFile() const { return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType(); } -inline BOOL SwGrfNode::IsLinkedDDE() const +inline sal_Bool SwGrfNode::IsLinkedDDE() const { return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType(); } diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index c1d210464eb3..f24dce137463 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -88,31 +88,31 @@ protected: //FIXME: why are the non-const methods public? public: void Insert( const SwTxtAttr *pHt ); - void DeleteAtPos( const USHORT nPosInStart ); + void DeleteAtPos( const sal_uInt16 nPosInStart ); bool Resort(); - SwTxtAttr * Cut( const USHORT nPosInStart ); + SwTxtAttr * Cut( const sal_uInt16 nPosInStart ); - inline const SwTxtAttr * GetStart( const USHORT nPos ) const + inline const SwTxtAttr * GetStart( const sal_uInt16 nPos ) const { return m_HintStarts[nPos]; } - inline const SwTxtAttr * GetEnd ( const USHORT nPos ) const + inline const SwTxtAttr * GetEnd ( const sal_uInt16 nPos ) const { return m_HintEnds [nPos]; } - inline SwTxtAttr * GetStart( const USHORT nPos ) + inline SwTxtAttr * GetStart( const sal_uInt16 nPos ) { return m_HintStarts[nPos]; } - inline SwTxtAttr * GetEnd ( const USHORT nPos ) + inline SwTxtAttr * GetEnd ( const sal_uInt16 nPos ) { return m_HintEnds [nPos]; } - inline USHORT GetEndCount() const { return m_HintEnds .Count(); } - inline USHORT GetStartCount() const { return m_HintStarts.Count(); } + inline sal_uInt16 GetEndCount() const { return m_HintEnds .Count(); } + inline sal_uInt16 GetStartCount() const { return m_HintStarts.Count(); } - inline USHORT GetStartOf( const SwTxtAttr *pHt ) const; - inline USHORT GetPos( const SwTxtAttr *pHt ) const + inline sal_uInt16 GetStartOf( const SwTxtAttr *pHt ) const; + inline sal_uInt16 GetPos( const SwTxtAttr *pHt ) const { return m_HintStarts.GetPos( pHt ); } - inline SwTxtAttr * GetTextHint( const USHORT nIdx ) + inline SwTxtAttr * GetTextHint( const sal_uInt16 nIdx ) { return GetStart(nIdx); } - inline const SwTxtAttr * operator[]( const USHORT nIdx ) const + inline const SwTxtAttr * operator[]( const sal_uInt16 nIdx ) const { return m_HintStarts[nIdx]; } - inline USHORT Count() const { return m_HintStarts.Count(); } + inline sal_uInt16 Count() const { return m_HintStarts.Count(); } #ifdef DBG_UTIL bool Check() const; @@ -147,7 +147,7 @@ private: // Because the TextNode also guarantees removal of the Character for // attributes without an end. friend class SwTxtNode; - void DeleteAtPos( const USHORT nPos ); + void DeleteAtPos( const sal_uInt16 nPos ); // Delete the given Hint. The Hint must actually be in the array! void Delete( SwTxtAttr* pTxtHt ); @@ -202,9 +202,9 @@ SvStream &operator<<(SvStream &aS, const SwpHints &rHints); //$ ostream * Inline Implementations *************************************************************************/ -inline USHORT SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const +inline sal_uInt16 SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const { - USHORT nPos; + sal_uInt16 nPos; if ( !m_HintStarts.Seek_Entry( pHt, &nPos ) ) { nPos = USHRT_MAX; @@ -212,7 +212,7 @@ inline USHORT SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const return nPos; } -inline SwTxtAttr *SwpHintsArray::Cut( const USHORT nPosInStart ) +inline SwTxtAttr *SwpHintsArray::Cut( const sal_uInt16 nPosInStart ) { SwTxtAttr *pHt = GetTextHint(nPosInStart); DeleteAtPos( nPosInStart ); diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 3c3a71dd8641..611c09390728 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -40,7 +40,7 @@ class SW_DLLPUBLIC SwNodeIndex { friend void SwNodes::RegisterIndex( SwNodeIndex& ); friend void SwNodes::DeRegisterIndex( SwNodeIndex& ); - friend void SwNodes::RemoveNode( ULONG, ULONG, BOOL ); + friend void SwNodes::RemoveNode( sal_uLong, sal_uLong, sal_Bool ); #ifdef DBG_UTIL static int nSerial; @@ -53,50 +53,50 @@ class SW_DLLPUBLIC SwNodeIndex void Remove(); // Ausketten // diese sind nicht erlaubt! - SwNodeIndex( SwNodes& rNds, USHORT nIdx ); + SwNodeIndex( SwNodes& rNds, sal_uInt16 nIdx ); SwNodeIndex( SwNodes& rNds, int nIdx ); public: - SwNodeIndex( SwNodes& rNds, ULONG nIdx = 0 ); + SwNodeIndex( SwNodes& rNds, sal_uLong nIdx = 0 ); SwNodeIndex( const SwNodeIndex &, long nDiff = 0 ); SwNodeIndex( const SwNode&, long nDiff = 0 ); ~SwNodeIndex() { Remove(); } - inline ULONG operator++(); - inline ULONG operator--(); + inline sal_uLong operator++(); + inline sal_uLong operator--(); #ifndef CFRONT - inline ULONG operator++(int); - inline ULONG operator--(int); + inline sal_uLong operator++(int); + inline sal_uLong operator--(int); #endif - inline ULONG operator+=( ULONG ); - inline ULONG operator-=( ULONG ); - inline ULONG operator+=( const SwNodeIndex& ); - inline ULONG operator-=( const SwNodeIndex& ); - - inline BOOL operator< ( const SwNodeIndex& ) const; - inline BOOL operator<=( const SwNodeIndex& ) const; - inline BOOL operator> ( const SwNodeIndex& ) const; - inline BOOL operator>=( const SwNodeIndex& ) const; - inline BOOL operator==( const SwNodeIndex& ) const; - inline BOOL operator!=( const SwNodeIndex& ) const; - - inline BOOL operator< ( ULONG nWert ) const; - inline BOOL operator<=( ULONG nWert ) const; - inline BOOL operator> ( ULONG nWert ) const; - inline BOOL operator>=( ULONG nWert ) const; - inline BOOL operator==( ULONG nWert ) const; - inline BOOL operator!=( ULONG nWert ) const; - - inline SwNodeIndex& operator=( ULONG ); + inline sal_uLong operator+=( sal_uLong ); + inline sal_uLong operator-=( sal_uLong ); + inline sal_uLong operator+=( const SwNodeIndex& ); + inline sal_uLong operator-=( const SwNodeIndex& ); + + inline sal_Bool operator< ( const SwNodeIndex& ) const; + inline sal_Bool operator<=( const SwNodeIndex& ) const; + inline sal_Bool operator> ( const SwNodeIndex& ) const; + inline sal_Bool operator>=( const SwNodeIndex& ) const; + inline sal_Bool operator==( const SwNodeIndex& ) const; + inline sal_Bool operator!=( const SwNodeIndex& ) const; + + inline sal_Bool operator< ( sal_uLong nWert ) const; + inline sal_Bool operator<=( sal_uLong nWert ) const; + inline sal_Bool operator> ( sal_uLong nWert ) const; + inline sal_Bool operator>=( sal_uLong nWert ) const; + inline sal_Bool operator==( sal_uLong nWert ) const; + inline sal_Bool operator!=( sal_uLong nWert ) const; + + inline SwNodeIndex& operator=( sal_uLong ); SwNodeIndex& operator=( const SwNodeIndex& ); SwNodeIndex& operator=( const SwNode& ); - // gebe den Wert vom Index als ULONG zurueck - inline ULONG GetIndex() const; + // gebe den Wert vom Index als sal_uLong zurueck + inline sal_uLong GetIndex() const; // ermoeglicht Zuweisungen ohne Erzeugen eines temporaeren Objektes - SwNodeIndex& Assign( SwNodes& rNds, ULONG ); + SwNodeIndex& Assign( SwNodes& rNds, sal_uLong ); SwNodeIndex& Assign( const SwNode& rNd, long nOffset = 0 ); // Herausgabe des Pointers auf das NodesArray, @@ -118,7 +118,7 @@ public: SwNodeRange( const SwNodeIndex &rS, const SwNodeIndex &rE ); SwNodeRange( const SwNodeRange &rRange ); - SwNodeRange( SwNodes& rArr, ULONG nSttIdx = 0, ULONG nEndIdx = 0 ); + SwNodeRange( SwNodes& rArr, sal_uLong nSttIdx = 0, sal_uLong nEndIdx = 0 ); SwNodeRange( const SwNodeIndex& rS, long nSttDiff, const SwNodeIndex& rE, long nEndDiff = 0 ); SwNodeRange( const SwNode& rS, long nSttDiff, @@ -132,7 +132,7 @@ public: // auch wieder dieses. Also alle Inlines, die auf pNd zugreifen werden // hier implementiert. -inline ULONG SwNodeIndex::GetIndex() const +inline sal_uLong SwNodeIndex::GetIndex() const { return pNd->GetIndex(); } @@ -144,96 +144,96 @@ inline SwNodes& SwNodeIndex::GetNodes() { return pNd->GetNodes(); } -inline BOOL SwNodeIndex::operator< ( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator< ( sal_uLong nWert ) const { return pNd->GetIndex() < nWert; } -inline BOOL SwNodeIndex::operator<=( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator<=( sal_uLong nWert ) const { return pNd->GetIndex() <= nWert; } -inline BOOL SwNodeIndex::operator> ( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator> ( sal_uLong nWert ) const { return pNd->GetIndex() > nWert; } -inline BOOL SwNodeIndex::operator>=( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator>=( sal_uLong nWert ) const { return pNd->GetIndex() >= nWert; } -inline BOOL SwNodeIndex::operator==( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator==( sal_uLong nWert ) const { return pNd->GetIndex() == nWert; } -inline BOOL SwNodeIndex::operator!=( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator!=( sal_uLong nWert ) const { return pNd->GetIndex() != nWert; } -inline BOOL SwNodeIndex::operator<( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator<( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() < rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator<=( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator<=( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() <= rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator>( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator>( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() > rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator>=( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator>=( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() >= rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator==( const SwNodeIndex& rIdx ) const +inline sal_Bool SwNodeIndex::operator==( const SwNodeIndex& rIdx ) const { return pNd == rIdx.pNd; } -inline BOOL SwNodeIndex::operator!=( const SwNodeIndex& rIdx ) const +inline sal_Bool SwNodeIndex::operator!=( const SwNodeIndex& rIdx ) const { return pNd != rIdx.pNd; } -inline ULONG SwNodeIndex::operator++() +inline sal_uLong SwNodeIndex::operator++() { return ( pNd = GetNodes()[ pNd->GetIndex()+1 ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator--() +inline sal_uLong SwNodeIndex::operator--() { return ( pNd = GetNodes()[ pNd->GetIndex()-1 ] )->GetIndex(); } #ifndef CFRONT -inline ULONG SwNodeIndex::operator++(int) +inline sal_uLong SwNodeIndex::operator++(int) { - ULONG nOldIndex = pNd->GetIndex(); + sal_uLong nOldIndex = pNd->GetIndex(); pNd = GetNodes()[ nOldIndex + 1 ]; return nOldIndex; } -inline ULONG SwNodeIndex::operator--(int) +inline sal_uLong SwNodeIndex::operator--(int) { - ULONG nOldIndex = pNd->GetIndex(); + sal_uLong nOldIndex = pNd->GetIndex(); pNd = GetNodes()[ nOldIndex - 1 ]; return nOldIndex; } #endif -inline ULONG SwNodeIndex::operator+=( ULONG nWert ) +inline sal_uLong SwNodeIndex::operator+=( sal_uLong nWert ) { return ( pNd = GetNodes()[ pNd->GetIndex() + nWert ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator-=( ULONG nWert ) +inline sal_uLong SwNodeIndex::operator-=( sal_uLong nWert ) { return ( pNd = GetNodes()[ pNd->GetIndex() - nWert ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator+=( const SwNodeIndex& rIndex ) +inline sal_uLong SwNodeIndex::operator+=( const SwNodeIndex& rIndex ) { return ( pNd = GetNodes()[ pNd->GetIndex() + rIndex.GetIndex() ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator-=( const SwNodeIndex& rIndex ) +inline sal_uLong SwNodeIndex::operator-=( const SwNodeIndex& rIndex ) { return ( pNd = GetNodes()[ pNd->GetIndex() - rIndex.GetIndex() ] )->GetIndex(); } -inline SwNodeIndex& SwNodeIndex::operator=( ULONG nWert ) +inline SwNodeIndex& SwNodeIndex::operator=( sal_uLong nWert ) { pNd = GetNodes()[ nWert ]; return *this; diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 64586f06cd8c..b61e46325bc5 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -43,11 +43,11 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode // String aAlternateText; // alternativer Text (HTML) PolyPolygon *pContour; // Polygon fuer Konturumlauf - BOOL bAutomaticContour : 1; // automatic contour polygon, not manipulated - BOOL bContourMapModeValid : 1; // contour map mode is not the graphics's + sal_Bool bAutomaticContour : 1; // automatic contour polygon, not manipulated + sal_Bool bContourMapModeValid : 1; // contour map mode is not the graphics's // prefered map mode, but either // MM100 or or pixel - BOOL bPixelContour : 1; // contour map mode is invalid and pixel. + sal_Bool bPixelContour : 1; // contour map mode is invalid and pixel. // erzeugt fuer alle Ableitungen einen AttrSet mit Bereichen // fuer Frame- und Grafik-Attributen (wird nur vom SwCntntNode gerufen) @@ -57,7 +57,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode SwNoTxtNode &operator=( const SwNoTxtNode& ); //nicht erlaubt protected: - SwNoTxtNode( const SwNodeIndex &rWhere, const BYTE nNdType, + SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 ); public: @@ -69,8 +69,8 @@ public: virtual Size GetTwipSize() const = 0; - virtual BOOL SavePersistentData(); - virtual BOOL RestorePersistentData(); + virtual sal_Bool SavePersistentData(); + virtual sal_Bool RestorePersistentData(); const String GetTitle() const; void SetTitle( const String& rTitle, @@ -84,25 +84,25 @@ public: // sal_Bool bBroadcast=sal_False ); void SetContour( const PolyPolygon *pPoly, - BOOL bAutomatic = FALSE ); + sal_Bool bAutomatic = sal_False ); const PolyPolygon *HasContour() const; - BOOL _HasContour() const { return pContour!=0; }; + sal_Bool _HasContour() const { return pContour!=0; }; void GetContour( PolyPolygon &rPoly ) const; void CreateContour(); - void SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; } - BOOL HasAutomaticContour() const { return bAutomaticContour; } + void SetAutomaticContour( sal_Bool bSet ) { bAutomaticContour = bSet; } + sal_Bool HasAutomaticContour() const { return bAutomaticContour; } // set either a MM100 or pixel contour void SetContourAPI( const PolyPolygon *pPoly ); - // get either a MM100 or pixel contour, return FALSE if no contour is set. - BOOL GetContourAPI( PolyPolygon &rPoly ) const; + // get either a MM100 or pixel contour, return sal_False if no contour is set. + sal_Bool GetContourAPI( PolyPolygon &rPoly ) const; - void SetPixelContour( BOOL bSet ) { bPixelContour = bSet; } - BOOL IsPixelContour() const; + void SetPixelContour( sal_Bool bSet ) { bPixelContour = bSet; } + sal_Bool IsPixelContour() const; - BOOL IsContourMapModeValid() const { return bContourMapModeValid; } + sal_Bool IsContourMapModeValid() const { return bContourMapModeValid; } //Besorgt die Graphic, mit SwapIn fuer GrfNode, per GetData fuer OLE. Graphic GetGraphic() const; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index e439109ff866..0199d2e399bb 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -59,8 +59,8 @@ public: SwOLEObj( const String &rName, sal_Int64 nAspect ); ~SwOLEObj(); - BOOL UnloadObject(); - static BOOL UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, + sal_Bool UnloadObject(); + static sal_Bool UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, const SwDoc* pDoc, sal_Int64 nAspect ); @@ -70,7 +70,7 @@ public: const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef(); svt::EmbeddedObjectRef& GetObject(); const String& GetCurrentPersistName() const { return aName; } - BOOL IsOleRef() const; //Damit das Objekt nicht unnoetig geladen werden muss. + sal_Bool IsOleRef() const; //Damit das Objekt nicht unnoetig geladen werden muss. #endif }; @@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode mutable SwOLEObj aOLEObj; Graphic* pGraphic; String sChartTblName; // bei Chart Objecten: Name der ref. Tabelle - BOOL bOLESizeInvalid; //Soll beim SwDoc::PrtOLENotify beruecksichtig + sal_Bool bOLESizeInvalid; //Soll beim SwDoc::PrtOLENotify beruecksichtig //werden (zum Beispiel kopiert). Ist nicht //Persistent. @@ -124,14 +124,14 @@ public: Graphic* GetHCGraphic(); // tries to retrieve HighContrast representation if possible void GetNewReplacement(); - virtual BOOL SavePersistentData(); - virtual BOOL RestorePersistentData(); + virtual sal_Bool SavePersistentData(); + virtual sal_Bool RestorePersistentData(); - BOOL IsInGlobalDocSection() const; - BOOL IsOLEObjectDeleted() const; + sal_Bool IsInGlobalDocSection() const; + sal_Bool IsOLEObjectDeleted() const; - BOOL IsOLESizeInvalid() const { return bOLESizeInvalid; } - void SetOLESizeInvalid( BOOL b ){ bOLESizeInvalid = b; } + sal_Bool IsOLESizeInvalid() const { return bOLESizeInvalid; } + void SetOLESizeInvalid( sal_Bool b ){ bOLESizeInvalid = b; } sal_Int64 GetAspect() const { return aOLEObj.GetObject().GetViewAspect(); } void SetAspect( sal_Int64 nAspect) { aOLEObj.GetObject().SetViewAspect( nAspect ); } diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 53168d5a9cb4..5ccaf0329f70 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -118,7 +118,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable mutable bool m_bLastOutlineState : 1; bool m_bNotifiable; - // BYTE nOutlineLevel; //#outline level, removed by zhaojianwei. + // sal_uInt8 nOutlineLevel; //#outline level, removed by zhaojianwei. // --> OD 2008-11-19 #i70748# bool mbEmptyListStyleSetDueToSetOutlineLevelAttr; // <-- @@ -145,8 +145,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable // Kopiert die Attribute an nStart nach pDest. SW_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const xub_StrLen nStart, const xub_StrLen nOldPos); - SW_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, BOOL bNext = TRUE, - BOOL bChgFollow = TRUE ); + SW_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True, + sal_Bool bChgFollow = sal_True ); SW_DLLPRIVATE void CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, @@ -160,7 +160,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable SW_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ); SW_DLLPRIVATE void Replace0xFF( XubString& rTxt, xub_StrLen& rTxtStt, - xub_StrLen nEndPos, BOOL bExpandFlds ) const; + xub_StrLen nEndPos, sal_Bool bExpandFlds ) const; // Optimization: Asking for information about hidden characters at SwScriptInfo // updates these flags. @@ -175,19 +175,19 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable SW_DLLPRIVATE void CalcHiddenCharFlags() const; - SW_DLLPRIVATE SwNumRule * _GetNumRule(BOOL bInParent = TRUE) const; + SW_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const; SW_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM, - LanguageType nLang, USHORT nLangWhichId, - const Font *pFont, USHORT nFontWhichId ); + LanguageType nLang, sal_uInt16 nLangWhichId, + const Font *pFont, sal_uInt16 nFontWhichId ); // // Start: Data collected during idle time // - SW_DLLPRIVATE void SetParaNumberOfWords( ULONG nTmpWords ) const; - SW_DLLPRIVATE ULONG GetParaNumberOfWords() const; - SW_DLLPRIVATE void SetParaNumberOfChars( ULONG nTmpChars ) const; - SW_DLLPRIVATE ULONG GetParaNumberOfChars() const; + SW_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const; + SW_DLLPRIVATE sal_uLong GetParaNumberOfWords() const; + SW_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const; + SW_DLLPRIVATE sal_uLong GetParaNumberOfChars() const; SW_DLLPRIVATE void InitSwParaStatistics( bool bNew ); /** create number for this text node, if not already existing @@ -247,16 +247,16 @@ public: virtual xub_StrLen Len() const; // steht in itratr - void GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, ULONG &rAbs, + void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs, OutputDevice* pOut = 0 ) const; // --> OD 2008-03-13 #refactorlists# // overriding to handle change of certain paragraph attributes - virtual BOOL SetAttr( const SfxPoolItem& ); - virtual BOOL SetAttr( const SfxItemSet& rSet ); - virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); - virtual BOOL ResetAttr( const SvUShorts& rWhichArr ); - virtual USHORT ResetAllAttr(); + virtual sal_Bool SetAttr( const SfxPoolItem& ); + virtual sal_Bool SetAttr( const SfxItemSet& rSet ); + virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual sal_Bool ResetAttr( const SvUShorts& rWhichArr ); + virtual sal_uInt16 ResetAllAttr(); // <-- /// insert text content @@ -283,8 +283,8 @@ public: refmarks, toxmarks, and metas will be ignored unless this is true ATTENTION: setting bInclRefToxMark is only allowed from UNDO! */ - void RstAttr( const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich = 0, - const SfxItemSet* pSet = 0, BOOL bInclRefToxMark = FALSE ); + void RstAttr( const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich = 0, + const SfxItemSet* pSet = 0, sal_Bool bInclRefToxMark = sal_False ); void GCAttr(); // loesche das Text-Attribut (muss beim Pool abgemeldet werden!) @@ -304,20 +304,20 @@ public: // setze diese Attribute am TextNode. Wird der gesamte Bereich umspannt, // dann setze sie nur im AutoAttrSet (SwCntntNode:: SetAttr) - BOOL SetAttr( const SfxItemSet& rSet, + sal_Bool SetAttr( const SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, const SetAttrMode nMode = nsSetAttrMode::SETATTR_DEFAULT ); // erfrage die Attribute vom TextNode ueber den Bereich // --> OD 2008-01-16 #newlistlevelattrs# // Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>. - // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of + // If <bMergeIndentValuesOfNumRule> == sal_True, the indent attributes of // the corresponding list level of an applied list style is merged into - // the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == FALSE, + // the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == sal_False, // corresponding node has not its own indent attributes and the // position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. - BOOL GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, - BOOL bOnlyTxtAttr = FALSE, - BOOL bGetFromChrFmt = TRUE, + sal_Bool GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, + sal_Bool bOnlyTxtAttr = sal_False, + sal_Bool bGetFromChrFmt = sal_True, const bool bMergeIndentValuesOfNumRule = false ) const; // <-- @@ -325,7 +325,7 @@ public: void FmtToTxtAttr( SwTxtNode* pNd ); /// delete all attributes of type nWhich at nStart (opt. end nEnd) - void DeleteAttributes( const USHORT nWhich, + void DeleteAttributes( const sal_uInt16 nWhich, const xub_StrLen nStart, const xub_StrLen nEnd = 0 ); /// delete the attribute pTxtAttr void DeleteAttribute ( SwTxtAttr * const pTxtAttr ); @@ -364,8 +364,8 @@ public: SwCntntNode *AppendNode( const SwPosition & ); // setze ggf. das DontExpand-Flag an INet bzw. Zeichenvorlagen - BOOL DontExpandFmt( const SwIndex& rIdx, bool bFlag = true, - BOOL bFmtToTxtAttributes = TRUE ); + sal_Bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true, + sal_Bool bFmtToTxtAttributes = sal_True ); enum GetTxtAttrMode { DEFAULT, /// DEFAULT: (Start < nIndex <= End) @@ -404,8 +404,8 @@ public: // Aktuelles Wort zurueckliefern XubString GetCurWord(xub_StrLen) const; - USHORT Spell(SwSpellArgs*); - USHORT Convert( SwConversionArgs & ); + sal_uInt16 Spell(SwSpellArgs*); + sal_uInt16 Convert( SwConversionArgs & ); inline SwTxtFmtColl *GetTxtColl() const; virtual SwFmtColl *ChgFmtColl( SwFmtColl* ); @@ -430,7 +430,7 @@ public: @return numbering rule of this text node or NULL if none is set */ - SwNumRule *GetNumRule(BOOL bInParent = TRUE) const; + SwNumRule *GetNumRule(sal_Bool bInParent = sal_True) const; inline const SwNodeNum* GetNum() const { @@ -460,10 +460,10 @@ public: - it has a SwNodeNum and it has a numbering rule and the according SwNumFmt defines a numbering type that is an enumeration. - @retval TRUE this text node may be numbered - @retval FALSE else + @retval sal_True this text node may be numbered + @retval sal_False else */ - //BOOL MayBeNumbered() const; + //sal_Bool MayBeNumbered() const; /** Notify this textnode that its numbering rule has changed. @@ -494,7 +494,7 @@ public: @return additional indents */ - long GetLeftMarginWithNum( BOOL bTxtLeft = FALSE ) const; + long GetLeftMarginWithNum( sal_Bool bTxtLeft = sal_False ) const; /** Returns the combined first line indent of this text node and @@ -503,10 +503,10 @@ public: @param the first line indent of this text node taking the numbering into account (return parameter) - @retval TRUE this node has SwNodeNum and has numbering rule - @retval FALSE else + @retval sal_True this node has SwNodeNum and has numbering rule + @retval sal_False else */ - BOOL GetFirstLineOfsWithNum( short& rFirstOffset ) const; + sal_Bool GetFirstLineOfsWithNum( short& rFirstOffset ) const; // --> OD 2010-01-05 #b6884103# SwTwips GetAdditionalIndentForStartingNewList() const; @@ -533,10 +533,10 @@ public: numbering rule and the numbering format specified for the level of the SwNodeNum is of an enumeration type. - @retval TRUE This text node has a number. - @retval FALSE else + @retval sal_True This text node has a number. + @retval sal_False else */ - BOOL HasNumber() const; + sal_Bool HasNumber() const; /** -> #i29560 Returns if this text node has a bullet. @@ -545,10 +545,10 @@ public: numbering rule and the numbering format specified for the level of the SwNodeNum is of a bullet type. - @retval TRUE This text node has a bullet. - @retval FALSE else + @retval sal_True This text node has a bullet. + @retval sal_False else */ - BOOL HasBullet() const; + sal_Bool HasBullet() const; /** -> #i27615# Returns is this text node is numbered. @@ -556,13 +556,13 @@ public: This node is numbered if it has a SwNodeNum and it has a numbering rule and has not a hidden SwNodeNum. - ATTENTION: Returns TRUE even if the SwNumFmt has type + ATTENTION: Returns sal_True even if the SwNumFmt has type SVX_NUM_NUMBER_NONE. - @retval TRUE This node is numbered. - @retval FALSE else + @retval sal_True This node is numbered. + @retval sal_False else */ - BOOL IsNumbered() const; + sal_Bool IsNumbered() const; /** -> #i27615# Returns if this text node has a marked label. @@ -644,7 +644,7 @@ public: @return the width of the leading whitespace */ - USHORT GetWidthOfLeadingTabs() const; + sal_uInt16 GetWidthOfLeadingTabs() const; /** @@ -653,7 +653,7 @@ public: Note: This function returns false, if the numbering format is SVX_NUM_NUMBER_NONE or if the numbering/bullet has been deleted. - @return TRUE if the paragraph has a visible numbering/bullet/outline + @return sal_True if the paragraph has a visible numbering/bullet/outline */ bool HasVisibleNumberingOrBullet() const; @@ -712,15 +712,15 @@ public: void fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const; - USHORT GetLang( const xub_StrLen nBegin, const xub_StrLen nLen = 0, - USHORT nScript = 0 ) const; + sal_uInt16 GetLang( const xub_StrLen nBegin, const xub_StrLen nLen = 0, + sal_uInt16 nScript = 0 ) const; // steht in ndcopy.cxx - BOOL IsSymbol( const xub_StrLen nBegin ) const; // steht in itratr.cxx + sal_Bool IsSymbol( const xub_StrLen nBegin ) const; // steht in itratr.cxx virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; // interaktive Trennung: wir finden den TxtFrm und rufen sein CalcHyph - BOOL Hyphenate( SwInterHyphInfo &rHyphInf ); + sal_Bool Hyphenate( SwInterHyphInfo &rHyphInf ); void DelSoftHyph( const xub_StrLen nStart, const xub_StrLen nEnd ); // --> OD 2007-11-15 #i83479# @@ -736,10 +736,10 @@ public: const bool bAddSpaceAfterListLabelStr = false, const bool bWithSpacesForLevel = false ) const; // <-- - BOOL GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0, + sal_Bool GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0, xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN, - BOOL bWithNum = FALSE, BOOL bWithFtn = TRUE, - BOOL bReplaceTabsWithSpaces = FALSE ) const; + sal_Bool bWithNum = sal_False, sal_Bool bWithFtn = sal_True, + sal_Bool bReplaceTabsWithSpaces = sal_False ) const; /* * @@ -749,11 +749,11 @@ public: XubString GetRedlineTxt( xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN, - BOOL bExpandFlds = FALSE, - BOOL bWithNum = FALSE ) const; + sal_Bool bExpandFlds = sal_False, + sal_Bool bWithNum = sal_False ) const; //Liefert fuer die Initalfunktion tatsaechliche Anzahl der Initialzeichen //bei nWishLen == 0 die des ersten Wortes - USHORT GetDropLen( USHORT nWishLen) const; + sal_uInt16 GetDropLen( sal_uInt16 nWishLen) const; // Passes back info needed on the dropcap dimensions bool GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescent) const; @@ -839,7 +839,7 @@ public: bool IsFirstOfNumRule() const; - USHORT GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const; + sal_uInt16 GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const; SW_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextContent> const& GetXParagraph() const diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx index f752348b5df4..6fb429980703 100644 --- a/sw/inc/ndtyp.hxx +++ b/sw/inc/ndtyp.hxx @@ -32,19 +32,19 @@ // Ids fuer die verschiedenden Nodes; in der Basisklasse steht der Member, // der angibt, um was fuer einen es sich handelt -const BYTE ND_ENDNODE = 0x01; -const BYTE ND_STARTNODE = 0x02; -const BYTE ND_TABLENODE = 0x06; -const BYTE ND_TEXTNODE = 0x08; -const BYTE ND_GRFNODE = 0x10; -const BYTE ND_OLENODE = 0x20; +const sal_uInt8 ND_ENDNODE = 0x01; +const sal_uInt8 ND_STARTNODE = 0x02; +const sal_uInt8 ND_TABLENODE = 0x06; +const sal_uInt8 ND_TEXTNODE = 0x08; +const sal_uInt8 ND_GRFNODE = 0x10; +const sal_uInt8 ND_OLENODE = 0x20; -const BYTE ND_CONTENTNODE = 0x38; // ContentNode (eines von den 3 Bits) -const BYTE ND_NOTXTNODE = 0x30; // NoTxtNode (eines von den 2 Bits) +const sal_uInt8 ND_CONTENTNODE = 0x38; // ContentNode (eines von den 3 Bits) +const sal_uInt8 ND_NOTXTNODE = 0x30; // NoTxtNode (eines von den 2 Bits) -const BYTE ND_SECTIONNODE = 0x42; +const sal_uInt8 ND_SECTIONNODE = 0x42; // nur fuer internen Gebrauch!! -const BYTE ND_SECTIONDUMMY = 0x40; //(ND_SECTIONNODE & ~ND_STARTNODE); +const sal_uInt8 ND_SECTIONDUMMY = 0x40; //(ND_SECTIONNODE & ~ND_STARTNODE); // spezielle Types der StartNodes, die keine Ableitungen sind, aber // "Bereiche" zusammenhalten. @@ -61,8 +61,8 @@ enum SwStartNodeType // is the node the first and/or last node of a section? // This information is used for the export filters. Our layout never have a // distance before or after if the node is the first or last in a section. -const BYTE ND_HAS_PREV_LAYNODE = 0x01; -const BYTE ND_HAS_NEXT_LAYNODE = 0x02; +const sal_uInt8 ND_HAS_PREV_LAYNODE = 0x01; +const sal_uInt8 ND_HAS_NEXT_LAYNODE = 0x02; diff --git a/sw/inc/newhdl.hxx b/sw/inc/newhdl.hxx index 04d88f2789be..574dc3f9167a 100644 --- a/sw/inc/newhdl.hxx +++ b/sw/inc/newhdl.hxx @@ -47,10 +47,10 @@ public: void SetWarnLnk( const Link &rLink ); void SetErrLnk( const Link &rLink ); - BOOL TryWarnMem(); + sal_Bool TryWarnMem(); - BOOL Flush_WarnMem(); - BOOL Flush_ExceptMem(); + sal_Bool Flush_WarnMem(); + sal_Bool Flush_ExceptMem(); SwNewHdl(); ~SwNewHdl(); diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 6cc14bbbf2c2..9ee05188898c 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -97,22 +97,22 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry long nMySerial; #endif - BYTE nNodeType; + sal_uInt8 nNodeType; // JP 28.03.96 // fuer Textnodes: Stufungslevel der Autoformatierung. Ist erstmal hier // gelandet, weil noch Bits frei sind - BYTE nAFmtNumLvl : 3; - BOOL bSetNumLSpace : 1; // fuer Numerierung: TRUE Einzug setzen - BOOL bIgnoreDontExpand : 1; // for Text Attributes - ignore the flag + sal_uInt8 nAFmtNumLvl : 3; + sal_Bool bSetNumLSpace : 1; // fuer Numerierung: sal_True Einzug setzen + sal_Bool bIgnoreDontExpand : 1; // for Text Attributes - ignore the flag protected: SwStartNode* pStartOfSection; - SwNode( const SwNodeIndex &rWhere, const BYTE nNodeId ); + SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeId ); // fuer den initialen StartNode - SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNodeId ); + SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNodeId ); public: virtual ~SwNode(); @@ -121,26 +121,26 @@ public: long int GetSerial() const { return nMySerial; } #endif - USHORT GetSectionLevel() const; + sal_uInt16 GetSectionLevel() const; - inline ULONG StartOfSectionIndex() const; + inline sal_uLong StartOfSectionIndex() const; inline const SwStartNode* StartOfSectionNode() const { return pStartOfSection; } inline SwStartNode* StartOfSectionNode() { return pStartOfSection; } - inline ULONG EndOfSectionIndex() const; + inline sal_uLong EndOfSectionIndex() const; inline const SwEndNode* EndOfSectionNode() const; inline SwEndNode* EndOfSectionNode(); - inline BYTE GetAutoFmtLvl() const { return nAFmtNumLvl; } - inline void SetAutoFmtLvl( BYTE nVal ) { nAFmtNumLvl = nVal; } + inline sal_uInt8 GetAutoFmtLvl() const { return nAFmtNumLvl; } + inline void SetAutoFmtLvl( sal_uInt8 nVal ) { nAFmtNumLvl = nVal; } - inline BOOL IsSetNumLSpace() const { return bSetNumLSpace; } - inline void SetNumLSpace( BOOL bFlag ) { bSetNumLSpace = bFlag; } + inline sal_Bool IsSetNumLSpace() const { return bSetNumLSpace; } + inline void SetNumLSpace( sal_Bool bFlag ) { bSetNumLSpace = bFlag; } - inline BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; } - inline void SetIgnoreDontExpand( BOOL bNew ) { bIgnoreDontExpand = bNew; } + inline sal_Bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; } + inline void SetIgnoreDontExpand( sal_Bool bNew ) { bIgnoreDontExpand = bNew; } - BYTE GetNodeType() const { return nNodeType; } + sal_uInt8 GetNodeType() const { return nNodeType; } inline SwStartNode *GetStartNode(); inline const SwStartNode *GetStartNode() const; @@ -168,23 +168,23 @@ public: inline SwSectionNode *GetSectionNode(); inline const SwSectionNode *GetSectionNode() const; - inline BOOL IsStartNode() const; - inline BOOL IsCntntNode() const; - inline BOOL IsEndNode() const; - inline BOOL IsTxtNode() const; - inline BOOL IsTableNode() const; - inline BOOL IsSectionNode() const; - inline BOOL IsOLENode() const; - inline BOOL IsNoTxtNode() const; - inline BOOL IsGrfNode() const; + inline sal_Bool IsStartNode() const; + inline sal_Bool IsCntntNode() const; + inline sal_Bool IsEndNode() const; + inline sal_Bool IsTxtNode() const; + inline sal_Bool IsTableNode() const; + inline sal_Bool IsSectionNode() const; + inline sal_Bool IsOLENode() const; + inline sal_Bool IsNoTxtNode() const; + inline sal_Bool IsGrfNode() const; /** Checks if this node is in redlines. - @retval TRUE this node is in redlines - @retval FALSE else + @retval sal_True this node is in redlines + @retval sal_False else */ - BOOL IsInRedlines() const; + sal_Bool IsInRedlines() const; // suche den TabellenNode, in dem dieser steht. Wenn in keiner // Tabelle wird 0 returnt. @@ -276,18 +276,18 @@ public: IDocumentListItems& getIDocumentListItems(); // liegt der Node im Sichtbarenbereich der Shell ? - BOOL IsInVisibleArea( ViewShell* pSh = 0 ) const; + sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const; // befindet sich der Node in einem geschuetzten Bereich? - BOOL IsInProtectSect() const; + sal_Bool IsInProtectSect() const; // befindet sich der Node in irgendetwas geschuetzten ? // (Bereich/Rahmen/Tabellenzellen/... incl. des Ankers bei // Rahmen/Fussnoten/..) - BOOL IsProtect() const; + sal_Bool IsProtect() const; // suche den PageDesc, mit dem dieser Node formatiert ist. Wenn das // Layout vorhanden ist wird ueber das gesucht, ansonsten gibt es nur // die harte Tour ueber die Nodes nach vorne suchen!! // OD 18.03.2003 #106326# - const SwPageDesc* FindPageDesc( BOOL bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; + const SwPageDesc* FindPageDesc( sal_Bool bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; // falls der Node in einem Fly steht, dann wird das entsprechende Format // returnt @@ -297,11 +297,11 @@ public: // TabellenBox returnt SwTableBox* GetTblBox() const; - inline ULONG GetIndex() const { return GetPos(); } + inline sal_uLong GetIndex() const { return GetPos(); } - const SwTxtNode* FindOutlineNodeOfLevel( BYTE nLvl ) const; + const SwTxtNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const; - BYTE HasPrevNextLayNode() const; + sal_uInt8 HasPrevNextLayNode() const; private: // privater Constructor, weil nie kopiert werden darf !! @@ -322,11 +322,11 @@ class SwStartNode: public SwNode SwStartNodeType eSttNdTyp; // fuer den initialen StartNode - SwStartNode( SwNodes& rNodes, ULONG nPos ); + SwStartNode( SwNodes& rNodes, sal_uLong nPos ); protected: SwStartNode( const SwNodeIndex &rWhere, - const BYTE nNodeType = ND_STARTNODE, + const sal_uInt8 nNodeType = ND_STARTNODE, SwStartNodeType = SwNormalStartNode ); public: DECL_FIXEDMEMPOOL_NEWDEL(SwStartNode) @@ -353,7 +353,7 @@ class SwEndNode : public SwNode friend class SwSectionNode; // um seinen EndNode anlegen zukoennen // fuer den initialen StartNode - SwEndNode( SwNodes& rNodes, ULONG nPos, SwStartNode& rSttNd ); + SwEndNode( SwNodes& rNodes, sal_uLong nPos, SwStartNode& rSttNd ); protected: SwEndNode( const SwNodeIndex &rWhere, SwStartNode& rSttNd ); @@ -382,7 +382,7 @@ class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexRe mutable bool mbSetModifyAtAttr; protected: - SwCntntNode( const SwNodeIndex &rWhere, const BYTE nNodeType, + SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType, SwFmtColl *pFmtColl ); virtual ~SwCntntNode(); @@ -395,7 +395,7 @@ protected: // There some functions that like to remove items from the internal // SwAttrSet (handle): - USHORT ClearItemsFromAttrSet( const std::vector<USHORT>& rWhichIds ); + sal_uInt16 ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds ); public: TYPEINFO(); //Bereits in Basisklasse Client drin. @@ -414,21 +414,21 @@ public: void MakeStartIndex( SwIndex * pIdx ) { pIdx->Assign( this, 0 ); } void MakeEndIndex( SwIndex * pIdx ) { pIdx->Assign( this, Len() ); } - BOOL GoNext(SwIndex *, USHORT nMode ) const; - BOOL GoPrevious(SwIndex *, USHORT nMode ) const; + sal_Bool GoNext(SwIndex *, sal_uInt16 nMode ) const; + sal_Bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; SwCntntFrm *GetFrm( const Point* pDocPos = 0, const SwPosition *pPos = 0, - const BOOL bCalcFrm = TRUE ) const; + const sal_Bool bCalcFrm = sal_True ) const; // Gibt die tatsaechlcheGroesse des Frames zurueck bzw. ein leeres // Rechteck, wenn kein Layout existiert. // Wird fuer die Export Filter benoetigt. - SwRect FindLayoutRect( const BOOL bPrtArea = FALSE, + SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False, const Point* pPoint = 0, - const BOOL bCalcFrm = FALSE ) const; - SwRect FindPageFrmRect( const BOOL bPrtArea = FALSE, + const sal_Bool bCalcFrm = sal_False ) const; + SwRect FindPageFrmRect( const sal_Bool bPrtArea = sal_False, const Point* pPoint = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; /* * Methode erzeugt fuer den angegebenen Node alle Ansichten vom * Dokument. Die erzeugten Contentframes werden in das entsprechende @@ -451,30 +451,30 @@ public: virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // SS fuer die PoolItems: (Harte-(Fmt)Attrbutierung) - // Ist bInParent FALSE, wird nur in diesem Node nach dem Attribut gesucht. - const SfxPoolItem& GetAttr( USHORT nWhich, BOOL bInParent=TRUE ) const; - BOOL GetAttr( SfxItemSet& rSet, BOOL bInParent=TRUE ) const; + // Ist bInParent sal_False, wird nur in diesem Node nach dem Attribut gesucht. + const SfxPoolItem& GetAttr( sal_uInt16 nWhich, sal_Bool bInParent=sal_True ) const; + sal_Bool GetAttr( SfxItemSet& rSet, sal_Bool bInParent=sal_True ) const; // --> OD 2008-03-13 #refactorlists# // made virtual - virtual BOOL SetAttr( const SfxPoolItem& ); - virtual BOOL SetAttr( const SfxItemSet& rSet ); - virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); - virtual BOOL ResetAttr( const SvUShorts& rWhichArr ); - virtual USHORT ResetAllAttr(); + virtual sal_Bool SetAttr( const SfxPoolItem& ); + virtual sal_Bool SetAttr( const SfxItemSet& rSet ); + virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual sal_Bool ResetAttr( const SvUShorts& rWhichArr ); + virtual sal_uInt16 ResetAllAttr(); // <-- // liefert das Attribut, das nicht ueber die bedingte Vorlage kommt! - const SfxPoolItem* GetNoCondAttr( USHORT nWhich, BOOL bInParents ) const; + const SfxPoolItem* GetNoCondAttr( sal_uInt16 nWhich, sal_Bool bInParents ) const; // hat der Node schon eigene Auto-Attribute ? // Zugriff auf SwAttrSet inline const SwAttrSet &GetSwAttrSet() const; inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); } - inline BOOL HasSwAttrSet() const { return mpAttrSet ? TRUE : FALSE; } + inline sal_Bool HasSwAttrSet() const { return mpAttrSet ? sal_True : sal_False; } virtual SwFmtColl* ChgFmtColl( SwFmtColl* ); SwFmtColl* GetFmtColl() const { return (SwFmtColl*)GetRegisteredIn(); } @@ -484,13 +484,13 @@ public: void SetCondFmtColl( SwFmtColl* ); inline SwFmtColl* GetCondFmtColl() const; - BOOL IsAnyCondition( SwCollCondition& rTmp ) const; + sal_Bool IsAnyCondition( SwCollCondition& rTmp ) const; void ChkCondColl(); //FEATURE::CONDCOLL // invalidiert die am Node gesetzte NumRule. Diese wird // spaetestend in EndAction einer Shell geupdatet - BOOL InvalidateNumRule(); + sal_Bool InvalidateNumRule(); // --> OD 2005-02-21 #i42921# - determines the text direction for a certain // position. Return -1, if text direction could *not* be determined. @@ -541,7 +541,7 @@ public: void MakeFrms( const SwNodeIndex & rIdx ); SwTableNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; - void SetNewTable( SwTable* , BOOL bNewFrames=TRUE ); + void SetNewTable( SwTable* , sal_Bool bNewFrames=sal_True ); private: // privater Constructor, weil nie kopiert werden darf !! @@ -597,7 +597,7 @@ public: // ueberprueft bei _nicht_ versteckten Bereichen, ob es Inhalt gibt, der // _nicht_ in einem versteckten (Unter-)Bereich liegt - BOOL IsCntntHidden() const; + sal_Bool IsCntntHidden() const; }; @@ -646,41 +646,41 @@ inline const SwCntntNode *SwNode::GetCntntNode() const } -inline BOOL SwNode::IsStartNode() const +inline sal_Bool SwNode::IsStartNode() const { - return ND_STARTNODE & nNodeType ? TRUE : FALSE; + return ND_STARTNODE & nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsCntntNode() const +inline sal_Bool SwNode::IsCntntNode() const { - return ND_CONTENTNODE & nNodeType ? TRUE : FALSE; + return ND_CONTENTNODE & nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsEndNode() const +inline sal_Bool SwNode::IsEndNode() const { - return ND_ENDNODE == nNodeType ? TRUE : FALSE; + return ND_ENDNODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsTxtNode() const +inline sal_Bool SwNode::IsTxtNode() const { - return ND_TEXTNODE == nNodeType ? TRUE : FALSE; + return ND_TEXTNODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsTableNode() const +inline sal_Bool SwNode::IsTableNode() const { - return ND_TABLENODE == nNodeType ? TRUE : FALSE; + return ND_TABLENODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsSectionNode() const +inline sal_Bool SwNode::IsSectionNode() const { - return ND_SECTIONNODE == nNodeType ? TRUE : FALSE; + return ND_SECTIONNODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsNoTxtNode() const +inline sal_Bool SwNode::IsNoTxtNode() const { - return ND_NOTXTNODE & nNodeType ? TRUE : FALSE; + return ND_NOTXTNODE & nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsOLENode() const +inline sal_Bool SwNode::IsOLENode() const { - return ND_OLENODE == nNodeType ? TRUE : FALSE; + return ND_OLENODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsGrfNode() const +inline sal_Bool SwNode::IsGrfNode() const { - return ND_GRFNODE == nNodeType ? TRUE : FALSE; + return ND_GRFNODE == nNodeType ? sal_True : sal_False; } inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) const @@ -695,11 +695,11 @@ inline const SwSectionNode* SwNode::FindSectionNode() const { return ((SwNode*)this)->FindSectionNode(); } -inline ULONG SwNode::StartOfSectionIndex() const +inline sal_uLong SwNode::StartOfSectionIndex() const { return pStartOfSection->GetIndex(); } -inline ULONG SwNode::EndOfSectionIndex() const +inline sal_uLong SwNode::EndOfSectionIndex() const { const SwStartNode* pStNd = IsStartNode() ? (SwStartNode*)this : pStartOfSection; return pStNd->pEndOfSection->GetIndex(); @@ -753,8 +753,8 @@ inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const //FEATURE::CONDCOLL -inline const SfxPoolItem& SwCntntNode::GetAttr( USHORT nWhich, - BOOL bInParents ) const +inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich, + sal_Bool bInParents ) const { return GetSwAttrSet().Get( nWhich, bInParents ); } diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 11920c2d6f61..d1125a0f4130 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -81,8 +81,8 @@ public: SwNumFmt& operator=( const SwNumFmt& ); - BOOL operator==( const SwNumFmt& ) const; - BOOL operator!=( const SwNumFmt& r ) const { return !(*this == r); } + sal_Bool operator==( const SwNumFmt& ) const; + sal_Bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; } void SetCharFmt( SwCharFmt* ); @@ -97,8 +97,8 @@ public: virtual sal_Int16 GetVertOrient() const; const SwFmtVertOrient* GetGraphicOrientation() const; - BOOL IsEnumeration() const; // #i22362# - BOOL IsItemize() const; // #i29560# + sal_Bool IsEnumeration() const; // #i22362# + sal_Bool IsItemize() const; // #i29560# }; class SwPaM; @@ -119,12 +119,12 @@ private: #endif static SwNumFmt* aBaseFmts [ RULE_END ][ MAXLEVEL ]; - static USHORT aDefNumIndents[ MAXLEVEL ]; + static sal_uInt16 aDefNumIndents[ MAXLEVEL ]; // --> OD 2008-02-11 #newlistlevelattrs# // default list level properties for position-and-space mode LABEL_ALIGNMENT static SwNumFmt* aLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ]; // <-- - static USHORT nRefCount; + static sal_uInt16 nRefCount; static char* pDefOutlineName; SwNumFmt* aFmts[ MAXLEVEL ]; @@ -151,13 +151,13 @@ private: String sName; SwNumRuleType eRuleType; - USHORT nPoolFmtId; // Id-fuer "automatich" erzeugte NumRules - USHORT nPoolHelpId; // HelpId fuer diese Pool-Vorlage - BYTE nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen - BOOL bAutoRuleFlag : 1; - BOOL bInvalidRuleFlag : 1; - BOOL bContinusNum : 1; // Fortlaufende Numerierung - ohne Ebenen - BOOL bAbsSpaces : 1; // die Ebenen repraesentieren absol. Einzuege + sal_uInt16 nPoolFmtId; // Id-fuer "automatich" erzeugte NumRules + sal_uInt16 nPoolHelpId; // HelpId fuer diese Pool-Vorlage + sal_uInt8 nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen + sal_Bool bAutoRuleFlag : 1; + sal_Bool bInvalidRuleFlag : 1; + sal_Bool bContinusNum : 1; // Fortlaufende Numerierung - ohne Ebenen + sal_Bool bAbsSpaces : 1; // die Ebenen repraesentieren absol. Einzuege bool mbCountPhantoms; // --> OD 2008-02-11 #newlistlevelattrs# @@ -177,28 +177,28 @@ public: SwNumRule( const String& rNm, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode, SwNumRuleType = NUM_RULE, - BOOL bAutoFlg = TRUE ); + sal_Bool bAutoFlg = sal_True ); SwNumRule( const SwNumRule& ); ~SwNumRule(); SwNumRule& operator=( const SwNumRule& ); - BOOL operator==( const SwNumRule& ) const; - BOOL operator!=( const SwNumRule& r ) const { return !(*this == r); } + sal_Bool operator==( const SwNumRule& ) const; + sal_Bool operator!=( const SwNumRule& r ) const { return !(*this == r); } - const SwNumFmt* GetNumFmt( USHORT i ) const; - const SwNumFmt& Get( USHORT i ) const; + const SwNumFmt* GetNumFmt( sal_uInt16 i ) const; + const SwNumFmt& Get( sal_uInt16 i ) const; - void Set( USHORT i, const SwNumFmt* ); - void Set( USHORT i, const SwNumFmt& ); - String MakeNumString( const SwNodeNum&, BOOL bInclStrings = TRUE, - BOOL bOnlyArabic = FALSE ) const; + void Set( sal_uInt16 i, const SwNumFmt* ); + void Set( sal_uInt16 i, const SwNumFmt& ); + String MakeNumString( const SwNodeNum&, sal_Bool bInclStrings = sal_True, + sal_Bool bOnlyArabic = sal_False ) const; // --> OD 2005-10-17 #126238# // - add optional parameter <_nRestrictToThisLevel> in order to // restrict returned string to this level. String MakeNumString( const SwNumberTree::tNumberVector & rNumVector, - const BOOL bInclStrings = TRUE, - const BOOL bOnlyArabic = FALSE, + const sal_Bool bInclStrings = sal_True, + const sal_Bool bOnlyArabic = sal_False, const unsigned int _nRestrictToThisLevel = MAXLEVEL ) const; // <-- // --> OD 2007-08-24 #i81002# @@ -249,12 +249,12 @@ public: static char* GetOutlineRuleName() { return pDefOutlineName; } - static USHORT GetNumIndent( BYTE nLvl ); - static USHORT GetBullIndent( BYTE nLvl ); + static sal_uInt16 GetNumIndent( sal_uInt8 nLvl ); + static sal_uInt16 GetBullIndent( sal_uInt8 nLvl ); SwNumRuleType GetRuleType() const { return eRuleType; } void SetRuleType( SwNumRuleType eNew ) { eRuleType = eNew; - bInvalidRuleFlag = TRUE; } + bInvalidRuleFlag = sal_True; } // eine Art Copy-Constructor, damit die Num-Formate auch an den // richtigen CharFormaten eines Dokumentes haengen !! @@ -271,33 +271,33 @@ public: IDocumentListsAccess& rDocListAccess ); // #i36749# // <-- - BOOL IsAutoRule() const { return bAutoRuleFlag; } - void SetAutoRule( BOOL bFlag ) { bAutoRuleFlag = bFlag; } + sal_Bool IsAutoRule() const { return bAutoRuleFlag; } + void SetAutoRule( sal_Bool bFlag ) { bAutoRuleFlag = bFlag; } - BOOL IsInvalidRule() const { return bInvalidRuleFlag; } - void SetInvalidRule( BOOL bFlag ); + sal_Bool IsInvalidRule() const { return bInvalidRuleFlag; } + void SetInvalidRule( sal_Bool bFlag ); - BOOL IsContinusNum() const { return bContinusNum; } - void SetContinusNum( BOOL bFlag ) { bContinusNum = bFlag; } + sal_Bool IsContinusNum() const { return bContinusNum; } + void SetContinusNum( sal_Bool bFlag ) { bContinusNum = bFlag; } - BOOL IsAbsSpaces() const { return bAbsSpaces; } - void SetAbsSpaces( BOOL bFlag ) { bAbsSpaces = bFlag; } + sal_Bool IsAbsSpaces() const { return bAbsSpaces; } + void SetAbsSpaces( sal_Bool bFlag ) { bAbsSpaces = bFlag; } // #115901# - BOOL IsOutlineRule() const { return eRuleType == OUTLINE_RULE; } + sal_Bool IsOutlineRule() const { return eRuleType == OUTLINE_RULE; } bool IsCountPhantoms() const; void SetCountPhantoms(bool bCountPhantoms); // erfragen und setzen der Poolvorlagen-Id's - USHORT GetPoolFmtId() const { return nPoolFmtId; } - void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; } + sal_uInt16 GetPoolFmtId() const { return nPoolFmtId; } + void SetPoolFmtId( sal_uInt16 nId ) { nPoolFmtId = nId; } // erfragen und setzen der Hilfe-Id's fuer die Document-Vorlagen - USHORT GetPoolHelpId() const { return nPoolHelpId; } - void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; } - BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; } - void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; } + sal_uInt16 GetPoolHelpId() const { return nPoolHelpId; } + void SetPoolHelpId( sal_uInt16 nId ) { nPoolHelpId = nId; } + sal_uInt8 GetPoolHlpFileId() const { return nPoolHlpFileId; } + void SetPoolHlpFileId( sal_uInt8 nId ) { nPoolHlpFileId = nId; } void SetSvxRule(const SvxNumRule&, SwDoc* pDoc); SvxNumRule MakeSvxNumRule() const; @@ -306,13 +306,13 @@ public: // --> OD 2008-06-09 #i90078# // refactoring: provide certain method for certain purpose // void Indent(short aAmount, int nLevel = -1, -// int nReferenceLevel = -1, BOOL bRelative = TRUE, -// BOOL bFirstLine = TRUE, BOOL bCheckGtZero = TRUE); +// int nReferenceLevel = -1, sal_Bool bRelative = sal_True, +// sal_Bool bFirstLine = sal_True, sal_Bool bCheckGtZero = sal_True); // change indent of all list levels by given difference void ChangeIndent( const short nDiff ); // set indent of certain list level to given value void SetIndent( const short nNewIndent, - const USHORT nListLevel ); + const sal_uInt16 nListLevel ); // set indent of first list level to given value and change other list level's // indents accordingly void SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent ); @@ -350,7 +350,7 @@ namespace numfunc @author OD */ - sal_Unicode GetBulletChar( BYTE nLevel ); + sal_Unicode GetBulletChar( sal_uInt8 nLevel ); /** configuration, if at first position of the first list item the <TAB>-key increased the indent of the complete list or only demotes this list item. diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 6df70d20199d..8ba32064c3ba 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -54,7 +54,7 @@ enum SwFtnAdj class SW_DLLPUBLIC SwPageFtnInfo { SwTwips nMaxHeight; //maximum height of the footnote area. - ULONG nLineWidth; //width of separator line + sal_uLong nLineWidth; //width of separator line Color aLineColor; //color of the separator line Fraction aWidth; //percentage width of the separator line. SwFtnAdj eAdj; //line adjustment. @@ -63,7 +63,7 @@ class SW_DLLPUBLIC SwPageFtnInfo public: SwTwips GetHeight() const { return nMaxHeight; } - ULONG GetLineWidth() const { return nLineWidth; } + sal_uLong GetLineWidth() const { return nLineWidth; } const Color& GetLineColor() const { return aLineColor;} const Fraction& GetWidth() const { return aWidth; } SwFtnAdj GetAdj() const { return eAdj; } @@ -71,7 +71,7 @@ public: SwTwips GetBottomDist() const { return nBottomDist; } void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; } - void SetLineWidth(ULONG nSet ) { nLineWidth = nSet; } + void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; } void SetLineColor(const Color& rCol ) { aLineColor = rCol;} void SetWidth( const Fraction &rNew){ aWidth = rNew; } void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; } @@ -82,7 +82,7 @@ public: SwPageFtnInfo( const SwPageFtnInfo& ); SwPageFtnInfo& operator=( const SwPageFtnInfo& ); - BOOL operator ==( const SwPageFtnInfo& ) const; + sal_Bool operator ==( const SwPageFtnInfo& ) const; }; /* @@ -119,7 +119,7 @@ public: * */ -typedef USHORT UseOnPage; +typedef sal_uInt16 UseOnPage; namespace nsUseOnPage { const UseOnPage PD_NONE = 0x0000; //for internal use only. @@ -144,10 +144,10 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify SwFrmFmt aLeft; SwDepend aDepend; // wg. Registerhaltigkeit SwPageDesc *pFollow; - USHORT nRegHeight; // Zeilenabstand und Fontascent der Vorlage - USHORT nRegAscent; // fuer die Registerhaltigkeit + sal_uInt16 nRegHeight; // Zeilenabstand und Fontascent der Vorlage + sal_uInt16 nRegAscent; // fuer die Registerhaltigkeit UseOnPage eUse; - BOOL bLandscape; + sal_Bool bLandscape; //Fussnoteninformationen SwPageFtnInfo aFtnInfo; @@ -164,8 +164,8 @@ public: const String &GetName() const { return aDescName; } void SetName( const String& rNewName ) { aDescName = rNewName; } - BOOL GetLandscape() const { return bLandscape; } - void SetLandscape( BOOL bNew ) { bLandscape = bNew; } + sal_Bool GetLandscape() const { return bLandscape; } + void SetLandscape( sal_Bool bNew ) { bLandscape = bNew; } const SvxNumberType &GetNumType() const { return aNumType; } void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; } @@ -174,10 +174,10 @@ public: SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; } void SetFtnInfo( const SwPageFtnInfo &rNew ) { aFtnInfo = rNew; } - inline BOOL IsHeaderShared() const; - inline BOOL IsFooterShared() const; - inline void ChgHeaderShare( BOOL bNew ); - inline void ChgFooterShare( BOOL bNew ); + inline sal_Bool IsHeaderShared() const; + inline sal_Bool IsFooterShared() const; + inline void ChgHeaderShare( sal_Bool bNew ); + inline void ChgFooterShare( sal_Bool bNew ); inline void SetUseOn( UseOnPage eNew ); inline UseOnPage GetUseOn() const; @@ -202,10 +202,10 @@ public: inline SwFrmFmt *GetLeftFmt(); inline const SwFrmFmt *GetLeftFmt() const; - USHORT GetRegHeight() const { return nRegHeight; } - USHORT GetRegAscent() const { return nRegAscent; } - void SetRegHeight( USHORT nNew ){ nRegHeight = nNew; } - void SetRegAscent( USHORT nNew ){ nRegAscent = nNew; } + sal_uInt16 GetRegHeight() const { return nRegHeight; } + sal_uInt16 GetRegAscent() const { return nRegAscent; } + void SetRegHeight( sal_uInt16 nNew ){ nRegHeight = nNew; } + void SetRegAscent( sal_uInt16 nNew ){ nRegAscent = nNew; } inline void SetFollow( const SwPageDesc* pNew ); const SwPageDesc* GetFollow() const { return pFollow; } @@ -217,19 +217,19 @@ public: void RegisterChange(); // erfragen und setzen der PoolFormat-Id - USHORT GetPoolFmtId() const { return aMaster.GetPoolFmtId(); } - void SetPoolFmtId( USHORT nId ) { aMaster.SetPoolFmtId( nId ); } - USHORT GetPoolHelpId() const { return aMaster.GetPoolHelpId(); } - void SetPoolHelpId( USHORT nId ) { aMaster.SetPoolHelpId( nId ); } - BYTE GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); } - void SetPoolHlpFileId( BYTE nId ) { aMaster.SetPoolHlpFileId( nId ); } + sal_uInt16 GetPoolFmtId() const { return aMaster.GetPoolFmtId(); } + void SetPoolFmtId( sal_uInt16 nId ) { aMaster.SetPoolFmtId( nId ); } + sal_uInt16 GetPoolHelpId() const { return aMaster.GetPoolHelpId(); } + void SetPoolHelpId( sal_uInt16 nId ) { aMaster.SetPoolHelpId( nId ); } + sal_uInt8 GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); } + void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); } // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, - BOOL bCheckForThisPgDc = TRUE ) const; - BOOL IsFollowNextPageOfNode( const SwNode& rNd ) const; + sal_Bool bCheckForThisPgDc = sal_True ) const; + sal_Bool IsFollowNextPageOfNode( const SwNode& rNd ) const; //Given a SwNode return the pagedesc in use at that location. static const SwPageDesc* GetPageDescOfNode(const SwNode& rNd); @@ -245,51 +245,51 @@ inline void SwPageDesc::SetFollow( const SwPageDesc* pNew ) pFollow = pNew ? (SwPageDesc*)pNew : this; } -inline BOOL SwPageDesc::IsHeaderShared() const +inline sal_Bool SwPageDesc::IsHeaderShared() const { - return eUse & nsUseOnPage::PD_HEADERSHARE ? TRUE : FALSE; + return eUse & nsUseOnPage::PD_HEADERSHARE ? sal_True : sal_False; } -inline BOOL SwPageDesc::IsFooterShared() const +inline sal_Bool SwPageDesc::IsFooterShared() const { - return eUse & nsUseOnPage::PD_FOOTERSHARE ? TRUE : FALSE; + return eUse & nsUseOnPage::PD_FOOTERSHARE ? sal_True : sal_False; } -inline void SwPageDesc::ChgHeaderShare( BOOL bNew ) +inline void SwPageDesc::ChgHeaderShare( sal_Bool bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE); - // (USHORT&)eUse |= (USHORT)nsUseOnPage::PD_HEADERSHARE; + // (sal_uInt16&)eUse |= (sal_uInt16)nsUseOnPage::PD_HEADERSHARE; else eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE); - // (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOHEADERSHARE; + // (sal_uInt16&)eUse &= (sal_uInt16)nsUseOnPage::PD_NOHEADERSHARE; } -inline void SwPageDesc::ChgFooterShare( BOOL bNew ) +inline void SwPageDesc::ChgFooterShare( sal_Bool bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE); - // (USHORT&)eUse |= (USHORT)nsUseOnPage::PD_FOOTERSHARE; + // (sal_uInt16&)eUse |= (sal_uInt16)nsUseOnPage::PD_FOOTERSHARE; else eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOFOOTERSHARE); - // (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE; + // (sal_uInt16&)eUse &= (sal_uInt16)nsUseOnPage::PD_NOFOOTERSHARE; } inline void SwPageDesc::SetUseOn( UseOnPage eNew ) { UseOnPage eTmp = nsUseOnPage::PD_NONE; if ( eUse & nsUseOnPage::PD_HEADERSHARE ) eTmp = nsUseOnPage::PD_HEADERSHARE; - // (USHORT&)eTmp |= (USHORT)nsUseOnPage::PD_HEADERSHARE; + // (sal_uInt16&)eTmp |= (sal_uInt16)nsUseOnPage::PD_HEADERSHARE; if ( eUse & nsUseOnPage::PD_FOOTERSHARE ) eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE); - // (USHORT&)eTmp |= (USHORT)nsUseOnPage::PD_FOOTERSHARE; + // (sal_uInt16&)eTmp |= (sal_uInt16)nsUseOnPage::PD_FOOTERSHARE; eUse = (UseOnPage) (eTmp | eNew); - // (USHORT&)eUse = eTmp | eNew; + // (sal_uInt16&)eUse = eTmp | eNew; } inline UseOnPage SwPageDesc::GetUseOn() const { UseOnPage eRet = eUse; eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOHEADERSHARE); - // (USHORT&)eRet &= (USHORT)nsUseOnPage::PD_NOHEADERSHARE; + // (sal_uInt16&)eRet &= (sal_uInt16)nsUseOnPage::PD_NOHEADERSHARE; eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFOOTERSHARE); - // (USHORT&)eRet &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE; + // (sal_uInt16&)eRet &= (sal_uInt16)nsUseOnPage::PD_NOFOOTERSHARE; return eRet; } diff --git a/sw/inc/pageiter.hxx b/sw/inc/pageiter.hxx index 97e03873ec8d..2280ae414093 100644 --- a/sw/inc/pageiter.hxx +++ b/sw/inc/pageiter.hxx @@ -41,11 +41,11 @@ class SwPageIter { public: SwPageIter( const SwDoc &rDoc, const SwPosition &rStartPos ); - BOOL IsEnd() const { return 0 == pPage; } - BOOL NextPage(); + sal_Bool IsEnd() const { return 0 == pPage; } + sal_Bool NextPage(); const SwPageDesc* GetPageDesc() const; - BOOL Seek( const SwPosition &rPos ); - BOOL GetPosition( SwPosition &rPos ) const; + sal_Bool Seek( const SwPosition &rPos ); + sal_Bool GetPosition( SwPosition &rPos ) const; }; diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 62277e6d48b0..995246f8d9e9 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -73,12 +73,12 @@ struct SW_DLLPUBLIC SwPosition */ SwDoc * GetDoc() const; - BOOL operator < (const SwPosition &) const; - BOOL operator > (const SwPosition &) const; - BOOL operator <=(const SwPosition &) const; - BOOL operator >=(const SwPosition &) const; - BOOL operator ==(const SwPosition &) const; - BOOL operator !=(const SwPosition &) const; + sal_Bool operator < (const SwPosition &) const; + sal_Bool operator > (const SwPosition &) const; + sal_Bool operator <=(const SwPosition &) const; + sal_Bool operator >=(const SwPosition &) const; + sal_Bool operator ==(const SwPosition &) const; + sal_Bool operator !=(const SwPosition &) const; }; @@ -109,7 +109,7 @@ typedef SwMoveFnCollection* SwMoveFn; SW_DLLPUBLIC extern SwMoveFn fnMoveForward; // SwPam::Move()/Find() default argument. SW_DLLPUBLIC extern SwMoveFn fnMoveBackward; -typedef BOOL (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove ); +typedef sal_Bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove ); SW_DLLPUBLIC extern SwGoInDoc fnGoDoc; extern SwGoInDoc fnGoSection; SW_DLLPUBLIC extern SwGoInDoc fnGoNode; @@ -151,27 +151,27 @@ public: SwPaM& operator=( const SwPaM & ); // Bewegen des Cursors - BOOL Move( SwMoveFn fnMove = fnMoveForward, + sal_Bool Move( SwMoveFn fnMove = fnMoveForward, SwGoInDoc fnGo = fnGoCntnt ); // Suchen - BYTE Find( const com::sun::star::util::SearchOptions& rSearchOpt, - BOOL bSearchInNotes, + sal_uInt8 Find( const com::sun::star::util::SearchOptions& rSearchOpt, + sal_Bool bSearchInNotes, utl::TextSearch& rSTxt, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, BOOL bInReadOnly = FALSE); - BOOL Find( const SwFmt& rFmt, + const SwPaM *pPam =0, sal_Bool bInReadOnly = sal_False); + sal_Bool Find( const SwFmt& rFmt, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, BOOL bInReadOnly = FALSE); - BOOL Find( const SfxPoolItem& rAttr, BOOL bValue = TRUE, + const SwPaM *pPam =0, sal_Bool bInReadOnly = sal_False); + sal_Bool Find( const SfxPoolItem& rAttr, sal_Bool bValue = sal_True, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, BOOL bInReadOnly = FALSE ); - BOOL Find( const SfxItemSet& rAttr, BOOL bNoColls, + const SwPaM *pPam =0, sal_Bool bInReadOnly = sal_False ); + sal_Bool Find( const SfxItemSet& rAttr, sal_Bool bNoColls, SwMoveFn fnMove, - const SwPaM *pPam, BOOL bInReadOnly, BOOL bMoveFirst ); + const SwPaM *pPam, sal_Bool bInReadOnly, sal_Bool bMoveFirst ); bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSTxt, - SwMoveFn fnMove, BOOL bSrchForward, BOOL bRegSearch, BOOL bChkEmptyPara, BOOL bChkParaEnd, + SwMoveFn fnMove, sal_Bool bSrchForward, sal_Bool bRegSearch, sal_Bool bChkEmptyPara, sal_Bool bChkParaEnd, xub_StrLen &nStart, xub_StrLen &nEnde,xub_StrLen nTxtLen,SwNode* pNode, SwPaM* pPam); inline bool IsInFrontOfLabel() const { return m_bIsInFrontOfLabel; } @@ -239,10 +239,10 @@ public: /** Normalizes PaM, i.e. sort point and mark. - @param bPointFirst TRUE: If the point is behind the mark then swap. - FALSE: If the mark is behind the point then swap. + @param bPointFirst sal_True: If the point is behind the mark then swap. + sal_False: If the mark is behind the point then swap. */ - SwPaM & Normalize(BOOL bPointFirst = TRUE); + SwPaM & Normalize(sal_Bool bPointFirst = sal_True); /// @return the document (SwDoc) at which the PaM is registered SwDoc* GetDoc() const { return m_pPoint->nNode.GetNode().GetDoc(); } @@ -253,18 +253,18 @@ public: { return bOne ? m_Bound1 : m_Bound2; } // erfrage die Seitennummer auf der der Cursor steht - USHORT GetPageNum( BOOL bAtPoint = TRUE, const Point* pLayPos = 0 ); + sal_uInt16 GetPageNum( sal_Bool bAtPoint = sal_True, const Point* pLayPos = 0 ); // steht in etwas geschuetztem oder in die Selektion umspannt // etwas geschuetztes. - BOOL HasReadonlySel( bool bFormView ) const; + sal_Bool HasReadonlySel( bool bFormView ) const; - BOOL ContainsPosition(const SwPosition & rPos) + sal_Bool ContainsPosition(const SwPosition & rPos) { return *Start() <= rPos && rPos <= *End(); } - static BOOL Overlap(const SwPaM & a, const SwPaM & b); + static sal_Bool Overlap(const SwPaM & a, const SwPaM & b); - static BOOL LessThan(const SwPaM & a, const SwPaM & b); + static sal_Bool LessThan(const SwPaM & a, const SwPaM & b); DECL_FIXEDMEMPOOL_NEWDEL(SwPaM); @@ -273,8 +273,8 @@ public: }; -BOOL CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, BOOL ); -BOOL GoInCntnt( SwPaM & rPam, SwMoveFn fnMove ); +sal_Bool CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, sal_Bool ); +sal_Bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove ); #endif // _PAM_HXX diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 68b9ba203ba3..bdd4a0155614 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -42,7 +42,7 @@ class IntlWrapper; |* class SwFmtDrop *************************************************************************/ -#define DROP_WHOLEWORD ((USHORT)0x0001) +#define DROP_WHOLEWORD ((sal_uInt16)0x0001) //Wenn ein SwFmtDrop Client ist, so ist dies das CharFmt welches den Font fuer //die DropCaps beschreibt. Ist es kein Client, so wird von der Formatierung @@ -53,11 +53,11 @@ class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient { SwModify* pDefinedIn; // Modify-Object, in dem der DropCaps steht // kann nur TxtFmtCollection/TxtNode sein - USHORT nDistance; // Abstand zum Textbeginn - USHORT nReadFmt; // fuer den Sw3-Reader: CharFormat-Id (Pool laden!) - BYTE nLines; // Anzahl der Zeilen - BYTE nChars; // Anzahl der Zeichen - BOOL bWholeWord; // Erstes Wort als Initialen + sal_uInt16 nDistance; // Abstand zum Textbeginn + sal_uInt16 nReadFmt; // fuer den Sw3-Reader: CharFormat-Id (Pool laden!) + sal_uInt8 nLines; // Anzahl der Zeilen + sal_uInt8 nChars; // Anzahl der Zeichen + sal_Bool bWholeWord; // Erstes Wort als Initialen public: TYPEINFO(); //Bereits in der Basisklasse SwClient @@ -79,27 +79,27 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0) 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 ); - inline BYTE GetLines() const { return nLines; } - inline BYTE &GetLines() { return nLines; } + inline sal_uInt8 GetLines() const { return nLines; } + inline sal_uInt8 &GetLines() { return nLines; } - inline BYTE GetChars() const { return nChars; } - inline BYTE &GetChars() { return nChars; } + inline sal_uInt8 GetChars() const { return nChars; } + inline sal_uInt8 &GetChars() { return nChars; } - inline BOOL GetWholeWord() const { return bWholeWord; } - inline BYTE &GetWholeWord() { return bWholeWord; } + inline sal_Bool GetWholeWord() const { return bWholeWord; } + inline sal_uInt8 &GetWholeWord() { return bWholeWord; } - inline USHORT GetDistance() const { return nDistance; } - inline USHORT &GetDistance() { return nDistance; } + inline sal_uInt16 GetDistance() const { return nDistance; } + inline sal_uInt16 &GetDistance() { return nDistance; } inline const SwCharFmt *GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; } inline SwCharFmt *GetCharFmt() { return (SwCharFmt*)pRegisteredIn; } void SetCharFmt( SwCharFmt *pNew ); virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // erfrage und setze den Modify-Pointer inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -112,7 +112,7 @@ class SwRegisterItem : public SfxBoolItem public: TYPEINFO(); - inline SwRegisterItem( const BOOL bRegister = FALSE ); + inline SwRegisterItem( const sal_Bool bRegister = sal_False ); // @@@ public copy assignment, but no copy ctor? inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); @@ -126,7 +126,7 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline SwRegisterItem::SwRegisterItem( const BOOL bRegister ) : +inline SwRegisterItem::SwRegisterItem( const sal_Bool bRegister ) : SfxBoolItem( RES_PARATR_REGISTER, bRegister ) {} @@ -165,8 +165,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); }; class SwParaConnectBorderItem : public SfxBoolItem @@ -174,7 +174,7 @@ class SwParaConnectBorderItem : public SfxBoolItem public: TYPEINFO(); - inline SwParaConnectBorderItem( const BOOL bConnect = TRUE ); + inline SwParaConnectBorderItem( const sal_Bool bConnect = sal_True ); // @@@ public copy assignment, but no copy ctor? inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); @@ -188,7 +188,7 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline SwParaConnectBorderItem::SwParaConnectBorderItem( const BOOL bConnect ) : +inline SwParaConnectBorderItem::SwParaConnectBorderItem( const sal_Bool bConnect ) : SfxBoolItem( RES_PARATR_CONNECT_BORDER, bConnect ) {} @@ -205,74 +205,74 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( * Implementierung der Paragraph-Attribut Methoden vom SwAttrSet ******************************************************************************/ -inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(BOOL bInP) const +inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(sal_Bool bInP) const { return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); } -inline const SvxAdjustItem &SwAttrSet::GetAdjust(BOOL bInP) const +inline const SvxAdjustItem &SwAttrSet::GetAdjust(sal_Bool bInP) const { return (const SvxAdjustItem&)Get( RES_PARATR_ADJUST,bInP); } -inline const SvxFmtSplitItem &SwAttrSet::GetSplit(BOOL bInP) const +inline const SvxFmtSplitItem &SwAttrSet::GetSplit(sal_Bool bInP) const { return (const SvxFmtSplitItem&)Get( RES_PARATR_SPLIT,bInP); } -inline const SwRegisterItem &SwAttrSet::GetRegister(BOOL bInP) const +inline const SwRegisterItem &SwAttrSet::GetRegister(sal_Bool bInP) const { return (const SwRegisterItem&)Get( RES_PARATR_REGISTER,bInP); } -inline const SvxWidowsItem &SwAttrSet::GetWidows(BOOL bInP) const +inline const SvxWidowsItem &SwAttrSet::GetWidows(sal_Bool bInP) const { return (const SvxWidowsItem&)Get( RES_PARATR_WIDOWS,bInP); } -inline const SvxOrphansItem &SwAttrSet::GetOrphans(BOOL bInP) const +inline const SvxOrphansItem &SwAttrSet::GetOrphans(sal_Bool bInP) const { return (const SvxOrphansItem&)Get( RES_PARATR_ORPHANS,bInP); } -inline const SvxTabStopItem &SwAttrSet::GetTabStops(BOOL bInP) const +inline const SvxTabStopItem &SwAttrSet::GetTabStops(sal_Bool bInP) const { return (const SvxTabStopItem&)Get( RES_PARATR_TABSTOP,bInP); } -inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(BOOL bInP) const +inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(sal_Bool bInP) const { return (const SvxHyphenZoneItem&)Get(RES_PARATR_HYPHENZONE,bInP); } -inline const SwFmtDrop &SwAttrSet::GetDrop(BOOL bInP) const +inline const SwFmtDrop &SwAttrSet::GetDrop(sal_Bool bInP) const { return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); } -inline const SwNumRuleItem &SwAttrSet::GetNumRule(BOOL bInP) const +inline const SwNumRuleItem &SwAttrSet::GetNumRule(sal_Bool bInP) const { return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); } -inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(BOOL bInP) const +inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(sal_Bool bInP) const { return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); } -inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(BOOL bInP) const +inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(sal_Bool bInP) const { return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); } -inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(BOOL bInP) const +inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(sal_Bool bInP) const { return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); } -inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(BOOL bInP) const +inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(sal_Bool bInP) const { return (const SvxParaVertAlignItem&)Get( RES_PARATR_VERTALIGN, bInP ); } -inline const SvxParaGridItem &SwAttrSet::GetParaGrid(BOOL bInP) const +inline const SvxParaGridItem &SwAttrSet::GetParaGrid(sal_Bool bInP) const { return (const SvxParaGridItem&)Get( RES_PARATR_SNAPTOGRID, bInP ); } -inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(BOOL bInP) const +inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(sal_Bool bInP) const { return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); } /****************************************************************************** * Implementierung der Paragraph-Attribut Methoden vom SwFmt ******************************************************************************/ -inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(BOOL bInP) const +inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(sal_Bool bInP) const { return aSet.GetLineSpacing(bInP); } -inline const SvxAdjustItem &SwFmt::GetAdjust(BOOL bInP) const +inline const SvxAdjustItem &SwFmt::GetAdjust(sal_Bool bInP) const { return aSet.GetAdjust(bInP); } -inline const SvxFmtSplitItem &SwFmt::GetSplit(BOOL bInP) const +inline const SvxFmtSplitItem &SwFmt::GetSplit(sal_Bool bInP) const { return aSet.GetSplit(bInP); } -inline const SwRegisterItem &SwFmt::GetRegister(BOOL bInP) const +inline const SwRegisterItem &SwFmt::GetRegister(sal_Bool bInP) const { return aSet.GetRegister(bInP); } -inline const SvxWidowsItem &SwFmt::GetWidows(BOOL bInP) const +inline const SvxWidowsItem &SwFmt::GetWidows(sal_Bool bInP) const { return aSet.GetWidows(bInP); } -inline const SvxOrphansItem &SwFmt::GetOrphans(BOOL bInP) const +inline const SvxOrphansItem &SwFmt::GetOrphans(sal_Bool bInP) const { return aSet.GetOrphans(bInP); } -inline const SvxTabStopItem &SwFmt::GetTabStops(BOOL bInP) const +inline const SvxTabStopItem &SwFmt::GetTabStops(sal_Bool bInP) const { return aSet.GetTabStops(bInP); } -inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(BOOL bInP) const +inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(sal_Bool bInP) const { return aSet.GetHyphenZone(bInP); } -inline const SwFmtDrop &SwFmt::GetDrop(BOOL bInP) const +inline const SwFmtDrop &SwFmt::GetDrop(sal_Bool bInP) const { return aSet.GetDrop(bInP); } -inline const SwNumRuleItem &SwFmt::GetNumRule(BOOL bInP) const +inline const SwNumRuleItem &SwFmt::GetNumRule(sal_Bool bInP) const { return aSet.GetNumRule(bInP); } -inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(BOOL bInP) const +inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(sal_Bool bInP) const { return aSet.GetScriptSpace(bInP) ; } -inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(BOOL bInP) const +inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(sal_Bool bInP) const { return aSet.GetHangingPunctuation(bInP) ; } -inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(BOOL bInP) const +inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(sal_Bool bInP) const { return (const SvxForbiddenRuleItem&)aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP); } -inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(BOOL bInP) const +inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(sal_Bool bInP) const { return (const SvxParaVertAlignItem&)aSet.Get( RES_PARATR_VERTALIGN, bInP ); } -inline const SvxParaGridItem &SwFmt::GetParaGrid(BOOL bInP) const +inline const SvxParaGridItem &SwFmt::GetParaGrid(sal_Bool bInP) const { return (const SvxParaGridItem&)aSet.Get( RES_PARATR_SNAPTOGRID, bInP ); } -inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(BOOL bInP) const +inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(sal_Bool bInP) const { return (const SwParaConnectBorderItem&)aSet.Get( RES_PARATR_CONNECT_BORDER, bInP ); } #endif diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index 7c4be27c76a7..e3dec80e22a8 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -69,38 +69,38 @@ // Maske fuer Erkennung von COLLPOOL-Ids: -const USHORT POOLGRP_NOCOLLID = (1 << 10); +const sal_uInt16 POOLGRP_NOCOLLID = (1 << 10); // POLLCOLL-Gruppen: -const USHORT USER_FMT = (1 << 15); -const USHORT POOL_FMT = (0 << 15); +const sal_uInt16 USER_FMT = (1 << 15); +const sal_uInt16 POOL_FMT = (0 << 15); -const USHORT COLL_TEXT_BITS = (1 << 11); -const USHORT COLL_LISTS_BITS = (2 << 11); -const USHORT COLL_EXTRA_BITS = (3 << 11); -const USHORT COLL_REGISTER_BITS = (4 << 11); -const USHORT COLL_DOC_BITS = (5 << 11); -const USHORT COLL_HTML_BITS = (6 << 11); -const USHORT COLL_GET_RANGE_BITS = (15 << 11); +const sal_uInt16 COLL_TEXT_BITS = (1 << 11); +const sal_uInt16 COLL_LISTS_BITS = (2 << 11); +const sal_uInt16 COLL_EXTRA_BITS = (3 << 11); +const sal_uInt16 COLL_REGISTER_BITS = (4 << 11); +const sal_uInt16 COLL_DOC_BITS = (5 << 11); +const sal_uInt16 COLL_HTML_BITS = (6 << 11); +const sal_uInt16 COLL_GET_RANGE_BITS = (15 << 11); // Sonstige Gruppen: -const USHORT POOLGRP_CHARFMT = (0 << 11) + POOLGRP_NOCOLLID; -const USHORT POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID; -const USHORT POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID; -const USHORT POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; -//const USHORT POOLGRP_GRFFMT = (4 << 11) + POOLGRP_NOCOLLID; // ? +const sal_uInt16 POOLGRP_CHARFMT = (0 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; +//const sal_uInt16 POOLGRP_GRFFMT = (4 << 11) + POOLGRP_NOCOLLID; // ? // fuer Erkennung ob Benutzer-Vorlage oder nicht: -const USHORT POOL_IDUSER_FMT = +const sal_uInt16 POOL_IDUSER_FMT = USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID); -inline BOOL IsPoolUserFmt( USHORT nId ) +inline sal_Bool IsPoolUserFmt( sal_uInt16 nId ) { return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID)) - ? TRUE : FALSE; + ? sal_True : sal_False; } @@ -423,11 +423,11 @@ RES_POOLCOLL_HTML_END // returnt: 0 -> Standard // USHRT_MAX -> kein Parent // sonst -> den Parent -USHORT GetPoolParent( USHORT nId ); +sal_uInt16 GetPoolParent( sal_uInt16 nId ); -SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage); +SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage); -inline BOOL IsConditionalByPoolId(USHORT nId) +inline sal_Bool IsConditionalByPoolId(sal_uInt16 nId) { return RES_POOLCOLL_TEXT == nId; } diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 31df018985c6..620936cdcf5b 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -57,7 +57,7 @@ struct SwLayoutInfo SwRect mPagePrtArea; unsigned long mnPageNumber; sw::sidebarwindows::SidebarPosition meSidebarPosition; - USHORT mRedlineAuthor; + sal_uInt16 mRedlineAuthor; SwLayoutInfo() : mpAnchorFrm(0) diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx index 7b23800cb206..14b20f147714 100644 --- a/sw/inc/pvprtdat.hxx +++ b/sw/inc/pvprtdat.hxx @@ -33,11 +33,11 @@ class SwPagePreViewPrtData { - ULONG nLeftSpace, nRightSpace, nTopSpace, nBottomSpace, + sal_uLong nLeftSpace, nRightSpace, nTopSpace, nBottomSpace, nHorzSpace, nVertSpace; - BYTE nRow, nCol; - BOOL bLandscape : 1; - BOOL bStretch : 1; + sal_uInt8 nRow, nCol; + sal_Bool bLandscape : 1; + sal_Bool bStretch : 1; public: SwPagePreViewPrtData() : nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0), @@ -45,32 +45,32 @@ public: bLandscape(0),bStretch(0) {} - ULONG GetLeftSpace() const { return nLeftSpace; } - void SetLeftSpace( ULONG n ) { nLeftSpace = n; } + sal_uLong GetLeftSpace() const { return nLeftSpace; } + void SetLeftSpace( sal_uLong n ) { nLeftSpace = n; } - ULONG GetRightSpace() const { return nRightSpace; } - void SetRightSpace( ULONG n ) { nRightSpace = n; } + sal_uLong GetRightSpace() const { return nRightSpace; } + void SetRightSpace( sal_uLong n ) { nRightSpace = n; } - ULONG GetTopSpace() const { return nTopSpace; } - void SetTopSpace( ULONG n ) { nTopSpace = n; } + sal_uLong GetTopSpace() const { return nTopSpace; } + void SetTopSpace( sal_uLong n ) { nTopSpace = n; } - ULONG GetBottomSpace() const { return nBottomSpace; } - void SetBottomSpace( ULONG n ) { nBottomSpace = n; } + sal_uLong GetBottomSpace() const { return nBottomSpace; } + void SetBottomSpace( sal_uLong n ) { nBottomSpace = n; } - ULONG GetHorzSpace() const { return nHorzSpace; } - void SetHorzSpace( ULONG n ) { nHorzSpace = n; } + sal_uLong GetHorzSpace() const { return nHorzSpace; } + void SetHorzSpace( sal_uLong n ) { nHorzSpace = n; } - ULONG GetVertSpace() const { return nVertSpace; } - void SetVertSpace( ULONG n ) { nVertSpace = n; } + sal_uLong GetVertSpace() const { return nVertSpace; } + void SetVertSpace( sal_uLong n ) { nVertSpace = n; } - BYTE GetRow() const { return nRow; } - void SetRow(BYTE n ) { nRow = n; } + sal_uInt8 GetRow() const { return nRow; } + void SetRow(sal_uInt8 n ) { nRow = n; } - BYTE GetCol() const { return nCol; } - void SetCol( BYTE n ) { nCol = n; } + sal_uInt8 GetCol() const { return nCol; } + void SetCol( sal_uInt8 n ) { nCol = n; } - BOOL GetLandscape() const { return bLandscape; } - void SetLandscape( BOOL b ) { bLandscape = b; } + sal_Bool GetLandscape() const { return bLandscape; } + void SetLandscape( sal_Bool b ) { bLandscape = b; } }; diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 5d3dce538793..d4242d35f383 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -62,9 +62,9 @@ class SwRedlineExtraData_FmtColl : public SwRedlineExtraData { String sFmtNm; SfxItemSet* pSet; - USHORT nPoolId; + sal_uInt16 nPoolId; public: - SwRedlineExtraData_FmtColl( const String& rColl, USHORT nPoolFmtId, + SwRedlineExtraData_FmtColl( const String& rColl, sal_uInt16 nPoolFmtId, const SfxItemSet* pSet = 0 ); virtual ~SwRedlineExtraData_FmtColl(); virtual SwRedlineExtraData* CreateNew() const; @@ -98,14 +98,14 @@ class SW_DLLPUBLIC SwRedlineData String sComment; DateTime aStamp; RedlineType_t eType; - USHORT nAuthor, nSeqNo; + sal_uInt16 nAuthor, nSeqNo; public: - SwRedlineData( RedlineType_t eT, USHORT nAut ); - SwRedlineData( const SwRedlineData& rCpy, BOOL bCpyNext = TRUE ); + SwRedlineData( RedlineType_t eT, sal_uInt16 nAut ); + SwRedlineData( const SwRedlineData& rCpy, sal_Bool bCpyNext = sal_True ); // fuer sw3io: pNext/pExtraData gehen in eigenen Besitz ueber! - SwRedlineData( RedlineType_t eT, USHORT nAut, const DateTime& rDT, + SwRedlineData( RedlineType_t eT, sal_uInt16 nAut, const DateTime& rDT, const String& rCmnt, SwRedlineData* pNxt, SwRedlineExtraData* pExtraData = 0 ); @@ -128,7 +128,7 @@ public: RedlineType_t GetType() const { return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } RedlineType_t GetRealType() const { return eType; } - USHORT GetAuthor() const { return nAuthor; } + sal_uInt16 GetAuthor() const { return nAuthor; } const String& GetComment() const { return sComment; } const DateTime& GetTimeStamp() const { return aStamp; } inline const SwRedlineData* Next() const{ return pNext; } @@ -160,8 +160,8 @@ public: // fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur // fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei, // das es noch weitere geben kann! - USHORT GetSeqNo() const { return nSeqNo; } - void SetSeqNo( USHORT nNo ) { nSeqNo = nNo; } + sal_uInt16 GetSeqNo() const { return nSeqNo; } + void SetSeqNo( sal_uInt16 nNo ) { nSeqNo = nNo; } String GetDescr() const; }; @@ -171,9 +171,9 @@ class SW_DLLPUBLIC SwRedline : public SwPaM { SwRedlineData* pRedlineData; SwNodeIndex* pCntntSect; - BOOL bDelLastPara : 1; - BOOL bIsLastParaDelete : 1; - BOOL bIsVisible : 1; + sal_Bool bDelLastPara : 1; + sal_Bool bIsLastParaDelete : 1; + sal_Bool bIsVisible : 1; void MoveToSection(); void CopyToSection(); @@ -185,8 +185,8 @@ public: SwRedline( const SwRedlineData& rData, const SwPaM& rPam ); SwRedline( const SwRedlineData& rData, const SwPosition& rPos ); // fuer sw3io: pData geht in eigenen Besitz ueber! - SwRedline(SwRedlineData* pData, const SwPosition& rPos, BOOL bVsbl, - BOOL bDelLP, BOOL bIsPD) : + SwRedline(SwRedlineData* pData, const SwPosition& rPos, sal_Bool bVsbl, + sal_Bool bDelLP, sal_Bool bIsPD) : SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ), bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl ) {} @@ -197,11 +197,11 @@ public: // fuers Undo void SetContentIdx( const SwNodeIndex* ); - BOOL IsVisible() const { return bIsVisible; } - BOOL IsDelLastPara() const { return bDelLastPara; } + sal_Bool IsVisible() const { return bIsVisible; } + sal_Bool IsDelLastPara() const { return bDelLastPara; } - // das BOOL besagt, ob nach dem setzen der Pos kein Bereich mehr - // aufgespannt ist. -> TRUE, ansonten Bereich und FALSE + // das sal_Bool besagt, ob nach dem setzen der Pos kein Bereich mehr + // aufgespannt ist. -> sal_True, ansonten Bereich und sal_False void SetStart( const SwPosition& rPos, SwPosition* pSttPtr = 0 ) { if( !pSttPtr ) pSttPtr = Start(); @@ -213,23 +213,23 @@ public: *pEndPtr = rPos; } // liegt eine gueltige Selektion vor? - BOOL HasValidRange() const; + sal_Bool HasValidRange() const; - const SwRedlineData& GetRedlineData(USHORT nPos = 0) const; + const SwRedlineData& GetRedlineData(sal_uInt16 nPos = 0) const; int operator==( const SwRedlineData& rCmp ) const { return *pRedlineData == rCmp; } int operator!=( const SwRedlineData& rCmp ) const { return *pRedlineData != rCmp; } void SetAutoFmtFlag() { pRedlineData->SetAutoFmtFlag(); } - USHORT GetStackCount() const; - USHORT GetAuthor( USHORT nPos = 0) const; - const String& GetAuthorString( USHORT nPos = 0 ) const; - const DateTime& GetTimeStamp( USHORT nPos = 0) const; - RedlineType_t GetRealType( USHORT nPos = 0 ) const; - RedlineType_t GetType( USHORT nPos = 0) const + sal_uInt16 GetStackCount() const; + sal_uInt16 GetAuthor( sal_uInt16 nPos = 0) const; + const String& GetAuthorString( sal_uInt16 nPos = 0 ) const; + const DateTime& GetTimeStamp( sal_uInt16 nPos = 0) const; + RedlineType_t GetRealType( sal_uInt16 nPos = 0 ) const; + RedlineType_t GetType( sal_uInt16 nPos = 0) const { return ( (RedlineType_t)(GetRealType( nPos ) & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } - const String& GetComment( USHORT nPos = 0 ) const; + const String& GetComment( sal_uInt16 nPos = 0 ) const; void SetComment( const String& rS ) { pRedlineData->SetComment( rS ); } @@ -243,29 +243,29 @@ public: // fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur // fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei, // das es noch weitere geben kann! - USHORT GetSeqNo() const { return pRedlineData->GetSeqNo(); } - void SetSeqNo( USHORT nNo ) { pRedlineData->SetSeqNo( nNo ); } + sal_uInt16 GetSeqNo() const { return pRedlineData->GetSeqNo(); } + void SetSeqNo( sal_uInt16 nNo ) { pRedlineData->SetSeqNo( nNo ); } // Beim Hide/ShowOriginal wird 2 mal ueber die Liste gelaufen, damit // die Del-Redlines per Copy und Delete versteckt werden. Beim Move // wird sonst die Attributierung falsch behandelt. // Alle anderen Aufrufer muessen immer 0 angeben. - void CallDisplayFunc( USHORT nLoop = 0 ); - void Show( USHORT nLoop = 0 ); - void Hide( USHORT nLoop = 0 ); - void ShowOriginal( USHORT nLoop = 0 ); + void CallDisplayFunc( sal_uInt16 nLoop = 0 ); + void Show( sal_uInt16 nLoop = 0 ); + void Hide( sal_uInt16 nLoop = 0 ); + void ShowOriginal( sal_uInt16 nLoop = 0 ); // calculates the intersection with text node number nNdIdx - void CalcStartEnd( ULONG nNdIdx, USHORT& nStart, USHORT& nEnd ) const; + void CalcStartEnd( sal_uLong nNdIdx, sal_uInt16& nStart, sal_uInt16& nEnd ) const; void InvalidateRange(); // das Layout anstossen - BOOL IsOwnRedline( const SwRedline& rRedl ) const + sal_Bool IsOwnRedline( const SwRedline& rRedl ) const { return GetAuthor() == rRedl.GetAuthor(); } - BOOL CanCombine( const SwRedline& rRedl ) const; + sal_Bool CanCombine( const SwRedline& rRedl ) const; - void PushData( const SwRedline& rRedl, BOOL bOwnAsNext = TRUE ); - BOOL PopData(); + void PushData( const SwRedline& rRedl, sal_Bool bOwnAsNext = sal_True ); + sal_Bool PopData(); // #111827# /** @@ -279,7 +279,7 @@ public: @return textual description of the selected redline data element */ - String GetDescr(USHORT nPos = 0); + String GetDescr(sal_uInt16 nPos = 0); int operator==( const SwRedline& ) const; int operator<( const SwRedline& ) const; diff --git a/sw/inc/redlnaut.hxx b/sw/inc/redlnaut.hxx index 4290b3ec709c..e1a238f0704b 100644 --- a/sw/inc/redlnaut.hxx +++ b/sw/inc/redlnaut.hxx @@ -41,7 +41,7 @@ class SwRedlineAuthor Color aChgLineColor; SfxItemSet *pInsAttrSet, *pDelAttrSet, *pFmtAttrSet; short eChgLineOrient; - BYTE cDelChar; + sal_uInt8 cDelChar; public: SwRedlineAuthor( SwAttrPool& rPool, const String& ); SwRedlineAuthor( const SwRedlineAuthor& ); diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 44d17eb38ca8..fcd8ba2c70b8 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -83,8 +83,8 @@ public: void MergeWithOtherDoc( SwDoc& rDestDoc ); static SwTxtNode* FindAnchor( SwDoc* pDoc, const String& rRefMark, - USHORT nSubType, USHORT nSeqNo, - USHORT* pStt, USHORT* pEnd = 0 ); + sal_uInt16 nSubType, sal_uInt16 nSeqNo, + sal_uInt16* pStt, sal_uInt16* pEnd = 0 ); }; /*-------------------------------------------------------------------- @@ -96,8 +96,8 @@ class SW_DLLPUBLIC SwGetRefField : public SwField private: String sSetRefName; String sTxt; - USHORT nSubType; - USHORT nSeqNo; + sal_uInt16 nSubType; + sal_uInt16 nSeqNo; virtual String Expand() const; virtual SwField* Copy() const; @@ -109,7 +109,7 @@ private: // <-- public: SwGetRefField( SwGetRefFieldType*, const String& rSetRef, - USHORT nSubType, USHORT nSeqNo, ULONG nFmt ); + sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt ); virtual ~SwGetRefField(); @@ -129,8 +129,8 @@ public: void SetExpand( const String& rStr ) { sTxt = rStr; } // SubType erfragen/setzen - virtual USHORT GetSubType() const; - virtual void SetSubType( USHORT n ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType( sal_uInt16 n ); // --> OD 2007-11-09 #i81002# bool IsRefToHeadingCrossRefBookmark() const; @@ -142,16 +142,16 @@ public: // <-- // SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant) - USHORT GetSeqNo() const { return nSeqNo; } - void SetSeqNo( USHORT n ) { nSeqNo = n; } + sal_uInt16 GetSeqNo() const { return nSeqNo; } + void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; } // Name der Referenz virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); virtual String GetPar2() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); void ConvertProgrammaticToUIName(); diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx index e2aa129f65e1..9a39200f0b21 100644 --- a/sw/inc/rolbck.hxx +++ b/sw/inc/rolbck.hxx @@ -111,10 +111,10 @@ public: class SwHistorySetFmt : public SwHistoryHint { ::std::auto_ptr<SfxPoolItem> m_pAttr; - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; public: - SwHistorySetFmt( const SfxPoolItem* pFmtHt, ULONG nNode ); + SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNode ); virtual ~SwHistorySetFmt(); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); virtual String GetDescription() const; @@ -123,12 +123,12 @@ public: class SwHistoryResetFmt : public SwHistoryHint { - const ULONG m_nNodeIndex; - const USHORT m_nWhich; + const sal_uLong m_nNodeIndex; + const sal_uInt16 m_nWhich; public: // --> OD 2008-02-27 #refactorlists# - removed <rDoc> - SwHistoryResetFmt( const SfxPoolItem* pFmtHt, ULONG nNodeIdx ); + SwHistoryResetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx ); // <-- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); @@ -137,12 +137,12 @@ public: class SwHistorySetTxt : public SwHistoryHint { ::std::auto_ptr<SfxPoolItem> m_pAttr; - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; const xub_StrLen m_nStart; const xub_StrLen m_nEnd; public: - SwHistorySetTxt( SwTxtAttr* pTxtHt, ULONG nNode ); + SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNode ); virtual ~SwHistorySetTxt(); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); @@ -155,12 +155,12 @@ class SwHistorySetTxtFld : public SwHistoryHint ::std::auto_ptr<SwFieldType> m_pFldType; const ::std::auto_ptr<SwFmtFld> m_pFld; - ULONG m_nNodeIndex; + sal_uLong m_nNodeIndex; xub_StrLen m_nPos; - USHORT m_nFldWhich; + sal_uInt16 m_nFldWhich; public: - SwHistorySetTxtFld( SwTxtFld* pTxtFld, ULONG nNode ); + SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNode ); virtual ~SwHistorySetTxtFld(); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); @@ -171,12 +171,12 @@ public: class SwHistorySetRefMark : public SwHistoryHint { const String m_RefName; - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; const xub_StrLen m_nStart; const xub_StrLen m_nEnd; public: - SwHistorySetRefMark( SwTxtRefMark* pTxtHt, ULONG nNode ); + SwHistorySetRefMark( SwTxtRefMark* pTxtHt, sal_uLong nNode ); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); }; @@ -186,12 +186,12 @@ class SwHistorySetTOXMark : public SwHistoryHint SwTOXMark m_TOXMark; const String m_TOXName; const TOXTypes m_eTOXTypes; - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; const xub_StrLen m_nStart; const xub_StrLen m_nEnd; public: - SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, ULONG nNode ); + SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, sal_uLong nNode ); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); int IsEqual( const SwTOXMark& rCmp ) const; @@ -199,18 +199,18 @@ public: class SwHistoryResetTxt : public SwHistoryHint { - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; const xub_StrLen m_nStart; const xub_StrLen m_nEnd; - const USHORT m_nAttr; + const sal_uInt16 m_nAttr; public: - SwHistoryResetTxt( USHORT nWhich, xub_StrLen nStt, xub_StrLen nEnd, - ULONG nNode ); + SwHistoryResetTxt( sal_uInt16 nWhich, xub_StrLen nStt, xub_StrLen nEnd, + sal_uLong nNode ); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - USHORT GetWhich() const { return m_nAttr; } - ULONG GetNode() const { return m_nNodeIndex; } + sal_uInt16 GetWhich() const { return m_nAttr; } + sal_uLong GetNode() const { return m_nNodeIndex; } xub_StrLen GetCntnt() const { return m_nStart; } }; @@ -219,12 +219,12 @@ class SwHistorySetFootnote : public SwHistoryHint { const ::std::auto_ptr<SwUndoSaveSection> m_pUndo; const String m_FootnoteNumber; - ULONG m_nNodeIndex; + sal_uLong m_nNodeIndex; const xub_StrLen m_nStart; const bool m_bEndNote; public: - SwHistorySetFootnote( SwTxtFtn* pTxtFtn, ULONG nNode ); + SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNode ); SwHistorySetFootnote( const SwTxtFtn& ); virtual ~SwHistorySetFootnote(); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); @@ -236,11 +236,11 @@ public: class SwHistoryChangeFmtColl : public SwHistoryHint { SwFmtColl * const m_pColl; - const ULONG m_nNodeIndex; - const BYTE m_nNodeType; + const sal_uLong m_nNodeIndex; + const sal_uInt8 m_nNodeType; public: - SwHistoryChangeFmtColl( SwFmtColl* pColl, ULONG nNode, BYTE nNodeWhich ); + SwHistoryChangeFmtColl( SwFmtColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich ); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); }; @@ -272,8 +272,8 @@ class SwHistoryBookmark : public SwHistoryHint const ::rtl::OUString m_aName; ::rtl::OUString m_aShortName; KeyCode m_aKeycode; - const ULONG m_nNode; - const ULONG m_nOtherNode; + const sal_uLong m_nNode; + const sal_uLong m_nOtherNode; const xub_StrLen m_nCntnt; const xub_StrLen m_nOtherCntnt; const bool m_bSavePos; @@ -287,10 +287,10 @@ class SwHistorySetAttrSet : public SwHistoryHint { SfxItemSet m_OldSet; SvUShorts m_ResetArray; - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; public: - SwHistorySetAttrSet( const SfxItemSet& rSet, ULONG nNode, + SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, const SvUShortsSort& rSetArr ); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); @@ -299,19 +299,19 @@ public: class SwHistoryResetAttrSet : public SwHistoryHint { - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; const xub_StrLen m_nStart; const xub_StrLen m_nEnd; SvUShorts m_Array; public: - SwHistoryResetAttrSet( const SfxItemSet& rSet, ULONG nNode, + SwHistoryResetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, xub_StrLen nStt = STRING_MAXLEN, xub_StrLen nEnd = STRING_MAXLEN ); virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); const SvUShorts& GetArr() const { return m_Array; } - ULONG GetNode() const { return m_nNodeIndex; } + sal_uLong GetNode() const { return m_nNodeIndex; } xub_StrLen GetCntnt() const { return m_nStart; } }; @@ -319,7 +319,7 @@ public: class SwHistoryChangeFlyAnchor : public SwHistoryHint { SwFrmFmt & m_rFmt; - const ULONG m_nOldNodeIndex; + const sal_uLong m_nOldNodeIndex; const xub_StrLen m_nOldContentIndex; public: @@ -363,41 +363,41 @@ class SwHistory friend class SwRegHistory; // for inserting History attributes SwpHstry m_SwpHstry; - USHORT m_nEndDiff; + sal_uInt16 m_nEndDiff; public: - SwHistory( USHORT nInitSz = 0, USHORT nGrowSz = 2 ); + SwHistory( sal_uInt16 nInitSz = 0, sal_uInt16 nGrowSz = 2 ); ~SwHistory(); // delete History from nStart to array end - void Delete( USHORT nStart = 0 ); + void Delete( sal_uInt16 nStart = 0 ); // call and delete all objects between nStart and array end - bool Rollback( SwDoc* pDoc, USHORT nStart = 0 ); + bool Rollback( SwDoc* pDoc, sal_uInt16 nStart = 0 ); // call all objects between nStart and TmpEnd; store nStart as TmpEnd - bool TmpRollback( SwDoc* pDoc, USHORT nStart, bool ToFirst = true ); + bool TmpRollback( SwDoc* pDoc, sal_uInt16 nStart, bool ToFirst = true ); // --> OD 2008-02-27 #refactorlists# - removed <rDoc> void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue, - ULONG nNodeIdx ); + sal_uLong nNodeIdx ); // <-- - void Add( SwTxtAttr* pTxtHt, ULONG nNodeIdx, bool bNewAttr = true ); - void Add( SwFmtColl*, ULONG nNodeIdx, BYTE nWhichNd ); + void Add( SwTxtAttr* pTxtHt, sal_uLong nNodeIdx, bool bNewAttr = true ); + void Add( SwFmtColl*, sal_uLong nNodeIdx, sal_uInt8 nWhichNd ); void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos ); void Add( SwFrmFmt& rFmt ); - void Add( SwFlyFrmFmt&, USHORT& rSetPos ); + void Add( SwFlyFrmFmt&, sal_uInt16& rSetPos ); void Add( const SwTxtFtn& ); void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt); // #i27615# - USHORT Count() const { return m_SwpHstry.Count(); } - USHORT GetTmpEnd() const { return m_SwpHstry.Count() - m_nEndDiff; } - USHORT SetTmpEnd( USHORT nTmpEnd ); // return previous value - SwHistoryHint * operator[]( USHORT nPos ) { return m_SwpHstry[nPos]; } - SwHistoryHint const* operator[]( USHORT nPos ) const + sal_uInt16 Count() const { return m_SwpHstry.Count(); } + sal_uInt16 GetTmpEnd() const { return m_SwpHstry.Count() - m_nEndDiff; } + sal_uInt16 SetTmpEnd( sal_uInt16 nTmpEnd ); // return previous value + SwHistoryHint * operator[]( sal_uInt16 nPos ) { return m_SwpHstry[nPos]; } + SwHistoryHint const* operator[]( sal_uInt16 nPos ) const { return m_SwpHstry[nPos]; } // for SwUndoDelete::Undo/Redo - void Move( USHORT nPos, SwHistory *pIns, - USHORT nStart = 0, USHORT nEnd = USHRT_MAX ) + void Move( sal_uInt16 nPos, SwHistory *pIns, + sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX ) { m_SwpHstry.Insert( &pIns->m_SwpHstry, nPos, nStart, nEnd ); pIns->m_SwpHstry.Remove( nStart, (nEnd == USHRT_MAX) @@ -407,10 +407,10 @@ public: // helper methods for recording attribute in History // used by Undo classes (Delete/Overwrite/Inserts) - void CopyAttr( SwpHints* pHts, ULONG nNodeIdx, xub_StrLen nStart, + void CopyAttr( SwpHints* pHts, sal_uLong nNodeIdx, xub_StrLen nStart, xub_StrLen nEnd, bool bFields ); // --> OD 2008-02-27 #refactorlists# - removed <rDoc> - void CopyFmtAttr( const SfxItemSet& rSet, ULONG nNodeIdx ); + void CopyFmtAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx ); // <-- }; @@ -421,7 +421,7 @@ class SwRegHistory : public SwClient private: SvUShortsSort m_WhichIdSet; SwHistory * const m_pHistory; - ULONG m_nNodeIndex; + sal_uLong m_nNodeIndex; void _MakeSetWhichIds(); @@ -442,7 +442,7 @@ public: void AddHint( SwTxtAttr* pHt, const bool bNew = false ); void RegisterInModify( SwModify* pRegIn, const SwNode& rNd ); - void ChangeNodeIndex( ULONG nNew ) { m_nNodeIndex = nNew; } + void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; } }; #endif diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index db99cfdf4d52..98948c228678 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -220,7 +220,7 @@ public: void SetCondHidden(bool const bFlag = true); bool IsCondHidden() const { return m_Data.IsCondHidden(); } // erfrage (auch ueber die Parents), ob diese Section versteckt sein soll. - BOOL CalcHiddenFlag() const; + sal_Bool CalcHiddenFlag() const; inline SwSection* GetParent() const; @@ -249,8 +249,8 @@ public: bool IsServer() const { return m_RefObj.Is(); } // Methoden fuer gelinkte Bereiche - USHORT GetUpdateType() const { return m_RefLink->GetUpdateMode(); } - void SetUpdateType(USHORT const nType ) + sal_uInt16 GetUpdateType() const { return m_RefLink->GetUpdateMode(); } + void SetUpdateType(sal_uInt16 const nType ) { m_RefLink->SetUpdateMode(nType); } bool IsConnected() const { return m_RefLink.Is(); } @@ -313,7 +313,7 @@ public: virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); // erfrage vom Format Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; SwSection* GetSection() const; inline SwSectionFmt* GetParent() const; @@ -322,13 +322,13 @@ public: // alle Sections, die von dieser abgeleitet sind // - sortiert nach : Name oder Position oder unsortiert // - alle oder nur die, die sich im normalten Nodes-Array befinden - USHORT GetChildSections( SwSections& rArr, + sal_uInt16 GetChildSections( SwSections& rArr, SectionSort eSort = SORTSECT_NOT, - BOOL bAllSections = TRUE ) const; + sal_Bool bAllSections = sal_True ) const; // erfrage, ob sich die Section im Nodes-Array oder UndoNodes-Array // befindet. - BOOL IsInNodesArr() const; + sal_Bool IsInNodesArr() const; SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false); const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 0e52ce256754..43c2066330f7 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -78,7 +78,7 @@ class SW_DLLPUBLIC SwAsciiOptions { String sFont; rtl_TextEncoding eCharSet; - USHORT nLanguage; + sal_uInt16 nLanguage; LineEnd eCRLF_Flag; public: @@ -89,8 +89,8 @@ public: rtl_TextEncoding GetCharSet() const { return eCharSet; } void SetCharSet( rtl_TextEncoding nVal ) { eCharSet = nVal; } - USHORT GetLanguage() const { return nLanguage; } - void SetLanguage( USHORT nVal ) { nLanguage = nVal; } + sal_uInt16 GetLanguage() const { return nLanguage; } + void SetLanguage( sal_uInt16 nVal ) { nLanguage = nVal; } LineEnd GetParaFlags() const { return eCRLF_Flag; } void SetParaFlags( LineEnd eVal ) { eCRLF_Flag = eVal; } @@ -122,35 +122,35 @@ class SwgReaderOption SwAsciiOptions aASCIIOpts; union { - BOOL bFmtsOnly; + sal_Bool bFmtsOnly; struct { - BOOL bFrmFmts: 1; - BOOL bPageDescs: 1; - BOOL bTxtFmts: 1; - BOOL bNumRules: 1; - BOOL bMerge:1; + sal_Bool bFrmFmts: 1; + sal_Bool bPageDescs: 1; + sal_Bool bTxtFmts: 1; + sal_Bool bNumRules: 1; + sal_Bool bMerge:1; } Fmts; } What; public: void ResetAllFmtsOnly() { What.bFmtsOnly = 0; } - BOOL IsFmtsOnly() const { return What.bFmtsOnly; } + sal_Bool IsFmtsOnly() const { return What.bFmtsOnly; } - BOOL IsFrmFmts() const { return What.Fmts.bFrmFmts; } - void SetFrmFmts( const BOOL bNew) { What.Fmts.bFrmFmts = bNew; } + sal_Bool IsFrmFmts() const { return What.Fmts.bFrmFmts; } + void SetFrmFmts( const sal_Bool bNew) { What.Fmts.bFrmFmts = bNew; } - BOOL IsPageDescs() const { return What.Fmts.bPageDescs; } - void SetPageDescs( const BOOL bNew) { What.Fmts.bPageDescs = bNew; } + sal_Bool IsPageDescs() const { return What.Fmts.bPageDescs; } + void SetPageDescs( const sal_Bool bNew) { What.Fmts.bPageDescs = bNew; } - BOOL IsTxtFmts() const { return What.Fmts.bTxtFmts; } - void SetTxtFmts( const BOOL bNew) { What.Fmts.bTxtFmts = bNew; } + sal_Bool IsTxtFmts() const { return What.Fmts.bTxtFmts; } + void SetTxtFmts( const sal_Bool bNew) { What.Fmts.bTxtFmts = bNew; } - BOOL IsNumRules() const { return What.Fmts.bNumRules; } - void SetNumRules( const BOOL bNew) { What.Fmts.bNumRules = bNew; } + sal_Bool IsNumRules() const { return What.Fmts.bNumRules; } + void SetNumRules( const sal_Bool bNew) { What.Fmts.bNumRules = bNew; } - BOOL IsMerge() const { return What.Fmts.bMerge; } - void SetMerge( const BOOL bNew ) { What.Fmts.bMerge = bNew; } + sal_Bool IsMerge() const { return What.Fmts.bMerge; } + void SetMerge( const sal_Bool bNew ) { What.Fmts.bMerge = bNew; } const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; } void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; } @@ -192,13 +192,13 @@ public: /* * Nur SwReader::Read(...) ist die Export-Schnittstelle!!! */ - BOOL NeedsPasswd( const Reader& ); - BOOL CheckPasswd( const String&, const Reader& ); - ULONG Read( const Reader& ); + sal_Bool NeedsPasswd( const Reader& ); + sal_Bool CheckPasswd( const String&, const Reader& ); + sal_uLong Read( const Reader& ); // ask for glossaries - BOOL HasGlossaries( const Reader& ); - BOOL ReadGlossaries( const Reader&, SwTextBlocks&, BOOL bSaveRelFiles ); + sal_Bool HasGlossaries( const Reader& ); + sal_Bool ReadGlossaries( const Reader&, SwTextBlocks&, sal_Bool bSaveRelFiles ); const String& GetBaseURL() const { return sBaseURL;} @@ -233,13 +233,13 @@ protected: SfxMedium* pMedium; // wer ein Medium haben will (W4W) SwgReaderOption aOpt; - BOOL bInsertMode : 1; - BOOL bTmplBrowseMode : 1; - BOOL bReadUTF8: 1; // Stream als UTF-8 interpretieren - BOOL bBlockMode: 1; - BOOL bOrganizerMode : 1; - BOOL bHasAskTemplateName : 1; - BOOL bIgnoreHTMLComments : 1; + sal_Bool bInsertMode : 1; + sal_Bool bTmplBrowseMode : 1; + sal_Bool bReadUTF8: 1; // Stream als UTF-8 interpretieren + sal_Bool bBlockMode: 1; + sal_Bool bOrganizerMode : 1; + sal_Bool bHasAskTemplateName : 1; + sal_Bool bIgnoreHTMLComments : 1; virtual String GetTemplateName() const; @@ -262,35 +262,35 @@ public: // Die Filter-Vorlage laden, setzen und wieder freigeben SwDoc* GetTemplateDoc(); - BOOL SetTemplate( SwDoc& rDoc ); + sal_Bool SetTemplate( SwDoc& rDoc ); void ClearTemplate(); void SetTemplateName( const String& rDir ); void MakeHTMLDummyTemplateDoc(); - BOOL IsReadUTF8() const { return bReadUTF8; } - void SetReadUTF8( BOOL bSet ) { bReadUTF8 = bSet; } + sal_Bool IsReadUTF8() const { return bReadUTF8; } + void SetReadUTF8( sal_Bool bSet ) { bReadUTF8 = bSet; } - BOOL IsBlockMode() const { return bBlockMode; } - void SetBlockMode( BOOL bSet ) { bBlockMode = bSet; } + sal_Bool IsBlockMode() const { return bBlockMode; } + void SetBlockMode( sal_Bool bSet ) { bBlockMode = bSet; } - BOOL IsOrganizerMode() const { return bOrganizerMode; } - void SetOrganizerMode( BOOL bSet ) { bOrganizerMode = bSet; } + sal_Bool IsOrganizerMode() const { return bOrganizerMode; } + void SetOrganizerMode( sal_Bool bSet ) { bOrganizerMode = bSet; } - void SetIgnoreHTMLComments( BOOL bSet ) { bIgnoreHTMLComments = bSet; } + void SetIgnoreHTMLComments( sal_Bool bSet ) { bIgnoreHTMLComments = bSet; } - virtual BOOL HasGlossaries() const; - virtual BOOL ReadGlossaries( SwTextBlocks&, BOOL bSaveRelFiles ) const; + virtual sal_Bool HasGlossaries() const; + virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const; // read the sections of the document, which is equal to the medium. // returns the count of it - virtual USHORT GetSectionList( SfxMedium& rMedium, + virtual sal_uInt16 GetSectionList( SfxMedium& rMedium, SvStrings& rStrings ) const; SotStorageRef getSotStorageRef() { return pStg; }; void setSotStorageRef(SotStorageRef pStgRef) { pStg = pStgRef; }; private: - virtual ULONG Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0; + virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0; // alle die die Streams / Storages nicht geoeffnet brauchen, // muessen die Methode ueberladen (W4W!!) @@ -300,14 +300,14 @@ private: class AsciiReader: public Reader { friend class SwReader; - virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); + virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); public: AsciiReader(): Reader() {} }; /*class SwgReader: public Reader { - virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); + virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); }; */ class SW_DLLPUBLIC StgReader : public Reader @@ -315,7 +315,7 @@ class SW_DLLPUBLIC StgReader : public Reader String aFltName; protected: - ULONG OpenMainStream( SotStorageStreamRef& rRef, USHORT& rBuffSize ); + sal_uLong OpenMainStream( SotStorageStreamRef& rRef, sal_uInt16& rBuffSize ); public: virtual int GetReaderType(); @@ -327,7 +327,7 @@ public: /*class Sw3Reader : public StgReader { Sw3Io* pIO; - virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); + virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); public: Sw3Reader() : pIO( 0 ) {} @@ -335,7 +335,7 @@ public: // read the sections of the document, which is equal to the medium. // returns the count of it - virtual USHORT GetSectionList( SfxMedium& rMedium, + virtual sal_uInt16 GetSectionList( SfxMedium& rMedium, SvStrings& rStrings ) const; };*/ @@ -353,7 +353,7 @@ class SW_DLLPUBLIC SwTextBlocks // friend class Sw2TextBlocks; // friend class Sw3IoImp; SwImpBlocks* pImp; - ULONG nErr; + sal_uLong nErr; public: SwTextBlocks( const String& ); @@ -365,43 +365,43 @@ public: void ClearDoc(); // Doc-Inhalt loeschen const String& GetName(); void SetName( const String& ); - ULONG GetError() const { return nErr; } + sal_uLong GetError() const { return nErr; } String GetBaseURL() const; void SetBaseURL( const String& rURL ); - BOOL IsOld() const; - ULONG ConvertToNew(); // Textbausteine konvertieren + sal_Bool IsOld() const; + sal_uLong ConvertToNew(); // Textbausteine konvertieren - USHORT GetCount() const; // Anzahl Textbausteine ermitteln - USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln - USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln - const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck - const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck + sal_uInt16 GetCount() const; // Anzahl Textbausteine ermitteln + sal_uInt16 GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln + sal_uInt16 GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln + const String& GetShortName( sal_uInt16 ) const; // Kurzname fuer Index zurueck + const String& GetLongName( sal_uInt16 ) const; // Langname fuer Index zurueck - BOOL Delete( USHORT ); // Loeschen - USHORT Rename( USHORT, const String*, const String* ); // Umbenennen - ULONG CopyBlock( SwTextBlocks& rSource, String& rSrcShort, + sal_Bool Delete( sal_uInt16 ); // Loeschen + sal_uInt16 Rename( sal_uInt16, const String*, const String* ); // Umbenennen + sal_uLong CopyBlock( SwTextBlocks& rSource, String& rSrcShort, const String& rLong ); // Block kopieren - BOOL BeginGetDoc( USHORT ); // Textbaustein einlesen + sal_Bool BeginGetDoc( sal_uInt16 ); // Textbaustein einlesen void EndGetDoc(); // Textbaustein wieder loslassen - BOOL BeginPutDoc( const String&, const String& ); // Speichern Beginn - USHORT PutDoc(); // Speichern Ende + sal_Bool BeginPutDoc( const String&, const String& ); // Speichern Beginn + sal_uInt16 PutDoc(); // Speichern Ende - USHORT PutText( const String&, const String&, const String& ); // Speichern( Kurzn., Text) + sal_uInt16 PutText( const String&, const String&, const String& ); // Speichern( Kurzn., Text) - BOOL IsOnlyTextBlock( USHORT ) const; - BOOL IsOnlyTextBlock( const String& rShort ) const; + sal_Bool IsOnlyTextBlock( sal_uInt16 ) const; + sal_Bool IsOnlyTextBlock( const String& rShort ) const; const String& GetFileName() const; // Dateiname von pImp - BOOL IsReadOnly() const; // ReadOnly-Flag von pImp + sal_Bool IsReadOnly() const; // ReadOnly-Flag von pImp - BOOL GetMacroTable( USHORT nIdx, SvxMacroTableDtor& rMacroTbl ); - BOOL SetMacroTable( USHORT nIdx, const SvxMacroTableDtor& rMacroTbl ); + sal_Bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl ); + sal_Bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl ); - BOOL StartPutMuchBlockEntries(); + sal_Bool StartPutMuchBlockEntries(); void EndPutMuchBlockEntries(); }; @@ -418,7 +418,7 @@ SW_DLLPUBLIC SwRead SwGetReaderXML(); // END source/filter/basflt/fltini.cxx -extern BOOL SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx +extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx /* */ @@ -442,7 +442,7 @@ class SW_DLLPUBLIC Writer String sBaseURL; void _AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ); - void _AddFontItems( SfxItemPool& rPool, USHORT nWhichId ); + void _AddFontItems( SfxItemPool& rPool, sal_uInt16 nWhichId ); ::std::auto_ptr<Writer_Impl> m_pImpl; @@ -452,13 +452,13 @@ protected: const String* pOrigFileName; void ResetWriter(); - BOOL CopyNextPam( SwPaM ** ); + sal_Bool CopyNextPam( SwPaM ** ); void PutNumFmtFontsInAttrPool(); - void PutEditEngFontsInAttrPool( BOOL bIncl_CJK_CTL = TRUE ); + void PutEditEngFontsInAttrPool( sal_Bool bIncl_CJK_CTL = sal_True ); void PutCJKandCTLFontsInAttrPool(); - virtual ULONG WriteStream() = 0; + virtual sal_uLong WriteStream() = 0; void SetBaseURL( const String& rURL ) { sBaseURL = rURL; } IDocumentSettingAccess* getIDocumentSettingAccess(); @@ -470,33 +470,33 @@ protected: public: SwDoc* pDoc; SwPaM* pCurPam; - BOOL bWriteAll : 1; - BOOL bShowProgress : 1; - BOOL bWriteClipboardDoc : 1; - BOOL bWriteOnlyFirstTable : 1; - BOOL bASCII_ParaAsCR : 1; - BOOL bASCII_ParaAsBlanc : 1; - BOOL bASCII_NoLastLineEnd : 1; - BOOL bUCS2_WithStartChar : 1; - BOOL bExportPargraphNumbering : 1; - - BOOL bBlock : 1; - BOOL bOrganizerMode : 1; + sal_Bool bWriteAll : 1; + sal_Bool bShowProgress : 1; + sal_Bool bWriteClipboardDoc : 1; + sal_Bool bWriteOnlyFirstTable : 1; + sal_Bool bASCII_ParaAsCR : 1; + sal_Bool bASCII_ParaAsBlanc : 1; + sal_Bool bASCII_NoLastLineEnd : 1; + sal_Bool bUCS2_WithStartChar : 1; + sal_Bool bExportPargraphNumbering : 1; + + sal_Bool bBlock : 1; + sal_Bool bOrganizerMode : 1; Writer(); virtual ~Writer(); - virtual ULONG Write( SwPaM&, SfxMedium&, const String* = 0 ); - ULONG Write( SwPaM&, SvStream&, const String* = 0 ); - virtual ULONG Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); - virtual ULONG Write( SwPaM&, SotStorage&, const String* = 0 ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const String* = 0 ); + sal_uLong Write( SwPaM&, SvStream&, const String* = 0 ); + virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); + virtual sal_uLong Write( SwPaM&, SotStorage&, const String* = 0 ); virtual void SetPasswd( const String& ); virtual void SetVersion( const String&, long ); - virtual BOOL IsStgWriter() const; -// virtual BOOL IsSw3Writer() const; + virtual sal_Bool IsStgWriter() const; +// virtual sal_Bool IsSw3Writer() const; - void SetShowProgress( BOOL bFlag = FALSE ) { bShowProgress = bFlag; } + void SetShowProgress( sal_Bool bFlag = sal_False ) { bShowProgress = bFlag; } const String* GetOrigFileName() const { return pOrigFileName; } @@ -511,38 +511,38 @@ public: // OtherPos of the bookmarks also inserted. void CreateBookmarkTbl(); // search alle Bookmarks in the range and return it in the Array - USHORT GetBookmarks( const SwCntntNode& rNd, + sal_uInt16 GetBookmarks( const SwCntntNode& rNd, xub_StrLen nStt, xub_StrLen nEnd, SvPtrarr& rArr ); // lege einen neuen PaM an der Position an - static SwPaM* NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx, - BOOL bNodesArray = TRUE ); + static SwPaM* NewSwPaM( SwDoc & rDoc, sal_uLong nStartIdx, sal_uLong nEndIdx, + sal_Bool bNodesArray = sal_True ); // kopiere ggfs. eine lokale Datei ins Internet - BOOL CopyLocalFileToINet( String& rFileNm ); + sal_Bool CopyLocalFileToINet( String& rFileNm ); // Stream-spezifische Routinen, im Storage-Writer NICHT VERWENDEN! // Optimierung der Ausgabe auf den Stream. SvStream& OutLong( SvStream& rStrm, long nVal ); - SvStream& OutULong( SvStream& rStrm, ULONG nVal ); + SvStream& OutULong( SvStream& rStrm, sal_uLong nVal ); // Hex-Zahl ausgeben, default ist 2.stellige Zahl - SvStream& OutHex( SvStream& rStrm, ULONG nHex, BYTE nLen = 2 ); + SvStream& OutHex( SvStream& rStrm, sal_uLong nHex, sal_uInt8 nLen = 2 ); // 4-st. Hex-Zahl ausgeben - inline SvStream& OutHex4( SvStream& rStrm, USHORT nHex ) + inline SvStream& OutHex4( SvStream& rStrm, sal_uInt16 nHex ) { return OutHex( rStrm, nHex, 4 ); } - inline SvStream& OutHex( USHORT nHex, BYTE nLen = 2 ) { return OutHex( Strm(), nHex, nLen ); } - inline SvStream& OutHex4( USHORT nHex ) { return OutHex( Strm(), nHex, 4 ); } + inline SvStream& OutHex( sal_uInt16 nHex, sal_uInt8 nLen = 2 ) { return OutHex( Strm(), nHex, nLen ); } + inline SvStream& OutHex4( sal_uInt16 nHex ) { return OutHex( Strm(), nHex, 4 ); } inline SvStream& OutLong( long nVal ) { return OutLong( Strm(), nVal ); } - inline SvStream& OutULong( ULONG nVal ) { return OutULong( Strm(), nVal ); } + inline SvStream& OutULong( sal_uLong nVal ) { return OutULong( Strm(), nVal ); } void SetStream(SvStream *const pStream); SvStream& Strm(); - void SetOrganizerMode( BOOL bSet ) { bOrganizerMode = bSet; } + void SetOrganizerMode( sal_Bool bSet ) { bOrganizerMode = bSet; } }; #ifndef SW_DECL_WRITER_DEFINED @@ -560,19 +560,19 @@ protected: com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; // Fehler beim Aufruf erzeugen - virtual ULONG WriteStream(); - virtual ULONG WriteStorage() = 0; - virtual ULONG WriteMedium( SfxMedium& ) = 0; + virtual sal_uLong WriteStream(); + virtual sal_uLong WriteStorage() = 0; + virtual sal_uLong WriteMedium( SfxMedium& ) = 0; using Writer::Write; public: StgWriter() : Writer() {} - virtual BOOL IsStgWriter() const; + virtual sal_Bool IsStgWriter() const; - virtual ULONG Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); - virtual ULONG Write( SwPaM&, SotStorage&, const String* = 0 ); + virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); + virtual sal_uLong Write( SwPaM&, SotStorage&, const String* = 0 ); SotStorage& GetStorage() const { return *pStg; } }; @@ -580,15 +580,15 @@ public: /*class Sw3Writer : public StgWriter { Sw3Io* pIO; - BOOL bSaveAs : 1; + sal_Bool bSaveAs : 1; - virtual ULONG WriteStorage(); - virtual ULONG WriteMedium( SfxMedium& ); + virtual sal_uLong WriteStorage(); + virtual sal_uLong WriteMedium( SfxMedium& ); public: - Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {} + Sw3Writer() : pIO( 0 ), bSaveAs( sal_False ) {} - virtual BOOL IsSw3Writer() const; + virtual sal_Bool IsSw3Writer() const; }; */ @@ -609,22 +609,22 @@ class SwWriter //String sBaseURL; - BOOL bWriteAll; + sal_Bool bWriteAll; public: - ULONG Write( WriterRef& rxWriter, const String* = 0); + sal_uLong Write( WriterRef& rxWriter, const String* = 0); - SwWriter( SvStream&, SwCrsrShell &,BOOL bWriteAll = FALSE ); + SwWriter( SvStream&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); SwWriter( SvStream&, SwDoc & ); - SwWriter( SvStream&, SwPaM &, BOOL bWriteAll = FALSE ); + SwWriter( SvStream&, SwPaM &, sal_Bool bWriteAll = sal_False ); -// SwWriter( SotStorage&, SwCrsrShell &,BOOL bWriteAll = FALSE ); +// SwWriter( SotStorage&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& ); -// SwWriter( SotStorage&, SwPaM&, BOOL bWriteAll = FALSE ); +// SwWriter( SotStorage&, SwPaM&, sal_Bool bWriteAll = sal_False ); - SwWriter( SfxMedium&, SwCrsrShell &,BOOL bWriteAll = FALSE ); + SwWriter( SfxMedium&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); SwWriter( SfxMedium&, SwDoc & ); -// SwWriter( SfxMedium&, SwPaM&, BOOL bWriteAll = FALSE ); +// SwWriter( SfxMedium&, SwPaM&, sal_Bool bWriteAll = sal_False ); //const String& GetBaseURL() const { return sBaseURL;} }; @@ -635,17 +635,17 @@ public: typedef Reader* (*FnGetReader)(); typedef void (*FnGetWriter)(const String&, const String& rBaseURL, WriterRef&); -ULONG SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, BOOL, const String& ); -ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); +sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, sal_Bool, const String& ); +sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); struct SwReaderWriterEntry { Reader* pReader; FnGetReader fnGetReader; FnGetWriter fnGetWriter; - BOOL bDelReader; + sal_Bool bDelReader; - SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, BOOL bDel ) + SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, sal_Bool bDel ) : pReader( NULL ), fnGetReader( fnReader ), fnGetWriter( fnWriter ), bDelReader( bDel ) {} diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 3875c5b1c15e..02f9742016ad 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -95,8 +95,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource // returns for the specific filter the new names of pagedescs // This method is for the old code of the specific filters with // now localized names - String GetPageDescName( USHORT nNo, BOOL bFirst = FALSE, - BOOL bFollow = FALSE ); + String GetPageDescName( sal_uInt16 nNo, sal_Bool bFirst = sal_False, + sal_Bool bFollow = sal_False ); ShellResource(); ~ShellResource(); diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 0e15f3758dd6..dbb58486f879 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -41,13 +41,13 @@ enum SwSortDirection { SRT_COLUMNS, SRT_ROWS }; struct SW_DLLPUBLIC SwSortKey { SwSortKey(); - SwSortKey( USHORT nId, const String& rSrtType, SwSortOrder eOrder ); + SwSortKey( sal_uInt16 nId, const String& rSrtType, SwSortOrder eOrder ); SwSortKey( const SwSortKey& rOld ); String sSortType; SwSortOrder eSortOrder; - USHORT nColumnId; - BOOL bIsNumeric; + sal_uInt16 nColumnId; + sal_Bool bIsNumeric; }; SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3, 1) @@ -61,9 +61,9 @@ struct SW_DLLPUBLIC SwSortOptions SwSortKeys aKeys; SwSortDirection eDirection; sal_Unicode cDeli; - USHORT nLanguage; - BOOL bTable; - BOOL bIgnoreCase; + sal_uInt16 nLanguage; + sal_Bool bTable; + sal_Bool bIgnoreCase; }; #endif // _SORTOPT_HXX diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 351d3bdf76f4..2768cc50bc82 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -117,14 +117,14 @@ class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg public: //from class SalFrame virtual void SetWindowState( const ByteString& rStr ) = 0; - virtual ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const = 0; + virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog //add for SwInsFootNoteDlg { public: virtual String GetFontName() = 0; - virtual BOOL IsEndNote() = 0; + virtual sal_Bool IsEndNote() = 0; virtual String GetStr() = 0; //from class Window virtual void SetHelpId( const rtl::OString& sHelpId ) = 0; @@ -135,14 +135,14 @@ class AbstractInsertGrfRulerDlg : public VclAbstractDialog //add for SwInsertGr { public: virtual String GetGraphicName() = 0; - virtual BOOL IsSimpleLine() = 0; - virtual BOOL HasImages() const = 0; + virtual sal_Bool IsSimpleLine() = 0; + virtual sal_Bool HasImages() const = 0; }; class AbstractInsTableDlg : public VclAbstractDialog //add for SwInsTableDlg { public: - virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol, + virtual void GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName, SwTableAutoFmt *& prTAFmt ) = 0; }; @@ -152,15 +152,15 @@ class AbstractJavaEditDialog : public VclAbstractDialog //add for SwJavaEditDia public: virtual String GetText() = 0; virtual String GetType() = 0; - virtual BOOL IsUrl() = 0; - virtual BOOL IsNew() = 0; - virtual BOOL IsUpdate() = 0; + virtual sal_Bool IsUrl() = 0; + virtual sal_Bool IsNew() = 0; + virtual sal_Bool IsUpdate() = 0; }; class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg { public: - virtual USHORT GetMergeType() = 0; + virtual sal_uInt16 GetMergeType() = 0; virtual const ::rtl::OUString& GetSaveFilter() const = 0; virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0; @@ -168,12 +168,12 @@ public: class AbstractMailMergeCreateFromDlg : public VclAbstractDialog //add for SwMailMergeCreateFromDlg { public: - virtual BOOL IsThisDocument() const = 0; + virtual sal_Bool IsThisDocument() const = 0; }; class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog //add for SwMailMergeFieldConnectionsDlg { public: - virtual BOOL IsUseExistingConnections() const = 0; + virtual sal_Bool IsUseExistingConnections() const = 0; }; class AbstractMultiTOXTabDialog : public VclAbstractDialog //add for SwMultiTOXTabDialog @@ -206,8 +206,8 @@ public: class AbstractSwInsertAbstractDlg : public VclAbstractDialog // add for SwInsertAbstractDlg { public: - virtual BYTE GetLevel() const = 0; - virtual BYTE GetPara() const = 0; + virtual sal_uInt8 GetLevel() const = 0; + virtual sal_uInt8 GetPara() const = 0; }; class AbstractSwAsciiFilterDlg : public VclAbstractDialog // add for SwAsciiFilterDlg @@ -221,8 +221,8 @@ class AbstractSwBreakDlg : public VclAbstractDialog // add for SwBreakDlg { public: virtual String GetTemplateName() = 0; - virtual USHORT GetKind() = 0; - virtual USHORT GetPageNumber() = 0; + virtual sal_uInt16 GetKind() = 0; + virtual sal_uInt16 GetPageNumber() = 0; }; @@ -253,7 +253,7 @@ public: class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog { public: - virtual ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow + virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow virtual void SetWindowState( const ByteString& rStr ) =0;//this method inherit from SystemWindow }; @@ -268,15 +268,15 @@ class AbstarctSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossar { public: virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0; // inline - virtual USHORT GetSelectedIdx() const = 0; // inline - virtual void SelectEntryPos(USHORT nIdx) = 0; // inline + virtual sal_uInt16 GetSelectedIdx() const = 0; // inline + virtual void SelectEntryPos(sal_uInt16 nIdx) = 0; // inline }; class AbstractSwSplitTableDlg :public VclAbstractDialog //add for SwSplitTableDlg { public: - virtual BOOL IsHorizontal() const = 0; - virtual BOOL IsProportional() const = 0; + virtual sal_Bool IsHorizontal() const = 0; + virtual sal_Bool IsProportional() const = 0; virtual long GetCount() const = 0; }; @@ -289,11 +289,11 @@ public: class AbstractSwFldDlg : public SfxAbstractTabDialog //add for SwFldDlg { public: - virtual void Start( BOOL bShow = TRUE ) = 0; //this method from sfxtabdialog + virtual void Start( sal_Bool bShow = sal_True ) = 0; //this method from sfxtabdialog virtual void Initialize(SfxChildWinInfo *pInfo) = 0; virtual void ReInitDlg() = 0; virtual void ActivateDatabasePage() = 0; - virtual void ShowPage( USHORT nId ) = 0;// this method from SfxTabDialog + virtual void ShowPage( sal_uInt16 nId ) = 0;// this method from SfxTabDialog virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer }; @@ -309,7 +309,7 @@ public: class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg { public: - virtual void AcceptAll( BOOL bAccept ) = 0; + virtual void AcceptAll( sal_Bool bAccept ) = 0; }; class AbstractMarkFloatDlg : public VclAbstractDialog //add for SwIndexMarkFloatDlg & SwAuthMarkFloatDlg @@ -333,7 +333,7 @@ class AbstractMailMergeWizard : public VclAbstractDialog2 public: virtual void SetReloadDocument(const String& rURL) = 0; virtual const String& GetReloadDocument() const = 0; - virtual BOOL ShowPage( USHORT nLevel ) = 0; + virtual sal_Bool ShowPage( sal_uInt16 nLevel ) = 0; virtual sal_uInt16 GetRestartPage() const = 0; }; @@ -358,7 +358,7 @@ public: virtual AbstractSwBreakDlg * CreateSwBreakDlg( Window *pParent, SwWrtShell &rSh,int nResId ) = 0; // add for SwBreakDlg virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ) = 0; //add for SwChangeDBDlg virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg - const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE) = 0; + const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg ( SwView& rView , int nResId, bool bToTable) = 0; //add for SwConvertTableDlg virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog @@ -369,23 +369,23 @@ public: virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg( Window *pParent, SwWrtShell &rSh,int nResId) = 0;//add for SwFootNoteOptionDlg virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog ( Window *pParent, SwWrtShell &rSh, //add for DropDownFieldDialog - SwField* pField,int nResId, BOOL bNextButton = FALSE ) = 0; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ) = 0; //add for SwEnvDlg + SwField* pField,int nResId, sal_Bool bNextButton = sal_False ) = 0; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int nResId ) = 0; //add for SwEnvDlg virtual AbstarctSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg - SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId ) = 0; + SwNewDBMgr* pNewDBMgr, sal_Bool bLabel,int nResId ) = 0; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg SwView& rVw, const SfxItemSet& rCoreSet, - BYTE nDialogMode, + sal_uInt8 nDialogMode, int nResId, const String *pCollName = 0, - BOOL bDraw = FALSE, - UINT16 nDefPage = 0) = 0; + sal_Bool bDraw = sal_False, + sal_uInt16 nDefPage = 0) = 0; virtual AbstarctSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ) = 0; //add for SwSelGlossaryDlg @@ -394,10 +394,10 @@ public: virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg int nResId, - BOOL bSetAutoFmt = TRUE, + sal_Bool bSetAutoFmt = sal_True, const SwTableAutoFmt* pSelFmt = 0 ) = 0; - virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, USHORT nType, int nResId ) = 0;//add for SwBorderDlg - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) = 0; //add for SwWrapDlg + virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0;//add for SwBorderDlg + virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg virtual VclAbstractDialog * CreateSwTableWidthDlg ( Window *pParent, SwTableFUNC &rFnc , int nResId ) = 0; //add for SwTableWidthDlg virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool, @@ -410,33 +410,33 @@ public: STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ) = 0; virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ) = 0; //add for SwModalRedlineAcceptDlg - virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, BOOL& rWithPrev ) = 0; //add for SwMergeTblDlg + virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm = TRUE, - USHORT nResType = DLG_FRM_STD, - BOOL bFmt = FALSE, - UINT16 nDefPage = 0, + sal_Bool bNewFrm = sal_True, + sal_uInt16 nResType = DLG_FRM_STD, + sal_Bool bFmt = sal_False, + sal_uInt16 nDefPage = 0, const String* pFmtStr = 0) = 0; //add for SwFrmDlg virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId, Window* pParent, SfxStyleSheetBase& rBase, - USHORT nRegion, - BOOL bColumn = FALSE, + sal_uInt16 nRegion, + sal_Bool bColumn = sal_False, SwWrtShell* pActShell = 0, - BOOL bNew = FALSE ) = 0; //add for SwTemplateDlg + sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId, SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId, Window *pParent, SwWrtShell &rSh, - SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg + SwField* pField, sal_Bool bNextButton = sal_False ) = 0; //add for SwFldInputDlg virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId, - Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg + Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId, - SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg + SwView& rView, sal_Bool bCol = sal_False ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId, Window * pParent ) = 0; //add for SwInsertGrfRulerDlg virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId, @@ -463,8 +463,8 @@ public: virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, - SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX, - BOOL bGlobal = FALSE) = 0; //add for SwMultiTOXTabDialog + SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, + sal_Bool bGlobal = sal_False) = 0; //add for SwMultiTOXTabDialog virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId, Window* pParent, SwWrtShell& rWrtSh ) = 0; //add for SwEditRegionDlg virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId, @@ -487,12 +487,12 @@ public: virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0; //add for static func in SwGlossaryDlg - virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId ) = 0; - virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId ) = 0; + virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( sal_uInt16 nId ) = 0; + virtual GlossarySetActGroup SetGlossaryActGroupFunc( sal_uInt16 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/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index aed3597b2478..c83bc740ea0a 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -40,11 +40,11 @@ protected: // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen // koennen aus der Wortliste herausgeholt werden!) // rShort ist der Stream-Name - gecryptet! - virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& , const String& rFileName, const String& rShort, String& rLong ); + virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& , const String& rFileName, const String& rShort, String& rLong ); // - Text mit Attributierung (kann nur der SWG - SWG-Format!) // rShort ist der Stream-Name - gecryptet! - virtual BOOL PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFileName, const String& rShort, SfxObjectShell& , + virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFileName, const String& rShort, SfxObjectShell& , String& ); public: diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index c64307845d6f..cc2f1532a6fc 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -146,14 +146,14 @@ class SwAttrPool : public SfxItemPool { friend void _InitCore(); // fuers anlegen/zerstoeren der friend void _FinitCore(); // Versionsmaps - static USHORT* pVersionMap1; - static USHORT* pVersionMap2; - static USHORT* pVersionMap3; - static USHORT* pVersionMap4; + static sal_uInt16* pVersionMap1; + static sal_uInt16* pVersionMap2; + static sal_uInt16* pVersionMap3; + static sal_uInt16* pVersionMap4; // OD 2004-01-21 #i18732# - due to extension of attribute set a new version // map for binary filter is necessary (version map 5). - static USHORT* pVersionMap5; - static USHORT* pVersionMap6; + static sal_uInt16* pVersionMap5; + static sal_uInt16* pVersionMap6; SwDoc* pDoc; @@ -166,10 +166,10 @@ public: SwDoc* GetDoc() { return pDoc; } const SwDoc* GetDoc() const { return pDoc; } - static USHORT* GetVersionMap1() { return pVersionMap1; } - static USHORT* GetVersionMap2() { return pVersionMap2; } - static USHORT* GetVersionMap3() { return pVersionMap3; } - static USHORT* GetVersionMap6() { return pVersionMap4; } + static sal_uInt16* GetVersionMap1() { return pVersionMap1; } + static sal_uInt16* GetVersionMap2() { return pVersionMap2; } + static sal_uInt16* GetVersionMap3() { return pVersionMap3; } + static sal_uInt16* GetVersionMap6() { return pVersionMap4; } }; @@ -183,18 +183,18 @@ class SW_DLLPUBLIC SwAttrSet : public SfxItemSet void PutChgd( const SfxPoolItem& rI ) { SfxItemSet::PutDirect( rI ); } public: - SwAttrSet( SwAttrPool&, USHORT nWhich1, USHORT nWhich2 ); - SwAttrSet( SwAttrPool&, const USHORT* nWhichPairTable ); + SwAttrSet( SwAttrPool&, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); + SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable ); SwAttrSet( const SwAttrSet& ); - virtual SfxItemSet* Clone(BOOL bItems = TRUE, SfxItemPool *pToPool = 0) const; + virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const; int Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew ); int Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); // ein Item oder einen Bereich loeschen - USHORT ClearItem_BC( USHORT nWhich, SwAttrSet* pOld, SwAttrSet* pNew ); - USHORT ClearItem_BC( USHORT nWhich1, USHORT nWhich2, + sal_uInt16 ClearItem_BC( sal_uInt16 nWhich, SwAttrSet* pOld, SwAttrSet* pNew ); + sal_uInt16 ClearItem_BC( sal_uInt16 nWhich1, sal_uInt16 nWhich2, SwAttrSet* pOld = 0, SwAttrSet* pNew = 0 ); int Intersect_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); @@ -221,127 +221,127 @@ public: const SwDoc *GetDoc() const { return GetPool()->GetDoc(); } SwDoc *GetDoc() { return GetPool()->GetDoc(); } - // GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in + // GetMethoden: das Bool gibt an, ob nur im Set (sal_False) oder auch in // den Parents gesucht werden soll. Wird nichts gefunden, // wird das deflt. Attribut returnt. // Charakter-Attribute - impl. steht im charatr.hxx // AMA 12.10.94: Umstellung von SwFmt... auf Svx... - inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const; - inline const SvxShadowedItem &GetShadowed( BOOL = TRUE ) const; - inline const SvxAutoKernItem &GetAutoKern( BOOL = TRUE ) const; - inline const SvxWordLineModeItem &GetWordLineMode( BOOL = TRUE ) const; - inline const SvxContourItem &GetContour( BOOL = TRUE ) const; - inline const SvxKerningItem &GetKerning( BOOL = TRUE ) const; - inline const SvxUnderlineItem &GetUnderline( BOOL = TRUE ) const; - inline const SvxOverlineItem &GetOverline( BOOL = TRUE ) const; - inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const; - inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const; - inline const SvxFontItem &GetFont( BOOL = TRUE ) const; - inline const SvxColorItem &GetColor( BOOL = TRUE ) const; - inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const; - inline const SvxEscapementItem &GetEscapement( BOOL = TRUE ) const; - inline const SvxCaseMapItem &GetCaseMap( BOOL = TRUE ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( BOOL = TRUE ) const; - inline const SvxBlinkItem &GetBlink( BOOL = TRUE ) const; - inline const SvxBrushItem &GetChrBackground( BOOL = TRUE ) const; - inline const SvxFontItem &GetCJKFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCJKSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCJKLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCJKPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCJKWeight( BOOL = TRUE ) const; - inline const SvxFontItem &GetCTLFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCTLSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCTLLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCTLPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCTLWeight( BOOL = TRUE ) const; - inline const SfxBoolItem &GetWritingDirection( BOOL = TRUE ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const; - inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const; - inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const; - inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const; - inline const SvxCharHiddenItem &GetCharHidden( BOOL = TRUE ) const; + inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const; + inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const; + inline const SvxAutoKernItem &GetAutoKern( sal_Bool = sal_True ) const; + inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const; + inline const SvxContourItem &GetContour( sal_Bool = sal_True ) const; + inline const SvxKerningItem &GetKerning( sal_Bool = sal_True ) const; + inline const SvxUnderlineItem &GetUnderline( sal_Bool = sal_True ) const; + inline const SvxOverlineItem &GetOverline( sal_Bool = sal_True ) const; + inline const SvxCrossedOutItem &GetCrossedOut( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetSize( sal_Bool = sal_True ) const; + inline const SvxPropSizeItem &GetPropSize( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetFont( sal_Bool = sal_True ) const; + inline const SvxColorItem &GetColor( sal_Bool = sal_True ) const; + inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetLanguage( sal_Bool = sal_True ) const; + inline const SvxEscapementItem &GetEscapement( sal_Bool = sal_True ) const; + inline const SvxCaseMapItem &GetCaseMap( sal_Bool = sal_True ) const; + inline const SvxNoHyphenItem &GetNoHyphenHere( sal_Bool = sal_True ) const; + inline const SvxBlinkItem &GetBlink( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetChrBackground( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetCJKFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCJKSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCJKLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCJKPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCJKWeight( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetCTLFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCTLSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCTLLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCTLPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCTLWeight( sal_Bool = sal_True ) const; + inline const SfxBoolItem &GetWritingDirection( sal_Bool = sal_True ) const; + inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const; + inline const SvxTwoLinesItem &Get2Lines( sal_Bool = sal_True ) const; + inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const; + inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; + inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; + inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; // Frame-Attribute - impl. steht im frmatr.hxx - inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - inline const SvxBoxItem &GetBox( BOOL = TRUE ) const; - inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - inline const SwFmtCol &GetCol( BOOL = TRUE ) const; - inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - inline const SwFmtURL &GetURL( BOOL = TRUE ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; - inline const SwFmtRowSplit &GetRowSplit( BOOL = TRUE ) const; - inline const SwFmtChain &GetChain( BOOL = TRUE ) const; - inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; - inline const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const; - inline const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const; - inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const; + inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; + inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const; + inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const; + inline const SvxLRSpaceItem &GetLRSpace( sal_Bool = sal_True ) const; + inline const SvxULSpaceItem &GetULSpace( sal_Bool = sal_True ) const; + inline const SwFmtCntnt &GetCntnt( sal_Bool = sal_True ) const; + inline const SwFmtHeader &GetHeader( sal_Bool = sal_True ) const; + inline const SwFmtFooter &GetFooter( sal_Bool = sal_True ) const; + inline const SvxPrintItem &GetPrint( sal_Bool = sal_True ) const; + inline const SvxOpaqueItem &GetOpaque( sal_Bool = sal_True ) const; + inline const SvxProtectItem &GetProtect( sal_Bool = sal_True ) const; + inline const SwFmtSurround &GetSurround( sal_Bool = sal_True ) const; + inline const SwFmtVertOrient &GetVertOrient( sal_Bool = sal_True ) const; + inline const SwFmtHoriOrient &GetHoriOrient( sal_Bool = sal_True ) const; + inline const SwFmtAnchor &GetAnchor( sal_Bool = sal_True ) const; + inline const SvxBoxItem &GetBox( sal_Bool = sal_True ) const; + inline const SvxFmtKeepItem &GetKeep( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetBackground( sal_Bool = sal_True ) const; + inline const SvxShadowItem &GetShadow( sal_Bool = sal_True ) const; + inline const SwFmtPageDesc &GetPageDesc( sal_Bool = sal_True ) const; + inline const SvxFmtBreakItem &GetBreak( sal_Bool = sal_True ) const; + inline const SwFmtCol &GetCol( sal_Bool = sal_True ) const; + inline const SvxMacroItem &GetMacro( sal_Bool = sal_True ) const; + inline const SwFmtURL &GetURL( sal_Bool = sal_True ) const; + inline const SwFmtEditInReadonly &GetEditInReadonly( sal_Bool = sal_True ) const; + inline const SwFmtLayoutSplit &GetLayoutSplit( sal_Bool = sal_True ) const; + inline const SwFmtRowSplit &GetRowSplit( sal_Bool = sal_True ) const; + inline const SwFmtChain &GetChain( sal_Bool = sal_True ) const; + inline const SwFmtLineNumber &GetLineNumber( sal_Bool = sal_True ) const; + inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const; + inline const SvxFrameDirectionItem &GetFrmDir( sal_Bool = sal_True ) const; + inline const SwTextGridItem &GetTextGrid( sal_Bool = sal_True ) const; + inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const; // OD 18.09.2003 #i18732# - inline const SwFmtFollowTextFlow &GetFollowTextFlow(BOOL = TRUE) const; + inline const SwFmtFollowTextFlow &GetFollowTextFlow(sal_Bool = sal_True) const; // OD 2004-05-05 #i28701# - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const; + inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const; // Grafik-Attribute - impl. steht im grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; - inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const; - inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const; - inline const SwContrastGrf &GetContrastGrf(BOOL = TRUE ) const; - inline const SwChannelRGrf &GetChannelRGrf(BOOL = TRUE ) const; - inline const SwChannelGGrf &GetChannelGGrf(BOOL = TRUE ) const; - inline const SwChannelBGrf &GetChannelBGrf(BOOL = TRUE ) const; - inline const SwGammaGrf &GetGammaGrf(BOOL = TRUE ) const; - inline const SwInvertGrf &GetInvertGrf(BOOL = TRUE ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(BOOL = TRUE ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(BOOL = TRUE ) const; + inline const SwMirrorGrf &GetMirrorGrf( sal_Bool = sal_True ) const; + inline const SwCropGrf &GetCropGrf( sal_Bool = sal_True ) const; + inline const SwRotationGrf &GetRotationGrf(sal_Bool = sal_True ) const; + inline const SwLuminanceGrf &GetLuminanceGrf(sal_Bool = sal_True ) const; + inline const SwContrastGrf &GetContrastGrf(sal_Bool = sal_True ) const; + inline const SwChannelRGrf &GetChannelRGrf(sal_Bool = sal_True ) const; + inline const SwChannelGGrf &GetChannelGGrf(sal_Bool = sal_True ) const; + inline const SwChannelBGrf &GetChannelBGrf(sal_Bool = sal_True ) const; + inline const SwGammaGrf &GetGammaGrf(sal_Bool = sal_True ) const; + inline const SwInvertGrf &GetInvertGrf(sal_Bool = sal_True ) const; + inline const SwTransparencyGrf &GetTransparencyGrf(sal_Bool = sal_True ) const; + inline const SwDrawModeGrf &GetDrawModeGrf(sal_Bool = sal_True ) const; // Paragraph-Attribute - impl. steht im paratr.hxx - inline const SvxLineSpacingItem &GetLineSpacing( BOOL = TRUE ) const; - inline const SvxAdjustItem &GetAdjust( BOOL = TRUE ) const; - inline const SvxFmtSplitItem &GetSplit( BOOL = TRUE ) const; - inline const SwRegisterItem &GetRegister( BOOL = TRUE ) const; - inline const SwNumRuleItem &GetNumRule( BOOL = TRUE ) const; - inline const SvxWidowsItem &GetWidows( BOOL = TRUE ) const; - inline const SvxOrphansItem &GetOrphans( BOOL = TRUE ) const; - inline const SvxTabStopItem &GetTabStops( BOOL = TRUE ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( BOOL = TRUE ) const; - inline const SwFmtDrop &GetDrop( BOOL = TRUE ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(BOOL = TRUE) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(BOOL = TRUE) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const; - inline const SvxParaGridItem &GetParaGrid(BOOL = TRUE) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const; + inline const SvxLineSpacingItem &GetLineSpacing( sal_Bool = sal_True ) const; + inline const SvxAdjustItem &GetAdjust( sal_Bool = sal_True ) const; + inline const SvxFmtSplitItem &GetSplit( sal_Bool = sal_True ) const; + inline const SwRegisterItem &GetRegister( sal_Bool = sal_True ) const; + inline const SwNumRuleItem &GetNumRule( sal_Bool = sal_True ) const; + inline const SvxWidowsItem &GetWidows( sal_Bool = sal_True ) const; + inline const SvxOrphansItem &GetOrphans( sal_Bool = sal_True ) const; + inline const SvxTabStopItem &GetTabStops( sal_Bool = sal_True ) const; + inline const SvxHyphenZoneItem &GetHyphenZone( sal_Bool = sal_True ) const; + inline const SwFmtDrop &GetDrop( sal_Bool = sal_True ) const; + inline const SvxScriptSpaceItem &GetScriptSpace(sal_Bool = sal_True) const; + inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const; + inline const SvxForbiddenRuleItem &GetForbiddenRule(sal_Bool = sal_True) const; + inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const; + inline const SvxParaGridItem &GetParaGrid(sal_Bool = sal_True) const; + inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const; // TabellenBox-Attribute - impl. steht im cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; - inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; + inline const SwTblBoxNumFormat &GetTblBoxNumFmt( sal_Bool = sal_True ) const; + inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; + inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet) }; diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index de70c0a250f0..46fbb36df723 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -39,27 +39,27 @@ class SwBaseLink : public ::sfx2::SvBaseLink friend long GrfNodeChanged( void* pLink, void* pCaller ); SwCntntNode* pCntntNode; - BOOL bSwapIn : 1; - BOOL bNoDataFlag : 1; - BOOL bIgnoreDataChanged : 1; + sal_Bool bSwapIn : 1; + sal_Bool bNoDataFlag : 1; + sal_Bool bIgnoreDataChanged : 1; ReReadThread* m_pReReadThread; protected: SwBaseLink(): m_pReReadThread(0) {} - SwBaseLink( const String& rNm, USHORT nObjectType, ::sfx2::SvLinkSource* pObj, + SwBaseLink( const String& rNm, sal_uInt16 nObjectType, ::sfx2::SvLinkSource* pObj, SwCntntNode* pNode = 0 ) : ::sfx2::SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ), - bSwapIn( FALSE ), bNoDataFlag( FALSE ), bIgnoreDataChanged( FALSE ), + bSwapIn( sal_False ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ), m_pReReadThread(0) {} public: TYPEINFO(); - SwBaseLink( USHORT nMode, USHORT nFormat, SwCntntNode* pNode = 0 ) + SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 ) : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ), - bSwapIn( FALSE ), bNoDataFlag( FALSE ), bIgnoreDataChanged( FALSE ), + bSwapIn( sal_False ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ), m_pReReadThread(0) {} virtual ~SwBaseLink(); @@ -74,20 +74,20 @@ public: SwCntntNode *GetCntntNode() { return pCntntNode; } // nur fuer Grafiken - BOOL SwapIn( BOOL bWaitForData = FALSE, BOOL bNativFormat = FALSE ); + sal_Bool SwapIn( sal_Bool bWaitForData = sal_False, sal_Bool bNativFormat = sal_False ); - BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); } // nur fuer Grafik-Links ( zum Umschalten zwischen DDE / Grf-Link) - void SetObjType( USHORT nType ) { SvBaseLink::SetObjType( nType ); } + void SetObjType( sal_uInt16 nType ) { SvBaseLink::SetObjType( nType ); } - BOOL IsRecursion( const SwBaseLink* pChkLnk ) const; - virtual BOOL IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt = 0, + sal_Bool IsRecursion( const SwBaseLink* pChkLnk ) const; + virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, xub_StrLen nStt = 0, xub_StrLen nEnd = STRING_NOTFOUND ) const; - void SetNoDataFlag() { bNoDataFlag = TRUE; } - BOOL ChkNoDataFlag() { BOOL bRet = bNoDataFlag; bNoDataFlag = FALSE; return bRet; } - BOOL IsNoDataFlag() const { return bNoDataFlag; } + void SetNoDataFlag() { bNoDataFlag = sal_True; } + sal_Bool ChkNoDataFlag() { sal_Bool bRet = bNoDataFlag; bNoDataFlag = sal_False; return bRet; } + sal_Bool IsNoDataFlag() const { return bNoDataFlag; } }; diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index 1f0e9c7a8348..f7def58ab211 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -36,7 +36,7 @@ class SwCalendarWrapper : public CalendarWrapper { String sUniqueId; - USHORT nLang; + sal_uInt16 nLang; public: SwCalendarWrapper( const ::com::sun::star::uno::Reference< @@ -44,7 +44,7 @@ public: : CalendarWrapper( xMSF ), nLang( LANGUAGE_SYSTEM ) {} - void LoadDefaultCalendar( USHORT nLang ); + void LoadDefaultCalendar( sal_uInt16 nLang ); }; diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index 113a63cc6d7c..86a42512475f 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -39,8 +39,8 @@ class SwEditWin; class SwOleClient : public SfxInPlaceClient { - BOOL bInDoVerb; - BOOL bOldCheckForOLEInCaption; + sal_Bool bInDoVerb; + sal_Bool bOldCheckForOLEInCaption; virtual void ObjectAreaChanged(); virtual void RequestNewObjectArea( Rectangle& ); @@ -50,9 +50,9 @@ class SwOleClient : public SfxInPlaceClient public: SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); - void SetInDoVerb( BOOL bFlag ) { bInDoVerb = bFlag; } + void SetInDoVerb( sal_Bool bFlag ) { bInDoVerb = bFlag; } - BOOL IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } + sal_Bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } virtual void FormatChanged(); }; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 49a95e9b7c41..daa33e4f232a 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -49,11 +49,11 @@ const int FIND_NO_RING = 2; struct SwFindParas { - virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, BOOL ) = 0; + virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, sal_Bool ) = 0; virtual int IsReplaceMode() const = 0; }; -typedef USHORT SwCursorSelOverFlags; +typedef sal_uInt16 SwCursorSelOverFlags; namespace nsSwCursorSelOverFlags { const SwCursorSelOverFlags SELOVER_NONE = 0x00; @@ -69,10 +69,10 @@ class SwCursor : public SwPaM _SwCursor_SavePos* pSavePos; long mnRowSpanOffset; // required for travelling in tabs with rowspans - BYTE nCursorBidiLevel; // bidi level of the cursor + sal_uInt8 nCursorBidiLevel; // bidi level of the cursor bool mbColumnSelection; // true: cursor is aprt of a column selection - ULONG FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, BOOL& bCancel ); + sal_uLong FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, sal_Bool& bCancel ); using SwPaM::Find; @@ -84,7 +84,7 @@ protected: const _SwCursor_SavePos* GetSavePos() const { return pSavePos; } virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - BOOL & io_rbLeft, BOOL bVisualAllowed, BOOL bInsertCrsr); + sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr); virtual void DoSetBidiLevelUpDown(); virtual bool IsSelOvrCheck(int eFlags); @@ -112,45 +112,45 @@ public: SwPaM* ) const; - ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt, - BOOL bSearchInNotes, + sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, + sal_Bool bSearchInNotes, SwDocPositions nStart, SwDocPositions nEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges = FND_IN_BODY, - int bReplace = FALSE ); - ULONG Find( const SwTxtFmtColl& rFmtColl, + int bReplace = sal_False ); + sal_uLong Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart, SwDocPositions nEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges = FND_IN_BODY, const SwTxtFmtColl* pReplFmt = 0 ); - ULONG Find( const SfxItemSet& rSet, BOOL bNoCollections, + sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections, SwDocPositions nStart, SwDocPositions nEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges = FND_IN_BODY, const com::sun::star::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); // UI versions - BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsStartEndSentence( bool bEnd ) const; - BOOL GoStartWord(); - BOOL GoEndWord(); - BOOL GoNextWord(); - BOOL GoPrevWord(); - BOOL SelectWord( const Point* pPt = 0 ); + sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + sal_Bool IsStartEndSentence( bool bEnd ) const; + sal_Bool GoStartWord(); + sal_Bool GoEndWord(); + sal_Bool GoNextWord(); + sal_Bool GoPrevWord(); + sal_Bool SelectWord( const Point* pPt = 0 ); // API versions of above functions (will be used with a different // WordType for the break iterator) - BOOL IsStartWordWT( sal_Int16 nWordType ) const; - BOOL IsEndWordWT( sal_Int16 nWordType ) const; - BOOL IsInWordWT( sal_Int16 nWordType ) const; - BOOL GoStartWordWT( sal_Int16 nWordType ); - BOOL GoEndWordWT( sal_Int16 nWordType ); - BOOL GoNextWordWT( sal_Int16 nWordType ); - BOOL GoPrevWordWT( sal_Int16 nWordType ); - BOOL SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 ); + sal_Bool IsStartWordWT( sal_Int16 nWordType ) const; + sal_Bool IsEndWordWT( sal_Int16 nWordType ) const; + sal_Bool IsInWordWT( sal_Int16 nWordType ) const; + sal_Bool GoStartWordWT( sal_Int16 nWordType ); + sal_Bool GoEndWordWT( sal_Int16 nWordType ); + sal_Bool GoNextWordWT( sal_Int16 nWordType ); + sal_Bool GoPrevWordWT( sal_Int16 nWordType ); + sal_Bool SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 ); enum SentenceMoveType { @@ -159,66 +159,66 @@ public: START_SENT, END_SENT }; - BOOL GoSentence(SentenceMoveType eMoveType); - BOOL GoNextSentence(){return GoSentence(NEXT_SENT);} - BOOL GoEndSentence(){return GoSentence(END_SENT);} - BOOL GoPrevSentence(){return GoSentence(PREV_SENT);} - BOOL GoStartSentence(){return GoSentence(START_SENT);} - BOOL ExpandToSentenceBorders(); - - virtual BOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, - BOOL bAllowVisual, BOOL bSkipHidden, BOOL bInsertCrsr ); - BOOL UpDown( BOOL bUp, USHORT nCnt, Point* pPt, long nUpDownX ); - BOOL LeftRightMargin( BOOL bLeftMargin, BOOL bAPI = FALSE ); - BOOL IsAtLeftRightMargin( BOOL bLeftMargin, BOOL bAPI = FALSE ) const; - BOOL SttEndDoc( BOOL bSttDoc ); - BOOL GoPrevNextCell( BOOL bNext, USHORT nCnt ); - - BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual, BOOL bSkipHidden ) - { return LeftRight( TRUE, nCnt, nMode, bAllowVisual, bSkipHidden, FALSE ); } - BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual, BOOL bSkipHidden ) - { return LeftRight( FALSE, nCnt, nMode, bAllowVisual, bSkipHidden, FALSE ); } - BOOL GoNextCell( USHORT nCnt = 1 ) { return GoPrevNextCell( TRUE, nCnt ); } - BOOL GoPrevCell( USHORT nCnt = 1 ) { return GoPrevNextCell( FALSE, nCnt ); } - virtual BOOL GotoTable( const String& rName ); - BOOL GotoTblBox( const String& rName ); - BOOL GotoRegion( const String& rName ); - BOOL GotoFtnAnchor(); - BOOL GotoFtnTxt(); - BOOL GotoNextFtnAnchor(); - BOOL GotoPrevFtnAnchor(); - BOOL GotoNextFtnCntnt(); - BOOL GotoPrevFtnCntnt(); - - BOOL MovePara( SwWhichPara, SwPosPara ); - BOOL MoveSection( SwWhichSection, SwPosSection ); - BOOL MoveTable( SwWhichTable, SwPosTable ); - BOOL MoveRegion( SwWhichRegion, SwPosRegion ); + sal_Bool GoSentence(SentenceMoveType eMoveType); + sal_Bool GoNextSentence(){return GoSentence(NEXT_SENT);} + sal_Bool GoEndSentence(){return GoSentence(END_SENT);} + sal_Bool GoPrevSentence(){return GoSentence(PREV_SENT);} + sal_Bool GoStartSentence(){return GoSentence(START_SENT);} + sal_Bool ExpandToSentenceBorders(); + + virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, + sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ); + sal_Bool UpDown( sal_Bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX ); + sal_Bool LeftRightMargin( sal_Bool bLeftMargin, sal_Bool bAPI = sal_False ); + sal_Bool IsAtLeftRightMargin( sal_Bool bLeftMargin, sal_Bool bAPI = sal_False ) const; + sal_Bool SttEndDoc( sal_Bool bSttDoc ); + sal_Bool GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt ); + + sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual, sal_Bool bSkipHidden ) + { return LeftRight( sal_True, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); } + sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual, sal_Bool bSkipHidden ) + { return LeftRight( sal_False, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); } + sal_Bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_True, nCnt ); } + sal_Bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_False, nCnt ); } + virtual sal_Bool GotoTable( const String& rName ); + sal_Bool GotoTblBox( const String& rName ); + sal_Bool GotoRegion( const String& rName ); + sal_Bool GotoFtnAnchor(); + sal_Bool GotoFtnTxt(); + sal_Bool GotoNextFtnAnchor(); + sal_Bool GotoPrevFtnAnchor(); + sal_Bool GotoNextFtnCntnt(); + sal_Bool GotoPrevFtnCntnt(); + + sal_Bool MovePara( SwWhichPara, SwPosPara ); + sal_Bool MoveSection( SwWhichSection, SwPosSection ); + sal_Bool MoveTable( SwWhichTable, SwPosTable ); + sal_Bool MoveRegion( SwWhichRegion, SwPosRegion ); // gibt es eine Selection vom Content in die Tabelle // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); - virtual BOOL IsInProtectTable( BOOL bMove = FALSE, - BOOL bChgCrsr = TRUE ); - BOOL IsNoCntnt() const; + virtual sal_Bool IsInProtectTable( sal_Bool bMove = sal_False, + sal_Bool bChgCrsr = sal_True ); + sal_Bool IsNoCntnt() const; void RestoreSavePos(); // Point auf die SavePos setzen - // TRUE: an die Position kann der Cursor gesetzt werden - virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; + // sal_True: an die Position kann der Cursor gesetzt werden + virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; // darf der Cursor in ReadOnlyBereiche? virtual bool IsReadOnlyAvailable() const; - virtual BOOL IsSkipOverProtectSections() const; - virtual BOOL IsSkipOverHiddenSections() const; + virtual sal_Bool IsSkipOverProtectSections() const; + virtual sal_Bool IsSkipOverHiddenSections() const; - BYTE GetCrsrBidiLevel() const { return nCursorBidiLevel; } - void SetCrsrBidiLevel( BYTE nNewLevel ) { nCursorBidiLevel = nNewLevel; } + sal_uInt8 GetCrsrBidiLevel() const { return nCursorBidiLevel; } + void SetCrsrBidiLevel( sal_uInt8 nNewLevel ) { nCursorBidiLevel = nNewLevel; } bool IsColumnSelection() const { return mbColumnSelection; } void SetColumnSelection( bool bNew ) { mbColumnSelection = bNew; } @@ -240,7 +240,7 @@ public: struct _SwCursor_SavePos { - ULONG nNode; + sal_uLong nNode; xub_StrLen nCntnt; _SwCursor_SavePos* pNext; @@ -260,11 +260,11 @@ class SwTableCursor : public virtual SwCursor { protected: - ULONG nTblPtNd, nTblMkNd; + sal_uLong nTblPtNd, nTblMkNd; xub_StrLen nTblPtCnt, nTblMkCnt; SwSelBoxes aSelBoxes; - BOOL bChg : 1; - BOOL bParked : 1; // Tabellen-Cursor wurde geparkt + sal_Bool bChg : 1; + sal_Bool bParked : 1; // Tabellen-Cursor wurde geparkt virtual bool IsSelOvrCheck(int eFlags); @@ -273,25 +273,25 @@ public: SwTableCursor( SwTableCursor& ); virtual ~SwTableCursor(); - virtual BOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, - BOOL bAllowVisual, BOOL bSkipHidden, BOOL bInsertCrsr ); - virtual BOOL GotoTable( const String& rName ); + virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, + sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ); + virtual sal_Bool GotoTable( const String& rName ); void InsertBox( const SwTableBox& rTblBox ); - void DeleteBox( USHORT nPos ) { aSelBoxes.Remove( nPos ); bChg = TRUE; } - USHORT GetBoxesCount() const { return aSelBoxes.Count(); } + void DeleteBox( sal_uInt16 nPos ) { aSelBoxes.Remove( nPos ); bChg = sal_True; } + sal_uInt16 GetBoxesCount() const { return aSelBoxes.Count(); } const SwSelBoxes& GetBoxes() const { return aSelBoxes; } // Baut fuer alle Boxen die Cursor auf SwCursor* MakeBoxSels( SwCursor* pAktCrsr ); // sind irgendwelche Boxen mit einem Schutz versehen? - BOOL HasReadOnlyBoxSel() const; + sal_Bool HasReadOnlyBoxSel() const; // wurde der TabelleCursor veraendert ? Wenn ja speicher gleich // die neuen Werte. - BOOL IsCrsrMovedUpdt(); + sal_Bool IsCrsrMovedUpdt(); // wurde der TabelleCursor veraendert ? - BOOL IsCrsrMoved() const + sal_Bool IsCrsrMoved() const { return nTblMkNd != GetMark()->nNode.GetIndex() || nTblPtNd != GetPoint()->nNode.GetIndex() || @@ -299,7 +299,7 @@ public: nTblPtCnt != GetPoint()->nContent.GetIndex(); } - BOOL IsChgd() const { return bChg; } + sal_Bool IsChgd() const { return bChg; } // Parke den Tabellen-Cursor auf dem StartNode der Boxen. void ParkCrsr(); diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx index d5c50f30dda7..a19cd67e8783 100644 --- a/sw/inc/swdbdata.hxx +++ b/sw/inc/swdbdata.hxx @@ -39,9 +39,9 @@ struct SwDBData SwDBData() : nCommandType(0){} - BOOL operator !=(const SwDBData& rCmp) const + sal_Bool operator !=(const SwDBData& rCmp) const {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand || rCmp.nCommandType != nCommandType;} - BOOL operator ==(const SwDBData& rCmp) const + sal_Bool operator ==(const SwDBData& rCmp) const {return rCmp.sDataSource == sDataSource && rCmp.sCommand == sCommand && rCmp.nCommandType == nCommandType;} }; diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 042654389174..f7e7bb56f97d 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -39,12 +39,12 @@ public: // Constructor movet alle Lines/Boxen aus der SwTable zu sich. // Die SwTable ist danach Leer und muss geloescht werden. SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, - BOOL bUpdate = TRUE ); + sal_Bool bUpdate = sal_True ); ~SwDDETable(); void Modify( SfxPoolItem*, SfxPoolItem* ); void ChangeContent(); - BOOL NoDDETable(); + sal_Bool NoDDETable(); SwDDEFieldType* GetDDEFldType(); inline const SwDDEFieldType* GetDDEFldType() const; diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h index fa7e03f3a381..74755e45b74b 100644 --- a/sw/inc/swerror.h +++ b/sw/inc/swerror.h @@ -95,12 +95,12 @@ #ifndef __RSC -inline FASTBOOL IsWarning( ULONG nErr ) +inline FASTBOOL IsWarning( sal_uLong nErr ) { return 0 != ( nErr & ERRCODE_WARNING_MASK & nErr ); } -inline FASTBOOL IsError( ULONG nErr ) +inline FASTBOOL IsError( sal_uLong nErr ) { return nErr && 0 == ( ERRCODE_WARNING_MASK & nErr ); } diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index 81e599c7464f..4194042d2327 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -121,7 +121,7 @@ struct SwCallMouseEvent void Clear() { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; } - BOOL HasEvent() const { return EVENT_OBJECT_NONE != eType; } + sal_Bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } }; diff --git a/sw/inc/swgstr.hxx b/sw/inc/swgstr.hxx index 50600cf945de..8b65028166a3 100644 --- a/sw/inc/swgstr.hxx +++ b/sw/inc/swgstr.hxx @@ -41,11 +41,11 @@ typedef long long3; // Zur Dokumentation: 3-byte-Longs class swcrypter { protected: sal_Char cPasswd[ PASSWDLEN ]; // Passwort-Puffer - BOOL bPasswd; // TRUE wenn mit Passwort - void encode( sal_Char*, USHORT ); // Puffer codieren/decodieren + sal_Bool bPasswd; // sal_True wenn mit Passwort + void encode( sal_Char*, sal_uInt16 ); // Puffer codieren/decodieren public: swcrypter(); - BOOL setpasswd( const String& ); // Passwort setzen + sal_Bool setpasswd( const String& ); // Passwort setzen void copypasswd( const sal_Char* ); // Passwort direkt setzen const sal_Char* getpasswd() { return cPasswd; } }; @@ -57,10 +57,10 @@ class swstreambase : public swcrypter { protected: SvStream* pStrm; // eigentlicher Stream sal_Char* pBuf; // Zwischenpuffer - USHORT nBuflen; // Laenge des Zwischenpuffers + sal_uInt16 nBuflen; // Laenge des Zwischenpuffers short nLong; // Long-Laenge (3 oder 4) - BOOL bTempStrm; // TRUE: Stream loeschen - void checkbuf( USHORT ); // Testen der Pufferlaenge + sal_Bool bTempStrm; // sal_True: Stream loeschen + void checkbuf( sal_uInt16 ); // Testen der Pufferlaenge swstreambase( SvStream& ); @@ -87,15 +87,15 @@ public: int operator!() { return ( pStrm->GetError() != SVSTREAM_OK ); } int eof() { return pStrm->IsEof(); } - BYTE get(); - void get( void* p, USHORT n ) { pStrm->Read( (sal_Char*) p, n ); } + sal_uInt8 get(); + void get( void* p, sal_uInt16 n ) { pStrm->Read( (sal_Char*) p, n ); } inline swstreambase& operator>>( sal_Char& ); - inline swstreambase& operator>>( BYTE& ); + inline swstreambase& operator>>( sal_uInt8& ); inline swstreambase& operator>>( short& ); - inline swstreambase& operator>>( USHORT& ); + inline swstreambase& operator>>( sal_uInt16& ); swstreambase& operator>>( long& ); - inline swstreambase& operator>>( ULONG& ); + inline swstreambase& operator>>( sal_uLong& ); }; inline swstreambase& swstreambase::operator>>( sal_Char& c ) @@ -103,7 +103,7 @@ inline swstreambase& swstreambase::operator>>( sal_Char& c ) *pStrm >> c; return *this; } -inline swstreambase& swstreambase::operator>>( BYTE& c ) +inline swstreambase& swstreambase::operator>>( sal_uInt8& c ) { *pStrm >> c; return *this; } @@ -113,26 +113,26 @@ inline swstreambase& swstreambase::operator>>( short& c ) *pStrm >> c; return *this; } -inline swstreambase& swstreambase::operator>>( USHORT& c ) +inline swstreambase& swstreambase::operator>>( sal_uInt16& c ) { *pStrm >> c; return *this; } -inline swstreambase& swstreambase::operator>>( ULONG& c ) +inline swstreambase& swstreambase::operator>>( sal_uLong& c ) { return *this >> (long&) c; } class swistream : public swstreambase { - BYTE cType; // Record-Typ - ULONG nOffset; // Record-Offset-Portion + sal_uInt8 cType; // Record-Typ + sal_uLong nOffset; // Record-Offset-Portion public: swistream( SvStream& ); - BYTE peek(); // 1 Byte testen - BYTE next(); // Blockstart - BYTE cur() { return cType; } // aktueller Block - BYTE skipnext(); // Record ueberspringen + sal_uInt8 peek(); // 1 Byte testen + sal_uInt8 next(); // Blockstart + sal_uInt8 cur() { return cType; } // aktueller Block + sal_uInt8 skipnext(); // Record ueberspringen void undonext(); // next() rueckgaengig machen long getskip() { return nOffset; } void skip( long = -1L ); // Block ueberspringen diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index c8e601143877..a2df211cd598 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -161,8 +161,8 @@ public: const SwViewOption* GetViewOption(sal_Bool bWeb); void ApplyUsrPref(const SwViewOption &, SwView*, sal_uInt16 nDest = VIEWOPT_DEST_VIEW ); - void ApplyUserMetric( FieldUnit eMetric, BOOL bWeb ); - void ApplyRulerMetric( FieldUnit eMetric, BOOL bHorizontal, BOOL bWeb ); + void ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb ); + void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bool bWeb ); void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags); void ApplyLinkMode(sal_Int32 nNewLinkMode); @@ -191,7 +191,7 @@ public: sal_Bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; } void SetEmbeddedLoadSave( sal_Bool bFlag ) { bEmbeddedLoadSave = bFlag; } - void ShowDBObj( SwView& rView, const SwDBData& rData, BOOL bOnlyIfAvailable = FALSE); + void ShowDBObj( SwView& rView, const SwDBData& rData, sal_Bool bOnlyIfAvailable = sal_False); // Tabellenmodi sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const; diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index f90bebcbbc7e..1cf85bfd5c42 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -84,18 +84,18 @@ public: SwRect &_Intersection( const SwRect &rRect ); inline SwRect GetIntersection( const SwRect& rRect ) const; - BOOL IsInside( const Point& rPOINT ) const; - BOOL IsNear(const Point& rPoint, long nTolerance ) const; - BOOL IsInside( const SwRect& rRect ) const; - BOOL IsOver( const SwRect& rRect ) const; - inline BOOL HasArea() const; - inline BOOL IsEmpty() const; + sal_Bool IsInside( const Point& rPOINT ) const; + sal_Bool IsNear(const Point& rPoint, long nTolerance ) const; + sal_Bool IsInside( const SwRect& rRect ) const; + sal_Bool IsOver( const SwRect& rRect ) const; + inline sal_Bool HasArea() const; + inline sal_Bool IsEmpty() const; inline void Clear(); inline SwRect &operator = ( const SwRect &rRect ); - inline BOOL operator == ( const SwRect& rRect ) const; - inline BOOL operator != ( const SwRect& rRect ) const; + inline sal_Bool operator == ( const SwRect& rRect ) const; + inline sal_Bool operator != ( const SwRect& rRect ) const; inline SwRect &operator+=( const Point &rPt ); inline SwRect &operator-=( const Point &rPt ); @@ -151,10 +151,10 @@ public: long GetBottomDistance( long ) const; long GetRightDistance( long ) const; long GetTopDistance( long ) const; - BOOL OverStepLeft( long ) const; - BOOL OverStepBottom( long ) const; - BOOL OverStepTop( long ) const; - BOOL OverStepRight( long ) const; + sal_Bool OverStepLeft( long ) const; + sal_Bool OverStepBottom( long ) const; + sal_Bool OverStepTop( long ) const; + sal_Bool OverStepRight( long ) const; }; // Implementation in in swrect.cxx @@ -164,7 +164,7 @@ typedef void (SwRect:: *SwRectSet)( const long nNew ); typedef long (SwRect:: *SwRectGet)() const; typedef const Point (SwRect:: *SwRectPoint)() const; typedef const Size (SwRect:: *SwRectSize)() const; -typedef BOOL (SwRect:: *SwRectMax)( long ) const; +typedef sal_Bool (SwRect:: *SwRectMax)( long ) const; typedef long (SwRect:: *SwRectDist)( long ) const; typedef void (SwRect:: *SwRectSetTwice)( long, long ); typedef void (SwRect:: *SwRectSetPos)( const Point& ); @@ -269,11 +269,11 @@ inline SwRect &SwRect::operator = ( const SwRect &rRect ) m_Size = rRect.m_Size; return *this; } -inline BOOL SwRect::operator == ( const SwRect& rRect ) const +inline sal_Bool SwRect::operator == ( const SwRect& rRect ) const { return (m_Point == rRect.m_Point && m_Size == rRect.m_Size); } -inline BOOL SwRect::operator != ( const SwRect& rRect ) const +inline sal_Bool SwRect::operator != ( const SwRect& rRect ) const { return (m_Point != rRect.m_Point || m_Size != rRect.m_Size); } @@ -317,11 +317,11 @@ inline SwRect SwRect::GetIntersection( const SwRect& rRect ) const return SwRect( *this ).Intersection( rRect ); } -inline BOOL SwRect::HasArea() const +inline sal_Bool SwRect::HasArea() const { return !IsEmpty(); } -inline BOOL SwRect::IsEmpty() const +inline sal_Bool SwRect::IsEmpty() const { return !(m_Size.getHeight() && m_Size.getWidth()); } diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx index e3c7dadf4732..5693622409aa 100644 --- a/sw/inc/swregion.hxx +++ b/sw/inc/swregion.hxx @@ -37,18 +37,18 @@ class SwRegionRects : public SwRects { SwRect aOrigin; // die Kopie des StartRects - inline void InsertRect( const SwRect &rRect, const USHORT nPos, BOOL &rDel); + inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, sal_Bool &rDel); public: - SwRegionRects( const SwRect& rStartRect, USHORT nInit = 20, - USHORT nGrow = 8 ); + SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20, + sal_uInt16 nGrow = 8 ); // Zum Ausstanzen aus aOrigin. void operator-=( const SwRect& rRect ); // Aus Loechern werden Flaechen, aus Flaechen werden Loecher. void Invert(); // Benachbarte Rechtecke zusammenfassen. - void Compress( BOOL bFuzzy = TRUE ); + void Compress( sal_Bool bFuzzy = sal_True ); inline const SwRect &GetOrigin() const { return aOrigin; } inline void ChangeOrigin( const SwRect &rRect ) { aOrigin = rRect; } diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index f5f790ddf9b8..797c57db44d7 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -68,17 +68,17 @@ public: } virtual ~SwServerObject(); - virtual BOOL GetData( ::com::sun::star::uno::Any & rData, + virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData, const String & rMimeType, - BOOL bSynchron = FALSE ); + sal_Bool bSynchron = sal_False ); - BOOL SetData( const String & rMimeType, + sal_Bool SetData( const String & rMimeType, const ::com::sun::star::uno::Any& rData ); virtual void SendDataChanged( const SwPosition& rPos ); virtual void SendDataChanged( const SwPaM& rRange ); - BOOL IsLinkInServer( const SwBaseLink* ) const; + sal_Bool IsLinkInServer( const SwBaseLink* ) const; void SetNoServer(); void SetDdeBookmark( ::sw::mark::IMark& rBookmark); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 1b1316ce37d1..2dd3bfaf7467 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -104,17 +104,17 @@ protected: //SOLL das fuer jede Tabelle einstellbar sein? TblChgMode eTblChgMode; - USHORT nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import + sal_uInt16 nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import // noch ein Resize der Tbl. anstossen - USHORT nRowsToRepeat; // number of rows to repeat on every page + sal_uInt16 nRowsToRepeat; // number of rows to repeat on every page - BOOL bModifyLocked :1; - BOOL bNewModel :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel + sal_Bool bModifyLocked :1; + sal_Bool bNewModel :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel #ifdef DBG_UTIL bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change #endif - BOOL IsModifyLocked(){ return bModifyLocked;} + sal_Bool IsModifyLocked(){ return bModifyLocked;} public: enum SearchType @@ -137,19 +137,19 @@ private: SwTable & operator= (const SwTable &); // no default ctor. SwTable(); - BOOL OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* ); - BOOL OldSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL ); - BOOL NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, + sal_Bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* ); + sal_Bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool ); + sal_Bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, SwTableBox*, SwUndoTblMerge* ); - BOOL NewSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL ); + sal_Bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool ); SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const; - void InsertSpannedRow( SwDoc* pDoc, USHORT nIdx, USHORT nCnt ); - BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind ); - BOOL NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL ); + void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt ); + sal_Bool _InsertRow( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, sal_Bool bBehind ); + sal_Bool NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool ); void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); void AdjustWidths( const long nOld, const long nNew ); void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, BOOL bCurRowOnly ); + const SwTableBox *pStart, sal_Bool bCurRowOnly ); public: @@ -157,18 +157,18 @@ public: const SwHTMLTableLayout *GetHTMLTableLayout() const { return pHTMLLayout; } void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang! - USHORT IncGrfsThatResize() { return ++nGrfsThatResize; } - USHORT DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; } + sal_uInt16 IncGrfsThatResize() { return ++nGrfsThatResize; } + sal_uInt16 DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; } - void LockModify() { bModifyLocked = TRUE; } //Muessen _immer_ paarig - void UnlockModify() { bModifyLocked = FALSE;} //benutzt werden! + void LockModify() { bModifyLocked = sal_True; } //Muessen _immer_ paarig + void UnlockModify() { bModifyLocked = sal_False;} //benutzt werden! - void SetTableModel( BOOL bNew ){ bNewModel = bNew; } - BOOL IsNewModel() const { return bNewModel; } + void SetTableModel( sal_Bool bNew ){ bNewModel = bNew; } + sal_Bool IsNewModel() const { return bNewModel; } - USHORT GetRowsToRepeat() const { return Min( GetTabLines().Count(), nRowsToRepeat ); } - USHORT _GetRowsToRepeat() const { return nRowsToRepeat; } - void SetRowsToRepeat( USHORT nNumOfRows ) { nRowsToRepeat = nNumOfRows; } + sal_uInt16 GetRowsToRepeat() const { return Min( GetTabLines().Count(), nRowsToRepeat ); } + sal_uInt16 _GetRowsToRepeat() const { return nRowsToRepeat; } + void SetRowsToRepeat( sal_uInt16 nNumOfRows ) { nRowsToRepeat = nNumOfRows; } bool IsHeadline( const SwTableLine& rLine ) const; @@ -181,9 +181,9 @@ public: virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, - BOOL bHidden = FALSE, BOOL bCurRowOnly = FALSE ) const; + sal_Bool bHidden = sal_False, sal_Bool bCurRowOnly = sal_False ) const; void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, BOOL bCurRowOnly ); + const SwTableBox *pStart, sal_Bool bCurRowOnly ); // The following functions are for new table model only... void CreateSelection( const SwPaM& rPam, SwSelBoxes& rBoxes, @@ -196,17 +196,17 @@ public: // SwSavRowSpan is the structure needed by Undo to undo the split operation // CleanUpRowSpan corrects the (top of the) second table and delviers the structure // for Undo - SwSaveRowSpan* CleanUpTopRowSpan( USHORT nSplitLine ); + SwSaveRowSpan* CleanUpTopRowSpan( sal_uInt16 nSplitLine ); // RestoreRowSpan is called by Undo to restore the old row span values void RestoreRowSpan( const SwSaveRowSpan& ); // CleanUpBottomRowSpan corrects the overhanging row spans at the end of the first table - void CleanUpBottomRowSpan( USHORT nDelLines ); + void CleanUpBottomRowSpan( sal_uInt16 nDelLines ); // The following functions are "pseudo-virtual", i.e. they are different for old and new table model // It's not allowed to change the table model after the first call of one of these functions. - BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, + sal_Bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 ) { #ifdef DBG_UTIL @@ -215,8 +215,8 @@ public: return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) : OldMerge( pDoc, rBoxes, pMergeBox, pUndo ); } - BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1, - BOOL bSameHeight = FALSE ) + sal_Bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1, + sal_Bool bSameHeight = sal_False ) { #ifdef DBG_UTIL bDontChangeModel = true; @@ -229,16 +229,16 @@ public: void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const; void PrepareDeleteCol( long nMin, long nMax ); - BOOL InsertCol( SwDoc*, const SwSelBoxes& rBoxes, - USHORT nCnt = 1, BOOL bBehind = TRUE ); - BOOL InsertRow( SwDoc*, const SwSelBoxes& rBoxes, - USHORT nCnt = 1, BOOL bBehind = TRUE ); - BOOL AppendRow( SwDoc* pDoc, USHORT nCnt = 1 ); + sal_Bool InsertCol( SwDoc*, const SwSelBoxes& rBoxes, + sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ); + sal_Bool InsertRow( SwDoc*, const SwSelBoxes& rBoxes, + sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ); + sal_Bool AppendRow( SwDoc* pDoc, sal_uInt16 nCnt = 1 ); void PrepareDelBoxes( const SwSelBoxes& rBoxes ); - BOOL DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, - SwUndo* pUndo, const BOOL bDelMakeFrms, const BOOL bCorrBorder ); - BOOL SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1 ); - BOOL Merge( const SwSelBoxes& rBoxes, + sal_Bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, + SwUndo* pUndo, const sal_Bool bDelMakeFrms, const sal_Bool bCorrBorder ); + sal_Bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); + sal_Bool Merge( const SwSelBoxes& rBoxes, SwTableBox* pMergeBox, SwUndoTblMerge* = 0 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) @@ -252,8 +252,8 @@ public: // (wird von GetTblBox und SwTblFld benutzt) // --> OD 2007-08-03 #i80314# // add 3rd parameter in order to control validation check on <rStr> - static USHORT _GetBoxNum( String& rStr, - BOOL bFirst = FALSE, + static sal_uInt16 _GetBoxNum( String& rStr, + sal_Bool bFirst = sal_False, const bool bPerformValidCheck = false ); // <-- // suche die Inhaltstragende Box mit dem Namen @@ -264,38 +264,38 @@ public: const bool bPerformValidCheck = false ) const; // <-- // kopiere die selektierten Boxen in ein anderes Dokument. - BOOL MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, - BOOL bCpyNds = TRUE, BOOL bCpyName = FALSE ) const; + sal_Bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, + sal_Bool bCpyNds = sal_True, sal_Bool bCpyName = sal_False ) const; // kopiere die Tabelle in diese. (die Logik steht im TBLRWCL.CXX) - BOOL InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, + sal_Bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, SwUndoTblCpyTbl* pUndo = 0 ); - BOOL InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, + sal_Bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, SwUndoTblCpyTbl* pUndo = 0 ); - BOOL InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, + sal_Bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, SwUndoTblCpyTbl* pUndo ); // kopiere die Headline (mit Inhalt!) der Tabelle in eine andere - BOOL CopyHeadlineIntoTable( SwTableNode& rTblNd ); + sal_Bool CopyHeadlineIntoTable( SwTableNode& rTblNd ); // erfrage die Box, dessen Start-Index auf nBoxStt steht - SwTableBox* GetTblBox( ULONG nSttIdx ); - const SwTableBox* GetTblBox( ULONG nSttIdx ) const + SwTableBox* GetTblBox( sal_uLong nSttIdx ); + const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const { return ((SwTable*)this)->GetTblBox( nSttIdx ); } - // returnt TRUE wenn sich in der Tabelle Verschachtelungen befinden - BOOL IsTblComplex() const; + // returnt sal_True wenn sich in der Tabelle Verschachtelungen befinden + sal_Bool IsTblComplex() const; - //returnt TRUE wenn die Tabelle oder Selektion ausgeglichen ist - BOOL IsTblComplexForChart( const String& rSel, + //returnt sal_True wenn die Tabelle oder Selektion ausgeglichen ist + sal_Bool IsTblComplexForChart( const String& rSel, SwChartLines* pGetCLines = 0 ) const; // suche alle Inhaltstragenden-Boxen der Grundline in der diese Box // steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen - //JP 31.01.97: bToTop = TRUE -> hoch bis zur Grundline, - // FALSE-> sonst nur die Line der Box + //JP 31.01.97: bToTop = sal_True -> hoch bis zur Grundline, + // sal_False-> sonst nur die Line der Box SwSelBoxes& SelLineFromBox( const SwTableBox* pBox, - SwSelBoxes& rBoxes, BOOL bToTop = TRUE ) const; + SwSelBoxes& rBoxes, sal_Bool bToTop = sal_True ) const; // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // suche im Format nach der angemeldeten Tabelle static SwTable * FindTable( SwFrmFmt const*const pFmt ); @@ -318,9 +318,9 @@ public: TblChgMode GetTblChgMode() const { return eTblChgMode; } void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; } - BOOL SetColWidth( SwTableBox& rAktBox, USHORT eType, + sal_Bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); - BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType, + sal_Bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); #ifdef DBG_UTIL void CheckConsistency() const; @@ -337,7 +337,7 @@ public: SwTableLine() : pUpper(0) {} - SwTableLine( SwTableLineFmt*, USHORT nBoxes, SwTableBox *pUp ); + SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp ); virtual ~SwTableLine(); SwTableBoxes &GetTabBoxes() { return aBoxes; } @@ -357,9 +357,9 @@ public: // suche nach der naechsten/vorherigen Box mit Inhalt SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const; @@ -390,7 +390,7 @@ public: SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {} - SwTableBox( SwTableBoxFmt*, USHORT nLines, SwTableLine *pUp = 0 ); + SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 ); SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 ); SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 ); virtual ~SwTableBox(); @@ -410,7 +410,7 @@ public: void ChgFrmFmt( SwTableBoxFmt *pNewFmt ); const SwStartNode *GetSttNd() const { return pSttNd; } - ULONG GetSttIdx() const + sal_uLong GetSttIdx() const #ifndef DBG_UTIL { return pSttNd ? pSttNd->GetIndex() : 0; } #else @@ -419,29 +419,29 @@ public: // suche nach der naechsten/vorherigen Box mit Inhalt SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; // gebe den Namen dieser Box zurueck. Dieser wird dynamisch bestimmt // und ergibt sich aus der Position in den Lines/Boxen/Tabelle String GetName() const; // gebe den "Wert" der Box zurueck (fuers rechnen in der Tabelle) double GetValue( SwTblCalcPara& rPara ) const; - BOOL IsInHeadline( const SwTable* pTbl = 0 ) const; + sal_Bool IsInHeadline( const SwTable* pTbl = 0 ) const; // enthaelt die Box Inhalt, der als Nummer formatiert werden kann? - BOOL HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, - BOOL& rIsEmptyTxtNd ) const; - ULONG IsValidNumTxtNd( BOOL bCheckAttr = TRUE ) const; + sal_Bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, + sal_Bool& rIsEmptyTxtNd ) const; + sal_uLong IsValidNumTxtNd( sal_Bool bCheckAttr = sal_True ) const; // teste ob der BoxInhalt mit der Nummer uebereinstimmt, wenn eine // Tabellenformel gesetzt ist. (fuers Redo des Change vom NumFormat!) - BOOL IsNumberChanged() const; + sal_Bool IsNumberChanged() const; // ist das eine FormelBox oder eine Box mit numerischen Inhalt (AutoSum) // Was es ist, besagt der ReturnWert - die WhichId des Attributes // Leere Boxen haben den ReturnWert USHRT_MAX !! - USHORT IsFormulaOrValueBox() const; + sal_uInt16 IsFormulaOrValueBox() const; // Loading of a document requires an actualisation of cells with values void ActualiseValueBox(); @@ -459,14 +459,14 @@ public: bool getDummyFlag() const; void setDummyFlag( bool bDummy ); - SwTableBox& FindStartOfRowSpan( const SwTable&, USHORT nMaxStep = USHRT_MAX ); + SwTableBox& FindStartOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX ); const SwTableBox& FindStartOfRowSpan( const SwTable& rTable, - USHORT nMaxStep = USHRT_MAX ) const + sal_uInt16 nMaxStep = USHRT_MAX ) const { return const_cast<SwTableBox*>(this)->FindStartOfRowSpan( rTable, nMaxStep ); } - SwTableBox& FindEndOfRowSpan( const SwTable&, USHORT nMaxStep = USHRT_MAX ); + SwTableBox& FindEndOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX ); const SwTableBox& FindEndOfRowSpan( const SwTable& rTable, - USHORT nMaxStep = USHRT_MAX ) const + sal_uInt16 nMaxStep = USHRT_MAX ) const { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); } }; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 0d37e63c367d..1f417052638d 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -116,15 +116,15 @@ enum SwLabelType }; -const BYTE OLD_MAXLEVEL = 5; -const BYTE MAXLEVEL = 10; //Ehemals numrule.hxx -const BYTE NO_NUM = 200; //Ehemals numrule.hxx -//const BYTE NO_NUMBERING = 201; //Ehemals numrule.hxx //#outline level,removed by zhaojianwei -//const BYTE NO_INIT = 202; //Ehemals numrule.hxx +const sal_uInt8 OLD_MAXLEVEL = 5; +const sal_uInt8 MAXLEVEL = 10; //Ehemals numrule.hxx +const sal_uInt8 NO_NUM = 200; //Ehemals numrule.hxx +//const sal_uInt8 NO_NUMBERING = 201; //Ehemals numrule.hxx //#outline level,removed by zhaojianwei +//const sal_uInt8 NO_INIT = 202; //Ehemals numrule.hxx // fuer Absaetze mit NO_NUM aber auf unterschiedlichen Leveln // DAMIT entfaellt das NO_NUM !!!! -const BYTE NO_NUMLEVEL = 0x20; // wird mit den Levels verodert +const sal_uInt8 NO_NUMLEVEL = 0x20; // wird mit den Levels verodert /* @@ -145,9 +145,9 @@ extern SwPathFinder *pPathFinder; // multiplizieren; Ebenen 0..4 !!!) // -> #i30312# -const USHORT lBullIndent = 1440/4; +const sal_uInt16 lBullIndent = 1440/4; const short lBullFirstLineOffset = -lBullIndent; -const USHORT lNumIndent = 1440/4; +const sal_uInt16 lNumIndent = 1440/4; const short lNumFirstLineOffset = -lNumIndent; const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm // <- #i30312# @@ -212,7 +212,7 @@ extern const sal_Char* __FAR_DATA pMarkToOLE; #endif -typedef USHORT SetAttrMode; +typedef sal_uInt16 SetAttrMode; namespace nsSetAttrMode { @@ -301,7 +301,7 @@ enum PrepareHint PREP_FTN, //Fussnoten-Invalidierung PREP_POS_CHGD, //Position des Frm hat sich verandert //(Zum Fly-Umbruch pruefen). Im void* des Prepare() - //wird ein BOOL& uebergeben, dieser zeigt mit TRUE, + //wird ein sal_Bool& uebergeben, dieser zeigt mit sal_True, //dass ein Format ausgefuehrt wurde. PREP_UL_SPACE, //UL-Space hat sich veraendert, TxtFrms muessen //den Zeilenabstand neu kalkulieren. diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 96ea90f5ce1d..f2623f48aa3b 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -50,32 +50,32 @@ sal_Int32 GetEnumAsInt32( const com::sun::star::uno::Any& rVal ); // methods for UCB actions: // delete the file under this URL -SW_DLLPUBLIC BOOL UCB_DeleteFile( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_DeleteFile( const String& rURL ); // copy/move the file to a new location -BOOL UCB_CopyFile( const String& rURL, const String& rNewURL, - BOOL bCopyIsMove = FALSE ); +sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, + sal_Bool bCopyIsMove = sal_False ); // is the URL on the current system case sentive? -SW_DLLPUBLIC BOOL UCB_IsCaseSensitiveFileName( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_IsCaseSensitiveFileName( const String& rURL ); // is the URL readonly? -SW_DLLPUBLIC BOOL UCB_IsReadOnlyFileName( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_IsReadOnlyFileName( const String& rURL ); // get a list of files from the folder of the URL // options: pExtension = 0 -> all, else this specific extension // pDateTime != 0 -> returns also the modified date/time of // the files in a SvPtrarr --> // !! objects must be deleted from the caller!! -BOOL UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList, +sal_Bool UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList, const String* pExtension = 0, SvPtrarr* pDateTimeList = 0 ); // is the URL an existing file? -SW_DLLPUBLIC BOOL UCB_IsFile( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_IsFile( const String& rURL ); // is the URL a existing directory? -BOOL UCB_IsDirectory( const String& rURL ); +sal_Bool UCB_IsDirectory( const String& rURL ); } #endif diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx index f8b9af4d6097..07f4b0631d78 100644 --- a/sw/inc/swurl.hxx +++ b/sw/inc/swurl.hxx @@ -38,7 +38,7 @@ class ViewShell; void LoadURL( const UniString& rName, ViewShell* pSh, - USHORT nFilter = URLLOAD_NOFILTER, + sal_uInt16 nFilter = URLLOAD_NOFILTER, const UniString *pTargetFrameName = 0 ); diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx index 19fb3045359c..19fb6cfb40a3 100644 --- a/sw/inc/swwait.hxx +++ b/sw/inc/swwait.hxx @@ -35,9 +35,9 @@ class SwDocShell; class SW_DLLPUBLIC SwWait { SwDocShell &rDoc; - BOOL bLock; + sal_Bool bLock; public: - SwWait( SwDocShell &rDocShell, BOOL bLockDispatcher ); + SwWait( SwDocShell &rDocShell, sal_Bool bLockDispatcher ); ~SwWait(); }; diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx index fed5ab748b6f..abbb7dcf9933 100644 --- a/sw/inc/tabcol.hxx +++ b/sw/inc/tabcol.hxx @@ -44,8 +44,8 @@ struct SwTabColsEntry long nPos; long nMin; long nMax; - BOOL bHidden; //Fuer jeden Eintrag ein Flag, Hidden oder nicht. - //Wenn das Flag Hidden TRUE ist liegt der Spalten- + sal_Bool bHidden; //Fuer jeden Eintrag ein Flag, Hidden oder nicht. + //Wenn das Flag Hidden sal_True ist liegt der Spalten- //trenner nicht in der aktuellen Zeile; er muss //mit gepflegt werden, darf aber nicht angezeigt //werden. @@ -72,23 +72,23 @@ class SW_DLLPUBLIC SwTabCols const SwTabColsEntries& GetData() const { return aData; } public: - SwTabCols( USHORT nSize = 0 ); + SwTabCols( sal_uInt16 nSize = 0 ); SwTabCols( const SwTabCols& ); SwTabCols &operator=( const SwTabCols& ); - BOOL operator==( const SwTabCols& rCmp ) const; - long& operator[]( USHORT nPos ) { return aData[nPos].nPos; } - long operator[]( USHORT nPos ) const { return aData[nPos].nPos; } - USHORT Count() const { return sal::static_int_cast< USHORT >(aData.size()); } + sal_Bool operator==( const SwTabCols& rCmp ) const; + long& operator[]( sal_uInt16 nPos ) { return aData[nPos].nPos; } + long operator[]( sal_uInt16 nPos ) const { return aData[nPos].nPos; } + sal_uInt16 Count() const { return sal::static_int_cast< sal_uInt16 >(aData.size()); } - BOOL IsHidden( USHORT nPos ) const { return aData[nPos].bHidden; } - void SetHidden( USHORT nPos, BOOL bValue ) { aData[nPos].bHidden = bValue; } + sal_Bool IsHidden( sal_uInt16 nPos ) const { return aData[nPos].bHidden; } + void SetHidden( sal_uInt16 nPos, sal_Bool bValue ) { aData[nPos].bHidden = bValue; } - void Insert( long nValue, BOOL bValue, USHORT nPos ); - void Insert( long nValue, long nMin, long nMax, BOOL bValue, USHORT nPos ); - void Remove( USHORT nPos, USHORT nAnz = 1 ); + void Insert( long nValue, sal_Bool bValue, sal_uInt16 nPos ); + void Insert( long nValue, long nMin, long nMax, sal_Bool bValue, sal_uInt16 nPos ); + void Remove( sal_uInt16 nPos, sal_uInt16 nAnz = 1 ); - const SwTabColsEntry& GetEntry( USHORT nPos ) const { return aData[nPos]; } - SwTabColsEntry& GetEntry( USHORT nPos ) { return aData[nPos]; } + const SwTabColsEntry& GetEntry( sal_uInt16 nPos ) const { return aData[nPos]; } + SwTabColsEntry& GetEntry( sal_uInt16 nPos ) { return aData[nPos]; } long GetLeftMin() const { return nLeftMin; } long GetLeft() const { return nLeft; } diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index fe2dd58b477d..99324909e20c 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -181,13 +181,13 @@ public: void SetValueFormat( const String& rFmt, LanguageType eLng, LanguageType eSys ) { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; } - BOOL Load( SvStream& rStream, const SwAfVersions& rVersions, USHORT nVer ); - BOOL Save( SvStream& rStream ) const; - BOOL SaveVerionNo( SvStream& rStream ) const; + sal_Bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); + sal_Bool Save( SvStream& rStream ) const; + sal_Bool SaveVerionNo( SvStream& rStream ) const; #ifdef READ_OLDVERS // lade alte Version - BOOL LoadOld( SvStream& rStream, USHORT aLoadVer[] ); + sal_Bool LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ); #endif }; @@ -197,17 +197,17 @@ class SW_DLLPUBLIC SwTableAutoFmt static SwBoxAutoFmt* pDfltBoxAutoFmt; String aName; - USHORT nStrResId; + sal_uInt16 nStrResId; // common flags of Calc and Writer - BOOL bInclFont : 1; - BOOL bInclJustify : 1; - BOOL bInclFrame : 1; - BOOL bInclBackground : 1; - BOOL bInclValueFormat : 1; + sal_Bool bInclFont : 1; + sal_Bool bInclJustify : 1; + sal_Bool bInclFrame : 1; + sal_Bool bInclBackground : 1; + sal_Bool bInclValueFormat : 1; // Calc specific flags - BOOL bInclWidthHeight : 1; + sal_Bool bInclWidthHeight : 1; SwBoxAutoFmt* aBoxAutoFmt[ 16 ]; @@ -218,37 +218,37 @@ public: SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew ); - void SetBoxFmt( const SwBoxAutoFmt& rNew, BYTE nPos ); - const SwBoxAutoFmt& GetBoxFmt( BYTE nPos ) const; + void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos ); + const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const; void SetName( const String& rNew ) { aName = rNew; nStrResId = USHRT_MAX; } const String& GetName() const { return aName; } enum UpdateFlags { UPDATE_CHAR = 1, UPDATE_BOX = 2, UPDATE_ALL = 3 }; - SwBoxAutoFmt& UpdateFromSet( BYTE nPos, const SfxItemSet& rSet, + SwBoxAutoFmt& UpdateFromSet( sal_uInt8 nPos, const SfxItemSet& rSet, UpdateFlags eFlags, SvNumberFormatter* ); - void UpdateToSet( BYTE nPos, SfxItemSet& rSet, UpdateFlags eFlags, + void UpdateToSet( sal_uInt8 nPos, SfxItemSet& rSet, UpdateFlags eFlags, SvNumberFormatter* ) const ; - BOOL IsFont() const { return bInclFont; } - BOOL IsJustify() const { return bInclJustify; } - BOOL IsFrame() const { return bInclFrame; } - BOOL IsBackground() const { return bInclBackground; } - BOOL IsValueFormat() const { return bInclValueFormat; } + sal_Bool IsFont() const { return bInclFont; } + sal_Bool IsJustify() const { return bInclJustify; } + sal_Bool IsFrame() const { return bInclFrame; } + sal_Bool IsBackground() const { return bInclBackground; } + sal_Bool IsValueFormat() const { return bInclValueFormat; } - void SetFont( const BOOL bNew ) { bInclFont = bNew; } - void SetJustify( const BOOL bNew ) { bInclJustify = bNew; } - void SetFrame( const BOOL bNew ) { bInclFrame = bNew; } - void SetBackground( const BOOL bNew ) { bInclBackground = bNew; } - void SetValueFormat( const BOOL bNew ) { bInclValueFormat = bNew; } - void SetWidthHeight( const BOOL bNew ) { bInclWidthHeight = bNew; } + void SetFont( const sal_Bool bNew ) { bInclFont = bNew; } + void SetJustify( const sal_Bool bNew ) { bInclJustify = bNew; } + void SetFrame( const sal_Bool bNew ) { bInclFrame = bNew; } + void SetBackground( const sal_Bool bNew ) { bInclBackground = bNew; } + void SetValueFormat( const sal_Bool bNew ) { bInclValueFormat = bNew; } + void SetWidthHeight( const sal_Bool bNew ) { bInclWidthHeight = bNew; } - BOOL Load( SvStream& rStream, const SwAfVersions& ); - BOOL Save( SvStream& rStream ) const; + sal_Bool Load( SvStream& rStream, const SwAfVersions& ); + sal_Bool Save( SvStream& rStream ) const; #ifdef READ_OLDVERS // lade alte Version - BOOL LoadOld( SvStream& rStream, USHORT aLoadVer[] ); + sal_Bool LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ); #endif }; @@ -257,14 +257,14 @@ SV_DECL_PTRARR_DEL( _SwTableAutoFmtTbl, SwTableAutoFmtPtr, 1, 5 ) class SW_DLLPUBLIC SwTableAutoFmtTbl : public _SwTableAutoFmtTbl { - SW_DLLPRIVATE BOOL Load( SvStream& rStream ); - SW_DLLPRIVATE BOOL Save( SvStream& rStream ) const; + SW_DLLPRIVATE sal_Bool Load( SvStream& rStream ); + SW_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const; public: SwTableAutoFmtTbl(); - BOOL Load(); - BOOL Save() const; + sal_Bool Load(); + sal_Bool Save() const; }; #endif diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx index 66fc5756407e..e5ca58c3df78 100644 --- a/sw/inc/tblenum.hxx +++ b/sw/inc/tblenum.hxx @@ -28,7 +28,7 @@ #define _TBLENUM_HXX //fuers aendern der Tabellen/Spalten/Zeilen Breiten/Hoehen -typedef USHORT TblChgWidthHeightType; +typedef sal_uInt16 TblChgWidthHeightType; namespace nsTblChgWidthHeightType { diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index c56068d28ed7..f284c1597ed9 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -55,7 +55,7 @@ SV_DECL_PTRARR_SORT( SwSelBoxes, SwTableBoxPtr, 10, 20 ) //erweitert. //Die Boxen werden ueber das Layout zusammengsucht, es wird auch bei //aufgespaltenen Tabellen korrekt gearbeitet (siehe: MakeSelUnions()). -typedef USHORT SwTblSearchType; +typedef sal_uInt16 SwTblSearchType; namespace nsSwTblSearchType { const SwTblSearchType TBLSEARCH_NONE = 0x1; // keine Erweiterung @@ -84,22 +84,22 @@ void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes ); void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes ); // suche fuer eine AutoSumme die beteiligten Boxen zusammen -BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); +sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); // check if the SelBoxes contains protected Boxes -BOOL HasProtectedCells( const SwSelBoxes& rBoxes ); +sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes ); // teste, ob die Selektion ausgeglichen ist SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16, 16) SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25, 50) -BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, +sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, SwChartLines* pGetCLines = 0 ); // teste ob die Celle in die SSelection gehoert // (wurde eine Funktion, damit GetTblSel() und MakeTblCrsr() immer // das "gleiche Verstaendnis" fuer die Selektion haben) -BOOL IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); +sal_Bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); // bestimme die Boxen, die zusammen gefasst werden sollen. // Dabei wird auf Layout Basis das Rechteck "angepasst". D.H. es @@ -110,16 +110,16 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo = 0 ); // teste ob die selektierten Boxen ein gueltiges Merge erlauben -USHORT CheckMergeSel( const SwPaM& rPam ); -USHORT CheckMergeSel( const SwSelBoxes& rBoxes ); +sal_uInt16 CheckMergeSel( const SwPaM& rPam ); +sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ); -BOOL IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); +sal_Bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); // teste ob ein Split oder InsertCol dazu fuehrt, das eine Box // kleiner als MINLAY wird. -BOOL CheckSplitCells( const SwCrsrShell& rShell, USHORT nDiv, +sal_Bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); -BOOL CheckSplitCells( const SwCursor& rCrsr, USHORT nDiv, +sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); //Fuer das Arbeiten auf TabSelektion auch fuer aufgespaltene Tabellen. @@ -183,9 +183,9 @@ public: void SetTableLines( const SwTable &rTable ); void DelFrms ( SwTable &rTable ); void MakeFrms( SwTable &rTable ); - void MakeNewFrms( SwTable &rTable, const USHORT nNumber, - const BOOL bBehind ); - BOOL AreLinesToRestore( const SwTable &rTable ) const; + void MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber, + const sal_Bool bBehind ); + sal_Bool AreLinesToRestore( const SwTable &rTable ) const; void ClearLineBehind() { pLineBehind = 0; } }; @@ -223,8 +223,8 @@ struct _FndPara : rBoxes(rPara.rBoxes), pFndLine(pFL), pFndBox(rPara.pFndBox) {} }; -BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ); -SW_DLLPUBLIC BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ); +sal_Bool _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ); +SW_DLLPUBLIC sal_Bool _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ); #endif // _TBLSEL_HXX diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index ca9ba7fd6db9..267aeacb7793 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -43,14 +43,14 @@ class SW_DLLPUBLIC SwTextGridItem : public SfxPoolItem sal_uInt16 nLines; sal_uInt16 nBaseHeight, nRubyHeight; SwTextGrid eGridType; - BOOL bRubyTextBelow; - BOOL bPrintGrid; - BOOL bDisplayGrid; + sal_Bool bRubyTextBelow; + sal_Bool bPrintGrid; + sal_Bool bDisplayGrid; //for textgrid enhancement sal_uInt16 nBaseWidth; - BOOL bSnapToChars; - BOOL bSquaredMode; + sal_Bool bSnapToChars; + sal_Bool bSquaredMode; public: SwTextGridItem(); virtual ~SwTextGridItem(); @@ -63,8 +63,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) 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 ); SwTextGridItem& operator=( const SwTextGridItem& ); @@ -83,37 +83,37 @@ public: SwTextGrid GetGridType() const { return eGridType; } void SetGridType( SwTextGrid eNew ) { eGridType = eNew; } - BOOL IsRubyTextBelow() const { return bRubyTextBelow; } - BOOL GetRubyTextBelow() const { return bRubyTextBelow; } - void SetRubyTextBelow( BOOL bNew ) { bRubyTextBelow = bNew; } + sal_Bool IsRubyTextBelow() const { return bRubyTextBelow; } + sal_Bool GetRubyTextBelow() const { return bRubyTextBelow; } + void SetRubyTextBelow( sal_Bool bNew ) { bRubyTextBelow = bNew; } - BOOL IsPrintGrid() const { return bPrintGrid; } - BOOL GetPrintGrid() const { return bPrintGrid; } - void SetPrintGrid( BOOL bNew ) { bPrintGrid = bNew; } + sal_Bool IsPrintGrid() const { return bPrintGrid; } + sal_Bool GetPrintGrid() const { return bPrintGrid; } + void SetPrintGrid( sal_Bool bNew ) { bPrintGrid = bNew; } - BOOL IsDisplayGrid() const { return bDisplayGrid; } - BOOL GetDisplayGrid() const { return bDisplayGrid; } - void SetDisplayGrid( BOOL bNew ) { bDisplayGrid = bNew; } + sal_Bool IsDisplayGrid() const { return bDisplayGrid; } + sal_Bool GetDisplayGrid() const { return bDisplayGrid; } + void SetDisplayGrid( sal_Bool bNew ) { bDisplayGrid = bNew; } //for textgrid enhancement sal_uInt16 GetBaseWidth() const { return nBaseWidth;} void SetBaseWidth( sal_uInt16 nNew ) { nBaseWidth = nNew; } - BOOL IsSnapToChars() const { return bSnapToChars; } - BOOL GetSnapToChars() const { return bSnapToChars; } - void SetSnapToChars( BOOL bNew ) { bSnapToChars = bNew; } + sal_Bool IsSnapToChars() const { return bSnapToChars; } + sal_Bool GetSnapToChars() const { return bSnapToChars; } + void SetSnapToChars( sal_Bool bNew ) { bSnapToChars = bNew; } - BOOL IsSquaredMode() const { return bSquaredMode; } - BOOL GetSquaredMode() const { return bSquaredMode; } - void SetSquaredMode( BOOL bNew ) { bSquaredMode = bNew; } - void SwitchPaperMode(BOOL bNew ); + sal_Bool IsSquaredMode() const { return bSquaredMode; } + sal_Bool GetSquaredMode() const { return bSquaredMode; } + void SetSquaredMode( sal_Bool bNew ) { bSquaredMode = bNew; } + void SwitchPaperMode(sal_Bool bNew ); void Init(); }; -inline const SwTextGridItem &SwAttrSet::GetTextGrid(BOOL bInP) const +inline const SwTextGridItem &SwAttrSet::GetTextGrid(sal_Bool bInP) const { return (const SwTextGridItem&)Get( RES_TEXTGRID, bInP ); } -inline const SwTextGridItem &SwFmt::GetTextGrid(BOOL bInP) const +inline const SwTextGridItem &SwFmt::GetTextGrid(sal_Bool bInP) const { return (const SwTextGridItem&)aSet.Get( RES_TEXTGRID, bInP ); } #endif diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index fea15cfafb82..f8bdb12f113b 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -62,8 +62,8 @@ SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10) Description: Entry of content index, alphabetical index or user defined index --------------------------------------------------------------------*/ -#define IVER_TOXMARK_STRPOOL ((USHORT)1) -#define IVER_TOXMARK_NEWTOX ((USHORT)2) +#define IVER_TOXMARK_STRPOOL ((sal_uInt16)1) +#define IVER_TOXMARK_NEWTOX ((sal_uInt16)2) class SW_DLLPUBLIC SwTOXMark : public SfxPoolItem @@ -82,9 +82,9 @@ class SW_DLLPUBLIC SwTOXMark SwTxtTOXMark* pTxtAttr; - USHORT nLevel; - BOOL bAutoGenerated : 1; // generated using a concordance file - BOOL bMainEntry : 1; // main entry emphasized by character style + sal_uInt16 nLevel; + sal_Bool bAutoGenerated : 1; // generated using a concordance file + sal_Bool bMainEntry : 1; // main entry emphasized by character style ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark; @@ -112,14 +112,14 @@ public: String GetText() const; - inline BOOL IsAlternativeText() const; + inline sal_Bool IsAlternativeText() const; inline const String& GetAlternativeText() const; inline void SetAlternativeText( const String& rAlt ); // content or user defined index - inline void SetLevel(USHORT nLevel); - inline USHORT GetLevel() const; + inline void SetLevel(sal_uInt16 nLevel); + inline sal_uInt16 GetLevel() const; // for alphabetical index only inline void SetPrimaryKey(const String& rStr ); @@ -134,11 +134,11 @@ public: inline const String& GetPrimaryKeyReading() const; inline const String& GetSecondaryKeyReading() const; - BOOL IsAutoGenerated() const {return bAutoGenerated;} - void SetAutoGenerated(BOOL bSet) {bAutoGenerated = bSet;} + sal_Bool IsAutoGenerated() const {return bAutoGenerated;} + void SetAutoGenerated(sal_Bool bSet) {bAutoGenerated = bSet;} - BOOL IsMainEntry() const {return bMainEntry;} - void SetMainEntry(BOOL bSet) { bMainEntry = bSet;} + sal_Bool IsMainEntry() const {return bMainEntry;} + void SetMainEntry(sal_Bool bSet) { bMainEntry = bSet;} inline const SwTOXType* GetTOXType() const; @@ -224,13 +224,13 @@ struct SW_DLLPUBLIC SwFormToken String sCharStyleName; SwTwips nTabStopPosition; FormTokenType eTokenType; - USHORT nPoolId; + sal_uInt16 nPoolId; SvxTabAdjust eTabAlign; - USHORT nChapterFormat; //SwChapterFormat; - USHORT nOutlineLevel;//the maximum permitted outline level in numbering - USHORT nAuthorityField; //enum ToxAuthorityField + sal_uInt16 nChapterFormat; //SwChapterFormat; + sal_uInt16 nOutlineLevel;//the maximum permitted outline level in numbering + sal_uInt16 nAuthorityField; //enum ToxAuthorityField sal_Unicode cTabFillChar; - sal_Bool bWithTab; // TRUE: do generate tab + sal_Bool bWithTab; // sal_True: do generate tab // character only the tab stop // #i21237# @@ -256,8 +256,8 @@ struct SW_DLLPUBLIC SwFormToken @param _eType the type to check for @param rToken the token to check - @retval TRUE the token has the given type - @retval FALSE else + @retval sal_True the token has the given type + @retval sal_False else */ struct SwFormTokenEqualToFormTokenType { @@ -361,13 +361,13 @@ class SW_DLLPUBLIC SwForm String aTemplate[ AUTH_TYPE_END + 1 ]; TOXTypes eType; - USHORT nFormMaxLevel; + sal_uInt16 nFormMaxLevel; - //USHORT nFirstTabPos; -> Value in tab token -// BOOL bHasFirstTabPos : 1; - BOOL bGenerateTabPos : 1; - BOOL bIsRelTabPos : 1; - BOOL bCommaSeparated : 1; + //sal_uInt16 nFirstTabPos; -> Value in tab token +// sal_Bool bHasFirstTabPos : 1; + sal_Bool bGenerateTabPos : 1; + sal_Bool bIsRelTabPos : 1; + sal_Bool bCommaSeparated : 1; public: SwForm( TOXTypes eTOXType = TOX_CONTENT ); @@ -375,57 +375,57 @@ public: SwForm& operator=( const SwForm& rForm ); - inline void SetTemplate(USHORT nLevel, const String& rName); - inline const String& GetTemplate(USHORT nLevel) const; + inline void SetTemplate(sal_uInt16 nLevel, const String& rName); + inline const String& GetTemplate(sal_uInt16 nLevel) const; // #i21237# - void SetPattern(USHORT nLevel, const SwFormTokens& rName); - void SetPattern(USHORT nLevel, const String& rStr); - const SwFormTokens& GetPattern(USHORT nLevel) const; + void SetPattern(sal_uInt16 nLevel, const SwFormTokens& rName); + void SetPattern(sal_uInt16 nLevel, const String& rStr); + const SwFormTokens& GetPattern(sal_uInt16 nLevel) const; // fill tab stop positions from template to pattern // #i21237# void AdjustTabStops(SwDoc& rDoc, - BOOL bInsertNewTabStops = FALSE); + sal_Bool bInsertNewTabStops = sal_False); inline TOXTypes GetTOXType() const; - inline USHORT GetFormMax() const; + inline sal_uInt16 GetFormMax() const; - BOOL IsRelTabPos() const { return bIsRelTabPos; } - void SetRelTabPos( BOOL b ) { bIsRelTabPos = b; } + sal_Bool IsRelTabPos() const { return bIsRelTabPos; } + void SetRelTabPos( sal_Bool b ) { bIsRelTabPos = b; } - BOOL IsCommaSeparated() const { return bCommaSeparated;} - void SetCommaSeparated( BOOL b) { bCommaSeparated = b;} + sal_Bool IsCommaSeparated() const { return bCommaSeparated;} + void SetCommaSeparated( sal_Bool b) { bCommaSeparated = b;} - static USHORT GetFormMaxLevel( TOXTypes eType ); + static sal_uInt16 GetFormMaxLevel( TOXTypes eType ); static const sal_Char* aFormEntry; // <E> - static BYTE nFormEntryLen; // 3 characters + static sal_uInt8 nFormEntryLen; // 3 characters static const sal_Char* aFormTab; // <T> - static BYTE nFormTabLen; // 3 characters + static sal_uInt8 nFormTabLen; // 3 characters static const sal_Char* aFormPageNums; // <P> - static BYTE nFormPageNumsLen; // 3 characters + static sal_uInt8 nFormPageNumsLen; // 3 characters static const sal_Char* aFormLinkStt; // <LS> - static BYTE nFormLinkSttLen; // 4 characters + static sal_uInt8 nFormLinkSttLen; // 4 characters static const sal_Char* aFormLinkEnd; // <LE> - static BYTE nFormLinkEndLen; // 4 characters + static sal_uInt8 nFormLinkEndLen; // 4 characters static const sal_Char* aFormEntryNum; // <E#> - static BYTE nFormEntryNumLen; // 4 characters + static sal_uInt8 nFormEntryNumLen; // 4 characters static const sal_Char* aFormEntryTxt; // <ET> - static BYTE nFormEntryTxtLen; // 4 characters + static sal_uInt8 nFormEntryTxtLen; // 4 characters static const sal_Char* aFormChapterMark; // <C> - static BYTE nFormChapterMarkLen; // 3 characters + static sal_uInt8 nFormChapterMarkLen; // 3 characters static const sal_Char* aFormText; // <TX> - static BYTE nFormTextLen; // 4 characters + static sal_uInt8 nFormTextLen; // 4 characters static const sal_Char* aFormAuth; // <Axx> xx - decimal enum value - static BYTE nFormAuthLen; // 3 characters + static sal_uInt8 nFormAuthLen; // 3 characters }; /*-------------------------------------------------------------------- Description: Content to create indexes of --------------------------------------------------------------------*/ -typedef USHORT SwTOXElement; +typedef sal_uInt16 SwTOXElement; namespace nsSwTOXElement { const SwTOXElement TOX_MARK = 1; @@ -438,7 +438,7 @@ namespace nsSwTOXElement const SwTOXElement TOX_SEQUENCE = 128; } -typedef USHORT SwTOIOptions; +typedef sal_uInt16 SwTOIOptions; namespace nsSwTOIOptions { const SwTOIOptions TOI_SAME_ENTRY = 1; @@ -458,7 +458,7 @@ enum SwCaptionDisplay CAPTION_TEXT }; -typedef USHORT SwTOOElements; +typedef sal_uInt16 SwTOOElements; namespace nsSwTOOElements { const SwTOOElements TOO_MATH = 0x01; @@ -490,25 +490,25 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient String sSortAlgorithm; union { - USHORT nLevel; // consider outline levels - USHORT nOptions; // options of alphabetical index + sal_uInt16 nLevel; // consider outline levels + sal_uInt16 nOptions; // options of alphabetical index } aData; - USHORT nCreateType; // sources to create the index from - USHORT nOLEOptions; // OLE sources + sal_uInt16 nCreateType; // sources to create the index from + sal_uInt16 nOLEOptions; // OLE sources SwCaptionDisplay eCaptionDisplay; // - BOOL bProtected : 1; // index protected ? - BOOL bFromChapter : 1; // create from chapter or document - BOOL bFromObjectNames : 1; // create a table or object index + sal_Bool bProtected : 1; // index protected ? + sal_Bool bFromChapter : 1; // create from chapter or document + sal_Bool bFromObjectNames : 1; // create a table or object index // from the names rather than the caption - BOOL bLevelFromChapter : 1; // User index: get the level from the source chapter + sal_Bool bLevelFromChapter : 1; // User index: get the level from the source chapter public: SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm, - USHORT nCreaType, const String& rTitle ); + sal_uInt16 nCreaType, const String& rTitle ); SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 ); virtual ~SwTOXBase(); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc. // If not, so create it an copy all other used things. The return is this @@ -516,7 +516,7 @@ public: const SwTOXType* GetTOXType() const; // - USHORT GetCreateType() const; // creation types + sal_uInt16 GetCreateType() const; // creation types const String& GetTOXName() const {return aName;} void SetTOXName(const String& rSet) {aName = rSet;} @@ -525,7 +525,7 @@ public: const String& GetTypeName() const; // Name const SwForm& GetTOXForm() const; // description of the lines - void SetCreate(USHORT); + void SetCreate(sal_uInt16); void SetTitle(const String& rTitle); void SetTOXForm(const SwForm& rForm); @@ -535,43 +535,43 @@ public: void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} // content index only - inline void SetLevel(USHORT); // consider outline level - inline USHORT GetLevel() const; + inline void SetLevel(sal_uInt16); // consider outline level + inline sal_uInt16 GetLevel() const; // alphabetical index only - inline USHORT GetOptions() const; // alphabetical index options - inline void SetOptions(USHORT nOpt); + inline sal_uInt16 GetOptions() const; // alphabetical index options + inline void SetOptions(sal_uInt16 nOpt); // index of objects - USHORT GetOLEOptions() const {return nOLEOptions;} - void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} + sal_uInt16 GetOLEOptions() const {return nOLEOptions;} + void SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;} // index of objects // user defined index only inline void SetTemplateName(const String& rName); // Absatzlayout beachten - const String& GetStyleNames(USHORT nLevel) const + const String& GetStyleNames(sal_uInt16 nLevel) const { DBG_ASSERT( nLevel < MAXLEVEL, "Which level?"); return aStyleNames[nLevel]; } - void SetStyleNames(const String& rSet, USHORT nLevel) + void SetStyleNames(const String& rSet, sal_uInt16 nLevel) { DBG_ASSERT( nLevel < MAXLEVEL, "Which level?"); aStyleNames[nLevel] = rSet; } - BOOL IsFromChapter() const { return bFromChapter;} - void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} + sal_Bool IsFromChapter() const { return bFromChapter;} + void SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;} - BOOL IsFromObjectNames() const {return bFromObjectNames;} - void SetFromObjectNames(BOOL bSet) {bFromObjectNames = bSet;} + sal_Bool IsFromObjectNames() const {return bFromObjectNames;} + void SetFromObjectNames(sal_Bool bSet) {bFromObjectNames = bSet;} - BOOL IsLevelFromChapter() const {return bLevelFromChapter;} - void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} + sal_Bool IsLevelFromChapter() const {return bLevelFromChapter;} + void SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;} - BOOL IsProtected() const { return bProtected; } - void SetProtected(BOOL bSet) { bProtected = bSet; } + sal_Bool IsProtected() const { return bProtected; } + void SetProtected(sal_Bool bSet) { bProtected = bSet; } const String& GetSequenceName() const {return sSequenceName;} void SetSequenceName(const String& rSet) {sSequenceName = rSet;} @@ -579,7 +579,7 @@ public: SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} - BOOL IsTOXBaseInReadonly() const; + sal_Bool IsTOXBaseInReadonly() const; const SfxItemSet* GetAttrSet() const; void SetAttrSet( const SfxItemSet& ); @@ -590,7 +590,7 @@ public: const String& GetSortAlgorithm()const {return sSortAlgorithm;} void SetSortAlgorithm(const String& rSet) {sSortAlgorithm = rSet;} // #i21237# - void AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop); + void AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop); SwTOXBase& operator=(const SwTOXBase& rSource); }; @@ -608,7 +608,7 @@ inline const String& SwTOXMark::GetAlternativeText() const inline const SwTOXType* SwTOXMark::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } -inline BOOL SwTOXMark::IsAlternativeText() const +inline sal_Bool SwTOXMark::IsAlternativeText() const { return aAltText.Len() > 0; } inline void SwTOXMark::SetAlternativeText(const String& rAlt) @@ -616,7 +616,7 @@ inline void SwTOXMark::SetAlternativeText(const String& rAlt) aAltText = rAlt; } -inline void SwTOXMark::SetLevel( USHORT nLvl ) +inline void SwTOXMark::SetLevel( sal_uInt16 nLvl ) { ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); nLevel = nLvl; @@ -652,7 +652,7 @@ inline void SwTOXMark::SetSecondaryKeyReading( const String& rKey ) aSecondaryKeyReading = rKey; } -inline USHORT SwTOXMark::GetLevel() const +inline sal_uInt16 SwTOXMark::GetLevel() const { ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); return nLevel; @@ -691,13 +691,13 @@ inline const String& SwTOXMark::GetSecondaryKeyReading() const // //SwForm // -inline void SwForm::SetTemplate(USHORT nLevel, const String& rTemplate) +inline void SwForm::SetTemplate(sal_uInt16 nLevel, const String& rTemplate) { ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX"); aTemplate[nLevel] = rTemplate; } -inline const String& SwForm::GetTemplate(USHORT nLevel) const +inline const String& SwForm::GetTemplate(sal_uInt16 nLevel) const { ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX"); return aTemplate[nLevel]; @@ -708,7 +708,7 @@ inline TOXTypes SwForm::GetTOXType() const return eType; } -inline USHORT SwForm::GetFormMax() const +inline sal_uInt16 SwForm::GetFormMax() const { return nFormMaxLevel; } @@ -729,7 +729,7 @@ inline TOXTypes SwTOXType::GetType() const inline const SwTOXType* SwTOXBase::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } -inline USHORT SwTOXBase::GetCreateType() const +inline sal_uInt16 SwTOXBase::GetCreateType() const { return nCreateType; } inline const String& SwTOXBase::GetTitle() const @@ -741,12 +741,12 @@ inline const String& SwTOXBase::GetTypeName() const inline const SwForm& SwTOXBase::GetTOXForm() const { return aForm; } -inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop) +inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop) { aForm.AdjustTabStops(rDoc, bDefaultRightTabStop); } -inline void SwTOXBase::SetCreate(USHORT nCreate) +inline void SwTOXBase::SetCreate(sal_uInt16 nCreate) { nCreateType = nCreate; } inline void SwTOXBase::SetTOXForm(const SwForm& rForm) @@ -755,13 +755,13 @@ inline void SwTOXBase::SetTOXForm(const SwForm& rForm) inline TOXTypes SwTOXBase::GetType() const { return GetTOXType()->GetType(); } -inline void SwTOXBase::SetLevel(USHORT nLev) +inline void SwTOXBase::SetLevel(sal_uInt16 nLev) { ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); aData.nLevel = nLev; } -inline USHORT SwTOXBase::GetLevel() const +inline sal_uInt16 SwTOXBase::GetLevel() const { ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); return aData.nLevel; @@ -777,13 +777,13 @@ inline void SwTOXBase::SetTemplateName(const String& rName) } -inline USHORT SwTOXBase::GetOptions() const +inline sal_uInt16 SwTOXBase::GetOptions() const { ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp"); return aData.nOptions; } -inline void SwTOXBase::SetOptions(USHORT nOpt) +inline void SwTOXBase::SetOptions(sal_uInt16 nOpt) { ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp"); aData.nOptions = nOpt; diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index 2d14cb0fad29..f38cd15c877c 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -60,7 +60,7 @@ public: String GetIndexKey( const String& rTxt, const String& rTxtReading, const STAR_NMSPC::lang::Locale& rLocale ) const; - String GetFollowingText( BOOL bMorePages ) const; + String GetFollowingText( sal_Bool bMorePages ) const; STAR_NMSPC::uno::Sequence< ::rtl::OUString > GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 8bdf77ad34fd..4829b1bcb012 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -106,7 +106,7 @@ public: inline const SfxPoolItem& GetAttr() const; inline SfxPoolItem& GetAttr(); - inline USHORT Which() const { return GetAttr().Which(); } + inline sal_uInt16 Which() const { return GetAttr().Which(); } virtual int operator==( const SwTxtAttr& ) const; @@ -129,7 +129,7 @@ protected: xub_StrLen m_nEnd; public: - SwTxtAttrEnd( SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd ); + SwTxtAttrEnd( SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd ); using SwTxtAttr::GetEnd; virtual xub_StrLen* GetEnd(); diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index da63c0c64b5a..6c6b354a7b59 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -72,7 +72,7 @@ class SwTxtAttrIterator void SearchNextChg(); public: - SwTxtAttrIterator( const SwTxtNode& rTxtNd, USHORT nWhichId, + SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId, xub_StrLen nStart = 0, sal_Bool bUseGetWhichOfScript = sal_True ); sal_Bool Next(); @@ -86,7 +86,7 @@ class SwLanguageIterator : public SwTxtAttrIterator { public: SwLanguageIterator( const SwTxtNode& rTxtNode, xub_StrLen nStart = 0, - USHORT nWhich = RES_CHRATR_LANGUAGE, + sal_uInt16 nWhich = RES_CHRATR_LANGUAGE, sal_Bool bUseGetWhichOfScript = sal_True ) : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript ) {} diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 65ecd951868c..f074a8696fdf 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -39,7 +39,7 @@ class SwCharFmt; class SwTxtCharFmt : public SwTxtAttrEnd { SwTxtNode * m_pTxtNode; - USHORT m_nSortNumber; + sal_uInt16 m_nSortNumber; public: SwTxtCharFmt( SwFmtCharFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd ); @@ -47,13 +47,13 @@ public: // werden vom SwFmtCharFmt hierher weitergeleitet virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // SwClient - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // get and set TxtNode pointer void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } - void SetSortNumber( USHORT nSortNumber ) { m_nSortNumber = nSortNumber; } - USHORT GetSortNumber() const { return m_nSortNumber; } + void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; } + sal_uInt16 GetSortNumber() const { return m_nSortNumber; } }; @@ -95,7 +95,7 @@ public: TYPEINFO(); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; /// get and set TxtNode pointer const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; } diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index 07043a9263bc..4f19924172ef 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -40,15 +40,15 @@ class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr { SwNodeIndex * m_pStartNode; SwTxtNode * m_pTxtNode; - USHORT m_nSeqNo; + sal_uInt16 m_nSeqNo; public: SwTxtFtn( SwFmtFtn& rAttr, xub_StrLen nStart ); virtual ~SwTxtFtn(); inline SwNodeIndex *GetStartNode() const { return m_pStartNode; } - void SetStartNode( const SwNodeIndex *pNode, BOOL bDelNodes = TRUE ); - void SetNumber( const USHORT nNumber, const String* = 0 ); + void SetStartNode( const SwNodeIndex *pNode, sal_Bool bDelNodes = sal_True ); + void SetNumber( const sal_uInt16 nNumber, const String* = 0 ); void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const; // get and set TxtNode pointer @@ -64,9 +64,9 @@ public: void CheckCondColl(); // fuer die Querverweise auf Fussnoten - USHORT SetSeqRefNo(); - void SetSeqNo( USHORT n ) { m_nSeqNo = n; } // for Readers - USHORT GetSeqRefNo() const { return m_nSeqNo; } + sal_uInt16 SetSeqRefNo(); + void SetSeqNo( sal_uInt16 n ) { m_nSeqNo = n; } // for Readers + sal_uInt16 GetSeqRefNo() const { return m_nSeqNo; } static void SetUniqueSeqRefNo( SwDoc& rDoc ); }; diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 8e0d66df654e..62d48320bf06 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -51,7 +51,7 @@ public: TYPEINFO(); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // get and set TxtNode pointer const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; } @@ -68,7 +68,7 @@ public: bool IsVisitedValid() const { return m_bVisitedValid; } void SetVisitedValid( bool bNew ) { m_bVisitedValid = bNew; } - BOOL IsProtect() const; + sal_Bool IsProtect() const; }; inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 7f16e4e4d44c..31c34407f57d 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -125,21 +125,21 @@ SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8, 8 ) class SwUndo { SwUndoId nId; - USHORT nOrigRedlineMode; + sal_uInt16 nOrigRedlineMode; protected: bool bCacheComment; mutable String * pComment; - void RemoveIdxFromSection( SwDoc&, ULONG nSttIdx, ULONG* pEndIdx = 0 ); - void RemoveIdxFromRange( SwPaM& rPam, BOOL bMoveNext ); - void RemoveIdxRel( ULONG, const SwPosition& ); + void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 ); + void RemoveIdxFromRange( SwPaM& rPam, sal_Bool bMoveNext ); + void RemoveIdxRel( sal_uLong, const SwPosition& ); void SetId( SwUndoId nNew ) { nId = nNew; } - static BOOL CanRedlineGroup( SwRedlineSaveDatas& rCurr, + static sal_Bool CanRedlineGroup( SwRedlineSaveDatas& rCurr, const SwRedlineSaveDatas& rCheck, - BOOL bCurrIsEnd ); + sal_Bool bCurrIsEnd ); // #111827# /** @@ -172,20 +172,20 @@ public: // das UndoObject merkt sich, welcher Mode eingeschaltet war. // In Undo/Redo/Repeat wird dann immer auf diesen zurueck geschaltet - USHORT GetRedlineMode() const { return nOrigRedlineMode; } - void SetRedlineMode( USHORT eMode ) { nOrigRedlineMode = eMode; } + sal_uInt16 GetRedlineMode() const { return nOrigRedlineMode; } + void SetRedlineMode( sal_uInt16 eMode ) { nOrigRedlineMode = eMode; } bool IsDelBox() const; // sicher und setze die RedlineDaten - static BOOL FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData, - BOOL bDelRange = TRUE, BOOL bCopyNext = TRUE ); - static BOOL FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& ); + static sal_Bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData, + sal_Bool bDelRange = sal_True, sal_Bool bCopyNext = sal_True ); + static sal_Bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& ); static void SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData ); - static BOOL HasHiddenRedlines( const SwRedlineSaveDatas& rSData ); + static sal_Bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData ); }; -typedef USHORT DelCntntType; +typedef sal_uInt16 DelCntntType; namespace nsDelCntntType { const DelCntntType DELCNT_FTN = 0x01; @@ -217,17 +217,17 @@ protected: // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray void MoveToUndoNds( SwPaM& rPam, SwNodeIndex* pNodeIdx = 0, SwIndex* pCntIdx = 0, - ULONG* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); - void MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx, xub_StrLen nCntntIdx, + sal_uLong* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); + void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, xub_StrLen nCntntIdx, SwPosition& rInsPos, - ULONG* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); + sal_uLong* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); // diese beiden Methoden bewegen den SPoint vom Pam zurueck/vor. Damit // kann fuer ein Undo/Redo ein Bereich aufgespannt werden. (Der // SPoint liegt dann vor dem manipuliertem Bereich !!) // Das Flag gibt an, ob noch vorm SPoint Inhalt steht. - BOOL MovePtBackward( SwPaM& rPam ); - void MovePtForward( SwPaM& rPam, BOOL bMvBkwrd ); + sal_Bool MovePtBackward( SwPaM& rPam ); + void MovePtForward( SwPaM& rPam, sal_Bool bMvBkwrd ); // vor dem Move ins UndoNodes-Array muss dafuer gesorgt werden, das // die Inhaltstragenden Attribute aus dem Nodes-Array entfernt werden. @@ -245,12 +245,12 @@ class SwUndoSaveSection : private SwUndoSaveCntnt { SwNodeIndex *pMvStt; SwRedlineSaveDatas* pRedlSaveData; - ULONG nMvLen; // Index ins UndoNodes-Array - ULONG nStartPos; + sal_uLong nMvLen; // Index ins UndoNodes-Array + sal_uLong nStartPos; protected: SwNodeIndex* GetMvSttIdx() const { return pMvStt; } - ULONG GetMvNodeCnt() const { return nMvLen; } + sal_uLong GetMvNodeCnt() const { return nMvLen; } public: SwUndoSaveSection(); @@ -258,7 +258,7 @@ public: void SaveSection( SwDoc* pDoc, const SwNodeIndex& rSttIdx ); void SaveSection( SwDoc* pDoc, const SwNodeRange& rRange ); - void RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, USHORT nSectType ); + void RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, sal_uInt16 nSectType ); void RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos ); const SwHistory* GetHistory() const { return pHistory; } @@ -266,20 +266,20 @@ public: }; -// Diese Klasse speichert den Pam als USHORT's und kann diese wieder zu +// Diese Klasse speichert den Pam als sal_uInt16's und kann diese wieder zu // einem PaM zusammensetzen class SwUndRng { public: - ULONG nSttNode, nEndNode; + sal_uLong nSttNode, nEndNode; xub_StrLen nSttCntnt, nEndCntnt; SwUndRng(); SwUndRng( const SwPaM& ); void SetValues( const SwPaM& rPam ); - void SetPaM( SwPaM&, BOOL bCorrToCntnt = FALSE ) const; - void SetPaM( SwUndoIter&, BOOL bCorrToCntnt = FALSE ) const; + void SetPaM( SwPaM&, sal_Bool bCorrToCntnt = sal_False ) const; + void SetPaM( SwUndoIter&, sal_Bool bCorrToCntnt = sal_False ) const; }; @@ -290,7 +290,7 @@ class SwUndoStart: public SwUndo // GetUserId() erfragt werden. SwUndoId nUserId; // fuer die "Verpointerung" von Start- und End-Undos - USHORT nEndOffset; + sal_uInt16 nEndOffset; SwRewriter mRewriter; @@ -309,8 +309,8 @@ public: virtual SwUndoId GetEffectiveId() const; SwUndoId GetUserId() const { return nUserId; } // Setzen vom End-Undo-Offset geschieht im Doc::EndUndo - USHORT GetEndOffset() const { return nEndOffset; } - void SetEndOffset( USHORT n ) { nEndOffset = n; } + sal_uInt16 GetEndOffset() const { return nEndOffset; } + void SetEndOffset( sal_uInt16 n ) { nEndOffset = n; } }; class SwUndoEnd: public SwUndo @@ -320,7 +320,7 @@ class SwUndoEnd: public SwUndo // GetUserId() erfragt werden. SwUndoId nUserId; // fuer die "Verpointerung" von Start- und End-Undos - USHORT nSttOffset; + sal_uInt16 nSttOffset; SwRewriter mRewriter; @@ -340,8 +340,8 @@ public: SwUndoId GetUserId() const { return nUserId; } // Setzen vom Start-Undo-Offset geschieht im Doc::EndUndo - void SetSttOffset(USHORT _nSttOffSet) { nSttOffset = _nSttOffSet; } - USHORT GetSttOffset() const { return nSttOffset; } + void SetSttOffset(sal_uInt16 _nSttOffSet) { nSttOffset = _nSttOffSet; } + sal_uInt16 GetSttOffset() const { return nSttOffset; } }; class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt @@ -349,16 +349,16 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt SwPosition *pPos; // Inhalt fuers Redo String *pTxt, *pUndoTxt; SwRedlineData* pRedlData; - ULONG nNode; + sal_uLong nNode; xub_StrLen nCntnt, nLen; - BOOL bIsWordDelim : 1; - BOOL bIsAppend : 1; + sal_Bool bIsWordDelim : 1; + sal_Bool bIsAppend : 1; const IDocumentContentOperations::InsertFlags m_nInsertFlags; friend class SwDoc; // eigentlich nur SwDoc::Insert( String ) - BOOL CanGrouping( sal_Unicode cIns ); - BOOL CanGrouping( const SwPosition& rPos ); + sal_Bool CanGrouping( sal_Unicode cIns ); + sal_Bool CanGrouping( const SwPosition& rPos ); SwDoc * pDoc; @@ -368,7 +368,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt public: SwUndoInsert( const SwNodeIndex& rNode, xub_StrLen nCntnt, xub_StrLen nLen, const IDocumentContentOperations::InsertFlags nInsertFlags, - BOOL bWDelim = TRUE ); + sal_Bool bWDelim = sal_True ); SwUndoInsert( const SwNodeIndex& rNode ); virtual ~SwUndoInsert(); @@ -406,25 +406,25 @@ class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt String sTableName; - ULONG nNode; - ULONG nNdDiff; // Differenz von Nodes vor-nach Delete - ULONG nSectDiff; // Diff. von Nodes vor/nach Move mit SectionNodes - ULONG nReplaceDummy; // Diff. to a temporary dummy object - USHORT nSetPos; - - BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in CanGrouping() ausgwertet !! - BOOL bBackSp : 1; // TRUE: wenn Gruppierung und der Inhalt davor geloescht wird - BOOL bJoinNext: 1; // TRUE: wenn der Bereich von Oben nach unten geht - BOOL bTblDelLastNd : 1; // TRUE: TextNode hinter der Tabelle einf./loeschen - BOOL bDelFullPara : 1; // TRUE: gesamte Nodes wurden geloescht - BOOL bResetPgDesc : 1; // TRUE: am nachfolgenden Node das PgDsc zuruecksetzen - BOOL bResetPgBrk : 1; // TRUE: am nachfolgenden Node das PgBreak zuruecksetzen - BOOL bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl - - BOOL SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd, + sal_uLong nNode; + sal_uLong nNdDiff; // Differenz von Nodes vor-nach Delete + sal_uLong nSectDiff; // Diff. von Nodes vor/nach Move mit SectionNodes + sal_uLong nReplaceDummy; // Diff. to a temporary dummy object + sal_uInt16 nSetPos; + + sal_Bool bGroup : 1; // sal_True: ist schon eine Gruppe; wird in CanGrouping() ausgwertet !! + sal_Bool bBackSp : 1; // sal_True: wenn Gruppierung und der Inhalt davor geloescht wird + sal_Bool bJoinNext: 1; // sal_True: wenn der Bereich von Oben nach unten geht + sal_Bool bTblDelLastNd : 1; // sal_True: TextNode hinter der Tabelle einf./loeschen + sal_Bool bDelFullPara : 1; // sal_True: gesamte Nodes wurden geloescht + sal_Bool bResetPgDesc : 1; // sal_True: am nachfolgenden Node das PgDsc zuruecksetzen + sal_Bool bResetPgBrk : 1; // sal_True: am nachfolgenden Node das PgBreak zuruecksetzen + sal_Bool bFromTableCopy : 1; // sal_True: called by SwUndoTblCpyTbl + + sal_Bool SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd, SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd ); public: - SwUndoDelete( SwPaM&, BOOL bFullPara = FALSE, BOOL bCalledByTblCpy = FALSE ); + SwUndoDelete( SwPaM&, sal_Bool bFullPara = sal_False, sal_Bool bCalledByTblCpy = sal_False ); virtual ~SwUndoDelete(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); @@ -444,12 +444,12 @@ public: */ virtual SwRewriter GetRewriter() const; - BOOL CanGrouping( SwDoc*, const SwPaM& ); + sal_Bool CanGrouping( SwDoc*, const SwPaM& ); - void SetTblDelLastNd() { bTblDelLastNd = TRUE; } + void SetTblDelLastNd() { bTblDelLastNd = sal_True; } // fuer die PageDesc/PageBreak Attribute einer Tabelle - void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc ) + void SetPgBrkFlags( sal_Bool bPageBreak, sal_Bool bPageDesc ) { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; } void SetTableName(const String & rName); @@ -457,7 +457,7 @@ public: // SwUndoTblCpyTbl needs this information: long NodeDiff() const { return nSttNode - nEndNode; } xub_StrLen ContentStart() const { return nSttCntnt; } - BOOL IsDelFullPara() const { return bDelFullPara; } + sal_Bool IsDelFullPara() const { return bDelFullPara; } DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete) }; @@ -467,10 +467,10 @@ class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt { String aDelStr, aInsStr; SwRedlineSaveDatas* pRedlSaveData; - ULONG nSttNode; + sal_uLong nSttNode; xub_StrLen nSttCntnt; - BOOL bInsChar : 1; // kein Overwrite mehr; sondern Insert - BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in + sal_Bool bInsChar : 1; // kein Overwrite mehr; sondern Insert + sal_Bool bGroup : 1; // sal_True: ist schon eine Gruppe; wird in // CanGrouping() ausgwertet !! public: SwUndoOverwrite( SwDoc*, SwPosition&, sal_Unicode cIns ); @@ -493,7 +493,7 @@ public: */ virtual SwRewriter GetRewriter() const; - BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); + sal_Bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); }; @@ -501,17 +501,17 @@ class SwUndoSplitNode: public SwUndo { SwHistory* pHistory; SwRedlineData* pRedlData; - ULONG nNode; + sal_uLong nNode; xub_StrLen nCntnt; - BOOL bTblFlag : 1; - BOOL bChkTblStt : 1; + sal_Bool bTblFlag : 1; + sal_Bool bChkTblStt : 1; public: - SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, BOOL bChkTbl ); + SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, sal_Bool bChkTbl ); virtual ~SwUndoSplitNode(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); - void SetTblFlag() { bTblFlag = TRUE; } + void SetTblFlag() { bTblFlag = sal_True; } }; @@ -520,12 +520,12 @@ class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt // nDest.. - Bereich, in den verschoben wurde (nach dem Move!) // nIns.. - Position, von der verschoben wurde und wieder die neue InsPos. ist // nMv.. Position auf die verschoben wird (vor dem Move!) ; fuers REDO - ULONG nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode; + sal_uLong nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode; xub_StrLen nDestSttCntnt, nDestEndCntnt, nInsPosCntnt, nMvDestCntnt; - USHORT nFtnStt; // StartPos der Fussnoten in der History + sal_uInt16 nFtnStt; // StartPos der Fussnoten in der History - BOOL bJoinNext : 1, + sal_Bool bJoinNext : 1, bJoinPrev : 1, bMoveRange : 1; @@ -538,13 +538,13 @@ public: virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); // setze den Destination-Bereich nach dem Verschieben. - void SetDestRange( const SwPaM&, const SwPosition&, BOOL, BOOL ); + void SetDestRange( const SwPaM&, const SwPosition&, sal_Bool, sal_Bool ); void SetDestRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, const SwNodeIndex& rInsPos ); - BOOL IsMoveRange() const { return bMoveRange; } - ULONG GetEndNode() const { return nEndNode; } - ULONG GetDestSttNode() const { return nDestSttNode; } + sal_Bool IsMoveRange() const { return bMoveRange; } + sal_uLong GetEndNode() const { return nEndNode; } + sal_uLong GetDestSttNode() const { return nDestSttNode; } xub_StrLen GetDestSttCntnt() const { return nDestSttCntnt; } void SetMoveRedlines( bool b ) { bMoveRedlines = b; } @@ -558,7 +558,7 @@ class SwUndoAttr : public SwUndo, private SwUndRng const ::std::auto_ptr<SwHistory> m_pHistory; // History for Undo ::std::auto_ptr<SwRedlineData> m_pRedlineData; // Redlining ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; - ULONG m_nNodeIndex; // Offset: for Redlining + sal_uLong m_nNodeIndex; // Offset: for Redlining const SetAttrMode m_nInsertFlags; // insert flags void RemoveIdx( SwDoc& rDoc ); @@ -570,7 +570,7 @@ public: virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); - void SaveRedlineData( const SwPaM& rPam, BOOL bInsCntnt ); + void SaveRedlineData( const SwPaM& rPam, sal_Bool bInsCntnt ); SwHistory& GetHistory() { return *m_pHistory; } @@ -580,11 +580,11 @@ class SwUndoResetAttr : public SwUndo, private SwUndRng { const ::std::auto_ptr<SwHistory> m_pHistory; SvUShortsSort m_Ids; - const USHORT m_nFormatId; // Format-Id for Redo + const sal_uInt16 m_nFormatId; // Format-Id for Redo public: - SwUndoResetAttr( const SwPaM&, USHORT nFmtId ); - SwUndoResetAttr( const SwPosition&, USHORT nFmtId ); + SwUndoResetAttr( const SwPaM&, sal_uInt16 nFmtId ); + SwUndoResetAttr( const SwPosition&, sal_uInt16 nFmtId ); virtual ~SwUndoResetAttr(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); @@ -600,8 +600,8 @@ class SwUndoFmtAttr : public SwUndo friend class SwUndoDefaultAttr; SwFmt * m_pFmt; ::std::auto_ptr<SfxItemSet> m_pOldSet; // old attributes - ULONG m_nNodeIndex; - const USHORT m_nFmtWhich; + sal_uLong m_nNodeIndex; + const sal_uInt16 m_nFmtWhich; const bool m_bSaveDrawPt; bool IsFmtInDoc( SwDoc* ); //is the attribute format still in the Doc? @@ -647,7 +647,7 @@ class SwUndoFmtResetAttr : public SwUndo { public: SwUndoFmtResetAttr( SwFmt& rChangedFormat, - const USHORT nWhichId ); + const sal_uInt16 nWhichId ); ~SwUndoFmtResetAttr(); virtual void Undo( SwUndoIter& ); @@ -657,7 +657,7 @@ class SwUndoFmtResetAttr : public SwUndo // format at which a certain attribute is reset. SwFmt * const m_pChangedFormat; // which ID of the reset attribute - const USHORT m_nWhichId; + const sal_uInt16 m_nWhichId; // old attribute which has been reset - needed for undo. ::std::auto_ptr<SfxPoolItem> m_pOldItem; }; @@ -665,7 +665,7 @@ class SwUndoFmtResetAttr : public SwUndo class SwUndoDontExpandFmt : public SwUndo { - const ULONG m_nNodeIndex; + const sal_uLong m_nNodeIndex; const xub_StrLen m_nContentIndex; public: @@ -744,7 +744,7 @@ class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng const bool m_bModulus; public: - SwUndoMoveLeftMargin( const SwPaM&, BOOL bRight, BOOL bModulus ); + SwUndoMoveLeftMargin( const SwPaM&, sal_Bool bRight, sal_Bool bModulus ); virtual ~SwUndoMoveLeftMargin(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); @@ -761,11 +761,11 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt SvPtrarr* pFrmFmts; SwUndos* pFlyUndos; SwRedlineData* pRedlData; - BOOL bSttWasTxtNd; + sal_Bool bSttWasTxtNd; protected: - ULONG nNdDiff; + sal_uLong nNdDiff; SwPosition *pPos; // Inhalt fuers Redo - USHORT nSetPos; // Start in der History-Liste + sal_uInt16 nSetPos; // Start in der History-Liste SwUndoInserts( SwUndoId nUndoId, const SwPaM& ); public: @@ -775,8 +775,8 @@ public: virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); // setze den Destination-Bereich nach dem Einlesen. - void SetInsertRange( const SwPaM&, BOOL bScanFlys = TRUE, - BOOL bSttWasTxtNd = TRUE ); + void SetInsertRange( const SwPaM&, sal_Bool bScanFlys = sal_True, + sal_Bool bSttWasTxtNd = sal_True ); }; class SwUndoInsDoc : public SwUndoInserts @@ -799,13 +799,13 @@ class SwUndoInsTbl : public SwUndo SvUShorts* pColWidth; SwRedlineData* pRedlData; SwTableAutoFmt* pAutoFmt; - ULONG nSttNode; - USHORT nRows, nCols; - USHORT nAdjust; + sal_uLong nSttNode; + sal_uInt16 nRows, nCols; + sal_uInt16 nAdjust; public: - SwUndoInsTbl( const SwPosition&, USHORT nCols, USHORT nRows, - USHORT eAdjust, const SwInsertTableOptions& rInsTblOpts, + SwUndoInsTbl( const SwPosition&, sal_uInt16 nCols, sal_uInt16 nRows, + sal_uInt16 eAdjust, const SwInsertTableOptions& rInsTblOpts, const SwTableAutoFmt* pTAFmt, const SvUShorts* pColArr, const String & rName); virtual ~SwUndoInsTbl(); @@ -825,11 +825,11 @@ class SwUndoTxtToTbl : public SwUndo, public SwUndRng SwTableAutoFmt* pAutoFmt; SwHistory* pHistory; sal_Unicode cTrenner; - USHORT nAdjust; - BOOL bSplitEnd : 1; + sal_uInt16 nAdjust; + sal_Bool bSplitEnd : 1; public: - SwUndoTxtToTbl( const SwPaM&, const SwInsertTableOptions&, sal_Unicode , USHORT, + SwUndoTxtToTbl( const SwPaM&, const SwInsertTableOptions&, sal_Unicode , sal_uInt16, const SwTableAutoFmt* pAFmt ); virtual ~SwUndoTxtToTbl(); @@ -848,11 +848,11 @@ class SwUndoTblToTxt : public SwUndo _SaveTable* pTblSave; SwTblToTxtSaves* pBoxSaves; SwHistory* pHistory; - ULONG nSttNd, nEndNd; - USHORT nAdjust; + sal_uLong nSttNd, nEndNd; + sal_uInt16 nAdjust; sal_Unicode cTrenner; - USHORT nHdlnRpt; - BOOL bCheckNumFmt : 1; + sal_uInt16 nHdlnRpt; + sal_Bool bCheckNumFmt : 1; public: SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh ); @@ -862,17 +862,17 @@ public: virtual void Repeat( SwUndoIter& ); void SetRange( const SwNodeRange& ); - void AddBoxPos( SwDoc& rDoc, ULONG nNdIdx, ULONG nEndIdx, + void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, xub_StrLen nCntntIdx = STRING_MAXLEN); }; class SwUndoAttrTbl : public SwUndo { - ULONG nSttNode; + sal_uLong nSttNode; _SaveTable* pSaveTbl; - BOOL bClearTabCol : 1; + sal_Bool bClearTabCol : 1; public: - SwUndoAttrTbl( const SwTableNode& rTblNd, BOOL bClearTabCols = FALSE ); + SwUndoAttrTbl( const SwTableNode& rTblNd, sal_Bool bClearTabCols = sal_False ); virtual ~SwUndoAttrTbl(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); @@ -880,12 +880,12 @@ public: class SwUndoTblAutoFmt : public SwUndo { - ULONG nSttNode; + sal_uLong nSttNode; _SaveTable* pSaveTbl; SwUndos* pUndos; - BOOL bSaveCntntAttr; + sal_Bool bSaveCntntAttr; - void UndoRedo( BOOL bUndo, SwUndoIter& rUndoIter ); + void UndoRedo( sal_Bool bUndo, SwUndoIter& rUndoIter ); public: SwUndoTblAutoFmt( const SwTableNode& rTblNd, const SwTableAutoFmt& ); @@ -906,16 +906,16 @@ class SwUndoTblNdsChg : public SwUndo } Ptrs; SvBools aMvBoxes; // fuers SplitRow (aufgeteilte Nodes einer Box) long nMin, nMax; // for redo of delete column - ULONG nSttNode, nCurrBox; - USHORT nCount, nRelDiff, nAbsDiff, nSetColType; - BOOL bFlag; - BOOL bSameHeight; // only used for SplitRow + sal_uLong nSttNode, nCurrBox; + sal_uInt16 nCount, nRelDiff, nAbsDiff, nSetColType; + sal_Bool bFlag; + sal_Bool bSameHeight; // only used for SplitRow public: SwUndoTblNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes, const SwTableNode& rTblNd, long nMn, long nMx, - USHORT nCnt, BOOL bFlg, BOOL bSameHeight ); + sal_uInt16 nCnt, sal_Bool bFlg, sal_Bool bSameHeight ); // fuer SetColWidth SwUndoTblNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes, @@ -932,21 +932,21 @@ public: void ReNewBoxes( const SwSelBoxes& rBoxes ); - void SetColWidthParam( ULONG nBoxIdx, USHORT nMode, USHORT nType, + void SetColWidthParam( sal_uLong nBoxIdx, sal_uInt16 nMode, sal_uInt16 nType, SwTwips nAbsDif, SwTwips nRelDif ) { nCurrBox = nBoxIdx; nCount = nMode; nSetColType = nType; - nAbsDiff = (USHORT)nAbsDif; - nRelDiff = (USHORT)nRelDif; + nAbsDiff = (sal_uInt16)nAbsDif; + nRelDiff = (sal_uInt16)nRelDif; } }; class SwUndoTblMerge : public SwUndo, private SwUndRng { - ULONG nTblNode; + sal_uLong nTblNode; _SaveTable* pSaveTbl; SvULongs aBoxes, aNewSttNds; SwUndoMoves* pMoves; @@ -962,7 +962,7 @@ public: void SetSelBoxes( const SwSelBoxes& rBoxes ); - void AddNewBox( ULONG nSttNdIdx ) + void AddNewBox( sal_uLong nSttNdIdx ) { aNewSttNds.Insert( nSttNdIdx, aNewSttNds.Count() ); } void SaveCollection( const SwTableBox& rBox ); @@ -976,14 +976,14 @@ class SwUndoTblNumFmt : public SwUndo SwHistory* pHistory; String aStr, aNewFml; - ULONG nFmtIdx, nNewFmtIdx; + sal_uLong nFmtIdx, nNewFmtIdx; double fNum, fNewNum; - ULONG nNode; - ULONG nNdPos; + sal_uLong nNode; + sal_uLong nNdPos; - BOOL bNewFmt : 1; - BOOL bNewFml : 1; - BOOL bNewValue : 1; + sal_Bool bNewFmt : 1; + sal_Bool bNewFml : 1; + sal_Bool bNewValue : 1; public: SwUndoTblNumFmt( const SwTableBox& rBox, const SfxItemSet* pNewSet = 0 ); @@ -991,7 +991,7 @@ public: virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void SetNumFmt( ULONG nNewNumFmtIdx, const double& rNewNumber ) + void SetNumFmt( sal_uLong nNewNumFmtIdx, const double& rNewNumber ) { nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; } void SetBox( const SwTableBox& rBox ); }; @@ -1013,42 +1013,42 @@ public: virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void AddBoxBefore( const SwTableBox& rBox, BOOL bDelCntnt ); - void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, BOOL bDelCntnt ); + void AddBoxBefore( const SwTableBox& rBox, sal_Bool bDelCntnt ); + void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, sal_Bool bDelCntnt ); - BOOL IsEmpty() const; - BOOL InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, USHORT nCnt ); + sal_Bool IsEmpty() const; + sal_Bool InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ); }; class SwUndoCpyTbl : public SwUndo { SwUndoDelete* pDel; - ULONG nTblNode; + sal_uLong nTblNode; public: SwUndoCpyTbl(); virtual ~SwUndoCpyTbl(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void SetTableSttIdx( ULONG nIdx ) { nTblNode = nIdx; } + void SetTableSttIdx( sal_uLong nIdx ) { nTblNode = nIdx; } }; class SwUndoSplitTbl : public SwUndo { - ULONG nTblNode, nOffset; + sal_uLong nTblNode, nOffset; SwSaveRowSpan* mpSaveRowSpan; // stores the row span values at the splitting row _SaveTable* pSavTbl; SwHistory* pHistory; - USHORT nMode, nFmlEnd; - BOOL bCalcNewSize; + sal_uInt16 nMode, nFmlEnd; + sal_Bool bCalcNewSize; public: - SwUndoSplitTbl( const SwTableNode& rTblNd, SwSaveRowSpan* pRowSp, USHORT nMode, BOOL bCalcNewSize ); + SwUndoSplitTbl( const SwTableNode& rTblNd, SwSaveRowSpan* pRowSp, sal_uInt16 nMode, sal_Bool bCalcNewSize ); virtual ~SwUndoSplitTbl(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); - void SetTblNodeOffset( ULONG nIdx ) { nOffset = nIdx - nTblNode; } + void SetTblNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - nTblNode; } SwHistory* GetHistory() { return pHistory; } void SaveFormula( SwHistory& rHistory ); }; @@ -1056,14 +1056,14 @@ public: class SwUndoMergeTbl : public SwUndo { String aName; - ULONG nTblNode; + sal_uLong nTblNode; _SaveTable* pSavTbl, *pSavHdl; SwHistory* pHistory; - USHORT nMode; - BOOL bWithPrev; + sal_uInt16 nMode; + sal_Bool bWithPrev; public: SwUndoMergeTbl( const SwTableNode& rTblNd, const SwTableNode& rDelTblNd, - BOOL bWithPrev, USHORT nMode ); + sal_Bool bWithPrev, sal_uInt16 nMode ); virtual ~SwUndoMergeTbl(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); @@ -1120,8 +1120,8 @@ struct SwSortUndoElement { union { struct { - ULONG nKenn; - ULONG nSource, nTarget; + sal_uLong nKenn; + sal_uLong nSource, nTarget; } TXT; struct { String *pSource, *pTarget; @@ -1133,7 +1133,7 @@ struct SwSortUndoElement SORT_TXT_TBL.TBL.pSource = new String( aS ); SORT_TXT_TBL.TBL.pTarget = new String( aT ); } - SwSortUndoElement( ULONG nS, ULONG nT ) + SwSortUndoElement( sal_uLong nS, sal_uLong nT ) { SORT_TXT_TBL.TXT.nSource = nS; SORT_TXT_TBL.TXT.nTarget = nT; @@ -1151,13 +1151,13 @@ class SwUndoSort : public SwUndo, private SwUndRng SwSortList aSortList; SwUndoAttrTbl* pUndoTblAttr; SwRedlineData* pRedlData; - ULONG nTblNd; + sal_uLong nTblNd; void RemoveIdx( SwPaM& rPam ); public: SwUndoSort( const SwPaM&, const SwSortOptions& ); - SwUndoSort( ULONG nStt, ULONG nEnd, const SwTableNode&, - const SwSortOptions&, BOOL bSaveTable ); + SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode&, + const SwSortOptions&, sal_Bool bSaveTable ); virtual ~SwUndoSort(); virtual void Undo( SwUndoIter& ); @@ -1165,7 +1165,7 @@ public: virtual void Repeat( SwUndoIter& ); void Insert( const String& rOrgPos, const String& rNewPos ); - void Insert( ULONG nOrgPos, ULONG nNewPos ); + void Insert( sal_uLong nOrgPos, sal_uLong nNewPos ); }; @@ -1177,18 +1177,18 @@ class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection { protected: SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat - ULONG nNdPgPos; + sal_uLong nNdPgPos; xub_StrLen nCntPos; // Seite/am Absatz/im Absatz - USHORT nRndId; - BOOL bDelFmt; // loesche das gespeicherte Format + sal_uInt16 nRndId; + sal_Bool bDelFmt; // loesche das gespeicherte Format - void InsFly( SwUndoIter&, BOOL bShowSel = TRUE ); + void InsFly( SwUndoIter&, sal_Bool bShowSel = sal_True ); void DelFly( SwDoc* ); SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId ); SwNodeIndex* GetMvSttIdx() const { return SwUndoSaveSection::GetMvSttIdx(); } - ULONG GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } + sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } public: virtual ~SwUndoFlyBase(); @@ -1200,10 +1200,10 @@ public: class SwUndoInsLayFmt : public SwUndoFlyBase { - ULONG mnCrsrSaveIndexPara; // Cursor position + sal_uLong mnCrsrSaveIndexPara; // Cursor position xub_StrLen mnCrsrSaveIndexPos; // for undo public: - SwUndoInsLayFmt( SwFrmFmt* pFormat, ULONG nNodeIdx, xub_StrLen nCntIdx ); + SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, xub_StrLen nCntIdx ); ~SwUndoInsLayFmt(); virtual void Undo( SwUndoIter& ); @@ -1216,7 +1216,7 @@ public: class SwUndoDelLayFmt : public SwUndoFlyBase { - BOOL bShowSelFrm; + sal_Bool bShowSelFrm; public: SwUndoDelLayFmt( SwFrmFmt* pFormat ); @@ -1224,7 +1224,7 @@ public: virtual void Redo( SwUndoIter& ); void Redo(); // Schnittstelle fuers Rollback - void ChgShowSel( BOOL bNew ) { bShowSelFrm = bNew; } + void ChgShowSel( sal_Bool bNew ) { bShowSelFrm = bNew; } virtual SwRewriter GetRewriter() const; @@ -1237,14 +1237,14 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient SwFrmFmt* pOldFmt; // die alte Fly Vorlage SwFrmFmt* pNewFmt; // die neue Fly Vorlage SfxItemSet* pItemSet; // die zurueck-/ gesetzten Attribute - ULONG nOldNode, nNewNode; + sal_uLong nOldNode, nNewNode; xub_StrLen nOldCntnt, nNewCntnt; - USHORT nOldAnchorTyp, nNewAnchorTyp; - BOOL bAnchorChgd; + sal_uInt16 nOldAnchorTyp, nNewAnchorTyp; + sal_Bool bAnchorChgd; - void PutAttr( USHORT nWhich, const SfxPoolItem* pItem ); + void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ); void Modify( SfxPoolItem*, SfxPoolItem* ); - void GetAnchor( SwFmtAnchor& rAnhor, ULONG nNode, xub_StrLen nCntnt ); + void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, xub_StrLen nCntnt ); public: SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt ); @@ -1265,8 +1265,8 @@ class SwUndoReplace : public SwUndo { friend class SwDoc; - BOOL bOldIterFlag; // Status vom Undo-Iter vorm 1. Aufruf - USHORT nAktPos; // fuer GetUndoRange und Undo/Redo + sal_Bool bOldIterFlag; // Status vom Undo-Iter vorm 1. Aufruf + sal_uInt16 nAktPos; // fuer GetUndoRange und Undo/Redo _UnReplaceDatas aArr; SwRedlineData* pRedlData; @@ -1298,10 +1298,10 @@ public: */ virtual SwRewriter GetRewriter() const; - void AddEntry( const SwPaM& rPam, const String& rInsert, BOOL bRegExp ); + void AddEntry( const SwPaM& rPam, const String& rInsert, sal_Bool bRegExp ); void SetEntryEnd( const SwPaM& rPam ); - BOOL IsFull() const + sal_Bool IsFull() const { return ((USHRT_MAX / sizeof( void* )) - 50 ) < aArr.Count(); } }; @@ -1312,11 +1312,11 @@ public: class SwUndoTblHeadline : public SwUndo { - ULONG nTblNd; - USHORT nOldHeadline; - USHORT nNewHeadline; + sal_uLong nTblNd; + sal_uInt16 nOldHeadline; + sal_uInt16 nNewHeadline; public: - SwUndoTblHeadline( const SwTable&, USHORT nOldHdl, USHORT nNewHdl ); + SwUndoTblHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16 nNewHdl ); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); @@ -1333,12 +1333,12 @@ private: const ::std::auto_ptr<SfxItemSet> m_pAttrSet; ::std::auto_ptr<SwHistory> m_pHistory; ::std::auto_ptr<SwRedlineData> m_pRedlData; - ULONG m_nSectionNodePos; + sal_uLong m_nSectionNodePos; bool m_bSplitAtStart : 1; bool m_bSplitAtEnd : 1; bool m_bUpdateFtn : 1; - void Join( SwDoc& rDoc, ULONG nNode ); + void Join( SwDoc& rDoc, sal_uLong nNode ); public: SwUndoInsSection(SwPaM const&, SwSectionData const&, @@ -1348,7 +1348,7 @@ public: virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); - void SetSectNdPos(ULONG const nPos) { m_nSectionNodePos = nPos; } + void SetSectNdPos(sal_uLong const nPos) { m_nSectionNodePos = nPos; } void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart); void SetUpdtFtnFlag(bool const bFlag) { m_bUpdateFtn = bFlag; } }; @@ -1392,10 +1392,10 @@ class SwUndoInsNum : public SwUndo, private SwUndRng { SwNumRule aNumRule; SwHistory* pHistory; - ULONG nSttSet; + sal_uLong nSttSet; SwNumRule* pOldNumRule; String sReplaceRule; - USHORT nLRSavePos; + sal_uInt16 nLRSavePos; public: SwUndoInsNum( const SwPaM& rPam, const SwNumRule& rRule ); SwUndoInsNum( const SwNumRule& rOldRule, const SwNumRule& rNewRule, @@ -1409,7 +1409,7 @@ public: virtual SwRewriter GetRewriter() const; SwHistory* GetHistory(); // wird ggfs. neu angelegt! - void SetSttNum( ULONG nNdIdx ) { nSttSet = nNdIdx; } + void SetSttNum( sal_uLong nNdIdx ) { nSttSet = nNdIdx; } void SaveOldNumRule( const SwNumRule& rOld ); void SetLRSpaceEndPos(); @@ -1429,21 +1429,21 @@ public: virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); - void AddNode( const SwTxtNode& rNd, BOOL bResetLRSpace ); + void AddNode( const SwTxtNode& rNd, sal_Bool bResetLRSpace ); SwHistory* GetHistory() { return pHistory; } }; class SwUndoMoveNum : public SwUndo, private SwUndRng { - ULONG nNewStt; + sal_uLong nNewStt; long nOffset; public: - SwUndoMoveNum( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv = FALSE ); + SwUndoMoveNum( const SwPaM& rPam, long nOffset, sal_Bool bIsOutlMv = sal_False ); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); - void SetStartNode( ULONG nValue ) { nNewStt = nValue; } + void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; } }; class SwUndoNumUpDown : public SwUndo, private SwUndRng @@ -1458,12 +1458,12 @@ public: class SwUndoNumOrNoNum : public SwUndo { - ULONG nIdx; - BOOL mbNewNum, mbOldNum; + sal_uLong nIdx; + sal_Bool mbNewNum, mbOldNum; public: - SwUndoNumOrNoNum( const SwNodeIndex& rIdx, BOOL mbOldNum, - BOOL mbNewNum ); + SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool mbOldNum, + sal_Bool mbNewNum ); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); @@ -1471,13 +1471,13 @@ public: class SwUndoNumRuleStart : public SwUndo { - ULONG nIdx; - USHORT nOldStt, nNewStt; - BOOL bSetSttValue : 1; - BOOL bFlag : 1; + sal_uLong nIdx; + sal_uInt16 nOldStt, nNewStt; + sal_Bool bSetSttValue : 1; + sal_Bool bFlag : 1; public: - SwUndoNumRuleStart( const SwPosition& rPos, BOOL bDelete ); - SwUndoNumRuleStart( const SwPosition& rPos, USHORT nStt ); + SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bDelete ); + SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt ); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); virtual void Repeat( SwUndoIter& ); @@ -1502,16 +1502,16 @@ public: class SwUndoDrawGroup : public SwUndo { SwUndoGroupObjImpl* pObjArr; - USHORT nSize; - BOOL bDelFmt; + sal_uInt16 nSize; + sal_Bool bDelFmt; public: - SwUndoDrawGroup( USHORT nCnt ); + SwUndoDrawGroup( sal_uInt16 nCnt ); virtual ~SwUndoDrawGroup(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void AddObj( USHORT nPos, SwDrawFrmFmt*, SdrObject* ); + void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, SdrObject* ); void SetGroupFmt( SwDrawFrmFmt* ); }; @@ -1530,8 +1530,8 @@ public: class SwUndoDrawUnGroup : public SwUndo { SwUndoGroupObjImpl* pObjArr; - USHORT nSize; - BOOL bDelFmt; + sal_uInt16 nSize; + sal_Bool bDelFmt; public: SwUndoDrawUnGroup( SdrObjGroup* ); @@ -1539,7 +1539,7 @@ public: virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void AddObj( USHORT nPos, SwDrawFrmFmt* ); + void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* ); }; // --> OD 2006-11-01 #130889# @@ -1564,16 +1564,16 @@ class SwUndoDrawDelete : public SwUndo { SwUndoGroupObjImpl* pObjArr; SdrMarkList* pMarkLst; // MarkList for all selected SdrObjects - USHORT nSize; - BOOL bDelFmt; + sal_uInt16 nSize; + sal_Bool bDelFmt; public: - SwUndoDrawDelete( USHORT nCnt ); + SwUndoDrawDelete( sal_uInt16 nCnt ); virtual ~SwUndoDrawDelete(); virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void AddObj( USHORT nPos, SwDrawFrmFmt*, const SdrMark& ); + void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& ); }; //-------------------------------------------------------------------- @@ -1582,8 +1582,8 @@ class SwUndoReRead : public SwUndo { Graphic *pGrf; String *pNm, *pFltr; - ULONG nPos; - USHORT nMirr; + sal_uLong nPos; + sal_uInt16 nMirr; void SaveGraphicData( const SwGrfNode& ); void SetAndSave( SwUndoIter& ); @@ -1609,7 +1609,7 @@ class SwUndoInsertLabel : public SwUndo struct { // fuer Tabelle/TextRahmen SwUndoDelete* pUndoInsNd; - ULONG nNode; + sal_uLong nNode; } NODE; }; @@ -1620,12 +1620,12 @@ class SwUndoInsertLabel : public SwUndo String sNumberSeparator; String sCharacterStyle; // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed - USHORT nFldId; + sal_uInt16 nFldId; SwLabelType eType; - BYTE nLayerId; // fuer Zeichen-Objekte - BOOL bBefore :1; - BOOL bUndoKeep :1; - BOOL bCpyBrd :1; + sal_uInt8 nLayerId; // fuer Zeichen-Objekte + sal_Bool bBefore :1; + sal_Bool bUndoKeep :1; + sal_Bool bCpyBrd :1; public: SwUndoInsertLabel( const SwLabelType eTyp, const String &rText, @@ -1633,9 +1633,9 @@ public: const String& rSeparator, // <-- const String& rNumberSeparator, //#i61007# order of captions - const BOOL bBefore, const USHORT nId, + const sal_Bool bBefore, const sal_uInt16 nId, const String& rCharacterStyle, - const BOOL bCpyBrd ); + const sal_Bool bCpyBrd ); virtual ~SwUndoInsertLabel(); virtual void Undo( SwUndoIter& ); @@ -1657,12 +1657,12 @@ public: */ virtual SwRewriter GetRewriter() const; - void SetNodePos( ULONG nNd ) + void SetNodePos( sal_uLong nNd ) { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; } - void SetUndoKeep() { bUndoKeep = TRUE; } + void SetUndoKeep() { bUndoKeep = sal_True; } void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly ); - void SetDrawObj( BYTE nLayerId ); + void SetDrawObj( sal_uInt8 nLayerId ); }; //-------------------------------------------------------------------- @@ -1671,12 +1671,12 @@ class SwUndoChangeFootNote : public SwUndo, private SwUndRng { const ::std::auto_ptr<SwHistory> m_pHistory; const String m_Text; - const USHORT m_nNumber; + const sal_uInt16 m_nNumber; const bool m_bEndNote; public: SwUndoChangeFootNote( const SwPaM& rRange, const String& rTxt, - USHORT nNum, bool bIsEndNote ); + sal_uInt16 nNum, bool bIsEndNote ); virtual ~SwUndoChangeFootNote(); virtual void Undo( SwUndoIter& ); @@ -1730,7 +1730,7 @@ public: void AddChanges( SwTxtNode& rTNd, xub_StrLen nStart, xub_StrLen nLen, ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); - BOOL HasData() const { return aChanges.size() > 0; } + sal_Bool HasData() const { return aChanges.size() > 0; } }; //-------------------------------------------------------------------- @@ -1741,7 +1741,7 @@ protected: SwRedlineData* pRedlData; SwRedlineSaveDatas* pRedlSaveData; SwUndoId nUserId; - BOOL bHiddenRedlines; + sal_Bool bHiddenRedlines; virtual void _Undo( SwUndoIter& ); virtual void _Redo( SwUndoIter& ); @@ -1753,15 +1753,15 @@ public: virtual void Redo( SwUndoIter& ); SwUndoId GetUserId() const { return nUserId; } - USHORT GetRedlSaveCount() const + sal_uInt16 GetRedlSaveCount() const { return pRedlSaveData ? pRedlSaveData->Count() : 0; } }; class SwUndoRedlineDelete : public SwUndoRedline { - BOOL bCanGroup : 1; - BOOL bIsDelim : 1; - BOOL bIsBackspace : 1; + sal_Bool bCanGroup : 1; + sal_Bool bIsDelim : 1; + sal_Bool bIsBackspace : 1; virtual void _Undo( SwUndoIter& ); virtual void _Redo( SwUndoIter& ); @@ -1769,13 +1769,13 @@ class SwUndoRedlineDelete : public SwUndoRedline public: SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); - BOOL CanGrouping( const SwUndoRedlineDelete& rPrev ); + sal_Bool CanGrouping( const SwUndoRedlineDelete& rPrev ); }; class SwUndoRedlineSort : public SwUndoRedline { SwSortOptions* pOpt; - ULONG nSaveEndNode, nOffset; + sal_uLong nSaveEndNode, nOffset; xub_StrLen nSaveEndCntnt; virtual void _Undo( SwUndoIter& ); @@ -1813,9 +1813,9 @@ class SwUndoCompDoc : public SwUndo, public SwUndRng SwRedlineData* pRedlData; SwUndoDelete* pUnDel, *pUnDel2; SwRedlineSaveDatas* pRedlSaveData; - BOOL bInsert; + sal_Bool bInsert; public: - SwUndoCompDoc( const SwPaM& rRg, BOOL bIns ); + SwUndoCompDoc( const SwPaM& rRg, sal_Bool bIns ); SwUndoCompDoc( const SwRedline& rRedl ); virtual ~SwUndoCompDoc(); @@ -1842,9 +1842,9 @@ class SwUndoIter friend void SwUndoReplace::Redo( SwUndoIter& ); SwUndoId nUndoId; - USHORT nEndCnt; - BOOL bWeiter : 1; - BOOL bUpdateAttr : 1; // Setze das GCAttr an der CursorShell + sal_uInt16 nEndCnt; + sal_Bool bWeiter : 1; + sal_Bool bUpdateAttr : 1; // Setze das GCAttr an der CursorShell public: SwPaM * pAktPam; // Member fuer das Undo @@ -1854,9 +1854,9 @@ public: SwUndoIter( SwPaM * pPam, SwUndoId nId = UNDO_EMPTY ); - BOOL IsNextUndo() const { return bWeiter; } - BOOL IsUpdateAttr() const { return bUpdateAttr; } - void SetUpdateAttr( BOOL bNew ) { bUpdateAttr = bNew; } + sal_Bool IsNextUndo() const { return bWeiter; } + sal_Bool IsUpdateAttr() const { return bUpdateAttr; } + void SetUpdateAttr( sal_Bool bNew ) { bUpdateAttr = bNew; } inline SwDoc& GetDoc() const; SwUndoId GetId() const { return nUndoId; } diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx index 3a072b9ff5b0..01033eb856ec 100644 --- a/sw/inc/unoatxt.hxx +++ b/sw/inc/unoatxt.hxx @@ -99,7 +99,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -159,7 +159,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XPropertySet @@ -234,9 +234,9 @@ public: //XText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, BOOL bAbsorb) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, BOOL bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, BOOL bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); //XTextRange @@ -251,7 +251,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier @@ -285,7 +285,7 @@ public: protected: virtual void replaceByName( - const USHORT nEvent, /// item ID of event + const sal_uInt16 nEvent, /// item ID of event const SvxMacro& rMacro) /// event (will be copied) throw( ::com::sun::star::lang::IllegalArgumentException, @@ -295,7 +295,7 @@ protected: virtual void getByName( SvxMacro& rMacro, /// macro to be filled - const USHORT nEvent ) /// item ID of event + const sal_uInt16 nEvent ) /// item ID of event throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index eeced6e62c50..01e45671a3c0 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -212,7 +212,7 @@ public: void DisposeAllDataSequences( const SwTable *pTable ); // functionality needed to get notified about new added rows/cols - void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, USHORT nLines, BOOL bBehind ); + void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, sal_Bool bBehind ); }; ////////////////////////////////////////////////////////////////////// diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index cc65666d8fd4..8b799ad98b9b 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -306,7 +306,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt ); @@ -348,7 +348,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); FlyCntType GetType()const{return eType;} @@ -371,7 +371,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -391,7 +391,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -411,7 +411,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -443,7 +443,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt ); @@ -475,7 +475,7 @@ class SwXBookmarks : public SwCollectionBaseClass, //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -533,7 +533,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt ); @@ -566,7 +566,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static SwXReferenceMark* GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark ); diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 001f0eef3ab2..91fbc0a1d552 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -32,9 +32,9 @@ class SwUnoCrsr : public virtual SwCursor, public SwModify { - BOOL bRemainInSection : 1; - BOOL bSkipOverHiddenSections : 1; - BOOL bSkipOverProtectSections : 1; + sal_Bool bRemainInSection : 1; + sal_Bool bSkipOverHiddenSections : 1; + sal_Bool bSkipOverProtectSections : 1; public: SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = 0 ); @@ -50,7 +50,7 @@ private: protected: virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - BOOL & io_rbLeft, BOOL bVisualAllowed, BOOL bInsertCrsr); + sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr); virtual void DoSetBidiLevelUpDown(); public: @@ -59,24 +59,24 @@ public: // gibt es eine Selection vom Content in die Tabelle // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); virtual bool IsReadOnlyAvailable() const; - BOOL IsRemainInSection() const { return bRemainInSection; } - void SetRemainInSection( BOOL bFlag ) { bRemainInSection = bFlag; } + sal_Bool IsRemainInSection() const { return bRemainInSection; } + void SetRemainInSection( sal_Bool bFlag ) { bRemainInSection = bFlag; } - virtual BOOL IsSkipOverProtectSections() const + virtual sal_Bool IsSkipOverProtectSections() const { return bSkipOverProtectSections; } - void SetSkipOverProtectSections( BOOL bFlag ) + void SetSkipOverProtectSections( sal_Bool bFlag ) { bSkipOverProtectSections = bFlag; } - virtual BOOL IsSkipOverHiddenSections() const + virtual sal_Bool IsSkipOverHiddenSections() const { return bSkipOverHiddenSections; } - void SetSkipOverHiddenSections( BOOL bFlag ) + void SetSkipOverHiddenSections( sal_Bool bFlag ) { bSkipOverHiddenSections = bFlag; } // make copy of cursor @@ -104,7 +104,7 @@ public: // gibt es eine Selection vom Content in die Tabelle // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 7ca06ee09391..f2f8ca922b8c 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -83,8 +83,8 @@ namespace SwUnoCursorHelper public: ~SwAnyMapHelper(); - void SetValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any& rAny ); - bool FillValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any*& pAny ); + void SetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any& rAny ); + bool FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any*& pAny ); }; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index d4ac0f4f3d61..f0168d632f51 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -123,7 +123,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); SwFmDrawPage* GetSvxPage(); @@ -297,7 +297,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // --> OD 2004-07-22 #i31698# XShape diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx index 9063120a6240..3b56ff6c3d33 100644 --- a/sw/inc/unoevtlstnr.hxx +++ b/sw/inc/unoevtlstnr.hxx @@ -52,7 +52,7 @@ class SwEventListenerContainer ~SwEventListenerContainer(); void AddListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener); - BOOL RemoveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener); + sal_Bool RemoveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener); void Disposing(); }; #endif diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx index 521a85e9168e..66fe2cb92a99 100644 --- a/sw/inc/unofield.hxx +++ b/sw/inc/unofield.hxx @@ -106,7 +106,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -192,7 +192,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XUpdatable @@ -243,7 +243,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -285,7 +285,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // SwUnoCollection @@ -313,12 +313,12 @@ public: SwXFieldEnumeration(SwDoc* pDoc); //XEnumeration - virtual BOOL SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient diff --git a/sw/inc/unoflatpara.hxx b/sw/inc/unoflatpara.hxx index acc004d473ab..b69fb448c102 100644 --- a/sw/inc/unoflatpara.hxx +++ b/sw/inc/unoflatpara.hxx @@ -136,9 +136,9 @@ private: const sal_Int32 mnType; const sal_Bool mbAutomatic; - ULONG mnCurrentNode; // used for non-automatic mode - ULONG mnStartNode; // used for non-automatic mode - ULONG mnEndNode; // used for non-automatic mode + sal_uLong mnCurrentNode; // used for non-automatic mode + sal_uLong mnStartNode; // used for non-automatic mode + sal_uLong mnEndNode; // used for non-automatic mode sal_Bool mbWrapped; // used for non-automatic mode }; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 9323d209c19a..269401e3d28f 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -142,7 +142,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -229,7 +229,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier @@ -282,7 +282,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier @@ -338,7 +338,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx index 39a9664c4123..0c2b77eb60d2 100644 --- a/sw/inc/unomailmerge.hxx +++ b/sw/inc/unomailmerge.hxx @@ -79,14 +79,14 @@ namespace rtl { // helper function call class struct PropHashType_Impl { - size_t operator()(const INT32 &s) const { return s; } + size_t operator()(const sal_Int32 &s) const { return s; } }; typedef cppu::OMultiTypeInterfaceContainerHelperVar < - INT32, + sal_Int32, PropHashType_Impl, - std::equal_to< INT32 > + std::equal_to< sal_Int32 > > OPropertyListenerContainerHelper; //////////////////////////////////////////////////////////// diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 0ea5fa9db598..5fe59c9648fe 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -813,7 +813,7 @@ enum SwPropNameIds struct SwPropNameLen { const char* pName; - USHORT nNameLen; + sal_uInt16 nNameLen; operator const char*() const { return pName; } }; @@ -825,8 +825,8 @@ extern const SwPropNameTab aPropNameTab; // !!! function must not(!) be inline because it is called via the below !!! // !!! listed macros from the swui DLL and that can not access the !!! // !!! array aPropNameTab which is located in a different DLL. !!! -SW_DLLPUBLIC const SwPropNameLen& GetPropName( USHORT nId ); -SW_DLLPUBLIC const SwPropNameLen& SwGetPropName( USHORT nId ); +SW_DLLPUBLIC const SwPropNameLen& GetPropName( sal_uInt16 nId ); +SW_DLLPUBLIC const SwPropNameLen& SwGetPropName( sal_uInt16 nId ); #define SW_PROP_NAME(nId) \ GetPropName( nId ).pName, GetPropName( nId ).nNameLen diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 92db9257c4a6..65c14d82bbbf 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -86,7 +86,7 @@ public: SwXRedlinePortion( const SwRedline* pRed, const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParent, - BOOL bIsStart); + sal_Bool bIsStart); ~SwXRedlinePortion(); diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 948e972e1998..49db8cf27761 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -67,7 +67,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::beans::XPropertySet* GetObject( SwRedline& rRedline, SwDoc& rDoc ); @@ -80,7 +80,7 @@ class SwXRedlineEnumeration , public SwClient { SwDoc* pDoc; - USHORT nCurrentIndex; + sal_uInt16 nCurrentIndex; protected: virtual ~SwXRedlineEnumeration(); public: @@ -88,12 +88,12 @@ public: //XEnumeration - virtual BOOL SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 8423ac29ad4c..4c2d66868420 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -78,7 +78,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void Invalidate() {pDoc = 0;} @@ -112,7 +112,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void Invalidate() {pDoc = 0;} @@ -146,7 +146,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void Invalidate() {pDoc = 0;} @@ -213,7 +213,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Sequence< @@ -249,7 +249,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -310,7 +310,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index c9da0cc39fe4..a4021761925f 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -119,7 +119,7 @@ public: //XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void FillSearchItemSet(SfxItemSet& rSet) const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 4a9fd533da66..740b909f1f7a 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -108,7 +108,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -166,7 +166,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; /* -----------------20.05.98 09:51------------------- @@ -212,7 +212,7 @@ protected: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: - SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, BOOL bConditional = FALSE); + SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, sal_Bool bConditional = sal_False); SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam, SwDoc* pDoc, const String& rStyleName);//, @@ -267,7 +267,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SfxListener diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 3121a6420a69..e359726f94dc 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -91,7 +91,7 @@ class SwXCell : public SwXCellBaseClass, public SwClient { friend void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt, - BOOL bKeepNumberFmt = FALSE ); + sal_Bool bKeepNumberFmt = sal_False ); friend double lcl_getValue( SwXCell &rCell ); friend void lcl_setValue( SwXCell &rCell, double nVal ); @@ -159,7 +159,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -211,7 +211,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -270,7 +270,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -406,7 +406,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -499,7 +499,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -561,7 +561,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient @@ -609,7 +609,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index ff7a536fb69e..4a10c7acf513 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -81,7 +81,7 @@ namespace sw { CreateParentXText(SwDoc & rDoc, const SwPosition& rPos); bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny, - const ::rtl::OUString& rPropertyName, USHORT nWID = 0); + const ::rtl::OUString& rPropertyName, sal_uInt16 nWID = 0); } // namespace sw diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 2869415d3978..f51e4a7892f0 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -364,7 +364,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); // css::drawing::XDrawPageSupplier @@ -475,7 +475,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); // @@ -530,7 +530,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); }; @@ -561,7 +561,7 @@ public: //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); }; #endif diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index dea534074179..21243589daf1 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -40,12 +40,12 @@ class SwDoc; class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType { - BOOL bValidValue : 1; - BOOL bDeleted : 1; + sal_Bool bValidValue : 1; + sal_Bool bDeleted : 1; double nValue; String aName; String aContent; - USHORT nType; + sal_uInt16 nType; public: SwUserFieldType( SwDoc* pDocPtr, const String& ); @@ -53,13 +53,13 @@ public: virtual const String& GetName() const; virtual SwFieldType* Copy() const; - String Expand(sal_uInt32 nFmt, USHORT nSubType, USHORT nLng); + String Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); String GetContent( sal_uInt32 nFmt = 0 ); void SetContent( const String& rStr, sal_uInt32 nFmt = 0 ); - inline BOOL IsValid() const; - inline void ChgValid( BOOL bNew ); + inline sal_Bool IsValid() const; + inline void ChgValid( sal_Bool bNew ); virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); @@ -67,20 +67,20 @@ public: inline double GetValue() const; inline void SetValue(const double nVal); - inline USHORT GetType() const; - inline void SetType(USHORT); + inline sal_uInt16 GetType() const; + inline void SetType(sal_uInt16); - BOOL IsDeleted() const { return bDeleted; } - void SetDeleted( BOOL b ) { bDeleted = b; } + sal_Bool IsDeleted() const { return bDeleted; } + void SetDeleted( sal_Bool b ) { bDeleted = b; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); }; -inline BOOL SwUserFieldType::IsValid() const +inline sal_Bool SwUserFieldType::IsValid() const { return bValidValue; } -inline void SwUserFieldType::ChgValid( BOOL bNew ) +inline void SwUserFieldType::ChgValid( sal_Bool bNew ) { bValidValue = bNew; } inline double SwUserFieldType::GetValue() const @@ -89,10 +89,10 @@ inline double SwUserFieldType::GetValue() const inline void SwUserFieldType::SetValue(const double nVal) { nValue = nVal; } -inline USHORT SwUserFieldType::GetType() const +inline sal_uInt16 SwUserFieldType::GetType() const { return nType; } -inline void SwUserFieldType::SetType(USHORT nSub) +inline void SwUserFieldType::SetType(sal_uInt16 nSub) { nType = nSub; EnableFormat(!(nSub & nsSwGetSetExpType::GSE_STRING)); @@ -104,16 +104,16 @@ inline void SwUserFieldType::SetType(USHORT nSub) class SW_DLLPUBLIC SwUserField : public SwValueField { - USHORT nSubType; + sal_uInt16 nSubType; virtual String Expand() const; virtual SwField* Copy() const; public: - SwUserField(SwUserFieldType*, USHORT nSub = 0, sal_uInt32 nFmt = 0); + SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0); - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nSub); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nSub); virtual double GetValue() const; virtual void SetValue( const double& rVal ); @@ -126,8 +126,8 @@ public: // Inhalt virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); }; #endif // SW_USRFLD_HXX diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 8d37888ea789..8bacf2ee8f67 100755..100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -140,50 +140,50 @@ class SwViewOption static sal_Int32 nAppearanceFlags; // protected: - static USHORT nPixelTwips;// 1 Pixel == ? Twips + static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips String sSymbolFont; // Symbolzeichensatz - UINT32 nCoreOptions; // Bits fuer die ViewShell - UINT32 nCore2Options; // Bits fuer die ViewShell - UINT32 nUIOptions; // UI-Bits + sal_uInt32 nCoreOptions; // Bits fuer die ViewShell + sal_uInt32 nCore2Options; // Bits fuer die ViewShell + sal_uInt32 nUIOptions; // UI-Bits Color aRetoucheColor; // DefaultBackground fuer BrowseView Size aSnapSize; // Beschreibt hori. wie vert. Snap - USHORT mnViewLayoutColumns;// # columns for edit view + sal_uInt16 mnViewLayoutColumns;// # columns for edit view short nDivisionX; // Rasterunterteilung short nDivisionY; - BYTE nPagePrevRow; // Page Preview Row/Columns - BYTE nPagePrevCol; // Page Preview Row/Columns - BYTE nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr - BOOL bReadonly : 1; // Readonly-Doc - BOOL bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents) - BOOL bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings - BOOL bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents + sal_uInt8 nPagePrevRow; // Page Preview Row/Columns + sal_uInt8 nPagePrevCol; // Page Preview Row/Columns + sal_uInt8 nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr + sal_Bool bReadonly : 1; // Readonly-Doc + sal_Bool bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents) + sal_Bool bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings + sal_Bool bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents // --> FME 2004-06-29 #114856# Formular view - BOOL bFormView : 1; + sal_Bool bFormView : 1; // <-- - BOOL bBookview : 1; // view mode for page preview - BOOL mbViewLayoutBookMode : 1; // book view mode for edit view + sal_Bool bBookview : 1; // view mode for page preview + sal_Bool mbViewLayoutBookMode : 1; // book view mode for edit view sal_Bool bShowPlaceHolderFields : 1; //only used in printing! mutable bool bIdle; // Maszstab - USHORT nZoom; // Angaben in Prozent + sal_uInt16 nZoom; // Angaben in Prozent SvxZoomType eZoom; // 'enum' fuer Zoom - BYTE nTblDest; // Ziel fuer Tabellenhintergrund + sal_uInt8 nTblDest; // Ziel fuer Tabellenhintergrund #ifdef DBG_UTIL // korrespondieren zu den Angaben in ui/config/cfgvw.src - BOOL bTest1 :1; // Test-Flag "Layout not loading" - BOOL bTest2 :1; // Test-Flag "WYSIWYG++" - BOOL bTest3 :1; // Test-Flag "" - BOOL bTest4 :1; // Test-Flag "WYSIWYG debug" - BOOL bTest5 :1; // Test-Flag "No idle format" - BOOL bTest6 :1; // Test-Flag "No screen adj" - BOOL bTest7 :1; // Test-Flag "win format" - BOOL bTest8 :1; // Test-Flag "" - static BOOL bTest9; // Test-Flag "DrawingLayerNotLoading" - BOOL bTest10 :1; // Test-Flag "Format by Input" + sal_Bool bTest1 :1; // Test-Flag "Layout not loading" + sal_Bool bTest2 :1; // Test-Flag "WYSIWYG++" + sal_Bool bTest3 :1; // Test-Flag "" + sal_Bool bTest4 :1; // Test-Flag "WYSIWYG debug" + sal_Bool bTest5 :1; // Test-Flag "No idle format" + sal_Bool bTest6 :1; // Test-Flag "No screen adj" + sal_Bool bTest7 :1; // Test-Flag "win format" + sal_Bool bTest8 :1; // Test-Flag "" + static sal_Bool bTest9; // Test-Flag "DrawingLayerNotLoading" + sal_Bool bTest10 :1; // Test-Flag "Format by Input" #endif public: @@ -193,200 +193,200 @@ public: void Init( Window *pWin ); // Initialisierung der statischen Daten - USHORT GetPixelTwips() const { return nPixelTwips; } + sal_uInt16 GetPixelTwips() const { return nPixelTwips; } - inline UINT32 GetCoreOptions() const {return nCoreOptions;} + inline sal_uInt32 GetCoreOptions() const {return nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); /*--------------------------------------------------------------------------- Optionen aus nCoreOptions ----------------------------------------------------------------------------*/ - inline BOOL IsIdle() const + inline sal_Bool IsIdle() const { return bIdle; } // logically this is a const function since it does not modify the viewoptions // but only effects idle formatting. Of course that member is already implement // in the wrong place here... Also currently there are many const modifying casts in the code // just to call this function on otherwise const objects. Thus declaring it as const now. - inline void SetIdle( BOOL b ) const + inline void SetIdle( sal_Bool b ) const { bIdle = b; } - inline BOOL IsTab(BOOL bHard = FALSE) const + inline sal_Bool IsTab(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetTab( BOOL b ) { + ? sal_True : sal_False; } + inline void SetTab( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); } - inline BOOL IsBlank(BOOL bHard = FALSE) const + inline sal_Bool IsBlank(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_BLANK) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetBlank( BOOL b ) + ? sal_True : sal_False; } + inline void SetBlank( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_BLANK ) : ( nCoreOptions &= ~VIEWOPT_1_BLANK); } - inline BOOL IsHardBlank() const - { return !bReadonly && nCoreOptions & VIEWOPT_1_HARDBLANK ? TRUE : FALSE; } - inline void SetHardBlank( BOOL b ) + inline sal_Bool IsHardBlank() const + { return !bReadonly && nCoreOptions & VIEWOPT_1_HARDBLANK ? sal_True : sal_False; } + inline void SetHardBlank( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_HARDBLANK ) : ( nCoreOptions &= ~VIEWOPT_1_HARDBLANK); } - inline BOOL IsParagraph(BOOL bHard = FALSE) const + inline sal_Bool IsParagraph(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_PARAGRAPH) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetParagraph( BOOL b ) + ? sal_True : sal_False; } + inline void SetParagraph( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PARAGRAPH ) : ( nCoreOptions &= ~VIEWOPT_1_PARAGRAPH); } - inline BOOL IsLineBreak(BOOL bHard = FALSE) const + inline sal_Bool IsLineBreak(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_LINEBREAK) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetLineBreak( BOOL b ) + ? sal_True : sal_False; } + inline void SetLineBreak( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_LINEBREAK); } - inline void SetPageBreak( BOOL b ) + inline void SetPageBreak( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBREAK); } - inline void SetColumnBreak( BOOL b) + inline void SetColumnBreak( sal_Bool b) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_COLUMNBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_COLUMNBREAK); } - inline BOOL IsSoftHyph() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_SOFTHYPH) ? TRUE : FALSE; } - inline void SetSoftHyph( BOOL b ) + inline sal_Bool IsSoftHyph() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_SOFTHYPH) ? sal_True : sal_False; } + inline void SetSoftHyph( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } - inline BOOL IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? TRUE : FALSE; } - inline void SetFldName( BOOL b ) + inline sal_Bool IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? sal_True : sal_False; } + inline void SetFldName( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); } - inline BOOL IsPostIts() const - { return (nCoreOptions & VIEWOPT_1_POSTITS) ? TRUE : FALSE; } - inline void SetPostIts( BOOL b ) + inline sal_Bool IsPostIts() const + { return (nCoreOptions & VIEWOPT_1_POSTITS) ? sal_True : sal_False; } + inline void SetPostIts( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); } void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const; - USHORT GetPostItsWidth( const OutputDevice *pOut = 0 ) const; + sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ) const; - inline BOOL IsShowHiddenChar(sal_Bool bHard = sal_False) const + inline sal_Bool IsShowHiddenChar(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } + ? sal_True : sal_False; } - inline void SetShowHiddenChar( BOOL b ) + inline void SetShowHiddenChar( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } - inline BOOL IsShowHiddenField() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) ? TRUE : FALSE; } - inline void SetShowHiddenField( BOOL b ) + inline sal_Bool IsShowHiddenField() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) ? sal_True : sal_False; } + inline void SetShowHiddenField( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLD_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_FLD_HIDDEN); } - inline BOOL IsGraphic() const - { return nCoreOptions & VIEWOPT_1_GRAPHIC ? TRUE : FALSE; } - inline void SetGraphic( BOOL b ) + inline sal_Bool IsGraphic() const + { return nCoreOptions & VIEWOPT_1_GRAPHIC ? sal_True : sal_False; } + inline void SetGraphic( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_GRAPHIC ) : ( nCoreOptions &= ~VIEWOPT_1_GRAPHIC); } - inline BOOL IsPageBack() const - { return nCoreOptions & VIEWOPT_1_PAGEBACK ? TRUE : FALSE; } - inline void SetPageBack( BOOL b ) + inline sal_Bool IsPageBack() const + { return nCoreOptions & VIEWOPT_1_PAGEBACK ? sal_True : sal_False; } + inline void SetPageBack( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); } - inline BOOL IsSolidMarkHdl() const - { return nCoreOptions & VIEWOPT_1_SOLIDMARKHDL ? TRUE : FALSE; } - inline void SetSolidMarkHdl( BOOL b ) + inline sal_Bool IsSolidMarkHdl() const + { return nCoreOptions & VIEWOPT_1_SOLIDMARKHDL ? sal_True : sal_False; } + inline void SetSolidMarkHdl( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOLIDMARKHDL) : ( nCoreOptions &= ~VIEWOPT_1_SOLIDMARKHDL); } - inline BOOL IsBigMarkHdl() const - { return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? TRUE : FALSE;} - inline void SetBigMarkHdl(BOOL b) + inline sal_Bool IsBigMarkHdl() const + { return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? sal_True : sal_False;} + inline void SetBigMarkHdl(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_BIGMARKHDL ) : (nCore2Options &= ~VIEWOPT_CORE2_BIGMARKHDL);} - inline BOOL IsTable() const - { return nCoreOptions & VIEWOPT_1_TABLE ? TRUE : FALSE; } - inline void SetTable( BOOL b ) + inline sal_Bool IsTable() const + { return nCoreOptions & VIEWOPT_1_TABLE ? sal_True : sal_False; } + inline void SetTable( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_TABLE ) : ( nCoreOptions &= ~VIEWOPT_1_TABLE); } - inline BOOL IsDraw() const - { return nCoreOptions & VIEWOPT_1_DRAW ? TRUE : FALSE; } - inline void SetDraw( BOOL b ) + inline sal_Bool IsDraw() const + { return nCoreOptions & VIEWOPT_1_DRAW ? sal_True : sal_False; } + inline void SetDraw( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_DRAW ) : ( nCoreOptions &= ~VIEWOPT_1_DRAW); } - inline BOOL IsControl() const - { return nCoreOptions & VIEWOPT_1_CONTROL ? TRUE : FALSE; } - inline void SetControl( BOOL b ) + inline sal_Bool IsControl() const + { return nCoreOptions & VIEWOPT_1_CONTROL ? sal_True : sal_False; } + inline void SetControl( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CONTROL ) : ( nCoreOptions &= ~VIEWOPT_1_CONTROL); } - inline BOOL IsSnap() const - { return nCoreOptions & VIEWOPT_1_SNAP ? TRUE : FALSE; } - inline void SetSnap( BOOL b ) + inline sal_Bool IsSnap() const + { return nCoreOptions & VIEWOPT_1_SNAP ? sal_True : sal_False; } + inline void SetSnap( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SNAP ) : ( nCoreOptions &= ~VIEWOPT_1_SNAP); } inline void SetSnapSize( Size &rSz ){ aSnapSize = rSz; } inline const Size &GetSnapSize() const { return aSnapSize; } - inline BOOL IsGridVisible() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_GRIDVISIBLE) ? TRUE : FALSE; } - inline void SetGridVisible( BOOL b ) + inline sal_Bool IsGridVisible() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_GRIDVISIBLE) ? sal_True : sal_False; } + inline void SetGridVisible( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_GRIDVISIBLE ) : ( nCoreOptions &= ~VIEWOPT_1_GRIDVISIBLE); } - inline BOOL IsOnlineSpell() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) ? TRUE : FALSE; } - inline void SetOnlineSpell( BOOL b ) + inline sal_Bool IsOnlineSpell() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) ? sal_True : sal_False; } + inline void SetOnlineSpell( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); } - inline BOOL IsViewMetaChars() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) ? TRUE : FALSE; } - inline void SetViewMetaChars( BOOL b) + inline sal_Bool IsViewMetaChars() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) ? sal_True : sal_False; } + inline void SetViewMetaChars( sal_Bool b) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_VIEWMETACHARS ) : ( nCoreOptions &= ~VIEWOPT_1_VIEWMETACHARS); } - inline BOOL IsSynchronize() const - { return nCoreOptions & VIEWOPT_1_SYNCHRONIZE ? TRUE : FALSE;} - inline void SetSynchronize( BOOL b ) + inline sal_Bool IsSynchronize() const + { return nCoreOptions & VIEWOPT_1_SYNCHRONIZE ? sal_True : sal_False;} + inline void SetSynchronize( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SYNCHRONIZE ) : ( nCoreOptions &= ~VIEWOPT_1_SYNCHRONIZE); } - inline BOOL IsCrossHair() const - { return nCoreOptions & VIEWOPT_1_CROSSHAIR ? TRUE : FALSE; } - inline void SetCrossHair( BOOL b ) + inline sal_Bool IsCrossHair() const + { return nCoreOptions & VIEWOPT_1_CROSSHAIR ? sal_True : sal_False; } + inline void SetCrossHair( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } /*--------------------------------------------------------------------------- Optionen aus nCore2Options ----------------------------------------------------------------------------*/ - inline BOOL IsBlackFont() const - {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? TRUE : FALSE;} + inline sal_Bool IsBlackFont() const + {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? sal_True : sal_False;} - inline void SetBlackFont(BOOL b) + inline void SetBlackFont(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);} - inline BOOL IsShowHiddenPara() const - {return nCore2Options & VIEWOPT_CORE2_HIDDENPARA ? TRUE : FALSE;} + inline sal_Bool IsShowHiddenPara() const + {return nCore2Options & VIEWOPT_CORE2_HIDDENPARA ? sal_True : sal_False;} - inline void SetShowHiddenPara(BOOL b) + inline void SetShowHiddenPara(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);} - inline BOOL IsSmoothScroll() const - {return nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL ? TRUE : FALSE;} + inline sal_Bool IsSmoothScroll() const + {return nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL ? sal_True : sal_False;} - inline void SetSmoothScroll(BOOL b) + inline void SetSmoothScroll(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);} - inline BOOL IsCursorInProtectedArea() const - {return nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT ? TRUE : FALSE;} + inline sal_Bool IsCursorInProtectedArea() const + {return nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT ? sal_True : sal_False;} - inline void SetCursorInProtectedArea(BOOL b) + inline void SetCursorInProtectedArea(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_CRSR_IN_PROT) : (nCore2Options &= ~VIEWOPT_CORE2_CRSR_IN_PROT);} - inline BOOL IsPDFExport() const - {return nCore2Options & VIEWOPT_CORE2_PDF_EXPORT ? TRUE : FALSE;} + inline sal_Bool IsPDFExport() const + {return nCore2Options & VIEWOPT_CORE2_PDF_EXPORT ? sal_True : sal_False;} - inline void SetPDFExport(BOOL b) + inline void SetPDFExport(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);} - inline BOOL IsPrinting() const - {return nCore2Options & VIEWOPT_CORE2_PRINTING ? TRUE : FALSE;} + inline sal_Bool IsPrinting() const + {return nCore2Options & VIEWOPT_CORE2_PRINTING ? sal_True : sal_False;} - inline void SetPrinting(BOOL b) + inline void SetPrinting(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);} /*--------------------------------------------------------------------------- @@ -399,105 +399,105 @@ public: inline short GetDivisionY() const { return nDivisionY; } inline void SetDivisionY( short n ){ nDivisionY = n; } - inline BYTE GetPagePrevRow() const { return nPagePrevRow; } - inline void SetPagePrevRow( BYTE n ) { nPagePrevRow = n; } - inline BYTE GetPagePrevCol() const { return nPagePrevCol; } - inline void SetPagePrevCol( BYTE n ) { nPagePrevCol = n; } - BOOL IsReadonly() const { return bReadonly; } - void SetReadonly(BOOL bSet) { bReadonly = bSet; } + inline sal_uInt8 GetPagePrevRow() const { return nPagePrevRow; } + inline void SetPagePrevRow( sal_uInt8 n ) { nPagePrevRow = n; } + inline sal_uInt8 GetPagePrevCol() const { return nPagePrevCol; } + inline void SetPagePrevCol( sal_uInt8 n ) { nPagePrevCol = n; } + sal_Bool IsReadonly() const { return bReadonly; } + void SetReadonly(sal_Bool bSet) { bReadonly = bSet; } - BOOL IsSelectionInReadonly() const {return bSelectionInReadonly;} - void SetSelectionInReadonly(BOOL bSet) {bSelectionInReadonly = bSet;} + sal_Bool IsSelectionInReadonly() const {return bSelectionInReadonly;} + void SetSelectionInReadonly(sal_Bool bSet) {bSelectionInReadonly = bSet;} // --> FME 2004-06-29 #114856# Formular view - BOOL IsFormView() const { return bFormView; } - void SetFormView( BOOL bSet ) { bFormView = bSet; } + sal_Bool IsFormView() const { return bFormView; } + void SetFormView( sal_Bool bSet ) { bFormView = bSet; } // <-- - inline BOOL IsPagePrevBookview() const { return bBookview; } - inline void SetPagePrevBookview(BOOL bSet) { bBookview = bSet; } + inline sal_Bool IsPagePrevBookview() const { return bBookview; } + inline void SetPagePrevBookview(sal_Bool bSet) { bBookview = bSet; } - BOOL IsAutoCompleteWords() const; + sal_Bool IsAutoCompleteWords() const; // PAGES01 bool IsViewLayoutBookMode() const { return mbViewLayoutBookMode; } void SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; } - USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; } - void SetViewLayoutColumns( USHORT nNew ) { mnViewLayoutColumns = nNew; } + sal_uInt16 GetViewLayoutColumns() const { return mnViewLayoutColumns; } + void SetViewLayoutColumns( sal_uInt16 nNew ) { mnViewLayoutColumns = nNew; } #ifdef DBG_UTIL // korrespondieren zu den Angaben in ui/config/cfgvw.src - inline BOOL IsTest1() const { return bTest1; } - inline void SetTest1( BOOL b ) { bTest1 = b; } - inline BOOL IsTest2() const { return bTest2; } - inline void SetTest2( BOOL b ) { bTest2 = b; } - inline BOOL IsTest3() const { return bTest3; } - inline void SetTest3( BOOL b ) { bTest3 = b; } - inline BOOL IsTest4() const { return bTest4; } - inline void SetTest4( BOOL b ) { bTest4 = b; } - inline BOOL IsTest5() const { return bTest5; } - inline void SetTest5( BOOL b ) { bTest5 = b; } - inline BOOL IsTest6() const { return bTest6; } - inline void SetTest6( BOOL b ) { bTest6 = b; } - inline BOOL IsTest7() const { return bTest7; } - inline void SetTest7( BOOL b ) { bTest7 = b; } - inline BOOL IsTest8() const { return bTest8; } - inline void SetTest8( BOOL b ) { bTest8 = b; } - static inline BOOL IsTest9() { return bTest9; } - static inline void SetTest9( BOOL b ) { bTest9 = b; } - inline BOOL IsTest10() const { return bTest10; } - inline void SetTest10( BOOL b ) { bTest10 = b; } + inline sal_Bool IsTest1() const { return bTest1; } + inline void SetTest1( sal_Bool b ) { bTest1 = b; } + inline sal_Bool IsTest2() const { return bTest2; } + inline void SetTest2( sal_Bool b ) { bTest2 = b; } + inline sal_Bool IsTest3() const { return bTest3; } + inline void SetTest3( sal_Bool b ) { bTest3 = b; } + inline sal_Bool IsTest4() const { return bTest4; } + inline void SetTest4( sal_Bool b ) { bTest4 = b; } + inline sal_Bool IsTest5() const { return bTest5; } + inline void SetTest5( sal_Bool b ) { bTest5 = b; } + inline sal_Bool IsTest6() const { return bTest6; } + inline void SetTest6( sal_Bool b ) { bTest6 = b; } + inline sal_Bool IsTest7() const { return bTest7; } + inline void SetTest7( sal_Bool b ) { bTest7 = b; } + inline sal_Bool IsTest8() const { return bTest8; } + inline void SetTest8( sal_Bool b ) { bTest8 = b; } + static inline sal_Bool IsTest9() { return bTest9; } + static inline void SetTest9( sal_Bool b ) { bTest9 = b; } + inline sal_Bool IsTest10() const { return bTest10; } + inline void SetTest10( sal_Bool b ) { bTest10 = b; } #endif - inline USHORT GetZoom() const { return nZoom; } - inline void SetZoom( USHORT n ){ nZoom = n; } + inline sal_uInt16 GetZoom() const { return nZoom; } + inline void SetZoom( sal_uInt16 n ){ nZoom = n; } void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ) const; void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ) const; SwViewOption& operator=( const SwViewOption &rOpt ); // Vergleichsmethoden - BOOL IsEqualFlags ( const SwViewOption &rOpt ) const; - inline BOOL operator == ( const SwViewOption &rOpt ) const; - inline BOOL operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } + sal_Bool IsEqualFlags ( const SwViewOption &rOpt ) const; + inline sal_Bool operator == ( const SwViewOption &rOpt ) const; + inline sal_Bool operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } /*--------------------------------------------------------------------------- Optionen aus nUIOptions ----------------------------------------------------------------------------*/ - BOOL IsViewVScrollBar() const - { return nUIOptions & VIEWOPT_2_VSCROLLBAR ? TRUE : FALSE; } - BOOL IsViewHScrollBar() const - { return nUIOptions & VIEWOPT_2_HSCROLLBAR ? TRUE : FALSE; } - BOOL IsKeepRatio() const - { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? TRUE : FALSE; } - BOOL IsGrfKeepZoom() const - { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE; } - BOOL IsPreventTips() const - { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? TRUE : FALSE; } - BOOL IsPrtFormat() const - { return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; } + sal_Bool IsViewVScrollBar() const + { return nUIOptions & VIEWOPT_2_VSCROLLBAR ? sal_True : sal_False; } + sal_Bool IsViewHScrollBar() const + { return nUIOptions & VIEWOPT_2_HSCROLLBAR ? sal_True : sal_False; } + sal_Bool IsKeepRatio() const + { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False; } + sal_Bool IsGrfKeepZoom() const + { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False; } + sal_Bool IsPreventTips() const + { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? sal_True : sal_False; } + sal_Bool IsPrtFormat() const + { return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; } SvxZoomType GetZoomType() const { return eZoom; } - BYTE GetTblDest() const { return nTblDest; } + sal_uInt8 GetTblDest() const { return nTblDest; } - void SetViewVScrollBar(BOOL b) + void SetViewVScrollBar(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); } - void SetViewHScrollBar(BOOL b) + void SetViewHScrollBar(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_HSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_HSCROLLBAR); } - void SetKeepRatio (BOOL b) + void SetKeepRatio (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); } - void SetGrfKeepZoom (BOOL b) + void SetGrfKeepZoom (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); } - void SetPreventTips( BOOL b) + void SetPreventTips( sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); } - void SetPrtFormat( BOOL b) + void SetPrtFormat( sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } - void SetTblDest( BYTE nNew ) { nTblDest = nNew; } + void SetTblDest( sal_uInt8 nNew ) { nTblDest = nNew; } const String& GetSymbolFont() const {return sSymbolFont;} void SetSymbolFont(const String& sSet) {sSymbolFont = sSet;} @@ -505,56 +505,56 @@ public: const Color& GetRetoucheColor() const { return aRetoucheColor;} void SetRetoucheColor(const Color&r) { aRetoucheColor = r; } - BOOL IsViewAnyRuler() const {return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);} - void SetViewAnyRuler(BOOL bSet) + sal_Bool IsViewAnyRuler() const {return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);} + void SetViewAnyRuler(sal_Bool bSet) { bSet ? (nUIOptions |= VIEWOPT_2_ANY_RULER) : (nUIOptions &= ~VIEWOPT_2_ANY_RULER);} - BOOL IsViewHRuler(BOOL bDirect = FALSE) const + sal_Bool IsViewHRuler(sal_Bool bDirect = sal_False) const { - BOOL bRet = sal::static_int_cast< BOOL >( bDirect ? + sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? 0 != (nUIOptions & VIEWOPT_2_H_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER) - : FALSE ); + : sal_False ); return bRet; } - void SetViewHRuler (BOOL b) + void SetViewHRuler (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_H_RULER ) : ( nUIOptions &= ~VIEWOPT_2_H_RULER);} - BOOL IsViewVRuler(BOOL bDirect = FALSE) const + sal_Bool IsViewVRuler(sal_Bool bDirect = sal_False) const { - BOOL bRet = sal::static_int_cast< BOOL >( bDirect ? + sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? 0 !=(nUIOptions & VIEWOPT_2_V_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER) - : FALSE ); + : sal_False ); return bRet; } - void SetViewVRuler (BOOL b) + void SetViewVRuler (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER);} // ShadowCursor ein schalten/abfragen/Farbe setzen/Modus setzen - BOOL IsShadowCursor() const - { return nUIOptions & VIEWOPT_2_SHADOWCRSR ? TRUE : FALSE; } - void SetShadowCursor(BOOL b) + sal_Bool IsShadowCursor() const + { return nUIOptions & VIEWOPT_2_SHADOWCRSR ? sal_True : sal_False; } + void SetShadowCursor(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_SHADOWCRSR ) : ( nUIOptions &= ~VIEWOPT_2_SHADOWCRSR); } //move vertical ruler to the right - BOOL IsVRulerRight() const - { return nUIOptions & VIEWOPT_2_V_RULER_RIGHT ? TRUE : FALSE; } - void SetVRulerRight(BOOL b) + sal_Bool IsVRulerRight() const + { return nUIOptions & VIEWOPT_2_V_RULER_RIGHT ? sal_True : sal_False; } + void SetVRulerRight(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER_RIGHT ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER_RIGHT); } - BOOL IsStarOneSetting() const {return bStarOneSetting; } - void SetStarOneSetting(BOOL bSet) {bStarOneSetting = bSet; } + sal_Bool IsStarOneSetting() const {return bStarOneSetting; } + void SetStarOneSetting(sal_Bool bSet) {bStarOneSetting = bSet; } - BOOL IsPagePreview() const {return bIsPagePreview; } - void SetPagePreview(BOOL bSet) { bIsPagePreview= bSet; } + sal_Bool IsPagePreview() const {return bIsPagePreview; } + void SetPagePreview(sal_Bool bSet) { bIsPagePreview= bSet; } - BYTE GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } - void SetShdwCrsrFillMode( BYTE nMode ) { nShdwCrsrFillMode = nMode; }; + sal_uInt8 GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } + void SetShdwCrsrFillMode( sal_uInt8 nMode ) { nShdwCrsrFillMode = nMode; }; sal_Bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; } void SetShowPlaceHolderFields(sal_Bool bSet) { bShowPlaceHolderFields = bSet; } @@ -576,26 +576,26 @@ public: static Color& GetSectionBoundColor(); static Color& GetPageBreakColor(); - static BOOL IsAppearanceFlag(sal_Int32 nFlag); + static sal_Bool IsAppearanceFlag(sal_Int32 nFlag); - static BOOL IsDocBoundaries() {return IsAppearanceFlag(VIEWOPT_DOC_BOUNDARIES);} - static BOOL IsObjectBoundaries(){return IsAppearanceFlag(VIEWOPT_OBJECT_BOUNDARIES);} - static BOOL IsTableBoundaries() {return IsAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES );} - static BOOL IsIndexShadings() {return IsAppearanceFlag(VIEWOPT_INDEX_SHADINGS );} - static BOOL IsLinks() {return IsAppearanceFlag(VIEWOPT_LINKS );} - static BOOL IsVisitedLinks() {return IsAppearanceFlag(VIEWOPT_VISITED_LINKS );} - static BOOL IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);} - static BOOL IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);} + static sal_Bool IsDocBoundaries() {return IsAppearanceFlag(VIEWOPT_DOC_BOUNDARIES);} + static sal_Bool IsObjectBoundaries(){return IsAppearanceFlag(VIEWOPT_OBJECT_BOUNDARIES);} + static sal_Bool IsTableBoundaries() {return IsAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES );} + static sal_Bool IsIndexShadings() {return IsAppearanceFlag(VIEWOPT_INDEX_SHADINGS );} + static sal_Bool IsLinks() {return IsAppearanceFlag(VIEWOPT_LINKS );} + static sal_Bool IsVisitedLinks() {return IsAppearanceFlag(VIEWOPT_VISITED_LINKS );} + static sal_Bool IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);} + static sal_Bool IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);} - static void SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInConfig = FALSE); + static void SetAppearanceFlag(sal_Int32 nFlag, sal_Bool bSet, sal_Bool bSaveInConfig = sal_False); - void SetDocBoundaries(BOOL bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} + void SetDocBoundaries(sal_Bool bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} static void ApplyColorConfigValues(const svtools::ColorConfig& rConfig); }; -inline BOOL SwViewOption::operator==( const SwViewOption &rOpt ) const +inline sal_Bool SwViewOption::operator==( const SwViewOption &rOpt ) const { return IsEqualFlags( rOpt ) && nZoom == rOpt.GetZoom(); } @@ -609,7 +609,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) // Hilfsfunktion zur Ermittlung der HTML-Faehigkeiten -SW_DLLPUBLIC USHORT GetHtmlMode(const SwDocShell*); +SW_DLLPUBLIC sal_uInt16 GetHtmlMode(const SwDocShell*); #endif diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 480876904d59..26300f99e24d 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -114,7 +114,7 @@ class SW_DLLPUBLIC ViewShell : public Ring //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert //werden kann. - friend void SetSwVisArea( ViewShell *pSh, const SwRect &, BOOL bPDFExport = FALSE ); + friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False ); // --> PB 2007-05-30 #146850# static BitmapEx* pReplaceBmp; // replaced display of still loaded images @@ -272,7 +272,7 @@ public: Point GetPagePos( sal_uInt16 nPageNum ) const; sal_uInt16 GetNumPages(); //Anzahl der aktuellen Seiten Layout erfragen. - sal_Bool IsDummyPage( USHORT nPageNum ) const; // An empty page? + sal_Bool IsDummyPage( sal_uInt16 nPageNum ) const; // An empty page? //Invalidierung der ersten Sichtbaren Seite fuer alle Shells im Ring. void SetFirstVisPageInvalid(); @@ -503,7 +503,7 @@ public: //wenn sich der BrowdseModus aendert, bBrowseChgd == sal_True //oder, im BrowseModus, wenn sich die Groessenverhaeltnisse //aendern (bBrowseChgd == sal_False) - void CheckBrowseView( BOOL bBrowseChgd ); + void CheckBrowseView( sal_Bool bBrowseChgd ); const Size& GetBrowseBorder() const; sal_Int32 GetBrowseWidth() const; diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 827671a7f94e..0dc52572d40e 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -45,11 +45,11 @@ class SwVisCrsr friend void _InitCore(); friend void _FinitCore(); - BOOL bIsVisible : 1; - BOOL bIsDragCrsr : 1; + sal_Bool bIsVisible : 1; + sal_Bool bIsDragCrsr : 1; #ifdef SW_CRSR_TIMER - BOOL bTimerOn : 1; + sal_Bool bTimerOn : 1; #endif Cursor aTxtCrsr; @@ -67,11 +67,11 @@ public: void Show(); void Hide(); - BOOL IsVisible() const { return bIsVisible; } - void SetDragCrsr( BOOL bFlag = TRUE ) { bIsDragCrsr = bFlag; } + sal_Bool IsVisible() const { return bIsVisible; } + void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; } #ifdef SW_CRSR_TIMER - BOOL ChgTimerFlag( BOOL bTimerOn = TRUE ); + sal_Bool ChgTimerFlag( sal_Bool bTimerOn = sal_True ); #endif }; @@ -159,15 +159,15 @@ public: virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); - BOOL UpDown( BOOL bUp, USHORT nCnt = 1 ); + sal_Bool UpDown( sal_Bool bUp, sal_uInt16 nCnt = 1 ); - // TRUE: an die Position kann der Cursor gesetzt werden - virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; + // sal_True: an die Position kann der Cursor gesetzt werden + virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; #ifdef DBG_UTIL // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung // am sichtbaren Cursor - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); @@ -197,7 +197,7 @@ public: virtual void FillRects(); // fuer Table- und normalen Crsr // Pruefe, ob sich der SPoint innerhalb der Tabellen-SSelection befindet - BOOL IsInside( const Point& rPt ) const; + sal_Bool IsInside( const Point& rPt ) const; virtual void SetMark(); virtual SwCursor* Create( SwPaM* pRing = 0 ) const; @@ -205,13 +205,13 @@ public: virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); - // TRUE: an die Position kann der Cursor gesetzt werden - virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; + // sal_True: an die Position kann der Cursor gesetzt werden + virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; #ifdef DBG_UTIL // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung // am sichtbaren Cursor - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index fe066a6b010c..7b97317bc23b 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -32,7 +32,7 @@ class SW_DLLPUBLIC SwWebDocShell: public SwDocShell { - USHORT nSourcePara; // aktive Zeile in der SourceView + sal_uInt16 nSourcePara; // aktive Zeile in der SourceView public: @@ -53,9 +53,9 @@ public: String * pUserName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; - USHORT GetSourcePara()const + sal_uInt16 GetSourcePara()const {return nSourcePara;} - void SetSourcePara(USHORT nSet) {nSourcePara = nSet;} + void SetSourcePara(sal_uInt16 nSet) {nSourcePara = nSet;} }; #endif |