[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
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 sc/UIConfig_scalc.mk
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
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
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
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
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
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
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
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
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
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
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 sc/UIConfig_scalc.mk
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
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
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
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
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
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
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
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
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
