diff options
Diffstat (limited to 'cui/source/inc')
42 files changed, 217 insertions, 217 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index f340cfd8f150..cd0179b88b79 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -105,7 +105,7 @@ public: void ResetUndo(); void Undo(); - void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); + void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); sal_uInt16 GetUndoActionCount(); void UndoActionStart( sal_uInt16 nId ); void UndoActionEnd(); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 2998db5fbdc1..825f79bc7052 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -86,20 +86,20 @@ struct TAccInfo const KeyCode& aKey ) : m_nKeyPos (nKeyPos ) , m_nListPos (nListPos ) - , m_bIsConfigurable(sal_True ) /**< its important to set sal_True as default - + , m_bIsConfigurable(true ) /**< its important to set sal_True as default - because only fix entries will be disabled later ... */ , m_sCommand ( ) , m_aKey (aKey ) {} - sal_Bool isConfigured() const + bool isConfigured() const { return (m_nKeyPos>-1 && m_nListPos>-1 && !m_sCommand.isEmpty()); } sal_Int32 m_nKeyPos; sal_Int32 m_nListPos; - sal_Bool m_bIsConfigurable; + bool m_bIsConfigurable; OUString m_sCommand; KeyCode m_aKey; }; @@ -134,7 +134,7 @@ private: OUString aFilterAllStr; OUString aFilterCfgStr; SfxStylesInfo_Impl m_aStylesInfo; - sal_Bool m_bStylesInfoInitialized; + bool m_bStylesInfoInitialized; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index e6748d0df116..644a8c7e84b5 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -80,8 +80,8 @@ class OfaACorrCheckListBox : public SvSimpleTable inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } - sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); - void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); + bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); + void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); }; @@ -182,18 +182,18 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage class AutoCorrEdit : public Edit { Link aActionLink; - sal_Bool bSpaces; + bool bSpaces; public: AutoCorrEdit(Window* pParent, const ResId& rResId) : - Edit(pParent, rResId), bSpaces(sal_False){} + Edit(pParent, rResId), bSpaces(false){} AutoCorrEdit(Window* pParent) : - Edit(pParent), bSpaces(sal_False){} + Edit(pParent), bSpaces(false){} void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(sal_Bool bSet) + void SetSpaces(bool bSet) {bSpaces = bSet;} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; @@ -245,16 +245,16 @@ private: CharClass* pCharClass; LanguageType eLang; - sal_Bool bHasSelectionText; - sal_Bool bFirstSelect:1; - sal_Bool bReplaceEditChanged:1; - sal_Bool bSWriter:1; + bool bHasSelectionText; + bool bFirstSelect:1; + bool bReplaceEditChanged:1; + bool bSWriter:1; DECL_LINK(SelectHdl, SvTabListBox*); DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBox( sal_Bool bFromReset, + void RefillReplaceBox( bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage); @@ -314,7 +314,7 @@ private: DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); /// Box filled with new language - void RefillReplaceBoxes(sal_Bool bFromReset, + void RefillReplaceBoxes(bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage); public: diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 23293c544453..b8c77fd37ac6 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -59,9 +59,9 @@ public: /// for the Writer (cells/rows/tables) void ShowTblControl(); /// for the Writer (paragraph/characters) - void ShowParaControl(sal_Bool bCharOnly = sal_False); + void ShowParaControl(bool bCharOnly = false); - void EnableTransparency(sal_Bool bColor, sal_Bool bGraphic); + void EnableTransparency(bool bColor, bool bGraphic); virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -108,11 +108,11 @@ private: Color aBgdColor; sal_uInt16 nHtmlMode; - sal_Bool bAllowShowSelector : 1; - sal_Bool bIsGraphicValid : 1; - sal_Bool bLinkOnly : 1; - sal_Bool bColTransparency : 1; - sal_Bool bGraphTransparency : 1; + bool bAllowShowSelector : 1; + bool bIsGraphicValid : 1; + bool bLinkOnly : 1; + bool bColTransparency : 1; + bool bGraphTransparency : 1; Graphic aBgdGraphic; OUString aBgdGraphicPath; OUString aBgdGraphicFilter; @@ -128,7 +128,7 @@ private: void HideColorUI_Impl(); void ShowBitmapUI_Impl(); void HideBitmapUI_Impl(); - sal_Bool LoadLinkedGraphic_Impl(); + bool LoadLinkedGraphic_Impl(); void RaiseLoadError_Impl(); void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); SvxGraphicPosition GetGraphicPosition_Impl(); diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 60010ffcd993..7a8865a11e90 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -65,7 +65,7 @@ struct SfxStylesInfo_Impl SfxStylesInfo_Impl(); void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); - sal_Bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); + bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); void getLabel4Style(SfxStyleInfo_Impl& aStyle); ::std::vector< SfxStyleInfo_Impl > getStyleFamilies(); @@ -85,12 +85,12 @@ struct SfxGroupInfo_Impl sal_uInt16 nKind; sal_uInt16 nUniqueID; void* pObject; - sal_Bool bWasOpened; + bool bWasOpened; OUString sCommand; OUString sLabel; SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) : - nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(sal_False) {} + nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {} }; struct CuiMacroInfo @@ -160,7 +160,7 @@ class SfxConfigGroupListBox : public SvTreeListBox protected: virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; - virtual sal_Bool Expand( SvTreeListEntry* pParent ); + virtual bool Expand( SvTreeListEntry* pParent ); public: SfxConfigGroupListBox(Window* pParent, WinBits nStyle); @@ -173,7 +173,7 @@ public: bool bEventMode); void SetFunctionListBox( SfxConfigFunctionListBox *pBox ) { pFunctionListBox = pBox; } - void Open( SvTreeListEntry*, sal_Bool ); + void Open( SvTreeListEntry*, bool ); void GroupSelected(); void SelectMacro( const SfxMacroInfoItem* ); void SelectMacro( const OUString&, const OUString& ); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index cc2c6a880433..c582d98302d5 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -49,7 +49,7 @@ class SvxCharBasePage : public SfxTabPage protected: SvxFontPrevWindow* m_pPreviewWin; - sal_Bool m_bPreviewBackgroundToCharacter; + bool m_bPreviewBackgroundToCharacter; SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); @@ -217,7 +217,7 @@ private: void UpdatePreview_Impl(); void SetCaseMap_Impl( SvxCaseMap eCaseMap ); void ResetColor_Impl( const SfxItemSet& rSet ); - sal_Bool FillItemSetColor_Impl( SfxItemSet& rSet ); + bool FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( SelectHdl_Impl, ListBox* ); DECL_LINK(CbClickHdl_Impl, void *); @@ -340,7 +340,7 @@ private: void UpdatePreview_Impl(); void Initialize(); void SelectCharacter( ListBox* pBox ); - void SetBracket( sal_Unicode cBracket, sal_Bool bStart ); + void SetBracket( sal_Unicode cBracket, bool bStart ); DECL_LINK(TwoLinesHdl_Impl, void *); DECL_LINK( CharacterMapHdl_Impl, ListBox* ); diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 79ee29252c66..09211e8b4db3 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -40,7 +40,7 @@ class SvxShowText : public Control { public: SvxShowText( Window* pParent, - sal_Bool bCenter = sal_False ); + bool bCenter = false ); virtual ~SvxShowText(); void SetFont( const Font& rFont ); @@ -56,7 +56,7 @@ protected: private: long mnY; - sal_Bool mbCenter; + bool mbCenter; }; @@ -81,7 +81,7 @@ private: SvxShowText* m_pShowChar; FixedText* m_pCharCodeText; Font aFont; - sal_Bool bOne; + bool bOne; const SubsetMap* pSubsetMap; DECL_LINK(OKHdl, void *); @@ -97,7 +97,7 @@ private: void fillAllSubsets(ListBox &rListBox); public: - SvxCharacterMap( Window* pParent, sal_Bool bOne=sal_True, const SfxItemSet* pSet=0 ); + SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); virtual ~SvxCharacterMap(); void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 909e2f1516f2..84fabd0d5eeb 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -143,11 +143,11 @@ protected: painting is turned on immediately. As a consequence for this intricateness there is no flickering when turning off and on quickly. */ - void EnableSearchUI(sal_Bool bEnable); + void EnableSearchUI(bool bEnable); - void EnableSearchForDependees(sal_Bool bEnable); + void EnableSearchForDependees(bool bEnable); - void EnableControlPaint(sal_Bool bEnable); + void EnableControlPaint(bool bEnable); void InitContext(sal_Int16 nContext); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6c3b1eacc30a..3458d5d361eb 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -65,7 +65,7 @@ private: void ImplSearch( const INetURLObject& rStartURL, const ::std::vector< OUString >& rFormats, - sal_Bool bRecursive ); + bool bRecursive ); virtual ~SearchThread(); virtual void execute() SAL_OVERRIDE; @@ -253,10 +253,10 @@ class TPGalleryThemeProperties : public SfxTabPage INetURLObject aURL; sal_uInt16 nCurFilterPos; sal_uInt16 nFirstExtFilterPos; - sal_Bool bEntriesFound; - sal_Bool bInputAllowed; - sal_Bool bTakeAll; - sal_Bool bSearchRecursive; + bool bEntriesFound; + bool bInputAllowed; + bool bTakeAll; + bool bSearchRecursive; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 05ed2b5ef57f..f501472c7560 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -121,12 +121,12 @@ private: public: GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic, - sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges); + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); } long GetTileHeight() const { return static_cast<long>(mpMtrHeight->GetValue()); } - sal_Bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } + bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } }; @@ -142,11 +142,11 @@ private: public: GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, - sal_uInt8 nGreyThreshold, sal_Bool bInvert ); + sal_uInt8 nGreyThreshold, bool bInvert ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); } - sal_Bool IsInvert() const { return mpCbxInvert->IsChecked(); } + bool IsInvert() const { return mpCbxInvert->IsChecked(); } }; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 0f0a512d28c6..d6ca568ea174 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -64,9 +64,9 @@ private: SfxBindings* mpBindings; SfxItemSet* mpItemSet; - sal_Bool mbGrabFocus : 1; - sal_Bool mbReadOnly : 1; - sal_Bool mbIsHTMLDoc : 1; + bool mbGrabFocus : 1; + bool mbReadOnly : 1; + bool mbIsHTMLDoc : 1; DECL_LINK (ClickApplyHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * ); @@ -82,8 +82,8 @@ public: virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; sal_uInt16 SetPage( SvxHyperlinkItem* pItem ); - void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); - inline sal_Bool IsHTMLDoc() const { return mbIsHTMLDoc; } + void SetReadOnlyMode( bool bReadOnly = false ); + inline bool IsHTMLDoc() const { return mbIsHTMLDoc; } inline SfxBindings* GetBindings() const { return mpBindings; }; inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 417b89a0d96f..5f58c56aaad9 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -65,7 +65,7 @@ private: sal_uInt16 mnPageType; sal_Int32 mnPos; - sal_Bool mbAreaTP; + bool mbAreaTP; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -138,7 +138,7 @@ class SvxTransparenceTabPage : public SvxTabPage // preview SvxXRectPreview* m_pCtlBitmapPreview; SvxXRectPreview* m_pCtlXRectPreview; - sal_Bool bBitmap; + bool bBitmap; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -151,12 +151,12 @@ class SvxTransparenceTabPage : public SvxTabPage DECL_LINK(ChangeTrgrTypeHdl_Impl, void*); DECL_LINK(ModifiedTrgrHdl_Impl, void*); - void ActivateLinear(sal_Bool bActivate); - void ActivateGradient(sal_Bool bActivate); + void ActivateLinear(bool bActivate); + void ActivateGradient(bool bActivate); void SetControlState_Impl(XGradientStyle eXGS); - sal_Bool InitPreview ( const SfxItemSet& rSet ); - void InvalidatePreview (sal_Bool bEnable = sal_True ); + bool InitPreview ( const SfxItemSet& rSet ); + void InvalidatePreview (bool bEnable = true ); public: SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs); @@ -240,7 +240,7 @@ private: // SvxAreaTabDialog has to call the setter methods (e.g. SetColorChgd). // Without that the pages used in SvxAreaTabDialog are not usable ChangeType maFixed_ChangeType; - sal_Bool maFixed_sal_Bool; + bool maFixed_sal_Bool; ChangeType* pnColorListState; ChangeType* pnBitmapListState; @@ -251,7 +251,7 @@ private: sal_uInt16 nDlgType; sal_Int32 nPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -311,7 +311,7 @@ public: void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } @@ -337,13 +337,13 @@ private: const SfxItemSet& rOutAttrs; RECT_POINT eRP; - XColorListRef pColorList; + XColorListRef pColorList; ChangeType* pnColorListState; - sal_uInt16 nPageType; - sal_uInt16 nDlgType; - sal_Bool* pbAreaTP; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + bool* pbAreaTP; - sal_Bool bDisable; + bool bDisable; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -369,10 +369,10 @@ public: void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; - void DisablePage( sal_Bool bIn ) { bDisable = bIn; } + void DisablePage( bool bIn ) { bDisable = bIn; } }; /************************************************************************/ @@ -413,7 +413,7 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XOutdevItemPool* pXPool; XFillStyleItem aXFStyleItem; @@ -451,7 +451,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } @@ -488,7 +488,7 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XOutdevItemPool* pXPool; XFillStyleItem aXFStyleItem; @@ -529,7 +529,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } @@ -571,9 +571,9 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; - sal_Bool bBmpChanged; + bool bBmpChanged; XOutdevItemPool* pXPool; XFillStyleItem aXFStyleItem; @@ -614,7 +614,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } @@ -694,7 +694,7 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XFillStyleItem aXFStyleItem; XFillColorItem aXFillColorItem; @@ -752,7 +752,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index c7f626ac4977..9de7879b9df2 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -42,7 +42,7 @@ private: XDashListRef pNewDashList; XLineEndListRef pLineEndList; XLineEndListRef pNewLineEndList; - sal_Bool bObjSelected; + bool bObjSelected; ChangeType nLineEndListState; ChangeType nDashListState; @@ -51,7 +51,7 @@ private: sal_uInt16 nPageType; sal_Int32 nPosDashLb; sal_Int32 nPosLineEndLb; - sal_Bool mbAreaTP; + bool mbAreaTP; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -63,7 +63,7 @@ protected: public: SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, - sal_Bool bHasObj = sal_True ); + bool bHasObj = true ); virtual ~SvxLineTabDialog(); void SetNewDashList( XDashListRef pInLst) @@ -139,15 +139,15 @@ private: CheckBox* m_pSymbolRatioCB; std::vector<OUString> aGrfNames; SvxBmpItemInfoList aGrfBrushItems; - sal_Bool bLastWidthModified; + bool bLastWidthModified; Size aSymbolLastSize; Graphic aSymbolGraphic; Size aSymbolSize; - sal_Bool bSymbols; + bool bSymbols; const SfxItemSet& rOutAttrs; RECT_POINT eRP; - sal_Bool bObjSelected; + bool bObjSelected; XOutdevItemPool* pXPool; XLineStyleItem aXLStyle; @@ -193,14 +193,14 @@ private: // LineCaps DECL_LINK ( ChangeCapStyleHdl_Impl, void * ); - sal_Bool FillXLSet_Impl(); + bool FillXLSet_Impl(); void InitSymbols(MenuButton* pButton); void SymbolSelected(MenuButton* pButton); void FillListboxes(); public: - void ShowSymbolControls(sal_Bool bOn); + void ShowSymbolControls(bool bOn); SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); @@ -223,7 +223,7 @@ public: void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetLineEndList( XLineEndListRef pLneEndLst) { pLineEndList = pLneEndLst; } - void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } + void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } @@ -263,7 +263,7 @@ private: const SfxItemSet& rOutAttrs; XDash aDash; - sal_Bool bObjSelected; + bool bObjSelected; XOutdevItemPool* pXPool; XLineStyleItem aXLStyle; @@ -313,7 +313,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } - void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } + void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } @@ -343,7 +343,7 @@ private: const SfxItemSet& rOutAttrs; const SdrObject* pPolyObj; - sal_Bool bObjSelected; + bool bObjSelected; XOutdevItemPool* pXPool; XLineStyleItem aXLStyle; @@ -384,7 +384,7 @@ public: void SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; } void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; } - void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } + void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 07649510a3f2..755232f436a0 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -54,7 +54,7 @@ namespace svx ::svx::OptHeaderTabListBox* pPathBox; SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; - sal_Bool m_bModified; + bool m_bModified; #ifdef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX DECL_LINK( NewHdl, void * ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 7d06e1476552..d5301414641e 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -88,9 +88,9 @@ class SvxGrfCropPage : public SfxTabPage const MetricField* pLastCropField; long nOldWidth; long nOldHeight; - sal_Bool bReset; - sal_Bool bInitialized; - sal_Bool bSetOrigSize; + bool bReset; + bool bInitialized; + bool bSetOrigSize; SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); @@ -106,7 +106,7 @@ class SvxGrfCropPage : public SfxTabPage void CalcZoom(); void CalcMinMaxBorder(); - void GraphicHasChanged(sal_Bool bFound); + void GraphicHasChanged(bool bFound); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; Size GetGrfOrigSize( const Graphic& ) const; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index f4658b3eeda0..18b22a252c18 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -50,7 +50,7 @@ public: void ConnectElements( void );/**< should be called after all manipulations on elements are done calcs real sizes depending on sizes of this */ - void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() + void Show( bool bVisible = true, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable() }; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 4a69291715a2..db5296c6c796 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -39,7 +39,7 @@ private: FixedText maFtDocTypes; ListBox maLbDocTypes; - sal_Bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; + bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); DECL_LINK (ClickNewHdl_Impl , void * ); @@ -58,7 +58,7 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual sal_Bool AskApply () SAL_OVERRIDE; + virtual bool AskApply () SAL_OVERRIDE; virtual void DoApply () SAL_OVERRIDE; virtual void SetInitFocus() SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index f580818f339b..5003f80055d9 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -44,7 +44,7 @@ private: OUString maStrURL; - sal_Bool mbMarkWndOpen; + bool mbMarkWndOpen; DECL_LINK (ClickFileopenHdl_Impl , void * ); DECL_LINK (ClickTargetHdl_Impl , void * ); @@ -66,7 +66,7 @@ protected: void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ) SAL_OVERRIDE; - virtual sal_Bool ShouldOpenMarkWnd () SAL_OVERRIDE {return mbMarkWndOpen;} + virtual bool ShouldOpenMarkWnd () SAL_OVERRIDE {return mbMarkWndOpen;} virtual void SetMarkWndShouldOpen (sal_Bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} OUString GetCurrentURL (); diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 153f83e21508..4bd07e6c36e8 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -47,7 +47,7 @@ private: OUString maStrOldUser; OUString maStrOldPassword; - sal_Bool mbMarkWndOpen; + bool mbMarkWndOpen; DECL_LINK (Click_SmartProtocol_Impl , void * ); ///< Radiobutton clicked: Type HTTP or FTP DECL_LINK (ClickAnonymousHdl_Impl , void * ); ///< Checkbox : Anonymous User @@ -75,7 +75,7 @@ protected: virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ) SAL_OVERRIDE; - virtual sal_Bool ShouldOpenMarkWnd () SAL_OVERRIDE {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} + virtual bool ShouldOpenMarkWnd () SAL_OVERRIDE {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} virtual void SetMarkWndShouldOpen (sal_Bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} public: diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index a560585ada0c..15633c3817b9 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -62,7 +62,7 @@ private: PushButton maBtClose; SvxHlmarkTreeLBox maLbTree; - sal_Bool mbUserMoved; + bool mbUserMoved; SvxHyperlinkTabPageBase* mpParent; @@ -71,7 +71,7 @@ private: sal_uInt16 mnError; protected: - sal_Bool RefreshFromDoc( const OUString& aURL ); + bool RefreshFromDoc( const OUString& aURL ); void RestoreLastSelection(); SvTreeListEntry* FindEntry(const OUString& aStrName); @@ -87,11 +87,11 @@ public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); virtual ~SvxHlinkDlgMarkWnd(); - sal_Bool MoveTo ( Point aNewPos ); + bool MoveTo ( Point aNewPos ); void RefreshTree(const OUString& aStrURL); bool SelectEntry(const OUString& aStrMark); - sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True ); + bool ConnectToDialog( bool bDoit = true ); sal_uInt16 SetError( sal_uInt16 nError); }; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 2b0f8823f76c..dad7e1fb1fc1 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -86,7 +86,7 @@ private: Edit *mpEdText; ImageButton *mpBtScript; - sal_Bool mbIsCloseDisabled; + bool mbIsCloseDisabled; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxDocumentFrame; @@ -94,7 +94,7 @@ private: protected: Window* mpDialog; - sal_Bool mbStdControlsInit; + bool mbStdControlsInit; OUString maStrInitURL; @@ -120,7 +120,7 @@ protected: static OUString GetSchemeFromURL( const OUString& rStrURL ); - inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; } + inline void DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; } public: SvxHyperlinkTabPageBase ( @@ -136,7 +136,7 @@ public: mxDocumentFrame = rxDocumentFrame; } - virtual sal_Bool AskApply (); + virtual bool AskApply (); virtual void DoApply (); virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); @@ -145,16 +145,16 @@ public: virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - sal_Bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } + bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } - sal_Bool MoveToExtraWnd ( Point aNewPos, sal_Bool bDisConnectDlg = sal_False ); + bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; - virtual sal_Bool QueryClose() SAL_OVERRIDE; + virtual bool QueryClose() SAL_OVERRIDE; protected: - virtual sal_Bool ShouldOpenMarkWnd(); + virtual bool ShouldOpenMarkWnd(); virtual void SetMarkWndShouldOpen(sal_Bool bOpen); void ShowMarkWnd (); @@ -166,7 +166,7 @@ protected: sal_uInt16 GetMacroEvents(); SvxMacroTableDtor* GetMacroTable(); - sal_Bool IsHTMLDoc() const; + bool IsHTMLDoc() const; }; #endif // INCLUDED_CUI_SOURCE_INC_HLTPBASE_HXX diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 1a41b0bcc7a7..f4e4293ad958 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -61,7 +61,7 @@ class SvxHyphenWordDialog : public SfxModalDialog sal_uInt16 nHyphPos; sal_uInt16 nOldPos; sal_Int32 nHyphenationPositionsOffset; - sal_Bool bBusy; + bool bBusy; void EnableLRBtn_Impl(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 729acf4c4502..689938c3bf05 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -53,17 +53,17 @@ struct IconChoicePageData CreatePage fnCreatePage; ///< pointer to the factory GetPageRanges fnGetRanges; ///< pointer to the ranges-function IconChoicePage* pPage; ///< the TabPage itself - sal_Bool bOnDemand; ///< Flag: ItemSet onDemand - sal_Bool bRefresh; ///< Flag: page has to be newly initialized + bool bOnDemand; ///< Flag: ItemSet onDemand + bool bRefresh; ///< Flag: page has to be newly initialized // constructor - IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, sal_Bool bDemand ) + IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, bool bDemand ) : nId ( Id ), fnCreatePage ( fnPage ), fnGetRanges ( fnRanges ), pPage ( NULL ), bOnDemand ( bDemand ), - bRefresh ( sal_False ) + bRefresh ( false ) {} }; @@ -75,7 +75,7 @@ class IconChoicePage : public TabPage private : const SfxItemSet* pSet; OUString aUserString; - sal_Bool bHasExchangeSupport; + bool bHasExchangeSupport; IconChoiceDialog* pDialog; void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } @@ -99,8 +99,8 @@ public : virtual bool FillItemSet( SfxItemSet& ) = 0; virtual void Reset( const SfxItemSet& ) = 0; - sal_Bool HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( sal_Bool bNew = sal_True ) { bHasExchangeSupport = bNew; } + bool HasExchangeSupport() const { return bHasExchangeSupport; } + void SetExchangeSupport( bool bNew = true ) { bHasExchangeSupport = bNew; } enum { KEEP_PAGE = 0x0000, ///< error handling @@ -116,8 +116,8 @@ public : void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } virtual void FillUserData(); - virtual sal_Bool IsReadOnly() const; - virtual sal_Bool QueryClose(); + virtual bool IsReadOnly() const; + virtual bool QueryClose(); void StateChanged( StateChangedType nType ) SAL_OVERRIDE; void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -148,11 +148,11 @@ private : sal_uInt32 nResId; - sal_Bool bHideResetBtn; - sal_Bool bModal; - sal_Bool bInOK; - sal_Bool bModified; - sal_Bool bItemsReset; + bool bHideResetBtn; + bool bModal; + bool bInOK; + bool bModified; + bool bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); DECL_LINK(OkHdl, void *); @@ -161,9 +161,9 @@ private : IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); - sal_Bool OK_Impl(); + bool OK_Impl(); - void SetPosSizeCtrls ( sal_Bool bInit = sal_False ); + void SetPosSizeCtrls ( bool bInit = false ); void SetPosSizePages ( sal_uInt16 nId ); void FocusOnIcon ( sal_uInt16 nId ); @@ -180,7 +180,7 @@ protected : const SfxItemSet* GetRefreshedSet(); void ActivatePageImpl (); - sal_Bool DeActivatePageImpl (); + bool DeActivatePageImpl (); void ResetPageImpl (); short Ok(); @@ -199,7 +199,7 @@ public : SvxIconChoiceCtrlEntry* AddTabPage( sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, - sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = TREELIST_APPEND ); + bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND ); void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } sal_uInt16 GetCurPageId() const { return mnCurrentPageId; } @@ -218,8 +218,8 @@ public : HelpButton& GetHelpButton() { return aHelpBtn; } short Execute() SAL_OVERRIDE; - void Start( sal_Bool bShow = sal_True ); - sal_Bool QueryClose(); + void Start( bool bShow = true ); + bool QueryClose(); const SfxItemSet* GetExampleSet() const { return pExampleSet; } diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index a612bbc80f5c..bd793a7b0ece 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -51,7 +51,7 @@ public: com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() { return m_xObj; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); - virtual sal_Bool IsCreateNew() const; + virtual bool IsCreateNew() const; }; class SvInsertOleDlg : public InsertObjectDialog_Impl @@ -77,9 +77,9 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return *m_pLbObjecttype; } OUString GetFilePath() const { return m_pEdFilepath->GetText(); } - sal_Bool IsLinked() const + bool IsLinked() const { return m_pCbFilelink->IsChecked(); } - sal_Bool IsCreateNew() const SAL_OVERRIDE + bool IsCreateNew() const SAL_OVERRIDE { return m_pRbNewObject->IsChecked(); } public: diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 2dc5c13447bb..9c85d7ba00bf 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -53,11 +53,11 @@ private: short nCaptionType; sal_Int32 nGap; short nEscDir; - sal_Bool bEscRel; + bool bEscRel; sal_Int32 nEscAbs; sal_Int32 nEscRel; sal_Int32 nLineLen; - sal_Bool bFitLineLen; + bool bFitLineLen; sal_uInt16 nAnsatzRelPos; sal_uInt16 nAnsatzTypePos; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 538a00793ffb..467ecba7ee61 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -70,7 +70,7 @@ class SvBaseLinksDlg : public ModalDialog OUString aStrCloselinkmsgMulti; OUString aStrWaitinglink; sfx2::LinkManager* pLinkMgr; - sal_Bool bHtmlMode; + bool bHtmlMode; Timer aUpdateTimer; DECL_LINK( LinksSelectHdl, SvTabListBox * ); @@ -86,7 +86,7 @@ class SvBaseLinksDlg : public ModalDialog sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); OUString ImplGetStateStr( const sfx2::SvBaseLink& ); void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, sal_uInt16 nType ); - void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uLong nPos = TREELIST_APPEND, sal_Bool bSelect = sal_False); + void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uLong nPos = TREELIST_APPEND, bool bSelect = false); void StartUpdateTimer() { aUpdateTimer.Start(); } @@ -112,7 +112,7 @@ class SvBaseLinksDlg : public ModalDialog void SetManager( sfx2::LinkManager* ); public: - SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, sal_Bool bHtml = sal_False ); + SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, bool bHtml = false ); virtual ~SvBaseLinksDlg(); void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index cdb5ab8e5be8..e8848a59acdf 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -89,7 +89,7 @@ public: virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void DisplayAppEvents( bool appEvents); - void SetReadOnly( sal_Bool bSet ); + void SetReadOnly( bool bSet ); bool IsReadOnly() const SAL_OVERRIDE; }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 7aea469a2fe7..8ce7f1bf0727 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -55,7 +55,7 @@ private: const SdrView* pView; SfxMapUnit eUnit; - sal_Bool bPositionModified; + bool bPositionModified; void FillUnitLB(); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 5955bb4bc074..5ff2baee62be 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -48,7 +48,7 @@ private: Color aPrevCol; sal_Int32 mnPos; sal_Unicode mnChar; - void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); + void InitSettings( bool bForeground, bool bBackground ); protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -83,7 +83,7 @@ public: { SetInfoItem( rItem ); } void SetOkHdl( const Link& rOkHandler ); - void HideLanguage(sal_Bool nFlag=sal_True); + void HideLanguage(bool nFlag=true); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; private: @@ -122,8 +122,8 @@ private: sal_uLong nInitFormat; Link fnOkHdl; - sal_Bool bNumItemFlag; ///< for handling with DocShell - sal_Bool bOneAreaFlag; + bool bNumItemFlag; ///< for handling with DocShell + bool bOneAreaFlag; short nFixedCategory; OUString sAutomaticEntry; @@ -133,15 +133,15 @@ private: void Init_Impl(); void FillCurrencyBox(); void FillFormatListBox_Impl( std::vector<OUString>& rEntries ); - void UpdateOptions_Impl( sal_Bool bCheckCatChange ); - void UpdateFormatListBox_Impl( sal_uInt16 bCat, sal_Bool bUpdateEdit ); + void UpdateOptions_Impl( bool bCheckCatChange ); + void UpdateFormatListBox_Impl( sal_uInt16 bCat, bool bUpdateEdit ); void Obstructing(); void EnableBySourceFormat_Impl(); void SetCategory( sal_uInt16 nPos ); OUString GetExpColorString( Color*& rpPreviewColor, const OUString& aFormatStr, short nTmpCatPos ); void MakePreviewText( const OUString& rFormat ); void ChangePreviewText( sal_uInt16 nPos ); - void AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect); + void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); // Handler DECL_LINK( LostFocusHdl_Impl, Edit* pEd ); DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index b3124adad1c4..b4714a566e56 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -44,7 +44,7 @@ class SvxNumberingPreview : public Window Font aStdFont; long nPageWidth; const OUString* pOutlineNames; - sal_Bool bPosition; + bool bPosition; sal_uInt16 nActLevel; protected: @@ -60,7 +60,7 @@ class SvxNumberingPreview : public Window void SetOutlineNames(const OUString* pNames) {pOutlineNames = pNames;} void SetPositionMode() - { bPosition = sal_True;} + { bPosition = true;} void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} }; @@ -95,8 +95,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage SvxNumRule* pActNum; SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; OUString sNumCharFmtName; sal_uInt16 nNumItemId; @@ -133,8 +133,8 @@ class SvxBulletPickTabPage : public SfxTabPage SvxNumRule* pActNum; SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; sal_uInt16 nNumItemId; OUString sBulletCharFmtName; @@ -176,8 +176,8 @@ class SvxNumPickTabPage : public SfxTabPage SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; sal_uInt16 nNumItemId; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; protected: @@ -221,8 +221,8 @@ class SvxBitmapPickTabPage : public SfxTabPage sal_uInt16 nActNumLvl; sal_uInt16 nNumItemId; SfxMapUnit eCoreUnit; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; protected: DECL_LINK(NumSelectHdl_Impl, void *); @@ -300,12 +300,12 @@ class SvxNumOptionsTabPage : public SfxTabPage Size aInitSize[SVX_MAX_NUM]; - sal_Bool bLastWidthModified : 1; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; - sal_Bool bAutomaticCharStyles: 1; - sal_Bool bHTMLMode : 1; - sal_Bool bMenuButtonInitialized : 1; + bool bLastWidthModified : 1; + bool bModified : 1; + bool bPreset : 1; + bool bAutomaticCharStyles: 1; + bool bHTMLMode : 1; + bool bMenuButtonInitialized : 1; std::vector<OUString> aGrfNames; Font aActBulletFont; @@ -320,7 +320,7 @@ class SvxNumOptionsTabPage : public SfxTabPage 0 - Number; 1 - Bullet; 2 - Bitmap; */ - void SwitchNumberType( sal_uInt8 nType, sal_Bool bBmp = sal_False ); + void SwitchNumberType( sal_uInt8 nType, bool bBmp = false ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); @@ -362,7 +362,7 @@ class SvxNumOptionsTabPage : public SfxTabPage void SetMetric(FieldUnit eSet); ListBox& GetCharFmtListBox() {return *m_pCharFmtLB;} - void SetModified(sal_Bool bRepaint = sal_True); + void SetModified(bool bRepaint = true); virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; /** Get the numberings provided by the i18n framework (CTL, Asian, ...) and @@ -423,9 +423,9 @@ class SvxNumPositionTabPage : public SfxTabPage sal_uInt16 nNumItemId; SfxMapUnit eCoreUnit; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; - sal_Bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on + bool bModified : 1; + bool bPreset : 1; + bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on bool bLabelAlignmentPosAndSpaceModeActive; void InitControls(); @@ -458,7 +458,7 @@ public: const SfxItemSet& rAttrSet); void SetMetric(FieldUnit eSet); - void SetModified(sal_Bool bRepaint = sal_True); + void SetModified(bool bRepaint = true); virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 24b8c896e060..4e0a5779b2da 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -77,18 +77,18 @@ public: class SvxDictEdit : public Edit { Link aActionLink; - sal_Bool bSpaces; + bool bSpaces; public: SvxDictEdit(Window* pParent, const ResId& rResId) : - Edit(pParent, rResId), bSpaces(sal_False){} + Edit(pParent, rResId), bSpaces(false){} SvxDictEdit(Window* pParent, WinBits aWB) : - Edit(pParent, aWB), bSpaces(sal_False){} + Edit(pParent, aWB), bSpaces(false){} void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(sal_Bool bSet) + void SetSpaces(bool bSet) {bSpaces = bSet;} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; @@ -123,9 +123,9 @@ private: short nOld; long nWidth; - sal_Bool bFirstSelect; - sal_Bool bDoNothing; - sal_Bool bDicIsReadonly; + bool bFirstSelect; + bool bDoNothing; + bool bDicIsReadonly; DECL_LINK(SelectBookHdl_Impl, void *); DECL_LINK(SelectLangHdl_Impl, void *); @@ -136,7 +136,7 @@ private: void ShowWords_Impl( sal_uInt16 nId ); void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); - sal_Bool IsDicReadonly_Impl() const { return bDicIsReadonly; } + bool IsDicReadonly_Impl() const { return bDicIsReadonly; } void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &xDic ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 15f276eca52a..5e1556cffc2a 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -64,7 +64,7 @@ private: DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, - OUString& _rUserPath, OUString& _rWritablePath, sal_Bool& _rReadOnly ); + OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ); void SetPathList( sal_uInt16 _nPathHandle, const OUString& _rUserPath, const OUString& _rWritablePath ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 29bf0b3fe6ab..a5881b996557 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -131,7 +131,7 @@ class SvxPageDescPage : public SfxTabPage long nLastBottomMargin; Size aMaxSize; - sal_Bool bLandscape; + bool bLandscape; bool bBorderModified; SvxModeType eMode; Paper ePaperStart; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index ca4c06e87a7d..7b74fcf632b1 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -81,12 +81,12 @@ private: long nAbst; long nWidth; long nMinFixDist; - sal_Bool bRelativeMode; - sal_Bool bNegativeIndents; + bool bRelativeMode; + bool bNegativeIndents; void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); void Init_Impl(); - void UpdateExample_Impl( sal_Bool bAll = sal_False ); + void UpdateExample_Impl( bool bAll = false ); DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK(ModifyHdl_Impl, void *); @@ -151,7 +151,7 @@ class SvxParaAlignTabPage : public SfxTabPage DECL_LINK(LastLineHdl_Impl, void *); DECL_LINK(TextDirectionHdl_Impl, void *); - void UpdateExample_Impl( sal_Bool bAll = sal_False ); + void UpdateExample_Impl( bool bAll = false ); SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxParaAlignTabPage(); @@ -239,8 +239,8 @@ private: NumericField* m_pWidowRowNo; FixedText* m_pWidowRowLabel; - sal_Bool bPageBreak; - sal_Bool bHtmlMode; + bool bPageBreak; + bool bHtmlMode; sal_uInt16 nStdPos; DECL_LINK(PageBreakHdl_Impl, void *); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 046beac90282..8a25529541f8 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -57,7 +57,7 @@ public: void SetNextHdl( const Link& rLink ) { aNextHdlLink = rLink; } - void EnableTravel(sal_Bool bNext, sal_Bool bPrev); + void EnableTravel(bool bNext, bool bPrev); OUString GetNote() { return m_pEditED->GetText(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 8e46d945ced0..f51c2f6dd365 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -160,7 +160,7 @@ protected: DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); + bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index c2ba86fb2ddd..8a8a9de478d6 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -45,7 +45,7 @@ struct SvxGroupInfo_Impl xBrowseNode; OUString sURL; OUString sHelpText; - sal_Bool bWasOpened; + bool bWasOpened; SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr ) :nKind( n ) @@ -53,7 +53,7 @@ struct SvxGroupInfo_Impl ,xBrowseNode() ,sURL() ,sHelpText() - ,bWasOpened(sal_False) + ,bWasOpened(false) { } @@ -63,7 +63,7 @@ struct SvxGroupInfo_Impl ,xBrowseNode( _rxNode ) ,sURL() ,sHelpText() - ,bWasOpened(sal_False) + ,bWasOpened(false) { } @@ -73,7 +73,7 @@ struct SvxGroupInfo_Impl ,xBrowseNode() ,sURL( _rURL ) ,sHelpText( _rHelpText ) - ,bWasOpened(sal_False) + ,bWasOpened(false) { } }; @@ -157,7 +157,7 @@ private: protected: virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; - virtual sal_Bool Expand( SvTreeListEntry* pParent ); + virtual bool Expand( SvTreeListEntry* pParent ); public: SvxConfigGroupListBox(Window* pParent, WinBits nStyle); @@ -166,7 +166,7 @@ public: void Init(bool bShowSlots, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame); - void Open( SvTreeListEntry*, sal_Bool ); + void Open( SvTreeListEntry*, bool ); void ClearAll(); void GroupSelected(); @@ -186,7 +186,7 @@ class SvxScriptSelectorDialog : public ModelessDialog PushButton* m_pCancelButton; VclMultiLineEdit* m_pDescriptionText; OUString m_sDefaultDesc; - sal_Bool m_bShowSlots; + bool m_bShowSlots; Link m_aAddHdl; DECL_LINK( ClickHdl, Button * ); @@ -199,7 +199,7 @@ public: SvxScriptSelectorDialog ( Window* pParent = NULL, - sal_Bool bShowSlots = sal_False, + bool bShowSlots = false, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 0d1f4c141f6c..c81a79d86003 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -72,7 +72,7 @@ private: public: SvxSearchSimilarityDialog( Window* pParent, - sal_Bool bRelax, + bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ); @@ -80,7 +80,7 @@ public: sal_uInt16 GetOther() { return (sal_uInt16)m_pOtherFld->GetValue(); } sal_uInt16 GetShorter() { return (sal_uInt16)m_pShorterFld->GetValue(); } sal_uInt16 GetLonger() { return (sal_uInt16)m_pLongerFld->GetValue(); } - sal_Bool IsRelaxed() { return m_pRelaxBox->IsChecked(); } + bool IsRelaxed() { return m_pRelaxBox->IsChecked(); } }; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 9493c5be4697..b4fd273fe4fd 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -99,7 +99,7 @@ private: SvxTabStopItem aNewTabs; long nDefDist; FieldUnit eDefUnit; - sal_Bool bCheck; + bool bCheck; void InitTabPos_Impl( sal_uInt16 nPos = 0 ); void SetFillAndTabType_Impl(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 8381c93f8179..fe40f007123a 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -57,12 +57,12 @@ private: const SfxItemSet& rOutAttrs; const SdrView* pView; - sal_Bool bAutoGrowSizeEnabled; - sal_Bool bContourEnabled; - sal_Bool bAutoGrowWidthEnabled; - sal_Bool bAutoGrowHeightEnabled; - sal_Bool bWordWrapTextEnabled; - sal_Bool bFitToSizeEnabled; + bool bAutoGrowSizeEnabled; + bool bContourEnabled; + bool bAutoGrowWidthEnabled; + bool bAutoGrowHeightEnabled; + bool bWordWrapTextEnabled; + bool bFitToSizeEnabled; DECL_LINK( ClickFullWidthHdl_Impl, void * ); DECL_LINK( ClickHdl_Impl, void * ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index f5c57ead5f90..e698653efa56 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -28,7 +28,7 @@ class SfxShell; // static ---------------------------------------------------------------- -sal_Bool EnableSSO(); +bool EnableSSO(); CreateTabPage GetSSOCreator( void ); // struct OrderedEntry --------------------------------------------------- @@ -164,8 +164,8 @@ private: SfxItemSet* pColorPageItemSet; SvxColorTabPage *mpColorPage; - sal_Bool bForgetSelection; - sal_Bool bExternBrowserActive; + bool bForgetSelection; + bool bExternBrowserActive; bool bIsFromExtensionManager; // check "for the current document only" and set focus to "Western" languages box @@ -276,7 +276,7 @@ private: bool m_bIsWindowHidden; void CreateDialogWithHandler(); - sal_Bool DispatchAction( const OUString& rAction ); + bool DispatchAction( const OUString& rAction ); public: ExtensionsTabPage( diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 2942c0797daa..64c46b53ac42 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -45,7 +45,7 @@ private: const SfxItemSet& rSet; SfxItemSet* pOutSet; - sal_Bool bModified; + bool bModified; DECL_LINK( UserHdl, RadioButton* ); DECL_LINK(SpinHdl, void *); |