[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

2023-03-22 Thread Maxim Monastirsky (via logerrit) 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/scabstdlg.hxx   |5 
 sc/inc/styleuno.hxx|2 
 sc/inc/unonames.hxx|1 
 sc/source/ui/attrdlg/scdlgfact.cxx |7 
 sc/source/ui/attrdlg/scdlgfact.hxx |4 
 sc/source/ui/inc/styledlg.hxx  |   16 
 sc/source/ui/styleui/styledlg.cxx  |  102 +++
 sc/source/ui/unoobj/shapeuno.cxx   |   33 +
 sc/source/ui/view/tabvwsha.cxx |7 
 sc/uiconfig/scalc/ui/drawtemplatedialog.ui |  847 +
 11 files changed, 1023 insertions(+), 2 deletions(-)

New commits:
commit ca487e3f4c0f97c14bcff3a5372717d47f32ee94
Author: Maxim Monastirsky 
AuthorDate: Fri Mar 17 14:42:20 2023 +0200
Commit: Maxim Monastirsky 
CommitDate: Wed Mar 22 10:16:12 2023 +

sc drawstyles: Add a dialog for style editing

Change-Id: I7e62251024df8f24bd6fe318f5c0262bbd6a1a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149279
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 13a4b98a6c7c..d83aa96dbaa1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/deletecolumnentry \
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/descriptivestatisticsdialog \
+   sc/uiconfig/scalc/ui/drawtemplatedialog \
sc/uiconfig/scalc/ui/dropmenu \
sc/uiconfig/scalc/ui/doubledialog \
sc/uiconfig/scalc/ui/erroralerttabpage \
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9901d48bd610..1868964e9bd0 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -43,6 +43,7 @@ class ScTabViewShell;
 class ScConditionalFormat;
 class ScConditionalFormatList;
 class Date;
+class SdrView;
 enum class CreateNameFlags;
 enum class CellShiftDisabledFlags;
 
@@ -551,6 +552,10 @@ public:
   SfxStyleSheetBase&  
rStyleBase,
   bool bPage /*true : 
page, false: para*/) = 0;
 
+virtual VclPtr CreateScDrawStyleDlg(weld::Window* 
pParent,
+  
SfxStyleSheetBase& rStyleBase,
+  SdrView* pView) 
= 0;
+
 virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
  const SfxItemSet& 
rArgSet) = 0;
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 0eca6bafb8a7..d0db6f84505a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1328,6 +1328,13 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScStyleDlg(weld
 return 
VclPtr::Create(std::make_shared(pParent,
 rStyleBase, bPage));
 }
 
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScDrawStyleDlg(weld::Window* pParent,
+   
 SfxStyleSheetBase& rStyleBase,
+   
 SdrView* pView)
+{
+return 
VclPtr::Create(std::make_shared(pParent,
 rStyleBase, pView));
+}
+
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(weld::Window* pParent, const 
SfxItemSet& rArgSet)
 {
 return 
VclPtr::Create(std::make_shared(pParent,
 rArgSet));
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index e39428018287..855abeecf1c8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -791,6 +791,10 @@ public:
   SfxStyleSheetBase& 
rStyleBase,
   bool bPage) override;
 
+virtual VclPtr CreateScDrawStyleDlg(weld::Window* 
pParent,
+  
SfxStyleSheetBase& rStyleBase,
+  SdrView* pView) 
override;
+
 virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
  const SfxItemSet& 
rArgSet) override;
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index 2f43e04745a6..736849ef963d 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -22,6 +22,7 @@
 #include 
 
 class SfxStyleSheetBase;
+class SdrView;
 
 class ScStyleDlg : public SfxStyleDialogController
 {
@@ -38,4 +39,19 @@ private:
 bool m_bPage;
 };
 
