[Libreoffice-commits] .: basctl/source
Takeshi Abe
tabe at kemper.freedesktop.org
Wed Aug 1 18:26:35 PDT 2012
basctl/source/basicide/baside3.cxx | 6 +++---
basctl/source/basicide/basides1.cxx | 4 ++--
basctl/source/basicide/basides2.cxx | 4 ++--
basctl/source/basicide/basides3.cxx | 4 ++--
basctl/source/basicide/basidesh.cxx | 14 +++++++-------
basctl/source/basicide/basobj2.cxx | 2 +-
basctl/source/basicide/basobj3.cxx | 2 +-
basctl/source/dlged/dlged.cxx | 6 +++---
basctl/source/inc/baside3.hxx | 2 +-
basctl/source/inc/basidesh.hxx | 8 ++++----
basctl/source/inc/dlged.hxx | 2 +-
11 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit d73ef723a280fc45f24b96e76c4edea112b29994
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Aug 2 10:21:00 2012 +0900
sal_Bool -> bool
Change-Id: Id2addfc6e0c4e0b30281c9f3d22ec0624a61dab1
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index fd6e2f7..6083fbd 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -74,7 +74,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, ::
:IDEBaseWindow( pParent, rDocument, aLibName, aName )
,pUndoMgr(NULL)
{
- InitSettings( sal_True, sal_True, sal_True );
+ InitSettings( true, true, true );
pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
pEditor->SetWindow( this );
@@ -1382,14 +1382,14 @@ void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if( (rDCEvt.GetType()==DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- InitSettings( sal_True, sal_True, sal_True );
+ InitSettings( true, true, true );
Invalidate();
}
else
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();
if( bFont )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 86af285..d62d81e 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -633,7 +633,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
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 )
RemoveWindow( pWin, true );
}
@@ -1268,7 +1268,7 @@ IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
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 )
{
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 13db522..5ff0a81 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -174,7 +174,7 @@ void BasicIDEShell::CreateModulWindowLayout()
ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
{
- bCreatingWindow = sal_True;
+ bCreatingWindow = true;
sal_uLong nKey = 0;
ModulWindow* pWin = 0;
@@ -243,7 +243,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
if ( !pCurWin )
SetCurWindow( pWin, false, false );
- bCreatingWindow = sal_False;
+ bCreatingWindow = false;
return pWin;
}
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index b4a7849..c0529f1 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::io;
DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName )
{
- bCreatingWindow = sal_True;
+ bCreatingWindow = true;
sal_uLong nKey = 0;
DialogWindow* pWin = 0;
@@ -111,7 +111,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
SetCurWindow( pWin, false, false );
}
- bCreatingWindow = sal_False;
+ bCreatingWindow = false;
return pWin;
}
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e2a0960..7a99290 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -117,7 +117,7 @@ public:
rtl::OUString 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 )
mpShell->RemoveWindow( pWin, true, true );
}
@@ -191,11 +191,11 @@ void BasicIDEShell::Init()
pCurWin = 0;
m_aCurDocument = ScriptDocument::getApplicationScriptDocument();
pObjectCatalog = 0;
- bCreatingWindow = sal_False;
+ bCreatingWindow = false;
pTabBar = new BasicIDETabBar( &GetViewFrame()->GetWindow() );
pTabBar->SetSplitHdl( LINK( this, BasicIDEShell, TabBarSplitHdl ) );
- bTabBarSplitted = sal_False;
+ bTabBarSplitted = false;
nCurKey = 100;
InitScrollBars();
@@ -460,7 +460,7 @@ void BasicIDEShell::OuterResizePixel( const Point &rPos, const Size &rSize )
IMPL_LINK_INLINE_START( BasicIDEShell, TabBarSplitHdl, TabBar *, pTBar )
{
(void)pTBar;
- bTabBarSplitted = sal_True;
+ bTabBarSplitted = true;
ArrangeTabBar();
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() );
if ( bPrev )
@@ -495,7 +495,7 @@ sal_Bool BasicIDEShell::NextPage( sal_Bool bPrev )
{
IDEBaseWindow* pWin = aIDEWindowTable[ pTabBar->GetPageId( nPos ) ];
SetCurWindow( pWin, true );
- bRet = sal_True;
+ bRet = true;
}
return bRet;
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 600f23c..e432359 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -187,7 +187,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
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 )
{
// set new name in window
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 98f41e7..bc95693 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -190,7 +190,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
}
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;
if ( pWin )
xExistingDialog = ((DialogWindow*)pWin)->GetEditor()->GetDialog();
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index acbf95c..056ffaa 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -189,7 +189,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
,pFunc(NULL)
,eMode( DLGED_SELECT )
,eActObj( OBJ_DLG_PUSHBUTTON )
- ,bFirstDraw(sal_False)
+ ,bFirstDraw(false)
,aGridSize( 100, 100 ) // 100TH_MM
,bGridVisible(sal_False)
,bGridSnap(sal_True)
@@ -424,7 +424,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr
}
}
- bFirstDraw = sal_True;
+ bFirstDraw = true;
pDlgEdModel->SetChanged( sal_False );
}
@@ -510,7 +510,7 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
pWindow->IsVisible() &&
(pWindow->GetOutputSize() != aMacSize) )
{
- bFirstDraw = sal_False;
+ bFirstDraw = false;
// get property set
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY);
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index a2fbe69..17bd9ec 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -61,7 +61,7 @@ protected:
virtual void DoInit();
virtual void DoScroll( ScrollBar* pCurScrollBar );
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:
TYPEINFO();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 6ec1666..579365a 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -82,8 +82,8 @@ friend class LocalizationMgr;
ScrollBar aVScrollBar;
ScrollBarBox aScrollBarBox;
BasicIDETabBar* pTabBar;
- sal_Bool bTabBarSplitted;
- sal_Bool bCreatingWindow;
+ bool bTabBarSplitted;
+ bool bCreatingWindow;
ModulWindowLayout* pModulLayout;
sal_Bool m_bAppBasicModified;
::basctl::DocumentEventNotifier
@@ -203,10 +203,10 @@ public:
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 );
IDEBaseWindow* FindApplicationWindow();
- sal_Bool NextPage( sal_Bool bPrev = sal_False );
+ bool NextPage( bool bPrev = false );
sal_Bool IsAppBasicModified() const { return m_bAppBasicModified; }
void SetAppBasicModified( sal_Bool bModified = sal_True ) { m_bAppBasicModified = bModified; }
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 915039b..3426e0c 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -109,7 +109,7 @@ protected:
DlgEdFunc* pFunc;
DlgEdMode eMode;
sal_uInt16 eActObj;
- sal_Bool bFirstDraw;
+ bool bFirstDraw;
Size aGridSize;
sal_Bool bGridVisible;
sal_Bool bGridSnap;
More information about the Libreoffice-commits
mailing list