[Libreoffice-commits] core.git: 4 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d73c7efd96fb8160284ebce817269bc043a03caa Author: Olivier Hallot AuthorDate: Fri Jun 21 16:16:56 2019 +0200 Commit: Gerrit Code Review CommitDate: Fri Jun 21 19:03:05 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Improve Operator symbols in Math help pages Rezise image and clean svg's Change-Id: Iae35945a62d00cec4f49fb1e3b78ec35867d2c90 Reviewed-on: https://gerrit.libreoffice.org/74529 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f005c1a7e350..53674dc8cec4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f005c1a7e350aed7f02599c98df322507d02b99f +Subproject commit 53674dc8cec4ca160c70819074e02c6b554b229b commit 21ddf3a6c4d664dab1906e1e0edceb53d7e0017c Author: Olivier Hallot AuthorDate: Thu Jun 20 17:08:33 2019 +0200 Commit: Gerrit Code Review CommitDate: Fri Jun 21 19:02:47 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Improve set operators symbols display in Help page resize Math iset operators icons (svg's) Change-Id: I6775b7742f1e1e4d3e484c35d4ce9de93c4ced1e Reviewed-on: https://gerrit.libreoffice.org/74479 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index fea6f8b2894f..f005c1a7e350 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fea6f8b2894f26ebdafce5adde0e7ebf7e6be338 +Subproject commit f005c1a7e350aed7f02599c98df322507d02b99f commit b8ff4921b212477d3082f1245aabba8c1936bb6b Author: Olivier Hallot AuthorDate: Thu Jun 20 15:24:17 2019 +0200 Commit: Gerrit Code Review CommitDate: Fri Jun 21 19:02:29 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Improve unary Math symbols display in Help page resize and arrange unary/binary symbols svg in Help page Change-Id: I87fe6023efde717aa6e86c72449bb2b3f6d5d217 Reviewed-on: https://gerrit.libreoffice.org/74478 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 592cfdd7506b..fea6f8b2894f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 592cfdd7506b085016acb817fa99116a78f76e1c +Subproject commit fea6f8b2894f26ebdafce5adde0e7ebf7e6be338 commit 50aefa68d1c28356f28c12ff6f570ed5d92490b6 Author: Olivier Hallot AuthorDate: Thu Jun 20 13:57:42 2019 +0200 Commit: Gerrit Code Review CommitDate: Fri Jun 21 19:02:06 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Improve relations Math symbols display in Help page resize and arrange relations symbols svg in Help page Change-Id: I4c9373cbbd36741ab55d5c7f1429d61ef736b68b Reviewed-on: https://gerrit.libreoffice.org/74477 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 589e7f29b4f0..592cfdd7506b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 589e7f29b4f02d45300d596036516f6b3c0bf202 +Subproject commit 592cfdd7506b085016acb817fa99116a78f76e1c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - helpcontent2 sal/qa sc/source sd/source
helpcontent2 |2 -
sal/qa/osl/file/osl_File.cxx |8 --
sc/source/core/data/documen4.cxx |7 -
sd/source/core/sdpage.cxx| 47 +++
4 files changed, 60 insertions(+), 4 deletions(-)
New commits:
commit fdbe65e7a551e3935fc4c68145152f02e622a99d
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 8 15:40:15 2013 +
Resolves: #i119056# Added direct refreshes for objects dependent...
on HeaderFooterSettings
(cherry picked from commit b94437b6dfe60904f9c89608c15ed55dc3ce277d)
Change-Id: I4e21876f83fc160883c0ffdee5941ee7488e35c8
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 8e1e339..18b4a25 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2719,9 +2719,56 @@ void SdPage::setHeaderFooterSettings( const
sd::HeaderFooterSettings rNewSettin
}
SetChanged();
+
if(TRG_HasMasterPage())
{
TRG_GetMasterPageDescriptorViewContact().ActionChanged();
+
+// #i119056# For HeaderFooterSettings SdrObjects are used, but the
properties
+// used are not part of their model data, but kept in SD. This data is
applied
+// using a 'backdoor' on primitive creation. Thus, the normal
mechanism to detect
+// object changes does not work here. It is neccessary to trigger
updates here
+// directly. BroadcastObjectChange used for PagePreview invalidations,
+// flushViewObjectContacts used to invalidate and flush all
visualizations in
+// edit views.
+SdPage* pMasterPage = dynamic_cast SdPage* (TRG_GetMasterPage());
+
+if(pMasterPage)
+{
+SdrObject* pCandidate = 0;
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_HEADER );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_DATETIME );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_FOOTER );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_SLIDENUMBER );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+}
}
}
commit 728c9d5f0d1335e160de43bd3f73b2a3168e8fcc
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 21:15:51 2013 +0100
CID#982700 silence coverity
Change-Id: I01fddeeca503ebc045c2f0e53c5917e6218e9d6e
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index ab22c85..54966ac 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -6107,8 +6107,12 @@ namespace osl_Directory
Directory::remove(buffer);
i = rtl_ustr_lastIndexOfChar(buffer, '/');
-buffer[i] = 0;
-Directory::remove(buffer);
+assert(i != -1);
+if (i != -1)
+{
+buffer[i] = 0;
+Directory::remove(buffer);
+}
}
//
commit daef8b82d00bbe823f711f73895ef422376a2f95
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 20:55:53 2013 +0100
CID#1038507 calm coverity nerves about a double free
Change-Id: Idc1c8e93ecdf7b2992bf08d54f2f63d337bea7eb
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 608cf4d..53c90db 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -284,7 +284,12 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW
nRow1,
continue;
if (*itr == nTab1)
-maTabs[*itr]-SetFormulaCell(nCol1, nRow1, pCell);
+{
+pCell = maTabs[*itr]-SetFormulaCell(nCol1, nRow1, pCell);
+assert(pCell); //NULL if nCol1/nRow1 is invalid, which it can't
be here
+if (!pCell)
+break;
+}
else
maTabs[*itr]-SetFormulaCell(
nCol1, nRow1,
commit c8ef7a4fbeb15e774f30c2e800247c7fc283cb0e
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Mon Oct 7 21:44:33 2013 +0200
Updated core
Project: help ba93fcc5c4e7236ff5ea4137e0d9ed86a2337ac4
Correct typo in function DDE in Calc
Server Soffice must be only lowercase as used in examples
Change-Id: Ia1cb2908f6e1b3ba7c567345a0f258bc8fccd23d
Reviewed-on:
[Libreoffice-commits] core.git: 4 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
helpcontent2 |2
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h |1
sw/inc/index.hrc |5
sw/source/ui/index/idxmrk.src| 52 -
sw/source/ui/index/swuiidxmrk.cxx| 40 +++
sw/uiconfig/swriter/ui/newuserindexdialog.ui | 153 +++
7 files changed, 172 insertions(+), 82 deletions(-)
New commits:
commit 2b21f71065b44949cce2a9acbc5f379f0ab86ab6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 29 11:36:53 2013 +0100
convert new user index dialog to .ui format
Change-Id: I7943c7e388b1cb73311d666ff600a31ac70c2838
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 4adc14c..53195ee 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -348,7 +348,6 @@
#define HID_TOX_ENTRY_BUTTON
SW_HID_TOX_ENTRY_BUTTON
#define HID_TOX_ENTRY_EDIT
SW_HID_TOX_ENTRY_EDIT
-#define HID_DLG_NEW_USER_IDX
SW_HID_DLG_NEW_USER_IDX
#define HID_TOKEN_WINDOW
SW_HID_TOKEN_WINDOW
#define HID_AUTH_FIELD_IDENTIFIER
SW_HID_AUTH_FIELD_IDENTIFIER
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index c16cc54..6f3ec1e 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -26,7 +26,6 @@
#include rcid.hrc
-#define DLG_INSIDXMARK (RC_INDEX_BEGIN + 3)
#define DLG_MULTMRK(RC_INDEX_BEGIN + 5)
#define STR_TITLE (RC_INDEX_BEGIN + 6)
@@ -39,14 +38,10 @@
#define STR_IDXMRK_INSERT (RC_INDEX_BEGIN + 13)
#define STR_IDXMRK_EDIT(RC_INDEX_BEGIN + 14)
-#define DLG_NEW_USER_IDX (RC_INDEX_BEGIN + 17)
-
#define STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18)
#define DLG_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19)
#define DLG_CREATE_AUTOMARK(RC_INDEX_BEGIN + 20)
-#define DLG_EDIT_IDXMARK_CJK (RC_INDEX_BEGIN + 21)
-#define DLG_INSIDXMARK_CJK (RC_INDEX_BEGIN + 22)
#endif // _INDEX_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 3f78a53..5835d83 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -23,58 +23,6 @@
#include helpid.h
#include cmdid.h
-ModalDialog DLG_NEW_USER_IDX
-{
-OutputSize = TRUE ;
-Moveable = TRUE ;
-Closeable = TRUE;
-Sizeable = FALSE ;
-HelpID = HID_DLG_NEW_USER_IDX;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 194 , 60 ) ;
-OKButton PB_OK
-{
-Pos = MAP_APPFONT ( 141 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-};
-CancelButton PB_CANCEL
-{
-Pos = MAP_APPFONT ( 141 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-};
-HelpButton PB_HELP
-{
-Pos = MAP_APPFONT ( 141 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-};
-FixedLine FL_NAME
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 130 , 8 ) ;
-
-Text [ en-US ] = New user index;
-};
-FixedText FT_NAME
-{
-Pos = MAP_APPFONT ( 12 , 17 ) ;
-Size = MAP_APPFONT ( 40 , 8 ) ;
-
-Text [ en-US ] = ~Name;
-};
-Edit ED_NAME
-{
-HelpID = sw:Edit:DLG_NEW_USER_IDX:ED_NAME;
-Border = TRUE ;
-Pos = MAP_APPFONT ( 55 , 15 ) ;
-Size = MAP_APPFONT ( 78 , 12 ) ;
-TabStop = TRUE ;
-Left = TRUE ;
-};
-Text [ en-US ] = Create New User-defined Index;
-};
-
String STR_IDXMRK_EDIT
{
Text [ en-US ] = Edit Index Entry ;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index 13f3fe3..e9cf706 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -573,36 +573,28 @@ void SwIndexMarkPane::UpdateKeyBoxes()
class SwNewUserIdxDlg : public ModalDialog
{
-OKButtonaOKPB;
-CancelButtonaCancelPB;
-HelpButton aHelpPB;
-FixedLine aNameFL;
-FixedText aNameFT;
-EditaNameED;
+OKButton*m_pOKPB;
+Edit*m_pNameED;
-SwIndexMarkPane* pDlg;
+SwIndexMarkPane* m_pDlg;
DECL_LINK( ModifyHdl, Edit*);
public:
-SwNewUserIdxDlg(SwIndexMarkPane* pPane) :
-ModalDialog((pPane-GetDialog()), SW_RES(DLG_NEW_USER_IDX)),
-aOKPB(this, SW_RES( PB_OK )),
-aCancelPB(this, SW_RES( PB_CANCEL )),
-aHelpPB(this, SW_RES( PB_HELP )),
-aNameFL(this, SW_RES(FL_NAME )),
-aNameFT(this, SW_RES( FT_NAME )),
-aNameED(this, SW_RES(ED_NAME )),
-pDlg(pPane)
+SwNewUserIdxDlg(SwIndexMarkPane* pPane)
+: ModalDialog((pPane-GetDialog()),
