summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-21 10:39:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-21 10:39:12 +0100
commit98fba37bb1e2c5fd10d57d20d6e139765eb69751 (patch)
tree14f77c32abc948c109622f72b31e666dc5952611 /include
parent9d4a40f108e24422dc7aad60f4d17bff08449e90 (diff)
Consistently let SetDesingMode functions take bool argument
...to avoid "warning C4805: '!=' : unsafe mix of type 'bool' and type 'sal_Bool' in opertaion" style errors. Additionally, mark those functions that are virtual overrides as such. Change-Id: I64f919f7e2d8f6224303f9bac67f6270d58de014
Diffstat (limited to 'include')
-rw-r--r--include/svx/fmgridcl.hxx2
-rw-r--r--include/svx/fmshell.hxx2
-rw-r--r--include/svx/gridctrl.hxx2
-rw-r--r--include/svx/svdmrkv.hxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 306023cce240..62ef3aede68e 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -159,7 +159,7 @@ protected:
virtual void ColumnResized(sal_uInt16 nId);
virtual void ColumnMoved(sal_uInt16 nId);
virtual void DeleteSelectedRows();
- virtual void SetDesignMode(sal_Bool bMode);
+ virtual void SetDesignMode(bool bMode) SAL_OVERRIDE;
virtual void CellModified();
virtual void HideColumn(sal_uInt16 nId);
virtual void ShowColumn(sal_uInt16 nId);
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 42d204d888ad..f0e7eb52abf3 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -162,7 +162,7 @@ public:
) const;
sal_Bool IsDesignMode() const { return m_bDesignMode; }
- void SetDesignMode( sal_Bool _bDesignMode );
+ void SetDesignMode( bool _bDesignMode );
protected:
void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich);
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 673f60442a57..9c457b8ec818 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -419,7 +419,7 @@ public:
sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return GetColumnId(nPos + 1); }
sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const;
- virtual void SetDesignMode(sal_Bool bMode);
+ virtual void SetDesignMode(bool bMode);
sal_Bool IsDesignMode() const {return m_bDesignMode;}
sal_Bool IsOpen() const {return m_pSeekCursor != NULL;}
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index e53bf1060215..30d589279594 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -222,7 +222,7 @@ public:
void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT; }
- void SetDesignMode(sal_Bool bOn=sal_True);
+ void SetDesignMode(bool bOn = true);
sal_Bool IsDesignMode() const { return bDesignMode; }
void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }