[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig extras/source include/svtools include/svx include/vcl sc/source svtools/source svx/inc svx/source vcl/source vcl/unx
cui/source/inc/cuitabarea.hxx | 94 ++--- cui/source/tabpages/tpcolor.cxx| 419 +++-- cui/uiconfig/ui/colorpage.ui | 242 ++ extras/source/glade/libreoffice-catalog.xml.in |3 include/svtools/valueset.hxx | 15 include/svx/Palette.hxx|1 include/svx/PaletteManager.hxx |2 include/svx/SvxColorValueSet.hxx |2 include/svx/hexcolorcontrol.hxx| 15 include/vcl/vclenum.hxx|7 include/vcl/weld.hxx |3 sc/source/ui/miscdlgs/tabbgcolordlg.cxx|3 svtools/source/control/valueset.cxx| 118 ++- svx/inc/palettes.hxx |3 svx/source/dialog/hexcolorcontrol.cxx | 107 -- svx/source/tbxctrls/Palette.cxx| 37 ++ svx/source/tbxctrls/PaletteManager.cxx | 52 +++ svx/source/tbxctrls/SvxColorValueSet.cxx | 52 +++ vcl/source/app/salvtables.cxx | 26 + vcl/source/window/layout.cxx |4 vcl/unx/gtk3/gtk3gtkinst.cxx | 154 ++--- 21 files changed, 770 insertions(+), 589 deletions(-) New commits: commit d148e5c5db3f3ea32abd6f7bed30665a3931e937 Author: Caolán McNamara Date: Mon Jun 18 21:30:10 2018 +0100 weld SvxColorTabPage Change-Id: I5dc6f949edcb34aa110dfa9415e2ac886d0dfa4c Reviewed-on: https://gerrit.libreoffice.org/56155 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 7a72431bb9a5..2c8e55234fe9 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -654,43 +654,6 @@ class SvxColorTabPage : public SfxTabPage private: VclPtr mpTopDlg; -PaletteManager maPaletteManager; -VclPtrm_pSelectPalette; -VclPtr m_pValSetColorList; -VclPtr m_pValSetRecentList; - -VclPtrm_pCtlPreviewOld; -VclPtrm_pCtlPreviewNew; - -VclPtrm_pRbRGB; -VclPtrm_pRbCMYK; - -VclPtr m_pRGBcustom; -VclPtr m_pRGBpreset; -VclPtr m_pRcustom; -VclPtr m_pRpreset; -VclPtr m_pGcustom; -VclPtr m_pGpreset; -VclPtr m_pBcustom; -VclPtr m_pBpreset; -VclPtrm_pHexpreset; -VclPtrm_pHexcustom; - -VclPtr m_pCMYKcustom; -VclPtr m_pCMYKpreset; -VclPtrm_pCcustom; -VclPtrm_pCpreset; -VclPtrm_pYcustom; -VclPtrm_pYpreset; -VclPtrm_pMcustom; -VclPtrm_pMpreset; -VclPtrm_pKcustom; -VclPtrm_pKpreset; - -VclPtr m_pBtnAdd; -VclPtr m_pBtnDelete; -VclPtr m_pBtnWorkOn; - const SfxItemSet& rOutAttrs; XColorListRef pColorList; @@ -705,6 +668,44 @@ private: Color aPreviousColor; Color aCurrentColor; +css::uno::Reference< css::uno::XComponentContext > m_context; + +PaletteManager maPaletteManager; +XRectPreview m_aCtlPreviewOld; +XRectPreview m_aCtlPreviewNew; +std::unique_ptr m_xValSetColorList; +std::unique_ptr m_xValSetRecentList; +std::unique_ptr m_xSelectPalette; +std::unique_ptr m_xRbRGB; +std::unique_ptr m_xRbCMYK; +std::unique_ptr m_xRGBcustom; +std::unique_ptr m_xRGBpreset; +std::unique_ptr m_xRpreset; +std::unique_ptr m_xGpreset; +std::unique_ptr m_xBpreset; +std::unique_ptr m_xRcustom; +std::unique_ptr m_xGcustom; +std::unique_ptr m_xBcustom; +std::unique_ptr m_xHexpreset; +std::unique_ptr m_xHexcustom; +std::unique_ptr m_xCMYKcustom; +std::unique_ptr m_xCMYKpreset; +std::unique_ptr m_xCpreset; +std::unique_ptr m_xYpreset; +std::unique_ptr m_xMpreset; +std::unique_ptr m_xKpreset; +std::unique_ptr m_xCcustom; +std::unique_ptr m_xYcustom; +std::unique_ptr m_xMcustom; +std::unique_ptr m_xKcustom; +std::unique_ptr m_xBtnAdd; +std::unique_ptr m_xBtnDelete; +std::unique_ptr m_xBtnWorkOn; +std::unique_ptr m_xCtlPreviewOld; +std::unique_ptr m_xCtlPreviewNew; +std::unique_ptr m_xValSetColorListWin; +std::unique_ptr m_xValSetRecentListWin; + static voidConvertColorValues (Color& rColor, ColorModel eModell); static voidRgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ); static voidCmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey ); @@ -714,27 +715,28 @@ private: void ImpColorCountChanged(); void FillPaletteLB(); -DECL_LINK( ClickAddHdl_Impl, Button*, void ); -DECL_LINK( ClickWorkOnHdl_Impl, Button*, void ); -DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); +DECL_LINK(ClickAddHdl_Impl, weld::Button&,
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig extras/source include/svx include/vcl solenv/sanitizers svx/source
cui/source/inc/page.hxx | 125 +-- cui/source/tabpages/page.cxx | 905 +-- cui/uiconfig/ui/pageformatpage.ui| 85 -- extras/source/glade/libreoffice-catalog.xml.in |3 include/svx/SvxNumOptionsTabPageHelper.hxx |4 include/svx/frmdirlbox.hxx |6 include/svx/pagenumberlistbox.hxx| 17 include/svx/papersizelistbox.hxx | 20 include/vcl/weld.hxx | 32 solenv/sanitizers/ui/cui.suppr |4 svx/source/dialog/SvxNumOptionsTabPageHelper.cxx | 52 + svx/source/dialog/pagectrl.cxx |2 svx/source/dialog/pagenumberlistbox.cxx | 44 + svx/source/dialog/papersizelistbox.cxx | 50 + 14 files changed, 699 insertions(+), 650 deletions(-) New commits: commit 73b1aeca87d050634bae9194632601561dedec06 Author: Caolán McNamara Date: Fri Jun 15 14:03:31 2018 +0100 weld SvxPageDescPage Change-Id: I5e2457b51a294cbdacc5c78db4ec0a048567b93d Reviewed-on: https://gerrit.libreoffice.org/55952 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 7f24edc49514..ab9f1cad1869 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -74,55 +75,7 @@ class SvxPageDescPage : public SfxTabPage static const sal_uInt16 pRanges[]; private: -// paper format -VclPtrm_pPaperSizeBox; - -VclPtr m_pPaperWidthEdit; -VclPtr m_pPaperHeightEdit; - -VclPtr m_pOrientationFT; -VclPtr m_pPortraitBtn; -VclPtr m_pLandscapeBtn; - -VclPtr m_pBspWin; - -VclPtr m_pTextFlowLbl; -VclPtr m_pTextFlowBox; - -VclPtr m_pPaperTrayBox; - -// Margins -VclPtr m_pLeftMarginLbl; -VclPtr m_pLeftMarginEdit; -VclPtr m_pRightMarginLbl; -VclPtr m_pRightMarginEdit; -VclPtr m_pTopMarginEdit; -VclPtr m_pBottomMarginEdit; - -// layout settings -VclPtr m_pPageText; -VclPtr m_pLayoutBox; -VclPtr m_pNumberFormatBox; - -//Extras Calc -VclPtr m_pTblAlignFT; -VclPtrm_pHorzBox; -VclPtrm_pVertBox; - -// Impress and Draw -VclPtrm_pAdaptBox; - -//Register Writer -VclPtrm_pRegisterCB; -VclPtr m_pRegisterFT; -VclPtr m_pRegisterLB; - -OUString sStandardRegister; - -VclPtr m_pInsideLbl; -VclPtr m_pOutsideLbl; -VclPtr m_pPrintRangeQueryText; - +OUStringsStandardRegister; longnFirstLeftMargin; longnFirstRightMargin; longnFirstTopMargin; @@ -143,38 +96,76 @@ private: boolmbDelPrinter : 1; boolmbEnableDrawingLayerFillStyles : 1; +PageWindow m_aBspWin; + +// paper format +std::unique_ptr m_xPaperSizeBox; +std::unique_ptr m_xPaperWidthEdit; +std::unique_ptr m_xPaperHeightEdit; +std::unique_ptr m_xOrientationFT; +std::unique_ptr m_xPortraitBtn; +std::unique_ptr m_xLandscapeBtn; +std::unique_ptr m_xTextFlowLbl; +std::unique_ptr m_xTextFlowBox; +std::unique_ptr m_xPaperTrayBox; +// Margins +std::unique_ptr m_xLeftMarginLbl; +std::unique_ptr m_xLeftMarginEdit; +std::unique_ptr m_xRightMarginLbl; +std::unique_ptr m_xRightMarginEdit; +std::unique_ptr m_xTopMarginEdit; +std::unique_ptr m_xBottomMarginEdit; +// layout settings +std::unique_ptr m_xPageText; +std::unique_ptr m_xLayoutBox; +std::unique_ptr m_xNumberFormatBox; +//Extras Calc +std::unique_ptr m_xTblAlignFT; +std::unique_ptr m_xHorzBox; +std::unique_ptr m_xVertBox; +// Impress and Draw +std::unique_ptr m_xAdaptBox; +//Register Writer +std::unique_ptr m_xRegisterCB; +std::unique_ptr m_xRegisterFT; +std::unique_ptr m_xRegisterLB; +std::unique_ptr m_xInsideLbl; +std::unique_ptr m_xOutsideLbl; +std::unique_ptr m_xPrintRangeQueryText; +std::unique_ptr m_xBspWin; + voidInit_Impl(); -DECL_LINK(LayoutHdl_Impl, ListBox&, void); -DECL_LINK(PaperBinHdl_Impl, Control&, void); -DECL_LINK(SwapOrientation_Impl, Button*, void ); -voidSwapFirstValues_Impl( bool bSet ); -DECL_LINK(BorderModify_Impl, Edit&, void); -voidInitHeadFoot_Impl( const SfxItemSet& rSet ); -DECL_LINK(CenterHdl_Impl, Button*, void); -voidUpdateExample_Impl( bool bResetbackground = false ); +
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/svx include/vcl solenv/sanitizers svx/source
cui/source/inc/paragrph.hxx | 60 ++-
cui/source/tabpages/paragrph.cxx | 558 ---
cui/uiconfig/ui/paraindentspacing.ui | 143
include/svx/relfld.hxx | 42 ++
include/vcl/weld.hxx |4
solenv/sanitizers/ui/cui.suppr |4
svx/source/dialog/relfld.cxx | 80 +
7 files changed, 500 insertions(+), 391 deletions(-)
New commits:
commit 903e664735b6bb0d58a16e08db8dfcb3fe52ed94
Author: Caolán McNamara
Date: Thu Jun 14 13:05:26 2018 +0100
weld SvxStdParagraphTabPage
Change-Id: I02b0f2e4f049b407a3ac0c7f304cbcd0cc652749
Reviewed-on: https://gerrit.libreoffice.org/55827
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index ed88e4461532..16614656125c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -51,48 +51,53 @@ class SvxStdParagraphTabPage: public SfxTabPage
static const sal_uInt16 pStdRanges[];
private:
-SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+
+longnAbst;
+longnWidth;
+longnMinFixDist;
+boolbRelativeMode;
+OUStringsAbsDist;
+
+ParaPrevWindow m_aExampleWin;
// indention
-VclPtr m_pLeftIndent;
+std::unique_ptr m_xLeftIndent;
-VclPtr m_pRightLabel;
-VclPtr m_pRightIndent;
+std::unique_ptr m_xRightLabel;
+std::unique_ptr m_xRightIndent;
-VclPtr m_pFLineLabel;
-VclPtr m_pFLineIndent;
-VclPtr m_pAutoCB;
+std::unique_ptr m_xFLineLabel;
+std::unique_ptr m_xFLineIndent;
+std::unique_ptr m_xAutoCB;
// distance
-VclPtr m_pTopDist;
-VclPtr m_pBottomDist;
-VclPtr m_pContextualCB;
+std::unique_ptr m_xTopDist;
+std::unique_ptr m_xBottomDist;
+std::unique_ptr m_xContextualCB;
// line spacing
-VclPtrm_pLineDist;
-VclPtr m_pLineDistAtLabel;
-VclPtrm_pLineDistAtPercentBox;
-VclPtrm_pLineDistAtMetricBox;
-VclPtr m_pAbsDist;
-OUStringsAbsDist;
-VclPtr m_pExampleWin;
+std::unique_ptr m_xLineDist;
+std::unique_ptr m_xLineDistAtPercentBox;
+std::unique_ptr m_xLineDistAtMetricBox;
+std::unique_ptr m_xLineDistAtLabel;
+std::unique_ptr m_xAbsDist;
// only writer
-VclPtr m_pRegisterFL;
-VclPtr m_pRegisterCB;
+std::unique_ptr m_xRegisterFL;
+std::unique_ptr m_xRegisterCB;
-longnAbst;
-longnWidth;
-longnMinFixDist;
-boolbRelativeMode;
+// preview
+std::unique_ptr m_xExampleWin;
voidSetLineSpacing_Impl( const SvxLineSpacingItem&
rAttr );
voidInit_Impl();
voidUpdateExample_Impl();
+voidELRLoseFocus();
-DECL_LINK( LineDistHdl_Impl, ListBox&, void );
-DECL_LINK( ModifyHdl_Impl, Edit&, void );
-DECL_LINK( AutoHdl_Impl, Button*, void );
+DECL_LINK(LineDistHdl_Impl, weld::ComboBoxText&, void);
+DECL_LINK(ModifyHdl_Impl, weld::MetricSpinButton&, void);
+DECL_LINK(AutoHdl_Impl, weld::ToggleButton&, void);
protected:
virtual voidActivatePage( const SfxItemSet& rSet ) override;
@@ -101,9 +106,8 @@ protected:
public:
virtual ~SvxStdParagraphTabPage() override;
-virtual void dispose() override;
-DECL_LINK(ELRLoseFocusHdl, Control&, void);
+DECL_LINK(ELRLoseFocusHdl, weld::MetricSpinButton&, void);
static VclPtr Create( TabPageParent pParent, const
SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pStdRanges; }
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0fdc536823df..5f3af968def6 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -160,46 +160,53 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet)
}
-IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void)
+void SvxStdParagraphTabPage::ELRLoseFocus()
{
SfxItemPool* pPool = GetItemSet().GetPool();
DBG_ASSERT( pPool, "Where is the pool?" );
FieldUnit eUnit =
MapToFieldUnit( pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) ) );
-sal_Int64 nL = m_pLeftIndent->Denormalize( m_pLeftIndent->GetValue( eUnit
) );
-sal_Int64 nR = m_pRightIndent->Denormalize( m_pRightIndent->GetValue(
eUnit ) );
-OUString aTmp = m_pFLineIndent->GetText();
+sal_Int64 nL =
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/svx
cui/source/inc/paragrph.hxx | 41 ++---
cui/source/tabpages/paragrph.cxx | 308 +-
cui/uiconfig/ui/paragalignpage.ui | 115 +-
include/svx/frmdirlbox.hxx|1
4 files changed, 205 insertions(+), 260 deletions(-)
New commits:
commit 575a9bb4cd3952ed39aaccb83a5d6761ea082601
Author: Caolán McNamara
Date: Thu Jun 14 11:07:20 2018 +0100
weld SvxParaAlignTabPage
Change-Id: I843b264d44266213e91b7e75bf35e4f6cf41dd88
Reviewed-on: https://gerrit.libreoffice.org/55809
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 569f5c082b23..ed88e4461532 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -130,36 +130,38 @@ class SvxParaAlignTabPage : public SfxTabPage
using TabPage::DeactivatePage;
static const sal_uInt16 pAlignRanges[];
+ParaPrevWindow m_aExampleWin;
+
// alignment
-VclPtr m_pLeft;
-VclPtr m_pRight;
-VclPtr m_pCenter;
-VclPtr m_pJustify;
-VclPtr m_pLeftBottom;
-VclPtr m_pRightTop;
+std::unique_ptr m_xLeft;
+std::unique_ptr m_xRight;
+std::unique_ptr m_xCenter;
+std::unique_ptr m_xJustify;
+std::unique_ptr m_xLeftBottom;
+std::unique_ptr m_xRightTop;
-VclPtr m_pLastLineFT;
-VclPtr m_pLastLineLB;
-VclPtrm_pExpandCB;
+std::unique_ptr m_xLastLineFT;
+std::unique_ptr m_xLastLineLB;
+std::unique_ptr m_xExpandCB;
-VclPtrm_pSnapToGridCB;
+std::unique_ptr m_xSnapToGridCB;
//preview
-VclPtr m_pExampleWin;
+std::unique_ptr m_xExampleWin;
//vertical alignment
-VclPtrm_pVertAlignFL;
-VclPtr m_pVertAlignLB;
+std::unique_ptr m_xVertAlignFL;
+std::unique_ptr m_xVertAlignLB;
-VclPtrm_pPropertiesFL;
-VclPtr m_pTextDirectionLB;
+std::unique_ptr m_xPropertiesFL;
+std::unique_ptr m_xTextDirectionLB;
-DECL_LINK(AlignHdl_Impl, Button*, void);
-DECL_LINK(LastLineHdl_Impl, ListBox&, void);
-DECL_LINK(TextDirectionHdl_Impl, ListBox&, void);
+DECL_LINK(AlignHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(LastLineHdl_Impl, weld::ComboBoxText&, void);
+DECL_LINK(TextDirectionHdl_Impl, weld::ComboBoxText&, void);
voidUpdateExample_Impl();
-SvxParaAlignTabPage( vcl::Window* pParent, const
SfxItemSet& rSet );
+SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet);
protected:
virtual voidActivatePage( const SfxItemSet& rSet ) override;
@@ -167,7 +169,6 @@ protected:
public:
virtual ~SvxParaAlignTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent pParent, const
SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pAlignRanges; }
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a3f25820739b..0fdc536823df 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1016,29 +1016,24 @@ voidSvxStdParagraphTabPage::PageCreated(const
SfxAllItemSet& aSet)
#define LASTLINECOUNT_OLD 3
#define LASTLINECOUNT_NEW 4
-SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const
SfxItemSet& rSet )
-
-: SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",)
+SvxParaAlignTabPage::SvxParaAlignTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/paragalignpage.ui", "ParaAlignPage", )
+, m_xLeft(m_xBuilder->weld_radio_button("radioBTN_LEFTALIGN"))
+, m_xRight(m_xBuilder->weld_radio_button("radioBTN_RIGHTALIGN"))
+, m_xCenter(m_xBuilder->weld_radio_button("radioBTN_CENTERALIGN"))
+, m_xJustify(m_xBuilder->weld_radio_button("radioBTN_JUSTIFYALIGN"))
+, m_xLeftBottom(m_xBuilder->weld_label("labelST_LEFTALIGN_ASIAN"))
+, m_xRightTop(m_xBuilder->weld_label("labelST_RIGHTALIGN_ASIAN"))
+, m_xLastLineFT(m_xBuilder->weld_label("labelLB_LASTLINE"))
+, m_xLastLineLB(m_xBuilder->weld_combo_box_text("comboLB_LASTLINE"))
+, m_xExpandCB(m_xBuilder->weld_check_button("checkCB_EXPAND"))
+, m_xSnapToGridCB(m_xBuilder->weld_check_button("checkCB_SNAP"))
+, m_xExampleWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE",
m_aExampleWin))
+, m_xVertAlignFL(m_xBuilder->weld_widget("frameFL_VERTALIGN"))
+, m_xVertAlignLB(m_xBuilder->weld_combo_box_text("comboLB_VERTALIGN"))
+, m_xPropertiesFL(m_xBuilder->weld_widget("framePROPERTIES"))
+, m_xTextDirectionLB(new
svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("comboLB_TEXTDIRECTION")))
{
-get(m_pLeft,"radioBTN_LEFTALIGN");
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig
cui/source/inc/paragrph.hxx | 82 ++---
cui/source/tabpages/paragrph.cxx | 638 +--
cui/uiconfig/ui/textflowpage.ui | 41 ++
3 files changed, 363 insertions(+), 398 deletions(-)
New commits:
commit 8f72549ce32c522ca951b7f53c2beedc7b4dcc7a
Author: Caolán McNamara
Date: Wed Jun 13 21:26:35 2018 +0100
weld SvxExtParagraphTabPage
Change-Id: I6836bc659f28ebae35ed0ca33ffd9425212c3622
Reviewed-on: https://gerrit.libreoffice.org/55791
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 648394ae4690..569f5c082b23 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -202,7 +202,6 @@ class SvxExtParagraphTabPage: public SfxTabPage
public:
virtual ~SvxExtParagraphTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent pParent,
const SfxItemSet* rSet );
@@ -218,59 +217,58 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
private:
-SvxExtParagraphTabPage( vcl::Window* pParent, const
SfxItemSet& rSet );
+SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+
+boolbPageBreak;
+boolbHtmlMode;
+sal_uInt16 nStdPos;
// hyphenation
-VclPtrm_pHyphenBox;
-VclPtr m_pBeforeText;
-VclPtr m_pExtHyphenBeforeBox;
-VclPtr m_pAfterText;
-VclPtr m_pExtHyphenAfterBox;
-VclPtr m_pMaxHyphenLabel;
-VclPtr m_pMaxHyphenEdit;
+std::unique_ptr m_xHyphenBox;
+std::unique_ptr m_xBeforeText;
+std::unique_ptr m_xExtHyphenBeforeBox;
+std::unique_ptr m_xAfterText;
+std::unique_ptr m_xExtHyphenAfterBox;
+std::unique_ptr m_xMaxHyphenLabel;
+std::unique_ptr m_xMaxHyphenEdit;
// pagebreak
-VclPtrm_pPageBreakBox;
-VclPtr m_pBreakTypeFT;
-VclPtrm_pBreakTypeLB;
-VclPtr m_pBreakPositionFT;
-VclPtrm_pBreakPositionLB;
-VclPtrm_pApplyCollBtn;
-VclPtrm_pApplyCollBox;
-VclPtrm_pPageNumBox;
-VclPtr m_pPagenumEdit;
+std::unique_ptr m_xPageBreakBox;
+std::unique_ptr m_xBreakTypeFT;
+std::unique_ptr m_xBreakTypeLB;
+std::unique_ptr m_xBreakPositionFT;
+std::unique_ptr m_xBreakPositionLB;
+std::unique_ptr m_xApplyCollBtn;
+std::unique_ptr m_xApplyCollBox;
+std::unique_ptr m_xPageNumBox;
+std::unique_ptr m_xPagenumEdit;
// paragraph division
-VclPtrm_pKeepTogetherBox;
-VclPtrm_pKeepParaBox;
+std::unique_ptr m_xKeepTogetherBox;
+std::unique_ptr m_xKeepParaBox;
// orphan/widow
-VclPtrm_pOrphanBox;
-VclPtr m_pOrphanRowNo;
-VclPtr m_pOrphanRowLabel;
-
-VclPtrm_pWidowBox;
-VclPtr m_pWidowRowNo;
-VclPtr m_pWidowRowLabel;
-
-boolbPageBreak;
-boolbHtmlMode;
-sal_uInt16 nStdPos;
-
-DECL_LINK(PageBreakHdl_Impl, Button*, void);
-DECL_LINK(KeepTogetherHdl_Impl, Button*, void);
-DECL_LINK(WidowHdl_Impl, Button*, void);
-DECL_LINK(OrphanHdl_Impl, Button*, void);
-DECL_LINK(HyphenClickHdl_Impl, Button*, void);
-DECL_LINK(ApplyCollClickHdl_Impl, Button*, void);
-DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void );
-DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void );
-DECL_LINK(PageNumBoxClickHdl_Impl, Button*, void);
+std::unique_ptr m_xOrphanBox;
+std::unique_ptr m_xOrphanRowNo;
+std::unique_ptr m_xOrphanRowLabel;
+
+std::unique_ptr m_xWidowBox;
+std::unique_ptr m_xWidowRowNo;
+std::unique_ptr m_xWidowRowLabel;
+
+DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(KeepTogetherHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(WidowHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(OrphanHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(HyphenClickHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBoxText&, void);
+DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBoxText&, void);
+DECL_LINK(PageNumBoxClickHdl_Impl, weld::ToggleButton&, void);
virtual voidPageCreated(const SfxAllItemSet& aSet) override;
};
-
class SvxAsianTabPage : public SfxTabPage
{
friend class VclPtr;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 96b0f6706107..a3f25820739b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1390,23 +1390,22 @@ void SvxParaAlignTabPage::PageCreated (const
SfxAllItemSet& aSet)
EnableJustifyExt();
}
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/vcl vcl/source
cui/source/inc/chardlg.hxx | 23 +++
cui/source/tabpages/chardlg.cxx | 130 +---
cui/uiconfig/ui/twolinespage.ui | 117 ++--
include/vcl/builder.hxx |2
vcl/source/window/builder.cxx | 12 +++
5 files changed, 164 insertions(+), 120 deletions(-)
New commits:
commit fa5f3096c9f669a063fe81325b5b47c6903d94a5
Author: Caolán McNamara
Date: Wed Jun 13 16:31:39 2018 +0100
weld SvxCharTwoLinesPage
Change-Id: I54a8963cd8b12f5fd51bf6b3bb791a4a15fbd13d
Reviewed-on: https://gerrit.libreoffice.org/55766
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index fd46e3c3c334..489ea991b5a4 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -354,32 +354,31 @@ public:
// class SvxCharTwoLinesPage -
-class SvxCharTwoLinesPage : public SvxCharBasePage
+class SvxCharTwoLinesPage : public CharBasePage
{
friend class VclPtr;
private:
static const sal_uInt16 pTwoLinesRanges[];
-VclPtr m_pTwoLinesBtn;
-VclPtr m_pEnclosingFrame;
-VclPtrm_pStartBracketLB;
-VclPtrm_pEndBracketLB;
-
sal_uInt16 m_nStartBracketPosition;
sal_uInt16 m_nEndBracketPosition;
-SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet);
+std::unique_ptr m_xTwoLinesBtn;
+std::unique_ptr m_xEnclosingFrame;
+std::unique_ptr m_xStartBracketLB;
+std::unique_ptr m_xEndBracketLB;
+
+SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet);
voidUpdatePreview_Impl();
voidInitialize();
-voidSelectCharacter( ListBox* pBox );
-voidSetBracket( sal_Unicode cBracket, bool bStart );
+voidSelectCharacter(weld::TreeView* pBox);
+voidSetBracket(sal_Unicode cBracket, bool bStart);
-DECL_LINK(TwoLinesHdl_Impl, Button*, void);
-DECL_LINK(CharacterMapHdl_Impl, ListBox&, void );
+DECL_LINK(TwoLinesHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void);
public:
virtual ~SvxCharTwoLinesPage() override;
-virtual void dispose() override;
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 22422651f504..c2b7a78eda83 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3130,45 +3130,33 @@ void SvxCharPositionPage::PageCreated(const
SfxAllItemSet& aSet)
}
// class SvxCharTwoLinesPage
-SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const
SfxItemSet& rInSet)
-: SvxCharBasePage(pParent, "TwoLinesPage", "cui/ui/twolinespage.ui",
rInSet)
+SvxCharTwoLinesPage::SvxCharTwoLinesPage(TabPageParent pParent, const
SfxItemSet& rInSet)
+: CharBasePage(pParent, "cui/ui/twolinespage.ui", "TwoLinesPage", rInSet)
, m_nStartBracketPosition( 0 )
, m_nEndBracketPosition( 0 )
+, m_xTwoLinesBtn(m_xBuilder->weld_check_button("twolines"))
+, m_xEnclosingFrame(m_xBuilder->weld_widget("enclosing"))
+, m_xStartBracketLB(m_xBuilder->weld_tree_view("startbracket"))
+, m_xEndBracketLB(m_xBuilder->weld_tree_view("endbracket"))
{
-get(m_pTwoLinesBtn, "twolines");
-get(m_pEnclosingFrame, "enclosing");
-get(m_pStartBracketLB, "startbracket");
-get(m_pEndBracketLB, "endbracket");
-
-get(m_pPreviewWin, "preview");
-
+m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview",
m_aPreviewWin));
Initialize();
}
SvxCharTwoLinesPage::~SvxCharTwoLinesPage()
{
-disposeOnce();
-}
-
-void SvxCharTwoLinesPage::dispose()
-{
-m_pTwoLinesBtn.clear();
-m_pEnclosingFrame.clear();
-m_pStartBracketLB.clear();
-m_pEndBracketLB.clear();
-SvxCharBasePage::dispose();
}
void SvxCharTwoLinesPage::Initialize()
{
-m_pTwoLinesBtn->Check( false );
-TwoLinesHdl_Impl( nullptr );
+m_xTwoLinesBtn->set_active(false);
+TwoLinesHdl_Impl(*m_xTwoLinesBtn);
-m_pTwoLinesBtn->SetClickHdl( LINK( this, SvxCharTwoLinesPage,
TwoLinesHdl_Impl ) );
+m_xTwoLinesBtn->connect_toggled(LINK(this, SvxCharTwoLinesPage,
TwoLinesHdl_Impl));
-Link aLink = LINK( this, SvxCharTwoLinesPage,
CharacterMapHdl_Impl );
-m_pStartBracketLB->SetSelectHdl( aLink );
-m_pEndBracketLB->SetSelectHdl( aLink );
+Link aLink = LINK(this, SvxCharTwoLinesPage,
CharacterMapHdl_Impl);
+m_xStartBracketLB->connect_changed(aLink);
+m_xEndBracketLB->connect_changed(aLink);
SvxFont& rFont = GetPreviewFont();
SvxFont& rCJKFont = GetPreviewCJKFont();
@@ -3178,10 +3166,9 @@ void
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/sfx2 include/svx include/vcl sfx2/source solenv/sanitizers svtools/source svx/source
cui/source/inc/chardlg.hxx | 97 ++-
cui/source/tabpages/chardlg.cxx | 459 +-
cui/uiconfig/ui/positionpage.ui | 71 ++
include/sfx2/dialoghelper.hxx |2
include/svx/fntctrl.hxx | 58 ++
include/vcl/weld.hxx| 14
sfx2/source/dialog/dialoghelper.cxx |4
solenv/sanitizers/ui/cui.suppr |1
svtools/source/control/valueset.cxx |2
svx/source/dialog/dlgctrl.cxx |3
svx/source/dialog/fntctrl.cxx | 909 +++-
svx/source/dialog/measctrl.cxx |2
12 files changed, 1332 insertions(+), 290 deletions(-)
New commits:
commit e10cd7f66af779347f428425f89fdd225ba5cc2e
Author: Caolán McNamara
Date: Wed Jun 13 14:40:15 2018 +0100
weld SvxCharPositionPage
Change-Id: I2084702798e5b01eae5905dc54ad8413e6d5fae6
Reviewed-on: https://gerrit.libreoffice.org/55765
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 144b13e94513..fd46e3c3c334 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
// forward ---
@@ -62,6 +63,33 @@ public:
};
+class CharBasePage : public SfxTabPage
+{
+protected:
+FontPrevWindow m_aPreviewWin;
+std::unique_ptr m_xPreviewWin;
+
+boolm_bPreviewBackgroundToCharacter;
+
+CharBasePage(TabPageParent pParent, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet& rAttrSet);
+
+void SetPrevFontWidthScale( const SfxItemSet& rSet );
+void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short
nEsc );
+
+inline SvxFont& GetPreviewFont();
+inline SvxFont& GetPreviewCJKFont();
+inline SvxFont& GetPreviewCTLFont();
+
+public:
+virtual ~CharBasePage() override;
+
+using SfxTabPage::ActivatePage;
+using SfxTabPage::DeactivatePage;
+
+virtual voidActivatePage( const SfxItemSet& rSet ) override;
+
+};
+
// class SvxCharNamePage -
struct SvxCharNamePage_Impl;
@@ -252,35 +280,12 @@ public:
// class SvxCharPositionPage -
-class SvxCharPositionPage : public SvxCharBasePage
+class SvxCharPositionPage : public CharBasePage
{
friend class VclPtr;
static const sal_uInt16 pPositionRanges[];
private:
-VclPtrm_pHighPosBtn;
-VclPtrm_pNormalPosBtn;
-VclPtrm_pLowPosBtn;
-VclPtr m_pHighLowFT;
-VclPtrm_pHighLowMF;
-VclPtr m_pHighLowRB;
-VclPtr m_pFontSizeFT;
-VclPtrm_pFontSizeMF;
-
-VclPtr m_pRotationContainer;
-
-VclPtr m_pScalingFT;
-VclPtr m_pScalingAndRotationFT;
-VclPtrm_p0degRB;
-VclPtrm_p90degRB;
-VclPtrm_p270degRB;
-VclPtr m_pFitToLineCB;
-
-VclPtrm_pScaleWidthMF;
-
-VclPtrm_pKerningMF;
-VclPtr m_pPairKerningBtn;
-
short m_nSuperEsc;
short m_nSubEsc;
@@ -290,25 +295,47 @@ private:
sal_uInt8m_nSuperProp;
sal_uInt8m_nSubProp;
-SvxCharPositionPage( vcl::Window* pParent, const
SfxItemSet& rSet );
+std::unique_ptr m_xHighPosBtn;
+std::unique_ptr m_xNormalPosBtn;
+std::unique_ptr m_xLowPosBtn;
+std::unique_ptr m_xHighLowFT;
+std::unique_ptr m_xHighLowMF;
+std::unique_ptr m_xHighLowRB;
+std::unique_ptr m_xFontSizeFT;
+std::unique_ptr m_xFontSizeMF;
+
+std::unique_ptr m_xRotationContainer;
+
+std::unique_ptr m_xScalingFT;
+std::unique_ptr m_xScalingAndRotationFT;
+std::unique_ptr m_x0degRB;
+std::unique_ptr m_x90degRB;
+std::unique_ptr m_x270degRB;
+std::unique_ptr m_xFitToLineCB;
+
+std::unique_ptr m_xScaleWidthMF;
+
+std::unique_ptr m_xKerningMF;
+std::unique_ptr m_xPairKerningBtn;
+
+SvxCharPositionPage(TabPageParent pParent, const
SfxItemSet& rSet);
voidInitialize();
voidUpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8
nEscProp, short nEsc );
voidSetEscapement_Impl( SvxEscapement nEsc );
-DECL_LINK(PositionHdl_Impl, Button*, void );
-DECL_LINK(RotationHdl_Impl, Button*, void );
-DECL_LINK(FontModifyHdl_Impl, Edit&, void );
-DECL_LINK(AutoPositionHdl_Impl, Button*, void );
-DECL_LINK(FitToLineHdl_Impl, Button*, void );
-DECL_LINK(KerningSelectHdl_Impl, ListBox&, void );
-DECL_LINK(KerningModifyHdl_Impl, Edit&, void );
-DECL_LINK(LoseFocusHdl_Impl, Control&, void );
-DECL_LINK(
[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
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/svx include/vcl starmath/source svx/source vcl/source
cui/source/inc/swpossizetabpage.hxx | 97 +---
cui/source/tabpages/swpossizetabpage.cxx | 746 ++-
cui/uiconfig/ui/swpossizepage.ui | 64 +-
include/svx/swframeexample.hxx | 65 ++
include/vcl/weld.hxx |4
starmath/source/dialog.cxx |8
svx/source/dialog/swframeexample.cxx | 666 +++
vcl/source/app/salvtables.cxx|5
8 files changed, 1168 insertions(+), 487 deletions(-)
New commits:
commit f78dbaad37f7b0ec08686a6aa31984ad11c631aa
Author: Caolán McNamara
Date: Mon May 28 14:33:42 2018 +0100
weld SvxSwPosSizeTabPage
Change-Id: I51c83ec801884a07f7920309535a58b55171b0be
Reviewed-on: https://gerrit.libreoffice.org/54979
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/swpossizetabpage.hxx
b/cui/source/inc/swpossizetabpage.hxx
index b10e2ca7617f..d9e326dee456 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -20,12 +20,9 @@
#define INCLUDED_CUI_SOURCE_INC_SWPOSSIZETABPAGE_HXX
#include
-#include
-#include
-#include
-#include
#include
#include
+#include
// SvxSwPosSizeTabPage - position and size page for Writer drawing objects
struct FrmMap;
@@ -37,40 +34,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
-VclPtr m_pWidthMF;
-VclPtr m_pHeightMF;
-VclPtr m_pKeepRatioCB;
-
-VclPtr m_pToPageRB;
-VclPtr m_pToParaRB;
-VclPtr m_pToCharRB;
-VclPtr m_pAsCharRB;
-VclPtr m_pToFrameRB;
-
-VclPtr m_pPositionCB;
-VclPtr m_pSizeCB;
-
-VclPtr m_pPosFrame;
-VclPtrm_pHoriFT;
-VclPtr m_pHoriLB;
-VclPtrm_pHoriByFT;
-VclPtr m_pHoriByMF;
-VclPtrm_pHoriToFT;
-VclPtr m_pHoriToLB;
-
-VclPtr m_pHoriMirrorCB;
-
-VclPtrm_pVertFT;
-VclPtr m_pVertLB;
-VclPtrm_pVertByFT;
-VclPtr m_pVertByMF;
-VclPtrm_pVertToFT;
-VclPtr m_pVertToLB;
-
-VclPtr m_pFollowCB;
-
-VclPtr m_pExampleWN;
-
Link m_aValidateLink;
::tools::Rectangle m_aRect; //size of all selected objects
@@ -95,24 +58,53 @@ class SvxSwPosSizeTabPage : public SfxTabPage
boolm_bIsInRightToLeft;
TriStatem_nProtectSizeState;
-DECL_LINK(RangeModifyHdl, Control&, void);
-DECL_LINK(RangeModifyClickHdl, Button*, void);
-DECL_LINK(AnchorTypeHdl, Button*, void);
-DECL_LINK( PosHdl, ListBox&, void );
-DECL_LINK( RelHdl, ListBox&, void );
-DECL_LINK(MirrorHdl, Button*, void);
-DECL_LINK( ModifyHdl, Edit&, void );
-DECL_LINK(ProtectHdl, Button*, void);
+SwFrameExample m_aExampleWN;
+
+std::unique_ptr m_xWidthMF;
+std::unique_ptr m_xHeightMF;
+std::unique_ptr m_xKeepRatioCB;
+std::unique_ptr m_xToPageRB;
+std::unique_ptr m_xToParaRB;
+std::unique_ptr m_xToCharRB;
+std::unique_ptr m_xAsCharRB;
+std::unique_ptr m_xToFrameRB;
+std::unique_ptr m_xPositionCB;
+std::unique_ptr m_xSizeCB;
+std::unique_ptr m_xPosFrame;
+std::unique_ptr m_xHoriFT;
+std::unique_ptr m_xHoriLB;
+std::unique_ptr m_xHoriByFT;
+std::unique_ptr m_xHoriByMF;
+std::unique_ptr m_xHoriToFT;
+std::unique_ptr m_xHoriToLB;
+std::unique_ptr m_xHoriMirrorCB;
+std::unique_ptr m_xVertFT;
+std::unique_ptr m_xVertLB;
+std::unique_ptr m_xVertByFT;
+std::unique_ptr m_xVertByMF;
+std::unique_ptr m_xVertToFT;
+std::unique_ptr m_xVertToLB;
+std::unique_ptr m_xFollowCB;
+std::unique_ptr m_xExampleWN;
+
+DECL_LINK(RangeModifyHdl, weld::Widget&, void);
+DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void);
+DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void);
+DECL_LINK(PosHdl, weld::ComboBoxText&, void);
+DECL_LINK(RelHdl, weld::ComboBoxText&, void);
+DECL_LINK(MirrorHdl, weld::ToggleButton&, void);
+DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void);
+DECL_LINK(ProtectHdl, weld::ToggleButton&, void);
voidInitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16
nHRel,
sal_uInt16 nV, sal_uInt16 nVRel,
long nX, long nY);
-static sal_uInt16 GetMapPos(FrmMap const *pMap, ListBox const );
-static shortGetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos,
ListBox const );
-static shortGetRelation(ListBox const );
+static sal_uInt16 GetMapPos(FrmMap const *pMap, const
weld::ComboBoxText& rAlignLB);
+static shortGetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos,
const weld::ComboBoxText& rRelationLB);
+static shortGetRelation(const weld::ComboBoxText& rRelationLB);
RndStdIds GetAnchorType(bool* pbHasChanged = nullptr);
-voidFillRelLB(FrmMap const *pMap, sal_uInt16 nLBSelPos,
[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
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig
cui/source/inc/transfrm.hxx | 24 +++
cui/source/tabpages/transfrm.cxx | 113 --
cui/uiconfig/ui/slantcornertabpage.ui | 68 ++--
3 files changed, 101 insertions(+), 104 deletions(-)
New commits:
commit 9f1fb000a50f38e45b68b4cb14cb4f7f9c514f82
Author: Caolán McNamara
Date: Fri May 25 16:19:52 2018 +0100
weld SvxSlantTabPage
Change-Id: Ib3b1bf1fa434c63b66f388a1f1815787b642fb88
Reviewed-on: https://gerrit.libreoffice.org/54967
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 959cd6bd8f4d..7e7aa264f91b 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -227,17 +227,6 @@ class SvxSlantTabPage : public SvxTabPage
static const sal_uInt16 pSlantRanges[];
private:
-VclPtrm_pFlRadius;
-VclPtr m_pMtrRadius;
-VclPtrm_pFlAngle;
-VclPtr m_pMtrAngle;
-
-VclPtrm_aControlGroups[2];
-VclPtrm_aControlGroupX[2];
-VclPtr m_aControlX[2];
-VclPtrm_aControlGroupY[2];
-VclPtr m_aControlY[2];
-
const SfxItemSet& rOutAttrs;
const SdrView* pView;
@@ -248,10 +237,19 @@ private:
MapUnit ePoolUnit;
FieldUnit eDlgUnit;
+std::unique_ptr m_xFlRadius;
+std::unique_ptr m_xMtrRadius;
+std::unique_ptr m_xFlAngle;
+std::unique_ptr m_xMtrAngle;
+std::unique_ptr m_aControlGroups[2];
+std::unique_ptr m_aControlGroupX[2];
+std::unique_ptr m_aControlX[2];
+std::unique_ptr m_aControlGroupY[2];
+std::unique_ptr m_aControlY[2];
+
public:
- SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
+SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxSlantTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pSlantRanges; }
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 0e67b85261b9..b37d366f2f0b 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -320,13 +320,11 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs)
m_pCtlAngle->SaveValue();
}
-
VclPtr SvxAngleTabPage::Create( TabPageParent pWindow, const
SfxItemSet* rSet)
{
return VclPtr::Create(pWindow.pParent, *rSet);
}
-
void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
{
SfxBoolItem const * bPosProtect = nullptr;
@@ -337,7 +335,6 @@ void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
}
}
-
DeactivateRC SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
@@ -422,25 +419,23 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea*
/*pWindow*/, RectPoint /*e
|* dialog for changing slant and corner radius
|*
\/
-SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet&
rInAttrs)
-: SvxTabPage(
pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui",
-rInAttrs)
+SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet&
rInAttrs)
+: SvxTabPage(pParent, "cui/ui/slantcornertabpage.ui",
"SlantAndCornerRadius", rInAttrs)
, rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FUNIT_NONE)
+, m_xFlRadius(m_xBuilder->weld_widget("FL_RADIUS"))
+, m_xMtrRadius(m_xBuilder->weld_metric_spin_button("MTR_FLD_RADIUS",
FUNIT_CM))
+, m_xFlAngle(m_xBuilder->weld_widget("FL_SLANT"))
+, m_xMtrAngle(m_xBuilder->weld_metric_spin_button("MTR_FLD_ANGLE",
FUNIT_DEGREE))
{
-get(m_pFlRadius, "FL_RADIUS");
-get(m_pMtrRadius, "MTR_FLD_RADIUS");
-get(m_pFlAngle, "FL_SLANT");
-get(m_pMtrAngle, "MTR_FLD_ANGLE");
-
for (int i = 0; i < 2; ++i)
{
-get(m_aControlGroups[i], "controlgroups" + OString::number(i+1));
-get(m_aControlGroupX[i], "controlgroupx" + OString::number(i+1));
-get(m_aControlX[i], "controlx" + OString::number(i+1));
-get(m_aControlGroupY[i], "controlgroupy" + OString::number(i+1));
-get(m_aControlY[i], "controly" + OString::number(i+1));
+m_aControlGroups[i].reset(m_xBuilder->weld_widget("controlgroups" +
OString::number(i+1)));
+m_aControlGroupX[i].reset(m_xBuilder->weld_widget("controlgroupx" +
OString::number(i+1)));
+m_aControlX[i].reset(m_xBuilder->weld_metric_spin_button("controlx" +
OString::number(i+1), FUNIT_CM));
+m_aControlGroupY[i].reset(m_xBuilder->weld_widget("controlgroupy" +
OString::number(i+1)));
+m_aControlY[i].reset(m_xBuilder->weld_metric_spin_button("controly" +
OString::number(i+1), FUNIT_CM));
}
// this page needs ExchangeSupport
@@ -448,30 +443,12 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source cui/uiconfig include/vcl
cui/source/inc/transfrm.hxx | 70 +++---
cui/source/tabpages/transfrm.cxx | 439 --
cui/uiconfig/ui/possizetabpage.ui | 145 +++-
include/vcl/customweld.hxx|1
4 files changed, 311 insertions(+), 344 deletions(-)
New commits:
commit 7ea2b86a7f82860be35bd1f7a4597d33cc82cef6
Author: Caolán McNamara
Date: Mon May 28 16:51:20 2018 +0100
weld SvxPositionSizeTabPage
Change-Id: Ic642d6ab2470a14b3a1d83284407fc690d5eba88
Reviewed-on: https://gerrit.libreoffice.org/54975
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 94fa4836de51..959cd6bd8f4d 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -74,32 +74,6 @@ class SvxPositionSizeTabPage : public SvxTabPage
static const sal_uInt16 pPosSizeRanges[];
private:
-// position
-VclPtrm_pFlPosition;
-VclPtr m_pMtrPosX;
-VclPtr m_pMtrPosY;
-VclPtr m_pCtlPos;
-
-// size
-VclPtrm_pFlSize;
-VclPtr m_pFtWidth;
-VclPtr m_pMtrWidth;
-VclPtr m_pFtHeight;
-VclPtr m_pMtrHeight;
-VclPtrm_pCbxScale;
-VclPtr m_pCtlSize;
-
-// protect
-VclPtrm_pFlProtect;
-VclPtr m_pTsbPosProtect;
-VclPtr m_pTsbSizeProtect;
-
-// adjust
-VclPtrm_pFlAdjust;
-VclPtr m_pTsbAutoGrowWidth;
-VclPtr m_pTsbAutoGrowHeight;
-
-private:
const SfxItemSet& mrOutAttrs;
const SdrView* mpView;
@@ -123,22 +97,48 @@ private:
double mfOldHeight;
RectPoint meRP;
+RectCtl m_aCtlPos;
+RectCtl m_aCtlSize;
-DECL_LINK( ChangePosProtectHdl, Button*, void );
-DECL_LINK( ChangeSizeProtectHdl, Button*, void );
+// position
+std::unique_ptr m_xFlPosition;
+std::unique_ptr m_xMtrPosX;
+std::unique_ptr m_xMtrPosY;
+std::unique_ptr m_xCtlPos;
+
+// size
+std::unique_ptr m_xFlSize;
+std::unique_ptr m_xFtWidth;
+std::unique_ptr m_xMtrWidth;
+std::unique_ptr m_xFtHeight;
+std::unique_ptr m_xMtrHeight;
+std::unique_ptr m_xCbxScale;
+std::unique_ptr m_xCtlSize;
+
+// protect
+std::unique_ptr m_xFlProtect;
+std::unique_ptr m_xTsbPosProtect;
+std::unique_ptr m_xTsbSizeProtect;
+
+// adjust
+std::unique_ptr m_xFlAdjust;
+std::unique_ptr m_xTsbAutoGrowWidth;
+std::unique_ptr m_xTsbAutoGrowHeight;
+
+DECL_LINK(ChangePosProtectHdl, weld::ToggleButton&, void);
+DECL_LINK(ChangeSizeProtectHdl, weld::ToggleButton&, void);
void SetMinMaxPosition();
void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange&
rRange);
-DECL_LINK( ChangeWidthHdl, Edit&, void );
-DECL_LINK( ChangeHeightHdl, Edit&, void );
-DECL_LINK( ClickSizeProtectHdl, Button*, void );
-DECL_LINK( ClickAutoHdl, Button*, void );
+DECL_LINK( ChangeWidthHdl, weld::MetricSpinButton&, void );
+DECL_LINK( ChangeHeightHdl, weld::MetricSpinButton&, void );
+DECL_LINK( ClickSizeProtectHdl, weld::ToggleButton&, void );
+DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
public:
-SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
);
+SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxPositionSizeTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pPosSizeRanges; }
@@ -149,8 +149,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( vcl::Window* pWindow, RectPoint eRP ) override;
void Construct();
void SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 570635d1737a..0e67b85261b9 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -804,8 +804,8 @@ void SvxSlantTabPage::PointChanged( weld::DrawingArea*,
RectPoint )
|* Dialog for changing position and size of graphic objects
|*
\/
-SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const
SfxItemSet& rInAttrs)
-: SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui",
rInAttrs)
+SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const
SfxItemSet&
