summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-12 15:23:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-12 15:23:48 +0200
commit3d20965ee5dc009090fe0e3dad2cec3d78344318 (patch)
treef05ea44838a8c1c7ea833ced62d5540b6668240a /extensions
parent5490e0a8800c3a15d6b5d88611463c0979a7ec71 (diff)
extensions: sal_Bool -> bool
Change-Id: I026056e093661d3beb7f7a231d6cf0e8c72e5b50
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx2
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx10
-rw-r--r--extensions/source/propctrlr/composeduiupdate.hxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx8
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx4
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx4
-rw-r--r--extensions/source/propctrlr/propertycomposer.cxx2
-rw-r--r--extensions/source/propctrlr/propertycomposer.hxx2
-rw-r--r--extensions/source/propctrlr/proplinelistener.hxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.hxx2
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx18
13 files changed, 30 insertions, 30 deletions
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 09856e4b9334..8f39ae82b3e7 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -40,7 +40,7 @@ namespace pcr
class IButtonClickListener
{
public:
- virtual void buttonClicked( OBrowserLine* _pLine, sal_Bool _bPrimary ) = 0;
+ virtual void buttonClicked( OBrowserLine* _pLine, bool _bPrimary ) = 0;
protected:
~IButtonClickListener() {}
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 699d5734bcff..05d672822053 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -882,7 +882,7 @@ namespace pcr
}
- void OBrowserListBox::buttonClicked( OBrowserLine* _pLine, sal_Bool _bPrimary )
+ void OBrowserListBox::buttonClicked( OBrowserLine* _pLine, bool _bPrimary )
{
DBG_ASSERT( _pLine, "OBrowserListBox::buttonClicked: invalid browser line!" );
if ( _pLine && m_pLineListener )
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 24ed978c524d..dca5005c7c7c 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -171,7 +171,7 @@ namespace pcr
virtual void SAL_CALL activateNextControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& CurrentControl ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// IButtonClickListener
- void buttonClicked( OBrowserLine* _pLine, sal_Bool _bPrimary ) SAL_OVERRIDE;
+ void buttonClicked( OBrowserLine* _pLine, bool _bPrimary ) SAL_OVERRIDE;
using Window::SetHelpText;
private:
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index bcff8de6c553..fe5c71a2f3cd 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -518,7 +518,7 @@ namespace pcr
class IStringKeyBooleanUIUpdate
{
public:
- virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const = 0;
+ virtual void updateUIForKey( const OUString& _rKey, bool _bFlag ) const = 0;
virtual ~IStringKeyBooleanUIUpdate() { }
};
@@ -544,11 +544,11 @@ namespace pcr
{
}
// IStringKeyBooleanUIUpdate
- virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const SAL_OVERRIDE;
+ virtual void updateUIForKey( const OUString& _rKey, bool _bFlag ) const SAL_OVERRIDE;
};
- void EnablePropertyUIElement::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const
+ void EnablePropertyUIElement::updateUIForKey( const OUString& _rKey, bool _bFlag ) const
{
m_xUIUpdate->enablePropertyUIElements( _rKey, m_nElement, _bFlag );
}
@@ -575,7 +575,7 @@ namespace pcr
public:
DefaultStringKeyBooleanUIUpdate( const Reference< XObjectInspectorUI >& _rxUIUpdate, FPropertyUIFlagSetter _pSetter );
// IStringKeyBooleanUIUpdate
- virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const SAL_OVERRIDE;
+ virtual void updateUIForKey( const OUString& _rKey, bool _bFlag ) const SAL_OVERRIDE;
};
@@ -586,7 +586,7 @@ namespace pcr
}
- void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const
+ void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const OUString& _rKey, bool _bFlag ) const
{
((m_xUIUpdate.get())->*m_pSetter)( _rKey, _bFlag );
}
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 74930b169fd6..7d612b70be6d 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -44,7 +44,7 @@ namespace pcr
class SAL_NO_VTABLE IPropertyExistenceCheck
{
public:
- virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0;
protected:
~IPropertyExistenceCheck() {}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 796686f30eb6..6b2b1f84941d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2989,7 +2989,7 @@ namespace pcr
virtual OUString getSQLCommand() const SAL_OVERRIDE;
virtual bool getEscapeProcessing() const SAL_OVERRIDE;
virtual void setSQLCommand( const OUString& _rCommand ) const SAL_OVERRIDE;
- virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const SAL_OVERRIDE;
+ virtual void setEscapeProcessing( const bool _bEscapeProcessing ) const SAL_OVERRIDE;
// ISQLCommandPropertyUI
virtual OUString* getPropertiesToDisable() SAL_OVERRIDE;
@@ -3027,7 +3027,7 @@ namespace pcr
}
- void FormSQLCommandUI::setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const
+ void FormSQLCommandUI::setEscapeProcessing( const bool _bEscapeProcessing ) const
{
m_xObject->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( _bEscapeProcessing ) );
}
@@ -3056,7 +3056,7 @@ namespace pcr
virtual OUString getSQLCommand() const SAL_OVERRIDE;
virtual bool getEscapeProcessing() const SAL_OVERRIDE;
virtual void setSQLCommand( const OUString& _rCommand ) const SAL_OVERRIDE;
- virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const SAL_OVERRIDE;
+ virtual void setEscapeProcessing( const bool _bEscapeProcessing ) const SAL_OVERRIDE;
// ISQLCommandPropertyUI
virtual OUString* getPropertiesToDisable() SAL_OVERRIDE;
@@ -3120,7 +3120,7 @@ namespace pcr
}
- void ValueListCommandUI::setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const
+ void ValueListCommandUI::setEscapeProcessing( const bool _bEscapeProcessing ) const
{
m_xObject->setPropertyValue( PROPERTY_LISTSOURCETYPE, makeAny(
_bEscapeProcessing ? ListSourceType_SQL : ListSourceType_SQLPASSTHROUGH ) );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index edcb814ccf40..ff37ef1ba4d6 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1309,7 +1309,7 @@ namespace pcr
}
- void OPropertyBrowserController::Clicked( const OUString& _rName, sal_Bool _bPrimary )
+ void OPropertyBrowserController::Clicked( const OUString& _rName, bool _bPrimary )
{
try
{
@@ -1353,7 +1353,7 @@ namespace pcr
}
- sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
+ bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
{
for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin();
search != m_aProperties.end();
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 265403bf8017..f5aa70673268 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -198,7 +198,7 @@ namespace pcr
protected:
// IPropertyLineListener
- virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ) SAL_OVERRIDE;
+ virtual void Clicked( const OUString& _rName, bool _bPrimary ) SAL_OVERRIDE;
virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) SAL_OVERRIDE;
// IPropertyControlObserver
@@ -206,7 +206,7 @@ namespace pcr
virtual void valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ) SAL_OVERRIDE;
// IPropertyExistenceCheck
- virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XObjectInspectorUI
virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 909e91f8ff4c..3b690583fb25 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -493,7 +493,7 @@ namespace pcr
}
- sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
+ bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
{
return impl_isSupportedProperty_nothrow( _rName );
}
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index 25ddc2fa0e4f..725f97170870 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -112,7 +112,7 @@ namespace pcr
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// IPropertyExistenceCheck
- virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private:
/** ensures that m_pUIRequestComposer exists
diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx
index 91d403353b0e..b80555c6b8cc 100644
--- a/extensions/source/propctrlr/proplinelistener.hxx
+++ b/extensions/source/propctrlr/proplinelistener.hxx
@@ -31,7 +31,7 @@ namespace pcr
class IPropertyLineListener
{
public:
- virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ) = 0;
+ virtual void Clicked( const OUString& _rName, bool _bPrimary ) = 0;
virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0;
protected:
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index c80a7c794d09..b2124a31708f 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -201,7 +201,7 @@ namespace pcr
/// sets a new SQL command
virtual void setSQLCommand( const OUString& _rCommand ) const = 0;
/// sets a new EscapeProcessing property value
- virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const = 0;
+ virtual void setEscapeProcessing( const bool _bEscapeProcessing ) const = 0;
virtual ~ISQLCommandAdapter();
};
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 2e2ea0b9c44f..d5f791e78646 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -111,7 +111,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
void Resize() SAL_OVERRIDE;
- void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE );
+ void Show( bool bVisible = true, sal_uInt16 nFlags = SHOW_NOACTIVATE );
void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; }
void SetTitleAndText( const OUString& rTitle, const OUString& rText,
const Image& rImage );
@@ -357,7 +357,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
mpBubbleWin = GetBubbleWindow();
if ( mpBubbleWin )
{
- mpBubbleWin->Show( sal_True );
+ mpBubbleWin->Show( true );
maTimeoutTimer.Start();
}
mbShowBubble = false;
@@ -426,7 +426,7 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
if ( mbShowBubble )
Application::PostUserEvent( LINK( this, UpdateCheckUI, UserEventHdl ) );
else if ( mpBubbleWin )
- mpBubbleWin->Show( sal_False );
+ mpBubbleWin->Show( false );
}
else if( rPropertyName == PROPERTY_CLICK_HDL ) {
uno::Reference< task::XJob > aJob;
@@ -452,7 +452,7 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
throw beans::UnknownPropertyException();
if ( mbBubbleChanged && mpBubbleWin )
- mpBubbleWin->Show( sal_False );
+ mpBubbleWin->Show( false );
}
@@ -586,7 +586,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl)
maWaitTimer.Stop();
if ( mpBubbleWin )
- mpBubbleWin->Show( sal_False );
+ mpBubbleWin->Show( false );
if ( mrJob.is() )
{
@@ -864,11 +864,11 @@ void BubbleWindow::Paint( const Rectangle& )
void BubbleWindow::MouseButtonDown( const MouseEvent& )
{
- Show( sal_False );
+ Show( false );
}
-void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
+void BubbleWindow::Show( bool bVisible, sal_uInt16 nFlags )
{
SolarMutexGuard aGuard;
@@ -920,7 +920,7 @@ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
void BubbleWindow::RecalcTextRects()
{
Size aTotalSize;
- sal_Bool bFinished = sal_False;
+ bool bFinished = false;
Font aOldFont = GetFont();
Font aBoldFont = aOldFont;
@@ -952,7 +952,7 @@ void BubbleWindow::RecalcTextRects()
maMaxTextSize.Height() = maMaxTextSize.Height() * 3 / 2;
}
else
- bFinished = sal_True;
+ bFinished = true;
}
maTitleRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT );
maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetHeight() * 3 / 4 );