[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig
sw/inc/swabstdlg.hxx|4
sw/source/ui/dialog/swdlgfact.cxx | 30 ++-
sw/source/ui/dialog/swdlgfact.hxx | 26 ++-
sw/source/ui/dialog/swuiexp.cxx |1
sw/source/ui/fldui/javaedit.cxx | 225
sw/source/ui/index/multmrk.cxx | 50 ++
sw/source/uibase/inc/javaedit.hxx | 73 -
sw/source/uibase/inc/multmrk.hxx| 29 +--
sw/source/uibase/shells/textfld.cxx |4
sw/source/uibase/shells/textidx.cxx |2
sw/uiconfig/swriter/ui/insertscript.ui | 212 ++
sw/uiconfig/swriter/ui/selectindexdialog.ui | 49 +-
12 files changed, 371 insertions(+), 334 deletions(-)
New commits:
commit 8a35cafb58c38e84541a44f8534c0511d2400e75
Author: Caolán McNamara
Date: Mon Apr 16 20:52:37 2018 +0100
weld SwMultiTOXMarkDlg
Change-Id: Idff6120f0a04bd94ec8402ae02daa9599f133698
Reviewed-on: https://gerrit.libreoffice.org/53004
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 862f8bb94751..2c24fc1bfbe1 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -477,7 +477,7 @@ public:
const css::uno::Reference<
css::sdbc::XConnection>& xConnection ) = 0;
virtual VclPtr
CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0;
virtual VclPtr
CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0;
-virtual VclPtr
CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0;
+virtual VclPtr
CreateMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr) = 0;
virtual VclPtr
CreateOutlineTabDialog(vcl::Window* pParent,
const SfxItemSet* pSwItemSet,
SwWrtShell &) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 6796a973c5dc..e3e9559a3331 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -123,6 +123,10 @@ short AbstractSwSortDlg_Impl::Execute()
{
return m_xDlg->execute();
}
+short AbstractMultiTOXMarkDlg_Impl::Execute()
+{
+return m_xDlg->execute();
+}
IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
short AbstractSwConvertTableDlg_Impl::Execute()
{
@@ -987,10 +991,9 @@ VclPtr
SwAbstractDialogFactory_Impl::Creat
return VclPtr::Create( pDlg );
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(vcl::Window* pParent,
SwTOXMgr &rTOXMgr)
+VclPtr
SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(weld::Window* pParent,
SwTOXMgr &rTOXMgr)
{
-VclPtr pDlg = VclPtr::Create(pParent, rTOXMgr);
-return VclPtr::Create(pDlg);
+return VclPtr::Create(new
SwMultiTOXMarkDlg(pParent, rTOXMgr));
}
VclPtr
SwAbstractDialogFactory_Impl::CreateSvxNumBulletTabDialog(vcl::Window* pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 904e005276c4..d53aad217e3c 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -25,6 +25,7 @@ class SwInsertAbstractDlg;
class SwAsciiFilterDlg;
class Dialog;
class SwBreakDlg;
+class SwMultiTOXMarkDlg;
class SwSortDlg;
class SwTableHeightDlg;
class SwTableWidthDlg;
@@ -135,6 +136,18 @@ public:
virtual short Execute() override;
};
+class AbstractMultiTOXMarkDlg_Impl : public VclAbstractDialog
+{
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractMultiTOXMarkDlg_Impl(SwMultiTOXMarkDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+};
+
class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
{
protected:
@@ -591,7 +604,7 @@ public:
const css::uno::Reference<
css::sdbc::XConnection>& xConnection ) override;
virtual VclPtr
CreateMailMergeCreateFromDlg(vcl::Window* pParent) override;
virtual VclPtr
CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) override;
-virtual VclPtr
CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) override;
+virtual VclPtr
CreateMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr) override;
virtual VclPtr
CreateOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet,
SwWrtShell &) override;
virtual VclPtr
CreateSvxNumBulletTabDialog(vcl::Window* pParent,
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index f541a4507909..ba351e57ced5 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/source
sw/UIConfig_swriter.mk |1 sw/inc/helpid.h| 11 - sw/source/uibase/docvw/docvw.hrc | 26 --- sw/source/uibase/docvw/docvw.src | 166 -- sw/source/uibase/docvw/romenu.cxx | 225 -- sw/source/uibase/docvw/romenu.hxx | 25 +++ sw/uiconfig/swriter/ui/readonlymenu.ui | 247 + vcl/source/window/mouse.cxx|9 - 8 files changed, 401 insertions(+), 309 deletions(-) New commits: commit 45d57a0dba8bb5a92150cc07bdff0b37b3041007 Author: Caolán McNamara Date: Tue Apr 18 13:13:27 2017 +0100 convert readonly menu to .ui Change-Id: Ia9400b3c4b410dbf70633e55286a4af77f0d651a diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index d6e4dd787eb2..86fe9b7e503d 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -229,6 +229,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/printmonitordialog \ sw/uiconfig/swriter/ui/printoptionspage \ sw/uiconfig/swriter/ui/privateuserpage \ + sw/uiconfig/swriter/ui/readonlymenu \ sw/uiconfig/swriter/ui/renameautotextdialog \ sw/uiconfig/swriter/ui/renameentrydialog \ sw/uiconfig/swriter/ui/renameobjectdialog \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 5bea9367c9df..0d18cd66e88d 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -88,17 +88,6 @@ #define HID_MN_SUB_SPELLING "SW_HID_MN_SUB_SPELLING" #define HID_MN_SUB_MIRROR "SW_HID_MN_SUB_MIRROR" -#define HID_MN_READONLY_SAVEGRAPHIC "SW_HID_MN_READONLY_SAVEGRAPHIC" -#define HID_MN_READONLY_GRAPHICTOGALLERY "SW_HID_MN_READONLY_GRAPHICTOGALLERY" -#define HID_MN_READONLY_TOGALLERYLINK "SW_HID_MN_READONLY_TOGALLERYLINK" -#define HID_MN_READONLY_TOGALLERYCOPY "SW_HID_MN_READONLY_TOGALLERYCOPY" -#define HID_MN_READONLY_SAVEBACKGROUND "SW_HID_MN_READONLY_SAVEBACKGROUND" -#define HID_MN_READONLY_BACKGROUNDTOGALLERY "SW_HID_MN_READONLY_BACKGROUNDTOGALLERY" -#define HID_MN_READONLY_COPYLINK "SW_HID_MN_READONLY_COPYLINK" -#define HID_MN_READONLY_COPYGRAPHIC "SW_HID_MN_READONLY_COPYGRAPHIC" -#define HID_MN_READONLY_LOADGRAPHIC "SW_HID_MN_READONLY_LOADGRAPHIC" -#define HID_MN_READONLY_GRAPHICOFF "SW_HID_MN_READONLY_GRAPHICOFF" - #define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR" #define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE" #define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN"// SMARTTAGS diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc index ca60529fbe07..799efce72c69 100644 --- a/sw/source/uibase/docvw/docvw.hrc +++ b/sw/source/uibase/docvw/docvw.hrc @@ -22,32 +22,6 @@ #include "rcid.hrc" -#define MN_READONLY_POPUP (RC_DOCVW_BEGIN + 1) -#define MN_READONLY_OPENURL (RC_DOCVW_BEGIN + 2) -#define MN_READONLY_OPENURLNEW (RC_DOCVW_BEGIN + 3) -#define MN_READONLY_EDITDOC (RC_DOCVW_BEGIN + 4) -// free (5) -#define MN_READONLY_BROWSE_BACKWARD (RC_DOCVW_BEGIN + 6) -#define MN_READONLY_BROWSE_FORWARD (RC_DOCVW_BEGIN + 7) -#define MN_READONLY_SELECTION_MODE (RC_DOCVW_BEGIN + 8) -#define MN_READONLY_SAVEGRAPHIC (RC_DOCVW_BEGIN + 11) -#define MN_READONLY_SAVEBACKGROUND (RC_DOCVW_BEGIN + 12) -#define MN_READONLY_COPYLINK(RC_DOCVW_BEGIN + 13) -#define MN_READONLY_COPYGRAPHIC (RC_DOCVW_BEGIN + 14) -#define MN_READONLY_LOADGRAPHIC (RC_DOCVW_BEGIN + 15) -#define MN_READONLY_GRAPHICOFF (RC_DOCVW_BEGIN + 16) -// free (RC_DOCVW_BEGIN + 17) -#define MN_READONLY_TOGALLERYLINK (RC_DOCVW_BEGIN + 18) -#define MN_READONLY_TOGALLERYCOPY (RC_DOCVW_BEGIN + 19) -#define MN_READONLY_SOURCEVIEW (RC_DOCVW_BEGIN + 20) -#define MN_READONLY_RELOAD_FRAME(RC_DOCVW_BEGIN + 21) -#define MN_READONLY_RELOAD (RC_DOCVW_BEGIN + 22) -#define MN_READONLY_COPY(RC_DOCVW_BEGIN + 23) - -//For the following we need space for the gallery-themes -#define MN_READONLY_GRAPHICTOGALLERY(RC_DOCVW_BEGIN + 24) -#define MN_READONLY_BACKGROUNDTOGALLERY (RC_DOCVW_BEGIN + 60) - #define STR_REDLINE_INSERT (RC_DOCVW_BEGIN + 9) #define STR_REDLINE_DELETE (RC_DOCVW_BEGIN + 10) #define STR_REDLINE_FORMAT (RC_DOCVW_BEGIN + 11) diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src index a589c11ae11f..22e47e6a8709 100644 --- a/sw/source/uibase/do
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/source
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|1
sw/inc/helpid.h|1
sw/source/ui/dbui/mailmergechildwindow.cxx | 37 ++
sw/source/ui/dbui/mailmergechildwindow.hrc |6 ---
sw/source/ui/dbui/mailmergechildwindow.src | 48
sw/source/ui/dbui/mmoutputpage.hrc |4 --
sw/uiconfig/swriter/ui/warnemaildialog.ui | 57 +
vcl/source/window/layout.cxx |1
9 files changed, 71 insertions(+), 85 deletions(-)
New commits:
commit a5598cf00a49469b14492b9c9c6a82d8f8e04c42
Author: Caolán McNamara
Date: Mon Oct 14 16:29:46 2013 +0100
convert warn email's can't be sent dialog to .ui
Change-Id: I611c5cb7ab140a04e7ee4a78b6d828ca199c5624
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c588dd0..c346962 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -206,6 +206,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/tokenwidget \
sw/uiconfig/swriter/ui/viewoptionspage \
sw/uiconfig/swriter/ui/warndatasourcedialog \
+ sw/uiconfig/swriter/ui/warnemaildialog \
sw/uiconfig/swriter/ui/wordcount \
sw/uiconfig/swriter/ui/wrapdialog \
sw/uiconfig/swriter/ui/wrappage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 057375e..0e6a220 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -46,7 +46,6 @@
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD(RC_DBUI_BEGIN + 26)
-#define DLG_MM_SENDWARNING(RC_DBUI_BEGIN + 29)
#define DLG_MM_CREATIONMONITOR(RC_DBUI_BEGIN + 30)
// Strings --
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 1651804..7284fdb 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -383,7 +383,6 @@
#define HID_MAILMERGECHILD
"SW_HID_MAILMERGECHILD"
#define HID_MM_MAILSTATUS_TLB
"SW_HID_MM_MAILSTATUS_TLB"
#define HID_RETURN_TO_MAILMERGE
"SW_HID_RETURN_TO_MAILMERGE"
-#define HID_MM_SENDWARNING
"SW_HID_MM_SENDWARNING"
#define HID_NID_TBL
"SW_HID_NID_TBL"
#define HID_NID_FRM
"SW_HID_NID_FRM"
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 2b9e2eb..0216245 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -241,36 +242,21 @@ void SwMailDispatcherListener_Impl::DeleteAttachments(
uno::Reference< mail::XMa
}
}
-class SwSendWarningBox_Impl : public ModalDialog
+class SwSendWarningBox_Impl : public MessageDialog
{
-FixedImage aWarningImageIM;
-FixedInfo aWarningFI;
-FixedText aDetailFT;
-MultiLineEdit aDetailED;
-FixedLine aSeparatorFL;
-OKButtonaOKPB;
-
+VclMultiLineEdit *m_pDetailED;
public:
SwSendWarningBox_Impl(Window* pParent, const String& rDetails);
-~SwSendWarningBox_Impl();
};
-SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const String&
rDetails) :
-ModalDialog(pParent, SW_RES( DLG_MM_SENDWARNING )),
-aWarningImageIM(this, SW_RES( IM_WARNING )),
-aWarningFI( this, SW_RES( FI_WARNING )),
-aDetailFT( this, SW_RES( FT_DETAILS )),
-aDetailED( this, SW_RES( ED_DETAILS )),
-aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
-aOKPB( this, SW_RES(PB_OK))
-{
-FreeResource();
-aWarningImageIM.SetImage(WarningBox::GetStandardImage());
-aDetailED.SetText(rDetails);
-}
-
-SwSendWarningBox_Impl::~SwSendWarningBox_Impl()
+SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const String&
rDetails)
+: MessageDialog(pParent, "WarnEmailDialog",
"modules/swriter/ui/warnemaildialog.ui")
{
+get(m_pDetailED, "errors");
+m_pDetailED->SetMaxTextWidth(80 * m_pDetailED->approximate_char_width());
+m_pDetailED->set_width_request(80 * m_pDetailED->approximate_char_width());
+m_pDetailED->set_height_request(8 * m_pDetailED->GetTextHeight());
+m_pDetailED->SetText(rDetails);
}
#define ITEMID_TASK 1
@@ -655,7 +641,8 @@ void SwSendMailDialog::DocumentSent( uno::Reference<
mail::XMailMessage> xMessag
++m_nErrorCount;
UpdateTransferStatus( );
-if(pError)
+
+if (pError)
{
SwSendWarningBox_Impl* pDlg = new SwSendWarningBox_Impl(0, *pError);
pDlg->Execute();
diff --git a/sw/source/ui/dbui/mailme
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/inc vcl/source
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h|1
sw/source/ui/config/mailconfigpage.src |1
sw/uiconfig/swriter/ui/testmailsettings.ui | 177 +
vcl/inc/outdev.h |2
vcl/source/app/svmain.cxx |1
vcl/source/gdi/outdev3.cxx |4
7 files changed, 178 insertions(+), 9 deletions(-)
New commits:
commit abe21b68fa7d384085a5e2788dcb32bba15025f1
Author: Caolán McNamara
Date: Tue Sep 17 11:50:48 2013 +0100
I think the CWS-gfbfcfg dust has safely settled by now
Change-Id: I23201c96fff514cf5eaaf69f9841d3ea6ade6070
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index fdeae8b..6291866 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -245,8 +245,6 @@ struct ImplOutDevData
basegfx::B2DHomMatrix* mpInverseViewTransform;
};
-void ImplFreeOutDevFontData();
-
#endif // _SV_OUTDEV_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index fdfe580..5bae2df 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -550,7 +550,6 @@ void DeInitVCL()
pSVData->maGDIData.mpScreenFontList = NULL;
delete pSVData->maGDIData.mpScreenFontCache;
pSVData->maGDIData.mpScreenFontCache = NULL;
-ImplFreeOutDevFontData();
if ( pSVData->mpResMgr )
{
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 084d62d..2a0a3b6 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -288,10 +288,6 @@ void OutputDevice::ImplUpdateAllFontData( bool
bNewFontLists )
}
}
-// TODO: remove this method when the CWS-gfbfcfg dust has settled
-void ImplFreeOutDevFontData()
-{}
-
void OutputDevice::BeginFontSubstitution()
{
ImplSVData* pSVData = ImplGetSVData();
commit cedb2fb971cafee49a2f545ea29aa2257e14de06
Author: Caolán McNamara
Date: Tue Sep 17 09:10:07 2013 +0100
convert test email account settings to .ui
Change-Id: I0582dc7e437382c5802acc45fa3da396e254e0a3
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 9df8021..8160b80 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -183,6 +183,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
+ sw/uiconfig/swriter/ui/testmailsettings \
sw/uiconfig/swriter/ui/tocdialog \
sw/uiconfig/swriter/ui/tocentriespage \
sw/uiconfig/swriter/ui/tocindexpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 344a790..5e2c42a 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -382,7 +382,6 @@
#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_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"
#define HID_MM_MAILBODY
"SW_HID_MM_MAILBODY"
diff --git a/sw/source/ui/config/mailconfigpage.src
b/sw/source/ui/config/mailconfigpage.src
index aaf1588..11b1c91 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -28,7 +28,6 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
{
OutputSize = TRUE ;
SVLook = TRUE ;
-HelpID = HID_MM_TESTACCOUNTSETTINGS;
Size = MAP_APPFONT ( 250 , 176 ) ;
Moveable = TRUE ;
diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui
b/sw/uiconfig/swriter/ui/testmailsettings.ui
new file mode 100644
index 000..1307d52
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/testmailsettings.ui
@@ -0,0 +1,177 @@
+
+
+
+
+False
+6
+Test Account Settings
+dialog
+
+
+False
+vertical
+12
+
+
+True
+False
+True
+True
+0
+none
+
+
+True
+False
+True
+True
+6
+12
+
+
+True
+False
+True
+True
+
+
+
+
+
+
+True
+False
+%PRODUCTNAME is testing the e-mail
account settings...
+
+
+
+
+
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|2
sw/inc/helpid.h|1
sw/source/ui/dbui/mmoutputpage.cxx | 57 ++
sw/source/ui/dbui/mmoutputpage.hrc |4
sw/source/ui/dbui/mmoutputpage.src | 72 -
sw/source/ui/envelp/envfmt.cxx |8 -
sw/uiconfig/swriter/ui/ccdialog.ui | 197 +
8 files changed, 217 insertions(+), 125 deletions(-)
New commits:
commit bc01ebe47c04228cf729a8f87af3efeab213dc3a
Author: Caolán McNamara
Date: Mon Sep 16 20:25:59 2013 +0100
convert copy to (cc) dialog to .ui
Change-Id: I1d5ef0410a0e3d325fb6cf42dad2c07eeb89a87a
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index b118f47..9df8021 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/cardformatpage \
sw/uiconfig/swriter/ui/cardmediumpage \
+ sw/uiconfig/swriter/ui/ccdialog \
sw/uiconfig/swriter/ui/characterproperties \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columndialog \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 361b7da..0ced6d1 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -42,7 +42,7 @@
#define DLG_MM_ASSIGNFIELDS (RC_DBUI_BEGIN + 20)
#define DLG_MM_LAYOUT_PAGE(RC_DBUI_BEGIN + 22)
-#define DLG_MM_COPYTO (RC_DBUI_BEGIN + 23)
+
#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 34f861e..344a790 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -381,7 +381,6 @@
#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_COPYTO
"SW_HID_MM_COPYTO"
#define HID_MM_ADDRESSLIST_HB
"SW_HID_MM_ADDRESSLIST_HB"
#define HID_MM_TESTACCOUNTSETTINGS
"SW_HID_MM_TESTACCOUNTSETTINGS"
#define HID_MM_TESTACCOUNTSETTINGS_TLB
"SW_HID_MM_TESTACCOUNTSETTINGS_TLB"
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx
b/sw/source/ui/dbui/mmoutputpage.cxx
index 2a5de59..bf1ec91 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -213,56 +213,25 @@ IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit*, pEdit)
class SwCopyToDialog : public SfxModalDialog
{
-FixedInfo m_aDescriptionFI;
-FixedText m_aCCFT;
-Editm_aCCED;
-FixedText m_aBCCFT;
-Editm_aBCCED;
-
-FixedInfo m_aNoteFI;
-FixedLine m_aSeparatorFL;
-
-OKButtonm_aOK;
-CancelButtonm_aCancel;
-HelpButton m_aHelp;
+Edit* m_pCCED;
+Edit* m_pBCCED;
public:
-SwCopyToDialog(Window* pParent);
-~SwCopyToDialog();
+SwCopyToDialog(Window* pParent)
+: SfxModalDialog(pParent, "CCDialog",
+"modules/swriter/ui/ccdialog.ui")
+{
+get(m_pCCED, "cc");
+get(m_pBCCED, "bcc");
+}
-String GetCC() {return m_aCCED.GetText();}
-voidSetCC(const String& rSet) {m_aCCED.SetText(rSet);}
+OUString GetCC() {return m_pCCED->GetText();}
+void SetCC(const OUString& rSet) {m_pCCED->SetText(rSet);}
-String GetBCC() {return m_aBCCED.GetText();}
-voidSetBCC(const String& rSet) {m_aBCCED.SetText(rSet);}
+OUString GetBCC() {return m_pBCCED->GetText();}
+void SetBCC(const OUString& rSet) {m_pBCCED->SetText(rSet);}
};
-SwCopyToDialog::SwCopyToDialog(Window* pParent) :
-SfxModalDialog(pParent, SW_RES(DLG_MM_COPYTO)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
-m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION )),
-m_aCCFT( this, SW_RES(FT_CC )),
-m_aCCED( this, SW_RES(ED_CC )),
-m_aBCCFT( this, SW_RES( FT_BCC )),
-m_aBCCED( this, SW_RES( ED_BCC )),
-m_aNoteFI( this, SW_RES( FI_NOTE)),
-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
-#pragma warning (default : 4355)
-#endif
-{
-FreeResource();
-}
-
-SwCopyToDialog::~SwCopyToDialog()
-{
-}
-
SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWi
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |2
sw/inc/envelp.hrc |2
sw/inc/helpid.h|2
sw/inc/swabstdlg.hxx |3
sw/source/ui/app/app.src |7
sw/source/ui/dialog/swdlgfact.cxx | 17 -
sw/source/ui/dialog/swdlgfact.hxx |3
sw/source/ui/envelp/mailmrge.cxx | 18 -
sw/source/ui/envelp/mailmrge.hrc |3
sw/source/ui/envelp/mailmrge.src | 49 -
sw/source/ui/inc/app.hrc |2
sw/source/ui/inc/mailmrge.hxx | 16 -
sw/source/ui/uiview/view2.cxx | 11 -
sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui | 34 +++
sw/uiconfig/swriter/ui/mailmergedialog.ui | 157 +
15 files changed, 216 insertions(+), 110 deletions(-)
New commits:
commit d802fe5eccc4074dd4b32ba8a8a83c0463b3296d
Author: Caolán McNamara
Date: Tue Jul 2 12:14:21 2013 +0100
convert Data Sources Unavailable Warningbox to .ui
Change-Id: Iea809c54fd080003f1dc7ccae6b666dcc5e66b6f
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 26f78fb..109dfef 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/createauthorentry \
sw/uiconfig/swriter/ui/createautomarkdialog \
+ sw/uiconfig/swriter/ui/datasourcesunavailabledialog \
sw/uiconfig/swriter/ui/dropcapspage \
sw/uiconfig/swriter/ui/dropdownfielddialog \
sw/uiconfig/swriter/ui/endnotepage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index dfe9d8d..ee1ae83 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -439,7 +439,6 @@
#define HID_MAIL_MERGE_INSERT_FIELDS
"SW_HID_MAIL_MERGE_INSERT_FIELDS"
#define HID_PRINT_AS_MERGE
"SW_HID_PRINT_AS_MERGE"
#define HID_MERGE_SOURCE_UNAVAILABLE
"SW_HID_MERGE_SOURCE_UNAVAILABLE"
-#define HID_DATA_SOURCES_UNAVAILABLE
"SW_HID_DATA_SOURCES_UNAVAILABLE"
#define HID_MODULE_TOOLBOX
"SW_HID_MODULE_TOOLBOX"
#define HID_SECTION_INDENTS_PAGE
"SW_HID_SECTION_INDENTS_PAGE"
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 34a6bc5..ea73203 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -543,13 +543,6 @@ ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
};
};
-WarningBox MSG_DATA_SOURCES_UNAVAILABLE
-{
-HelpId = HID_DATA_SOURCES_UNAVAILABLE;
-Buttons = WB_OK_CANCEL;
-Message [ en-US ] = "No data source has been set up yet. You need a data
source, such as a database, to supply data (for example, names and addresses)
for the fields.";
-};
-
String RID_MODULE_TOOLBOX
{
Text [ en-US ] = "Function Bar (viewing mode)" ;
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index a12e3b5..ddb3335 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -51,7 +51,7 @@
#define STR_WESTERN_FONT(RC_APP_BEGIN + 77)
#define STR_CJK_FONT(RC_APP_BEGIN + 78)
#define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80)
-#define MSG_DATA_SOURCES_UNAVAILABLE(RC_APP_BEGIN + 82)
+
#define DLG_MERGE_SOURCE_UNAVAILABLE(RC_APP_BEGIN + 83)
#define ST_MERGE_SOURCE_UNAVAILABLE 1
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 70606af..9865284 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2281,11 +2281,11 @@ void SwView::GenerateFormLetter(sal_Bool
bUseCurrentDocument)
if ( lcl_NeedAdditionalDataSource( xDBContext ) )
{
// no data sources are available - create a new one
-WarningBox aWarning(
-&GetViewFrame()->GetWindow(),
-SW_RES(MSG_DATA_SOURCES_UNAVAILABLE));
+MessageDialog aQuery(&GetViewFrame()->GetWindow(),
+"DataSourcesUnavailableDialog",
+"modules/swriter/ui/datasourcesunavailabledialog.ui");
// no cancel allowed
-if ( RET_OK != aWarning.Execute() )
+if (RET_OK != aQuery.Execute())
return;
bCallAddressPilot = sal_True;
}
diff --git a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
new file mode 100644
index 000..a503b6e
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
@@ -0,0 +1,34 @
