disinherit OWizardPage and SfxTabPage from vcl TabPage

Now that there's no need to support weld/unwelded mixes of
pages in dialog any more.

inherit from a BuilderPage which contains a Builder and
Toplevel container

BuilderPage Activate and Deactivate replace TabPage ActivatePage and
DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and
DeactivatePage.

Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812
Reviewed-on: https://gerrit.libreoffice.org/79317
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 4 insertions, 10 deletions

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 7defa0a2b08e..a9030218e0d9 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -103,18 +103,12 @@ SvxGrfCropPage::SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet)
 
 SvxGrfCropPage::~SvxGrfCropPage()
 {
-    disposeOnce();
-}
-
-void SvxGrfCropPage::dispose()
-{
     m_xExampleWN.reset();
-    SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SvxGrfCropPage>::Create(pParent, *rSet);
+    return std::make_unique<SvxGrfCropPage>(pParent, *rSet);
 }
 
 void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
@@ -666,12 +660,12 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
     m_xZoomConstRB->set_sensitive(bFound);
 }
 
-Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const
+Size SvxGrfCropPage::GetGrfOrigSize(const Graphic& rGrf)
 {
     const MapMode aMapTwip( MapUnit::MapTwip );
     Size aSize( rGrf.GetPrefSize() );
     if( MapUnit::MapPixel == rGrf.GetPrefMapMode().GetMapUnit() )
-        aSize = PixelToLogic( aSize, aMapTwip );
+        aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, aMapTwip);
     else
         aSize = OutputDevice::LogicToLogic( aSize,
                                         rGrf.GetPrefMapMode(), aMapTwip );