From 46b8c7a83f2cae57966ac55591e6f512ceaa114f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 7 Sep 2023 12:38:51 +0200 Subject: merge SvxFmDrawPage into SvxDrawPage it adds hardly any functionality. Change-Id: I82f5c52148222596d52f1fb41d726733ca1cf40d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156654 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/inc/pageuno.hxx | 6 +++--- sc/source/ui/unoobj/pageuno.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sc') diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index 742b2aaa583a..1956ba246270 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -19,11 +19,11 @@ #pragma once -#include +#include -// SvxFmDrawPage subclass to create ScShapeObj for shapes +// SvxDrawPage subclass to create ScShapeObj for shapes -class ScPageObj final : public SvxFmDrawPage +class ScPageObj final : public SvxDrawPage { public: ScPageObj(SdrPage* pPage); diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 796d16e12e06..3ca903e63eb6 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; ScPageObj::ScPageObj( SdrPage* pPage ) : - SvxFmDrawPage( pPage ) + SvxDrawPage( pPage ) { } @@ -35,7 +35,7 @@ ScPageObj::~ScPageObj() noexcept uno::Reference ScPageObj::CreateShape( SdrObject *pObj ) const { - uno::Reference xShape(SvxFmDrawPage::CreateShape( pObj )); + uno::Reference xShape(SvxDrawPage::CreateShape( pObj )); new ScShapeObj( xShape ); // aggregates object and modifies xShape -- cgit