include/svx/optgrid.hxx | 61 ++++-------
include/svx/svxdlg.hxx | 1
sc/source/ui/app/scmod.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 52 ++++-----
sd/source/ui/inc/tpoption.hxx | 5
svx/source/dialog/optgrid.cxx | 217 ++++++++++++++++------------------------
svx/uiconfig/ui/optgridpage.ui | 60 +++++++----
sw/source/uibase/app/appopt.cxx | 2
8 files changed, 185 insertions(+), 215 deletions(-)
New commits:
commit c0266d67bbc79ba78cbd58f7051458253c8e5196
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 9 15:20:00 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Sep 9 19:56:59 2018 +0200
weld SvxGridTabPage
Change-Id: I04c2ead288547ecd0fba22a7a95a2497ab8dc768
Reviewed-on: https://gerrit.libreoffice.org/60217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index fc20989f7134..1e4f62c92c96 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -21,9 +21,7 @@
#include <sfx2/tabdlg.hxx>
#include <svl/eitem.hxx>
-#include <vcl/group.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
+#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>
class SvxGridTabPage;
@@ -92,11 +90,10 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage
using TabPage::DeactivatePage;
public:
- SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SvxGridTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet&
rAttrSet );
+ static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet&
rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -105,38 +102,34 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
private:
- VclPtr<CheckBox> pCbxUseGridsnap;
- VclPtr<CheckBox> pCbxGridVisible;
-
- VclPtr<MetricField> pMtrFldDrawX;
- VclPtr<MetricField> pMtrFldDrawY;
-
- VclPtr<NumericField> pNumFldDivisionX;
- VclPtr<NumericField> pNumFldDivisionY;
+ bool bAttrModified;
- VclPtr<CheckBox> pCbxSynchronize;
+ std::unique_ptr<weld::CheckButton> m_xCbxUseGridsnap;
+ std::unique_ptr<weld::CheckButton> m_xCbxGridVisible;
+ std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDrawX;
+ std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDrawY;
+ std::unique_ptr<weld::SpinButton> m_xNumFldDivisionX;
+ std::unique_ptr<weld::SpinButton> m_xNumFldDivisionY;
+ std::unique_ptr<weld::CheckButton> m_xCbxSynchronize;
protected:
//these controls are used in draw and impress
- VclPtr<VclContainer> pSnapFrames;
- VclPtr<CheckBox> pCbxSnapHelplines;
- VclPtr<CheckBox> pCbxSnapBorder;
- VclPtr<CheckBox> pCbxSnapFrame;
- VclPtr<CheckBox> pCbxSnapPoints;
- VclPtr<MetricField> pMtrFldSnapArea;
-
- VclPtr<CheckBox> pCbxOrtho;
- VclPtr<CheckBox> pCbxBigOrtho;
- VclPtr<CheckBox> pCbxRotate;
- VclPtr<MetricField> pMtrFldAngle;
- VclPtr<MetricField> pMtrFldBezAngle;
-
+ std::unique_ptr<weld::Widget> m_xSnapFrames;
+ std::unique_ptr<weld::CheckButton> m_xCbxSnapHelplines;
+ std::unique_ptr<weld::CheckButton> m_xCbxSnapBorder;
+ std::unique_ptr<weld::CheckButton> m_xCbxSnapFrame;
+ std::unique_ptr<weld::CheckButton> m_xCbxSnapPoints;
+ std::unique_ptr<weld::MetricSpinButton> m_xMtrFldSnapArea;
+ std::unique_ptr<weld::CheckButton> m_xCbxOrtho;
+ std::unique_ptr<weld::CheckButton> m_xCbxBigOrtho;
+ std::unique_ptr<weld::CheckButton> m_xCbxRotate;
+ std::unique_ptr<weld::MetricSpinButton> m_xMtrFldAngle;
+ std::unique_ptr<weld::MetricSpinButton> m_xMtrFldBezAngle;
+
+ DECL_LINK(ClickRotateHdl_Impl, weld::ToggleButton&, void);
private:
- bool bAttrModified;
-
- DECL_LINK( ClickRotateHdl_Impl, Button*, void );
- DECL_LINK( ChangeDrawHdl_Impl, Edit&, void );
- DECL_LINK( ChangeGridsnapHdl_Impl, Button*, void );
- DECL_LINK( ChangeDivisionHdl_Impl, Edit&, void );
+ DECL_LINK(ChangeDrawHdl_Impl, weld::MetricSpinButton&, void);
+ DECL_LINK(ChangeGridsnapHdl_Impl, weld::ToggleButton&, void);
+ DECL_LINK(ChangeDivisionHdl_Impl, weld::SpinButton&, void);
};
#endif
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 46789edb9567..0390397b678e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2040,7 +2040,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16
nId, TabPageParent pParen
break;
}
case SID_SC_TP_GRID:
- pRet = SvxGridTabPage::Create(pParent.pParent, rSet);
+ pRet = SvxGridTabPage::Create(pParent, rSet);
break;
case SID_SC_TP_USERLISTS:
{
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index b77e2949b2a7..b08feff7bdbb 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -46,10 +46,10 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-SdTpOptionsSnap::SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet&
rInAttrs ) :
- SvxGridTabPage(pParent, rInAttrs)
+SdTpOptionsSnap::SdTpOptionsSnap(TabPageParent pParent, const SfxItemSet&
rInAttrs)
+ : SvxGridTabPage(pParent, rInAttrs)
{
- pSnapFrames->Show();
+ m_xSnapFrames->show();
}
SdTpOptionsSnap::~SdTpOptionsSnap()
@@ -61,16 +61,16 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
SvxGridTabPage::FillItemSet(rAttrs);
SdOptionsSnapItem aOptsItem;
- aOptsItem.GetOptionsSnap().SetSnapHelplines(
pCbxSnapHelplines->IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapBorder( pCbxSnapBorder->IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapFrame( pCbxSnapFrame->IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapPoints( pCbxSnapPoints->IsChecked() );
- aOptsItem.GetOptionsSnap().SetOrtho( pCbxOrtho->IsChecked() );
- aOptsItem.GetOptionsSnap().SetBigOrtho( pCbxBigOrtho->IsChecked() );
- aOptsItem.GetOptionsSnap().SetRotate( pCbxRotate->IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapArea(
static_cast<sal_Int16>(pMtrFldSnapArea->GetValue()) );
- aOptsItem.GetOptionsSnap().SetAngle(
static_cast<sal_Int16>(pMtrFldAngle->GetValue()) );
- aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(
static_cast<sal_Int16>(pMtrFldBezAngle->GetValue()) );
+ aOptsItem.GetOptionsSnap().SetSnapHelplines(
m_xCbxSnapHelplines->get_active() );
+ aOptsItem.GetOptionsSnap().SetSnapBorder( m_xCbxSnapBorder->get_active() );
+ aOptsItem.GetOptionsSnap().SetSnapFrame( m_xCbxSnapFrame->get_active() );
+ aOptsItem.GetOptionsSnap().SetSnapPoints( m_xCbxSnapPoints->get_active() );
+ aOptsItem.GetOptionsSnap().SetOrtho( m_xCbxOrtho->get_active() );
+ aOptsItem.GetOptionsSnap().SetBigOrtho( m_xCbxBigOrtho->get_active() );
+ aOptsItem.GetOptionsSnap().SetRotate( m_xCbxRotate->get_active() );
+
aOptsItem.GetOptionsSnap().SetSnapArea(static_cast<sal_Int16>(m_xMtrFldSnapArea->get_value(FUNIT_PIXEL)));
+
aOptsItem.GetOptionsSnap().SetAngle(static_cast<sal_Int16>(m_xMtrFldAngle->get_value(FUNIT_DEGREE)));
+
aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(static_cast<sal_Int16>(m_xMtrFldBezAngle->get_value(FUNIT_DEGREE)));
rAttrs->Put( aOptsItem );
@@ -86,24 +86,24 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
SdOptionsSnapItem aOptsItem( static_cast<const SdOptionsSnapItem&>(
rAttrs->
Get( ATTR_OPTIONS_SNAP ) ) );
- pCbxSnapHelplines->Check( aOptsItem.GetOptionsSnap().IsSnapHelplines() );
- pCbxSnapBorder->Check( aOptsItem.GetOptionsSnap().IsSnapBorder() );
- pCbxSnapFrame->Check( aOptsItem.GetOptionsSnap().IsSnapFrame() );
- pCbxSnapPoints->Check( aOptsItem.GetOptionsSnap().IsSnapPoints() );
- pCbxOrtho->Check( aOptsItem.GetOptionsSnap().IsOrtho() );
- pCbxBigOrtho->Check( aOptsItem.GetOptionsSnap().IsBigOrtho() );
- pCbxRotate->Check( aOptsItem.GetOptionsSnap().IsRotate() );
- pMtrFldSnapArea->SetValue( aOptsItem.GetOptionsSnap().GetSnapArea() );
- pMtrFldAngle->SetValue( aOptsItem.GetOptionsSnap().GetAngle() );
- pMtrFldBezAngle->SetValue(
aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle() );
-
- pCbxRotate->GetClickHdl().Call(nullptr);
+ m_xCbxSnapHelplines->set_active(
aOptsItem.GetOptionsSnap().IsSnapHelplines() );
+ m_xCbxSnapBorder->set_active( aOptsItem.GetOptionsSnap().IsSnapBorder() );
+ m_xCbxSnapFrame->set_active( aOptsItem.GetOptionsSnap().IsSnapFrame() );
+ m_xCbxSnapPoints->set_active( aOptsItem.GetOptionsSnap().IsSnapPoints() );
+ m_xCbxOrtho->set_active( aOptsItem.GetOptionsSnap().IsOrtho() );
+ m_xCbxBigOrtho->set_active( aOptsItem.GetOptionsSnap().IsBigOrtho() );
+ m_xCbxRotate->set_active( aOptsItem.GetOptionsSnap().IsRotate() );
+ m_xMtrFldSnapArea->set_value(aOptsItem.GetOptionsSnap().GetSnapArea(),
FUNIT_PIXEL);
+ m_xMtrFldAngle->set_value(aOptsItem.GetOptionsSnap().GetAngle(),
FUNIT_DEGREE);
+
m_xMtrFldBezAngle->set_value(aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle(),
FUNIT_DEGREE);
+
+ ClickRotateHdl_Impl(*m_xCbxRotate);
}
VclPtr<SfxTabPage> SdTpOptionsSnap::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
- return VclPtr<SdTpOptionsSnap>::Create( pWindow.pParent, *rAttrs );
+ return VclPtr<SdTpOptionsSnap>::Create(pWindow, *rAttrs);
}
/*************************************************************************
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index a9bed66172be..464fbba9d1f6 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -33,13 +33,12 @@
class SdTpOptionsSnap : public SvxGridTabPage
{
public:
- SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs
);
- virtual ~SdTpOptionsSnap() override;
+ SdTpOptionsSnap(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ virtual ~SdTpOptionsSnap() override;
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
-
};
/**
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index abe9093e1a35..cfa82be0fe83 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -26,20 +26,16 @@
#include <svx/dlgutil.hxx>
// local functions
-static void lcl_GetMinMax(MetricField const & rField, long& nFirst, long&
nLast, long& nMin, long& nMax)
+static void lcl_GetMinMax(weld::MetricSpinButton const& rField, int& nMin,
int& nMax)
{
- nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst(
FUNIT_TWIP ) ));
- nLast = static_cast<long>(rField.Denormalize( rField.GetLast( FUNIT_TWIP )
));
- nMin = static_cast<long>(rField.Denormalize( rField.GetMin( FUNIT_TWIP )
));
- nMax = static_cast<long>(rField.Denormalize( rField.GetMax( FUNIT_TWIP )
));
+ rField.get_range(nMin, nMax, FUNIT_TWIP);
+ nMin = rField.denormalize(nMin);
+ nMax = rField.denormalize(nMax);
}
-static void lcl_SetMinMax(MetricField& rField, long nFirst, long nLast,
long nMin, long nMax)
+static void lcl_SetMinMax(weld::MetricSpinButton& rField, int nMin, int nMax)
{
- rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP );
- rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP );
- rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP );
- rField.SetMax( rField.Normalize( nMax ), FUNIT_TWIP );
+ rField.set_range(rField.normalize(nMin), rField.normalize(nMax),
FUNIT_TWIP);
}
SvxOptionsGrid::SvxOptionsGrid() :
@@ -92,59 +88,56 @@ bool SvxGridItem::GetPresentation
}
// TabPage Screen Settings
-SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet&
rCoreSet) :
-
- SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", &rCoreSet ),
- bAttrModified( false )
+SvxGridTabPage::SvxGridTabPage(TabPageParent pParent, const SfxItemSet&
rCoreSet)
+ : SfxTabPage(pParent, "svx/ui/optgridpage.ui", "OptGridPage", &rCoreSet)
+ , bAttrModified(false)
+ , m_xCbxUseGridsnap(m_xBuilder->weld_check_button("usegridsnap"))
+ , m_xCbxGridVisible(m_xBuilder->weld_check_button("gridvisible"))
+ , m_xMtrFldDrawX(m_xBuilder->weld_metric_spin_button("mtrflddrawx",
FUNIT_CM))
+ , m_xMtrFldDrawY(m_xBuilder->weld_metric_spin_button("mtrflddrawy",
FUNIT_CM))
+ , m_xNumFldDivisionX(m_xBuilder->weld_spin_button("numflddivisionx"))
+ , m_xNumFldDivisionY(m_xBuilder->weld_spin_button("numflddivisiony"))
+ , m_xCbxSynchronize(m_xBuilder->weld_check_button("synchronize"))
+ , m_xSnapFrames(m_xBuilder->weld_widget("snapframes"))
+ , m_xCbxSnapHelplines(m_xBuilder->weld_check_button("snaphelplines"))
+ , m_xCbxSnapBorder(m_xBuilder->weld_check_button("snapborder"))
+ , m_xCbxSnapFrame(m_xBuilder->weld_check_button("snapframe"))
+ , m_xCbxSnapPoints(m_xBuilder->weld_check_button("snappoints"))
+ , m_xMtrFldSnapArea(m_xBuilder->weld_metric_spin_button("mtrfldsnaparea",
FUNIT_PIXEL))
+ , m_xCbxOrtho(m_xBuilder->weld_check_button("ortho"))
+ , m_xCbxBigOrtho(m_xBuilder->weld_check_button("bigortho"))
+ , m_xCbxRotate(m_xBuilder->weld_check_button("rotate"))
+ , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button("mtrfldangle",
FUNIT_DEGREE))
+ , m_xMtrFldBezAngle(m_xBuilder->weld_metric_spin_button("mtrfldbezangle",
FUNIT_DEGREE))
{
- get(pCbxUseGridsnap,"usegridsnap");
- get(pCbxGridVisible,"gridvisible");
- get(pMtrFldDrawX,"mtrflddrawx");
- get(pMtrFldDrawY,"mtrflddrawy");
- get(pNumFldDivisionX,"numflddivisionx");
- get(pNumFldDivisionY,"numflddivisiony");
- get(pCbxSynchronize,"synchronize");
-
- get(pSnapFrames,"snapframes");
- get(pCbxSnapHelplines,"snaphelplines");
- get(pCbxSnapBorder,"snapborder");
- get(pCbxSnapFrame,"snapframe");
- get(pCbxSnapPoints,"snappoints");
- get(pMtrFldSnapArea,"mtrfldsnaparea");
- get(pCbxOrtho,"ortho");
- get(pCbxBigOrtho,"bigortho");
- get(pCbxRotate,"rotate");
- get(pMtrFldAngle,"mtrfldangle");
- get(pMtrFldBezAngle,"mtrfldbezangle");
-
// This page requires exchange Support
SetExchangeSupport();
// Set Metrics
FieldUnit eFUnit = GetModuleFieldUnit( rCoreSet );
- long nFirst, nLast, nMin, nMax;
+ int nMin, nMax;
- lcl_GetMinMax(*pMtrFldDrawX , nFirst, nLast, nMin, nMax);
- SetFieldUnit( *pMtrFldDrawX , eFUnit, true );
- lcl_SetMinMax(*pMtrFldDrawX , nFirst, nLast, nMin, nMax);
+ lcl_GetMinMax(*m_xMtrFldDrawX, nMin, nMax);
+ SetFieldUnit( *m_xMtrFldDrawX, eFUnit, true );
+ lcl_SetMinMax(*m_xMtrFldDrawX, nMin, nMax);
- lcl_GetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit( *pMtrFldDrawY, eFUnit, true );
- lcl_SetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
+ lcl_GetMinMax(*m_xMtrFldDrawY, nMin, nMax);
+ SetFieldUnit( *m_xMtrFldDrawY, eFUnit, true );
+ lcl_SetMinMax(*m_xMtrFldDrawY, nMin, nMax);
- pCbxRotate->SetClickHdl( LINK( this, SvxGridTabPage, ClickRotateHdl_Impl )
);
- Link<Button*,void> aLink = LINK( this, SvxGridTabPage,
ChangeGridsnapHdl_Impl );
- pCbxUseGridsnap->SetClickHdl( aLink );
- pCbxSynchronize->SetClickHdl( aLink );
- pCbxGridVisible->SetClickHdl( aLink );
- pMtrFldDrawX->SetModifyHdl(
+ m_xCbxRotate->connect_toggled(LINK(this, SvxGridTabPage,
ClickRotateHdl_Impl));
+ Link<weld::ToggleButton&,void> aLink = LINK(this, SvxGridTabPage,
ChangeGridsnapHdl_Impl);
+ m_xCbxUseGridsnap->connect_toggled(aLink);
+ m_xCbxSynchronize->connect_toggled(aLink);
+ m_xCbxGridVisible->connect_toggled(aLink);
+ m_xMtrFldDrawX->connect_value_changed(
LINK( this, SvxGridTabPage, ChangeDrawHdl_Impl ) );
- pMtrFldDrawY->SetModifyHdl(
+ m_xMtrFldDrawY->connect_value_changed(
LINK( this, SvxGridTabPage, ChangeDrawHdl_Impl ) );
- pNumFldDivisionX->SetModifyHdl(
+ m_xNumFldDivisionX->connect_value_changed(
LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
- pNumFldDivisionY->SetModifyHdl(
+ m_xNumFldDivisionY->connect_value_changed(
LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
}
@@ -153,62 +146,36 @@ SvxGridTabPage::~SvxGridTabPage()
disposeOnce();
}
-void SvxGridTabPage::dispose()
+VclPtr<SfxTabPage> SvxGridTabPage::Create(TabPageParent pParent, const
SfxItemSet& rAttrSet)
{
- pCbxUseGridsnap.clear();
- pCbxGridVisible.clear();
- pMtrFldDrawX.clear();
- pMtrFldDrawY.clear();
- pNumFldDivisionX.clear();
- pNumFldDivisionY.clear();
- pCbxSynchronize.clear();
- pSnapFrames.clear();
- pCbxSnapHelplines.clear();
- pCbxSnapBorder.clear();
- pCbxSnapFrame.clear();
- pCbxSnapPoints.clear();
- pMtrFldSnapArea.clear();
- pCbxOrtho.clear();
- pCbxBigOrtho.clear();
- pCbxRotate.clear();
- pMtrFldAngle.clear();
- pMtrFldBezAngle.clear();
- SfxTabPage::dispose();
+ return VclPtr<SvxGridTabPage>::Create(pParent, rAttrSet);
}
-
-VclPtr<SfxTabPage> SvxGridTabPage::Create( vcl::Window* pParent, const
SfxItemSet& rAttrSet )
-{
- return VclPtr<SvxGridTabPage>::Create( pParent, rAttrSet );
-}
-
-
bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
if ( bAttrModified )
{
SvxGridItem aGridItem( SID_ATTR_GRID_OPTIONS );
- aGridItem.bUseGridsnap = pCbxUseGridsnap->IsChecked();
- aGridItem.bSynchronize = pCbxSynchronize->IsChecked();
- aGridItem.bGridVisible = pCbxGridVisible->IsChecked();
+ aGridItem.bUseGridsnap = m_xCbxUseGridsnap->get_active();
+ aGridItem.bSynchronize = m_xCbxSynchronize->get_active();
+ aGridItem.bGridVisible = m_xCbxGridVisible->get_active();
MapUnit eUnit =
rCoreSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS )
);
- long nX =GetCoreValue( *pMtrFldDrawX, eUnit );
- long nY = GetCoreValue( *pMtrFldDrawY, eUnit );
+ long nX = GetCoreValue( *m_xMtrFldDrawX, eUnit );
+ long nY = GetCoreValue( *m_xMtrFldDrawY, eUnit );
aGridItem.nFldDrawX = static_cast<sal_uInt32>(nX);
aGridItem.nFldDrawY = static_cast<sal_uInt32>(nY);
- aGridItem.nFldDivisionX =
static_cast<long>(pNumFldDivisionX->GetValue()-1);
- aGridItem.nFldDivisionY =
static_cast<long>(pNumFldDivisionY->GetValue()-1);
+ aGridItem.nFldDivisionX =
static_cast<long>(m_xNumFldDivisionX->get_value() - 1);
+ aGridItem.nFldDivisionY =
static_cast<long>(m_xNumFldDivisionY->get_value() - 1);
rCoreSet->Put( aGridItem );
}
return bAttrModified;
}
-
void SvxGridTabPage::Reset( const SfxItemSet* rSet )
{
const SfxPoolItem* pAttr = nullptr;
@@ -217,24 +184,23 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet )
&pAttr ))
{
const SvxGridItem* pGridAttr = static_cast<const SvxGridItem*>(pAttr);
- pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap );
- pCbxSynchronize->Check( pGridAttr->bSynchronize );
- pCbxGridVisible->Check( pGridAttr->bGridVisible );
+ m_xCbxUseGridsnap->set_active(pGridAttr->bUseGridsnap);
+ m_xCbxSynchronize->set_active(pGridAttr->bSynchronize);
+ m_xCbxGridVisible->set_active(pGridAttr->bGridVisible);
MapUnit eUnit =
rSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) );
- SetMetricValue( *pMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
- SetMetricValue( *pMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
+ SetMetricValue( *m_xMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
+ SetMetricValue( *m_xMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
- pNumFldDivisionX->SetValue( pGridAttr->nFldDivisionX+1 );
- pNumFldDivisionY->SetValue( pGridAttr->nFldDivisionY+1 );
+ m_xNumFldDivisionX->set_value(pGridAttr->nFldDivisionX + 1);
+ m_xNumFldDivisionY->set_value(pGridAttr->nFldDivisionY + 1);
}
- ChangeGridsnapHdl_Impl( pCbxUseGridsnap );
+ ChangeGridsnapHdl_Impl(*m_xCbxUseGridsnap);
bAttrModified = false;
}
-
void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
{
const SfxPoolItem* pAttr = nullptr;
@@ -242,9 +208,9 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
&pAttr ))
{
const SvxGridItem* pGridAttr = static_cast<const SvxGridItem*>(pAttr);
- pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap );
+ m_xCbxUseGridsnap->set_active(pGridAttr->bUseGridsnap);
- ChangeGridsnapHdl_Impl( pCbxUseGridsnap );
+ ChangeGridsnapHdl_Impl(*m_xCbxUseGridsnap);
}
// Metric Change if necessary (as TabPage is in the dialog, where the
@@ -256,29 +222,28 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet
)
FieldUnit eFUnit =
static_cast<FieldUnit>(static_cast<long>(pItem->GetValue()));
- if( eFUnit != pMtrFldDrawX->GetUnit() )
+ if (eFUnit != m_xMtrFldDrawX->get_unit())
{
// Set Metrics
- long nFirst, nLast, nMin, nMax;
- long nVal = static_cast<long>(pMtrFldDrawX->Denormalize(
pMtrFldDrawX->GetValue( FUNIT_TWIP ) ));
+ int nMin, nMax;
+ int nVal =
m_xMtrFldDrawX->denormalize(m_xMtrFldDrawX->get_value(FUNIT_TWIP));
- lcl_GetMinMax(*pMtrFldDrawX, nFirst, nLast, nMin, nMax);
- SetFieldUnit( *pMtrFldDrawX, eFUnit, true );
- lcl_SetMinMax(*pMtrFldDrawX, nFirst, nLast, nMin, nMax);
+ lcl_GetMinMax(*m_xMtrFldDrawX, nMin, nMax);
+ SetFieldUnit(*m_xMtrFldDrawX, eFUnit, true);
+ lcl_SetMinMax(*m_xMtrFldDrawX, nMin, nMax);
- pMtrFldDrawX->SetValue( pMtrFldDrawX->Normalize( nVal ),
FUNIT_TWIP );
+ m_xMtrFldDrawX->set_value(m_xMtrFldDrawX->normalize(nVal),
FUNIT_TWIP);
- nVal = static_cast<long>(pMtrFldDrawY->Denormalize(
pMtrFldDrawY->GetValue( FUNIT_TWIP ) ));
- lcl_GetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit(*pMtrFldDrawY, eFUnit, true );
- lcl_SetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
- pMtrFldDrawY->SetValue( pMtrFldDrawY->Normalize( nVal ),
FUNIT_TWIP );
+ nVal =
m_xMtrFldDrawY->denormalize(m_xMtrFldDrawY->get_value(FUNIT_TWIP));
+ lcl_GetMinMax(*m_xMtrFldDrawY, nMin, nMax);
+ SetFieldUnit(*m_xMtrFldDrawY, eFUnit, true);
+ lcl_SetMinMax(*m_xMtrFldDrawY, nMin, nMax);
+ m_xMtrFldDrawY->set_value(m_xMtrFldDrawY->normalize(nVal),
FUNIT_TWIP);
}
}
}
-
DeactivateRC SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
@@ -286,45 +251,41 @@ DeactivateRC SvxGridTabPage::DeactivatePage( SfxItemSet*
_pSet )
return DeactivateRC::LeavePage;
}
-IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void )
+IMPL_LINK(SvxGridTabPage, ChangeDrawHdl_Impl, weld::MetricSpinButton&, rField,
void)
{
bAttrModified = true;
- if( pCbxSynchronize->IsChecked() )
+ if (m_xCbxSynchronize->get_active())
{
- if(&rField == pMtrFldDrawX)
- pMtrFldDrawY->SetValue( pMtrFldDrawX->GetValue() );
+ if (&rField == m_xMtrFldDrawX.get())
+ m_xMtrFldDrawY->set_value(m_xMtrFldDrawX->get_value(FUNIT_NONE),
FUNIT_NONE);
else
- pMtrFldDrawX->SetValue( pMtrFldDrawY->GetValue() );
+ m_xMtrFldDrawX->set_value(m_xMtrFldDrawY->get_value(FUNIT_NONE),
FUNIT_NONE);
}
}
-
-IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl, weld::ToggleButton&, void)
{
- if( pCbxRotate->IsChecked() )
- pMtrFldAngle->Enable();
+ if (m_xCbxRotate->get_active())
+ m_xMtrFldAngle->set_sensitive(true);
else
- pMtrFldAngle->Disable();
+ m_xMtrFldAngle->set_sensitive(false);
}
-
-IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void )
+IMPL_LINK(SvxGridTabPage, ChangeDivisionHdl_Impl, weld::SpinButton&, rField,
void)
{
bAttrModified = true;
- if( pCbxSynchronize->IsChecked() )
+ if (m_xCbxSynchronize->get_active())
{
- if(pNumFldDivisionX == &rField)
- pNumFldDivisionY->SetValue( pNumFldDivisionX->GetValue() );
+ if (m_xNumFldDivisionX.get() == &rField)
+ m_xNumFldDivisionY->set_value(m_xNumFldDivisionX->get_value());
else
- pNumFldDivisionX->SetValue( pNumFldDivisionY->GetValue() );
+ m_xNumFldDivisionX->set_value(m_xNumFldDivisionY->get_value());
}
}
-
-IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, weld::ToggleButton&,
void)
{
bAttrModified = true;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui
index 8c67fc5108a2..808572da6ad6 100644
--- a/svx/uiconfig/ui/optgridpage.ui
+++ b/svx/uiconfig/ui/optgridpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="svx">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -32,6 +32,18 @@
<property name="step_increment">5</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="lower">0.01</property>
+ <property name="upper">10</property>
+ <property name="step_increment">0.20000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="lower">1</property>
+ <property name="upper">99</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkBox" id="OptGridPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -138,9 +150,10 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkSpinButton" id="mtrflddrawx:0.00cm">
+ <object class="GtkSpinButton" id="mtrflddrawx">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
@@ -150,10 +163,11 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="mtrflddrawy:0.00cm">
+ <object class="GtkSpinButton" id="mtrflddrawy">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment6</property>
<property name="digits">2</property>
</object>
<packing>
@@ -165,10 +179,10 @@
<object class="GtkLabel" id="flddrawx">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|flddrawx">H_orizontal:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">mtrflddrawx:0.00cm</property>
+ <property name="mnemonic_widget">mtrflddrawx</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -179,10 +193,10 @@
<object class="GtkLabel" id="flddrawy">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|flddrawy">_Vertical:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">mtrflddrawy:0.00cm</property>
+ <property name="mnemonic_widget">mtrflddrawy</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -259,6 +273,7 @@
<object class="GtkSpinButton" id="numflddivisionx">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment2</property>
</object>
<packing>
@@ -270,8 +285,8 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|label4">space(s)</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -293,7 +308,8 @@
<object class="GtkSpinButton" id="numflddivisiony">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment7</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -304,8 +320,8 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|label5">space(s)</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -322,10 +338,10 @@
<object class="GtkLabel" id="divisionx">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|divisionx">Horizont_al:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">numflddivisionx</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -336,10 +352,10 @@
<object class="GtkLabel" id="divisiony">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|divisiony">V_ertical:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">numflddivisiony</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -463,9 +479,10 @@
<property name="can_focus">False</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkSpinButton"
id="mtrfldsnaparea:0pixels">
+ <object class="GtkSpinButton" id="mtrfldsnaparea">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment3</property>
</object>
<packing>
@@ -477,10 +494,10 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|label7">_Snap range:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">mtrfldsnaparea:0pixels</property>
+ <property
name="mnemonic_widget">mtrfldsnaparea</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -570,7 +587,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkSpinButton"
id="mtrfldangle:0.00degrees">
+ <object class="GtkSpinButton" id="mtrfldangle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment4</property>
@@ -594,7 +611,7 @@
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<accessibility>
- <relation type="label-for"
target="mtrfldangle:0.00degrees"/>
+ <relation type="label-for" target="mtrfldangle"/>
</accessibility>
</object>
<packing>
@@ -603,9 +620,10 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="mtrfldbezangle:0.00degrees">
+ <object class="GtkSpinButton" id="mtrfldbezangle">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment5</property>
<property name="digits">2</property>
</object>
@@ -618,10 +636,10 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="optgridpage|label9">Point reducti_on:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">mtrfldbezangle:0.00degrees</property>
+ <property
name="mnemonic_widget">mtrfldbezangle</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index b7edb4e35d58..17bf33292a4c 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -429,7 +429,7 @@ VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId,
TabPageParent pParen
}
case RID_SW_TP_HTML_OPTGRID_PAGE:
case RID_SVXPAGE_GRID:
- pRet = SvxGridTabPage::Create(pParent.pParent, rSet);
+ pRet = SvxGridTabPage::Create(pParent, rSet);
break;
case RID_SW_TP_STD_FONT:
commit 3ad3292376e7818ccc53047483d6ab3bc1930c3f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 9 15:24:34 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Sep 9 19:56:46 2018 +0200
unused typedef
Change-Id: Iaba97feb23b22930261b558f953a70aa3364a1ef
Reviewed-on: https://gerrit.libreoffice.org/60219
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 92457870721b..c41d83e7a696 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -54,7 +54,6 @@ class SdrObject;
class SvxSpellWrapper;
struct FmSearchContext;
-typedef VclPtr<SfxTabPage> (*CreateSvxDistributePage)(vcl::Window *pParent,
const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical
eVer);
typedef const sal_uInt16* (*DialogGetRanges)();
typedef ::std::vector< OUString > TargetList;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
