[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source

2018-09-10 Thread Libreoffice Gerrit user 
 helpcontent2|2 
 sw/inc/redline.hxx  |   52 +++
 sw/source/core/doc/docredln.cxx |   88 
 3 files changed, 71 insertions(+), 71 deletions(-)

New commits:
commit a909d67f476945ec51d597dcd281a6f2a2b0b9b8
Author: Miklos Vajna 
AuthorDate: Mon Sep 10 09:06:15 2018 +0200
Commit: Miklos Vajna 
CommitDate: Mon Sep 10 12:34:44 2018 +0200

sw: prefix members of SwRedlineData

Change-Id: Idf21b7f3330fdc4ecca6245494a788a33efee2a7
Reviewed-on: https://gerrit.libreoffice.org/60236
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index cde78e743b0b..c307792d80b0 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -106,14 +106,14 @@ public:
 class SW_DLLPUBLIC SwRedlineData
 {
 friend class SwRangeRedline;
-SwRedlineData* pNext;   // Points to other data.
-SwRedlineExtraData* pExtraData;
+SwRedlineData* m_pNext;   // Points to other data.
+SwRedlineExtraData* m_pExtraData;
 
-OUString sComment;
-DateTime aStamp;
-RedlineType_t eType;
-std::size_t nAuthor;
-sal_uInt16 nSeqNo;
+OUString m_sComment;
+DateTime m_aStamp;
+RedlineType_t m_eType;
+std::size_t m_nAuthor;
+sal_uInt16 m_nSeqNo;
 
 public:
 SwRedlineData( RedlineType_t eT, std::size_t nAut );
@@ -127,43 +127,43 @@ public:
 
 bool operator==( const SwRedlineData& rCmp ) const
 {
-return nAuthor == rCmp.nAuthor &&
-eType == rCmp.eType &&
-sComment == rCmp.sComment &&
-(( !pNext && !rCmp.pNext ) ||
-( pNext && rCmp.pNext && *pNext == *rCmp.pNext )) &&
-(( !pExtraData && !rCmp.pExtraData ) ||
-( pExtraData && rCmp.pExtraData &&
-*pExtraData == *rCmp.pExtraData ));
+return m_nAuthor == rCmp.m_nAuthor &&
+m_eType == rCmp.m_eType &&
+m_sComment == rCmp.m_sComment &&
+(( !m_pNext && !rCmp.m_pNext ) ||
+( m_pNext && rCmp.m_pNext && *m_pNext == *rCmp.m_pNext 
)) &&
+(( !m_pExtraData && !rCmp.m_pExtraData ) ||
+( m_pExtraData && rCmp.m_pExtraData &&
+*m_pExtraData == *rCmp.m_pExtraData ));
 }
 bool operator!=( const SwRedlineData& rCmp ) const
 {   return !operator==( rCmp ); }
 
 RedlineType_t GetType() const
-{ return static_cast(eType & 
nsRedlineType_t::REDLINE_NO_FLAG_MASK); }
+{ return static_cast(m_eType & 
nsRedlineType_t::REDLINE_NO_FLAG_MASK); }
 
-std::size_t GetAuthor() const{ return nAuthor; }
-const OUString& GetComment() const{ return sComment; }
-const DateTime& GetTimeStamp() const{ return aStamp; }
-const SwRedlineData* Next() const{ return pNext; }
+std::size_t GetAuthor() const{ return m_nAuthor; }
+const OUString& GetComment() const{ return m_sComment; }
+const DateTime& GetTimeStamp() const{ return m_aStamp; }
+const SwRedlineData* Next() const{ return m_pNext; }
 
-void SetComment( const OUString& rS ) { sComment = rS; }
-void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
+void SetComment( const OUString& rS ) { m_sComment = rS; }
+void SetTimeStamp( const DateTime& rDT ) { m_aStamp = rDT; }
 
 void SetAutoFormatFlag()
-{ eType = static_cast(eType | 
nsRedlineType_t::REDLINE_FORM_AUTOFMT); }
+{ m_eType = static_cast(m_eType | 
nsRedlineType_t::REDLINE_FORM_AUTOFMT); }
 bool CanCombine( const SwRedlineData& rCmp ) const;
 
 // ExtraData gets copied, the pointer is therefore not taken over by
 // the RedlineObject
 void SetExtraData( const SwRedlineExtraData* pData );
-const SwRedlineExtraData* GetExtraData() const { return pExtraData; }
+const SwRedlineExtraData* GetExtraData() const { return m_pExtraData; }
 
 // For UI-side pooling of Redline-actions.
 // At the moment only used for Autoformat with Redline.
 // Value != 0 means there can be others!
-sal_uInt16 GetSeqNo() const { return nSeqNo; }
-void SetSeqNo( sal_uInt16 nNo ) { nSeqNo = nNo; }
+sal_uInt16 GetSeqNo() const { return m_nSeqNo; }
+void SetSeqNo( sal_uInt16 nNo ) { m_nSeqNo = nNo; }
 
 OUString GetDescr() const;
 };
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 0947b6a0cbfd..5c36d8be9b1c 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -924,38 +924,38 @@ bool SwRedlineExtraData_FormattingChanges::operator == ( 
const SwRedlineExtraDat
 }
 
 SwRedlineData::SwRedlineData( RedlineType_t eT, std::size_t nAut )
-:

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc

2018-05-19 Thread Andrea Gelmini 
 helpcontent2   |2 +-
 sw/inc/IGrammarContact.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 098a7d7f74e262634e39d72264e6b3e9a30fffc5
Author: Andrea Gelmini 
Date:   Fri May 18 14:20:53 2018 +0200

Fix typo

Change-Id: I4f58c7cabb00a152cb2b38a07bbe50a685c1d0a0
Reviewed-on: https://gerrit.libreoffice.org/54540
Reviewed-by: Julien Nabet 
Tested-by: Jenkins 

diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index 995a80bc56e1..83d0c59c83b9 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -46,7 +46,7 @@ public:
 virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool 
bCreate ) = 0;
 
 /** finishGrammarCheck() has to be called if a grammar checking has been 
completed
-for a text node. If this text node has not been hided by the current 
proxy list
+for a text node. If this text node has not been hidden by the current 
proxy list
 it will be repainted. Otherwise the proxy list replaces the old list 
and the
 repaint will be triggered by a timer
 @returns void
commit 0b03073524cf5fec55faf8a8910ae9dc097744e3
Author: Andrea Gelmini 
Date:   Sat May 19 19:51:38 2018 +0200

Updated core
Project: help  4c0375c9ff38051744b17741ee5a17a2797306d2

Fix typo

Change-Id: I82135d325f129c55d67b879af06ec69e34da68d4
Reviewed-on: https://gerrit.libreoffice.org/54570
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/helpcontent2 b/helpcontent2
index 28138ff018a1..4c0375c9ff38 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 28138ff018a1ee48dc659b6d0ef0073b0a00a14e
+Subproject commit 4c0375c9ff38051744b17741ee5a17a2797306d2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source

2016-10-11 Thread Caolán McNamara 
 helpcontent2 |2 +-
 sw/inc/helpid.h  |2 --
 sw/source/uibase/ribbar/inputwin.src |1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit c8054c1d6885067caf557b5b3179975793cf80f7
Author: Caolán McNamara 
Date:   Tue Oct 11 16:19:56 2016 +0100

HID_CALC_TOOLBOX goes nowhere

Change-Id: I812f56c53487b2bf115bc2803337176941baf49b

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 6583313..3319a90 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -148,8 +148,6 @@
 // More Help-IDs
 #define HID_EDIT_FORMULA
"SW_HID_EDIT_FORMULA"
 
-#define HID_CALC_TOOLBOX
"SW_HID_CALC_TOOLBOX"
-
 #define HID_AUTOFORMAT_REJECT   
"SW_HID_AUTOFORMAT_REJECT"
 #define HID_AUTOFORMAT_ACCEPT   
"SW_HID_AUTOFORMAT_ACCEPT"
 #define HID_AUTOFORMAT_EDIT_CHG 
"SW_HID_AUTOFORMAT_EDIT_CHG"
diff --git a/sw/source/uibase/ribbar/inputwin.src 
b/sw/source/uibase/ribbar/inputwin.src
index 0e00305..444c255 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -30,7 +30,6 @@ ToolBox RID_TBX_FORMULA
 {
 Pos = MAP_APPFONT ( 0 , 0 ) ;
 Size = MAP_APPFONT ( 600 , 14 ) ;
-HelpID = HID_CALC_TOOLBOX ;
 SVLook = TRUE ;
 Border = TRUE ;
 ItemList =
commit ccafebf67147d272a911b6ff0411249f96ae5864
Author: Caolán McNamara 
Date:   Tue Oct 11 16:19:06 2016 +0100

Updated core
Project: help  5d912ed85e9c4103fe37b129a56493c7c3c5

drop unused HID_CALC_TOOLBOX hid

Change-Id: I08ba38e7446e62fd712e53a1969e38d8b3fb653a

diff --git a/helpcontent2 b/helpcontent2
index b223bd2..5d912ed 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef
+Subproject commit 5d912ed85e9c4103fe37b129a56493c7c3c5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/Library_swui.mk sw/source sw/uiconfig sw/UIConfig_swriter.mk

2013-09-19 Thread Caolán McNamara 
 helpcontent2  |2 
 sw/Library_swui.mk|1 
 sw/UIConfig_swriter.mk|2 
 sw/inc/dbui.hrc   |1 
 sw/inc/helpid.h   |1 
 sw/source/ui/dbui/mmoutputpage.cxx|  108 +-
 sw/source/ui/dbui/mmoutputpage.hrc|2 
 sw/source/ui/dbui/mmoutputpage.hxx|2 
 sw/source/ui/dbui/mmoutputpage.src|   53 ---
 sw/source/ui/dialog/swmessdialog.cxx  |   33 
 sw/source/ui/inc/swmessdialog.hxx |   30 
 sw/uiconfig/swriter/ui/alreadyexistsdialog.ui |4 
 sw/uiconfig/swriter/ui/attachnamedialog.ui|  194 ++
 sw/uiconfig/swriter/ui/subjectdialog.ui   |  194 ++
 14 files changed, 496 insertions(+), 131 deletions(-)

New commits:
commit 5c80c7defccdc8e1a5545dfa0f304c77c71c479d
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 19 11:18:53 2013 +0100

convert mail merge subject/attachment dialogs to .ui

Factor out SwMessageAndEditDialog as a reusable base class. Split the
attachment and subjects dialogs apart and base them on top of that.

Change-Id: I321ef375b154f070715a3e8091e02974b376c9db

diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 2f1d4bc..ab0c264 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
 sw/source/ui/dialog/macassgn \
 sw/source/ui/dialog/swdialmgr \
 sw/source/ui/dialog/swdlgfact \
+sw/source/ui/dialog/swmessdialog \
 sw/source/ui/dialog/swuiexp \
 sw/source/ui/dialog/uiregionsw \
 sw/source/ui/dialog/wordcountdialog \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 8160b80..5be26fd 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/alreadyexistsdialog \
sw/uiconfig/swriter/ui/asciifilterdialog \
sw/uiconfig/swriter/ui/assignstylesdialog \
+   sw/uiconfig/swriter/ui/attachnamedialog \
sw/uiconfig/swriter/ui/authenticationsettingsdialog \
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/autotext \
@@ -183,6 +184,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/subjectdialog \
sw/uiconfig/swriter/ui/testmailsettings \
sw/uiconfig/swriter/ui/tocdialog \
sw/uiconfig/swriter/ui/tocentriespage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 0ced6d1..057375e 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_QUERY  (RC_DBUI_BEGIN + 28)
 #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 6148039..ecbf662 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -388,7 +388,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_QUERY
SW_HID_MM_QUERY
 #define HID_MM_SENDWARNING  
SW_HID_MM_SENDWARNING
 
 #define HID_NID_TBL 
SW_HID_NID_TBL
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx 
b/sw/source/ui/dbui/mmoutputpage.cxx
index bf1ec91..668969f 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -22,6 +22,7 @@
 #include mmconfigitem.hxx
 #include mailmergechildwindow.hxx
 #include mailconfigpage.hxx
+#include swmessdialog.hxx
 #include cmdid.h
 #include swtypes.hxx
 #include view.hxx
@@ -106,76 +107,56 @@ static OUString lcl_GetColumnValueOf(const OUString 
rColumn, Reference  contai
 return sRet;
 }
 
-class SwSaveWarningBox_Impl : public ModalDialog
+class SwSaveWarningBox_Impl : public SwMessageAndEditDialog
 {
-OKButton* m_pOKPB;
-FixedImage*   m_pWarningImageIM;
-VclMultiLineEdit* m_pPrimaryMessage;
-VclMultiLineEdit* m_pSecondaryMessage;
-Edit* m_pFileNameED;
-
 DECL_LINK( ModifyHdl, Edit*);
 public:
 SwSaveWarningBox_Impl(Window* pParent, const OUString rFileName);
 
 OUString

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig

2013-09-14 Thread Caolán McNamara 
 helpcontent2 |2 
 sw/inc/dbui.hrc  |2 
 sw/source/ui/dbui/mailmergehelper.cxx|2 
 sw/source/ui/dbui/mmaddressblockpage.cxx |   98 +--
 sw/source/ui/dbui/mmaddressblockpage.hrc |9 -
 sw/source/ui/dbui/mmaddressblockpage.hxx |   26 +--
 sw/source/ui/dbui/mmaddressblockpage.src |  103 
 sw/uiconfig/swriter/ui/addressblockdialog.ui |2 
 sw/uiconfig/swriter/ui/selectblockdialog.ui  |  224 ++-
 9 files changed, 274 insertions(+), 194 deletions(-)

New commits:
commit d03ec9f32d7a6331e6bc49cf54a54d15a1399638
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Sep 14 15:03:05 2013 +0100

really convert select address block to .ui

Change-Id: Icfd77f2037a27f24fd796084509a1baa7734103b

diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 7e24085..361b7da 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -38,7 +38,7 @@
 #define DLG_MM_CREATEADDRESSLIST(RC_DBUI_BEGIN + 14)
 #define DLG_MM_CUSTOMIZE_ADDRESS_LIST (RC_DBUI_BEGIN + 17)
 
-#define DLG_MM_SELECTADDRESSBLOCK (RC_DBUI_BEGIN + 19)
+
 #define DLG_MM_ASSIGNFIELDS   (RC_DBUI_BEGIN + 20)
 
 #define DLG_MM_LAYOUT_PAGE(RC_DBUI_BEGIN + 22)
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx 
b/sw/source/ui/dbui/mailmergehelper.cxx
index 14cbf1a..f6f9a89 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -222,7 +222,7 @@ SwAddressPreview::SwAddressPreview(Window* pParent, WinBits 
nStyle)
 
 extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAddressPreview(Window 
*pParent, VclBuilder::stringmap rMap)
 {
-WinBits nWinStyle = WB_NOTABSTOP;
+WinBits nWinStyle = WB_DIALOGCONTROL;
 OString sBorder = VclBuilder::extractCustomProperty(rMap);
 if (!sBorder.isEmpty())
 nWinStyle |= WB_BORDER;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index c8be401..dcd6b8f 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -338,44 +338,35 @@ IMPL_LINK(SwMailMergeAddressBlockPage, 
InsertDataHdl_Impl, ImageButton*, pButton
 }
 
 SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
-Window* pParent, SwMailMergeConfigItem rConfig) :
-SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTADDRESSBLOCK)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
-m_aSelectFT( this, SW_RES( FT_SELECT)),
-m_aPreview( this, SW_RES(  WIN_PREVIEW)),
-m_aNewPB( this, SW_RES(PB_NEW)),
-m_aCustomizePB( this, SW_RES(  PB_CUSTOMIZE)),
-m_aDeletePB( this, SW_RES( PB_DELETE)),
-m_aSettingsFI( this, SW_RES(   FI_SETTINGS)),
-m_aNeverRB( this, SW_RES(  RB_NEVER)),
-m_aAlwaysRB( this, SW_RES( RB_ALWAYS)),
-m_aDependentRB( this, SW_RES(  RB_DEPENDENT)),
-m_aCountryED( this, SW_RES(ED_COUNTRY)),
-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
-m_rConfig(rConfig)
-{
-FreeResource();
+Window* pParent, SwMailMergeConfigItem rConfig)
+: SfxModalDialog(pParent, SelectBlockDialog,
+modules/swriter/ui/selectblockdialog.ui)
+, m_rConfig(rConfig)
+{
+get(m_pPreview, preview);
+Size aSize(m_pPreview-LogicToPixel(Size(192, 100), MapMode(MAP_APPFONT)));
+m_pPreview-set_width_request(aSize.Width());
+m_pPreview-set_height_request(aSize.Height());
+get(m_pNewPB, new);
+get(m_pCustomizePB, edit);
+get(m_pDeletePB, delete);
+get(m_pNeverRB, never);
+get(m_pAlwaysRB, always);
+get(m_pDependentRB, dependent);
+get(m_pCountryED, country);
 
 Link aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, 
NewCustomizeHdl_Impl);
-m_aNewPB.SetClickHdl(aCustomizeHdl);
-m_aCustomizePB.SetClickHdl(aCustomizeHdl);
+m_pNewPB-SetClickHdl(aCustomizeHdl);
+m_pCustomizePB-SetClickHdl(aCustomizeHdl);
 
-m_aDeletePB.SetClickHdl(LINK(this, SwSelectAddressBlockDialog, 
DeleteHdl_Impl));
+m_pDeletePB-SetClickHdl(LINK(this, SwSelectAddressBlockDialog, 
DeleteHdl_Impl));
 
 Link aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl);
-m_aNeverRB.SetClickHdl(aLk);
-m_aAlwaysRB.SetClickHdl(aLk);
-m_aDependentRB.SetClickHdl(aLk);
-m_aPreview.SetLayout(2, 2);
-m_aPreview.EnableScrollBar();
+m_pNeverRB-SetClickHdl(aLk);
+m_pAlwaysRB-SetClickHdl(aLk);
+m_pDependentRB-SetClickHdl(aLk);
+m_pPreview-SetLayout(2, 2);
+m_pPreview-EnableScrollBar();
 }
 
 SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog()
@@ -387,15 +378,15 @@ void SwSelectAddressBlockDialog::SetAddressBlocks(const

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc

2013-09-13 Thread Caolán McNamara 
 helpcontent2|2 +-
 sw/inc/helpid.h |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 84019b0f7bbc67ab947ed22f87108bcf7d10b1b5
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Sep 13 12:15:04 2013 +0100

unused help id

Change-Id: If1b4125fa0757fdcdff5466bf9b99791c930ffa6

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index bec986e..53689ef 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -391,7 +391,6 @@
 #define HID_MM_SENDMAILS
SW_HID_MM_SENDMAILS
 #define HID_MM_SENDMAILS_STATUSLB   
SW_HID_MM_SENDMAILS_STATUSLB
 #define HID_MAILMERGECHILD  
SW_HID_MAILMERGECHILD
-#define HID_MM_CUSTOMFIELDS 
SW_HID_MM_CUSTOMFIELDS
 #define HID_MM_MAILSTATUS_TLB   
SW_HID_MM_MAILSTATUS_TLB
 #define HID_RETURN_TO_MAILMERGE 
SW_HID_RETURN_TO_MAILMERGE
 #define HID_MM_QUERY
SW_HID_MM_QUERY
commit d85aec9ecd201a5c498a4346f3876b0b1ee8ac09
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Sep 13 12:15:17 2013 +0100

Updated core
Project: help  cff95cb4ac050718c0ac7c9e37c5946ce4467c95

diff --git a/helpcontent2 b/helpcontent2
index 0c13515..cff95cb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0c13515aab91aed4e53560362de4ad8be9d36551
+Subproject commit cff95cb4ac050718c0ac7c9e37c5946ce4467c95
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

2013-08-23 Thread Caolán McNamara 
 helpcontent2|2 
 sw/UIConfig_swriter.mk  |1 
 sw/inc/globals.hrc  |   15 --
 sw/inc/helpid.h |1 
 sw/inc/index.hrc|1 
 sw/inc/swabstdlg.hxx|2 
 sw/source/ui/dialog/swdlgfact.cxx   |   23 ---
 sw/source/ui/dialog/swdlgfact.hxx   |2 
 sw/source/ui/inc/swuicnttab.hxx |   26 ++--
 sw/source/ui/index/cnttab.cxx   |   98 ++-
 sw/source/ui/index/cnttab.hrc   |2 
 sw/source/ui/index/cnttab.src   |   62 -
 sw/source/ui/shells/textidx.cxx |2 
 sw/source/ui/utlui/glbltree.cxx |2 
 sw/uiconfig/swriter/ui/tocdialog.ui |  233 
 15 files changed, 307 insertions(+), 165 deletions(-)

New commits:
commit 194c692a7fe4949684920eba53ab4dfcc3391895
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 23 12:59:04 2013 +0100

convert toc dialog to .ui

this should stop the intermittent redraw glitch and the toc dialog initially
appearing shoved up against the left edge of the screen

Change-Id: Id1dad162f110cd9140d2603a2b3b43ef64e703ca

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index e718dc9..030e5653 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -169,6 +169,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/tocdialog \
sw/uiconfig/swriter/ui/tocstylespage \
sw/uiconfig/swriter/ui/tablecolumnpage \
sw/uiconfig/swriter/ui/tableproperties \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index c0580cc..31e300b 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -117,31 +117,18 @@
 
 // TABPAGES ---
 
-#define TP_BACKGROUND   (RC_GLOBALS_BEGIN +  11)
-#define TP_BORDER   (RC_GLOBALS_BEGIN +  12)
-#define TP_COLUMN   (RC_GLOBALS_BEGIN +  13)
-
 #define TP_DOC_STAT (RC_GLOBALS_BEGIN +  15)
 
 // Sw-pages
-#define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN +  25)
 #define TP_OPTPRINT_PAGE(RC_GLOBALS_BEGIN +  26)
 
-#define TP_CONTENT_OPT  (RC_GLOBALS_BEGIN +  45)
-#define TP_STD_FONT (RC_GLOBALS_BEGIN +  47)
-
-#define TP_OPTSHDWCRSR  (RC_GLOBALS_BEGIN +  70)
-
-
-#define TP_OPTCAPTION_PAGE  (RC_GLOBALS_BEGIN +  78)
+#define TP_OPTCAPTION_PAGE  (RC_GLOBALS_BEGIN +  77)
 #define DLG_SVXTEST_NUM_BULLET  (RC_GLOBALS_BEGIN +  79)
 
-#define DLG_MULTI_TOX   (RC_GLOBALS_BEGIN +  89)
 #define TP_TOX_SELECT   (RC_GLOBALS_BEGIN +  90)
 #define TP_TOX_ENTRY(RC_GLOBALS_BEGIN +  91)
 #define TP_TOX_STYLES   (RC_GLOBALS_BEGIN +  92)
 #define DLG_ADD_IDX_STYLES  (RC_GLOBALS_BEGIN +  94)
-#define TP_OPTCOMPATIBILITY_PAGE(RC_GLOBALS_BEGIN +  103)
 //maximum: RC_GLOBALS_BEGIN +  120
 
 
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 88ff694..d74754a 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -129,7 +129,6 @@
 #define HID_FILEDLG_SRCVIEW 
SW_HID_FILEDLG_SRCVIEW
 #define HID_FILEDLG_WIZDOKU 
SW_HID_FILEDLG_WIZDOKU
 
-#define HID_MULTI_TOX_DLG   
SW_HID_MULTI_TOX_DLG
 #define HID_GLBLTREE_EDIT_LINK  
SW_HID_GLBLTREE_EDIT_LINK
 #define HID_FORMAT_NAME_OBJECT_NAME 
SW_HID_FORMAT_NAME_OBJECT_NAME
 
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 99ec6e5..7797f65 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -40,6 +40,7 @@
 
 #define  STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18)
 #define  DLG_CHANGE_AUTH_ENTRY  (RC_INDEX_BEGIN + 19)
+#define  STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20)
 
 #endif  // _INDEX_HRC
 
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c5b26d5..7a6402c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -435,7 +435,7 @@ public:
 Window* pParent,
 const SfxItemSet* pSwItemSet,
 SwWrtShell ) = 0; //add for 
SwSvxNumBulletTabDialog, SwOutlineTabDialog
-virtual AbstractMultiTOXTabDialog*  CreateMultiTOXTabDialog( int 
nResId,
+virtual AbstractMultiTOXTabDialog*  CreateMultiTOXTabDialog(
 Window* pParent, const 
SfxItemSet rSet,
 SwWrtShell rShell,
 SwTOXBase* pCurTOX, sal_uInt16 
nToxType = USHRT_MAX,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc

2013-06-19 Thread Caolán McNamara 
 helpcontent2|2 +-
 sw/inc/helpid.h |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 650eaad6cee4211d15f7d5e91ef70d482205228e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:23:06 2013 +0100

drop unused helpids

Change-Id: Ic2cb501330b7c05b303750152619c4b4abb0

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 1ea0ffc..c437da1 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -142,7 +142,6 @@
 
 // TabPage Help-IDs
 
-#define HID_DROPCAPS
SW_HID_DROPCAPS
 #define HID_FRM_EXT 
SW_HID_FRM_EXT
 #define HID_FRM_STD 
SW_HID_FRM_STD
 #define HID_GRF_EXT 
SW_HID_GRF_EXT
commit 03e93ba2bcaf6425eaffa32379f227ea7265d39e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:22:51 2013 +0100

Updated core
Project: help  fd638f9abaea98e5a5f788b24faedc45fe01ec1e

diff --git a/helpcontent2 b/helpcontent2
index d6621f9..fd638f9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d6621f90fda77c1d2232f511f42b3ed0dc38ac68
+Subproject commit fd638f9abaea98e5a5f788b24faedc45fe01ec1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

2013-04-29 Thread Caolán McNamara 
 helpcontent2|2 
 sw/UIConfig_swriter.mk  |1 
 sw/inc/helpid.h |1 
 sw/inc/index.hrc|1 
 sw/source/ui/index/idxmrk.hrc   |1 
 sw/source/ui/index/idxmrk.src   |   33 --
 sw/source/ui/index/swuiidxmrk.cxx   |  117 ++---
 sw/uiconfig/swriter/ui/createauthorentry.ui |  347 
 8 files changed, 383 insertions(+), 120 deletions(-)

New commits:
commit b191f53860eebf12de6b7cf0a7ddea21a17382e8
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Apr 29 10:54:14 2013 +0100

convert create author entry dialog to .ui format

Change-Id: Ia36b42be8f5caa93937e870467c95f47439d9c9e

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 6a1c63c..b4bd3de 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/createauthorentry \
sw/uiconfig/swriter/ui/dropdownfielddialog \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index fc5a1ca..4adc14c 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -186,7 +186,6 @@
 #define HID_DLG_ADD_IDX_STYLES  
SW_HID_DLG_ADD_IDX_STYLES
 #define HID_ADD_STYLES_TLB  
SW_HID_ADD_STYLES_TLB
 #define HID_OLE_CHECKLB 
SW_HID_OLE_CHECKLB
-#define HID_DLG_CREATE_AUTH_ENTRY   
SW_HID_DLG_CREATE_AUTH_ENTRY
 #define HID_TP_PRIVATE_DATA 
SW_HID_TP_PRIVATE_DATA
 
 #define HID_TP_BUSINESS_DATA
SW_HID_TP_BUSINESS_DATA
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index ef5c224..c16cc54 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -33,7 +33,6 @@
 #define  STR_ALPHA  (RC_INDEX_BEGIN + 7)
 #define  STR_LEVEL  (RC_INDEX_BEGIN + 8)
 
-#define  DLG_CREATE_AUTH_ENTRY  (RC_INDEX_BEGIN + 10)
 #define  DLG_EDIT_IDXMARK   (RC_INDEX_BEGIN + 11)
 #define  DLG_EDIT_AUTHMARK  (RC_INDEX_BEGIN + 12)
 
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc
index 86e9bca..2a748b7 100644
--- a/sw/source/ui/index/idxmrk.hrc
+++ b/sw/source/ui/index/idxmrk.hrc
@@ -19,7 +19,6 @@
 #define PB_OK   22
 #define PB_CANCEL   23
 #define PB_HELP 24
-#define FL_ENTRIES  25
 #define FL_NAME 37
 #define FT_NAME 38
 #define ED_NAME 39
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 3797bf8..3f78a53 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -85,39 +85,6 @@ String STR_IDXMRK_INSERT
 Text [ en-US ] = Insert Index Entry ;
 };
 
-ModalDialog DLG_CREATE_AUTH_ENTRY
-{
-HelpId = HID_DLG_CREATE_AUTH_ENTRY;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 365 , 203 ) ;
-Moveable = TRUE ;
-OKButton PB_OK
-{
-Pos = MAP_APPFONT ( 312 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-};
-CancelButton PB_CANCEL
-{
-Pos = MAP_APPFONT ( 312 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-};
-HelpButton PB_HELP
-{
-Pos = MAP_APPFONT ( 312 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-};
-FixedLine FL_ENTRIES
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 300 , 8 ) ;
-Text [ en-US ] = Entry data;
-};
-Text [ en-US ] = Define Bibliography Entry;
-};
-
 QueryBox DLG_CHANGE_AUTH_ENTRY
 {
 BUTTONS = WB_YES_NO ;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 79948ae..0844d5a 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -30,6 +30,7 @@
 #include com/sun/star/util/SearchOptions.hpp
 #include com/sun/star/util/SearchFlags.hpp
 #include svl/stritem.hxx
+#include vcl/layout.hxx
 #include vcl/msgbox.hxx
 #include sfx2/dispatch.hxx
 #include svl/eitem.hxx
@@ -1032,16 +1033,12 @@ void SwIndexMarkModalDlg::Apply()
 
 class SwCreateAuthEntryDlg_Impl : public ModalDialog
 {
-FixedLine   aEntriesFL;
-
 FixedText*  pFixedTexts[AUTH_FIELD_END];
 ListBox*pTypeListBox;
 ComboBox*   pIdentifierBox;
 Edit*   pEdits[AUTH_FIELD_END];
 
-OKButtonaOKBT;
-CancelButtonaCancelBT;
-HelpButton  aHelpBT;
+OKButton*   m_pOKBT;
 
 LinkaShortNameCheckLink;
 
@@ -1475,77 +1472,48 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
 const String

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

2013-04-26 Thread Caolán McNamara 
 helpcontent2   |2 
 sw/UIConfig_swriter.mk |1 
 sw/inc/helpid.h|1 
 sw/source/ui/inc/misc.hrc  |1 
 sw/source/ui/misc/glossary.cxx |   79 +++-
 sw/source/ui/misc/glossary.hrc |   44 
 sw/source/ui/misc/glossary.src |   89 -
 sw/uiconfig/swriter/ui/renameautotextdialog.ui |  240 +
 8 files changed, 275 insertions(+), 182 deletions(-)

New commits:
commit 1e197c5a41e45f0d0ae211518aee93339392973c
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Apr 26 15:37:22 2013 +0100

convert autotext rename dialog to .ui

Change-Id: I8cf878de00ede3c25163526a6863ec734b9815a9

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 2341919..2486c93 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
+   sw/uiconfig/swriter/ui/renameautotextdialog \
sw/uiconfig/swriter/ui/renameobjectdialog \
sw/uiconfig/swriter/ui/rowheight \
sw/uiconfig/swriter/ui/sortdialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index ab344ca..4a3473c 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -309,7 +309,6 @@
 #define HID_EDIT_FORMULA
SW_HID_EDIT_FORMULA
 #define HID_INSERT_FILE 
SW_HID_INSERT_FILE
 #define HID_FORMAT_PAGE 
SW_HID_FORMAT_PAGE
-#define HID_RENAME_GLOSSARY 
SW_HID_RENAME_GLOSSARY
 #define HID_CONFIG_MENU 
SW_HID_CONFIG_MENU
 #define HID_NAVIGATION_PI   
SW_HID_NAVIGATION_PI
 #define HID_ENVELOP_PRINT   
SW_HID_ENVELOP_PRINT
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index c8a4f7d..aa37171a 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -26,7 +26,6 @@
 #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
 #define DLG_NUM_NAMES   (RC_MISC_BEGIN + 18)
 #define DLG_SORTING (RC_MISC_BEGIN + 19)
-#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25)
 
 #define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 1e275db..3494051 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -64,7 +64,6 @@
 #include swerror.h
 #include globals.hrc
 #include misc.hrc
-#include glossary.hrc
 #include swmodule.hxx
 #include sfx2/filedlghelper.hxx
 
@@ -116,17 +115,11 @@ struct GroupUserData
 */
 class SwNewGlosNameDlg : public ModalDialog
 {
-FixedText   aNNFT;
-EditaNewName;
-FixedText   aNSFT;
-NoSpaceEdit aNewShort;
-OKButtonaOk;
-CancelButtonaCancel;
-FixedText   aONFT;
-EditaOldName;
-FixedText   aOSFT;
-EditaOldShort;
-FixedLine   aFL;
+Edit*m_pNewName;
+NoSpaceEdit* m_pNewShort;
+OKButton*m_pOk;
+Edit*m_pOldName;
+Edit*m_pOldShort;
 
 protected:
 DECL_LINK( Modify, Edit * );
@@ -137,34 +130,28 @@ public:
   const String rOldName,
   const String rOldShort );
 