+class ScDrawStyleDlg : public SfxStyleDialogController
+{
+public:
+ScDrawStyleDlg(weld::Window* pParent,
+   SfxStyleSheetBase& rStyleBase,

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

2016-10-05 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk |1 
 sc/inc/sc.hrc|7 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx |8 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc |   70 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |   27 -
 sc/source/ui/sidebar/CellAppearancePropertyPanel.src |  205 --
 sc/source/ui/sidebar/CellBorderStyleControl.cxx  |  225 +--
 sc/source/ui/sidebar/CellBorderStyleControl.hxx  |   10 
 sc/source/ui/sidebar/CellLineStyleControl.cxx|1 
 sc/uiconfig/scalc/ui/floatingborderstyle.ui  |  271 +++
 sc/uiconfig/scalc/ui/floatinglinestyle.ui|1 
 11 files changed, 361 insertions(+), 465 deletions(-)

New commits:
commit 768e132ed82cbe73cb4ec0152a421db699f740f3
Author: Caolán McNamara 
Date:   Wed Oct 5 13:24:49 2016 +0100

grab focus to border style popup

Change-Id: I8943f78721386efaeb5bc23fca612504e4c54431

diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx 
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index ac57705..a2d798b 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -156,8 +156,7 @@ IMPL_LINK(CellAppearancePropertyPanel, 
TbxCellBorderSelectHdl, ToolBox*, pToolBo
 {
 if (!mxCellBorderStylePopup)
 mxCellBorderStylePopup = 
VclPtr::Create(GetBindings()->GetDispatcher());
-mxCellBorderStylePopup->StartPopupMode(pToolBox, 
FloatWinPopupFlags::Down |
- 
FloatWinPopupFlags::NoAppFocusClose);
+mxCellBorderStylePopup->StartPopupMode(pToolBox, 
FloatWinPopupFlags::GrabFocus);
 }
 }
 
commit 5227af2e4580e478eb92eaab8a42fc188c0fddbb
Author: Caolán McNamara 
Date:   Wed Oct 5 12:39:08 2016 +0100

convert border style to .ui

and merge CellBorderStylePopup and CellBorderStyleControl

Change-Id: I96ca2784f2055e8d99380b4d4bcd1374c9c40f4e

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 41555ec..b8e8c9c5 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/formulacalculationoptions \
+   sc/uiconfig/scalc/ui/floatingborderstyle \
sc/uiconfig/scalc/ui/floatinglinestyle \
sc/uiconfig/scalc/ui/goalseekdlg \
sc/uiconfig/scalc/ui/groupdialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 048111c..693d1fe 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1088,12 +1088,9 @@
 
 #define RID_SCDLG_COND_FORMAT_MANAGER   (SC_DIALOGS_START + 159)
 
-// defines for CellAppearancePropertyPanel
-#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 163)
+#define WID_CONDFRMT_REF(SC_DIALOGS_START + 163)
 
-#define WID_CONDFRMT_REF(SC_DIALOGS_START + 164)
-
-#define SC_DIALOGS_END  
(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE + 1)
+#define SC_DIALOGS_END  (WID_CONDFRMT_REF + 1)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx 
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 0915add..ac57705 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include "CellAppearancePropertyPanel.hxx"
-#include 
 #include "sc.hrc"
 #include "scresid.hxx"
 #include 
@@ -91,10 +90,8 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
 mbInnerBorder(false),
 mbTLBR(false),
 mbBLTR(false),
-
 mxCellLineStylePopup(),
 mxCellBorderStylePopup(),
-
 maContext(),
 mpBindings(pBindings)
 {
@@ -158,7 +155,7 @@ IMPL_LINK(CellAppearancePropertyPanel, 
TbxCellBorderSelectHdl, ToolBox*, pToolBo
 if (aCommand == UNO_SETBORDERSTYLE)
 {
 if (!mxCellBorderStylePopup)
-mxCellBorderStylePopup = 
VclPtr::Create(pToolBox, GetBindings()->GetDispatcher());
+mxCellBorderStylePopup = 
VclPtr::Create(GetBindings()->GetDispatcher());
 mxCellBorderStylePopup->StartPopupMode(pToolBox, 
FloatWinPopupFlags::Down |
  
FloatWinPopupFlags::NoAppFocusClose);
 }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc 
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
deleted file mode 100644
index aece513..000
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

2013-12-30 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk |1 
 sc/inc/sc.hrc|1 
 sc/source/ui/inc/retypepassdlg.hrc   |8 
 sc/source/ui/inc/retypepassdlg.hxx   |   22 +-
 sc/source/ui/miscdlgs/retypepassdlg.cxx  |   92 --
 sc/source/ui/miscdlgs/retypepassdlg.src  |   91 --
 sc/source/ui/view/tabvwshh.cxx   |6 
 sc/uiconfig/scalc/ui/retypepassworddialog.ui |  233 +++
 8 files changed, 285 insertions(+), 169 deletions(-)

New commits:
commit 131a01e0beac937b9b7f1b2beb9b61e5b0f2a4aa
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 30 20:16:03 2013 +

convert retype password input dialog to .ui

Change-Id: I97940629f93a5a1948a8771b9d9668bc28c49a91

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 7ab5ca2..bd785c9 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/queryrunstreamscriptdialog \
sc/uiconfig/scalc/ui/randomnumbergenerator \
+   sc/uiconfig/scalc/ui/retypepassworddialog \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
sc/uiconfig/scalc/ui/rowheightdialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 1f38832..695bce6 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1096,7 +1096,6 @@
 #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
 #define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148)
 #define RID_SCDLG_RETYPEPASS(SC_DIALOGS_START + 150)
-#define RID_SCDLG_RETYPEPASS_INPUT  (SC_DIALOGS_START + 151)
 
 #define RID_POPUP_FILTER(SC_DIALOGS_START + 153)
 #define RID_COND_ENTRY  (SC_DIALOGS_START + 156)
diff --git a/sc/source/ui/inc/retypepassdlg.hrc 
b/sc/source/ui/inc/retypepassdlg.hrc
index 2684a30..09c88ec 100644
--- a/sc/source/ui/inc/retypepassdlg.hrc
+++ b/sc/source/ui/inc/retypepassdlg.hrc
@@ -54,12 +54,4 @@
 #define STR_HASH_GOOD   203
 #define STR_HASH_REGENERATED204
 
-#define FT_PASSWORD1301
-#define ED_PASSWORD1302
-#define FT_PASSWORD2303
-#define ED_PASSWORD2304
-#define BTN_MATCH_OLD_PASSWORD  305
-#define BTN_RETYPE_PASSWORD 306
-#define BTN_REMOVE_PASSWORD 307
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/retypepassdlg.hxx 
b/sc/source/ui/inc/retypepassdlg.hxx
index efb0872..90c4863 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -20,10 +20,11 @@
 #ifndef SC_UI_RETYPEPASS_DLG_HXX
 #define SC_UI_RETYPEPASS_DLG_HXX
 
-#include vcl/dialog.hxx
 #include vcl/button.hxx
-#include vcl/fixed.hxx
+#include vcl/dialog.hxx
 #include vcl/edit.hxx
+#include vcl/fixed.hxx
+#include vcl/layout.hxx
 #include vcl/scrbar.hxx
 #include svx/checklbx.hxx
 #include svtools/stdctrl.hxx
@@ -140,20 +141,17 @@ private:
 void CheckPasswordInput();
 
 private:
-OKButtonmaBtnOk;
-CancelButtonmaBtnCancel;
-HelpButton  maBtnHelp;
+OKButton*   m_pBtnOk;
 
-RadioButton maBtnRetypePassword;
+RadioButton*m_pBtnRetypePassword;
 
-FixedText   maPassword1Text;
-EditmaPassword1Edit;
-FixedText   maPassword2Text;
-EditmaPassword2Edit;
+VclContainer*   m_pPasswordGrid;
+Edit*   m_pPassword1Edit;
+Edit*   m_pPassword2Edit;
 
-CheckBoxmaBtnMatchOldPass;
+CheckBox*   m_pBtnMatchOldPass;
 
-RadioButton maBtnRemovePassword;
+RadioButton*m_pBtnRemovePassword;
 
 DECL_LINK( OKHdl, void* );
 DECL_LINK( RadioBtnHdl, RadioButton* );
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx 
b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 7abf7e9..478b7f7 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -393,25 +393,19 @@ IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl)
 
 // 
 
-ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, 
ScPassHashProtectable* pProtected) :
-ModalDialog(pParent, ScResId(RID_SCDLG_RETYPEPASS_INPUT)),
-
-maBtnOk (this, ScResId(BTN_OK)),
-maBtnCancel (this, ScResId(BTN_CANCEL)),
-maBtnHelp   (this, ScResId(BTN_HELP)),
-
-maBtnRetypePassword(this, ScResId(BTN_RETYPE_PASSWORD)),
-
-maPassword1Text (this, ScResId(FT_PASSWORD1)),
-maPassword1Edit (this, ScResId(ED_PASSWORD1)),
-maPassword2Text (this, ScResId(FT_PASSWORD2)),
-maPassword2Edit (this, ScResId(ED_PASSWORD2)),
-maBtnMatchOldPass(this, ScResId(BTN_MATCH_OLD_PASSWORD)),
-
-maBtnRemovePassword(this, ScResId(BTN_REMOVE_PASSWORD)),
-
-mpProtected(pProtected)

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

2013-10-24 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk|1 
 sc/inc/helpids.h|1 
 sc/inc/sc.hrc   |1 
 sc/source/ui/app/inputhdl.cxx   |2 
 sc/source/ui/inc/solveroptions.hxx  |   13 +--
 sc/source/ui/miscdlgs/solveroptions.cxx |   19 ++---
 sc/source/ui/src/solveroptions.src  |   50 --
 sc/uiconfig/scalc/ui/integerdialog.ui   |  113 
 8 files changed, 128 insertions(+), 72 deletions(-)

New commits:
commit 8755bef6dd4145f2eac8c18a4a7eb58c52b83d47
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 24 12:46:27 2013 +0100

convert SolverInteger dialog to .ui

Change-Id: Iec4b0d041ec0389630d21572d6c5658639d85b17

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 2bbaf3a..29893fe 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/insertcells \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
+   sc/uiconfig/scalc/ui/integerdialog \
sc/uiconfig/scalc/ui/leftfooterdialog \
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index b7856b2..126eba6 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -170,7 +170,6 @@
 
 #define HID_SC_SOLVEROPTIONS
SC_HID_SC_SOLVEROPTIONS
 #define HID_SC_SOLVEROPTIONS_LB 
SC_HID_SC_SOLVEROPTIONS_LB
-#define HID_SC_SOLVER_INTEGER   
SC_HID_SC_SOLVER_INTEGER
 #define HID_SC_SOLVER_DOUBLE
SC_HID_SC_SOLVER_DOUBLE
 #define HID_SC_SOLVER_PROGRESS  
SC_HID_SC_SOLVER_PROGRESS
 #define HID_SC_SOLVER_NOSOLUTION
SC_HID_SC_SOLVER_NOSOLUTION
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7e945b6..a8ad8eb 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1090,7 +1090,6 @@
 #define RID_SCDLG_DPSHOWDETAIL  (SC_DIALOGS_START + 137)
 
 #define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139)
-#define RID_SCDLG_SOLVER_INTEGER(SC_DIALOGS_START + 140)
 #define RID_SCDLG_SOLVER_DOUBLE (SC_DIALOGS_START + 141)
 #define RID_SCDLG_SOLVER_PROGRESS   (SC_DIALOGS_START + 142)
 #define RID_SCDLG_SOLVER_NOSOLUTION (SC_DIALOGS_START + 143)
diff --git a/sc/source/ui/inc/solveroptions.hxx 
b/sc/source/ui/inc/solveroptions.hxx
index b632b47..9dbde59 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -20,12 +20,12 @@
 #ifndef SC_SOLVEROPTIONS_HXX
 #define SC_SOLVEROPTIONS_HXX
 
-#include vcl/dialog.hxx
-
 #include vcl/button.hxx
+#include vcl/dialog.hxx
+#include vcl/field.hxx
 #include vcl/fixed.hxx
+#include vcl/layout.hxx
 #include vcl/lstbox.hxx
-#include vcl/field.hxx
 #include svx/checklbx.hxx
 #include com/sun/star/uno/Sequence.hxx
 
@@ -77,11 +77,8 @@ public:
 
 class ScSolverIntegerDialog : public ModalDialog
 {
-FixedText   maFtName;
-NumericFieldmaNfValue;
-FixedLine   maFlButtons;
-OKButtonmaBtnOk;
-CancelButtonmaBtnCancel;
+VclFrame* m_pFrame;
+NumericField* m_pNfValue;
 
 public:
 ScSolverIntegerDialog( Window * pParent );
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx 
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 6488c7b..479f3a4 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -401,15 +401,12 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl)
 
 //--
 
-ScSolverIntegerDialog::ScSolverIntegerDialog( Window * pParent )
-: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVER_INTEGER ) ),
-maFtName( this, ScResId( FT_OPTIONNAME ) ),
-maNfValue   ( this, ScResId( NF_VALUE ) ),
-maFlButtons ( this, ScResId( FL_BUTTONS ) ),
-maBtnOk ( this, ScResId( BTN_OK ) ),
-maBtnCancel ( this, ScResId( BTN_CANCEL ) )
+ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent)
+: ModalDialog( pParent, IntegerDialog,
+modules/scalc/ui/integerdialog.ui )
 {
-FreeResource();
+get(m_pFrame, frame);
+get(m_pNfValue, value);
 }
 
 ScSolverIntegerDialog::~ScSolverIntegerDialog()
