Christian Glombek license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0406.xhp |8 source/text/swriter/guide/spellcheck_dialog.xhp |2 +- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit b5d455e09862a98eba8209445f859de29c1e449e Author: Olivier Hallot Date: Thu Aug 24 23:46:54 2017 -0300 tdf#112015 Spelling and Grammar -> Spelling Valid for strings that refers to the menu, but not on the descriptive pages, where the funcionality of spell check come together with the grammar check. Change-Id: If8a8e876782eed2da8f42d05726aa16e621fa062 Reviewed-on: https://gerrit.libreoffice.org/41548 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/source/text/shared/00/0406.xhp b/source/text/shared/00/0406.xhp index 720d1851c..f7d45ac91 100644 --- a/source/text/shared/00/0406.xhp +++ b/source/text/shared/00/0406.xhp @@ -49,7 +49,7 @@ Choose Tools - Gallery or click the Gallery icon on the Standard Bar - New Theme button - Files tab -Choose Tools - Spelling and Grammar +Choose Tools - Spelling F7 key On Standard bar, click @@ -62,7 +62,7 @@ - Spelling and Grammar + Spelling @@ -75,9 +75,9 @@ Choose Tools - Language - Chinese Conversion (Asian language support must be enabled) - Edit terms button - Choose Tools - Spelling and Grammar + Choose Tools - Spelling - Choose Tools - Spelling and Grammar, then click Options + Choose Tools - Spelling, then click Options Choose Tools - Language - Thesaurus diff --git a/source/text/swriter/guide/spellcheck_dialog.xhp b/source/text/swriter/guide/spellcheck_dialog.xhp index 176a0a55a..8f0fbe41e 100644 --- a/source/text/swriter/guide/spellcheck_dialog.xhp +++ b/source/text/swriter/guide/spellcheck_dialog.xhp @@ -44,7 +44,7 @@ Click in the document, or select the text that you want to check. -Choose Tools - Spelling and Grammar. +Choose Tools - Spelling. When a possible spelling error is encountered, the Spellcheck dialog opens and $[officename] offers some suggested corrections. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5bd31bf44301fdb1938d38eae7317745f35d9db1 Author: Olivier Hallot Date: Thu Aug 24 23:46:54 2017 -0300 Updated core Project: help b5d455e09862a98eba8209445f859de29c1e449e tdf#112015 Spelling and Grammar -> Spelling Valid for strings that refers to the menu, but not on the descriptive pages, where the funcionality of spell check come together with the grammar check. Change-Id: If8a8e876782eed2da8f42d05726aa16e621fa062 Reviewed-on: https://gerrit.libreoffice.org/41548 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/helpcontent2 b/helpcontent2 index 8ecf172a2713..b5d455e09862 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8ecf172a2713f691ac63908676446fd86eefb2c1 +Subproject commit b5d455e09862a98eba8209445f859de29c1e449e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/scriptitems.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2b78b9feab9521e614b9edae17709cb6e2001292
Author: Markus Mohrhard
Date: Fri Aug 25 07:42:14 2017 +0200
updater: fix the handling of ~ in the update config
Change-Id: I5c07039e336de9362fdd92be29de516da0846998
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 98b41f7b484a..db2b67c5c9bb 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -659,7 +659,7 @@ sub replace_setup_variables
my $updatechannel = "";
if ( $ENV{'UPDATE_CONFIG'} && $ENV{'UPDATE_CONFIG'} ne "")
{
-open(CONFIG, $ENV{'UPDATE_CONFIG'});
+open(CONFIG, glob($ENV{'UPDATE_CONFIG'}));
while ()
{
chomp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Rebuilding LO freezes on macOS
Julien, Shinnok, Alex, thanks for your feedback. I'm trying to raise number of openable file descriptors by means of ulimit first. Default seems to be 256 for OS X 10.11. Indeed issue probably takes place during population of "instdir". "Library/libscfiltlo.dylib" is referenced in make's last console output only. I'll give feedback upon testing. brgds Thorsten > On 24.08.2017, at 11:19, Alexander Thurgood wrote: > > Le 23/08/2017 à 21:28, Thorsten Wagner a écrit : > > Hi THorsten, > > >> (2) During building again build freezes while linking >> "Library/libscfiltlo.dylib". "make" loops consuming 100% cpu on a single >> core. Build has to be interrupted by killing "make" processes. >> > > I see this occasionally, or though it tends to be during population of > instdir (so towards the end of the build) and not specifically in > libscfiltLO.dylib. Possibly the parallel build gets into a race > condition somewhere (shrugs) and I have to kill it, clean it and restart. > > I remember reading somewhere a long time ago about changing the ulimit > number of openable file descriptors, something like this here: > > https://unix.stackexchange.com/questions/108174/how-to-persist-ulimit-settings-in-macos > > That might help, but if you need to push past the hard limit set by > Apple as default, then you need to buy AppleServer for OSX from the > AppStore. > > > Alex > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 8d74698f407de0b02826777d5cb3f5aca2fd50f1 Author: Akshay Deep Date: Thu Aug 24 20:47:43 2017 + tdf#111795 - Special character preview control background color Change-Id: Id5c3448b0cf82e5ed3aa9afabc5bfb093eddf2e9 Reviewed-on: https://gerrit.libreoffice.org/41524 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 0e7f66c93f4b..72d81f410f3f 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1139,10 +1139,13 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta rRenderContext.SetFont(maFont); Color aTextCol = rRenderContext.GetTextColor(); +Color aFillCol = rRenderContext.GetFillColor(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Color aWindowTextColor(rStyleSettings.GetDialogTextColor()); +const Color aWindowColor(rStyleSettings.GetWindowColor()); rRenderContext.SetTextColor(aWindowTextColor); +rRenderContext.SetFillColor(aWindowColor); const OUString aText = GetText(); const Size aSize(GetOutputSizePixel()); @@ -1211,8 +1214,10 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta } } +rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), Size(GetOutputSizePixel().Width(), GetOutputSizePixel().Height(; rRenderContext.DrawText(aPoint, aText); rRenderContext.SetTextColor(aTextCol); +rRenderContext.SetFillColor(aFillCol); if (bShrankFont) rRenderContext.SetFont(aOrigFont); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0e082c465ed0ac73ceb5f95c01bb1b09a1b12d09 Author: Christian Lohmaier Date: Thu Aug 24 23:39:40 2017 +0200 bump product version to 5.4.1.2.0+ Change-Id: I56daad178b971a4364250e20c7ada322ee9667de diff --git a/configure.ac b/configure.ac index 4cd0a4dc6d25..c38dd959f81b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.4.1.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.4.1.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.4.1.2'
Tag 'libreoffice-5.4.1.2' created by Christian Lohmaier at 2017-08-24 21:39 + Tag libreoffice-5.4.1.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJZn0d/AAoJEPQ0oe+v7q6jisIP/R+1rVjXmoagi/efs0xaY9Bc IqVNGV+zjVDwv9uP7SP0bERO01Gc5CXGPsJ6tTOnzYzPTxT76sh627CfggssOwgF /vpfBhBwn+ogf6OZsvkcczEoMnfVaqaoseWzTpfx7oP8rWFvs+/M6ntaD3r99KZG YZzykIpp16kQ0Zjvc7scXZriZ4/2gl/8xibYXHIUQAmLfwndoMcUnEErx+jmpKot bGnXUDRBthibGPTcD8BJWC8ps9XpZMMf+ySW67oCPLkU+0dRk0YqjsojkCJ+lomE s80xLFOnvJSc42ln2cIECpMEvUBfQjP5WWMWures6qUNoI7I/rWtnUURes7ZASIM udM8rlxt5+CD5uW2tUIg6bwl9/bJHFIQgRCkwAdfT18syZGtsf+C2UQVpEtkG0KX cIIdQ/syNBkrnF4L0gYplwqkuYaMT/EbbPsKZgxgT0wpgn3oRBPGEh2r4tdaM4+E Myyo0jdAfNSntjByvQQAPEgL3eCz5FXgCt50BT45druogADwU/0BPxdGJwKo7KRK H1xWG2vIHmWc8n++ij/PzG9xlYyAv+Wq562PKQj5xxDoRh6BRwWXoP/Cf58VROG+ JBiVEH8NDN9Pxm27rMHBNyYQ4w+1q/RhHtA+4wWVGNwn37+G8Lh1HgMBnl5s1r3u ykQHR2CQO/d8po+/zfNk =Iqdu -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.4.1.2'
Tag 'libreoffice-5.4.1.2' created by Christian Lohmaier at 2017-08-24 21:39 + Tag libreoffice-5.4.1.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJZn0eCAAoJEPQ0oe+v7q6joTQP/13NcESLKkH0rX8981k791jw VnW2ck15QJhZysHmu95jqMqFUR9cFQItjFFzrYP4orC9JhFcdBebvBRZqSLL8V9M SCSr9+pr4orA3zhI2yL0Le9zEPnYF/34iqoTEJV9mLKiLYsw32uiycI7U289WCc3 RUSkCG6sBXxgTSeOz1jx7fkkds1NdnB4c5WyFRONvRX2Zfx5EeBqn3Us2uT62FYg vMwjxcISdao0cXQCxnyQYcI6xfXAcE1UrGMr6MXkFQjybSju+5Fb5lFOrPTLmL18 Wqw6b7HoTj7WztfjpH2MCvrsd675Q3SSkywz715MSw16EFAZeDaLhQBvvVnpIpcT Dzxmxxr6S7Rngd2rVbGF1ZFlKT+ua12wdG2QWx0T/71LDqbBqw3nHxNtS5J10F6N 5TtK5CPFyDmIInRPhuwsbbTlzciJJhdzHUtSfaAqwA9b3m0zwben8OM218sumHRD TrpY/dFdSvOtnZL72fXMfRDFOwXmUuo/QzXusk22NhL3B4Omd1HGzq1q45eG8zAJ DESPFea6ALIofQ3n/3IldI4NJOxgnPBnKBJFsOhhLxWGrpWIeOXF7PNDHKifOsZy DUW8L8mUwj0ZR8ZnASrpi1xoSjpdIqIoI4SQ2E6ENjHe5GIOUowZ/tdnO5p66RuJ o11tebCTdu18trX5GznT =RarF -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-534: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.4.1.2'
Tag 'libreoffice-5.4.1.2' created by Christian Lohmaier at 2017-08-24 21:38 + Tag libreoffice-5.4.1.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJZn0dyAAoJEPQ0oe+v7q6j/4AQAIdXE+VDAXFDPF5qq3M7CPOC PkOsbuXWWCQ9ocRO3emdJAHIo+fLLe0VLRhY7WL5y9pqNSCXoXZeCEKVJhW02Pje goGv0P7dhqVweVKbiVzSBJ2Ma43sOh7cd8JV+TEjEPxbb3gMXM0XBapYMHMvAMS8 lio4pnf3GF7pRP9kucz71rKjXHf3HjRBCVMx5vjZFDPVu4tcDyzsW5DXtgRMLICH 4bWHdgJUDInWWpdDlvxpIL9Qq0q2QFM5M1R6pOwla0z/hJp2PEREHD9zpd/2pfie KsKJWqcgvB+iFvuFfpy8E+1FcQtBTDdkV8YbMUc/hxxWXnt4SuB+eEBSBrDVifUV iyBdyLq93ilEc+0Hq4w3PqjagbjLVtRJ3eOWk4CXWlWNQFsf2/rHSbph0kHbto31 Ordpm3EVz/nMeEdoSxLZbFPRBVnX7uIUp7Ti5gwcP44jvAjLRwWJDwQDI4QACwhh hn+GYMkEAhl42+tCVhgwj0z9yi5RHske/9/ARJeb+I/AyAguOxjdYwB1aCJoBzep opETd3VYzkzrqDN+juFdR8sPWDVXC4z72/CpnwUPHbv3G0NrDqQbTqAoQE42p2YT T0UTShjaNCXOzxm40m68xQw2GtF8CBJHKkdMO9xxC5QxTRdpTbekyv9bOxq1fFGF y5YY7MnDCWAGv/c4UpGX =5I1q -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.4.1.2'
Tag 'libreoffice-5.4.1.2' created by Christian Lohmaier at 2017-08-24 21:39 + Tag libreoffice-5.4.1.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJZn0d7AAoJEPQ0oe+v7q6j4icP/2FT4Hv0zoUfYejVLdgJONkz nunvgT2we6b88K8ZnkUFh9zoeVQ/g59lSDDRvimS4CwDhEd2GTCEbvKW67isJah3 MDii3Zi2N8joD3TE+EGoVT3jYw7rXYJ4b9IEPujEcGg6N8sgMuurfVjqRC64b0Qz HG7M8a+J03nJ29Y7Nhc5j2UCz9zlrLps2KNVmoJVVdguFdw1/St3gXRJW4fwV1rs ugY5OGkBitR98lf9GMScmcSOg6spA6lsjrR86gXAL/ctCpdxyDf89Hytc60P0qTi reBefWxvopSVPeneZmpQqZvFjIuz8xEXVS6sK1WTCyp85AnR8atbX3CUKIQ6ENlE yL2TlpadFroiG/6Z4lT9bNZ34tZO0BRL0WnGC32phUuYi2FV/6XEsC1JTLpoMyYZ XkqzipRMUSzo3I63547Yu2yVtV7fcUMqfcOOmH25apfFT+pFO+kFFVs95dX5FmX2 moDwNpq6zVp8AX9JGlkCgEyIC+LK8Od4S9kdhU2Q+qbZ2w6IjwyxWW5RJnmRnWhb wbYipmS1WtoVNnM1t7414GZUXvGkxKV+MJFHKPg2Z31ybqrXL3xAW2vyKmGjiIz9 0SnRpvGNaSGugjWD+PRqwMHU4JnJfQjEWh+0qK0lbC/7eLjPUd+a4RFD7NKGgbuS pKf99JHjFbynBABaIaqV =SsTa -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-54: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b99f9c9559b9a3a2aa6337bb87be0ea1767ee7a7
Author: Michael Stahl
Date: Fri Aug 18 17:25:17 2017 +0200
tdf#99692 sw: fix the fix: don't set bNullContent if node was split
When showing the redlines in rhbz908615-13.odt, the following assertion
happens:
Assertion `IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark(rPaM)
&& "" "- creation of cross-reference
bookmark with an illegal PaM that does not expand over exactly one whole
paragraph."' failed.
This is because in DocumentContentOperationsManager::MoveRange() the
flag bNullContent is set after the node has been split; in this case the
nContent is of course always 0.
Later the function then restores aSavePam to the index 0 of the next
node, when it actually shouldn't do anything because the JoinNext()
already positioned it correctly at the merge-index of the re-joined node.
(regression from 850795942b3e168cab8ce88b4f2b421945ff29ca)
Change-Id: I64d50e70b19e2fd81537a9771fa8706898b17642
(cherry picked from commit 6a018363791945b6fd7f04f2aa311e4f4753f6aa)
Reviewed-on: https://gerrit.libreoffice.org/41304
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit cac440fd5a76f4a76565466cd9df363f5634e8bd)
Reviewed-on: https://gerrit.libreoffice.org/41464
Reviewed-by: Eike Rathke
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 32f7da7e99de..cfc4f4fe9605 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2039,7 +2039,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
// the manipulated range.
// tdf#99692 don't Move() back if that would end up in another node
// because moving backward is not necessarily the inverse of forward then.
-const bool bNullContent = aSavePam.GetPoint()->nContent == 0;
+// (but do Move() back if we have split the node)
+const bool bNullContent = !bSplit && aSavePam.GetPoint()->nContent == 0;
if( bNullContent )
{
aSavePam.GetPoint()->nNode--;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2c8a955e5a0df44651e01be6d76a9ecdcf37a94 Author: Christian Lohmaier Date: Thu Aug 24 22:49:15 2017 +0200 Updated core Project: translations e5a1db22b7e114706f4b7cbeb243c10c96cac3be update translations for 5.4.1 rc2 and force-fix errors using pocheck Change-Id: I757f8fd738860dc4b9acd543e4e00de668bb1e69 (cherry picked from commit 1f0ab2c64b5590f8d762b41b63f3ce1f8c6ac077) diff --git a/translations b/translations index b55ddde65dfb..e5a1db22b7e1 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b55ddde65dfb9374b2c861fa5dcb38bf85087b49 +Subproject commit e5a1db22b7e114706f4b7cbeb243c10c96cac3be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4' - source/am source/ar source/be source/bg source/cs source/de source/es source/eu source/fr source/gl source/hr source/hsb source/id so
source/am/dbaccess/source/ui/dlg.po|6 source/am/dbaccess/source/ui/querydesign.po|6 source/am/desktop/source/app.po| 10 source/am/dictionaries/en/dialog.po|6 source/am/extras/source/autocorr/emoji.po |6 source/am/formula/source/core/resource.po | 16 source/am/helpcontent2/source/text/scalc/01.po | 16 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/am/sc/source/ui/dbgui.po| 10 source/am/sc/source/ui/src.po | 122 - source/am/sc/uiconfig/scalc/ui.po | 30 source/am/scaddins/source/analysis.po | 24 source/am/starmath/uiconfig/smath/ui.po|8 source/am/svx/source/dialog.po |8 source/am/svx/source/svdraw.po | 10 source/am/sw/source/uibase/utlui.po| 10 source/am/sw/uiconfig/swriter/ui.po| 14 source/am/wizards/source/formwizard.po |8 source/am/wizards/source/template.po | 12 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 16 source/ar/sd/source/core.po| 10 source/ar/sd/source/ui/view.po |6 source/ar/sfx2/source/doc.po | 12 source/ar/sfx2/source/view.po | 18 source/ar/sfx2/uiconfig/ui.po | 46 source/ar/svtools/source/misc.po | 12 source/ar/svtools/uiconfig/ui.po | 15 source/be/chart2/source/controller/dialogs.po | 10 source/be/connectivity/source/resource.po |6 source/be/cui/source/dialogs.po|8 source/be/cui/source/options.po| 16 source/be/cui/source/tabpages.po |6 source/be/dbaccess/source/ui/tabledesign.po|6 source/be/filter/source/config/fragments/filters.po| 10 source/be/filter/source/config/fragments/types.po |6 source/be/filter/uiconfig/ui.po| 24 source/be/formula/source/core/resource.po | 12 source/be/librelogo/source/pythonpath.po | 22 source/be/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|6 source/be/officecfg/registry/data/org/openoffice/Office.po | 169 - source/be/officecfg/registry/data/org/openoffice/Office/UI.po | 28 source/be/readlicense_oo/docs.po |7 source/be/reportdesign/uiconfig/dbreport/ui.po |8 source/be/sc/source/ui/StatisticsDialogs.po| 44 source/be/sc/source/ui/cctrl.po| 10 source/be/sc/source/ui/dbgui.po| 10 source/be/sc/source/ui/src.po | 219 -- source/be/sc/uiconfig/scalc/ui.po | 249 +- source/be/scaddins/source/analysis.po | 20 source/be/scp2/source/draw.po | 14 source/be/sd/uiconfig/sdraw/ui.po | 46 source/be/sd/uiconfig/simpress/ui.po | 72 source/be/sfx2/source/dialog.po| 16 source/be/sfx2/uiconfig/ui.po | 14 source/be/starmath/source.po |6 source/be/starmath/uiconfig/smath/ui.po| 26 source/be/svtools/source/misc.po | 22 source/be/svx/source/dialog.po | 70 source/be/svx/source/form.po | 16 source/be/svx/source/gallery2.po | 15 source/be/svx/source/items.po |9 source/be/svx/source/src.po|9 source/be/svx/source/svdraw.po | 14 source/be/svx/uiconfig/ui.po | 52 source/be/swext/mediawiki/help.po | 18 source/bg/helpcontent2/source/text/scalc/guide.po
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4-1' - source/am source/ar source/be source/bg source/cs source/de source/es source/eu source/fr source/gl source/hr source/hsb source/id
source/am/dbaccess/source/ui/dlg.po|6 source/am/dbaccess/source/ui/querydesign.po|6 source/am/desktop/source/app.po| 10 source/am/dictionaries/en/dialog.po|6 source/am/extras/source/autocorr/emoji.po |6 source/am/formula/source/core/resource.po | 16 source/am/helpcontent2/source/text/scalc/01.po | 16 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/am/sc/source/ui/dbgui.po| 10 source/am/sc/source/ui/src.po | 122 - source/am/sc/uiconfig/scalc/ui.po | 30 source/am/scaddins/source/analysis.po | 24 source/am/starmath/uiconfig/smath/ui.po|8 source/am/svx/source/dialog.po |8 source/am/svx/source/svdraw.po | 10 source/am/sw/source/uibase/utlui.po| 10 source/am/sw/uiconfig/swriter/ui.po| 14 source/am/wizards/source/formwizard.po |8 source/am/wizards/source/template.po | 12 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 16 source/ar/sd/source/core.po| 10 source/ar/sd/source/ui/view.po |6 source/ar/sfx2/source/doc.po | 12 source/ar/sfx2/source/view.po | 18 source/ar/sfx2/uiconfig/ui.po | 46 source/ar/svtools/source/misc.po | 12 source/ar/svtools/uiconfig/ui.po | 15 source/be/chart2/source/controller/dialogs.po | 10 source/be/connectivity/source/resource.po |6 source/be/cui/source/dialogs.po|8 source/be/cui/source/options.po| 16 source/be/cui/source/tabpages.po |6 source/be/dbaccess/source/ui/tabledesign.po|6 source/be/filter/source/config/fragments/filters.po| 10 source/be/filter/source/config/fragments/types.po |6 source/be/filter/uiconfig/ui.po| 24 source/be/formula/source/core/resource.po | 12 source/be/librelogo/source/pythonpath.po | 22 source/be/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|6 source/be/officecfg/registry/data/org/openoffice/Office.po | 169 - source/be/officecfg/registry/data/org/openoffice/Office/UI.po | 28 source/be/readlicense_oo/docs.po |7 source/be/reportdesign/uiconfig/dbreport/ui.po |8 source/be/sc/source/ui/StatisticsDialogs.po| 44 source/be/sc/source/ui/cctrl.po| 10 source/be/sc/source/ui/dbgui.po| 10 source/be/sc/source/ui/src.po | 219 -- source/be/sc/uiconfig/scalc/ui.po | 249 +- source/be/scaddins/source/analysis.po | 20 source/be/scp2/source/draw.po | 14 source/be/sd/uiconfig/sdraw/ui.po | 46 source/be/sd/uiconfig/simpress/ui.po | 72 source/be/sfx2/source/dialog.po| 16 source/be/sfx2/uiconfig/ui.po | 14 source/be/starmath/source.po |6 source/be/starmath/uiconfig/smath/ui.po| 26 source/be/svtools/source/misc.po | 22 source/be/svx/source/dialog.po | 70 source/be/svx/source/form.po | 16 source/be/svx/source/gallery2.po | 15 source/be/svx/source/items.po |9 source/be/svx/source/src.po|9 source/be/svx/source/svdraw.po | 14 source/be/svx/uiconfig/ui.po | 52 source/be/swext/mediawiki/help.po | 18 source/bg/helpcontent2/source/text/scalc/guide.po
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1403f09257f502acaff7f0c1ea4dd15fb0eda9a4 Author: Christian Lohmaier Date: Thu Aug 24 22:49:15 2017 +0200 Updated core Project: translations 1f0ab2c64b5590f8d762b41b63f3ce1f8c6ac077 update translations for 5.4.1 rc2 and force-fix errors using pocheck Change-Id: I757f8fd738860dc4b9acd543e4e00de668bb1e69 diff --git a/translations b/translations index 264123910785..1f0ab2c64b55 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 26412391078511f68986b8e3ad4a94229cf7c52d +Subproject commit 1f0ab2c64b5590f8d762b41b63f3ce1f8c6ac077 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - cli_ure/version unoil/climaker
cli_ure/version/version.txt | 24 unoil/climaker/version.txt |6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 49eadf7e55a98ec284a76bc44373150c85fa7f1e Author: Michael Stahl Date: Wed Aug 16 15:32:04 2017 +0200 tdf#108709 cli_ure,unoil: bump CLI assembly versions for 5.4 perl cli_ure/source/scripts/increment_version.pl cli_ure/version/version.txt cli_ure/version/incversions.txt temp.txt && mv temp.txt cli_ure/version/version.txt perl cli_ure/source/scripts/increment_version.pl unoil/climaker/version.txt unoil/climaker/incversions.txt temp.txt && mv temp.txt unoil/climaker/version.txt Change-Id: Iaea028fc345d090317f7ebf128b683b4643a1093 (cherry picked from commit 17192ce5588f84192d1dd0d963622bda48566fdc) Reviewed-on: https://gerrit.libreoffice.org/41215 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit aac0c5a7d6e2738bc8f86327f3c2ba0a132b6354) Reviewed-on: https://gerrit.libreoffice.org/41247 Reviewed-by: Christian Lohmaier Reviewed-by: Thorsten Behrens Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt index e24ddc511fe9..11cd9e737649 100644 --- a/cli_ure/version/version.txt +++ b/cli_ure/version/version.txt @@ -16,23 +16,23 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -CLI_URETYPES_NEW_VERSION=1.0.8.0 -CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.7.0 -CLI_URETYPES_POLICY_VERSION=8.0.0.0 +CLI_URETYPES_NEW_VERSION=1.0.9.0 +CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.8.0 +CLI_URETYPES_POLICY_VERSION=9.0.0.0 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes -CLI_BASETYPES_NEW_VERSION=1.0.19.0 -CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.18.0 -CLI_BASETYPES_POLICY_VERSION=19.0.0.0 +CLI_BASETYPES_NEW_VERSION=1.0.20.0 +CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.19.0 +CLI_BASETYPES_POLICY_VERSION=20.0.0.0 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes -CLI_URE_NEW_VERSION=1.0.22.0 -CLI_URE_OLD_VERSION=1.0.0.0-1.0.21.0 -CLI_URE_POLICY_VERSION=22.0.0.0 +CLI_URE_NEW_VERSION=1.0.23.0 +CLI_URE_OLD_VERSION=1.0.0.0-1.0.22.0 +CLI_URE_POLICY_VERSION=23.0.0.0 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure -CLI_CPPUHELPER_NEW_VERSION=1.0.22.0 -CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.21.0 -CLI_CPPUHELPER_POLICY_VERSION=22.0.0.0 +CLI_CPPUHELPER_NEW_VERSION=1.0.23.0 +CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.22.0 +CLI_CPPUHELPER_POLICY_VERSION=23.0.0.0 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt index abc28bc42473..ec48a082e47f 100644 --- a/unoil/climaker/version.txt +++ b/unoil/climaker/version.txt @@ -16,8 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -CLI_OOOTYPES_NEW_VERSION=1.0.8.0 -CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.7.0 -CLI_OOOTYPES_POLICY_VERSION=8.0.0.0 +CLI_OOOTYPES_NEW_VERSION=1.0.9.0 +CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.8.0 +CLI_OOOTYPES_POLICY_VERSION=9.0.0.0 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - svtools/source sw/qa vcl/source
svtools/source/misc/ehdl.cxx |2 +-
sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt |binary
vcl/source/window/errinf.cxx |2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e090b4272b8fa12d2032ff0c0ea4bfb24c0d2d2
Author: Michael Stahl
Date: Thu Aug 24 21:20:25 2017 +0200
tdf#111934: add document for filters-tests
Thanks to infostu...@gmail.com for the document; unfortunately git
tells me that i can't set the commit author to just an email address.
Change-Id: I844e725d06cfa2a56adcd93aaa0a222fbb14028f
diff --git a/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt
b/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt
new file mode 100644
index ..7d823df75213
Binary files /dev/null and
b/sw/qa/core/data/odt/fail/82fff64a-0a21-4b09-bbdc-2914a5a150f0.odt differ
commit 4ebcb4009e2185961fe3d716bd07ef2013ecd070
Author: Michael Stahl
Date: Thu Aug 24 21:03:58 2017 +0200
svtools: fix checking of ErrCodeArea so error dialogs are shown again
Previously SfxErrorHandler::CreateString() compared the entire error
code so >=/<= worked but now only the ErrCodeArea is compared,
so only works.
(regression from 158595543053c158a9bcb95f679e7b8a3c2e4e89)
Change-Id: I8ac46de154f93a7109ec29d899c71bfb470d008c
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 2941c80397d7..effe4ecb5860 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -159,7 +159,7 @@ bool SfxErrorHandler::CreateString(const ErrorInfo *pErr,
OUString &rStr) const
{
ErrCode nErrCode(sal_uInt32(pErr->GetErrorCode()) & ERRCODE_ERROR_MASK);
-if( pErr->GetErrorCode().GetArea() > lEnd ||
pErr->GetErrorCode().GetArea() <= lStart )
+if (pErr->GetErrorCode().GetArea() < lStart || lEnd <
pErr->GetErrorCode().GetArea())
return false;
if(GetErrorString(nErrCode, rStr))
{
commit 41fb6822cbc2f82333ea54db816f60616f827e49
Author: Michael Stahl
Date: Thu Aug 24 17:14:45 2017 +0200
vcl: fix double-free of ErrorInfo
The only value that ErrorHandler::GetErrorString() adds over
ErrorStringFactory::CreateString() is that it will delete the pInfo a
2nd time, because the ErrorInfo::GetErrorInfo() returns the same object
twice.
This may fix it, but it's generally hard to tell what this
brain damaged error handling code will do.
(regression from 1167df7df59e37fddef0c40c4d27cb2e82e10922)
Change-Id: I22f446bee669cae8c5288bcc2f1e1d0299f5b384
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 0eb4c0160e8c..40849ca916e1 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -148,7 +148,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId,
DialogMask nFlags)
}
OUString aErr;
-if (ErrorHandler::GetErrorString(nErrCodeId, aErr))
+if (ErrorStringFactory::CreateString(pInfo, aErr))
{
if(!rData.pDsp)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/notify/lstner.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 80d8cbb8e1444ff89dd61b270b43995623e95662
Author: Julien Nabet
Date: Thu Aug 24 19:52:44 2017 +0200
SAL_INFO->SAL_WARN in lstner.cxx (svl module)
Since we're already in #ifdef DBG_UTIL, we can also directly use SAL_WARN
Change-Id: Ic7c564f6c08e05eb9bd5928ef031f212def094aa
Reviewed-on: https://gerrit.libreoffice.org/41531
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 0b3d2e9a3af5..75928021351a 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -95,7 +95,7 @@ void SfxListener::StartListening( SfxBroadcaster&
rBroadcaster, bool bPreventDup
if (bListeningAlready && !bPreventDuplicates)
{
auto f = mpImpl->maCallStacks.find( &rBroadcaster );
-SAL_INFO("svl", "previous StartListening call came from: " <<
sal_backtrace_to_string(f->second.get()));
+SAL_WARN("svl", "previous StartListening call came from: " <<
sal_backtrace_to_string(f->second.get()));
}
#endif
assert(!(bListeningAlready && !bPreventDuplicates) && "duplicate listener,
try building with DBG_UTIL to find the other insert site.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - sc/source
sc/source/core/tool/scmatrix.cxx | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit d5e600aeb89915f1fbc291462190573e555bf21d
Author: Eike Rathke
Date: Mon Aug 21 15:49:41 2017 +0200
Resolves: tdf#111943 really really limit the match, tdf#108292 follow-up
getRemainingCount() could deliver a wrapped around overflow value if mnIndex
was already greater than the end index, which could happen if when/for
non-matching larger block sizes were added, and if then a match was found
behind those blocks a non-requested/unexpected index was returned, which in
turn led to the assert() being hit in ScInterpreter::CalculateLookup(). In
non-debug could result in an invalid block position access.
This happened with the bug case document of tdf#111943 which in master can
be
loaded.
Also, the start and end index are not dynamic and don't have to be
recalculated
each time, so make them const; column argument values are unused after.
(cherry picked from commit 25b3806ac509006573e669acc33643af3bd77380)
Change-Id: Ic294cade4e8e7828bee394e5ade61d7127be6bbb
Reviewed-on: https://gerrit.libreoffice.org/41468
Reviewed-by: Christian Lohmaier
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 659e22fa064a..0a3dca7cb12d 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1267,24 +1267,25 @@ template
class WalkAndMatchElements : public
std::unary_function
{
Type maMatchValue;
-MatrixImplType::size_pair_type maSize;
-size_t mnCol1;
-size_t mnCol2;
+const size_t mnStartIndex;
+const size_t mnStopIndex;
size_t mnResult;
size_t mnIndex;
public:
WalkAndMatchElements(Type aMatchValue, const
MatrixImplType::size_pair_type& aSize, size_t nCol1, size_t nCol2) :
maMatchValue(aMatchValue),
-maSize(aSize),
-mnCol1(nCol1),
-mnCol2(nCol2),
+mnStartIndex( nCol1 * aSize.row ),
+mnStopIndex( (nCol2 + 1) * aSize.row ),
mnResult(ResultNotSet),
mnIndex(0) {}
size_t getMatching() const { return mnResult; }
-size_t getRemainingCount() const { return ((mnCol2 + 1) * maSize.row) -
mnIndex; }
+size_t getRemainingCount() const
+{
+return mnIndex < mnStopIndex ? mnStopIndex - mnIndex : 0;
+}
size_t compare(const MatrixImplType::element_block_node_type& node) const;
@@ -1295,7 +1296,7 @@ public:
return;
// limit lookup to the requested columns
-if ((mnCol1 * maSize.row) <= mnIndex && getRemainingCount() > 0)
+if (mnStartIndex <= mnIndex && getRemainingCount() > 0)
{
mnResult = compare(node);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen7.cxx |3 ++-
sc/source/core/data/table5.cxx | 15 ---
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit c84332184a5de3e4180514cf6e3282597ffe5dd6
Author: Eike Rathke
Date: Thu Aug 24 19:33:32 2017 +0200
Resolves: tdf#93171 follow-up, notify dependents of subtotal formula cells
Track ScHiddenRowsChanged collected cells and broadcast with ScDataChanged.
Change-Id: Id41d2731585f6749533319bf42ad655a845ecf30
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 342fff0c5664..299f5e70d089 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -559,7 +559,8 @@ void ScDocument::TrackFormulas( SfxHintId nHintId )
if (!pBASM)
return;
-if (pBASM->IsInBulkBroadcast() && !IsFinalTrackFormulas() && nHintId ==
SfxHintId::ScDataChanged)
+if (pBASM->IsInBulkBroadcast() && !IsFinalTrackFormulas() &&
+(nHintId == SfxHintId::ScDataChanged || nHintId ==
SfxHintId::ScHiddenRowsChanged))
{
SetTrackFormulasPending();
return;
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index f64e2dc865f1..d6c7a8527e4b 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -40,6 +40,7 @@
#include "globalnames.hxx"
#include "scmod.hxx"
#include "printopt.hxx"
+#include "bcaslot.hxx"
#include
@@ -593,9 +594,17 @@ bool ScTable::SetRowHidden(SCROW nStartRow, SCROW nEndRow,
bool bHidden)
{
if (IsStreamValid())
SetStreamValid(false);
-for (SCCOL i = 0; i < aCol.size(); i++)
-{
-aCol[i].BroadcastRows(nStartRow, nEndRow,
SfxHintId::ScHiddenRowsChanged);
+
+{ // Scoped bulk broadcast.
+// Only subtotal formula cells will accept the notification of
+// SfxHintId::ScHiddenRowsChanged, leaving the bulk will track
+// those and broadcast SfxHintId::ScDataChanged to notify all
+// dependents.
+ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM(),
SfxHintId::ScDataChanged);
+for (SCCOL i = 0; i < aCol.size(); i++)
+{
+aCol[i].BroadcastRows(nStartRow, nEndRow,
SfxHintId::ScHiddenRowsChanged);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/watermark-layer.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 14 ++
sw/source/core/edit/edfcol.cxx | 15 ++-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +-
4 files changed, 33 insertions(+), 6 deletions(-)
New commits:
commit 39c08074a286855dd014ce1c30b8f7ef95b10242
Author: Szymon KÅos
Date: Fri Aug 18 15:13:52 2017 +0200
Watermark: not visible if page background was set
Watermark was drawn under the page background.
It has to be placed on the upper layer to be visible.
Change-Id: I132a313eed6fb712aafdca14a38fe559aa4231c8
Reviewed-on: https://gerrit.libreoffice.org/41289
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
diff --git a/sw/qa/extras/ooxmlexport/data/watermark-layer.docx
b/sw/qa/extras/ooxmlexport/data/watermark-layer.docx
new file mode 100755
index ..9428686c1bad
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/watermark-layer.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 4e961079b829..515f40e4803b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -30,8 +30,10 @@
#include
#include
+#include
#include
#include
+#include
class Test : public SwModelTestBase
{
@@ -993,6 +995,18 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXControlAtRunEnd,
"activex_control_at_run_end
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,getProperty(xPropertySet2,"AnchorType"));
}
+DECLARE_OOXMLEXPORT_TEST(testWatermarkLayer, "watermark-layer.docx")
+{
+// Watermark was not visible if page background was set.
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+SdrPage* pPage =
pTextDoc->GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+SdrObject* pObject = pPage->GetObj(0);
+
+CPPUNIT_ASSERT(pObject);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pObject->GetLayer().get());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 4e309a33761f..456d06b65b96 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -62,6 +62,7 @@
#include
#include
#include
+#include
#include
@@ -352,7 +353,8 @@ SfxWatermarkItem SwEditShell::GetWatermark()
void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark,
const uno::Reference& xModel,
const uno::Reference&
xPageStyle,
-const uno::Reference& xHeaderText)
+const uno::Reference& xHeaderText,
+sal_Int16 nLayer)
{
uno::Reference xMultiServiceFactory(xModel,
uno::UNO_QUERY);
OUString aShapeServiceName = "com.sun.star.drawing.CustomShape";
@@ -474,6 +476,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem&
rWatermark,
xPropertySet->setPropertyValue("Transformation",
uno::makeAny(aMatrix));
xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT,
uno::makeAny(static_cast(text::HoriOrientation::CENTER)));
xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT,
uno::makeAny(static_cast(text::VertOrientation::CENTER)));
+xPropertySet->setPropertyValue(UNO_NAME_MISC_OBJ_LAYERID,
uno::makeAny(nLayer));
uno::Reference xTextRange(xShape, uno::UNO_QUERY);
xTextRange->setString(rWatermark.GetText());
@@ -519,6 +522,8 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem&
rWatermark)
uno::Reference
xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
uno::Reference
xStyleFamily(xStyleFamilies->getByName("PageStyles"), uno::UNO_QUERY);
+sal_Int16 nHeavenId =
GetDoc()->getIDocumentDrawModelAccess().GetHeavenId().get();
+
std::set aUsedPageStyles = lcl_getUsedPageStyles(this);
for (const OUString& rPageStyleName : aUsedPageStyles)
{
@@ -544,16 +549,16 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem&
rWatermark)
uno::Reference xHeaderTextRight;
xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT) >>= xHeaderText;
-lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle,
xHeaderText);
+lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle,
xHeaderText, nHeavenId);
xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT_FIRST) >>=
xHeaderTextFirst;
-lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle,
xHeaderTextFirst);
+lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle,
xHeaderTextFirst, nHeavenId);
xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT_LEFT) >>=
xHeaderTextLeft;
-lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle,
xHeaderTextLeft);
+
[Libreoffice-commits] core.git: writerperfect/CppunitTest_writerperfect_epubexport.mk writerperfect/Module_writerperfect.mk writerperfect/qa
writerperfect/CppunitTest_writerperfect_epubexport.mk | 41
writerperfect/Module_writerperfect.mk |1
writerperfect/qa/unit/EPUBExportTest.cxx| 88
++
writerperfect/qa/unit/data/writer/epubexport/outline-level.fodt | 15 +
4 files changed, 145 insertions(+)
New commits:
commit ab8b8fb183067fd0bded089f513b614d35138e18
Author: Miklos Vajna
Date: Thu Aug 24 14:32:59 2017 +0200
Add initial CppunitTest_writerperfect_epubexport
Fails with the writerperfect/source/writer/exp/txtparai.cxx part of
commit b6f39c47fb477f16c65631523b0c18b4f262fadf (EPUB export: initial
index support, 2017-08-15) reverted.
Change-Id: I56457b3e3b312682e4c83ea08dbd459ca42152ef
Reviewed-on: https://gerrit.libreoffice.org/41518
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerperfect/CppunitTest_writerperfect_epubexport.mk
b/writerperfect/CppunitTest_writerperfect_epubexport.mk
new file mode 100644
index ..ea5285730b31
--- /dev/null
+++ b/writerperfect/CppunitTest_writerperfect_epubexport.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,writerperfect_epubexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_epubexport, \
+writerperfect/qa/unit/EPUBExportTest \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_epubexport))
+
+$(eval $(call gb_CppunitTest_use_libraries,writerperfect_epubexport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ test \
+ unotest \
+ utl \
+ tl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call
gb_CppunitTest_use_external,writerperfect_epubexport,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_epubexport))
+
+$(eval $(call gb_CppunitTest_use_ure,writerperfect_epubexport))
+$(eval $(call gb_CppunitTest_use_vcl,writerperfect_epubexport))
+
+$(eval $(call gb_CppunitTest_use_rdb,writerperfect_epubexport,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,writerperfect_epubexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/Module_writerperfect.mk
b/writerperfect/Module_writerperfect.mk
index b2102c54b987..859f0cbe2507 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_check_targets,writerperfect,\
$(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
CppunitTest_writerperfect_calc \
CppunitTest_writerperfect_draw \
+ CppunitTest_writerperfect_epubexport \
CppunitTest_writerperfect_import \
CppunitTest_writerperfect_impress \
CppunitTest_writerperfect_writer \
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx
b/writerperfect/qa/unit/EPUBExportTest.cxx
new file mode 100644
index ..ef65012daca9
--- /dev/null
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace ::com::sun::star;
+
+namespace
+{
+
+char const DATA_DIRECTORY[] = "/writerperfect/qa/unit/data/writer/epubexport/";
+
+/// Tests the EPUB export filter.
+class EPUBExportTest : public test::BootstrapFixture, public
unotest::MacrosTest
+{
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+virtual void setUp() override;
+virtual void tearDown() override;
+void testOutlineLevel();
+
+CPPUNIT_TEST_SUITE(EPUBExportTest);
+CPPUNIT_TEST(testOutlineLevel);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void EPUBExportTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+
mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void EPUBExportTest::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+void EPUBExportTest::testOutlineLevel()
+{
+// Import the bugdoc and export as EPUB.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"outline-level.fodt";
+mxComponent = loadFromDesktop(aURL);
+CPPUNIT_ASSERT(mxComponent.is());
+
+uno::Reference xStorable(mxCompo
[Libreoffice-commits] core.git: emfio/qa test/source
emfio/qa/cppunit/emf/EmfImportTest.cxx | 42 +++
emfio/qa/cppunit/emf/data/TestDrawLine.emf |binary
emfio/qa/cppunit/emf/data/TestDrawString.emf |binary
test/source/primitive2dxmldump.cxx | 18 +++
4 files changed, 60 insertions(+)
New commits:
commit 8d1dc9a662d2e1bc833d5488f3f0013f98e7f3fd
Author: Patrick Jaap
Date: Tue Aug 22 12:31:15 2017 +0200
emfio: unit test for the EMF+ renderer
Two unit tests, which test the EMF+ records DrawString and DrawLine
independently.
To this end, a fixed view decomposition of metafiles is implemented.
The chosen primitives should be optimal, even for future extensions
of the EMF+ parser.
Change-Id: I12672d3b294ff0fdae63c7a5ce211517ef8f763c
Reviewed-on: https://gerrit.libreoffice.org/41425
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index ca766b8b67f3..bc14c4bd3062 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -39,12 +39,16 @@ class Test : public test::BootstrapFixture, public
XmlTestTools
void checkRectPrimitive(Primitive2DSequence const & rPrimitive);
void testWorking();
+void TestDrawString();
+void TestDrawLine();
Primitive2DSequence parseEmf(const OUString& aSource);
public:
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testWorking);
+CPPUNIT_TEST(TestDrawString);
+CPPUNIT_TEST(TestDrawLine);
CPPUNIT_TEST_SUITE_END();
};
@@ -88,6 +92,44 @@ void Test::testWorking()
checkRectPrimitive(aSequenceRect);
}
+void Test::TestDrawString()
+{
+// This unit checks for a correct import of an EMF+ file with only one
DrawString Record
+// Since the text is undecorated the optimal choice is a simpletextportion
primitive
+
+// first, get the sequence of primitives and dump it
+Primitive2DSequence aSequence =
parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf");
+CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
+Primitive2dXmlDump dumper;
+xmlDocPtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
+CPPUNIT_ASSERT (pDocument);
+
+// check correct import of the DrawString: height, position, text, color
and font
+assertXPath(pDocument,
"/primitive2D/metafile/transform/textsimpleportion", "height", "276");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/textsimpleportion", "x", "25");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/textsimpleportion", "y", "323");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/textsimpleportion", "text", "TEST");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/textsimpleportion", "fontcolor", "#00");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/textsimpleportion", "familyname", "CALIBRI");
+}
+
+void Test::TestDrawLine()
+{
+// This unit checks for a correct import of an EMF+ file with only one
DrawLine Record
+// The line is colored and has a specified width, therefore a
polypolygonstroke primitive is the optimal choice
+
+// first, get the sequence of primitives and dump it
+Primitive2DSequence aSequence =
parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf");
+CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
+Primitive2dXmlDump dumper;
+xmlDocPtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
+CPPUNIT_ASSERT (pDocument);
+
+// check correct import of the DrawLine: color and width of the line
+assertXPath(pDocument,
"/primitive2D/metafile/transform/polypolygonstroke/line", "color", "#00");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/polypolygonstroke/line", "width", "33");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
diff --git a/emfio/qa/cppunit/emf/data/TestDrawLine.emf
b/emfio/qa/cppunit/emf/data/TestDrawLine.emf
new file mode 100644
index ..89946c523f98
Binary files /dev/null and b/emfio/qa/cppunit/emf/data/TestDrawLine.emf differ
diff --git a/emfio/qa/cppunit/emf/data/TestDrawString.emf
b/emfio/qa/cppunit/emf/data/TestDrawString.emf
new file mode 100644
index ..c7976f53b3c0
Binary files /dev/null and b/emfio/qa/cppunit/emf/data/TestDrawString.emf differ
diff --git a/test/source/primitive2dxmldump.cxx
b/test/source/primitive2dxmldump.cxx
index 6523c4c0c971..563fb75acc19 100644
--- a/test/source/primitive2dxmldump.cxx
+++ b/test/source/primitive2dxmldump.cxx
@@ -26,6 +26,9 @@
#include
#include
#include
+#include
+#include
+
#include
#include
@@ -190,6 +193,8 @@ void Primitive2dXmlDump::decomposeAndWrite(
{
rWriter.attribute("height", aScale.getY());
}
+rWriter.attribute("x", aTranslate.getX());
+rWriter.attribute("y", aTransla
[Libreoffice-commits] core.git: cui/uiconfig officecfg/registry
cui/uiconfig/ui/spellingdialog.ui|2 +- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 1098fba99acb8c8cc7e87c55ece12ef175593147 Author: heiko tietze Date: Thu Aug 3 14:55:27 2017 +0200 tdf#87648 Spelling and Grammar Renamed to just Spelling Change-Id: I4433d75a8fd697e8d4dd25fa5d26411ed15b6c1b Reviewed-on: https://gerrit.libreoffice.org/40717 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 0f576da899ac..07688929231b 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -6,7 +6,7 @@ False 6 -Spelling and Grammar: $LANGUAGE ($LOCATION) +Spelling: $LANGUAGE ($LOCATION) False dialog diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 62f495322389..ff7788129b3c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3577,10 +3577,10 @@ Spelling - ~Spelling and Grammar... + ~Spelling... - Check Spelling and Grammar + Check Spelling 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of ESC call 2017-08-24
* Present: + Armin, Heiko, Olivier, Shinnok, Thorsten, Miklos, Sophie, Eike, Stephan, Michael S, Cloph, Jan-Marek * Completed Action Items: + poke people if they are around for GSoC evals (Thorsten) * Pending Action Items: + find out if we have projects & mentors for Capstone (Shinnok) + Update the roadmap wiki with new 5.3.6/7 dates (Christian) + https://wiki.documentfoundation.org/Development/ScreenshotsAtInstall + work out what a good idea is here (Kendy, Thorsten) + next week or remove... + create redirect / transparent proxy so that we can use help.libreoffice.org directly even for the new stuff (Christian) [ sitemap exists, but not functional yet ] + build a write-up of the differences cross-platform (Xisco) [ done, Heiko wants to discuss a possible multiplier ] * Release Engineering update (Christian) + 5.3.6 RC1 is on the mirrors, to be announced early next week + 5.4.1 RC2 is due this week, a bit of delay due to additional fixes + https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-5-4-1 + Android & iOS Remote + Android viewer + 10% of users reported crashes, not yet rolling out + AI: connect to uznomis[m] / Ximeng to take a look if possible (Christian) + Online + Not enough tinderboxes? (Thorsten) + Christian’s box is the only one providing daily builds for macOS + Mac CI will be back in 1-2 weeks, that’s the hope + would be good to have 1-2 mac tinderboxes at any rate + Linux builds are always off for 2-3 days around releases + only affects RPM/DEB, Markus provides archives * Documentation (Olivier) + More work on SEO data for BoD + Help pages for undocumented features (Impress Remote) + Updated help pages (SUBTOTAL, CDATE) + More help fixes by G. Kelemen and A. Barrientos + Help online: Shall we keep Google search or find a internal solution? See “Search” tab of https://goo.gl/7zWZ8W + Is there any massive critics? (Thorsten) + The site is already crawled (large site, lots of pages * languages) + Can we limit hits to a single language? (Christian) + Not at the moment (Olivier) + Perhaps something less invasive (i.e. not Google but DDG?) + Having this as someone else’ problem is great (Thorsten) + Doumentation team producing Guides updates weekly + Target is 6.0 release in sync with code + Staff activities. * UX Update (Heiko) + Bugzilla (topicUI) statistics 257(257) (topicUI) bugs open, 419(419) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month 3 months 12 months added 7(-1) 15(3) 31(2) 346(-1) commented 44(-12) 170(7)484(-5)3311(13) removed 0(-1) 2(-1) 5(-1) 44(-1) resolved 6(-1) 31(-8)69(3) 287(6) + top 10 contributors: Tietze, Heiko made 140 changes in 1 month, and 1603 changes in 1 year Philips, Yousuf made 49 changes in 1 month, and 1486 changes in 1 year Foote, V Stuart made 44 changes in 1 month, and 604 changes in 1 year Cor Nouws made 41 changes in 1 month, and 363 changes in 1 year Faulí Tarazona, Xisco made 23 changes in 1 month, and 466 changes in 1 y Adolfo Jayme Barrientos made 22 changes in 1 month, and 51 changes in 1 y Thomas Lendo made 21 changes in 1 month, and 407 changes in 1 year Timur made 13 changes in 1 month, and 70 changes in 1 year Telesto made 12 changes in 1 month, and 73 changes in 1 year Buovjaga made 11 changes in 1 month, and 352 changes in 1 year + Mascot >180 proposals, and counting + Open Source survey 1400 participants, evaluation comes next + Talked about taking direct formatting/character style from headings into ToC https://bugs.documentfoundation.org/show_bug.cgi?id=87604 question is whether or not to take all properties + there are related tickets, resolved and open (Miklos) * Crash Reporting (Caolan) + 24(+0) import failure, ~700(+0) export failures + 13 coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporter (Xisco) + http://crashreport.libreoffice.org/stats/?days=128 + http://crashreport.libreoffice.org/stats/version/5.3.4.2 + 1982 (last 7 days) + http://crashreport.libreoffice.org/stats/version/5.3.5.2 + 420(last 7 days) + http://crashreport.libreoffice.org/stats/version/5.4.0.3 + 1982 (last 7 days) * Hackfests & Events (Bjoern) + next venues / suggestions + LibreOffice Conference + Google Mentor Summit right after the conference + application deadline is next week, hurry up if you want to go (and are a mentor) * mentoring/easyhack update (S
Minutes of the Design Hangout: 2017-Aug-24
Present: Jay, Stuart, Andreas, Heiko, Tomaž * Default list of favorite characters + https://bugs.documentfoundation.org/show_bug.cgi?id=111775 + ₠ -> € + ₪ -> © + Φ,Ψ -> ≤,≥ + 😃 -> π (U+03c0) * Default set of list styles + https://bugs.documentfoundation.org/show_bug.cgi?id=106988 + https://gerrit.libreoffice.org/#/c/37742/ + Final decision needed to submit Jay's patch -> create a document without patch and open with patch (AI Heiko) * Removal of Format > Columns + https://gerrit.libreoffice.org/#/c/39017/ + Final decision needed to submit Jay's patch -> accepted, +2'ed, merged * 'Spelling' or 'Spelling and Grammar' + https://bugs.documentfoundation.org/show_bug.cgi?id=87648 + https://gerrit.libreoffice.org/#/c/40717/ + "If we instead swap the .uno:SpellingAndGrammarDialog command for .uno:SpellDialog in the menu and toolbar xml, we could make this change and backport it as well." (Jay) -> there might be code that removes "and Grammar" when the dialog is opened in other modules, eg. Calc -> merge but double-check * Insert field in Calc only in edit mode + https://bugs.documentfoundation.org/show_bug.cgi?id=89261 + what if cell has content and in case of multi selection? + Better have dedicated functions/specifier for this, e.g. =INFO() (Heiko) + no, because it clutters the menu (Jay) + no, because the target is unclear in multiselection (heiko) -> WF * Use direct formatting and character style in ToC + https://bugs.documentfoundation.org/show_bug.cgi?id=87604 + Limitation unclear, e.g. font size? + Scope unclear, alphabetical index, figures, tables... + Take all properties (Heiko) + implementation issues to pick single properties and not use font size, for example (Stuart, Jay) -> postponed for next week signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |8
sc/source/ui/app/inputwin.cxx |6 ++
sc/source/ui/inc/inputhdl.hxx |1 +
3 files changed, 15 insertions(+)
New commits:
commit d31a8263d564ebd7886f6debdf36cedd031915ea
Author: Eike Rathke
Date: Thu Aug 24 16:34:55 2017 +0200
Resolves: tdf#108795 merge table EditEngine language attributes to input
line
... when editing there, so the SvxAutoCorrect behaviour is synchronized.
Depends on commit 06d14411a447cd798d1f0678a3c5e06f5278a1cb that disentangles
the stateful SvxAutoCorrect instance.
Change-Id: Ic6aac1f2acc36b500144be50a20a4784a3ba62dc
Reviewed-on: https://gerrit.libreoffice.org/41521
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9be7701dfb92..f9435aac55f1 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2185,6 +2185,14 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped,
bool bFromCommand, bool bIn
return bNewTable;
}
+void ScInputHandler::MergeLanguageAttributes( ScEditEngineDefaulter&
rDestEngine ) const
+{
+const SfxItemSet& rSrcSet = mpEditEngine->GetDefaults();
+rDestEngine.SetDefaultItem( rSrcSet.Get( EE_CHAR_LANGUAGE ));
+rDestEngine.SetDefaultItem( rSrcSet.Get( EE_CHAR_LANGUAGE_CJK ));
+rDestEngine.SetDefaultItem( rSrcSet.Get( EE_CHAR_LANGUAGE_CTL ));
+}
+
static void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel )
{
OSL_ENSURE( rSel.nStartPara==0 && rSel.nEndPara==0, "SetTopSelection: Para
!= 0" );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c69dae4a98a0..dca31015375a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1108,7 +1108,13 @@ void ScTextWnd::StartEditEngine()
ScInputHandler* pHdl = mpViewShell->GetInputHandler();
if (pHdl)
+{
+bool bStarting = !pHdl->IsEditMode();
pHdl->SetMode(SC_INPUT_TOP);
+if (bStarting)
+// necessary to sync SvxAutoCorrect behavior
+pHdl->MergeLanguageAttributes( *mpEditEngine);
+}
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (pViewFrm)
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 0301b0a72056..99fd54f299a2 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -180,6 +180,7 @@ public:
const ScAddress& GetCursorPos() const { return aCursorPos; }
boolGetTextAndFields( ScEditEngineDefaulter& rDestEngine );
+voidMergeLanguageAttributes( ScEditEngineDefaulter&
rDestEngine ) const;
boolKeyInput( const KeyEvent& rKEvt, bool bStartEdit );
voidEnterHandler( ScEnterMode nBlockMode = ScEnterMode::NORMAL
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/export/drawingml.hxx |4 +-
oox/source/export/drawingml.cxx| 15 +
oox/source/export/shapes.cxx |6 ++-
sd/qa/unit/data/odp/tdf111798.odp |binary
sd/qa/unit/export-tests-ooxml2.cxx | 59 +
5 files changed, 74 insertions(+), 10 deletions(-)
New commits:
commit 73ee631e58f392415f23e98460ff4b2f3a763d37
Author: Paul Trojahn
Date: Thu Aug 17 20:04:27 2017 +0200
tdf#111798 Fix deformed export of flipped custom shapes to pptx
Shapes were deformed because flipping wasn't considered when removing
the rotation. Also WriteShapeTransformation needs information about
flipping to convert the angle correctly.
Change-Id: I7d485e93c00e02b9ec6c73ad6ae2876e5bc6360a
Reviewed-on: https://gerrit.libreoffice.org/41462
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 4ee841d33eb2..ecdad5b99b6a 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -189,8 +189,8 @@ public:
const OUString& rURL, bool bRelPathToMedia = false , const Graphic
*pGraphic=nullptr );
void WriteBlipMode( const css::uno::Reference< css::beans::XPropertySet >&
rXPropSet, const OUString& rURL );
-void WriteShapeTransformation( const css::uno::Reference<
css::drawing::XShape >& rXShape,
- sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV =
false, bool bSuppressRotation = false );
+void WriteShapeTransformation(const css::uno::Reference<
css::drawing::XShape >& rXShape,
+ sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV =
false, bool bSuppressRotation = false, bool bSuppressFlipping = false );
void WriteTransformation( const tools::Rectangle& rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV =
false, sal_Int32 nRotation = 0 );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index aec1aaecc6a5..3d5a7ace8262 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1157,11 +1157,6 @@ void DrawingML::WriteStretch( const css::uno::Reference<
css::beans::XPropertySe
void DrawingML::WriteTransformation( const tools::Rectangle& rRect,
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, sal_Int32 nRotation
)
{
-//OOXML flips shapes before rotating them.
-if(bFlipH)
-nRotation = nRotation * -1 + 6*360;
-if(bFlipV)
-nRotation = nRotation * -1 + 6*360;
mpFS->startElementNS( nXmlNamespace, XML_xfrm,
XML_flipH, bFlipH ? "1" : nullptr,
@@ -1183,7 +1178,7 @@ void DrawingML::WriteTransformation( const
tools::Rectangle& rRect,
mpFS->endElementNS( nXmlNamespace, XML_xfrm );
}
-void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape,
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation )
+void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape,
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation, bool
bSuppressFlipping )
{
SAL_INFO("oox.shape", "write shape transformation");
@@ -1220,6 +1215,14 @@ void DrawingML::WriteShapeTransformation( const
Reference< XShape >& rXShape, sa
if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
}
+
+// OOXML flips shapes before rotating them.
+if(bFlipH != bFlipV)
+nRotation = nRotation * -1 + 36000;
+
+if(bSuppressFlipping)
+bFlipH = bFlipV = false;
+
WriteTransformation( tools::Rectangle( Point( aPos.X, aPos.Y ), Size(
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV,
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index b5d4a450b94b..df34231a225b 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -823,7 +823,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const
Reference< XShape >& xShape )
if (bHasHandles && bCustGeom && pShape)
{
-WriteShapeTransformation( xShape, XML_a ); // do not flip, polypolygon
coordinates are flipped already
+WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV, false, true
);// do not flip, polypolygon coordinates are flipped already
tools::PolyPolygon aPolyPolygon( pShape->GetLineGeometry(true) );
sal_Int32 nRotation = 0;
// The RotateAngle property's value is independent from any flipping,
and that's exactly what we need here.
@@ -831,8 +831,10 @@ ShapeExport& ShapeExport::WriteCustomShape( const
Reference< XShape >& xShape )
uno::Reference xPropertySetInfo =
xPropertySet->getPropertySetInfo();
if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
xPro
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - external/libxml2
external/libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1
| 116
external/libxml2/0001-Fix-handling-of-parameter-entity-references.patch.1
| 287 ++
external/libxml2/0001-Fix-type-confusion-in-xmlValidateOneNamespace.patch.1
| 43 +
external/libxml2/0001-Increase-buffer-space-for-port-in-HTTP-redirect-supp.patch.1
| 31 +
external/libxml2/0001-Prevent-unwanted-external-entity-reference.patch.1
| 35 +
external/libxml2/UnpackedTarball_xml2.mk
|5
6 files changed, 517 insertions(+)
New commits:
commit f86f98796c2a602c5ccd0ce046573978f9152f56
Author: Michael Stahl
Date: Wed Aug 23 12:10:38 2017 +0200
libxml2: bunch of CVE fixes
Change-Id: Ic786fef17cbdb574c342925a4c57875123ef3151
(cherry picked from commit 486d3b214c270fbd2651a0b0895d600e0f647750)
Reviewed-on: https://gerrit.libreoffice.org/41471
Reviewed-by: Markus Mohrhard
Reviewed-by: Christian Lohmaier
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git
a/external/libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1
b/external/libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1
new file mode 100644
index ..047c88d943a7
--- /dev/null
+++
b/external/libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1
@@ -0,0 +1,116 @@
+From 932cc9896ab41475d4aa429c27d9afd175959d74 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer
+Date: Sat, 3 Jun 2017 02:01:29 +0200
+Subject: [PATCH] Fix buffer size checks in xmlSnprintfElementContent
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+xmlSnprintfElementContent failed to correctly check the available
+buffer space in two locations.
+
+Fixes bug 781333 (CVE-2017-9047) and bug 781701 (CVE-2017-9048).
+
+Thanks to Marcel Böhme and Thuan Pham for the report.
+---
+ result/valid/781333.xml | 5 +
+ result/valid/781333.xml.err | 3 +++
+ result/valid/781333.xml.err.rdr | 6 ++
+ test/valid/781333.xml | 4
+ valid.c | 20 +++-
+ 5 files changed, 29 insertions(+), 9 deletions(-)
+ create mode 100644 result/valid/781333.xml
+ create mode 100644 result/valid/781333.xml.err
+ create mode 100644 result/valid/781333.xml.err.rdr
+ create mode 100644 test/valid/781333.xml
+
+diff --git a/result/valid/781333.xml b/result/valid/781333.xml
+new file mode 100644
+index ..45dc451d
+--- /dev/null
b/result/valid/781333.xml
+@@ -0,0 +1,5 @@
++
++
++]>
++
+diff --git a/result/valid/781333.xml.err b/result/valid/781333.xml.err
+new file mode 100644
+index ..b401b49a
+--- /dev/null
b/result/valid/781333.xml.err
+@@ -0,0 +1,3 @@
++./test/valid/781333.xml:4: element a: validity error : Element a content does
not follow the DTD, expecting ( ..., got
++
++^
+diff --git a/result/valid/781333.xml.err.rdr b/result/valid/781333.xml.err.rdr
+new file mode 100644
+index ..5ff56992
+--- /dev/null
b/result/valid/781333.xml.err.rdr
+@@ -0,0 +1,6 @@
++./test/valid/781333.xml:4: element a: validity error : Element a content does
not follow the DTD, expecting ( ..., got
++
++^
++./test/valid/781333.xml:5: element a: validity error : Element a content does
not follow the DTD, Expecting more child
++
++^
+diff --git a/test/valid/781333.xml b/test/valid/781333.xml
+new file mode 100644
+index ..b29e5a68
+--- /dev/null
b/test/valid/781333.xml
+@@ -0,0 +1,4 @@
++
++]>
++
+diff --git a/valid.c b/valid.c
+index 19f84b82..9b2df56a 100644
+--- a/valid.c
b/valid.c
+@@ -1262,22 +1262,23 @@ xmlSnprintfElementContent(char *buf, int size,
xmlElementContentPtr content, int
+ case XML_ELEMENT_CONTENT_PCDATA:
+ strcat(buf, "#PCDATA");
+ break;
+- case XML_ELEMENT_CONTENT_ELEMENT:
++ case XML_ELEMENT_CONTENT_ELEMENT: {
++int qnameLen = xmlStrlen(content->name);
++
++ if (content->prefix != NULL)
++qnameLen += xmlStrlen(content->prefix) + 1;
++ if (size - len < qnameLen + 10) {
++ strcat(buf, " ...");
++ return;
++ }
+ if (content->prefix != NULL) {
+- if (size - len < xmlStrlen(content->prefix) + 10) {
+- strcat(buf, " ...");
+- return;
+- }
+ strcat(buf, (char *) content->prefix);
+ strcat(buf, ":");
+ }
+- if (size - len < xmlStrlen(content->name) + 10) {
+- strcat(buf, " ...");
+- return;
+- }
+ if (content->name != NULL)
+ strcat(buf, (char *) content->name);
+ break;
++}
+ case XML_ELEMENT_CONTENT_SEQ:
+ if ((content->c1->type == XML_ELEMENT_CONTENT_OR) ||
+ (content->c1->type == XML_ELEM
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/glosbib.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit dffdc0b1995e2b24304ce0651ca886bbf9cf4f95
Author: Gabor Kelemen
Date: Thu Aug 17 01:02:26 2017 +0200
tdf#111870 Translate the "My AutoText" string in the Edit Categories window
Change-Id: I483fa998d140c8458948fe19c5338e7af0d32527
Reviewed-on: https://gerrit.libreoffice.org/41234
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 401d4901859b..a3db641950c8 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -94,6 +94,9 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent,
m_pPathLB->Enable();
const size_t nCount = pHdl->GetGroupCnt();
+/* tdf#111870 "My AutoText" comes from mytexts.bau but should be translated
+ here as well, see also SwGlossaryDlg::Init */
+const OUString sMyAutoTextEnglish("My AutoText");
for( size_t i = 0; i < nCount; ++i)
{
OUString sTitle;
@@ -102,9 +105,12 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window *
pParent,
continue;
GlosBibUserData* pData = new GlosBibUserData;
pData->sGroupName = sGroup;
-pData->sGroupTitle = sTitle;
+if ( sTitle == sMyAutoTextEnglish )
+pData->sGroupTitle = SwResId(STR_MY_AUTOTEXT);
+else
+pData->sGroupTitle = sTitle;
pData->sPath = m_pPathLB->GetEntry(sGroup.getToken(1,
GLOS_DELIM).toInt32());
-SvTreeListEntry* pEntry = m_pGroupTLB->InsertEntry(sTitle + "\t" +
pData->sPath);
+SvTreeListEntry* pEntry = m_pGroupTLB->InsertEntry(pData->sGroupTitle
+ "\t" + pData->sPath);
pEntry->SetUserData(pData);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa sd/source
sd/qa/unit/data/pptx/tdf108926.ppt |binary
sd/qa/unit/import-tests.cxx| 19 ++
sd/source/filter/ppt/pptin.cxx | 324 ++---
3 files changed, 179 insertions(+), 164 deletions(-)
New commits:
commit b766cab621690a3aaf4e10fcf925ebab1c1925b8
Author: Tamás Zolnai
Date: Thu Aug 24 14:29:00 2017 +0200
tdf#108926: Notes placeholder text boxes not shown in PPTs
Regression from:
acb2943c8125f4ceed74f35f31776929dedeb8d8
Call this placeholder related code not only for
normal slide pages.
Change-Id: Iae185ac7e5d2505554692045516cc51dbdcd735b
Reviewed-on: https://gerrit.libreoffice.org/41517
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/sd/qa/unit/data/pptx/tdf108926.ppt
b/sd/qa/unit/data/pptx/tdf108926.ppt
new file mode 100755
index ..c8455e226e1b
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf108926.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 7546689852a5..f9177c6493d3 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -171,6 +171,7 @@ public:
void testSmartArtRotation();
void testTdf109223();
void testTdf109187();
+void testTdf108926();
bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber,
std::vector& rExpected);
void testPatternImport();
@@ -250,6 +251,7 @@ public:
CPPUNIT_TEST(testSmartArtRotation);
CPPUNIT_TEST(testTdf109223);
CPPUNIT_TEST(testTdf109187);
+CPPUNIT_TEST(testTdf108926);
CPPUNIT_TEST_SUITE_END();
};
@@ -2431,6 +2433,23 @@ void SdImportTest::testTdf109187()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf108926()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf108926.ppt"), PPT);
+uno::Reference< presentation::XPresentationPage > xPage (getPage(0,
xDocShRef), uno::UNO_QUERY_THROW);
+uno::Reference< drawing::XDrawPage > xNotesPage (xPage->getNotesPage(),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), xNotesPage->getCount());
+
+// Second object should be imported as an empty presentation shape
+uno::Reference< beans::XPropertySet >
xPresentationShape(xNotesPage->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPresentationShape.is());
+bool bIsEmptyPresObject = false;
+xPresentationShape->getPropertyValue( "IsEmptyPresentationObject" ) >>=
bIsEmptyPresObject;
+CPPUNIT_ASSERT(bIsEmptyPresObject);
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 7bec40a94c6c..ce06ae52a268 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2355,215 +2355,211 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
{
sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId;
PptPlaceholder nPlaceholderId = pPlaceHolder->nPlaceholderId;
-
-if ( eAktPageKind == PPT_SLIDEPAGE )
+PresObjKind ePresObjKind = PRESOBJ_NONE;
+boolbEmptyPresObj = true;
+boolbVertical = false;
+if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || (
pTextObj->GetShapeType() == mso_sptTextBox ) )
{
-PresObjKind ePresObjKind = PRESOBJ_NONE;
-boolbEmptyPresObj = true;
-boolbVertical = false;
-if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || (
pTextObj->GetShapeType() == mso_sptTextBox ) )
+//if a placeholder with some custom attribute,the pTextObj
will keep those attr,whose text size is zero,
+//so sdPage should renew a PresObj to process placeholder.
+bEmptyPresObj = ( pTextObj->Count() == 0 ) || (
pTextObj->Count() == 1 && pTextObj->First()->GetTextSize() == 0 );
+switch ( nPlaceholderId )
{
-//if a placeholder with some custom attribute,the
pTextObj will keep those attr,whose text size is zero,
-//so sdPage should renew a PresObj to process
placeholder.
-bEmptyPresObj = ( pTextObj->Count() == 0 ) || (
pTextObj->Count() == 1 && pTextObj->First()->GetTextSize() == 0 );
-switch ( nPlaceholderId )
+case PptPlaceholder::NOTESBODY :
ePresObjKind = PRESOBJ_NOTES; break;
+case PptPlaceholder::VERTICALTEXTTITLE :
+bVertical = true;
+SAL_FALLTHROUGH;
+case PptPlaceholder::TITLE :
ePresObjKind = PRESOBJ_TITLE; break;
+case PptPlaceho
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |1 - 1 file changed, 1 deletion(-) New commits: commit 04e719efbdb551d7c72fd0cc690f76c96bb66960 Author: Yousuf Philips Date: Tue Jun 20 18:32:48 2017 +0400 tdf#91781 Removal of Format > Columns Columns tab is available in Format > Page and in Format > Section > Options which makes this menu entry redundant Change-Id: Ia637b7fe5c95ba075bad921cacb9d2e41e159cb8 Reviewed-on: https://gerrit.libreoffice.org/39017 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 83a52c0ec1fb..ce25da98b5a2 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -453,7 +453,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-5.4.1.2'
Tag 'libreoffice-5.4.1.2' created by Andras Timar at 2017-08-24 13:28 + libreoffice-5.4.1.2 Changes since libreoffice-5.4.0.2-13: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/diagram/diagram.cxx|7 +
oox/source/drawingml/diagram/diagram.hxx|5 +
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 71 +++-
oox/source/drawingml/diagram/diagramlayoutatoms.hxx |6 +
sd/qa/unit/data/pptx/smartart-dir.pptx |binary
sd/qa/unit/data/pptx/smartart-maxdepth.pptx |binary
sd/qa/unit/import-tests.cxx | 31
7 files changed, 102 insertions(+), 18 deletions(-)
New commits:
commit f6850953dfd0ff0847e5a24bf921456a12ae47e4
Author: Grzegorz Araminowicz
Date: Wed Aug 23 12:23:58 2017 +0200
SmartArt: implement dir and maxDepth if node functions
Change-Id: I4ef05b5bab1188cf349d1c7f5bbc9022bc79b21c
Reviewed-on: https://gerrit.libreoffice.org/41452
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 2f33d9a79002..e0a8256e997d 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -65,8 +65,9 @@ void Point::dump() const
} // dgm namespace
-DiagramData::DiagramData()
-: mpFillProperties( new FillProperties )
+DiagramData::DiagramData() :
+mpFillProperties( new FillProperties ),
+mnMaxDepth(0)
{
}
@@ -298,6 +299,8 @@ void Diagram::build( )
const sal_Int32 nDepth=calcDepth(aPresOfNodeIterCalcLevel->first,
getData()->getConnections());
aPresOfNodeIterCalcLevel->second = nDepth != 0 ? nDepth : -1;
+if (nDepth > getData()->getMaxDepth())
+getData()->setMaxDepth(nDepth);
++aPresOfNodeIterCalcLevel;
}
diff --git a/oox/source/drawingml/diagram/diagram.hxx
b/oox/source/drawingml/diagram/diagram.hxx
index f31757f6ad91..3604d2607344 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -182,6 +182,10 @@ public:
::std::vector &getExtDrawings()
{ return maExtDrawings; }
const dgm::Point* getRootPoint() const;
+sal_Int32 getMaxDepth() const
+{ return mnMaxDepth; }
+void setMaxDepth(sal_Int32 nDepth)
+{ mnMaxDepth = nDepth; }
void dump() const;
private:
FillPropertiesPtr mpFillProperties;
@@ -191,6 +195,7 @@ private:
PointsNameMap maPointsPresNameMap;
ConnectionNameMap maConnectionNameMap;
StringMap maPresOfNameMap;
+sal_Int32 mnMaxDepth;
};
typedef std::shared_ptr< DiagramData > DiagramDataPtr;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 7bfe4996edef..791381ccda87 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -29,7 +29,6 @@
#include "drawingml/textparagraph.hxx"
#include "drawingml/textrun.hxx"
#include "drawingml/customshapeproperties.hxx"
-#include "layoutnodecontext.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -63,17 +62,17 @@ ConditionAttr::ConditionAttr()
: mnFunc( 0 )
, mnArg( 0 )
, mnOp( 0 )
+, mnVal( 0 )
{
-
}
void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >&
xAttr )
{
mnFunc = xAttr->getOptionalValueToken( XML_func, 0 );
-// mnArg will be -1 for "none" or any other unknown value
-mnArg = LayoutNodeContext::tagToVarIdx( xAttr->getOptionalValueToken(
XML_arg, XML_none ) );
+mnArg = xAttr->getOptionalValueToken( XML_arg, XML_none );
mnOp = xAttr->getOptionalValueToken( XML_op, 0 );
msVal = xAttr->getOptionalValue( XML_val );
+mnVal = xAttr->getOptionalValueToken( XML_val, 0 );
}
void LayoutAtom::dump(int level)
@@ -123,15 +122,36 @@ bool ConditionAtom::compareResult(sal_Int32 nOperator,
sal_Int32 nFirst, sal_Int
}
}
-sal_Int32 ConditionAtom::getNodeCount() const
+bool ConditionAtom::compareResult(sal_Int32 nOperator, const OUString& sFirst,
const OUString& sSecond)
+{
+switch (nOperator)
+{
+case XML_equ: return sFirst == sSecond;
+case XML_neq: return sFirst != sSecond;
+default:
+SAL_WARN("oox.drawingml", "unsupported operator: " << nOperator);
+return false;
+}
+}
+
+const dgm::Point* ConditionAtom::getPresNode() const
{
-sal_Int32 nCount = 0;
const DiagramData::PointsNameMap& rPoints =
mrLayoutNode.getDiagram().getData()->getPointsPresNameMap();
DiagramData::PointsNameMap::const_iterator aDataNode =
rPoints.find(mrLayoutNode.getName());
if (aDataNode != rPoints.end())
{
-SAL_WARN_IF(aDataNode->second.size() > 1, "oox.drawingml", "multiple
nodes found; calculating cnt for first one");
-const dgm::Point* pPoint = aDataNode->second.front();
+SAL_WARN_IF(aDataNode->second.size() > 1, "oox.drawingml", "multiple
nodes
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/arealink.hxx |2 +-
sc/inc/datamapper.hxx|2 +-
sc/inc/externalrefmgr.hxx|6 +++---
sc/inc/tablink.hxx |2 +-
sc/source/ui/cctrl/checklistmenu.cxx |2 +-
sc/source/ui/condformat/colorformat.cxx |4 ++--
sc/source/ui/condformat/condformatdlgentry.cxx |4 ++--
sc/source/ui/dataprovider/dataprovider.cxx |2 +-
sc/source/ui/dataprovider/datatransformation.cxx |2 +-
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 10 +-
sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |4 ++--
sc/source/ui/dbgui/validate.cxx |6 +++---
sc/source/ui/docshell/arealink.cxx |2 +-
sc/source/ui/docshell/dbdocfun.cxx |2 +-
sc/source/ui/docshell/dbdocimp.cxx |2 +-
sc/source/ui/docshell/docfunc.cxx|4 ++--
sc/source/ui/docshell/docsh.cxx |2 +-
sc/source/ui/docshell/docsh4.cxx |2 +-
sc/source/ui/docshell/editable.cxx | 16
sc/source/ui/docshell/externalrefmgr.cxx | 14 +++---
sc/source/ui/docshell/impex.cxx |4 ++--
sc/source/ui/docshell/tablink.cxx|2 +-
sc/source/ui/drawfunc/drawsh.cxx |2 +-
sc/source/ui/drawfunc/drawsh5.cxx|6 +++---
sc/source/ui/drawfunc/drtxtob.cxx|2 +-
sc/source/ui/drawfunc/drtxtob2.cxx |2 +-
sc/source/ui/drawfunc/fuconrec.cxx |4 ++--
sc/source/ui/drawfunc/fuconstr.cxx |2 +-
sc/source/ui/drawfunc/fudraw.cxx |4 ++--
sc/source/ui/drawfunc/fuins1.cxx |6 +++---
sc/source/ui/drawfunc/fuins2.cxx |2 +-
sc/source/ui/drawfunc/fupoor.cxx |2 +-
sc/source/ui/drawfunc/fusel.cxx |2 +-
sc/source/ui/drawfunc/fusel2.cxx |2 +-
sc/source/ui/drawfunc/futext.cxx |2 +-
sc/source/ui/inc/PivotLayoutDialog.hxx |8
sc/source/ui/inc/PivotLayoutTreeListBase.hxx |4 ++--
sc/source/ui/inc/checklistmenu.hxx |2 +-
sc/source/ui/inc/datatransformation.hxx |2 +-
sc/source/ui/inc/dbdocfun.hxx|4 ++--
sc/source/ui/inc/docsh.hxx |2 +-
sc/source/ui/inc/drawsh.hxx |6 +++---
sc/source/ui/inc/drtxtob.hxx |4 ++--
sc/source/ui/inc/editable.hxx| 16
sc/source/ui/inc/fuconrec.hxx|2 +-
sc/source/ui/inc/fuconstr.hxx|2 +-
sc/source/ui/inc/fudraw.hxx |2 +-
sc/source/ui/inc/fuinsert.hxx|4 ++--
sc/source/ui/inc/fupoor.hxx |2 +-
sc/source/ui/inc/fusel.hxx |4 ++--
sc/source/ui/inc/validate.hxx| 14 +++---
51 files changed, 106 insertions(+), 106 deletions(-)
New commits:
commit c137c2a46cd2276938d572c97fb111b9aa31cdfd
Author: Noel Grandin
Date: Thu Aug 24 12:24:44 2017 +0200
loplugin:constparam in sc part5
Change-Id: Iba249d4d8f7cc686941106983031bae53c7528e1
Reviewed-on: https://gerrit.libreoffice.org/41510
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 69b6b5a8d40f..5391d320ce09 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -42,7 +42,7 @@ private:
boolbAddUndo;
boolbInCreate;
boolbDoInsert; // is set to FALSE for first update
-static bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const
OUString& rAreaName );
+static bool FindExtRange( ScRange& rRange, const ScDocument* pSrcDoc,
const OUString& rAreaName );
public:
ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx
index 55390fc5a39b..f872f50143b8 100644
--- a/sc/inc/datamapper.hxx
+++ b/sc/inc/datamapper.hxx
@@ -85,7 +85,7 @@ public:
const OUString& getID() const;
double getUpdateFrequency() const;
OUString getDBName() const;
-void setDBData(ScDBData* pDBData);
+void setDBData(const ScDBData* pDBData);
void refresh(ScDocument* pDoc, bool bDeterministic = false);
};
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 5a63a0030797..30bc8136b034 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -398,7 +398,7 @@ public:
class SC_DLLPUBLIC ApiGuard
{
public:
-ApiGuard(ScDocument* pDoc);
+ApiGuard(const ScDocument* pDoc);
~ApiGuard();
private:
ScExternalRefManager* m
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/xmlnumfi.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 9fe857b7bd126ff4856fc4689d375881653b97a2
Author: Michael Stahl
Date: Thu Aug 24 13:56:35 2017 +0200
tdf#111934 xmloff: ODF import: self-referential conditional style crash
It's invalid input and also causes stack overflow.
Change-Id: Ie0b9dcaefcfcf254326151f345f4802ed66b994d
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 25d54ecf4252..6a3d997f8fe5 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1659,6 +1659,11 @@ sal_Int32
SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter)
{
SvXMLNumFormatContext* pStyle = const_cast(
static_cast(pStyles->FindStyleChildContext(
XML_STYLE_FAMILY_DATA_STYLE, aMyConditions[i].sMapName)));
+if (this == pStyle)
+{
+SAL_INFO("xmloff.style", "invalid style:map references containing
style");
+pStyle = nullptr;
+}
if (pStyle)
{
if (pStyle->PrivateGetKey() > -1) // don't reset pStyle's
bRemoveAfterUse flag
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/rtfexport/rtfexport3.cxx |4 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx |2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 49877dc91b2f91baa656facd462ac1b1e832f182
Author: Justin Luth
Date: Tue Jul 25 19:55:14 2017 -0400
sw:rtf - timely export of footnote char properties
related to tdf#82173 and tdf#108949.
Write the footnote character properties now - otherwise they will
affect text incorrectly later on.
Change-Id: I33af1586a51f9028ef5b0d646e4ba3d746c77a2c
Reviewed-on: https://gerrit.libreoffice.org/40435
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 35d7fc9861ec..fbf63740f444 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -33,10 +33,10 @@ DECLARE_RTFEXPORT_TEST(testTdf108949,
"tdf108949_footnoteCharFormat.odt")
uno::Reference xFootnoteText;
xFootnotes->getByIndex(0) >>= xFootnoteText;
// This was green (0x00A800), the character property of the footnote
character, not the footnote text
-//CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00),
getProperty(getRun(getParagraphOfText(1, xFootnoteText),1),
"CharColor"));
+CPPUNIT_ASSERT_MESSAGE ("Footnote Text color",sal_Int32(0x00) >=
getProperty(getRun(getParagraphOfText(1, xFootnoteText),1),
"CharColor"));
}
-DECLARE_RTFIMPORT_TEST(testTdf108949_footnote, "tdf108949_footnote.rtf")
+DECLARE_RTFEXPORT_TEST(testTdf108949_footnote, "tdf108949_footnote.rtf")
{
CPPUNIT_ASSERT_EQUAL_MESSAGE("Paragraph Numbering style", OUString(),
getProperty(getParagraph(2), "NumberingStyleName"));
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5a1cd9252921..acb9385ebc6b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2657,6 +2657,8 @@ void RtfAttributeOutput::TextFootnote_Impl(const
SwFormatFootnote& rFootnote)
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_SUPER " ");
+EndRunProperties(nullptr);
+m_aRun->append(' ');
WriteTextFootnoteNumStr(rFootnote);
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_FOOTNOTE);
if (rFootnote.IsEndNote() || m_rExport.m_pDoc->GetFootnoteInfo().ePos ==
FTNPOS_CHAPTER)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/source
vcl/Library_vcl.mk|8 vcl/source/gdi/pdfwriter_impl.cxx | 14 -- 2 files changed, 22 deletions(-) New commits: commit b23cd7ea0607ea1c0ec2022e80349d96368e3923 Author: Miklos Vajna Date: Thu Aug 24 09:29:03 2017 +0200 vcl PDF export: remove no longer direct NSS dependency The relevant code has been moved to svl. Change-Id: Id2b77c797745af21d3d5f954357a02d54fb67908 Reviewed-on: https://gerrit.libreoffice.org/41498 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 00cbf3b6a23e..f6eaae2d4e13 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -63,14 +63,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \ )) -ifeq ($(TLS),NSS) -$(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter-out IOS WNT,$(OS)), \ - nss3 \ - plc4) \ -)) -endif - $(eval $(call gb_Library_use_libraries,vcl,\ $(call gb_Helper_optional,BREAKPAD, \ crashreport) \ diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 63d9848e2a22..9e3db7068a25 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -85,20 +85,6 @@ #include "pdfwriter_impl.hxx" -#if HAVE_FEATURE_NSS && !defined(_WIN32) -// NSS headers for PDF signing -#include "nss.h" -#include "cert.h" -#include "hasht.h" -#include "secerr.h" -#include "sechash.h" -#include "cms.h" -#include "cmst.h" - -// We use curl for RFC3161 time stamp requests -#include -#endif - #ifdef _WIN32 // WinCrypt headers for PDF signing // Note: this uses Windows 7 APIs and requires the relevant data types ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 30935cf8adf8747b46ea485ba4a320b542a4f7a5 Author: Stephan Bergmann Date: Thu Aug 24 14:34:39 2017 +0200 Explicitly specify -finput-charset=UTF-8 for GCC/Clang ...after 9a7d2d72cef7ff14a020c1024fbff8c00e4e4aff "tell msvc our source code is written using utf-8" did the equivalent for MSVC. That should cause the C++ string literal u8"Ãa" (in vcl/qa/cppunit/mnemonic.cxx) introduced with that commit to reliably be interpreted as intended by all our toolchains. Change-Id: Ibbda8588a3ca66d1c2764f70aa999fad243f1bb1 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 97a2538b1895..793e5d34f656 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -55,6 +55,7 @@ gb_CFLAGS_COMMON := \ -Wstrict-prototypes \ -Wundef \ -Wunused-macros \ + -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ -pipe \ @@ -67,6 +68,7 @@ gb_CXXFLAGS_COMMON := \ -Wextra \ -Wundef \ -Wunused-macros \ + -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ -pipe \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uiconfiguration/CommandImageResolver.cxx | 15
++---
framework/source/uiconfiguration/CommandImageResolver.hxx |3 +
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 16
+-
3 files changed, 9 insertions(+), 25 deletions(-)
New commits:
commit f9acc8649d4a31ddd84832124e0413d4f1fa1710
Author: Noel Grandin
Date: Wed Aug 23 15:15:20 2017 +0200
loplugin:useuniqueptr in framework
Change-Id: I89bcfaa605251912bd1f979b38f12e983dcaf76e
Reviewed-on: https://gerrit.libreoffice.org/41512
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uiconfiguration/CommandImageResolver.cxx
b/framework/source/uiconfiguration/CommandImageResolver.cxx
index 98aec12e3b4c..12d902d4bfd5 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.cxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.cxx
@@ -64,14 +64,10 @@ OUString lclConvertToCanonicalName(const OUString&
rFileName)
CommandImageResolver::CommandImageResolver()
{
-for (ImageList*& rp : m_pImageList)
-rp = nullptr;
}
CommandImageResolver::~CommandImageResolver()
{
-for (ImageList* p : m_pImageList)
-delete p;
}
bool CommandImageResolver::registerCommands(Sequence&
aCommandSequence)
@@ -129,20 +125,17 @@ ImageList* CommandImageResolver::getImageList(ImageType
nImageType)
if (sIconTheme != m_sIconTheme)
{
m_sIconTheme = sIconTheme;
-for (ImageList*& rp : m_pImageList)
-{
-delete rp;
-rp = nullptr;
-}
+for (auto& rp : m_pImageList)
+rp.reset();
}
if (!m_pImageList[nImageType])
{
OUString sIconPath =
OUString::createFromAscii(ImageType_Prefixes[nImageType]);
-m_pImageList[nImageType] = new ImageList(m_aImageNameVector,
sIconPath);
+m_pImageList[nImageType].reset( new ImageList(m_aImageNameVector,
sIconPath) );
}
-return m_pImageList[nImageType];
+return m_pImageList[nImageType].get();
}
Image CommandImageResolver::getImageFromCommandURL(ImageType nImageType, const
OUString& rCommandURL)
diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx
b/framework/source/uiconfiguration/CommandImageResolver.hxx
index d7788e4e49bf..8d5a3c9ef309 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.hxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.hxx
@@ -18,6 +18,7 @@
#include "ImageList.hxx"
+#include
#include
#include
@@ -33,7 +34,7 @@ private:
std::vector m_aImageCommandNameVector;
std::vector m_aImageNameVector;
-o3tl::enumarray m_pImageList;
+o3tl::enumarray> m_pImageList;
OUString m_sIconTheme;
ImageList* getImageList(ImageType nImageType);
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index aa94300e6154..96299c2bd83b 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace com::sun::star::uno;
@@ -85,8 +86,6 @@ public:
const css::uno::Reference< css::uno::XComponentContext >&
xServiceManager,
const css::uno::Sequence< css::uno::Any >& aArguments);
-virtual ~ModuleUIConfigurationManager() override;
-
virtual OUString SAL_CALL getImplementationName() override
{
return
OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager");
@@ -201,7 +200,7 @@ private:
voidimpl_reloadElementTypeData( UIElementType&
rUserElementType, UIElementType const & rDefaultElementType,
ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer&
rReplaceNotifyContainer );
UIElementTypesVector
m_aUIElements[LAYER_COUNT];
-PresetHandler*
m_pStorageHandler[css::ui::UIElementType::COUNT];
+std::unique_ptr
m_pStorageHandler[css::ui::UIElementType::COUNT];
css::uno::Reference< css::embed::XStorage >
m_xDefaultConfigStorage;
css::uno::Reference< css::embed::XStorage >
m_xUserConfigStorage;
bool m_bReadOnly;
@@ -854,9 +853,6 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
, m_xContext( xContext )
, m_aListenerContainer( m_mutex )
{
-for (PresetHandler* & i : m_pStorageHandler)
-i = nullptr;
-
// Make sure we have a default initialized entry for every layer and user
interface element type!
// The following code depends on this!
m_aUIElements[LAYER_DEFAULT].resize( css::ui::UIElementType::COUNT );
@@ -888,7 +884,7 @@ ModuleUIConfig
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 17 --
oox/source/drawingml/diagram/layoutnodecontext.cxx | 49
oox/source/drawingml/diagram/layoutnodecontext.hxx |2
3 files changed, 2 insertions(+), 66 deletions(-)
New commits:
commit 96b07db82b4a7834246ae8acc395cd2cb355630b
Author: Grzegorz Araminowicz
Date: Wed Aug 23 14:26:03 2017 +0200
SmartArt: get rid of tagToVarIdx() and change VarMap to std::map
it was unnecessarily complicated
Change-Id: I5ad4b4a6a401ffe6a67a471fa355ade9c1514ef1
Reviewed-on: https://gerrit.libreoffice.org/41458
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index a7ff21759174..cb7c84e9e532 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -22,9 +22,7 @@
#include
#include
-#include
-#include
#include
#include "oox/drawingml/shape.hxx"
@@ -207,20 +205,7 @@ class LayoutNode
: public LayoutAtom
{
public:
-enum {
-VAR_animLvl = 0,
-VAR_animOne,
-VAR_bulletEnabled,
-VAR_chMax,
-VAR_chPref,
-VAR_dir,
-VAR_hierBranch,
-VAR_orgChart,
-VAR_resizeHandles
-};
-// we know that the array is of fixed size
-// the use of Any allow having empty values
-typedef std::array VarMap;
+typedef std::map VarMap;
LayoutNode(const Diagram& rDgm) : LayoutAtom(*this), mrDgm(rDgm),
mnChildOrder(0) {}
const Diagram& getDiagram() const
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx
b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 77a3fa3b8ed8..6fc38a5608a0 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -160,12 +160,7 @@ public:
virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const
AttributeList& rAttribs ) override
{
-sal_Int32 nIdx = LayoutNodeContext::tagToVarIdx( getBaseToken(
aElement ) );
-if( nIdx != -1 )
-{
-mVariables[ nIdx ] <<= rAttribs.getString( XML_val ).get();
-}
-
+mVariables[ getBaseToken(aElement) ] = rAttribs.getString( XML_val
).get();
return this;
}
private:
@@ -187,48 +182,6 @@ LayoutNodeContext::~LayoutNodeContext()
{
}
-/** convert the XML tag to a variable index in the array
- * @param aTag the tag, without namespace
- * @return the variable index. -1 is an error
- */
-sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag )
-{
-sal_Int32 nIdx = -1;
-switch( aTag )
-{
-case DGM_TOKEN( animLvl ):
-nIdx = LayoutNode::VAR_animLvl;
-break;
-case DGM_TOKEN( animOne ):
-nIdx = LayoutNode::VAR_animOne;
-break;
-case DGM_TOKEN( bulletEnabled ):
-nIdx = LayoutNode::VAR_bulletEnabled;
-break;
-case DGM_TOKEN( chMax ):
-nIdx = LayoutNode::VAR_chMax;
-break;
-case DGM_TOKEN( chPref ):
-nIdx = LayoutNode::VAR_chPref;
-break;
-case DGM_TOKEN( dir ):
-nIdx = LayoutNode::VAR_dir;
-break;
-case DGM_TOKEN( hierBranch ):
-nIdx = LayoutNode::VAR_hierBranch;
-break;
-case DGM_TOKEN( orgChart ):
-nIdx = LayoutNode::VAR_orgChart;
-break;
-case DGM_TOKEN( resizeHandles ):
-nIdx = LayoutNode::VAR_resizeHandles;
-break;
-default:
-break;
-}
-return nIdx;
-}
-
ContextHandlerRef
LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
const AttributeList& rAttribs )
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx
b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index 85f73f029f24..335c86fa13c9 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -33,8 +33,6 @@ public:
virtual ~LayoutNodeContext() override;
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32
Element, const ::oox::AttributeList& rAttribs ) override;
-
-static ::sal_Int32 tagToVarIdx( ::sal_Int32 aTag );
private:
LayoutAtomPtr mpNode;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/component/imgprod.cxx | 27 +--
forms/source/component/imgprod.hxx |7 +--
2 files changed, 14 insertions(+), 20 deletions(-)
New commits:
commit 0d46a29b2144eb840935e6bb040ee016d74b4d99
Author: Noel Grandin
Date: Wed Aug 23 15:05:45 2017 +0200
loplugin:useuniqueptr in forms
Change-Id: I656ef57a322a4d04d0a39ae8f9e1df6fff054a58
Reviewed-on: https://gerrit.libreoffice.org/41511
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/forms/source/component/imgprod.cxx
b/forms/source/component/imgprod.cxx
index 1f7eb6045500..154b4114800c 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -161,16 +161,11 @@ ImageProducer::ImageProducer()
, mnTransIndex(0)
, mbConsInit(false)
{
-mpGraphic = new Graphic;
+mpGraphic.reset( new Graphic );
}
ImageProducer::~ImageProducer()
{
-delete mpGraphic;
-mpGraphic = nullptr;
-
-delete mpStm;
-mpStm = nullptr;
}
@@ -206,19 +201,18 @@ void ImageProducer::SetImage( const OUString& rPath )
maURL = rPath;
mpGraphic->Clear();
mbConsInit = false;
-delete mpStm;
+mpStm.reset();
if ( ::svt::GraphicAccess::isSupportedURL( maURL ) )
{
-mpStm = ::svt::GraphicAccess::getImageStream(
::comphelper::getProcessComponentContext(), maURL );
+mpStm.reset( ::svt::GraphicAccess::getImageStream(
::comphelper::getProcessComponentContext(), maURL ) );
}
else if( !maURL.isEmpty() )
{
SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL,
StreamMode::STD_READ );
-mpStm = pIStm ? new SvStream( new ImgProdLockBytes( pIStm, true ) ) :
nullptr;
+if (pIStm)
+mpStm.reset( new SvStream( new ImgProdLockBytes( pIStm, true ) ) );
}
-else
-mpStm = nullptr;
}
@@ -228,8 +222,7 @@ void ImageProducer::SetImage( SvStream& rStm )
mpGraphic->Clear();
mbConsInit = false;
-delete mpStm;
-mpStm = new SvStream( new ImgProdLockBytes( &rStm, false ) );
+mpStm.reset( new SvStream( new ImgProdLockBytes( &rStm, false ) ) );
}
@@ -238,12 +231,10 @@ void ImageProducer::setImage( css::uno::Reference<
css::io::XInputStream > const
maURL.clear();
mpGraphic->Clear();
mbConsInit = false;
-delete mpStm;
+mpStm.reset();
if( rInputStmRef.is() )
-mpStm = new SvStream( new ImgProdLockBytes( rInputStmRef ) );
-else
-mpStm = nullptr;
+mpStm.reset( new SvStream( new ImgProdLockBytes( rInputStmRef ) ) );
}
@@ -268,7 +259,7 @@ void ImageProducer::startProduction()
if( ( mpGraphic->GetType() == GraphicType::NONE ) ||
mpGraphic->GetContext() )
{
if ( ImplImportGraphic( *mpGraphic ) )
-maDoneHdl.Call( mpGraphic );
+maDoneHdl.Call( mpGraphic.get() );
}
if( mpGraphic->GetType() != GraphicType::NONE )
diff --git a/forms/source/component/imgprod.hxx
b/forms/source/component/imgprod.hxx
index a247b2890f92..2c0fed6e2c44 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
@@ -47,8 +48,10 @@ private:
OUStringmaURL;
ConsumerList_t maConsList;
-Graphic*mpGraphic;
-SvStream* mpStm;
+std::unique_ptr
+mpGraphic;
+std::unique_ptr
+mpStm;
sal_uInt32 mnTransIndex;
boolmbConsInit;
Link maDoneHdl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/escriba/escriba-5.2.1' - 19 commits - offapi/com solenv/gbuild sw/inc sw/qa sw/source
offapi/com/sun/star/text/TextRangeContentProperties.idl |6
solenv/gbuild/platform/filter-showIncludes.awk |7
sw/inc/cmdid.h |1
sw/inc/unoprnms.hxx |1
sw/qa/extras/odfimport/data/i61225.sxw |binary
sw/qa/extras/odfimport/odfimport.cxx |8
sw/qa/extras/uiwriter/data/i95698.odt|binary
sw/qa/extras/uiwriter/data/lines-in-section-in-table.odt |binary
sw/qa/extras/uiwriter/data/paragraph-of-text-range.odt |binary
sw/qa/extras/uiwriter/data/rhbz739252-3.odt |binary
sw/qa/extras/uiwriter/data/table-in-sect.odt |binary
sw/qa/extras/uiwriter/data/tdf108524.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 126 +++
sw/source/core/inc/cellfrm.hxx |1
sw/source/core/layout/findfrm.cxx| 20 +-
sw/source/core/layout/flowfrm.cxx|5
sw/source/core/layout/sectfrm.cxx| 66 ++-
sw/source/core/layout/tabfrm.cxx | 39
sw/source/core/unocore/unocrsrhelper.cxx | 13 +
sw/source/core/unocore/unomapproperties.hxx |1
sw/source/uibase/inc/unodispatch.hxx |7
sw/source/uibase/uno/unodispatch.cxx | 10 +
22 files changed, 293 insertions(+), 18 deletions(-)
New commits:
commit 3ff777ef14f690946073aa7b48cd6953412e4db1
Author: Miklos Vajna
Date: Wed Aug 16 17:19:05 2017 +0200
i#95698 sw: fix crash on splitting in-table section containing a nested
table
Found by crashtesting, ooo95698-1.odt crashed sw layout on load. The
intended use-case is splitting section frames inside a table frame, so
can just blacklist the non-interesting table-in-section-in-table case
that causes the problem here.
Reviewed-on: https://gerrit.libreoffice.org/41224
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 802477ae75b39194442d9c01a1342d068c7b9300)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Ic47cd8c46cc71f7eaa36b03ec2c4a5df8ca8051c
diff --git a/sw/qa/extras/uiwriter/data/i95698.odt
b/sw/qa/extras/uiwriter/data/i95698.odt
new file mode 100644
index ..9fe3ec207648
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/i95698.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3d566b5df278..c23c0e825d27 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -203,6 +203,7 @@ public:
void testTdf108524();
void testTableInSection();
void testTableInNestedSection();
+void testTableInSectionInTable();
void testLinesInSectionInTable();
void testLinesMoveBackwardsInSectionInTable();
@@ -312,6 +313,7 @@ public:
CPPUNIT_TEST(testTableInSection);
CPPUNIT_TEST(testTableInNestedSection);
CPPUNIT_TEST(testLinesInSectionInTable);
+CPPUNIT_TEST(testTableInSectionInTable);
CPPUNIT_TEST(testLinesMoveBackwardsInSectionInTable);
CPPUNIT_TEST_SUITE_END();
@@ -3820,6 +3822,14 @@ void SwUiWriterTest::testTableInNestedSection()
assertXPath(pXmlDoc, "//page[2]//section/tab", 1);
}
+void SwUiWriterTest::testTableInSectionInTable()
+{
+// The document has a table, containing a section, containing a nested
+// table.
+// This crashed the layout.
+createDoc("i95698.odt");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 45282d886929..0c6db983d50d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -916,9 +916,21 @@ static bool lcl_FindSectionsInRow( const SwRowFrame& rRow )
if (const SwFrame* pSectionLower =
pTmpFrame->GetLower())
{
if (!pSectionLower->IsColumnFrame())
+{
// Section has a single column only, try to
// split that.
bRet = false;
+
+for (const SwFrame* pFrame = pSectionLower;
pFrame; pFrame = pFrame->GetNext())
+{
+if (pFrame->IsTabFrame())
+{
+// Section contains a table, no split
in that case.
+bRet = true;
+break;
+}
+}
+}
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/core/tool/scmatrix.cxx | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 9bedb5caae9cb4b535b9fc370480c1b4f5cd70f6
Author: Eike Rathke
Date: Mon Aug 21 15:49:41 2017 +0200
Resolves: tdf#111943 really really limit the match, tdf#108292 follow-up
getRemainingCount() could deliver a wrapped around overflow value if mnIndex
was already greater than the end index, which could happen if when/for
non-matching larger block sizes were added, and if then a match was found
behind those blocks a non-requested/unexpected index was returned, which in
turn led to the assert() being hit in ScInterpreter::CalculateLookup(). In
non-debug could result in an invalid block position access.
This happened with the bug case document of tdf#111943 which in master can
be
loaded.
Also, the start and end index are not dynamic and don't have to be
recalculated
each time, so make them const; column argument values are unused after.
(cherry picked from commit 25b3806ac509006573e669acc33643af3bd77380)
Change-Id: Ic294cade4e8e7828bee394e5ade61d7127be6bbb
Reviewed-on: https://gerrit.libreoffice.org/41396
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 659e22fa064a..0a3dca7cb12d 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1267,24 +1267,25 @@ template
class WalkAndMatchElements : public
std::unary_function
{
Type maMatchValue;
-MatrixImplType::size_pair_type maSize;
-size_t mnCol1;
-size_t mnCol2;
+const size_t mnStartIndex;
+const size_t mnStopIndex;
size_t mnResult;
size_t mnIndex;
public:
WalkAndMatchElements(Type aMatchValue, const
MatrixImplType::size_pair_type& aSize, size_t nCol1, size_t nCol2) :
maMatchValue(aMatchValue),
-maSize(aSize),
-mnCol1(nCol1),
-mnCol2(nCol2),
+mnStartIndex( nCol1 * aSize.row ),
+mnStopIndex( (nCol2 + 1) * aSize.row ),
mnResult(ResultNotSet),
mnIndex(0) {}
size_t getMatching() const { return mnResult; }
-size_t getRemainingCount() const { return ((mnCol2 + 1) * maSize.row) -
mnIndex; }
+size_t getRemainingCount() const
+{
+return mnIndex < mnStopIndex ? mnStopIndex - mnIndex : 0;
+}
size_t compare(const MatrixImplType::element_block_node_type& node) const;
@@ -1295,7 +1296,7 @@ public:
return;
// limit lookup to the requested columns
-if ((mnCol1 * maSize.row) <= mnIndex && getRemainingCount() > 0)
+if (mnStartIndex <= mnIndex && getRemainingCount() > 0)
{
mnResult = compare(node);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-1' - sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx | 67 +-
sc/source/filter/xml/xmlexprt.cxx |8 +++-
2 files changed, 73 insertions(+), 2 deletions(-)
New commits:
commit ebe58344ba4bf6ad7de49564ebf10940d7636176
Author: Dennis Francis
Date: Tue Aug 15 11:21:04 2017 +0530
tdf#83562: Make the EditTextObject export of automatic colors...
... use the xml token "use-window-font-color" instead of "color"
to encode a boolean value of whether an auto color is used or not.
This is because the "auto" color is 0x and cannot be
written into "color" xml field which can store only 3 byte-hexcode.
This commit also adds a unit test in subsequent_export-test.cxx
to ensure the correct export of automatic color.
Change-Id: I42aab926f31669c1423bc09b96b45c410c9732de
Reviewed-on: https://gerrit.libreoffice.org/41252
Tested-by: Jenkins
Reviewed-by: Dennis Francis
(cherry picked from commit 06d104ecda085200fb6d22e0bd6d6cb89ca4f66c)
Reviewed-on: https://gerrit.libreoffice.org/41358
Reviewed-by: Michael Stahl
(cherry picked from commit 1b4c5f66083a92f4bfc9bd20a2a5b1e863ec84c1)
Reviewed-on: https://gerrit.libreoffice.org/41467
Reviewed-by: Eike Rathke
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index fb4d496243bf..26ac932a7765 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -26,6 +26,7 @@
#include "userdat.hxx"
#include "docsh.hxx"
#include "patattr.hxx"
+#include "docpool.hxx"
#include "scitems.hxx"
#include "document.hxx"
#include "cellform.hxx"
@@ -61,6 +62,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1029,7 +1031,7 @@ void ScExportTest::testMiscRowHeightExport()
namespace {
-void setAttribute( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd, sal_uInt16 nType )
+void setAttribute( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd, sal_uInt16 nType, sal_uInt32 nColor = COL_BLACK )
{
ESelection aSel;
aSel.nStartPara = aSel.nEndPara = nPara;
@@ -1074,6 +1076,13 @@ void setAttribute( ScFieldEditEngine& rEE, sal_Int32
nPara, sal_Int32 nStart, sa
rEE.QuickSetAttribs(aItemSet, aSel);
}
break;
+case EE_CHAR_COLOR:
+{
+SvxColorItem aItem(nColor, nType);
+aItemSet.Put(aItem);
+rEE.QuickSetAttribs(aItemSet, aSel);
+}
+break;
default:
;
}
@@ -1256,6 +1265,23 @@ void ScExportTest::testRichTextExportODS()
return false;
}
+static bool isColor(const editeng::Section& rAttr, sal_uInt32 nColor)
+{
+if (rAttr.maAttributes.empty())
+return false;
+
+std::vector::const_iterator it =
rAttr.maAttributes.begin(), itEnd = rAttr.maAttributes.end();
+for (; it != itEnd; ++it)
+{
+const SfxPoolItem* p = *it;
+if (p->Which() != EE_CHAR_COLOR)
+continue;
+
+return static_cast(p)->GetValue() ==
nColor;
+}
+return false;
+}
+
bool checkB2(const EditTextObject* pText) const
{
if (!pText)
@@ -1482,6 +1508,32 @@ void ScExportTest::testRichTextExportODS()
return true;
}
+bool checkB10(const EditTextObject* pText) const
+{
+if (!pText)
+return false;
+
+if (pText->GetParagraphCount() != 1)
+return false;
+
+if (pText->GetText(0) != "BLUE AUTO")
+return false;
+
+std::vector aSecAttrs;
+pText->GetAllSections(aSecAttrs);
+if (aSecAttrs.size() != 2)
+return false;
+
+// auto color
+const editeng::Section* pAttr = &aSecAttrs[1];
+if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 5 || pAttr->mnEnd
!= 9)
+return false;
+
+if (pAttr->maAttributes.size() != 1 || !isColor(*pAttr, COL_AUTO))
+return false;
+
+return true;
+}
} aCheckFunc;
@@ -1583,6 +1635,17 @@ void ScExportTest::testRichTextExportODS()
pEditText = rDoc3.GetEditText(ScAddress(1,8,0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B9 value.",
aCheckFunc.checkB9(pEditText));
+ScPatternAttr aCellFontColor(rDoc3.GetPool());
+aCellFontColor.GetItemSet().Put(SvxColorItem(COL_BLUE,
ATTR_FONT_COLOR));
+// Set font color of B10 to blue.
+rDoc3.ApplyPattern(1, 9, 0, aCellFontColor);
+pEE->Clear();
+pEE->SetText("BLUE AUTO");
+// Set the color of the string "AUTO" to automatic color.
+setAttribute(*pEE
[Libreoffice-commits] online.git: loolwsd.xml.in wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
loolwsd.xml.in |3 +++
wsd/DocumentBroker.cpp |6 --
wsd/DocumentBroker.hpp |3 ---
wsd/LOOLWSD.cpp|2 ++
4 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit ad211ef51b1f87d8ab587d991bda253b54bb6be1
Author: Pranav Kant
Date: Thu Aug 24 16:40:39 2017 +0530
wsd: Configurable autosave and idlesave durations
But these save conditions are checked every 30 seconds only, so setting
them to less than 30 seconds wouldn't mean that save will be triggered
anytime sooner.
Change-Id: Id473a79af6a3170c72e372040460f2b7c15f150e
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index a8b67737..5097d9ac 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -16,6 +16,9 @@
4
3600
+
+30
+300
0
0
8000
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 77035837..6744b838 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -799,9 +799,11 @@ bool DocumentBroker::autoSave(const bool force)
LOG_TRC("Time since last save of docKey [" << _docKey << "] is " <<
timeSinceLastSaveMs <<
"ms and most recent activity was " << inactivityTimeMs << "ms
ago.");
+static const auto idleSaveDurationMs =
LOOLWSD::getConfigValue("per_document.idlesave_duration_secs", 30) * 1000;
+static const auto autoSaveDurationMs =
LOOLWSD::getConfigValue("per_document.autosave_duration_secs", 300) * 1000;
// Either we've been idle long enough, or it's auto-save time.
-if (inactivityTimeMs >= IdleSaveDurationMs ||
-timeSinceLastSaveMs >= AutoSaveDurationMs)
+if (inactivityTimeMs >= idleSaveDurationMs ||
+timeSinceLastSaveMs >= autoSaveDurationMs)
{
LOG_TRC("Sending timed save command for [" << _docKey << "].");
sent = sendUnoSave(savingSessionId);
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index b08fd2e9..ecaaa30a 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -435,9 +435,6 @@ private:
/// Unique DocBroker ID for tracing and debugging.
static std::atomic DocBrokerId;
-
-static constexpr auto IdleSaveDurationMs = 30 * 1000;
-static constexpr auto AutoSaveDurationMs = 300 * 1000;
};
#endif
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 37e56dd2..dc389dcf 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -633,6 +633,8 @@ void LOOLWSD::initialize(Application& self)
{ "num_prespawn_children", "1" },
{ "per_document.max_concurrency", "4" },
{ "per_document.idle_timeout_secs", "3600" },
+{ "per_document.idlesave_duration_secs", "30" },
+{ "per_document.autosave_duration_secs", "300" },
{ "per_document.limit_virt_mem_mb", "0" },
{ "per_document.limit_stack_mem_kb", "8000" },
{ "per_document.limit_file_size_mb", "50" },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/databasecontext.cxx | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit a05e5adc62c74b42262fce9a309c1bc6c685893c
Author: Michael Stahl
Date: Thu Aug 24 12:41:24 2017 +0200
dbaccess: avoid deadlock in ODatabaseContext::registerObject()
Limit the scope of m_aMutex lock to what is necessary.
As observed by Jan-Marek Glogowski:
[Switching to thread 198 (Thread 0x2aab44e5b700 (LWP 46847))]
3 osl_acquireMutex(oslMutexImpl*) (pMutex=0x1e59d10) at
sal/osl/unx/mutex.cxx:97
4 osl::Mutex::acquire() (this=0x1ebbe28) at include/osl/mutex.hxx:56
5 osl::Guard::Guard(osl::Mutex&, bool) (this=0x2aab44e56198,
rT=..., bAquire=true) at include/osl/mutex.hxx:135
6 dbaccess::ODatabaseContext::getElementNames() (this=0x1ebbd90) at
dbaccess/source/core/dataaccess/databasecontext.cxx:661
7 non-virtual thunk to dbaccess::ODatabaseContext::getElementNames() () at
dbaccess/source/core/dataaccess/databasecontext.cxx:659
8 dbaui::SbaTableQueryBrowser::initializeTreeModel() (this=0xb174890) at
dbaccess/source/ui/browser/unodatbr.cxx:2086
9 dbaui::SbaTableQueryBrowser::impl_initialize() (this=0xb174890) at
dbaccess/source/ui/browser/unodatbr.cxx:3201
10
dbaui::OGenericUnoController::initialize(com::sun::star::uno::Sequence
const&) (this=0xb174890, aArguments=uno::Sequence of length 9 = {...}) at
dbaccess/source/ui/browser/genericcontroller.cxx:299
11
DBContentLoader::load(com::sun::star::uno::Reference
const&, rtl::OUString const&,
com::sun::star::uno::Sequence const&,
com::sun::star::uno::Reference
const&) (this=0xb1730a0, rFrame=uno::Reference to ((anonymous namespace)::Frame
*) 0xb162690, rURL=".component:DB/DataSourceBrowser", rArgs=uno::Sequence of
length 8 = {...}, rListener=uno::Reference to (framework::LoadEnvListener *)
0xb174228) at dbaccess/source/ui/browser/dbloader.cxx:270
12 framework::LoadEnv::impl_loadContent() (this=0xb16f5b8) at
framework/source/loadenv/loadenv.cxx:1077
13 framework::LoadEnv::startLoading() (this=0xb16f5b8) at
framework/source/loadenv/loadenv.cxx:372
[Switching to thread 196 (Thread 0x2aab4565f700 (LWP 42841))]
3 osl_acquireMutex(oslMutexImpl*) (pMutex=0x773cd0) at
sal/osl/unx/mutex.cxx:97
4 osl::Mutex::acquire() (this=0x77b4a8) at include/osl/mutex.hxx:56
5 comphelper::GenericSolarMutex::doAcquire(unsigned int) (this=0x77b4a0,
nLockCount=1) at comphelper/source/misc/solarmutex.cxx:61
6 comphelper::SolarMutex::acquire(unsigned int) (this=0x77b4a0,
nLockCount=1) at include/comphelper/solarmutex.hxx:74
7
osl::ClearableGuard::ClearableGuard(comphelper::SolarMutex&)
(this=0x2aab4565d478, t=...) at include/osl/mutex.hxx:170
8
osl::ResettableGuard::ResettableGuard(comphelper::SolarMutex&)
(this=0x2aab4565d478, rT=...) at include/osl/mutex.hxx:215
9 SolarMutexResettableGuard::SolarMutexResettableGuard()
(this=0x2aab4565d478) at include/vcl/svapp.hxx:1416
10
dbaccess::ModelMethodGuard::ModelMethodGuard(dbaccess::ModelDependentComponent
const&) (this=0x2aab4565d478, _component=...) at
dbaccess/source/core/dataaccess/ModelImpl.hxx:587
11 dbaccess::ODatabaseSource::getDatabaseDocument() (this=0x281d690) at
dbaccess/source/core/dataaccess/datasource.cxx:1300
12 non-virtual thunk to dbaccess::ODatabaseSource::getDatabaseDocument() ()
at dbaccess/source/core/dataaccess/datasource.cxx:1298
13 dbaccess::ODatabaseContext::registerObject(rtl::OUString const&,
com::sun::star::uno::Reference const&)
(this=0x1ebbd90, _rName="MyFactory", _rxObject=uno::Reference to
(dbaccess::ODatabaseSource *) 0x281d708) at
dbaccess/source/core/dataaccess/databasecontext.cxx:433
14 gcc3::callVirtualMethod(void*, unsigned int, void*,
_typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int,
unsigned long*, double*) (pThis=0x1ebbdf8, nVtableIndex=4, pRegisterReturn=0x0,
pReturnTypeRef=0x781090, bSimpleReturn=true, pStack=0x2aab4565d810, nStack=0,
pGPR=0x2aab4565db30, pFPR=0x2aab4565daf0) at
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:77
Change-Id: I06e91d9c4e193c97f98f29f6b73eaf01b12922c0
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index e023806270b2..4d2305a6b9cf 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -423,9 +423,6 @@ void ODatabaseContext::setTransientProperties(const
OUString& _sURL, ODatabaseMo
void ODatabaseContext::registerObject(const OUString& _rName, const Reference<
XInterface > & _rxObject)
{
-MutexGuard aGuard(m_aMutex);
-
::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
-
if ( _rName.isEmpty() )
throw IllegalArgumentException( OUString(), *this, 1 );
@@ -438,9 +435,14 @@ void ODatabaseContext::registerObject(con
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_vba.cxx |5 ++
basic/qa/vba_tests/val.vb | 94 ++
basic/qa/vba_tests/vartype.vb | 86 ++
basic/qa/vba_tests/weekday.vb | 83 +
basic/qa/vba_tests/weekdayname.vb | 86 ++
basic/qa/vba_tests/year.vb| 66 ++
6 files changed, 420 insertions(+)
New commits:
commit 74da6d5f9f875cc355776f8fa8fbff15f0316d0c
Author: ZdenÄk Crhonek
Date: Thu Aug 24 11:02:01 2017 +0200
VBA tests-add VAL,VARTYPE,WEEKDAY,WEEKDAYNAME,YEAR tests
Change-Id: I3f1803617a2bdeaab9922ebb375ec4fd67318d20
Reviewed-on: https://gerrit.libreoffice.org/41499
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 9ba9521036a5..a8d5c7c9410c 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -137,6 +137,11 @@ void VBATest::testMiscVBAFunctions()
"typename.vb",
"ubound.vb",
"ucase.vb",
+"val.vb",
+"vartype.vb",
+"weekday.vb",
+"weekdayname.vb",
+"year.vb",
#ifndef WIN32 // missing 64bit Currency marshalling.
"win32compat.vb", // windows compatibility hooks.
#endif
diff --git a/basic/qa/vba_tests/val.vb b/basic/qa/vba_tests/val.vb
new file mode 100644
index ..08f2722c3c8d
--- /dev/null
+++ b/basic/qa/vba_tests/val.vb
@@ -0,0 +1,94 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testVal()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testVal() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim TestDateTime As Date
+Dim TestStr As String
+Dim date1, date2
+testName = "Test Val function"
+On Error GoTo errorHandler
+
+date2 = 2
+date1 = Val("02/04/2010")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+date2 = 1050
+date1 = Val("1050")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+date2 = 130.75
+date1 = Val("130.75")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+date2 = 50
+date1 = Val("50 Park Lane")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+date2 = 1320
+date1 = Val("1320 then some text")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+date2 = 0
+date1 = Val("L13.5")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+date2 = 0
+date1 = Val("sometext")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+
+REMdate2 = 1
+REMdate1 = Val("1, 2")
+REMTestLog_ASSERT date1 = date2, "the return Val is: " & date1
+REMtdf#111999
+
+date2 = -1
+date1 = Val("&H")
+TestLog_ASSERT date1 = date2, "the return Val is: " & date1
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
+verify_testVal = result
+
+Exit Function
+errorHandler:
+TestLog_ASSERT (False), testName & ": hit error handler"
+End Function
+
+Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional
testComment As String)
+
+If assertion = True Then
+passCount = passCount + 1
+Else
+Dim testMsg As String
+If Not IsMissing(testId) Then
+testMsg = testMsg + " : " + testId
+End If
+If Not IsMissing(testComment) And Not (testComment = "") Then
+testMsg = testMsg + " (" + testComment + ")"
+End If
+
+result = result & Chr$(10) & " Failed: " & testMsg
+failCount = failCount + 1
+End If
+
+End Sub
+
diff --git a/basic/qa/vba_tests/vartype.vb b/basic/qa/vba_tests/vartype.vb
new file mode 100644
index ..05cfa308fe28
--- /dev/null
+++ b/basic/qa/vba_tests/vartype.vb
@@ -0,0 +1,86 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testVarType()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testVarType() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim TestDateTime As Date
+Dim TestStr As String
+Dim TestInt As Integer
+Dim TestLong As Long
+Dim TestDouble As Double
+Dim TestBoo As Boolean
+Dim date1, date2
+testName = "Test VarType function"
+On Error GoTo er
Re: tdf#109097 - mdds accelerating random lookups
Hi Dennis, On 24/08/17 11:03, Dennis Francis wrote: > As this bug report > (https://bugs.documentfoundation.org/show_bug.cgi?id=109097) suggests > it is highly desirable to improve the lookup time in multi_type_vector > (currently in worst case it takes O(N)) without position hints. Perhaps one further elaboration here is that we're working on exploring threading the calc-ulation engine (with some success) - however this requires avoiding highly granular locking - ie. that we can treat the various calc core data-structures as immutable during that process. As such the low-hanging fruit solutions of building caches / last-position-looked-up etc. as we do lookups are rather problematic. So - I'm well up for this change - assuming Kohei, and other calc guys are happy. HTH, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
tdf#109097 - mdds accelerating random lookups
Hello, As this bug report ( https://bugs.documentfoundation.org/show_bug.cgi?id=109097) suggests it is highly desirable to improve the lookup time in multi_type_vector (currently in worst case it takes O(N)) without position hints. One way to improve the situation is to store absolute position of first element of each block in the block instead of the block size member. This can improve the lookup time up to log(log(N)) using linear interpolation search or at least log(N) if we fallback to binary search after a few initial passes of linear-interpolation search. Down side of this approach is that in the worst case, insert/deletes incur O(N) cost because absolute positions stored in each block subsequent to the delete/insert block have to be changed, but this still would be way better than old cell storage case when there was no concept of blocks. Before working on any change from my side, I would love to hear everyone's thoughts on the topic first. Thanks ! Regards, Dennis ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/tdf108943.rtf | 24
sw/qa/extras/rtfimport/rtfimport.cxx| 19 +++
writerfilter/source/rtftok/rtfdispatchvalue.cxx |5 -
3 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit e6426cc1bf174a67828f3e18ab1ea70eccc44b07
Author: Miklos Vajna
Date: Wed Aug 23 09:04:43 2017 +0200
tdf#108943 RTF import: handle \tx inside a list level definition
\tx in the list level definition has a different meaning (we should map
it to the ListtabStopPosition UNO property), compared to when it's used
as a plain text property.
(cherry picked from commit 57d535302596a62be914bee49d7b1df1fc622a65)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I7b98ae3d82bbd2c4ad41d0d7f4ad50525c4d0f9a
Reviewed-on: https://gerrit.libreoffice.org/41457
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/rtfimport/data/tdf108943.rtf
b/sw/qa/extras/rtfimport/data/tdf108943.rtf
new file mode 100644
index ..478d101f4167
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108943.rtf
@@ -0,0 +1,24 @@
+{\rtf1
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2 Times New Roman;}
+}
+\noqfpromote
+{\stylesheet
+{\s25 \fi-720\li720\ri0\ls1 ParaLevel1;}
+}
+{\*\listtable
+{\list\listtemplateid-1762123600
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'00.;}
+{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \b0\i0\ulnone\fbias0
\s25\fi-720\li720\jclisttab\tx720\lin720 }
+\listid1977027487}
+}
+{\*\listoverridetable
+{\listoverride\listid1977027487\listoverridecount0\ls1}
+}
+\pard\plain \s25 \fi-720\li720\ri0\tqr\tx720\ls1
+hello
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index bf8188db99d6..f7f2e89d70a3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -235,6 +235,25 @@ DECLARE_RTFIMPORT_TEST(testFdo45187, "fdo45187.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int16(1),
xTextRangeCompare->compareRegionStarts(xAnchor0, xAnchor1));
}
+DECLARE_RTFIMPORT_TEST(testTdf108943, "tdf108943.rtf")
+{
+uno::Reference
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+uno::Reference
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+uno::Sequence aProps;
+xLevels->getByIndex(0) >>= aProps; // 1st level
+
+sal_Int32 nListtabStopPosition = 0;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+
+if (rProp.Name == "ListtabStopPosition")
+nListtabStopPosition = rProp.Value.get();
+}
+// This was 0, \tx was handled in paragraphs only (and not in list
definitions).
+CPPUNIT_ASSERT_EQUAL(static_cast(1270), nListtabStopPosition);
+}
+
DECLARE_RTFIMPORT_TEST(testFdo46662, "fdo46662.rtf")
{
uno::Reference
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum3"), uno::UNO_QUERY);
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 527d39da68db..f6a243e2fbc0 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -605,7 +605,10 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword
nKeyword, int nParam)
{
m_aStates.top().aTabAttributes.set(NS_ooxml::LN_CT_TabStop_pos,
pIntValue);
auto pValue =
std::make_shared(m_aStates.top().aTabAttributes);
-putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_ooxml::LN_CT_Tabs_tab, pValue);
+if (m_aStates.top().eDestination == Destination::LISTLEVEL)
+putNestedSprm(m_aStates.top().aTableSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_ooxml::LN_CT_Tabs_tab, pValue);
+else
+putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_ooxml::LN_CT_Tabs_tab, pValue);
m_aStates.top().aTabAttributes.clear();
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Rebuilding LO freezes on macOS
Le 23/08/2017 à 21:28, Thorsten Wagner a écrit : Hi THorsten, > (2) During building again build freezes while linking > "Library/libscfiltlo.dylib". "make" loops consuming 100% cpu on a single > core. Build has to be interrupted by killing "make" processes. > I see this occasionally, or though it tends to be during population of instdir (so towards the end of the build) and not specifically in libscfiltLO.dylib. Possibly the parallel build gets into a race condition somewhere (shrugs) and I have to kill it, clean it and restart. I remember reading somewhere a long time ago about changing the ulimit number of openable file descriptors, something like this here: https://unix.stackexchange.com/questions/108174/how-to-persist-ulimit-settings-in-macos That might help, but if you need to push past the hard limit set by Apple as default, then you need to buy AppleServer for OSX from the AppStore. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/colorscale.hxx|2 - sc/inc/formulacell.hxx |4 +- sc/inc/formularesult.hxx |2 - sc/inc/scmod.hxx |6 +-- sc/inc/xmlwrap.hxx | 14 +++ sc/inc/zforauto.hxx |2 - sc/source/core/data/colorscale.cxx |2 - sc/source/core/data/formulacell.cxx |4 +- sc/source/core/tool/formularesult.cxx|2 - sc/source/core/tool/zforauto.cxx |2 - sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |4 +- sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx |4 +- sc/source/filter/xml/XMLExportDDELinks.cxx |2 - sc/source/filter/xml/XMLExportDDELinks.hxx |2 - sc/source/filter/xml/XMLExportDataPilot.cxx | 20 +-- sc/source/filter/xml/XMLExportDataPilot.hxx | 20 +-- sc/source/filter/xml/XMLExportIterator.cxx |2 - sc/source/filter/xml/XMLExportIterator.hxx |2 - sc/source/filter/xml/XMLStylesExportHelper.cxx |2 - sc/source/filter/xml/XMLStylesExportHelper.hxx |2 - sc/source/filter/xml/XMLTableShapeImportHelper.cxx |2 - sc/source/filter/xml/XMLTableShapeImportHelper.hxx |2 - sc/source/filter/xml/XMLTableShapeResizer.cxx|4 +- sc/source/filter/xml/XMLTableShapeResizer.hxx|4 +- sc/source/filter/xml/xmlcelli.cxx|2 - sc/source/filter/xml/xmlexprt.cxx|4 +- sc/source/filter/xml/xmlexprt.hxx|4 +- sc/source/filter/xml/xmlimprt.cxx|2 - sc/source/filter/xml/xmlimprt.hxx|2 - sc/source/filter/xml/xmlsubti.cxx|2 - sc/source/filter/xml/xmlsubti.hxx|4 +- sc/source/filter/xml/xmlwrap.cxx | 12 +++--- sc/source/ui/Accessibility/AccessibleCell.cxx|4 +- sc/source/ui/Accessibility/AccessibleDocument.cxx|2 - sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |8 ++-- sc/source/ui/Accessibility/AccessiblePreviewCell.cxx |2 - sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |4 +- sc/source/ui/app/client.cxx |2 - sc/source/ui/app/drwtrans.cxx|2 - sc/source/ui/app/inputhdl.cxx| 14 +++ sc/source/ui/app/inputwin.cxx|4 +- sc/source/ui/app/scmod.cxx |8 ++-- sc/source/ui/app/transobj.cxx|2 - sc/source/ui/cctrl/checklistmenu.cxx |6 +-- sc/source/ui/condformat/condformatdlgentry.cxx |8 ++-- sc/source/ui/inc/AccessibleCell.hxx |4 +- sc/source/ui/inc/AccessiblePreviewCell.hxx |2 - sc/source/ui/inc/AccessibleSpreadsheet.hxx |4 +- sc/source/ui/inc/checklistmenu.hxx |6 +-- sc/source/ui/inc/client.hxx |2 - sc/source/ui/inc/drwtrans.hxx|2 - sc/source/ui/inc/inputhdl.hxx| 12 +++--- sc/source/ui/inc/inputwin.hxx|2 - sc/source/ui/inc/transobj.hxx|2 - 54 files changed, 123 insertions(+), 123 deletions(-) New commits: commit fd736c4f7910f5b876c3ab8b8e0e804aa83347a0 Author: Noel Grandin Date: Thu Aug 24 09:26:25 2017 +0200 loplugin:constparam in sc part4 Change-Id: I745f50257948a53ca07766955c4f4e86dd2a366e Reviewed-on: https://gerrit.libreoffice.org/41497 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 4fe901e8387d..0d33f1bb7146 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -68,7 +68,7 @@ public: void UpdateReference( const sc::RefUpdateContext& rCxt ); void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ); void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); -void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ); +void UpdateMoveTab( const sc::RefUpdateMoveTabContext& rCxt ); const ScTokenArray* GetFormula() const; OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index a7843f875f
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/address.hxx |6 ++---
sc/inc/charthelper.hxx |4 +--
sc/inc/compiler.hxx|2 -
sc/inc/consoli.hxx |4 +--
sc/inc/dbdata.hxx |4 +--
sc/inc/detdata.hxx |4 +--
sc/inc/detfunc.hxx |4 +--
sc/inc/document.hxx|2 -
sc/inc/orcusxml.hxx|3 --
sc/inc/rangelst.hxx|8 +++
sc/inc/rangenam.hxx|4 +--
sc/inc/rangeutl.hxx| 16 +++
sc/inc/tabprotection.hxx |2 -
sc/inc/token.hxx |4 +--
sc/inc/tokenarray.hxx |2 -
sc/inc/zforauto.hxx|2 -
sc/source/core/data/documen5.cxx |2 -
sc/source/core/data/tabprotection.cxx |6 ++---
sc/source/core/inc/interpre.hxx|2 -
sc/source/core/inc/refupdat.hxx|8 +++
sc/source/core/tool/address.cxx|6 ++---
sc/source/core/tool/charthelper.cxx|4 +--
sc/source/core/tool/compiler.cxx |2 -
sc/source/core/tool/consoli.cxx|2 -
sc/source/core/tool/dbdata.cxx |4 +--
sc/source/core/tool/detdata.cxx|2 -
sc/source/core/tool/detfunc.cxx|6 ++---
sc/source/core/tool/interpr2.cxx |2 -
sc/source/core/tool/interpr4.cxx |6 ++---
sc/source/core/tool/orcusxml.cxx |7 --
sc/source/core/tool/progress.cxx |4 +--
sc/source/core/tool/rangelst.cxx |8 +++
sc/source/core/tool/rangenam.cxx |4 +--
sc/source/core/tool/rangeutl.cxx | 18 -
sc/source/core/tool/refupdat.cxx |8 +++
sc/source/core/tool/token.cxx | 10 -
sc/source/core/tool/zforauto.cxx |2 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 12 +--
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx |4 +--
39 files changed, 97 insertions(+), 103 deletions(-)
New commits:
commit 3eb5ab6efe4229db0ec2bb177d892f2604f49411
Author: Noel Grandin
Date: Wed Aug 23 18:37:52 2017 +0200
loplugin:constparam in sc part3
Change-Id: I8abc44b9f0bcd5e39fd8a94abafaf80aadcd26ca
Reviewed-on: https://gerrit.libreoffice.org/41496
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 607a9a824691..0adeaa705861 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -543,7 +543,7 @@ public:
const
css::uno::Sequence* pExternalLinks = nullptr,
const OUString* pErrRef = nullptr );
-SC_DLLPUBLIC ScRefFlags ParseAny( const OUString&, ScDocument*,
+SC_DLLPUBLIC ScRefFlags ParseAny( const OUString&, const ScDocument*,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1 );
SC_DLLPUBLIC ScRefFlags ParseCols( const OUString&,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1 );
@@ -907,12 +907,12 @@ template< typename T > void PutInOrder( T& nStart, T&
nEnd )
}
}
-bool ConvertSingleRef( ScDocument* pDocument, const OUString& rRefString,
+bool ConvertSingleRef( const ScDocument* pDocument, const OUString& rRefString,
SCTAB nDefTab, ScRefAddress& rRefAddress,
const ScAddress::Details& rDetails,
ScAddress::ExternalInfo* pExtInfo = nullptr );
-bool ConvertDoubleRef( ScDocument* pDocument, const OUString& rRefString,
+bool ConvertDoubleRef( const ScDocument* pDocument, const OUString& rRefString,
SCTAB nDefTab, ScRefAddress& rStartRefAddress,
ScRefAddress& rEndRefAddress,
const ScAddress::Details& rDetails,
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index 9e7689e87fcf..7aad9522045a 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -38,7 +38,7 @@ class ScChartHelper
{
public:
static sal_uInt16 DoUpdateAllCharts( ScDocument* pDoc );
-static void AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc,
ScDocument* pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab )
[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/inc cui/source cui/uiconfig
cui/inc/strings.hrc |1
cui/source/customize/SvxMenuConfigPage.cxx| 31 ++
cui/source/customize/SvxToolbarConfigPage.cxx | 23 +++
cui/source/customize/cfg.cxx | 22 --
cui/source/inc/SvxMenuConfigPage.hxx |1
cui/source/inc/SvxToolbarConfigPage.hxx |1
cui/source/inc/cfg.hxx|4 +++
cui/uiconfig/ui/menuassignpage.ui |2 -
8 files changed, 82 insertions(+), 3 deletions(-)
New commits:
commit e0d03d929929dec937d3fbf97ebf7d9eef1806a0
Author: Muhammet Kara
Date: Sun Aug 20 20:43:56 2017 +0300
Implement "Reset" button in the Customize dialog
For now, it works for the Toolbar and the Context Menu tabs.
Normal top-level menus cannot be reset individually at the moment
because they are sharing a single xml file, and the removeSettings()
mathod doesn't provide per-item removal from within a single file.
Change-Id: I42d62dc26130e4c03cf75a1ce6dc9ff367a58d47
Reviewed-on: https://gerrit.libreoffice.org/41367
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 74b0bcb4f80e..266f93bdd5de 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -69,6 +69,7 @@
#define RID_SVXSTR_CONFIRM_MENU_RESET
NC_("RID_SVXSTR_CONFIRM_MENU_RESET", "The menu configuration for %SAVE IN
SELECTION% will be reset to the default settings. Do you want to continue?")
#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET
NC_("RID_SVXSTR_CONFIRM_TOOLBAR_RESET", "The toolbar configuration for %SAVE IN
SELECTION% will be reset to the default settings. Do you want to continue?")
#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT
NC_("RID_SVXSTR_CONFIRM_RESTORE_DEFAULT", "This will delete all changes
previously made to this toolbar. Do you really want to reset the toolbar?")
+#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU
NC_("RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU", "This will delete all changes
previously made to this context menu. Do you really want to reset?")
#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED
NC_("RID_SVXSTR_MNUCFG_ALREADY_INCLUDED", "Function is already included in this
popup.")
#define RID_SVXSTR_LABEL_NEW_NAME
NC_("RID_SVXSTR_LABEL_NEW_NAME", "~New name")
#define RID_SVXSTR_RENAME_MENU
NC_("RID_SVXSTR_RENAME_MENU", "Rename Menu")
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx
b/cui/source/customize/SvxMenuConfigPage.cxx
index 32eb77e83a6c..decf6a9d251b 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -130,6 +130,9 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent,
const SfxItemSet& rSe
m_pInsertBtn->SetSelectHdl(
LINK( this, SvxMenuConfigPage, InsertHdl ) );
+m_pResetBtn->SetClickHdl(
+LINK( this, SvxMenuConfigPage, ResetMenuHdl ) );
+
}
SvxMenuConfigPage::~SvxMenuConfigPage()
@@ -360,6 +363,34 @@ IMPL_LINK( SvxMenuConfigPage, InsertHdl, MenuButton *,
pButton, void )
}
}
+IMPL_LINK_NOARG( SvxMenuConfigPage, ResetMenuHdl, Button *, void )
+{
+SvxConfigEntry* pMenuData = GetTopLevelSelection();
+
+ScopedVclPtrInstance qbox(this,
+CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU),
VclMessageType::Question, VclButtonsType::YesNo);
+
+// Resetting individual top-level menus is not possible at the moment.
+// So we are resetting only if it is a context menu
+if (!m_bIsMenuBar && qbox->Execute() == RET_YES)
+{
+sal_Int32 nPos = m_pTopLevelListBox->GetSelectEntryPos();
+ContextMenuSaveInData* pSaveInData = static_cast<
ContextMenuSaveInData* >(GetSaveInData());
+
+pSaveInData->ResetContextMenu(pMenuData);
+
+// ensure that the UI is cleared before populating it
+m_pTopLevelListBox->Clear();
+m_pContentsListBox->Clear();
+
+ReloadTopLevelListBox();
+
+// Reselect the resetted menu
+m_pTopLevelListBox->SelectEntryPos(nPos);
+m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
+}
+}
+
SaveInData* SvxMenuConfigPage::CreateSaveInData(
const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgMgr,
const css::uno::Reference< css::ui::XUIConfigurationManager >&
xParentCfgMgr,
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index c9a87a4b0e23..fdf1837952d7 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -140,6 +140,9 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window
*pParent, const SfxItemSe
m_pInsertBtn->SetSelectHdl(
LINK( this, SvxToolbarConfigPage, InsertHdl ) );
+m_pResetBtn->SetClickHdl(
+LINK( this, SvxToolbarConfigPage, ResetToolbarHdl )
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/idxf/dxf2mtf.cxx |2 +-
filter/source/graphicfilter/idxf/dxfentrd.cxx | 10 --
filter/source/graphicfilter/idxf/dxfentrd.hxx |2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 4fb9d7b69c4fb10107210c2f851040f7c259e413
Author: Noel Grandin
Date: Wed Aug 23 14:57:41 2017 +0200
loplugin:useuniqueptr in filter
Change-Id: I127b570bb1563dc75b21633019b3640f93715d77
Reviewed-on: https://gerrit.libreoffice.org/41495
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index a30da0c25912..692151d4012b 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -574,7 +574,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity
& rE, const DXFTransf
{
for ( std::deque::size_type i = 0; i <
rPathData.aEdges.size(); i++ )
{
-const DXFEdgeType* pEdge = rPathData.aEdges[ i ];
+const DXFEdgeType* pEdge = rPathData.aEdges[ i ].get();
switch( pEdge->nEdgeType )
{
case 1 :
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx
b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index 8c8eb309b4c0..9995ef8270d7 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -562,8 +562,6 @@ DXFBoundaryPathData::DXFBoundaryPathData() :
DXFBoundaryPathData::~DXFBoundaryPathData()
{
-for (auto i: aEdges)
-delete i;
}
bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
@@ -619,10 +617,10 @@ bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader &
rDGR )
sal_Int32 nEdgeType = rDGR.GetI();
switch( nEdgeType )
{
-case 1 : aEdges.push_back( new DXFEdgeTypeLine() ); break;
-case 2 : aEdges.push_back( new DXFEdgeTypeCircularArc() );
break;
-case 3 : aEdges.push_back( new DXFEdgeTypeEllipticalArc() );
break;
-case 4 : aEdges.push_back( new DXFEdgeTypeSpline() ); break;
+case 1 : aEdges.emplace_back( new DXFEdgeTypeLine() ); break;
+case 2 : aEdges.emplace_back( new DXFEdgeTypeCircularArc() );
break;
+case 3 : aEdges.emplace_back( new DXFEdgeTypeEllipticalArc()
); break;
+case 4 : aEdges.emplace_back( new DXFEdgeTypeSpline() ); break;
}
}
else if ( aEdges.size() )
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx
b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index 85dbd32b2c5e..849ffeca6cd4 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -412,7 +412,7 @@ struct DXFBoundaryPathData
sal_Int32 nPointIndex;
std::unique_ptr pP;
-std::deque aEdges;
+std::deque> aEdges;
DXFBoundaryPathData();
~DXFBoundaryPathData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/escriba/escriba-5.2' - 16 commits - sw/qa sw/source
sw/qa/extras/odfimport/data/i61225.sxw |binary
sw/qa/extras/odfimport/odfimport.cxx |8 +
sw/qa/extras/uiwriter/data/i95698.odt|binary
sw/qa/extras/uiwriter/data/lines-in-section-in-table.odt |binary
sw/qa/extras/uiwriter/data/rhbz739252-3.odt |binary
sw/qa/extras/uiwriter/data/table-in-sect.odt |binary
sw/qa/extras/uiwriter/data/tdf108524.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 103 +++
sw/source/core/inc/cellfrm.hxx |1
sw/source/core/layout/findfrm.cxx| 20 +-
sw/source/core/layout/flowfrm.cxx|5
sw/source/core/layout/sectfrm.cxx| 66 -
sw/source/core/layout/tabfrm.cxx | 39 +
13 files changed, 225 insertions(+), 17 deletions(-)
New commits:
commit 0d644aeba1580865173840f6b41e6f2f0ac5ccf0
Author: Miklos Vajna
Date: Wed Aug 16 17:19:05 2017 +0200
i#95698 sw: fix crash on splitting in-table section containing a nested
table
Found by crashtesting, ooo95698-1.odt crashed sw layout on load. The
intended use-case is splitting section frames inside a table frame, so
can just blacklist the non-interesting table-in-section-in-table case
that causes the problem here.
Reviewed-on: https://gerrit.libreoffice.org/41224
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 802477ae75b39194442d9c01a1342d068c7b9300)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Ic47cd8c46cc71f7eaa36b03ec2c4a5df8ca8051c
diff --git a/sw/qa/extras/uiwriter/data/i95698.odt
b/sw/qa/extras/uiwriter/data/i95698.odt
new file mode 100644
index ..9fe3ec207648
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/i95698.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index fd9031de8516..7d5bb5982431 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -205,6 +205,7 @@ public:
void testTdf108524();
void testTableInSection();
void testTableInNestedSection();
+void testTableInSectionInTable();
void testLinesInSectionInTable();
void testLinesMoveBackwardsInSectionInTable();
@@ -316,6 +317,7 @@ public:
CPPUNIT_TEST(testTableInSection);
CPPUNIT_TEST(testTableInNestedSection);
CPPUNIT_TEST(testLinesInSectionInTable);
+CPPUNIT_TEST(testTableInSectionInTable);
CPPUNIT_TEST(testLinesMoveBackwardsInSectionInTable);
CPPUNIT_TEST_SUITE_END();
@@ -3846,6 +3848,14 @@ void SwUiWriterTest::testTableInNestedSection()
assertXPath(pXmlDoc, "//page[2]//section/tab", 1);
}
+void SwUiWriterTest::testTableInSectionInTable()
+{
+// The document has a table, containing a section, containing a nested
+// table.
+// This crashed the layout.
+createDoc("i95698.odt");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 45282d886929..0c6db983d50d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -916,9 +916,21 @@ static bool lcl_FindSectionsInRow( const SwRowFrame& rRow )
if (const SwFrame* pSectionLower =
pTmpFrame->GetLower())
{
if (!pSectionLower->IsColumnFrame())
+{
// Section has a single column only, try to
// split that.
bRet = false;
+
+for (const SwFrame* pFrame = pSectionLower;
pFrame; pFrame = pFrame->GetNext())
+{
+if (pFrame->IsTabFrame())
+{
+// Section contains a table, no split
in that case.
+bRet = true;
+break;
+}
+}
+}
}
}
}
commit d67b100f44f7c320af713355dc6022451347447d
Author: Miklos Vajna
Date: Fri Jul 14 16:05:10 2017 +0200
CppunitTest_sw_uiwriter: disable testLinesMoveBackwards... on macOS
No idea off the top of my head what is the problem here, seeing Linux
and Windows is happy; clang on Linux as well.
Change-Id: I56c79b37a5648d9afd02d8e161ea4a279cc89744
(cherry picked from commit 39dd0121f5994dee56f95bc57fae3323bf849a20)
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index ef555d8b3ac4..fd9031de8516 100644
--- a/sw
[Libreoffice-commits] core.git: chart2/qa emfio/qa include/unotest sc/qa sd/qa svgio/qa sw/qa test/source unotest/source vcl/qa xmlsecurity/qa
chart2/qa/extras/charttest.hxx |8
emfio/qa/cppunit/emf/EmfImportTest.cxx |4 ++--
include/unotest/directories.hxx| 14 ++
sc/qa/extras/htmlexporttest.cxx|2 +-
sc/qa/unit/tiledrendering/tiledrendering.cxx |2 +-
sd/qa/unit/SVGExportTests.cxx |2 +-
sd/qa/unit/import-tests.cxx|2 +-
sd/qa/unit/tiledrendering/tiledrendering.cxx |2 +-
svgio/qa/cppunit/SvgImportTest.cxx |4 ++--
sw/qa/extras/globalfilter/globalfilter.cxx |4 ++--
sw/qa/extras/inc/swmodeltestbase.hxx |6 +++---
sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
sw/qa/extras/uiwriter/uiwriter.cxx |2 +-
test/source/screenshot_test.cxx|7 +++
unotest/source/cpp/directories.cxx | 18 --
vcl/qa/cppunit/pdfexport/pdfexport.cxx |2 +-
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |2 +-
xmlsecurity/qa/unit/signing/signing.cxx|2 +-
18 files changed, 36 insertions(+), 49 deletions(-)
New commits:
commit 66604baf08c47cc0c77ab3b9ee7e77f987c64722
Author: Stephan Bergmann
Date: Wed Aug 23 18:11:38 2017 +0200
Consistently use OUString in test::Directories
Change-Id: Ia5fd8af34ee9d2f37e4450ab241f6bb9a06445b2
Reviewed-on: https://gerrit.libreoffice.org/41466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index b75dac6d25b5..438565222db4 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -76,10 +76,10 @@ public:
void load( const OUString& rDir, const OUString& rFileName );
std::shared_ptr save( const OUString& rFileName );
std::shared_ptr reload( const OUString& rFileName );
-uno::Sequence < OUString > getImpressChartColumnDescriptions( const char*
pDir, const char* pName );
+uno::Sequence < OUString > getImpressChartColumnDescriptions( const
OUString& pDir, const char* pName );
OUString getFileExtension( const OUString& rFileName );
-uno::Reference< chart::XChartDocument > getChartDocFromImpress( const
char* pDir, const char* pName );
+uno::Reference< chart::XChartDocument > getChartDocFromImpress( const
OUString& pDir, const char* pName );
uno::Reference getChartDocFromDrawImpress(
sal_Int32 nPage, sal_Int32 nShape );
@@ -497,7 +497,7 @@ std::vector >
getDataSeriesLabelsFromChartType( const Re
return aRet;
}
-uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress(
const char* pDir, const char* pName )
+uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress(
const OUString& pDir, const char* pName )
{
mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) +
OUString::createFromAscii(pName),
"com.sun.star.comp.Draw.PresentationDocument");
uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent,
uno::UNO_QUERY_THROW );
@@ -562,7 +562,7 @@ uno::Reference
ChartTest::getChartDocFromWriter( sal_Int3
return xChartDoc;
}
-uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const
char* pDir, const char* pName )
+uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const
OUString& pDir, const char* pName )
{
uno::Reference< chart::XChartDocument > xChartDoc =
getChartDocFromImpress( pDir, pName );
uno::Reference< chart::XChartDataArray > xChartData (
xChartDoc->getData(), uno::UNO_QUERY_THROW);
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index a78aaeabeba2..ca766b8b67f3 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -40,7 +40,7 @@ class Test : public test::BootstrapFixture, public
XmlTestTools
void testWorking();
-Primitive2DSequence parseEmf(const char* aSource);
+Primitive2DSequence parseEmf(const OUString& aSource);
public:
CPPUNIT_TEST_SUITE(Test);
@@ -48,7 +48,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-Primitive2DSequence Test::parseEmf(const char* aSource)
+Primitive2DSequence Test::parseEmf(const OUString& aSource)
{
const Reference xEmfParser = EmfTools::create(m_xContext);
diff --git a/include/unotest/directories.hxx b/include/unotest/directories.hxx
index 04ee9287fe68..c1eaac83bafa 100644
--- a/include/unotest/directories.hxx
+++ b/include/unotest/directories.hxx
@@ -30,19 +30,17 @@ public:
const OUString& getSrcRootURL() { return m_aSrcRootURL; }
const OUString& getSrcRootPath() { return m_aSrcRootPath; }
-// return a URL to a given c-str path from the source directory
-OUString getURLFromSrc( const char *pPath );
+// return a URL to a given path from the source directory
OUString getURLFromSrc( const OUString& rPath );
-// return a Path to a giv
[Libreoffice-commits] core.git: Changes to 'distro/escriba/escriba-5.2.1'
New branch 'distro/escriba/escriba-5.2.1' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Rebuilding LO freezes on macOS
Thorsten, I can't reproduce this with latest LO on macOS 10.12.6, so maybe this is specific to your build env and system. Can you run make with the -d flag and when it hangs kill the build process and reply with the link command and following output? PS: You did make sure you are not running out of disk space or other potential causes like that? Shinnok > On Aug 23, 2017, at 10:28 PM, Thorsten Wagner > wrote: > > Dear all, > > at least since LO 5.2 I have a strange problem concerning building on macOS: > > (1) Build is ok after cleaning and building for the first time. > > (2) During building again build freezes while linking > "Library/libscfiltlo.dylib". "make" loops consuming 100% cpu on a single > core. Build has to be interrupted by killing "make" processes. > > (3) Issue is reproducible. Only workaround is cleaning and rebuilding > completely. > > I'm building on OS X 10.11 using Xcode 8.2 command line tools. > > Does everyone has seen this behaviour too? > > Any heap would be appreciated. > > brgds Thorsten > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/graphicfilter.hxx |1 - vcl/source/filter/graphicfilter.cxx |2 -- 2 files changed, 3 deletions(-) New commits: commit 844b3c067ccef7c8fcd38f4456689065dee5a447 Author: Noel Grandin Date: Wed Aug 23 20:30:39 2017 +0200 remove unused error code in vcl ever since commit 920d4463f6e59b815852c173e2974ffc7b4bb284 Date: Thu Jun 23 13:13:28 2016 +0200 loplugin:singlevalfields in vcl(part1) Change-Id: I3691d03dadff10585a119ca8db8aa193b5a01702 Reviewed-on: https://gerrit.libreoffice.org/41492 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 62ed0745a3d9..7f15760ee786 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -41,7 +41,6 @@ struct ConvertData; #define ERRCODE_GRFILTER_FORMATERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 3) #define ERRCODE_GRFILTER_VERSIONERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 4) #define ERRCODE_GRFILTER_FILTERERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 5) -#define ERRCODE_GRFILTER_ABORTErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 6) #define ERRCODE_GRFILTER_TOOBIG ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 7) #define GRFILTER_OUTHINT_GREY 1 diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index a5a4c53ebc5d..47f755b368b3 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2449,8 +2449,6 @@ ErrCode GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilt aReturnString="version error"; else if (nRes == ERRCODE_GRFILTER_FILTERERROR) aReturnString="filter error"; -else if (nRes == ERRCODE_GRFILTER_ABORT) -aReturnString="import aborted"; else if (nRes == ERRCODE_GRFILTER_TOOBIG) aReturnString="graphic is too big"; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
