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

2023-07-25 Thread Laurent Balland (via logerrit) 
 sc/inc/filter.hxx |6 ++-
 sc/inc/scabstdlg.hxx  |1 
 sc/source/filter/html/htmlimp.cxx |9 +++--
 sc/source/filter/inc/eeimport.hxx |3 +
 sc/source/filter/inc/ftools.hxx   |2 -
 sc/source/filter/inc/htmlimp.hxx  |3 +
 sc/source/filter/rtf/eeimpars.cxx |7 +++-
 sc/source/ui/attrdlg/scdlgfact.cxx|5 +++
 sc/source/ui/attrdlg/scdlgfact.hxx|1 
 sc/source/ui/dbgui/textimportoptions.cxx  |   36 +++---
 sc/source/ui/docshell/docsh.cxx   |9 +++--
 sc/source/ui/docshell/impex.cxx   |3 +
 sc/source/ui/inc/textimportoptions.hxx|8 +++--
 sc/source/ui/unoobj/filtuno.cxx   |2 +
 sc/source/ui/view/viewfun5.cxx|4 ++
 sc/uiconfig/scalc/ui/textimportoptions.ui |   47 --
 16 files changed, 114 insertions(+), 32 deletions(-)

New commits:
commit 5ae709d8519dd6d0de265d516c6158ccbdf4882e
Author: Laurent Balland 
AuthorDate: Sun Jun 4 19:03:16 2023 +0200
Commit: Laurent Balland 
CommitDate: Tue Jul 25 21:44:36 2023 +0200

follow tdf#154131 Treat also HMTL import

Add Detect numbers in scientific notation option to HTML paste
Still need some qa tests

Change-Id: I553404a01ab2a61566b861b3c01d14bdc0c46668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152591
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 7a71b89c503e..6bceb74b69d0 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -50,7 +50,8 @@ class ScEEAbsImport {
 virtual ScRange GetRange() = 0;
 virtual voidWriteToDocument(
 bool bSizeColsRows = false, double nOutputFactor = 1.0,
-SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) = 
0;
+SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true,
+bool bConvertScientific = true ) = 0;
 };
 
 class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
@@ -67,7 +68,8 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
  const rtl_TextEncoding eSrc ) = 0;
 virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, 
ScDocument*, ScRange& rRange ) = 0;
 virtual ErrCode ScImportHTML( SvStream&, const OUString& rBaseURL, 
ScDocument*, ScRange& rRange, double nOutputFactor,
-   bool bCalcWidthHeight, SvNumberFormatter* 
pFormatter, bool bConvertDate ) = 0;
+   bool bCalcWidthHeight, SvNumberFormatter* 
pFormatter, bool bConvertDate,
+   bool bConvertScientific ) = 0;
 
 // various import helpers
 virtual std::unique_ptr CreateRTFImport( ScDocument* pDoc, 
const ScRange& rRange ) = 0;
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index a06a435e7d5e..7a94af5f6fe9 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -394,6 +394,7 @@ protected:
 public:
 virtual LanguageType GetLanguageType() const = 0;
 virtual bool IsDateConversionSet() const = 0;
+virtual bool IsScientificConversionSet() const = 0;
 virtual bool IsKeepAskingSet() const = 0;
 };
 
diff --git a/sc/source/filter/html/htmlimp.cxx 
b/sc/source/filter/html/htmlimp.cxx
index 12e98a9ef018..3168a02fc4eb 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -45,13 +45,13 @@
 
 ErrCode ScFormatFilterPluginImpl::ScImportHTML( SvStream , const 
OUString& rBaseURL, ScDocument *pDoc,
 ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, 
SvNumberFormatter* pFormatter,
-bool bConvertDate )
+bool bConvertDate, bool bConvertScientific )
 {
 ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
 ErrCode nErr = aImp.Read( rStream, rBaseURL );
 ScRange aR = aImp.GetRange();
 rRange.aEnd = aR.aEnd;
-aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate );
+aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate, 
bConvertScientific );
 return nErr;
 }
 
@@ -112,9 +112,10 @@ void ScHTMLImport::InsertRangeName( ScDocument& rDoc, 
const OUString& rName, con
 }
 
 void ScHTMLImport::WriteToDocument(
-bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, 
bool bConvertDate )
+bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, 
bool bConvertDate,
+bool bConvertScientific )
 {
-ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, 
bConvertDate );
+ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, 
bConvertDate, bConvertScientific );
 
 const ScHTMLParser* pParser = static_cast(mpParser.get());
 const ScHTMLTable* pGlobTable = pParser->GetGlobalTable();
diff --git a/sc/source/filter/inc/eeimport.hxx 
b/sc/source/filter/inc/eeimport.hxx
index d4ddc31f40c2..0d0466eb8909 100644
---

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

2023-05-05 Thread Bartosz Kosiorek (via logerrit) 
 sc/inc/strings.hrc |3 
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx |   32 
+++---
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui  |1 
 3 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 793cc7d2ef5967af90a6810e597e1e12bd42777c
Author: Bartosz Kosiorek 
AuthorDate: Fri May 5 20:15:19 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat May 6 03:54:25 2023 +0200

tdf#154872 Add Poisson distribution to Random Number Generators

Change-Id: I325a76423a98a405dfb0f69fbd89eb9253c36390
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151439
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index e860263424be..6c85b3d617da 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -266,9 +266,10 @@
 #define STR_DISTRIBUTION_CAUCHY 
NC_("STR_DISTRIBUTION_CAUCHY", "Cauchy")
 #define STR_DISTRIBUTION_BERNOULLI  
NC_("STR_DISTRIBUTION_BERNOULLI", "Bernoulli")
 #define STR_DISTRIBUTION_BINOMIAL   
NC_("STR_DISTRIBUTION_BINOMIAL", "Binomial")
-#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL  
NC_("STR_DISTRIBUTION_NEGATIVE_BINOMIAL", "Negative Binomial")
 #define STR_DISTRIBUTION_CHI_SQUARED
NC_("STR_DISTRIBUTION_CHI_SQUARED", "Chi Squared")
 #define STR_DISTRIBUTION_GEOMETRIC  
NC_("STR_DISTRIBUTION_GEOMETRIC", "Geometric")
+#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL  
NC_("STR_DISTRIBUTION_NEGATIVE_BINOMIAL", "Negative Binomial")
+#define STR_DISTRIBUTION_POISSON
NC_("STR_DISTRIBUTION_POISSON", "Poisson")
 #define STR_RNG_PARAMETER_MINIMUM   
NC_("STR_RNG_PARAMETER_MINIMUM", "Minimum")
 #define STR_RNG_PARAMETER_MAXIMUM   
NC_("STR_RNG_PARAMETER_MAXIMUM", "Maximum")
 #define STR_RNG_PARAMETER_MEAN  
NC_("STR_RNG_PARAMETER_MEAN", "Mean")
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx 
b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 91b43cbe0433..2490ebf47301 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -36,6 +36,7 @@ const sal_Int64 DIST_CHI_SQUARED = 5;
 const sal_Int64 DIST_GEOMETRIC   = 6;
 const sal_Int64 DIST_NEGATIVE_BINOMIAL   = 7;
 const sal_Int64 DIST_UNIFORM_INTEGER = 8;
+const sal_Int64 DIST_POISSON = 9;
 
 const sal_Int64 PRECISION   = 1;
 const sal_Int64 DIGITS  = 4;
@@ -225,13 +226,6 @@ void 
ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
 GenerateNumbers(rng, STR_DISTRIBUTION_BINOMIAL, aDecimalPlaces);
 break;
 }
-case DIST_NEGATIVE_BINOMIAL:
-{
-std::negative_binomial_distribution<> 
distribution(parameterInteger2, parameter1);
-auto rng = std::bind(distribution, seed);
-GenerateNumbers(rng, STR_DISTRIBUTION_NEGATIVE_BINOMIAL, 
aDecimalPlaces);
-break;
-}
 case DIST_CHI_SQUARED:
 {
 std::chi_squared_distribution<> distribution(parameter1);
@@ -246,6 +240,20 @@ void 
ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
 GenerateNumbers(rng, STR_DISTRIBUTION_GEOMETRIC, aDecimalPlaces);
 break;
 }
+case DIST_NEGATIVE_BINOMIAL:
+{
+std::negative_binomial_distribution<> 
distribution(parameterInteger2, parameter1);
+auto rng = std::bind(distribution, seed);
+GenerateNumbers(rng, STR_DISTRIBUTION_NEGATIVE_BINOMIAL, 
aDecimalPlaces);
+break;
+}
+case DIST_POISSON:
+{
+std::poisson_distribution<> distribution(parameter1);
+auto rng = std::bind(distribution, seed);
+GenerateNumbers(rng, STR_DISTRIBUTION_POISSON, aDecimalPlaces);
+break;
+}
 }
 }
 
@@ -476,6 +484,16 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, 
DistributionChanged, weld::ComboB
 mxParameter2Value->hide();
 break;
 }
+case DIST_POISSON:
+{
+mxParameter1Text->set_label(ScResId(STR_RNG_PARAMETER_MEAN));
+mxParameter1Value->set_value(PRECISION);
+mxParameter1Value->set_increments(1000, 1);
+mxParameter1Value->set_min(1000);
+mxParameter2Text->hide();
+mxParameter2Value->hide();
+break;
+}
 }
 }
 
diff --git a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui 
b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
index e6f8f93ba214..d9481046bd8f 100644
--- a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
+++ b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
@@ -240,6 +240,7 @@
   Chi Squared

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

2023-04-04 Thread Heiko Tietze (via logerrit) 
 sc/inc/viewopti.hxx|4 -
 sc/source/core/tool/viewopti.cxx   |4 +
 sc/source/ui/inc/tpview.hxx|2 
 sc/source/ui/optdlg/tpview.cxx |   34 
 sc/source/ui/view/viewdata.cxx |   17 
 sc/uiconfig/scalc/ui/tpviewpage.ui |   75 +
 6 files changed, 15 insertions(+), 121 deletions(-)

New commits:
commit 2039fd382af9d110bd68be8629ab757b3617926a
Author: Heiko Tietze 
AuthorDate: Wed Mar 29 15:12:58 2023 +0200
Commit: Heiko Tietze 
CommitDate: Tue Apr 4 10:53:56 2023 +0200

Resolves tdf#154446 - Remove redundant option for grid line color

Change-Id: I41d39b763e651f90660f2a451ed0a9b473ead206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149715
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index cd641198753b..b90e1b65f076 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -59,10 +59,6 @@ enum ScVObjType
 #define MAX_OPT sal_uInt16(VOPT_CLIPMARKS)+1
 #define MAX_TYPEsal_uInt16(VOBJ_TYPE_DRAW)+1
 
-// SC_STD_GRIDCOLOR is obsolete since tdf#152184 since GridColor == COL_AUTO
-// converts now to either light or dark but still used on options > view > 
visual aids
-#define SC_STD_GRIDCOLORCOL_LIGHTGRAY
-
 // SvxGrid options with standard operators
 
 class ScGridOptions : public SvxOptionsGrid
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 6079323f13e7..f243289653cd 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -22,6 +22,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -111,7 +113,7 @@ void ScViewOptions::SetDefaults()
 aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
 aModeArr[VOBJ_TYPE_DRAW ] = VOBJ_MODE_SHOW;
 
-aGridCol = SC_STD_GRIDCOLOR;
+aGridCol = svtools::ColorConfig().GetColorValue( svtools::CALCGRID 
).nColor;
 
 aGridOpt.SetDefaults();
 }
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 7be90de5aceb..ad485b361580 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -29,8 +29,6 @@ class ScTpContentOptions : public SfxTabPage
 std::unique_ptr m_xLocalOptions;
 
 std::unique_ptr m_xGridLB;
-std::unique_ptr m_xColorFT;
-std::unique_ptr m_xColorLB;
 std::unique_ptr m_xBreakCB;
 std::unique_ptr m_xGuideLineCB;
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 926436864e79..f83ce9f033a5 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -30,15 +30,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet&  rArgSet)
 : SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui", 
"TpViewPage", )
 , m_xGridLB(m_xBuilder->weld_combo_box("grid"))
-, m_xColorFT(m_xBuilder->weld_label("color_label"))
-, m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"),
-[this]{ return GetDialogController()->getDialog(); }))
 , m_xBreakCB(m_xBuilder->weld_check_button("break"))
 , m_xGuideLineCB(m_xBuilder->weld_check_button("guideline"))
 , m_xFormulaCB(m_xBuilder->weld_check_button("formula"))
@@ -88,14 +84,10 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* 
pPage, weld::DialogContr
 m_xRowColHeaderCB->connect_toggled(aCBHdl);
 m_xSummaryCB->connect_toggled(aCBHdl);
 m_xThemedCursorRB->connect_toggled(aCBHdl);
-
-m_xColorLB->SetSlotId(SID_ATTR_CHAR_COLOR);
-m_xColorLB->SetAutoDisplayColor(SC_STD_GRIDCOLOR);
 }
 
 ScTpContentOptions::~ScTpContentOptions()
 {
-m_xColorLB.reset();
 }
 
 std::unique_ptr ScTpContentOptions::Create( weld::Container* 
pPage, weld::DialogController* pController,
@@ -123,19 +115,11 @@ boolScTpContentOptions::FillItemSet( SfxItemSet* 
rCoreSet )
 m_xVScrollCB->get_state_changed_from_saved() ||
 m_xTblRegCB->get_state_changed_from_saved() ||
 m_xOutlineCB->get_state_changed_from_saved() ||
-m_xColorLB->IsValueChangedFromSaved() ||
 m_xBreakCB->get_state_changed_from_saved() ||
 m_xSummaryCB->get_state_changed_from_saved() ||
 m_xThemedCursorRB->get_state_changed_from_saved() ||
 m_xGuideLineCB->get_state_changed_from_saved())
 {
-NamedColor aNamedColor = m_xColorLB->GetSelectedEntry();
-if (aNamedColor.first == COL_AUTO)
-{
-aNamedColor.first = SC_STD_GRIDCOLOR;
-aNamedColor.second.clear();
-}
-m_xLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second);
 rCoreSet->Put(ScTpViewItem(*m_xLocalOptions));
 bRet = true;
 }
@@ -211,7 +195,6 @@ voidScTpContentOptions::Reset( const SfxItemSet* 
rCoreSet )

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

2023-03-08 Thread Grigory A. Mozhaev (via logerrit) 
 sc/inc/ViewSettingsSequenceDefines.hxx |   31 +++---
 sc/inc/unonames.hxx|1 
 sc/inc/viewopti.hxx|1 
 sc/source/core/tool/viewopti.cxx   |   21 ++---
 sc/source/ui/inc/output.hxx|1 
 sc/source/ui/inc/tpview.hxx|1 
 sc/source/ui/optdlg/tpview.cxx |6 ++
 sc/source/ui/unoobj/confuno.cxx|5 ++
 sc/source/ui/unoobj/viewuno.cxx|4 +
 sc/source/ui/view/gridwin4.cxx |3 +
 sc/source/ui/view/gridwin5.cxx |   25 +++
 sc/source/ui/view/output.cxx   |   72 +
 sc/source/ui/view/viewdata.cxx |4 +
 sc/uiconfig/scalc/ui/tpviewpage.ui |   22 --
 14 files changed, 172 insertions(+), 25 deletions(-)

New commits:
commit 3fcf9f864f9d12fdb0ade4741127c81cec74378a
Author: Grigory A. Mozhaev 
AuthorDate: Mon Feb 27 16:03:39 2023 +0300
Commit: Heiko Tietze 
CommitDate: Wed Mar 8 10:51:42 2023 +

tdf#97551 Added marker and hint for formula to Calc

Added option "Formula indicator and hint" to LibreOffice Calc > View 
section (near to "Comment indicator"). This option turned off by default to 
avoid interfere existing UX.

Indicator displays in the bottom-left corner as blue triangle marker if 
cells contains formula (correctly reacts on cells merging and different sizing).

Hint displays when user hover cursor over the cell that contains the 
formula (uses already built-in mechanics for help tooltip).

More details about request and discussion of the feature in Bugzilla.

Change-Id: I8f3e368d4fdad362b819b4ce2fd6b0c32b5c1c0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147914
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx 
b/sc/inc/ViewSettingsSequenceDefines.hxx
index f22c4df5e05b..501a87cc1854 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -36,21 +36,22 @@
 #define SC_PAGE_BREAK_PREVIEW   7
 #define SC_SHOWZERO 8
 #define SC_SHOWNOTES9
-#define SC_SHOWGRID 10
-#define SC_GRIDCOLOR11
-#define SC_SHOWPAGEBR   12
-#define SC_COLROWHDR13
-#define SC_SHEETTABS14
-#define SC_OUTLSYMB 15
-#define SC_VALUE_HIGHLIGHTING   16
-#define SC_SNAPTORASTER 17
-#define SC_RASTERVIS18
-#define SC_RASTERRESX   19
-#define SC_RASTERRESY   20
-#define SC_RASTERSUBX   21
-#define SC_RASTERSUBY   22
-#define SC_RASTERSYNC   23
-#define SC_FORMULA_BAR_HEIGHT   24
+#define SC_SHOWFORMULASMARKS10
+#define SC_SHOWGRID 11
+#define SC_GRIDCOLOR12
+#define SC_SHOWPAGEBR   13
+#define SC_COLROWHDR14
+#define SC_SHEETTABS15
+#define SC_OUTLSYMB 16
+#define SC_VALUE_HIGHLIGHTING   17
+#define SC_SNAPTORASTER 18
+#define SC_RASTERVIS19
+#define SC_RASTERRESX   20
+#define SC_RASTERRESY   21
+#define SC_RASTERSUBX   22
+#define SC_RASTERSUBY   23
+#define SC_RASTERSYNC   24
+#define SC_FORMULA_BAR_HEIGHT   25
 
 // this are the defines for the position of the settings in the
 // TableViewSettingsSequence
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index bdd37e666871..abb09c334c10 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -550,6 +550,7 @@ inline constexpr OUStringLiteral SC_UNO_SHOWFORM
 = u"ShowFormulas";
 inline constexpr OUStringLiteral SC_UNO_SHOWGRID = u"ShowGrid";
 inline constexpr OUStringLiteral SC_UNO_SHOWHELP = 
u"ShowHelpLines";
 inline constexpr OUStringLiteral SC_UNO_SHOWNOTES= u"ShowNotes";
+inline constexpr OUStringLiteral SC_UNO_SHOWFORMULASMARKS= 
u"ShowFormulasMarks";
 inline constexpr OUStringLiteral SC_UNO_SHOWOBJ  = u"ShowObjects";
 inline constexpr OUStringLiteral SC_UNO_SHOWPAGEBR   = 
u"ShowPageBreaks";
 inline constexpr OUStringLiteral SC_UNO_SHOWZERO = 
u"ShowZeroValues";
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 79819e7ca324..b5a15f016e1b 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -33,6 +33,7 @@ enum ScViewOption
 VOPT_NULLVALS,
 VOPT_SYNTAX,
 VOPT_NOTES,
+VOPT_FORMULAS_MARKS,
 VOPT_VSCROLL,
 VOPT_HSCROLL,
 VOPT_TABCONTROLS,
diff --git

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

2022-01-26 Thread Caolán McNamara (via logerrit) 
 sc/inc/strings.hrc  |1 -
 sc/source/ui/view/viewfunc.cxx  |1 -
 sc/uiconfig/scalc/ui/warnautocorrect.ui |2 ++
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7600afa82505ba4f5b78800aa95855d01bb766fc
Author: Caolán McNamara 
AuthorDate: Tue Jan 25 16:08:51 2022 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 26 10:54:03 2022 +0100

split two paragraph warning into primary and secondary messages

Change-Id: Ie3bd9205a549ac55a0e5c7b9a444928b0fd80174
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128935
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 81908559a230..9a461a40d4ff 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -83,7 +83,6 @@
 #define SCSTR_COLUMN_USER   NC_("SCSTR_COLUMN_USER", 
"Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide")
 #define SCSTR_FIELDSEP_TAB  NC_("SCSTR_FIELDSEP_TAB", 
"Tab")
 #define SCSTR_FIELDSEP_SPACE
NC_("SCSTR_FIELDSEP_SPACE", "space")
-#define SCSTR_FORMULA_AUTOCORRECTION
NC_("SCSTR_FORMULA_AUTOCORRECTION", "%PRODUCTNAME Calc found an error in the 
formula entered.\nDo you want to accept the correction proposed below?\n\n")
 #define SCSTR_UNDO_GRAFFILTER   
NC_("SCSTR_UNDO_GRAFFILTER", "Image Filter")
 #define STR_CAPTION_DEFAULT_TEXT
NC_("STR_CAPTION_DEFAULT_TEXT", "Text")
 // Select tables dialog title
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ecaa0a2cdf8a..8d444122a7ed 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -348,7 +348,6 @@ namespace
 : weld::MessageDialogController(pParent, 
"modules/scalc/ui/warnautocorrect.ui", "WarnAutoCorrect", "grid")
 , m_xError(m_xBuilder->weld_text_view("error"))
 {
-
m_xDialog->set_primary_text(ScResId(SCSTR_FORMULA_AUTOCORRECTION).trim());
 m_xDialog->set_default_response(RET_YES);
 
 const int nMaxWidth = m_xError->get_approximate_digit_width() * 65;
diff --git a/sc/uiconfig/scalc/ui/warnautocorrect.ui 
b/sc/uiconfig/scalc/ui/warnautocorrect.ui
index 632dbcc80360..02c1cf055473 100644
--- a/sc/uiconfig/scalc/ui/warnautocorrect.ui
+++ b/sc/uiconfig/scalc/ui/warnautocorrect.ui
@@ -11,6 +11,8 @@
 True
 question
 yes-no
+%PRODUCTNAME Calc found an error in 
the formula entered.
+Do you want to accept the correction 
proposed below?
 
   
 False

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

2021-11-17 Thread Caolán McNamara (via logerrit) 
 sc/inc/strings.hrc   |7 +
 sc/source/ui/dbgui/filtdlg.cxx   |7 +
 sc/uiconfig/scalc/ui/standardfilterdialog.ui |   96 +--
 3 files changed, 58 insertions(+), 52 deletions(-)

New commits:
commit 938fbac669bc59cf0b388bd0d21a2f14c4399757
Author: Caolán McNamara 
AuthorDate: Wed Nov 17 09:29:08 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 17 14:40:51 2021 +0100

SCSTR_FILTER_TEXT_COLOR is used in two different contexts

in the autofilter popup and the standard filter combobox.

In the autofilter we want title case to match the other
entries there, for the standard filter we need the same
text as appears in the combobox list

Change-Id: I693d3fa8a9fa1bac0803971be593f107d5817e74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125371
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 59e1efd14b02..0cdbf7f1e540 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -35,8 +35,11 @@
 #define SCSTR_TOP10FILTER   NC_("SCSTR_TOP10FILTER", 
"Top 10")
 #define SCSTR_FILTER_EMPTY  NC_("SCSTR_FILTER_EMPTY", 
"Empty")
 #define SCSTR_FILTER_NOTEMPTY   
NC_("SCSTR_FILTER_NOTEMPTY", "Not Empty")
-#define SCSTR_FILTER_TEXT_COLOR 
NC_("SCSTR_FILTER_TEXT_COLOR", "Text color")
-#define SCSTR_FILTER_BACKGROUND_COLOR   
NC_("SCSTR_FILTER_BACKGROUND_COLOR", "Background color")
+#define SCSTR_FILTER_TEXT_COLOR 
NC_("SCSTR_FILTER_TEXT_COLOR", "Text Color")
+#define SCSTR_FILTER_BACKGROUND_COLOR   
NC_("SCSTR_FILTER_BACKGROUND_COLOR", "Background Color")
+// This must match the translation of the same strings of 
standardfilterdialog|cond
+#define SCSTR_FILTER_TEXT_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Text color")
+#define SCSTR_FILTER_BACKGROUND_COLOR_COND  
NC_("STANDARDFILTERDIALOG_COND", "Background color")
 #define SCSTR_FILTER_NO_FILL
NC_("SCSTR_FILTER_NO_FILL", "No Fill")
 #define SCSTR_FILTER_AUTOMATIC_COLOR
NC_("SCSTR_FILTER_AUTOMATIC_COLOR", "Automatic")
 #define SCSTR_NONAMENC_("SCSTR_NONAME", 
"unnamed")
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index e5eb4a7b333c..8b4c0b852a8b 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -60,8 +60,8 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pPa
 , aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
 , aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
 , aStrColumn(ScResId(SCSTR_COLUMN))
-, aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR))
-, aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR))
+, aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR_COND))
+, aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR_COND))
 , nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
 , theQueryData(static_cast(rArgSet.Get(nWhichQuery)).GetQueryData())
 , pViewData(nullptr)
@@ -114,6 +114,9 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pPa
 m_xEdCopyArea->SetReferences(this, m_xFtDbAreaLabel.get());
 m_xRbCopyArea->SetReferences(this, m_xEdCopyArea.get());
 
+assert(m_xLbCond1->find_text(aStrTextColor) != -1);
+assert(m_xLbCond1->find_text(aStrBackgroundColor) != -1);
+
 Init( rArgSet );
 
 // Hack: RefInput control
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui 
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index cb5e66ea62bb..359273e11ff7 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -420,18 +420,18 @@
   =
   =
   
-  Largest
-  Smallest
-  Largest %
-  Smallest %
-  Contains
-  Does not contain
-  Begins with
-  Does not begin with
-  Ends with
-  Does not end with
-  Text color
-  Background color
+  Largest
+  Smallest
+  Largest %
+  Smallest %
+  Contains
+  Does not contain
+  Begins with
+  Does not begin with
+  Ends with
+

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

2021-02-19 Thread George Bateman (via logerrit) 
 sc/inc/scabstdlg.hxx  |1 
 sc/source/ui/attrdlg/scdlgfact.cxx|5 +++
 sc/source/ui/attrdlg/scdlgfact.hxx|1 
 sc/source/ui/dbgui/textimportoptions.cxx  |6 +++
 sc/source/ui/inc/textimportoptions.hxx|2 +
 sc/source/ui/view/viewfun5.cxx|   48 +-
 sc/uiconfig/scalc/ui/textimportoptions.ui |   16 +-
 7 files changed, 58 insertions(+), 21 deletions(-)

New commits:
commit 57dec020b9527d3dd472e33010381822d4ca306c
Author: George Bateman 
AuthorDate: Tue Dec 8 10:22:22 2020 +
Commit: Mike Kaganski 
CommitDate: Fri Feb 19 10:59:44 2021 +0100

tdf#65872 [WIP] Allow prefered interpretation of pasted numbers to be saved

Change-Id: I065f1f8cff1b3c7d7198ce431df39a7b8cb7b593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107402
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Mike Kaganski 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index e6971503a051..0656ca16cc10 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -393,6 +393,7 @@ protected:
 public:
 virtual LanguageType GetLanguageType() const = 0;
 virtual bool IsDateConversionSet() const = 0;
+virtual bool IsKeepAskingSet() const = 0;
 };
 
 class ScAbstractDialogFactory
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 061db5614a66..b77f603540de 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -876,6 +876,11 @@ bool 
AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
 return m_xDlg->isDateConversionSet();
 }
 
+bool AbstractScTextImportOptionsDlg_Impl::IsKeepAskingSet() const
+{
+return m_xDlg->isKeepAskingSet();
+}
+
 BitmapEx AbstractScTextImportOptionsDlg_Impl::createScreenshot() const
 {
 VclPtr xDialogSurface(m_xDlg->getDialog()->screenshot());
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 980b3f4270bc..be01347f495f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -626,6 +626,7 @@ public:
 virtual short Execute() override;
 virtual LanguageType GetLanguageType() const override;
 virtual bool IsDateConversionSet() const override;
+virtual bool IsKeepAskingSet() const override;
 
 // screenshotting
 virtual BitmapEx createScreenshot() const override;
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx 
b/sc/source/ui/dbgui/textimportoptions.cxx
index 63353d4b28a8..b8e99ca2e6df 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -31,6 +31,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(weld::Window* 
pParent)
 , m_xRbAutomatic(m_xBuilder->weld_radio_button("automatic"))
 , m_xRbCustom(m_xBuilder->weld_radio_button("custom"))
 , m_xBtnConvertDate(m_xBuilder->weld_check_button("convertdata"))
+, m_xBtnKeepAsking(m_xBuilder->weld_check_button("keepasking"))
 , m_xLbCustomLang(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang")))
 {
 init();
@@ -53,6 +54,11 @@ bool ScTextImportOptionsDlg::isDateConversionSet() const
 return m_xBtnConvertDate->get_active();
 }
 
+bool ScTextImportOptionsDlg::isKeepAskingSet() const
+{
+return m_xBtnKeepAsking->get_active();
+}
+
 void ScTextImportOptionsDlg::init()
 {
 m_xBtnOk->connect_clicked(LINK(this, ScTextImportOptionsDlg, OKHdl));
diff --git a/sc/source/ui/inc/textimportoptions.hxx 
b/sc/source/ui/inc/textimportoptions.hxx
index 3b50655c7d72..78fd5cb88e01 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -33,6 +33,7 @@ public:
 
 LanguageType getLanguageType() const;
 bool isDateConversionSet() const;
+bool isKeepAskingSet() const;
 
 private:
 void init();
@@ -42,6 +43,7 @@ private:
 std::unique_ptr m_xRbAutomatic;
 std::unique_ptr m_xRbCustom;
 std::unique_ptr m_xBtnConvertDate;
+std::unique_ptr m_xBtnKeepAsking;
 std::unique_ptr m_xLbCustomLang;
 
 DECL_LINK(OKHdl, weld::Button&, void);
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 1773c2fb4474..010febb22012 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -304,28 +304,50 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId 
nFormatId,
 tools::SvRef xStream;
 if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && 
xStream.is() )
 {
+// Static variables for per-session storage. This could be
+// changed to longer-term storage in future.
+static bool bHaveSavedPreferences = false;
+static LanguageType eSavedLanguage;
+static bool bSavedDateConversion;
+
 if (nFormatId == SotClipboardFormatId::HTML &&
 !comphelper::LibreOfficeKit::isActive())

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

2020-02-07 Thread Maxim Monastirsky (via logerrit) 
 sc/inc/scabstdlg.hxx   |2 -
 sc/source/ui/attrdlg/scdlgfact.cxx |4 +--
 sc/source/ui/attrdlg/scdlgfact.hxx |2 -
 sc/source/ui/drawfunc/drtxtob1.cxx |2 -
 sc/source/ui/inc/textdlgs.hxx  |2 -
 sc/source/ui/miscdlgs/textdlgs.cxx |   12 -
 sc/source/ui/pagedlg/tphfedit.cxx  |2 -
 sc/source/ui/view/editsh.cxx   |2 -
 sc/uiconfig/scalc/ui/chardialog.ui |   47 +
 9 files changed, 66 insertions(+), 9 deletions(-)

New commits:
commit 01bc1dfde8ba8d374698085fabe8b67d4d52c69a
Author: Maxim Monastirsky 
AuthorDate: Thu Feb 6 01:46:53 2020 +0200
Commit: Maxim Monastirsky 
CommitDate: Fri Feb 7 10:49:04 2020 +0100

tdf#99693 Add Highlighting tab for Calc

Works with shapes and comments.

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

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 16690afefcc0..a4282b7a7bda 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -532,7 +532,7 @@ public:
  const SfxItemSet* 
pArgSet) = 0;
 
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
-const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0;
+const SfxItemSet* pAttr, const SfxObjectShell* pDocShell, bool 
bDrawText) = 0;
 
 virtual VclPtr CreateScParagraphDlg(weld::Window* 
pParent,
 const SfxItemSet* pAttr) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index af0bcfdef27e..71ec37385c0d 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1225,9 +1225,9 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(w
 }
 
 VclPtr ScAbstractDialogFactory_Impl::CreateScCharDlg(
-weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* 
pDocShell)
+weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* 
pDocShell, bool bDrawText)
 {
-return 
VclPtr::Create(std::make_unique(pParent,
 pAttr, pDocShell));
+return 
VclPtr::Create(std::make_unique(pParent,
 pAttr, pDocShell, bDrawText));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScParagraphDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 60e5a6bc35d8..1c5b0cbe8da3 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -796,7 +796,7 @@ public:
 virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
  const SfxItemSet* 
pArgSet) override;
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
-const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) override;
+const SfxItemSet* pAttr, const SfxObjectShell* pDocShell, bool 
bDrawText) override;
 
 virtual VclPtr CreateScParagraphDlg(weld::Window* 
pParent,
 const SfxItemSet* pAttr) override;
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx 
b/sc/source/ui/drawfunc/drtxtob1.cxx
index 1b092128afe3..76964b6ebdeb 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -43,7 +43,7 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& 
rArgs,
 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
 ScopedVclPtr pDlg(pFact->CreateScCharDlg(
 pViewData->GetDialogParent(), ,
-pViewData->GetSfxDocShell()));
+pViewData->GetSfxDocShell(), true));
 if (nSlot == SID_CHAR_DLG_EFFECT)
 {
 pDlg->SetCurPageId("fonteffects");
diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx
index b9b06002aebf..f9d3a6dba615 100644
--- a/sc/source/ui/inc/textdlgs.hxx
+++ b/sc/source/ui/inc/textdlgs.hxx
@@ -31,7 +31,7 @@ private:
 
 virtual void PageCreated(const OString& rId, SfxTabPage ) override;
 public:
-ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const 
SfxObjectShell* pDocShell);
+ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const 
SfxObjectShell* pDocShell, bool bDrawText);
 };
 
 class ScParagraphDlg : public SfxTabDialogController
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx 
b/sc/source/ui/miscdlgs/textdlgs.cxx
index 1cbd139a24f2..08251008255d 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -30,13 +30,18 @@
 #include 
 #include 
 
-ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const 
SfxObjectShell* pDocShell)
+ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const 
SfxObjectShell* pDocShell, bool bDrawText)
 : SfxTabDialogController(pParent, "modules/scalc/ui/chardialog.ui", 
"CharDialog", pAttr)
 , rDocShell(*pDocShell)
 {
 AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
 AddTabPage("fonteffects",

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

2019-05-11 Thread Caolán McNamara (via logerrit) 
 sc/inc/globstr.hrc  |3 
 sc/inc/scabstdlg.hxx|2 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   23 ++-
 sc/source/ui/attrdlg/scdlgfact.hxx  |   15 +-
 sc/source/ui/condformat/condformatmgr.cxx   |  173 +--
 sc/source/ui/inc/condformatmgr.hxx  |   41 ++---
 sc/source/ui/view/cellsh1.cxx   |5 
 sc/uiconfig/scalc/ui/condformatmanager.ui   |  178 +++-
 sc/uiconfig/scalc/ui/conditionalformatdialog.ui |4 
 9 files changed, 232 insertions(+), 212 deletions(-)

New commits:
commit b8061f41373cc90823c93cf9f025647c93496293
Author: Caolán McNamara 
AuthorDate: Sat May 11 19:51:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Sat May 11 22:19:28 2019 +0200

weld ScCondFormatManagerDlg

Change-Id: Iccf2657f2c8fe98b4e975936fb75d56fc9523b5a
Reviewed-on: https://gerrit.libreoffice.org/72162
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 614beb5300bb..78437dc9f9d3 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -423,7 +423,6 @@
 #define STR_UNDO_INSERT_CURRENT_TIME
NC_("STR_UNDO_INSERT_CURRENT_TIME", "Insert Current Time")
 #define STR_MANAGE_NAMESNC_("STR_MANAGE_NAMES", 
"Manage Names...")
 #define STR_HEADER_NAME NC_("STR_HEADER_NAME", "Name")
-#define STR_HEADER_RANGE_OR_EXPR
NC_("STR_HEADER_RANGE_OR_EXPR", "Range or formula expression")
 #define STR_HEADER_SCOPENC_("STR_HEADER_SCOPE", 
"Scope")
 #define STR_MULTI_SELECTNC_("STR_MULTI_SELECT", 
"(multiple)")
 #define STR_GLOBAL_SCOPENC_("STR_GLOBAL_SCOPE", 
"Document (Global)")
@@ -431,8 +430,6 @@
 #define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID", 
"Invalid name. Only use letters, numbers and underscore.")
 #define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF", 
"This Document contains external references to unsaved documents.\n\nDo you 
want to continue?")
 #define STR_CLOSE_WITH_UNSAVED_REFS 
NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another 
document and not yet saved. Closing it without saving will result in data 
loss.")
-#define STR_HEADER_RANGENC_("STR_HEADER_RANGE", 
"Range")
-#define STR_HEADER_COND NC_("STR_HEADER_COND", "First 
Condition")
 #define STR_COND_CONDITION  NC_("STR_COND_CONDITION", 
"Cell value is")
 #define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE", 
"ColorScale")
 #define STR_COND_DATABARNC_("STR_COND_DATABAR", 
"DataBar")
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index cb6ba6933ee7..afada832cfa0 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -410,7 +410,7 @@ public:
 
 virtual VclPtr 
CreateScSortWarningDlg(weld::Window* pParent, const OUString& rExtendText, 
const OUString& rCurrentText ) = 0;
 
-virtual VclPtr 
CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const 
ScConditionalFormatList* pFormatList ) = 0;
+virtual VclPtr 
CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument* pDoc, const 
ScConditionalFormatList* pFormatList ) = 0;
 
 virtual VclPtr 
CreateScDataPilotDatabaseDlg(weld::Window* pParent) = 0;
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 057935500c69..a2b4e4c2b02f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -82,7 +82,15 @@ short AbstractScColRowLabelDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl);
+short AbstractScCondFormatManagerDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
+bool 
AbstractScCondFormatManagerDlg_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContext
 )
+{
+return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
 
 short AbstractScDataPilotDatabaseDlg_Impl::Execute()
 {
@@ -510,22 +518,22 @@ sal_uLong AbstractScLinkedAreaDlg_Impl::GetRefresh()
 
 std::unique_ptr 
AbstractScCondFormatManagerDlg_Impl::GetConditionalFormatList()
 {
-return pDlg->GetConditionalFormatList();
+return m_xDlg->GetConditionalFormatList();
 }
 
 bool AbstractScCondFormatManagerDlg_Impl::CondFormatsChanged() const
 {
-return pDlg->CondFormatsChanged();
+return m_xDlg->CondFormatsChanged();
 }
 
 void AbstractScCondFormatManagerDlg_Impl::SetModified()
 {
-return pDlg->SetModified();
+return m_xDlg->SetModified();
 }
 
 ScConditionalFormat* 
AbstractScCondFormatManagerDlg_Impl::GetCondFormatSelected()
 {
-return pDlg->GetCondFormatSelected();
+return m_xDlg->GetCondFormatSelected();
 }
 
 int

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

2019-04-21 Thread Gagandeep Singh (via logerrit) 
 sc/UIConfig_scalc.mk|1 
 sc/inc/strings.hrc  |2 
 sc/source/ui/app/inputwin.cxx   |  122 ++--
 sc/source/ui/inc/inputwin.hxx   |4 +
 sc/source/ui/inc/tabvwsh.hxx|3 
 sc/source/ui/inc/viewfunc.hxx   |8 +-
 sc/source/ui/view/cellsh1.cxx   |2 
 sc/source/ui/view/tabvwshc.cxx  |   10 +--
 sc/source/ui/view/viewfun2.cxx  |   87 
 sc/uiconfig/scalc/ui/autosum.ui |   49 
 10 files changed, 213 insertions(+), 75 deletions(-)

New commits:
commit 0ec98930888ee9f29032d12185baefc71da8489f
Author: Gagandeep Singh 
AuthorDate: Mon Apr 1 16:50:18 2019 +0530
Commit: Dennis Francis 
CommitDate: Sun Apr 21 19:31:07 2019 +0200

bug tdf#120697

add drop down containing formulas in autosum button in calc

Change-Id: I1da8116ba2f6073bec153979282161fbaa286427
Reviewed-on: https://gerrit.libreoffice.org/70058
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index a80f9d2ea791..a091655403b4 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/allheaderfooterdialog \
sc/uiconfig/scalc/ui/analysisofvariancedialog \
sc/uiconfig/scalc/ui/autoformattable \
+   sc/uiconfig/scalc/ui/autosum \
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/changesourcedialog \
sc/uiconfig/scalc/ui/chardialog \
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 39873fcf46a1..dcceddab3190 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -177,7 +177,7 @@
 #define SCSTR_QHELP_BTNCALC NC_("SCSTR_QHELP_BTNCALC", 
"Function Wizard")
 #define SCSTR_QHELP_BTNOK   NC_("SCSTR_QHELP_BTNOK", 
"Accept")
 #define SCSTR_QHELP_BTNCANCEL   
NC_("SCSTR_QHELP_BTNCANCEL", "Cancel")
-#define SCSTR_QHELP_BTNSUM  NC_("SCSTR_QHELP_BTNSUM", 
"Sum")
+#define SCSTR_QHELP_BTNSUM  NC_("SCSTR_QHELP_BTNSUM", 
"Autosum")
 #define SCSTR_QHELP_BTNEQUAL
NC_("SCSTR_QHELP_BTNEQUAL", "Formula")
 #define SCSTR_QHELP_EXPAND_FORMULA  
NC_("SCSTR_QHELP_EXPAND_FORMULA", "Expand Formula Bar")
 #define SCSTR_QHELP_COLLAPSE_FORMULA
NC_("SCSTR_QHELP_COLLAPSE_FORMULA", "Collapse Formula Bar")
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index e38febfda9f6..a54332c9a4af 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -62,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -183,12 +184,13 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const 
SfxBindings* pBind ) :
 InsertWindow(1, aWndPos.get(), ToolBoxItemBits::NONE, 0);
 InsertSeparator (1);
 InsertItem  (SID_INPUT_FUNCTION, Image(StockImage::Yes, 
RID_BMP_INPUT_FUNCTION), ToolBoxItemBits::NONE, 2);
-InsertItem  (SID_INPUT_SUM,  Image(StockImage::Yes, 
RID_BMP_INPUT_SUM), ToolBoxItemBits::NONE, 3);
+InsertItem  (SID_INPUT_SUM,  Image(StockImage::Yes, 
RID_BMP_INPUT_SUM), ToolBoxItemBits::DROPDOWNONLY, 3);
 InsertItem  (SID_INPUT_EQUAL,Image(StockImage::Yes, 
RID_BMP_INPUT_EQUAL), ToolBoxItemBits::NONE, 4);
 InsertItem  (SID_INPUT_CANCEL,   Image(StockImage::Yes, 
RID_BMP_INPUT_CANCEL), ToolBoxItemBits::NONE, 5);
 InsertItem  (SID_INPUT_OK,   Image(StockImage::Yes, 
RID_BMP_INPUT_OK), ToolBoxItemBits::NONE, 6);
 InsertSeparator (7);
 InsertWindow(7, , ToolBoxItemBits::NONE, 8);
+SetDropdownClickHdl( LINK( this, ScInputWindow, DropdownClickHdl ));
 
 aWndPos   ->SetQuickHelpText(ScResId(SCSTR_QHELP_POSWND));
 aWndPos   ->SetHelpId   (HID_INSWIN_POS);
@@ -329,45 +331,6 @@ void ScInputWindow::Select()
 aTextWindow.Invalidate(); // Or else the Selection remains
 break;
 