@@ -418,17 +415,17 @@ ScSolverIntegerDialog::~ScSolverIntegerDialog()
 
 void ScSolverIntegerDialog::SetOptionName( const OUString rName )
 {
-maFtName.SetText( rName );
+m_pFrame-set_label(rName);
 }
 
 void ScSolverIntegerDialog::SetValue( sal_Int32 nValue )
 {
-maNfValue.SetValue( nValue );
+m_pNfValue-SetValue( nValue );
 }
 
 sal_Int32 ScSolverIntegerDialog::GetValue() const
 {
-sal_Int64 nValue = maNfValue.GetValue();
+sal_Int64 nValue = m_pNfValue-GetValue();
 if ( nValue

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk unodevtools/Executable_skeletonmaker.mk unodevtools/source

2013-04-11 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk|1 
 sc/inc/sc.hrc   |2 
 sc/inc/scabstdlg.hxx|2 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   22 
 sc/source/ui/attrdlg/scdlgfact.hxx  |3 
 sc/source/ui/inc/delcldlg.hxx   |   16 
 sc/source/ui/inc/miscdlgs.hrc   |9 
 sc/source/ui/miscdlgs/delcldlg.cxx  |   51 -
 sc/source/ui/src/miscdlgs.src   |   68 --
 sc/source/ui/view/cellsh1.cxx   |4 
 sc/uiconfig/scalc/ui/deletecells.ui |   51 -
 unodevtools/Executable_skeletonmaker.mk |1 
 unodevtools/source/unodevtools/typeblob.cxx |  797 
 13 files changed, 61 insertions(+), 966 deletions(-)

New commits:
commit 569ef418f5b0ff2d9e2246f2a16d7d7f090ce4d0
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Apr 11 13:32:24 2013 +0100

adapt code for delete cells dialog

Change-Id: Ibf587e1ea94765f0322a5b847bcf82d1eabc1b64

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 3ff8973..8f800bf 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/definename \
+   sc/uiconfig/scalc/ui/deletecells \
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/insertname \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 9d85a5a..4749970 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -951,7 +951,7 @@
 
 #define RID_SCDLG_FILTER(SC_DIALOGS_START + 8)
 #define RID_SCDLG_SPEC_FILTER   (SC_DIALOGS_START + 9)
-#define RID_SCDLG_DELCELL   (SC_DIALOGS_START + 11)
+
 #define RID_SCDLG_INSCELL   (SC_DIALOGS_START + 12)
 
 #define RID_SCDLG_INSCONT   (SC_DIALOGS_START + 14)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 7b6c602..89997d4 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -358,7 +358,7 @@ public:
 const 
com::sun::star::uno::SequenceOUString rServices,
 int 
nId ) = 0;
 
-virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, 
int nId, sal_Bool bDisallowCellMove = false ) = 0 ; //add for ScDeleteCellDlg
+virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, 
bool bDisallowCellMove = false) = 0 ; //add for ScDeleteCellDlg
 
 //for dataform
 virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int 
