[Libreoffice-commits] core.git: extensions/source
Stephan Bergmann
sbergman at redhat.com
Fri Apr 22 08:19:57 UTC 2016
extensions/source/propctrlr/composeduiupdate.cxx | 14 ++++++------
extensions/source/propctrlr/defaulthelpprovider.cxx | 6 ++---
extensions/source/propctrlr/inspectormodelbase.cxx | 4 +--
extensions/source/propctrlr/inspectormodelbase.hxx | 2 -
extensions/source/propctrlr/pcrcommon.hxx | 8 +++----
extensions/source/propctrlr/propcontroller.cxx | 22 ++++++++++----------
extensions/source/propctrlr/propcontroller.hxx | 8 +++----
extensions/source/propctrlr/propcontrolobserver.hxx | 4 +--
8 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 64d4e2a4c9c833f8f8730f06d4e822c1a8ccc9bc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Apr 17 11:49:49 2016 +0200
Avoid reserved identifiers
Change-Id: I5a68cac4f923218a000c79a01c436bf1dc897971
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index faf619e..8ad15cff 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -142,7 +142,7 @@ namespace pcr
virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override;
virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override;
virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException, std::exception) override;
+ virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception) override;
// UNOCompatibleNonUNOReference overridables
virtual void SAL_CALL acquire() throw() override;
@@ -346,27 +346,27 @@ namespace pcr
}
- void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException, std::exception)
+ void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
{
OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" );
// CachedInspectorUI is used as context for the controls, and we don't expect them to
// register listeners themself
- m_rMaster.getDelegatorUI()->registerControlObserver( _Observer );
+ m_rMaster.getDelegatorUI()->registerControlObserver( Observer );
}
- void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException, std::exception)
+ void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
{
OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" );
// CachedInspectorUI is used as context for the controls, and we don't expect them to
// register listeners themself
- m_rMaster.getDelegatorUI()->revokeControlObserver( _Observer );
+ m_rMaster.getDelegatorUI()->revokeControlObserver( Observer );
}
- void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException, std::exception)
+ void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception)
{
- m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText );
+ m_rMaster.getDelegatorUI()->setHelpSectionText( HelpText );
}
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index 21d6a87..f85e849 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -86,14 +86,14 @@ namespace pcr
}
- void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& _Control ) throw (RuntimeException, std::exception)
+ void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception)
{
if ( !m_xInspectorUI.is() )
throw RuntimeException( OUString(), *this );
try
{
- m_xInspectorUI->setHelpSectionText( impl_getHelpText_nothrow( _Control ) );
+ m_xInspectorUI->setHelpSectionText( impl_getHelpText_nothrow( Control ) );
}
catch( const Exception& )
{
@@ -102,7 +102,7 @@ namespace pcr
}
- void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& /*_Control*/ ) throw (RuntimeException, std::exception)
+ void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& ) throw (RuntimeException, std::exception)
{
// not interested in
}
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index a106c2c..d4f8d92 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -227,9 +227,9 @@ namespace pcr
}
- void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool _IsReadOnly ) throw (css::uno::RuntimeException, std::exception)
+ void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly ) throw (css::uno::RuntimeException, std::exception)
{
- setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( _IsReadOnly ) );
+ setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( IsReadOnly ) );
}
sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 10e1f60..eae50b5 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -77,7 +77,7 @@ namespace pcr
virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL getIsReadOnly() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setIsReadOnly( sal_Bool _IsReadOnly ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setIsReadOnly( sal_Bool IsReadOnly ) throw (css::uno::RuntimeException, std::exception) override;
// css::lang::XServiceInfo
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 2aec531..1013290 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -112,13 +112,13 @@ namespace pcr
{ \
baseclass::WeakComponentImplHelperBase::dispose(); \
} \
- void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) \
+ void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) \
{ \
- baseclass::WeakComponentImplHelperBase::addEventListener( _Listener ); \
+ baseclass::WeakComponentImplHelperBase::addEventListener( Listener ); \
} \
- void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) \
+ void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) \
{ \
- baseclass::WeakComponentImplHelperBase::removeEventListener( _Listener ); \
+ baseclass::WeakComponentImplHelperBase::removeEventListener( Listener ); \
} \
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 434cfef..4fc9df5 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -760,7 +760,7 @@ namespace pcr
}
- Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, sal_Bool _CreateReadOnly ) throw (IllegalArgumentException, RuntimeException, std::exception)
+ Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -770,8 +770,8 @@ namespace pcr
WinBits nWinBits = WB_BORDER;
// read-only-ness
- _CreateReadOnly |= impl_isReadOnlyModel_throw() ? 1 : 0;
- if ( _CreateReadOnly )
+ CreateReadOnly |= impl_isReadOnlyModel_throw() ? 1 : 0;
+ if ( CreateReadOnly )
nWinBits |= WB_READONLY;
switch ( ControlType )
@@ -1428,15 +1428,15 @@ namespace pcr
}
- void OPropertyBrowserController::focusGained( const Reference< XPropertyControl >& _Control )
+ void OPropertyBrowserController::focusGained( const Reference< XPropertyControl >& Control )
{
- m_aControlObservers.notifyEach( &XPropertyControlObserver::focusGained, _Control );
+ m_aControlObservers.notifyEach( &XPropertyControlObserver::focusGained, Control );
}
- void OPropertyBrowserController::valueChanged( const Reference< XPropertyControl >& _Control )
+ void OPropertyBrowserController::valueChanged( const Reference< XPropertyControl >& Control )
{
- m_aControlObservers.notifyEach( &XPropertyControlObserver::valueChanged, _Control );
+ m_aControlObservers.notifyEach( &XPropertyControlObserver::valueChanged, Control );
}
@@ -1687,15 +1687,15 @@ namespace pcr
}
- void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException, std::exception)
+ void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
{
- m_aControlObservers.addInterface( _Observer );
+ m_aControlObservers.addInterface( Observer );
}
- void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException, std::exception)
+ void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
{
- m_aControlObservers.removeInterface( _Observer );
+ m_aControlObservers.removeInterface( Observer );
}
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 79e8bb9..b7b02ac 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -201,8 +201,8 @@ namespace pcr
virtual void Commit( const OUString& _rName, const css::uno::Any& _rVal ) override;
// IPropertyControlObserver
- virtual void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) override;
- virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) override;
+ virtual void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override;
+ virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override;
// IPropertyExistenceCheck
virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) override;
@@ -215,8 +215,8 @@ namespace pcr
virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& _Observer ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& _Observer ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
// XObjectInspector
diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx
index 982e812..8b448ad 100644
--- a/extensions/source/propctrlr/propcontrolobserver.hxx
+++ b/extensions/source/propctrlr/propcontrolobserver.hxx
@@ -33,8 +33,8 @@ namespace pcr
class IPropertyControlObserver
{
public:
- virtual void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) = 0;
- virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) = 0;
+ virtual void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) = 0;
+ virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) = 0;
protected:
~IPropertyControlObserver() {}
More information about the Libreoffice-commits
mailing list