-String GetNewName()  const { return aNewName.GetText(); }
-String GetNewShort() const { return aNewShort.GetText(); }
+String GetNewName()  const { return m_pNewName-GetText(); }
+String GetNewShort() const { return m_pNewShort-GetText(); }
 };
 
 SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
 const String rOldName,
-const String rOldShort ) :
-ModalDialog( pParent, SW_RES( DLG_RENAME_GLOS ) ),
-aNNFT   (this, SW_RES( FT_NN)),
-aNewName(this, SW_RES( ED_NN)),
-aNSFT   (this, SW_RES( FT_NS)),
-aNewShort(this,SW_RES( ED_NS)),
-aOk (this, SW_RES( BT_OKNEW)),
-aCancel (this, SW_RES( BT_CANCEL)),
-aONFT   (this, SW_RES( FT_ON)),
-aOldName(this, SW_RES( ED_ON)),
-aOSFT   (this, SW_RES( FT_OS)),
-aOldShort(this,SW_RES( ED_OS)),
-aFL(this, SW_RES( FL_NN))
-
+const String rOldShort )
+: ModalDialog(pParent, RenameAutoTextDialog,
+modules/swriter/ui/renameautotextdialog.ui)
 {
-FreeResource();
-aOldName.SetText( rOldName );
-aOldShort.SetText( rOldShort );
-aNewName.SetModifyHdl(LINK(this, SwNewGlosNameDlg, Modify ));
-