diff options
| -rw-r--r-- | include/svtools/tabbar.hxx | 100 | ||||
| -rw-r--r-- | include/svtools/templatefoldercache.hxx | 6 | ||||
| -rw-r--r-- | include/svtools/templdlg.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/toolboxcontroller.hxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/doctempl.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/templwin.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/tabbar.cxx | 206 | ||||
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 86 | ||||
| -rw-r--r-- | svtools/source/uno/generictoolboxcontroller.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 34 |
10 files changed, 225 insertions, 225 deletions
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 8bdc26a66911..ca025cc86396 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -349,24 +349,24 @@ private: long mnOffY; long mnLastOffX; long mnSplitSize; - sal_uLong mnSwitchTime; + sal_uLong mnSwitchTime; WinBits mnWinStyle; - sal_uInt16 mnCurPageId; - sal_uInt16 mnFirstPos; - sal_uInt16 mnDropPos; - sal_uInt16 mnSwitchId; - sal_uInt16 mnEditId; - sal_Bool mbFormat; - sal_Bool mbFirstFormat; - sal_Bool mbSizeFormat; - sal_Bool mbAutoMaxWidth; - sal_Bool mbInSwitching; - sal_Bool mbAutoEditMode; - sal_Bool mbEditCanceled; - sal_Bool mbDropPos; - sal_Bool mbInSelect; - sal_Bool mbSelColor; - sal_Bool mbSelTextColor; + sal_uInt16 mnCurPageId; + sal_uInt16 mnFirstPos; + sal_uInt16 mnDropPos; + sal_uInt16 mnSwitchId; + sal_uInt16 mnEditId; + bool mbFormat; + bool mbFirstFormat; + bool mbSizeFormat; + bool mbAutoMaxWidth; + bool mbInSwitching; + bool mbAutoEditMode; + bool mbEditCanceled; + bool mbDropPos; + bool mbInSelect; + bool mbSelColor; + bool mbSelTextColor; bool mbMirrored; bool mbHasInsertTab; // if true, the tab bar has an extra tab at the end. bool mbScrollAlwaysEnabled; @@ -383,18 +383,18 @@ private: using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bBackground ); + SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bBackground ); SVT_DLLPRIVATE void ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, Color& rSelectColor, Color& rSelectTextColor ); SVT_DLLPRIVATE void ImplShowPage( sal_uInt16 nPos ); - SVT_DLLPRIVATE sal_Bool ImplCalcWidth(); + SVT_DLLPRIVATE bool ImplCalcWidth(); SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE sal_uInt16 ImplGetLastFirstPos(); + SVT_DLLPRIVATE sal_uInt16 ImplGetLastFirstPos(); SVT_DLLPRIVATE void ImplInitControls(); SVT_DLLPRIVATE void ImplEnableControls(); - SVT_DLLPRIVATE void ImplSelect(); - SVT_DLLPRIVATE void ImplActivatePage(); - SVT_DLLPRIVATE long ImplDeactivatePage(); + SVT_DLLPRIVATE void ImplSelect(); + SVT_DLLPRIVATE void ImplActivatePage(); + SVT_DLLPRIVATE long ImplDeactivatePage(); SVT_DLLPRIVATE void ImplPrePaint(); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem) const; @@ -439,50 +439,50 @@ public: Color GetTabBgColor( sal_uInt16 nPageId ) const; void SetTabBgColor( sal_uInt16 nPageId, const Color& aTabBgColor ); - sal_Bool IsDefaultTabBgColor( sal_uInt16 nPageId ); + bool IsDefaultTabBgColor( sal_uInt16 nPageId ); void Clear(); - sal_Bool IsPageEnabled( sal_uInt16 nPageId ) const; + bool IsPageEnabled( sal_uInt16 nPageId ) const; void SetPageBits( sal_uInt16 nPageId, TabBarPageBits nBits = 0 ); TabBarPageBits GetPageBits( sal_uInt16 nPageId ) const; - sal_uInt16 GetPageCount() const; - sal_uInt16 GetPageId( sal_uInt16 nPos ) const; - sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const; - sal_uInt16 GetPageId( const Point& rPos, bool bCheckInsTab = false ) const; + sal_uInt16 GetPageCount() const; + sal_uInt16 GetPageId( sal_uInt16 nPos ) const; + sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const; + sal_uInt16 GetPageId( const Point& rPos, bool bCheckInsTab = false ) const; Rectangle GetPageRect( sal_uInt16 nPageId ) const; // returns the rectangle in which page tabs are drawn Rectangle GetPageArea() const; void SetCurPageId( sal_uInt16 nPageId ); - sal_uInt16 GetCurPageId() const { return mnCurPageId; } + sal_uInt16 GetCurPageId() const { return mnCurPageId; } void SetFirstPageId( sal_uInt16 nPageId ); - sal_uInt16 GetFirstPageId() const { return GetPageId( mnFirstPos ); } + sal_uInt16 GetFirstPageId() const { return GetPageId( mnFirstPos ); } void MakeVisible( sal_uInt16 nPageId ); - void SelectPage( sal_uInt16 nPageId, sal_Bool bSelect = sal_True ); - sal_uInt16 GetSelectPageCount() const; - sal_Bool IsPageSelected( sal_uInt16 nPageId ) const; + void SelectPage( sal_uInt16 nPageId, bool bSelect = true ); + sal_uInt16 GetSelectPageCount() const; + bool IsPageSelected( sal_uInt16 nPageId ) const; - void EnableAutoMaxPageWidth( sal_Bool bEnable = sal_True ) { mbAutoMaxWidth = bEnable; } - sal_Bool IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } + void EnableAutoMaxPageWidth( bool bEnable = true ) { mbAutoMaxWidth = bEnable; } + bool IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } void SetMaxPageWidth( long nMaxWidth ); long GetMaxPageWidth() const { return mnMaxPageWidth; } void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - sal_Bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } + bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } - void EnableEditMode( sal_Bool bEnable = sal_True ) { mbAutoEditMode = bEnable; } - sal_Bool IsEditModeEnabled() const { return mbAutoEditMode; } - sal_Bool StartEditMode( sal_uInt16 nPageId ); - void EndEditMode( sal_Bool bCancel = sal_False ); + void EnableEditMode( bool bEnable = true ) { mbAutoEditMode = bEnable; } + bool IsEditModeEnabled() const { return mbAutoEditMode; } + bool StartEditMode( sal_uInt16 nPageId ); + void EndEditMode( bool bCancel = false ); void SetEditText( const OUString& rText ) { maEditText = rText; } const OUString& GetEditText() const { return maEditText; } - sal_Bool IsInEditMode() const { return (mpEdit != NULL); } - sal_Bool IsEditModeCanceled() const { return mbEditCanceled; } - sal_uInt16 GetEditPageId() const { return mnEditId; } + bool IsInEditMode() const { return (mpEdit != NULL); } + bool IsEditModeCanceled() const { return mbEditCanceled; } + sal_uInt16 GetEditPageId() const { return mnEditId; } /** Mirrors the entire control including position of buttons and splitter. Mirroring is done relative to the current direction of the GUI. @@ -500,17 +500,17 @@ public: /** Returns true, if the control draws from right to left (see SetEffectiveRTL()). */ bool IsEffectiveRTL() const; - sal_Bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); - sal_uInt16 ShowDropPos( const Point& rPos ); + bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + sal_uInt16 ShowDropPos( const Point& rPos ); void HideDropPos(); - sal_Bool SwitchPage( const Point& rPos ); + bool SwitchPage( const Point& rPos ); void EndSwitchPage(); - sal_Bool IsInSwitching() { return mbInSwitching; } + bool IsInSwitching() { return mbInSwitching; } const Color& GetSelectColor() const { return maSelColor; } - sal_Bool IsSelectColor() const { return mbSelColor; } + bool IsSelectColor() const { return mbSelColor; } const Color& GetSelectTextColor() const { return maSelTextColor; } - sal_Bool IsSelectTextColor() const { return mbSelTextColor; } + bool IsSelectTextColor() const { return mbSelTextColor; } void SetPageText( sal_uInt16 nPageId, const OUString& rText ); OUString GetPageText( sal_uInt16 nPageId ) const; diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index b6f8ffd6b0a6..c01bfd02b24a 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -71,7 +71,7 @@ namespace svt If the current state is not known (e.g. because you did not call needsUpdate, which retrieves it), it is not retrieved in the dtor, regardless of the <arg>_bAutoStoreState</arg> flag. */ - TemplateFolderCache( sal_Bool _bAutoStoreState = sal_False ); + TemplateFolderCache( bool _bAutoStoreState = false ); ~TemplateFolderCache( ); /** determines whether or not the template configuration needs to be updated @@ -82,7 +82,7 @@ namespace svt @return <TRUE/> if the template configuration needs to be updated */ - sal_Bool needsUpdate( sal_Bool _bForceCheck = sal_False ); + bool needsUpdate( bool _bForceCheck = false ); /** stores the current state of the template folders in the cache @param _bForceRetrieval @@ -90,7 +90,7 @@ namespace svt Usually, you set this to <FALSE/>: After calling <method>needsUpdate</method>, the state is know and does not need to be read again. */ - void storeState( sal_Bool _bForceRetrieval = sal_False ); + void storeState( bool _bForceRetrieval = false ); }; diff --git a/include/svtools/templdlg.hxx b/include/svtools/templdlg.hxx index 81712509e4be..2e58f2bf3eaf 100644 --- a/include/svtools/templdlg.hxx +++ b/include/svtools/templdlg.hxx @@ -73,7 +73,7 @@ public: private: SVT_DLLPRIVATE void InitImpl( ); - SVT_DLLPRIVATE sal_Bool CanEnableEditBtn() const; + SVT_DLLPRIVATE bool CanEnableEditBtn() const; }; #endif // INCLUDED_SVTOOLS_TEMPLDLG_HXX diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 445cd4169b39..06127e027312 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -59,7 +59,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::comphelper::OPropertyArrayUsageHelper< ToolboxController > { private: - sal_Bool m_bSupportVisible; + bool m_bSupportVisible; public: ToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, @@ -124,7 +124,7 @@ class SVT_DLLPUBLIC ToolboxController : protected: bool getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox ); - void setSupportVisibleProperty(sal_Bool bValue); + void setSupportVisibleProperty(bool bValue); struct Listener { Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : @@ -161,13 +161,13 @@ class SVT_DLLPUBLIC ToolboxController : void removeStatusListener( const OUString& aCommandURL ); void bindListener(); void unbindListener(); - sal_Bool isBound() const; + bool isBound() const; // TODO remove ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; // TODO remove ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const; - sal_Bool m_bInitialized : 1, + bool m_bInitialized : 1, m_bDisposed : 1; sal_uInt16 m_nToolBoxId; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 832faee8dd6d..4e28700d2b47 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -1270,7 +1270,7 @@ SfxDocumentTemplates::~SfxDocumentTemplates() void SfxDocumentTemplates::Update( bool _bSmart ) { if ( !_bSmart // don't be smart - || ::svt::TemplateFolderCache( sal_True ).needsUpdate() // update is really necessary + || ::svt::TemplateFolderCache( true ).needsUpdate() // update is really necessary ) { if ( pImp->Construct() ) diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 39d6a828aff7..8f50356e71a0 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -1510,9 +1510,9 @@ SvtDocumentTemplateDialog::~SvtDocumentTemplateDialog() -sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const +bool SvtDocumentTemplateDialog::CanEnableEditBtn() const { - sal_Bool bEnable = sal_False; + bool bEnable = false; OUString aFolderURL = pImpl->pWin->GetFolderURL(); if ( pImpl->pWin->IsFileSelected() && !aFolderURL.isEmpty() ) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 1d1691fdcc1f..5da20690b624 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -54,10 +54,10 @@ struct ImplTabBarItem OUString maHelpText; Rectangle maRect; long mnWidth; - OString maHelpId; - sal_Bool mbShort; - sal_Bool mbSelect; - sal_Bool mbEnable; + OString maHelpId; + bool mbShort; + bool mbSelect; + bool mbEnable; Color maTabBgColor; Color maTabTextColor; @@ -68,9 +68,9 @@ struct ImplTabBarItem mnId = nItemId; mnBits = nPageBits; mnWidth = 0; - mbShort = sal_False; - mbSelect = sal_False; - mbEnable = sal_True; + mbShort = false; + mbSelect = false; + mbEnable = true; maTabBgColor = Color( COL_AUTO ); maTabTextColor = Color( COL_AUTO ); } @@ -254,7 +254,7 @@ class TabBarEdit : public Edit { private: Timer maLoseFocusTimer; - sal_Bool mbPostEvt; + bool mbPostEvt; DECL_LINK( ImplEndEditHdl, void* ); DECL_LINK( ImplEndTimerHdl, void* ); @@ -264,8 +264,8 @@ public: TabBar* GetParent() const { return (TabBar*)Window::GetParent(); } - void SetPostEvent() { mbPostEvt = sal_True; } - void ResetPostEvent() { mbPostEvt = sal_False; } + void SetPostEvent() { mbPostEvt = true; } + void ResetPostEvent() { mbPostEvt = false; } virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void LoseFocus(); @@ -276,7 +276,7 @@ public: TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) : Edit( pParent, nWinStyle ) { - mbPostEvt = sal_False; + mbPostEvt = false; } @@ -293,7 +293,7 @@ bool TabBarEdit::PreNotify( NotifyEvent& rNEvt ) if ( !mbPostEvt ) { if ( PostUserEvent( LINK( this, TabBarEdit, ImplEndEditHdl ), (void*)sal_False ) ) - mbPostEvt = sal_True; + mbPostEvt = true; } return true; } @@ -302,7 +302,7 @@ bool TabBarEdit::PreNotify( NotifyEvent& rNEvt ) if ( !mbPostEvt ) { if ( PostUserEvent( LINK( this, TabBarEdit, ImplEndEditHdl ), (void*)sal_True ) ) - mbPostEvt = sal_True; + mbPostEvt = true; } return true; } @@ -319,7 +319,7 @@ void TabBarEdit::LoseFocus() if ( !mbPostEvt ) { if ( PostUserEvent( LINK( this, TabBarEdit, ImplEndEditHdl ), (void*)sal_False ) ) - mbPostEvt = sal_True; + mbPostEvt = true; } Edit::LoseFocus(); @@ -358,7 +358,7 @@ IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl) if ( HasChildPathFocus( true ) ) maLoseFocusTimer.Start(); else - GetParent()->EndEditMode( sal_True ); + GetParent()->EndEditMode( true ); return 0; } @@ -407,17 +407,17 @@ void TabBar::ImplInit( WinBits nWinStyle ) mnDropPos = 0; mnSwitchId = 0; mnEditId = 0; - mbFormat = sal_True; - mbFirstFormat = sal_True; - mbSizeFormat = sal_True; - mbAutoMaxWidth = sal_True; - mbInSwitching = sal_False; - mbAutoEditMode = sal_False; - mbEditCanceled = sal_False; - mbDropPos = sal_False; - mbInSelect = sal_False; - mbSelColor = sal_False; - mbSelTextColor = sal_False; + mbFormat = true; + mbFirstFormat = true; + mbSizeFormat = true; + mbAutoMaxWidth = true; + mbInSwitching = false; + mbAutoEditMode = false; + mbEditCanceled = false; + mbDropPos = false; + mbInSelect = false; + mbSelColor = false; + mbSelTextColor = false; mbMirrored = false; mbMirrored = false; mbScrollAlwaysEnabled = false; @@ -437,7 +437,7 @@ void TabBar::ImplInit( WinBits nWinStyle ) mpLastBtn->SetAccessibleName(SVT_RESSTR(STR_TABBAR_PUSHBUTTON_MOVETOEND)); SetSizePixel( Size( 100, CalcWindowSizePixel().Height() ) ); - ImplInitSettings( sal_True, sal_True ); + ImplInitSettings( true, true ); } @@ -453,7 +453,7 @@ TabBar::TabBar( Window* pParent, WinBits nWinStyle ) : TabBar::~TabBar() { - EndEditMode( sal_True ); + EndEditMode( true ); // Controls loeschen if ( mpPrevBtn ) @@ -501,7 +501,7 @@ ImplTabBarItem* TabBar::next() -void TabBar::ImplInitSettings( sal_Bool bFont, sal_Bool bBackground ) +void TabBar::ImplInitSettings( bool bFont, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -575,11 +575,11 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, -sal_Bool TabBar::ImplCalcWidth() +bool TabBar::ImplCalcWidth() { // Sizes should only be retrieved if the text or the font was changed if ( !mbSizeFormat ) - return sal_False; + return false; // retrieve width of tabs with bold font Font aFont = GetFont(); @@ -602,28 +602,28 @@ sal_Bool TabBar::ImplCalcWidth() else mnCurMaxWidth = 0; - sal_Bool bChanged = sal_False; + bool bChanged = false; for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) { ImplTabBarItem* pItem = (*mpItemList)[ i ]; long nNewWidth = GetTextWidth( pItem->maText ); if ( mnCurMaxWidth && (nNewWidth > mnCurMaxWidth) ) { - pItem->mbShort = sal_True; + pItem->mbShort = true; nNewWidth = mnCurMaxWidth; } else - pItem->mbShort = sal_False; + pItem->mbShort = false; nNewWidth += TABBAR_OFFSET_X+TABBAR_OFFSET_X2; if ( pItem->mnWidth != nNewWidth ) { pItem->mnWidth = nNewWidth; if ( !pItem->maRect.IsEmpty() ) - bChanged = sal_True; + bChanged = true; } } - mbSizeFormat = sal_False; - mbFormat = sal_True; + mbSizeFormat = false; + mbFormat = true; return bChanged; } @@ -669,7 +669,7 @@ void TabBar::ImplFormat() n++; } - mbFormat = sal_False; + mbFormat = false; // enable/disable button ImplEnableControls(); @@ -773,7 +773,7 @@ void TabBar::ImplEnableControls() return; // enable/disable buttons - sal_Bool bEnableBtn = mbScrollAlwaysEnabled || mnFirstPos > 0; + bool bEnableBtn = mbScrollAlwaysEnabled || mnFirstPos > 0; if ( mpFirstBtn ) mpFirstBtn->Enable( bEnableBtn ); if ( mpPrevBtn ) @@ -854,7 +854,7 @@ IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn ) void TabBar::MouseMove( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeaveWindow() ) - mbInSelect = sal_False; + mbInSelect = false; Window::MouseMove( rMEvt ); } @@ -891,7 +891,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) ImplActivatePage(); ImplSelect(); } - mbInSelect = sal_True; + mbInSelect = true; } } return; @@ -907,8 +907,8 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) { if ( nSelId ) { - sal_uInt16 nPos = GetPagePos( nSelId ); - sal_Bool bSelectTab = sal_False; + sal_uInt16 nPos = GetPagePos( nSelId ); + bool bSelectTab = false; pItem = (*mpItemList)[ nPos ]; if ( pItem->mbEnable ) @@ -918,14 +918,14 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( nSelId != mnCurPageId ) { SelectPage( nSelId, !IsPageSelected( nSelId ) ); - bSelectTab = sal_True; + bSelectTab = true; } } else if ( mnWinStyle & (WB_MULTISELECT | WB_RANGESELECT) ) { - bSelectTab = sal_True; + bSelectTab = true; sal_uInt16 n; - sal_Bool bSelect; + bool bSelect; sal_uInt16 nCurPos = GetPagePos( mnCurPageId ); if ( nPos <= nCurPos ) { @@ -937,9 +937,9 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) { pItem = (*mpItemList)[ n ]; if ( n < nPos ) - bSelect = sal_False; + bSelect = false; else - bSelect = sal_True; + bSelect = true; if ( pItem->mbSelect != bSelect ) { @@ -964,9 +964,9 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) pItem = (*mpItemList)[ n ]; if ( n <= nPos ) - bSelect = sal_True; + bSelect = true; else - bSelect = sal_False; + bSelect = false; if ( pItem->mbSelect != bSelect ) { @@ -990,7 +990,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) } else ImplShowPage( nPos ); - mbInSelect = sal_True; + mbInSelect = true; return; } @@ -1026,9 +1026,9 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( !pItem->mbSelect ) { // make not valid - sal_Bool bUpdate = sal_False; + bool bUpdate = false; if ( IsReallyVisible() && IsUpdateMode() ) - bUpdate = sal_True; + bUpdate = true; // deselect all selected items for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) @@ -1036,7 +1036,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) pItem = (*mpItemList)[ i ]; if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) { - pItem->mbSelect = sal_False; + pItem->mbSelect = false; if ( bUpdate ) Invalidate( pItem->maRect ); } @@ -1053,7 +1053,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) } else ImplShowPage( nPos ); - mbInSelect = sal_True; + mbInSelect = true; } return; @@ -1067,7 +1067,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) void TabBar::MouseButtonUp( const MouseEvent& rMEvt ) { - mbInSelect = sal_False; + mbInSelect = false; Window::MouseButtonUp( rMEvt ); } @@ -1485,7 +1485,7 @@ void TabBar::Resize() // order the scroll buttons long nHeight = aNewSize.Height(); // adapt font height? - ImplInitSettings( sal_True, sal_False ); + ImplInitSettings( true, false ); long nX = mbMirrored ? (aNewSize.Width()-nHeight) : 0; long nXDiff = mbMirrored ? -nHeight : nHeight; @@ -1531,7 +1531,7 @@ void TabBar::Resize() } // reformat - mbSizeFormat = sal_True; + mbSizeFormat = true; if ( IsReallyVisible() ) { if ( ImplCalcWidth() ) @@ -1544,7 +1544,7 @@ void TabBar::Resize() if ( mnFirstPos > nLastFirstPos ) { mnFirstPos = nLastFirstPos; - mbFormat = sal_True; + mbFormat = true; Invalidate(); } // Ensure the currently selected page is visible @@ -1639,14 +1639,14 @@ void TabBar::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False ); + ImplInitSettings( true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) Invalidate(); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_True ); + ImplInitSettings( false, true ); Invalidate(); } else if ( nType == STATE_CHANGE_MIRRORING ) @@ -1672,7 +1672,7 @@ void TabBar::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True ); + ImplInitSettings( true, true ); Invalidate(); } } @@ -1748,7 +1748,7 @@ void TabBar::ImplPrePaint() // assure the actual tabpage becomes visible at first format if ( mbFirstFormat ) { - mbFirstFormat = sal_False; + mbFirstFormat = false; if ( mnCurPageId && (mnFirstPos == 0) && !mbDropPos ) { @@ -1756,9 +1756,9 @@ void TabBar::ImplPrePaint() if ( pItem->maRect.IsEmpty() ) { // set mbDropPos (or misuse) to prevent Invalidate() - mbDropPos = sal_True; + mbDropPos = true; SetFirstPageId( mnCurPageId ); - mbDropPos = sal_False; + mbDropPos = false; if ( mnFirstPos != 0 ) ImplFormat(); } @@ -1873,7 +1873,7 @@ void TabBar::InsertPage( sal_uInt16 nPageId, const OUString& rText, } else { mpItemList->push_back( pItem ); } - mbSizeFormat = sal_True; + mbSizeFormat = true; // set CurPageId if required if ( !mnCurPageId ) @@ -1999,7 +1999,7 @@ void TabBar::Clear() mpItemList->clear(); // remove items from the list - mbSizeFormat = sal_True; + mbSizeFormat = true; mnCurPageId = 0; mnFirstPos = 0; maCurrentItemList = 0; @@ -2013,14 +2013,14 @@ void TabBar::Clear() -sal_Bool TabBar::IsPageEnabled( sal_uInt16 nPageId ) const +bool TabBar::IsPageEnabled( sal_uInt16 nPageId ) const { sal_uInt16 nPos = GetPagePos( nPageId ); if ( nPos != PAGE_NOT_FOUND ) return (*mpItemList)[ nPos ]->mbEnable; else - return sal_False; + return false; } @@ -2129,9 +2129,9 @@ void TabBar::SetCurPageId( sal_uInt16 nPageId ) return; // make invalide - sal_Bool bUpdate = sal_False; + bool bUpdate = false; if ( IsReallyVisible() && IsUpdateMode() ) - bUpdate = sal_True; + bUpdate = true; ImplTabBarItem* pItem = (*mpItemList)[ nPos ]; ImplTabBarItem* pOldItem; @@ -2147,12 +2147,12 @@ void TabBar::SetCurPageId( sal_uInt16 nPageId ) { sal_uInt16 nSelPageCount = GetSelectPageCount(); if ( nSelPageCount == 1 ) - pOldItem->mbSelect = sal_False; - pItem->mbSelect = sal_True; + pOldItem->mbSelect = false; + pItem->mbSelect = true; } mnCurPageId = nPageId; - mbFormat = sal_True; + mbFormat = true; // assure the actual page becomes visible if ( IsReallyVisible() ) @@ -2226,7 +2226,7 @@ void TabBar::MakeVisible( sal_uInt16 nPageId ) if ( mbFormat || pItem->maRect.IsEmpty() ) { - mbFormat = sal_True; + mbFormat = true; ImplFormat(); } @@ -2257,7 +2257,7 @@ void TabBar::SetFirstPageId( sal_uInt16 nPageId ) { sal_uInt16 nPos = GetPagePos( nPageId ); - // return sal_False if item does not exist + // return false if item does not exist if ( nPos != PAGE_NOT_FOUND ) { if ( nPos != mnFirstPos ) @@ -2274,7 +2274,7 @@ void TabBar::SetFirstPageId( sal_uInt16 nPageId ) if ( nNewPos != mnFirstPos ) { mnFirstPos = nNewPos; - mbFormat = sal_True; + mbFormat = true; // redraw bar (attention: check mbDropPos, // as if this flag was set, we do not re-paint immediately @@ -2287,7 +2287,7 @@ void TabBar::SetFirstPageId( sal_uInt16 nPageId ) -void TabBar::SelectPage( sal_uInt16 nPageId, sal_Bool bSelect ) +void TabBar::SelectPage( sal_uInt16 nPageId, bool bSelect ) { sal_uInt16 nPos = GetPagePos( nPageId ); @@ -2323,22 +2323,22 @@ sal_uInt16 TabBar::GetSelectPageCount() const -sal_Bool TabBar::IsPageSelected( sal_uInt16 nPageId ) const +bool TabBar::IsPageSelected( sal_uInt16 nPageId ) const { sal_uInt16 nPos = GetPagePos( nPageId ); if ( nPos != PAGE_NOT_FOUND ) return (*mpItemList)[ nPos ]->mbSelect; else - return sal_False; + return false; } -sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId ) +bool TabBar::StartEditMode( sal_uInt16 nPageId ) { sal_uInt16 nPos = GetPagePos( nPageId ); if ( mpEdit || (nPos == PAGE_NOT_FOUND) || (mnLastOffX < 8) ) - return sal_False; + return false; mnEditId = nPageId; if ( StartRenaming() ) @@ -2390,23 +2390,23 @@ sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId ) mpEdit->GrabFocus(); mpEdit->SetSelection( Selection( 0, mpEdit->GetText().getLength() ) ); mpEdit->Show(); - return sal_True; + return true; } else { mnEditId = 0; - return sal_False; + return false; } } -void TabBar::EndEditMode( sal_Bool bCancel ) +void TabBar::EndEditMode( bool bCancel ) { if ( mpEdit ) { // call hdl - sal_Bool bEnd = sal_True; + bool bEnd = true; mbEditCanceled = bCancel; maEditText = mpEdit->GetText(); mpEdit->SetPostEvent(); @@ -2416,9 +2416,9 @@ void TabBar::EndEditMode( sal_Bool bCancel ) if ( nAllowRenaming == TABBAR_RENAMING_YES ) SetPageText( mnEditId, maEditText ); else if ( nAllowRenaming == TABBAR_RENAMING_NO ) - bEnd = sal_False; + bEnd = false; else // nAllowRenaming == TABBAR_RENAMING_CANCEL - mbEditCanceled = sal_True; + mbEditCanceled = true; } // renaming not allowed, than reset edit data @@ -2473,7 +2473,7 @@ void TabBar::SetMaxPageWidth( long nMaxWidth ) if ( mnMaxPageWidth != nMaxWidth ) { mnMaxPageWidth = nMaxWidth; - mbSizeFormat = sal_True; + mbSizeFormat = true; // redraw bar if ( IsReallyVisible() && IsUpdateMode() ) @@ -2489,7 +2489,7 @@ void TabBar::SetPageText( sal_uInt16 nPageId, const OUString& rText ) if ( nPos != PAGE_NOT_FOUND ) { (*mpItemList)[ nPos ]->maText = rText; - mbSizeFormat = sal_True; + mbSizeFormat = true; // redraw bar if ( IsReallyVisible() && IsUpdateMode() ) @@ -2542,10 +2542,10 @@ OString TabBar::GetHelpId( sal_uInt16 nPageId ) const -sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) +bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) { if ( !(mnWinStyle & WB_DRAG) || (rCEvt.GetCommand() != COMMAND_STARTDRAG) ) - return sal_False; + return false; // Check if the clicked page was selected. If this is not the case // set it as actual entry. We check for this only at a mouse action @@ -2558,7 +2558,7 @@ sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) // do not start dragging if no entry was clicked if ( !nSelId ) - return sal_False; + return false; // check if page was selected. If not set it as actual // page and call Select() @@ -2572,17 +2572,17 @@ sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) ImplSelect(); } else - return sal_False; + return false; } } - mbInSelect = sal_False; + mbInSelect = false; Region aRegion; // assign region rRegion = aRegion; - return sal_True; + return true; } @@ -2635,7 +2635,7 @@ sal_uInt16 TabBar::ShowDropPos( const Point& rPos ) if ( mbDropPos ) HideDropPos(); - mbDropPos = sal_True; + mbDropPos = true; mnDropPos = nNewDropPos; if ( nScroll ) @@ -2726,16 +2726,16 @@ void TabBar::HideDropPos() SetClipRegion(); } - mbDropPos = sal_False; + mbDropPos = false; mnDropPos = 0; } } -sal_Bool TabBar::SwitchPage( const Point& rPos ) +bool TabBar::SwitchPage( const Point& rPos ) { - sal_Bool bSwitch = sal_False; + bool bSwitch = false; sal_uInt16 nSwitchId = GetPageId( rPos ); if ( !nSwitchId ) EndSwitchPage(); @@ -2753,16 +2753,16 @@ sal_Bool TabBar::SwitchPage( const Point& rPos ) { if ( Time::GetSystemTicks() > mnSwitchTime+500 ) { - mbInSwitching = sal_True; + mbInSwitching = true; if ( ImplDeactivatePage() ) { SetCurPageId( mnSwitchId ); Update(); ImplActivatePage(); ImplSelect(); - bSwitch = sal_True; + bSwitch = true; } - mbInSwitching = sal_False; + mbInSwitching = false; } } } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 548cab19c42b..fa058e818374 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -89,7 +89,7 @@ namespace svt } - sal_Bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) + bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) { return _rLHS.NanoSeconds == _rRHS.NanoSeconds && _rLHS.Seconds == _rRHS.Seconds @@ -102,7 +102,7 @@ namespace svt } - sal_Bool operator != ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) + bool operator != ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) { return !( _rLHS == _rRHS ); } @@ -449,48 +449,48 @@ namespace svt uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; SvStream* m_pCacheStream; - sal_Bool m_bNeedsUpdate : 1; - sal_Bool m_bKnowState : 1; - sal_Bool m_bValidCurrentState : 1; - sal_Bool m_bAutoStoreState : 1; + bool m_bNeedsUpdate : 1; + bool m_bKnowState : 1; + bool m_bValidCurrentState : 1; + bool m_bAutoStoreState : 1; public: - TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ); + TemplateFolderCacheImpl( bool _bAutoStoreState ); ~TemplateFolderCacheImpl( ); - sal_Bool needsUpdate( sal_Bool _bForceCheck ); - void storeState( sal_Bool _bForceRetrieval ); + bool needsUpdate( bool _bForceCheck ); + void storeState( bool _bForceRetrieval ); private: - sal_Bool openCacheStream( sal_Bool _bForRead ); + bool openCacheStream( bool _bForRead ); void closeCacheStream( ); /// read the state of the dirs from the cache file - sal_Bool readPreviousState(); + bool readPreviousState(); /// read the current state of the dirs - sal_Bool readCurrentState(); + bool readCurrentState(); OUString implParseSmart( const OUString& _rPath ); - sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); + bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); static OUString getCacheFileName(); static sal_Int32 getMagicNumber(); static void normalize( TemplateFolderContent& _rState ); // @return <TRUE/> if the states equal - static sal_Bool equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ); + static bool equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ); // late initialize m_xOfficeInstDirs uno::Reference< util::XOfficeInstallationDirectories > getOfficeInstDirs(); }; - TemplateFolderCacheImpl::TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ) + TemplateFolderCacheImpl::TemplateFolderCacheImpl( bool _bAutoStoreState ) :m_pCacheStream ( NULL ) - ,m_bNeedsUpdate ( sal_True ) - ,m_bKnowState ( sal_False ) - ,m_bValidCurrentState ( sal_False ) + ,m_bNeedsUpdate ( true ) + ,m_bKnowState ( false ) + ,m_bValidCurrentState ( false ) ,m_bAutoStoreState ( _bAutoStoreState ) { } @@ -500,7 +500,7 @@ namespace svt { // store the current state if possible and required if ( m_bValidCurrentState && m_bAutoStoreState ) - storeState( sal_False ); + storeState( false ); closeCacheStream( ); } @@ -530,10 +530,10 @@ namespace svt } - sal_Bool TemplateFolderCacheImpl::equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ) + bool TemplateFolderCacheImpl::equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ) { if ( _rLHS.size() != _rRHS.size() ) - return sal_False; + return false; // as both arrays are sorted (by definition - this is a precondition of this method) // we can simply go from the front to the back and compare the single elements @@ -549,12 +549,12 @@ namespace svt } - void TemplateFolderCacheImpl::storeState( sal_Bool _bForceRetrieval ) + void TemplateFolderCacheImpl::storeState( bool _bForceRetrieval ) { if ( !m_bValidCurrentState || _bForceRetrieval ) readCurrentState( ); - if ( m_bValidCurrentState && openCacheStream( sal_False ) ) + if ( m_bValidCurrentState && openCacheStream( false ) ) { m_pCacheStream->WriteInt32( getMagicNumber() ); @@ -599,7 +599,7 @@ namespace svt } - sal_Bool TemplateFolderCacheImpl::implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ) + bool TemplateFolderCacheImpl::implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ) { try { @@ -624,7 +624,7 @@ namespace svt catch( CommandAbortedException& ) { SAL_WARN( "svtools.misc", "TemplateFolderCacheImpl::implReadFolder: caught a CommandAbortedException!" ); - return sal_False; + return false; } catch( ::com::sun::star::uno::Exception& ) { @@ -664,16 +664,16 @@ namespace svt catch( const Exception& ) { OSL_FAIL( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" ); - return sal_False; + return false; } - return sal_True; + return true; } - sal_Bool TemplateFolderCacheImpl::readCurrentState() + bool TemplateFolderCacheImpl::readCurrentState() { // reset - m_bValidCurrentState = sal_False; + m_bValidCurrentState = false; TemplateFolderContent aTemplateFolderContent; m_aCurrentState.swap( aTemplateFolderContent ); @@ -704,19 +704,19 @@ namespace svt --aCurrentRoot; if ( !implReadFolder( *aCurrentRoot ) ) - return sal_False; + return false; } while ( nIndex >= 0 ); // normalize the array (which basically means "sort it") normalize( m_aCurrentState ); - m_bValidCurrentState = sal_True; + m_bValidCurrentState = true; return m_bValidCurrentState; } - sal_Bool TemplateFolderCacheImpl::readPreviousState() + bool TemplateFolderCacheImpl::readPreviousState() { DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::readPreviousState: not to be called without stream!" ); @@ -729,7 +729,7 @@ namespace svt m_pCacheStream->ReadInt32( nMagic ); DBG_ASSERT( getMagicNumber() == nMagic, "TemplateFolderCacheImpl::readPreviousState: invalid cache file!" ); if ( getMagicNumber() != nMagic ) - return sal_False; + return false; // the root directories // their number @@ -759,11 +759,11 @@ namespace svt // normalize the array (which basically means "sort it") normalize( m_aPreviousState ); - return sal_True; + return true; } - sal_Bool TemplateFolderCacheImpl::openCacheStream( sal_Bool _bForRead ) + bool TemplateFolderCacheImpl::openCacheStream( bool _bForRead ) { // close any old stream instance closeCacheStream( ); @@ -774,7 +774,7 @@ namespace svt if ( INET_PROT_NOT_VALID == aStorageURL.GetProtocol() ) { OSL_FAIL( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" ); - return sal_False; + return false; } // append our name @@ -796,18 +796,18 @@ namespace svt } - sal_Bool TemplateFolderCacheImpl::needsUpdate( sal_Bool _bForceCheck ) + bool TemplateFolderCacheImpl::needsUpdate( bool _bForceCheck ) { if ( m_bKnowState && !_bForceCheck ) return m_bNeedsUpdate; - m_bNeedsUpdate = sal_True; - m_bKnowState = sal_True; + m_bNeedsUpdate = true; + m_bKnowState = true; if ( readCurrentState() ) { // open the stream which contains the cached state of the directories - if ( openCacheStream( sal_True ) ) + if ( openCacheStream( true ) ) { // opening the stream succeeded if ( readPreviousState() ) { @@ -843,7 +843,7 @@ namespace svt //= TemplateFolderCache - TemplateFolderCache::TemplateFolderCache( sal_Bool _bAutoStoreState ) + TemplateFolderCache::TemplateFolderCache( bool _bAutoStoreState ) :m_pImpl( new TemplateFolderCacheImpl( _bAutoStoreState ) ) { } @@ -855,13 +855,13 @@ namespace svt } - sal_Bool TemplateFolderCache::needsUpdate( sal_Bool _bForceCheck ) + bool TemplateFolderCache::needsUpdate( bool _bForceCheck ) { return m_pImpl->needsUpdate( _bForceCheck ); } - void TemplateFolderCache::storeState( sal_Bool _bForceRetrieval ) + void TemplateFolderCache::storeState( bool _bForceRetrieval ) { m_pImpl->storeState( _bForceRetrieval ); } diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 2d9ebfb904d5..9b827bba1b15 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -59,7 +59,7 @@ GenericToolboxController::GenericToolboxController( const Reference< XComponentC , m_nID( nID ) { // Initialization is done through ctor - m_bInitialized = sal_True; + m_bInitialized = true; // insert main command to our listener map if ( !m_aCommandURL.isEmpty() ) diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index a7ebe11b55b3..f25166d4ee5e 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -53,12 +53,12 @@ ToolboxController::ToolboxController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& xFrame, const OUString& aCommandURL ) : - OPropertyContainer(GetBroadcastHelper()) - , m_bSupportVisible(sal_False) - , m_bInitialized( sal_False ) - , m_bDisposed( sal_False ) + OPropertyContainer( GetBroadcastHelper() ) + , m_bSupportVisible( false ) + , m_bInitialized( false ) + , m_bDisposed( false ) , m_nToolBoxId( SAL_MAX_UINT16 ) - , m_xFrame(xFrame) + , m_xFrame( xFrame ) , m_xContext( rxContext ) , m_aCommandURL( aCommandURL ) , m_aListenerContainer( m_aMutex ) @@ -80,9 +80,9 @@ ToolboxController::ToolboxController( ToolboxController::ToolboxController() : OPropertyContainer(GetBroadcastHelper()) - , m_bSupportVisible(sal_False) - , m_bInitialized( sal_False ) - , m_bDisposed( sal_False ) + , m_bSupportVisible(false) + , m_bInitialized( false ) + , m_bDisposed( false ) , m_nToolBoxId( SAL_MAX_UINT16 ) , m_aListenerContainer( m_aMutex ) { @@ -179,8 +179,8 @@ throw ( Exception, RuntimeException, std::exception ) if ( !bInitialized ) { SolarMutexGuard aSolarMutexGuard; - m_bInitialized = sal_True; - m_bSupportVisible = sal_False; + m_bInitialized = true; + m_bSupportVisible = false; PropertyValue aPropValue; for ( int i = 0; i < aArguments.getLength(); i++ ) { @@ -271,7 +271,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) ++pIter; } - m_bDisposed = sal_True; + m_bDisposed = true; } void SAL_CALL ToolboxController::addEventListener( const Reference< XEventListener >& xListener ) @@ -614,18 +614,18 @@ void ToolboxController::unbindListener() } } -sal_Bool ToolboxController::isBound() const +bool ToolboxController::isBound() const { SolarMutexGuard aSolarMutexGuard; if ( !m_bInitialized ) - return sal_False; + return false; URLToDispatchMap::const_iterator pIter = m_aListenerMap.find( m_aCommandURL ); if ( pIter != m_aListenerMap.end() ) - return ( pIter->second.is() ); + return pIter->second.is(); - return sal_False; + return false; } void ToolboxController::updateStatus() @@ -727,7 +727,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_C return new ::cppu::OPropertyArrayHelper(aProps); } -void ToolboxController::setSupportVisibleProperty(sal_Bool bValue) +void ToolboxController::setSupportVisibleProperty(bool bValue) { m_bSupportVisible = bValue; } @@ -743,7 +743,7 @@ sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::u { sal_Bool aNewValue(sal_False); aValue >>= aNewValue; - if (aNewValue != m_bSupportVisible) + if (aNewValue != (m_bSupportVisible ? 1 : 0)) { aConvertedValue <<= aNewValue; aOldValue <<= m_bSupportVisible; |