include/oox/export/shapes.hxx | 1 - oox/source/export/shapes.cxx | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-)
New commits: commit 37a41210d317c522824f326e8894db2b04229ded Author: Mike Kaganski <[email protected]> AuthorDate: Tue Nov 11 09:10:23 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Tue Nov 11 10:55:17 2025 +0100 Drop unneeded indirection The two-argument variant of `GetNewShapeID` was only used to implement the single-argument overload. Change-Id: I0bbe5ee2539b4e52e50f2d2ba9f71e6f101b5e5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193783 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index c8f2bf6e73d1..89f88aefe34b 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -201,7 +201,6 @@ public: void WriteTableCellBorders(const css::uno::Reference< css::beans::XPropertySet >& rXPropSet); sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape >& rShape ); - sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape >& rShape, ::oox::core::XmlFilterBase* pFB ); sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape >& rShape ); static sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape >& rShape, ShapeHashMap* pShapeMap ); }; diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 08addb42cedc..0a2c6799fb6d 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -2998,16 +2998,11 @@ ShapeExport& ShapeExport::WriteUnknownShape( const Reference< XShape >& ) } sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape >& rXShape ) -{ - return GetNewShapeID( rXShape, GetFB() ); -} - -sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape >& rXShape, XmlFilterBase* pFB ) { if( !rXShape.is() ) return -1; - sal_Int32 nID = pFB->GetUniqueId(); + sal_Int32 nID = GetFB()->GetUniqueId(); auto it = mpShapeMap->find(rXShape); if (it == mpShapeMap->end())
