[Libreoffice-commits] core.git: cui/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 20 20:09:01 UTC 2018
cui/source/inc/cuitabarea.hxx | 17 ++++-------------
cui/source/inc/cuitabline.hxx | 5 +----
cui/source/inc/dstribut.hxx | 4 +---
cui/source/inc/transfrm.hxx | 5 +----
cui/source/tabpages/dstribut.cxx | 12 ++----------
cui/source/tabpages/tparea.cxx | 12 ++----------
cui/source/tabpages/tpbitmap.cxx | 12 ++----------
cui/source/tabpages/tphatch.cxx | 14 +++-----------
cui/source/tabpages/tpline.cxx | 16 ++++------------
cui/source/tabpages/tptrans.cxx | 10 +---------
cui/source/tabpages/transfrm.cxx | 10 +---------
11 files changed, 22 insertions(+), 95 deletions(-)
New commits:
commit ec67e7e4b22740bf8dc5e1a9c84c49facdd85717
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 20 16:58:21 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 20 22:08:29 2018 +0200
SvxTabPage with a dummy PointChanged impl is just SfxTabPage
Change-Id: I520353fe1e4695f29e0646d52a492c3a63b90060
Reviewed-on: https://gerrit.libreoffice.org/60830
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 20f207aa9bb0..5770104120b0 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -132,7 +132,7 @@ public:
/************************************************************************/
-class SvxTransparenceTabPage : public SvxTabPage
+class SvxTransparenceTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -205,8 +205,6 @@ public:
virtual void ChangesApplied() override;
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
- virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override;
- virtual void PointChanged(weld::DrawingArea* pWindow, RectPoint eRP) override;
void SetPageType(PageType nInType) { nPageType = nInType; }
void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }
@@ -215,7 +213,7 @@ public:
/************************************************************************/
-class SvxAreaTabPage : public SvxTabPage
+class SvxAreaTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
static const sal_uInt16 pAreaRanges[];
@@ -279,8 +277,6 @@ public:
virtual void Reset( const SfxItemSet * ) override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
- virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override;
void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
void SetGradientList( XGradientListRef const & pGrdLst)
@@ -434,7 +430,7 @@ public:
/************************************************************************/
-class SvxHatchTabPage : public SvxTabPage
+class SvxHatchTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -497,9 +493,6 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
- virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override;
-
void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
void SetHatchingList( XHatchListRef const & pHtchLst)
{ m_pHatchingList = pHtchLst; }
@@ -512,7 +505,7 @@ public:
/************************************************************************/
-class SvxBitmapTabPage : public SvxTabPage
+class SvxBitmapTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -583,8 +576,6 @@ public:
virtual void Reset( const SfxItemSet * ) override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
- virtual void PointChanged( weld::DrawingArea*, RectPoint eRP ) override;
void SetBitmapList( const XBitmapListRef& pBmpLst) { m_pBitmapList = pBmpLst; }
void SetBmpChgd( ChangeType* pIn ) { m_pnBitmapListState = pIn; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index abce5666f58d..28cdf1b4be41 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -84,7 +84,7 @@ struct SvxBmpItemInfo
sal_uInt16 nItemId;
};
-class SvxLineTabPage : public SvxTabPage
+class SvxLineTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -215,9 +215,6 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
- virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override;
-
virtual void FillUserData() override;
void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 40f93d7635c7..f2d50d064066 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -24,7 +24,7 @@
#include <vcl/fixed.hxx>
#include <svx/dstribut_enum.hxx>
-class SvxDistributePage : public SvxTabPage
+class SvxDistributePage : public SfxTabPage
{
SvxDistributeHorizontal m_eDistributeHor;
SvxDistributeVertical m_eDistributeVer;
@@ -48,8 +48,6 @@ public:
virtual bool FillItemSet(SfxItemSet*) override;
virtual void Reset(const SfxItemSet*) override;
- virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override;
- virtual void PointChanged(weld::DrawingArea* pWindow, RectPoint eRP) override;
SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; }
SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 0a9140e458dd..c04dd42c02f3 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -218,7 +218,7 @@ public:
|* slant/corner radius tab page
|*
\************************************************************************/
-class SvxSlantTabPage : public SvxTabPage
+class SvxSlantTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -258,9 +258,6 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
- virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override;
-
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
};
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 668fd610d80d..6c15508ee345 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -52,8 +52,8 @@ SvxDistributeDialog::~SvxDistributeDialog()
SvxDistributePage::SvxDistributePage(TabPageParent pWindow,
const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
- : SvxTabPage(pWindow, "cui/ui/distributionpage.ui", "DistributionPage",
- rInAttrs)
+ : SfxTabPage(pWindow, "cui/ui/distributionpage.ui", "DistributionPage",
+ &rInAttrs)
, m_eDistributeHor(eHor)
, m_eDistributeVer(eVer)
, m_xBtnHorNone(m_xBuilder->weld_radio_button("hornone"))
@@ -73,14 +73,6 @@ SvxDistributePage::~SvxDistributePage()
{
}
-void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RectPoint /*eRP*/)
-{
-}
-
-void SvxDistributePage::PointChanged(weld::DrawingArea*, RectPoint /*eRP*/)
-{
-}
-
/*************************************************************************
|*
|* read the delivered Item-Set
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 0daa38f3b1b9..55f35c096dc0 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -83,7 +83,7 @@ void lclExtendSize(Size& rSize, const Size& rInputSize)
\************************************************************************/
SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/areatabpage.ui", "AreaTabPage", rInAttrs)
+ : SfxTabPage(pParent, "cui/ui/areatabpage.ui", "AreaTabPage", &rInAttrs)
// local fixed not o be changed values for local pointers
, maFixed_ChangeType(ChangeType::NONE)
// init with pointers to fixed ChangeType
@@ -152,7 +152,7 @@ SvxAreaTabPage::~SvxAreaTabPage()
void SvxAreaTabPage::dispose()
{
m_pFillTabPage.disposeAndClear();
- SvxTabPage::dispose();
+ SfxTabPage::dispose();
}
void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
@@ -388,14 +388,6 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
SetPatternList(pPatternListItem->GetPatternList());
}
-void SvxAreaTabPage::PointChanged( vcl::Window* , RectPoint )
-{
-}
-
-void SvxAreaTabPage::PointChanged( weld::DrawingArea*, RectPoint )
-{
-}
-
void SvxAreaTabPage::CreatePage( sal_Int32 nId, SfxTabPage* pTab )
{
if(nId == SOLID )
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 952ca4393393..a721a70171de 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -68,7 +68,7 @@ const sal_uInt16 SvxBitmapTabPage::pBitmapRanges[] =
};
SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", rInAttrs)
+ : SfxTabPage(pParent, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnBitmapListState(nullptr)
, m_fObjectWidth(0.0)
@@ -142,7 +142,7 @@ void SvxBitmapTabPage::dispose()
m_xBitmapLBWin.reset();
m_xBitmapLB.reset();
m_xCtlBitmapPreview.reset();
- SvxTabPage::dispose();
+ SfxTabPage::dispose();
}
void SvxBitmapTabPage::Construct()
@@ -795,12 +795,4 @@ sal_Int32 SvxBitmapTabPage::SearchBitmapList(const OUString& rBitmapName)
return nPos;
}
-void SvxBitmapTabPage::PointChanged( vcl::Window* , RectPoint )
-{
-}
-
-void SvxBitmapTabPage::PointChanged( weld::DrawingArea*, RectPoint )
-{
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 959d1de3e86b..ff31f3320579 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -50,7 +50,7 @@
using namespace com::sun::star;
SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/hatchpage.ui", "HatchPage", rInAttrs)
+ : SfxTabPage(pParent, "cui/ui/hatchpage.ui", "HatchPage", &rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnHatchingListState(nullptr)
, m_pnColorListState(nullptr)
@@ -131,7 +131,7 @@ void SvxHatchTabPage::dispose()
m_xHatchLB.reset();
m_xLbBackgroundColor.reset();
m_xLbLineColor.reset();
- SvxTabPage::dispose();
+ SfxTabPage::dispose();
}
void SvxHatchTabPage::Construct()
@@ -568,20 +568,12 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, PresetListBox*, void )
}
-void SvxHatchTabPage::PointChanged( vcl::Window*, RectPoint )
-{
-}
-
-void SvxHatchTabPage::PointChanged( weld::DrawingArea*, RectPoint )
-{
-}
-
void SvxHatchTabPage::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) )
m_aCtlPreview.SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
- SvxTabPage::DataChanged( rDCEvt );
+ SfxTabPage::DataChanged( rDCEvt );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f8c8a8b8fa8e..d7d6d12de777 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -81,10 +81,10 @@ SvxLineTabPage::SvxLineTabPage
vcl::Window* pParent,
const SfxItemSet& rInAttrs
) :
- SvxTabPage ( pParent
+ SfxTabPage ( pParent
,"LineTabPage"
,"cui/ui/linetabpage.ui"
- , rInAttrs ),
+ , &rInAttrs ),
m_pSymbolList(nullptr),
m_bNewSize(false),
@@ -258,7 +258,7 @@ void SvxLineTabPage::dispose()
m_pSymbolWidthMF.clear();
m_pSymbolHeightMF.clear();
m_pSymbolRatioCB.clear();
- SvxTabPage::dispose();
+ SfxTabPage::dispose();
}
void SvxLineTabPage::Construct()
@@ -1669,14 +1669,6 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void)
m_pCtlPreview->Invalidate();
}
-void SvxLineTabPage::PointChanged( vcl::Window*, RectPoint )
-{
-}
-
-void SvxLineTabPage::PointChanged( weld::DrawingArea*, RectPoint )
-{
-}
-
void SvxLineTabPage::FillUserData()
{
// Write the synched value to the INI file
@@ -1761,7 +1753,7 @@ IMPL_LINK( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void )
void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt )
{
- SvxTabPage::DataChanged( rDCEvt );
+ SfxTabPage::DataChanged( rDCEvt );
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index d974edc9cb7b..02a0e64e18a4 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -201,7 +201,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS)
}
SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/transparencytabpage.ui", "TransparencyTabPage", rInAttrs)
+ : SfxTabPage(pParent, "cui/ui/transparencytabpage.ui", "TransparencyTabPage", &rInAttrs)
, rOutAttrs(rInAttrs)
, nPageType(PageType::Area)
, nDlgType(0)
@@ -447,14 +447,6 @@ DeactivateRC SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
return DeactivateRC::LeavePage;
}
-void SvxTransparenceTabPage::PointChanged(vcl::Window* , RectPoint )
-{
-}
-
-void SvxTransparenceTabPage::PointChanged(weld::DrawingArea*, RectPoint)
-{
-}
-
// Preview-Methods
bool SvxTransparenceTabPage::InitPreview(const SfxItemSet& rSet)
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index a9a368f1a560..b1a81ab56d39 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -403,7 +403,7 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eR
|*
\************************************************************************/
SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", rInAttrs)
+ : SfxTabPage(pParent, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs)
, rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FUNIT_NONE)
@@ -748,14 +748,6 @@ DeactivateRC SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
}
-void SvxSlantTabPage::PointChanged( vcl::Window*, RectPoint )
-{
-}
-
-void SvxSlantTabPage::PointChanged( weld::DrawingArea*, RectPoint )
-{
-}
-
/*************************************************************************
|*
|* Dialog for changing position and size of graphic objects
More information about the Libreoffice-commits
mailing list