-case SID_INPUT_SUM:
-{
-ScTabViewShell* pViewSh = dynamic_cast( 
SfxViewShell::Current()  );
-if ( pViewSh )
-{
-bool bSubTotal = false;
-bool bRangeFinder = false;
-const OUString aFormula = pViewSh->DoAutoSum(bRangeFinder, 
bSubTotal);
-if (!aFormula.isEmpty())
-{
-SetFuncString( aFormula );
-if (bRangeFinder && pScMod->IsEditMode())
-{
-ScInputHandler* pHdl = pScMod->GetInputHdl( 
pViewSh );
-if ( pHdl )
-{
-pHdl->InitRangeFinder( aFormula );
-
-//! SetSelection at the InputHandler?
-

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

2019-04-08 Thread Caolán McNamara (via logerrit) 
 sc/inc/scabstdlg.hxx  |2 
 sc/source/ui/attrdlg/scdlgfact.cxx|   26 ++---
 sc/source/ui/attrdlg/scdlgfact.hxx|2 
 sc/source/ui/docshell/docsh4.cxx  |3 
 sc/source/ui/inc/hfedtdlg.hxx |   28 ++---
 sc/source/ui/pagedlg/hfedtdlg.cxx |  105 ++--
 sc/source/ui/pagedlg/tphf.cxx |2 
 sc/uiconfig/scalc/ui/allheaderfooterdialog.ui |  132 +++---
 sc/uiconfig/scalc/ui/footerdialog.ui  |   84 +---
 sc/uiconfig/scalc/ui/headerdialog.ui  |   84 +---
 sc/uiconfig/scalc/ui/headerfooterdialog.ui|   84 +---
 sc/uiconfig/scalc/ui/leftfooterdialog.ui  |   60 ---
 sc/uiconfig/scalc/ui/leftheaderdialog.ui  |   60 ---
 sc/uiconfig/scalc/ui/rightfooterdialog.ui |   60 ---
 sc/uiconfig/scalc/ui/rightheaderdialog.ui |   60 ---
 sc/uiconfig/scalc/ui/sharedfooterdialog.ui|  108 ++---
 sc/uiconfig/scalc/ui/sharedheaderdialog.ui|  108 ++---
 17 files changed, 775 insertions(+), 233 deletions(-)

New commits:
commit de8ea47ecdaa33934e47a6ee9bfa742698311534
Author: Caolán McNamara 
AuthorDate: Mon Apr 8 14:53:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 8 22:26:59 2019 +0200

weld ScHFEditDlg

Change-Id: I2f17dfb1f8193730b26e7c338100a786ddbb87c7
Reviewed-on: https://gerrit.libreoffice.org/70418
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 5bcfd9d5fab4..7b2c458ee7eb 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -520,7 +520,7 @@ public:
 virtual VclPtr CreateScAttrDlg(weld::Window* pParent,
 const SfxItemSet* 
pCellAttrs) = 0;
 
-virtual VclPtr CreateScHFEditDlg(vcl::Window*   
pParent,
+virtual VclPtr CreateScHFEditDlg(weld::Window*   
pParent,
 const SfxItemSet&   
rCoreSet,
 const OUString& 
rPageStyle,
 sal_uInt16  nResId 
) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 740c06ffc2a2..f2074b170845 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -989,51 +989,51 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScAttrDlg(weld:
 return 
VclPtr::Create(std::make_unique(pParent,
 pCellAttrs));
 }
 
-VclPtr ScAbstractDialogFactory_Impl::CreateScHFEditDlg( 
vcl::Window* pParent,
+VclPtr ScAbstractDialogFactory_Impl::CreateScHFEditDlg( 
weld::Window* pParent,
 const 
SfxItemSet&   rCoreSet,
 const 
OUString& rPageStyle,
 
sal_uInt16  nResId )
 {
-VclPtr pDlg;
+std::unique_ptr xDlg;
 
 switch (nResId)
 {
 case RID_SCDLG_HFED_HEADER:
 case RID_SCDLG_HFEDIT_HEADER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFED_FOOTER:
 case RID_SCDLG_HFEDIT_FOOTER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_LEFTHEADER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_RIGHTHEADER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_LEFTFOOTER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_RIGHTFOOTER:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, rCoreSet, 
rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_SHDR:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, 
rCoreSet, rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_SFTR:
-pDlg = VclPtr::Create(pParent, rCoreSet, 
rPageStyle);
+xDlg = std::make_unique(pParent, 
rCoreSet, rPageStyle);
 break;
 case RID_SCDLG_HFEDIT_ALL:
-pDlg =

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

2019-03-26 Thread Caolán McNamara (via logerrit) 
 sc/inc/strings.hrc |3 -
 sc/source/ui/dialogs/searchresults.cxx |   97 ++---
 sc/source/ui/inc/searchresults.hxx |   20 +++---
 sc/source/ui/view/viewfun2.cxx |2 
 sc/uiconfig/scalc/ui/searchresults.ui  |   77 --
 5 files changed, 126 insertions(+), 73 deletions(-)

New commits:
commit cd19a7664a25eda786bb76feefb40ebcbf79a54d
Author: Caolán McNamara 
AuthorDate: Tue Mar 26 14:12:49 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Mar 26 18:23:23 2019 +0100

weld SearchResultsDlg

Change-Id: Ib2a031843a92626941ebe9c94a77a44c4c970585
Reviewed-on: https://gerrit.libreoffice.org/69757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index a3392a36b20c..39873fcf46a1 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -141,9 +141,6 @@
 #define STR_MID NC_("STR_MID", "Mid" )
 #define STR_SOUTH   NC_("STR_SOUTH", "South" )
 #define STR_SUM NC_("STR_SUM", "Total" )
-#define STR_SHEET   NC_("STR_SHEET", "Sheet" )
-#define STR_CELLNC_("STR_CELL", "Cell" )
-#define STR_CONTENT NC_("STR_CONTENT", 
"Content" )
 #define SCSTR_UNDO_PAGE_ANCHOR  
NC_("SCSTR_UNDO_PAGE_ANCHOR", "Page Anchor" )
 #define SCSTR_UNDO_CELL_ANCHOR  
NC_("SCSTR_UNDO_CELL_ANCHOR", "Cell Anchor" )
 #define SCSTR_CONDITION NC_("SCSTR_CONDITION", 
"Condition ")
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index 34ac4dd989ee..6a4d899d892f 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -22,66 +22,56 @@
 
 namespace sc {
 
-SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* 
pParent ) :
-ModelessDialog(pParent, "SearchResultsDialog", 
"modules/scalc/ui/searchresults.ui"),
-aSkipped( ScResId( SCSTR_SKIPPED ) ),
-mpBindings(_pBindings), mpDoc(nullptr)
+SearchResultsDlg::SearchResultsDlg(SfxBindings* _pBindings, weld::Window* 
pParent)
+: SfxDialogController(pParent, "modules/scalc/ui/searchresults.ui", 
"SearchResultsDialog")
+, aSkipped(ScResId(SCSTR_SKIPPED))
+, mpBindings(_pBindings)
+, mpDoc(nullptr)
+, mxList(m_xBuilder->weld_tree_view("results"))
+, mxSearchResults(m_xBuilder->weld_label("lbSearchResults"))
 {
-get(mpSearchResults, "lbSearchResults");
-
-SvSimpleTableContainer *pContainer = 
get("results");
-Size aControlSize(150, 120);
-aControlSize = pContainer->LogicToPixel(aControlSize, 
MapMode(MapUnit::MapAppFont));
-pContainer->set_width_request(aControlSize.Width());
-pContainer->set_height_request(aControlSize.Height());
-
-mpList = VclPtr::Create(*pContainer);
-long nTabs[] = {0, 40, 60};
-mpList->SetTabs(SAL_N_ELEMENTS(nTabs), nTabs);
-mpList->InsertHeaderEntry(ScResId(STR_SHEET) + "\t" + ScResId(STR_CELL) + 
"\t" + ScResId(STR_CONTENT));
-mpList->SetSelectHdl( LINK(this, SearchResultsDlg, ListSelectHdl) );
-}
+mxList->set_size_request(mxList->get_approximate_digit_width() * 50, 
mxList->get_height_rows(15));
 
-SearchResultsDlg::~SearchResultsDlg()
-{
-disposeOnce();
+std::vector aWidths;
+aWidths.push_back(mxList->get_approximate_digit_width() * 10);
+aWidths.push_back(mxList->get_approximate_digit_width() * 10);
+mxList->set_column_fixed_widths(aWidths);
+mxList->connect_changed(LINK(this, SearchResultsDlg, ListSelectHdl));
 }
 
-void SearchResultsDlg::dispose()
+SearchResultsDlg::~SearchResultsDlg()
 {
-mpList.disposeAndClear();
-mpSearchResults.disposeAndClear();
-ModelessDialog::dispose();
 }
 
 namespace
 {
 class ListWrapper {
-OUStringBuffer maName;
-VclPtr mpList;
+weld::TreeView& mrList;
 public:
 size_t mnCount = 0;
 static const size_t mnMaximum = 1000;
-ListWrapper(const VclPtr ) :
-mpList(pList)
+ListWrapper(weld::TreeView& rList)
+: mrList(rList)
 {
-mpList->Clear();
-mpList->SetUpdateMode(false);
+mrList.clear();
+mrList.freeze();
 }
-void Insert(const OUString ,
+~ListWrapper()
+{
+mrList.thaw();
+}
+void Insert(const OUString ,
 const ScAddress ,
 formula::FormulaGrammar::AddressConvention eConvention,
-const OUString )
+const OUString )
 {
 if (mnCount++ < mnMaximum)
 {
-maName.append(aTabName);
-maName.append("\t");
-

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

2019-03-26 Thread Caolán McNamara (via logerrit) 
 sc/inc/scabstdlg.hxx  |5 
 sc/source/ui/attrdlg/scdlgfact.cxx|   14 -
 sc/source/ui/attrdlg/scdlgfact.hxx|   12 
 sc/source/ui/dbgui/pfiltdlg.cxx   |  393 +-
 sc/source/ui/inc/pfiltdlg.hxx |   60 ++--
 sc/source/ui/view/gridwin2.cxx|2 
 sc/source/ui/view/pivotsh.cxx |2 
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui |   57 ++--
 8 files changed, 260 insertions(+), 285 deletions(-)

New commits:
commit d9de9d2d33bffb0032eac563079f66b13f1ca426
Author: Caolán McNamara 
AuthorDate: Tue Mar 26 10:06:54 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Mar 26 13:14:35 2019 +0100

weld ScPivotFilterDlg

Change-Id: I0a2ffa6fd02dcf82d55f961ba229112b456eda8e
Reviewed-on: https://gerrit.libreoffice.org/69733
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4a5d326049a1..5bcfd9d5fab4 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -468,8 +468,9 @@ public:
 
 virtual VclPtr CreateScNamePasteDlg(weld::Window * 
pParent, ScDocShell* pShell) = 0;
 
-virtual VclPtr 
CreateScPivotFilterDlg(vcl::Window* pParent,
-const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) = 0;
+virtual VclPtr 
CreateScPivotFilterDlg(weld::Window* pParent,
+const 
SfxItemSet& rArgSet,
+sal_uInt16 
nSourceTab) = 0;
 
 virtual VclPtr 
CreateScDPFunctionDlg(weld::Window* pParent,
   const 
ScDPLabelDataVector& rLabelVec,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 88a153120400..581391c4857a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -162,7 +162,10 @@ short AbstractScNamePasteDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
+short AbstractScPivotFilterDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScDPFunctionDlg_Impl::Execute()
 {
@@ -603,9 +606,9 @@ std::vector 
AbstractScNamePasteDlg_Impl::GetSelectedNames() const
 return m_xDlg->GetSelectedNames();
 }
 
-const ScQueryItem&   AbstractScPivotFilterDlg_Impl::GetOutputItem()
+const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem()
 {
-return pDlg->GetOutputItem();
+return m_xDlg->GetOutputItem();
 }
 
 PivotFunc AbstractScDPFunctionDlg_Impl::GetFuncMask() const
@@ -903,11 +906,10 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScNamePasteDl
 return 
VclPtr::Create(std::make_unique(pParent,
 pShell));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(vcl::Window* pParent,
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(weld::Window* pParent,
 const SfxItemSet& rArgSet, sal_uInt16 nSourceTab)
 {
-VclPtr pDlg = VclPtr::Create(pParent, 
rArgSet, nSourceTab);
-return VclPtr::Create(pDlg);
+return 
VclPtr::Create(std::make_unique(pParent,
 rArgSet, nSourceTab));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index c752101f82af..4d762f219742 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -388,7 +388,13 @@ public:
 
 class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg
 {
-DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScPivotFilterDlg_Impl(std::unique_ptr p)
+: m_xDlg(std::move(p))
+{
+}
+virtual short Execute() override;
 virtual const ScQueryItem&  GetOutputItem() override;
 };
 
@@ -660,8 +666,8 @@ public:
 
 virtual VclPtr CreateScNamePasteDlg(weld::Window * 
pParent, ScDocShell* pShell) override;
 
-virtual VclPtr 
CreateScPivotFilterDlg(vcl::Window* pParent,
-const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) override;
+virtual VclPtr 
CreateScPivotFilterDlg(weld::Window* pParent, const SfxItemSet& rArgSet,
+sal_uInt16 
nSourceTab) override;
 
 virtual VclPtr 
CreateScDPFunctionDlg(weld::Window* pParent,
   const 
ScDPLabelDataVector& rLabelVec,
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index a23e77027266..bd6b6ec1bbb3 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -37,72 +37,39 @@
 #include 
 #include 
 
-ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& 
rArgSet,
-SCTAB nSourceTab )
-:   ModalDialog(pParent, "PivotFilterDialog",
-

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

2019-03-11 Thread Libreoffice Gerrit user 
 sc/inc/scabstdlg.hxx|4 
 sc/source/ui/attrdlg/scdlgfact.cxx  |5 -
 sc/source/ui/attrdlg/scdlgfact.hxx  |4 
 sc/source/ui/dbgui/subtdlg.cxx  |   31 ++-
 sc/source/ui/inc/subtdlg.hxx|9 --
 sc/source/ui/view/cellsh1.cxx   |2 
 sc/uiconfig/scalc/ui/subtotaldialog.ui  |  136 +++-
 sc/uiconfig/scalc/ui/subtotalgrppage.ui |   28 ++
 8 files changed, 150 insertions(+), 69 deletions(-)

New commits:
commit c31e7723915a20e45698d8288816288ce9104af8
Author: Caolán McNamara 
AuthorDate: Sat Mar 9 20:20:34 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 10:01:02 2019 +0100

weld ScSubTotalDlg

Change-Id: I34db4ff89aa8e91d882bcde94e9ecfb88f25d9a6
Reviewed-on: https://gerrit.libreoffice.org/68984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9fc0bdbf32a7..3c6812562c48 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -528,8 +528,8 @@ public:
   SfxStyleSheetBase&  
rStyleBase,
   bool bPage /*true : 
page, false: para*/) = 0;
 
-virtual VclPtr CreateScSubTotalDlg( vcl::Window* 
pParent,
-const SfxItemSet*   
pArgSet ) = 0;
+virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
+ const SfxItemSet* 
pArgSet) = 0;
 
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
 const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index dcf8de1a42f2..86d8966b0409 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1038,10 +1038,9 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScStyleDlg(weld
 return 
VclPtr::Create(std::make_unique(pParent,
 rStyleBase, bPage));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const 
SfxItemSet* pArgSet)
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(weld::Window* pParent, const 
SfxItemSet* pArgSet)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
pArgSet );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(std::make_unique(pParent,
 pArgSet));
 }
 
 VclPtr ScAbstractDialogFactory_Impl::CreateScCharDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 6577714f44a4..471d22a9e8cb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -714,8 +714,8 @@ public:
   SfxStyleSheetBase& 
rStyleBase,
   bool bPage) override;
 
-virtual VclPtr CreateScSubTotalDlg( vcl::Window* 
pParent,
-const SfxItemSet*   
pArgSet ) override;
+virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
+ const SfxItemSet* 
pArgSet) override;
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
 const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) override;
 
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 1c931ec082e6..36c692b2f37f 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -23,36 +23,25 @@
 #include 
 #include 
 
-ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
-: SfxTabDialog(pParent, "SubTotalDialog",
-"modules/scalc/ui/subtotaldialog.ui", pArgSet)
+ScSubTotalDlg::ScSubTotalDlg(weld::Window* pParent, const SfxItemSet* pArgSet)
+: SfxTabDialogController(pParent, "modules/scalc/ui/subtotaldialog.ui", 
"SubTotalDialog", pArgSet)
+, m_xBtnRemove(m_xBuilder->weld_button("remove"))
 {
-get(m_pBtnRemove, "remove");
 
-AddTabPage("1stgroup",  ScTpSubTotalGroup1::Create);
-AddTabPage("2ndgroup",  ScTpSubTotalGroup2::Create);
-AddTabPage("3rdgroup",  ScTpSubTotalGroup3::Create);
-AddTabPage("options", ScTpSubTotalOptions::Create);
-m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) );
+AddTabPage("1stgroup",  ScTpSubTotalGroup1::Create, nullptr);
+AddTabPage("2ndgroup",  ScTpSubTotalGroup2::Create, nullptr);
+AddTabPage("3rdgroup",  ScTpSubTotalGroup3::Create, nullptr);
+AddTabPage("options", ScTpSubTotalOptions::Create, nullptr);
+m_xBtnRemove->connect_clicked( LINK( this, ScSubTotalDlg, RemoveHdl ) );
 }
 
 ScSubTotalDlg::~ScSubTotalDlg()
 {
-disposeOnce();
 }
 
-void ScSubTotalDlg::dispose()
+IMPL_LINK_NOARG(ScSubTotalDlg, RemoveHdl, weld::Button&, void)
 {
-

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

2019-02-15 Thread Libreoffice Gerrit user 
 sc/inc/scabstdlg.hxx   |   10 +-
 sc/source/ui/attrdlg/scdlgfact.cxx |   23 ++--
 sc/source/ui/attrdlg/scdlgfact.hxx |   18 ++-
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx |2 
 sc/source/ui/dbgui/pvfundlg.cxx|  136 +
 sc/source/ui/inc/pvfundlg.hxx  |   50 +++---
 sc/uiconfig/scalc/ui/pivotfielddialog.ui   |   95 
 7 files changed, 203 insertions(+), 131 deletions(-)

New commits:
commit ce31d3cd23510fb545b0f923ea24fb3cb5303780
Author: Caolán McNamara 
AuthorDate: Fri Feb 15 15:34:47 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 20:49:32 2019 +0100

weld ScDPSubtotalDlg

Change-Id: I33403031421a9f372c240cddea320591ac72bfc2
Reviewed-on: https://gerrit.libreoffice.org/67878
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9b16e1a26af5..1d6e00d26c8f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -476,11 +476,11 @@ public:
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData ) = 0;
 
-virtual VclPtr CreateScDPSubtotalDlg( 
vcl::Window* pParent,
-ScDPObject& 
rDPObj,
-const 
ScDPLabelData& rLabelData,
-const 
ScPivotFuncData& rFuncData,
-const 
ScDPNameVec& rDataFields ) = 0;
+virtual VclPtr 
CreateScDPSubtotalDlg(weld::Window* pParent,
+  ScDPObject& 
rDPObj,
+  const 
ScDPLabelData& rLabelData,
+  const 
ScPivotFuncData& rFuncData,
+  const 
ScDPNameVec& rDataFields) = 0;
 
 virtual VclPtr 
CreateScDPNumGroupDlg(weld::Window* pParent,
   const 
ScDPNumGroupInfo& rInfo) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index bd39b1bb7be3..e3125c60ce06 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -167,7 +167,11 @@ short AbstractScNamePasteDlg_Impl::Execute()
 
 IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDPSubtotalDlg_Impl);
+
+short AbstractScDPSubtotalDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScDPNumGroupDlg_Impl::Execute()
 {
@@ -615,12 +619,12 @@ css::sheet::DataPilotFieldReference 
AbstractScDPFunctionDlg_Impl::GetFieldRef()
 
 PivotFunc AbstractScDPSubtotalDlg_Impl::GetFuncMask() const
 {
- return pDlg->GetFuncMask();
+ return m_xDlg->GetFuncMask();
 }
 
 void AbstractScDPSubtotalDlg_Impl::FillLabelData( ScDPLabelData& rLabelData ) 
const
 {
-pDlg->FillLabelData( rLabelData );
+m_xDlg->FillLabelData( rLabelData );
 }
 
 ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
@@ -915,14 +919,13 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPFunction
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( vcl::Window* pParent,
-ScDPObject& 
rDPObj,
-const 
ScDPLabelData& rLabelData,
-const 
ScPivotFuncData& rFuncData,
-const 
ScDPNameVec& rDataFields )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg(weld::Window* pParent,
+   
 ScDPObject& rDPObj,
+   
 const ScDPLabelData& rLabelData,
+   
 const ScPivotFuncData& rFuncData,
+   
 const ScDPNameVec& rDataFields)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/ );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(std::make_unique(pParent,
 rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(weld::Window* pParent, 
const ScDPNumGroupInfo& rInfo)
diff --git

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig solenv/sanitizers

2019-02-14 Thread Libreoffice Gerrit user 
 sc/inc/scabstdlg.hxx |4 -
 sc/source/ui/attrdlg/scdlgfact.cxx   |   14 ++-
 sc/source/ui/attrdlg/scdlgfact.hxx   |   13 ++-
 sc/source/ui/cctrl/editfield.cxx |   25 ++
 sc/source/ui/dbgui/dpgroupdlg.cxx|  111 ---
 sc/source/ui/inc/dpgroupdlg.hxx  |   57 +++
 sc/source/ui/inc/editfield.hxx   |   17 
 sc/source/ui/view/cellsh1.cxx|2 
 sc/uiconfig/scalc/ui/groupbynumber.ui|   35 +++--
 solenv/sanitizers/ui/modules/scalc.suppr |1 
 10 files changed, 207 insertions(+), 72 deletions(-)

New commits:
commit c57dc7d41bd62f933cffab6131edb7252606382d
Author: Caolán McNamara 
AuthorDate: Thu Feb 14 10:38:00 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 14 22:04:26 2019 +0100

weld ScDPNumGroupDlg

Change-Id: I5f5861a1f39307133f4c87e4d5ca50ced24409ba
Reviewed-on: https://gerrit.libreoffice.org/67813
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index f272b1a31ced..f4e48b1e063b 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -482,8 +482,8 @@ public:
 const 
ScPivotFuncData& rFuncData,
 const 
ScDPNameVec& rDataFields ) = 0;
 
-virtual VclPtr CreateScDPNumGroupDlg( 
vcl::Window* pParent,
-const 
ScDPNumGroupInfo& rInfo ) = 0;
+virtual VclPtr 
CreateScDPNumGroupDlg(weld::Window* pParent,
+  const 
ScDPNumGroupInfo& rInfo) = 0;
 
 virtual VclPtr CreateScDPDateGroupDlg( 
vcl::Window* pParent,
 const 
ScDPNumGroupInfo& rInfo,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index fa64f1848b80..3f24dc09439a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -168,7 +168,12 @@ short AbstractScNamePasteDlg_Impl::Execute()
 IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDPSubtotalDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDPNumGroupDlg_Impl);
+
+short AbstractScDPNumGroupDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
 IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl);
 
 short AbstractScDPShowDetailDlg_Impl::Execute()
@@ -614,7 +619,7 @@ void AbstractScDPSubtotalDlg_Impl::FillLabelData( 
ScDPLabelData& rLabelData ) co
 
 ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
 {
-return pDlg->GetGroupInfo();
+return m_xDlg->GetGroupInfo();
 }
 
 ScDPNumGroupInfo AbstractScDPDateGroupDlg_Impl::GetGroupInfo() const
@@ -914,10 +919,9 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPSubtotal
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(
-vcl::Window* pParent, const ScDPNumGroupInfo& rInfo )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(weld::Window* pParent, 
const ScDPNumGroupInfo& rInfo)
 {
-return VclPtr::Create( 
VclPtr::Create( pParent, rInfo ) );
+return VclPtr::Create(new 
ScDPNumGroupDlg(pParent, rInfo));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 1d1b8ce4fa2e..ddee8f8607ea 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -406,7 +406,14 @@ class AbstractScDPSubtotalDlg_Impl : public 
AbstractScDPSubtotalDlg
 
 class AbstractScDPNumGroupDlg_Impl : public AbstractScDPNumGroupDlg
 {
-DECL_ABSTDLG_BASE( AbstractScDPNumGroupDlg_Impl, ScDPNumGroupDlg )
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScDPNumGroupDlg_Impl(ScDPNumGroupDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
 virtual ScDPNumGroupInfo GetGroupInfo() const override;
 };
 
@@ -649,8 +656,8 @@ public:
 const 
ScPivotFuncData& rFuncData,
 const 
ScDPNameVec& rDataFields ) override;
 
-virtual VclPtr CreateScDPNumGroupDlg( 
vcl::Window* pParent,
-const 
ScDPNumGroupInfo& rInfo ) override;
+virtual VclPtr 
CreateScDPNumGroupDlg(weld::Window* pParent,
+  const 
ScDPNumGroupInfo& rInfo) override;
 
 virtual VclPtr CreateScDPDateGroupDlg( 
vcl::Window* pParent,
 const 
ScDPNumGroupInfo& rInfo,
diff --git a/sc/source/ui/cctrl/editfield.cxx

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

2019-02-02 Thread Libreoffice Gerrit user 
 sc/inc/scabstdlg.hxx   |4 -
 sc/source/ui/attrdlg/scdlgfact.cxx |   14 ++-
 sc/source/ui/attrdlg/scdlgfact.hxx |   13 ++-
 sc/source/ui/dbgui/scendlg.cxx |  122 ++---
 sc/source/ui/docshell/docsh4.cxx   |3 
 sc/source/ui/inc/scendlg.hxx   |   36 -
 sc/source/ui/view/cellsh3.cxx  |2 
 sc/uiconfig/scalc/ui/scenariodialog.ui |   47 +---
 8 files changed, 129 insertions(+), 112 deletions(-)

New commits:
commit e666102498dc37988630eb06071670e2c64abdfb
Author: Caolán McNamara 
AuthorDate: Sat Feb 2 10:21:55 2019 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 2 12:26:23 2019 +0100

weld ScNewScenarioDlg

Change-Id: I30bab36cc4163872a5e72abd2c111ff9b0b5846e
Reviewed-on: https://gerrit.libreoffice.org/67278
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 8542a283375b..fa82d4550da9 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -494,8 +494,8 @@ public:
 ScDPObject& 
rDPObj,
 
css::sheet::DataPilotFieldOrientation nOrient ) = 0;
 
-virtual VclPtr CreateScNewScenarioDlg ( 
vcl::Window* pParent, const OUString& rName,
-bool bEdit, 
bool bSheetProtected ) = 0;
+virtual VclPtr 
CreateScNewScenarioDlg(weld::Window* pParent, const OUString& rName,
+bool 
bEdit, bool bSheetProtected) = 0;
 virtual VclPtr CreateScShowTabDlg(weld::Window* 
pParent) = 0;
 
 virtual VclPtr 
CreateScStringInputDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4f2ecd2092a0..161297ab80d2 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -172,7 +172,10 @@ short AbstractScDPShowDetailDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
+short AbstractScNewScenarioDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScShowTabDlg_Impl::Execute()
 {
@@ -623,13 +626,13 @@ OUString 
AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
 void AbstractScNewScenarioDlg_Impl::SetScenarioData(
 const OUString& rName, const OUString& rComment, const Color& rColor, 
ScScenarioFlags nFlags )
 {
-pDlg->SetScenarioData(rName, rComment, rColor, nFlags);
+m_xDlg->SetScenarioData(rName, rComment, rColor, nFlags);
 }
 
 void AbstractScNewScenarioDlg_Impl::GetScenarioData(
 OUString& rName, OUString& rComment, Color& rColor, ScScenarioFlags& 
rFlags ) const
 {
-pDlg->GetScenarioData(rName, rComment, rColor, rFlags);
+m_xDlg->GetScenarioData(rName, rComment, rColor, rFlags);
 }
 
 void AbstractScShowTabDlg_Impl::Insert( const OUString& rString, bool 
bSelected )
@@ -923,11 +926,10 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPShowDe
 return VclPtr::Create(new 
ScDPShowDetailDlg(pParent, rDPObj, nOrient));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(vcl::Window* pParent, 
const OUString& rName,
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(weld::Window* pParent, 
const OUString& rName,
 bool bEdit, bool bSheetProtected)
 {
-VclPtr pDlg = VclPtr::Create(pParent, 
rName, bEdit, bSheetProtected);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
ScNewScenarioDlg(pParent, rName, bEdit, bSheetProtected));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScShowTabDlg(weld::Window* pParent)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index bcf0fa6e0c8e..8413310703f8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -426,7 +426,14 @@ public:
 
 class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg
 {
-DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg )
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScNewScenarioDlg_Impl(ScNewScenarioDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short   Execute() override;
+
 virtual void SetScenarioData( const OUString& rName, const OUString& 
rComment,
 const Color& rColor, ScScenarioFlags nFlags ) 
override;
 
@@ -641,8 +648,8 @@ public:
 ScDPObject& 
rDPObj,
 
css::sheet::DataPilotFieldOrientation nOrient) override;
 
-virtual VclPtr CreateScNewScenarioDlg ( 
vcl::Window* pParent, const OUString& rName,
-bool bEdit, 
bool bSheetProtected ) override;
+virtual VclPtr

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

2018-09-28 Thread Libreoffice Gerrit user 
 sc/inc/scabstdlg.hxx   |7 
 sc/source/ui/attrdlg/scdlgfact.cxx |   22 --
 sc/source/ui/attrdlg/scdlgfact.hxx |7 
 sc/source/ui/docshell/docsh4.cxx   |3 
 sc/source/ui/inc/styledlg.hxx  |   21 --
 sc/source/ui/inc/tphf.hxx  |2 
 sc/source/ui/pagedlg/tphf.cxx  |2 
 sc/source/ui/styleui/styledlg.cxx  |  154 ++---
 sc/source/ui/view/formatsh.cxx |   25 --
 sc/uiconfig/scalc/ui/pagetemplatedialog.ui |  201 +-
 sc/uiconfig/scalc/ui/paratemplatedialog.ui |  259 ++---
 11 files changed, 513 insertions(+), 190 deletions(-)

New commits:
commit b2e7956c6ce350eeaa1e4ea79909afd8480ee242
Author: Caolán McNamara 
AuthorDate: Thu Sep 27 16:25:51 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 28 15:36:15 2018 +0200

weld ScStyleDlg

Change-Id: I67e6a6cd1f0b018012c3a373c856494c4fc02979
Reviewed-on: https://gerrit.libreoffice.org/61048
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index b7910d594243..2c0c80c8ee2f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -523,10 +523,9 @@ public:
 const OUString& 
rPageStyle,
 sal_uInt16  nResId 
) = 0;
 
-virtual VclPtr CreateScStyleDlg( vcl::Window*
pParent,
-SfxStyleSheetBase&  
rStyleBase,
-sal_uInt16  
nRscId,
-int nId) = 0;
+virtual VclPtr CreateScStyleDlg(weld::Window* 
pParent,
+  SfxStyleSheetBase&  
rStyleBase,
+  bool bPage /*true : 
page, false: para*/) = 0;
 
 virtual VclPtr CreateScSubTotalDlg( vcl::Window* 
pParent,
 const SfxItemSet*   
pArgSet ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 662b78b09c1a..a23634a41d7d 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1014,25 +1014,11 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vc
 return pDlg ? VclPtr::Create( pDlg ) : nullptr;
 }
 
-VclPtr ScAbstractDialogFactory_Impl::CreateScStyleDlg( 
vcl::Window*  pParent,
-
SfxStyleSheetBase&  rStyleBase,
-
sal_uInt16  nRscId,
-int 
nId)
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScStyleDlg(weld::Window* pParent,
+
SfxStyleSheetBase& rStyleBase,
+
bool bPage)
 {
-VclPtr pDlg;
-switch ( nId )
-{
-case RID_SCDLG_STYLES_PAGE :
-case RID_SCDLG_STYLES_PAR :
-pDlg = VclPtr::Create( pParent, rStyleBase, nRscId );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return VclPtr::Create( pDlg );
-return nullptr;
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rStyleBase, bPage));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const 
SfxItemSet* pArgSet)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3ffc5bc6b367..797d6deaf794 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -671,10 +671,9 @@ public:
 const OUString& 
rPageStyle,
 sal_uInt16  nResId 
) override;
 
-virtual VclPtr CreateScStyleDlg( vcl::Window*
pParent,
-SfxStyleSheetBase&  
rStyleBase,
-sal_uInt16  
nRscId,
-int nId) override;
+virtual VclPtr CreateScStyleDlg(weld::Window* 
pParent,
+  SfxStyleSheetBase& 
rStyleBase,
+  bool bPage) override;
 
 virtual VclPtr CreateScSubTotalDlg( vcl::Window* 
pParent,
 const SfxItemSet*   
pArgSet ) override;
diff --git a/sc/source/ui/docshell/docsh4.cxx

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

2018-05-31 Thread Marco Cecchetti 
 sc/inc/strings.hrc |1 
 sc/inc/validat.hxx |   20 +
 sc/source/core/data/conditio.cxx   |3 +
 sc/source/core/data/validat.cxx|   54 ++---
 sc/source/filter/excel/xicontent.cxx   |9 
 sc/source/filter/oox/worksheethelper.cxx   |6 ++
 sc/source/filter/xml/XMLStylesExportHelper.cxx |6 ++
 sc/source/filter/xml/xmlcvali.cxx  |1 
 sc/source/ui/app/inputhdl.cxx  |   12 +
 sc/source/ui/dbgui/validate.cxx|   26 +---
 sc/source/ui/inc/validate.hxx  |1 
 sc/source/ui/view/cellsh2.cxx  |2 
 sc/uiconfig/scalc/ui/validationcriteriapage.ui |4 +
 13 files changed, 130 insertions(+), 15 deletions(-)

New commits:
commit f15c4b0f3c2cdfa7a72c97301ff32cc1764c54da
Author: Marco Cecchetti 
Date:   Thu Feb 1 12:28:54 2018 +0100

tdf#96698 - calc: add support for custom validation (through a formula)

Now it is possible to select a `custom` validation in the validation
dialog: this type of validation let's the user to define a formula,
the cell content is valid when the formula is evaluted to true, and
not valid when evaluated to false.

The `cutom` validation is correctly saved and restored for ods
documents, and is correctly imported and exported to xlsx documents

This patch contains an adaptation of a preliminary work of Justin Luth
for importing custom validation from xlsx documents. Thanks Justin!

Change-Id: Idc26654ba69a6f73d1b208d63acdad4b880c776d
Reviewed-on: https://gerrit.libreoffice.org/49084
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index ed0fc8df5663..ad3a8fa583dd 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -65,6 +65,7 @@
 #define SCSTR_VALID_MINIMUM NC_("SCSTR_VALID_MINIMUM", 
"~Minimum")
 #define SCSTR_VALID_MAXIMUM NC_("SCSTR_VALID_MAXIMUM", 
"~Maximum")
 #define SCSTR_VALID_VALUE   NC_("SCSTR_VALID_VALUE", 
"~Value")
+#define SCSTR_VALID_FORMULA NC_("SCSTR_VALID_FORMULA", 
"~Formula")
 #define SCSTR_VALID_RANGE   NC_("SCSTR_VALID_RANGE", 
"~Source")
 #define SCSTR_VALID_LISTNC_("SCSTR_VALID_LIST", 
