mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Bool -> bool

Browse Source 
Change-Id: Id2addfc6e0c4e0b30281c9f3d22ec0624a61dab1
This commit is contained in:
Takeshi Abe 2012-08-02 10:21:00 +09:00
parent 624bcdc302
commit d73ef723a2
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basctl/source/basicide/baside3.cxx
View File

@ -74,7 +74,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, ::
:IDEBaseWindow( pParent, rDocument, aLibName, aName ) :IDEBaseWindow( pParent, rDocument, aLibName, aName )
,pUndoMgr(NULL) ,pUndoMgr(NULL)
{ {
InitSettings( sal_True, sal_True, sal_True ); InitSettings( true, true, true );
pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
pEditor->SetWindow( this ); pEditor->SetWindow( this );
@ -1382,14 +1382,14 @@ void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt )
{ {
if( (rDCEvt.GetType()==DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) if( (rDCEvt.GetType()==DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{ {
InitSettings( sal_True, sal_True, sal_True ); InitSettings( true, true, true );
Invalidate(); Invalidate();
} }
else else
IDEBaseWindow::DataChanged( rDCEvt ); IDEBaseWindow::DataChanged( rDCEvt );
} }
void DialogWindow::InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground) void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground)
{ {
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont ) if( bFont )

4
basctl/source/basicide/basides1.cxx
View File

@ -633,7 +633,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
ScriptDocument aDocument( rSbxItem.GetDocument() ); ScriptDocument aDocument( rSbxItem.GetDocument() );
IDEBaseWindow* pWin = FindWindow( aDocument, rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), sal_True ); IDEBaseWindow* pWin = FindWindow( aDocument, rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), true );
if ( pWin ) if ( pWin )
RemoveWindow( pWin, true ); RemoveWindow( pWin, true );
} }
@ -1268,7 +1268,7 @@ IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
return FindWindow( ScriptDocument::getApplicationScriptDocument() ); return FindWindow( ScriptDocument::getApplicationScriptDocument() );
} }
IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rName, BasicIDEType nType, sal_Bool bFindSuspended ) IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rName, BasicIDEType nType, bool bFindSuspended )
{ {
for( IDEWindowTable::const_iterator it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it ) for( IDEWindowTable::const_iterator it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it )
{ {

4
basctl/source/basicide/basides2.cxx
View File

@ -174,7 +174,7 @@ void BasicIDEShell::CreateModulWindowLayout()
ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName ) ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
{ {
bCreatingWindow = sal_True; bCreatingWindow = true;
sal_uLong nKey = 0; sal_uLong nKey = 0;
ModulWindow* pWin = 0; ModulWindow* pWin = 0;
@ -243,7 +243,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
if ( !pCurWin ) if ( !pCurWin )
SetCurWindow( pWin, false, false ); SetCurWindow( pWin, false, false );
bCreatingWindow = sal_False; bCreatingWindow = false;
return pWin; return pWin;
} }

4
basctl/source/basicide/basides3.cxx
View File

@ -43,7 +43,7 @@ using namespace ::com::sun::star::io;
DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName ) DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName )
{ {
bCreatingWindow = sal_True; bCreatingWindow = true;
sal_uLong nKey = 0; sal_uLong nKey = 0;
DialogWindow* pWin = 0; DialogWindow* pWin = 0;
@ -111,7 +111,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
SetCurWindow( pWin, false, false ); SetCurWindow( pWin, false, false );
} }
bCreatingWindow = sal_False; bCreatingWindow = false;
return pWin; return pWin;
} }

14
basctl/source/basicide/basidesh.cxx
View File

