[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig
sw/AllLangResTarget_sw.mk|1
sw/inc/helpid.h |1
sw/source/ui/inc/glosbib.hxx | 46 +++--
sw/source/ui/inc/misc.hrc|3
sw/source/ui/misc/glosbib.cxx| 180 ++--
sw/source/ui/misc/glosbib.hrc| 32 ---
sw/source/ui/misc/glosbib.src| 137 ---
sw/uiconfig/swriter/ui/editcategories.ui | 269 ++-
8 files changed, 248 insertions(+), 421 deletions(-)
New commits:
commit 1a162570d0050a7526a442f90f09c4bb0eb95d97
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 9 15:11:32 2013 +
adapt code to edit categories dialog .ui
Change-Id: Ib03ec188ba30d122ff687937209b989d418fe7ac
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f554549..033d7c8 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -139,7 +139,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/lingu/olmenu.src \
sw/source/ui/misc/autocorr.src \
sw/source/ui/misc/docfnote.src \
-sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
sw/source/ui/misc/numberingtypelistbox.src \
sw/source/ui/misc/outline.src \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 145e6c4..8cef3ce 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -20,7 +20,6 @@
#include svx/svxcommands.h
#include sfx2/sfxcommands.h
-#define HID_BIB_BASE
SW_HID_BIB_BASE
#define HID_MERGE_PRINTMONITOR
SW_HID_MERGE_PRINTMONITOR
#define HID_FLD_INPUT
SW_HID_FLD_INPUT
#define HID_DOCINFO_EDT
SW_HID_DOCINFO_EDT
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index 7d722b4..99673dc 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -35,9 +35,16 @@ class SwGlossaryHdl;
class FEdit : public Edit
{
-public:
-FEdit(Window * pParent, const ResId rResId) :
-Edit(pParent, rResId){}
+public:
+FEdit(Window* pParent, const ResId rResId)
+: Edit(pParent, rResId)
+{
+}
+
+FEdit(Window* pParent)
+: Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
+{
+}
virtual void KeyInput( const KeyEvent rKEvent );
};
@@ -52,27 +59,28 @@ struct GlosBibUserData
class SwGlossaryGroupTLB : public SvTabListBox
{
public:
-SwGlossaryGroupTLB(Window* pParent, const ResId rResId) :
-SvTabListBox(pParent, rResId) {}
+SwGlossaryGroupTLB(Window* pParent, const ResId rResId)
+: SvTabListBox(pParent, rResId)
+{
+}
-virtual voidRequestHelp( const HelpEvent rHEvt );
+SwGlossaryGroupTLB(Window* pParent)
+: SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT)
+{
+}
+
+virtual void RequestHelp( const HelpEvent rHEvt );
};
class SwGlossaryGroupDlg : public SvxStandardDialog
{
-FixedText aBibFT;
-FEdit aNameED;
-FixedText aPathFT;
-ListBox aPathLB;
-FixedText aSelectFT;
-SwGlossaryGroupTLB aGroupTLB;
-
-OKButtonaOkPB;
-CancelButtonaCancelPB;
-HelpButton aHelpPB;
-PushButton aNewPB;
-PushButton aDelPB;
-PushButton aRenamePB;
+FEdit* m_pNameED;
+ListBox*m_pPathLB;
+SwGlossaryGroupTLB* m_pGroupTLB;
+
+PushButton* m_pNewPB;
+PushButton* m_pDelPB;
+PushButton* m_pRenamePB;
typedef std::vector ::rtl::OUString OUVector_t;
OUVector_t m_RemovedArr;
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index dad483d..0944840 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -21,10 +21,7 @@
#include rcid.hrc
-#define STR_GLOSSARY_BIB_DLG(RC_MISC_BEGIN + 5)
-
#define DLG_DOC_FOOTNOTE(RC_MISC_BEGIN + 13)
-#define DLG_BIB_BASE(RC_MISC_BEGIN + 16)
#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18)
#define DLG_SORTING (RC_MISC_BEGIN + 19)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 5e824dc..e0b4756 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -35,10 +35,7 @@
#include glosdoc.hxx
#include swunohelper.hxx
-#include glosbib.hrc
#include misc.hrc
-#include helpid.h
-
#define PATH_CASE_SENSITIVE 0x01
#define PATH_READONLY 0x02
@@ -46,49 +43,44 @@
#define RENAME_TOKEN_DELIM (sal_Unicode)1
SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
-std::vectorString const rPathArr,
-SwGlossaryHdl *pHdl) :
-SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)),
-
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UI_swriter.mk|1
sw/inc/fldui.hrc|1
sw/inc/swabstdlg.hxx|2
sw/source/ui/dbui/dbtree.cxx| 26 +++
sw/source/ui/dialog/swdlgfact.cxx | 19 --
sw/source/ui/dialog/swdlgfact.hxx |2
sw/source/ui/fldui/changedb.cxx | 112 ++
sw/source/ui/fldui/changedb.hrc | 48 --
sw/source/ui/fldui/changedb.src | 119 --
sw/source/ui/inc/changedb.hxx | 17 --
sw/source/ui/inc/dbtree.hxx |4
sw/source/ui/inc/titlepage.hxx |4
sw/source/ui/misc/titlepage.cxx |4
sw/source/ui/shells/basesh.cxx |2
sw/uiconfig/swriter/ui/exchangedatabases.ui | 224
16 files changed, 201 insertions(+), 385 deletions(-)
New commits:
commit f5a8fa8b54e0a4a70d7439a054868d5bbdfd593b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 9 16:06:30 2013 +
adapt code to Exchange Databases dialog
Change-Id: Ife2d92131f7cd758628ae686cde734dab56e4499
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 033d7c8..7ba3c46 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/envelp/labprt.src \
sw/source/ui/envelp/mailmrge.src \
sw/source/ui/fldui/DropDownFieldDialog.src \
-sw/source/ui/fldui/changedb.src \
sw/source/ui/fldui/flddb.src \
sw/source/ui/fldui/flddinf.src \
sw/source/ui/fldui/flddok.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index d24053c..2caf62f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
+ sw/uiconfig/swriter/ui/exchangedatabases \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index c500a1d..1a7b078 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -21,7 +21,6 @@
#include rcid.hrc
#define DLG_FLD_INPUT (RC_FLDDLG_BEGIN + 5)
-#define DLG_CHANGE_DB (RC_FLDDLG_BEGIN + 9)
#define DLG_FLD_INSERT (RC_FLDDLG_BEGIN + 11)
#define DLG_FLD_DROPDOWN(RC_FLDDLG_BEGIN + 12)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index a6f8ab5..553dcc0 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -354,7 +354,7 @@ public:
virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent,
SwWrtShell rSh, SfxRequest rReq, int nResId ) = 0;// add for
SwInsertBookmarkDlg
virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell
rSh) = 0; // add for SwBreakDlg
-virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView rVw, int nResId
) = 0; //add for SwChangeDBDlg
+virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView rVw) = 0; //add
for SwChangeDBDlg
virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView
pVw, const SfxItemSet rCoreSet, int nResId, // add for SwCharDlg
const String* pFmtStr = 0,
sal_Bool bIsDrwTxtDlg = sal_False) = 0;
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView rView,
bool bToTable) = 0; //add for SwConvertTableDlg
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 34803ac..fe695aa 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -42,6 +42,7 @@
#include wrtsh.hxx
#include dbtree.hxx
#include osl/mutex.hxx
+#include vcl/builder.hxx
#include vcl/svapp.hxx
#include svtools/treelistentry.hxx
@@ -189,6 +190,31 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId
rResId,
InitTreeList();
}
+SwDBTreeList::SwDBTreeList(Window *pParent)
+: SvTreeListBox(pParent, WB_TABSTOP)
+, aImageList(SW_RES(ILIST_DB_DLG))
+, bInitialized(false)
+, bShowColumns(false)
+, pImpl(new SwDBTreeList_Impl(NULL))
+{
+SetHelpId(HID_DB_SELECTION_TLB);
+
+if (IsVisible())
+InitTreeList();
+}
+
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwDBTreeList(Window
*pParent, VclBuilder::stringmap )
+{
+return new SwDBTreeList(pParent);
+}
+
+Size SwDBTreeList::GetOptimalSize(WindowSizeType eType) const
+{
+if (eType == WINDOWSIZE_PREFERRED)
+return LogicToPixel(Size(100, 62), MapMode(MAP_APPFONT));
+return SvTreeListBox::GetOptimalSize(eType);
+}
+
SwDBTreeList::~SwDBTreeList()
{
delete pImpl;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 437c2bb..5f833a3 100644
---
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/globals.hrc |2
sw/inc/helpid.h |1
sw/source/ui/app/app.src |2
sw/source/ui/frmdlg/cption.cxx | 83 ++-
sw/source/ui/frmdlg/cption.hrc | 48
sw/source/ui/frmdlg/cption.src | 152 -
sw/uiconfig/swriter/ui/captionoptions.ui | 360 +++
9 files changed, 395 insertions(+), 255 deletions(-)
New commits:
commit f82b7a2aea7bcbc6dca13fc251b11685d62b8380
Author: Jack Leigh leigh...@gmx.se
Date: Wed Dec 12 21:58:17 2012 +
migrate 'Caption options' dialog to .ui file
Change-Id: I58dbb70faf22c5958b65e5192664b7d12d62f04c
Reviewed-on: https://gerrit.libreoffice.org/1312
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ea1196b..d80bfbc 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/fldui/inpdlg.src \
sw/source/ui/fmtui/tmpdlg.src \
sw/source/ui/frmdlg/column.src \
-sw/source/ui/frmdlg/cption.src \
sw/source/ui/frmdlg/frmpage.src \
sw/source/ui/frmdlg/frmui.src \
sw/source/ui/frmdlg/wrap.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index f39bb2f..9da10bf 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/swriter))
$(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/bibliographyentry \
+ sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 5362aee..1b79466 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -73,7 +73,7 @@
#define STR_CAPTION_END (RC_GLOBALS_BEGIN + 43)
#define STR_CAPTION_ABOVE (RC_GLOBALS_BEGIN + 44)
#define STR_CAPTION_BELOW (RC_GLOBALS_BEGIN + 45)
-#define STR_CAPTION_CATEGORY_NONE (RC_GLOBALS_BEGIN + 46)
+#define STR_CAPTION_NONE(RC_GLOBALS_BEGIN + 46)
// DIALOGS ---
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 917d9de..d443b6d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -132,7 +132,6 @@
#define HID_SW_SORT_POSITION
SW_HID_SW_SORT_POSITION
#define HID_SYNC_BTN
SW_HID_SYNC_BTN
#define HID_EDIT_COMMENT
SW_HID_EDIT_COMMENT
-#define HID_DLG_SEQUENCE_OPTION
SW_HID_DLG_SEQUENCE_OPTION
#define HID_DLG_FLDEDT_NEXT
SW_HID_DLG_FLDEDT_NEXT
#define HID_DLG_FLDEDT_PREV
SW_HID_DLG_FLDEDT_PREV
#define HID_DLG_FLDEDT_ADDRESS
SW_HID_DLG_FLDEDT_ADDRESS
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 9111d94..0239ddf 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -256,7 +256,7 @@ String STR_CAPTION_BELOW
{
Text [ en-US ] = Below ;
};
-String STR_CAPTION_CATEGORY_NONE
+String STR_CAPTION_NONE
{
Text [ en-US ] = None ;
};
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 404b36d..3585ded 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -44,7 +44,6 @@
#include comphelper/string.hxx
#include frmui.hrc
#include globals.hrc
-#include cption.hrc
#include SwStyleNameMapper.hxx
using namespace ::com::sun::star;
@@ -56,25 +55,14 @@ extern String* GetOldDrwCat();
class SwSequenceOptionDialog : public SvxStandardDialog
{
-FixedLine aFlHeader;
-FixedText aFtLevel;
-ListBox aLbLevel;
-FixedText aFtDelim;
-EditaEdDelim;
+ListBox*m_pLbLevel;
+Edit* m_pEdDelim;
-FixedLine aFlCatAndFrame;
-FixedText aFtCharStyle;
-ListBox aLbCharStyle;
-CheckBoxaApplyBorderAndShadowCB;
+ListBox*m_pLbCharStyle;
+CheckBox* m_pApplyBorderAndShadowCB;
//#i61007# order of captions
-FixedLine aFlCaptionOrder;
-FixedText aFtCaptionOrder;
-ListBox aLbCaptionOrder;
-
-OKButtonaOKButton;
-CancelButtonaCancelButton;
-HelpButton aHelpButton;
+ListBox*m_pLbCaptionOrder;
SwView rView;
String aFldTypeName;
@@ -85,12 +73,12 @@ public:
virtual ~SwSequenceOptionDialog();
virtual void Apply();
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/globals.hrc |2
sw/source/ui/app/app.src |4
sw/source/ui/inc/insfnote.hxx| 38 +--
sw/source/ui/misc/insfnote.cxx | 116 +-
sw/source/ui/misc/insfnote.hrc | 34 ---
sw/source/ui/misc/insfnote.src | 138
sw/uiconfig/swriter/ui/insertfootnote.ui | 341 +++
9 files changed, 422 insertions(+), 253 deletions(-)
New commits:
commit 99d0ddf89c1c13f6b897d6b11009b777c6d735ca
Author: Jack Leigh leigh...@gmx.se
Date: Thu Nov 29 00:07:04 2012 +
migrate 'Insert Footnote' dialog to .ui file
Conflicts:
sw/source/ui/misc/insfnote.src
Change-Id: If16285d85bca187b2e929f0327b15f103b5d786f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 42e3303..bf8ba79 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -145,7 +145,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/misc/docfnote.src \
sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
-sw/source/ui/misc/insfnote.src \
sw/source/ui/misc/num.src \
sw/source/ui/misc/numberingtypelistbox.src \
sw/source/ui/misc/outline.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index ade3a51..ca8535f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbreak \
+ sw/uiconfig/swriter/ui/insertfootnote \
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 4473eb4..e0f55ae 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -63,6 +63,8 @@
#define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38)
+#define STR_FOOTNOTE_DIALOG_CHAR(RC_GLOBALS_BEGIN + 39)
+
// DIALOGS ---
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 8f86c61..c730e9f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -220,6 +220,10 @@ String STR_JAVA_EDIT
Text [ en-US ] = Edit Script ;
};
+String STR_FOOTNOTE_DIALOG_CHAR
+{
+Text [ en-US ] = Character ;
+};
InfoBox MSG_ERROR_SEND_MAIL
{
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx
index 53253a2..71ee27a 100644
--- a/sw/source/ui/inc/insfnote.hxx
+++ b/sw/source/ui/inc/insfnote.hxx
@@ -28,6 +28,8 @@
class SwWrtShell;
+class VclFrame;
+
class SwInsFootNoteDlg: public SvxStandardDialog
{
SwWrtShell rSh;
@@ -37,28 +39,26 @@ class SwInsFootNoteDlg: public SvxStandardDialog
CharSet eCharSet;
sal_BoolbExtCharAvailable;
sal_BoolbEdit;
-FixedLine aNumberFL;
-RadioButton aNumberAutoBtn;
-RadioButton aNumberCharBtn;
-EditaNumberCharEdit;
-PushButton aNumberExtChar;
+
+VclFrame* m_pNumberFrame;
+RadioButton*m_pNumberAutoBtn;
+RadioButton*m_pNumberCharBtn;
+Edit* m_pNumberCharEdit;
+PushButton* m_pNumberExtChar;
// everything for the selection footnote/endnote
-FixedLineaTypeFL;
-RadioButton aFtnBtn;
-RadioButton aEndNoteBtn;
+RadioButton*m_pFtnBtn;
+RadioButton*m_pEndNoteBtn;
-OKButtonaOkBtn;
-CancelButtonaCancelBtn;
-HelpButton aHelpBtn;
-ImageButton aPrevBT;
-ImageButton aNextBT;
+PushButton* m_pOkBtn;
+PushButton* m_pPrevBT;
+PushButton* m_pNextBT;
DECL_LINK(NumberCharHdl, void *);
-DECL_LINK( NumberEditHdl, void * );
+DECL_LINK(NumberEditHdl, void *);
DECL_LINK(NumberAutoBtnHdl, void *);
DECL_LINK(NumberExtCharHdl, void *);
-DECL_LINK( NextPrevHdl, Button * );
+DECL_LINK(NextPrevHdl, Button *);
virtual voidApply();
@@ -69,13 +69,13 @@ public:
~SwInsFootNoteDlg();
CharSet GetCharSet() { return eCharSet; }
-sal_BoolIsExtCharAvailable() { return bExtCharAvailable; }
+sal_BoolIsExtCharAvailable() { return bExtCharAvailable; }
String GetFontName() { return aFontName; }
-sal_BoolIsEndNote() { return aEndNoteBtn.IsChecked(); }
+sal_BoolIsEndNote() { return m_pEndNoteBtn-IsChecked(); }
String GetStr()
{
-if ( aNumberCharBtn.IsChecked() )
-return aNumberCharEdit.GetText();
+if ( m_pNumberCharBtn-IsChecked() )
+
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/globals.hrc |2
sw/source/ui/app/app.src |5 +
sw/source/ui/cctrl/swlbox.cxx| 14
sw/source/ui/inc/bookmark.hxx| 13 ++--
sw/source/ui/inc/misc.hrc|1
sw/source/ui/inc/swlbox.hxx |7 +-
sw/source/ui/misc/bookmark.cxx | 68 ---
sw/source/ui/misc/bookmark.hrc | 25
sw/source/ui/misc/bookmark.src | 73
sw/source/ui/utlui/swrenamexnameddlg.cxx |1
sw/uiconfig/swriter/ui/insertbookmark.ui | 91 +++
13 files changed, 159 insertions(+), 143 deletions(-)
New commits:
commit 42f6308d1b4c352b8949a4ab8c2c77388d4a29e9
Author: Jack Leigh leigh...@gmx.se
Date: Thu Nov 29 21:44:20 2012 +
migrate 'Insert Bookmark' dialog to .ui file
STR_REMOVE_WARNING moved to globals.hrc so also misc.hrc no longer
required in swrenamexnameddlg.cxx
Conflicts:
sw/source/ui/misc/bookmark.src
Change-Id: I5c34c14df36a78133ff08c0f2f0ce1a01292067f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index bf8ba79..fbd038f 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/index/multmrk.src \
sw/source/ui/lingu/olmenu.src \
sw/source/ui/misc/autocorr.src \
-sw/source/ui/misc/bookmark.src \
sw/source/ui/misc/docfnote.src \
sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index ca8535f..890ae28 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
+ sw/uiconfig/swriter/ui/insertbookmark \
sw/uiconfig/swriter/ui/insertbreak \
sw/uiconfig/swriter/ui/insertfootnote \
sw/uiconfig/swriter/ui/insertscript \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index e0f55ae..a7ed844 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -65,6 +65,8 @@
#define STR_FOOTNOTE_DIALOG_CHAR(RC_GLOBALS_BEGIN + 39)
+#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
+
// DIALOGS ---
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c730e9f..d56012d 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -225,6 +225,11 @@ String STR_FOOTNOTE_DIALOG_CHAR
Text [ en-US ] = Character ;
};
+String STR_REMOVE_WARNING
+{
+Text [ en-US ] = The following characters are not valid and have been
removed: ;
+};
+
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx
index 939ac31..6e6a85b 100644
--- a/sw/source/ui/cctrl/swlbox.cxx
+++ b/sw/source/ui/cctrl/swlbox.cxx
@@ -49,10 +49,22 @@ SwBoxEntry::SwBoxEntry(const SwBoxEntry rOld) :
{
}
-SwComboBox::SwComboBox(Window* pParent, const ResId rId, sal_uInt16
nStyleBits ):
+SwComboBox::SwComboBox(Window* pParent, sal_uInt16 nStyleBits) :
+ComboBox(pParent),
+nStyle(nStyleBits)
+{
+Init();
+}
+
+SwComboBox::SwComboBox(Window* pParent, const ResId rId, sal_uInt16
nStyleBits) :
ComboBox(pParent, rId),
nStyle(nStyleBits)
{
+Init();
+}
+
+void SwComboBox::Init()
+{
// create administration for the resource's Stringlist
sal_uInt16 nSize = GetEntryCount();
for( sal_uInt16 i=0; i nSize; ++i )
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index d7fc9c5..80cf41b 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -37,6 +37,7 @@ class BookmarkCombo : public SwComboBox
virtual longPreNotify(NotifyEvent rNEvt);
public:
+BookmarkCombo( Window* pWin );
BookmarkCombo( Window* pWin, const ResId rResId );
sal_uInt16 GetSelectEntryCount() const;
@@ -47,23 +48,21 @@ public:
class SwInsertBookmarkDlg: public SvxStandardDialog
{
-FixedLine aBookmarkFl;
-BookmarkCombo aBookmarkBox;
-OKButtonaOkBtn;
-CancelButtonaCancelBtn;
-PushButton aDeleteBtn;
+BookmarkCombo* m_pBookmarkBox;
+OKButton* m_pOkBtn;
+PushButton* m_pDeleteBtn;
String sRemoveWarning;
SwWrtShell rSh;
SfxRequest rReq;
-DECL_LINK( ModifyHdl, BookmarkCombo * );
+DECL_LINK(ModifyHdl, BookmarkCombo *);
DECL_LINK(DeleteHdl, void *);
virtual void Apply();
public:
-SwInsertBookmarkDlg( Window *pParent, SwWrtShell rSh, SfxRequest
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig
sw/AllLangResTarget_sw.mk |1
sw/inc/globals.hrc | 10 +
sw/source/ui/app/app.src |6 +
sw/source/ui/fldui/javaedit.cxx|2 -
sw/source/ui/fldui/javaedit.hrc| 24 --
sw/source/ui/fldui/javaedit.src| 35 -
sw/uiconfig/swriter/ui/insertscript.ui |3 +-
7 files changed, 15 insertions(+), 66 deletions(-)
New commits:
commit 0052235753832c28e66e367c8bff244dcf7affb7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 26 16:53:00 2012 +
set default script text in .ui
and move last javascript string into global strings
Change-Id: I51f0e18e77ab1696d5b70c98698b81ac6122f970
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 5bb8873..f970dad 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -138,7 +138,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/fldui/fldui.src \
sw/source/ui/fldui/fldvar.src \
sw/source/ui/fldui/inpdlg.src \
-sw/source/ui/fldui/javaedit.src \
sw/source/ui/fmtui/tmpdlg.src \
sw/source/ui/frmdlg/column.src \
sw/source/ui/frmdlg/cption.src \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 34ba270..4473eb4 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -54,13 +54,15 @@
#define STR_TOP_BASE(RC_GLOBALS_BEGIN + 30)
#define STR_BOTTOM_BASE (RC_GLOBALS_BEGIN + 31)
#define STR_CENTER_BASE (RC_GLOBALS_BEGIN + 32)
-#define STR_TOP (RC_GLOBALS_BEGIN + 33)
-#define STR_BOTTOM(RC_GLOBALS_BEGIN + 34)
-#define STR_CENTER_HORI (RC_GLOBALS_BEGIN + 35)
-#define STR_CENTER_VERT (RC_GLOBALS_BEGIN + 36)
+#define STR_TOP (RC_GLOBALS_BEGIN + 33)
+#define STR_BOTTOM (RC_GLOBALS_BEGIN + 34)
+#define STR_CENTER_HORI (RC_GLOBALS_BEGIN + 35)
+#define STR_CENTER_VERT (RC_GLOBALS_BEGIN + 36)
#define STR_LOAD_HTML_DOC (RC_GLOBALS_BEGIN + 37)
+#define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38)
+
// DIALOGS ---
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 75c5340..f3f2762 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -224,6 +224,12 @@ String STR_LOAD_HTML_DOC
Text [ en-US ] = Name and Path of the HTML Document ;
};
+String STR_JAVA_EDIT
+{
+Text [ en-US ] = Edit Script ;
+};
+
+
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 956fbe0..d11c374 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -43,7 +43,7 @@
#include javaedit.hxx
#include fldui.hrc
-#include javaedit.hrc
+#include globals.hrc
using namespace ::com::sun::star;
diff --git a/sw/source/ui/fldui/javaedit.hrc b/sw/source/ui/fldui/javaedit.hrc
deleted file mode 100644
index 4c72168..000
--- a/sw/source/ui/fldui/javaedit.hrc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 .
- */
-#ifndef _SW_JAVAEDIT_HRC
-#define _SW_JAVAEDIT_HRC
-
-#define STR_JAVA_EDIT 17
-
-#endif
-
diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src
deleted file mode 100644
index 5c4d8e7..000
--- a/sw/source/ui/fldui/javaedit.src
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but