"~Entries")
 // for dialogues:
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index bc13663a7e6d..92e87901fc9d 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -132,6 +132,26 @@ public:
 bool IsDataValid(
 const OUString& rTest, const ScPatternAttr& rPattern, const ScAddress& 
rPos ) const;
 
+// Custom validations (SC_VALID_CUSTOM) should be validated using this 
specific method.
+// Take care that internally this method commits to the to be validated 
cell the new input,
+// in order to be able to interpret the validating boolean formula on the 
new input.
+// After the formula has been evaluated the original cell content is 
restored.
+// At present is only used in ScInputHandler::EnterHandler: handling this 
case in the
+// regular IsDataValid method would have been unsafe since it can be 
invoked
+// by ScFormulaCell::InterpretTail.
+
+struct CustomValidationPrivateAccess
+{
+// so IsDataValidCustom can be invoked only by ScInputHandler methods
+friend class ScInputHandler;
+private:
+CustomValidationPrivateAccess() {}
+};
+
+bool IsDataValidCustom(
+const OUString& rTest, const ScPatternAttr& rPattern,
+const ScAddress& rPos, const CustomValidationPrivateAccess& ) const;
+
 bool IsDataValid( ScRefCellValue& rCell, const ScAddress& rPos ) const;
 
 // TRUE -> break
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d07c98ebbf8d..173aa43dc763 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1242,6 +1242,9 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& 
rCell, const ScAddress& rPos
 {
 const_cast(this)->Interpret(rPos); // Evaluate formula
 
+if ( eOp == ScConditionMode::Direct )
+return nVal1 != 0.0;
+
 double nArg = 0.0;
 OUString aArgStr;
 bool bVal = lcl_GetCellContent( rCell, bIsStr1, nArg, aArgStr, mpDoc );
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 01e1fa41ca38..813c9940ff9f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -426,6 +426,51 @@ bool ScValidationData::DoError(weld::Window* pParent, 
const OUString& rInput,
 return ( eErrorStyle == SC_VALERR_STOP || nRet == RET_CANCEL );
 }
 
+bool ScValidationData::IsDataValidCustom(
+const OUString& rTest,
+const ScPatternAttr& rPattern,
+

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

2018-05-19 Thread Caolán McNamara 
 sc/inc/scabstdlg.hxx|2 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   11 +-
 sc/source/ui/attrdlg/scdlgfact.hxx  |   11 +-
 sc/source/ui/dbgui/sortdlg.cxx  |   38 +++-
 sc/source/ui/inc/sortdlg.hxx|   17 +--
 sc/source/ui/view/cellsh2.cxx   |2 
 sc/uiconfig/scalc/ui/sortwarning.ui |  168 
 7 files changed, 118 insertions(+), 131 deletions(-)

New commits:
commit 71f855bd31009b4a4463bcb0826fed6e4a8faaea
Author: Caolán McNamara 
Date:   Sat May 19 16:44:27 2018 +0100

weld ScSortWarningDlg

Change-Id: I9462906fbe77a8463d7b283942c5280fdd71239e
Reviewed-on: https://gerrit.libreoffice.org/54565
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index f5b299c8dde8..392e4d60fa2d 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -410,7 +410,7 @@ public:
 bool bCol,
 bool bRow) = 0;
 
-virtual VclPtr 
CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const 
OUString& rCurrentText ) = 0;
+virtual VclPtr 
CreateScSortWarningDlg(weld::Window* pParent, const OUString& rExtendText, 
const OUString& rCurrentText ) = 0;
 
 virtual VclPtr 
CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const 
ScConditionalFormatList* pFormatList ) = 0;
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 89179fed4b6e..a84d7dc9b5dd 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -173,7 +173,11 @@ bool 
AbstractScShowTabDlg_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContex
 return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
 }
 
-IMPL_ABSTDLG_BASE(AbstractScSortWarningDlg_Impl);
+short AbstractScSortWarningDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
 IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
@@ -699,10 +703,9 @@ VclPtr  
ScAbstractDialogFactory_Impl::CreateScColRowLa
 return VclPtr::Create(new 
ScColRowLabelDlg(pParent, bCol, bRow));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( vcl::Window* pParent, 
const OUString& rExtendText, const OUString& rCurrentText )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg(weld::Window* pParent, 
const OUString& rExtendText, const OUString& rCurrentText)
 {
-VclPtr pDlg = VclPtr::Create(pParent, 
rExtendText, rCurrentText );
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
ScSortWarningDlg(pParent, rExtendText, rCurrentText));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, 
ScDocument* pDoc, const ScConditionalFormatList* pFormatList )
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 184eaddb11c0..27e6513b2904 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -440,7 +440,14 @@ public:
 
 class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg
 {
-DECL_ABSTDLG_BASE( AbstractScSortWarningDlg_Impl, ScSortWarningDlg )
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScSortWarningDlg_Impl(ScSortWarningDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
 };
 
 class AbstractScStringInputDlg_Impl :  public AbstractScStringInputDlg
@@ -508,7 +515,7 @@ public:
 bool bCol,
 bool bRow) 
override;
 
-virtual VclPtr 
CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const 
OUString& rCurrentText ) override;
+virtual VclPtr 
CreateScSortWarningDlg(weld::Window* pParent, const OUString& rExtendText, 
const OUString& rCurrentText ) override;
 
 virtual VclPtr 
CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const 
ScConditionalFormatList* pFormatList ) override;
 
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index d192885ac773..53feb2d16c4d 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -31,45 +31,35 @@ ScSortDlg::ScSortDlg(vcl::Window* pParent, const 
SfxItemSet* pArgSet)
 AddTabPage("options", ScTabPageSortOptions::Create, nullptr);
 }
 
-ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent,
+ScSortWarningDlg::ScSortWarningDlg(weld::Window* pParent,
 const OUString& rExtendText, const OUString& rCurrentText)
-: ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui")
+: GenericDialogController(pParent, "modules/scalc/ui/sortwarning.ui",

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

2018-05-18 Thread Caolán McNamara 
 sc/inc/scabstdlg.hxx|3 --
 sc/source/ui/attrdlg/scdlgfact.cxx  |   14 ++-
 sc/source/ui/attrdlg/scdlgfact.hxx  |   11 ++---
 sc/source/ui/inc/lbseldlg.hxx   |   16 -
 sc/source/ui/miscdlgs/lbseldlg.cxx  |   34 ++-
 sc/source/ui/view/cellsh2.cxx   |3 --
 sc/uiconfig/scalc/ui/selectrange.ui |   44 
 7 files changed, 76 insertions(+), 49 deletions(-)

New commits:
commit c8e50e5d407eb0957d8b49683dd45d50d715929a
Author: Caolán McNamara 
Date:   Fri May 18 11:49:27 2018 +0100

weld ScSelEntryDlg

Change-Id: I1bc78b61a50f909ceb4c79e9dc9425306d41e617
Reviewed-on: https://gerrit.libreoffice.org/54534
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 979876d88c77..1815e2680802 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -450,8 +450,7 @@ public:
 virtual VclPtr 
CreateScInsertTableDlg(weld::Window* pParent, ScViewData& rViewData,
 SCTAB nTabCount, bool bFromFile) = 0;
 
-virtual VclPtr CreateScSelEntryDlg ( vcl::Window* 
pParent,
-  const 
std::vector  ) = 0;
+virtual VclPtr CreateScSelEntryDlg(weld::Window* 
pParent, const std::vector ) = 0;
 virtual VclPtr 
CreateScLinkedAreaDlg(weld::Window* pParent) = 0;
 
 virtual VclPtr 
CreateScMetricInputDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index b5a434272149..d0d098d1fb45 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -129,7 +129,10 @@ short AbstractScInsertTableDlg_Impl::Execute()
 return m_xDlg->execute();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl);
+short AbstractScSelEntryDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScMetricInputDlg_Impl::Execute()
 {
@@ -443,7 +446,7 @@ const OUString* 
AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
 
 OUString AbstractScSelEntryDlg_Impl::GetSelectedEntry() const
 {
-return pDlg->GetSelectedEntry();
+return m_xDlg->GetSelectedEntry();
 }
 
 void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, 
const OUString& rFilter,
@@ -777,11 +780,10 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertTab
 return VclPtr::Create(new 
ScInsertTableDlg(pParent, rViewData,nTabCount, bFromFile));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( vcl::Window* pParent,
-const 
std::vector  )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScSelEntryDlg(weld::Window* pParent,
+   
 const std::vector )
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
rEntryList );
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
ScSelEntryDlg(pParent, rEntryList));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(weld::Window* pParent)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index d2a1a694c6aa..a62239af8a87 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -288,7 +288,13 @@ public:
 
 class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
 {
-DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg )
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScSelEntryDlg_Impl(ScSelEntryDlg* p)
+: m_xDlg(p)
+{
+}
+virtual shortExecute() override;
 virtual OUString GetSelectedEntry() const override;
 };
 
@@ -535,8 +541,7 @@ public:
 virtual VclPtr 
CreateScInsertTableDlg(weld::Window* pParent, ScViewData& rViewData,
 SCTAB nTabCount, bool bFromFile) override;
 
-virtual VclPtr CreateScSelEntryDlg ( vcl::Window* 
pParent,
-  const 
std::vector  ) override;
+virtual VclPtr CreateScSelEntryDlg(weld::Window* 
pParent, const std::vector ) override;
 
 virtual VclPtr 
CreateScLinkedAreaDlg(weld::Window* pParent) override;
 
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index 0b45c70e8fa1..fc78c8a77367 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -20,24 +20,18 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX
 
-#include 
-#include 
+#include 
 
-#include 
-
-#include 
-
-class ScSelEntryDlg : public ModalDialog
+class ScSelEntryDlg : public weld::GenericDialogController
 {
 private:
-VclPtr m_pLb;
+std::unique_ptr m_xLb;
 
-DECL_LINK( DblClkHdl, ListBox&, void );
+DECL_LINK(DblClkHdl, weld::TreeView&, void);
 
 public:
-

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

2018-05-15 Thread Caolán McNamara 
 sc/inc/scabstdlg.hxx   |2 
 sc/source/ui/attrdlg/scdlgfact.cxx |   26 ++-
 sc/source/ui/attrdlg/scdlgfact.hxx |   10 +
 sc/source/ui/inc/filldlg.hxx   |   86 ++--
 sc/source/ui/miscdlgs/filldlg.cxx  |  252 -
 sc/source/ui/view/cellsh1.cxx  |2 
 sc/uiconfig/scalc/ui/filldlg.ui|   37 +++--
 7 files changed, 199 insertions(+), 216 deletions(-)

New commits:
commit d9f4c8ded46ddc4892bb47128011ba85d6f7cd22
Author: Caolán McNamara 
Date:   Mon May 14 17:32:27 2018 +0100

weld ScFillSeriesDlg

Change-Id: I1b4c6777d3334813c6bfe47efbb67f065efa555c
Reviewed-on: https://gerrit.libreoffice.org/54338
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 77c3410f0aee..88af9b1ccb4c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -429,7 +429,7 @@ public:
 ScTabViewShell* pTabViewShell) = 0;
 
 virtual VclPtr 
CreateScDeleteContentsDlg(weld::Window* pParent) = 0;
-virtual VclPtr CreateScFillSeriesDlg( 
vcl::Window*pParent,
+virtual VclPtr 
CreateScFillSeriesDlg(weld::Window*pParent,
 ScDocument& 
rDocument,
 FillDir 
eFillDir,
 FillCmd 
eFillCmd,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 35279d838fc8..d00b2d76f0a0 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -96,7 +96,10 @@ short AbstractScDeleteContentsDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
+short AbstractScFillSeriesDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScGroupDlg_Impl::Execute()
 {
@@ -289,42 +292,42 @@ InsertDeleteFlags 
AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() cons
 
 FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const
 {
-return pDlg->GetFillDir();
+return m_xDlg->GetFillDir();
 }
 
 FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const
 {
-return pDlg->GetFillCmd();
+return m_xDlg->GetFillCmd();
 }
 
 FillDateCmd AbstractScFillSeriesDlg_Impl::GetFillDateCmd() const
 {
-return pDlg->GetFillDateCmd();
+return m_xDlg->GetFillDateCmd();
 }
 
 double  AbstractScFillSeriesDlg_Impl::GetStart() const
 {
-return pDlg->GetStart();
+return m_xDlg->GetStart();
 }
 
 double  AbstractScFillSeriesDlg_Impl::GetStep() const
 {
-return pDlg->GetStep();
+return m_xDlg->GetStep();
 }
 
 double  AbstractScFillSeriesDlg_Impl::GetMax() const
 {
-return pDlg->GetMax();
+return m_xDlg->GetMax();
 }
 
 OUString  AbstractScFillSeriesDlg_Impl::GetStartStr() const
 {
-return pDlg->GetStartStr();
+return m_xDlg->GetStartStr();
 }
 
 voidAbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag)
 {
-pDlg->SetEdStartValEnabled(bFlag);
+m_xDlg->SetEdStartValEnabled(bFlag);
 }
 
 bool AbstractScGroupDlg_Impl::GetColsChecked() const
@@ -724,7 +727,7 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDelete
 return VclPtr::Create(new 
ScDeleteContentsDlg(pParent));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vcl::Window*   pParent,
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg(weld::Window*   pParent,
 ScDocument& 
rDocument,
 FillDir 
eFillDir,
 FillCmd 
eFillCmd,
@@ -734,8 +737,7 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeries
 double  
fMax,
 sal_uInt16  
nPossDir)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
ScFillSeriesDlg(pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, 
aStartStr,fStep,fMax,nPossDir));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, 
bool bUnGroup)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3da1d5a9767d..f0fdfbf67fa2 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -193,7 +193,13 @@ public:
 
 class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
 {
-DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit

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

2018-04-30 Thread Caolán McNamara 
 sc/inc/scabstdlg.hxx  |3 --
 sc/source/ui/attrdlg/scdlgfact.cxx|   14 +++-
 sc/source/ui/attrdlg/scdlgfact.hxx|   11 +++---
 sc/source/ui/inc/groupdlg.hxx |   13 ---
 sc/source/ui/miscdlgs/groupdlg.cxx|   37 --
 sc/source/ui/view/cellsh1.cxx |4 +--
 sc/uiconfig/scalc/ui/groupdialog.ui   |   12 +++
 sc/uiconfig/scalc/ui/ungroupdialog.ui |   12 +++
 8 files changed, 54 insertions(+), 52 deletions(-)

New commits:
commit 7c112da22428ea56045f24911854a5569bd851df
Author: Caolán McNamara 
Date:   Mon Apr 30 12:06:43 2018 +0100

weld ScGroupDlg

Change-Id: If62c664dbc068bde3fee552aabe35243eeb28a47
Reviewed-on: https://gerrit.libreoffice.org/53659
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index dc4e89043bf6..9e097aef5aa2 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -440,8 +440,7 @@ public:
 double  
fMax,
 sal_uInt16 
 nPossDir) = 0;
 
-virtual VclPtr CreateAbstractScGroupDlg( vcl::Window* 
pParent,
-bool bUnGroup = 
false ) = 0;
+virtual VclPtr CreateAbstractScGroupDlg(weld::Window* 
pParent, bool bUnGroup = false) = 0;
 
 virtual VclPtr 
CreateScInsertCellDlg(weld::Window* pParent,
  bool 
bDisallowCellMove) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index f8d4b8f0d542..1d3d3d10f1f9 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -97,7 +97,11 @@ short AbstractScDeleteContentsDlg_Impl::Execute()
 }
 
 IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl);
+
+short AbstractScGroupDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScInsertCellDlg_Impl::Execute()
 {
@@ -307,7 +311,7 @@ void
AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag)
 
 bool AbstractScGroupDlg_Impl::GetColsChecked() const
 {
-return pDlg->GetColsChecked();
+return m_xDlg->GetColsChecked();
 }
 
 InsCellCmd  AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
@@ -721,11 +725,9 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeries
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl::Window* pParent,
-bool bUnGroup )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, 
bool bUnGroup)
 {
-VclPtr pDlg = VclPtr::Create( pParent, bUnGroup, 
true/*bRows*/);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new ScGroupDlg(pParent, 
bUnGroup, true/*bRows*/));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3b1d5334b08b..d4565762ed22 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -206,7 +206,13 @@ class AbstractScFillSeriesDlg_Impl:public 
AbstractScFillSeriesDlg
 
 class AbstractScGroupDlg_Impl :  public AbstractScGroupDlg
 {
-DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScGroupDlg_Impl(ScGroupDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
 virtual bool GetColsChecked() const override;
 };
 
@@ -469,8 +475,7 @@ public:
 double  
fStep,
 double  
fMax,
 sal_uInt16   
nPossDir) override;
-virtual VclPtr CreateAbstractScGroupDlg( vcl::Window* 
pParent,
-bool bUnGroup = 
false) override;
+virtual VclPtr CreateAbstractScGroupDlg(weld::Window* 
pParent, bool bUnGroup = false) override;
 
 virtual VclPtr 
CreateScInsertCellDlg(weld::Window* pParent,
   bool 
bDisallowCellMove) override;
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index 47cc587a375c..6f654d193594 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -20,21 +20,18 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX
 
-#include 
-#include 
-#include 
+#include 
 
-class ScGroupDlg : public ModalDialog
+class ScGroupDlg : public

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sfx2/uiconfig

2018-04-13 Thread Caolán McNamara 
 sc/inc/scabstdlg.hxx|4 +-
 sc/source/ui/attrdlg/scdlgfact.cxx  |   17 +---
 sc/source/ui/attrdlg/scdlgfact.hxx  |   12 --
 sc/source/ui/inc/inscldlg.hxx   |   17 +++-
 sc/source/ui/miscdlgs/inscldlg.cxx  |   69 ++--
 sc/source/ui/view/cellsh1.cxx   |2 -
 sc/uiconfig/scalc/ui/insertcells.ui |   14 ---
 sfx2/uiconfig/ui/bookmarkdialog.ui  |5 --
 8 files changed, 76 insertions(+), 64 deletions(-)

New commits:
commit 03a59d9f43c3bbe80e1f06b1a95afd4694ac2f50
Author: Caolán McNamara 
Date:   Fri Apr 13 12:20:13 2018 +0100

weld ScInsertCellDlg

Change-Id: I91118d4c0c5e2fa17fed02377547caa65e11bfdc
Reviewed-on: https://gerrit.libreoffice.org/52824
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index ccdd419f2a69..d970cac36827 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -443,8 +443,8 @@ public:
 virtual VclPtr CreateAbstractScGroupDlg( vcl::Window* 
pParent,
 bool bUnGroup = 
false ) = 0;
 
-virtual VclPtr CreateScInsertCellDlg( 
vcl::Window* pParent,
- bool 
bDisallowCellMove ) = 0;
+virtual VclPtr 
CreateScInsertCellDlg(weld::Window* pParent,
+ bool 
bDisallowCellMove) = 0;
 
 virtual VclPtr CreateScInsertContentsDlg( 
vcl::Window*pParent,
 const 
OUString* pStrTitle = nullptr ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 101ad4c56d96..2c7c7eb2ebba 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -88,7 +88,12 @@ IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScInsertCellDlg_Impl);
+
+short AbstractScInsertCellDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
 IMPL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScInsertTableDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl);
@@ -113,6 +118,7 @@ IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl);
 AbstractScLinkedAreaDlg_Impl::~AbstractScLinkedAreaDlg_Impl()
 {
 }
+
 short AbstractScLinkedAreaDlg_Impl::Execute()
 {
 return m_xDlg->run();
@@ -296,7 +302,7 @@ bool AbstractScGroupDlg_Impl::GetColsChecked() const
 
 InsCellCmd  AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
 {
-return pDlg->GetInsCellCmd();
+return m_xDlg->GetInsCellCmd();
 }
 
 InsertDeleteFlags AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() 
const
@@ -714,11 +720,10 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDl
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( vcl::Window* pParent,
-bool 
bDisallowCellMove )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent,
+bool 
bDisallowCellMove)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
bDisallowCellMove);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
ScInsertCellDlg(pParent, bDisallowCellMove));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window*  
pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 86cf786de353..1f2bcee38bce 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -200,7 +200,13 @@ class AbstractScGroupDlg_Impl :  public AbstractScGroupDlg
 
 class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg
 {
-DECL_ABSTDLG_BASE( AbstractScInsertCellDlg_Impl, ScInsertCellDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScInsertCellDlg_Impl(ScInsertCellDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short   Execute() override;
 virtual InsCellCmd GetInsCellCmd() const override ;
 };
 
@@ -449,8 +455,8 @@ public:
 virtual VclPtr CreateAbstractScGroupDlg( vcl::Window* 
pParent,
 bool bUnGroup = 
false) override;
 
-virtual VclPtr CreateScInsertCellDlg( 
vcl::Window* pParent,
- bool 
bDisallowCellMove ) override;
+virtual VclPtr 
CreateScInsertCellDlg(weld::Window* pParent,
+  bool 
bDisallowCellMove) override;
 
 virtual VclPtr

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

2017-11-27 Thread heiko tietze 
 sc/inc/strings.hrc |2 +
 sc/source/ui/dialogs/searchresults.cxx |   45 +
 sc/source/ui/inc/searchresults.hxx |4 ++
 sc/uiconfig/scalc/ui/searchresults.ui  |   25 +-
 4 files changed, 42 insertions(+), 34 deletions(-)

New commits:
commit 470682b3abf0622f5e9663d62d8641f63ceb6f30
Author: heiko tietze 
Date:   Sat Nov 25 12:35:59 2017 +0100

tdf#113831 Show number of search results

Skipped label used to show the number via resource strings

Change-Id: I6f57799565126c202041d0bf6a9f361d4e64cdfd
Reviewed-on: https://gerrit.libreoffice.org/45269
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index e82b9d1f5362..a29c93b54a7c 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -47,6 +47,8 @@
 #define SCSTR_NO_TAB_BG_COLOR   
NC_("SCSTR_NO_TAB_BG_COLOR", "Default")
 #define SCSTR_RENAMEOBJECT  NC_("SCSTR_RENAMEOBJECT", 
"Name Object")
 #define STR_INSERTGRAPHIC   NC_("STR_INSERTGRAPHIC", 
"Insert Image")
+#define SCSTR_TOTAL NC_("SCSTR_TOTAL", "%1 
results found")
+#define SCSTR_SKIPPED   NC_("SCSTR_SKIPPED", 
"(only %1 are listed)")
 // Attribute
 #define SCSTR_PROTECTDOCNC_("SCSTR_PROTECTDOC", 
"Protect Document")
 #define SCSTR_UNPROTECTDOC  NC_("SCSTR_UNPROTECTDOC", 
"Unprotect document")
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index d9cf33f1a4be..f72bb7423388 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -25,9 +25,11 @@ namespace sc {
 
 SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* 
pParent ) :
 ModelessDialog(pParent, "SearchResultsDialog", 
"modules/scalc/ui/searchresults.ui"),
+aSkipped( ScResId( SCSTR_SKIPPED ) ),
+aTotal( ScResId( SCSTR_TOTAL ) ),
 mpBindings(_pBindings), mpDoc(nullptr)
 {
-get(mpLabel, "skipped");
+get(mpSearchResults, "lbSearchResults");
 
 SvSimpleTableContainer *pContainer = 
get("results");
 Size aControlSize(150, 120);
@@ -50,23 +52,19 @@ SearchResultsDlg::~SearchResultsDlg()
 void SearchResultsDlg::dispose()
 {
 mpList.disposeAndClear();
-mpLabel.disposeAndClear();
+mpSearchResults.disposeAndClear();
 ModelessDialog::dispose();
 }
 
 namespace
 {
 class ListWrapper {
-size_t mnCount;
-static const size_t mnMaximum = 1000;
 OUStringBuffer maName;
-VclPtr mpLabel;
 VclPtr mpList;
 public:
-ListWrapper(const VclPtr ,
-const VclPtr ) :
-mnCount(0),
-mpLabel(pLabel),
+size_t mnCount = 0;
+static const size_t mnMaximum = 1000;
+ListWrapper(const VclPtr ) :
 mpList(pList)
 {
 mpList->Clear();
@@ -88,33 +86,19 @@ namespace
 mpList->InsertEntry(maName.makeStringAndClear());
 }
 }
-void Update()
-{
-if (mnCount > mnMaximum)
-{
-if (mpLabel)
-{
-size_t nSkipped = mnCount - mnMaximum;
-OUString aSkipped(mpLabel->GetText());
-mpList->InsertEntry(
-aSkipped.replaceFirst("$1", 
OUString::number(nSkipped)));
-}
-}
-mpList->SetUpdateMode(true);
-}
 };
 }
 
 void SearchResultsDlg::FillResults( ScDocument* pDoc, const ScRangeList 
, bool bCellNotes )
 {
-ListWrapper aList(mpList, mpLabel);
+ListWrapper aList(mpList);
 std::vector aTabNames = pDoc->GetAllTableNames();
 SCTAB nTabCount = aTabNames.size();
 
 // tdf#92160 - too many results blow the widget's mind
 size_t nMatchMax = rMatchedRanges.size();
-if (nMatchMax > 1000)
-nMatchMax = 1000;
+if (nMatchMax > ListWrapper::mnMaximum)
+nMatchMax = ListWrapper::mnMaximum;
 
 if (bCellNotes)
 {
@@ -163,7 +147,14 @@ void SearchResultsDlg::FillResults( ScDocument* pDoc, 
const ScRangeList 
 }
 }
 }
-aList.Update();
+
+OUString aSearchResults = ScGlobal::ReplaceOrAppend( aTotal, "%1", 
OUString::number( aList.mnCount ) );
+if (aList.mnCount > ListWrapper::mnMaximum)
+aSearchResults += " " + ScGlobal::ReplaceOrAppend( aSkipped, "%1", 
OUString::number( ListWrapper::mnMaximum ) );
+mpSearchResults->SetText(aSearchResults);
+
+mpList->SetUpdateMode(true);
+
 mpDoc = pDoc;
 }
 