@ -117,7 +117,7 @@ public:
rtl::OUString sModuleName; rtl::OUString sModuleName;
if( mpShell && ( Event.Accessor >>= sModuleName ) ) if( mpShell && ( Event.Accessor >>= sModuleName ) )
{ {
IDEBaseWindow* pWin = mpShell->FindWindow( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, BASICIDE_TYPE_MODULE, sal_True ); IDEBaseWindow* pWin = mpShell->FindWindow( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, BASICIDE_TYPE_MODULE, true );
if( pWin ) if( pWin )
mpShell->RemoveWindow( pWin, true, true ); mpShell->RemoveWindow( pWin, true, true );
} }
@ -191,11 +191,11 @@ void BasicIDEShell::Init()
pCurWin = 0; pCurWin = 0;
m_aCurDocument = ScriptDocument::getApplicationScriptDocument(); m_aCurDocument = ScriptDocument::getApplicationScriptDocument();
pObjectCatalog = 0; pObjectCatalog = 0;
bCreatingWindow = sal_False; bCreatingWindow = false;
pTabBar = new BasicIDETabBar( &GetViewFrame()->GetWindow() ); pTabBar = new BasicIDETabBar( &GetViewFrame()->GetWindow() );
pTabBar->SetSplitHdl( LINK( this, BasicIDEShell, TabBarSplitHdl ) ); pTabBar->SetSplitHdl( LINK( this, BasicIDEShell, TabBarSplitHdl ) );
bTabBarSplitted = sal_False; bTabBarSplitted = false;
nCurKey = 100; nCurKey = 100;
InitScrollBars(); InitScrollBars();
@ -460,7 +460,7 @@ void BasicIDEShell::OuterResizePixel( const Point &rPos, const Size &rSize )
IMPL_LINK_INLINE_START( BasicIDEShell, TabBarSplitHdl, TabBar *, pTBar ) IMPL_LINK_INLINE_START( BasicIDEShell, TabBarSplitHdl, TabBar *, pTBar )
{ {
(void)pTBar; (void)pTBar;
bTabBarSplitted = sal_True; bTabBarSplitted = true;
ArrangeTabBar(); ArrangeTabBar();
return 0; return 0;
@ -481,9 +481,9 @@ IMPL_LINK( BasicIDEShell, TabBarHdl, TabBar *, pCurTabBar )
sal_Bool BasicIDEShell::NextPage( sal_Bool bPrev ) bool BasicIDEShell::NextPage( bool bPrev )
{ {
sal_Bool bRet = sal_False; bool bRet = false;
sal_uInt16 nPos = pTabBar->GetPagePos( pTabBar->GetCurPageId() ); sal_uInt16 nPos = pTabBar->GetPagePos( pTabBar->GetCurPageId() );
if ( bPrev ) if ( bPrev )
@ -495,7 +495,7 @@ sal_Bool BasicIDEShell::NextPage( sal_Bool bPrev )
{ {
IDEBaseWindow* pWin = aIDEWindowTable[ pTabBar->GetPageId( nPos ) ]; IDEBaseWindow* pWin = aIDEWindowTable[ pTabBar->GetPageId( nPos ) ];
SetCurWindow( pWin, true ); SetCurWindow( pWin, true );
bRet = sal_True; bRet = true;
} }
return bRet; return bRet;

2
basctl/source/basicide/basobj2.cxx
View File

@ -187,7 +187,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell(); BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell ) if ( pIDEShell )
{ {
IDEBaseWindow* pWin = pIDEShell->FindWindow( rDocument, rLibName, rNewName, BASICIDE_TYPE_MODULE, sal_True ); IDEBaseWindow* pWin = pIDEShell->FindWindow( rDocument, rLibName, rNewName, BASICIDE_TYPE_MODULE, true );
if ( pWin ) if ( pWin )
{ {
// set new name in window // set new name in window

2
basctl/source/basicide/basobj3.cxx
View File

@ -190,7 +190,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
} }
BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell(); BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
IDEBaseWindow* pWin = pIDEShell ? pIDEShell->FindWindow( rDocument, rLibName, rOldName, BASICIDE_TYPE_DIALOG, sal_False ) : NULL; IDEBaseWindow* pWin = pIDEShell ? pIDEShell->FindWindow( rDocument, rLibName, rOldName, BASICIDE_TYPE_DIALOG, false ) : NULL;
Reference< XNameContainer > xExistingDialog; Reference< XNameContainer > xExistingDialog;
if ( pWin ) if ( pWin )
xExistingDialog = ((DialogWindow*)pWin)->GetEditor()->GetDialog(); xExistingDialog = ((DialogWindow*)pWin)->GetEditor()->GetDialog();

6
basctl/source/dlged/dlged.cxx
View File

@ -189,7 +189,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
,pFunc(NULL) ,pFunc(NULL)
,eMode( DLGED_SELECT ) ,eMode( DLGED_SELECT )
,eActObj( OBJ_DLG_PUSHBUTTON ) ,eActObj( OBJ_DLG_PUSHBUTTON )
,bFirstDraw(sal_False) ,bFirstDraw(false)
,aGridSize( 100, 100 ) // 100TH_MM ,aGridSize( 100, 100 ) // 100TH_MM
,bGridVisible(sal_False) ,bGridVisible(sal_False)
,bGridSnap(sal_True) ,bGridSnap(sal_True)
@ -424,7 +424,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr
} }
} }
bFirstDraw = sal_True; bFirstDraw = true;
pDlgEdModel->SetChanged( sal_False ); pDlgEdModel->SetChanged( sal_False );
} }
@ -510,7 +510,7 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
pWindow->IsVisible() && pWindow->IsVisible() &&
(pWindow->GetOutputSize() != aMacSize) ) (pWindow->GetOutputSize() != aMacSize) )
{ {
bFirstDraw = sal_False; bFirstDraw = false;
// get property set // get property set
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY);

2
basctl/source/inc/baside3.hxx
View File

@ -61,7 +61,7 @@ protected:
virtual void DoInit(); virtual void DoInit();
virtual void DoScroll( ScrollBar* pCurScrollBar ); virtual void DoScroll( ScrollBar* pCurScrollBar );
virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt );
void InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground); void InitSettings(bool bFont, bool bForeground, bool bBackground);
public: public:
TYPEINFO(); TYPEINFO();

