summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx8
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/docrecovery.hxx4
-rw-r--r--svx/source/inc/filtnav.hxx10
-rw-r--r--svx/source/inc/fmPropBrw.hxx2
-rw-r--r--svx/source/inc/fmexch.hxx28
-rw-r--r--svx/source/inc/fmexpl.hxx82
-rw-r--r--svx/source/inc/fmpgeimp.hxx6
-rw-r--r--svx/source/inc/fmshimp.hxx72
-rw-r--r--svx/source/inc/fmundo.hxx6
-rw-r--r--svx/source/inc/fmvwimp.hxx8
-rw-r--r--svx/source/inc/formcontroller.hxx44
-rw-r--r--svx/source/inc/formcontrolling.hxx10
-rw-r--r--svx/source/inc/formdispatchinterceptor.hxx2
-rw-r--r--svx/source/inc/formfeaturedispatcher.hxx4
-rw-r--r--svx/source/inc/gridcell.hxx128
-rw-r--r--svx/source/inc/sdbdatacolumn.hxx12
-rw-r--r--svx/source/inc/svxpixelctlaccessiblecontext.hxx26
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx16
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/unogalthemeprovider.hxx2
21 files changed, 237 insertions, 237 deletions
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index ef485cdf2889..c829f3a7aa93 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -85,9 +85,9 @@ public:
virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -105,7 +105,7 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void Invalidate();
- void NotifyFocusListeners(sal_Bool bGetFocus);
+ void NotifyFocusListeners(bool bGetFocus);
void NotifyAccessibleEvent( const sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue );
protected:
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index fc96dedd1bba..4ef172f816e8 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -247,7 +247,7 @@ private:
/// client id in the AccessibleEventNotifier queue
sal_uInt32 mnClientId;
- sal_Bool mbDisposed;
+ bool mbDisposed;
};
#endif
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 59f312a7b3e2..8ce4a55ec94f 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -696,7 +696,7 @@ class BrokenRecoveryDialog : public ModalDialog
OUString m_sSavePath;
RecoveryCore* m_pCore;
bool m_bBeforeRecovery;
- sal_Bool m_bExecutionNeeded;
+ bool m_bExecutionNeeded;
// interface
@@ -714,7 +714,7 @@ class BrokenRecoveryDialog : public ModalDialog
/** @short TODO */
- virtual sal_Bool isExecutionNeeded();
+ virtual bool isExecutionNeeded();
/** @short TODO */
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 8e86bab8f356..3530dbe1d9f9 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -172,7 +172,7 @@ public:
void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xCurrent);
void Clear();
- sal_Bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const;
+ bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const;
void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem);
void SetTextForItem(FmFilterItem* pItem, const OUString& rText);
@@ -207,7 +207,7 @@ public:
OFilterItemExchange();
static sal_uInt32 getFormatId( );
- inline static sal_Bool hasFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasFormat( const DataFlavorExVector& _rFormats );
const ::std::vector<FmFilterItem*>& getDraggedEntries() const { return m_aDraggedEntries; }
void setDraggedEntries(const ::std::vector<FmFilterItem*>& _rList) { m_aDraggedEntries = _rList; }
@@ -220,7 +220,7 @@ protected:
virtual void AddSupportedFormats() SAL_OVERRIDE;
};
-inline sal_Bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats )
+inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats )
{
return OLocalExchange::hasFormat( _rFormats, getFormatId() );
}
@@ -271,7 +271,7 @@ protected:
virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
- virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
+ virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) SAL_OVERRIDE;
virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
@@ -304,7 +304,7 @@ private:
@param _bCopy
If <TRUE/> the items will not be removed from the model, otherwise they will.
*/
- void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False);
+ void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems, bool _bCopy = false);
SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = NULL);
SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = NULL);
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 126121eacda3..bdd5cad691ce 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -42,7 +42,7 @@ class FmFormShell;
class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem
{
- sal_Bool m_bInitialStateChange;
+ bool m_bInitialStateChange;
bool m_bInStateChange;
OUString m_sLastActivePage;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 99b3b887c7cf..cfee3c0b0d09 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -52,8 +52,8 @@ namespace svxform
{
private:
Link m_aClipboardListener;
- sal_Bool m_bDragging : 1;
- sal_Bool m_bClipboardOwner : 1;
+ bool m_bDragging : 1;
+ bool m_bClipboardOwner : 1;
public:
class GrantAccess
@@ -64,8 +64,8 @@ namespace svxform
public:
OLocalExchange( );
- sal_Bool isDragging() const { return m_bDragging; }
- sal_Bool isClipboardOwner() const { return m_bClipboardOwner; }
+ bool isDragging() const { return m_bDragging; }
+ bool isClipboardOwner() const { return m_bClipboardOwner; }
void startDrag( Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& );
void copyToClipboard( Window* _pWindow, const GrantAccess& );
@@ -74,7 +74,7 @@ namespace svxform
void clear();
- static sal_Bool hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId );
+ static bool hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId );
protected:
// XClipboardOwner
@@ -110,9 +110,9 @@ namespace svxform
void startDrag( sal_Int8 nDragSourceActions );
void copyToClipboard( ) const;
- inline sal_Bool isDragSource() const { return m_pTransferable && m_pTransferable->isDragging(); }
- inline sal_Bool isClipboardOwner() const { return m_pTransferable && m_pTransferable->isClipboardOwner(); }
- inline sal_Bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
+ inline bool isDragSource() const { return m_pTransferable && m_pTransferable->isDragging(); }
+ inline bool isClipboardOwner() const { return m_pTransferable && m_pTransferable->isClipboardOwner(); }
+ inline bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
inline void clear() { if ( isDataExchangeActive() ) m_pTransferable->clear(); }
SVX_DLLPRIVATE void setClipboardListener( const Link& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
@@ -220,9 +220,9 @@ namespace svxform
static sal_uInt32 getControlPathFormatId( );
static sal_uInt32 getHiddenControlModelsFormatId( );
- inline static sal_Bool hasFieldExchangeFormat( const DataFlavorExVector& _rFormats );
- inline static sal_Bool hasControlPathFormat( const DataFlavorExVector& _rFormats );
- inline static sal_Bool hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasFieldExchangeFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasControlPathFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats );
protected:
virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
@@ -246,17 +246,17 @@ namespace svxform
- inline sal_Bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats )
+ inline bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats )
{
return hasFormat( _rFormats, getFieldExchangeFormatId() );
}
- inline sal_Bool OControlExchange::hasControlPathFormat( const DataFlavorExVector& _rFormats )
+ inline bool OControlExchange::hasControlPathFormat( const DataFlavorExVector& _rFormats )
{
return hasFormat( _rFormats, getControlPathFormatId() );
}
- inline sal_Bool OControlExchange::hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats )
+ inline bool OControlExchange::hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats )
{
return hasFormat( _rFormats, getHiddenControlModelsFormatId() );
}
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 548b7fd6f85c..18b9a187eb23 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -173,7 +173,7 @@ public:
FmEntryData* GetParent() const { return pParent; }
FmEntryDataList* GetChildList() const { return pChildList; }
- virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData );
+ virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData );
virtual FmEntryData* Clone() = 0;
// note that the interface returned is normalized, i.e. querying the given XInterface of the object
@@ -223,17 +223,17 @@ typedef std::set<FmEntryData*> FmEntryDataArray;
class FmNavRequestSelectHint : public SfxHint
{
FmEntryDataArray m_arredToSelect;
- sal_Bool m_bMixedSelection;
+ bool m_bMixedSelection;
public:
TYPEINFO_OVERRIDE();
FmNavRequestSelectHint()
- : m_bMixedSelection(sal_False)
+ : m_bMixedSelection(false)
{
}
virtual ~FmNavRequestSelectHint() {}
- void SetMixedSelection(sal_Bool bMixedSelection) { m_bMixedSelection = bMixedSelection; }
- sal_Bool IsMixedSelection() { return m_bMixedSelection; }
+ void SetMixedSelection(bool bMixedSelection) { m_bMixedSelection = bMixedSelection; }
+ bool IsMixedSelection() { return m_bMixedSelection; }
void AddItem(FmEntryData* pEntry) { m_arredToSelect.insert(pEntry); }
void ClearItems() { m_arredToSelect.clear(); }
FmEntryDataArray& GetItems() { return m_arredToSelect; }
@@ -267,7 +267,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& GetFormIface() const { return m_xForm; }
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& GetContainer() const { return m_xContainer; }
- virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
+ virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
virtual FmEntryData* Clone() SAL_OVERRIDE;
};
@@ -291,7 +291,7 @@ public:
virtual ~FmControlData();
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& GetFormComponent() const { return m_xFormComponent; }
- virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
+ virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
virtual FmEntryData* Clone() SAL_OVERRIDE;
void ModelReplaced(
@@ -318,7 +318,7 @@ namespace svxform
{
::svxform::NavigatorTreeModel* m_pNavModel;
sal_uInt32 m_nLocks;
- sal_Bool m_bCanUndo;
+ bool m_bCanUndo;
public:
OFormComponentObserver( ::svxform::NavigatorTreeModel* pModel );
@@ -337,8 +337,8 @@ namespace svxform
void Lock() { m_nLocks++; }
void UnLock() { m_nLocks--; }
- sal_Bool IsLocked() const { return m_nLocks != 0; }
- sal_Bool CanUndo() const { return m_bCanUndo; }
+ bool IsLocked() const { return m_nLocks != 0; }
+ bool CanUndo() const { return m_bCanUndo; }
void ReleaseModel() { m_pNavModel = NULL; }
protected:
void Insert(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIface, sal_Int32 nIndex);
@@ -377,7 +377,7 @@ namespace svxform
void BroadcastMarkedObjects(const SdrMarkList& mlMarked);
// einen RequestSelectHint mit den aktuell markierten Objekten broadcasten
- sal_Bool InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject);
+ bool InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject);
// ist ein Helper fuer vorherige, managet das Abteigen in SdrObjGroups
// Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht)
@@ -390,19 +390,19 @@ namespace svxform
void UpdateContent( FmFormShell* pNewShell );
void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = CONTAINER_APPEND,
- sal_Bool bAlterModel = sal_False );
- void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False );
+ bool bAlterModel = false );
+ void Remove( FmEntryData* pEntryData, bool bAlterModel = false );
- sal_Bool Rename( FmEntryData* pEntryData, const OUString& rNewText );
+ bool Rename( FmEntryData* pEntryData, const OUString& rNewText );
void Clear();
- void SetModified( sal_Bool bMod=sal_True );
+ void SetModified( bool bMod=true );
::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > GetForms() const;
FmFormShell* GetFormShell() const { return m_pFormShell; }
FmFormPage* GetFormPage() const { return m_pFormPage; }
- FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, sal_Bool bRecurs=sal_True );
- FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True );
+ FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true );
+ FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs=true );
FmEntryDataList* GetRootList() const { return m_pRootList; }
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData );
SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp);
@@ -447,16 +447,16 @@ namespace svxform
unsigned short m_aTimerCounter;
- sal_Bool m_bDragDataDirty : 1; // dito
- sal_Bool m_bPrevSelectionMixed : 1;
- sal_Bool m_bMarkingObjects : 1; // wenn das sal_True ist, brauche ich auf die RequestSelectHints nicht reagieren
- sal_Bool m_bRootSelected : 1;
- sal_Bool m_bInitialUpdate : 1; // bin ich das erste Mal im UpdateContent ?
- sal_Bool m_bKeyboardCut : 1;
+ bool m_bDragDataDirty : 1; // dito
+ bool m_bPrevSelectionMixed : 1;
+ bool m_bMarkingObjects : 1; // wenn das sal_True ist, brauche ich auf die RequestSelectHints nicht reagieren
+ bool m_bRootSelected : 1;
+ bool m_bInitialUpdate : 1; // bin ich das erste Mal im UpdateContent ?
+ bool m_bKeyboardCut : 1;
void UpdateContent();
- FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True );
+ FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName = true );
void NewForm( SvTreeListEntry* pParentEntry );
SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=TREELIST_APPEND );
void Remove( FmEntryData* pEntryData );
@@ -474,7 +474,7 @@ namespace svxform
// SDI_DIRTY ist natuerlich nicht erlaubt als Parameter
// ein einziges Interface fuer alle selektierten Eintraege zusammensetzen
- void ShowSelectionProperties(sal_Bool bForce = sal_False);
+ void ShowSelectionProperties(bool bForce = false);
// alle selektierten Elemnte loeschen
void DeleteSelection();
@@ -485,15 +485,15 @@ namespace svxform
void SynchronizeMarkList();
// umgekehrte Richtung von SynchronizeMarkList : markiert in der ::com::sun::star::sdbcx::View alle der aktuellen Selektion entsprechenden Controls
- void CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects);
+ void CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects);
// im Select aktualisiere ich normalerweise die Marklist der zugehoerigen ::com::sun::star::sdbcx::View, mit folgenden Funktionen
// kann ich das Locking dieses Verhaltens steuern
void LockSelectionHandling() { ++m_nSelectLock; }
void UnlockSelectionHandling() { --m_nSelectLock; }
- sal_Bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; }
+ bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; }
- sal_Bool IsHiddenControl(FmEntryData* pEntryData);
+ bool IsHiddenControl(FmEntryData* pEntryData);
DECL_LINK( OnEdit, void* );
DECL_LINK( OnDropActionTimer, void* );
@@ -516,12 +516,12 @@ namespace svxform
void Clear();
void UpdateContent( FmFormShell* pFormShell );
- void MarkViewObj( FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep = sal_False );
- void MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark );
+ void MarkViewObj( FmFormData* pFormData, bool bMark, bool bDeep = false );
+ void MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark );
void UnmarkAllViewObj();
- sal_Bool IsFormEntry( SvTreeListEntry* pEntry );
- sal_Bool IsFormComponentEntry( SvTreeListEntry* pEntry );
+ bool IsFormEntry( SvTreeListEntry* pEntry );
+ bool IsFormComponentEntry( SvTreeListEntry* pEntry );
OUString GenerateName( FmEntryData* pEntryData );
@@ -529,7 +529,7 @@ namespace svxform
SvTreeListEntry* FindEntry( FmEntryData* pEntryData );
virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
- virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
+ virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
@@ -542,25 +542,25 @@ namespace svxform
using SvTreeListBox::Notify;
private:
- sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos, sal_Bool _bDnD );
- sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD );
+ sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD );
+ sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
- sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, sal_Bool _bDnD );
- sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD );
+ sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD );
+ sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
// check if a cut, copy, or drag operation can be started in the current situation
- sal_Bool implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden = NULL );
+ bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = NULL );
// check if a paste with the current clipboard content can be accepted
- sal_Bool implAcceptPaste( );
+ bool implAcceptPaste( );
// fills m_aControlExchange in preparation of a DnD or clipboard operation
- sal_Bool implPrepareExchange( sal_Int8 _nAction );
+ bool implPrepareExchange( sal_Int8 _nAction );
void doPaste();
void doCopy();
void doCut();
- sal_Bool doingKeyboardCut( ) const { return m_bKeyboardCut; }
+ bool doingKeyboardCut( ) const { return m_bKeyboardCut; }
};
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 3a5d6b3915d3..dfd4083231b9 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -56,7 +56,7 @@ class SVX_DLLPRIVATE FmFormPageImpl
FmFormPage& m_rPage;
Link m_aFormsCreationHdl;
- sal_Bool m_bFirstActivation;
+ bool m_bFirstActivation;
bool m_bAttemptedFormCreation;
bool m_bInFind;
@@ -88,8 +88,8 @@ public:
);
// activation handling
- inline sal_Bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = sal_False; }
+ inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true );
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index bb2623e3d938..053dd2043939 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -226,21 +226,21 @@ class FmXFormShell :public FmXFormShell_BASE
mutable ::svxform::DocumentType
m_eDocumentType; /// the type of document we're living in
sal_Int16 m_nLockSlotInvalidation;
- sal_Bool m_bHadPropertyBrowserInDesignMode : 1;
+ bool m_bHadPropertyBrowserInDesignMode : 1;
- sal_Bool m_bTrackProperties : 1;
+ bool m_bTrackProperties : 1;
// soll ich (bzw. der Owner diese Impl-Klasse) mich um die Aktualisierung des ::com::sun::star::beans::Property-Browsers kuemmern ?
- sal_Bool m_bUseWizards : 1;
+ bool m_bUseWizards : 1;
- sal_Bool m_bDatabaseBar : 1; // Gibt es eine Datenbankleiste
- sal_Bool m_bInActivate : 1; // Wird ein Controller aktiviert
- sal_Bool m_bSetFocus : 1; // Darf der Focus umgesetzt werden
- sal_Bool m_bFilterMode : 1; // Wird gerade ein Filter auf die Controls angesetzt
- sal_Bool m_bChangingDesignMode:1; // sal_True within SetDesignMode
- sal_Bool m_bPreparedClose : 1; // for the current modification state of the current form
+ bool m_bDatabaseBar : 1; // Gibt es eine Datenbankleiste
+ bool m_bInActivate : 1; // Wird ein Controller aktiviert
+ bool m_bSetFocus : 1; // Darf der Focus umgesetzt werden
+ bool m_bFilterMode : 1; // Wird gerade ein Filter auf die Controls angesetzt
+ bool m_bChangingDesignMode:1; // sal_True within SetDesignMode
+ bool m_bPreparedClose : 1; // for the current modification state of the current form
// PrepareClose had been called and the user denied to save changes
- sal_Bool m_bFirstActivation : 1; // has the shell ever been activated?
+ bool m_bFirstActivation : 1; // has the shell ever been activated?
public:
// attribute access
@@ -249,10 +249,10 @@ public:
inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >&
getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; }
- inline sal_Bool
+ inline bool
didPrepareClose() const { return m_bPreparedClose; }
inline void
- didPrepareClose( sal_Bool _bDid ) { m_bPreparedClose = _bDid; }
+ didPrepareClose( bool _bDid ) { m_bPreparedClose = _bDid; }
public:
FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame);
@@ -290,12 +290,12 @@ protected:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
public:
- void EnableTrackProperties( sal_Bool bEnable) { m_bTrackProperties = bEnable; }
- sal_Bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
+ void EnableTrackProperties( bool bEnable) { m_bTrackProperties = bEnable; }
+ bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
// activation handling
- void viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction = sal_False );
- void viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController = sal_True );
+ void viewActivated( FmFormView& _rCurrentView, bool _bSyncAction = false );
+ void viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivateController = true );
// IControllerFeatureInvalidation
virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) SAL_OVERRIDE;
@@ -311,18 +311,18 @@ public:
/** updates m_xForms, to be either <NULL/>, if we're in alive mode, or our current page's forms collection,
if in design mode
*/
- void UpdateForms( sal_Bool _bInvalidate );
+ void UpdateForms( bool _bInvalidate );
void ExecuteSearch(); // execute SID_FM_SEARCH
void CreateExternalView(); // execute SID_FM_VIEW_AS_GRID
- sal_Bool GetY2KState(sal_uInt16& n);
+ bool GetY2KState(sal_uInt16& n);
void SetY2KState(sal_uInt16 n);
protected:
// activation handling
- inline sal_Bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = sal_False; }
+ inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
// form handling
/// load or unload the forms on a page
@@ -353,7 +353,7 @@ protected:
public:
// methode fuer nicht designmode (alive mode)
- void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, sal_Bool _bNoSaveOldContent = sal_False );
+ void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false );
const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;}
const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;}
@@ -389,7 +389,7 @@ public:
getCurrentForm() const { return m_xCurrentForm; }
void forgetCurrentForm();
/// returns whether the last known marking contained only controls
- sal_Bool onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
+ bool onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
/// determines whether the current selection consists of exactly the given object
bool isSolelySelected(
@@ -401,12 +401,12 @@ public:
/// handles the request for showing the "Properties"
void handleShowPropertiesRequest();
- sal_Bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
- sal_Bool hasDatabaseBar() const {return m_bDatabaseBar;}
- sal_Bool canNavigate() const {return m_xNavigationController.is();}
+ bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
+ bool hasDatabaseBar() const {return m_bDatabaseBar;}
+ bool canNavigate() const {return m_xNavigationController.is();}
- void ShowSelectionProperties( sal_Bool bShow );
- sal_Bool IsPropBrwOpen() const;
+ void ShowSelectionProperties( bool bShow );
+ bool IsPropBrwOpen() const;
void DetermineSelection(const SdrMarkList& rMarkList);
void SetSelection(const SdrMarkList& rMarkList);
@@ -414,13 +414,13 @@ public:
void SetDesignMode(bool bDesign);
- sal_Bool GetWizardUsing() const { return m_bUseWizards; }
- void SetWizardUsing(sal_Bool _bUseThem);
+ bool GetWizardUsing() const { return m_bUseWizards; }
+ void SetWizardUsing(bool _bUseThem);
// Setzen des Filtermodus
- sal_Bool isInFilterMode() const {return m_bFilterMode;}
+ bool isInFilterMode() const {return m_bFilterMode;}
void startFiltering();
- void stopFiltering(sal_Bool bSave);
+ void stopFiltering(bool bSave);
static PopupMenu* GetConversionMenu();
// ein Menue, das alle ControlConversion-Eintraege enthaelt
@@ -454,8 +454,8 @@ public:
// das Setzen des curObject/selObject/curForm erfolgt verzoegert (SetSelectionDelayed), mit den folgenden
// Funktionen laesst sich das abfragen/erzwingen
- inline sal_Bool IsSelectionUpdatePending();
- void ForceUpdateSelection(sal_Bool bLockInvalidation);
+ inline bool IsSelectionUpdatePending();
+ void ForceUpdateSelection(bool bLockInvalidation);
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getContextDocument() const;
::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& _xForm) const;
@@ -477,11 +477,11 @@ private:
void LoopGrids(sal_Int16 nWhat);
// Invalidierung von Slots
- void InvalidateSlot( sal_Int16 nId, sal_Bool bWithId );
+ void InvalidateSlot( sal_Int16 nId, bool bWithId );
void UpdateSlot( sal_Int16 nId );
// Locking der Invalidierung - wenn der interne Locking-Counter auf 0 geht, werden alle aufgelaufenen Slots
// (asynchron) invalidiert
- void LockSlotInvalidation(sal_Bool bLock);
+ void LockSlotInvalidation(bool bLock);
DECL_LINK(OnInvalidateSlots, void*);
@@ -537,7 +537,7 @@ protected:
};
-inline sal_Bool FmXFormShell::IsSelectionUpdatePending()
+inline bool FmXFormShell::IsSelectionUpdatePending()
{
return m_aMarkTimer.IsActive();
}
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 785d122050c0..abaf346ab908 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -157,7 +157,7 @@ public:
void Lock() { osl_atomic_increment( &m_Locks ); }
void UnLock() { osl_atomic_decrement( &m_Locks ); }
- sal_Bool IsLocked() const { return m_Locks != 0; }
+ bool IsLocked() const { return m_Locks != 0; }
// access control
struct Accessor { friend class FmFormModel; private: Accessor() { } };
@@ -167,8 +167,8 @@ public:
void RemoveForms( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& rForms );
// readonly-ness
- void SetReadOnly( sal_Bool bRead, const Accessor& ) { bReadOnly = bRead; }
- sal_Bool IsReadOnly() const {return bReadOnly;}
+ void SetReadOnly( bool bRead, const Accessor& ) { bReadOnly = bRead; }
+ bool IsReadOnly() const {return bReadOnly;}
protected:
// XEventListener
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 824ac2c2122c..a9ce1ba04cda 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -187,7 +187,7 @@ protected:
FmXFormView( FmFormView* _pView );
virtual ~FmXFormView();
- void saveMarkList( sal_Bool _bSmartUnmark = sal_True );
+ void saveMarkList( bool _bSmartUnmark = true );
void restoreMarkList( SdrMarkList& _rRestoredMarkList );
void stopMarkListWatching();
void startMarkListWatching();
@@ -248,8 +248,8 @@ private:
//void addWindow(const SdrPageViewWinRec*);
void addWindow(const SdrPageWindow&);
void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
- void Activate(sal_Bool bSync = sal_False);
- void Deactivate(sal_Bool bDeactivateController = sal_True);
+ void Activate(bool bSync = false);
+ void Deactivate(bool bDeactivateController = true);
SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor );
SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc );
@@ -296,7 +296,7 @@ private:
void cancelEvents();
/// the auto focus to the first (in terms of the tab order) control
- void AutoFocus( sal_Bool _bSync = sal_False );
+ void AutoFocus( bool _bSync = false );
DECL_LINK( OnActivate, void* );
DECL_LINK( OnAutoFocus, void* );
DECL_LINK( OnDelayedErrorMessage, void* );
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index a12b5b6f283e..0134eadc2243 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -82,9 +82,9 @@
#include <comphelper/implbase_var.hxx>
#endif
-struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , sal_Bool>
+struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , bool>
{
- sal_Bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
+ bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
{
return reinterpret_cast<sal_Int64>(x.get()) < reinterpret_cast<sal_Int64>(y.get());
}
@@ -190,19 +190,19 @@ namespace svxform
sal_Int32 m_nCurrentFilterPosition; // current level for filtering (or-criteria)
- sal_Bool m_bCurrentRecordModified : 1;
- sal_Bool m_bCurrentRecordNew : 1;
- sal_Bool m_bLocked : 1;
- sal_Bool m_bDBConnection : 1; // Focuslistener nur fuer Datenbankformulare
- sal_Bool m_bCycle : 1;
- sal_Bool m_bCanInsert : 1;
- sal_Bool m_bCanUpdate : 1;
- sal_Bool m_bCommitLock : 1; // lock the committing of controls see focusGained
- sal_Bool m_bModified : 1; // ist der Inhalt eines Controls modifiziert ?
- sal_Bool m_bControlsSorted : 1;
- sal_Bool m_bFiltering : 1;
- sal_Bool m_bAttachEvents : 1;
- sal_Bool m_bDetachEvents : 1;
+ bool m_bCurrentRecordModified : 1;
+ bool m_bCurrentRecordNew : 1;
+ bool m_bLocked : 1;
+ bool m_bDBConnection : 1; // Focuslistener nur fuer Datenbankformulare
+ bool m_bCycle : 1;
+ bool m_bCanInsert : 1;
+ bool m_bCanUpdate : 1;
+ bool m_bCommitLock : 1; // lock the committing of controls see focusGained
+ bool m_bModified : 1; // ist der Inhalt eines Controls modifiziert ?
+ bool m_bControlsSorted : 1;
+ bool m_bFiltering : 1;
+ bool m_bAttachEvents : 1;
+ bool m_bDetachEvents : 1;
bool m_bAttemptedHandlerCreation : 1;
bool m_bSuspendFilterTextListening; // no bit field, passed around as reference
@@ -480,14 +480,14 @@ namespace svxform
void setControlLock(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
void addToEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
void removeFromEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
- void toggleAutoFields(sal_Bool bAutoFields);
+ void toggleAutoFields(bool bAutoFields);
void unload() throw( ::com::sun::star::uno::RuntimeException );
void removeBoundFieldListener();
- void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
- void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
+ void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly );
+ void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly );
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, sal_Bool _bRemove, sal_Bool _bOverWrite ) const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, bool _bRemove, bool _bOverWrite ) const;
void insertControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
void removeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
@@ -522,8 +522,8 @@ namespace svxform
*/
void impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rClearBeforeNotify );
- sal_Bool isLocked() const {return m_bLocked;}
- sal_Bool determineLockState() const;
+ bool isLocked() const {return m_bLocked;}
+ bool determineLockState() const;
Window* getDialogParentWindow();
// returns the window which should be used as parent window for dialogs
@@ -565,7 +565,7 @@ namespace svxform
void impl_setTextOnAllFilter_throw();
// in filter mode we do not listen for changes
- sal_Bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
+ bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const;
DECL_LINK( OnActivateTabOrder, void* );
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index e1cedf04d14d..dbe66831e329 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -175,13 +175,13 @@ namespace svx
sal_Int32 _nSlotId,
::com::sun::star::form::runtime::FeatureState& _out_rState
) const;
- sal_Bool isEnabled( sal_Int32 _nSlotId ) const;
+ bool isEnabled( sal_Int32 _nSlotId ) const;
void execute( sal_Int32 _nSlotId ) const;
void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const;
- sal_Bool commitCurrentRecord() const;
- sal_Bool commitCurrentControl( ) const;
- sal_Bool isInsertionRow() const;
- sal_Bool isModifiedRow() const;
+ bool commitCurrentRecord() const;
+ bool commitCurrentControl( ) const;
+ bool isInsertionRow() const;
+ bool isModifiedRow() const;
bool canDoFormFilter() const;
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index 92766a3558cd..1c2cf672b75d 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -63,7 +63,7 @@ namespace svxform
// the component which's dispatches we're intercepting
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterception >
m_xIntercepted;
- sal_Bool m_bListening;
+ bool m_bListening;
// the real interceptor
DispatchInterceptor* m_pMaster;
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index b2d6062da04f..f2d138fb752f 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -48,8 +48,8 @@ namespace svx
const ::com::sun::star::util::URL m_aFeatureURL;
::com::sun::star::uno::Any m_aLastKnownState;
const sal_Int16 m_nFormFeature;
- sal_Bool m_bLastKnownEnabled;
- sal_Bool m_bDisposed;
+ bool m_bLastKnownEnabled;
+ bool m_bDisposed;
public:
/** constructs the dispatcher
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 1778dc6f7472..6275c3f8ee80 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -85,14 +85,14 @@ private:
sal_uInt16 m_nId;
sal_Int16 m_nFieldPos;
sal_Int16 m_nAlign; // wird mit TXT_ALIGN_LEFT .... angegeben
- sal_Bool m_bReadOnly : 1;
- sal_Bool m_bAutoValue : 1;
- sal_Bool m_bInSave : 1;
- sal_Bool m_bNumeric : 1;
- sal_Bool m_bObject : 1; // Verweist die Column auf ein Object Datentyp?
- sal_Bool m_bHidden : 1;
- sal_Bool m_bLocked : 1;
- sal_Bool m_bDateTime : 1;
+ bool m_bReadOnly : 1;
+ bool m_bAutoValue : 1;
+ bool m_bInSave : 1;
+ bool m_bNumeric : 1;
+ bool m_bObject : 1; // Verweist die Column auf ein Object Datentyp?
+ bool m_bHidden : 1;
+ bool m_bLocked : 1;
+ bool m_bDateTime : 1;
static ::svt::CellControllerRef s_xEmptyController;
// used by locked columns
@@ -107,14 +107,14 @@ public:
,m_nId(_nId)
,m_nFieldPos(-1)
,m_nAlign(::com::sun::star::awt::TextAlign::LEFT)
- ,m_bReadOnly(sal_False)
- ,m_bAutoValue(sal_False)
- ,m_bInSave(sal_False)
- ,m_bNumeric(sal_False)
- ,m_bObject(sal_False)
- ,m_bHidden(sal_False)
- ,m_bLocked(sal_False)
- ,m_bDateTime(sal_False)
+ ,m_bReadOnly(false)
+ ,m_bAutoValue(false)
+ ,m_bInSave(false)
+ ,m_bNumeric(false)
+ ,m_bObject(false)
+ ,m_bHidden(false)
+ ,m_bLocked(false)
+ ,m_bDateTime(false)
{
}
@@ -125,16 +125,16 @@ public:
sal_uInt16 GetId() const {return m_nId;}
- sal_Bool IsReadOnly() const {return m_bReadOnly;}
- sal_Bool IsAutoValue() const {return m_bAutoValue;}
- sal_Bool IsUpdating() const {return m_bInSave;}
+ bool IsReadOnly() const {return m_bReadOnly;}
+ bool IsAutoValue() const {return m_bAutoValue;}
+ bool IsUpdating() const {return m_bInSave;}
sal_Int16 GetAlignment() const {return m_nAlign;}
sal_Int16 GetType() const {return m_nFieldType;}
sal_Int16 GetFieldPos() const {return m_nFieldPos; }
- sal_Bool IsNumeric() const {return m_bNumeric;}
- sal_Bool IsDateTime() const {return m_bDateTime;}
- sal_Bool IsObject() const {return m_bObject;}
- sal_Bool IsHidden() const {return m_bHidden;}
+ bool IsNumeric() const {return m_bNumeric;}
+ bool IsDateTime() const {return m_bDateTime;}
+ bool IsObject() const {return m_bObject;}
+ bool IsHidden() const {return m_bHidden;}
sal_Int32 GetKey() const {return m_nFormatKey;}
const ::svt::CellControllerRef& GetController() const {return m_bLocked ? s_xEmptyController : m_xController;}
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& GetField() const {return m_xField;}
@@ -163,7 +163,7 @@ public:
// Editieren einer Zelle
void UpdateFromField(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter);
- sal_Bool Commit();
+ bool Commit();
// freigeben aller Daten, die fuer den AliveMode noetig sind
void Clear();
@@ -171,8 +171,8 @@ public:
OUString GetCellText(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const;
OUString GetCellText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const;
- void SetReadOnly(sal_Bool bRead){m_bReadOnly = bRead;}
- void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = sal_True; m_nFieldPos = nPos;}
+ void SetReadOnly(bool bRead){m_bReadOnly = bRead;}
+ void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;}
void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat );
@@ -185,8 +185,8 @@ public:
// alignment if the property if void, return the really set alignment
// column locking
- sal_Bool isLocked() const { return m_bLocked; }
- void setLock(sal_Bool _bLock);
+ bool isLocked() const { return m_bLocked; }
+ void setLock(bool _bLock);
private:
/** attaches or detaches our cell object to the SctriptEventAttacherManager implemented
@@ -211,9 +211,9 @@ private:
::comphelper::OPropertyChangeMultiplexer* m_pFieldChangeBroadcaster;
private:
- sal_Bool m_bTransparent : 1;
- sal_Bool m_bAlignedController : 1;
- sal_Bool m_bAccessingValueProperty : 1;
+ bool m_bTransparent : 1;
+ bool m_bAlignedController : 1;
+ bool m_bAccessingValueProperty : 1;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >
m_xCursor;
@@ -228,17 +228,17 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& getCursor() const { return m_xCursor; }
// control transparency
- inline sal_Bool isTransparent( ) const { return m_bTransparent; }
- inline void setTransparent( sal_Bool _bSet ) { m_bTransparent = _bSet; }
+ inline bool isTransparent( ) const { return m_bTransparent; }
+ inline void setTransparent( bool _bSet ) { m_bTransparent = _bSet; }
// control alignment
- inline void setAlignedController( sal_Bool _bAlign = sal_True ) { m_bAlignedController = _bAlign; }
+ inline void setAlignedController( bool _bAlign = true ) { m_bAlignedController = _bAlign; }
/** determined whether or not the value property is locked
@see lockValueProperty
*/
- inline sal_Bool isValuePropertyLocked() const;
+ inline bool isValuePropertyLocked() const;
/** locks the listening at the value property.
<p>This means that every subsequent change now done on the value property of the model ("Text", or "Value",
@@ -269,7 +269,7 @@ protected:
public:
TYPEINFO();
- DbCellControl(DbGridColumn& _rColumn, sal_Bool _bText = sal_True);
+ DbCellControl(DbGridColumn& _rColumn, bool _bText = true);
virtual ~DbCellControl();
@@ -280,7 +280,7 @@ public:
}
// control alignment
- inline sal_Bool isAlignedController() const { return m_bAlignedController; }
+ inline bool isAlignedController() const { return m_bAlignedController; }
void AlignControl(sal_Int16 nAlignment);
void SetTextLineColor();
@@ -291,7 +291,7 @@ public:
virtual ::svt::CellControllerRef CreateController() const = 0;
// Schreiben des Wertes in das Model
- sal_Bool Commit();
+ bool Commit();
// Formatting the field data to output text
virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0;
@@ -316,7 +316,7 @@ protected:
<p>To be overwritten in derived classes.</p>
@see updateFromModel
*/
- virtual sal_Bool commitControl( ) = 0;
+ virtual bool commitControl( ) = 0;
/** updates the current content of the control (e.g. the text of an edit field) from the column model
(e.g. the "Text" property of the model).
@@ -335,7 +335,7 @@ protected:
virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private:
- void implDoPropertyListening( const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent = sal_True );
+ void implDoPropertyListening( const OUString& _rPropertyName, bool _bWarnIfNotExistent = true );
/// updates the "readonly" setting on m_pWindow, according to the respective property value in the given model
void implAdjustReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,bool i_bReadOnly );
@@ -346,7 +346,7 @@ private:
-inline sal_Bool DbCellControl::isValuePropertyLocked() const
+inline bool DbCellControl::isValuePropertyLocked() const
{
return m_bAccessingValueProperty;
}
@@ -355,14 +355,14 @@ inline sal_Bool DbCellControl::isValuePropertyLocked() const
inline void DbCellControl::lockValueProperty()
{
OSL_ENSURE( !isValuePropertyLocked(), "DbCellControl::lockValueProperty: not to be nested!" );
- m_bAccessingValueProperty = sal_True;
+ m_bAccessingValueProperty = true;
}
inline void DbCellControl::unlockValueProperty()
{
OSL_ENSURE( isValuePropertyLocked(), "DbCellControl::lockValueProperty: not locked so far!" );
- m_bAccessingValueProperty = sal_False;
+ m_bAccessingValueProperty = false;
}
@@ -394,7 +394,7 @@ class DbTextField : public DbLimitedLengthField
::svt::IEditImplementation* m_pEdit;
::svt::IEditImplementation* m_pPainterImplementation;
sal_Int16 m_nKeyType;
- sal_Bool m_bIsSimpleEdit;
+ bool m_bIsSimpleEdit;
protected:
virtual ~DbTextField( );
@@ -404,7 +404,7 @@ public:
DbTextField(DbGridColumn& _rColumn);
::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; }
- sal_Bool IsSimpleEdit() const { return m_bIsSimpleEdit; }
+ bool IsSimpleEdit() const { return m_bIsSimpleEdit; }
virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE;
virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE;
@@ -416,7 +416,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbLimitedLengthField
virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) SAL_OVERRIDE;
@@ -443,7 +443,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// OPropertyChangeListener
@@ -467,7 +467,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
};
@@ -489,7 +489,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE;
@@ -501,7 +501,7 @@ protected:
class DbListBox :public DbCellControl
{
- sal_Bool m_bBound : 1;
+ bool m_bBound : 1;
::com::sun::star::uno::Sequence< OUString > m_aValueList;
public:
@@ -517,7 +517,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE;
@@ -539,7 +539,7 @@ public:
protected:
/// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE;
@@ -590,7 +590,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -615,7 +615,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -644,7 +644,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -669,7 +669,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -692,9 +692,9 @@ class DbFilterField
OUString m_aText;
Link m_aCommitLink;
sal_Int16 m_nControlClass;
- sal_Bool m_bFilterList : 1;
- sal_Bool m_bFilterListFilled : 1;
- sal_Bool m_bBound : 1;
+ bool m_bFilterList : 1;
+ bool m_bFilterListFilled : 1;
+ bool m_bBound : 1;
public:
TYPEINFO_OVERRIDE();
@@ -717,11 +717,11 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
protected:
- void SetList(const ::com::sun::star::uno::Any& rItems, sal_Bool bComboBox);
+ void SetList(const ::com::sun::star::uno::Any& rItems, bool bComboBox);
void CreateControl(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel);
DECL_LINK( OnClick, void* );
};
@@ -812,11 +812,11 @@ public:
virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Bool Commit() {return m_pCellControl->Commit();}
+ bool Commit() {return m_pCellControl->Commit();}
void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat )
{ m_pCellControl->ImplInitWindow( rParent, _eInitWhat ); }
- sal_Bool isAlignedController() const { return m_pCellControl->isAlignedController(); }
+ bool isAlignedController() const { return m_pCellControl->isAlignedController(); }
void AlignControl(sal_Int16 nAlignment)
{ m_pCellControl->AlignControl(nAlignment);}
@@ -872,7 +872,7 @@ protected:
This member is <TRUE/> by default, and can be modified by derived classes.
*/
- sal_Bool m_bFastPaint;
+ bool m_bFastPaint;
public:
TYPEINFO_OVERRIDE();
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index e85091caa5d4..02cea4f5e026 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -48,9 +48,9 @@ namespace svxform
// (which is checked via the supported interfaces) _all_ members will be set to
// void !, even if the object has some of the needed interfaces.
- sal_Bool is() const { return m_xColumn.is(); }
- sal_Bool Is() const { return m_xColumn.is(); }
- sal_Bool supportsUpdate() const { return m_xColumnUpdate.is(); }
+ bool is() const { return m_xColumn.is(); }
+ bool Is() const { return m_xColumn.is(); }
+ bool supportsUpdate() const { return m_xColumnUpdate.is(); }
DataColumn* operator ->() { return this; }
operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn.get(); }
@@ -84,9 +84,9 @@ namespace svxform
inline void removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::sdb::XColumn
- inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+ inline bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
- inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+ inline bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
@@ -107,7 +107,7 @@ namespace svxform
// XColumnUpdate
inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
- inline void updateBoolean(sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+ inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index c7043bb48dcd..7b08ee51c9a2 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -70,7 +70,7 @@ class SvxPixelCtlAccessibleChild :
SvxPixelCtl& mrParentWindow;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
void IsValid() throw (::com::sun::star::uno::RuntimeException);
- sal_Bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
+ bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
Point maPoint;
Rectangle* mpBoundingBox;
/// index of child in parent
@@ -80,7 +80,7 @@ class SvxPixelCtlAccessibleChild :
public:
SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
- sal_Bool bPixelColorOrBG,
+ bool bPixelColorOrBG,
const Point& aPoint,
const Rectangle& rBounds,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xParent,
@@ -142,16 +142,16 @@ public:
virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
/// @returns true if it's disposed or in disposing
- inline sal_Bool IsAlive( void ) const;
+ inline bool IsAlive( void ) const;
/// @returns true if it's not disposed and no in disposing
- inline sal_Bool IsNotAlive( void ) const;
+ inline bool IsNotAlive( void ) const;
/// throws the exception DisposedException if it's not alive
void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException );
void CheckChild();
- void SelectChild( sal_Bool bSelect);
- void ChangePixelColorOrBG(sal_Bool bPixelColorOrBG){ m_bPixelColorOrBG = bPixelColorOrBG ;}
+ void SelectChild( bool bSelect);
+ void ChangePixelColorOrBG(bool bPixelColorOrBG){ m_bPixelColorOrBG = bPixelColorOrBG ;}
OUString GetName();
};
@@ -244,32 +244,32 @@ public:
void LoseFocus();
/// @returns true if it's disposed or in disposing
- inline sal_Bool IsAlive( void ) const;
+ inline bool IsAlive( void ) const;
/// @returns true if it's not disposed and no in disposing
- inline sal_Bool IsNotAlive( void ) const;
+ inline bool IsNotAlive( void ) const;
protected:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild;
public:
- void NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool bCheck);
+ void NotifyChild(long nIndex, bool bSelect, bool bCheck);
};
-inline sal_Bool SvxPixelCtlAccessible::IsAlive( void ) const
+inline bool SvxPixelCtlAccessible::IsAlive( void ) const
{
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline sal_Bool SvxPixelCtlAccessible::IsNotAlive( void ) const
+inline bool SvxPixelCtlAccessible::IsNotAlive( void ) const
{
return rBHelper.bDisposed || rBHelper.bInDispose;
}
-inline sal_Bool SvxPixelCtlAccessibleChild::IsAlive( void ) const
+inline bool SvxPixelCtlAccessibleChild::IsAlive( void ) const
{
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline sal_Bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const
+inline bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const
{
return rBHelper.bDisposed || rBHelper.bInDispose;
}
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 489441bddd30..cae837f125a4 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -106,13 +106,13 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL
getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isShowing() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isVisible() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL
@@ -241,7 +241,7 @@ protected:
@param nIndexOfChild
Index of the new child which should be selected.
*/
- void selectChild( long nIndexOfChild, sal_Bool bFireFocus = sal_True);
+ void selectChild( long nIndexOfChild, bool bFireFocus = true);
public:
/** Selects a new child by point.
@@ -252,7 +252,7 @@ public:
@param eButton
Button which belongs to the child which should be selected.
*/
- void selectChild( RECT_POINT ePoint, sal_Bool bFireFocus = sal_True );
+ void selectChild( RECT_POINT ePoint, bool bFireFocus = true );
void FireChildFocus( RECT_POINT eButton );
protected:
@@ -364,13 +364,13 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL
getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isShowing() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isVisible() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 3976f8c5314f..3e49fee12807 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -106,7 +106,7 @@ public:
const OUString& GetObjectName() const { return m_aObjectName; }
sal_Int32 GetObjectType() const { return m_nObjectType; }
- sal_Bool createSelectionControls( );
+ bool createSelectionControls( );
protected:
// FmXChangeListener
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index d31dad59fdef..3ef6205f23bd 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -68,7 +68,7 @@ protected:
private:
Gallery* mpGallery;
- sal_Bool mbHiddenThemes;
+ bool mbHiddenThemes;
};
}
generated by cgit (git 2.34.1) at 2024-07-02 12:02:33 +0000