diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-04 14:20:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-05 07:32:46 +0100 |
commit | 9a06b99d2f53bd8d0a9ab0936efed9924a2abb88 (patch) | |
tree | 544f3e51a3978bd234a1c9fcdbf12d9b84352da4 /svx/source/unodraw | |
parent | eaf89e477af94bd3977aca17d72dd442c7604e63 (diff) |
loplugin:salcall fix non-virtual methods
first, since those are safer to change than virtual methods
Change-Id: Ie3b624019d75ee2b793cee33b3c5f64e994e8bfe
Reviewed-on: https://gerrit.libreoffice.org/45798
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/UnoNameItemTable.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/UnoNameItemTable.hxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unomtabl.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 16 | ||||
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 8 |
5 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 7e7a5e3f49d1..dee7a834d726 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -78,7 +78,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service return cppu::supportsService(this, ServiceName); } -void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) +void SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { maItemSetVector.push_back( o3tl::make_unique< SfxItemSet >( *mpModelPool, std::initializer_list<SfxItemSet::Pair>{{mnWhich, mnWhich}} ) ); diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 53d7355cf408..29ded8f82530 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -48,7 +48,7 @@ private: ItemPoolVector maItemSetVector; - void SAL_CALL ImplInsertByName( const OUString& aName, const css::uno::Any& aElement ); + void ImplInsertByName( const OUString& aName, const css::uno::Any& aElement ); public: SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw(); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 1b02a964b702..57725e32318d 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -70,7 +70,7 @@ public: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; - void SAL_CALL ImplInsertByName( const OUString& aName, const uno::Any& aElement ); + void ImplInsertByName( const OUString& aName, const uno::Any& aElement ); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) override; @@ -139,7 +139,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( return aSNS; } -void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) +void SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { maItemSetVector.push_back( o3tl::make_unique<SfxItemSet>( *mpModelPool, svl::Items<XATTR_LINESTART, XATTR_LINEEND>{} )); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f5eb6a14c375..c2aa90ca7cce 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -726,7 +726,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() } -uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() +uno::Sequence< uno::Type > SvxShape::_getTypes() { switch( mpImpl->mnObjId ) { @@ -1367,7 +1367,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL } } -Reference< beans::XPropertySetInfo > SAL_CALL +Reference< beans::XPropertySetInfo > SvxShape::_getPropertySetInfo() { return mpPropSet->getPropertySetInfo(); @@ -1400,7 +1400,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re } -bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) +bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { SfxItemSet aSet( mpModel->GetItemPool(), {{(sal_uInt16)nWID, (sal_uInt16)nWID}} ); @@ -1591,7 +1591,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u } } -void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) +void SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) { ::SolarMutexGuard aGuard; @@ -1982,7 +1982,7 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper } } -beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName ) +beans::PropertyState SvxShape::_getPropertyState( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -2956,7 +2956,7 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) } } -void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) +void SvxShape::_setPropertyToDefault( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -2986,7 +2986,7 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) } } -uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) +uno::Any SvxShape::_getPropertyDefault( const OUString& aPropertyName ) { ::SolarMutexGuard aGuard; @@ -3122,7 +3122,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() } } -uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() +uno::Sequence< OUString > SvxShape::_getSupportedServiceNames() { ::SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index e16e823d2448..1a36a3ece2a1 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -120,8 +120,8 @@ public: SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ); virtual ~SvxTextEditSourceImpl() override; - void SAL_CALL acquire(); - void SAL_CALL release(); + void acquire(); + void release(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -251,13 +251,13 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) } -void SAL_CALL SvxTextEditSourceImpl::acquire() +void SvxTextEditSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } -void SAL_CALL SvxTextEditSourceImpl::release() +void SvxTextEditSourceImpl::release() { if( ! osl_atomic_decrement( &maRefCount ) ) delete this; |