diff options
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 16 | ||||
-rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 6 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 6 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 8 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogwindow.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/baside3.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedfunc.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/propbrw.hxx | 2 |
12 files changed, 32 insertions, 32 deletions
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 7a45247b7407..987dbc834798 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -214,9 +214,9 @@ void AccessibleDialogWindow::UpdateBounds() // ----------------------------------------------------------------------------- -sal_Bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) +bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) { - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( m_pDialogWindow ) { @@ -250,7 +250,7 @@ sal_Bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) // check, if the shape's bounding box intersects with the bounding box of its parent Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); if ( aParentRect.IsOver( aRect ) ) - bVisible = sal_True; + bVisible = true; } } } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index cad5d8c0f33c..fd6e2f79b23f 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -661,16 +661,16 @@ Reference< container::XNameContainer > DialogWindow::GetDialog() const return pEditor->GetDialog(); } -sal_Bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName ) +bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName ) { if ( !BasicIDE::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) ) - return sal_False; + return false; SfxBindings* pBindings = BasicIDE::GetBindingsPtr(); if ( pBindings ) pBindings->Invalidate( SID_DOC_MODIFIED ); - return sal_True; + return true; } void DialogWindow::DisableBrowser() diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 6c9aacd63524..d68603e52f51 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -906,7 +906,7 @@ void LibPage::InsertLib() InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute(); else { - sal_Bool bChanges = sal_False; + bool bChanges = false; ::rtl::OUString aExtension( aURLObj.getExtension() ); ::rtl::OUString aLibExtension(RTL_CONSTASCII_USTRINGPARAM("xlb")); ::rtl::OUString aContExtension(RTL_CONSTASCII_USTRINGPARAM("xlc")); @@ -918,7 +918,7 @@ void LibPage::InsertLib() if ( pLibDlg->Execute() ) { sal_uLong nNewPos = aLibBox.GetEntryCount(); - sal_Bool bRemove = sal_False; + bool bRemove = false; sal_Bool bReplace = pLibDlg->IsReplace(); sal_Bool bReference = pLibDlg->IsReference(); for ( sal_uInt16 nLib = 0; nLib < pLibDlg->GetLibBox().GetEntryCount(); nLib++ ) @@ -957,7 +957,7 @@ void LibPage::InsertLib() } // remove existing libraries - bRemove = sal_True; + bRemove = true; } else { @@ -1134,7 +1134,7 @@ void LibPage::InsertLib() // insert listbox entry ImpInsertLibEntry( aLibName, aLibBox.GetEntryCount() ); - bChanges = sal_True; + bChanges = true; } } @@ -1430,14 +1430,14 @@ void LibPage::DeleteCurrent() String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); // check, if library is link - sal_Bool bIsLibraryLink = sal_False; + bool bIsLibraryLink = false; ::rtl::OUString aOULibName( aLibName ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLink( aOULibName ) ) || ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLink( aOULibName ) ) ) { - bIsLibraryLink = sal_True; + bIsLibraryLink = true; } if ( QueryDelLib( aLibName, bIsLibraryLink, this ) ) @@ -1591,14 +1591,14 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, String aLibName; String aLibStdName( String( RTL_CONSTASCII_USTRINGPARAM( "Library" ) ) ); //String aLibStdName( IDEResId( RID_STR_STDLIBNAME ) ); - sal_Bool bValid = sal_False; + bool bValid = false; sal_uInt16 i = 1; while ( !bValid ) { aLibName = aLibStdName; aLibName += String::CreateFromInt32( i ); if ( !rDocument.hasLibrary( E_SCRIPTS, aLibName ) && !rDocument.hasLibrary( E_DIALOGS, aLibName ) ) - bValid = sal_True; + bValid = true; i++; } diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index e3ec443bf7b7..6a77b4942342 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -601,7 +601,7 @@ void ObjectPage::CheckButtons() ScriptDocument aDocument( aDesc.GetDocument() ); ::rtl::OUString aLibName( aDesc.GetLibName() ); ::rtl::OUString aLibSubName( aDesc.GetLibSubName() ); - sal_Bool bVBAEnabled = aDocument.isInVBAMode(); + bool bVBAEnabled = aDocument.isInVBAMode(); sal_uInt16 nMode = aBasicBox.GetMode(); sal_uInt16 nDepth = pCurEntry ? aBasicBox.GetModel()->GetDepth( pCurEntry ) : 0; @@ -617,7 +617,7 @@ void ObjectPage::CheckButtons() // enable/disable new module/dialog buttons LibraryLocation eLocation( aDesc.GetLocation() ); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; if ( nDepth > 0 ) { Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); @@ -625,7 +625,7 @@ void ObjectPage::CheckButtons() if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) ) || ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) ) ) { - bReadOnly = sal_True; + bReadOnly = true; } } if ( bReadOnly || eLocation == LIBRARY_LOCATION_SHARE ) diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 0fd37f4a7866..3221a1ce619c 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -469,7 +469,7 @@ sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) DlgEdFuncSelect::DlgEdFuncSelect( DlgEditor* pParent_ ) : DlgEdFunc( pParent_ ), - bMarkAction(sal_False) + bMarkAction(false) { } @@ -529,7 +529,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { // select object pView->BegMarkObj(aMDPos); - bMarkAction = sal_True; + bMarkAction = true; } } } @@ -572,7 +572,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) } } - bMarkAction = sal_False; + bMarkAction = false; pWindow->SetPointer( pView->GetPreferedPointer( aPnt, pWindow, nHitLog ) ); pWindow->ReleaseMouse(); diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 0fb5092208ff..c412f1a0c093 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -55,7 +55,7 @@ DBG_NAME(DlgEdObj); DlgEdObj::DlgEdObj() :SdrUnoObj(String(), sal_False) - ,bIsListening(sal_False) + ,bIsListening(false) ,pDlgEdForm( NULL ) { DBG_CTOR(DlgEdObj, NULL); @@ -66,7 +66,7 @@ DlgEdObj::DlgEdObj() DlgEdObj::DlgEdObj(const ::rtl::OUString& rModelName, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac) :SdrUnoObj(rModelName, rxSFac, sal_False) - ,bIsListening(sal_False) + ,bIsListening(false) ,pDlgEdForm( NULL ) { DBG_CTOR(DlgEdObj, NULL); @@ -1129,7 +1129,7 @@ void DlgEdObj::StartListening() if (!isListening()) { - bIsListening = sal_True; + bIsListening = true; // XPropertyChangeListener Reference< XPropertySet > xControlModel( GetUnoControlModel() , UNO_QUERY ); @@ -1167,7 +1167,7 @@ void DlgEdObj::EndListening(sal_Bool bRemoveListener) if (isListening()) { - bIsListening = sal_False; + bIsListening = false; if (bRemoveListener) { diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 2ab5b2e158eb..8a9e550a1b3a 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -101,7 +101,7 @@ DBG_NAME(PropBrw) PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _pBindings, PropBrwMgr* _pMgr, Window* _pParent, const Reference< XModel >& _rxContextDocument ) :SfxFloatingWindow( _pBindings, _pMgr, _pParent, WinBits( WB_STDMODELESS | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE ) ) - ,m_bInitialStateChange(sal_True) + ,m_bInitialStateChange(true) ,m_xORB(_xORB) ,m_xContextDocument( _rxContextDocument ) ,pView( NULL ) @@ -509,7 +509,7 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView { if ( m_xBrowserComponentWindow.is() ) m_xBrowserComponentWindow->setFocus(); - m_bInitialStateChange = sal_False; + m_bInitialStateChange = false; } const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 7ec750492f74..e3fd97365641 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -86,7 +86,7 @@ protected: void UpdateSelected(); void UpdateBounds(); - sal_Bool IsChildVisible( const ChildDescriptor& rDesc ); + bool IsChildVisible( const ChildDescriptor& rDesc ); void InsertChild( const ChildDescriptor& rDesc ); void RemoveChild( const ChildDescriptor& rDesc ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index d1ab9c24b4ba..a2fbe694cb9a 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -77,7 +77,7 @@ public: DlgEdModel* GetModel() const; DlgEdPage* GetPage() const; DlgEdView* GetView() const; - sal_Bool RenameDialog( const ::rtl::OUString& rNewName ); + bool RenameDialog( const ::rtl::OUString& rNewName ); void DisableBrowser(); void UpdateBrowser(); bool SaveDialog(); diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index f9cc712296e4..f4a8c77158dd 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -67,7 +67,7 @@ public: class DlgEdFuncSelect : public DlgEdFunc { protected: - sal_Bool bMarkAction; + bool bMarkAction; public: DlgEdFuncSelect( DlgEditor* pParent ); diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 0f1d90f4d739..0bbdcc2e70d2 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -46,7 +46,7 @@ class DlgEdObj: public SdrUnoObj friend class DlgEdForm; private: - sal_Bool bIsListening; + bool bIsListening; DlgEdForm* pDlgEdForm; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; @@ -64,7 +64,7 @@ protected: void StartListening(); using SfxListener::EndListening; void EndListening(sal_Bool bRemoveListener = sal_True); - sal_Bool isListening() const { return bIsListening; } + bool isListening() const { return bIsListening; } virtual bool TransformSdrToControlCoordinates( sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 0822a2a125e4..87c2e6c8d94f 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -48,7 +48,7 @@ class SdrView; class PropBrw : public SfxFloatingWindow , public SfxListener, public SfxBroadcaster { private: - sal_Bool m_bInitialStateChange; + bool m_bInitialStateChange; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; |