summaryrefslogtreecommitdiff
path: root/svx
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 /svx
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 'svx')
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx4
7 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ac04ace27d1b..27b657c53a93 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1068,7 +1068,7 @@ void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChange
}
}
-void FmGridControl::SetDesignMode(sal_Bool bMode)
+void FmGridControl::SetDesignMode(bool bMode)
{
sal_Bool bOldMode = IsDesignMode();
DbGridControl::SetDesignMode(bMode);
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 4c7641bf98c8..07a41bee36dc 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2537,7 +2537,7 @@ void DbGridControl::AppendNew()
MoveToPosition(nNewRow - 1);
}
-void DbGridControl::SetDesignMode(sal_Bool bMode)
+void DbGridControl::SetDesignMode(bool bMode)
{
if (IsDesignMode() != bMode)
{
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 40e1ba2e2bce..dcf8ce4bf0a0 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1450,7 +1450,7 @@ Reference< runtime::XFormController > FmFormShell::GetFormController( const Refe
}
//------------------------------------------------------------------------
-void FmFormShell::SetDesignMode( sal_Bool _bDesignMode )
+void FmFormShell::SetDesignMode( bool _bDesignMode )
{
if ( _bDesignMode == m_bDesignMode )
return;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 94d4c2e8fad7..1a8794d5f438 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2799,7 +2799,7 @@ public:
};
//------------------------------------------------------------------------------
-void FmXFormShell::SetDesignMode(sal_Bool bDesign)
+void FmXFormShell::SetDesignMode(bool bDesign)
{
if ( impl_checkDisposed() )
return;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 2eb41e98b962..e2036e719092 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -412,7 +412,7 @@ public:
void SetSelection(const SdrMarkList& rMarkList);
void SetSelectionDelayed();
- void SetDesignMode(sal_Bool bDesign);
+ void SetDesignMode(bool bDesign);
sal_Bool GetWizardUsing() const { return m_bUseWizards; }
void SetWizardUsing(sal_Bool _bUseThem);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 4d24c6636e93..2124482569be 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -2117,7 +2117,7 @@ void SdrMarkView::SetMoveOutside(sal_Bool bOn)
aHdl.SetMoveOutside(bOn);
}
-void SdrMarkView::SetDesignMode( sal_Bool _bOn )
+void SdrMarkView::SetDesignMode( bool _bOn )
{
if ( bDesignMode != _bOn )
{
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 771f8e80b115..fbda90a097a7 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -75,7 +75,7 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
// Erzeugen der (hidden) ::com::sun::star::sdbcx::View
mpView = new SdrView( mpModel );
if( mpView )
- mpView->SetDesignMode(sal_True);
+ mpView->SetDesignMode(true);
}
SvxDrawPage::~SvxDrawPage() throw()
@@ -848,7 +848,7 @@ void SvxDrawPage::ChangeModel( SdrModel* pNewModel )
delete mpView;
mpView = new SdrView( mpModel );
if( mpView )
- mpView->SetDesignMode(sal_True);
+ mpView->SetDesignMode(true);
}
}
}