diff --git a/sc/source/ui/inc/searchresults.hxx 
b/sc/source/ui/inc/searchresults.hxx
index ae9707ef2ac4..f07cc19ce5df 100644
--- a/sc/source/ui/inc/searchresults.hxx
+++

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

2017-01-27 Thread Abhilash Singh 
 sc/inc/globstr.hrc  |4 +++-
 sc/inc/rangenam.hxx |   10 +-
 sc/source/core/tool/rangenam.cxx|   12 ++--
 sc/source/ui/app/inputwin.cxx   |2 +-
 sc/source/ui/dbgui/dbnamdlg.cxx |2 +-
 sc/source/ui/inc/namedefdlg.hxx |1 +
 sc/source/ui/namedlg/namedefdlg.cxx |   13 +++--
 sc/source/ui/namedlg/namedlg.cxx|2 +-
 sc/source/ui/src/globstr.src|4 
 sc/source/ui/vba/vbanames.cxx   |4 ++--
 sc/uiconfig/scalc/ui/definename.ui  |2 +-
 11 files changed, 40 insertions(+), 16 deletions(-)

New commits:
commit 413232229cbfd9d49ce9d1cdbb6b6e2dbe83af38
Author: Abhilash Singh 
Date:   Sun Jan 22 14:42:15 2017 +0530

tdf#86214 User isn't warned entering a cell address not allowed

Refactored ScRangeData::IsNameValid

Change-Id: I74dd5830d13e48e8fe9a5180a819be4acdc9a1db
Reviewed-on: https://gerrit.libreoffice.org/33386
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 68d48d9..3b3cef6 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -712,7 +712,9 @@
 
 #define STR_QUERY_PIVOTTABLE_DELTAB 545
 
-#define SC_GLOBSTR_STR_COUNT546 /**< the count of permanently 
resident strings */
+#define STR_ERR_NAME_INVALID_CELL_REF   546
+
+#define SC_GLOBSTR_STR_COUNT547 /**< the count of permanently 
resident strings */
 
 #endif
 
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 19c288b..737c5e6 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -59,6 +59,13 @@ public:
 AbsPos = 0x0080
 };
 
+enum IsNameValidType
+{
+NAME_VALID,
+NAME_INVALID_CELL_REF,
+NAME_INVALID_BAD_STRING
+};
+
 private:
 OUStringaName;
 OUStringaUpperName; // #i62977# for faster searching (aName is 
never modified after ctor)
@@ -154,7 +161,8 @@ public:
 voidValidateTabRefs();
 
 static void MakeValidName( OUString& rName );
-SC_DLLPUBLIC static boolIsNameValid( const OUString& rName, 
ScDocument* pDoc );
+
+SC_DLLPUBLIC static IsNameValidType IsNameValid( const OUString& 
rName, ScDocument* pDoc );
 
 SCROW GetMaxRow() const;
 SCCOL GetMaxCol() const;
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index d7fba04..1728460 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -474,21 +474,21 @@ void ScRangeData::MakeValidName( OUString& rName )
 }
 }
 
-bool ScRangeData::IsNameValid( const OUString& rName, ScDocument* pDoc )
+ScRangeData::IsNameValidType ScRangeData::IsNameValid( const OUString& rName, 
ScDocument* pDoc )
 {
 /* XXX If changed, sc/source/filter/ftools/ftools.cxx
  * ScfTools::ConvertToScDefinedName needs to be changed too. */
 sal_Char a('.');
 if (rName.indexOf(a) != -1)
-return false;
+return NAME_INVALID_BAD_STRING;
 sal_Int32 nPos = 0;
 sal_Int32 nLen = rName.getLength();
 if ( !nLen || !ScCompiler::IsCharFlagAllConventions( rName, nPos++, 
ScCharFlags::CharName ) )
-return false;
+return NAME_INVALID_BAD_STRING;
 while ( nPos < nLen )
 {
 if ( !ScCompiler::IsCharFlagAllConventions( rName, nPos++, 
ScCharFlags::Name ) )
-return false;
+return NAME_INVALID_BAD_STRING;
 }
 ScAddress aAddr;
 ScRange aRange;
@@ -500,10 +500,10 @@ bool ScRangeData::IsNameValid( const OUString& rName, 
ScDocument* pDoc )
 if (aRange.Parse(rName, pDoc, details) != ScRefFlags::ZERO ||
  aAddr.Parse(rName, pDoc, details) != ScRefFlags::ZERO )
 {
-return false;
+return NAME_INVALID_CELL_REF;
 }
 }
-return true;
+return NAME_VALID;
 }
 
 SCROW ScRangeData::GetMaxRow() const
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 9239398..9f94098 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1991,7 +1991,7 @@ static ScNameInputType lcl_GetInputType( const OUString& 
rText )
 eRet = SC_NAME_INPUT_ROW;
 else if ( pDoc->GetTable( rText, nNameTab ) )
 eRet = SC_NAME_INPUT_SHEET;
-else if ( ScRangeData::IsNameValid( rText, pDoc ) ) // nothing 
found, create new range?
+else if ( ScRangeData::IsNameValid( rText, pDoc ) == 
ScRangeData::NAME_VALID ) // nothing found, create new range?
 {
 if ( rViewData.GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
 eRet = SC_NAME_INPUT_DEFINE;
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 8c91758..4596729 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -416,7 +416,7 @@ IMPL_LINK_NOARG(ScDbNameDlg,

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

2015-10-16 Thread Katarina Behrens 
 sc/inc/docoptio.hxx   |5 +
 sc/inc/formulaopt.hxx |4 +
 sc/source/core/tool/docoptio.cxx  |4 +
 sc/source/core/tool/formulaopt.cxx|   63 --
 sc/source/ui/inc/tpformula.hxx|4 +
 sc/source/ui/optdlg/calcoptionsdlg.cxx|   12 +++-
 sc/source/ui/optdlg/calcoptionsdlg.hxx|6 +-
 sc/source/ui/optdlg/tpformula.cxx |   16 -
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |   15 +
 9 files changed, 108 insertions(+), 21 deletions(-)

New commits:
commit 313df729a3b6a94275ac992e74b18256fd286f93
Author: Katarina Behrens 
Date:   Mon Oct 12 11:43:46 2015 +0200

tdf#92256, c#19: Implement "current doc only" switch

that'll save calculation settings into current document only, not
into global user profile

Change-Id: I50ab31b679f712ff512f85a2cd58319d356462ea
Reviewed-on: https://gerrit.libreoffice.org/19318
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 1a54a3e..d8ff785 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -46,6 +46,7 @@ class SC_DLLPUBLIC ScDocOptions
 bool   bDoAutoSpell;///< auto-spelling
 bool   bLookUpColRowNames;  ///< determine column-/row titles 
automagically
 bool   bFormulaRegexEnabled;///< regular expressions in formulas 
enabled
+bool   bWriteCalcConfig;///< (subset of) Calc config will be 
written to user's profile
 public:
 ScDocOptions();
 ScDocOptions( const ScDocOptions& rCpy );
@@ -91,6 +92,8 @@ public:
 voidSetFormulaRegexEnabled( bool bVal ) { bFormulaRegexEnabled = bVal; 
}
 boolIsFormulaRegexEnabled() const   { return bFormulaRegexEnabled; 
}
 
+voidSetWriteCalcConfig( bool bVal ) { bWriteCalcConfig = bVal; }
+boolIsWriteCalcConfig() const   { return bWriteCalcConfig; }
 };
 
 inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
@@ -110,6 +113,7 @@ inline const ScDocOptions& ScDocOptions::operator=( const 
ScDocOptions& rCpy )
 bDoAutoSpell= rCpy.bDoAutoSpell;
 bLookUpColRowNames  = rCpy.bLookUpColRowNames;
 bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
+bWriteCalcConfig= rCpy.bWriteCalcConfig;
 
 return *this;
 }
@@ -132,6 +136,7 @@ inline bool ScDocOptions::operator==( const ScDocOptions& 
rOpt ) const
 &&  rOpt.bDoAutoSpell   == bDoAutoSpell
 &&  rOpt.bLookUpColRowNames == bLookUpColRowNames
 &&  rOpt.bFormulaRegexEnabled   == bFormulaRegexEnabled
+&&  rOpt.bWriteCalcConfig   == bWriteCalcConfig
 );
 }
 
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index ce56f20..8a903d2 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -25,6 +25,7 @@ private:
 bool bUseEnglishFuncName; // use English function name even if the 
locale is not English.
 formula::FormulaGrammar::Grammar eFormulaGrammar;  // formula grammar used 
to switch different formula syntax
 ScCalcConfig aCalcConfig;
+bool mbWriteCalcConfig;
 
 OUString aFormulaSepArg;
 OUString aFormulaSepArrayRow;
@@ -50,6 +51,9 @@ public:
 void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; }
 bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; }
 
+void SetWriteCalcConfig( bool bVal ) { mbWriteCalcConfig = bVal; }
+bool GetWriteCalcConfig() const { return mbWriteCalcConfig; }
+
 void SetFormulaSepArg(const OUString& rSep) { aFormulaSepArg = rSep; }
 OUString GetFormulaSepArg() const { return aFormulaSepArg; }
 
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index c90bd94..656be6e 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -71,7 +71,8 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
 bMatchWholeCell( rCpy.bMatchWholeCell ),
 bDoAutoSpell( rCpy.bDoAutoSpell ),
 bLookUpColRowNames( rCpy.bLookUpColRowNames ),
-bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled )
+bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
+bWriteCalcConfig( rCpy.bWriteCalcConfig )
 {
 }
 
@@ -96,6 +97,7 @@ void ScDocOptions::ResetDocOptions()
 bDoAutoSpell= false;
 bLookUpColRowNames  = true;
 bFormulaRegexEnabled= true;
+bWriteCalcConfig= true;
 }
 
 //  ScTpCalcItem - Daten fuer die CalcOptions-TabPage
diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index 166429f..db1bc0b 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -36,6 +36,7 @@

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

2014-08-06 Thread Szymon Kłos 
 sc/UIConfig_scalc.mk|1 
 sc/inc/sc.hrc   |7 +
 sc/source/ui/inc/conflictsdlg.hrc   |   37 --
 sc/source/ui/inc/conflictsdlg.hxx   |   17 +-
 sc/source/ui/miscdlgs/conflictsdlg.cxx  |  169 
 sc/source/ui/miscdlgs/conflictsdlg.src  |  100 +++-
 sc/uiconfig/scalc/ui/conflictsdialog.ui |  191 
 7 files changed, 273 insertions(+), 249 deletions(-)

New commits:
commit 660931a01916bb1386d5855fffd25d355d2c627c
Author: Szymon Kłos eszka...@gmail.com
Date:   Wed Aug 6 09:34:47 2014 +0200

RID_SCDLG_CONFLICTS conversion to .ui

Change-Id: Ibdfa27e834cd8fba0f73228e5fba699c1e90
Reviewed-on: https://gerrit.libreoffice.org/10778
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 423dd8f..0833dc1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/condformatmanager \
sc/uiconfig/scalc/ui/conditionalformatdialog \
+   sc/uiconfig/scalc/ui/conflictsdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \
sc/uiconfig/scalc/ui/covariancedialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index f420815..228cda8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -991,7 +991,12 @@
 #define STR_HASH_GOOD   (STR_START + 438)
 #define STR_HASH_REGENERATED(STR_START + 439)
 #define STR_RETYPE  (STR_START + 440)
-#define STR_END (STR_RETYPE)
+
+#define STR_TITLE_CONFLICT  (STR_START + 441)
+#define STR_TITLE_AUTHOR(STR_START + 442)
+#define STR_TITLE_DATE  (STR_START + 443)
+#define STR_UNKNOWN_USER_CONFLICT(STR_START + 444)
+#define STR_END (STR_UNKNOWN_USER_CONFLICT)
 
 #define BMP_START   (STR_END)
 
diff --git a/sc/source/ui/inc/conflictsdlg.hrc 
b/sc/source/ui/inc/conflictsdlg.hrc
deleted file mode 100644
index bbdcd88..000
--- a/sc/source/ui/inc/conflictsdlg.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include sc.hrc
-
-#define FT_CONFLICTS1
-#define LB_CONFLICTS2
-#define BTN_KEEPMINE3
-#define BTN_KEEPOTHER   4
-#define FL_CONFLICTS5
-#define BTN_KEEPALLMINE 6
-#define BTN_KEEPALLOTHERS   7
-#define BTN_CANCEL  8
-#define BTN_HELP9
-
-#define STR_TITLE_CONFLICT  1
-#define STR_TITLE_AUTHOR2
-#define STR_TITLE_DATE  3
-#define STR_UNKNOWN_USER4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/conflictsdlg.hxx 
b/sc/source/ui/inc/conflictsdlg.hxx
index 6123dbc..05d16ff 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -116,16 +116,12 @@ public:
 class ScConflictsDlg : public ModalDialog
 {
 private:
-FixedText   maFtConflicts;
-SvSimpleTableContainer m_aLbConflictsContainer;
-SvxRedlinTable  maLbConflicts;
-PushButton  maBtnKeepMine;
-PushButton  maBtnKeepOther;
-FixedLine   maFlConflicts;
-PushButton  maBtnKeepAllMine;
-PushButton  maBtnKeepAllOthers;
-CancelButtonmaBtnCancel;
-HelpButton  maBtnHelp;
+SvSimpleTableContainer *m_pLbConflictsContainer;
+boost::scoped_ptrSvxRedlinTablem_pLbConflicts;
+PushButton  *m_pBtnKeepMine;
+PushButton  *m_pBtnKeepOther;
+PushButton  *m_pBtnKeepAllMine;
+PushButton  *m_pBtnKeepAllOthers;
 
 OUStringmaStrTitleConflict;
 OUStringmaStrTitleAuthor;
@@ -164,7 +160,6 @@ public:
 ScConflictsDlg( Window* pParent, ScViewData* 
pViewData, ScDocument* pSharedDoc, ScConflictsList rConflictsList );

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

2014-02-14 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |2 
 sc/inc/sc.hrc  |1 
 sc/source/ui/dbgui/pvfundlg.cxx|  187 +++-
 sc/source/ui/dbgui/pvfundlg.src|  204 
 sc/source/ui/inc/pvfundlg.hxx  |   51 +-
 sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui |  574 +
 7 files changed, 689 insertions(+), 331 deletions(-)

New commits:
commit 03497c8b9c88a8be9f124ef4f913a68c29a974bb
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 13 20:39:15 2014 +

convert Data Field Options Dialog to .ui

Change-Id: Ie940352828a9b58d35dd1644d030d6fb5b72d386

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index ac2f383..29bf456 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/createnamesdialog \
sc/uiconfig/scalc/ui/databaroptions \
sc/uiconfig/scalc/ui/datafielddialog \
+   sc/uiconfig/scalc/ui/datafieldoptionsdialog \
sc/uiconfig/scalc/ui/dataform \
sc/uiconfig/scalc/ui/datastreams \
sc/uiconfig/scalc/ui/definedatabaserangedialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index b93ca22..6e5ec3b 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -142,8 +142,6 @@
 
 #define HID_SC_DRAW_RENAME  
SC_HID_SC_DRAW_RENAME
 
-#define HID_SC_DPSUBT_OPT   
SC_HID_SC_DPSUBT_OPT
-#define HID_SC_DPSUBT_HIDE  
SC_HID_SC_DPSUBT_HIDE
 #define HID_SC_DPNUMGROUP   
SC_HID_SC_DPNUMGROUP
 #define HID_SC_DPDATEGROUP  
SC_HID_SC_DPDATEGROUP
 #define HID_SC_DPDATEGROUP_LB   
SC_HID_SC_DPDATEGROUP_LB
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 4cbfb88..3ed851a 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1070,7 +1070,6 @@
 
 #define RID_SCDLG_DAPISERVICE   (SC_DIALOGS_START + 130)
 
-#define RID_SCDLG_DPSUBTOTAL_OPT(SC_DIALOGS_START + 134)
 #define RID_SCDLG_DPNUMGROUP(SC_DIALOGS_START + 135)
 #define RID_SCDLG_DPDATEGROUP   (SC_DIALOGS_START + 136)
 #define RID_SCDLG_DPSHOWDETAIL  (SC_DIALOGS_START + 137)
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 3f5839e..a6c7f7b 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -523,38 +523,36 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn )
 
 ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject rDPObj,
 const ScDPLabelData rLabelData, const ScDPNameVec rDataFields,
-bool bEnableLayout ) :
-ModalDialog ( pParent, ScResId( RID_SCDLG_DPSUBTOTAL_OPT ) ),
-maFlSortBy  ( this, ScResId( FL_SORT_BY ) ),
-maLbSortBy  ( this, ScResId( LB_SORT_BY ) ),
-maRbSortAsc ( this, ScResId( RB_SORT_ASC ) ),
-maRbSortDesc( this, ScResId( RB_SORT_DESC ) ),
-maRbSortMan ( this, ScResId( RB_SORT_MAN ) ),
-maFlLayout  ( this, ScResId( FL_LAYOUT ) ),
-maFtLayout  ( this, ScResId( FT_LAYOUT ) ),
-maLbLayout  ( this, ScResId( LB_LAYOUT ) ),
-maCbLayoutEmpty ( this, ScResId( CB_LAYOUT_EMPTY ) ),
-maFlAutoShow( this, ScResId( FL_AUTOSHOW ) ),
-maCbShow( this, ScResId( CB_SHOW ) ),
-maNfShow( this, ScResId( NF_SHOW ) ),
-maFtShow( this, ScResId( FT_SHOW ) ),
-maFtShowFrom( this, ScResId( FT_SHOW_FROM ) ),
-maLbShowFrom( this, ScResId( LB_SHOW_FROM ) ),
-maFtShowUsing   ( this, ScResId( FT_SHOW_USING ) ),
-maLbShowUsing   ( this, ScResId( LB_SHOW_USING ) ),
-maFlHide( this, ScResId( FL_HIDE ) ),
-maLbHide( this, ScResId( CT_HIDE ) ),
-maFtHierarchy   ( this, ScResId( FT_HIERARCHY ) ),
-maLbHierarchy   ( this, ScResId( LB_HIERARCHY ) ),
-maBtnOk ( this, ScResId( BTN_OK ) ),
-maBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-maBtnHelp   ( this, ScResId( BTN_HELP ) ),
-maLbLayoutWrp   ( maLbLayout, spLayoutMap ),
-maLbShowFromWrp ( maLbShowFrom, spShowFromMap ),
-mrDPObj ( rDPObj ),
-maLabelData ( rLabelData )
+bool bEnableLayout )
+: ModalDialog(pParent, DataFieldOptionsDialog,
+modules/scalc/ui/datafieldoptionsdialog.ui)
+, mrDPObj(rDPObj)
+, maLabelData(rLabelData)
 {
-FreeResource();
+get(m_pLbSortBy, sortby);
+m_pLbSortBy-set_width_request(m_pLbSortBy-approximate_char_width() * 20);
+get(m_pRbSortAsc, ascending);
+get(m_pRbSortDesc, descending);
+get(m_pRbSortMan, manual);
+get(m_pLayoutFrame, layoutframe);
+get(m_pLbLayout, layout);
+get(m_pCbLayoutEmpty, emptyline);
+get(m_pCbShow, show);
+

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

2014-01-17 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk |1 
 sc/inc/helpids.h |1 
 sc/inc/sc.hrc|1 
 sc/inc/scabstdlg.hxx |2 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   16 -
 sc/source/ui/attrdlg/scdlgfact.hxx   |2 
 sc/source/ui/dbgui/pvfundlg.cxx  |   72 +++
 sc/source/ui/dbgui/pvfundlg.src  |  100 --
 sc/source/ui/dbgui/pvlaydlg.cxx  |2 
 sc/source/ui/inc/pvfundlg.hxx|   28 +--
 sc/uiconfig/scalc/ui/pivotfielddialog.ui |  282 +++
 11 files changed, 335 insertions(+), 172 deletions(-)

New commits:
commit 8634c127d488a5aa8e994664b9ebc80860055fbf
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 17 11:01:13 2014 +

convert pivot table subtotals data field dialog to .ui

Change-Id: I4ac7fb3a13cdc03d3c75cdd730bf39a7d814de99

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 729ae69..f688073 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/pagetemplatedialog \
sc/uiconfig/scalc/ui/paradialog \
sc/uiconfig/scalc/ui/paratemplatedialog \
+   sc/uiconfig/scalc/ui/pivotfielddialog \
sc/uiconfig/scalc/ui/printareasdialog \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 2e0cf5e..f9fd155 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -53,7 +53,6 @@
 // Hilfe IDs fuer Dialoge / Pages (max.70) ---
 #define HID_SC_PIVOTFILTER  
SC_HID_SC_PIVOTFILTER
 #define HID_SC_INPORTOPT
SC_HID_SC_INPORTOPT
-#define HID_SC_PIVOTSUBT
SC_HID_SC_PIVOTSUBT
 
 #define HID_SC_NAVIGATOR
SC_HID_SC_NAVIGATOR
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 97630f8..9c51d90 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1017,7 +1017,6 @@
 #define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
 #define RID_SCDLG_PIVOT_LAYOUT  (SC_DIALOGS_START + 34)
 #define RID_SCDLG_CONSOLIDATE   (SC_DIALOGS_START + 35)
-#define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38)
 #define RID_SCDLG_NEWSCENARIO   (SC_DIALOGS_START + 39)
 #define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9b63ee0..068e544 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -421,7 +421,7 @@ public:
 const 
ScDPLabelData rLabelData,
 const 
ScPivotFuncData rFuncData ) = 0;
 
-virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, 
int nId,
+virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent,
 ScDPObject 
rDPObj,
 const 
ScDPLabelData rLabelData,
 const 
ScPivotFuncData rFuncData,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 01a2c54..0229bfb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -890,26 +890,14 @@ AbstractScDPFunctionDlg * 
ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg (
 }
 
 AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg 
( Window* pParent,
-int nId,
 ScDPObject 
rDPObj,
 const 
ScDPLabelData rLabelData,
 const 
ScPivotFuncData rFuncData,
 const 
ScDPNameVec rDataFields,
 bool 
bEnableLayout )
 {
-ScDPSubtotalDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_PIVOTSUBT :
-pDlg = new ScDPSubtotalDlg( pParent, rDPObj, rLabelData, 
rFuncData, rDataFields, bEnableLayout );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScDPSubtotalDlg_Impl( pDlg );
-return 0;
+ScDPSubtotalDlg * pDlg = new ScDPSubtotalDlg( pParent, rDPObj, rLabelData, 
rFuncData, rDataFields, bEnableLayout );
+return new AbstractScDPSubtotalDlg_Impl( pDlg );
 }
 
 AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx

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

2014-01-06 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/sc.hrc  |1 
 sc/source/ui/inc/crdlg.hxx |   25 +
 sc/source/ui/miscdlgs/crdlg.cxx|   56 +++-
 sc/source/ui/src/miscdlgs.src  |   60 -
 sc/uiconfig/scalc/ui/colorrowdialog.ui |  152 +
 6 files changed, 176 insertions(+), 119 deletions(-)

New commits:
commit 0183d4cf7e3311625d3544395229b5ccd0f7bc4d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jan 6 16:04:55 2014 +

convert col or row dialog to .ui

Change-Id: I47b0b0abd3cbb992b93cd1db10558fed579e4f1c

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8299602..b0308be 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/analysisofvariancedialog \
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/chardialog \
+   sc/uiconfig/scalc/ui/colorrowdialog \
sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index bfd9668..6b8cc619 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1045,7 +1045,6 @@
 #define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68)
 #define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69)
 #define RID_SCPAGE_PRINT(SC_DIALOGS_START + 70)
-#define RID_SCDLG_COLORROW  (SC_DIALOGS_START + 71)
 
 #define RID_SCDLG_CONTACTS  (SC_DIALOGS_START + 78)
 
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index fd2eaba..5e7f00f 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -23,34 +23,23 @@
 
 #include vcl/dialog.hxx
 #include vcl/button.hxx
-#include vcl/fixed.hxx
+#include vcl/layout.hxx
 #include scui_def.hxx
 
-//
-
 class ScColOrRowDlg : public ModalDialog
 {
 public:
-ScColOrRowDlg( Window*  pParent,
-   const OUStringrStrTitle,
-   const OUStringrStrLabel,
-   sal_Bool bColDefault = sal_True );
-~ScColOrRowDlg();
-
+ScColOrRowDlg(Window* pParent, const OUString rStrTitle,
+const OUString rStrLabel, bool bColDefault = true);
 private:
-FixedLine   aFlFrame;
-RadioButton aBtnRows;
-RadioButton aBtnCols;
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton  aBtnHelp;
+VclFrame*   m_pFrame;
+RadioButton*m_pBtnRows;
+RadioButton*m_pBtnCols;
+OKButton*   m_pBtnOk;
 
 DECL_LINK(OkHdl, void *);
 };
 
-
 #endif
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 7a41edb..c009bd4 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -17,62 +17,38 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #undef SC_DLLIMPLEMENTATION
 
-
-
-//--
-
 #include crdlg.hxx
 #include scresid.hxx
 #include miscdlgs.hrc
 
-
-//==
-
-ScColOrRowDlg::ScColOrRowDlg( Window*   pParent,
-  const OUString rStrTitle,
-  const OUString rStrLabel,
-  sal_Bool  bColDefault )
-
-:   ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ),
-//
-aFlFrame( this, ScResId( FL_FRAME ) ),
-aBtnRows( this, ScResId( BTN_GROUP_ROWS ) ),
-aBtnCols( this, ScResId( BTN_GROUP_COLS ) ),
-aBtnOk  ( this, ScResId( BTN_OK ) ),
-aBtnCancel  ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) )
+ScColOrRowDlg::ScColOrRowDlg(Window* pParent, const OUString rStrTitle,
+const OUString rStrLabel, bool bColDefault)
+: ModalDialog(pParent, ColOrRowDialog,
+modules/scalc/ui/colorrowdialog.ui)
 {
-SetText( rStrTitle );
-aFlFrame.SetText( rStrLabel );
-
-if ( bColDefault )
-aBtnCols.Check();
-else
-aBtnRows.Check();
-
-aBtnOk.SetClickHdl( LINK( this, ScColOrRowDlg, OkHdl ) );
+get(m_pBtnOk, ok);
+get(m_pBtnCols, columns);
+get(m_pBtnRows, rows);
+get(m_pFrame, frame);
 
-FreeResource();
-}
+SetText(rStrTitle);
+m_pFrame-set_label(rStrLabel);
 
