summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2020-02-16 13:05:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-17 08:59:01 +0100
commit6be9ae8aa1d3b164f3953dbc1cb7f0f1c1976d9b (patch)
tree244d93b2f30894d9367aae54d76b962e53a165f2 /svx
parentea0701aab307a549cf6cad1d309cab1bf11ef436 (diff)
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@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/unodraw/unomod.cxx10
-rw-r--r--svx/source/unodraw/unopool.cxx10
-rw-r--r--svx/source/unodraw/unoshap2.cxx39
-rw-r--r--svx/source/unodraw/unoshap3.cxx10
-rw-r--r--svx/source/unodraw/unoshape.cxx21
5 files changed, 0 insertions, 90 deletions
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()