nId, ScTabViewShell*  pTabViewShell ) = 0 ; //add for ScDataFormDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index b6ce1f8..98b656f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -832,27 +832,13 @@ AbstractScDataPilotServiceDlg* 
ScAbstractDialogFactory_Impl::CreateScDataPilotSe
 // add for ScDataPilotServiceDlg end
 
 
-AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( 
Window* pParent, int nId,
- 
sal_Bool bDisallowCellMove )
+AbstractScDeleteCellDlg* 
ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(Window* pParent,
+bool bDisallowCellMove)
 {
-ScDeleteCellDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_DELCELL :
-pDlg = new ScDeleteCellDlg( pParent, bDisallowCellMove );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScDeleteCellDlg_Impl( pDlg );
-return 0;
+ScDeleteCellDlg * pDlg = new ScDeleteCellDlg(pParent, bDisallowCellMove);
+return new AbstractScDeleteCellDlg_Impl( pDlg );
 }
 
-
-
-
 AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( 
Window* pParent, int nId, ScTabViewShell* pTabViewShell )
 {
 ScDataFormDlg * pDlg=NULL;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 823eaeb..3383616 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -424,8 +424,7 @@ public:
 virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( 
Window* pParent, //add for ScDataPilotServiceDlg
 const 
com::sun::star::uno::SequenceOUString rServices,
 int 
nId );
-virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, 
int nId,
-sal_Bool 
bDisallowCellMove = false ); //add for ScDeleteCellDlg
+virtual AbstractScDeleteCellDlg *