[Libreoffice-commits] core.git: comphelper/source include/comphelper include/sfx2 include/svx include/ucbhelper include/unotools sfx2/source svx/source ucbhelper/source unotools/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Feb 17 07:59:35 UTC 2020
comphelper/source/misc/weak.cxx | 10 --
include/comphelper/weak.hxx | 7 +
include/sfx2/sfxbasemodel.hxx | 6 -
include/svx/unomodel.hxx | 6 -
include/svx/unopool.hxx | 6 -
include/svx/unoshape.hxx | 42 +++++---
include/ucbhelper/contenthelper.hxx | 7 -
include/ucbhelper/interactionrequest.hxx | 56 +++++------
include/unotools/streamwrap.hxx | 6 -
sfx2/source/doc/sfxbasemodel.cxx | 23 ----
svx/source/unodraw/unomod.cxx | 10 --
svx/source/unodraw/unopool.cxx | 10 --
svx/source/unodraw/unoshap2.cxx | 39 --------
svx/source/unodraw/unoshap3.cxx | 10 --
svx/source/unodraw/unoshape.cxx | 21 ----
ucbhelper/source/provider/contenthelper.cxx | 6 -
ucbhelper/source/provider/interactionrequest.cxx | 110 -----------------------
unotools/source/streaming/streamwrap.cxx | 10 --
18 files changed, 80 insertions(+), 305 deletions(-)
New commits:
commit 6be9ae8aa1d3b164f3953dbc1cb7f0f1c1976d9b
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Feb 16 13:05:12 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 17 08:59:01 2020 +0100
inline some acquire/release calls
because these are all on the hot path, and in the best case, with
enough inlining, the compiler can skip the call altogether and just
do a locked CMPXHG instruction
Change-Id: I099d6385f602e40e1767f9f1002b7514ecf436e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88775
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx
index 1aadadaa6b7f..02cf40e2b646 100644
--- a/comphelper/source/misc/weak.cxx
+++ b/comphelper/source/misc/weak.cxx
@@ -42,16 +42,6 @@ Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType )
return ::cppu::OWeakObject::queryInterface( rType );
}
-void SAL_CALL OWeakTypeObject::acquire() throw ()
-{
- ::cppu::OWeakObject::acquire();
-}
-
-void SAL_CALL OWeakTypeObject::release() throw ()
-{
- ::cppu::OWeakObject::release();
-}
-
Sequence< Type > SAL_CALL OWeakTypeObject::getTypes( )
{
return Sequence< Type >();
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index f094225cb32c..f53ea8d7f562 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -46,8 +46,11 @@ public:
OWeakTypeObject & operator =(OWeakTypeObject &&) = default;
virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
+ virtual void SAL_CALL acquire() throw () override
+ { ::cppu::OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw () override
+ { ::cppu::OWeakObject::release(); }
+
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) override;
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 3dbdb80c3aff..5ee900b8d852 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -191,7 +191,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual void SAL_CALL acquire() throw() override ;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
/**___________________________________________________________________________________________________
@short decrement refcount
@@ -200,7 +201,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual void SAL_CALL release() throw() override ;
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx
index efbc5d7ba4e6..08b910ca83ec 100644
--- a/include/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
@@ -67,8 +67,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SfxBaseModel::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SfxBaseModel::release(); }
// XModel
virtual void SAL_CALL lockControllers( ) override;
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index f7738f3fc5c1..b8cc1c7d41f3 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -63,8 +63,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakAggObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakAggObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index eb0333468046..7c6b60291886 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -376,8 +376,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SvxShape::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SvxShape::release(); }
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
@@ -407,8 +409,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakAggObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakAggObject::release(); }
// XServiceInfo
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
@@ -436,8 +440,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SvxShape::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SvxShape::release(); }
// XShapes
virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
@@ -485,8 +491,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SvxShapeText::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SvxShapeText::release(); }
// XShapeDescriptor
virtual OUString SAL_CALL getShapeType() override;
@@ -524,8 +532,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SvxShapeText::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SvxShapeText::release(); }
// XPropertySet
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
@@ -671,8 +681,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SvxShape::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SvxShape::release(); }
// XShapes
virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
@@ -804,8 +816,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { SvxShapeText::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { SvxShapeText::release(); }
// XShape
virtual css::awt::Point SAL_CALL getPosition() override;
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 957ff4353b7e..76a2e290b497 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -308,10 +308,9 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { cppu::OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override;
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index e7f56c7ffcf6..b7f40c8f176f 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -166,10 +166,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
@@ -199,10 +199,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
@@ -232,10 +232,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
@@ -265,10 +265,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
@@ -357,10 +357,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
@@ -494,10 +494,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
@@ -522,10 +522,10 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
+ virtual void SAL_CALL acquire() throw() override
+ { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override
+ { OWeakObject::release(); }
// XInteractionContinuation
virtual void SAL_CALL select() override;
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index 7900c93b4c39..363c0d69dcea 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -134,8 +134,10 @@ private:
// disambiguate XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override;
- virtual void SAL_CALL acquire( ) throw () override;
- virtual void SAL_CALL release( ) throw () override;
+ virtual void SAL_CALL acquire( ) throw () override
+ { OOutputStreamWrapper::acquire(); }
+ virtual void SAL_CALL release( ) throw () override
+ { OOutputStreamWrapper::release(); }
// XSeekable
virtual void SAL_CALL seek( sal_Int64 _nLocation ) override;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7d6c8317f804..ddc5d050da23 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -527,29 +527,6 @@ Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType )
return SfxBaseModel_Base::queryInterface( rType );
}
-// XInterface
-void SAL_CALL SfxBaseModel::acquire() throw( )
-{
- // Attention:
- // Don't use mutex or guard in this method!!! Is a method of XInterface.
-
- // Forward to baseclass
- OWeakObject::acquire() ;
-}
-
-
-// XInterface
-
-
-void SAL_CALL SfxBaseModel::release() throw( )
-{
- // Attention:
- // Don't use mutex or guard in this method!!! Is a method of XInterface.
-
- // Forward to baseclass
- OWeakObject::release() ;
-}
-
// XTypeProvider
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index e3017b41ecfb..62ce2f181d8d 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -264,16 +264,6 @@ uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType )
return aAny;
}
-void SAL_CALL SvxUnoDrawingModel::acquire() throw ( )
-{
- SfxBaseModel::acquire();
-}
-
-void SAL_CALL SvxUnoDrawingModel::release() throw ( )
-{
- SfxBaseModel::release();
-}
-
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( )
{
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 5b064ac6fe71..865f9fc080b6 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -340,16 +340,6 @@ uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType )
return aAny;
}
-void SAL_CALL SvxUnoDrawPool::acquire() throw ( )
-{
- OWeakAggObject::acquire();
-}
-
-void SAL_CALL SvxUnoDrawPool::release() throw ( )
-{
- OWeakAggObject::release();
-}
-
uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes()
{
static const uno::Sequence aTypes {
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index d7dbfd9a0a69..48961d3172ef 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -122,16 +122,6 @@ uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType )
return aAny;
}
-void SAL_CALL SvxShapeGroup::acquire() throw ( )
-{
- SvxShape::acquire();
-}
-
-void SAL_CALL SvxShapeGroup::release() throw ( )
-{
- SvxShape::release();
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
@@ -380,15 +370,6 @@ uno::Any SAL_CALL SvxShapeConnector::queryAggregation( const uno::Type & rType )
return aAny;
}
-void SAL_CALL SvxShapeConnector::acquire() throw ( )
-{
- SvxShapeText::acquire();
-}
-
-void SAL_CALL SvxShapeConnector::release() throw ( )
-{
- SvxShapeText::release();
-}
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SvxShapeConnector::getTypes()
@@ -512,15 +493,6 @@ uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType )
return aAny;
}
-void SAL_CALL SvxShapeControl::acquire() throw ( )
-{
- SvxShapeText::acquire();
-}
-
-void SAL_CALL SvxShapeControl::release() throw ( )
-{
- SvxShapeText::release();
-}
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SvxShapeControl::getTypes()
@@ -1620,17 +1592,6 @@ uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType )
return aReturn;
}
-void SAL_CALL SvxCustomShape::acquire() throw ( )
-{
- SvxShapeText::acquire();
-}
-
-void SAL_CALL SvxCustomShape::release() throw ( )
-{
- SvxShapeText::release();
-}
-
-
uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes()
{
return SvxShapeText::getTypes();
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 6265dc646ff8..6c07d975fcf6 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -100,16 +100,6 @@ uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType )
return SvxShape::queryInterface( rType );
}
-void SAL_CALL Svx3DSceneObject::acquire() throw ( )
-{
- SvxShape::acquire();
-}
-
-void SAL_CALL Svx3DSceneObject::release() throw ( )
-{
- SvxShape::release();
-}
-
// XTypeProvider
uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId()
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8c369d84fd1f..dacc9d6f9c33 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3757,17 +3757,6 @@ uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType )
}
-void SAL_CALL SvxShapeText::acquire() throw()
-{
- SvxShape::acquire();
-}
-
-
-void SAL_CALL SvxShapeText::release() throw()
-{
- SvxShape::release();
-}
-
// XServiceInfo
OUString SAL_CALL SvxShapeText::getImplementationName()
@@ -3934,16 +3923,6 @@ uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType )
return SvxShapeText::queryAggregation( rType );
}
-void SAL_CALL SvxShapeRect::acquire() throw()
-{
- OWeakAggObject::acquire();
-}
-
-void SAL_CALL SvxShapeRect::release() throw()
-{
- OWeakAggObject::release();
-}
-
// XServiceInfo
uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames()
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 01ebcee1ca71..c29442978af8 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -138,12 +138,6 @@ ContentImplHelper::~ContentImplHelper()
{
}
-void SAL_CALL ContentImplHelper::acquire()
- throw()
-{
- cppu::OWeakObject::acquire();
-}
-
void SAL_CALL ContentImplHelper::release()
throw()
{
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 0dbc568fcaa7..95ed4199426e 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -151,22 +151,6 @@ void InteractionContinuation::recordSelection()
// XInterface methods.
-// virtual
-void SAL_CALL InteractionAbort::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionAbort::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
// virtual
uno::Any SAL_CALL
InteractionAbort::queryInterface( const uno::Type & rType )
@@ -218,22 +202,6 @@ void SAL_CALL InteractionAbort::select()
// XInterface methods.
-// virtual
-void SAL_CALL InteractionRetry::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionRetry::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
// virtual
uno::Any SAL_CALL
InteractionRetry::queryInterface( const uno::Type & rType )
@@ -285,22 +253,6 @@ void SAL_CALL InteractionRetry::select()
// XInterface methods.
-// virtual
-void SAL_CALL InteractionApprove::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionApprove::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
// virtual
uno::Any SAL_CALL
InteractionApprove::queryInterface( const uno::Type & rType )
@@ -352,22 +304,6 @@ void SAL_CALL InteractionApprove::select()
// XInterface methods.
-// virtual
-void SAL_CALL InteractionDisapprove::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionDisapprove::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
// virtual
uno::Any SAL_CALL
InteractionDisapprove::queryInterface( const uno::Type & rType )
@@ -419,22 +355,6 @@ void SAL_CALL InteractionDisapprove::select()
// XInterface methods.
-// virtual
-void SAL_CALL InteractionSupplyAuthentication::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionSupplyAuthentication::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
// virtual
uno::Any SAL_CALL
InteractionSupplyAuthentication::queryInterface( const uno::Type & rType )
@@ -626,22 +546,6 @@ void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials(
// XInterface methods.
-// virtual
-void SAL_CALL InteractionReplaceExistingData::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionReplaceExistingData::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
// virtual
uno::Any SAL_CALL
InteractionReplaceExistingData::queryInterface( const uno::Type & rType )
@@ -691,20 +595,6 @@ void SAL_CALL InteractionReplaceExistingData::select()
// XInterface methods.
-// virtual
-void SAL_CALL InteractionAuthFallback::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-// virtual
-void SAL_CALL InteractionAuthFallback::release()
- throw()
-{
- OWeakObject::release();
-}
-
// virtual
uno::Any SAL_CALL
InteractionAuthFallback::queryInterface( const uno::Type & rType )
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index b2d842f81ff5..70054d0f58dc 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -240,16 +240,6 @@ Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType )
return aReturn;
}
-void SAL_CALL OSeekableOutputStreamWrapper::acquire( ) throw ()
-{
- OOutputStreamWrapper::acquire();
-}
-
-void SAL_CALL OSeekableOutputStreamWrapper::release( ) throw ()
-{
- OOutputStreamWrapper::release();
-}
-
void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation )
{
rStream.Seek(static_cast<sal_uInt32>(_nLocation));
More information about the Libreoffice-commits
mailing list