-//
+if (bColDefault)
+m_pBtnCols-Check();
+else
+m_pBtnRows-Check();
 
-ScColOrRowDlg::~ScColOrRowDlg()
-{
+m_pBtnOk-SetClickHdl( LINK(

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

2014-01-04 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/sc.hrc  |1 
 sc/inc/scabstdlg.hxx   |4 -
 sc/source/ui/attrdlg/scdlgfact.cxx |   19 +---
 sc/source/ui/attrdlg/scdlgfact.hxx |4 -
 sc/source/ui/drawfunc/drtxtob1.cxx |5 -
 sc/source/ui/inc/textdlgs.hxx  |   12 +--
 sc/source/ui/miscdlgs/textdlgs.cxx |   44 ---
 sc/source/ui/pagedlg/tphfedit.cxx  |4 -
 sc/source/ui/src/textdlgs.src  |   59 --
 sc/source/ui/view/editsh.cxx   |4 -
 sc/uiconfig/scalc/ui/chardialog.ui |  148 +
 12 files changed, 189 insertions(+), 116 deletions(-)

New commits:
commit 51640a1bcdc17a87c2f5dd9348bd2d4493bd05e6
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Jan 4 19:43:02 2014 +

convert calc character dialog to .ui

Change-Id: I305b18bea24377dcd98b3e06c4cf75bdbdd4d717

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index bd785c9..2cbf29f 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/allheaderfooterdialog \
sc/uiconfig/scalc/ui/analysisofvariancedialog \
sc/uiconfig/scalc/ui/cellprotectionpage \
+   sc/uiconfig/scalc/ui/chardialog \
sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 695bce6..98aebf8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1049,7 +1049,6 @@
 
 
 
-#define RID_SCDLG_CHAR  (SC_DIALOGS_START + 76)
 #define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
 #define RID_SCDLG_CONTACTS  (SC_DIALOGS_START + 78)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 243bf24..c7716db 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -492,8 +492,8 @@ public:
 virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* 
pParent,
 const SfxItemSet*   
pArgSet ) = 0;
 
-virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const 
SfxItemSet* pAttr,
-const SfxObjectShell* 
pDocShell, int nId ) = 0;
+virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent,
+const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0;
 
 virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, 
const SfxItemSet* pAttr ,
 int nId ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 743f989..1ac1e0e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1125,22 +1125,11 @@ SfxAbstractTabDialog * 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(Window*
 return new ScAbstractTabDialog_Impl( pDlg );
 }
 
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* 
pParent, const SfxItemSet* pAttr,
-const SfxObjectShell* 
pDocShell, int nId )
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg(
+Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell)
 {
-SfxTabDialog* pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_CHAR :
-pDlg = new ScCharDlg( pParent, pAttr, pDocShell );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new ScAbstractTabDialog_Impl( pDlg );
-return 0;
+SfxTabDialog* pDlg = new ScCharDlg(pParent, pAttr, pDocShell);
+return new ScAbstractTabDialog_Impl(pDlg);
 }
 
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( 
Window* pParent, const SfxItemSet* pAttr ,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 78a9d2b..cbbf070 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -559,8 +559,8 @@ public:
 
 virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* 
pParent,
 const SfxItemSet*   
pArgSet );
-virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const 
SfxItemSet* pAttr,
-const SfxObjectShell* 
pDocShell, int nId );
+virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent,
+const SfxItemSet* pAttr, const SfxObjectShell* pDocShell);
 
 virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, 
const SfxItemSet* pAttr ,
 int nId );
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx 
b/sc/source/ui/drawfunc/drtxtob1.cxx
index fcff116..141062d 100644
---

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

2013-12-29 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk|1 
 sc/inc/helpids.h|1 
 sc/inc/sc.hrc   |1 
 sc/source/ui/inc/optsolver.hrc  |3 
 sc/source/ui/inc/optsolver.hxx  |   12 +-
 sc/source/ui/miscdlgs/optsolver.cxx |   25 +++--
 sc/source/ui/src/optsolver.src  |   50 ---
 sc/uiconfig/scalc/ui/solversuccessdialog.ui |  119 
 8 files changed, 139 insertions(+), 73 deletions(-)

New commits:
commit eb91348f8dee9ca6f46050a7170ff2bb39c13146
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Dec 29 21:22:27 2013 +

convert solver success dialog to .ui

Change-Id: Ia9062a21afde96510a4953d1b51e7e59e9012fb7

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index cddbd87..41bcb7c 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sidebarnumberformat \
sc/uiconfig/scalc/ui/sidebarcellappearance \
sc/uiconfig/scalc/ui/solverdlg \
+   sc/uiconfig/scalc/ui/solversuccessdialog \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortdialog \
sc/uiconfig/scalc/ui/sortkey \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 22526d6..8d989dd 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -163,7 +163,6 @@
 #define HID_SC_SOLVEROPTIONS
SC_HID_SC_SOLVEROPTIONS
 #define HID_SC_SOLVEROPTIONS_LB 
SC_HID_SC_SOLVEROPTIONS_LB
 #define HID_SC_SOLVER_PROGRESS  
SC_HID_SC_SOLVER_PROGRESS
-#define HID_SC_SOLVER_SUCCESS   
SC_HID_SC_SOLVER_SUCCESS
 
 #define HID_SCDLG_CONFLICTS 
SC_HID_SCDLG_CONFLICTS
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index d97cfcf..0b0f398 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1095,7 +1095,6 @@
 
 #define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139)
 #define RID_SCDLG_SOLVER_PROGRESS   (SC_DIALOGS_START + 142)
-#define RID_SCDLG_SOLVER_SUCCESS(SC_DIALOGS_START + 144)
 
 #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
 #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc
index f72063e..bbb3bce 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.hrc
@@ -21,9 +21,6 @@
 
 #define FT_PROGRESS 7
 #define FT_TIMELIMIT8
-#define FT_SUCCESS  11
-#define FT_RESULT   12
-#define FT_QUESTION 13
 
 #define FL_CONDITIONS   1
 #define FL_BUTTONS  2
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index aaf756d..1f850d7 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -229,16 +229,14 @@ public:
 
 class ScSolverSuccessDialog : public ModalDialog
 {
-FixedText   maFtSuccess;
-FixedText   maFtResult;
-FixedText   maFtQuestion;
-FixedLine   maFlButtons;
-OKButtonmaBtnOk;
-CancelButtonmaBtnCancel;
+FixedText* m_pFtResult;
+PushButton* m_pBtnOk;
+PushButton* m_pBtnCancel;
+
+DECL_LINK(ClickHdl, PushButton*);
 
 public:
 ScSolverSuccessDialog( Window* pParent, const OUString rSolution );
-~ScSolverSuccessDialog();
 };
 
 
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index d0020e2..7648ac2 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -88,21 +88,24 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* 
pParent, const OUStr
 //
 
 ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString 
rSolution )
-: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVER_SUCCESS ) ),
-maFtSuccess ( this, ScResId( FT_SUCCESS ) ),
-maFtResult  ( this, ScResId( FT_RESULT ) ),
-maFtQuestion( this, ScResId( FT_QUESTION ) ),
-maFlButtons ( this, ScResId( FL_BUTTONS ) ),
-maBtnOk ( this, ScResId( BTN_OK ) ),
-maBtnCancel ( this, ScResId( BTN_CANCEL ) )
+: ModalDialog(pParent, SolverSuccessDialog, 
modules/scalc/ui/solversuccessdialog.ui)
 {
-OUString aMessage = maFtResult.GetText() +   + rSolution;
-maFtResult.SetText( aMessage );
-FreeResource();
+get(m_pFtResult, result);
+get(m_pBtnOk, ok);
+m_pBtnOk-SetClickHdl(LINK(this, ScSolverSuccessDialog, ClickHdl));
+get(m_pBtnCancel, cancel);
+m_pBtnCancel-SetClickHdl(LINK(this, ScSolverSuccessDialog, ClickHdl));
+OUString aMessage = m_pFtResult-GetText() +   + rSolution;
+m_pFtResult-SetText(aMessage);
 }

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

2013-12-23 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk |5 
 sc/inc/scabstdlg.hxx |4 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   19 ---
 sc/source/ui/attrdlg/scdlgfact.hxx   |4 
 sc/source/ui/dbgui/validate.cxx  |   35 +++---
 sc/source/ui/dbgui/validate.src  |   35 --
 sc/source/ui/inc/anyrefdg.hxx|   12 ++
 sc/source/ui/inc/validate.hrc|3 
 sc/source/ui/inc/validate.hxx|   33 +++---
 sc/source/ui/view/cellsh2.cxx|4 
 sc/uiconfig/scalc/ui/validationdialog.ui |  161 +++
 11 files changed, 218 insertions(+), 97 deletions(-)

New commits:
commit 03552256018e90edfd825b0d4c0a5d855abaef24
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 23 17:33:24 2013 +

convert validity tabdialog to .ui

Change-Id: Ib7be4172e2d9b80869dbfa47674b13f1e03877d3

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index f55823e..8508fe7 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -99,6 +99,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
+   sc/uiconfig/scalc/ui/movecopysheet \
+   sc/uiconfig/scalc/ui/movingaveragedialog \
sc/uiconfig/scalc/ui/nosolutiondialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
@@ -148,9 +150,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/tpviewpage \
sc/uiconfig/scalc/ui/ttestdialog \
sc/uiconfig/scalc/ui/ungroupdialog \
+   sc/uiconfig/scalc/ui/validationdialog \
sc/uiconfig/scalc/ui/validationhelptabpage \
-   sc/uiconfig/scalc/ui/movecopysheet \
-   sc/uiconfig/scalc/ui/movingaveragedialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index eba169d..b5ecda2 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -499,8 +499,8 @@ public:
 virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, 
const SfxItemSet* pAttr ,
 int nId ) = 0;
 
-virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent,
-const SfxItemSet* 
pArgSet,int nId, ScTabViewShell *pTabVwSh  ) = 0;
+virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent,
+const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) = 0;
 virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const 
SfxItemSet* pArgSet) = 0;
 
 // for tabpage
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 003d96b..aa1a9bf 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1173,22 +1173,11 @@ SfxAbstractTabDialog * 
ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
 return 0;
 }
 
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( 
Window* pParent,
-const SfxItemSet* 
pArgSet,int nId, ScTabViewShell *pTabVwSh  )
+SfxAbstractTabDialog * 
ScAbstractDialogFactory_Impl::CreateScValidationDlg(Window* pParent,
+const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh)
 {
-SfxTabDialog* pDlg=NULL;
-switch ( nId )
-{
-case TAB_DLG_VALIDATION :
-pDlg = new ScValidationDlg( pParent, pArgSet, pTabVwSh );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new ScAbstractTabDialog_Impl( pDlg );
-return 0;
+SfxTabDialog* pDlg = new ScValidationDlg(pParent, pArgSet, pTabVwSh);
+return new ScAbstractTabDialog_Impl(pDlg);
 }
 
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(Window* 
pParent, const SfxItemSet* pArgSet)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index e00a5bb..1cdf525 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -566,8 +566,8 @@ public:
 virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, 
const SfxItemSet* pAttr ,
 int nId );
 
-virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent,
-const SfxItemSet* 
pArgSet,int nId, ScTabViewShell *pTabVwSh  );
+virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent,
+const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh);
 
 virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const 
SfxItemSet* pArgSet);
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index f40981c..1d309c3 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++

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

2013-12-20 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |1 
 sc/inc/sc.hrc  |1 
 sc/source/ui/inc/optsolver.hrc |2 
 sc/source/ui/inc/optsolver.hxx |8 --
 sc/source/ui/miscdlgs/optsolver.cxx|   14 ---
 sc/source/ui/src/optsolver.src |   36 --
 sc/uiconfig/scalc/ui/nosolutiondialog.ui   |   90 +
 sc/uiconfig/scalc/ui/optimalrowheightdialog.ui |   70 +--
 9 files changed, 103 insertions(+), 120 deletions(-)

New commits:
commit 1822302066fba5a21a8fb72cbaaae9bbe4cf9fbd
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Dec 20 10:46:52 2013 +

convert solver no solution dialog to .ui

Change-Id: I94ba29d328c443e0f944fef8d33fc25cdc0e9694

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 3cd1c63..f55823e 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
+   sc/uiconfig/scalc/ui/nosolutiondialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
sc/uiconfig/scalc/ui/optcompatibilitypage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 9188d40..22526d6 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -163,7 +163,6 @@
 #define HID_SC_SOLVEROPTIONS
SC_HID_SC_SOLVEROPTIONS
 #define HID_SC_SOLVEROPTIONS_LB 
SC_HID_SC_SOLVEROPTIONS_LB
 #define HID_SC_SOLVER_PROGRESS  
SC_HID_SC_SOLVER_PROGRESS
-#define HID_SC_SOLVER_NOSOLUTION
SC_HID_SC_SOLVER_NOSOLUTION
 #define HID_SC_SOLVER_SUCCESS   
SC_HID_SC_SOLVER_SUCCESS
 
 #define HID_SCDLG_CONFLICTS 
SC_HID_SCDLG_CONFLICTS
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 78d887a..000a6e1 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1085,7 +1085,6 @@
 
 #define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139)
 #define RID_SCDLG_SOLVER_PROGRESS   (SC_DIALOGS_START + 142)
-#define RID_SCDLG_SOLVER_NOSOLUTION (SC_DIALOGS_START + 143)
 #define RID_SCDLG_SOLVER_SUCCESS(SC_DIALOGS_START + 144)
 
 #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc
index 5557cf7..f72063e 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.hrc
@@ -21,8 +21,6 @@
 
 #define FT_PROGRESS 7
 #define FT_TIMELIMIT8
-#define FT_NOSOLUTION   9
-#define FT_ERRORTEXT10
 #define FT_SUCCESS  11
 #define FT_RESULT   12
 #define FT_QUESTION 13
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index ad80ced..aaf756d 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -221,14 +221,10 @@ public:
 
 class ScSolverNoSolutionDialog : public ModalDialog
 {
-FixedText   maFtNoSolution;
-FixedText   maFtErrorText;
-FixedLine   maFlButtons;
-OKButtonmaBtnOk;
+FixedText* m_pFtErrorText;
 
 public:
-ScSolverNoSolutionDialog( Window* pParent, const OUString rErrorText );
-~ScSolverNoSolutionDialog();
+ScSolverNoSolutionDialog(Window* pParent, const OUString rErrorText);
 };
 
 class ScSolverSuccessDialog : public ModalDialog
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index 873a81a..d0020e2 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -79,18 +79,10 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 
nSeconds )
 //
 
 ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const 
OUString rErrorText )
-: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVER_NOSOLUTION ) ),
-maFtNoSolution  ( this, ScResId( FT_NOSOLUTION ) ),
-maFtErrorText   ( this, ScResId( FT_ERRORTEXT ) ),
-maFlButtons ( this, ScResId( FL_BUTTONS ) ),
-maBtnOk ( this, ScResId( BTN_OK ) )
-{
-maFtErrorText.SetText( rErrorText );
-FreeResource();
-}
-
-ScSolverNoSolutionDialog::~ScSolverNoSolutionDialog()
+: ModalDialog(pParent, NoSolutionDialog, 
modules/scalc/ui/nosolutiondialog.ui)
 {
+get(m_pFtErrorText, error);
+m_pFtErrorText-SetText(rErrorText);
 }
 
 //
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index 477baad..1de4b5e 100644
---

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

2013-12-19 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  |   17 
 sc/source/ui/attrdlg/scdlgfact.hxx  |2 
 sc/source/ui/inc/shtabdlg.hxx   |   12 +--
 sc/source/ui/miscdlgs/shtabdlg.cxx  |   41 --
 sc/source/ui/src/miscdlgs.src   |   47 ---
 sc/source/ui/view/tabvwsh3.cxx  |2 
 sc/source/ui/view/tabvwshf.cxx  |2 
 sc/uiconfig/scalc/ui/showsheetdialog.ui |  126 
 11 files changed, 154 insertions(+), 100 deletions(-)

New commits:
commit 3b385c20d8c50e11ef02006f0dab4fd8cf360e5b
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 19 20:49:34 2013 +

convert show sheets dialog to .ui

Change-Id: Ia32aa742b426872c6634a431170c441ae3c8c963

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 248e8b1..77e54f4 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedocumentdlg \
sc/uiconfig/scalc/ui/sharedfooterdialog \
sc/uiconfig/scalc/ui/sharedheaderdialog \
+   sc/uiconfig/scalc/ui/showsheetdialog \
sc/uiconfig/scalc/ui/sidebaralignment \
sc/uiconfig/scalc/ui/sidebarnumberformat \
sc/uiconfig/scalc/ui/sidebarcellappearance \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e757185..c22b064 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1063,8 +1063,6 @@
 
 // derivations from RID_SCDLG_SELENTRY
 
-#define RID_SCDLG_SHOW_TAB  (SC_DIALOGS_START + 109)
-
 #define RID_SCPAGE_CONTENT  (SC_DIALOGS_START + 113)
 #define RID_SCPAGE_LAYOUT   (SC_DIALOGS_START + 114)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 70bf915..371a362 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -452,7 +452,7 @@ public:
 virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* 
pParent, const OUString rName,
 int nId,
 sal_Bool bEdit 
= false, sal_Bool bSheetProtected = false ) = 0;
-virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int 
nId ) = 0;
+virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) = 0;
 
 virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* 
pParent,
 const 
OUString rTitle,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 931de9f..8df625b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1004,21 +1004,10 @@ AbstractScNewScenarioDlg * 
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg
 return 0;
 }
 
-AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( 
Window* pParent, int nId )
+AbstractScShowTabDlg * 
ScAbstractDialogFactory_Impl::CreateScShowTabDlg(Window* pParent)
 {
-ScShowTabDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_SHOW_TAB :
-pDlg = new ScShowTabDlg( pParent);
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScShowTabDlg_Impl( pDlg );
-return 0;
+ScShowTabDlg * pDlg = new ScShowTabDlg( pParent);
+return new AbstractScShowTabDlg_Impl( pDlg );
 }
 
 AbstractScStringInputDlg * 
ScAbstractDialogFactory_Impl::CreateScStringInputDlg (  Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 4b5ae12..6829114 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -521,7 +521,7 @@ public:
 virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* 
pParent, const OUString rName,
 int nId,
 sal_Bool bEdit 
= false, sal_Bool bSheetProtected = false );
-virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int 
nId );
+virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent);
 
 virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* 
pParent,
 const 
OUString rTitle,
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 326a0f4..6ba02b6 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -20,9 +20,9 @@
 #ifndef SC_SHTABDLG_HXX
 #define SC_SHTABDLG_HXX
 
-#include vcl/fixed.hxx
 #include vcl/button.hxx
 #include vcl/dialog.hxx
+#include vcl/layout.hxx
 #include vcl/lstbox.hxx

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

2013-10-23 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/sc.hrc |2 
 sc/inc/scabstdlg.hxx  |5 -
 sc/source/ui/attrdlg/scdlgfact.cxx|   26 +-
 sc/source/ui/attrdlg/scdlgfact.hxx|5 -
 sc/source/ui/inc/miscdlgs.hrc |1 
 sc/source/ui/inc/strindlg.hxx |   29 +++
 sc/source/ui/miscdlgs/scuiautofmt.cxx |4 -
 sc/source/ui/miscdlgs/strindlg.cxx|   43 ++
 sc/source/ui/src/miscdlgs.src |   42 --
 sc/source/ui/view/tabvwshf.cxx|4 -
 sc/uiconfig/scalc/ui/inputstringdialog.ui |  118 ++
 12 files changed, 155 insertions(+), 125 deletions(-)

New commits:
commit 05ef22774ac84296eeec3a3cdcfa3c292d2f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 23 09:53:02 2013 +0100

convert input string dialog to .ui

Change-Id: I2d40924e77f075024aed54548ffda8a162f7af91

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 2945a5c..2bbaf3a 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/headerdialog \
sc/uiconfig/scalc/ui/headerfootercontent \
sc/uiconfig/scalc/ui/headerfooterdialog \
+   sc/uiconfig/scalc/ui/inputstringdialog \
sc/uiconfig/scalc/ui/insertcells \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ba125eb..7e945b6 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -987,7 +987,7 @@
 
 #define RID_SCDLG_INSCONT   (SC_DIALOGS_START + 14)
 
-#define RID_SCDLG_STRINPUT  (SC_DIALOGS_START + 16)
+
 #define RID_SCDLG_MTRINPUT  (SC_DIALOGS_START + 17)
 #define RID_SCDLG_SELENTRY  (SC_DIALOGS_START + 18)
 #define RID_SCDLG_AUTOFORMAT(SC_DIALOGS_START + 20)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index d5f6876..cdd08eb 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -299,7 +299,7 @@ class AbstractScSortWarningDlg : public VclAbstractDialog
 class AbstractScStringInputDlg :  public VclAbstractDialog
 {
 public:
-virtual void GetInputString( OUString rString ) const = 0;
+virtual OUString GetInputString() const = 0;
 };
 
 class AbstractScTabBgColorDlg : public VclAbstractDialog
@@ -458,8 +458,7 @@ public:
 const 
OUString rTitle,
 const 
OUString rEditTitle,
 const 
OUString rDefault,
-const OString 
sHelpId, const OString sEditHelpId,
-int nId ) = 0;
+const OString 
sHelpId, const OString sEditHelpId ) = 0;
 
 virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent,
 const 
OUString rTitle, //Dialog Title
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index ba7817c..c779526 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -572,14 +572,14 @@ sal_uInt16  
AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const
 return pDlg-GetSelectEntryPos( nPos);
 }
 
-OUString   AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const
+OUString AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const
 {
-return pDlg-GetSelectEntry(nPos);
+return pDlg-GetSelectEntry(nPos);
 }
 
-void AbstractScStringInputDlg_Impl::GetInputString( OUString rString ) const
+OUString AbstractScStringInputDlg_Impl::GetInputString() const
 {
-pDlg-GetInputString( rString );
+return pDlg-GetInputString();
 }
 
 void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color rColor ) const
@@ -1025,22 +1025,10 @@ AbstractScStringInputDlg * 
ScAbstractDialogFactory_Impl::CreateScStringInputDlg
 const 
OUString rTitle,
 const 
OUString rEditTitle,
 const 
OUString rDefault,
-const OString 
sHelpId, const OString sEditHelpId,
-int nId )
+const OString 
sHelpId, const OString sEditHelpId )
 {
-ScStringInputDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_STRINPUT :
-pDlg = new ScStringInputDlg( pParent, rTitle, rEditTitle, 
rDefault, sHelpId, sEditHelpId );
-

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

2013-07-24 Thread oger000 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/sc.hrc |2 
 sc/inc/scabstdlg.hxx  |5 
 sc/source/ui/attrdlg/scdlgfact.cxx|   20 -
 sc/source/ui/attrdlg/scdlgfact.hxx|5 
 sc/source/ui/inc/miscdlgs.hrc |   13 -
 sc/source/ui/inc/mvtabdlg.hxx |   22 --
 sc/source/ui/miscdlgs/mvtabdlg.cxx|  162 +++
 sc/source/ui/src/miscdlgs.src |  136 
 sc/source/ui/view/tabvwshf.cxx|5 
 sc/uiconfig/scalc/ui/movecopysheet.ui |  363 ++
 11 files changed, 459 insertions(+), 275 deletions(-)

New commits:
commit c2a28a731f7068baf66f3ba9e4139e573d23d707
Author: oger000 lo...@ogersoft.at
Date:   Sun Jul 21 18:52:52 2013 +0200

convert move table dialog to .ui format

Help needed:
I did not find a way to get the height of the warning area
included in the automatic calculated dialog height. So it
stays behind the action buttons if an error occurs.
(I am new to glade)

Code adaption should be complete - build and move-sheet-test ok.
helpcontent2 is done and I will try to upload.

Change-Id: Id987ac799b17787c35302890a95af2bd99456589
Reviewed-on: https://gerrit.libreoffice.org/5006
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 06588d8..208f97c 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/textimportcsv \
sc/uiconfig/scalc/ui/tpviewpage \
sc/uiconfig/scalc/ui/ungroupdialog \
+   sc/uiconfig/scalc/ui/movecopysheet \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b552fa0..5b0ec00 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -981,7 +981,7 @@
 #define RID_SCDLG_INSCELL   (SC_DIALOGS_START + 12)
 
 #define RID_SCDLG_INSCONT   (SC_DIALOGS_START + 14)
-#define RID_SCDLG_MOVETAB   (SC_DIALOGS_START + 15)
+
 #define RID_SCDLG_STRINPUT  (SC_DIALOGS_START + 16)
 #define RID_SCDLG_MTRINPUT  (SC_DIALOGS_START + 17)
 #define RID_SCDLG_SELENTRY  (SC_DIALOGS_START + 18)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index ce45799..a1966f5 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -416,9 +416,8 @@ public:
 long   
 nFirst= 1,
 long  
nLast = 100 ) = 0;
 
-virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(  Window* pParent,  
//add for ScMoveTableDlg
-const String 
rDefault,
-int nId ) = 0;
+virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent,
+const String rDefault) = 0;
 
 virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
 sal_uInt16 nFlags) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index bc6db22..fe7dd50 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -958,23 +958,11 @@ AbstractScMetricInputDlg * 
ScAbstractDialogFactory_Impl::CreateScMetricInputDlg
 
 
 
-AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(  
Window* pParent,
-  
const String rDefault,
-  
int nId )
+AbstractScMoveTableDlg * 
ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent,
+const String rDefault)
 {
-ScMoveTableDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_MOVETAB :
-pDlg = new ScMoveTableDlg( pParent, rDefault );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScMoveTableDlg_Impl( pDlg );
-return 0;
+ScMoveTableDlg * pDlg = new ScMoveTableDlg( pParent, rDefault );
+return new AbstractScMoveTableDlg_Impl( pDlg );
 }
 
 AbstractScNameCreateDlg * 
ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(Window * pParent, 
sal_uInt16 nFlags)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 107c238..349d518 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -484,9 +484,8 @@ public:
 long   
 nFirst= 1,
 long  
