[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/svx include/vcl svx/source
cui/source/inc/cuitabarea.hxx | 65 +++---
cui/source/tabpages/tptrans.cxx| 352 +++--
cui/uiconfig/ui/transparencytabpage.ui | 162 ++-
include/svx/dlgctrl.hxx| 51
include/vcl/customweld.hxx |1
svx/source/dialog/dlgctrl.cxx | 149 +
6 files changed, 511 insertions(+), 269 deletions(-)
New commits:
commit f8480defc137d0eb9f9cd20294909546c2cfc598
Author: Caolán McNamara
Date: Tue Jun 12 11:22:15 2018 +0100
weld SvxTransparenceTabPage
Change-Id: If8c8a6cf74664f9acd360d877c57e8dd9de2f2b5
Reviewed-on: https://gerrit.libreoffice.org/55694
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index da368bf460e0..7a72431bb9a5 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -146,42 +146,48 @@ class SvxTransparenceTabPage : public SvxTabPage
PageType nPageType;
sal_uInt16 nDlgType;
+boolbBitmap;
+
+XFillAttrSetItemaXFillAttr;
+SfxItemSet& rXFSet;
+
+XRectPreview m_aCtlBitmapPreview;
+XRectPreview m_aCtlXRectPreview;
+
// main selection
-VclPtrm_pRbtTransOff;
-VclPtrm_pRbtTransLinear;
-VclPtrm_pRbtTransGradient;
+std::unique_ptr m_xRbtTransOff;
+std::unique_ptr m_xRbtTransLinear;
+std::unique_ptr m_xRbtTransGradient;
/// linear transparency
-VclPtrm_pMtrTransparent;
+std::unique_ptr m_xMtrTransparent;
// gradient transparency
-VclPtrm_pGridGradient;
-VclPtrm_pLbTrgrGradientType;
-VclPtr m_pFtTrgrCenterX;
-VclPtrm_pMtrTrgrCenterX;
-VclPtr m_pFtTrgrCenterY;
-VclPtrm_pMtrTrgrCenterY;
-VclPtr m_pFtTrgrAngle;
-VclPtrm_pMtrTrgrAngle;
-VclPtrm_pMtrTrgrBorder;
-VclPtrm_pMtrTrgrStartValue;
-VclPtrm_pMtrTrgrEndValue;
+std::unique_ptr m_xGridGradient;
+std::unique_ptr m_xLbTrgrGradientType;
+std::unique_ptr m_xFtTrgrCenterX;
+std::unique_ptr m_xMtrTrgrCenterX;
+std::unique_ptr m_xFtTrgrCenterY;
+std::unique_ptr m_xMtrTrgrCenterY;
+std::unique_ptr m_xFtTrgrAngle;
+std::unique_ptr m_xMtrTrgrAngle;
+std::unique_ptr m_xMtrTrgrBorder;
+std::unique_ptr m_xMtrTrgrStartValue;
+std::unique_ptr m_xMtrTrgrEndValue;
+std::unique_ptr m_xCtlBitmapBorder;
+std::unique_ptr m_xCtlXRectBorder;
// preview
-VclPtrm_pCtlBitmapPreview;
-VclPtrm_pCtlXRectPreview;
-boolbBitmap;
-
-XFillAttrSetItemaXFillAttr;
-SfxItemSet& rXFSet;
+std::unique_ptr m_xCtlBitmapPreview;
+std::unique_ptr m_xCtlXRectPreview;
-DECL_LINK(ClickTransOffHdl_Impl, Button*, void );
-DECL_LINK(ClickTransLinearHdl_Impl, Button*, void );
-DECL_LINK(ClickTransGradientHdl_Impl, Button*, void );
-DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void);
-DECL_LINK(ModifiedTrgrEditHdl_Impl, Edit&, void);
-DECL_LINK(ModifiedTrgrListBoxHdl_Impl, ListBox&, void);
-void ModifiedTrgrHdl_Impl(void const *);
+DECL_LINK(ClickTransOffHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(ClickTransLinearHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(ClickTransGradientHdl_Impl, weld::ToggleButton&, void );
+DECL_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void);
+DECL_LINK(ModifiedTrgrEditHdl_Impl, weld::MetricSpinButton&, void);
+DECL_LINK(ModifiedTrgrListBoxHdl_Impl, weld::ComboBoxText&, void);
+void ModifiedTrgrHdl_Impl(const weld::ComboBoxText*);
void ActivateLinear(bool bActivate);
void ActivateGradient(bool bActivate);
@@ -191,9 +197,8 @@ class SvxTransparenceTabPage : public SvxTabPage
void InvalidatePreview (bool bEnable = true );
public:
-SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
+SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxTransparenceTabPage() override;
-virtual void dispose() override;
static VclPtr Create(TabPageParent, const SfxItemSet*);
static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 1f6fc20da7dd..f75416c0c94b 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -59,22 +59,22 @@ const sal_uInt16
SvxTransparenceTabPage::pTransparenceRanges[] =
|*
\/
-IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl,
weld::ToggleButton&, void)
{
// disable all other controls
Activat
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/svx include/vcl svx/source vcl/source vcl/unx
cui/source/dialogs/colorpicker.cxx | 14 -
cui/source/inc/transfrm.hxx| 27 +--
cui/source/tabpages/transfrm.cxx | 134 -
cui/uiconfig/ui/rotationtabpage.ui | 86 ---
include/svx/dialcontrol.hxx| 93
include/vcl/customweld.hxx |6
include/vcl/weld.hxx |4
svx/source/dialog/charmap.cxx |4
svx/source/dialog/dialcontrol.cxx | 277 -
vcl/source/app/salvtables.cxx | 15 ++
vcl/unx/gtk3/gtk3gtkinst.cxx | 15 ++
11 files changed, 543 insertions(+), 132 deletions(-)
New commits:
commit 94762fbc8dcb3b7fe6d535374915db7e7ab95937
Author: Caolán McNamara
Date: Fri May 25 16:54:30 2018 +0100
weld SvxAngleTabPage
Change-Id: I03bd0a6a0805d549570ce44030a0f58ca2b98d05
Reviewed-on: https://gerrit.libreoffice.org/54987
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 4fba23b2f7ca..3b182cde641a 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -426,7 +426,7 @@ void ColorFieldControl::ShowPosition( const Point& rPos,
bool bUpdate )
void ColorFieldControl::MouseButtonDown(const MouseEvent& rMEvt)
{
-grab_add();
+CaptureMouse();
mbMouseCaptured = true;
ShowPosition(rMEvt.GetPosPixel(), true);
Modify();
@@ -443,7 +443,7 @@ void ColorFieldControl::MouseMove(const MouseEvent& rMEvt)
void ColorFieldControl::MouseButtonUp(const MouseEvent&)
{
-grab_remove();
+ReleaseMouse();
mbMouseCaptured = false;
}
@@ -537,14 +537,12 @@ private:
VclPtr mxBitmap;
sal_Int16 mnLevel;
double mdValue;
-bool mbMouseCaptured;
};
ColorSliderControl::ColorSliderControl()
: meMode( DefaultMode )
, mnLevel( 0 )
, mdValue( -1.0 )
-, mbMouseCaptured(false)
{
}
@@ -651,15 +649,14 @@ void ColorSliderControl::ChangePosition(long nY)
void ColorSliderControl::MouseButtonDown(const MouseEvent& rMEvt)
{
-grab_add();
-mbMouseCaptured = true;
+CaptureMouse();
ChangePosition(rMEvt.GetPosPixel().Y());
Modify();
}
void ColorSliderControl::MouseMove(const MouseEvent& rMEvt)
{
-if (mbMouseCaptured)
+if (IsMouseCaptured())
{
ChangePosition(rMEvt.GetPosPixel().Y());
Modify();
@@ -668,8 +665,7 @@ void ColorSliderControl::MouseMove(const MouseEvent& rMEvt)
void ColorSliderControl::MouseButtonUp(const MouseEvent&)
{
-grab_remove();
-mbMouseCaptured = false;
+ReleaseMouse();
}
void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 7e7aa264f91b..9dccd2663241 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -175,15 +175,6 @@ class SvxAngleTabPage : public SvxTabPage
static const sal_uInt16 pAngleRanges[];
private:
-VclPtrm_pFlPosition;
-VclPtr m_pMtrPosX;
-VclPtr m_pMtrPosY;
-VclPtr m_pCtlRect;
-
-VclPtrm_pFlAngle;
-VclPtrm_pNfAngle;
-VclPtrm_pCtlAngle;
-
const SfxItemSet& rOutAttrs;
const SdrView* pView;
@@ -194,10 +185,20 @@ private:
MapUnit ePoolUnit;
FieldUnit eDlgUnit;
+svx::SvxDialControl m_aCtlAngle;
+RectCtl m_aCtlRect;
+
+std::unique_ptr m_xFlPosition;
+std::unique_ptr m_xMtrPosX;
+std::unique_ptr m_xMtrPosY;
+std::unique_ptr m_xCtlRect;
+std::unique_ptr m_xFlAngle;
+std::unique_ptr m_xNfAngle;
+std::unique_ptr m_xCtlAngle;
+
public:
- SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
+SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxAngleTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAngleRanges; }
@@ -208,8 +209,8 @@ 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 PointChanged(weld::DrawingArea* pWindow, RectPoint eRP)
override;
+virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override;
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index b37d366f2f0b..cf3bc446a78e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -173,57 +173,43 @@ void SvxTransformTabDialog::SetValidateFrameP
