[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk|1
sw/inc/helpid.h |2
sw/source/ui/chrdlg/numpara.cxx | 214 -
sw/source/ui/chrdlg/numpara.hrc | 43 ---
sw/source/ui/chrdlg/numpara.src | 187 ---
sw/source/ui/inc/numpara.hxx | 33 +-
sw/uiconfig/swriter/ui/numparapage.ui | 413 ++
8 files changed, 534 insertions(+), 360 deletions(-)
New commits:
commit 3ce8127936548eccf0646319ffd35c7beaaee603
Author: Olivier Hallot
Date: Thu Apr 11 10:35:34 2013 -0300
Convert Paragraph Outline&Numbering tab page to Widget UI
Conflicts:
sw/UI_swriter.mk
Change-Id: I5280ddaa714db0f9ffd61cf400acf9a9fcc1087b
Reviewed-on: https://gerrit.libreoffice.org/3337
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 1e94fa7..735751a 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/chrdlg/chardlg.src \
sw/source/ui/chrdlg/chrdlg.src \
sw/source/ui/chrdlg/drpcps.src \
-sw/source/ui/chrdlg/numpara.src \
sw/source/ui/chrdlg/paradlg.src \
sw/source/ui/config/mailconfigpage.src \
sw/source/ui/config/optcomp.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 1e7a807..5b889c7 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
+ sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 1340e25..ad22fb0 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -170,7 +170,7 @@
#define HID_FLD_FUNC
"SW_HID_FLD_FUNC"
#define HID_FLD_REF
"SW_HID_FLD_REF"
#define HID_OPTSHDWCRSR
"SW_HID_OPTSHDWCRSR"
-#define HID_NUMPARA
"SW_HID_NUMPARA"
+
#define HID_REDLINE_OPT
"SW_HID_REDLINE_OPT"
#define HID_EDIT_FLD_DB
"SW_HID_EDIT_FLD_DB"
#define HID_EDIT_FLD_DOKINF
"SW_HID_EDIT_FLD_DOKINF"
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 54975d7..e4d13af 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
@@ -42,54 +41,48 @@ static sal_uInt16 aPageRg[] = {
0
};
-SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent,
-const SfxItemSet& rAttr ) :
-SfxTabPage(pParent, SW_RES(TP_NUMPARA), rAttr),
-aOutlineStartFL ( this, SW_RES( FL_OUTLINE_START )),
-aOutlineLvFT( this, SW_RES( FT_OUTLINE_LEVEL )),
-aOutlineLvLB( this, SW_RES( LB_OUTLINE_LEVEL )),
-aNewStartFL ( this, SW_RES( FL_NEW_START ) ),
-aNumberStyleFT ( this, SW_RES( FT_NUMBER_STYLE ) ),
-aNumberStyleLB ( this, SW_RES( LB_NUMBER_STYLE ) ),
- aNewStartCB ( this, SW_RES( CB_NEW_START ) ),
-aNewStartNumberCB ( this, SW_RES( CB_NUMBER_NEW_START ) ),
-aNewStartNF ( this, SW_RES( NF_NEW_START ) ),
-aCountParaFL( this, SW_RES( FL_COUNT_PARA) ),
-aCountParaCB( this, SW_RES( CB_COUNT_PARA) ),
-aRestartParaCountCB ( this, SW_RES( CB_RESTART_PARACOUNT ) ),
-aRestartFT ( this, SW_RES( FT_RESTART_NO) ),
-aRestartNF ( this, SW_RES( NF_RESTART_PARA ) ),
+SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const
SfxItemSet& rAttr ) :
+SfxTabPage(pParent, "NumParaPage", "/modules/swriter/ui/numparapage.ui",
rAttr),
+
msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ),
bModified(sal_False),
bCurNumrule(sal_False)
{
-FreeResource();
+get(m_pOutlineStartBX, "boxOUTLINE");
+get(m_pOutlineLvLB,"comboLB_OUTLINE_LEVEL");
+
+get(m_pNumberStyleBX, "boxNUMBER_STYLE");
+get(m_pNumberStyleLB, "comboLB_NUMBER_STYLE");
+
+get(m_pNewStartBX, "boxNEW_START");
+get(m_pNewStartCB, "checkCB_NEW_START");
+get(m_pNewStartNumberCB, "checkCB_NUMBER_NEW_START");
+get(m_pNewStartNF, "spinNF_NEW_START");
+
+get(m_pCountPara
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h|1
sw/source/ui/envelp/labprt.cxx | 98 --
sw/source/ui/envelp/labprt.hrc | 49 -
sw/source/ui/envelp/labprt.hxx | 27 +-
sw/source/ui/envelp/labprt.src | 122
sw/uiconfig/swriter/ui/labeloptionspage.ui | 284 +
8 files changed, 340 insertions(+), 243 deletions(-)
New commits:
commit c5740ff43bea7ab7362812cb6fd77507ba100359
Author: Caolán McNamara
Date: Tue Aug 6 23:06:11 2013 +0200
convert label options tabpage to .ui
Change-Id: I3fd082bc3a8989f6099ee826f61240d9227b2afe
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 0916793..0d1cc07 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/envelp/envprt.src \
sw/source/ui/envelp/label.src \
sw/source/ui/envelp/labfmt.src \
-sw/source/ui/envelp/labprt.src \
sw/source/ui/envelp/mailmrge.src \
sw/source/ui/fldui/flddb.src \
sw/source/ui/fldui/flddinf.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 8e7f217..34ea76f 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertsectiondialog \
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
+ sw/uiconfig/swriter/ui/labeloptionspage \
sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/mailconfigpage \
sw/uiconfig/swriter/ui/mailmergedialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 6127920..0a4014c 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -145,7 +145,6 @@
#define HID_FRM_STD
"SW_HID_FRM_STD"
#define HID_GRF_EXT
"SW_HID_GRF_EXT"
#define HID_LAB_LAB
"SW_HID_LAB_LAB"
-#define HID_LAB_PRT
"SW_HID_LAB_PRT"
#define HID_ENV_PRT
"SW_HID_ENV_PRT"
#define HID_LAB_FMT
"SW_HID_LAB_FMT"
#define HID_ENV_ENV
"SW_HID_ENV_ENV"
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index de6a37e..c59b359 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -27,44 +27,36 @@
#include "swuilabimp.hxx"
#include
-#include
-
-SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
-
-SfxTabPage(pParent, SW_RES(TP_LAB_PRT), rSet),
-
-pPrinter( 0 ),
-aFLDontKnow(this, SW_RES(FL_DONTKNOW)),
-aPageButton(this, SW_RES(BTN_PAGE )),
-aSingleButton (this, SW_RES(BTN_SINGLE )),
-aColText (this, SW_RES(TXT_COL)),
-aColField (this, SW_RES(FLD_COL)),
-aRowText (this, SW_RES(TXT_ROW)),
-aRowField (this, SW_RES(FLD_ROW)),
-aSynchronCB(this, SW_RES(CB_SYNCHRON)),
-aFLPrinter (this, SW_RES(FL_PRINTER )),
-aPrinterInfo (this, SW_RES(INF_PRINTER)),
-aPrtSetup (this, SW_RES(BTN_PRTSETUP))
+SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet)
+: SfxTabPage(pParent, "LabelOptionsPage",
+"modules/swriter/ui/labeloptionspage.ui", rSet)
+, pPrinter(0)
{
-FreeResource();
+get(m_pPageButton, "entirepage");
+get(m_pSingleButton, "singlelabel");
+get(m_pSingleGrid, "singlegrid");
+get(m_pColField, "cols");
+get(m_pRowField, "rows");
+get(m_pSynchronCB, "synchronize");
+get(m_pPrinterFrame, "printerframe");
+get(m_pPrinterInfo, "printername");
+get(m_pPrtSetup, "setup");
SetExchangeSupport();
// Install handlers
Link aLk = LINK(this, SwLabPrtPage, CountHdl);
-aPageButton .SetClickHdl( aLk );
-aSingleButton.SetClickHdl( aLk );
+m_pPageButton->SetClickHdl( aLk );
+m_pSingleButton->SetClickHdl( aLk );
-aPrtSetup.SetClickHdl( aLk );
+m_pPrtSetup->SetClickHdl( aLk );
SvtCommandOptions aCmdOpts;
if ( aCmdOpts.Lookup(
SvtCommandOptions::CMDOPTION_DISABLED,
OUString( "Print" ) ) )
{
-aPrinterInfo.Hide();
-aPrtSetup.Hide();
-aFLPrinter.Hide();
+m_pPrinterFrame->Hide();
}
}
@@ -75,7 +67,7 @@ SwLabPrtPage::~SwLabPrtPage()
IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
{
-if (pButton == &aPrtSetup)
+if (pButton == m_pPrtSetup)
{
// Call printer setup
if (!pPrinter)
@@ -86,20 +78,17 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
pDlg->Execute(
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk|3 sw/UIConfig_swriter.mk |1 sw/inc/swabstdlg.hxx |1 sw/source/ui/chrdlg/paradlg.hrc | 25 --- sw/source/ui/chrdlg/paradlg.src | 128 --- sw/source/ui/chrdlg/pardlg.cxx | 70 ++ sw/source/ui/dialog/swdlgfact.cxx| 21 --- sw/source/ui/dialog/swdlgfact.hxx|1 sw/source/ui/inc/swuipardlg.hxx | 12 + sw/source/ui/shells/annotsh.cxx |2 sw/source/ui/shells/drwtxtex.cxx |2 sw/source/ui/shells/textsh1.cxx |2 sw/uiconfig/swriter/ui/paradialog.ui | 233 +++ 13 files changed, 294 insertions(+), 207 deletions(-) New commits: commit 9992b1aadb114159fe5d78e46aebb209d718d958 Author: Olivier Hallot Date: Thu Jul 11 17:10:14 2013 -0300 Convert paragraph properties dialog to .ui format Convert Writer paragraph properties dialog to .ui widgets. Reduced 2 different dialogs into one (bDrawParaDlg) Conflicts: sw/AllLangResTarget_sw.mk Change-Id: I63135dda5416b8b503f9aa9f4986ce3ed08f535c Reviewed-on: https://gerrit.libreoffice.org/4851 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 7f96e8b..c4553fd 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -69,10 +69,9 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/app/mn.src \ sw/source/ui/chrdlg/ccoll.src \ sw/source/ui/chrdlg/chrdlg.src \ -sw/source/ui/chrdlg/paradlg.src \ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ - sw/source/ui/config/optdlg.src \ +sw/source/ui/config/optdlg.src \ sw/source/ui/config/optload.src \ sw/source/ui/dbui/addresslistdialog.src \ sw/source/ui/dbui/createaddresslistdialog.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 43fc6a0..c4a09e5 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -113,6 +113,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/outlinenumberingpage \ sw/uiconfig/swriter/ui/outlinepositionpage \ sw/uiconfig/swriter/ui/queryshowchangesdialog \ + sw/uiconfig/swriter/ui/paradialog \ sw/uiconfig/swriter/ui/previewzoomdialog \ sw/uiconfig/swriter/ui/printoptionspage \ sw/uiconfig/swriter/ui/printeroptions \ diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 1515b78..4f48dad 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -365,7 +365,6 @@ public: SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, -int nResId, const String *pCollName = 0, sal_Bool bDraw = sal_False, sal_uInt16 nDefPage = 0) = 0; diff --git a/sw/source/ui/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc deleted file mode 100644 index d0f59f9..000 --- a/sw/source/ui/chrdlg/paradlg.hrc +++ /dev/null @@ -1,25 +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 . - */ -#define TAB_CONTROL 55 -#define HYPHEN_BOX_AFTER 44 -#define HYPHEN_BOX_BEFORE 22 -#define OK_BTN 50 -#define CANCEL_BTN 51 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src deleted file mode 100644 index 6435a96..000 --- a/sw/source/ui/chrdlg/paradlg.src +++ /dev/null @@ -1,128 +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 -
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |2
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h |1
sw/source/ui/config/optdlg.hrc |9 -
sw/source/ui/config/optdlg.src | 75 ---
sw/source/ui/config/optpage.cxx | 110 -
sw/source/ui/inc/optpage.hxx| 16 +-
sw/uiconfig/swriter/ui/optcomparison.ui | 201
8 files changed, 262 insertions(+), 153 deletions(-)
New commits:
commit c99830c221cd2362d58caac15dd2fb33a2b1ad38
Author: abdulmajeed ahmed
Date: Thu May 30 17:27:46 2013 +0200
Convert Comparison tab page to .ui
Change-Id: Ia1cd8c868de4c73ae518b2775dc568d32a15f16f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index bfb95fc..3b60502 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -70,7 +70,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/chrdlg/paradlg.src \
sw/source/ui/config/mailconfigpage.src \
sw/source/ui/config/optcomp.src \
-sw/source/ui/config/optdlg.src \
+ sw/source/ui/config/optdlg.src \
sw/source/ui/config/optload.src \
sw/source/ui/config/redlopt.src \
sw/source/ui/dbui/addresslistdialog.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index eb100cf..a01d738 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/newuserindexdialog \
sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/numberingnamedialog \
+ sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 2fa479f..e2c2be3 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -193,7 +193,6 @@
#define HID_OPTCOMPATIBILITY_PAGE
"SW_HID_OPTCOMPATIBILITY_PAGE"
#define HID_COMPATIBILITY_OPTIONS_BOX
"SW_HID_COMPATIBILITY_OPTIONS_BOX"
-#define HID_COMPARISON_OPT
"SW_HID_COMPARISON_OPT"
#define HID_PROPERTYPANEL_WRAP_SECTION
"SW_HID_PROPERTYPANEL_WRAP_SECTION"
#define HID_PROPERTYPANEL_WRAP_RB_NO_WRAP
"SW_HID_PROPERTYPANEL_WRAP_RB_NO_WRAP"
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 4d716c8..160b8f1 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -135,13 +135,4 @@
#define CB_MATH_BASELINE_ALIGNMENT16
-#define FL_CMP 141
-#define RB_AUTO142
-#define RB_WORD143
-#define RB_CHAR144
-#define FL_SET 145
-#define CB_RSID146
-#define CB_IGNORE 147
-#define NF_LEN 148
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 889408f9..b411db0 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -641,79 +641,4 @@ StringArray STR_PRINTOPTUI
};
};
-
-/**/
-/**/
-/* TabPage Comparison
*/
-/**/
-/**/
-TabPage TP_COMPARISON_OPT
-{
-HelpID = HID_COMPARISON_OPT;
-SVLook = TRUE ;
-Hide = TRUE;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT );
-FixedLine FL_CMP
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Compare documents";
-};
-RadioButton RB_AUTO
-{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "~Auto";
-TabStop = TRUE ;
-Group = TRUE ;
-};
-RadioButton RB_WORD
-{
-Pos = MAP_APPFONT ( 12 , 27 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "By ~word";
-};
-RadioButton RB_CHAR
-{
-Pos = MAP_APPFONT ( 12 , 40 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "By ~character";
-};
-FixedLine FL_SET
-{
-Pos = MAP_APPFONT ( 6 , 56 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Settings";
-};
-CheckBox CB_RSID
-{
-Pos = M
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h|1
sw/source/ui/utlui/gloslst.cxx | 31 ++
sw/source/ui/utlui/gloslst.hrc | 31 --
sw/source/ui/utlui/gloslst.src | 71 --
sw/uiconfig/swriter/ui/selectautotextdialog.ui | 122 +
7 files changed, 135 insertions(+), 123 deletions(-)
New commits:
commit f201d069cc7126da92b203c38479f1b4510d4e50
Author: Caolán McNamara
Date: Sat Aug 17 14:53:43 2013 +0100
convert select autotext group to .ui
Change-Id: I2be99d22d30b5a09ee0b0920a63852ca6783cc0a
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 775b558..6317b49 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/table/tabledlg.src \
sw/source/ui/uiview/view.src \
sw/source/ui/utlui/attrdesc.src \
-sw/source/ui/utlui/gloslst.src \
sw/source/ui/utlui/initui.src \
sw/source/ui/utlui/navipi.src \
sw/source/ui/utlui/poolfmt.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 4a2209a..907c251 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/saveashtmldialog \
sw/uiconfig/swriter/ui/savelabeldialog \
sw/uiconfig/swriter/ui/sectionpage \
+ sw/uiconfig/swriter/ui/selectautotextdialog \
sw/uiconfig/swriter/ui/sidebarpage \
sw/uiconfig/swriter/ui/sidebarwrap \
sw/uiconfig/swriter/ui/sortdialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index a55b714..01bdcbb 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -56,7 +56,6 @@
#define HID_INSERT_CHART
"SW_HID_INSERT_CHART"
#define HID_NAVIGATOR_TREELIST
"SW_HID_NAVIGATOR_TREELIST"
-#define HID_DLG_GLOSS_DECIDE
"SW_HID_DLG_GLOSS_DECIDE"
#define HID_NAVIGATOR_TOOLBOX
"SW_HID_NAVIGATOR_TOOLBOX"
#define HID_NAVIGATOR_LISTBOX
"SW_HID_NAVIGATOR_LISTBOX"
#define HID_VS_SINGLENUM
"SW_HID_VS_SINGLENUM"
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index eab56d3..9290720 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -37,8 +37,6 @@
#include
#include
-#include
-
#define STRING_DELIM (char)0x0A
#define GLOS_TIMEOUT 3 // update every 30 seconds
@@ -54,31 +52,26 @@ struct TripleString
class SwGlossDecideDlg : public ModalDialog
{
-OKButtonaOk;
-CancelButtonaCancel;
-HelpButton aHelp;
-ListBox aListLB;
-FixedLine aFL;
+OKButton* m_pOk;
+ListBox* m_pListLB;
DECL_LINK(DoubleClickHdl, void*);
DECL_LINK(SelectHdl, void*);
public:
SwGlossDecideDlg(Window* pParent);
-ListBox&GetListBox() {return aListLB;}
+ListBox&GetListBox() {return *m_pListLB;}
};
-SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) :
-ModalDialog(pParent, SW_RES(DLG_GLOSSARY_DECIDE_DLG)),
-aOk(this, SW_RES(PB_OK)),
-aCancel(this, SW_RES(PB_CANCEL)),
-aHelp(this, SW_RES(PB_HELP)),
-aListLB(this, SW_RES(LB_LIST)),
-aFL(this,SW_RES(FL_GLOSS))
+SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent)
+: ModalDialog(pParent, "SelectAutoTextDialog",
+"modules/swriter/ui/selectautotextdialog.ui")
{
-FreeResource();
-aListLB.SetDoubleClickHdl(LINK(this, SwGlossDecideDlg, DoubleClickHdl));
-aListLB.SetSelectHdl(LINK(this, SwGlossDecideDlg, SelectHdl));
+get(m_pOk, "ok");
+get(m_pListLB, "treeview");
+m_pListLB->set_height_request(m_pListLB->GetTextHeight() * 10);
+m_pListLB->SetDoubleClickHdl(LINK(this, SwGlossDecideDlg, DoubleClickHdl));
+m_pListLB->SetSelectHdl(LINK(this, SwGlossDecideDlg, SelectHdl));
}
IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl)
@@ -89,7 +82,7 @@ IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl)
IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl)
{
-aOk.Enable(LISTBOX_ENTRY_NOTFOUND != aListLB.GetSelectEntryPos());
+m_pOk->Enable(LISTBOX_ENTRY_NOTFOUND != m_pListLB->GetSelectEntryPos());
return 0;
}
diff --git a/sw/source/ui/utlui/gloslst.hrc b/sw/source/ui/utlui/gloslst.hrc
deleted file mode 100644
index 8e70ed0..000
--- a/sw/source/ui/utlui/gloslst.hrc
+++ /dev/null
@@ -1,31 +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
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/index.hrc|2
sw/inc/swabstdlg.hxx|3
sw/source/ui/dialog/swdlgfact.cxx | 17 ---
sw/source/ui/dialog/swdlgfact.hxx |3
sw/source/ui/inc/multmrk.hxx| 13 --
sw/source/ui/index/multmrk.cxx | 37 +++
sw/source/ui/index/multmrk.hrc | 27 -
sw/source/ui/index/multmrk.src | 82 -
sw/source/ui/shells/textidx.cxx |3
sw/uiconfig/swriter/ui/selectindexdialog.ui | 131
12 files changed, 157 insertions(+), 163 deletions(-)
New commits:
commit 58fe754c70b64ee5152197b24c3e0cf92d4122ed
Author: Caolán McNamara
Date: Tue Sep 3 08:45:49 2013 +0100
convert select index dialog to .ui
Change-Id: I49a3d67e9c22c1608354b732f8aee27afcf15885
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 148ad76..e2c30a5 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -103,7 +103,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/globdoc/globdoc.src \
sw/source/ui/index/cnttab.src \
sw/source/ui/index/idxmrk.src \
-sw/source/ui/index/multmrk.src \
sw/source/ui/lingu/olmenu.src \
sw/source/ui/misc/glossary.src \
sw/source/ui/misc/numberingtypelistbox.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index ceb9611..d50ba65 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -166,6 +166,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/savelabeldialog \
sw/uiconfig/swriter/ui/sectionpage \
sw/uiconfig/swriter/ui/selectautotextdialog \
+ sw/uiconfig/swriter/ui/selectindexdialog \
sw/uiconfig/swriter/ui/sidebarpage \
sw/uiconfig/swriter/ui/sidebarwrap \
sw/uiconfig/swriter/ui/sortdialog \
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index d9fad14..bdb7796 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -26,8 +26,6 @@
#include "rcid.hrc"
-#define DLG_MULTMRK(RC_INDEX_BEGIN + 5)
-
#define STR_TITLE (RC_INDEX_BEGIN + 6)
#define STR_ALPHA (RC_INDEX_BEGIN + 7)
#define STR_LEVEL (RC_INDEX_BEGIN + 8)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index b2a5fbb..aa1d02b 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -424,8 +424,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 )
= 0;
virtual AbstractMailMergeCreateFromDlg*
CreateMailMergeCreateFromDlg(Window* pParent) = 0;
virtual AbstractMailMergeFieldConnectionsDlg*
CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0;
-virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
-Window* pParent, SwTOXMgr
&rTOXMgr ) = 0;
+virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent,
SwTOXMgr &rTOXMgr) = 0;
virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index e07cc8b..cd2d333 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1023,21 +1023,10 @@ AbstractMailMergeFieldConnectionsDlg *
SwAbstractDialogFactory_Impl::CreateMailM
return new AbstractMailMergeFieldConnectionsDlg_Impl( pDlg );
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int
nResId,
-Window* pParent, SwTOXMgr
&rTOXMgr )
+VclAbstractDialog *
SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr
&rTOXMgr)
{
-Dialog* pDlg=NULL;
-switch ( nResId )
-{
-case DLG_MULTMRK :
-pDlg = new SwMultiTOXMarkDlg( pParent, rTOXMgr );
-break;
-default:
-break;
-}
-if ( pDlg )
-return new VclAbstractDialog_Impl( pDlg );
-return 0;
+Dialog* pDlg = new SwMultiTOXMarkDlg(pParent, rTOXMgr);
+return new VclAbstractDialog_Impl(pDlg);
}
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int
nResId,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 77aa49c..a0b113c 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -469,8 +469,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 );
virtual AbstractMailMergeCreateFromDlg*
CreateMail
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1 sw/UIConfig_swriter.mk|1 sw/inc/helpid.h |2 sw/source/ui/dbui/addresslistdialog.cxx | 227 ++-- sw/source/ui/dbui/addresslistdialog.hrc | 41 --- sw/source/ui/dbui/addresslistdialog.hxx | 31 +- sw/source/ui/dbui/addresslistdialog.src | 124 -- sw/source/ui/index/cnttab.cxx |3 sw/uiconfig/swriter/ui/selectaddressdialog.ui | 295 ++ 9 files changed, 428 insertions(+), 297 deletions(-) New commits: commit f27ee66f2b1f086baf8feb6054d4e6d77a4a30e3 Author: Caolán McNamara Date: Wed Sep 11 14:11:54 2013 +0100 convert select address book to .ui Change-Id: I578bd89d2abb077c7b90ec4f75e0b8204dd33f92 diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index b5f1687..4392c77 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -71,7 +71,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optdlg.src \ sw/source/ui/config/optload.src \ -sw/source/ui/dbui/addresslistdialog.src \ sw/source/ui/dbui/createaddresslistdialog.src \ sw/source/ui/dbui/dbtablepreviewdialog.src \ sw/source/ui/dbui/dbui.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 5016644..f903b9b 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -171,6 +171,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/saveashtmldialog \ sw/uiconfig/swriter/ui/savelabeldialog \ sw/uiconfig/swriter/ui/sectionpage \ + sw/uiconfig/swriter/ui/selectaddressdialog \ sw/uiconfig/swriter/ui/selectautotextdialog \ sw/uiconfig/swriter/ui/selectindexdialog \ sw/uiconfig/swriter/ui/sidebarpage \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 5bdcc27..2314270 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -375,7 +375,6 @@ #define HID_MM_PREPAREMERGEPAGE "SW_HID_MM_PREPAREMERGEPAGE" #define HID_MM_MERGEPAGE "SW_HID_MM_MERGEPAGE" #define HID_MM_OUTPUTPAGE "SW_HID_MM_OUTPUTPAGE" -#define HID_MM_ADDRESSLISTDIALOG "SW_HID_MM_ADDRESSLISTDIALOG" #define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG" #define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" #define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG" @@ -386,7 +385,6 @@ #define HID_MM_LAYOUT_PAGE "SW_HID_MM_LAYOUT_PAGE" #define HID_MM_COPYTO "SW_HID_MM_COPYTO" #define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB" -#define HID_MM_ADDRESSLIST_TLB "SW_HID_MM_ADDRESSLIST_TLB" #define HID_MM_TESTACCOUNTSETTINGS "SW_HID_MM_TESTACCOUNTSETTINGS" #define HID_MM_TESTACCOUNTSETTINGS_TLB "SW_HID_MM_TESTACCOUNTSETTINGS_TLB" #define HID_MM_TESTACCOUNTSETTINGS_HB "SW_HID_MM_TESTACCOUNTSETTINGS_HB" diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 5934046..79e85f9 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -32,7 +32,8 @@ #include #include #include -#include "svtools/treelistentry.hxx" +#include +#include #include #include #include @@ -53,7 +54,6 @@ #include #include #include -#include #include #include @@ -139,72 +139,80 @@ static OUString lcl_getFlatURL( uno::Reference& xSourceProp return sURL; } -SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : -SfxModalDialog(pParent, SW_RES(DLG_MM_ADDRESSLISTDIALOG)), -#ifdef _MSC_VER -#pragma warning (disable : 4355) -#endif -m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION)), -m_aListFT( this, SW_RES( FT_LIST )), -m_aListHB( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER), -m_aListLB( this, SW_RES( LB_LIST )), -m_aLoadListPB( this, SW_RES( PB_LOADLIST )), -m_aCreateListPB(this, SW_RES(PB_CREATELIST )), -m_aFilterPB( this, SW_RES( PB_FILTER )), -m_aEditPB(this, SW_RES( PB_EDIT )), -m_aTablePB(this, SW_RES( PB_TABLE )), -m_aSeparatorFL(this, SW_RES(FL_SEPARATOR )), -m_aOK( this, SW_RES( PB_OK )), -m_aCancel( this, SW_RES( PB_CANCEL )), -m_aHelp( this, SW_RES( PB_HELP )), -#ifdef _MSC_VER -#pra
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|2
sw/inc/helpid.h|1
sw/source/ui/dbui/mmlayoutpage.cxx | 130 -
sw/source/ui/dbui/mmlayoutpage.hxx | 27 --
sw/source/ui/dbui/mmlayoutpage.src | 155 ---
sw/uiconfig/swriter/ui/mmlayoutpage.ui | 437 +
8 files changed, 509 insertions(+), 245 deletions(-)
New commits:
commit 50d5b97a776342d3f032f3df2f2f2c90b02d7f34
Author: Caolán McNamara
Date: Tue Mar 18 16:00:18 2014 +
convert wizard layout page to .ui
Change-Id: I40ae0f7dea51bf0b8db60ec6b3cac955e9016af4
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 998137d..99df02b 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mailmergewizard.src \
sw/source/ui/dbui/mmaddressblockpage.src \
sw/source/ui/dbui/mmgreetingspage.src \
-sw/source/ui/dbui/mmlayoutpage.src \
sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
sw/source/ui/dbui/mmpreparemergepage.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 98b91b1..ebb6682 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/mmaddressblockpage \
sw/uiconfig/swriter/ui/mmcreatingdialog \
+ sw/uiconfig/swriter/ui/mmlayoutpage \
sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmselectpage \
sw/uiconfig/swriter/ui/mmsalutationpage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 2bf18ec..33996c5 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -39,8 +39,6 @@
#define DLG_MM_ASSIGNFIELDS (RC_DBUI_BEGIN + 20)
-#define DLG_MM_LAYOUT_PAGE(RC_DBUI_BEGIN + 22)
-
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD(RC_DBUI_BEGIN + 26)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 55fe598..c4a7d88 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -372,7 +372,6 @@
#define HID_MM_DBTABLEPREVIEWDIALOG
"SW_HID_MM_DBTABLEPREVIEWDIALOG"
#define HID_MM_CREATEADDRESSLIST
"SW_HID_MM_CREATEADDRESSLIST"
#define HID_MM_ASSIGNFIELDS
"SW_HID_MM_ASSIGNFIELDS"
-#define HID_MM_LAYOUT_PAGE
"SW_HID_MM_LAYOUT_PAGE"
#define HID_MM_ADDRESSLIST_HB
"SW_HID_MM_ADDRESSLIST_HB"
#define HID_MM_MAILBODY
"SW_HID_MM_MAILBODY"
#define HID_MM_SENDMAILS
"SW_HID_MM_SENDMAILS"
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx
b/sw/source/ui/dbui/mmlayoutpage.cxx
index 3dd2016..1863263 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -73,29 +73,27 @@ using namespace ::com::sun::star::view;
#define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm
SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
-svt::OWizardPage( _pParent, SW_RES(DLG_MM_LAYOUT_PAGE)),
-m_aHeaderFI( this, SW_RES( FI_HEADER )),
-m_aPositionFL( this, SW_RES( FL_POSITION )),
-m_aAlignToBodyCB( this, SW_RES( CB_ALIGN )),
-m_aLeftFT( this, SW_RES( FT_LEFT )),
-m_aLeftMF( this, SW_RES( MF_LEFT )),
-m_aTopFT( this, SW_RES(FT_TOP)),
-m_aTopMF( this, SW_RES(MF_TOP)),
-m_aGreetingLineFL( this, SW_RES( FL_GREETINGLINE )),
-m_aUpFT( this, SW_RES( FT_UP )),
-m_aUpPB( this, SW_RES( MF_UP )),
-m_aDownFT( this, SW_RES( FT_DOWN )),
-m_aDownPB( this, SW_RES( PB_DOWN )),
-m_aExampleContainerWIN( this, SW_RES( WIN_EXAMPLECONTAINER )),
-m_aZoomFT( this, SW_RES( FT_ZOOM )),
-m_aZoomLB( this, SW_RES( LB_ZOOM )),
-m_pExampleFrame(0),
-m_pExampleWrtShell(0),
-m_pAddressBlockFormat(0),
-m_bIsGreetingInserted(false),
-m_pWizard(_pParent)
+svt::OWizardPage(_pParent, "MMLayoutPage",
+"modules/swriter/ui/mmlayoutpage.ui")
+, m_pExampleFrame(0)
+, m_pExampleWrtShell(0)
+, m_pAddressBlockFormat(0)
+, m_bIsGreetingInserted(false)
+, m_pWizard(_pParent)
{
-FreeResource();
+get(m_pPosition, "addresspos");
+get(m_pGreetingLine, "greetings
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc |1
sw/inc/helpid.h |1
sw/source/ui/dbui/mmpreparemergepage.cxx | 76 +++
sw/source/ui/dbui/mmpreparemergepage.hrc | 38 ---
sw/source/ui/dbui/mmpreparemergepage.hxx | 24 --
sw/source/ui/dbui/mmpreparemergepage.src | 124 ---
sw/uiconfig/swriter/ui/mmpreparepage.ui | 328 +++
9 files changed, 370 insertions(+), 224 deletions(-)
New commits:
commit 2a200a271c134bdd91658f6b34213b4a77f3295f
Author: Caolán McNamara
Date: Mon Mar 24 13:46:31 2014 +
convert mail merge prepare page to .ui
Change-Id: I7bfd0a5b3f5ce5d548bf711ffb82b85a126fec2b
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 99df02b..001c39e 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mmgreetingspage.src \
sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
-sw/source/ui/dbui/mmpreparemergepage.src \
sw/source/ui/dbui/selectdbtabledialog.src \
sw/source/ui/dialog/dialog.src \
sw/source/ui/dochdl/dochdl.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index ebb6682..e06de32 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -167,6 +167,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmlayoutpage \
sw/uiconfig/swriter/ui/mmoutputtypepage \
+ sw/uiconfig/swriter/ui/mmpreparepage \
sw/uiconfig/swriter/ui/mmselectpage \
sw/uiconfig/swriter/ui/mmsalutationpage \
sw/uiconfig/swriter/ui/paradialog \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 33996c5..2800901 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -27,7 +27,6 @@
#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
#define DLG_MM_DOCSELECT_PAGE (RC_DBUI_BEGIN + 4)
#define DLG_MM_OUTPUTTYPE_PAGE (RC_DBUI_BEGIN + 5)
-#define DLG_MM_PREPAREMERGE_PAGE(RC_DBUI_BEGIN + 8)
#define DLG_MM_MERGE_PAGE (RC_DBUI_BEGIN + 9)
#define DLG_MM_OUTPUT_PAGE (RC_DBUI_BEGIN + 10)
#define DLG_MM_ADDRESSLISTDIALOG(RC_DBUI_BEGIN + 11)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index c4a7d88..8eebb15 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -364,7 +364,6 @@
#define HID_PRINT_AS_MERGE
"SW_HID_PRINT_AS_MERGE"
#define HID_MODULE_TOOLBOX
"SW_HID_MODULE_TOOLBOX"
-#define HID_MM_PREPAREMERGEPAGE
"SW_HID_MM_PREPAREMERGEPAGE"
#define HID_MM_MERGEPAGE
"SW_HID_MM_MERGEPAGE"
#define HID_MM_OUTPUTPAGE
"SW_HID_MM_OUTPUTPAGE"
#define HID_MM_SELECTDBTABLEDDIALOG
"SW_HID_MM_SELECTDBTABLEDDIALOG"
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx
b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 218d158..60f800f 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -29,44 +29,33 @@
#include
#include
-#include
-
#include
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
-SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard*
_pParent) :
-svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)),
-m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
-m_aPreviewFI(this, SW_RES( FI_PREVIEW ) ),
-m_aRecipientFT(this, SW_RES( FT_RECIPIENT ) ),
-m_aFirstPB(this, SW_RES( PB_FIRST ) ),
-m_aPrevPB(this, SW_RES(PB_PREV) ),
-m_aRecordED(this, SW_RES( ED_RECORD ) ),
-m_aNextPB(this, SW_RES(PB_NEXT) ),
-m_aLastPB(this, SW_RES(PB_LAST) ),
-m_ExcludeCB(this, SW_RES( CB_EXCLUDE) ),
-m_aNoteHeaderFL(this, SW_RES( FL_NOTEHEADER ) ),
-m_aEditFI(this, SW_RES(FI_EDIT ) ),
-m_aEditPB(this, SW_RES(PB_EDIT ) ),
-m_pWizard(_pParent)
+SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard*
_pParent)
+: svt::OWizardPage(_pParent, "MMPreparePage",
"modules/swriter/ui/mmpreparepage.ui")
+, m_pWizard(_pParent)
{
-FreeResource();
-m_aEditPB.SetClickHdl( LINK( this, SwMailMergePrepareMergePage,
EditDocumentHdl_Impl));
-Link aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl));
-m_aFirstPB.SetClickHdl( aMoveLink );
-m_aPrevPB.SetClickHdl( aMoveLink );
-m_aNextPB.SetClickHdl( aMoveLink );
-m_aLastPB.SetClickHdl( aMoveLink );
-m_aRecordED.SetActionHdl( aMoveLink );
-m_ExcludeCB.SetClickHdl(LINK(this,
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk|1
sw/inc/dbui.hrc |1
sw/inc/helpid.h |1
sw/source/ui/dbui/mmmergepage.cxx | 52 ++
sw/source/ui/dbui/mmmergepage.hrc | 35
sw/source/ui/dbui/mmmergepage.hxx | 21 +-
sw/source/ui/dbui/mmmergepage.src | 98
sw/uiconfig/swriter/ui/mmmergepage.ui | 263 ++
9 files changed, 294 insertions(+), 179 deletions(-)
New commits:
commit 76ada5696d114bc90cf285fafec41b1d21696692
Author: Caolán McNamara
Date: Tue Mar 25 14:06:11 2014 +
convert mail merge page to .ui
Change-Id: I13e23a2e5c19370b0a82c24bc96b532debf9c160
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 001c39e..2842cf1 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mailmergewizard.src \
sw/source/ui/dbui/mmaddressblockpage.src \
sw/source/ui/dbui/mmgreetingspage.src \
-sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
sw/source/ui/dbui/selectdbtabledialog.src \
sw/source/ui/dialog/dialog.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index e06de32..00bbcdb 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -166,6 +166,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/mmaddressblockpage \
sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmlayoutpage \
+ sw/uiconfig/swriter/ui/mmmergepage \
sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmpreparepage \
sw/uiconfig/swriter/ui/mmselectpage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 2800901..5760a68 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -27,7 +27,6 @@
#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
#define DLG_MM_DOCSELECT_PAGE (RC_DBUI_BEGIN + 4)
#define DLG_MM_OUTPUTTYPE_PAGE (RC_DBUI_BEGIN + 5)
-#define DLG_MM_MERGE_PAGE (RC_DBUI_BEGIN + 9)
#define DLG_MM_OUTPUT_PAGE (RC_DBUI_BEGIN + 10)
#define DLG_MM_ADDRESSLISTDIALOG(RC_DBUI_BEGIN + 11)
#define DLG_MM_SELECTDBTABLEDDIALOG (RC_DBUI_BEGIN + 12)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8eebb15..8ad928d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -364,7 +364,6 @@
#define HID_PRINT_AS_MERGE
"SW_HID_PRINT_AS_MERGE"
#define HID_MODULE_TOOLBOX
"SW_HID_MODULE_TOOLBOX"
-#define HID_MM_MERGEPAGE
"SW_HID_MM_MERGEPAGE"
#define HID_MM_OUTPUTPAGE
"SW_HID_MM_OUTPUTPAGE"
#define HID_MM_SELECTDBTABLEDDIALOG
"SW_HID_MM_SELECTDBTABLEDDIALOG"
#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX
"SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX"
diff --git a/sw/source/ui/dbui/mmmergepage.cxx
b/sw/source/ui/dbui/mmmergepage.cxx
index a54be84..a888cfe 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -23,41 +23,33 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
-svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)),
-m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
-m_aEditFI(this, SW_RES( FI_EDIT )),
-m_aEditPB(this, SW_RES( PB_EDIT )),
-m_aFindFL(this, SW_RES( FL_FIND )),
-m_aFineFT(this, SW_RES( FT_FIND )),
-m_aFindED(this, SW_RES( ED_FIND )),
-m_aFindPB(this, SW_RES( PB_FIND )),
-m_aWholeWordsCB(this, SW_RES( CB_WHOLEWORDS)),
-m_aBackwardsCB(this, SW_RES( CB_BACKWARDS )),
-m_aMatchCaseCB(this, SW_RES( CB_MATCHCASE )),
-m_pWizard(_pParent)
+SwMailMergeMergePage::SwMailMergeMergePage(SwMailMergeWizard* _pParent)
+: svt::OWizardPage(_pParent, "MMMergePage",
+"modules/swriter/ui/mmmergepage.ui")
+, m_pWizard(_pParent)
{
-FreeResource();
-OUString sTemp(m_aEditFI.GetText());
-sTemp = sTemp.replaceFirst("%1", m_aEditPB.GetText());
-m_aEditFI.SetText(sTemp);
-m_aEditPB.SetClickHdl( LINK( this, SwMailMergeMergePage,
EditDocumentHdl_Impl));
-m_aFindPB.SetClickHdl( LINK( this, SwMailMergeMergePage, FindHdl_Impl ));
+get(m_pEditFI, "helplabel");
+get(m_pEditPB, "edit");
+get(m_pFindPB, "find");
+get(m_pWholeWordsCB, "wholewords");
+get(m_pBackwardsCB, "backwards");
+get(m_pMatchCaseCB, "matchcase");
+get(m_pFindED, "entry");
+OUString sTemp(m_pEditFI->GetText());
+sTemp = sTemp.replaceFirst("%1", m_pEditPB->GetText());
+m_pEditFI->SetText(sTem
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/swabstdlg.hxx |2
sw/source/ui/dialog/swdlgfact.cxx | 17 ---
sw/source/ui/dialog/swdlgfact.hxx |3
sw/source/ui/inc/mergetbl.hxx | 11 --
sw/source/ui/inc/table.hrc |4
sw/source/ui/shells/tabsh.cxx |2
sw/source/ui/table/mergetbl.cxx| 21 ---
sw/source/ui/table/mergetbl.hrc| 26
sw/source/ui/table/mergetbl.src| 75 --
sw/uiconfig/swriter/ui/mergetabledialog.ui | 154 +
12 files changed, 170 insertions(+), 147 deletions(-)
New commits:
commit 61483d2f40cb0d77a4e1593ee677ae37c9ec6d65
Author: Caolán McNamara
Date: Thu Apr 25 11:58:40 2013 +0100
convert merge table dialog to .ui
Change-Id: I59ff70e3280d4e746b0d20f7f9532a341d88cb57
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 6d63cea..f52adae 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -141,7 +141,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/shells/shells.src \
sw/source/ui/smartmenu/stmenu.src \
sw/source/ui/table/chartins.src \
-sw/source/ui/table/mergetbl.src \
sw/source/ui/table/table.src \
sw/source/ui/table/tabledlg.src \
sw/source/ui/uiview/pview.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index a4349e5..a014523 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
+ sw/uiconfig/swriter/ui/mergetabledialog \
sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c0ff6ed..acc2af9 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -391,7 +391,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > &
xNameAccess, int nResId ) = 0;
virtual AbstractSwModalRedlineAcceptDlg *
CreateSwModalRedlineAcceptDlg(Window *pParent) = 0;
-virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window*
pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
+virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent,
sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
SfxViewFrame *pFrame, Window
*pParent,
const SfxItemSet& rCoreSet,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 0cedad7..851cbb1 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1028,21 +1028,10 @@ AbstractSwModalRedlineAcceptDlg *
SwAbstractDialogFactory_Impl::CreateSwModalRed
return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg );
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int
nResId,
-Window* pParent, sal_Bool&
rWithPrev ) //add for SwMergeTblDlg
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window*
pParent, sal_Bool& rWithPrev) //add for SwMergeTblDlg
{
-Dialog* pDlg=NULL;
-switch ( nResId )
-{
-case DLG_MERGE_TABLE :
-pDlg = new SwMergeTblDlg( pParent, rWithPrev );
-break;
-default:
-break;
-}
-if ( pDlg )
-return new VclAbstractDialog_Impl( pDlg );
-return 0;
+Dialog* pDlg = new SwMergeTblDlg( pParent, rWithPrev );
+return new VclAbstractDialog_Impl( pDlg );
}
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog( int
nResId,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index b9c75bd..2547151 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -490,8 +490,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > &
xNameAccess, int nResId );
virtual AbstractSwModalRedlineAcceptDlg *
CreateSwModalRedlineAcceptDlg(Window *pParent); //add for
SwModalRedlineAcceptDlg
-virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
-Window* pParent, sal_Bool&
rWithPrev ); //add for SwMergeTblDlg
+virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent,
sal_Bool& rWithPrev); //add for SwMerg
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h |1
sw/source/ui/uiview/pview.cxx | 40 ++
sw/source/ui/uiview/pview.hrc | 51
sw/source/ui/uiview/pview.src | 103
sw/source/ui/uiview/view.hrc|1
sw/source/ui/uiview/view.src|4
sw/uiconfig/swriter/ui/previewzoomdialog.ui | 171
9 files changed, 189 insertions(+), 184 deletions(-)
New commits:
commit 5ab7d719795d5c74af856df98d23117ab62ffd78
Author: Caolán McNamara
Date: Thu Apr 25 12:27:59 2013 +0100
convert page preview zoom dialog to .ui
Change-Id: I4c4511787247bdcabd88af1c3b0894361336b71f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f52adae..921d608 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -143,7 +143,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/table/chartins.src \
sw/source/ui/table/table.src \
sw/source/ui/table/tabledlg.src \
-sw/source/ui/uiview/pview.src \
sw/source/ui/uiview/view.src \
sw/source/ui/utlui/attrdesc.src \
sw/source/ui/utlui/gloslst.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index a014523..0343d21 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
sw/uiconfig/swriter/ui/outlinepositionpage \
+ sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/rowheight \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5b114f8..f5095ba 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -83,7 +83,6 @@
#define HID_NAVI_TBX15
"SW_HID_NAVI_TBX15"
#define HID_NAVI_VS
"SW_HID_NAVI_VS"
#define HID_NUM_FORMAT_BTN
"SW_HID_NUM_FORMAT_BTN"
-#define HID_PPREV_ZOOM
"SW_HID_PPREV_ZOOM"
#define HID_NAVI_TBX16
"SW_HID_NAVI_TBX16"
#define HID_LTEMPL_TEXT
"SW_HID_LTEMPL_TEXT"
#define HID_LTEMPL_FRAME
"SW_HID_LTEMPL_FRAME"
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 8ce5a32..c7c5e41 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -66,7 +66,7 @@
#include
#include
#include
-#include
+#include
#define SwPagePreView
#include
@@ -137,47 +137,33 @@ static void lcl_InvalidateZoomSlots(SfxBindings&
rBindings)
// erstmal der Zoom-Dialog
class SwPreViewZoomDlg : public SvxStandardDialog
{
-FixedText aRowLbl;
-NumericFieldaRowEdit;
-FixedText aColLbl;
-NumericFieldaColEdit;
+NumericField* m_pRowEdit;
+NumericField* m_pColEdit;
-OKButtonaOkBtn;
-CancelButtonaCancelBtn;
-HelpButton aHelpBtn;
-
-virtual voidApply();
+virtual void Apply();
public:
SwPreViewZoomDlg( SwPagePreViewWin& rParent );
-~SwPreViewZoomDlg();
};
-SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) :
-SvxStandardDialog( &rParent, SW_RES(DLG_PAGEPREVIEW_ZOOM) ),
-aRowLbl(this,SW_RES(FT_ROW)),
-aRowEdit(this,SW_RES(ED_ROW)),
-aColLbl(this,SW_RES(FT_COL)),
-aColEdit(this,SW_RES(ED_COL)),
-aOkBtn(this,SW_RES(BT_OK)),
-aCancelBtn(this,SW_RES(BT_CANCEL)),
-aHelpBtn(this,SW_RES(BT_HELP))
+SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent )
+: SvxStandardDialog(&rParent, "PreviewZoomDialog",
"modules/swriter/ui/previewzoomdialog.ui")
{
-FreeResource();
+get(m_pRowEdit, "rows");
+get(m_pColEdit, "cols");
-aRowEdit.SetValue( rParent.GetRow() );
-aColEdit.SetValue( rParent.GetCol() );
+m_pRowEdit->SetValue( rParent.GetRow() );
+m_pColEdit->SetValue( rParent.GetCol() );
}
-SwPreViewZoomDlg::~SwPreViewZoomDlg() {}
void SwPreViewZoomDlg::Apply()
{
((SwPagePreViewWin*)GetParent())->CalcWish(
-sal_uInt8(aRowEdit.GetValue()),
-sal_uInt8(aColEdit.GetValue()) );
+sal_uInt8(m_pRowEdit->GetValue()),
+sal_uInt8(m_pColEdit->GetValue()) );
}
-// alles fuers SwPagePreViewWin
+// all for SwPagePreViewWin
SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView )
: Window( pParent, WinBits( WB_CLIPCHILDREN) ),
mpViewShell( 0 ),
diff --git a/sw/source/ui/uiview/pview.hrc b/sw/source/ui/uiview/pview.hrc
deleted file mode 100644
index
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk|1
sw/inc/helpid.h |1
sw/inc/swabstdlg.hxx |5
sw/source/ui/dialog/swdlgfact.cxx | 21 ---
sw/source/ui/dialog/swdlgfact.hxx |5
sw/source/ui/fldui/DropDownFieldDialog.cxx| 60 +++-
sw/source/ui/fldui/DropDownFieldDialog.hrc| 31
sw/source/ui/fldui/DropDownFieldDialog.src| 87
sw/source/ui/inc/DropDownFieldDialog.hxx | 12 -
sw/source/ui/wrtsh/wrtsh2.cxx |2
sw/uiconfig/swriter/ui/dropdownfielddialog.ui | 180 ++
12 files changed, 219 insertions(+), 187 deletions(-)
New commits:
commit 9069a4a4775b89291eddb5cdc1d81263a7e772f5
Author: Caolán McNamara
Date: Sun Apr 28 10:42:49 2013 +0100
convert drop down field dialog to .ui
Change-Id: If629068fee488abbad9704b8300e59ea4c5c8605
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 8a53f1a..7c0b1b0 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/envelp/labfmt.src \
sw/source/ui/envelp/labprt.src \
sw/source/ui/envelp/mailmrge.src \
-sw/source/ui/fldui/DropDownFieldDialog.src \
sw/source/ui/fldui/flddb.src \
sw/source/ui/fldui/flddinf.src \
sw/source/ui/fldui/flddok.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index bfee0da..6a1c63c 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columnpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
+ sw/uiconfig/swriter/ui/dropdownfielddialog \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
sw/uiconfig/swriter/ui/editsectiondialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 4fca677..fc5a1ca 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -421,7 +421,6 @@
#define HID_MODULE_TOOLBOX
"SW_HID_MODULE_TOOLBOX"
#define HID_SECTION_INDENTS_PAGE
"SW_HID_SECTION_INDENTS_PAGE"
-#define HID_FLD_DROPDOWN
"SW_HID_FLD_DROPDOWN"
#define HID_MM_DOCSELECTPAGE
"SW_HID_MM_DOCSELECTPAGE"
#define HID_MM_OUTPUTTYPEPAGE
"SW_HID_MM_OUTPUTTYPEPAGE"
#define HID_MM_ADDRESSBLOCKPAGE
"SW_HID_MM_ADDRESSBLOCKPAGE"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 8a4c45e..df02c3b 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -350,8 +350,9 @@ public:
const SwDBData& rData, int nResId) = 0;
virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg( Window *pParent,
SwWrtShell &rSh,int nResId) = 0;//add for SwFootNoteOptionDlg
-virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog ( Window
*pParent, SwWrtShell &rSh, //add for DropDownFieldDialog
-SwField* pField,int nResId, sal_Bool
bNextButton = sal_False ) = 0;
+//add for DropDownFieldDialog
+virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window
*pParent, SwWrtShell &rSh,
+SwField* pField, sal_Bool bNextButton = sal_False) = 0;
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const
SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int
nResId ) = 0; //add for SwEnvDlg
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 3fc1ef0..dffb169 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -777,23 +777,12 @@ SfxAbstractTabDialog *
SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(
return 0;
}
-AbstractDropDownFieldDialog *
SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog ( Window *pParent,
SwWrtShell &rSh, //add for DropDownFieldDialog
-SwField* pField,int nResId, sal_Bool
bNextButton )
+//add for DropDownFieldDialog
+AbstractDropDownFieldDialog *
SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(Window *pParent,
+SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton)
{
-sw::DropDownFieldDialog* pDlg=NULL;
-switch ( nResId )
-{
-case DLG_FLD_DROPDOWN :
-pDlg = new sw::DropDownFieldDialog( pParent, rSh, pField,
bNextButton );
-break;
-
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractDropDownFieldDialog_Impl( pDlg );
-return 0;
+sw::DropDownFieldDialog* pDlg = new sw::DropDownFieldDialog(pParent, rSh,
pField, bNextButton);
+return new AbstractDr