8
basctl/source/inc/basidesh.hxx
View File

@ -82,8 +82,8 @@ friend class LocalizationMgr;
ScrollBar aVScrollBar; ScrollBar aVScrollBar;
ScrollBarBox aScrollBarBox; ScrollBarBox aScrollBarBox;
BasicIDETabBar* pTabBar; BasicIDETabBar* pTabBar;
sal_Bool bTabBarSplitted; bool bTabBarSplitted;
sal_Bool bCreatingWindow; bool bCreatingWindow;
ModulWindowLayout* pModulLayout; ModulWindowLayout* pModulLayout;
sal_Bool m_bAppBasicModified; sal_Bool m_bAppBasicModified;
::basctl::DocumentEventNotifier ::basctl::DocumentEventNotifier
@ -203,10 +203,10 @@ public:
ModulWindowLayout* GetLayoutWindow() const { return pModulLayout; } ModulWindowLayout* GetLayoutWindow() const { return pModulLayout; }
IDEBaseWindow* FindWindow( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName = ::rtl::OUString(), const ::rtl::OUString& rName = ::rtl::OUString(), BasicIDEType nType = BASICIDE_TYPE_UNKNOWN, sal_Bool bFindSuspended = sal_False ); IDEBaseWindow* FindWindow( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName = ::rtl::OUString(), const ::rtl::OUString& rName = ::rtl::OUString(), BasicIDEType nType = BASICIDE_TYPE_UNKNOWN, bool bFindSuspended = false );
DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName, bool bCreateIfNotExist, bool bFindSuspended = false ); DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName, bool bCreateIfNotExist, bool bFindSuspended = false );
IDEBaseWindow* FindApplicationWindow(); IDEBaseWindow* FindApplicationWindow();
sal_Bool NextPage( sal_Bool bPrev = sal_False ); bool NextPage( bool bPrev = false );
sal_Bool IsAppBasicModified() const { return m_bAppBasicModified; } sal_Bool IsAppBasicModified() const { return m_bAppBasicModified; }
void SetAppBasicModified( sal_Bool bModified = sal_True ) { m_bAppBasicModified = bModified; } void SetAppBasicModified( sal_Bool bModified = sal_True ) { m_bAppBasicModified = bModified; }

2
basctl/source/inc/dlged.hxx
View File

@ -109,7 +109,7 @@ protected:
DlgEdFunc* pFunc; DlgEdFunc* pFunc;
DlgEdMode eMode; DlgEdMode eMode;
sal_uInt16 eActObj; sal_uInt16 eActObj;
sal_Bool bFirstDraw; bool bFirstDraw;
Size aGridSize; Size aGridSize;
sal_Bool bGridVisible; sal_Bool bGridVisible;
sal_Bool bGridSnap; sal_Bool bGridSnap;