nLast = 100 );
 
-virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(  Window* pParent,  
//add for ScMoveTableDlg
-

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

2013-07-24 Thread Caolán McNamara 
 sc/inc/helpids.h |2 --
 sc/source/ui/inc/consdlg.hxx |1 -
 sc/source/ui/inc/crnrdlg.hxx |1 -
 sc/source/ui/miscdlgs/crnrdlg.cxx|5 ++---
 sc/uiconfig/scalc/ui/namerangesdialog.ui |   12 ++--
 5 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit f54a68427fb8b4b665c16aaa15edab43cdee41ba
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 24 20:29:15 2013 +0100

set widgets to use for extra title text in shrink mode

Change-Id: Ie53a1c36cca6ed1d1133abe1a70d76e2c2492786

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 358887c..b7856b2 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -98,8 +98,6 @@
 #define HID_SC_SCENARIO_DELETE  
SC_HID_SC_SCENARIO_DELETE
 #define HID_SC_SCENARIO_EDIT
SC_HID_SC_SCENARIO_EDIT
 
-#define HID_COLROWNAMERANGES
SC_HID_COLROWNAMERANGES
-
 #define HID_FUNCTION_BOX
SC_HID_FUNCTION_BOX
 #define HID_SC_REDLIN_CTR   
SC_HID_SC_REDLIN_CTR
 
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 204db24..8dd89d6 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -73,7 +73,6 @@ private:
 
 OKButton*pBtnOk;
 CancelButton*pBtnCancel;
-HelpButton*  pBtnHelp;
 PushButton*  pBtnAdd;
 PushButton*  pBtnRemove;
 
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index c2efd2d..b7f522c 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -58,7 +58,6 @@ private:
 
 OKButton*pBtnOk;
 CancelButton*pBtnCancel;
-HelpButton*  pBtnHelp;
 PushButton*  pBtnAdd;
 PushButton*  pBtnRemove;
 
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx 
b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 0e38a24..3cf2f12 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -80,11 +80,13 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* 
pB,
 get(pEdAssign,edassign);
 get(pRbAssign,rbassign);
 pRbAssign-SetReferences(this, pEdAssign);
+pEdAssign-SetReferences(this, 
getVclFrame(rangeframe)-get_label_widget());
 get(pBtnColHead,colhead);
 get(pBtnRowHead,rowhead);
 get(pEdAssign2,edassign2);
 get(pRbAssign2,rbassign2);
 pRbAssign2-SetReferences(this, pEdAssign2);
+pEdAssign2-SetReferences(this, getFixedText(datarange));
 
 get(pBtnOk,ok);
 get(pBtnCancel,cancel);
@@ -94,9 +96,6 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
 xColNameRanges = pDoc-GetColNameRanges()-Clone();
 xRowNameRanges = pDoc-GetRowNameRanges()-Clone();
 Init();
-
-pRbAssign-SetAccessibleRelationMemberOf(pEdAssign);
-pRbAssign2-SetAccessibleRelationMemberOf(pEdAssign);
 }
 
 
diff --git a/sc/uiconfig/scalc/ui/namerangesdialog.ui 
b/sc/uiconfig/scalc/ui/namerangesdialog.ui
index f81b8fc..a06b96c 100644
--- a/sc/uiconfig/scalc/ui/namerangesdialog.ui
+++ b/sc/uiconfig/scalc/ui/namerangesdialog.ui
@@ -1,5 +1,6 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
+  !-- interface-requires LibreOffice 1.0 --
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=NameRangesDialog
 property name=can_focusFalse/property
@@ -9,6 +10,8 @@
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
 property name=orientationvertical/property
 property name=spacing12/property
 child internal-child=action_area
@@ -70,10 +73,11 @@
   /packing
 /child
 child
-  object class=GtkFrame id=frame1
+  object class=GtkFrame id=rangeframe
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
+property name=vexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
 child
@@ -96,7 +100,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
-property name=vexpandTrue/property
 property name=column_spacing12/property
 child
   object class=foruilo-RefEdit id=edassign
@@ -141,7 +144,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
-property name=vexpandTrue/property

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

2013-07-12 Thread Caolán McNamara 
 sc/inc/helpids.h |1 
 sc/source/ui/inc/areasdlg.hxx|3 
 sc/source/ui/pagedlg/areasdlg.cxx|   28 +++-
 sc/uiconfig/scalc/ui/printareasdialog.ui |   97 ---
 4 files changed, 64 insertions(+), 65 deletions(-)

New commits:
commit 7908692490120350f2ad45241f7b19ba52dc0489
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jul 12 15:33:55 2013 +0100

GtkComboBox-GtkComboBoxText to use the items, etc

Change-Id: I6ece0c471fbe21fc832c4c65a02bfbc9cf991a5a

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index bb7e205..eae705d 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -60,7 +60,6 @@
 #define HID_SC_PIVOTSUBT
SC_HID_SC_PIVOTSUBT
 #define HID_SCPAGE_SUBT_OPTIONS 
SC_HID_SCPAGE_SUBT_OPTIONS
 #define HID_SCPAGE_SUBT_GROUP   
SC_HID_SCPAGE_SUBT_GROUP
-#define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
 #define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
 #define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 9f0a03e..3ed 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -48,17 +48,14 @@ public:
 virtual sal_BoolClose();
 
 private:
-FixedLine*   pFlPrintArea;
 ListBox* pLbPrintArea;
 formula::RefEdit*pEdPrintArea;
 formula::RefButton*  pRbPrintArea;
 
-FixedLine*   pFlRepeatRow;
 ListBox* pLbRepeatRow;
 formula::RefEdit*pEdRepeatRow;
 formula::RefButton*  pRbRepeatRow;
 
-FixedLine*   pFlRepeatCol;
 ListBox* pLbRepeatCol;
 formula::RefEdit*pEdRepeatCol;
 formula::RefButton*  pRbRepeatCol;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx 
b/sc/source/ui/pagedlg/areasdlg.cxx
index 97b8a16..e421b0b 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -105,32 +105,28 @@ static void printAddressFlags(sal_uInt16 nFlag)
 //
 
 ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, 
Window* pParent )
-:   ScAnyRefDlg ( pB, pCW, pParent, PrintAreasDialog, 
modules/scalc/ui/printareasdialog.ui),
-//
-bDlgLostFocus   ( false ),
-pDoc( NULL ),
-pViewData   ( NULL ),
-nCurTab ( 0 )
+: ScAnyRefDlg(pB, pCW, pParent, PrintAreasDialog, 
modules/scalc/ui/printareasdialog.ui)
+, bDlgLostFocus(false)
+, pDoc(NULL)
+, pViewData(NULL)
+, nCurTab(0)
 {
-get(pFlPrintArea,label1);
 get(pLbPrintArea,lbprintarea);
 get(pEdPrintArea,edprintarea);
-pEdPrintArea-SetReferences(this, pFlPrintArea);
+pEdPrintArea-SetReferences(this, 
getVclFrame(printframe)-get_label_widget());
 pRefInputEdit = pEdPrintArea;
 get(pRbPrintArea,rbprintarea);
 pRbPrintArea-SetReferences(this, pEdPrintArea);
 
-get(pFlRepeatRow,label2);
 get(pLbRepeatRow,lbrepeatrow);
 get(pEdRepeatRow,edrepeatrow);
-pEdRepeatRow-SetReferences(this, pFlRepeatRow);
+pEdRepeatRow-SetReferences(this, 
getVclFrame(rowframe)-get_label_widget());
 get(pRbRepeatRow,rbrepeatrow);
 pRbRepeatRow-SetReferences(this, pEdRepeatRow);
 
-get(pFlRepeatCol,label3);
 get(pLbRepeatCol,lbrepeatcol);
 get(pEdRepeatCol,edrepeatcol);
-pEdRepeatCol-SetReferences(this, pFlRepeatCol);
+pEdRepeatCol-SetReferences(this, 
getVclFrame(colframe)-get_label_widget());
 get(pRbRepeatCol,rbrepeatcol);
 pRbRepeatCol-SetReferences(this, pEdRepeatCol);
 
@@ -162,13 +158,13 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, 
SfxChildWindow* pCW, Window*
 ScPrintAreasDlg::~ScPrintAreasDlg()
 {
 // Extra-Data an ListBox-Entries abraeumen
-ListBox* pLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
+ListBox* aLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
 
-for ( sal_uInt16 i=0; i3; i++ )
+for (sal_uInt16 i = 0; i  SAL_N_ELEMENTS(aLb); ++i)
 {
-sal_uInt16 nCount = pLb[i]-GetEntryCount();
+sal_uInt16 nCount = aLb[i]-GetEntryCount();
 for ( sal_uInt16 j=0; jnCount; j++ )
-delete (String*)pLb[i]-GetEntryData(j);
+delete (String*)aLb[i]-GetEntryData(j);
 }
 }
 
diff --git a/sc/uiconfig/scalc/ui/printareasdialog.ui 
b/sc/uiconfig/scalc/ui/printareasdialog.ui
index 6e119d4..d52ef6d 100644
--- a/sc/uiconfig/scalc/ui/printareasdialog.ui
+++ b/sc/uiconfig/scalc/ui/printareasdialog.ui
@@ -1,9 +1,11 @@
 ?xml version=1.0 encoding=UTF-8?
 interface

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

2013-06-11 Thread Manal Alhassoun 
 sc/UIConfig_scalc.mk|1 
 sc/inc/scabstdlg.hxx|1 
 sc/source/ui/attrdlg/scdlgfact.cxx  |3 
 sc/source/ui/attrdlg/scdlgfact.hxx  |1 
 sc/source/ui/inc/groupdlg.hxx   |   10 --
 sc/source/ui/miscdlgs/groupdlg.cxx  |   27 ++
 sc/source/ui/view/cellsh1.cxx   |4 
 sc/uiconfig/scalc/ui/groupdialog.ui |  159 
 8 files changed, 176 insertions(+), 30 deletions(-)

New commits:
commit 8da13c55405f1a5789401b280d15f77efbf908e8
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Sun Jun 9 11:13:56 2013 +0300

groupdialog.ui widget

Change-Id: Ic19184c1250b59a4dac7c2bb42893d63c6b1a602
Reviewed-on: https://gerrit.libreoffice.org/4208
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 9e7fb46..46692c8 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/goalseekdlg \
+   sc/uiconfig/scalc/ui/groupdialog \
sc/uiconfig/scalc/ui/headerdialog \
sc/uiconfig/scalc/ui/headerfootercontent \
sc/uiconfig/scalc/ui/headerfooterdialog \
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9a0edf4..a041451a 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -385,7 +385,6 @@ public:
 int nId) = 0;
 
 virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, 
//add for ScGroupDlg
-sal_uInt16  nResId,
 int nId,
 sal_Bool
bUnGroup = false,
 sal_BoolbRows  
  = sal_True  ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4a8b9be..fe68814 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -856,7 +856,6 @@ AbstractScFillSeriesDlg* 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
 
 
 AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( 
Window* pParent,
-sal_uInt16  nResId,
 int nId,
 sal_Bool
bUnGroup ,
 sal_BoolbRows  
 )
@@ -866,7 +865,7 @@ AbstractScGroupDlg* 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind
 {
 case RID_SCDLG_GRP_KILL :
 case RID_SCDLG_GRP_MAKE :
-pDlg = new ScGroupDlg( pParent, nResId,bUnGroup, bRows);
+pDlg = new ScGroupDlg( pParent, bUnGroup, bRows);
 break;
 default:
 break;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index f207558..2be305e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -452,7 +452,6 @@ public:
 sal_uInt16 
 nPossDir,
 int nId);
 virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, 
//add for ScGroupDlg
-sal_uInt16  nResId,
 int nId,
 sal_Bool
bUnGroup = false,
 sal_BoolbRows  
  = sal_True  );
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index 7c54800..538d601 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -31,7 +31,6 @@ class ScGroupDlg : public ModalDialog
 {
 public:
 ScGroupDlg( Window* pParent,
-sal_uInt16  nResId,
 sal_BoolbUnGroup = false,
 sal_BoolbRows= sal_True  );
 ~ScGroupDlg();
@@ -39,12 +38,9 @@ public:
 sal_Bool GetColsChecked() const;
 
 private:
-FixedLine   aFlFrame;
-RadioButton aBtnRows;
-RadioButton aBtnCols;
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton  aBtnHelp;
+FixedText* m_pFtLabel;
+RadioButton* m_pBtnRows;
+RadioButton* m_pBtnCols;
 };
 
 
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx 
b/sc/source/ui/miscdlgs/groupdlg.cxx
index 6cdf306..bc37423 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++

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

2013-06-11 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk  |3 
 sc/inc/sc.hrc |5 -
 sc/inc/scabstdlg.hxx  |5 -
 sc/source/ui/attrdlg/scdlgfact.cxx|   28 --
 sc/source/ui/attrdlg/scdlgfact.hxx|5 -
 sc/source/ui/inc/groupdlg.hxx |9 -
 sc/source/ui/miscdlgs/groupdlg.cxx|   17 +--
 sc/source/ui/src/miscdlgs.src |   66 --
 sc/source/ui/view/cellsh1.cxx |4 
 sc/uiconfig/scalc/ui/groupdialog.ui   |  119 -
 sc/uiconfig/scalc/ui/ungroupdialog.ui |  158 ++
 11 files changed, 241 insertions(+), 178 deletions(-)

New commits:
commit f741d948b6910622d199e8d14ca1e3ecd7475156
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 11 13:19:51 2013 +0100

split group dialog into group and ungroup dialogs

Change-Id: If9f8e8a47bd8ce0207b7dec8470375d5fa48f6cd

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 46692c8..5b937a1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optchangespage \
sc/uiconfig/scalc/ui/optcompatibilitypage \
sc/uiconfig/scalc/ui/optdefaultpage \
+   sc/uiconfig/scalc/ui/optdlg \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/scgeneralpage \
@@ -103,7 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
-   sc/uiconfig/scalc/ui/optdlg \
+   sc/uiconfig/scalc/ui/ungroupdialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e98448c..0e9f049 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -971,7 +971,6 @@
 #define RID_SCDLG_SELENTRY  (SC_DIALOGS_START + 18)
 #define RID_SCDLG_FILLSERIES(SC_DIALOGS_START + 19)
 #define RID_SCDLG_AUTOFORMAT(SC_DIALOGS_START + 20)
-#define RID_SCDLG_GROUP (SC_DIALOGS_START + 21)
 #define RID_SCDLG_NAMES (SC_DIALOGS_START + 22)
 #define RID_SCDLG_DBNAMES   (SC_DIALOGS_START + 23)
 #define RID_SCDLG_SOLVER(SC_DIALOGS_START + 26)
@@ -1043,10 +1042,6 @@
 
 #define RID_SCDLG_SHOW_TAB  (SC_DIALOGS_START + 109)
 
-// derivations from RID_SCDLG_GROUP
-#define RID_SCDLG_GRP_MAKE  (SC_DIALOGS_START + 110)
-#define RID_SCDLG_GRP_KILL  (SC_DIALOGS_START + 111)
-
 #define RID_SCDLG_COLROWNAMERANGES  (SC_DIALOGS_START + 112)
 
 #define RID_SCPAGE_CONTENT  (SC_DIALOGS_START + 113)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index a041451a..ce45799 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -385,9 +385,8 @@ public:
 int nId) = 0;
 
 virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, 
//add for ScGroupDlg
-int nId,
-sal_Bool
bUnGroup = false,
-sal_BoolbRows  
  = sal_True  ) = 0;
+bool bUnGroup = 
false,
+bool bRows= 
true ) = 0;
 
 virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, 
//add for ScInsertCellDlg
 int nId,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index fe68814..bc6db22 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -852,34 +852,14 @@ AbstractScFillSeriesDlg* 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
 return 0;
 }
 
-
-
-
 AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( 
Window* pParent,
-int nId,
-sal_Bool
bUnGroup ,
-sal_BoolbRows  
 )
+bool bUnGroup,
+bool bRows )
 {
-ScGroupDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_GRP_KILL :
-case RID_SCDLG_GRP_MAKE :
-pDlg = new ScGroupDlg( pParent, bUnGroup, bRows);
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScGroupDlg_Impl( pDlg );
-return 0;
+ScGroupDlg * pDlg = new ScGroupDlg( pParent, bUnGroup, bRows);
+return new AbstractScGroupDlg_Impl( pDlg );
 }
 
-
-
-
-
 AbstractScInsertCellDlg *

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

2013-06-10 Thread Faisal M . Al-Otaibi 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/helpids.h  |1 
 sc/inc/sc.hrc |1 
 sc/source/ui/inc/optdlg.hrc   |   21 -
 sc/source/ui/inc/tpview.hxx   |   37 +-
 sc/source/ui/optdlg/tpview.cxx|  186 ++---
 sc/source/ui/src/optdlg.src   |  179 -
 sc/source/ui/src/scstring.src |   15 +
 sc/uiconfig/scalc/ui/scgeneralpage.ui |  460 ++
 9 files changed, 582 insertions(+), 319 deletions(-)

New commits:
commit 813e8bc2268d74a2e7ce2d9f1cb5ae9c412086a6
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Mon Jun 10 11:53:21 2013 +0200

Convert sc general option page to .ui format

Change-Id: I06487f74b8dfdf27b067c1bdb6e47a5fa8babf30

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8fc9e35..9e7fb46 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
+   sc/uiconfig/scalc/ui/scgeneralpage \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index afef8bb..15086f9 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -68,7 +68,6 @@
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
 
 #define HID_SCPAGE_CONTENT  
SC_HID_SCPAGE_CONTENT
-#define HID_SCPAGE_LAYOUT   
SC_HID_SCPAGE_LAYOUT
 
 #define HID_SC_NAVIGATOR
SC_HID_SC_NAVIGATOR
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7b823b0..e98448c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -830,6 +830,7 @@
 #define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
 #define SCSTR_ORIENTATION_STANDARD  (STR_START + 112)
 #define SCSTR_AUTHOR(STR_START + 113)
+#define SCSTR_UNIT  (STR_START + 114)
 
 // accessibility
 
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 4103d54..d815de1 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -77,16 +77,11 @@
 #define CB_SYNCZOOM 35
 
 // TP_LAYOUT
-#define GB_LINK 1
-#define RB_ALWAYS   2
-#define RB_REQUEST  3
-#define RB_NEVER4
 #define CB_DOCONLY  5
 #define CB_MERGE_PARA_DIST  6
 #define GB_COMPAT   7
 #define CB_AUTO_UPDATE_FIELDS   8
 #define CB_AUTO_UPDATE_CHARTS   9
-#define FT_UPDATE_LINKS 10
 
 #define GB_WINDOW   50
 #define CB_ROWCOLHEADER 51
@@ -98,30 +93,14 @@
 #define FT_COLOR58
 #define LB_COLOR59
 #define CB_GUIDELINE60
-#define GB_UNIT 61
-#define LB_UNIT 62
-#define ST_UNIT 63
-#define MF_TAB  65
 #define CB_PAGEBREAKS   66
-#define FT_TAB  69
-#define FT_UNIT 70
 #define FL_SEPARATOR1   71
 #define FL_SEPARATOR2   72
-#define FL_SEPARATOR73
 #define FT_GRID 74
 #define LB_GRID 75
 
 // TP_INPUT
-#define GB_OPTIONS  70
-#define CB_ALIGN71
-#define LB_ALIGN72
-#define CB_EDITMODE 73
-#define CB_FORMAT   74
 #define CB_RFIND75
-#define CB_EXPREF   76
-#define CB_MARKHDR  77
-#define CB_TEXTFMT  78
-#define CB_REPLWARN 79
 
 
 // TP_FORMULA
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 0bb22a5..7f786cb 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -103,28 +103,21 @@ public:
 class ScDocument;
 class ScTpLayoutOptions : public SfxTabPage
 {
-FixedLine   aUnitGB;
-FixedText   aUnitFT;
-ListBox aUnitLB;
-FixedText   aTabFT;
-MetricField aTabMF;
-
-FixedLine   aSeparatorFL;
-FixedLine   aLinkGB;
-FixedText   aLinkFT;
-RadioButton aAlwaysRB;
-RadioButton aRequestRB;
-RadioButton aNeverRB;
-
-FixedLine   aOptionsGB;
-CheckBoxaAlignCB;
-ListBox aAlignLB;
-CheckBoxaEditModeCB;
-CheckBoxaFormatCB;
-CheckBoxaExpRefCB;
-CheckBoxaMarkHdrCB;
-CheckBoxaTextFmtCB;
-CheckBoxaReplWarnCB;
+ListBox*m_pUnitLB;
+MetricField*m_pTabMF;
+
+RadioButton*m_pAlwaysRB;
+RadioButton*m_pRequestRB;
+RadioButton*m_pNeverRB;
+
+CheckBox*   m_pAlignCB;
+ListBox*m_pAlignLB;
+CheckBox*   m_pEditModeCB;
+CheckBox*   m_pFormatCB;
+CheckBox*   m_pExpRefCB;
+CheckBox*   m_pMarkHdrCB;
+CheckBox*   m_pTextFmtCB;
+CheckBox*   m_pReplWarnCB;
 
 SvxStringArray

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

2013-06-06 Thread abdulmajeed ahmed 
 sc/UIConfig_scalc.mk |1 
 sc/inc/helpids.h |1 
 sc/source/ui/inc/optdlg.hrc  |4 -
 sc/source/ui/inc/tpcompatibility.hxx |4 -
 sc/source/ui/optdlg/tpcompatibility.cxx  |   17 ++---
 sc/source/ui/src/optdlg.src  |   38 ---
 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |   90 +++
 7 files changed, 99 insertions(+), 56 deletions(-)

New commits:
commit dc676d9d7a2aa92758e97208d4c6e641d2798664
Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Date:   Thu Jun 6 13:01:34 2013 +0200

Convert Compatibility tab page to .ui

Change-Id: I97e5ecfb800443e41b2d9a88731cc530600a7b1c

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index a9b2e6a..8fc9e35 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
+   sc/uiconfig/scalc/ui/optcompatibilitypage \
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 2037945..afef8bb 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -63,7 +63,6 @@
 #define HID_SCPAGE_FORMULA  
SC_HID_SCPAGE_FORMULA
 #define HID_SCPAGE_USERLISTS
SC_HID_SCPAGE_USERLISTS
 #define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
-#define HID_SCPAGE_COMPATIBILITY
SC_HID_SCPAGE_COMPATIBILITY
 #define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
 #define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 78fdf85..4103d54 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -147,9 +147,5 @@
 #define FT_ODF_RECALC 99
 #define LB_ODF_RECALC100
 
-// TP_COMPATIBILITY
-#define FL_KEY_BINDINGS   1
-#define FT_KEY_BINDINGS   2
-#define LB_KEY_BINDINGS   3
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpcompatibility.hxx 
b/sc/source/ui/inc/tpcompatibility.hxx
index 67b906c..01d74f4 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -30,9 +30,7 @@ private:
 virtual ~ScTpCompatOptions();
 
 private:
-FixedLine maFlKeyBindings;
-FixedText maFtKeyBindings;
-ListBox   maLbKeyBindings;
+ListBox*   m_pLbKeyBindings;
 };
 
 #endif
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx 
b/sc/source/ui/optdlg/tpcompatibility.cxx
index 00f9ef4..3aa1b60 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -16,12 +16,9 @@
 #include appoptio.hxx
 
 ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet 
rCoreAttrs) :
-SfxTabPage(pParent, ScResId(RID_SCPAGE_COMPATIBILITY), rCoreAttrs),
-maFlKeyBindings(this, ScResId(FL_KEY_BINDINGS)),
-maFtKeyBindings(this, ScResId(FT_KEY_BINDINGS)),
-maLbKeyBindings(this, ScResId(LB_KEY_BINDINGS))
+SfxTabPage(pParent, 
OptCompatibilityPage,modules/scalc/ui/optcompatibilitypage.ui, rCoreAttrs)
 {
-FreeResource();
+get(m_pLbKeyBindings,keybindings);
 }
 
 ScTpCompatOptions::~ScTpCompatOptions()
@@ -36,11 +33,11 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, 
const SfxItemSet rCoreAt
 sal_Bool ScTpCompatOptions::FillItemSet(SfxItemSet rCoreAttrs)
 {
 bool bRet = false;
-if (maLbKeyBindings.GetSavedValue() != maLbKeyBindings.GetSelectEntryPos())
+if (m_pLbKeyBindings-GetSavedValue() != 
m_pLbKeyBindings-GetSelectEntryPos())
 {
 rCoreAttrs.Put(
 SfxUInt16Item(
-SID_SC_OPT_KEY_BINDING_COMPAT, 
maLbKeyBindings.GetSelectEntryPos()));
+SID_SC_OPT_KEY_BINDING_COMPAT, 
m_pLbKeyBindings-GetSelectEntryPos()));
 bRet = true;
 }
 return bRet;
@@ -58,17 +55,17 @@ void ScTpCompatOptions::Reset(const SfxItemSet rCoreAttrs)
 switch (eKeyB)
 {
 case ScOptionsUtil::KEY_DEFAULT:
-maLbKeyBindings.SelectEntryPos(0);
+m_pLbKeyBindings-SelectEntryPos(0);
 break;
 case ScOptionsUtil::KEY_OOO_LEGACY:
-maLbKeyBindings.SelectEntryPos(1);
+m_pLbKeyBindings-SelectEntryPos(1);
 break;
 default:
 ;
 }
 }
 
-maLbKeyBindings.SaveValue();
+m_pLbKeyBindings-SaveValue();
 }
 
 int

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

2013-06-04 Thread Abdulaziz A Alayed 
 sc/UIConfig_scalc.mk|1 
 sc/inc/helpids.h|1 
 sc/source/ui/inc/optdlg.hrc |4 
 sc/source/ui/inc/tpprint.hxx|6 -
 sc/source/ui/optdlg/tpprint.cxx |   32 +++
 sc/source/ui/src/optdlg.src |   35 
 sc/uiconfig/scalc/ui/optdlg.ui  |  165 
 7 files changed, 183 insertions(+), 61 deletions(-)

New commits:
commit b8400dbf46aeffd5991f71511ae27368d46a5c40
Author: Abdulaziz A Alayed aala...@kacst.edu.sa
Date:   Tue Jun 4 12:12:33 2013 +0200

