summaryrefslogtreecommitdiff
path: root/basctl/source/inc
diff options
context:
space:
mode:
authorUray M. János <uray.janos@gmail.com>2012-08-07 08:36:40 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-08-07 11:01:01 +0300
commit13b9c0513319623fd56a5a0ead5bdddecf90a10f (patch)
tree0e20a62643c2c44023222bcc63b451c7c4b6947a /basctl/source/inc
parent67f688b97aa5afde455674dbe28297a89d817503 (diff)
IDE: sal_Bool to bool
Convert all occurences of sal_Bool, sal_True and sal_False in basctl to bool, true and false -- except in prototypes of virtual function overrides. (The virtual functions that are internal to basctl can be and was converted.) Note that since sal_Bool and bool are implicitly convertible to each other, for functions that take a sal_Bool (by value), true and false can be given too. Change-Id: Ie44740fa87f89e9fedd913840ca2b38e95e6b957
Diffstat (limited to 'basctl/source/inc')
-rw-r--r--basctl/source/inc/accessibledialogcontrolshape.hxx12
-rw-r--r--basctl/source/inc/baside3.hxx8
-rw-r--r--basctl/source/inc/basidesh.hxx6
-rw-r--r--basctl/source/inc/basobj.hxx4
-rw-r--r--basctl/source/inc/bastypes.hxx8
-rw-r--r--basctl/source/inc/dlged.hxx28
-rw-r--r--basctl/source/inc/dlgedfunc.hxx20
7 files changed, 43 insertions, 43 deletions
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 01e204794722..0d5e512454a1 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -54,18 +54,18 @@ private:
VCLExternalSolarLock* m_pExternalLock;
DialogWindow* m_pDialogWindow;
DlgEdObj* m_pDlgEdObj;
- sal_Bool m_bFocused;
- sal_Bool m_bSelected;
+ bool m_bFocused;
+ bool m_bSelected;
::com::sun::star::awt::Rectangle m_aBounds;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel;
protected:
- sal_Bool IsFocused();
- sal_Bool IsSelected();
+ bool IsFocused();
+ bool IsSelected();
- void SetFocused( sal_Bool bFocused );
- void SetSelected( sal_Bool bSelected );
+ void SetFocused (bool bFocused);
+ void SetSelected (bool bSelected);
::com::sun::star::awt::Rectangle GetBounds();
void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds );
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 17bd9ec7e7c7..f2560e38da10 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -85,12 +85,12 @@ public:
virtual ::rtl::OUString GetTitle();
virtual BasicEntryDescriptor CreateEntryDescriptor();
- virtual void SetReadOnly( sal_Bool bReadOnly );
- virtual sal_Bool IsReadOnly();
+ virtual void SetReadOnly (bool bReadOnly);
+ virtual bool IsReadOnly();
virtual void StoreData();
- virtual sal_Bool IsModified();
- virtual sal_Bool IsPasteAllowed();
+ virtual bool IsModified();
+ virtual bool IsPasteAllowed();
virtual ::svl::IUndoManager*
GetUndoManager();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index ed2b120c3cc7..5e8c25713fac 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -82,7 +82,7 @@ friend class LocalizationMgr;
bool bTabBarSplitted;
bool bCreatingWindow;
ModulWindowLayout* pModulLayout;
- sal_Bool m_bAppBasicModified;
+ bool m_bAppBasicModified;
::basctl::DocumentEventNotifier
m_aNotifier;
friend class ContainerListenerImpl;
@@ -202,8 +202,8 @@ public:
IDEBaseWindow* FindApplicationWindow();
bool NextPage( bool bPrev = false );
- sal_Bool IsAppBasicModified() const { return m_bAppBasicModified; }
- void SetAppBasicModified( sal_Bool bModified = sal_True ) { m_bAppBasicModified = bModified; }
+ bool IsAppBasicModified () const { return m_bAppBasicModified; }
+ void SetAppBasicModified (bool bModified = true) { m_bAppBasicModified = bModified; }
// For Dialog Drag&Drop in Dialog Organizer
static void CopyDialogResources(
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 5e72308534fa..52d8c46e400e 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -47,7 +47,7 @@ namespace BasicIDE
void BasicStopped( bool* pbAppWindowDisabled = 0, bool* pbDispatcherLocked = 0, sal_uInt16* pnWaitCount = 0,
SfxUInt16Item** ppSWActionCount = 0, SfxUInt16Item** ppSWLockViewCount = 0 );
- sal_Bool IsValidSbxName( const String& rName );
+ bool IsValidSbxName( const String& rName );
BasicManager* FindBasicManager( StarBASIC* pLib );
@@ -78,7 +78,7 @@ namespace BasicIDE
// new methods for macros
::rtl::OUString ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument,
- sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc );
+ bool bChooseOnly, const ::rtl::OUString& rMacroDesc );
::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames(
const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 7795becbb47d..30fb847f5db1 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -160,13 +160,13 @@ public:
::rtl::OUString CreateQualifiedName();
virtual BasicEntryDescriptor CreateEntryDescriptor() = 0;
- virtual sal_Bool IsModified();
- virtual sal_Bool IsPasteAllowed();
+ virtual bool IsModified();
+ virtual bool IsPasteAllowed();
virtual bool AllowUndo();
- virtual void SetReadOnly( sal_Bool bReadOnly );
- virtual sal_Bool IsReadOnly();
+ virtual void SetReadOnly (bool bReadOnly);
+ virtual bool IsReadOnly();
int GetStatus() { return nStatus; }
void SetStatus(int n) { nStatus = n; }
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 3426e0caabdb..bbb0dca03843 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -108,15 +108,15 @@ protected:
Window* pWindow;
DlgEdFunc* pFunc;
DlgEdMode eMode;
- sal_uInt16 eActObj;
+ sal_uInt16 eActObj;
bool bFirstDraw;
Size aGridSize;
- sal_Bool bGridVisible;
- sal_Bool bGridSnap;
- sal_Bool bCreateOK;
+ bool bGridVisible;
+ bool bGridSnap;
+ bool bCreateOK;
Timer aPaintTimer;
Rectangle aPaintRect;
- sal_Bool bDialogModelChanged;
+ bool bDialogModelChanged;
Timer aMarkTimer;
long mnPaintGuard;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
@@ -160,33 +160,33 @@ public:
void ShowDialog();
- sal_Bool UnmarkDialog();
- sal_Bool RemarkDialog();
+ bool UnmarkDialog();
+ bool RemarkDialog();
- void SetDialogModelChanged( sal_Bool bChanged = sal_True ) { bDialogModelChanged = bChanged; }
- sal_Bool IsDialogModelChanged() const { return bDialogModelChanged; }
+ void SetDialogModelChanged (bool bChanged = true) { bDialogModelChanged = bChanged; }
+ bool IsDialogModelChanged () const { return bDialogModelChanged; }
- sal_Bool IsModified() const;
+ bool IsModified () const;
void ClearModifyFlag();
void MouseButtonDown( const MouseEvent& rMEvt );
void MouseButtonUp( const MouseEvent& rMEvt );
void MouseMove( const MouseEvent& rMEvt );
void Paint( const Rectangle& rRect );
- sal_Bool KeyInput( const KeyEvent& rKEvt );
+ bool KeyInput( const KeyEvent& rKEvt );
void SetMode( DlgEdMode eMode );
void SetInsertObj( sal_uInt16 eObj );
- sal_uInt16 GetInsertObj() const;
+ sal_uInt16 GetInsertObj() const;
void CreateDefaultObject();
DlgEdMode GetMode() const { return eMode; }
- sal_Bool IsCreateOK() const { return bCreateOK; }
+ bool IsCreateOK() const { return bCreateOK; }
void Cut();
void Copy();
void Paste();
void Delete();
- sal_Bool IsPasteAllowed();
+ bool IsPasteAllowed();
void ShowProperties();
void UpdatePropertyBrowserDelayed();
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index f4a8c77158dd..b7a4f7bf3673 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -39,10 +39,10 @@ public:
DlgEdFunc( DlgEditor* pParent );
virtual ~DlgEdFunc();
- virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
- virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
- virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
- virtual sal_Bool KeyInput( const KeyEvent& rKEvt );
+ virtual bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual bool MouseButtonUp( const MouseEvent& rMEvt );
+ virtual bool MouseMove( const MouseEvent& rMEvt );
+ virtual bool KeyInput( const KeyEvent& rKEvt );
};
//============================================================================
@@ -55,9 +55,9 @@ public:
DlgEdFuncInsert( DlgEditor* pParent );
~DlgEdFuncInsert();
- virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
- virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
- virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
+ virtual bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual bool MouseButtonUp( const MouseEvent& rMEvt );
+ virtual bool MouseMove( const MouseEvent& rMEvt );
};
//============================================================================
@@ -73,9 +73,9 @@ public:
DlgEdFuncSelect( DlgEditor* pParent );
~DlgEdFuncSelect();
- virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
- virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
- virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
+ virtual bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual bool MouseButtonUp( const MouseEvent& rMEvt );
+ virtual bool MouseMove( const MouseEvent& rMEvt );
};