[Libreoffice-commits] core.git: sc/source

[Stephan Bergmann]

 sc/source/ui/cctrl/tbinsert.cxx         |    2 +-
 sc/source/ui/inc/tbinsert.hxx           |    2 +-
 sc/source/ui/vba/vbacondition.cxx       |    2 +-
 sc/source/ui/vba/vbacondition.hxx       |    2 +-
 sc/source/ui/vba/vbaformatcondition.cxx |    4 ++--
 sc/source/ui/vba/vbaformatcondition.hxx |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 19620f12a2a6df132515c5025a402587a9b8337c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 15 15:36:47 2014 +0200

    sc: sal_Bool -> bool
    
    Change-Id: I3b59c5679ac3d370f62960b9fc26eab4c3fc4873

diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 5de5395..fe1635b 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -98,7 +98,7 @@ SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
     return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
 }
 
-void ScTbxInsertCtrl::Select( sal_Bool /* bMod1 */ )
+void ScTbxInsertCtrl::Select( bool /* bMod1 */ )
 {
     SfxViewShell*   pCurSh( SfxViewShell::Current() );
     SfxDispatcher*  pDispatch( 0 );
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index f38aeb0..01b1d46 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -27,7 +27,7 @@ class ScTbxInsertCtrl : public SfxToolBoxControl
     sal_uInt16                  nLastSlotId;
 
     using SfxToolBoxControl::Select;
-    virtual void            Select( sal_Bool bMod1 = false );
+    virtual void            Select( bool bMod1 = false );
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 3e475d8..060d33d8 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -117,7 +117,7 @@ ScVbaCondition< Ifc1 >::setFormula2( const uno::Any& _aFormula2) throw ( script:
 
 template< typename Ifc1 >
 sal_Int32
-ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script::BasicErrorException )
+ScVbaCondition< Ifc1 >::Operator(bool _bIncludeFormulaValue) throw ( script::BasicErrorException )
 {
     sal_Int32 retvalue = -1;
     sheet::ConditionOperator aConditionalOperator =  mxSheetCondition->getOperator();
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index 85d5212..c6e0b33 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -39,7 +39,7 @@ public:
     virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
     virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException );
     virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException );
-    virtual sal_Int32 Operator(sal_Bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException );
+    virtual sal_Int32 Operator(bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException );
     virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) = 0;
 
 };
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 683a3c9..8833c75 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -132,14 +132,14 @@ ScVbaFormatCondition::Type(  ) throw ( script::BasicErrorException, uno::Runtime
 }
 
 ::sal_Int32
-ScVbaFormatCondition::Operator( sal_Bool bVal ) throw (script::BasicErrorException )
+ScVbaFormatCondition::Operator( bool bVal ) throw (script::BasicErrorException )
 {
     return ScVbaFormatCondition_BASE::Operator( bVal );
 }
 ::sal_Int32 SAL_CALL
 ScVbaFormatCondition::Operator(  ) throw (script::BasicErrorException, uno::RuntimeException)
 {
-    return ScVbaFormatCondition_BASE::Operator( sal_True );
+    return ScVbaFormatCondition_BASE::Operator( true );
 }
 
 void
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index 8110606..4e9c464 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -53,7 +53,7 @@ public:
     virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::sal_Int32 Operator( sal_Bool  ) throw (css::script::BasicErrorException) SAL_OVERRIDE;
+    virtual ::sal_Int32 Operator( bool  ) throw (css::script::BasicErrorException) SAL_OVERRIDE;
     virtual ::sal_Int32 SAL_CALL Operator(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE;
     virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) SAL_OVERRIDE;
     virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ) SAL_OVERRIDE;