Convert Calc Print option page to .ui.

Change-Id: Ida482cb280c3ec3ae05af053861f19c13f8a1d78

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 94a8aea..27563d3 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
+   sc/uiconfig/scalc/ui/optdlg \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 8bbc07a..9744a35 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -64,7 +64,6 @@
 #define HID_SCPAGE_USERLISTS
SC_HID_SCPAGE_USERLISTS
 #define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
 #define HID_SCPAGE_COMPATIBILITY
SC_HID_SCPAGE_COMPATIBILITY
-#define HID_SCPAGE_PRINT
SC_HID_SCPAGE_PRINT
 #define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
 #define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 515ddcb..78fdf85 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -56,10 +56,6 @@
 #define STR_COPYERR 9
 
 // TP_PRINT:
-#define FL_PAGES1
-#define BTN_SKIPEMPTYPAGES  2
-#define FL_SHEETS   2
-#define BTN_SELECTEDSHEETS  4
 
 // TP_LCONTENT
 
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 0babe41..2b9eac7 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -27,10 +27,8 @@
 
 class ScTpPrintOptions : public SfxTabPage
 {
-FixedLine   aPagesFL;
-CheckBoxaSkipEmptyPagesCB;
-FixedLine   aSheetsFL;
-CheckBoxaSelectedSheetsCB;
+CheckBox*   m_pSkipEmptyPagesCB;
+CheckBox*   m_pSelectedSheetsCB;
 
 ScTpPrintOptions( Window* pParent, const SfxItemSet rCoreSet );
 ~ScTpPrintOptions();
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 9ca45c1..cdfc5eb 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -34,14 +34,12 @@
 ScTpPrintOptions::ScTpPrintOptions( Window*   pParent,
 const SfxItemSet rCoreAttrs )
 :   SfxTabPage  ( pParent,
-  ScResId( RID_SCPAGE_PRINT ),
-  rCoreAttrs ),
-aPagesFL ( this, ScResId( FL_PAGES ) ),
-aSkipEmptyPagesCB( this, ScResId( BTN_SKIPEMPTYPAGES ) ),
-aSheetsFL( this, ScResId( FL_SHEETS ) ),
-aSelectedSheetsCB( this, ScResId( BTN_SELECTEDSHEETS ) )
+  optCalcPrintPage,
+  modules/scalc/ui/optdlg.ui,
+  rCoreAttrs )
 {
-FreeResource();
+get( m_pSkipEmptyPagesCB , suppressCB );
+get( m_pSelectedSheetsCB , printCB );
 }
 
 ScTpPrintOptions::~ScTpPrintOptions()
@@ -79,16 +77,16 @@ void ScTpPrintOptions::Reset( const SfxItemSet rCoreSet )
 if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, false 
, pItem ) )
 {
 sal_Bool bChecked = ( (const SfxBoolItem*)pItem )-GetValue();
-aSelectedSheetsCB.Check( bChecked );
+m_pSelectedSheetsCB-Check( bChecked );
 }
 else
 {
-aSelectedSheetsCB.Check( !aOptions.GetAllSheets() );
+m_pSelectedSheetsCB-Check( !aOptions.GetAllSheets() );
 }
 
-aSkipEmptyPagesCB.Check( aOptions.GetSkipEmpty() );
-aSkipEmptyPagesCB.SaveValue();
-aSelectedSheetsCB.SaveValue();
+m_pSkipEmptyPagesCB-Check( aOptions.GetSkipEmpty() );
+m_pSkipEmptyPagesCB-SaveValue();
+m_pSelectedSheetsCB-SaveValue();
 }
 
 // ---
@@ -97,18 +95,18 @@ sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet 
rCoreAttrs )
 {
 rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET );
 
-bool bSkipEmptyChanged = ( aSkipEmptyPagesCB.GetSavedValue() != 
aSkipEmptyPagesCB.IsChecked() );
-bool bSelectedSheetsChanged = ( aSelectedSheetsCB.GetSavedValue() !=

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

2013-05-31 Thread Faisal M . Al-Otaibi 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |1 
 sc/source/ui/inc/optdlg.hrc|7 --
 sc/source/ui/inc/tpdefaults.hxx|9 +-
 sc/source/ui/optdlg/tpdefaults.cxx |   63 +-
 sc/source/ui/src/optdlg.src|   45 -
 sc/uiconfig/scalc/ui/optdefaultpage.ui |  111 +
 7 files changed, 147 insertions(+), 90 deletions(-)

New commits:
commit a20b8dce7985e0b78201c4d7adb207d167117b08
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Thu May 30 12:30:48 2013 +0200

conversion the calc default option page to .ui

Change-Id: I09d8b012633e7fce916b54eee6b1b0d9db50ac23
Reviewed-on: https://gerrit.libreoffice.org/4092
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index cf715ff..94a8aea 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
+   sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/sheetprintpage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 3eff53e..8bbc07a 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -65,7 +65,6 @@
 #define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
 #define HID_SCPAGE_COMPATIBILITY
SC_HID_SCPAGE_COMPATIBILITY
 #define HID_SCPAGE_PRINT
SC_HID_SCPAGE_PRINT
-#define HID_SCPAGE_DEFAULTS 
SC_HID_SCPAGE_DEFAULTS
 #define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
 #define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index ad60340..515ddcb 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -156,11 +156,4 @@
 #define FT_KEY_BINDINGS   2
 #define LB_KEY_BINDINGS   3
 
-// TP_DEFAULTS
-#define FL_INIT_SPREADSHEET  1
-#define FT_NSHEETS   2
-#define ED_NSHEETS   3
-#define FT_SHEETPREFIX   4
-#define ED_SHEETPREFIX   5
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index bd967bb..850ecda 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -38,11 +38,10 @@ private:
 DECL_LINK( PrefixEditOnFocusHdl, Edit* );
 
 private:
-FixedLine aFLInitSpreadSheet;
-FixedText aFtNSheets;
-NumericField  aEdNSheets;
-FixedText aFtSheetPrefix;
-Edit  aEdSheetPrefix;
+FixedText*m_pFtNSheets;
+NumericField* m_pEdNSheets;
+FixedText*m_pFtSheetPrefix;
+Edit* m_pEdSheetPrefix;
 
 // Stores old Sheet Prefix
 OUString maOldPrefixValue;
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index 2dc5a42..06a75cd 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -19,36 +19,35 @@
 
 
 ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet 
rCoreSet) :
-SfxTabPage(pParent, ScResId(RID_SCPAGE_DEFAULTS), rCoreSet),
-aFLInitSpreadSheet ( this, ScResId( FL_INIT_SPREADSHEET ) ),
-aFtNSheets ( this, ScResId( FT_NSHEETS ) ),
-aEdNSheets ( this, ScResId( ED_NSHEETS ) ),
-aFtSheetPrefix ( this, ScResId( FT_SHEETPREFIX ) ),
-aEdSheetPrefix ( this, ScResId( ED_SHEETPREFIX ) )
+SfxTabPage(pParent, OptDefaultPage, 
modules/scalc/ui/optdefaultpage.ui, rCoreSet)
+
 {
-FreeResource();
+get( m_pFtNSheets, textsheetsnumber);
+get( m_pEdNSheets, sheetsnumber);
+get( m_pFtSheetPrefix, textsheetprefix);
+get( m_pEdSheetPrefix, sheetprefix);
 
 // the following computation must be modified accordingly if a third line 
is added to this dialog
-long nTxtW1 = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
-long nCtrlW1 = aFtNSheets.GetSizePixel().Width();
-long nTxtW2 = aFtSheetPrefix.GetCtrlTextWidth(aFtSheetPrefix.GetText() );
-long nCtrlW2 = aFtSheetPrefix.GetSizePixel().Width();
+long nTxtW1  = m_pFtNSheets-GetCtrlTextWidth( m_pFtNSheets-GetText() );
+long nCtrlW1 = m_pFtNSheets-GetSizePixel().Width();
+long nTxtW2  = 
m_pFtSheetPrefix-GetCtrlTextWidth(m_pFtSheetPrefix-GetText() );
+long nCtrlW2 = m_pFtSheetPrefix-GetSizePixel().Width();
 if ( nTxtW1 = nCtrlW1 || nTxtW2 = nCtrlW2)

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

2013-04-15 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/sc.hrc |2 
 sc/inc/scabstdlg.hxx  |3 -
 sc/source/ui/attrdlg/scdlgfact.cxx|   23 +-
 sc/source/ui/attrdlg/scdlgfact.hxx|3 -
 sc/source/ui/inc/namecrea.hxx |   12 +
 sc/source/ui/miscdlgs/namecrea.cxx|   45 +---
 sc/source/ui/src/miscdlgs.src |   67 --
 sc/source/ui/view/cellsh1.cxx |2 
 sc/uiconfig/scalc/ui/createnamesdialog.ui |   21 +
 sc/uiconfig/scalc/ui/externaldata.ui  |   12 +
 11 files changed, 52 insertions(+), 139 deletions(-)

New commits:
commit fd2c9d360ab0b55d0100273875e469448e607751
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Apr 15 11:14:35 2013 +0100

adapt code to create names .ui conversion

Change-Id: I276f354cd07480c8798951c14b565994c93750c2

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 4371959..fe4e049 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -60,6 +60,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/createnamesdialog \
sc/uiconfig/scalc/ui/definename \
sc/uiconfig/scalc/ui/deletecells \
sc/uiconfig/scalc/ui/deletecontents \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index d131092..b0bfb20 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1002,7 +1002,7 @@
 #define RID_SCPAGE_PRINT(SC_DIALOGS_START + 70)
 #define RID_SCDLG_COLORROW  (SC_DIALOGS_START + 71)
 
-#define RID_SCDLG_NAMES_CREATE  (SC_DIALOGS_START + 73)
+
 
 #define RID_SCDLG_CHAR  (SC_DIALOGS_START + 76)
 #define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 026a03e..4e9ffaa 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -414,7 +414,8 @@ public:
 const String 
rDefault,
 int nId ) = 0;
 
-virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * 
pParent, sal_uInt16 nFlags, int nId ) = 0; //add for ScNameCreateDlg
+virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
+sal_uInt16 nFlags) = 0;
 
 virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, 
ScDocShell* pShell, bool bInsList=true ) = 0; // add for ScNamePasteDlg
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 83f3c23..acf411b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1041,29 +1041,12 @@ AbstractScMoveTableDlg * 
ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(  Wi
 return 0;
 }
 
-
-
-
-AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg 
( Window * pParent, sal_uInt16 nFlags, int nId )
+AbstractScNameCreateDlg * 
ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(Window * pParent, 
sal_uInt16 nFlags)
 {
-ScNameCreateDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_NAMES_CREATE :
-pDlg = new ScNameCreateDlg( pParent, nFlags );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScNameCreateDlg_Impl( pDlg );
-return 0;
+ScNameCreateDlg * pDlg = new ScNameCreateDlg( pParent, nFlags );
+return new AbstractScNameCreateDlg_Impl( pDlg );
 }
 
-
-
-
 AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( 
Window * pParent, ScDocShell* pShell, bool bInsList )
 {
 ScNamePasteDlg * pDlg = new ScNamePasteDlg( pParent, pShell, bInsList );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index f88bb0e..d4ea5ef 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -481,7 +481,8 @@ public:
 const String 
rDefault,
 int nId );
 
-virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * 
pParent, sal_uInt16 nFlags, int nId ); //add for ScNameCreateDlg
+virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
+sal_uInt16 nFlags);
 
 virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, 
ScDocShell* pShell, bool bInsList=true ); //add for ScNamePasteDlg
 
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index 8de83ce..dc52ae5 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -28,14 +28,10 @@
 class ScNameCreateDlg : public ModalDialog
 {
 protected:
-FixedLine   aFixedLine;
-CheckBox

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

2013-04-15 Thread Albert Thuswaldner 
 sc/UIConfig_scalc.mk|1 
 sc/inc/sc.hrc   |1 
 sc/inc/scabstdlg.hxx|8 +-
 sc/source/ui/attrdlg/scdlgfact.cxx  |   20 +
 sc/source/ui/attrdlg/scdlgfact.hxx  |9 ++
 sc/source/ui/dbgui/sortdlg.cxx  |   25 +++
 sc/source/ui/inc/sortdlg.hrc|7 -
 sc/source/ui/inc/sortdlg.hxx|8 --
 sc/source/ui/src/sortdlg.src|   48 -
 sc/source/ui/view/cellsh2.cxx   |2 
 sc/uiconfig/scalc/ui/sortwarning.ui |  127 
 11 files changed, 162 insertions(+), 94 deletions(-)

New commits:
commit db8b11b876ed26fb70cf90f86337395dd2e78f64
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date:   Sun Apr 14 12:41:42 2013 +0200

Calc: converted sort warning dialog to .ui

Change-Id: I2bc44990efb62183507f46b22bfd8e09edf02eb6
Reviewed-on: https://gerrit.libreoffice.org/3380
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index fe4e049..3d3c47f 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
+   sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
 ))
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b0bfb20..7e1 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1080,7 +1080,6 @@
 
 #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
 #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
-#define RID_SCDLG_SORT_WARNING  (SC_DIALOGS_START + 147)
 #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)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4e9ffaa..2e80c1c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -46,6 +46,7 @@ class SfxStyleSheetBase;
 class ScDPObject;
 struct ScPivotFuncData;
 struct ScDPNumGroupInfo;
+class ScSortWarningDlg;
 class ScTabViewShell;
 class ScConditionalFormat;
 class ScConditionalFormatList;
@@ -293,6 +294,10 @@ public:
 virtual sal_uInt16  GetSelectEntryPos(sal_uInt16 nPos) const = 0;
 };
 
+class AbstractScSortWarningDlg : public VclAbstractDialog  //add for 
ScSortWarningDlg
+{
+};
+
 class AbstractScStringInputDlg :  public VclAbstractDialog  //add for 
ScStringInputDlg
 {
 public:
@@ -345,7 +350,8 @@ public:
 const String   rStrLabel,
 int nId,
 sal_Bool
bColDefault = sal_True ) = 0;
-virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, 
const String rExtendText, const String rCurrentText, int nId ) = 0;  //add 
for ScSortWarningDlg
+
+virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, 
const String rExtendText, const String rCurrentText ) = 0; //add for 
ScSortWarningDlg
 
 virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* 
pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
 const 
ScAddress rPos, int nId ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index acf411b..1283a3b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -109,6 +109,7 @@ IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScSortWarningDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
@@ -729,23 +730,10 @@ VclAbstractDialog *  
ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
 return 0;
 }
 
-
-
-VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( 
Window* pParent, const String rExtendText,
-  
const String rCurrentText, int nId )
+AbstractScSortWarningDlg* 
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const 
String rExtendText, const String rCurrentText )
 {
-Dialog * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_SORT_WARNING:
-pDlg = new ScSortWarningDlg( pParent, rExtendText, rCurrentText );
-break;
-default:
-break;
-}
-if( pDlg )
-return new

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

2013-04-15 Thread Caolán McNamara 
 sc/UIConfig_scalc.mk |1 
 sc/inc/helpids.h |1 
 sc/inc/sc.hrc|2 
 sc/inc/scabstdlg.hxx |3 -
 sc/source/ui/attrdlg/scdlgfact.cxx   |   26 +--
 sc/source/ui/attrdlg/scdlgfact.hxx   |3 -
 sc/source/ui/dbgui/dapitype.cxx  |   57 +++--
 sc/source/ui/dbgui/dapitype.hrc  |6 --
 sc/source/ui/dbgui/dapitype.src  |   77 ---
 sc/source/ui/inc/dapitype.hxx|   18 +++-
 sc/source/ui/view/cellsh1.cxx|2 
 sc/uiconfig/scalc/ui/selectsource.ui |   70 +--
 12 files changed, 82 insertions(+), 184 deletions(-)

New commits:
commit 73318c3db8031127574a3371bf737eb926006d7b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Apr 15 14:17:16 2013 +0100

adapt code to select source .ui

Change-Id: I65d3f5acbe95985269c03b3e0c57c5cc80ca30d4

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 12f0025..07cb7be 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/selectrange \
+   sc/uiconfig/scalc/ui/selectsource \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index fa4323c..ef6e849 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -191,7 +191,6 @@
 #define HID_PASSWD_TABLE
SC_HID_PASSWD_TABLE
 #define HID_PASSWD_DOC  
SC_HID_PASSWD_DOC
 
-#define HID_DATAPILOT_TYPE  
SC_HID_DATAPILOT_TYPE
 #define HID_DATAPILOT_DATABASE  
SC_HID_DATAPILOT_DATABASE
 #define HID_DATAPILOT_SERVICE   
SC_HID_DATAPILOT_SERVICE
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7e1..793a746 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1060,7 +1060,7 @@
 #define WID_SIMPLE_REF  (SC_DIALOGS_START + 126)
 #define RID_POPUP_CHANGES   (SC_DIALOGS_START + 127)
 
-#define RID_SCDLG_DAPITYPE  (SC_DIALOGS_START + 129)
+
 #define RID_SCDLG_DAPISERVICE   (SC_DIALOGS_START + 130)
 #define RID_SCDLG_DAPIDATA  (SC_DIALOGS_START + 131)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index c50e355..5190c9a 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -358,7 +358,8 @@ public:
 
 virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg 
(Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
 
-virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg 
( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for 
ScDataPilotSourceTypeDlg
+virtual AbstractScDataPilotSourceTypeDlg * 
CreateScDataPilotSourceTypeDlg(Window* pParent,
+bool bEnableExternal) = 0;
 
 virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( 
Window* pParent, //add for ScDataPilotServiceDlg
 const 
com::sun::star::uno::SequenceOUString rServices,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 0a24dd6..e9945b8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -773,31 +773,13 @@ AbstractScDataPilotDatabaseDlg *  
ScAbstractDialogFactory_Impl::CreateScDataPilo
 return 0;
 }
 
-
-
-AbstractScDataPilotSourceTypeDlg* 
ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( Window* pParent,
-   
sal_Bool bEnableExternal,
-   
int nId )
+AbstractScDataPilotSourceTypeDlg* 
ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg(
+Window* pParent, bool bEnableExternal)
 {
-ScDataPilotSourceTypeDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_DAPITYPE :
-pDlg = new ScDataPilotSourceTypeDlg( pParent, bEnableExternal );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScDataPilotSourceTypeDlg_Impl( pDlg );
-return 0;
+ScDataPilotSourceTypeDlg* pDlg = new ScDataPilotSourceTypeDlg(pParent, 
bEnableExternal);
+return new AbstractScDataPilotSourceTypeDlg_Impl(pDlg);
 }
 
-// add for ScDataPilotSourceTypeDlg end
-
-
-
 AbstractScDataPilotServiceDlg* 
ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent,
 const

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

2013-04-09 Thread Caolán McNamara 
 sc/UI_scalc.mk  |1 
 sc/inc/helpids.h|1 
 sc/inc/sc.hrc   |6 +-
 sc/inc/scabstdlg.hxx|6 --
 sc/source/ui/attrdlg/scdlgfact.cxx  |   21 +-
 sc/source/ui/attrdlg/scdlgfact.hxx  |6 --
 sc/source/ui/inc/lbseldlg.hxx   |   17 +---
 sc/source/ui/miscdlgs/lbseldlg.cxx  |   44 +
 sc/source/ui/src/miscdlgs.src   |   49 ---
 sc/source/ui/src/scstring.src   |   10 
 sc/source/ui/view/cellsh2.cxx   |6 --
 sc/uiconfig/scalc/ui/selectrange.ui |   75 ++--
 12 files changed, 64 insertions(+), 178 deletions(-)

New commits:
commit 78417f42a4b71729f324ca09e341ee24d9d4baaa
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 9 10:40:16 2013 +0100

adapt code for select range .ui conversion

Change-Id: Ib53b42a340da04276ce005efb22d19fda617e29a

diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index 9b8f7a4..60850afe 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/sheetprintpage \
+   sc/uiconfig/scalc/ui/selectrange \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 96be512..6f210c8 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -95,7 +95,6 @@
 
 #define HID_SC_NAVIGATOR
SC_HID_SC_NAVIGATOR
 
-#define HID_SC_SELENTRY_LIST
SC_HID_SC_SELENTRY_LIST
 #define HID_SC_GROUP_COLS   
SC_HID_SC_GROUP_COLS
 #define HID_SC_GROUP_ROWS   
SC_HID_SC_GROUP_ROWS
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 08365fa..0b460be 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -716,8 +716,8 @@
 #define SCSTR_MODIFY(STR_START + 19)
 #define SCSTR_SHOWTABLE (STR_START + 20)
 #define SCSTR_HIDDENTABLES  (STR_START + 21)
-#define SCSTR_SELECTDB  (STR_START + 22)
-#define SCSTR_AREAS (STR_START + 23)
+
+
 #define SCSTR_TABLE (STR_START + 24)
 #define SCSTR_NAME  (STR_START + 25)
 #define SCSTR_INSTABLE  (STR_START + 26)
@@ -1035,7 +1035,7 @@
 #define RID_SCDLG_ROW_OPT   (SC_DIALOGS_START + 107)
 
 // derivations from RID_SCDLG_SELENTRY
-#define RID_SCDLG_SELECTDB  (SC_DIALOGS_START + 108)
+
 #define RID_SCDLG_SHOW_TAB  (SC_DIALOGS_START + 109)
 
 // derivations from RID_SCDLG_GROUP
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 50f3aa0..14de680 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -395,11 +395,7 @@ public:
 SCTAB nTabCount, bool bFromFile) = 0;
 
 virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // 
add for ScSelEntryDlg
-sal_uInt16  nResId,
-const String aTitle,
-const String aLbTitle,
-const 
std::vectorString rEntryList,
-int nId ) = 0;
+  const 
std::vectorString rEntryList ) = 0;
 virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg (  Window* 
pParent, int nId) = 0; //add for ScLinkedAreaDlg
 
 virtual AbstractScMetricInputDlg * CreateScMetricInputDlg (  Window*   
 pParent, //add for ScMetricInputDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 0c43040..9ca906a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1000,25 +1000,10 @@ AbstractScInsertTableDlg * 
ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(
 
 // add for ScSelEntryDlg begin
 AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( 
Window* pParent,
-sal_uInt16  nResId,
-const String aTitle,
-const String aLbTitle,
-const 
std::vectorString rEntryList,
-int nId )
+const 
std::vectorString rEntryList )
 {
-ScSelEntryDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_SELECTDB :
-pDlg = new ScSelEntryDlg( pParent, nResId,aTitle, aLbTitle, 
rEntryList );
-

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

2013-04-04 Thread Caolán McNamara 
 sc/inc/helpids.h   |1 
 sc/source/ui/pagedlg/pagedlg.hrc   |1 
 sc/uiconfig/scalc/ui/sheetprintpage.ui |   93 +
 3 files changed, 49 insertions(+), 46 deletions(-)

New commits:
commit cb3bf6a1300b15eb800435175036a6d3448b5e9a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Apr 4 11:08:00 2013 +0100

set adjustment min/maxes

Change-Id: I713c1a280c31a7a783e6a0af94b838091fc98779

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 93e73d4..96be512 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -79,7 +79,6 @@
 #define HID_SCPAGE_HFEDIT   
SC_HID_SCPAGE_HFEDIT
 #define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
 #define HID_SCPAGE_COMPATIBILITY
SC_HID_SCPAGE_COMPATIBILITY
-#define HID_SCPAGE_TABLE
SC_HID_SCPAGE_TABLE
 #define HID_SCPAGE_PRINT
SC_HID_SCPAGE_PRINT
 #define HID_SCPAGE_DEFAULTS 
SC_HID_SCPAGE_DEFAULTS
 #define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
index abadb48..d4b13b0 100644
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ b/sc/source/ui/pagedlg/pagedlg.hrc
@@ -19,7 +19,6 @@
 
 
 #include sc.hrc   // - RID_SCDLG_PAGE
-// - RID_SCPAGE_TABLE
 // - RID_SCPAGE_AREAS
 
 #define TP_PAGE_STD 1
diff --git a/sc/uiconfig/scalc/ui/sheetprintpage.ui 
b/sc/uiconfig/scalc/ui/sheetprintpage.ui
index 85318a1..0f1b6c9 100644
--- a/sc/uiconfig/scalc/ui/sheetprintpage.ui
+++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui
@@ -1,13 +1,23 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  object class=GtkAdjustment id=adjustmentFirstPage
+property name=lower1.05/property
+property name=upper.04009/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
   object class=GtkAdjustment id=adjustmentPage
-property name=upper999/property
+property name=lower1/property
+property name=upper1000/property
+property name=value1/property
 property name=step_increment1/property
 property name=page_increment10/property
   /object
   object class=GtkAdjustment id=adjustmentScalingFactor
-property name=upper100/property
+property name=lower10/property
+property name=upper400/property
+property name=value15/property
 property name=step_increment1/property
 property name=page_increment10/property
   /object
@@ -110,7 +120,7 @@
 property name=can_focusTrue/property
 property name=max_length5/property
 property name=invisible_char•/property
-property name=adjustmentadjustmentPage/property
+property 
name=adjustmentadjustmentFirstPage/property
   /object
   packing
 property name=left_attach1/property
@@ -311,18 +321,6 @@
   /packing
 /child
 child
-  placeholder/
-/child
-child
-  placeholder/
-/child
-child
-  placeholder/
-/child
-child
-  placeholder/
-/child
-child
   object class=GtkCheckButton id=checkBTN_NULLVALS
 property name=label translatable=yes_Zero 
values/property
 property name=visibleTrue/property
@@ -339,6 +337,18 @@
 property name=height1/property
   /packing
 /child
+child
+  placeholder/
+/child
+child
+  placeholder/
+/child
+child
+  placeholder/
+/child
+child
+  placeholder/
+/child
   /object
 /child
   /object
@@ -382,6 +392,7 @@
   object class=GtkLabel id=labelScalingMode
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=xalign0/property
 property name=label translatable=yesScaling 
_mode:/property
 property name=use_underlineTrue/property
 property 
name=mnemonic_widgetcomboLB_SCALEMODE/property
@@ -403,12 +414,12 @@
   object class=GtkHBox id=boxSCALEALL
 property name=visibleTrue/property
 property