diff options
Diffstat (limited to 'sw/source/ui/inc')
142 files changed, 1543 insertions, 2013 deletions
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx index 293d76c7a3dc..cabf71ac46c1 100644 --- a/sw/source/ui/inc/DropDownFieldDialog.hxx +++ b/sw/source/ui/inc/DropDownFieldDialog.hxx @@ -61,7 +61,7 @@ class DropDownFieldDialog : public SvxStandardDialog virtual void Apply(); public: DropDownFieldDialog( Window *pParent, SwWrtShell &rSh, - SwField* pField, BOOL bNextButton = FALSE ); + SwField* pField, sal_Bool bNextButton = sal_False ); ~DropDownFieldDialog(); }; } //namespace sw diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx index 4b2af9f3238e..0d3cf88faac2 100644 --- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx @@ -60,7 +60,7 @@ protected: public: SwSpellDialogChildWindow ( Window*pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); ~SwSpellDialogChildWindow(); diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index 29a60dff072d..755d30b61503 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.hxx @@ -54,8 +54,8 @@ public: SwInsertAbstractDlg( Window* pParent ); ~SwInsertAbstractDlg(); - BYTE GetLevel() const; - BYTE GetPara() const; + sal_uInt8 GetLevel() const; + sal_uInt8 GetPara() const; }; #endif diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index 5d6d74a7614e..12de8a18618b 100644 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.hxx @@ -68,11 +68,12 @@ public: void InsertSymbol(SfxRequest& rReq); - void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); + void ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False); void StateSearch(SfxItemSet &); - virtual SfxUndoManager* GetUndoManager(); + virtual ::svl::IUndoManager* + GetUndoManager(); }; #endif diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 59d0ca231b07..763eaba3e55c 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -54,7 +54,7 @@ class SwAsciiFilterDlg : public SfxModalDialog CancelButton aCancelPB; HelpButton aHelpPB; String sSystemCharSet; - BOOL bSaveLineStatus; + sal_Bool bSaveLineStatus; DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* ); DECL_LINK( LineEndHdl, RadioButton* ); diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index b5c6fe86df68..a3a97af2916d 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -70,7 +70,7 @@ protected: inline SwView& GetView() { return rView; } inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } + inline sal_Bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); } DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); @@ -109,7 +109,7 @@ public: void GetBckColState(SfxItemSet &rSet); void ExecBckCol(SfxRequest& rReq); - void SetWrapMode( USHORT nSlot ); + void SetWrapMode( sal_uInt16 nSlot ); void StateDisableItems(SfxItemSet &); diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index c602b9e9df1a..180e033f1b44 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.hxx @@ -42,22 +42,22 @@ private: Graphic aGraphic; BitmapEx aBmp; - BOOL bHorz : 1; - BOOL bVert : 1; - BOOL bGraphic : 1; - BOOL bLeftAlign : 1; + sal_Bool bHorz : 1; + sal_Bool bVert : 1; + sal_Bool bGraphic : 1; + sal_Bool bLeftAlign : 1; void Paint(const Rectangle& rRect); public: - BmpWindow(Window* pPar, USHORT nId, + BmpWindow(Window* pPar, sal_uInt16 nId, const Graphic& rGraphic, const BitmapEx& rBmp); BmpWindow(Window* pParent, const ResId rResId) : Window(pParent, rResId), - bHorz(FALSE), bVert(FALSE),bGraphic(FALSE), bLeftAlign(TRUE) {} + bHorz(sal_False), bVert(sal_False),bGraphic(sal_False), bLeftAlign(sal_True) {} ~BmpWindow(); - void MirrorVert(BOOL bMirror) { bVert = bMirror; Invalidate(); } - void MirrorHorz(BOOL bMirror) { bHorz = bMirror; Invalidate(); } + void MirrorVert(sal_Bool bMirror) { bVert = bMirror; Invalidate(); } + void MirrorHorz(sal_Bool bMirror) { bHorz = bMirror; Invalidate(); } void SetGraphic(const Graphic& rGrf); }; diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index c426aa93c071..0f9e96f50d73 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -40,13 +40,13 @@ class SwBookmarkControl : public SfxStatusBarControl virtual void Command( const CommandEvent& rCEvt ); public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SwBookmarkControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SwBookmarkControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SwBookmarkControl(); private: diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index d6201069f8d6..effdba914367 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -40,24 +40,24 @@ class SfxRequest; class BookmarkCombo : public SwComboBox { - USHORT GetFirstSelEntryPos() const; - USHORT GetNextSelEntryPos(USHORT nPos) const; - USHORT GetSelEntryPos(USHORT nPos) const; + sal_uInt16 GetFirstSelEntryPos() const; + sal_uInt16 GetNextSelEntryPos(sal_uInt16 nPos) const; + sal_uInt16 GetSelEntryPos(sal_uInt16 nPos) const; virtual long PreNotify(NotifyEvent& rNEvt); public: BookmarkCombo( Window* pWin, const ResId& rResId ); - USHORT GetSelectEntryCount() const; - USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; + sal_uInt16 GetSelectEntryCount() const; + sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const; static const String aForbiddenChars; }; class SwInsertBookmarkDlg: public SvxStandardDialog { - BookmarkCombo aBookmarkBox; FixedLine aBookmarkFl; + BookmarkCombo aBookmarkBox; OKButton aOkBtn; CancelButton aCancelBtn; PushButton aDeleteBtn; diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 1d4236a90575..9ff55fde5d2b 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -43,6 +43,7 @@ class SwWrtShell; class SwBreakDlg: public SvxStandardDialog { SwWrtShell &rSh; + FixedLine aBreakFL; RadioButton aLineBtn; RadioButton aColumnBtn; RadioButton aPageBtn; @@ -50,17 +51,16 @@ class SwBreakDlg: public SvxStandardDialog ListBox aPageCollBox; CheckBox aPageNumBox; NumericField aPageNumEdit; - FixedLine aBreakFL; OKButton aOkBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; String aTemplate; - USHORT nKind; - USHORT nPgNum; + sal_uInt16 nKind; + sal_uInt16 nPgNum; - BOOL bHtmlMode; + sal_Bool bHtmlMode; DECL_LINK( ClickHdl, void * ); DECL_LINK( PageNumHdl, CheckBox * ); @@ -77,8 +77,8 @@ public: ~SwBreakDlg(); String GetTemplateName() { return aTemplate; } - USHORT GetKind() { return nKind; } - USHORT GetPageNumber() { return nPgNum; } + sal_uInt16 GetKind() { return nKind; } + sal_uInt16 GetPageNumber() { return nPgNum; } }; #endif diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 119f20a4f257..cf1260094ee2 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -36,29 +36,29 @@ class SW_DLLPUBLIC InsCaptionOpt { private: - BOOL bUseCaption; + sal_Bool bUseCaption; SwCapObjType eObjType; SvGlobalName aOleId; String sCategory; - USHORT nNumType; + sal_uInt16 nNumType; ::rtl::OUString sNumberSeparator; String sCaption; - USHORT nPos; - USHORT nLevel; + sal_uInt16 nPos; + sal_uInt16 nLevel; // sal_Unicode cSeparator; String sSeparator; String sCharacterStyle; - BOOL bIgnoreSeqOpts; // wird nicht gespeichert - BOOL bCopyAttributes; // -""- + sal_Bool bIgnoreSeqOpts; // wird nicht gespeichert + sal_Bool bCopyAttributes; // -""- public: InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = 0); InsCaptionOpt(const InsCaptionOpt&); ~InsCaptionOpt(); - inline BOOL& UseCaption() { return bUseCaption; } - inline BOOL UseCaption() const { return bUseCaption; } + inline sal_Bool& UseCaption() { return bUseCaption; } + inline sal_Bool UseCaption() const { return bUseCaption; } inline SwCapObjType GetObjType() const { return eObjType; } inline void SetObjType(const SwCapObjType eType) { eObjType = eType; } @@ -69,8 +69,8 @@ public: inline const String& GetCategory() const { return sCategory; } inline void SetCategory(const String& rCat) { sCategory = rCat; } - inline USHORT GetNumType() const { return nNumType; } - inline void SetNumType(const USHORT nNT) { nNumType = nNT; } + inline sal_uInt16 GetNumType() const { return nNumType; } + inline void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } const ::rtl::OUString& GetNumSeparator() const { return sNumberSeparator; } void SetNumSeparator(const ::rtl::OUString& rSet) {sNumberSeparator = rSet;} @@ -78,11 +78,11 @@ public: inline const String& GetCaption() const { return sCaption; } inline void SetCaption(const String& rCap) { sCaption = rCap; } - inline USHORT GetPos() const { return nPos; } - inline void SetPos(const USHORT nP) { nPos = nP; } + inline sal_uInt16 GetPos() const { return nPos; } + inline void SetPos(const sal_uInt16 nP) { nPos = nP; } - inline USHORT GetLevel() const { return nLevel; } - inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; } + inline sal_uInt16 GetLevel() const { return nLevel; } + inline void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } // inline sal_Unicode GetSeparator() const { return cSeparator; } // inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; } @@ -93,15 +93,15 @@ public: void SetCharacterStyle(const String& rStyle) { sCharacterStyle = rStyle; } - inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; } - inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; } + inline sal_Bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } + inline sal_Bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } - inline BOOL& CopyAttributes() { return bCopyAttributes; } - inline BOOL CopyAttributes() const { return bCopyAttributes; } + inline sal_Bool& CopyAttributes() { return bCopyAttributes; } + inline sal_Bool CopyAttributes() const { return bCopyAttributes; } - BOOL operator==( const InsCaptionOpt& rOpt ) const; + sal_Bool operator==( const InsCaptionOpt& rOpt ) const; InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); - inline BOOL operator< ( const InsCaptionOpt & rObj ) const + inline sal_Bool operator< ( const InsCaptionOpt & rObj ) const { return aOleId < rObj.aOleId; } // friend SvStream& operator>>( SvStream& rIStream, InsCaptionOpt& rCapOpt ); // friend SvStream& operator<<( SvStream& rOStream, const InsCaptionOpt& rCapOpt ); diff --git a/sw/source/ui/inc/cfgdesc.hxx b/sw/source/ui/inc/cfgdesc.hxx index 9de404744078..8ecc19a00b5c 100644 --- a/sw/source/ui/inc/cfgdesc.hxx +++ b/sw/source/ui/inc/cfgdesc.hxx @@ -35,25 +35,25 @@ class SwCfgDesc protected: String aFuncText; String aLibName; - USHORT nEvent; + sal_uInt16 nEvent; - SwCfgDesc(const String &rFuncName, USHORT nId); + SwCfgDesc(const String &rFuncName, sal_uInt16 nId); SwCfgDesc(const String &rLib,const String &rMacro); ~SwCfgDesc(); public: - void SetEvent(USHORT nE); // inline + void SetEvent(sal_uInt16 nE); // inline void SetFuncText(const String &rStr); // inline void SetMacro(const String &rLib, const String &rMac); - BOOL IsMacro() const; - USHORT GetEvent() const; // inline + sal_Bool IsMacro() const; + sal_uInt16 GetEvent() const; // inline String GetFuncText() const; // inline String GetMacro() const; // inline String GetLib() const; // inline }; // INLINE METHODE -------------------------------------------------------- -inline void SwCfgDesc::SetEvent(USHORT nE) { +inline void SwCfgDesc::SetEvent(sal_uInt16 nE) { nEvent = nE; } @@ -61,7 +61,7 @@ inline void SwCfgDesc::SetFuncText(const String &rStr) { aFuncText = rStr; } -inline USHORT SwCfgDesc::GetEvent() const { return nEvent; } +inline sal_uInt16 SwCfgDesc::GetEvent() const { return nEvent; } inline String SwCfgDesc::GetFuncText() const { return aFuncText; } inline String SwCfgDesc::GetMacro() const { return aFuncText; } inline String SwCfgDesc::GetLib() const { return aLibName; } diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 8793a6d8ff00..d0d1103459c8 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -60,26 +60,26 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem friend class SwShdwCrsrOptionsTabPage; friend class SwModule; - BOOL bParagraphEnd :1; - BOOL bTab :1; - BOOL bSpace :1; - BOOL bNonbreakingSpace :1; - BOOL bSoftHyphen :1; - BOOL bCharHiddenText :1; - BOOL bFldHiddenText :1; - BOOL bManualBreak :1; - BOOL bShowHiddenPara :1; + sal_Bool bParagraphEnd :1; + sal_Bool bTab :1; + sal_Bool bSpace :1; + sal_Bool bNonbreakingSpace :1; + sal_Bool bSoftHyphen :1; + sal_Bool bCharHiddenText :1; + sal_Bool bFldHiddenText :1; + sal_Bool bManualBreak :1; + sal_Bool bShowHiddenPara :1; Color aIndexBackgrndCol; public: TYPEINFO(); - SwDocDisplayItem( USHORT nWhich = FN_PARAM_DOCDISP ); + SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); SwDocDisplayItem( const SwDocDisplayItem& rSwDocDisplayItem ); SwDocDisplayItem( const SwViewOption& rVOpt, - USHORT nWhich ); + sal_uInt16 nWhich ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -94,31 +94,31 @@ Item fuer Einstellungsdialog, Elementeseite class SW_DLLPUBLIC SwElemItem : public SfxPoolItem { //view - BOOL bHorzScrollbar :1; - BOOL bVertScrollbar :1; - BOOL bAnyRuler : 1; - BOOL bHorzRuler :1; - BOOL bVertRuler :1; - BOOL bVertRulerRight:1; - BOOL bSmoothScroll :1; + sal_Bool bHorzScrollbar :1; + sal_Bool bVertScrollbar :1; + sal_Bool bAnyRuler : 1; + sal_Bool bHorzRuler :1; + sal_Bool bVertRuler :1; + sal_Bool bVertRulerRight:1; + sal_Bool bSmoothScroll :1; //visual aids - BOOL bCrosshair :1; - BOOL bHandles :1; - BOOL bBigHandles :1; + sal_Bool bCrosshair :1; + sal_Bool bHandles :1; + sal_Bool bBigHandles :1; //display - BOOL bTable :1; - BOOL bGraphic :1; - BOOL bDrawing :1; - BOOL bFieldName :1; - BOOL bNotes :1; + sal_Bool bTable :1; + sal_Bool bGraphic :1; + sal_Bool bDrawing :1; + sal_Bool bFieldName :1; + sal_Bool bNotes :1; friend class SwContentOptPage; public: TYPEINFO(); - SwElemItem( USHORT nWhich = FN_PARAM_ELEM ); + SwElemItem( sal_uInt16 nWhich = FN_PARAM_ELEM ); SwElemItem(const SwElemItem& rElemItem); - SwElemItem(const SwViewOption& rVOpt, USHORT nWhich); + SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -140,8 +140,8 @@ class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData public: TYPEINFO(); - SwAddPrinterItem( USHORT nWhich = FN_PARAM_ADDPRINTER ); - SwAddPrinterItem( USHORT nWhich, const SwPrintData& rPrtData ); + SwAddPrinterItem( sal_uInt16 nWhich = FN_PARAM_ADDPRINTER ); + SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -152,27 +152,27 @@ public: void SetFax( const String& rFax) { sFaxName = rFax; } - BOOL IsPrintProspect() const { return bPrintProspect; } - BOOL IsPrintProspectRTL() const { return bPrintProspectRTL; } - void SetPrintProspect(BOOL bFlag ){ bPrintProspect = bFlag; } - void SetPrintProspectRTL(BOOL bFlag ){ bPrintProspectRTL = bFlag; } - BOOL IsPrintGraphic () const { return bPrintGraphic; } - BOOL IsPrintTable () const { return bPrintTable; } - BOOL IsPrintDraw () const { return bPrintDraw; } - BOOL IsPrintControl () const { return bPrintControl; } - BOOL IsPrintLeftPage () const { return bPrintLeftPages; } - BOOL IsPrintRightPage() const { return bPrintRightPages; } - BOOL IsPrintReverse () const { return bPrintReverse; } - BOOL IsPaperFromSetup() const { return bPaperFromSetup; } - BOOL IsPrintEmptyPages() const { return bPrintEmptyPages; } - BOOL IsPrintPageBackground() const { return bPrintPageBackground; } - BOOL IsPrintBlackFont() const { return bPrintBlackFont; } + sal_Bool IsPrintProspect() const { return bPrintProspect; } + sal_Bool IsPrintProspectRTL() const { return bPrintProspectRTL; } + void SetPrintProspect(sal_Bool bFlag ){ bPrintProspect = bFlag; } + void SetPrintProspectRTL(sal_Bool bFlag ){ bPrintProspectRTL = bFlag; } + sal_Bool IsPrintGraphic () const { return bPrintGraphic; } + sal_Bool IsPrintTable () const { return bPrintTable; } + sal_Bool IsPrintDraw () const { return bPrintDraw; } + sal_Bool IsPrintControl () const { return bPrintControl; } + sal_Bool IsPrintLeftPage () const { return bPrintLeftPages; } + sal_Bool IsPrintRightPage() const { return bPrintRightPages; } + sal_Bool IsPrintReverse () const { return bPrintReverse; } + sal_Bool IsPaperFromSetup() const { return bPaperFromSetup; } + sal_Bool IsPrintEmptyPages() const { return bPrintEmptyPages; } + sal_Bool IsPrintPageBackground() const { return bPrintPageBackground; } + sal_Bool IsPrintBlackFont() const { return bPrintBlackFont; } //#i81434# - printing of hidden text sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; } sal_Bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; } - BOOL IsPrintSingleJobs() const { return bPrintSingleJobs; } - ULONG GetPrintPostIts () const { return nPrintPostIts; } + sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs; } + sal_uLong GetPrintPostIts () const { return nPrintPostIts; } }; @@ -181,13 +181,13 @@ Item fuer Einstellungsdialog, ShadowCursorSeite --------------------------------------------------------- */ class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem { - BYTE eMode; - BOOL bOn; + sal_uInt8 eMode; + sal_Bool bOn; public: TYPEINFO(); - SwShadowCursorItem( USHORT nWhich = FN_PARAM_SHADOWCURSOR ); + SwShadowCursorItem( sal_uInt16 nWhich = FN_PARAM_SHADOWCURSOR ); SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); - SwShadowCursorItem( const SwViewOption& rVOpt, USHORT nWhich ); + SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -196,11 +196,11 @@ public: void FillViewOptions( SwViewOption& rVOpt) const; - BYTE GetMode() const { return eMode; } - BOOL IsOn() const { return bOn; } + sal_uInt8 GetMode() const { return eMode; } + sal_Bool IsOn() const { return bOn; } - void SetMode( BYTE eM ) { eMode = eM; } - void SetOn( BOOL bFlag ) { bOn = bFlag; } + void SetMode( sal_uInt8 eM ) { eMode = eM; } + void SetOn( sal_Bool bFlag ) { bOn = bFlag; } }; #if OSL_DEBUG_LEVEL > 1 @@ -215,19 +215,19 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem friend class SwTestTabPage; friend class SwDocEditDialog; - BOOL bTest1:1; - BOOL bTest2:1; - BOOL bTest3:1; - BOOL bTest4:1; - BOOL bTest5:1; - BOOL bTest6:1; - BOOL bTest7:1; - BOOL bTest8:1; - BOOL bTest9:1; - BOOL bTest10:1; + sal_Bool bTest1:1; + sal_Bool bTest2:1; + sal_Bool bTest3:1; + sal_Bool bTest4:1; + sal_Bool bTest5:1; + sal_Bool bTest6:1; + sal_Bool bTest7:1; + sal_Bool bTest8:1; + sal_Bool bTest9:1; + sal_Bool bTest10:1; public: - SwTestItem( USHORT _nWhich): + SwTestItem( sal_uInt16 _nWhich): SfxPoolItem(_nWhich){}; SwTestItem( const SwTestItem& pTestItem); diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index 4bd104d860c8..70b4e4385ab6 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.hxx @@ -42,10 +42,10 @@ class SwChildWinWrapper : public SfxChildWindow // Implementation in fldtdlg.cxx protected: - SwChildWinWrapper(Window *pParentWindow, USHORT nId); + SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId); public: - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); inline SwDocShell* GetOldDocShell() { return m_pDocSh; } inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 7f3679beacf7..db5bf5bc50cb 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -51,15 +51,15 @@ class SvxMacroItem; class SwCharDlg: public SfxTabDialog { SwView& rView; - BOOL bIsDrwTxtMode; + sal_Bool bIsDrwTxtMode; public: SwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE); + const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False); ~SwCharDlg(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); }; /*-----------------14.08.96 11.03------------------- @@ -87,7 +87,7 @@ class SwCharURLPage : public SfxTabPage ListBox aNotVisitedLB; SvxMacroItem* pINetItem; - BOOL bModified; + sal_Bool bModified; DECL_LINK( InsertFileHdl, PushButton * ); DECL_LINK( EventHdl, PushButton * ); @@ -100,7 +100,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index 8c1616559d4e..9c1a3fca65cb 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -55,17 +55,17 @@ struct CurTOXType { TOXTypes eType; - USHORT nIndex; //for TOX_USER only + sal_uInt16 nIndex; //for TOX_USER only - BOOL operator==(const CurTOXType aCmp) + sal_Bool operator==(const CurTOXType aCmp) { return eType == aCmp.eType && nIndex == aCmp.nIndex; } - USHORT GetFlatIndex() const; + sal_uInt16 GetFlatIndex() const; CurTOXType () : eType (TOX_INDEX), nIndex (0) {}; - CurTOXType (TOXTypes t, USHORT i) : eType (t), nIndex (i) {}; + CurTOXType (TOXTypes t, sal_uInt16 i) : eType (t), nIndex (i) {}; }; class SwOLENames : public Resource diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx index fb93c8d11ffa..f8d194a5fe7e 100644 --- a/sw/source/ui/inc/colex.hxx +++ b/sw/source/ui/inc/colex.hxx @@ -55,8 +55,8 @@ class SW_DLLPUBLIC SwPageGridExample : public SwPageExample sal_Bool m_bVertical; protected: virtual void DrawPage( const Point& rPoint, - const BOOL bSecond, - const BOOL bEnabled ); + const sal_Bool bSecond, + const sal_Bool bEnabled ); public: SwPageGridExample(Window* pPar, const ResId& rResId ) : SwPageExample(pPar, rResId ), @@ -74,8 +74,8 @@ class SW_DLLPUBLIC SwColExample : public SwPageExample protected: virtual void DrawPage( const Point& rPoint, - const BOOL bSecond, - const BOOL bEnabled ); + const sal_Bool bSecond, + const sal_Bool bEnabled ); public: SwColExample(Window* pPar, const ResId& rResId ) : diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index cc2ecd26bd24..44273b8cc41e 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -31,33 +31,33 @@ #include "swdllapi.h" #include <fmtclds.hxx> -SW_DLLPUBLIC void FitToActualSize(SwFmtCol& rCol, USHORT nWidth); +SW_DLLPUBLIC void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth); class SW_DLLPUBLIC SwColMgr { public: // lActWidth wird aus den Edits des Seitendialogs // direkt uebergeben - SwColMgr(const SfxItemSet &rSet, USHORT nActWidth = USHRT_MAX); + SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX); ~SwColMgr(); - inline USHORT GetCount() const; - void SetCount(USHORT nCount, USHORT nGutterWidth); - USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const; - void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX); + inline sal_uInt16 GetCount() const; + void SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth); + sal_uInt16 GetGutterWidth(sal_uInt16 nPos = USHRT_MAX) const; + void SetGutterWidth(sal_uInt16 nWidth, sal_uInt16 nPos = USHRT_MAX); - USHORT GetColWidth(USHORT nIdx) const; - void SetColWidth(USHORT nIdx, USHORT nWidth); + sal_uInt16 GetColWidth(sal_uInt16 nIdx) const; + void SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWidth); - inline BOOL IsAutoWidth() const; - void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0); + inline sal_Bool IsAutoWidth() const; + void SetAutoWidth(sal_Bool bOn = sal_True, sal_uInt16 lGutterWidth = 0); - inline BOOL HasLine() const; + inline sal_Bool HasLine() const; inline void SetNoLine(); - inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol); - inline ULONG GetLineWidth() const; + inline void SetLineWidthAndColor(sal_uLong nWidth, const Color& rCol); + inline sal_uLong GetLineWidth() const; inline const Color& GetLineColor() const; inline SwColLineAdj GetAdjust() const; @@ -71,29 +71,28 @@ public: const SwFmtCol& GetColumns() const { return aFmtCol; } - void SetActualWidth(USHORT nW); - USHORT GetActualSize() const { return nWidth; } + void SetActualWidth(sal_uInt16 nW); + sal_uInt16 GetActualSize() const { return nWidth; } private: SwFmtCol aFmtCol; - USHORT nWidth; + sal_uInt16 nWidth; }; // INLINE METHODE -------------------------------------------------------- -inline USHORT SwColMgr::GetCount() const +inline sal_uInt16 SwColMgr::GetCount() const { return aFmtCol.GetNumCols(); } -inline void SwColMgr::SetLineWidthAndColor(ULONG nLWidth, const Color& rCol) +inline void SwColMgr::SetLineWidthAndColor(sal_uLong nLWidth, const Color& rCol) { aFmtCol.SetLineWidth(nLWidth); aFmtCol.SetLineColor(rCol); } - -inline ULONG SwColMgr::GetLineWidth() const +inline sal_uLong SwColMgr::GetLineWidth() const { return aFmtCol.GetLineWidth(); } @@ -112,13 +111,11 @@ inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) { aFmtCol.SetLineAdj(eAdj); } - -inline BOOL SwColMgr::IsAutoWidth() const +inline sal_Bool SwColMgr::IsAutoWidth() const { return aFmtCol.IsOrtho(); } - -inline void SwColMgr::SetAutoWidth(BOOL bOn, USHORT nGutterWidth) +inline void SwColMgr::SetAutoWidth(sal_Bool bOn, sal_uInt16 nGutterWidth) { aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth); } @@ -127,8 +124,7 @@ inline void SwColMgr::NoCols() { aFmtCol.GetColumns().DeleteAndDestroy(0, aFmtCol.GetColumns().Count()); } - -inline BOOL SwColMgr::HasLine() const +inline sal_Bool SwColMgr::HasLine() const { return GetAdjust() != COLADJ_NONE; } diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 0ebdf821a42a..aceb0ae3ddef 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -37,7 +37,7 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> #include <vcl/timer.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <svtools/ctrlbox.hxx> #include <svtools/valueset.hxx> #include <sfx2/basedlgs.hxx> @@ -71,10 +71,10 @@ class SwColumnDlg : public SfxModalDialog long nSelectionWidth; long nPageWidth; - BOOL bPageChanged : 1; - BOOL bSectionChanged : 1; - BOOL bSelSectionChanged : 1; - BOOL bFrameChanged : 1; + sal_Bool bPageChanged : 1; + sal_Bool bSectionChanged : 1; + sal_Bool bSelSectionChanged : 1; + sal_Bool bFrameChanged : 1; DECL_LINK(ObjectHdl, ListBox*); @@ -103,13 +103,14 @@ class ColumnValueSet : public ValueSet --------------------------------------------------------------------*/ class SwColumnPage : public SfxTabPage { + FixedLine aFLGroup; FixedText aClNrLbl; NumericField aCLNrEdt; ColumnValueSet aDefaultVS; ImageList aPreColsIL; CheckBox aBalanceColsCB; - FixedLine aFLGroup; + FixedLine aFLLayout; ImageButton aBtnUp; FixedText aColumnFT; FixedText aWidthFT; @@ -125,15 +126,14 @@ class SwColumnPage : public SfxTabPage ImageButton aBtnDown; CheckBox aAutoWidthBox; - FixedLine aFLLayout; + FixedLine aFLLineType; FixedText aLineTypeLbl; LineListBox aLineTypeDLB; FixedText aLineHeightLbl; MetricField aLineHeightEdit; FixedText aLinePosLbl; ListBox aLinePosDLB; - FixedLine aFLLineType; FixedLine aVertFL; FixedLine aPropertiesFL; @@ -146,16 +146,16 @@ class SwColumnPage : public SfxTabPage SwColMgr* pColMgr; - USHORT nFirstVis; - USHORT nCols; + sal_uInt16 nFirstVis; + sal_uInt16 nCols; long nColWidth[nMaxCols]; long nColDist[nMaxCols]; - USHORT nMinWidth; + sal_uInt16 nMinWidth; PercentField *pModifiedField; - BOOL bFormat; - BOOL bFrm; - BOOL bHtmlMode; - BOOL bLockUpdate; + sal_Bool bFormat; + sal_Bool bFrm; + sal_Bool bHtmlMode; + sal_Bool bLockUpdate; // Handler DECL_LINK( ColModify, NumericField * ); @@ -174,7 +174,7 @@ class SwColumnPage : public SfxTabPage void UpdateCols(); void Init(); void ResetColWidth(); - void SetLabels( USHORT nVis ); + void SetLabels( sal_uInt16 nVis ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -188,18 +188,18 @@ public: virtual ~SwColumnPage(); static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetFrmMode(BOOL bMod); + void SetFrmMode(sal_Bool bMod); void SetPageWidth(long nPageWidth); - void SetFormatUsed(BOOL bFmt) { bFormat = bFmt; } + void SetFormatUsed(sal_Bool bFmt) { bFormat = bFmt; } - void ShowBalance(BOOL bShow) {aBalanceColsCB.Show(bShow);} - void SetInSection(BOOL bSet); + void ShowBalance(sal_Bool bShow) {aBalanceColsCB.Show(bShow);} + void SetInSection(sal_Bool bSet); void ActivateColumnControl() {aCLNrEdt.GrabFocus();} }; diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 720af53b9057..5b8241e31c04 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.hxx @@ -39,16 +39,16 @@ class ConstArc : public SwDrawBase { Point aStartPnt; - UINT16 nAnzButUp; + sal_uInt16 nAnzButUp; public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Funktion aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Funktion aktivieren virtual void Deactivate(); }; diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx index 85c096ed2c71..2fd1990dd864 100644 --- a/sw/source/ui/inc/concustomshape.hxx +++ b/sw/source/ui/inc/concustomshape.hxx @@ -53,10 +53,10 @@ class ConstCustomShape : public SwDrawBase ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren rtl::OUString GetShapeType() const; static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq ); diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index 4cd343986171..8287d54665c9 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -34,7 +34,7 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { - BOOL bBrackets, bEnableDrop; + sal_Bool bBrackets, bEnableDrop; SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); @@ -42,10 +42,10 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper public: ConditionEdit( Window* pParent, const ResId& rResId ); - inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; } + inline void ShowBrackets(sal_Bool bShow) { bBrackets = bShow; } - inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; } - inline BOOL IsDropEnable() const { return bEnableDrop; } + inline void SetDropEnable( sal_Bool bFlag ) { bEnableDrop = bFlag; } + inline sal_Bool IsDropEnable() const { return bEnableDrop; } }; #endif diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index 7f450e730a98..82c7cd6f967a 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.hxx @@ -36,9 +36,9 @@ public: ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren virtual void CreateDefaultObject(); }; diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 43244db17b2a..09220d15e1c7 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.hxx @@ -44,11 +44,11 @@ public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren }; diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx index 3f07874a10d0..0ad80cfbc79a 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.hxx @@ -39,8 +39,8 @@ class ConstRectangle : public SwDrawBase { - BOOL bMarquee; - BOOL bCapVertical; + sal_Bool bMarquee; + sal_Bool bCapVertical; // #93382# sal_Bool mbVertical; @@ -49,10 +49,10 @@ class ConstRectangle : public SwDrawBase ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren }; diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 5abb7ec6cfb4..31aeb8fdd6fc 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -46,7 +46,7 @@ class SwRedline; class SwPopup : public PopupMenu { - USHORT nCurId; + sal_uInt16 nCurId; virtual void Select(){nCurId = GetCurItemId();} public: @@ -54,7 +54,7 @@ public: PopupMenu(), nCurId(USHRT_MAX){} - USHORT GetCurId() const { return nCurId; } + sal_uInt16 GetCurId() const { return nCurId; } }; @@ -62,38 +62,38 @@ public: class SwOutlineContent : public SwContent { - USHORT nOutlinePos; - BYTE nOutlineLevel; - BOOL bIsMoveable; + sal_uInt16 nOutlinePos; + sal_uInt8 nOutlineLevel; + sal_Bool bIsMoveable; public: SwOutlineContent( const SwContentType* pCnt, const String& rName, - USHORT nArrPos, - BYTE nLevel, - BOOL bMove, + sal_uInt16 nArrPos, + sal_uInt8 nLevel, + sal_Bool bMove, long nYPos) : SwContent(pCnt, rName, nYPos), nOutlinePos(nArrPos), nOutlineLevel(nLevel), bIsMoveable(bMove) {} - USHORT GetPos(){return nOutlinePos;} - BYTE GetOutlineLevel(){return nOutlineLevel;} - BOOL IsMoveable(){return bIsMoveable;}; + sal_uInt16 GetPos(){return nOutlinePos;} + sal_uInt8 GetOutlineLevel(){return nOutlineLevel;} + sal_Bool IsMoveable(){return bIsMoveable;}; }; //---------------------------------------------------------------------------- class SwRegionContent : public SwContent { - BYTE nRegionLevel; + sal_uInt8 nRegionLevel; public: SwRegionContent( const SwContentType* pCnt, const String& rName, - BYTE nLevel, + sal_uInt8 nLevel, long nYPos) : SwContent(pCnt, rName, nYPos), nRegionLevel(nLevel){} - BYTE GetRegionLevel() const {return nRegionLevel;} + sal_uInt8 GetRegionLevel() const {return nRegionLevel;} }; //---------------------------------------------------------------------------- @@ -111,7 +111,7 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual BOOL IsProtect() const; + virtual sal_Bool IsProtect() const; const String& GetURL() { return sURL; } const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; @@ -138,7 +138,7 @@ public: const SwFmtFld* GetPostIt() { return pFld; } SwRedline* GetRedline() { return pRedline; } - virtual BOOL IsProtect() const; + virtual sal_Bool IsProtect() const; bool IsPostIt() {return mbPostIt; } }; @@ -184,31 +184,31 @@ class SwContentType : public SwTypeNumber String sContentTypeName; // Name der Inhaltsform String sSingleContentTypeName; // Name der Inhaltsform, Singular String sTypeToken; // Anhaengsel fuer URL - USHORT nMemberCount; // Inhaltsanzahl - USHORT nContentType; // Id der Inhaltsform - BYTE nOutlineLevel; - BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? - BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden? - BOOL bDataValid : 1; // - BOOL bEdit: 1; // kann diese Type bearbeitet werden ? - BOOL bDelete: 1; // kann diese Type geloescht werden ? + sal_uInt16 nMemberCount; // Inhaltsanzahl + sal_uInt16 nContentType; // Id der Inhaltsform + sal_uInt8 nOutlineLevel; + sal_Bool bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt? + sal_Bool bIsInternalDrag:1; // koennen die Inhalte verschoben werden? + sal_Bool bDataValid : 1; // + sal_Bool bEdit: 1; // kann diese Type bearbeitet werden ? + sal_Bool bDelete: 1; // kann diese Type geloescht werden ? protected: void RemoveNewline(String&); public: - SwContentType(SwWrtShell* pParent, USHORT nType, BYTE nLevel ); + SwContentType(SwWrtShell* pParent, sal_uInt16 nType, sal_uInt8 nLevel ); ~SwContentType(); - void Init(BOOL* pbInvalidateWindow = 0); - void FillMemberList(BOOL* pbLevelChanged = NULL); - USHORT GetMemberCount() const + void Init(sal_Bool* pbInvalidateWindow = 0); + void FillMemberList(sal_Bool* pbLevelChanged = NULL); + sal_uInt16 GetMemberCount() const {return nMemberCount;}; - USHORT GetType() const {return nContentType;} - const SwContent* GetMember(USHORT nIndex); + sal_uInt16 GetType() const {return nContentType;} + const SwContent* GetMember(sal_uInt16 nIndex); const String& GetName() {return sContentTypeName;} const String& GetSingleName() const {return sSingleContentTypeName;} const String& GetTypeToken() const{return sTypeToken;} - void SetOutlineLevel(BYTE nNew) + void SetOutlineLevel(sal_uInt8 nNew) { nOutlineLevel = nNew; Invalidate(); @@ -216,8 +216,8 @@ public: void Invalidate(); // nur nMemberCount wird neu gelesen - BOOL IsEditable() const {return bEdit;} - BOOL IsDeletable() const {return bDelete;} + sal_Bool IsEditable() const {return bEdit;} + sal_Bool IsDeletable() const {return bDelete;} }; #endif diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index accf1d1b1818..433a8ebae34d 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -80,24 +80,24 @@ class SwContentTree : public SvTreeListBox std::map< void*, sal_Bool > mOutLineNodeMap; sal_Int32 nActiveBlock; - USHORT nHiddenBlock; - USHORT nRootType; - USHORT nLastSelType; - BYTE nOutlineLevel; - - BOOL bIsActive :1; - BOOL bIsConstant :1; - BOOL bIsHidden :1; - BOOL bDocChgdInDragging :1; - BOOL bIsInternalDrag :1; - BOOL bIsRoot :1; - BOOL bIsIdleClear :1; - BOOL bIsLastReadOnly :1; - BOOL bIsOutlineMoveable :1; - BOOL bViewHasChanged :1; - BOOL bIsImageListInitialized : 1; - - static BOOL bIsInDrag; + sal_uInt16 nHiddenBlock; + sal_uInt16 nRootType; + sal_uInt16 nLastSelType; + sal_uInt8 nOutlineLevel; + + sal_Bool bIsActive :1; + sal_Bool bIsConstant :1; + sal_Bool bIsHidden :1; + sal_Bool bDocChgdInDragging :1; + sal_Bool bIsInternalDrag :1; + sal_Bool bIsRoot :1; + sal_Bool bIsIdleClear :1; + sal_Bool bIsLastReadOnly :1; + sal_Bool bIsOutlineMoveable :1; + sal_Bool bViewHasChanged :1; + sal_Bool bIsImageListInitialized : 1; + + static sal_Bool bIsInDrag; void FindActiveTypeAndRemoveUserData(); @@ -123,41 +123,41 @@ protected: sal_Bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); - BOOL HasContentChanged(); + sal_Bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); - virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, + virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos + sal_uLong& rNewChildPos ); - virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, + virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos + sal_uLong& rNewChildPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - void EditEntry( SvLBoxEntry* pEntry, BYTE nMode ); + void EditEntry( SvLBoxEntry* pEntry, sal_uInt8 nMode ); void GotoContent(SwContent* pCnt); - static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;} + static void SetInDrag(sal_Bool bSet) {bIsInDrag = bSet;} virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); public: SwContentTree(Window* pParent, const ResId& rResId); ~SwContentTree(); - BOOL ToggleToRoot(); - BOOL IsRoot() const {return bIsRoot;} - USHORT GetRootType() const {return nRootType;} - void SetRootType(USHORT nType); - void Display( BOOL bActiveView ); + sal_Bool ToggleToRoot(); + sal_Bool IsRoot() const {return bIsRoot;} + sal_uInt16 GetRootType() const {return nRootType;} + void SetRootType(sal_uInt16 nType); + void Display( sal_Bool bActiveView ); void Clear(); void SetHiddenShell(SwWrtShell* pSh); void ShowHiddenShell(); @@ -170,26 +170,26 @@ public: pActiveShell : pHiddenShell;} - static BOOL IsInDrag() {return bIsInDrag;} - BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} + static sal_Bool IsInDrag() {return bIsInDrag;} + sal_Bool IsInternalDrag() const {return bIsInternalDrag != 0;} sal_Int32 GetActiveBlock() const {return nActiveBlock;} - BYTE GetOutlineLevel()const {return nOutlineLevel;} - void SetOutlineLevel(BYTE nSet); + sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} + void SetOutlineLevel(sal_uInt8 nSet); - BOOL Expand( SvLBoxEntry* pParent ); + sal_Bool Expand( SvLBoxEntry* pParent ); - BOOL Collapse( SvLBoxEntry* pParent ); + sal_Bool Collapse( SvLBoxEntry* pParent ); - void ExecCommand(USHORT nCmd, BOOL bModifier); + void ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier); void ShowTree(); void HideTree(); - BOOL IsConstantView() {return bIsConstant;} - BOOL IsActiveView() {return bIsActive;} - BOOL IsHiddenView() {return bIsHidden;} + sal_Bool IsConstantView() {return bIsConstant;} + sal_Bool IsActiveView() {return bIsActive;} + sal_Bool IsHiddenView() {return bIsHidden;} const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} @@ -202,7 +202,7 @@ public: virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); + virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); }; @@ -214,12 +214,12 @@ class SwLBoxString : public SvLBoxString { public: - SwLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, + SwLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) { } - virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, + virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; @@ -243,9 +243,9 @@ private: SwGlblDocContent* pDocContent; sfx2::DocumentInserter* pDocInserter; - BOOL bIsInternalDrag :1; - BOOL bLastEntryEmphasis :1; // Drag'n Drop - BOOL bIsImageListInitialized : 1; + sal_Bool bIsInternalDrag :1; + sal_Bool bLastEntryEmphasis :1; // Drag'n Drop + sal_Bool bIsImageListInitialized : 1; static const SfxObjectShell* pShowShell; @@ -269,22 +269,22 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ); virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, + virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos + sal_uLong& rNewChildPos ); - virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, + virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos + sal_uLong& rNewChildPos ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); @@ -299,26 +299,26 @@ protected: DECL_LINK( Timeout, Timer* ); DECL_LINK( DoubleClickHdl, SwGlobalTree * ); - BOOL IsInternalDrag() const {return bIsInternalDrag != 0;} + sal_Bool IsInternalDrag() const {return bIsInternalDrag != 0;} SwNavigationPI* GetParentWindow() { return (SwNavigationPI*)Window::GetParent(); } void OpenDoc(const SwGlblDocContent*); void GotoContent(const SwGlblDocContent*); - USHORT GetEnableFlags() const; + sal_uInt16 GetEnableFlags() const; static const SfxObjectShell* GetShowShell() {return pShowShell;} static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); public: SwGlobalTree(Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); - void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox); + void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); void InsertRegion( const SwGlblDocContent* pCont, const String* pFileName = 0 ); void EditContent(const SwGlblDocContent* pCont ); @@ -326,11 +326,11 @@ public: void ShowTree(); void HideTree(); - void ExecCommand(USHORT nCmd); + void ExecCommand(sal_uInt16 nCmd); - void Display(BOOL bOnlyUpdateUserData = FALSE); + void Display(sal_Bool bOnlyUpdateUserData = sal_False); - BOOL Update(BOOL bHard); + sal_Bool Update(sal_Bool bHard); }; #endif diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 9ca9c15b06ef..56adecbaad8f 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -66,18 +66,18 @@ struct SwInsDBColumn sal_Int32 nDBNumFmt; sal_uInt32 nUsrNumFmt; LanguageType eUsrNumFmtLng; - USHORT nCol; - BOOL bHasFmt : 1; - BOOL bIsDBFmt : 1; + sal_uInt16 nCol; + sal_Bool bHasFmt : 1; + sal_Bool bIsDBFmt : 1; - SwInsDBColumn( const String& rStr, USHORT nColumn ) + SwInsDBColumn( const String& rStr, sal_uInt16 nColumn ) : sColumn( rStr ), nDBNumFmt( 0 ), nUsrNumFmt( 0 ), eUsrNumFmtLng( LANGUAGE_SYSTEM ), nCol( nColumn ), - bHasFmt(FALSE), - bIsDBFmt(TRUE) + bHasFmt(sal_False), + bIsDBFmt(sal_True) {} int operator==( const SwInsDBColumn& rCmp ) const @@ -143,7 +143,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem SfxItemSet* pTblSet; SwTableRep* pRep; - USHORT nGBFmtLen; + sal_uInt16 nGBFmtLen; DECL_LINK( PageHdl, Button* ); DECL_LINK( AutoFmtHdl, PushButton* ); @@ -154,7 +154,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem DECL_LINK( DblClickHdl, ListBox* ); DECL_LINK( HeaderHdl, Button* ); - BOOL SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, BOOL bInsField ); + sal_Bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ); using SfxModalDialog::Notify; virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); virtual void Commit(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index ec0bb0d970b5..090654b3f55c 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -49,8 +49,8 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox Image aQueryBMP; String sDefDBName; - BOOL bInitialized; - BOOL bShowColumns; + sal_Bool bInitialized; + sal_Bool bShowColumns; SwDBTreeList_Impl* pImpl; @@ -68,15 +68,15 @@ public: SwDBTreeList( Window* pParent, const ResId& rResId, SwWrtShell* pSh, const String& rDefDBName = aEmptyStr, - const BOOL bShowCol = FALSE ); + const sal_Bool bShowCol = sal_False ); virtual ~SwDBTreeList(); - String GetDBName( String& rTableName, String& rColumnName, BOOL* pbIsTable = 0); + String GetDBName( String& rTableName, String& rColumnName, sal_Bool* pbIsTable = 0); void Select( const String& rDBName, const String& rTableName, const String& rColumnName ); - void ShowColumns(BOOL bShowCol); + void ShowColumns(sal_Bool bShowCol); void SetWrtShell(SwWrtShell& rSh); void AddDataSource(const String& rSource); diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/ui/inc/docfnote.hxx index 69b65f12ae1e..172ca409317a 100644 --- a/sw/source/ui/inc/docfnote.hxx +++ b/sw/source/ui/inc/docfnote.hxx @@ -37,7 +37,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog SwWrtShell &rSh; Link aOldOkHdl; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); #ifdef _SOLAR__PRIVATE DECL_LINK( OkHdl, Button * ); diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index fd48d593ee3f..c8e007dd0f89 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.hxx @@ -47,28 +47,27 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); protected: - virtual BOOL FillItemSet( SfxItemSet &rSet); + virtual sal_Bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); DECL_LINK( UpdateHdl, PushButton*); private: - FixedText aTableLbl; - FixedText aGrfLbl; - FixedText aOLELbl; FixedText aPageLbl; - FixedText aParaLbl; - FixedText aWordLbl; - FixedText aCharLbl; - FixedText aLineLbl; - + FixedInfo aPageNo; + FixedText aTableLbl; FixedInfo aTableNo; + FixedText aGrfLbl; FixedInfo aGrfNo; + FixedText aOLELbl; FixedInfo aOLENo; - FixedInfo aPageNo; + FixedText aParaLbl; FixedInfo aParaNo; + FixedText aWordLbl; FixedInfo aWordNo; + FixedText aCharLbl; FixedInfo aCharNo; + FixedText aLineLbl; FixedInfo aLineNo; PushButton aUpdatePB; diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index fa306a080db1..ebcd7fed227c 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.hxx @@ -52,9 +52,9 @@ protected: SwEditWin* m_pWin; Point m_aStartPos; // Position von BeginCreate Point m_aMDPos; // Position von MouseButtonDown - USHORT m_nSlotId; - BOOL m_bCreateObj :1; - BOOL m_bInsForm :1; + sal_uInt16 m_nSlotId; + sal_Bool m_bCreateObj :1; + sal_Bool m_bInsForm :1; Point GetDefaultCenterPos(); public: @@ -63,20 +63,20 @@ public: void SetDrawPointer(); void EnterSelectMode(const MouseEvent& rMEvt); - inline BOOL IsInsertForm() const { return m_bInsForm; } - inline BOOL IsCreateObj() const { return m_bCreateObj; } + inline sal_Bool IsInsertForm() const { return m_bInsForm; } + inline sal_Bool IsCreateObj() const { return m_bCreateObj; } - // Mouse- & Key-Events; Returnwert=TRUE: Event wurde bearbeitet - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + // Mouse- & Key-Events; Returnwert=sal_True: Event wurde bearbeitet + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); void BreakCreate(); - void SetSlotId(USHORT nSlot) {m_nSlotId = nSlot;} - USHORT GetSlotId() { return m_nSlotId;} + void SetSlotId(sal_uInt16 nSlot) {m_nSlotId = nSlot;} + sal_uInt16 GetSlotId() { return m_nSlotId;} - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren virtual void Deactivate(); // Function deaktivieren virtual void CreateDefaultObject(); diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index 75ce9441c6ea..f9a8f7316c93 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.hxx @@ -63,6 +63,7 @@ class SwDropCapsPage : public SfxTabPage { friend class SwDropCapsPict; + FixedLine aSettingsFL; CheckBox aDropCapsBox; CheckBox aWholeWordCB; FixedText aSwitchText; @@ -71,19 +72,18 @@ friend class SwDropCapsPict; NumericField aLinesField; FixedText aDistanceText; MetricField aDistanceField; - FixedLine aSettingsFL; + FixedLine aContentFL; FixedText aTextText; Edit aTextEdit; FixedText aTemplateText; ListBox aTemplateBox; - FixedLine aContentFL; SwDropCapsPict *pPict; - BOOL bModified; - BOOL bFormat; - BOOL bHtmlMode; + sal_Bool bModified; + sal_Bool bFormat; + sal_Bool bHtmlMode; SwWrtShell &rSh; @@ -104,12 +104,12 @@ friend class SwDropCapsPict; public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet &rSet); + virtual sal_Bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); - void SetFormat(BOOL bSet){bFormat = bSet;} + void SetFormat(sal_Bool bSet){bFormat = bSet;} }; #endif diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index e57cf394183f..0b5628b99cad 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.hxx @@ -39,9 +39,9 @@ class SwDrawBaseShell: public SwBaseShell { SwDrawBase* pDrawActual; - UINT16 eDrawMode; - BOOL bRotate : 1; - BOOL bSelMove: 1; + sal_uInt16 eDrawMode; + sal_Bool bRotate : 1; + sal_Bool bSelMove: 1; DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* ); DECL_LINK(ValidatePosition, SvxSwFrameValidation* ); @@ -55,7 +55,7 @@ public: void Execute(SfxRequest &); void GetState(SfxItemSet &); void DisableState(SfxItemSet &rSet) { Disable(rSet);} - BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0); + sal_Bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0); void StateStatusline(SfxItemSet &rSet); diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/ui/inc/drwtxtsh.hxx index a77eadf598b1..493a8ede30de 100644 --- a/sw/source/ui/inc/drwtxtsh.hxx +++ b/sw/source/ui/inc/drwtxtsh.hxx @@ -42,12 +42,12 @@ class SwDrawTextShell: public SfxShell SdrView *pSdrView; - BOOL bRotate : 1; - BOOL bSelMove: 1; + sal_Bool bRotate : 1; + sal_Bool bSelMove: 1; void SetAttrToMarked(const SfxItemSet& rAttr); void InsertSymbol(SfxRequest& rReq); - BOOL IsTextEdit(); + sal_Bool IsTextEdit(); public: SFX_DECL_INTERFACE(SW_DRWTXTSHELL) TYPEINFO(); @@ -58,7 +58,8 @@ public: SwDrawTextShell(SwView &rView); virtual ~SwDrawTextShell(); - virtual SfxUndoManager* GetUndoManager(); + virtual ::svl::IUndoManager* + GetUndoManager(); void StateDisableItems(SfxItemSet &); diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index 68af7d2a9366..ecd0eb7c8df3 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.hxx @@ -42,9 +42,9 @@ class DrawSelection : public SwDrawBase DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual void Activate(const USHORT nSlotId); // Function aktivieren + virtual void Activate(const sal_uInt16 nSlotId); // Function aktivieren }; diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 3cc702f8cd3b..a81aa116aeca 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -61,23 +61,23 @@ class SwEditWin: public Window, public DropTargetHelper, public DragSourceHelper { friend void ScrollMDI(ViewShell* pVwSh, const SwRect&, - USHORT nRangeX, USHORT nRangeY); -friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&); + sal_uInt16 nRangeX, sal_uInt16 nRangeY); +friend sal_Bool IsScrollMDI(ViewShell* pVwSh, const SwRect&); friend void SizeNotify(ViewShell* pVwSh, const Size &); friend void PageNumNotify( ViewShell* pVwSh, - USHORT nPhyNum, - USHORT nVirtNum, + sal_uInt16 nPhyNum, + sal_uInt16 nVirtNum, const String& rPg ); static QuickHelpData* pQuickHlpData; - static BOOL bReplaceQuote; + static sal_Bool bReplaceQuote; static long nDDStartPosX, nDDStartPosY; static Color aTextColor; //Textfarbe, fuer die Giesskanne - static BOOL bTransparentBackColor; // Hintergrund transparent + static sal_Bool bTransparentBackColor; // Hintergrund transparent static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne /* @@ -114,14 +114,14 @@ friend void PageNumNotify( ViewShell* pVwSh, int aActHitType; // aktueller Mauspointer - ULONG m_nDropFormat; //Format aus dem letzten QueryDrop - USHORT m_nDropAction; //Action aus dem letzten QueryDrop - USHORT m_nDropDestination; //Ziel aus dem letzten QueryDrop + sal_uLong m_nDropFormat; //Format aus dem letzten QueryDrop + sal_uInt16 m_nDropAction; //Action aus dem letzten QueryDrop + sal_uInt16 m_nDropDestination; //Ziel aus dem letzten QueryDrop - UINT16 eBezierMode; - UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen + sal_uInt16 eBezierMode; + sal_uInt16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen SdrObjKind eDrawMode; - BOOL bLinkRemoved : 1, + sal_Bool bLinkRemoved : 1, bMBPressed : 1, bInsDraw : 1, bInsFrm : 1, @@ -143,8 +143,8 @@ friend void PageNumNotify( ViewShell* pVwSh, bObjectSelect : 1; - USHORT nKS_NUMDOWN_Count; // #i23725# - USHORT nKS_NUMINDENTINC_Count; + sal_uInt16 nKS_NUMDOWN_Count; // #i23725# + sal_uInt16 nKS_NUMINDENTINC_Count; void LeaveArea(const Point &); void JustifyAreaTimer(); @@ -152,19 +152,19 @@ friend void PageNumNotify( ViewShell* pVwSh, void RstMBDownFlags(); - void ChangeFly( BYTE nDir, BOOL bWeb = FALSE ); - void ChangeDrawing( BYTE nDir ); + void ChangeFly( sal_uInt8 nDir, sal_Bool bWeb = sal_False ); + void ChangeDrawing( sal_uInt8 nDir ); - BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); - BOOL RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode); + sal_Bool EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos); + sal_Bool RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode); //Hilfsfunktionen fuer D&D void DropCleanup(); void CleanupDropUserMarker(); - USHORT GetDropDestination( const Point& rPixPnt, + sal_uInt16 GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj = 0 ); //select the object/cursor at the mouse position of the context menu request - BOOL SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ); + sal_Bool SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ); /* * Handler fuer das Weiterscrollen, wenn der Mauspointer innerhalb eines @@ -218,45 +218,45 @@ protected: SvxAutoCorrect* pACorr, sal_Bool bFromIME = sal_False ); public: - void UpdatePointer(const Point &, USHORT nButtons = 0); + void UpdatePointer(const Point &, sal_uInt16 nButtons = 0); - BOOL IsDrawSelMode(); - BOOL IsDrawAction() { return (bInsDraw); } - void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; } + sal_Bool IsDrawSelMode(); + sal_Bool IsDrawAction() { return (bInsDraw); } + void SetDrawAction(sal_Bool bFlag) { bInsDraw = bFlag; } - void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; } - BOOL IsObjectSelect() const { return bObjectSelect; } + void SetObjectSelect( sal_Bool bVal ) { bObjectSelect = bVal; } + sal_Bool IsObjectSelect() const { return bObjectSelect; } - inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; } - inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); } - void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect ); + inline SdrObjKind GetSdrDrawMode(/*sal_Bool bBuf = sal_False*/) const { return eDrawMode; } + inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( sal_False ); } + void StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect ); - BOOL IsFrmAction() { return (bInsFrm); } - inline UINT16 GetBezierMode() { return eBezierMode; } - void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; } + sal_Bool IsFrmAction() { return (bInsFrm); } + inline sal_uInt16 GetBezierMode() { return eBezierMode; } + void SetBezierMode(sal_uInt16 eBezMode) { eBezierMode = eBezMode; } void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten - void InsFrm(USHORT nCols); + void InsFrm(sal_uInt16 nCols); void StopInsFrm(); - UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen + sal_uInt16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen - void SetChainMode( BOOL bOn ); - BOOL IsChainMode() const { return bChainMode; } + void SetChainMode( sal_Bool bOn ); + sal_Bool IsChainMode() const { return bChainMode; } void FlushInBuffer(); - BOOL IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const; + sal_Bool IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const; - static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; } - static BOOL IsReplaceQuote() { return bReplaceQuote; } + static void SetReplaceQuote(sal_Bool bOn = sal_True) { bReplaceQuote = bOn; } + static sal_Bool IsReplaceQuote() { return bReplaceQuote; } void SetApplyTemplate(const SwApplyTemplate &); SwApplyTemplate* GetApplyTemplate() const { return pApplyTempl; } void StartExecuteDrag(); void DragFinished(); - USHORT GetDropAction() const { return m_nDropAction; } - ULONG GetDropFormat() const { return m_nDropFormat; } + sal_uInt16 GetDropAction() const { return m_nDropAction; } + sal_uLong GetDropFormat() const { return m_nDropFormat; } Color GetTextColor() { return aTextColor; } @@ -266,11 +266,11 @@ public: { return aTextBackColor; } void SetTextBackColor(const Color& rCol ) { aTextBackColor = rCol; } - void SetTextBackColorTransparent(BOOL bSet) + void SetTextBackColorTransparent(sal_Bool bSet) { bTransparentBackColor = bSet; } - BOOL IsTextBackColorTransparent() + sal_Bool IsTextBackColorTransparent() { return bTransparentBackColor; } - void LockKeyInput(BOOL bSet){bLockInput = bSet;} + void LockKeyInput(sal_Bool bSet){bLockInput = bSet;} const SwView &GetView() const { return rView; } SwView &GetView() { return rView; } @@ -290,7 +290,7 @@ public: void StopQuickHelp(); // --> OD 2005-02-18 #i42921# - add parameter <bVerticalMode> - BOOL RulerMarginDrag( const MouseEvent& rMEvt, + sal_Bool RulerMarginDrag( const MouseEvent& rMEvt, const bool bVerticalMode ); // <-- diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index d086b5bb8e2a..4e221ea487d4 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -75,8 +75,8 @@ public: virtual int operator ==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* = 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; // class SwEnvCfgItem ------------------------------------------------------- diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 470edbf2661b..1deb5c788b2c 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -37,7 +37,7 @@ #include <vcl/lstbox.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include "envimg.hxx" @@ -79,11 +79,11 @@ friend class SwEnvPreview; SfxItemSet *pAddresseeSet; SfxItemSet *pSenderSet; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual short Ok(); public: - SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert); + SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert); ~SwEnvDlg(); }; @@ -128,7 +128,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwEnvItem& rItem); - virtual BOOL FillItemSet(SfxItemSet& rSet); + virtual sal_Bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx index 47b85163e7a7..d41557e1636f 100644 --- a/sw/source/ui/inc/fldedt.hxx +++ b/sw/source/ui/inc/fldedt.hxx @@ -28,7 +28,7 @@ #ifndef _FLDEDT_HXX #define _FLDEDT_HXX #include <sfx2/basedlgs.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> class SwView; class SwWrtShell; @@ -44,7 +44,7 @@ class SwFldEditDlg : public SfxSingleTabDialog DECL_LINK( NextPrevHdl, Button *pBt = 0 ); void Init(); - SfxTabPage* CreatePage(USHORT nGroup); + SfxTabPage* CreatePage(sal_uInt16 nGroup); public: @@ -55,7 +55,7 @@ public: virtual short Execute(); - void EnableInsert(BOOL bEnable); + void EnableInsert(sal_Bool bEnable); void InsertHdl(); }; diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index da36b2ebed85..84c3be977a11 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -69,8 +69,8 @@ enum SwFldGroups struct SwFldGroupRgn { - USHORT nStart; - USHORT nEnd; + sal_uInt16 nStart; + sal_uInt16 nEnd; }; /*-------------------------------------------------------------------- @@ -79,21 +79,21 @@ struct SwFldGroupRgn --------------------------------------------------------------------*/ struct SwInsertFld_Data { - USHORT nTypeId; - USHORT nSubType; + sal_uInt16 nTypeId; + sal_uInt16 nSubType; const String sPar1; const String sPar2; - ULONG nFormatId; + sal_uLong nFormatId; SwWrtShell* pSh; sal_Unicode cSeparator; - BOOL bIsAutomaticLanguage; + sal_Bool bIsAutomaticLanguage; ::com::sun::star::uno::Any aDBDataSource; ::com::sun::star::uno::Any aDBConnection; ::com::sun::star::uno::Any aDBColumn; Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() - SwInsertFld_Data(USHORT nType, USHORT nSub, const String& rPar1, const String& rPar2, - ULONG nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', BOOL bIsAutoLanguage = TRUE) : + SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const String& rPar1, const String& rPar2, + sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', sal_Bool bIsAutoLanguage = sal_True) : nTypeId(nType), nSubType(nSub), sPar1(rPar1), @@ -107,7 +107,7 @@ struct SwInsertFld_Data SwInsertFld_Data() : pSh(0), cSeparator(' '), - bIsAutomaticLanguage(TRUE){} + bIsAutomaticLanguage(sal_True){} }; @@ -125,10 +125,10 @@ private: String sMacroPath; String sMacroName; - ULONG nCurFmt; - BOOL bEvalExp; + sal_uLong nCurFmt; + sal_Bool bEvalExp; - SW_DLLPRIVATE USHORT GetCurrLanguage() const; + SW_DLLPRIVATE sal_uInt16 GetCurrLanguage() const; com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext; com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo; @@ -142,83 +142,83 @@ public: { pWrtShell = pShell; } // Feld einfuegen ueber TypeId (TYP_ ...) - BOOL InsertFld( const SwInsertFld_Data& rData ); + sal_Bool InsertFld( const SwInsertFld_Data& rData ); // Direkt das aktuelle Feld aendern - void UpdateCurFld(ULONG nFormat, + void UpdateCurFld(sal_uLong nFormat, const String& rPar1, const String& rPar2, SwField * _pField = 0); // #111840# inline const String& GetCurFldPar1() const; inline const String& GetCurFldPar2() const; - inline ULONG GetCurFldFmt() const; + inline sal_uLong GetCurFldFmt() const; // Ein Feld ermitteln SwField* GetCurFld(); void InsertFldType(SwFieldType& rType); - BOOL ChooseMacro(const String &rSelMacro = aEmptyStr); + sal_Bool ChooseMacro(const String &rSelMacro = aEmptyStr); void SetMacroPath(const String& rPath); inline const String& GetMacroPath() const { return (sMacroPath); } inline const String& GetMacroName() const { return (sMacroName); } inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } // Vorheriger Naechster gleichen Typ - BOOL GoNextPrev( BOOL bNext = TRUE, SwFieldType* pTyp = 0 ); - BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); } - BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); } + sal_Bool GoNextPrev( sal_Bool bNext = sal_True, SwFieldType* pTyp = 0 ); + sal_Bool GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( sal_True, pTyp ); } + sal_Bool GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( sal_False, pTyp ); } // Erfragen von Werten aus Datenbankfeldern (BASIC ) // String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); - BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName, - BOOL bIsTable, const String& rFldName); + sal_Bool IsDBNumeric(const String& rDBName, const String& rTblQryName, + sal_Bool bIsTable, const String& rFldName); // RefMark mit Namen organisieren - BOOL CanInsertRefMark( const String& rStr ); + sal_Bool CanInsertRefMark( const String& rStr ); // Zugriff ueber ResId auf Feldtypen - USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const; - SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const; - SwFieldType* GetFldType(USHORT nResId, const String& rName) const; + sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; + SwFieldType* GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; + SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName) const; - void RemoveFldType(USHORT nResId, const String& rName); + void RemoveFldType(sal_uInt16 nResId, const String& rName); // Zugriff ueber TypeId aus dem Dialog // Ids fuer einen Bereich von Feldern - const SwFldGroupRgn& GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const; - USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const; + const SwFldGroupRgn& GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const; + sal_uInt16 GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0) const; // TypeId des aktuellen Feldes - USHORT GetCurTypeId() const; + sal_uInt16 GetCurTypeId() const; // TypeId fuer einen konkrete Pos in der Liste - static USHORT GetTypeId(USHORT nPos); + static sal_uInt16 GetTypeId(sal_uInt16 nPos); // Name des Typen in der Liste der Felder - static const String& GetTypeStr(USHORT nPos); + static const String& GetTypeStr(sal_uInt16 nPos); // Pos in der Liste der Felder - static USHORT GetPos(USHORT nTypeId); + static sal_uInt16 GetPos(sal_uInt16 nTypeId); // Untertypen zu einem Typ - BOOL GetSubTypes(USHORT nId, SvStringsDtor& rToFill); + sal_Bool GetSubTypes(sal_uInt16 nId, SvStringsDtor& rToFill); // Formate zu einem Typ - USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const; - String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const; - USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const; - ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); + sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode = sal_False) const; + String GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const; + sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const; + sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, sal_Bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L); // Evaluierung der ExpressionFelder ausschalten fuer das Einfuegen // vieler Expressionfelder (siehe Etiketten) // - inline void SetEvalExpFlds(BOOL bEval); + inline void SetEvalExpFlds(sal_Bool bEval); void EvalExpFlds(SwWrtShell* pSh = NULL); }; -inline void SwFldMgr::SetEvalExpFlds(BOOL bEval) +inline void SwFldMgr::SetEvalExpFlds(sal_Bool bEval) { bEvalExp = bEval; } inline const String& SwFldMgr::GetCurFldPar1() const @@ -227,7 +227,7 @@ inline const String& SwFldMgr::GetCurFldPar1() const inline const String& SwFldMgr::GetCurFldPar2() const { return aCurPar2; } -inline ULONG SwFldMgr::GetCurFldFmt() const +inline sal_uLong SwFldMgr::GetCurFldFmt() const { return nCurFmt; } #endif diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index e8959a98e123..013002276b9c 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -38,16 +38,16 @@ class SwFldDlg: public SfxTabDialog { SwChildWinWrapper* m_pChildWin; SfxBindings* m_pBindings; - BOOL m_bHtmlMode; - BOOL m_bDataBaseMode; + sal_Bool m_bHtmlMode; + sal_Bool m_bDataBaseMode; - virtual BOOL Close(); - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + virtual sal_Bool Close(); + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); virtual void Activate(); - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); - void ReInitTabPage( USHORT nPageId, - BOOL bOnlyActivate = FALSE ); + void ReInitTabPage( sal_uInt16 nPageId, + sal_Bool bOnlyActivate = sal_False ); public: SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); @@ -57,7 +57,7 @@ public: void Initialize(SfxChildWinInfo *pInfo); void ReInitDlg(); - void EnableInsert(BOOL bEnable); + void EnableInsert(sal_Bool bEnable); void InsertHdl(); void ActivateDatabasePage(); }; diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx index 54479e9b232b..5b5597a5096b 100644 --- a/sw/source/ui/inc/fldwrap.hxx +++ b/sw/source/ui/inc/fldwrap.hxx @@ -35,13 +35,13 @@ class SwFldDlgWrapper : public SwChildWinWrapper { public: AbstractSwFldDlg * pDlgInterface; - SwFldDlgWrapper( Window* pParent, USHORT nId, + SwFldDlgWrapper( Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SwFldDlgWrapper); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); - void ShowPage(USHORT nPage = 0); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + void ShowPage(sal_uInt16 nPage = 0); }; /* -----------------04.02.2003 14:14----------------- @@ -52,12 +52,12 @@ class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper { public: AbstractSwFldDlg * pDlgInterface; - SwFldDataOnlyDlgWrapper( Window* pParent, USHORT nId, + SwFldDataOnlyDlgWrapper( Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); }; #endif diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index 554c5ccc88c4..5acd526bd16e 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem SW_DLLPRIVATE com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); - void ChangeString(USHORT nFontType, const String& rSet) + void ChangeString(sal_uInt16 nFontType, const String& rSet) { if(sDefaultFonts[nFontType] != rSet) { @@ -79,7 +79,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem } } - void ChangeInt( USHORT nFontType, sal_Int32 nHeight ); + void ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight ); public: SwStdFontConfig(); @@ -94,8 +94,8 @@ public: const String& GetFontCaption(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_CAPTION + FONT_PER_GROUP * nFontGroup];} const String& GetFontIndex (sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_INDEX + FONT_PER_GROUP * nFontGroup];} - const String& GetFontFor(USHORT nFontType) const {return sDefaultFonts[nFontType];} - BOOL IsFontDefault(USHORT nFontType) const; + const String& GetFontFor(sal_uInt16 nFontType) const {return sDefaultFonts[nFontType];} + sal_Bool IsFontDefault(sal_uInt16 nFontType) const; void SetFontStandard(const String& rSet, sal_uInt8 nFontGroup) {ChangeString(FONT_STANDARD + FONT_PER_GROUP * nFontGroup, rSet);} @@ -114,8 +114,8 @@ public: sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang ); - static String GetDefaultFor(USHORT nFontType, LanguageType eLang); - static sal_Int32 GetDefaultHeightFor(USHORT nFontType, LanguageType eLang); + static String GetDefaultFor(sal_uInt16 nFontType, LanguageType eLang); + static sal_Int32 GetDefaultHeightFor(sal_uInt16 nFontType, LanguageType eLang); }; #endif diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index f303f1e6f1d7..77968261799a 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.hxx @@ -81,14 +81,14 @@ class SwIdxFormDlg : public SvxStandardDialog SwWrtShell &rSh; SwForm *pForm; - USHORT nAktLevel; - BOOL bLastLinkIsEnd; + sal_uInt16 nAktLevel; + sal_Bool bLastLinkIsEnd; public: SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); ~SwIdxFormDlg(); - static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); + static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName); const SwForm& GetTOXForm(); }; diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx index d5e8b484384e..61be18818f41 100644 --- a/sw/source/ui/inc/frmdlg.hxx +++ b/sw/source/ui/inc/frmdlg.hxx @@ -38,23 +38,24 @@ class SwWrtShell; --------------------------------------------------------------------*/ class SwFrmDlg : public SfxTabDialog { - BOOL m_bFormat; - BOOL m_bNew; - BOOL m_bHTMLMode; + sal_Bool m_bFormat; + sal_Bool m_bNew; + sal_Bool m_bHTMLMode; + bool m_bEnableVertPos; const SfxItemSet& m_rSet; - USHORT m_nDlgType; + sal_uInt16 m_nDlgType; SwWrtShell* m_pWrtShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); public: SwFrmDlg( 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); ~SwFrmDlg(); diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx index de84a1ba1061..ce31fa734ab6 100644 --- a/sw/source/ui/inc/frmmgr.hxx +++ b/sw/source/ui/inc/frmmgr.hxx @@ -63,9 +63,12 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr Point aAbsPos; SwWrtShell *pOwnSh; - BOOL bAbsPos, + sal_Bool bAbsPos, bNewFrm; - BOOL bIsInVertical; + sal_Bool bIsInVertical; + // --> OD 2009-09-01 #mongolianlayout# + sal_Bool bIsInVerticalL2R; + // <-- // interne Verrechnung fuer Umrandung SW_DLLPRIVATE SwTwips CalcTopSpace(); @@ -76,10 +79,10 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update public: - SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ); + SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType ); //CopyCtor fuer die Dialoge, zum Pruefen der Metrics - SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); + SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet ); inline SwWrtShell* GetShell() { return pOwnSh; } @@ -100,7 +103,7 @@ public: void SetSize(const Size& rLSize); inline const Size& GetSize() const; - inline USHORT GetHeightPercent() const; + inline sal_uInt16 GetHeightPercent() const; void SetHeightSizeType(SwFrmSize eType); @@ -117,18 +120,18 @@ public: void UpdateFlyFrm(); // neuen Rahmen erzeugen - BOOL InsertFlyFrm(); + sal_Bool InsertFlyFrm(); void InsertFlyFrm(RndStdIds eAnchorType, const Point &rPos, const Size &rSize, - BOOL bAbsPos = FALSE); + sal_Bool bAbsPos = sal_False); // Metriken pruefen und aendern void ValidateMetrics(SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, - BOOL bOnlyPercentRefValue = FALSE); + sal_Bool bOnlyPercentRefValue = sal_False); - void DelAttr(USHORT nId); + void DelAttr(sal_uInt16 nId); // Set rausreichen inline const SfxItemSet &GetAttrSet() const { return aSet; } @@ -186,7 +189,7 @@ inline RndStdIds SwFlyFrmAttrMgr::GetAnchor() const return ((SwFmtAnchor&)aSet.Get(RES_ANCHOR)).GetAnchorId(); } -inline USHORT SwFlyFrmAttrMgr::GetHeightPercent() const +inline sal_uInt16 SwFlyFrmAttrMgr::GetHeightPercent() const { return GetFrmSize().GetHeightPercent(); } diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 1e82d3d75574..36ee618380ea 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -53,6 +53,7 @@ struct SwPosition; class SwFrmPage: public SfxTabPage { // Size + FixedLine aSizeFL; FixedText aWidthFT; FixedText aWidthAutoFT; PercentField aWidthED; @@ -65,11 +66,10 @@ class SwFrmPage: public SfxTabPage CheckBox aAutoHeightCB; CheckBox aFixedRatioCB; PushButton aRealSizeBT; - FixedLine aSizeFL; // Anker - FixedLine aTypeFL; FixedLine aTypeSepFL; + FixedLine aTypeFL; RadioButton aAnchorAtPageRB; RadioButton aAnchorAtParaRB; RadioButton aAnchorAtCharRB; @@ -77,6 +77,7 @@ class SwFrmPage: public SfxTabPage RadioButton aAnchorAtFrameRB; // Position + FixedLine aPositionFL; FixedText aHorizontalFT; ListBox aHorizontalDLB; FixedText aAtHorzPosFT; @@ -92,7 +93,6 @@ class SwFrmPage: public SfxTabPage ListBox aVertRelationLB; // OD 02.10.2003 #i18732# - check box for new option 'FollowTextFlow' CheckBox aFollowTextFlowCB; - FixedLine aPositionFL; // Example SvxSwFrameExample aExampleWN; @@ -100,18 +100,21 @@ class SwFrmPage: public SfxTabPage //'string provider' SvxSwFramePosString aFramePosString; - BOOL bAtHorzPosModified; - BOOL bAtVertPosModified; - - BOOL bFormat; - BOOL bNew; - BOOL bNoModifyHdl; - BOOL bVerticalChanged; //check done whether frame is in vertical environment - BOOL bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged - BOOL bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged - BOOL bHtmlMode; - USHORT nHtmlMode; - USHORT nDlgType; + sal_Bool bAtHorzPosModified; + sal_Bool bAtVertPosModified; + + sal_Bool bFormat; + sal_Bool bNew; + sal_Bool bNoModifyHdl; + sal_Bool bVerticalChanged; //check done whether frame is in vertical environment + sal_Bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged + // --> OD 2009-08-31 #mongolianlayou# + sal_Bool bIsVerticalL2R; + // <-- + sal_Bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged + sal_Bool bHtmlMode; + sal_uInt16 nHtmlMode; + sal_uInt16 nDlgType; Size aGrfSize; Size aWrap; SwTwips nUpperBorder; @@ -131,6 +134,10 @@ class SwFrmPage: public SfxTabPage FrmMap* pVMap; FrmMap* pHMap; + bool m_bAllowVertPositioning; + bool m_bIsMathOLE; + bool m_bIsMathBaselineAlignment; + virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); @@ -139,8 +146,8 @@ class SwFrmPage: public SfxTabPage DECL_LINK( AnchorTypeHdl, RadioButton * ); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); - void InitPos(RndStdIds eId, USHORT nH, USHORT nHRel, - USHORT nV, USHORT nVRel, + void InitPos(RndStdIds eId, sal_uInt16 nH, sal_uInt16 nHRel, + sal_uInt16 nV, sal_uInt16 nVRel, long nX, long nY); DECL_LINK( RealSizeHdl, Button * ); @@ -154,23 +161,23 @@ class SwFrmPage: public SfxTabPage void UpdateExample(); DECL_LINK( ModifyHdl, Edit * ); - void Init(const SfxItemSet& rSet, BOOL bReset = FALSE); + void Init(const SfxItemSet& rSet, sal_Bool bReset = sal_False); // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous // in the alignment. - USHORT FillPosLB( const FrmMap* _pMap, - const USHORT _nAlign, - const USHORT _nRel, + sal_uInt16 FillPosLB( const FrmMap* _pMap, + const sal_uInt16 _nAlign, + const sal_uInt16 _nRel, ListBox& _rLB ); // OD 14.11.2003 #i22341# - adjustment to handle maps, that are ambigous // in their string entries. - ULONG FillRelLB( const FrmMap* _pMap, - const USHORT _nLBSelPos, - const USHORT _nAlign, - USHORT _nRel, + sal_uLong FillRelLB( const FrmMap* _pMap, + const sal_uInt16 _nLBSelPos, + const sal_uInt16 _nAlign, + sal_uInt16 _nRel, ListBox& _rLB, FixedText& _rFT ); - USHORT GetMapPos( const FrmMap *pMap, ListBox &rAlignLB ); - short GetAlignment(FrmMap *pMap, USHORT nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); + sal_uInt16 GetMapPos( const FrmMap *pMap, ListBox &rAlignLB ); + short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); short GetRelation(FrmMap *pMap, ListBox &rRelationLB); RndStdIds GetAnchor(); @@ -185,15 +192,16 @@ class SwFrmPage: public SfxTabPage public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - void SetFormatUsed(BOOL bFmt); - void SetFrmType(USHORT nType) { nDlgType = nType; } - inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; } + void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } + void SetFormatUsed(sal_Bool bFmt); + void SetFrmType(sal_uInt16 nType) { nDlgType = nType; } + inline sal_Bool IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; } + void EnableVerticalPositioning( bool bEnable ); }; class SwGrfExtPage: public SfxTabPage @@ -217,7 +225,7 @@ class SwGrfExtPage: public SfxTabPage ::sfx2::FileDialogHelper* pGrfDlg; - BOOL bHtmlMode; + sal_Bool bHtmlMode; // Handler fuer Spiegeln DECL_LINK( MirrorHdl, CheckBox * ); @@ -234,7 +242,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); virtual int DeactivatePage(SfxItemSet *pSet); }; @@ -269,12 +277,13 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); }; class SwFrmAddPage : public SfxTabPage { + FixedLine aNamesFL; FixedText aNameFT; Edit aNameED; FixedText aAltNameFT; @@ -283,26 +292,25 @@ class SwFrmAddPage : public SfxTabPage ListBox aPrevLB; FixedText aNextFT; ListBox aNextLB; - FixedLine aNamesFL; + FixedLine aProtectFL; CheckBox aProtectContentCB; CheckBox aProtectFrameCB; CheckBox aProtectSizeCB; - FixedLine aProtectFL; + FixedLine aExtFL; CheckBox aEditInReadonlyCB; CheckBox aPrintFrameCB; FixedText aTextFlowFT; ListBox aTextFlowLB; - FixedLine aExtFL; SwWrtShell* pWrtSh; - USHORT nDlgType; - BOOL bHtmlMode; - BOOL bFormat; - BOOL bNew; + sal_uInt16 nDlgType; + sal_Bool bHtmlMode; + sal_Bool bFormat; + sal_Bool bNew; DECL_LINK(EditModifyHdl, Edit*); DECL_LINK(ChainModifyHdl, ListBox*); @@ -313,14 +321,14 @@ class SwFrmAddPage : public SfxTabPage public: static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - void SetFormatUsed(BOOL bFmt); - void SetFrmType(USHORT nType) { nDlgType = nType; } - void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } + void SetFormatUsed(sal_Bool bFmt); + void SetFrmType(sal_uInt16 nType) { nDlgType = nType; } + void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index 8c38b3e91efd..c886ad6cea92 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -68,9 +68,11 @@ public: class SwGlossaryGroupDlg : public SvxStandardDialog { - + FixedText aBibFT; FEdit aNameED; + FixedText aPathFT; ListBox aPathLB; + FixedText aSelectFT; SwGlossaryGroupTLB aGroupTLB; OKButton aOkPB; @@ -79,9 +81,6 @@ class SwGlossaryGroupDlg : public SvxStandardDialog PushButton aNewPB; PushButton aDelPB; PushButton aRenamePB; - FixedText aBibFT; - FixedText aPathFT; - FixedText aSelectFT; SvStrings* pRemovedArr; SvStrings* pInsertedArr; @@ -91,7 +90,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog String sCreatedGroup; - BOOL IsDeleteAllowed(const String &rGroup); + sal_Bool IsDeleteAllowed(const String &rGroup); protected: virtual void Apply(); diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index 8a88d86fe3a6..b85e6fa74283 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -68,9 +68,9 @@ class SW_DLLPUBLIC SwGlossaries String m_sErrPath; SvStrings *m_pPathArr; SvStrings *m_pGlosArr; - BOOL m_bError; + sal_Bool m_bError; - SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; + SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, sal_Bool bCreate = sal_True) const; SW_DLLPRIVATE SvStrings *GetNameList(); // implementation in unoatxt.cxx @@ -119,14 +119,14 @@ public: bool _bCreate = false ); - USHORT GetGroupCnt(); - String GetGroupName(USHORT ); + sal_uInt16 GetGroupCnt(); + String GetGroupName(sal_uInt16 ); String GetGroupTitle( const String& rGroupName ); - BOOL FindGroupName(String & rGroup); + sal_Bool FindGroupName(String & rGroup); SwTextBlocks* GetGroupDoc(const String &rName, - BOOL bCreate = FALSE) const; + sal_Bool bCreate = sal_False) const; SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());} void PutGroupDoc(SwTextBlocks *pBlock); static String GetDefName(); @@ -134,14 +134,14 @@ public: String GetCompleteGroupName( const ::rtl::OUString& GroupName ); - BOOL NewGroupDoc(String &rGroupName, const String& rTitle); - BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); - BOOL DelGroupDoc(const String &); - SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE ); + sal_Bool NewGroupDoc(String &rGroupName, const String& rTitle); + sal_Bool RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); + sal_Bool DelGroupDoc(const String &); + SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, sal_Bool bShow = sal_True ); void SaveGroupDoc(const String &rGrpName, const String& rLongName ); - void UpdateGlosPath(BOOL bFull); + void UpdateGlosPath(sal_Bool bFull); void ShowError(); - inline ULONG IsGlosPathErr() { return m_bError; } + inline sal_uLong IsGlosPathErr() { return m_bError; } const SvStrings* GetPathArray() const {return m_pPathArr;} }; diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx index 7e5d9fbfd619..365e56c4afd6 100644 --- a/sw/source/ui/inc/gloshdl.hxx +++ b/sw/source/ui/inc/gloshdl.hxx @@ -51,42 +51,42 @@ class SW_DLLPUBLIC SwGlossaryHdl const SvxMacro *pStart, const SvxMacro *pEnd); - SW_DLLPRIVATE BOOL Expand( const String& rShortName, + SW_DLLPRIVATE sal_Bool Expand( const String& rShortName, SwGlossaries* pGlossaries, SwTextBlocks *pGlossary ); public: - BOOL ConvertToNew(SwTextBlocks& rOld); + sal_Bool ConvertToNew(SwTextBlocks& rOld); void GlossaryDlg(); - USHORT GetGroupCnt() const; - String GetGroupName( USHORT, String* pTitle = 0 ); - BOOL NewGroup(String & rGroupName, const String& rTitle); - BOOL DelGroup(const String &); - BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle); - void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE); + sal_uInt16 GetGroupCnt() const; + String GetGroupName( sal_uInt16, String* pTitle = 0 ); + sal_Bool NewGroup(String & rGroupName, const String& rTitle); + sal_Bool DelGroup(const String &); + sal_Bool RenameGroup(const String & rOld, String& rNew, const String& rNewTitle); + void SetCurGroup(const String &aGrp, sal_Bool bApi = sal_False, sal_Bool bAlwaysCreateNew = sal_False); const String &GetCurGroup() const { return aCurGrp; } - USHORT GetGlossaryCnt(); - String GetGlossaryName(USHORT); + sal_uInt16 GetGlossaryCnt(); + String GetGlossaryName(sal_uInt16); String GetGlossaryShortName(const String &rName); - String GetGlossaryShortName(USHORT); + String GetGlossaryShortName(sal_uInt16); - BOOL Rename( const String& rOldShortName, const String& rNewShortName, + sal_Bool Rename( const String& rOldShortName, const String& rNewShortName, const String& rNewName); - BOOL CopyOrMove( const String& rSourceGroupName, String& rSourceShortName, - const String& rDestGroupName, const String& rLongName, BOOL bMove ); - BOOL HasShortName(const String &rShortName) const; + sal_Bool CopyOrMove( const String& rSourceGroupName, String& rSourceShortName, + const String& rDestGroupName, const String& rLongName, sal_Bool bMove ); + sal_Bool HasShortName(const String &rShortName) const; //wird NewGlossary vom Basic gerufen, dann soll dir zuvor eingestellte //Gruppe ggf. neu erstellt werden - BOOL NewGlossary(const String &rName, const String &rShortName, - BOOL bApiCall = FALSE, BOOL bNoAttr = FALSE ); - BOOL DelGlossary(const String&); - BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName); + sal_Bool NewGlossary(const String &rName, const String &rShortName, + sal_Bool bApiCall = sal_False, sal_Bool bNoAttr = sal_False ); + sal_Bool DelGlossary(const String&); + sal_Bool CopyToClipboard(SwWrtShell& rSh, const String& rShortName); - BOOL ExpandGlossary(); - BOOL InsertGlossary(const String &rName); + sal_Bool ExpandGlossary(); + sal_Bool InsertGlossary(const String &rName); void SetMacros(const String& rName, const SvxMacro* pStart, @@ -97,12 +97,12 @@ public: SvxMacro& rEnd, SwTextBlocks* pGlossary = 0 ); - BOOL IsReadOnly( const String* = 0 ) const; - BOOL IsOld() const; + sal_Bool IsReadOnly( const String* = 0 ) const; + sal_Bool IsOld() const; - BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden + sal_Bool FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden - BOOL ImportGlossaries( const String& rName ); + sal_Bool ImportGlossaries( const String& rName ); SwGlossaryHdl(SfxViewFrame* pViewFrame, SwWrtShell *); ~SwGlossaryHdl(); diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index dc50675b0ca5..1ce560ecceca 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -40,7 +40,7 @@ class SvStringsISortDtor; struct AutoTextGroup { - USHORT nCount; + sal_uInt16 nCount; String sName; String sTitle; String sLongNames; // durch 0x0A getrennte Langnamen @@ -56,7 +56,7 @@ class SwGlossaryList : public AutoTimer { AutoTextGroups aGroupArr; String sPath; - BOOL bFilled; + sal_Bool bFilled; AutoTextGroup* FindGroup(const String& rGroupName); void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss); @@ -65,14 +65,14 @@ public: SwGlossaryList(); ~SwGlossaryList(); - BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames ); - BOOL GetShortName(const String& rLongName, + sal_Bool HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames ); + sal_Bool GetShortName(const String& rLongName, String& rShortName, String& rGroupName ); - USHORT GetGroupCount(); - String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0); - USHORT GetBlockCount(USHORT nGroup); - String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName); + sal_uInt16 GetGroupCount(); + String GetGroupName(sal_uInt16 nPos, sal_Bool bNoPath = sal_True, String* pTitle = 0); + sal_uInt16 GetBlockCount(sal_uInt16 nGroup); + String GetBlockName(sal_uInt16 nGroup, sal_uInt16 nBlock, String& rShortName); void Update(); diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index 088fbe52e8d7..3f499a8c0def 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -72,12 +72,12 @@ class SwGlTreeListBox : public SvTreeListBox virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos + sal_uLong& rNewChildPos ); virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); + sal_uLong& rNewChildPos); public: SwGlTreeListBox(Window* pParent, const ResId& rResId); @@ -121,7 +121,7 @@ class SwGlossaryDlg : public SvxStandardDialog String sResumeGroup; String sResumeShortName; - BOOL bResume; + sal_Bool bResume; const sal_Bool bSelection : 1; @@ -152,11 +152,11 @@ class SwGlossaryDlg : public SvxStandardDialog void ShowAutoText(const String& rGroup, const String& rShortName); void ResumeShowAutoText(); - BOOL GetResumeData(String& rGroup, String& rShortName) + sal_Bool GetResumeData(String& rGroup, String& rShortName) {rGroup = sResumeGroup; rShortName = sResumeShortName; return bResume;} void SetResumeData(const String& rGroup, const String& rShortName) - {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = TRUE;} - void ResetResumeData() {bResume = FALSE;} + {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = sal_True;} + void ResetResumeData() {bResume = sal_False;} public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); ~SwGlossaryDlg(); diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index be8cd87ad1ba..2c073f8b3e07 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -39,7 +39,7 @@ class SwGlosDocShell : public SwDocShell using SotObject::GetInterface; protected: - virtual BOOL Save(); + virtual sal_Bool Save(); public: @@ -70,7 +70,7 @@ class SwWebGlosDocShell : public SwWebDocShell using SotObject::GetInterface; protected: - virtual BOOL Save(); + virtual sal_Bool Save(); public: diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 2bb8665d9712..897f1773d318 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -68,7 +68,7 @@ SW_DLLPUBLIC SwGlossaries* GetGlossaries(); class SwGlossaryList; -BOOL HasGlossaryList(); +sal_Bool HasGlossaryList(); SwGlossaryList* GetGlossaryList(); extern void _InitUI(); diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 35aa82ed6c17..b57a59bb0228 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -67,7 +67,7 @@ class SwFldInputDlg: public SvxStandardDialog DECL_LINK(NextHdl, PushButton*); public: SwFldInputDlg( Window *pParent, SwWrtShell &rSh, - SwField* pField, BOOL bNextButton = FALSE ); + SwField* pField, sal_Bool bNextButton = sal_False ); ~SwFldInputDlg(); }; diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 72750bb7d251..1c0e7dc6fc4b 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -28,11 +28,11 @@ #ifndef SW_INPUTWIN_HXX #define SW_INPUTWIN_HXX - +#include <vcl/edit.hxx> #include <vcl/menu.hxx> -#include <sfx2/childwin.hxx> #include <vcl/toolbox.hxx> -#include <vcl/edit.hxx> + +#include <sfx2/childwin.hxx> class SwFldMgr; class SwWrtShell; @@ -67,16 +67,17 @@ friend class InputEdit; SwView* pView; SfxBindings* pBindings; String aAktTableName, sOldFml; - USHORT nActionCnt; + sal_Int32 m_nActionCount; - BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf - BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel - BOOL bIsTable : 1; - BOOL bDelSel : 1; - BOOL bDoesUndo : 1; - BOOL bResetUndo : 1; - BOOL bCallUndo : 1; + sal_Bool bFirst : 1; //Initialisierungen beim ersten Aufruf + sal_Bool bActive : 1; //fuer Hide/Show beim Dokumentwechsel + sal_Bool bIsTable : 1; + sal_Bool bDelSel : 1; + bool m_bDoesUndo : 1; + bool m_bResetUndo : 1; + bool m_bCallUndo : 1; + void CleanupUglyHackWithUndo(); void DelBoxCntnt(); DECL_LINK( ModifyHdl, InputEdit* ); @@ -101,26 +102,26 @@ public: void ShowWin(); - BOOL IsActive(){ return bActive; }; + sal_Bool IsActive(){ return bActive; }; DECL_LINK( SelTblCellsNotify, SwWrtShell * ); - void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ); + void SetFormula( const String& rFormula, sal_Bool bDelSel = sal_True ); const SwView* GetView() const{return pView;} }; class SwInputChild : public SfxChildWindow { - BOOL bObjVis; + sal_Bool bObjVis; SfxDispatcher* pDispatch; public: SwInputChild( Window* , - USHORT nId, + sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); ~SwInputChild(); SFX_DECL_CHILDWINDOW( SwInputChild ); - void SetFormula( const String& rFormula, BOOL bDelSel = TRUE ) + void SetFormula( const String& rFormula, sal_Bool bDelSel = sal_True ) { ((SwInputWindow*)pWindow)->SetFormula( rFormula, bDelSel ); } const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();} diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index 3e16d9f75840..8e01cbc3b78e 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -45,18 +45,18 @@ class SwInsFootNoteDlg: public SvxStandardDialog String aFontName; CharSet eCharSet; char cExtChar; - BOOL bExtCharAvailable; - BOOL bEdit; + sal_Bool bExtCharAvailable; + sal_Bool bEdit; + FixedLine aNumberFL; RadioButton aNumberAutoBtn; RadioButton aNumberCharBtn; Edit aNumberCharEdit; PushButton aNumberExtChar; - FixedLine aNumberFL; //Alles fuer die Auswahl Fussnote/Endnote + FixedLine aTypeFL; RadioButton aFtnBtn; RadioButton aEndNoteBtn; - FixedLine aTypeFL; OKButton aOkBtn; CancelButton aCancelBtn; @@ -75,13 +75,13 @@ class SwInsFootNoteDlg: public SvxStandardDialog void Init(); public: - SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); + SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); ~SwInsFootNoteDlg(); CharSet GetCharSet() { return eCharSet; } - BOOL IsExtCharAvailable() { return bExtCharAvailable; } + sal_Bool IsExtCharAvailable() { return bExtCharAvailable; } String GetFontName() { return aFontName; } - BOOL IsEndNote() { return aEndNoteBtn.IsChecked(); } + sal_Bool IsEndNote() { return aEndNoteBtn.IsChecked(); } String GetStr() { if ( aNumberCharBtn.IsChecked() ) diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx index e3a8473934a0..385fdaa1cade 100644 --- a/sw/source/ui/inc/insrule.hxx +++ b/sw/source/ui/inc/insrule.hxx @@ -42,7 +42,7 @@ class SwInsertGrfRulerDlg : public SfxModalDialog List aGrfNames; String sSimple; String sRulers; - USHORT nSelPos; + sal_uInt16 nSelPos; SwRulerValueSet* pExampleVS; @@ -55,8 +55,8 @@ public: ~SwInsertGrfRulerDlg(); String GetGraphicName(); - BOOL IsSimpleLine() {return nSelPos == 1;} - BOOL HasImages() const {return 0 != aGrfNames.Count();} + sal_Bool IsSimpleLine() {return nSelPos == 1;} + sal_Bool HasImages() const {return 0 != aGrfNames.Count();} }; #endif diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index a65320e294a6..9f222c918176 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -85,7 +85,7 @@ public: SwInsTableDlg( SwView& rView ); ~SwInsTableDlg(); - void GetValues( String& rName, USHORT& rRow, USHORT& rCol, + void GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTblOpts, String& rTableAutoFmtName, SwTableAutoFmt *& prTAFmt ); }; diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index b1529ba85afd..767d05a7028c 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -38,7 +38,7 @@ #include <vcl/button.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> class SwWrtShell; class SwFldMgr; @@ -69,8 +69,8 @@ private: String aText; String aType; - BOOL bNew; - BOOL bIsUrl; + sal_Bool bNew; + sal_Bool bIsUrl; SwScriptField* pFld; SwFldMgr* pMgr; @@ -101,9 +101,9 @@ public: String GetType() { return aType; } - BOOL IsUrl() { return bIsUrl; } - BOOL IsNew() { return bNew; } - BOOL IsUpdate(); + sal_Bool IsUrl() { return bIsUrl; } + sal_Bool IsNew() { return bNew; } + sal_Bool IsUpdate(); }; diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 20791d16c43a..8a23e1e845ce 100644 --- a/sw/source/ui/inc/label.hxx +++ b/sw/source/ui/inc/label.hxx @@ -57,17 +57,17 @@ class SwLabDlg : public SfxTabDialog String sBusinessCardDlg; String sFormat; String sMedium; - BOOL m_bLabel; + sal_Bool m_bLabel; void _ReplaceGroup( const String &rMake ); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); public: SwLabDlg( Window* pParent, const SfxItemSet& rSet, - SwNewDBMgr* pNewDBMgr, BOOL bLabel); + SwNewDBMgr* pNewDBMgr, sal_Bool bLabel); ~SwLabDlg(); - SwLabRec* GetRecord(const String &rRecName, BOOL bCont); + SwLabRec* GetRecord(const String &rRecName, sal_Bool bCont); void GetLabItem(SwLabItem &rItem); SwLabRecs &Recs() { return *pRecs; } diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx index c798a34c7b93..90a8503cea6f 100644 --- a/sw/source/ui/inc/langhelper.hxx +++ b/sw/source/ui/inc/langhelper.hxx @@ -38,7 +38,7 @@ struct ESelection; namespace SwLangHelper { - extern USHORT GetLanguageStatus( OutlinerView* pOLV, SfxItemSet& rSet ); + extern sal_uInt16 GetLanguageStatus( OutlinerView* pOLV, SfxItemSet& rSet ); extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView &rView, SwWrtShell &rSh ); extern void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); @@ -59,10 +59,10 @@ namespace SwLangHelper extern String GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection ); extern String GetTextForLanguageGuessing( SwWrtShell &rSh ); - extern LanguageType GetLanguage( SfxItemSet aSet, USHORT nLangWhichId ); - extern LanguageType GetLanguage( SwWrtShell &rSh, USHORT nLangWhichId ); + extern LanguageType GetLanguage( SfxItemSet aSet, sal_uInt16 nLangWhichId ); + extern LanguageType GetLanguage( SwWrtShell &rSh, sal_uInt16 nLangWhichId ); - extern LanguageType GetCurrentLanguage( SfxItemSet aSet, USHORT nScriptType ); + extern LanguageType GetCurrentLanguage( SfxItemSet aSet, sal_uInt16 nScriptType ); extern LanguageType GetCurrentLanguage( SwWrtShell &rSh ); } diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index e8a7c800aa93..a91490634e73 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -63,6 +63,7 @@ public: class SwLineNumberingPage : public SfxTabPage { CheckBox aNumberingOnCB; + FixedLine aDisplayFL; FixedText aCharStyleFT; ListBox aCharStyleLB; FixedText aFormatFT; @@ -74,17 +75,16 @@ class SwLineNumberingPage : public SfxTabPage FixedText aNumIntervalFT; NumericField aNumIntervalNF; FixedText aNumRowsFT; - FixedLine aDisplayFL; + FixedLine aDivisorFL; FixedText aDivisorFT; Edit aDivisorED; FixedText aDivIntervalFT; NumericField aDivIntervalNF; FixedText aDivRowsFT; - FixedLine aDivisorFL; + FixedLine aCountFL; CheckBox aCountEmptyLinesCB; CheckBox aCountFrameLinesCB; CheckBox aRestartEachPageCB; - FixedLine aCountFL; SwWrtShell* pSh; @@ -98,7 +98,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx index 304b760d5d54..291129d20ada 100644 --- a/sw/source/ui/inc/macassgn.hxx +++ b/sw/source/ui/inc/macassgn.hxx @@ -47,7 +47,7 @@ class SwMacroAssignDlg { public: static SfxEventNamesItem AddEvents( DlgEventType eType ); - static BOOL INetFmtDlg( Window* pParent, SwWrtShell& rSh, + static sal_Bool INetFmtDlg( Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ); }; diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index 9f2929771891..4c01efb74a90 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -81,7 +81,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/ui/inc/mailmergechildwindow.hxx index afa4af930ce4..a02ca949180c 100644 --- a/sw/source/ui/inc/mailmergechildwindow.hxx +++ b/sw/source/ui/inc/mailmergechildwindow.hxx @@ -51,7 +51,7 @@ class SwMailMergeChildWindow : public SfxChildWindow { public: SwMailMergeChildWindow( Window* , - USHORT nId, + sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index 810f98adf492..359027244a3e 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -117,7 +117,7 @@ class SwMailMergeDlg : public SvxStandardDialog const String& rDBName; const String& rTableName; - USHORT nMergeType; + sal_uInt16 nMergeType; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; @@ -146,7 +146,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); ~SwMailMergeDlg(); - inline USHORT GetMergeType() { return nMergeType; } + inline sal_uInt16 GetMergeType() { return nMergeType; } const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;} inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; @@ -166,7 +166,7 @@ public: SwMailMergeCreateFromDlg(Window* pParent); ~SwMailMergeCreateFromDlg(); - BOOL IsThisDocument() const {return aThisDocRB.IsChecked();} + sal_Bool IsThisDocument() const {return aThisDocRB.IsChecked();} }; class SwMailMergeFieldConnectionsDlg : public ModalDialog @@ -184,7 +184,7 @@ public: SwMailMergeFieldConnectionsDlg(Window* pParent); ~SwMailMergeFieldConnectionsDlg(); - BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();} + sal_Bool IsUseExistingConnections() const {return aUseExistingRB.IsChecked();} }; #endif diff --git a/sw/source/ui/inc/makefile.mk b/sw/source/ui/inc/makefile.mk deleted file mode 100644 index cb9b968dcc06..000000000000 --- a/sw/source/ui/inc/makefile.mk +++ /dev/null @@ -1,42 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=uiinc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -LOCALIZE_ME=swmn_tmpl.hrc toolbox_tmpl.hrc - -.INCLUDE : target.mk - diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index fb37057c40ec..8923a2a1c2f3 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -43,12 +43,12 @@ class SwMergeTblDlg : public SvxStandardDialog RadioButton aMergePrevRB; RadioButton aMergeNextRB; - BOOL& rMergePrev; + sal_Bool& rMergePrev; protected: virtual void Apply(); public: - SwMergeTblDlg( Window *pParent, BOOL& rWithPrev ); + SwMergeTblDlg( Window *pParent, sal_Bool& rWithPrev ); }; #endif diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index 9fa90ea19c34..4ac5eab0da00 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -68,8 +68,8 @@ class SW_DLLPUBLIC SwMailMergeConfigItem ::rtl::OUString m_rAddressBlockFrame; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; - USHORT m_nStartPrint; - USHORT m_nEndPrint; + sal_uInt16 m_nStartPrint; + sal_uInt16 m_nEndPrint; ::rtl::OUString m_sSelectedPrinter; @@ -256,10 +256,10 @@ public: SwDocMergeInfo& GetDocumentMergeInfo(sal_uInt32 nDocument); sal_uInt32 GetMergedDocumentCount() const; - void SetPrintRange( USHORT nStartDocument, USHORT nEndDocument) + void SetPrintRange( sal_uInt16 nStartDocument, sal_uInt16 nEndDocument) {m_nStartPrint = nStartDocument; m_nEndPrint = nEndDocument;} - USHORT GetPrintRangeStart() const {return m_nStartPrint;} - USHORT GetPrintRangeEnd() const {return m_nEndPrint;} + sal_uInt16 GetPrintRangeStart() const {return m_nStartPrint;} + sal_uInt16 GetPrintRangeEnd() const {return m_nEndPrint;} const ::rtl::OUString& GetSelectedPrinter() const {return m_sSelectedPrinter;} void SetSelectedPrinter(const ::rtl::OUString& rSet ) diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index e7519740509c..e3f182b9583c 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -55,7 +55,7 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog CancelButton aCancelBT; SwTOXMgr &rMgr; - USHORT nPos; + sal_uInt16 nPos; void Apply(); public: diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx index 94e833d41dc7..db5208049990 100644 --- a/sw/source/ui/inc/navicont.hxx +++ b/sw/source/ui/inc/navicont.hxx @@ -44,19 +44,19 @@ class NaviContentBookmark String aUrl; // URL inkl. Sprungmarke String aDescr; // Description long nDocSh; // Adresse der DocShell - USHORT nDefDrag; // Description enthaelt defaultDragType + sal_uInt16 nDefDrag; // Description enthaelt defaultDragType public: NaviContentBookmark(); NaviContentBookmark( const String &rUrl, const String& rDesc, - USHORT nDragType, const SwDocShell* ); + sal_uInt16 nDragType, const SwDocShell* ); const String& GetURL() const { return aUrl; } const String& GetDescription() const { return aDescr; } - USHORT GetDefaultDragType() const { return nDefDrag; } + sal_uInt16 GetDefaultDragType() const { return nDefDrag; } long GetDocShell() const { return nDocSh; } void Copy( TransferDataContainer& rData ) const; - BOOL Paste( TransferableDataHelper& rData ); + sal_Bool Paste( TransferableDataHelper& rData ); }; #endif diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 91e16972596b..f5ef00cff8a4 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -94,19 +94,19 @@ class SwNavigationPI : public Window, long nDocLBIniHeight; long nWishWidth; - USHORT nAutoMarkIdx; - USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link + sal_uInt16 nAutoMarkIdx; + sal_uInt16 nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link short nZoomIn; short nZoomOutInit; short nZoomOut; - BOOL bSmallMode : 1; - BOOL bIsZoomedIn : 1; - BOOL bPageCtrlsVisible : 1; - BOOL bGlobalMode : 1; + sal_Bool bSmallMode : 1; + sal_Bool bIsZoomedIn : 1; + sal_Bool bPageCtrlsVisible : 1; + sal_Bool bGlobalMode : 1; // --------- methods ----------------------------- - BOOL _IsZoomedIn() const {return bIsZoomedIn;} + sal_Bool _IsZoomedIn() const {return bIsZoomedIn;} void _ZoomOut(); void _ZoomIn(); @@ -138,7 +138,7 @@ class SwNavigationPI : public Window, protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -147,8 +147,8 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); NumEditAction& GetPageEdit(); - BOOL ToggleTree(); - void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;} + sal_Bool ToggleTree(); + void SetGlobalMode(sal_Bool bSet) {bGlobalMode = bSet;} public: @@ -159,32 +159,32 @@ public: void Update() { FillBox(); } void UpdateListBox(); - void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds); + void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, sal_Bool bWithCilds); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); static String CreateDropFileName( TransferableDataHelper& rData ); static void CleanEntry( String& rEntry ); - USHORT GetRegionDropMode() const {return nRegionMode;} - void SetRegionDropMode(USHORT nNewMode); + sal_uInt16 GetRegionDropMode() const {return nRegionMode;} + void SetRegionDropMode(sal_uInt16 nNewMode); sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - BOOL IsGlobalDoc() const; - BOOL IsGlobalMode() const {return bGlobalMode;} + sal_Bool IsGlobalDoc() const; + sal_Bool IsGlobalMode() const {return bGlobalMode;} SwView* GetCreateView() const; - void CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus); + void CreateNavigationTool(const Rectangle& rRect, sal_Bool bSetFocus); }; class SwNavigationChild : public SfxChildWindowContext { public: SwNavigationChild( Window* , - USHORT nId, + sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx index b2d35ae07eee..2a86172e6c1b 100644 --- a/sw/source/ui/inc/navmgr.hxx +++ b/sw/source/ui/inc/navmgr.hxx @@ -60,9 +60,9 @@ public: /* Constructor that initializes the shell to the current shell */ SwNavigationMgr( SwWrtShell* pShell ); /* Can we go back in the history ? */ - BOOL backEnabled() ; + sal_Bool backEnabled() ; /* Can we go forward in the history ? */ - BOOL forwardEnabled(); + sal_Bool forwardEnabled(); /* The method that is called when we click the back button */ void goBack() ; /* The method that is called when we click the forward button */ diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 290878bac53b..32cab6675abd 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -48,7 +48,7 @@ class SwOutlineTabDialog; struct SwBmpItemInfo { SvxBrushItem* pBrushItem; - USHORT nItemId; + sal_uInt16 nItemId; }; #define NUM_PAGETYPE_BULLET 0 @@ -59,12 +59,12 @@ struct SwBmpItemInfo class SwNumPositionTabPage : public SfxTabPage { - FixedLine aPositionFL; - FixedLine aLevelFL; + FixedLine aLevelFL; MultiListBox aLevelLB; // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION + FixedLine aPositionFL; FixedText aDistBorderFT; MetricField aDistBorderMF; CheckBox aRelativeCB; @@ -97,11 +97,11 @@ class SwNumPositionTabPage : public SfxTabPage SwWrtShell* pWrtSh; SwOutlineTabDialog* pOutlineDlg; - USHORT nActNumLvl; + sal_uInt16 nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein + sal_Bool bModified : 1; + sal_Bool bPreset : 1; + sal_Bool bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein bool bLabelAlignmentPosAndSpaceModeActive; void InitControls(); @@ -131,7 +131,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, @@ -140,10 +140,10 @@ public: void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} void SetWrtShell(SwWrtShell* pSh); #if OSL_DEBUG_LEVEL > 1 - void SetModified(BOOL bRepaint = TRUE); + void SetModified(sal_Bool bRepaint = sal_True); #else - void SetModified(BOOL bRepaint = TRUE) - { bModified = TRUE; + void SetModified(sal_Bool bRepaint = sal_True) + { bModified = sal_True; if(bRepaint) { aPreviewWIN.SetLevel(nActNumLvl); @@ -162,7 +162,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog protected: virtual short Ok(); - virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); DECL_LINK(RemoveNumberingHdl, PushButton*); public: SwSvxNumBulletTabDialog(Window* pParent, diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 3ac0d047b436..747328dd1378 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -45,10 +45,10 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox public: SwNumberingTypeListBox( Window* pWin, const ResId& rResId, - USHORT nTypeFlags = INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING|INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES ); + sal_uInt16 nTypeFlags = INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING|INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES ); ~SwNumberingTypeListBox(); - void Reload(USHORT nTypeFlags); + void Reload(sal_uInt16 nTypeFlags); sal_Int16 GetSelectedNumberingType(); sal_Bool SelectNumberingType(sal_Int16 nType); diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index 31ef802ebbb1..e19d7206535e 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -37,49 +37,49 @@ class SwView; class SW_DLLPUBLIC NumFormatListBox : public ListBox { short nCurrFormatType; - USHORT nStdEntry; - BOOL bOneArea; - ULONG nDefFormat; + sal_uInt16 nStdEntry; + sal_Bool bOneArea; + sal_uLong nDefFormat; SwView* pVw; SvNumberFormatter* pOwnFormatter; LanguageType eCurLanguage; - BOOL bShowLanguageControl; //determine whether the language control has + sal_Bool bShowLanguageControl; //determine whether the language control has //to be shown in the number format dialog - BOOL bUseAutomaticLanguage;//determine whether language is automatically assigned + sal_Bool bUseAutomaticLanguage;//determine whether language is automatically assigned SW_DLLPRIVATE DECL_LINK( SelectHdl, ListBox * ); SW_DLLPRIVATE double GetDefValue(const short nFormatType) const; - SW_DLLPRIVATE void Init(short nFormatType, BOOL bUsrFmts); + SW_DLLPRIVATE void Init(short nFormatType, sal_Bool bUsrFmts); SW_DLLPRIVATE SwView* GetView(); public: NumFormatListBox( Window* pWin, const ResId& rResId, - short nFormatType = NUMBERFORMAT_NUMBER, ULONG nDefFmt = 0, - BOOL bUsrFmts = TRUE ); + short nFormatType = NUMBERFORMAT_NUMBER, sal_uLong nDefFmt = 0, + sal_Bool bUsrFmts = sal_True ); NumFormatListBox( Window* pWin, SwView* pView, const ResId& rResId, - short nFormatType = NUMBERFORMAT_NUMBER, ULONG nDefFmt = 0, - BOOL bUsrFmts = TRUE ); + short nFormatType = NUMBERFORMAT_NUMBER, sal_uLong nDefFmt = 0, + sal_Bool bUsrFmts = sal_True ); ~NumFormatListBox(); void Clear(); - inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; } + inline void SetOneArea(sal_Bool bOnlyOne = sal_True) { bOneArea = bOnlyOne; } void SetFormatType(const short nFormatType); inline short GetFormatType() const { return nCurrFormatType; } - void SetDefFormat(const ULONG nDefFmt); - ULONG GetFormat() const; + void SetDefFormat(const sal_uLong nDefFmt); + sal_uLong GetFormat() const; inline LanguageType GetCurLanguage() const { return eCurLanguage;} void SetLanguage(LanguageType eSet) { eCurLanguage = eSet;} - void SetAutomaticLanguage(BOOL bSet){bUseAutomaticLanguage = bSet;} - BOOL IsAutomaticLanguage()const {return bUseAutomaticLanguage;} + void SetAutomaticLanguage(sal_Bool bSet){bUseAutomaticLanguage = bSet;} + sal_Bool IsAutomaticLanguage()const {return bUseAutomaticLanguage;} - void SetShowLanguageControl(BOOL bSet){bShowLanguageControl = bSet;} + void SetShowLanguageControl(sal_Bool bSet){bShowLanguageControl = bSet;} }; diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 236c0205c9a0..2cf7d903338c 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -47,10 +47,10 @@ class SwParagraphNumTabPage : public SfxTabPage FixedText aOutlineLvFT; ListBox aOutlineLvLB; + FixedLine aNewStartFL; FixedText aNumberStyleFT; ListBox aNumberStyleLB; - FixedLine aNewStartFL; TriStateBox aNewStartCB; TriStateBox aNewStartNumberCB; NumericField aNewStartNF; @@ -65,8 +65,8 @@ class SwParagraphNumTabPage : public SfxTabPage const String msOutlineNumbering; // <-- - BOOL bModified : 1; - BOOL bCurNumrule : 1; + sal_Bool bModified : 1; + sal_Bool bCurNumrule : 1; DECL_LINK( NewStartHdl_Impl, CheckBox* ); DECL_LINK( StyleHdl_Impl, ListBox* ); @@ -80,9 +80,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void EnableNewStart(); diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index 939cdd0e0585..e40e49b41347 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.hxx @@ -40,8 +40,8 @@ class NumberingPreview : public Window Font aStdFont; long nPageWidth; const String* pOutlineNames; - BOOL bPosition; - UINT16 nActLevel; + sal_Bool bPosition; + sal_uInt16 nActLevel; protected: virtual void Paint( const Rectangle& rRect ); @@ -49,7 +49,7 @@ class NumberingPreview : public Window public: NumberingPreview(Window* pParent, const ResId& rResId ) : Window(pParent, rResId), - pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX) {} + pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX) {} ~NumberingPreview(); void SetNumRule(const SwNumRule* pNum) @@ -59,8 +59,8 @@ class NumberingPreview : public Window void SetOutlineNames(const String* pNames) {pOutlineNames = pNames;} void SetPositionMode() - { bPosition = TRUE;} - void SetLevel(USHORT nSet) {nActLevel = nSet;} + { bPosition = sal_True;} + void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} }; diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index f83feb7f27db..bc2c7a1e8973 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -65,7 +65,7 @@ class SwSpellPopup : public PopupMenu Image aInfo16; - void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart, + void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart, ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh, std::map< sal_Int16, ::rtl::OUString > &rLangTable ); @@ -84,7 +84,7 @@ public: const String & rParaText ); sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); - void Execute( USHORT nId ); + void Execute( sal_uInt16 nId ); }; diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx index c4758b649ead..b9e95f5722bf 100644 --- a/sw/source/ui/inc/optcomp.hxx +++ b/sw/source/ui/inc/optcomp.hxx @@ -60,7 +60,7 @@ private: // impl object SwCompatibilityOptPage_Impl* m_pImpl; // saved options after "Reset"; used in "FillItemSet" for comparison - ULONG m_nSavedOptions; + sal_uLong m_nSavedOptions; // handler DECL_LINK( SelectHdl, ListBox* ); @@ -69,8 +69,8 @@ private: // private methods void InitControls( const SfxItemSet& rSet ); void ReplaceFormatName( String& rEntry ); - void SetCurrentOptions( ULONG nOptions ); - ULONG GetDocumentOptions() const; + void SetCurrentOptions( sal_uLong nOptions ); + sal_uLong GetDocumentOptions() const; void WriteOptions(); public: @@ -79,7 +79,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index fb2bb6c26189..1c5d0bd4d5b0 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -67,7 +67,7 @@ private: SwWrtShell* pWrtShell; sal_Bool bHTMLMode; - UINT16 nLastTab; + sal_uInt16 nLastTab; sal_Int32 nOldLinkMode; DECL_LINK(CaptionHdl, PushButton*); @@ -80,7 +80,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -166,8 +166,8 @@ private: String sNone; SwFldMgr *pMgr; - USHORT eType; - BOOL bHTMLMode; + sal_uInt16 eType; + sal_Bool bHTMLMode; DECL_LINK( SelectHdl, ListBox *pLB = 0 ); DECL_LINK( ModifyHdl, Edit *pEdt = 0 ); @@ -176,7 +176,7 @@ private: DECL_LINK( SaveEntryHdl, SvxCheckListBox *pLB = 0 ); void DelUserData(); - void SetOptions( const USHORT nPos, + void SetOptions( const sal_uInt16 nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); void SaveEntry( SvLBoxEntry* pEntry ); @@ -190,7 +190,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 81541a374496..9c175fecd680 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -89,7 +89,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -120,11 +120,11 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aSeparatorRFL; + FixedLine aFL3; RadioButton aNoRB; RadioButton aOnlyRB; RadioButton aEndRB; RadioButton aEndPageRB; - FixedLine aFL3; FixedLine aFL4; CheckBox aPrintEmptyPagesCB; // CheckBox aSingleJobsCB; @@ -133,8 +133,8 @@ class SwAddPrinterTabPage : public SfxTabPage ListBox aFaxLB; String sNone; - BOOL bAttrModified; - BOOL bPreview; + sal_Bool bAttrModified; + sal_Bool bPreview; void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); @@ -148,11 +148,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetFax( const SvStringsDtor& ); void SelectFax( const String& ); - void SetPreview(BOOL bPrev); + void SetPreview(sal_Bool bPrev); virtual void PageCreated (SfxAllItemSet aSet); }; @@ -200,20 +200,20 @@ class SwStdFontTabPage : public SfxTabPage SwWrtShell* pWrtShell; LanguageType eLanguage; // waren nur defaults vorhanden? wurden sie mit den Boxen ueberschrieben - BOOL bListDefault :1; - BOOL bSetListDefault :1; - BOOL bLabelDefault :1; - BOOL bSetLabelDefault :1; - BOOL bIdxDefault :1; - BOOL bSetIdxDefault :1; - BOOL bDeletePrinter :1; - - BOOL bListHeightDefault :1; - BOOL bSetListHeightDefault :1; - BOOL bLabelHeightDefault :1; - BOOL bSetLabelHeightDefault :1; - BOOL bIndexHeightDefault :1; - BOOL bSetIndexHeightDefault :1; + sal_Bool bListDefault :1; + sal_Bool bSetListDefault :1; + sal_Bool bLabelDefault :1; + sal_Bool bSetLabelDefault :1; + sal_Bool bIdxDefault :1; + sal_Bool bSetIdxDefault :1; + sal_Bool bDeletePrinter :1; + + sal_Bool bListHeightDefault :1; + sal_Bool bSetListHeightDefault :1; + sal_Bool bLabelHeightDefault :1; + sal_Bool bSetLabelHeightDefault :1; + sal_Bool bIndexHeightDefault :1; + sal_Bool bSetIndexHeightDefault :1; sal_uInt8 nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL] @@ -234,7 +234,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} @@ -278,7 +278,7 @@ class SwTableOptionsTabPage : public SfxTabPage FixedText aVarFT; SwWrtShell* pWrtShell; - BOOL bHTMLMode; + sal_Bool bHTMLMode; DECL_LINK(CheckBoxHdl, CheckBox *pCB); @@ -292,7 +292,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} @@ -331,6 +331,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage FixedLine aCrsrOptFL; CheckBox aCrsrInProtCB; + FixedLine m_aLayoutOptionsFL; + CheckBox m_aMathBaselineAlignmentCB; + + SwWrtShell * m_pWrtShell; + + SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); @@ -338,8 +344,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); + + void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } + virtual void PageCreated( SfxAllItemSet aSet ); }; /*----------------------------------------------------------------------- @@ -359,7 +368,7 @@ class SwMarkPreview : public Window Rectangle aLeftPagePrtArea; Rectangle aRightPagePrtArea; - USHORT nMarkPos; + sal_uInt16 nMarkPos; using OutputDevice::DrawRect; void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); @@ -376,7 +385,7 @@ public: virtual ~SwMarkPreview(); inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } - inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; } + inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } }; /*----------------------------------------------------------------------- @@ -431,7 +440,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -450,7 +459,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); private: @@ -466,7 +475,7 @@ private: CheckBox aTest9CBox; CheckBox aTest10CBox; - BOOL bAttrModified; + sal_Bool bAttrModified; void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); @@ -475,5 +484,4 @@ private: #endif //PRODUCT #endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 52e6e3fb1aa2..f19969660392 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -54,7 +54,7 @@ class SwChapterNumRules; class SwOutlineTabDialog : public SfxTabDialog { - static USHORT nNumLevel; + static sal_uInt16 nNumLevel; String aNullStr; String aCollNames[MAXLEVEL]; @@ -64,14 +64,14 @@ class SwOutlineTabDialog : public SfxTabDialog SwNumRule* pNumRule; SwChapterNumRules* pChapterNumRules; - BOOL bModified : 1; + sal_Bool bModified : 1; protected: DECL_LINK( CancelHdl, Button * ); DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); - virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); virtual short Ok(); public: @@ -81,18 +81,19 @@ class SwOutlineTabDialog : public SfxTabDialog ~SwOutlineTabDialog(); SwNumRule* GetNumRule() {return pNumRule;} - USHORT GetLevel(const String &rFmtName) const; + sal_uInt16 GetLevel(const String &rFmtName) const; String* GetCollNames() {return aCollNames;} - static USHORT GetActNumLevel() {return nNumLevel;} - static void SetActNumLevel(USHORT nSet) {nNumLevel = nSet;} + static sal_uInt16 GetActNumLevel() {return nNumLevel;} + static void SetActNumLevel(sal_uInt16 nSet) {nNumLevel = nSet;} }; class SwOutlineSettingsTabPage : public SfxTabPage { - ListBox aLevelLB; FixedLine aLevelFL; + ListBox aLevelLB; + FixedLine aNumberFL; FixedText aCollLbl; ListBox aCollBox; FixedText aNumberLbl; @@ -108,7 +109,6 @@ class SwOutlineSettingsTabPage : public SfxTabPage Edit aSuffixED; FixedText aStartLbl; NumericField aStartEdit; - FixedLine aNumberFL; NumberingPreview aPreviewWIN; String aNoFmtName; @@ -116,7 +116,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage SwWrtShell* pSh; SwNumRule* pNumRule; String* pCollNames; - USHORT nActLevel; + sal_uInt16 nActLevel; DECL_LINK( LevelHdl, ListBox * ); DECL_LINK( ToggleComplete, NumericField * ); @@ -144,7 +144,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index ac46e739f863..a69d7b121aba 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -44,22 +44,23 @@ class SwFootNotePage: public SfxTabPage { public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); private: SwFootNotePage(Window *pParent, const SfxItemSet &rSet); ~SwFootNotePage(); + FixedLine aPosHeader; RadioButton aMaxHeightPageBtn; RadioButton aMaxHeightBtn; MetricField aMaxHeightEdit; FixedText aDistLbl; MetricField aDistEdit; - FixedLine aPosHeader; + FixedLine aLineHeader; FixedText aLinePosLbl; ListBox aLinePosBox; FixedText aLineTypeLbl; @@ -68,7 +69,6 @@ private: MetricField aLineWidthEdit; FixedText aLineDistLbl; MetricField aLineDistEdit; - FixedLine aLineHeader; DECL_LINK( HeightPage, Button * ); DECL_LINK( HeightMetric, Button * ); diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index 4b4ccc9bbdce..974b48690465 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -103,9 +103,9 @@ class SwTextGridPage: public SfxTabPage public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx index aafe5510983c..7eb84042ddc0 100644 --- a/sw/source/ui/inc/prcntfld.hxx +++ b/sw/source/ui/inc/prcntfld.hxx @@ -40,12 +40,12 @@ class SW_DLLPUBLIC PercentField : public MetricField sal_Int64 nOldBaseValue; sal_Int64 nLastPercent; sal_Int64 nLastValue; - USHORT nOldDigits; + sal_uInt16 nOldDigits; FieldUnit eOldUnit; sal_Bool bLockAutoCalculation; //prevent recalcution of percent values when the //reference value is changed - SW_DLLPRIVATE sal_Int64 ImpPower10(USHORT n); + SW_DLLPRIVATE sal_Int64 ImpPower10(sal_uInt16 n); using MetricField::SetValue; using MetricField::GetValue; @@ -69,7 +69,7 @@ public: sal_Int64 GetValue(FieldUnit eOutUnit = FUNIT_NONE); - BOOL IsValueModified(); + sal_Bool IsValueModified(); //using NumericFormatter::SetMax; void SetMax(sal_Int64 nNewMax, FieldUnit eInUnit = FUNIT_NONE); @@ -86,9 +86,9 @@ public: sal_Int64 Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit); - void ShowPercent(BOOL bPercent); + void ShowPercent(sal_Bool bPercent); - USHORT GetOldDigits() const {return nOldDigits;} + sal_uInt16 GetOldDigits() const {return nOldDigits;} void LockAutoCalculation(sal_Bool bLock) {bLockAutoCalculation = bLock;} sal_Bool IsAutoCalculationLocked()const {return bLockAutoCalculation;} diff --git a/sw/source/ui/inc/prtopt.hxx b/sw/source/ui/inc/prtopt.hxx deleted file mode 100644 index a2c47fd47066..000000000000 --- a/sw/source/ui/inc/prtopt.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _PRTOPT_HXX -#define _PRTOPT_HXX - -#include <unotools/configitem.hxx> -#include <printdata.hxx> - -class SwPrintOptions : public SwPrintData, public utl::ConfigItem -{ - sal_Bool bIsWeb; - - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); -public: - SwPrintOptions(sal_Bool bWeb); - virtual ~SwPrintOptions(); - - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void doSetModified( ) { bModified = sal_True; SetModified();} - - SwPrintOptions& operator=(const SwPrintData& rData) - { - SwPrintData::operator=( rData ); - SetModified(); - return *this; - } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 04206297a9d3..dfa0cb23316c 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -55,8 +55,8 @@ class SwPagePreviewLayout; class SwPagePreViewWin : public Window { ViewShell* mpViewShell; - USHORT mnSttPage; - BYTE mnRow, mnCol; + sal_uInt16 mnSttPage; + sal_uInt8 mnRow, mnCol; Size maPxWinSize; Fraction maScale; SwPagePreView& mrView; @@ -66,7 +66,7 @@ class SwPagePreViewWin : public Window // OD 12.12.2002 #103492# SwPagePreviewLayout* mpPgPrevwLayout; - void SetPagePreview( BYTE nRow, BYTE nCol ); + void SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ); using Window::Scroll; @@ -85,14 +85,14 @@ public: ViewShell* GetViewShell() const { return mpViewShell; } - BYTE GetRow() const { return mnRow; } - void SetRow( BYTE n ) { if( n ) mnRow = n; } + sal_uInt8 GetRow() const { return mnRow; } + void SetRow( sal_uInt8 n ) { if( n ) mnRow = n; } - BYTE GetCol() const { return mnCol; } - void SetCol( BYTE n ) { if( n ) mnCol = n; } + sal_uInt8 GetCol() const { return mnCol; } + void SetCol( sal_uInt8 n ) { if( n ) mnCol = n; } - USHORT GetSttPage() const { return mnSttPage; } - void SetSttPage( USHORT n ) { mnSttPage = n; } + sal_uInt16 GetSttPage() const { return mnSttPage; } + void SetSttPage( sal_uInt16 n ) { mnSttPage = n; } /** get selected page number of document preview @@ -116,9 +116,9 @@ public: void SetSelectedPage( sal_uInt16 _nSelectedPageNum ); //JP 19.08.98: bei Einspaltigkeit gibt es keine 0. Seite! - USHORT GetDefSttPage() const { return 1 == mnCol ? 1 : 0; } + sal_uInt16 GetDefSttPage() const { return 1 == mnCol ? 1 : 0; } - void CalcWish( BYTE nNewRow, BYTE nNewCol ); + void CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ); const Size& GetWinSize() const { return maPxWinSize; } void SetWinSize( const Size& rNewSize ); @@ -129,7 +129,7 @@ public: int MovePage( int eMoveMode ); // erzeuge den String fuer die StatusLeiste - void GetStatusStr( String& rStr, USHORT nPageCount ) const; + void GetStatusStr( String& rStr, sal_uInt16 nPageCount ) const; void RepaintCoreRect( const SwRect& rRect ); @@ -150,7 +150,7 @@ public: return maPaintedPreviewDocRect; } - void Scroll(long nXMove, long nYMove, USHORT nFlags = 0); + void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0); /** method to enable/disable book preview @@ -160,7 +160,7 @@ public: @param _bBookPreview input parameter - boolean indicating, if book preview mode has to - switch on <TRUE> or of <FALSE> + switch on <sal_True> or of <sal_False> @return boolean indicating, if book preview mode has changed. */ @@ -184,7 +184,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too - USHORT nNewPage; + sal_uInt16 nNewPage; // Sichtbarer Bereich String sPageStr; Size aDocSz; @@ -199,8 +199,8 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell // aktiv sind Window *pScrollFill; - USHORT mnPageCount; - BOOL bNormalPrint; + sal_uInt16 mnPageCount; + sal_Bool bNormalPrint; // OD 09.01.2003 #106334# // new members to reset design mode at draw view for form shell on switching @@ -211,20 +211,19 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell SW_DLLPRIVATE void Init(const SwViewOption* = 0); SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; - SW_DLLPRIVATE int _CreateScrollbar( BOOL bHori ); + SW_DLLPRIVATE int _CreateScrollbar( sal_Bool bHori ); SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( BtnPage, Button * ); - SW_DLLPRIVATE int ChgPage( int eMvMode, int bUpdateScrollbar = TRUE ); + SW_DLLPRIVATE int ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - SW_DLLPRIVATE virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); + SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); + SW_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window *pParent ); - SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); + SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner ); /** help method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN @@ -247,7 +246,7 @@ protected: virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); virtual Size GetOptimalSizePixel() const; - void SetZoom(SvxZoomType eSet, USHORT nFactor); + void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); public: SFX_DECL_VIEWFACTORY(SwPagePreView); @@ -264,7 +263,7 @@ public: void DocSzChgd(const Size& rNewSize); const Size& GetDocSz() const { return aDocSz; } - virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE); + virtual void SetVisArea( const Rectangle&, sal_Bool bUpdateScrollbar = sal_True); inline void AdjustEditWin(); @@ -274,16 +273,16 @@ public: void ShowVScrollbar(sal_Bool bShow); - USHORT GetPageCount() const { return mnPageCount; } + sal_uInt16 GetPageCount() const { return mnPageCount; } - BOOL HandleWheelCommands( const CommandEvent& ); + sal_Bool HandleWheelCommands( const CommandEvent& ); const String& GetPrevSwViewData() const { return sSwViewData; } void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; } const String& GetNewCrsrPos() const { return sNewCrsrPos; } - USHORT GetNewPage() const {return nNewPage;} - void SetNewPage(USHORT nSet) {nNewPage = nSet;} + sal_uInt16 GetNewPage() const {return nNewPage;} + void SetNewPage(sal_uInt16 nSet) {nNewPage = nSet;} // Handler void Execute(SfxRequest&); diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 8f2686b93cb1..f67aeb5a3291 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -56,9 +56,9 @@ struct SwRedlineDataParent SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag String sComment; // Redline-Kommentar - inline BOOL operator==( const SwRedlineDataParent& rObj ) const + inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); } - inline BOOL operator< ( const SwRedlineDataParent& rObj ) const + inline sal_Bool operator< ( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); } }; @@ -98,9 +98,9 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox Link aOldSelectHdl; Link aOldDeselectHdl; - BOOL bOnlyFormatedRedlines; - BOOL bHasReadonlySel; - BOOL bRedlnAutoFmt; + sal_Bool bOnlyFormatedRedlines; + sal_Bool bHasReadonlySel; + sal_Bool bRedlnAutoFmt; // prevent update dialog data during longer operations (cf #102657#) bool bInhibitActivate; @@ -115,27 +115,27 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SW_DLLPRIVATE DECL_LINK( GotoHdl, void* ); SW_DLLPRIVATE DECL_LINK( CommandHdl, void* ); - SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild); - SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt); - SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX); - SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd); + SW_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, sal_Bool bChild); + SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const sal_uInt16 nAutoFmt); + SW_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX); + SW_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd); SW_DLLPRIVATE void InitAuthors(); - SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0); - SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0); - SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const; + SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0); + SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, sal_uInt16 nStack = 0); + SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvLBoxEntry& rEntry) const; public: - SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt = FALSE); + SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False); virtual ~SwRedlineAcceptDlg(); DECL_LINK( FilterChangedHdl, void *pDummy = 0 ); inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; } - inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; } + inline sal_Bool HasRedlineAutoFmt() const { return bRedlnAutoFmt; } - void Init(USHORT nStart = 0); - void CallAcceptReject( BOOL bSelect, BOOL bAccept ); + void Init(sal_uInt16 nStart = 0); + void CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ); void Initialize(const String &rExtraData); void FillInfo(String &rExtraData) const; @@ -164,13 +164,13 @@ class SwRedlineAcceptChild : public SwChildWinWrapper { public: SwRedlineAcceptChild( Window* , - USHORT nId, + sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SwRedlineAcceptChild ); - virtual BOOL ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); }; diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index ea6573a60f4f..416684f3af9f 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -114,14 +114,14 @@ class SwEditRegionDlg : public SfxModalDialog sfx2::DocumentInserter* m_pDocInserter; Window* m_pOldDefDlgParent; - BOOL bDontCheckPasswd :1; - BOOL bWeb :1; + sal_Bool bDontCheckPasswd :1; + sal_Bool bWeb :1; - Image BuildBitmap(BOOL bProtect,BOOL bHidden); + Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); - USHORT FindArrPos(const SwSectionFmt* pFmt); + sal_uInt16 FindArrPos(const SwSectionFmt* pFmt); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); DECL_LINK( DeselectHdl, SvTreeListBox * ); @@ -145,7 +145,7 @@ class SwEditRegionDlg : public SfxModalDialog DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* ); DECL_LINK( SubRegionEventHdl, VclWindowEvent * ); - BOOL CheckPasswd(CheckBox* pBox = 0); + sal_Bool CheckPasswd(CheckBox* pBox = 0); public: SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ); @@ -216,7 +216,7 @@ public: void SetWrtShell(SwWrtShell& rSh); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); static SfxTabPage* Create( Window* pParent, @@ -255,13 +255,13 @@ class SwSectionFtnEndTabPage : public SfxTabPage DECL_LINK( FootEndHdl, CheckBox * ); - void ResetState( BOOL bFtn, const SwFmtFtnEndAtTxtEnd& ); + void ResetState( sal_Bool bFtn, const SwFmtFtnEndAtTxtEnd& ); public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); static SfxTabPage* Create( Window* pParent, @@ -283,7 +283,7 @@ public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); static SfxTabPage* Create( Window* pParent, @@ -298,7 +298,7 @@ class SwInsertSectionTabDialog : public SfxTabDialog ::std::auto_ptr<SwSectionData> m_pSectionData; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual short Ok(); public: SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); @@ -312,7 +312,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog { SwWrtShell& rWrtSh; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); public: SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index 45c494b6f136..c9af820ba35b 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.hrc @@ -69,10 +69,7 @@ #define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) #define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) -#define RID_INSERT_CTRL (RC_RIBBAR_BEGIN + 24) -#define RID_INSERT_OBJ_CTRL (RC_RIBBAR_BEGIN + 25) #define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26) -#define RID_TBL_OPT_CTRL (RC_RIBBAR_BEGIN + 27) #define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) #define RID_SCROLL_NAVI_TBX (RC_RIBBAR_BEGIN + 29) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index 43e52bea056b..0302fcefe4bb 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.hxx @@ -37,9 +37,9 @@ class SwWrtShell; class SwTableHeightDlg : public SvxStandardDialog { + FixedLine aHeightFL; MetricField aHeightEdit; CheckBox aAutoHeightCB; - FixedLine aHeightFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 6d360af5671f..134ce9d284ad 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -32,11 +32,11 @@ class SwScrollbar: public ScrollBar { Size aDocSz; - BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal - BOOL bAuto :1; // fuer Scrollingmode - BOOL bThumbEnabled:1; - BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen - BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt? + sal_Bool bHori :1; // Horizontal = sal_True, sonst Vertikal + sal_Bool bAuto :1; // fuer Scrollingmode + sal_Bool bThumbEnabled:1; + sal_Bool bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen + sal_Bool bSizeSet :1; // wurde die Groesse bereits gesetzt? void AutoShow(); @@ -46,22 +46,22 @@ class SwScrollbar: public ScrollBar public: - void ExtendedShow( BOOL bVisible = TRUE ); - void Hide() { Show( FALSE ); } + void ExtendedShow( sal_Bool bVisible = sal_True ); + void Hide() { Show( sal_False ); } void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } + sal_Bool IsVisible(sal_Bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // Aenderung der Dokumentgroesse void DocSzChgd(const Size &rNewSize); // Aenderung des sichtbaren Bereiches void ViewPortChgd(const Rectangle &rRectangle); // was fuer einer ist es denn ?? - BOOL IsHoriScroll() const { return bHori; } + sal_Bool IsHoriScroll() const { return bHori; } - void SetAuto(BOOL bSet); - BOOL IsAuto() { return bAuto;} + void SetAuto(sal_Bool bSet); + sal_Bool IsAuto() { return bAuto;} - SwScrollbar(Window *pParent, BOOL bHori = TRUE ); + SwScrollbar(Window *pParent, sal_Bool bHori = sal_True ); ~SwScrollbar(); }; diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index d8c86a972de2..4ce626454d25 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.hxx @@ -49,8 +49,8 @@ public: SwSelGlossaryDlg(Window * pParent, const String &rShortName); ~SwSelGlossaryDlg(); void InsertGlos(const String &rRegion, const String &rGlosName); // inline - USHORT GetSelectedIdx() const; // inline - void SelectEntryPos(USHORT nIdx); // inline + sal_uInt16 GetSelectedIdx() const; // inline + void SelectEntryPos(sal_uInt16 nIdx); // inline }; inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion, @@ -61,9 +61,9 @@ inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion, aTmp += rGlosName; aGlosBox.InsertEntry( aTmp ); } -inline USHORT SwSelGlossaryDlg::GetSelectedIdx() const +inline sal_uInt16 SwSelGlossaryDlg::GetSelectedIdx() const { return aGlosBox.GetSelectEntryPos(); } -inline void SwSelGlossaryDlg::SelectEntryPos(USHORT nIdx) +inline void SwSelGlossaryDlg::SelectEntryPos(sal_uInt16 nIdx) { aGlosBox.SelectEntryPos(nIdx); } #endif diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index 8b1a4e9123de..7a6c85047dc0 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -41,23 +41,23 @@ class SwShadowCursor Color aCol; Point aOldPt; long nOldHeight; - USHORT nOldMode; + sal_uInt16 nOldMode; - void DrawTri( const Point& rPt, long nHeight, BOOL bLeft ); - void DrawCrsr( const Point& rPt, long nHeight, USHORT nMode ); + void DrawTri( const Point& rPt, long nHeight, sal_Bool bLeft ); + void DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode ); public: SwShadowCursor( Window& rWin, const Color& rCol ) : pWin( &rWin ), aCol( rCol ), nOldHeight(0), nOldMode( USHRT_MAX ) {} ~SwShadowCursor(); - void SetPos( const Point& rPt, long nHeight, USHORT nMode ); + void SetPos( const Point& rPt, long nHeight, sal_uInt16 nMode ); void Paint(); const Point& GetPoint() const { return aOldPt; } long GetHeight() const { return nOldHeight; } - USHORT GetMode() const { return nOldMode; } + sal_uInt16 GetMode() const { return nOldMode; } Rectangle GetRect() const; }; diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index a49e131cd666..5d9dd5aa2178 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -34,7 +34,7 @@ #include <vcl/field.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/button.hxx> @@ -42,13 +42,13 @@ class SwWrtShell; class SwSplitTableDlg : public SvxStandardDialog { + FixedLine aCountFL; FixedText aCountLbl; NumericField aCountEdit; - FixedLine aCountFL; + FixedLine aDirFL; ImageRadioButton aHorzBox; ImageRadioButton aVertBox; CheckBox aPropCB; - FixedLine aDirFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; @@ -61,8 +61,8 @@ public: SwSplitTableDlg(Window *pParent, SwWrtShell& rShell ); DECL_LINK( ClickHdl, Button * ); - BOOL IsHorizontal() const { return aHorzBox.IsChecked(); } - BOOL IsProportional() const { return aPropCB.IsChecked() && aHorzBox.IsChecked(); } + sal_Bool IsHorizontal() const { return aHorzBox.IsChecked(); } + sal_Bool IsProportional() const { return aPropCB.IsChecked() && aHorzBox.IsChecked(); } long GetCount() const { return sal::static_int_cast< long >(aCountEdit.GetValue()); } }; diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index f570d05fd0f3..7ce7c65e898e 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -46,7 +46,7 @@ class SwSplitTblDlg : public SvxStandardDialog RadioButton aBorderCopyRB; SwWrtShell &rShell; - USHORT m_nSplit; + sal_uInt16 m_nSplit; protected: virtual void Apply(); @@ -54,7 +54,7 @@ protected: public: SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ); - USHORT GetSplitMode() const { return m_nSplit; } + sal_uInt16 GetSplitMode() const { return m_nSplit; } }; #endif diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 485cd94f1d84..9e9a74f900af 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -85,16 +85,16 @@ private: utl::SourceViewConfig* pSourceViewConfig; long nCurTextWidth; - USHORT nStartLine; + sal_uInt16 nStartLine; rtl_TextEncoding eSourceEncoding; - BOOL bReadonly; - BOOL bDoSyntaxHighlight; - BOOL bHighlighting; + sal_Bool bReadonly; + sal_Bool bDoSyntaxHighlight; + sal_Bool bHighlighting; Timer aSyntaxIdleTimer; Table aSyntaxLineTable; - void ImpDoHighlight( const String& rSource, USHORT nLineOff ); + void ImpDoHighlight( const String& rSource, sal_uInt16 nLineOff ); using OutputDevice::SetFont; void SetFont(); @@ -113,7 +113,7 @@ protected: // virtual void LoseFocus(); void CreateTextEngine(); - void DoSyntaxHighlight( USHORT nPara ); + void DoSyntaxHighlight( sal_uInt16 nPara ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); @@ -126,9 +126,9 @@ public: void SetScrollBarRanges(); void InitScrollBars(); - ULONG Read( SvStream& rInput) + sal_uLong Read( SvStream& rInput) {return pTextEngine->Read(rInput);} - ULONG Write( SvStream& rOutput) + sal_uLong Write( SvStream& rOutput) {return pTextEngine->Write(rOutput);} ExtTextView* GetTextView() @@ -139,20 +139,20 @@ public: TextViewOutWin* GetOutWin() {return pOutWin;} - virtual void Invalidate( USHORT nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0 ); void ClearModifyFlag() - { pTextEngine->SetModified(FALSE); } - BOOL IsModified() const + { pTextEngine->SetModified(sal_False); } + sal_Bool IsModified() const { return pTextEngine->IsModified();} void CreateScrollbars(); - void SetReadonly(BOOL bSet){bReadonly = bSet;} - BOOL IsReadonly(){return bReadonly;} + void SetReadonly(sal_Bool bSet){bReadonly = bSet;} + sal_Bool IsReadonly(){return bReadonly;} - void DoDelayedSyntaxHighlight( USHORT nPara ); + void DoDelayedSyntaxHighlight( sal_uInt16 nPara ); - void SetStartLine(USHORT nLine){nStartLine = nLine;} + void SetStartLine(sal_uInt16 nLine){nStartLine = nLine;} virtual void Command( const CommandEvent& rCEvt ); void HandleWheelCommand( const CommandEvent& rCEvt ); diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 1e99efb2f895..42fd797c9e74 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -45,7 +45,7 @@ class SwSrcView: public SfxViewShell SvxSearchItem* pSearchItem; - BOOL bSourceSaved :1; + sal_Bool bSourceSaved :1; rtl_TextEncoding eLoadEncoding; void Init(); @@ -54,10 +54,10 @@ class SwSrcView: public SfxViewShell protected: - USHORT StartSearchAndReplace(const SvxSearchItem& rItem, - BOOL bFromStart, - BOOL bApi, - BOOL bRecursive = FALSE); + sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, + sal_Bool bFromStart, + sal_Bool bApi, + sal_Bool bRecursive = sal_False); public: @@ -76,7 +76,7 @@ public: void SaveContent(const String& rTmpFile); void SaveContentTo(SfxMedium& rMed); - BOOL IsModified() {return aEditWin.IsModified();} + sal_Bool IsModified() {return aEditWin.IsModified();} @@ -88,13 +88,13 @@ public: void Load(SwDocShell* pDocShell); - virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); + virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); - void SourceSaved() {bSourceSaved = TRUE;} - BOOL HasSourceSaved() const {return bSourceSaved;} + void SourceSaved() {bSourceSaved = sal_True;} + sal_Bool HasSourceSaved() const {return bSourceSaved;} }; diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 8b689fad973a..3f17aff5d01a 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -44,7 +44,7 @@ class SwSortDlg : public SvxStandardDialog FixedText aTypLbl; FixedText aDirLbl; - FixedLine aDirFL; + FixedLine aSortFL; CheckBox aKeyCB1; NumericField aColEdt1; @@ -64,7 +64,7 @@ class SwSortDlg : public SvxStandardDialog RadioButton aSortUp3RB; RadioButton aSortDn3RB; - FixedLine aSortFL; + FixedLine aDirFL; RadioButton aColumnRB; RadioButton aRowRB; @@ -91,8 +91,8 @@ class SwSortDlg : public SvxStandardDialog SwWrtShell &rSh; CollatorRessource* pColRes; - USHORT nX; - USHORT nY; + sal_uInt16 nX; + sal_uInt16 nY; virtual void Apply(); sal_Unicode GetDelimChar() const; diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index be57eddd40ff..0472ed3bc470 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -70,13 +70,13 @@ class SwContentType; //mini rtti class SwTypeNumber { - BYTE nTypeId; + sal_uInt8 nTypeId; public: - SwTypeNumber(BYTE nId) :nTypeId(nId){} + SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){} virtual ~SwTypeNumber(); - virtual BYTE GetTypeId(); + virtual sal_uInt8 GetTypeId(); }; //---------------------------------------------------------------------------- @@ -85,17 +85,17 @@ class SwContent : public SwTypeNumber const SwContentType* pParent; String sContentName; long nYPosition; - BOOL bInvisible; + sal_Bool bInvisible; public: SwContent(const SwContentType* pCnt, const String& rName, long nYPos ); - virtual BOOL IsProtect() const; + virtual sal_Bool IsProtect() const; const SwContentType* GetParent() const {return pParent;} const String& GetName() const {return sContentName;} int operator==(const SwContent& /*rCont*/) const { //gleich sind sie nie, sonst fallen sie aus dem Array - return FALSE; + return sal_False; } int operator<(const SwContent& rCont) const { @@ -107,8 +107,8 @@ public: long GetYPos() const {return nYPosition;} - BOOL IsInvisible() const {return bInvisible;} - void SetInvisible(){ bInvisible = TRUE;} + sal_Bool IsInvisible() const {return bInvisible;} + void SetInvisible(){ bInvisible = sal_True;} }; #endif diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 9a3274a61f1c..de826236705c 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -66,7 +66,7 @@ namespace nsTransferBufferType class SwTransferable : public TransferableHelper { friend class SwView_Impl; - SfxObjectShellRef aDocShellRef; + SfxObjectShellLock aDocShellRef; TransferableDataHelper aOleData; TransferableObjectDescriptor aObjDesc; ::sfx2::SvBaseLinkRef refDdeLink; @@ -83,8 +83,8 @@ class SwTransferable : public TransferableHelper TransferBufferType eBufferType; - BOOL bOldIdle :1; //D&D Idle flag from the viewsettings - BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) + sal_Bool bOldIdle :1; //D&D Idle flag from the viewsettings + sal_Bool bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) // helper methods for the copy com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const; @@ -93,50 +93,50 @@ class SwTransferable : public TransferableHelper // helper methods for the paste static SwTransferable* GetSwTransferable( const TransferableDataHelper& rData ); - static void SetSelInShell( SwWrtShell& , BOOL , const Point* ); - static BOOL _CheckForURLOrLNKFile( TransferableDataHelper& rData, + static void SetSelInShell( SwWrtShell& , sal_Bool , const Point* ); + static sal_Bool _CheckForURLOrLNKFile( TransferableDataHelper& rData, String& rFileName, String* pTitle = 0 ); static int _TestAllowedFormat( const TransferableDataHelper& rData, - ULONG nFormat, USHORT nDestination ); + sal_uLong nFormat, sal_uInt16 nDestination ); static int _PasteFileContent( TransferableDataHelper&, - SwWrtShell& rSh, ULONG nFmt, BOOL bMsg ); + SwWrtShell& rSh, sal_uLong nFmt, sal_Bool bMsg ); static int _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, - ULONG nFmt, BYTE nActionFlags, BOOL bMsg ); + sal_uLong nFmt, sal_uInt8 nActionFlags, sal_Bool bMsg ); static int _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh, - USHORT nAction, const Point* pPt, BOOL bInsertGRF ); + sal_uInt16 nAction, const Point* pPt, sal_Bool bInsertGRF ); static int _PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell, - BOOL bReReadGrf, BOOL bMsg ); + sal_Bool bReReadGrf, sal_Bool bMsg ); static int _PasteSdrFormat( TransferableDataHelper& rData, - SwWrtShell& rSh, USHORT nAction, - const Point* pPt, BYTE nActionFlags ); + SwWrtShell& rSh, sal_uInt16 nAction, + const Point* pPt, sal_uInt8 nActionFlags ); static int _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, - ULONG nFmt, USHORT nAction, const Point* pPt, - BYTE nActionFlags, BOOL bMsg ); + sal_uLong nFmt, sal_uInt16 nAction, const Point* pPt, + sal_uInt8 nActionFlags, sal_Bool bMsg ); static int _PasteImageMap( TransferableDataHelper& rData, SwWrtShell& rSh ); static int _PasteAsHyperlink( TransferableDataHelper& rData, - SwWrtShell& rSh, ULONG nFmt ); + SwWrtShell& rSh, sal_uLong nFmt ); static int _PasteFileName( TransferableDataHelper& rData, - SwWrtShell& rSh, ULONG nFmt, USHORT nAction, - const Point* pPt, BYTE nActionFlags, BOOL bMsg ); + SwWrtShell& rSh, sal_uLong nFmt, sal_uInt16 nAction, + const Point* pPt, sal_uInt8 nActionFlags, sal_Bool bMsg ); static int _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh, - ULONG nFmt, BOOL bLink, const Point* pDragPt, - BOOL bMsg ); + sal_uLong nFmt, sal_Bool bLink, const Point* pDragPt, + sal_Bool bMsg ); static int _PasteFileList( TransferableDataHelper& rData, - SwWrtShell& rSh, BOOL bLink, - const Point* pPt, BOOL bMsg ); + SwWrtShell& rSh, sal_Bool bLink, + const Point* pPt, sal_Bool bMsg ); - int PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, BOOL bMove, - BOOL bIsXSelection ); + int PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, sal_Bool bMove, + sal_Bool bIsXSelection ); int PrivatePaste( SwWrtShell& rShell ); void SetDataForDragAndDrop( const Point& rSttPos ); @@ -162,7 +162,7 @@ public: SwTransferable( SwWrtShell& ); virtual ~SwTransferable(); - static USHORT GetSotDestination( const SwWrtShell& rSh, const Point* = 0 ); + static sal_uInt16 GetSotDestination( const SwWrtShell& rSh, const Point* = 0 ); // set properties on the document, like PageMargin, VisArea. // And set real Size @@ -170,8 +170,8 @@ public: // copy - methods and helper methods for the copy int Cut(); - int Copy( BOOL bIsCut = FALSE ); - int PrepareForCopy( BOOL bIsCut = FALSE ); + int Copy( sal_Bool bIsCut = sal_False ); + int PrepareForCopy( sal_Bool bIsCut = sal_False ); int CalculateAndCopy(); // special for Calculator int CopyGlossary( SwTextBlocks& rGlossary, const String& rStr ); @@ -179,21 +179,21 @@ public: void RemoveDDELinkFormat( const Window& rWin ); // paste - methods and helper methods for the paste - static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& ); + static sal_Bool IsPaste( const SwWrtShell&, const TransferableDataHelper& ); static int Paste( SwWrtShell&, TransferableDataHelper& ); static int PasteData( TransferableDataHelper& rData, - SwWrtShell& rSh, USHORT nAction, ULONG nFormat, - USHORT nDestination, BOOL bIsPasteFmt, + SwWrtShell& rSh, sal_uInt16 nAction, sal_uLong nFormat, + sal_uInt16 nDestination, sal_Bool bIsPasteFmt, sal_Bool bIsDefault, const Point* pDDPos = 0, sal_Int8 nDropAction = 0, - BOOL bPasteSelection = FALSE ); + sal_Bool bPasteSelection = sal_False ); - static BOOL IsPasteSpecial( const SwWrtShell& rWrtShell, + static sal_Bool IsPasteSpecial( const SwWrtShell& rWrtShell, const TransferableDataHelper& ); static int PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& ); - static int PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, ULONG& rFormatUsed ); + static int PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, sal_uLong& rFormatUsed ); static int PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData, - ULONG nFormat ); + sal_uLong nFormat ); static void FillClipFmtItem( const SwWrtShell& rSh, const TransferableDataHelper& rData, @@ -203,7 +203,7 @@ public: void StartDrag( Window* pWin, const Point& rPos ); SwWrtShell* GetShell() { return pWrtShell; } - void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } + void SetCleanUp( sal_Bool bFlag ) { bCleanUp = bFlag; } // Interfaces for Selection /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */ diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 6f8122277bd5..7b8a958006b5 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -47,14 +47,14 @@ class SW_DLLPUBLIC SwBoxEntry { friend class SwComboBox; - BOOL bModified : 1; - BOOL bNew : 1; + sal_Bool bModified : 1; + sal_Bool bNew : 1; String aName; - USHORT nId; + sal_uInt16 nId; public: - SwBoxEntry(const String& aName, USHORT nId=0); + SwBoxEntry(const String& aName, sal_uInt16 nId=0); SwBoxEntry(const SwBoxEntry& rOrg); SwBoxEntry(); @@ -64,7 +64,7 @@ public: /*-------------------------------------------------------------------- Beschreibung: fuer ComboBoxen --------------------------------------------------------------------*/ -typedef USHORT SwComboBoxStyle; +typedef sal_uInt16 SwComboBoxStyle; namespace nsSwComboBoxStyle { @@ -72,11 +72,7 @@ namespace nsSwComboBoxStyle const SwComboBoxStyle CBS_LOWER = 0x02; const SwComboBoxStyle CBS_ALL = 0x04; const SwComboBoxStyle CBS_FILENAME = 0x08; -#ifdef WIN - const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; -#else const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; -#endif } class SW_DLLPUBLIC SwComboBox : public ComboBox @@ -84,7 +80,7 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox SwEntryLst aEntryLst; SwEntryLst aDelEntryLst; SwBoxEntry aDefault; - USHORT nStyle; + sal_uInt16 nStyle; SW_DLLPRIVATE void InitComboBox(); SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); @@ -98,25 +94,25 @@ public: using ComboBox::GetEntryPos; SwComboBox(Window* pParent, const ResId& rId, - USHORT nStyleBits = nsSwComboBoxStyle::CBS_ALL); + sal_uInt16 nStyleBits = nsSwComboBoxStyle::CBS_ALL); ~SwComboBox(); virtual void KeyInput( const KeyEvent& rKEvt ); void InsertEntry(const SwBoxEntry&); - USHORT InsertEntry( const XubString& rStr, USHORT = 0) + sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 = 0) { InsertEntry( SwBoxEntry( rStr ) ); return 0; } - void RemoveEntry(USHORT nPos); + void RemoveEntry(sal_uInt16 nPos); - USHORT GetEntryPos(const SwBoxEntry& rEntry) const; - const SwBoxEntry& GetEntry(USHORT) const; + sal_uInt16 GetEntryPos(const SwBoxEntry& rEntry) const; + const SwBoxEntry& GetEntry(sal_uInt16) const; - USHORT GetRemovedCount() const; - const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; + sal_uInt16 GetRemovedCount() const; + const SwBoxEntry& GetRemovedEntry(sal_uInt16 nPos) const; - USHORT GetStyle() const { return nStyle; } - void SetStyle(const USHORT nSt) { nStyle = nSt; } + sal_uInt16 GetStyle() const { return nStyle; } + void SetStyle(const sal_uInt16 nSt) { nStyle = nSt; } String GetText() const; }; diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc deleted file mode 100644 index 10ef7962f6cb..000000000000 --- a/sw/source/ui/inc/swmn_tmpl.hrc +++ /dev/null @@ -1,386 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SWMN_HRC -#define _SWMN_HRC - -#include <svx/dialogs.hrc> -#include <svx/globlmn.hrc> -#include "cmdid.h" -#include "app.hrc" -#include "globals.hrc" -#include "helpid.h" -#include "popup.hrc" - -/* --------------------- F O R M A T --------------------------------- */ - -#define SEPARATOR MenuItem { Separator = TRUE; } - -//define for ITEM_FORMAT_NUMBERING -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS -#define MN_NUMBERING ITEM_FORMAT_NUMBERING - -#define MN_TXT\ - MenuItem\ - {\ - ITEM_FORMAT_CHAR_DLG\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_PARA_DLG\ - };\ - MenuItem\ - {\ - Identifier = FN_FORMAT_PAGE_DLG ; \ - HelpID = FN_FORMAT_PAGE_DLG ; \ - Text [ en-US ] = "Pa~ge..." ; \ - };\ - MenuItem\ - {\ - Identifier = FN_FORMAT_TITLEPAGE_DLG ; \ - HelpID = FN_FORMAT_TITLEPAGE_DLG ; \ - Text [ en-US ] = "~Title Page..." ; \ - }; - -#define MN_TEXT_ATTR\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_FONT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_STYLE ; \ - HelpID = MN_FORMAT_STYLE ; \ - Command = ".uno:StyleMenu" ; \ - Text [ en-US ] = "St~yle" ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_WEIGHT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_POSTURE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_OVERLINE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_UNDERLINE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_SHADOWED\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_CONTOUR\ - };\ - SEPARATOR ; \ - MenuItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT ; \ - HelpID = FN_SET_SUPER_SCRIPT ; \ - Text [ en-US ] = "Superscript" ; \ - };\ - MenuItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT ; \ - HelpID = FN_SET_SUB_SCRIPT ; \ - Text [ en-US ] = "Subscript" ; \ - };\ - };\ - };\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_ALGN ; \ - HelpID = MN_FORMAT_ALGN ; \ - Command = ".uno:AlignTextMenu" ; \ - Text [ en-US ] = "A~lignment" ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\ - };\ - MenuItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ - RadioCheck = TRUE ; \ - Text [ en-US ] = "Justified" ; \ - };\ - };\ - };\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_LINESPACE ; \ - HelpID = MN_FORMAT_LINESPACE ; \ - Command = ".uno:LineSpacingMenu" ; \ - Text [ en-US ] = "Line Spacing" ; \ - _MenuItemFlags = MIB_RADIOCHECK ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_10\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_15\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_20\ - };\ - };\ - };\ - }; - -/* --------------------- M E N U --------------------------------- */ - -/* - - -The application menu bar resource has become obsolete. You can now find the menu bar at the following -location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml - - -*/ - -/* --------------------- D O C U M E N T -------------------------- */ - - -#define _MN_EDIT_FIELD \ - MenuItem \ - { \ - Identifier = FN_EDIT_FIELD ; \ - HelpID = FN_EDIT_FIELD ; \ - Text [ en-US ] = "Fields..." ; \ - }; -#define _MN_EDIT_FOOTNOTE \ - MenuItem \ - { \ - Identifier = FN_EDIT_FOOTNOTE ; \ - HelpID = FN_EDIT_FOOTNOTE ; \ - Text [ en-US ] = "Footnote/Endnote~..." ; \ - }; - #define _MN_EDIT_IDX_ENTRY_DLG \ - MenuItem \ - { \ - Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ - HelpID = FN_EDIT_IDX_ENTRY_DLG ; \ - Text [ en-US ] = "Inde~x Entry..." ; \ - }; - -#define _MN_EDIT_REDLINE \ - MenuItem \ - { \ - Identifier = FN_REDLINE_ACCEPT_DIRECT; \ - HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ - Text [ en-US ] = "Accept Change" ; \ - };\ - MenuItem \ - { \ - Identifier = FN_REDLINE_REJECT_DIRECT ; \ - HelpID = FN_REDLINE_REJECT_DIRECT ; \ - Text [ en-US ] = "Reject Change" ; \ - }; \ - SEPARATOR ; -#define _MN_EDIT_BIB_ENTRY_DLG \ - MenuItem \ - { \ - Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ - HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ - Text [ en-US ] = "~Bibliography Entry..."; \ - }; \ - SEPARATOR ; - -#define _MN_EDIT_OPEN_HYPERLINK \ - MenuItem \ - { \ - ITEM_OPEN_HYPERLINK \ - };\ - MenuItem \ - { \ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "Edit Hyperlink..."; \ - }; \ - MenuItem \ - { \ - Identifier = FN_COPY_HYPERLINK_LOCATION; \ - HelpID = FN_COPY_HYPERLINK_LOCATION; \ - Text [ en-US ] = "Copy Hyperlink ~Location"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REMOVE_HYPERLINK ; \ - HelpID = FN_REMOVE_HYPERLINK ; \ - Text [ en-US ] = "Remo~ve Hyperlink"; \ - }; - -#define _MN_EDIT_OPEN_SMARTTAGMENU \ - MenuItem \ - { \ - ITEM_OPEN_SMARTTAGMENU \ - }; - -#define _MN_EDIT__HYPERLINK \ - MenuItem\ - {\ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "~Edit Hyperlink" ; \ - }; - -#define _DEFAULT_TEXT_EDIT_ELEMENTS \ - _MN_EDIT_FIELD \ - _MN_EDIT_FOOTNOTE \ - _MN_EDIT_IDX_ENTRY_DLG \ - _MN_EDIT_BIB_ENTRY_DLG \ - _MN_EDIT_REDLINE \ - MenuItem \ - { \ - ITEM_POPUP_TEMPLATE_EDIT \ - }; \ - SEPARATOR ; \ - _MN_EDIT_OPEN_HYPERLINK \ - _MN_EDIT_OPEN_SMARTTAGMENU - - -#define MN_RESET\ - MenuItem\ - {\ - Identifier = FN_FORMAT_RESET ; \ - HelpID = FN_FORMAT_RESET ; \ - Text [ en-US ] = "~Clear Direct Formatting" ; \ - }; - -#define _NUMBERING_RELATED_MENU \ - SEPARATOR ; \ - MenuItem \ - { \ - Identifier = FN_NUMBER_NEWSTART; \ - HelpId = FN_NUMBER_NEWSTART; \ - Text[ en-US ] = "Restart Numbering"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_CONTINUE; \ - HelpId = FN_NUM_CONTINUE; \ - Text[ en-US ] = "Continue previous numbering"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_BULLET_UP; \ - HelpId = FN_NUM_BULLET_UP; \ - Text[ en-US ] = "Up One Level"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_BULLET_DOWN; \ - HelpId = FN_NUM_BULLET_DOWN; \ - Text[ en-US ] = "Down One Level"; \ - }; - -#define BASE_TEXT_POPUPMENU_BEGIN \ -{ \ - ItemList = \ - { \ - MN_RESET \ - _NUMBERING_RELATED_MENU \ - SEPARATOR ; \ - MN_TEXT_ATTR \ - SEPARATOR ; \ - MN_TXT \ - MN_NUMBERING \ - ITEM_TRANSLITERATE_MENU \ - SEPARATOR ; - -// not in Writer/Web -#define BASE_TEXT_POPUPMENU_NOWEB \ - MenuItem \ - { \ - Identifier = FN_UPDATE_CUR_TOX ; \ - HelpID = FN_UPDATE_CUR_TOX ; \ - Text [ en-US ] = "~Update Index/Table"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_EDIT_CURRENT_TOX; \ - HelpID = FN_EDIT_CURRENT_TOX; \ - Text [ en-US ] = "~Edit Index/Table"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REMOVE_CUR_TOX; \ - HelpID = FN_REMOVE_CUR_TOX; \ - Text [ en-US ] = "Delete Index/Table"; \ - }; \ - SEPARATOR ; - -#define BASE_TEXT_POPUPMENU_END \ - _DEFAULT_TEXT_EDIT_ELEMENTS \ - }; \ -}; - -#endif - diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx index 7b4a9b4afd74..2e983566c6f2 100644 --- a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx @@ -42,7 +42,7 @@ public: SwModalRedlineAcceptDlg(Window *pParent); ~SwModalRedlineAcceptDlg(); - void AcceptAll( BOOL bAccept ); + void AcceptAll( sal_Bool bAccept ); virtual void Activate(); }; diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index 1d51a0ef5e5d..de02fa8b06fc 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -44,9 +44,9 @@ class SwRenameXNamedDlg : public ModalDialog { + FixedLine aNameFL; FixedText aNewNameFT; NoSpaceEdit aNewNameED; - FixedLine aNameFL; OKButton aOk; CancelButton aCancel; HelpButton aHelp; diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index 5867deb610eb..d0b341456cb0 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.hxx @@ -43,20 +43,20 @@ class SW_DLLPUBLIC SwTableRep SwTwips nSpace; SwTwips nLeftSpace; SwTwips nRightSpace; - USHORT nAlign; - USHORT nColCount; - USHORT nAllCols; - USHORT nWidthPercent; - BOOL bComplex : 1; - BOOL bLineSelected : 1; - BOOL bWidthChanged : 1; - BOOL bColsChanged : 1; + sal_uInt16 nAlign; + sal_uInt16 nColCount; + sal_uInt16 nAllCols; + sal_uInt16 nWidthPercent; + sal_Bool bComplex : 1; + sal_Bool bLineSelected : 1; + sal_Bool bWidthChanged : 1; + sal_Bool bColsChanged : 1; public: - SwTableRep( const SwTabCols& rTabCol, BOOL bComplex ); + SwTableRep( const SwTabCols& rTabCol, sal_Bool bComplex ); ~SwTableRep(); - BOOL FillTabCols( SwTabCols& rTabCol ) const; + sal_Bool FillTabCols( SwTabCols& rTabCol ) const; SwTwips GetLeftSpace() const {return nLeftSpace;} void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;} @@ -67,24 +67,24 @@ public: SwTwips GetWidth() const {return nTblWidth;} void SetWidth(SwTwips nSet) {nTblWidth = nSet;} - USHORT GetWidthPercent() const {return nWidthPercent;} - void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;} + sal_uInt16 GetWidthPercent() const {return nWidthPercent;} + void SetWidthPercent(sal_uInt16 nSet) {nWidthPercent = nSet;} - USHORT GetAlign() const {return nAlign;} - void SetAlign(USHORT nSet) {nAlign = nSet;} + sal_uInt16 GetAlign() const {return nAlign;} + void SetAlign(sal_uInt16 nSet) {nAlign = nSet;} - BOOL IsComplex() const {return bComplex;} - USHORT GetColCount() const {return nColCount;} - USHORT GetAllColCount() const {return nAllCols;} + sal_Bool IsComplex() const {return bComplex;} + sal_uInt16 GetColCount() const {return nColCount;} + sal_uInt16 GetAllColCount() const {return nAllCols;} - BOOL HasColsChanged() const {return bColsChanged;} - void SetColsChanged() {bColsChanged = TRUE;} + sal_Bool HasColsChanged() const {return bColsChanged;} + void SetColsChanged() {bColsChanged = sal_True;} - BOOL HasWidthChanged() const {return bWidthChanged;} - void SetWidthChanged() {bWidthChanged = TRUE;} + sal_Bool HasWidthChanged() const {return bWidthChanged;} + void SetWidthChanged() {bWidthChanged = sal_True;} - BOOL IsLineSelected() const {return bLineSelected;} - void SetLineSelected(BOOL bSet) {bLineSelected = bSet;} + sal_Bool IsLineSelected() const {return bLineSelected;} + void SetLineSelected(sal_Bool bSet) {bLineSelected = bSet;} SwTwips GetSpace() const { return nSpace;} void SetSpace(SwTwips nSet) {nSpace = nSet;} diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 20f951af4ed8..b665a068828e 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -58,7 +58,7 @@ class SwCondCollPage : public SfxTabPage CollName* pNms; - BOOL bNewTemplate; + sal_Bool bNewTemplate; SwCondCollPage(Window *pParent, const SfxItemSet &rSet); @@ -76,12 +76,12 @@ class SwCondCollPage : public SfxTabPage public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet &rSet); + virtual sal_Bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); - void SetCollection( SwFmt* pFormat, BOOL bNew ); + void SetCollection( SwFmt* pFormat, sal_Bool bNew ); }; diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index f0c678fe2afc..63298235243f 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -86,12 +86,12 @@ class SwMultiTOXTabDialog : public SfxTabDialog CurTOXType eCurrentTOXType; String sUserDefinedIndex; - USHORT nTypeCount; - USHORT nInitialTOXType; + sal_uInt16 nTypeCount; + sal_uInt16 nInitialTOXType; - BOOL bEditTOX; - BOOL bExampleCreated; - BOOL bGlobalFlag; + sal_Bool bEditTOX; + sal_Bool bExampleCreated; + sal_Bool bGlobalFlag; virtual short Ok(); SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); @@ -102,11 +102,11 @@ class SwMultiTOXTabDialog : public SfxTabDialog public: SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, - SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX, - BOOL bGlobal = FALSE); + SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, + sal_Bool bGlobal = sal_False); ~SwMultiTOXTabDialog(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); SwForm* GetForm(CurTOXType eType); @@ -117,15 +117,15 @@ public: } void UpdateExample(); - BOOL IsTOXEditMode() const { return bEditTOX;} + sal_Bool IsTOXEditMode() const { return bEditTOX;} SwWrtShell& GetWrtShell() {return rSh;} SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); void CreateOrUpdateExample( - TOXTypes nTOXIndex, USHORT nPage = 0, USHORT nCurLevel = USHRT_MAX); + TOXTypes nTOXIndex, sal_uInt16 nPage = 0, sal_uInt16 nCurLevel = USHRT_MAX); - static BOOL IsNoNum(SwWrtShell& rSh, const String& rName); + static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName); }; class IndexEntryRessource; @@ -151,6 +151,8 @@ class SwTOXSelectTabPage : public SfxTabPage CheckBox aFromHeadingsCB; CheckBox aAddStylesCB; PushButton aAddStylesPB; + Point aAddStylesPosDef; + Point aAddStylesPosUser; //user CheckBox aFromTablesCB; CheckBox aFromFramesCB; @@ -174,6 +176,7 @@ class SwTOXSelectTabPage : public SfxTabPage // //index only + FixedLine aIdxOptionsFL; CheckBox aCollectSameCB; CheckBox aUseFFCB; CheckBox aUseDashCB; @@ -182,7 +185,6 @@ class SwTOXSelectTabPage : public SfxTabPage CheckBox aKeyAsEntryCB; CheckBox aFromFileCB; MenuButton aAutoMarkPB; - FixedLine aIdxOptionsFL; // index only // object only SwOLENames aFromNames; @@ -215,7 +217,7 @@ class SwTOXSelectTabPage : public SfxTabPage const IndexEntrySupplierWrapper* pIndexEntryWrapper; - BOOL bFirstCall; + sal_Bool bFirstCall; DECL_LINK(TOXTypeHdl, ListBox* ); DECL_LINK(TOXAreaHdl, ListBox* ); @@ -238,7 +240,7 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXSelectTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& ); @@ -268,8 +270,8 @@ class SwTokenWindow : public Window ImageButton aRightScrollWin; TOXControlList aControlList; SwForm* pForm; - USHORT nLevel; - BOOL bValid; + sal_uInt16 nLevel; + sal_Bool bValid; String aButtonTexts[TOKEN_END]; // Text of the buttons String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons String sCharStyle; @@ -297,12 +299,12 @@ public: SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId); ~SwTokenWindow(); - void SetForm(SwForm& rForm, USHORT nLevel); - USHORT GetLastLevel()const {return nLevel;}; + void SetForm(SwForm& rForm, sal_uInt16 nLevel); + sal_uInt16 GetLastLevel()const {return nLevel;}; - BOOL IsValid() const {return bValid;} + sal_Bool IsValid() const {return bValid;} - void SetInvalid() {bValid = FALSE;} + void SetInvalid() {bValid = sal_False;} String GetPattern() const; @@ -315,14 +317,14 @@ public: { return pActiveCtrl;} void InsertAtSelection(const String& rText, const SwFormToken& aToken); - void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE); + void RemoveControl(SwTOXButton* pDel, sal_Bool bInternalCall = sal_False); - BOOL Contains(FormTokenType) const; + sal_Bool Contains(FormTokenType) const; - BOOL DetermineLinkStart(); + sal_Bool DetermineLinkStart(); //helper for pattern buttons and edits - BOOL CreateQuickHelp(Control* pCtrl, + sal_Bool CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); virtual void Resize(); @@ -345,6 +347,7 @@ class SwTOXEntryTabPage : public SfxTabPage FixedText aLevelFT; SwIdxTreeListBox aLevelLB; + FixedLine aEntryFL; FixedText aTokenFT; SwTokenWindow aTokenWIN; PushButton aAllLevelsPB; @@ -377,14 +380,13 @@ class SwTOXEntryTabPage : public SfxTabPage FixedText aTabPosFT; MetricField aTabPosMF; // tab stop position CheckBox aAutoRightCB; - FixedLine aEntryFL; + FixedLine aFormatFL; CheckBox aRelToStyleCB; // position relative to the right margin of the para style FixedText aMainEntryStyleFT; ListBox aMainEntryStyleLB; // character style of main entries in indexes CheckBox aAlphaDelimCB; CheckBox aCommaSeparatedCB; - FixedLine aFormatFL; RadioButton aSortDocPosRB; RadioButton aSortContentRB; @@ -421,7 +423,7 @@ class SwTOXEntryTabPage : public SfxTabPage Size aLevelFLSize; CurTOXType aLastTOXType; - BOOL bInLevelHdl; + sal_Bool bInLevelHdl; Point aChapterEntryFTPosition; //!< holds position of ChapterEntryFT control, //to be used in moving the element among different tokens @@ -456,7 +458,7 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXEntryTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -465,21 +467,21 @@ public: const SfxItemSet& rAttrSet); void SetWrtShell(SwWrtShell& rSh); - String GetLevelHelp(USHORT nLevel) const; + String GetLevelHelp(sal_uInt16 nLevel) const; void PreTokenButtonRemoved(const SwFormToken& rToken); }; class SwTOXStylesTabPage : public SfxTabPage { + FixedLine aFormatFL; FixedText aLevelFT2; ListBox aLevelLB; + ImageButton aAssignBT; FixedText aTemplateFT; ListBox aParaLayLB; PushButton aStdBT; - ImageButton aAssignBT; PushButton aEditStyleBT; - FixedLine aFormatFL; SwForm* m_pCurrentForm; @@ -503,7 +505,7 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXStylesTabPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& ); diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 2fb8470d6087..098010ad7134 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -42,7 +42,7 @@ #include <vcl/button.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <sfx2/childwin.hxx> #include "toxe.hxx" #include <svtools/stdctrl.hxx> @@ -61,6 +61,7 @@ class SwIndexMarkDlg : public Window { friend class SwIndexMarkFloatDlg; friend class SwIndexMarkModalDlg; + FixedLine aIndexFL; FixedText aTypeFT; ListBox aTypeDCB; ImageButton aNewBT; @@ -87,7 +88,6 @@ class SwIndexMarkDlg : public Window CheckBox aSearchCaseSensitiveCB; CheckBox aSearchCaseWordOnlyCB; - FixedLine aIndexFL; OKButton aOKBT; CancelButton aCancelBT; @@ -106,11 +106,11 @@ class SwIndexMarkDlg : public Window sal_Bool bNewMark; sal_Bool bSelected; - BOOL bPhoneticED0_ChangedByUser; - BOOL bPhoneticED1_ChangedByUser; - BOOL bPhoneticED2_ChangedByUser; + sal_Bool bPhoneticED0_ChangedByUser; + sal_Bool bPhoneticED1_ChangedByUser; + sal_Bool bPhoneticED2_ChangedByUser; LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal - BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry + sal_Bool bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier > xExtendedIndexEntrySupplier; diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx index 753e3c93cae2..62ea87544fd5 100644 --- a/sw/source/ui/inc/swuipardlg.hxx +++ b/sw/source/ui/inc/swuipardlg.hxx @@ -32,20 +32,20 @@ class SwParaDlg: public SfxTabDialog { SwView& rView; - USHORT nHtmlMode; - BYTE nDlgMode; - BOOL bDrawParaDlg; + sal_uInt16 nHtmlMode; + sal_uInt8 nDlgMode; + sal_Bool bDrawParaDlg; - void PageCreated(USHORT nID, SfxTabPage& rPage); + void PageCreated(sal_uInt16 nID, SfxTabPage& rPage); public: SwParaDlg( Window *pParent, SwView& rVw, const SfxItemSet&, - BYTE nDialogMode, + sal_uInt8 nDialogMode, const String *pCollName = 0, - BOOL bDraw = FALSE, - UINT16 nDefPage = 0); + sal_Bool bDraw = sal_False, + sal_uInt16 nDefPage = 0); ~SwParaDlg(); }; diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 27621fd3e9fd..f8e272702e45 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem public: TYPEINFO(); SwWrtShellItem(); - SwWrtShellItem( USHORT nWhich , SwWrtShell* pWrtSh); + SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index 7c05e0776b96..c176dc13cb6d 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -50,7 +50,7 @@ class SwSyncChildWin : public SfxChildWindow { public: SwSyncChildWin( Window* , - USHORT nId, + sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index ed8f3cd8630a..572637109aa6 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -44,9 +44,9 @@ struct TColumn; class SwTableTabDlg : public SfxTabDialog { SwWrtShell* pShell; - USHORT nHtmlMode; + sal_uInt16 nHtmlMode; - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); public: SwTableTabDlg( Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx index 135569ab6561..b8035c681327 100644 --- a/sw/source/ui/inc/tablemgr.hxx +++ b/sw/source/ui/inc/tablemgr.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwTableFUNC { SwFrmFmt *pFmt; SwWrtShell *pSh; - BOOL bCopy; + sal_Bool bCopy; SwTabCols aCols; private: @@ -61,18 +61,18 @@ private: public: inline SwTableFUNC(SwFrmFmt &); - SwTableFUNC(SwWrtShell *pShell, BOOL bCopyFmt = FALSE); + SwTableFUNC(SwWrtShell *pShell, sal_Bool bCopyFmt = sal_False); ~SwTableFUNC(); void InitTabCols(); void ColWidthDlg(Window *pParent ); - SwTwips GetColWidth(USHORT nNum) const; - SwTwips GetMaxColWidth(USHORT nNum) const; - void SetColWidth(USHORT nNum, SwTwips nWidth ); - USHORT GetColCount() const; - USHORT GetCurColNum() const; + SwTwips GetColWidth(sal_uInt16 nNum) const; + SwTwips GetMaxColWidth(sal_uInt16 nNum) const; + void SetColWidth(sal_uInt16 nNum, SwTwips nWidth ); + sal_uInt16 GetColCount() const; + sal_uInt16 GetCurColNum() const; - BOOL IsTableSelected() const { return pFmt != 0; } + sal_Bool IsTableSelected() const { return pFmt != 0; } const SwFrmFmt *GetTableFmt() const { return pFmt; } @@ -89,7 +89,7 @@ public: inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) : pFmt(&rFmt), pSh(0), - bCopy(FALSE) + bCopy(sal_False) { } diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx index 79d913146094..49c8a06558a7 100644 --- a/sw/source/ui/inc/tabsh.hxx +++ b/sw/source/ui/inc/tabsh.hxx @@ -36,8 +36,8 @@ class SwWrtShell; SW_DLLPUBLIC void ItemSetToTableParam( const SfxItemSet& rSet, SwWrtShell &rSh ); -extern const USHORT aUITableAttrRange[]; -SW_DLLPUBLIC const USHORT* SwuiGetUITableAttrRange(); +extern const sal_uInt16 aUITableAttrRange[]; +SW_DLLPUBLIC const sal_uInt16* SwuiGetUITableAttrRange(); class SwTableShell: public SwBaseShell { diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 1b3c0260cb60..5ba02135aa62 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -54,12 +54,12 @@ class SwAutoFormatDlg : public SfxModalDialog { FixedLine aFlFormat; ListBox aLbFormat; + FixedLine aFlFormats; CheckBox aBtnNumFormat; CheckBox aBtnBorder; CheckBox aBtnFont; CheckBox aBtnPattern; CheckBox aBtnAlignment; - FixedLine aFlFormats; OKButton aBtnOk; CancelButton aBtnCancel; HelpButton aBtnHelp; @@ -79,14 +79,14 @@ class SwAutoFormatDlg : public SfxModalDialog //------------------------ SwWrtShell* pShell; SwTableAutoFmtTbl* pTableTbl; - BYTE nIndex; - BYTE nDfltStylePos; - BOOL bCoreDataChanged : 1; - BOOL bSetAutoFmt : 1; + sal_uInt8 nIndex; + sal_uInt8 nDfltStylePos; + sal_Bool bCoreDataChanged : 1; + sal_Bool bSetAutoFmt : 1; void Init( const SwTableAutoFmt* pSelFmt ); - void UpdateChecks( const SwTableAutoFmt&, BOOL bEnableBtn ); + void UpdateChecks( const SwTableAutoFmt&, sal_Bool bEnableBtn ); //------------------------ DECL_LINK( CheckHdl, Button * ); DECL_LINK( OkHdl, Button * ); @@ -97,7 +97,7 @@ class SwAutoFormatDlg : public SfxModalDialog public: SwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, - BOOL bSetAutoFmt = TRUE, + sal_Bool bSetAutoFmt = sal_True, const SwTableAutoFmt* pSelFmt = 0 ); virtual ~SwAutoFormatDlg(); diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index cb0c01371745..4616174ac0f3 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.hxx @@ -42,7 +42,7 @@ class SwTableOptimizeCtrl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SwTableOptimizeCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SwTableOptimizeCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTableOptimizeCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const; diff --git a/sw/source/ui/inc/tbxanchr.hxx b/sw/source/ui/inc/tbxanchr.hxx index c36b31007f4a..c27dbcc88b14 100644 --- a/sw/source/ui/inc/tbxanchr.hxx +++ b/sw/source/ui/inc/tbxanchr.hxx @@ -32,17 +32,17 @@ class SwTbxAnchor : public SfxToolBoxControl { - USHORT nActAnchorId; + sal_uInt16 nActAnchorId; public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual SfxPopupWindow* CreatePopupWindow(); SFX_DECL_TOOLBOX_CONTROL(); - SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SwTbxAnchor( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTbxAnchor(); }; diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index 6f95b73acb6a..d730a4d701b6 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.hxx @@ -51,14 +51,14 @@ public: Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter ); virtual ~TextControlCombo(); - void Arrange( FixedText& _rOrg, BOOL bShow = true ); + void Arrange( FixedText& _rOrg, sal_Bool bShow = true ); // identical to window functionality - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); - void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } + void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ); + void Hide( sal_uInt16 nFlags = 0 ) { Show( sal_False, nFlags ); } - void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE ); - void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); } + void Enable( sal_Bool bEnable = sal_True, sal_Bool bChild = sal_True ); + void Disable( sal_Bool bChild = sal_True ) { Enable( sal_False, bChild ); } }; diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx index 5817013c9ca9..9571e6645580 100644 --- a/sw/source/ui/inc/textsh.hxx +++ b/sw/source/ui/inc/textsh.hxx @@ -42,7 +42,7 @@ class SwTextShell: public SwBaseShell void InsertSymbol( SfxRequest& ); void InsertHyperlink(const SvxHyperlinkItem& rHlnkItem); bool InsertMediaDlg( SfxRequest& ); - void ChangeHeaderOrFooter(const String& rStyleName, BOOL bHeader, BOOL bOn, BOOL bShowWarning); + void ChangeHeaderOrFooter(const String& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning); public: SFX_DECL_INTERFACE(SW_TEXTSHELL) diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/ui/inc/titlepage.hxx index 44230b90f14f..5f102e008201 100644 --- a/sw/source/ui/inc/titlepage.hxx +++ b/sw/source/ui/inc/titlepage.hxx @@ -83,7 +83,7 @@ private: void FillList(); - USHORT GetInsertPosition() const; + sal_uInt16 GetInsertPosition() const; DECL_LINK( OKHdl, Button * ); DECL_LINK( EditHdl, Button * ); diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index ddb24179758e..cc2a9c18d441 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.hxx @@ -39,25 +39,25 @@ class SwWrtShell; class SwTemplateDlg: public SfxStyleDialog { - USHORT nType; - USHORT nHtmlMode; + sal_uInt16 nType; + sal_uInt16 nHtmlMode; SwWrtShell* pWrtShell; - BOOL bNewStyle; + sal_Bool bNewStyle; DECL_LINK( NumOptionsHdl, PushButton* ); public: SwTemplateDlg( Window* pParent, SfxStyleSheetBase& rBase, - USHORT nRegion, - BOOL bColumn = FALSE, + sal_uInt16 nRegion, + sal_Bool bColumn = sal_False, SwWrtShell* pActShell = 0, - BOOL bNew = FALSE ); + sal_Bool bNew = sal_False ); ~SwTemplateDlg(); const SfxItemSet* GetRefreshedSet(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual short Ok(); }; diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx index 25a946a1c98c..f0579d0ec96c 100644 --- a/sw/source/ui/inc/tmplctrl.hxx +++ b/sw/source/ui/inc/tmplctrl.hxx @@ -38,13 +38,13 @@ class SwTemplateControl : public SfxStatusBarControl protected: virtual void Command( const CommandEvent& rCEvt ); public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SwTemplateControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SwTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SwTemplateControl(); private: diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox.hrc index 73ab3059d705..73ab3059d705 100644 --- a/sw/source/ui/inc/toolbox_tmpl.hrc +++ b/sw/source/ui/inc/toolbox.hrc diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index c8c01a0ac777..d80bcf05b577 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -50,9 +50,9 @@ class SW_DLLPUBLIC SwTOXDescription String* pTitle; String* pTOUName; SwForm* pForm; - USHORT nContent; - USHORT nIndexOptions; - USHORT nOLEOptions; + sal_uInt16 nContent; + sal_uInt16 nIndexOptions; + sal_uInt16 nOLEOptions; LanguageType eLanguage; String sSortAlgorithm; @@ -61,13 +61,13 @@ class SW_DLLPUBLIC SwTOXDescription SwTOXSortKey eSortKey1; SwTOXSortKey eSortKey2; SwTOXSortKey eSortKey3; - BYTE nLevel; - BOOL bFromObjectNames : 1; - BOOL bFromChapter : 1; - BOOL bReadonly: 1; - BOOL bLevelFromChapter : 1; - BOOL bIsAuthSequence :1; - BOOL bSortByDocument :1; + sal_uInt8 nLevel; + sal_Bool bFromObjectNames : 1; + sal_Bool bFromChapter : 1; + sal_Bool bReadonly: 1; + sal_Bool bLevelFromChapter : 1; + sal_Bool bIsAuthSequence :1; + sal_Bool bSortByDocument :1; //TODO: TemplateNames //const String* pTemplateName = 0, ??? @@ -90,12 +90,12 @@ public: eLanguage((LanguageType)::GetAppLanguage()), eCaptionDisplay(CAPTION_COMPLETE), nLevel(MAXLEVEL), - bFromObjectNames(FALSE), - bFromChapter(FALSE), - bReadonly(TRUE), - bLevelFromChapter(FALSE), - bIsAuthSequence(FALSE), - bSortByDocument(TRUE) + bFromObjectNames(sal_False), + bFromChapter(sal_False), + bReadonly(sal_True), + bLevelFromChapter(sal_False), + bIsAuthSequence(sal_False), + bSortByDocument(sal_True) {} ~SwTOXDescription() { @@ -107,9 +107,9 @@ public: void SetTOXType(TOXTypes eSet) { eTOXType = eSet;} TOXTypes GetTOXType() const { return eTOXType;} - const String& GetStyleNames(USHORT nLvl) const + const String& GetStyleNames(sal_uInt16 nLvl) const {return aStyleNames[nLvl];} - void SetStyleNames(const String& rSet, USHORT nLvl) + void SetStyleNames(const String& rSet, sal_uInt16 nLvl) {aStyleNames[nLvl] = rSet; } const String& GetAutoMarkURL() const { return sAutoMarkURL;} @@ -124,20 +124,20 @@ public: void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);} const SwForm* GetForm() const {return pForm;} - void SetContentOptions(USHORT nSet) { nContent = nSet;} - USHORT GetContentOptions() const { return nContent;} + void SetContentOptions(sal_uInt16 nSet) { nContent = nSet;} + sal_uInt16 GetContentOptions() const { return nContent;} - void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;} - USHORT GetIndexOptions() const { return nIndexOptions;} + void SetIndexOptions(sal_uInt16 nSet) { nIndexOptions = nSet;} + sal_uInt16 GetIndexOptions() const { return nIndexOptions;} const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;} void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} - void SetLevel(BYTE nSet) {nLevel = nSet;} - BYTE GetLevel()const {return nLevel; } + void SetLevel(sal_uInt8 nSet) {nLevel = nSet;} + sal_uInt8 GetLevel()const {return nLevel; } - void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;} - BOOL IsCreateFromObjectNames() const {return bFromObjectNames;} + void SetCreateFromObjectNames(sal_Bool bSet) { bFromObjectNames = bSet;} + sal_Bool IsCreateFromObjectNames() const {return bFromObjectNames;} const String& GetSequenceName() const {return sSequenceName;} void SetSequenceName(const String& rSet) {sSequenceName = rSet;} @@ -145,26 +145,26 @@ public: SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} - void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} - BOOL IsFromChapter() const {return bFromChapter;} + void SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;} + sal_Bool IsFromChapter() const {return bFromChapter;} - void SetReadonly(BOOL bSet){bReadonly = bSet;} - BOOL IsReadonly() const {return bReadonly;} + void SetReadonly(sal_Bool bSet){bReadonly = bSet;} + sal_Bool IsReadonly() const {return bReadonly;} - USHORT GetOLEOptions() const {return nOLEOptions;} - void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} + sal_uInt16 GetOLEOptions() const {return nOLEOptions;} + void SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;} - BOOL IsLevelFromChapter() const {return bLevelFromChapter;} - void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} + sal_Bool IsLevelFromChapter() const {return bLevelFromChapter;} + void SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;} String GetAuthBrackets() const {return sAuthBrackets;} void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;} - BOOL IsAuthSequence() const {return bIsAuthSequence;} - void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;} + sal_Bool IsAuthSequence() const {return bIsAuthSequence;} + void SetAuthSequence(sal_Bool bSet){bIsAuthSequence = bSet;} - BOOL IsSortByDocument()const {return bSortByDocument ;} - void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;} + sal_Bool IsSortByDocument()const {return bSortByDocument ;} + void SetSortByDocument(sal_Bool bSet) {bSortByDocument = bSet;} void SetSortKeys(SwTOXSortKey eKey1, SwTOXSortKey eKey2, @@ -188,7 +188,7 @@ class SwTOXMarkDescription { TOXTypes eTOXType; int nLevel; - BOOL bMainEntry; + sal_Bool bMainEntry; String* pPrimKey; String* pSecKey; @@ -209,7 +209,7 @@ public: explicit SwTOXMarkDescription(TOXTypes eType) : eTOXType(eType), nLevel(0), - bMainEntry(FALSE), + bMainEntry(sal_False), pPrimKey(0), pSecKey(0), pAltStr(0), @@ -235,8 +235,8 @@ public: void SetLevel(int nSet) {nLevel = nSet;} int GetLevel() const {return nLevel;} - void SetMainEntry(BOOL bSet) {bMainEntry = bSet;} - BOOL IsMainEntry() const {return bMainEntry;} + void SetMainEntry(sal_Bool bSet) {bMainEntry = bSet;} + sal_Bool IsMainEntry() const {return bMainEntry;} void SetPrimKey(const String& rSet) {delete pPrimKey; pPrimKey = new String(rSet);} @@ -274,7 +274,7 @@ class SW_DLLPUBLIC SwTOXMgr SwTOXMark* pCurTOXMark; SwTOXMarks aCurMarks; - SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr); + SW_DLLPRIVATE sal_uInt16 GetUserTypeID(const String& rStr); public: // single argument ctors shall be explicit. @@ -289,22 +289,22 @@ public: void DeleteTOXMark(); - void NextTOXMark(BOOL bSame=FALSE); - void PrevTOXMark(BOOL bSame=FALSE); + void NextTOXMark(sal_Bool bSame=sal_False); + void PrevTOXMark(sal_Bool bSame=sal_False); // Aktuelle TOXmarks holen - USHORT GetTOXMarks(); - USHORT GetTOXMarkCount(); - SwTOXMark* GetTOXMark(USHORT nId); + sal_uInt16 GetTOXMarks(); + sal_uInt16 GetTOXMarkCount(); + SwTOXMark* GetTOXMark(sal_uInt16 nId); SwTOXMark* GetCurTOXMark(); - void SetCurTOXMark(USHORT nId); + void SetCurTOXMark(sal_uInt16 nId); // // Methoden fuer Verzeichnisse // - BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); + sal_Bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); - const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const; + const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; const SwTOXBase* GetCurTOX(); }; @@ -312,7 +312,7 @@ public: /*-------------------------------------------------------------------- Beschreibung: Inlines --------------------------------------------------------------------*/ -inline USHORT SwTOXMgr::GetTOXMarkCount() +inline sal_uInt16 SwTOXMgr::GetTOXMarkCount() { return aCurMarks.Count(); } inline SwTOXMark* SwTOXMgr::GetCurTOXMark() diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx index 5dd02380cb85..b734427f0124 100644 --- a/sw/source/ui/inc/uiborder.hxx +++ b/sw/source/ui/inc/uiborder.hxx @@ -42,7 +42,7 @@ public: // SW_BORDER_MODE_TABLE // SW_BORDER_MODE_FRAME - SwBorderDlg(Window* pParent, SfxItemSet& rSet, USHORT nType); + SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType); ~SwBorderDlg(); }; diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index dfd891839572..f33a2b01418b 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwPageFtnInfoItem : public SfxPoolItem public: - SwPageFtnInfoItem(const USHORT nId, SwPageFtnInfo& rInfo); + SwPageFtnInfoItem(const sal_uInt16 nId, SwPageFtnInfo& rInfo); SwPageFtnInfoItem(const SwPageFtnInfoItem& rItem ); ~SwPageFtnInfoItem(); @@ -57,8 +57,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem void* pMisc; public: - SwPtrItem( const USHORT nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0); + SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0); SwPtrItem( const SwPtrItem& rItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -85,15 +85,15 @@ class SW_DLLPUBLIC SwUINumRuleItem : public SfxPoolItem SwNumRule* pRule; public: - SwUINumRuleItem( const SwNumRule& rRule, const USHORT = FN_PARAM_ACT_NUMBER); + SwUINumRuleItem( const SwNumRule& rRule, const sal_uInt16 = FN_PARAM_ACT_NUMBER); SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } @@ -102,7 +102,7 @@ public: class SwBackgroundDestinationItem : public SfxUInt16Item { public: - SwBackgroundDestinationItem(USHORT nWhich, USHORT nValue); + SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 2cb957b7dc0b..b748eafe4a04 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwNumRulesWithName { SwNumFmt aFmt; String sCharFmtName; - USHORT nCharPoolId; + sal_uInt16 nCharPoolId; _SwNumFmtsAttrs aItems; _SwNumFmtGlobal& operator=( const _SwNumFmtGlobal& ); @@ -58,7 +58,7 @@ class SW_DLLPUBLIC SwNumRulesWithName public: _SwNumFmtGlobal( const SwNumFmt& rFmt ); _SwNumFmtGlobal( const _SwNumFmtGlobal& ); - _SwNumFmtGlobal( SvStream&, USHORT nVersion ); + _SwNumFmtGlobal( SvStream&, sal_uInt16 nVersion ); ~_SwNumFmtGlobal(); void Store( SvStream& ); @@ -73,7 +73,7 @@ protected: public: SwNumRulesWithName(const SwNumRule &, const String &); SwNumRulesWithName( const SwNumRulesWithName & ); - SwNumRulesWithName(SvStream &, USHORT nVersion); + SwNumRulesWithName(SvStream &, sal_uInt16 nVersion); ~SwNumRulesWithName(); const SwNumRulesWithName &operator=(const SwNumRulesWithName &); @@ -91,11 +91,11 @@ public: protected: SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; String sFileName; - USHORT nVersion; - BOOL bModified; + sal_uInt16 nVersion; + sal_Bool bModified; virtual int Load(SvStream&); - virtual BOOL Store(SvStream&); + virtual sal_Bool Store(SvStream&); void Init(); @@ -103,10 +103,10 @@ public: SwBaseNumRules(const String& rFileName); virtual ~SwBaseNumRules(); - inline const SwNumRulesWithName* GetRules(USHORT nIdx) const; + inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, - USHORT nIdx); + sal_uInt16 nIdx); }; @@ -118,11 +118,11 @@ public: virtual ~SwChapterNumRules(); virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, - USHORT nIdx); + sal_uInt16 nIdx); }; // INLINE METHODE -------------------------------------------------------- -inline const SwNumRulesWithName *SwBaseNumRules::GetRules(USHORT nIdx) const +inline const SwNumRulesWithName *SwBaseNumRules::GetRules(sal_uInt16 nIdx) const { OSL_ENSURE(nIdx < nMaxRules, "Array der NumRules ueberindiziert."); return pNumRules[nIdx]; diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index 5f0e1d93f2cd..374c00780300 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -28,7 +28,7 @@ #ifndef _UITOOL_HXX #define _UITOOL_HXX -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/field.hxx> #include <swtypes.hxx> #include "swdllapi.h" @@ -63,7 +63,7 @@ SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); //void EraseDefTabs(SvxTabStopItem& rTabs); // Abstand zwischen dem 1. und zweitem Element ermitteln -SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); +SW_DLLPUBLIC sal_uInt16 GetTabDist(const SvxTabStopItem& rTabs); // erfrage ob im Set eine Sfx-PageDesc-Kombination vorliegt // und setze diesen im Set und loesche die Transport Items @@ -71,27 +71,27 @@ SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs); void SwToSfxPageDescAttr( SfxItemSet& rSet ); void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ); -SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb); -void SetDfltMetric(FieldUnit eMetric, BOOL bWeb); +SW_DLLPUBLIC FieldUnit GetDfltMetric(sal_Bool bWeb); +void SetDfltMetric(FieldUnit eMetric, sal_Bool bWeb); -SW_DLLPUBLIC BOOL HasCharUnit( BOOL bWeb ); -void SetApplyCharUnit(BOOL bApplyChar, BOOL bWeb); +SW_DLLPUBLIC sal_Bool HasCharUnit( sal_Bool bWeb ); +void SetApplyCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); // ListBox mit allen Zeichenvorlagen fuellen - ausser Standard! -SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, BOOL bSorted = FALSE, BOOL bWithDefault = FALSE); +SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, sal_Bool bSorted = sal_False, sal_Bool bWithDefault = sal_False); //inserts a string sorted into a ListBox, -SW_DLLPUBLIC USHORT InsertStringSorted(const String& rEntry, ListBox& rToFill, USHORT nOffset); +SW_DLLPUBLIC sal_uInt16 InsertStringSorted(const String& rEntry, ListBox& rToFill, sal_uInt16 nOffset); // Tabellenbreite und Ausrichtung ermitteln -SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent, +SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent, SwWrtShell* pSh ); String GetAppLangDateTimeString( const DateTime& ); // search for a command string withing the menu structure and execute it // at the dispatcher if there is one, if executed return true -bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, USHORT nId ); +bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId ); #endif // _UITOOL_HXX diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index e92eb71dcf23..4c349a047c67 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -90,7 +90,7 @@ public: void ViewDestroyed() { pView = 0; } - void AddRemoveListener( BOOL bAdd ); + void AddRemoveListener( sal_Bool bAdd ); }; class SwMailMergeConfigItem; @@ -105,8 +105,7 @@ class SwView_Impl // temporary document for printing text of selection / multi selection // in PDF export. - SfxObjectShellRef xTmpSelDocSh; - SfxObjectShellRef aEmbeddedObjRef; + SfxObjectShellLock xTmpSelDocSh; SwView* pView; SwScannerEventListener* pScanEvtLstnr; @@ -142,9 +141,7 @@ public: void AddClipboardListener(); - SfxObjectShellRef & GetTmpSelectionDoc() { return xTmpSelDocSh; } - - SfxObjectShellRef& GetEmbeddedObjRef() { return *boost::addressof(aEmbeddedObjRef); } + SfxObjectShellLock& GetTmpSelectionDoc() { return xTmpSelDocSh; } void AddTransferable(SwTransferable& rTransferable); diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index af9a7a3a73c6..aa710f182a6f 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -115,7 +115,7 @@ public: STAR_REFERENCE( frame::XController ) & GetController() {return _xController;} STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;} - void ClearDocument( BOOL bStartTimer = FALSE ); + void ClearDocument( sal_Bool bStartTimer = sal_False ); sal_Bool IsInitialized() const {return bIsInitialized;} sal_Bool IsServiceAvailable() const {return bServiceAvailable;} diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index e0d19471bdf5..0e11b99e946a 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -154,7 +154,7 @@ public: void Invalidate(); // temporary document used for PDF export of selections/multi-selections - SfxObjectShellRef BuildTmpSelectionDoc( SfxObjectShellRef& ); + SfxObjectShellLock BuildTmpSelectionDoc(); }; typedef cppu::WeakImplHelper8< @@ -190,12 +190,12 @@ public: //XTextCursor - neu virtual void SAL_CALL collapseToStart( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL collapseToEnd( ) throw(::com::sun::star::uno::RuntimeException); - virtual BOOL SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException); - virtual BOOL SAL_CALL goLeft( sal_Int16 nCount, BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual BOOL SAL_CALL goRight( sal_Int16 nCount, BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoStart( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoEnd( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); //XPageCursor virtual sal_Bool SAL_CALL jumpToFirstPage(void) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 3d2ec33f14b1..fbf1971fe959 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -33,18 +33,18 @@ #include <unotools/configitem.hxx> #include <fldupde.hxx> #include "viewopt.hxx" -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> class SwMasterUsrPref; class SwContentViewConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - BOOL bWeb; + sal_Bool bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: - SwContentViewConfig(BOOL bWeb, SwMasterUsrPref& rParent); + SwContentViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwContentViewConfig(); // utl::ConfigItem @@ -58,11 +58,11 @@ class SwContentViewConfig : public utl::ConfigItem class SwLayoutViewConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - BOOL bWeb; + sal_Bool bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: - SwLayoutViewConfig(BOOL bWeb, SwMasterUsrPref& rParent); + SwLayoutViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwLayoutViewConfig(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); @@ -74,11 +74,11 @@ class SwLayoutViewConfig : public utl::ConfigItem class SwGridConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - BOOL bWeb; + sal_Bool bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: - SwGridConfig(BOOL bWeb, SwMasterUsrPref& rParent); + SwGridConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwGridConfig(); virtual void Commit(); @@ -136,6 +136,8 @@ class SwMasterUsrPref : public SwViewOption sal_Int32 nDefTab; //default tab stop distance sal_Bool bIsSquaredPageMode; //default page mode for text grid + sal_Bool bIsAlignMathObjectsToBaseline; + SwContentViewConfig aContentConfig; SwLayoutViewConfig aLayoutConfig; SwGridConfig aGridConfig; @@ -144,7 +146,7 @@ class SwMasterUsrPref : public SwViewOption sal_Bool bApplyCharUnit; // apply_char_unit public: - SwMasterUsrPref(BOOL bWeb); + SwMasterUsrPref(sal_Bool bWeb); ~SwMasterUsrPref(); void SetUsrPref(const SwViewOption &rCopy); @@ -176,7 +178,7 @@ public: } sal_Int32 GetUpdateLinkMode() const {return nLinkUpdateMode; } - void SetUpdateFields(BOOL bSet, sal_Bool bNoModify = sal_False) + void SetUpdateFields(sal_Bool bSet, sal_Bool bNoModify = sal_False) { if(bSet && eFldUpdateFlags == AUTOUPD_OFF) { @@ -201,7 +203,7 @@ public: aContentConfig.SetModified(); } - void SetUpdateCharts(BOOL bSet, sal_Bool bNoModify = sal_False) + void SetUpdateCharts(sal_Bool bSet, sal_Bool bNoModify = sal_False) { if(bSet) { @@ -248,7 +250,7 @@ public: { return bApplyCharUnit; } - void SetApplyCharUnit(BOOL bSet, sal_Bool bNoModify = sal_False) + void SetApplyCharUnit(sal_Bool bSet, sal_Bool bNoModify = sal_False) { bApplyCharUnit = bSet; if(!bNoModify) @@ -272,6 +274,13 @@ public: aLayoutConfig.SetModified(); } + sal_Bool IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; } + void SetAlignMathObjectsToBaseline( sal_Bool bVal, sal_Bool bNoModify = sal_False ) + { + bIsAlignMathObjectsToBaseline = bVal; + if(!bNoModify) + aLayoutConfig.SetModified(); + } }; #endif diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index f454fc578e8b..56285b11d52a 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -34,7 +34,7 @@ #include <svtools/htmlcfg.hxx> #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> -#include <sfx2/objsh.hxx> // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell) +#include <sfx2/objsh.hxx> #include <editeng/svxenum.hxx> #include <svx/zoomitem.hxx> #include <editeng/editstat.hxx> @@ -59,7 +59,6 @@ class SvxRuler; class SvxLRSpaceItem; class SwDocShell; class SwScrollbar; -class PrintDialog; class SvxVCBrowser; class SvBorder; class Ruler; @@ -85,7 +84,6 @@ class CommandEvent; class InsCaptionOpt; class SvGlobalName; class SvtAccessibilityOptions; -class SwPrtOptions; class SwTransferable; class SwMailMergeConfigItem; class SwTxtNode; // #i23726# @@ -150,15 +148,15 @@ struct SwApplyTemplate } aColl; int eType; - USHORT nColor; + sal_uInt16 nColor; SwFormatClipboard* pFormatClipboard; - BOOL bUndo; + sal_Bool bUndo; SwApplyTemplate() : eType(0), nColor(0), pFormatClipboard(0), - bUndo(FALSE) + bUndo(sal_False) { aColl.pTxtColl = 0; } @@ -182,16 +180,16 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SvxSearchDialog *pSrchDlg; static SvxSearchItem *pSrchItem; - static USHORT nInsertCtrlState; - static USHORT nWebInsertCtrlState; - static USHORT nInsertObjectCtrlState; - static USHORT nInsertFieldCtrlState; - static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) + static sal_uInt16 nInsertCtrlState; + static sal_uInt16 nWebInsertCtrlState; + static sal_uInt16 nInsertObjectCtrlState; + static sal_uInt16 nInsertFieldCtrlState; + static sal_uInt16 nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte Merker - static BOOL bExtra; - static BOOL bFound; - static BOOL bJustOpened; + static sal_Bool bExtra; + static sal_Bool bFound; + static sal_Bool bJustOpened; static SearchAttrItemList* pSrchList; static SearchAttrItemList* pReplList; @@ -205,7 +203,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too - USHORT nNewPage; + sal_uInt16 nNewPage; Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus //aus dem Dokument heraus. @@ -254,19 +252,19 @@ class SW_DLLPUBLIC SwView: public SfxViewShell String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; - USHORT nPageCnt; + sal_uInt16 nPageCnt; // Aktueller Drawmode - USHORT nDrawSfxId; + sal_uInt16 nDrawSfxId; String sDrawCustom; //some drawing types are marked with strings! - USHORT nFormSfxId; - USHORT nLastPasteDestination; + sal_uInt16 nFormSfxId; + sal_uInt16 nLastPasteDestination; // save the border distance status from SwView::StateTabWin to re-use it in SwView::ExecTabWin() - USHORT nLeftBorderDistance; - USHORT nRightBorderDistance; + sal_uInt16 nLeftBorderDistance; + sal_uInt16 nRightBorderDistance; - BOOL bCenterCrsr : 1, + sal_Bool bCenterCrsr : 1, bTopCrsr : 1, bAllwaysShowSel : 1, bTabColFromDoc : 1, @@ -292,14 +290,14 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // Methoden fuers Suchen // Suchkontext setzen - SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE); - SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0); - SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions ); + SW_DLLPRIVATE sal_Bool SearchAndWrap(sal_Bool bApi = sal_False); + SW_DLLPRIVATE sal_Bool SearchAll(sal_uInt16* pFound = 0); + SW_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions ); SW_DLLPRIVATE void Replace(); - BOOL IsDocumentBorder(); + sal_Bool IsDocumentBorder(); - SW_DLLPRIVATE BOOL IsTextTool() const; + SW_DLLPRIVATE sal_Bool IsTextTool() const; // Bedienelemente verwalten anlegen SW_DLLPRIVATE void CreateBtns(); @@ -316,32 +314,32 @@ class SW_DLLPUBLIC SwView: public SfxViewShell inline long GetYScroll() const; SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, - USHORT nRangeX = USHRT_MAX, - USHORT nRangeY = USHRT_MAX); + sal_uInt16 nRangeX = USHRT_MAX, + sal_uInt16 nRangeY = USHRT_MAX); - SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const; - SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const; + SW_DLLPRIVATE sal_Bool GetPageScrollUpOffset(SwTwips& rOff) const; + SW_DLLPRIVATE sal_Bool GetPageScrollDownOffset(SwTwips& rOff) const; // Scrollbar Movements SW_DLLPRIVATE long PageUp(); SW_DLLPRIVATE long PageDown(); - SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect); - SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect); + SW_DLLPRIVATE long PageUpCrsr(sal_Bool bSelect); + SW_DLLPRIVATE long PageDownCrsr(sal_Bool bSelect); SW_DLLPRIVATE long PhyPageUp(); SW_DLLPRIVATE long PhyPageDown(); - SW_DLLPRIVATE int _CreateScrollbar( BOOL bHori ); + SW_DLLPRIVATE int _CreateScrollbar( sal_Bool bHori ); SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * ); + SW_DLLPRIVATE sal_Bool UpdateScrollbars(); SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); - SW_DLLPRIVATE BOOL UpdateScrollbars(); SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); - SW_DLLPRIVATE void CreatePageButtons(BOOL bShow); + SW_DLLPRIVATE void CreatePageButtons(sal_Bool bShow); // Linguistik-Funktionen SW_DLLPRIVATE void HyphenateDocument(); - SW_DLLPRIVATE BOOL IsDrawTextHyphenate(); + SW_DLLPRIVATE sal_Bool IsDrawTextHyphenate(); SW_DLLPRIVATE void HyphenateDrawText(); SW_DLLPRIVATE void StartThesaurus(); @@ -349,18 +347,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); // used for spell checking and text conversion - SW_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, BOOL bStartDone, - BOOL bEndDone, SwConversionArgs *pConvArgs = 0 ); + SW_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, sal_Bool bStartDone, + sal_Bool bEndDone, SwConversionArgs *pConvArgs = 0 ); SW_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 ); SW_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); - SW_DLLPRIVATE BOOL CheckSpecialCntnt(); - SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE) + SW_DLLPRIVATE sal_Bool CheckSpecialCntnt(); + SW_DLLPRIVATE void SpellKontext(sal_Bool bOn = sal_True) { bCenterCrsr = bOn; bAllwaysShowSel = bOn; } // Methoden fuers Printing - SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent ); + SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); // fuer Readonly-Umschaltung @@ -374,14 +371,14 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, SvxZoomType eZoomType, short nFactor = 100, - BOOL bViewOnly = FALSE); - SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); + sal_Bool bViewOnly = sal_False); + SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner ); SW_DLLPRIVATE void ShowAtResize(); SW_DLLPRIVATE virtual void Move(); - SW_DLLPRIVATE BOOL InsertGraphicDlg( SfxRequest& ); + SW_DLLPRIVATE sal_Bool InsertGraphicDlg( SfxRequest& ); protected: @@ -398,8 +395,8 @@ protected: virtual void SelectShell(); - virtual void Activate(BOOL); - virtual void Deactivate(BOOL); + virtual void Activate(sal_Bool); + virtual void Deactivate(sal_Bool); virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); virtual Size GetOptimalSizePixel() const; @@ -410,7 +407,7 @@ protected: void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} // form letter execution - void GenerateFormLetter(BOOL bUseCurrentDocument); + void GenerateFormLetter(sal_Bool bUseCurrentDocument); using SfxShell::GetDispatcher; @@ -425,20 +422,20 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( bool bOn = TRUE ); + virtual void ShowCursor( bool bOn = sal_True ); virtual ErrCode DoVerb( long nVerb ); - virtual USHORT SetPrinter( SfxPrinter* pNew, - USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, + sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); ShellModes GetShellMode(); com::sun::star::view::XSelectionSupplier* GetUNOObject(); - String GetSelectionTextParam( BOOL bCompleteWords, - BOOL bEraseTrail ); - virtual BOOL HasSelection( BOOL bText ) const; - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + String GetSelectionTextParam( sal_Bool bCompleteWords, + sal_Bool bEraseTrail ); + virtual sal_Bool HasSelection( sal_Bool bText ) const; + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); virtual void MarginChanged(); // replace word/selection with text from the thesaurus @@ -456,7 +453,7 @@ public: inline SwEditWin &GetEditWin() { return *pEditWin; } inline const SwEditWin &GetEditWin () const { return *pEditWin; } -#if defined WIN || defined WNT || defined UNX +#if defined WNT || defined UNX void ScannerEventHdl( const ::com::sun::star::lang::EventObject& rEventObject ); #endif @@ -465,58 +462,59 @@ public: inline const Rectangle& GetVisArea() const { return aVisArea; } - BOOL IsScroll(const Rectangle& rRect) const; + sal_Bool IsScroll(const Rectangle& rRect) const; void Scroll( const Rectangle& rRect, - USHORT nRangeX = USHRT_MAX, - USHORT nRangeY = USHRT_MAX); + sal_uInt16 nRangeX = USHRT_MAX, + sal_uInt16 nRangeY = USHRT_MAX); long SetVScrollMax(long lMax); long SetHScrollMax(long lMax); DECL_LINK( SpellError, LanguageType * ); - BOOL ExecSpellPopup( const Point& rPt ); - void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); + sal_Bool ExecSpellPopup( const Point& rPt ); + void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); + // SMARTTAGS - BOOL ExecSmartTagPopup( const Point& rPt ); + sal_Bool ExecSmartTagPopup( const Point& rPt ); DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - BOOL ExecDrwTxtSpellPopup(const Point& rPt); + sal_Bool ExecDrwTxtSpellPopup(const Point& rPt); void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; } - void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; } - BOOL IsTabColFromDoc() const { return bTabColFromDoc; } - void SetTabRowFromDoc( BOOL b ) { bTabRowFromDoc = b; } - BOOL IsTabRowFromDoc() const { return bTabRowFromDoc; } + void SetTabColFromDoc( sal_Bool b ) { bTabColFromDoc = b; } + sal_Bool IsTabColFromDoc() const { return bTabColFromDoc; } + void SetTabRowFromDoc( sal_Bool b ) { bTabRowFromDoc = b; } + sal_Bool IsTabRowFromDoc() const { return bTabRowFromDoc; } // -> #i23726# void SetNumRuleNodeFromDoc( SwTxtNode * pNumRuleNode ) { pNumRuleNodeFromDoc = pNumRuleNode; } - void SetNumIndentFromDoc(BOOL b) { bNumIndentFromDoc = b; } - BOOL IsNumIndentFromDoc() const { return NULL != pNumRuleNodeFromDoc; } + void SetNumIndentFromDoc(sal_Bool b) { bNumIndentFromDoc = b; } + sal_Bool IsNumIndentFromDoc() const { return NULL != pNumRuleNodeFromDoc; } // <- #i23726# void DocSzChgd( const Size& rNewSize ); const Size& GetDocSz() const { return aDocSz; } - virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE); - void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE); + virtual void SetVisArea( const Rectangle&, sal_Bool bUpdateScrollbar = sal_True); + void SetVisArea( const Point&, sal_Bool bUpdateScrollbar = sal_True); void CheckVisArea(); static LAYOUT_NS Dialog* GetSearchDialog(); - static USHORT GetMoveType(); - static void SetMoveType(USHORT nSet); + static sal_uInt16 GetMoveType(); + static void SetMoveType(sal_uInt16 nSet); DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416# static void SetActMark(sal_Int32 nSet); - BOOL HandleWheelCommands( const CommandEvent& ); + sal_Bool HandleWheelCommands( const CommandEvent& ); // Rahmen einfuegen - void InsFrmMode(USHORT nCols); + void InsFrmMode(sal_uInt16 nCols); - void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE); + void SetZoom( SvxZoomType eZoomType, short nFactor = 100, sal_Bool bViewOnly = sal_False); virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); - void SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly = FALSE ); + void SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewOnly = sal_False ); void ShowHScrollbar(sal_Bool bShow); sal_Bool IsHScrollbarVisible()const; @@ -555,7 +553,7 @@ public: void ExecTabWin(SfxRequest&); void ExecuteStatusLine(SfxRequest&); DECL_LINK( ExecRulerClick, Ruler * ); - void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE); + void ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False); void ExecViewOptions(SfxRequest &); void StateViewOptions(SfxItemSet &); @@ -566,24 +564,24 @@ public: // Funktionen fuer Drawing void SetDrawFuncPtr(SwDrawBase* pFuncPtr); - inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; } + inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const { return pDrawActual; } void GetDrawState(SfxItemSet &rSet); void ExitDraw(); - inline BOOL IsDrawRotate() { return bDrawRotate; } + inline sal_Bool IsDrawRotate() { return bDrawRotate; } inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; } - inline BOOL IsDrawSelMode() { return bDrawSelMode; } + inline sal_Bool IsDrawSelMode() { return bDrawSelMode; } void SetSelDrawSlot(); inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } void NoRotate(); // Rotate-Mode abschalten - BOOL EnterDrawTextMode(const Point& aDocPos); + sal_Bool EnterDrawTextMode(const Point& aDocPos); void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();} - BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } - BOOL IsFormMode() const; - BOOL IsBezierEditMode(); - BOOL AreOnlyFormsSelected() const; - BOOL HasDrwObj(SdrObject *pSdrObj) const; - BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const; - BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, + sal_Bool IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } + sal_Bool IsFormMode() const; + sal_Bool IsBezierEditMode(); + sal_Bool AreOnlyFormsSelected() const; + sal_Bool HasDrwObj(SdrObject *pSdrObj) const; + sal_Bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const; + sal_Bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); void StateTabWin(SfxItemSet&); @@ -596,13 +594,13 @@ public: // Links bearbeiten void EditLinkDlg(); - void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0); + void AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId = 0); void InsertCaption(const InsCaptionOpt *pOpt); // Async Aufruf durch Core - void UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); + void UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); - String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr); + String GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); // Shell rausreichen SfxShell *GetCurShell() { return pShell; } @@ -614,32 +612,32 @@ public: //damit in DToren der SubShells ggf. pShell zurueckgesetzt werden kann void ResetSubShell() { pShell = 0; } - virtual void WriteUserData(String &, BOOL bBrowse = FALSE ); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE ); + virtual void WriteUserData(String &, sal_Bool bBrowse = sal_False ); + virtual void ReadUserData(const String &, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); - void SetCrsrAtTop( BOOL bFlag, BOOL bCenter = FALSE ) + void SetCrsrAtTop( sal_Bool bFlag, sal_Bool bCenter = sal_False ) { bTopCrsr = bFlag, bCenterCrsr = bCenter; } - BOOL IsCrsrAtTop() const { return bTopCrsr; } - BOOL IsCrsrAtCenter() const { return bCenterCrsr; } + sal_Bool IsCrsrAtTop() const { return bTopCrsr; } + sal_Bool IsCrsrAtCenter() const { return bCenterCrsr; } - BOOL JumpToSwMark( const String& rMark ); + sal_Bool JumpToSwMark( const String& rMark ); - long InsertDoc( USHORT nSlotId, const String& rFileName, - const String& rFilterName, INT16 nVersion = 0 ); + long InsertDoc( sal_uInt16 nSlotId, const String& rFileName, + const String& rFilterName, sal_Int16 nVersion = 0 ); void ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ); - long InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ); + long InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVersion ); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper * ); // status methods for clipboard. // Status changes now notified from the clipboard. - BOOL IsPasteAllowed(); - BOOL IsPasteSpecialAllowed(); + sal_Bool IsPasteAllowed(); + sal_Bool IsPasteSpecialAllowed(); // Enable mail merge - mail merge field dialog enabled - void EnableMailMerge(BOOL bEnable = TRUE); + void EnableMailMerge(sal_Bool bEnable = sal_True); //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); @@ -648,8 +646,8 @@ public: void NotifyDBChanged(); - SfxObjectShellRef & GetTmpSelectionDoc(); - SfxObjectShellRef & GetOrCreateTmpSelectionDoc(); + SfxObjectShellLock & GetTmpSelectionDoc(); + SfxObjectShellLock & GetOrCreateTmpSelectionDoc(); void AddTransferable(SwTransferable& rTransferable); @@ -665,9 +663,9 @@ public: //public fuer D&D int InsertGraphic( const String &rPath, const String &rFilter, - BOOL bLink = TRUE, GraphicFilter *pFlt = 0, + sal_Bool bLink = sal_True, GraphicFilter *pFlt = 0, Graphic* pPreviewGrf = 0, - BOOL bRule = FALSE ); + sal_Bool bRule = sal_False ); void ExecuteScan( SfxRequest& rReq ); @@ -693,7 +691,7 @@ inline const SwDocShell *SwView::GetDocShell() const SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, - BOOL bPreview); + sal_Bool bPreview); #endif diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/ui/inc/viewlayoutctrl.hxx index 8363955a165e..fd02906129a8 100644 --- a/sw/source/ui/inc/viewlayoutctrl.hxx +++ b/sw/source/ui/inc/viewlayoutctrl.hxx @@ -43,12 +43,12 @@ public: SFX_DECL_STATUSBAR_CONTROL(); - SwViewLayoutControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SwViewLayoutControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); - virtual BOOL MouseButtonDown( const MouseEvent & ); + virtual sal_Bool MouseButtonDown( const MouseEvent & ); }; #endif diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index cfc02d6fec68..805f7382babc 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -31,7 +31,7 @@ #include <sfx2/tbxctrl.hxx> #include <vcl/toolbox.hxx> #include <svtools/stdctrl.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> class PopupMenu; class SwView; @@ -69,20 +69,20 @@ class SwView; class SwTbxInsertCtrl : public SfxToolBoxControl { - USHORT nLastSlotId; + sal_uInt16 nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); public: SFX_DECL_TOOLBOX_CONTROL(); - SwTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SwTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTbxInsertCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -103,12 +103,12 @@ class SwTbxAutoTextCtrl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SwTbxAutoTextCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTbxAutoTextCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -139,8 +139,8 @@ class SwScrollNaviPopup : public SfxPopupWindow String sQuickHelp[2 * NID_COUNT]; - USHORT nFwdId; - USHORT nBackId; + sal_uInt16 nFwdId; + sal_uInt16 nBackId; void ApplyImageList(); @@ -151,10 +151,10 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - SwScrollNaviPopup( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~SwScrollNaviPopup(); - static String GetQuickHelpText(BOOL bNext); + static String GetQuickHelpText(sal_Bool bNext); virtual SfxPopupWindow* Clone() const; void GrabFocus(){aToolBox.GrabFocus();} @@ -191,9 +191,9 @@ class SwNaviImageButton : public ImageButton class SwHlpImageButton : public ImageButton { - BOOL bUp; + sal_Bool bUp; public: - SwHlpImageButton(Window* pParent, const ResId& rResId, BOOL bUpBtn) : + SwHlpImageButton(Window* pParent, const ResId& rResId, sal_Bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} virtual void RequestHelp( const HelpEvent& rHEvt ); @@ -205,10 +205,10 @@ class SwPreviewZoomControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SwPreviewZoomControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SwPreviewZoomControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwPreviewZoomControl(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index ef8172ec7218..94e5e7f9be3f 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -31,7 +31,7 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/button.hxx> @@ -48,7 +48,7 @@ class SwWrapDlg : public SfxSingleTabDialog SwWrtShell* pWrtShell; public: - SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode); + SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode); ~SwWrapDlg(); inline SwWrtShell* GetWrtShell() { return pWrtShell; } @@ -92,22 +92,22 @@ class SwWrapTabPage: public SfxTabPage ImageList aWrapIL; ImageList aWrapILH; - USHORT nOldLeftMargin; - USHORT nOldRightMargin; - USHORT nOldUpperMargin; - USHORT nOldLowerMargin; + sal_uInt16 nOldLeftMargin; + sal_uInt16 nOldRightMargin; + sal_uInt16 nOldUpperMargin; + sal_uInt16 nOldLowerMargin; RndStdIds nAnchorId; - USHORT nHtmlMode; + sal_uInt16 nHtmlMode; Size aFrmSize; SwWrtShell* pWrtSh; - BOOL bFormat; - BOOL bNew; - BOOL bHtmlMode; - BOOL bDrawMode; - BOOL bContourImage; + sal_Bool bFormat; + sal_Bool bNew; + sal_Bool bHtmlMode; + sal_Bool bDrawMode; + sal_Bool bContourImage; SwWrapTabPage(Window *pParent, const SfxItemSet &rSet); ~SwWrapTabPage(); @@ -129,12 +129,12 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - static USHORT* GetRanges(); - inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt; + static sal_uInt16* GetRanges(); + inline void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } + inline void SetFormatUsed(sal_Bool bFmt, sal_Bool bDrw) { bFormat = bFmt; bDrawMode = bDrw; } inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 42be4412fe3a..db1f651b099f 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -108,7 +108,7 @@ public: using SwEditShell::Insert; - typedef long (SwWrtShell::*SELECTFUNC)(const Point *, BOOL bProp ); + typedef long (SwWrtShell::*SELECTFUNC)(const Point *, sal_Bool bProp ); SELECTFUNC fnDrag; SELECTFUNC fnSetCrsr; @@ -116,160 +116,160 @@ public: SELECTFUNC fnKillSel; // Alle Selektionen aufheben - long ResetSelect( const Point *, BOOL ); + long ResetSelect( const Point *, sal_Bool ); //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down //zurueck, falls ein Stack aufgebaut ist inline void ResetCursorStack(); SelectionType GetSelectionType() const; - BOOL IsModePushed() const { return 0 != pModeStack; } + sal_Bool IsModePushed() const { return 0 != pModeStack; } void PushMode(); void PopMode(); void SttSelect(); void EndSelect(); - BOOL IsInSelect() const { return bInSelect; } - void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; } + sal_Bool IsInSelect() const { return bInSelect; } + void SetInSelect(sal_Bool bSel = sal_True) { bInSelect = bSel; } // Liegt eine Text- oder Rahmenselektion vor? - BOOL HasSelection() const { return SwCrsrShell::HasSelection() || + sal_Bool HasSelection() const { return SwCrsrShell::HasSelection() || IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); } - BOOL Pop( BOOL bOldCrsr = TRUE ); + sal_Bool Pop( sal_Bool bOldCrsr = sal_True ); void EnterStdMode(); - BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; } + sal_Bool IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; } void EnterExtMode(); void LeaveExtMode(); long ToggleExtMode(); - BOOL IsExtMode() const { return bExtMode; } + sal_Bool IsExtMode() const { return bExtMode; } void EnterAddMode(); void LeaveAddMode(); long ToggleAddMode(); - BOOL IsAddMode() const { return bAddMode; } + sal_Bool IsAddMode() const { return bAddMode; } void EnterBlockMode(); void LeaveBlockMode(); long ToggleBlockMode(); - BOOL IsBlockMode() const { return bBlockMode; } + sal_Bool IsBlockMode() const { return bBlockMode; } - void SetInsMode( BOOL bOn = TRUE ); + void SetInsMode( sal_Bool bOn = sal_True ); void ToggleInsMode() { SetInsMode( !bIns ); } - BOOL IsInsMode() const { return bIns; } - void SetRedlineModeAndCheckInsMode( USHORT eMode ); + sal_Bool IsInsMode() const { return bIns; } + void SetRedlineModeAndCheckInsMode( sal_uInt16 eMode ); void EnterSelFrmMode(const Point *pStartDrag = 0); void LeaveSelFrmMode(); - BOOL IsSelFrmMode() const { return bLayoutMode; } + sal_Bool IsSelFrmMode() const { return bLayoutMode; } // Selektion von Rahmen aufheben void UnSelectFrm(); void Invalidate(); // Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar - inline void SelTblCells( const Link &rLink, BOOL bMark = TRUE ); + inline void SelTblCells( const Link &rLink, sal_Bool bMark = sal_True ); inline void EndSelTblCells(); //Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird //in der Regel in MB-Up gerufen. - BOOL IsExtSel() const { return bSelWrd || bSelLn; } + sal_Bool IsExtSel() const { return bSelWrd || bSelLn; } // erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist // Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen. - inline BOOL Is_FnDragEQBeginDrag() const; + inline sal_Bool Is_FnDragEQBeginDrag() const; //Basisabfragen - BOOL IsInWrd() { return IsInWord(); } - BOOL IsSttWrd() { return IsStartWord(); } - BOOL IsEndWrd(); - BOOL IsSttOfPara() const { return IsSttPara(); } - BOOL IsEndOfPara() const { return IsEndPara(); } + sal_Bool IsInWrd() { return IsInWord(); } + sal_Bool IsSttWrd() { return IsStartWord(); } + sal_Bool IsEndWrd(); + sal_Bool IsSttOfPara() const { return IsSttPara(); } + sal_Bool IsEndOfPara() const { return IsEndPara(); } //Word bzw. Satz selektieren. - BOOL SelNearestWrd(); - BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE ); + sal_Bool SelNearestWrd(); + sal_Bool SelWrd (const Point * = 0, sal_Bool bProp=sal_False ); // --> FME 2004-07-30 #i32329# Enhanced selection - void SelSentence (const Point * = 0, BOOL bProp=FALSE ); - void SelPara (const Point * = 0, BOOL bProp=FALSE ); + void SelSentence (const Point * = 0, sal_Bool bProp=sal_False ); + void SelPara (const Point * = 0, sal_Bool bProp=sal_False ); // <-- long SelAll(); //Basiscursortravelling -typedef BOOL (SwWrtShell:: *FNSimpleMove)(); - BOOL SimpleMove( FNSimpleMove, BOOL bSelect ); - - BOOL Left ( USHORT nMode, BOOL bSelect, - USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE ); - BOOL Right ( USHORT nMode, BOOL bSelect, - USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE ); - BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1, - BOOL bBasicCall = FALSE ); - BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1, - BOOL bBasicCall = FALSE ); - BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } - BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } - - BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall ); - BOOL RightMargin( BOOL bSelect, BOOL bBasicCall ); - - BOOL SttDoc ( BOOL bSelect = FALSE ); - BOOL EndDoc ( BOOL bSelect = FALSE ); - - BOOL SttNxtPg ( BOOL bSelect = FALSE ); - BOOL SttPrvPg ( BOOL bSelect = FALSE ); - BOOL EndNxtPg ( BOOL bSelect = FALSE ); - BOOL EndPrvPg ( BOOL bSelect = FALSE ); - BOOL SttPg ( BOOL bSelect = FALSE ); - BOOL EndPg ( BOOL bSelect = FALSE ); - BOOL SttPara ( BOOL bSelect = FALSE ); - BOOL EndPara ( BOOL bSelect = FALSE ); - BOOL FwdPara ( BOOL bSelect = FALSE ) +typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); + sal_Bool SimpleMove( FNSimpleMove, sal_Bool bSelect ); + + sal_Bool Left ( sal_uInt16 nMode, sal_Bool bSelect, + sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual = sal_False ); + sal_Bool Right ( sal_uInt16 nMode, sal_Bool bSelect, + sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual = sal_False ); + sal_Bool Up ( sal_Bool bSelect = sal_False, sal_uInt16 nCount = 1, + sal_Bool bBasicCall = sal_False ); + sal_Bool Down ( sal_Bool bSelect = sal_False, sal_uInt16 nCount = 1, + sal_Bool bBasicCall = sal_False ); + sal_Bool NxtWrd ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } + sal_Bool PrvWrd ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } + + sal_Bool LeftMargin ( sal_Bool bSelect, sal_Bool bBasicCall ); + sal_Bool RightMargin( sal_Bool bSelect, sal_Bool bBasicCall ); + + sal_Bool SttDoc ( sal_Bool bSelect = sal_False ); + sal_Bool EndDoc ( sal_Bool bSelect = sal_False ); + + sal_Bool SttNxtPg ( sal_Bool bSelect = sal_False ); + sal_Bool SttPrvPg ( sal_Bool bSelect = sal_False ); + sal_Bool EndNxtPg ( sal_Bool bSelect = sal_False ); + sal_Bool EndPrvPg ( sal_Bool bSelect = sal_False ); + sal_Bool SttPg ( sal_Bool bSelect = sal_False ); + sal_Bool EndPg ( sal_Bool bSelect = sal_False ); + sal_Bool SttPara ( sal_Bool bSelect = sal_False ); + sal_Bool EndPara ( sal_Bool bSelect = sal_False ); + sal_Bool FwdPara ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_FwdPara, bSelect ); } - BOOL BwdPara ( BOOL bSelect = FALSE ) + sal_Bool BwdPara ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_BwdPara, bSelect ); } - BOOL FwdSentence( BOOL bSelect = FALSE ) + sal_Bool FwdSentence( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); } - BOOL BwdSentence( BOOL bSelect = FALSE ) + sal_Bool BwdSentence( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); } // --> FME 2004-07-30 #i20126# Enhanced table selection - BOOL SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); + sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); // <-- - BOOL SelectTableRow(); - BOOL SelectTableCol(); - BOOL SelectTableCell(); + sal_Bool SelectTableRow(); + sal_Bool SelectTableCol(); + sal_Bool SelectTableCell(); - BOOL SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr = 0 ); + sal_Bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 ); // Spaltenweise Spruenge - BOOL StartOfColumn ( BOOL bSelect = FALSE ); - BOOL EndOfColumn ( BOOL bSelect = FALSE ); - BOOL StartOfNextColumn ( BOOL bSelect = FALSE ); - BOOL EndOfNextColumn ( BOOL bSelect = FALSE ); - BOOL StartOfPrevColumn ( BOOL bSelect = FALSE ); - BOOL EndOfPrevColumn ( BOOL bSelect = FALSE ); + sal_Bool StartOfColumn ( sal_Bool bSelect = sal_False ); + sal_Bool EndOfColumn ( sal_Bool bSelect = sal_False ); + sal_Bool StartOfNextColumn ( sal_Bool bSelect = sal_False ); + sal_Bool EndOfNextColumn ( sal_Bool bSelect = sal_False ); + sal_Bool StartOfPrevColumn ( sal_Bool bSelect = sal_False ); + sal_Bool EndOfPrevColumn ( sal_Bool bSelect = sal_False ); // setze den Cursor auf die Seite "nPage" an den Anfang // zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx // werden hier alle bestehenden Selektionen vor dem Setzen des // Cursors aufgehoben - BOOL GotoPage( USHORT nPage, BOOL bRecord ); + sal_Bool GotoPage( sal_uInt16 nPage, sal_Bool bRecord ); //setzen des Cursors; merken der alten Position fuer Zurueckblaettern. DECL_LINK( ExecFlyMac, void * ); - BOOL PageCrsr(SwTwips lOffset, BOOL bSelect); + sal_Bool PageCrsr(SwTwips lOffset, sal_Bool bSelect); // Felder Update - void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE ); + void UpdateInputFlds( SwInputFieldList* pLst = 0, sal_Bool bOnlyInSel = sal_False ); - void NoEdit(BOOL bHideCrsr = TRUE); + void NoEdit(sal_Bool bHideCrsr = sal_True); void Edit(); - BOOL IsNoEdit() const { return bNoEdit; } + sal_Bool IsNoEdit() const { return bNoEdit; } - BOOL IsRetainSelection() const { return mbRetainSelection; } - void SetRetainSelection( BOOL bRet ) { mbRetainSelection = bRet; } + sal_Bool IsRetainSelection() const { return mbRetainSelection; } + void SetRetainSelection( sal_Bool bRet ) { mbRetainSelection = bRet; } // change current data base and notify void ChgDBData(const SwDBData& SwDBData); @@ -281,7 +281,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); long DelLeft(); // loescht auch Rahmen bzw. setzt den Cursor in den Rahmen, - // wenn bDelFrm == FALSE ist + // wenn bDelFrm == sal_False ist long DelRight(); long DelToEndOfPara(); long DelToStartOfPara(); @@ -300,7 +300,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); WORD_SPACE_AFTER = 2, WORD_NO_SPACE = 3 }; - int IntelligentCut(int nSelectionType, BOOL bCut = TRUE); + int IntelligentCut(int nSelectionType, sal_Bool bCut = sal_True); // Editieren void Insert(SwField &); @@ -308,28 +308,28 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); // Graphic void Insert( const String &rPath, const String &rFilter, const Graphic &, SwFlyFrmAttrMgr * = 0, - BOOL bRule = FALSE ); + sal_Bool bRule = sal_False ); void InsertByWord( const String & ); - void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 ); + void InsertPageBreak(const String *pPageDesc = 0, sal_uInt16 nPgNum = 0 ); void InsertLineBreak(); void InsertColumnBreak(); - void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE ); - void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE ); - BOOL CanInsert(); + void InsertFootnote(const String &, sal_Bool bEndNote = sal_False, sal_Bool bEdit = sal_True ); + void SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True ); + sal_Bool CanInsert(); // Verzeichnisse void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); + sal_Bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); // Numerierung und Bullets /** Turns on numbering or bullets. - @param bNum TRUE: turn on numbering - FALSE: turn on bullets + @param bNum sal_True: turn on numbering + sal_False: turn on bullets */ - void NumOrBulletOn(BOOL bNum); // #i29560# + void NumOrBulletOn(sal_Bool bNum); // #i29560# void NumOrBulletOff(); // #i29560# void NumOn(); void BulletOn(); @@ -338,12 +338,12 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 fuer Clipboard const svt::EmbeddedObjectRef&, SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. - BOOL bActivate = TRUE, - USHORT nSlotId = 0); // SlotId fuer Dialog + sal_Bool bActivate = sal_True, + sal_uInt16 nSlotId = 0); // SlotId fuer Dialog - BOOL InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); + sal_Bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); void LaunchOLEObj( long nVerb = 0 ); // Server starten - BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;} + sal_Bool IsOLEObj() const { return GetCntType() == CNT_OLE;} virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, @@ -366,32 +366,32 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); void SetPageStyle(const String &rCollName); - String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const; + String GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const; // Aktuelle Vorlage anhand der geltenden Attribute aendern void QuickUpdateStyle(); enum DoType { UNDO, REDO, REPEAT }; - void Do( DoType eDoType, USHORT nCnt = 1 ); + void Do( DoType eDoType, sal_uInt16 nCnt = 1 ); String GetDoString( DoType eDoType ) const; String GetRepeatString() const; - USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; + sal_uInt16 GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; //Suchen oder Ersetzen - ULONG SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt, - BOOL bSearchInNotes, + sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt, + sal_Bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnde, FindRanges eFlags = FND_IN_BODY, - int bReplace = FALSE ); + int bReplace = sal_False ); - ULONG SearchTempl (const String &rTempl, + sal_uLong SearchTempl (const String &rTempl, SwDocPositions eStart, SwDocPositions eEnde, FindRanges eFlags = FND_IN_BODY, const String* pReplTempl = 0 ); - ULONG SearchAttr (const SfxItemSet& rFindSet, - BOOL bNoColls, + sal_uLong SearchAttr (const SfxItemSet& rFindSet, + sal_Bool bNoColls, SwDocPositions eStart,SwDocPositions eEnde, FindRanges eFlags = FND_IN_BODY, const com::sun::star::util::SearchOptions* pSearchOpt = 0, @@ -401,30 +401,30 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); // Aktion vor Cursorbewegung // Hebt gfs. Selektionen auf, triggert Timer und GCAttr() - void MoveCrsr( BOOL bWithSelect = FALSE ); + void MoveCrsr( sal_Bool bWithSelect = sal_False ); // Eingabefelder updaten - BOOL StartInputFldDlg(SwField*, BOOL bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0); + sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0); // update DropDown fields - BOOL StartDropDownFldDlg(SwField*, BOOL bNextButton, ByteString* pWindowState = 0); + sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, ByteString* pWindowState = 0); //"Handler" fuer Anederungen an der DrawView - fuer Controls. virtual void DrawSelChanged( ); // springe zum Bookmark und setze die "Selections-Flags" wieder richtig - BOOL GotoMark( const ::sw::mark::IMark* const pMark ); - BOOL GotoMark( const ::sw::mark::IMark* const pMark, BOOL bSelect, BOOL bStart ); - BOOL GotoMark( const ::rtl::OUString& rName ); - BOOL GoNextBookmark(); // TRUE, wenn's noch eine gab - BOOL GoPrevBookmark(); + sal_Bool GotoMark( const ::sw::mark::IMark* const pMark ); + sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart ); + sal_Bool GotoMark( const ::rtl::OUString& rName ); + sal_Bool GoNextBookmark(); // sal_True, wenn's noch eine gab + sal_Bool GoPrevBookmark(); bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark); - BOOL GotoField( const SwFmtFld& rFld ); + sal_Bool GotoField( const SwFmtFld& rFld ); // jump to the next / previous hyperlink - inside text and also // on graphics - BOOL SelectNextPrevHyperlink( BOOL bNext = TRUE ); + sal_Bool SelectNextPrevHyperlink( sal_Bool bNext = sal_True ); // Zugehoerige SwView ermitteln const SwView& GetView() const { return rView; } @@ -433,23 +433,23 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); //Weil es sonst keiner macht, gibt es hier eine ExecMacro() void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 ); // rufe ins dunkle Basic/JavaScript - USHORT CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent, - BOOL bCheckPtr = FALSE, SbxArray* pArgs = 0, + sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, + sal_Bool bCheckPtr = sal_False, SbxArray* pArgs = 0, const Link* pCallBack = 0 ); // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem. // Fuehre die vor definierten Aktionen aus. void ClickToField( const SwField& rFld ); - void ClickToINetAttr( const SwFmtINetFmt& rItem, USHORT nFilter = URLLOAD_NOFILTER ); - BOOL ClickToINetGrf( const Point& rDocPt, USHORT nFilter = URLLOAD_NOFILTER ); - inline BOOL IsInClickToEdit() const ; + void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER ); + sal_Bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER ); + inline sal_Bool IsInClickToEdit() const ; // fall ein URL-Button selektiert ist, dessen URL returnen, ansonsten // einen LeerString - BOOL GetURLFromButton( String& rURL, String& rDescr ) const; + sal_Bool GetURLFromButton( String& rURL, String& rDescr ) const; void NavigatorPaste( const NaviContentBookmark& rBkmk, - const USHORT nAction ); + const sal_uInt16 nAction ); // die Core erzeugt eine Selektion, das SttSelect muss gerufen werden virtual void NewCoreSelection(); @@ -469,29 +469,29 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); const SwViewOption *pViewOpt = 0); virtual ~SwWrtShell(); - BOOL TryRemoveIndent(); // #i23725# + sal_Bool TryRemoveIndent(); // #i23725# String GetSelDescr() const; SwNavigationMgr& GetNavigationMgr(); void addCurrentPosition(); - BOOL GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, - BOOL bSelFrame = TRUE ); - BOOL GotoINetAttr( const SwTxtINetFmt& rAttr ); - void GotoOutline( USHORT nIdx ); - BOOL GotoOutline( const String& rName ); - BOOL GotoRegion( const String& rName ); - BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0, - USHORT nSeqNo = 0 ); - BOOL GotoNextTOXBase( const String* pName = 0); - BOOL GotoTable( const String& rName ); - BOOL GotoFld( const SwFmtFld& rFld ); - const SwRedline* GotoRedline( USHORT nArrPos, BOOL bSelect = FALSE); + sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, + sal_Bool bSelFrame = sal_True ); + sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr ); + void GotoOutline( sal_uInt16 nIdx ); + sal_Bool GotoOutline( const String& rName ); + sal_Bool GotoRegion( const String& rName ); + sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0, + sal_uInt16 nSeqNo = 0 ); + sal_Bool GotoNextTOXBase( const String* pName = 0); + sal_Bool GotoTable( const String& rName ); + sal_Bool GotoFld( const SwFmtFld& rFld ); + const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); private: SW_DLLPRIVATE void OpenMark(); - SW_DLLPRIVATE void CloseMark( BOOL bOkFlag ); + SW_DLLPRIVATE void CloseMark( sal_Bool bOkFlag ); SW_DLLPRIVATE String GetWrdDelim(); SW_DLLPRIVATE String GetSDelim(); @@ -500,11 +500,11 @@ private: struct ModeStack { ModeStack *pNext; - BOOL bAdd, + sal_Bool bAdd, bBlock, bExt, bIns; - ModeStack(ModeStack *pNextMode, BOOL _bIns, BOOL _bExt, BOOL _bAdd, BOOL _bBlock): + ModeStack(ModeStack *pNextMode, sal_Bool _bIns, sal_Bool _bExt, sal_Bool _bAdd, sal_Bool _bBlock): pNext(pNextMode), bAdd(_bAdd), bBlock(_bBlock), @@ -525,11 +525,11 @@ private: { Point aDocPos; CrsrStack *pNext; - BOOL bValidCurPos : 1; - BOOL bIsFrmSel : 1; + sal_Bool bValidCurPos : 1; + sal_Bool bIsFrmSel : 1; SwTwips lOffset; - CrsrStack( BOOL bValid, BOOL bFrmSel, const Point &rDocPos, + CrsrStack( sal_Bool bValid, sal_Bool bFrmSel, const Point &rDocPos, SwTwips lOff, CrsrStack *pN ) : aDocPos(rDocPos), pNext(pN), @@ -547,39 +547,39 @@ private: SwNavigationMgr aNavigationMgr; Point aDest; - BOOL bDestOnStack; - BOOL HasCrsrStack() const { return 0 != pCrsrStack; } - SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect); - SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE); + sal_Bool bDestOnStack; + sal_Bool HasCrsrStack() const { return 0 != pCrsrStack; } + SW_DLLPRIVATE sal_Bool PushCrsr(SwTwips lOffset, sal_Bool bSelect); + SW_DLLPRIVATE sal_Bool PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False); // ENDE Cursor bei PageUp / -Down mitnehmen - SW_DLLPRIVATE BOOL _SttWrd(); - SW_DLLPRIVATE BOOL _EndWrd(); - SW_DLLPRIVATE BOOL _NxtWrd(); - SW_DLLPRIVATE BOOL _PrvWrd(); + SW_DLLPRIVATE sal_Bool _SttWrd(); + SW_DLLPRIVATE sal_Bool _EndWrd(); + SW_DLLPRIVATE sal_Bool _NxtWrd(); + SW_DLLPRIVATE sal_Bool _PrvWrd(); // --> OD 2008-08-06 #i92468# - SW_DLLPRIVATE BOOL _NxtWrdForDelete(); - SW_DLLPRIVATE BOOL _PrvWrdForDelete(); + SW_DLLPRIVATE sal_Bool _NxtWrdForDelete(); + SW_DLLPRIVATE sal_Bool _PrvWrdForDelete(); // <-- - SW_DLLPRIVATE BOOL _FwdSentence(); - SW_DLLPRIVATE BOOL _BwdSentence(); - BOOL _FwdPara(); - SW_DLLPRIVATE BOOL _BwdPara(); + SW_DLLPRIVATE sal_Bool _FwdSentence(); + SW_DLLPRIVATE sal_Bool _BwdSentence(); + sal_Bool _FwdPara(); + SW_DLLPRIVATE sal_Bool _BwdPara(); // Selektionen - BOOL bIns :1; - BOOL bInSelect :1; - BOOL bExtMode :1; - BOOL bAddMode :1; - BOOL bBlockMode :1; - BOOL bLayoutMode :1; - BOOL bNoEdit :1; - BOOL bCopy :1; - BOOL bSelWrd :1; - BOOL bSelLn :1; - BOOL bIsInClickToEdit:1; - BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen - BOOL mbRetainSelection :1; // Do not remove selections + sal_Bool bIns :1; + sal_Bool bInSelect :1; + sal_Bool bExtMode :1; + sal_Bool bAddMode :1; + sal_Bool bBlockMode :1; + sal_Bool bLayoutMode :1; + sal_Bool bNoEdit :1; + sal_Bool bCopy :1; + sal_Bool bSelWrd :1; + sal_Bool bSelLn :1; + sal_Bool bIsInClickToEdit:1; + sal_Bool bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen + sal_Bool mbRetainSelection :1; // Do not remove selections Point aStart; Link aSelTblLink; @@ -592,37 +592,37 @@ private: SW_DLLPRIVATE void SttDragDrop(Timer *); using SwCrsrShell::SetCrsr; - SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SetCrsr(const Point *, sal_Bool bProp=sal_False ); - SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SetCrsrKillSel(const Point *, sal_Bool bProp=sal_False ); - SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long StdSelect(const Point *, sal_Bool bProp=sal_False ); + SW_DLLPRIVATE long BeginDrag(const Point *, sal_Bool bProp=sal_False ); + SW_DLLPRIVATE long Drag(const Point *, sal_Bool bProp=sal_False ); + SW_DLLPRIVATE long EndDrag(const Point *, sal_Bool bProp=sal_False ); - SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long ExtSelWrd(const Point *, sal_Bool bProp=sal_False ); + SW_DLLPRIVATE long ExtSelLn(const Point *, sal_Bool bProp=sal_False ); //Verschieben von Text aus Drag and Drop; Point ist //Destination fuer alle Selektionen. - SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long MoveText(const Point *, sal_Bool bProp=sal_False ); - SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long BeginFrmDrag(const Point *, sal_Bool bProp=sal_False ); //nach SSize/Move eines Frames Update; Point ist Destination. - SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False ); - SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE ); - SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE ); + SW_DLLPRIVATE long SttLeaveSelect(const Point *, sal_Bool bProp=sal_False ); + SW_DLLPRIVATE long AddLeaveSelect(const Point *, sal_Bool bProp=sal_False ); + SW_DLLPRIVATE long Ignore(const Point *, sal_Bool bProp=sal_False ); - SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;} - SW_DLLPRIVATE BOOL _CanInsert(); + SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = sal_False;} + SW_DLLPRIVATE sal_Bool _CanInsert(); - SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0, - BOOL bSelect = FALSE, BOOL bDontMoveRegion = FALSE); - SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0); + SW_DLLPRIVATE sal_Bool GoStart(sal_Bool KeepArea = sal_False, sal_Bool * = 0, + sal_Bool bSelect = sal_False, sal_Bool bDontMoveRegion = sal_False); + SW_DLLPRIVATE sal_Bool GoEnd(sal_Bool KeepArea = sal_False, sal_Bool * = 0); enum BookMarkMove { @@ -632,7 +632,7 @@ private: BOOKMARK_LAST_LAST_ENTRY }; - SW_DLLPRIVATE BOOL MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL); + SW_DLLPRIVATE sal_Bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL); }; inline void SwWrtShell::ResetCursorStack() @@ -641,27 +641,27 @@ inline void SwWrtShell::ResetCursorStack() _ResetCursorStack(); } -inline void SwWrtShell::SelTblCells(const Link &rLink, BOOL bMark ) +inline void SwWrtShell::SelTblCells(const Link &rLink, sal_Bool bMark ) { - SetSelTblCells( TRUE ); + SetSelTblCells( sal_True ); bClearMark = bMark; aSelTblLink = rLink; } inline void SwWrtShell::EndSelTblCells() { - SetSelTblCells( FALSE ); - bClearMark = TRUE; + SetSelTblCells( sal_False ); + bClearMark = sal_True; } -inline BOOL SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; } +inline sal_Bool SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; } -inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const +inline sal_Bool SwWrtShell::Is_FnDragEQBeginDrag() const { #ifdef GCC SELECTFUNC fnTmp = &SwWrtShell::BeginDrag; return fnDrag == fnTmp; #else - return sal::static_int_cast< BOOL >(fnDrag == &SwWrtShell::BeginDrag); + return sal::static_int_cast< sal_Bool >(fnDrag == &SwWrtShell::BeginDrag); #endif } diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index cfd0c41784ba..29818393d9a2 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.hxx @@ -36,13 +36,13 @@ private: String sPreviewZoom; public: virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SwZoomControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SwZoomControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SwZoomControl(); }; |