[Libreoffice-commits] core.git: extras/source

[Shivam Kumar Singh (via logerrit)]

 extras/source/wordbook/technical.dic |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a177fcb1a5ac8c57c9e491c107943651bd714fd6
Author: Shivam Kumar Singh 
AuthorDate: Sun May 10 00:57:59 2020 +0530
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jul 28 07:49:35 2020 +0200

tdf#87605 Added a few more terms

Change-Id: Ib138b4f1ab0bc75265e593f66bd09b3fe75f0eae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93893
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/extras/source/wordbook/technical.dic 
b/extras/source/wordbook/technical.dic
index 91bea60b39a5..c29586aa7bfb 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -86,6 +86,7 @@ eDirectory
 Edubuntu
 eGuide
 Electronics
+elementary
 Etch
 Ethernet
 Evolution
@@ -97,6 +98,7 @@ Firefox
 Firewall
 FLAC
 Flash
+Flipkart
 Foundation
 Foxconn
 FreeBSD
@@ -188,6 +190,7 @@ Mono
 MOOC
 Moodle
 Motorola
+Mouse
 Mozilla
 MySQL
 Naver
@@ -218,6 +221,7 @@ OpenWorld=
 OpenZorg=
 Opera
 OPPO
+Operating
 Optronics
 Oracle=
 P2P
@@ -225,6 +229,7 @@ Panasonic
 Pangolin
 PayPal
 PDF
+Pen drive
 PeopleSoft=
 Phishing
 Plug-in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC "Extending the UITest framework" Week (8) Report

[ahmed El-Shreif]

Hello all,

here is my Week (8) report:
https://ahmedelshreifgsoc20.blogspot.com/2020/07/week-8-report.html

waiting for all your feedback.

Thanks,
Ahmed ElShreif
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basctl/sdi basctl/source dbaccess/source framework/source include/sfx2 officecfg/registry sfx2/sdi sfx2/source

[Maxim Monastirsky (via logerrit)]

 basctl/sdi/baside.sdi  |6 
 basctl/source/basicide/basides1.cxx|   16 
 dbaccess/source/ui/app/AppController.cxx   |   17 
 framework/source/uielement/popuptoolbarcontroller.cxx  |  174 
+++---
 include/sfx2/app.hxx   |1 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |9 
 sfx2/sdi/appslots.sdi  |1 
 sfx2/source/appl/appopen.cxx   |4 
 8 files changed, 103 insertions(+), 125 deletions(-)

New commits:
commit 2446fdba3ec4a81d6e3b619a1d9e91b3c6dcbd54
Author: Maxim Monastirsky 
AuthorDate: Sun Jul 26 12:35:11 2020 +0300
Commit: Maxim Monastirsky 
CommitDate: Tue Jul 28 00:44:46 2020 +0200

tdf#134887 Rework last item handling in NewToolbarController

Just store the last used menu id, and consistently get all the
information (command name, image id, target frame etc.) from the menu
instance. Also implement the XSubToolbarController interface, so we get
a chance to update the image on icon size or theme change.

The initial action and icon of the button are based on the url passed
by the .uno:AddDirect status update, given that there is a corresponding
menu item. The only defined fallback now is to .uno:AddDirect itself for
both executing and getting the icon, but this shouldn't happen normally,
as I fixed all the affected cases I found so far, namely Base (including
windows like table design etc.) and the Basic IDE.

Actually these cases were partially broken anyway, and as a result now
completely fixed:

- In Base main app window, the button used to default to a new Writer
document, although its tooltip advertises Ctrl+N as the kb shortcut, and
pressing that shortcut actually opens the database creation wizard (as
expected).

- In the Basic IDE, the button was working, but not the Ctrl+N shortcut.

Change-Id: I6537b3f38e7d7001ec1b39d78285445464fd8cbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99514
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 447e5ad6fd71..455924549556 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -206,6 +206,12 @@ shell basctl_Shell
 StateMethod = GetState;
 ]
 
+SID_NEWDOCDIRECT
+[
+ExecMethod  = ExecuteGlobal;
+StateMethod = GetState;
+]
+
 SID_SAVEDOC
 [
 ExecMethod  = ExecuteGlobal;
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 12399e823019..e42ad914390a 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -270,6 +271,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
 sal_uInt16 nSlot = rReq.GetSlot();
 switch ( nSlot )
 {
+case SID_NEWDOCDIRECT:
+{
+// we do not have a new document factory,
+// so just forward to a fallback method.
+SfxGetpApp()->ExecuteSlot(rReq);
+}
+break;
+
 case SID_BASICSTOP:
 {
 // maybe do not simply stop if on breakpoint!
@@ -770,6 +779,13 @@ void Shell::GetState(SfxItemSet &rSet)
 {
 switch ( nWh )
 {
+case SID_NEWDOCDIRECT:
+{
+// we do not have a new document factory,
+// so just forward to a fallback method.
+SfxGetpApp()->GetSlotState(nWh, nullptr, &rSet);
+}
+break;
 case SID_DOCINFO:
 {
 rSet.DisableItem( nWh );
diff --git a/dbaccess/source/ui/app/AppController.cxx 
b/dbaccess/source/ui/app/AppController.cxx
index b7036d149e25..958d5d9c7b4f 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -532,6 +532,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 
_nId) const
 {
 switch (_nId)
 {
+case SID_NEWDOCDIRECT:
+aReturn.bEnabled = true;
+aReturn.sTitle = "private:factory/sdatabase";
+break;
 case SID_OPENURL:
 aReturn.bEnabled = true;
 if ( m_xModel.is() )
@@ -1031,17 +1035,25 @@ void OApplicationController::Execute(sal_uInt16 _nId, 
const Sequence< PropertyVa
 }
 }
 break;
+case SID_NEWDOCDIRECT:
 case SID_OPENDOC:
 {
 Reference < XDispatchProvider > xProv( getFrame(), 
UNO_QUERY );
 if ( xProv.is() )
 {
 URL aURL;
-  

[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[gokaysatir (via logerrit)]

 loleaflet/css/notebookbar.css  |1 +
 loleaflet/src/control/Control.LokDialog.js |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1be5550126f83d08cbc39f92647293130951dba5
Author: gokaysatir 
AuthorDate: Mon Jul 27 18:25:10 2020 +0300
Commit: Henry Castro 
CommitDate: Tue Jul 28 00:44:41 2020 +0200

loleaflet: lokDialog children are mispositioned bug.

Change-Id: I9f84d1860d541c56da033dff6e95dbc4d7e0f68b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99513
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 09626e911..dbf9ccfb1 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -96,6 +96,7 @@
 
 #toolbar-wrapper.hasnotebookbar {
position: fixed;
+   z-index: 11;
 }
 
 /* unobuttons */
diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index f88e74e5e..d2aa02af7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1674,7 +1674,7 @@ L.Control.LokDialog = L.Control.extend({
else if (grandParentID.includes('calc-inputbar')) {
// This is the calculator input bar.
L.DomUtil.setStyle(floatingCanvas, 'left', 
(containerLeft + left) + 'px');
-   L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop 
+ top - 20) + 'px');
+   L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop 
+ 20) + 'px');
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/marker/Annotation.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 87d9769187a2f39ee1044199e8c195c6e38ee4a4
Author: Pranam Lashkari 
AuthorDate: Thu Jul 16 01:49:58 2020 +0530
Commit: Henry Castro 
CommitDate: Tue Jul 28 00:39:18 2020 +0200

tdf#132125 leaflet: setting annotations active and inactive on focus

adding these classes help in pasting text in comments in calc and impress

Change-Id: Id94e6017d1db5f024f4ebfa287051c799c225ec9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98860
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index f60b7b680..b8d24a482 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -145,6 +145,7 @@ L.Annotation = L.Layer.extend({
},
 
focus: function () {
+   $(this._container).addClass('annotation-active');
this._nodeModifyText.focus();
this._nodeReplyText.focus();
},
@@ -313,6 +314,7 @@ L.Annotation = L.Layer.extend({
},
 
_onLostFocus: function (e) {
+   $(this._container).removeClass('annotation-active');
if (this._contentText.origText !== this._nodeModifyText.value) {
this._onSaveComment(e);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/map/Clipboard.js |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit eb36adcdf8e77691afc20bf9a01870499671f350
Author: Pranam Lashkari 
AuthorDate: Thu Jun 25 16:42:19 2020 +0530
Commit: Henry Castro 
CommitDate: Tue Jul 28 00:35:07 2020 +0200

tdf#132125: leaflet: Pasting text into comments pastes into the document 
instead

Change-Id: Ibfc3a4519da13dfbe12082a4cd98b7a0060d3838
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97108
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 53c62364e..ede448410 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -3,7 +3,7 @@
  * L.Clipboard is used to abstract our storage and management of
  * local & remote clipboard data.
  */
-/* global _ vex brandProductName isAnyVexDialogActive */
+/* global _ vex brandProductName isAnyVexDialogActive $ */
 
 // Get all interesting clipboard related events here, and handle
 // download logic in one place ...
@@ -681,6 +681,9 @@ L.Clipboard = L.Class.extend({
if (isAnyVexDialogActive() && !this._map.hasFocus())
return;
 
+   if ($('.annotation-active').length > 0 && !this._map.hasFocus())
+   return;
+
// If the focus is in the search box, paste there.
if (this._map.isSearching())
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - include/vcl vcl/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/workben

[Miklos Vajna (via logerrit)]

 include/vcl/filter/pdfdocument.hxx |2 
 vcl/source/filter/ipdf/pdfdocument.cxx |   13 +
 xmlsecurity/inc/pdfio/pdfdocument.hxx  |6 
 xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  |   19 +
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |3 
 xmlsecurity/source/pdfio/pdfdocument.cxx   |  140 ++---
 xmlsecurity/workben/pdfverify.cxx  |6 
 8 files changed, 155 insertions(+), 34 deletions(-)

New commits:
commit 7b6dcebb436a9db99007ceed32ff4d6c63128ab6
Author: Miklos Vajna 
AuthorDate: Fri Jul 24 11:29:27 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jul 28 00:18:49 2020 +0200

xmlsecurity: detect unsigned incremental update between signatures

(cherry picked from commit 7468d5df5ec79783eae84b62bdc5ecf12f0ca255)

Conflicts:
vcl/source/filter/ipdf/pdfdocument.cxx
xmlsecurity/source/pdfio/pdfdocument.cxx

Change-Id: I269ed858852ee7d1275adf340c8cc1565fc30693
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99480
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index 03180fd0597f..50ffb29ee977 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -408,6 +408,8 @@ public:
 std::vector GetSignatureWidgets();
 /// Remove the nth signature from read document in the edit buffer.
 bool RemoveSignature(size_t nPosition);
+/// Get byte offsets of the end of incremental updates.
+const std::vector& GetEOFs() const;
 //@}
 };
 
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index c74bcbbade84..291f30387094 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -147,6 +147,8 @@ bool PDFDocument::RemoveSignature(size_t nPosition)
 return m_aEditBuffer.good();
 }
 
+const std::vector& PDFDocument::GetEOFs() const { return m_aEOFs; }
+
 sal_uInt32 PDFDocument::GetNextSignature()
 {
 sal_uInt32 nRet = 0;
@@ -1978,7 +1980,16 @@ bool PDFCommentElement::Read(SvStream& rStream)
 m_aComment = aBuf.makeStringAndClear();
 
 if (m_aComment.startsWith("%%EOF"))
-m_rDoc.PushBackEOF(rStream.Tell());
+{
+sal_uInt64 nPos = rStream.Tell();
+if (ch == '\r')
+{
+// If the comment ends with a \r\n, count the \n as well 
to match Adobe Acrobat
+// behavior.
+nPos += 1;
+}
+m_rDoc.PushBackEOF(nPos);
+}
 
 SAL_INFO("vcl.filter", "PDFCommentElement::Read: m_aComment is '" 
<< m_aComment << "'");
 return true;
diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx 
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 996bb1527bb8..f7e36492e746 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -18,6 +18,7 @@ namespace vcl
 namespace filter
 {
 class PDFObjectElement;
+class PDFDocument;
 }
 }
 struct SignatureInformation;
@@ -29,12 +30,13 @@ namespace pdfio
 {
 /**
  * @param rInformation The actual result.
- * @param bLast If this is the last signature in the file, so it covers the 
whole file physically.
+ * @param rDocument the parsed document to see if the signature is partial.
  * @return If we can determinate a result.
  */
 XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& rStream,
  vcl::filter::PDFObjectElement* 
pSignature,
- SignatureInformation& 
rInformation, bool bLast);
+ SignatureInformation& 
rInformation,
+ vcl::filter::PDFDocument& 
rDocument);
 
 } // namespace pdfio
 } // namespace xmlsecurity
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf
new file mode 100644
index ..211a111cb394
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 442323deb6ad..ea6a67f4e64f 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -75,6 +75,7 @@ public:
 void testPDFPAdESGood();
 /// Test a valid signature that does not cover the whole file.
 void testPartial();
+void testPartialInBetween();
 /// Test writing a PAdES signature.
 void testSigningCertificateAttribute();
 /// Test that we accept files which are supposed t

Simulated Animation Effects - Week 8 Report

[Sarper Akdemir]

Hello,

Published my report about the progress on the last week on my blog,
you can check it out at:
https://quwex.com/gsoc20-week8/

Looking forward to your feedback!

Best regards,
Sarper Akdemir
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/vcl vcl/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/workben

[Miklos Vajna (via logerrit)]

 include/vcl/filter/pdfdocument.hxx |2 
 vcl/source/filter/ipdf/pdfdocument.cxx |   13 +
 xmlsecurity/inc/pdfio/pdfdocument.hxx  |6 
 xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  |   19 +
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |3 
 xmlsecurity/source/pdfio/pdfdocument.cxx   |  140 ++---
 xmlsecurity/workben/pdfverify.cxx  |6 
 8 files changed, 155 insertions(+), 34 deletions(-)

New commits:
commit e1c1f1332942fc4f15122cf5e894a64da8e1be0e
Author: Miklos Vajna 
AuthorDate: Fri Jul 24 11:29:27 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 27 23:28:22 2020 +0200

xmlsecurity: detect unsigned incremental update between signatures

(cherry picked from commit 7468d5df5ec79783eae84b62bdc5ecf12f0ca255)

Conflicts:
vcl/source/filter/ipdf/pdfdocument.cxx
xmlsecurity/source/pdfio/pdfdocument.cxx

Change-Id: I269ed858852ee7d1275adf340c8cc1565fc30693
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99480
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index 3ec08020044a..56debd53e8c7 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -402,6 +402,8 @@ public:
 std::vector GetSignatureWidgets();
 /// Remove the nth signature from read document in the edit buffer.
 bool RemoveSignature(size_t nPosition);
+/// Get byte offsets of the end of incremental updates.
+const std::vector& GetEOFs() const;
 //@}
 };
 
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 092df7cfbee7..84b65705b595 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -147,6 +147,8 @@ bool PDFDocument::RemoveSignature(size_t nPosition)
 return m_aEditBuffer.good();
 }
 
+const std::vector& PDFDocument::GetEOFs() const { return m_aEOFs; }
+
 sal_uInt32 PDFDocument::GetNextSignature()
 {
 sal_uInt32 nRet = 0;
@@ -1978,7 +1980,16 @@ bool PDFCommentElement::Read(SvStream& rStream)
 m_aComment = aBuf.makeStringAndClear();
 
 if (m_aComment.startsWith("%%EOF"))
-m_rDoc.PushBackEOF(rStream.Tell());
+{
+sal_uInt64 nPos = rStream.Tell();
+if (ch == '\r')
+{
+// If the comment ends with a \r\n, count the \n as well 
to match Adobe Acrobat
+// behavior.
+nPos += 1;
+}
+m_rDoc.PushBackEOF(nPos);
+}
 
 SAL_INFO("vcl.filter", "PDFCommentElement::Read: m_aComment is '" 
<< m_aComment << "'");
 return true;
diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx 
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 996bb1527bb8..f7e36492e746 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -18,6 +18,7 @@ namespace vcl
 namespace filter
 {
 class PDFObjectElement;
+class PDFDocument;
 }
 }
 struct SignatureInformation;
@@ -29,12 +30,13 @@ namespace pdfio
 {
 /**
  * @param rInformation The actual result.
- * @param bLast If this is the last signature in the file, so it covers the 
whole file physically.
+ * @param rDocument the parsed document to see if the signature is partial.
  * @return If we can determinate a result.
  */
 XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& rStream,
  vcl::filter::PDFObjectElement* 
pSignature,
- SignatureInformation& 
rInformation, bool bLast);
+ SignatureInformation& 
rInformation,
+ vcl::filter::PDFDocument& 
rDocument);
 
 } // namespace pdfio
 } // namespace xmlsecurity
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf
new file mode 100644
index ..211a111cb394
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index d608129d6254..8511f20eeae4 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -76,6 +76,7 @@ public:
 void testPDFPAdESGood();
 /// Test a valid signature that does not cover the whole file.
 void testPartial();
+void testPartialInBetween();
 /// Test writing a PAdES signature.
 void testSigningCertificateAttribute();
 /// Test that we accept files which are supposed to be

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - chart2/source sw/qa

[Tünde Tóth (via logerrit)]

 chart2/source/view/main/VLegend.cxx|   56 ++---
 sw/qa/extras/layout/data/long_legendentry.docx |binary
 sw/qa/extras/layout/layout.cxx |   17 +++
 3 files changed, 67 insertions(+), 6 deletions(-)

New commits:
commit 1010aa9b2e064446082a0523aa746a2f9cb7458b
Author: Tünde Tóth 
AuthorDate: Mon Jun 15 16:42:40 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Mon Jul 27 23:26:07 2020 +0200

tdf#126425 Chart: fix missing legend with exceeding text

Ellipsize legend box contents, if the custom size of
the chart legend is too small to contain the text.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96437
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 72613bd2a04b4b1ba614c0f645e9804ebfe73682)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97503
Tested-by: Jenkins
Reviewed-by: Tünde Tóth 
(cherry picked from commit dc219b0fe04d07a1e5c7c4c37bff94c29d4a1171)

Change-Id: I91ef913f509b233912a8bfb878a1c80d577e2a88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99537
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/chart2/source/view/main/VLegend.cxx 
b/chart2/source/view/main/VLegend.cxx
index f9d836921ebe..9962b3704089 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -407,18 +407,62 @@ awt::Size lcl_placeLegendEntries(
 DrawModelWrapper::removeShape( aTextShapes[nEntry] );
 aTextShapes.pop_back();
 }
-if( nEntry < nNumberOfEntries )
+if( nEntry < nNumberOfEntries && ( nEntry != 0 || 
nNumberOfColumns != 1 ) )
 {
 DrawModelWrapper::removeShape( rEntries[ nEntry 
].aSymbol );
 rEntries.pop_back();
 nNumberOfEntries--;
 }
 }
-nSumHeight -= aRowHeights[nRow];
-aRowHeights.pop_back();
-nRemainingSpace = rRemainingSpace.Height - nSumHeight;
-if( nRemainingSpace>=0 )
-break;
+if (nRow == 0 && nNumberOfColumns == 1)
+{
+try
+{
+OUString aLabelString = 
rEntries[0].aLabel[0]->getString();
+const OUString sDots = "...";
+ShapeFactory* pShapeFactory = 
ShapeFactory::getOrCreateShapeFactory(xShapeFactory);
+for (sal_Int32 nNewLen = aLabelString.getLength() - 
sDots.getLength(); nNewLen > 0; nNewLen--)
+{
+OUString aNewLabel = aLabelString.copy(0, nNewLen) 
+ sDots;
+Reference xEntry = 
pShapeFactory->createText(
+xTarget, aNewLabel, rTextProperties.first, 
rTextProperties.second, uno::Any());
+nSumHeight = xEntry->getSize().Height;
+nRemainingSpace = rRemainingSpace.Height - 
nSumHeight;
+if (nRemainingSpace >= 0)
+{
+sal_Int32 nWidth = xEntry->getSize().Width + 
nSymbolPlusDistanceWidth;
+if (rRemainingSpace.Width - nWidth >= 0)
+{
+aTextShapes.push_back(xEntry);
+
rEntries[0].aLabel[0]->setString(aNewLabel);
+aRowHeights[0] = nSumHeight;
+aColumnWidths[0] = nWidth;
+break;
+}
+}
+DrawModelWrapper::removeShape(xEntry);
+}
+if (aTextShapes.size() == 0)
+{
+DrawModelWrapper::removeShape(rEntries[0].aSymbol);
+rEntries.pop_back();
+nNumberOfEntries--;
+aRowHeights.pop_back();
+}
+}
+catch (const uno::Exception&)
+{
+DBG_UNHANDLED_EXCEPTION("chart2");
+}
+}
+else
+{
+nSumHeight -= aRowHeights[nRow];
+aRowHeights.pop_back();
+nRemainingSpace = rRemainingSpace.Height - nSumHeight;
+if (nRemainingSpace >= 0)
+break;
+}
 }
 nNumberOfRows = static_cast(aRowHeights.size());
 }
diff --git a/sw/qa/extras/layout/data/long_legendentry.docx 

[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am  |   45 
+-
 cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js |7 -
 cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js |7 +
 3 files changed, 35 insertions(+), 24 deletions(-)

New commits:
commit f980eccde2e6abaf075980478212467da283549d
Author: Tamás Zolnai 
AuthorDate: Mon Jul 27 18:15:12 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Jul 27 23:19:23 2020 +0200

cypress: update multi-user test case.

Change-Id: I8e73c41df35b92305e31fd3c5e35d5c15ae6e8e8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99518
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 150d981f1..2a0fc221a 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -63,7 +63,7 @@ MOBILE_TEST_FILES=$(subst $(MOBILE_TEST_FOLDER)/,,$(wildcard 
$(MOBILE_TEST_FOLDE
 DEKSTOP_TEST_FILES=$(subst $(DESKTOP_TEST_FOLDER)/,,$(wildcard 
$(DESKTOP_TEST_FOLDER)/*_spec.js) $(wildcard 
$(DESKTOP_TEST_FOLDER)/*/*_spec.js))
 
 MULTIUSER_TEST_FILES= \
-   userlist_user1_spec.js,userlist_user2_spec.js
+   paragraph_prop_user1_spec.js,paragraph_prop_user2_spec.js
 
 MOBILE_TEST_FILES_DONE= \
$(foreach 
test_file,$(MOBILE_TEST_FILES),$(MOBILE_TRACK_FOLDER)/$(test_file).done)
diff --git a/cypress_test/integration_tests/multiuser/userlist_user1_spec.js 
b/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
similarity index 77%
rename from cypress_test/integration_tests/multiuser/userlist_user1_spec.js
rename to cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
index 93f323b96..c64babdf3 100644
--- a/cypress_test/integration_tests/multiuser/userlist_user1_spec.js
+++ b/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../common/helper');
 
-describe('Check user list with user-1.', function() {
+describe('Change paragraph properties: user-1.', function() {
var testFileName = 'userlist.odt';
 
beforeEach(function() {
@@ -13,7 +13,7 @@ describe('Check user list with user-1.', function() {
helper.afterAll(testFileName);
});
 
-   it('Userlist visibility.', function() {
+   it('Change paragraph alignment.', function() {
// user-2 loads the same document
 
cy.get('#tb_actionbar_item_userlist')
@@ -29,7 +29,8 @@ describe('Check user list with user-1.', function() {
cy.get('#tb_editbar_item_centerpara .w2ui-button')
.click();
 
-   cy.get('#tb_editbar_item_centerpara .w2ui-button')
+   // user-2 changes the paragraph alignment
+   cy.get('#tb_editbar_item_rightpara .w2ui-button')
.should('have.class', 'checked');
});
 
diff --git a/cypress_test/integration_tests/multiuser/userlist_user2_spec.js 
b/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
similarity index 80%
rename from cypress_test/integration_tests/multiuser/userlist_user2_spec.js
rename to cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
index 7b7b9fa5e..3267f093c 100644
--- a/cypress_test/integration_tests/multiuser/userlist_user2_spec.js
+++ b/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../common/helper');
 
-describe('Check user list with user-2.', function() {
+describe('Change paragraph properties: user-2.', function() {
var testFileName = 'userlist.odt';
 
beforeEach(function() {
@@ -16,7 +16,7 @@ describe('Check user list with user-2.', function() {
helper.afterAll(testFileName);
});
 
-   it('Userlist visibility.', function() {
+   it('Change paragraph alignment.', function() {
// user-1 loads the same document
 
cy.get('#tb_actionbar_item_userlist')
@@ -28,5 +28,8 @@ describe('Check user list with user-2.', function() {
// user-1 changes the paragraph alignment
cy.get('#tb_editbar_item_centerpara .w2ui-button')
.should('have.class', 'checked');
+
+   cy.get('#tb_editbar_item_rightpara .w2ui-button')
+   .click();
});
 });
commit bda83c263b8f005fc40b2204f1775420385e7de9
Author: Tamás Zolnai 
AuthorDate: Mon Jul 27 15:33:27 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Jul 27 23:19:14 2020 +0200

cypress: better way of running multi-user tests.

Before we used the GNU make implicit parallelization
which triggered by recipe structure.
Instead of that we use linux's bakcground process
feature and run one client in the background and
the other one in the foreground.

Change-Id: I9de899686ae67b47eee00

[Libreoffice-commits] online.git: 2 commits - cypress_test/Makefile.am cypress_test/run_parallel.sh

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am |  131 ---
 cypress_test/run_parallel.sh |   95 +++
 2 files changed, 156 insertions(+), 70 deletions(-)

New commits:
commit 439b4af8ad89ab566c3ac41a955f78223644e633
Author: Tamás Zolnai 
AuthorDate: Thu Jul 23 18:33:09 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Jul 27 23:18:59 2020 +0200

cypress: better way of detecting error during parallel run.

We used to grep for error messages in the output, but
it can change what is written out. Better to catch if
the command fails directly.

Change-Id: I8c3cba212b262227551876bfb23629a243424c39
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99365
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/run_parallel.sh b/cypress_test/run_parallel.sh
index 38add0215..21f4e6c2a 100755
--- a/cypress_test/run_parallel.sh
+++ b/cypress_test/run_parallel.sh
@@ -43,6 +43,7 @@ while test $# -gt 0; do
   esac
   shift
 done
+TEST_ERROR="${TEST_LOG}.error"
 
 TEST_FILE_PATH=
 if [ "${TEST_TYPE}" = "desktop" ]; then
@@ -60,8 +61,6 @@ RUN_COMMAND="${CYPRESS_BINARY} run \
 --env ${TEST_ENV}\
 --spec=${TEST_FILE_PATH}"
 
-ERROR_MATCHER="Error:\|Command failed:\|Timed out retrying\|The error was:"
-
 print_error() {
 echo -e "\n\
 CypressError: a test failed, please do one of the following:\n\n\
@@ -71,15 +70,20 @@ print_error() {
 \tcd cypress_test && make run-${TEST_TYPE} spec=${TEST_FILE}\n" >> 
${ERROR_LOG}
 }
 
+run_command() {
+rm -rf ${TEST_ERROR}
+echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND} || touch ${TEST_ERROR}`" > 
${TEST_LOG} 2>&1
+}
+
 mkdir -p `dirname ${TEST_LOG}`
 touch ${TEST_LOG}
-echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND}`" > ${TEST_LOG} 2>&1
-if [ -z `grep -o -m 1 "${ERROR_MATCHER}" ${TEST_LOG}` ];
+run_command
+if [ ! -f ${TEST_ERROR} ];
 then cat ${TEST_LOG};
 elif [ ${SECOND_CHANCE} = true ];
 then echo "Second chance!" > ${TEST_LOG} && \
-echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND}`" >> ${TEST_LOG} 2>&1 && \
-if [ -z `grep -o -m 1 "${ERROR_MATCHER}" ${TEST_LOG}` ];\
+run_command && \
+if [ ! -f ${TEST_ERROR} ];\
 then cat ${TEST_LOG};\
 else cat ${TEST_LOG} >> ${ERROR_LOG} && \
  print_error; \
commit 09abe6724f5e13181e7dfeca0ddcb2df131468f4
Author: Tamás Zolnai 
AuthorDate: Thu Jul 23 13:23:14 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Jul 27 23:18:50 2020 +0200

cypress: extract parallel test running code to a shell script file.

Change-Id: Ice856737b5b4bcfc6a202b507a03fdfa16938c25
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99364
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index c0dab338b..9f6901bcf 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -9,6 +9,8 @@ WAIT_ON_BINARY = 
$(abs_builddir)/node_modules/wait-on/bin/wait-on
 GET_PORT_BINARY = $(abs_builddir)/node_modules/get-port-cli/cli.js
 NPM_INSTALLED = $(abs_builddir)/workdir/npm_installed
 
+PARALLEL_SCRIPT = $(abs_srcdir)/run_parallel.sh
+
 PID_FILE=$(abs_builddir)/workdir/loolwsd.pid
 ERROR_LOG=$(abs_builddir)/workdir/error.log
 
@@ -202,16 +204,22 @@ define start_Xvfb
 endef
 
 DESKTOP_CONFIG = \
-   --config 
integrationFolder=$(DESKTOP_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT)
 \
-   --env 
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+   
integrationFolder=$(DESKTOP_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT)
+
+DESKTOP_ENV = \
+   
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
 
 MOBILE_CONFIG = \
-   --config 
integrationFolder=$(MOBILE_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT)
 \
-   --env 
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+   
integrationFolder=$(MOBILE_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT)
+
+MOBILE_ENV = \
+   
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
 
 MULTIUSER_CONFIG = \
-   --config 
integrationFolder=$(MULTIUSER_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT),defaultCommandTimeout=3
 \
-   --env 
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),WORKDIR=$(MULTIUSER_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VE

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source writerfilter/source

[Szabolcs Toth (via logerrit)]

 
sw/qa/extras/ooxmlexport/data/tdf133670_testRelativeAnchorWidthFromRightMargin.docx
 |binary
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  
 |   13 ++
 sw/source/core/layout/anchoreddrawobject.cxx   
 |3 ++
 writerfilter/source/dmapper/GraphicImport.cxx  
 |8 ++
 4 files changed, 24 insertions(+)

New commits:
commit ff4740980c7a7fa5162da94c0d31d41e25f5d1e3
Author: Szabolcs Toth 
AuthorDate: Fri Jun 5 12:06:22 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Mon Jul 27 23:04:42 2020 +0200

tdf#133670 DOCX import: fix shape width relative to right margin

using UNO API RelativeWidthRelation and the associated
lo-ext attribute for OpenDocument export.

See commit 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4
(offapi: document the 4 new properties which are no longer read-only).

Co-authored-by: Balázs Regényi

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95582
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 330ed8120e9881656716d70d87b9f49f861f0bfa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97067
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 718683ab1582849ea43797e404c6453ce2fbd424)

Change-Id: Ic5d25701d46cdace6502ec55dbc0e5f0ebd7742b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99536
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf133670_testRelativeAnchorWidthFromRightMargin.docx
 
b/sw/qa/extras/ooxmlexport/data/tdf133670_testRelativeAnchorWidthFromRightMargin.docx
new file mode 100644
index ..68f24370a31e
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf133670_testRelativeAnchorWidthFromRightMargin.docx
 differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 93a65a57fc45..c9833e045f0a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -1231,6 +1231,19 @@ DECLARE_OOXMLEXPORT_TEST(testDocxTablePosition, 
"floating-table-position.docx")
 assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblpPr", "tblpY", 
"4611");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorWidthFromRightMargin, 
"tdf133670_testRelativeAnchorWidthFromRightMargin.docx")
+{
+// TODO: Fix export.
+if (mbExported)
+return;
+
+// tdf#133670 The width was set relative from right margin, but this was 
handled relative from page width.
+xmlDocPtr pXmlDoc = parseLayoutDump();
+const sal_Int32 nAnchoredWidth
+= getXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", 
"width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(2408), nAnchoredWidth);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 95ad5bc155b4..4b9b119b7d0f 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -633,6 +633,9 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 // E.g.: (left margin = 8 && relative size = 150%) -> width of 
some shape = 12.
 else if (GetDrawObj()->GetRelativeWidthRelation() == 
text::RelOrientation::PAGE_LEFT)
 nWidth = GetPageFrame()->GetLeftMargin();
+// Same as the left margin above.
+else if (GetDrawObj()->GetRelativeWidthRelation() == 
text::RelOrientation::PAGE_RIGHT)
+nWidth = GetPageFrame()->GetRightMargin();
 else
 nWidth = GetPageFrame( )->GetBoundRect( 
GetPageFrame()->getRootFrame()->GetCurrShell()->GetOut() ).SVRect().GetWidth();
 nTargetWidth = nWidth * (*GetDrawObj( )->GetRelativeWidth());
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 04b2b124aae6..062c00d5f58e 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -948,6 +948,14 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 
xPropertySet->setPropertyValue("RelativeWidthRelation", 
uno::makeAny(text::RelOrientation::PAGE_LEFT));
 }
 break;
+case NS_ooxml::LN_ST_SizeRelFromH_rightMargin:
+if (m_xShape.is())
+{
+// Same as the left margin above.
+uno::Reference 
xPropertySet(m_xShape, uno::UNO_QUERY);
+
xPropertySet->setPropertyValue("RelativeWidthRelation", 
uno::makeAny(text::RelOrientation::PAGE_RIGHT));
+}
+break;
 case NS_o

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a10e3987e61b7fcc1a3f7ce3f34fe75a51bff87e
Author: Olivier Hallot 
AuthorDate: Mon Jul 27 17:37:42 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Jul 27 22:37:42 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5794edee8b1e7fc990bb0a41462d4aeb382a976f
  - Change e-mail to email and E-mail to Email

Change-Id: Ie47ed745f336e44389c8c797967de6af72c9ce8d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99526
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 09c3906689f2..5794edee8b1e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 09c3906689f2a33490dceb57b47caaa4d22b2060
+Subproject commit 5794edee8b1e7fc990bb0a41462d4aeb382a976f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/shared/00/0002.xhp   |4 +-
 source/text/shared/00/0401.xhp   |4 +-
 source/text/shared/00/0406.xhp   |2 -
 source/text/shared/01/0116.xhp   |   14 -
 source/text/shared/01/01160200.xhp   |6 ++--
 source/text/shared/01/addsignatureline.xhp   |4 +-
 source/text/shared/01/ref_pdf_send_as.xhp|6 ++--
 source/text/shared/02/09070200.xhp   |6 ++--
 source/text/shared/autopi/01110400.xhp   |4 +-
 source/text/shared/explorer/database/menufile.xhp|8 ++---
 source/text/shared/guide/data_tables.xhp |2 -
 source/text/shared/guide/digital_signatures.xhp  |2 -
 source/text/shared/guide/email.xhp   |   28 +--
 source/text/shared/guide/error_report.xhp|2 -
 source/text/shared/guide/redlining.xhp   |2 -
 source/text/shared/optionen/01010100.xhp |4 +-
 source/text/shared/optionen/01020300.xhp |   12 
 source/text/shared/optionen/mailmerge.xhp|   24 
 source/text/shared/optionen/serverauthentication.xhp |6 ++--
 source/text/shared/optionen/testaccount.xhp  |2 -
 source/text/swriter/01/04090200.xhp  |2 -
 source/text/swriter/01/mailmerge00.xhp   |2 -
 source/text/swriter/01/mailmerge02.xhp   |4 +-
 source/text/swriter/01/mailmerge03.xhp   |2 -
 source/text/swriter/01/mm_copyto.xhp |8 ++---
 source/text/swriter/01/mm_cusgrelin.xhp  |2 -
 source/text/swriter/01/mm_emabod.xhp |8 ++---
 source/text/swriter/01/mm_emailmergeddoc.xhp |   20 ++---
 source/text/swriter/guide/fields_userdata.xhp|2 -
 source/text/swriter/guide/form_letters_main.xhp  |4 +-
 30 files changed, 98 insertions(+), 98 deletions(-)

New commits:
commit 5794edee8b1e7fc990bb0a41462d4aeb382a976f
Author: Olivier Hallot 
AuthorDate: Mon Jul 27 14:11:45 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jul 27 22:37:42 2020 +0200

Change e-mail to email and E-mail to Email

Change-Id: Ie47ed745f336e44389c8c797967de6af72c9ce8d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99526
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/00/0002.xhp 
b/source/text/shared/00/0002.xhp
index 5a9ce270f..b10de4e6f 100644
--- a/source/text/shared/00/0002.xhp
+++ b/source/text/shared/00/0002.xhp
@@ -38,7 +38,7 @@
 mw changed "Internet...".
 
 Glossary 
of Internet Terms
-If you are a 
newcomer to the Internet, you will be confronted with unfamiliar terms: 
browser, bookmark, e-mail, homepage, search engine, and many others. To make 
your first steps easier, this glossary explains some of the more important 
terminology you may find in the Internet, intranet, mail and news.
+If you are a 
newcomer to the Internet, you will be confronted with unfamiliar terms: 
browser, bookmark, email, homepage, search engine, and many others. To make 
your first steps easier, this glossary explains some of the more important 
terminology you may find in the Internet, intranet, mail and news.
 
 
 
@@ -201,7 +201,7 @@
 
 
 URL
-The Uniform 
Resource Locator (URL) displays the address of a document or a server in the 
Internet. The general structure of a URL varies according to type and is 
generally in the form Service://Hostname:Port/Path/Page#Mark although not all 
elements are always required. An URL can be a FTP address, a WWW (HTTP) 
address, a file address or an e-mail address.
+The Uniform 
Resource Locator (URL) displays the address of a document or a server in the 
Internet. The general structure of a URL varies according to type and is 
generally in the form Service://Hostname:Port/Path/Page#Mark although not all 
elements are always required. An URL can be a FTP address, a WWW (HTTP) 
address, a file address or an email address.
 
 
 
diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index dccbe8148..68ab3658e 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -230,7 +230,7 @@
 Icon
 
 
-E-mail 
Document
+Email 
Document
 
 
 
@@ -290,7 +290,7 @@
 
 
 
-Choose 
File - Send - E-mail as PDF.
+Choose 
File - Send - Email as PDF.
 
 Choose File - Send - Create Master 
Document.
 
diff --git a/source/text/shared/00/0406.xhp 
b/source/text/shared/00/0406.xhp
index 2d24d7df0..6b10c6e7d 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -176,7 +176,7 @@
 Open a text document, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME 
Writer.
 Open a text document, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - 
Compatibility.
 

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source writerfilter/source

[Szabolcs Toth (via logerrit)]

 
sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
 |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  
|   14 ++
 sw/source/core/layout/anchoreddrawobject.cxx   
|   13 ++---
 writerfilter/source/dmapper/GraphicImport.cxx  
|   10 +++
 4 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit 10b24292a37b69e9329b03fed2f10af4a91247e0
Author: Szabolcs Toth 
AuthorDate: Thu Jun 4 15:43:42 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Mon Jul 27 22:34:02 2020 +0200

tdf#132976 DOCX import: fix shape width relative to left margin

using UNO API RelativeWidthRelation and the associated
lo-ext attribute for OpenDocument export.

See commit 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4
(offapi: document the 4 new properties which are no longer read-only).

Co-authored-by: Balázs Regényi

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95525
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 7380905abc0833d9e4c4fe731d76174db8a8724c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96998
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 5451833f3af5582a8cab7e4b3da402f083f56908)

Change-Id: I2dada8ad764a1fba33d241117cc4bc5eddae74ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99530
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
 
b/sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
new file mode 100644
index ..2f1c5560c17a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
 differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 089154675288..bd5c8605d454 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1130,6 +1130,20 @@ DECLARE_OOXMLEXPORT_TEST(testShapeLineWidth, 
"tdf92526_ShapeLineWidth.odt")
 "/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln", "w", "0");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorWidthFromLeftMargin, 
"tdf132976_testRelativeAnchorWidthFromLeftMargin.docx")
+{
+// TODO: Fix export.
+if (mbExported)
+return;
+
+// tdf#132976 The size of the width of this shape should come from the 
size of the left margin.
+// It was set to the size of the width of the entire page before.
+xmlDocPtr pXmlDoc = parseLayoutDump();
+const sal_Int32 nAnchoredWidth
+= getXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", 
"width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(1133), nAnchoredWidth);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 079468fdf062..95ad5bc155b4 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -624,13 +624,18 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 long nTargetWidth = aCurrObjRect.GetWidth( );
 if ( GetDrawObj( )->GetRelativeWidth( ) )
 {
-tools::Rectangle aPageRect;
+long nWidth = 0;
 if (GetDrawObj()->GetRelativeWidthRelation() == 
text::RelOrientation::FRAME)
 // Exclude margins.
-aPageRect = GetPageFrame()->getFramePrintArea().SVRect();
+nWidth = 
GetPageFrame()->getFramePrintArea().SVRect().GetWidth();
+// Here we handle the relative size of the width of some shape.
+// The size of the shape's width is going to be relative to the 
size of the left margin.
+// E.g.: (left margin = 8 && relative size = 150%) -> width of 
some shape = 12.
+else if (GetDrawObj()->GetRelativeWidthRelation() == 
text::RelOrientation::PAGE_LEFT)
+nWidth = GetPageFrame()->GetLeftMargin();
 else
-aPageRect = GetPageFrame( )->GetBoundRect( 
GetPageFrame()->getRootFrame()->GetCurrShell()->GetOut() ).SVRect();
-nTargetWidth = aPageRect.GetWidth( ) * (*GetDrawObj( 
)->GetRelativeWidth());
+nWidth = GetPageFrame( )->GetBoundRect( 
GetPageFrame()->getRootFrame()->GetCurrShell()->GetOut() ).SVRect().GetWidth();
+nTargetWidth = nWidth * (*GetDrawObj( )->GetRelativeWidth());
 }
 
 long nTargetHeight = aCurrObjRect.GetHeight( );
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 8afea80365fe..04b2b124aae6 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
++

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

[Gülşah Köse (via logerrit)]

 sw/source/ui/dbui/mmresultdialogs.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 08d16c76e48b43e4f74bb6f9e57605f43f27
Author: Gülşah Köse 
AuthorDate: Mon Jul 27 22:26:13 2020 +0300
Commit: Gülşah Köse 
CommitDate: Mon Jul 27 22:31:32 2020 +0200

Use enable/disable widgets instead of hide/show.

Change-Id: Ied3eb671155b88d47a5a91fcd81351492ccf9bb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99560
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx 
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 083b7633969e..ef10e4f321a9 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -346,9 +346,9 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* 
pParent)
 
 m_xOKButton->connect_clicked(LINK(this, SwMMResultEmailDialog, 
SendDocumentsHdl_Impl));
 
-m_xPasswordCB->hide();
-m_xPasswordFT->hide();
-m_xPasswordLB->hide();
+m_xPasswordCB->set_sensitive(false);
+m_xPasswordFT->set_sensitive(false);
+m_xPasswordLB->set_sensitive(false);
 
 FillInEmailSettings();
 }
@@ -860,17 +860,16 @@ IMPL_LINK(SwMMResultEmailDialog, SendTypeHdl_Impl, 
weld::ComboBox&, rBox, void)
 
 if(bIsPDF)
 {
-m_xPasswordCB->show();
-m_xPasswordFT->show();
-m_xPasswordLB->show();
+m_xPasswordCB->set_sensitive(true);
+m_xPasswordFT->set_sensitive(true);
+m_xPasswordLB->set_sensitive(true);
 CheckHdl(*m_xPasswordCB);
 }
 else
 {
-m_xPasswordCB->hide();
-m_xPasswordFT->hide();
-m_xPasswordLB->hide();
-
+m_xPasswordCB->set_sensitive(false);
+m_xPasswordFT->set_sensitive(false);
+m_xPasswordLB->set_sensitive(false);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 4 commits - animations/source include/xmloff offapi/com offapi/UnoApi_offapi.mk officecfg/registry sd/inc sd/source sd/

[Sarper Akdemir (via logerrit)]

Rebased ref, commits from common ancestor:
commit b1f3de125b3e5eeb21a8d71667e3d0841656368d
Author: Sarper Akdemir 
AuthorDate: Mon Jul 27 23:02:48 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Mon Jul 27 23:03:18 2020 +0300

work-in-progress complex shapes

Change-Id: I807bbde92c143b8c96792b3d8bf9603a31216486

diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 8729300184f6..1a553ee7fd29 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -11,6 +11,12 @@
 #include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
 
 #define BOX2D_SLIDE_SIZE_IN_METERS 100.00f
 
@@ -62,6 +68,36 @@ b2Vec2 convertB2DPointToBox2DVec2(const basegfx::B2DPoint& 
aPoint, const double
 return { static_cast(aPoint.getX() * fScaleFactor),
  static_cast(aPoint.getY() * -fScaleFactor) };
 }
+
+void addTriangleVectorToBody(const basegfx::triangulator::B2DTriangleVector& 
rTriangleVector,
+ b2Body* aBody, const basegfx::B2DRange& 
rShapeBounds,
+ const float fDensity, const float fFriction, 
const float fRestitution,
+ const double fScaleFactor)
+{
+// aAdjustCenter is used to make coordinates relative to center of the 
shape instead of top left
+basegfx::B2DPoint aAdjustCenter(rShapeBounds.getWidth() / 2, 
rShapeBounds.getHeight() / 2);
+for (const basegfx::triangulator::B2DTriangle& aTriangle : rTriangleVector)
+{
+b2FixtureDef aFixture;
+b2PolygonShape aPolygonShape;
+b2Vec2 aTriangleVertices[3];
+basegfx::B2DPoint aTriangleVertice = aTriangle.getA() - aAdjustCenter;
+// putting the operation in place of aTriangleVertice creates weird 
behavior and i dont know why
+aTriangleVertices[0] = convertB2DPointToBox2DVec2(aTriangleVertice, 
fScaleFactor);
+aTriangleVertice = aTriangle.getB() - aAdjustCenter;
+aTriangleVertices[1] = convertB2DPointToBox2DVec2(aTriangleVertice, 
fScaleFactor);
+aTriangleVertice = aTriangle.getC() - aAdjustCenter;
+aTriangleVertices[2] = convertB2DPointToBox2DVec2(aTriangleVertice, 
fScaleFactor);
+
+// FIXME: weird bug when using a bezier curve with >10 vertices
+aPolygonShape.Set(aTriangleVertices, 3);
+aFixture.shape = &aPolygonShape;
+aFixture.density = fDensity;
+aFixture.friction = fFriction;
+aFixture.restitution = fRestitution;
+aBody->CreateFixture(&aFixture);
+}
+}
 }
 
 box2DWorld::box2DWorld(const ::basegfx::B2DVector& rSlideSize)
@@ -224,7 +260,17 @@ void box2DWorld::initateAllShapesAsStaticBodies(
 slideshow::internal::ShapeSharedPtr pShape = aIt->second;
 if (pShape->isForeground())
 {
-Box2DBodySharedPtr pBox2DBody = 
createStaticBodyFromBoundingBox(pShape);
+Box2DBodySharedPtr pBox2DBody;
+
+auto aShapeType = pShape->getXShape()->getShapeType();
+
+if (aShapeType == "com.sun.star.drawing.PolyPolygonShape")
+pBox2DBody = createStaticBodyFromPolygonShape(pShape);
+else if (aShapeType == "com.sun.star.drawing.ClosedBezierShape")
+pBox2DBody = createStaticBodyFromBezierShape(pShape);
+else
+pBox2DBody = createStaticBodyFromBoundingBox(pShape);
+
 mpXShapeToBodyMap.insert(std::make_pair(pShape->getXShape(), 
pBox2DBody));
 if (!pShape->isVisible())
 {
@@ -382,6 +428,72 @@ box2DWorld::createStaticBodyFromBoundingBox(const 
slideshow::internal::ShapeShar
 return std::make_shared(pBody, mfScaleFactor);
 }
 
+Box2DBodySharedPtr
+box2DWorld::createStaticBodyFromPolygonShape(const 
slideshow::internal::ShapeSharedPtr& rShape,
+ const float fDensity, const float 
fFriction)
+{
+assert(mpBox2DWorld);
+
+::basegfx::B2DRectangle aShapeBounds = rShape->getBounds();
+
+b2BodyDef aBodyDef;
+aBodyDef.type = b2_staticBody;
+aBodyDef.position = convertB2DPointToBox2DVec2(aShapeBounds.getCenter(), 
mfScaleFactor);
+
+std::shared_ptr pBody(mpBox2DWorld->CreateBody(&aBodyDef),
+  [](b2Body* pBody) { 
pBody->GetWorld()->DestroyBody(pBody); });
+
+// triangulate and add the geometry to box2d body
+css::uno::Reference xShape = rShape->getXShape();
+const css::uno::Reference xPropSet(xShape, 
css::uno::UNO_QUERY);
+assert(xPropSet.is());
+
+css::uno::Any aAny(xPropSet->getPropertyValue("Geometry"));
+const basegfx::B2DPolyPolygon aPolyPolygon(
+::basegfx::utils::UnoPointSequenceSequenceToB2DPolyPolygon(
+*o3tl::doAccess(aAny)));
+
+// FIXME: Right now skewed/rotated shapes are not handled properly, should 
get and apply transformation etc to the polygon
+basegfx::triangulator::B2DTriangleVector aTriangleVect

Re: CppunitTest: different results depending on execution command

[Xisco Fauli]

Hi Michael,

That might explain why another unittest I created for tdf#132944 was
also giving different results locally and in jenkins, See
https://bugs.documentfoundation.org/show_bug.cgi?id=132944#c10

Do you know how I could reset the test to its original state?

I tried to add something like this at the end of testRedlineViewAuthor

const OUString aEmptyAuthor("");
pView->SetRedlineAuthor(aEmptyAuthor);
pDocShell->SetView(pView);

or

SwEditShell* const pEditShell(pDoc->GetEditShell());
while(pEditShell->GetRedlineCount())
    pEditShell->AcceptRedline(0);

but the new unittest is still failing.

Thanks in advance

On 27/7/20 18:24, Michael Stahl wrote:
> On 27.07.20 17:54, Xisco Fauli wrote:
>> Hello Miklos,
>>
>> On 27/7/20 8:46, Miklos Vajna wrote:
>>> Hi Xisco,
>>>
>>> On Fri, Jul 24, 2020 at 07:51:30PM +0200, Xisco Fauli
>>>  wrote:
 as I mentioned yesterday in the ESC meeting, i'm working on a unittest
 that is passing for me locally but it fails in Jenkins. The patch is
 here: https://gerrit.libreoffice.org/c/core/+/99214

 it turned out it passes when executed with 'make
 CppunitTest_sw_uiwriter
 CPPUNIT_TEST_NAME="testTdf132911::TestBody"' but fails when executed
 with 'make CppunitTest_sw_uiwriter'.

 Any idea why it passes when the test is executed alone and why it
 fails
 when not ?
>>> Most probably one of the tests violate that invariant that none of the
>>> test cases in a suite should alter the global state. You could try to
>>> disable the tests from the suite, i.e. binary search what test causes
>>> the problem. Hopefully you can find a single 2nd test that makes your
>>> new test fail, and then that's easier to investigate that the whole
>>> sw_uiwriter suite, which has 300+ test cases.
>>
>> After disabling some tests here and there, I found
>> SwUiWriterTest::testRedlineViewAuthor is the one affecting the execution
>> of the new test.
>>
>> I'm not sure why it's happening yet but I do believe it has to do with
>> the view being set in
>> https://opengrok.libreoffice.org/xref/core/sw/qa/extras/uiwriter/uiwriter.cxx?r=99d4bf94#5477
>>
>>
>> I tried to add the following like at the end of the unittest but it
>> didn't work:
>>
>> pDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_CLOSEWIN,
>>
>> SfxCallMode::SYNCHRON);
>>
>> ( similar to destroyView in lokhelper <
>> https://opengrok.libreoffice.org/xref/core/sfx2/source/view/lokhelper.cxx?r=2f72fa98#93
>>
>>> )
>>
>> Any idea what is happening and how to solve it? Otherwise I might go
>> with your second solution and put the test somewhere else.
>
> the problem is that it sets a different redline author; this causes
> different paths to be taken in AppendRedline() with checks like
> pRedl->IsOwnRedline(*pNewRedl).
>
> btw i think i'll revert the fix for that bug because i accidentally
> wrote a different fix for it last week (and now i know why that one
> only worked on my master build, because guess what, it has a user-name
> set for some different bug so the redline author name isn't "Unknown
> Author"...), and today i found out why the 2 commits don't like each
> other.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/CppunitTest_sw_uibase_frmdlg.mk sw/Module_sw.mk sw/qa sw/source writerfilter/source

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_uibase_frmdlg.mk  |   73 
 sw/Module_sw.mk |1 
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 
 sw/qa/uibase/frmdlg/data/wrapped-math-object.docx   |binary
 sw/qa/uibase/frmdlg/frmdlg.cxx  |   51 +++
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 -
 sw/source/core/draw/dflyobj.cxx |2 
 sw/source/uibase/app/appenv.cxx |2 
 sw/source/uibase/frmdlg/frmmgr.cxx  |   10 +-
 sw/source/uibase/inc/frmmgr.hxx |3 
 sw/source/uibase/shells/basesh.cxx  |   10 +-
 sw/source/uibase/shells/frmsh.cxx   |4 
 sw/source/uibase/shells/grfsh.cxx   |4 
 sw/source/uibase/shells/textsh.cxx  |4 
 sw/source/uibase/uiview/view2.cxx   |4 
 sw/source/uibase/wrtsh/wrtsh1.cxx   |   11 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |4 
 17 files changed, 162 insertions(+), 29 deletions(-)

New commits:
commit 383f39493c0ca3e11c296fa37e7d9cf679065f74
Author: Miklos Vajna 
AuthorDate: Mon Jul 27 21:03:26 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 27 21:52:53 2020 +0200

tdf#134610 sw: fix incorrect position of math object from DOCX

Regression from commit a2f85c062aafb3fd9dfb1c6c6e87e1e73e7545a3
(tdf#130362 sw: fix anchoring of inline math objects, 2020-02-04), the
problem was that the SwFlyFrameAttrMgr ctor wanted to set the anchor
type to at-char, and then later
DocumentContentOperationsManager::InsertEmbObject() wanted to undo that
for math objects, but this did not play nicely with objects imported
from DOCX.

So don't set and clear the anchor type, rather set it conditionally in
the first place. This allows setting the anchor type in writerfilter/
before insertion, and then all of 1) docx import (depends) 2) insert of
Math objects (as-char) 3) insert of images (at-char) are working.

Change-Id: I94d82c12f30d069426db1bab70c456cadf1c91ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99559
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/CppunitTest_sw_uibase_frmdlg.mk 
b/sw/CppunitTest_sw_uibase_frmdlg.mk
new file mode 100644
index ..5c2b8b7283b7
--- /dev/null
+++ b/sw/CppunitTest_sw_uibase_frmdlg.mk
@@ -0,0 +1,73 @@
+# -*- 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,sw_uibase_frmdlg))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uibase_frmdlg))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_uibase_frmdlg, \
+sw/qa/uibase/frmdlg/frmdlg \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_uibase_frmdlg, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+sal \
+sfx \
+svl \
+svx \
+svxcore \
+sw \
+test \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_uibase_frmdlg,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_uibase_frmdlg,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_uibase_frmdlg,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_uibase_frmdlg))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uibase_frmdlg))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_uibase_frmdlg,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_uibase_frmdlg,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_uibase_frmdlg))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uibase_frmdlg, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_uibase_frmdlg))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 731dc4ef7ca6..1dd4f34cc61f 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_core_doc \
 CppunitTest_sw_uibase_shells \
 CppunitTest_sw_uibase_dochdl \
+CppunitTest_sw_uibase_frmdlg \
 CppunitTest_sw_core_accessibilitycheck \
 CppunitTest_sw_core_layout \
 CppunitTest_sw_core_frmedt \
di

[Libreoffice-commits] core.git: sw/Library_vbaswobj.mk sw/source sw/util

[Noel Grandin (via logerrit)]

 sw/Library_vbaswobj.mk   |1 
 sw/source/ui/vba/service.cxx |   39 ---
 sw/source/ui/vba/service.hxx |   35 ---
 sw/source/ui/vba/vbadocument.cxx |   13 ---
 sw/source/ui/vba/vbaeventshelper.cxx |   29 +-
 sw/source/ui/vba/vbaeventshelper.hxx |5 
 sw/source/ui/vba/vbaglobals.cxx  |   18 
 sw/source/ui/vba/vbawrapformat.cxx   |   13 ---
 sw/util/vbaswobj.component   |   11 +
 9 files changed, 46 insertions(+), 118 deletions(-)

New commits:
commit d12f2e9025250a7e310078ff736f8c6756cf894d
Author: Noel Grandin 
AuthorDate: Sun Jul 26 17:06:45 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 27 21:09:44 2020 +0200

sw/vba: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: Ieaa5ef1eef7488d7b53454bdd3b14702de909beb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99519
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 2b2a5bef6e7b..822c986898d1 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_Library_use_externals,vbaswobj,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
-sw/source/ui/vba/service \
 sw/source/ui/vba/vbarange \
 sw/source/ui/vba/vbacell \
 sw/source/ui/vba/vbacells \
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
deleted file mode 100644
index 43345e302eb1..
--- a/sw/source/ui/vba/service.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-
-#include "service.hxx"
-
-// component exports
-
-namespace sdecl = comphelper::service_decl;
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * vbaswobj_component_getFactory(
-const char * pImplName, void *, void *)
-{
-void* pRet = sdecl::component_getFactoryHelper(pImplName,
-{&globals::serviceDecl, &::document::serviceDecl,
- &wrapformat::serviceDecl, &vbaeventshelper::serviceDecl} );
-SAL_INFO("sw.vba", "Ret is " << pRet);
-return pRet;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/service.hxx b/sw/source/ui/vba/service.hxx
deleted file mode 100644
index 3ed37ff0ffe5..
--- a/sw/source/ui/vba/service.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#ifndef INCLUDED_SW_SOURCE_UI_VBA_SERVICE_HXX
-#define INCLUDED_SW_SOURCE_UI_VBA_SERVICE_HXX
-
-#include 
-
-namespace comphelper::service_decl { class ServiceDecl; }
-
-namespace document {
-extern comphelper::service_decl::ServiceDecl const serviceDecl;
-}
-
-namespace globals {
-extern comphelper::service_decl::ServiceDecl const serviceDecl;
-}
-
-namespace vbaeventshelper {
-extern comphelper::service_decl::ServiceDecl const serviceDecl;
-}
-
-namespace wrapformat {
-extern comphelper::service_decl::ServiceDecl const serviceDecl;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 9d91960e55be..beb74b865e98 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 
-#include "service.hxx"
 #include "vbafilterpropsfromformat.hxx"
 #include "vbadocument.hxx"
 #include "vbarange.hxx"
@@ -708,14 +707,12 @@ SwVbaDocument::getServiceNames()
 return aServiceNames;
 }
 
-namespace document
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+Writer_SwVbaDocument_get_implementation(
+css::uno::XComponentContext* context, c

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source

[Marco Cecchetti (via logerrit)]

 sd/source/core/sdpage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31b595c0785c6991c55f8aa647efb2eab27fb0b8
Author: Marco Cecchetti 
AuthorDate: Thu Jul 23 14:08:47 2020 +0200
Commit: Marco Cecchetti 
CommitDate: Mon Jul 27 20:36:21 2020 +0200

lok: fix-up: isLOKMobilePhone -> isLOKTablet

That was the actual intention.

Change-Id: I2967cea8ae3099e8523438a68c076a786042e15a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99286
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Marco Cecchetti 

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 91ad345e8edf..22dadc5072a7 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2613,7 +2613,7 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) 
const
 #else
 bool isMobileDevice = false;
 if (const SfxViewShell* pCurrentViewShell = SfxViewShell::Current())
-isMobileDevice = pCurrentViewShell->isLOKMobilePhone() || 
pCurrentViewShell->isLOKMobilePhone();
+isMobileDevice = pCurrentViewShell->isLOKMobilePhone() || 
pCurrentViewShell->isLOKTablet();
 #endif
 
 if (eObjKind == PRESOBJ_TITLE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools include/svx solenv/sanitizers svtools/source svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

[Caolán McNamara (via logerrit)]

 include/svtools/brwbox.hxx |4 
 include/svtools/recorditemwindow.hxx   |   23 +
 include/svx/gridctrl.hxx   |  108 +++---
 solenv/sanitizers/ui/svx.suppr |1 
 svtools/source/brwbox/brwbox1.cxx  |   50 +++
 svtools/source/brwbox/brwbox2.cxx  |   11 
 svtools/source/brwbox/recorditemwindow.cxx |   42 +-
 svx/UIConfig_svx.mk|1 
 svx/inc/pch/precompiled_svx.hxx|6 
 svx/inc/pch/precompiled_svxcore.hxx|5 
 svx/source/fmcomp/gridctrl.cxx |  461 +
 svx/uiconfig/ui/navigationbar.ui   |  224 ++
 12 files changed, 539 insertions(+), 397 deletions(-)

New commits:
commit 32f0a170c941522d0b7c0594aa4627a84a0d1b38
Author: Caolán McNamara 
AuthorDate: Sat Jul 25 12:52:30 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 20:13:41 2020 +0200

weld NavigationBar

Change-Id: I5d31d603a9e5f91723a310900aeee875df1599c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99445
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 00b68803515b..63796c752ef8 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -39,7 +39,7 @@
 class BrowserColumn;
 class BrowserHeader;
 class ScrollBar;
-class RecordItemWindow;
+class MeasureStatusBar;
 
 namespace svt {
 class BrowseBoxImpl;
@@ -275,7 +275,7 @@ private:
 VclPtr pDataWin;   // window to display data rows
 VclPtr  pVScroll;   // vertical scrollbar
 VclPtr  aHScroll;   // horizontal scrollbar
-VclPtr aStatusBarHeight; // statusbar, just to measure 
its height
+VclPtr aStatusBarHeight; // statusbar, just to measure 
its height
 
 longnDataRowHeight; // height of a single data-row
 sal_uInt16  nTitleLines;// number of lines in title row
diff --git a/include/svtools/recorditemwindow.hxx 
b/include/svtools/recorditemwindow.hxx
index 576be8766430..06571a7b69ac 100644
--- a/include/svtools/recorditemwindow.hxx
+++ b/include/svtools/recorditemwindow.hxx
@@ -12,24 +12,24 @@
 #include 
 #include 
 
-class SVT_DLLPUBLIC RecordItemWindow : public InterimItemWindow
+class SVT_DLLPUBLIC RecordItemWindowBase
 {
 public:
-RecordItemWindow(vcl::Window* pParent, bool bHasFrame);
-virtual void dispose() override;
-virtual ~RecordItemWindow() override;
+RecordItemWindowBase(std::unique_ptr xEntry);
+virtual ~RecordItemWindowBase();
 
 void set_text(const OUString& rText) { m_xWidget->set_text(rText); }
 void set_font(const vcl::Font& rFont) { m_xWidget->set_font(rFont); }
+void set_help_id(const OString& rHelpId) { 
m_xWidget->set_help_id(rHelpId); }
 
 protected:
+std::unique_ptr m_xWidget;
+
 virtual bool DoKeyInput(const KeyEvent& rEvt);
 
 private:
 virtual void PositionFired(sal_Int64 nRecord);
 
-std::unique_ptr m_xWidget;
-
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 
 DECL_LINK(ActivatedHdl, weld::Entry&, bool);
@@ -39,4 +39,15 @@ private:
 void FirePosition(bool bForce);
 };
 
+class SVT_DLLPUBLIC RecordItemWindow : public InterimItemWindow, public 
RecordItemWindowBase
+{
+public:
+RecordItemWindow(vcl::Window* pParent, bool bHasFrame);
+virtual void dispose() override;
+virtual ~RecordItemWindow() override;
+
+protected:
+virtual bool DoKeyInput(const KeyEvent& rEvt) override;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index c07f9ed464f1..dfcf5cb151af 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -39,10 +39,6 @@ namespace com::sun::star::sdb { class XRowsChangeListener; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XNumberFormatter; }
 
-class Button;
-class ImageButton;
-class FixedText;
-
 class CursorWrapper;
 
 bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight);
@@ -163,67 +159,79 @@ enum class DbGridControlNavigationBarState
 
 class FmXGridSourcePropListener;
 class DisposeListenerGridBridge;
-class SVXCORE_DLLPUBLIC DbGridControl : public svt::EditBrowseBox
+
+// NavigationBar
+class NavigationBar final : public InterimItemWindow
 {
-friend class FmXGridSourcePropListener;
-friend class GridFieldValueListener;
-friend class DisposeListenerGridBridge;
+class AbsolutePos final : public RecordItemWindowBase
+{
+public:
+AbsolutePos(std::unique_ptr xEntry, NavigationBar* pBar);
 
-public:
+virtual bool DoKeyInput(const KeyEvent& rEvt) override;
+virtual void PositionFired(sal_Int64 nRecord) override;
 
-// NavigationBar
+weld::Entry* GetWidget() { return m_xWidget.get(); }
+private:
+VclPtr m_xParent;
+};
 
-class SAL

[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit fe019b702cfe2af24c35f40db340a82892feb69c
Author: Caolán McNamara 
AuthorDate: Mon Jul 27 15:56:54 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 20:13:24 2020 +0200

detect small-button class and minimize padding and size in that case

Change-Id: I7db9d765549112e292f60d1cd47002e45f0136b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99517
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e9c7dab0b0e0..7b9b8b134e3d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -15349,6 +15349,7 @@ private:
 GtkBuilder* m_pBuilder;
 GSList* m_pObjectList;
 GtkWidget* m_pParentWidget;
+GtkCssProvider *m_pSmallButtonProvider;
 gulong m_nNotifySignalId;
 std::vector m_aMnemonicButtons;
 std::vector m_aMnemonicLabels;
@@ -15440,6 +15441,33 @@ private:
 }
 if (gtk_button_get_use_underline(pButton) && 
!gtk_button_get_use_stock(pButton))
 m_aMnemonicButtons.push_back(pButton);
+
+GtkStyleContext *pButtonContext = 
gtk_widget_get_style_context(pWidget);
+if (gtk_style_context_has_class(pButtonContext, "small-button"))
+{
+if (!m_pSmallButtonProvider)
+{
+m_pSmallButtonProvider = gtk_css_provider_new();
+static const gchar data[] = "* { "
+  "padding: 0;"
+  "margin-left: 0px;"
+  "margin-right: 0px;"
+  "min-height: 18px;"
+  "min-width: 18px;"
+  "}";
+const gchar olddata[] = "* { "
+  "padding: 0;"
+  "margin-left: 0px;"
+  "margin-right: 0px;"
+  "}";
+gtk_css_provider_load_from_data(m_pSmallButtonProvider, 
gtk_check_version(3, 20, 0) == nullptr ? data : olddata, -1, nullptr);
+}
+
+gtk_style_context_add_provider(pButtonContext,
+   
GTK_STYLE_PROVIDER(m_pSmallButtonProvider),
+   
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
 }
 else if (GTK_IS_LABEL(pWidget))
 {
@@ -15522,6 +15550,7 @@ public:
 : weld::Builder()
 , m_pStringReplace(Translate::GetReadStringHook())
 , m_pParentWidget(pParent)
+, m_pSmallButtonProvider(nullptr)
 , m_nNotifySignalId(0)
 , m_xInterimGlue(pInterimGlue)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0c21f6600d5e86d4d408e4a59680e8954232db24
Author: Caolán McNamara 
AuthorDate: Mon Jul 27 14:56:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 20:12:36 2020 +0200

drop unused SVTOOLS_IN_EDITBROWSEBOX_HXX define

Change-Id: I7d0944c7772562c8da8ce1ee668434ae8cf7e9c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99515
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 5c8cbef2d9eb..4e718bc708de 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -19,7 +19,6 @@
 
 #ifndef INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX
 #define INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX
-#define SVTOOLS_IN_EDITBROWSEBOX_HXX
 
 #include 
 #include 
@@ -945,7 +944,6 @@ namespace svt
 }   // namespace svt
 
 
-#undef SVTOOLS_IN_EDITBROWSEBOX_HXX
 #endif // INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit de9c2b37961b5f7ddeed2a7597b08458b9760932
Author: Caolán McNamara 
AuthorDate: Mon Jul 27 16:29:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 20:12:58 2020 +0200

map gtk-new symbol to SymbolType::PLUS

Change-Id: Id2fdbc9873377871c929b10e8152151bec02812c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99516
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index caec0ae3b57e..6bbfef0d9574 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -132,6 +132,8 @@ namespace
 eRet = SymbolType::HELP;
 else if (sType == "gtk-close")
 eRet = SymbolType::CLOSE;
+else if (sType == "gtk-new")
+eRet = SymbolType::PLUS;
 else if (!mapStockToImageResource(sType).isEmpty())
 eRet = SymbolType::IMAGE;
 return eRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/window2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b56aaa3bef7b5f3e8641df8e3eb67484fb199ed4
Author: Caolán McNamara 
AuthorDate: Mon Jul 27 12:21:52 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 20:12:05 2020 +0200

make margin-start/margin-left and margin-end/margin-right synonyms

Change-Id: I15dc9a87ca0a25d34b1280eb5e776e933a080a62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99486
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index cf0c74ca2d59..8a6809771c3a 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1516,9 +1516,9 @@ bool Window::set_property(const OString &rKey, const 
OUString &rValue)
 SetQuickHelpText(rValue);
 else if (rKey == "border-width")
 set_border_width(rValue.toInt32());
-else if (rKey == "margin-left")
+else if (rKey == "margin-start" || rKey == "margin-left")
 set_margin_left(rValue.toInt32());
-else if (rKey == "margin-right")
+else if (rKey == "margin-end" || rKey == "margin-right")
 set_margin_right(rValue.toInt32());
 else if (rKey == "margin-top")
 set_margin_top(rValue.toInt32());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/brwbox/brwbox1.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7fd9bd4cdf4ffc03b2280964ef3f7e5917769bbd
Author: Caolán McNamara 
AuthorDate: Mon Jul 27 11:43:12 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 20:11:33 2020 +0200

we want the position of the start of the scrollbar

not its width, but its width and the the width of the corner square
or just take its position if visible

Change-Id: Ideaea789046fb03067501798b5a541985ef75e0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99485
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index 5bac96fc1945..eb185380af8a 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2072,10 +2072,11 @@ bool BrowseBox::ReserveControlArea(sal_uInt16 nWidth)
 tools::Rectangle BrowseBox::GetControlArea() const
 {
 auto nHeight = aHScroll->GetSizePixel().Height();
+auto nEndRight = aHScroll->IsVisible() ? aHScroll->GetPosPixel().X() : 
GetOutputSizePixel().Width();
+
 return tools::Rectangle(
 Point( 0, GetOutputSizePixel().Height() - nHeight ),
-Size( GetOutputSizePixel().Width() - aHScroll->GetSizePixel().Width(),
- nHeight ) );
+Size( nEndRight, nHeight ) );
 }
 
 void BrowseBox::SetMode( BrowserMode nMode )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - oox/source sw/qa

[Szabolcs Toth (via logerrit)]

 oox/source/export/drawingml.cxx   |2 +-
 sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |   12 
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1dc3fa541159e746b81561bb6a6170dcd968704d
Author: Szabolcs Toth 
AuthorDate: Mon May 11 15:56:27 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Mon Jul 27 20:03:26 2020 +0200

tdf#92526 DrawingML shape export: fix 0 line width

0 line width is the thinnest possible line width,
but without its explicit export (a:ln w="0"), shape
outline was imported with 0.75 pt line width by MSO.

Co-authored-by: Balázs Regényi

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93968
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit 96319d662dca12616eb52c601a2d5b5adca3ae57)

Change-Id: I40f7aefe6358bebe9a3853fe3e7d6faa170bc34c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99533
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 468c89ad7b7e..9ef07ec5ef5d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -874,7 +874,7 @@ void DrawingML::WriteOutline( const 
Reference& rXPropSet, Referenc
 
 mpFS->startElementNS( XML_a, XML_ln,
   XML_cap, cap,
-  XML_w, nLineWidth > 1 && nStyleLineWidth != 
nLineWidth ?
+  XML_w, nLineWidth == 0 || (nLineWidth > 1 && 
nStyleLineWidth != nLineWidth) ?
   
OString::number(oox::drawingml::convertHmmToEmu(nLineWidth)).getStr() : nullptr 
);
 
 if( bColorSet )
diff --git a/sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt 
b/sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt
new file mode 100644
index ..fffd9b9b2037
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 7e9bcb639012..089154675288 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1118,6 +1118,18 @@ DECLARE_OOXMLEXPORT_TEST(testArrowMarker, 
"tdf123346_ArrowMarker.docx")
 "/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:tailEnd", "type", 
"arrow");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testShapeLineWidth, "tdf92526_ShapeLineWidth.odt")
+{
+// tdf#92526: Make sure that line with stays 0.
+xmlDocPtr pXml = parseExport("word/document.xml");
+if (!pXml)
+return;
+
+// "w" attribute was not exported.
+assertXPath(pXml, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing"
+"/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln", "w", "0");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/source/core/text/inftxt.cxx |2 +-
 sw/source/core/text/txtftn.cxx |5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9054c903b215892198f54f105947b16544a78f01
Author: Justin Luth 
AuthorDate: Sat Jul 25 13:03:15 2020 +0300
Commit: Justin Luth 
CommitDate: Mon Jul 27 19:47:27 2020 +0200

tdf#108820 sw layout: no ftn fieldshading in repeated header

IsFootnoteAllowed() removes the footnote marker from
the repeated table headers, but it didn't remove the
view menu -> field shadings background.

NewExtraPortion() is the only function that calls
NewFootnotePortion(), and it will create a blank
FieldPortion is nullptr is returned, so return a
null FoonotePortion instead so that we can test
for is-footnote and then prevent the drawing
of the fieldshadings.

FieldShading is an on-screen item only and never printed,
so no unit test is possible.

Change-Id: I940eaf2dc3f4ad808b333d46f0964df31a9345b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99423
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Justin Luth 

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index b7a58b198c6c..a6903b9aab75 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1335,7 +1335,7 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion 
&rPor,
  && ( PortionType::Number != nWhich
   || 
m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel())) // #i27615#
 {
-bDraw = true;
+bDraw = PortionType::Footnote != nWhich || 
m_pFrame->IsFootnoteAllowed();
 }
 break;
 case PortionType::Bookmark:
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 73aff1cf57bf..05f71a25bf74 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -783,10 +783,11 @@ SwFootnotePortion *SwTextFormatter::NewFootnotePortion( 
SwTextFormatInfo &rInf,
 OSL_ENSURE( ! m_pFrame->IsVertical() || m_pFrame->IsSwapped(),
 "NewFootnotePortion with unswapped frame" );
 
+SwTextFootnote  *pFootnote = static_cast(pHint);
+
 if( !m_pFrame->IsFootnoteAllowed() )
-return nullptr;
+return new SwFootnotePortion("", pFootnote);
 
-SwTextFootnote  *pFootnote = static_cast(pHint);
 const SwFormatFootnote& rFootnote = pFootnote->GetFootnote();
 SwDoc *const pDoc = &m_pFrame->GetDoc();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Week 8 Styles Inspector Report

[Shivam Kumar Singh]

Hi,
Last week was the 8th and the last week before the second evaluation.

Work done :-
* tdf#134564 and tdf#134578, It was a little inconvenient to see the
hierarchy in the different styles/properties in the Inspector. Added Tree
Lines to understand parent child relations properly. Also updated ui file
such that unused properties are now greyed out.MERGED
* Headers were added to the ui file so that users can resize the
property/value column according to desire. MERGED
* tdf#135038 Sort the properties for any style for more ordered
inspections. MERGED
* cleanup patch. MERGED
* Direct Formatting pane would always show a few properties by default.
Though it's correct and they should be shown, yet it's confusing to find
properties not manually formatted in the DF pane. Added a patch to hide
them from the panel. MERGED

To do for this week:-
* LO crashes on inserting a chart and then doing undo with Experimental
Features enabled. tdf#135179 and tdf#135178. Fix this
* The ui file shows a weird behaviour, the height of the panel is different
in different environments for different users.tdf#134831. Fix this
* Add translator for the properties
* Add colour box to the Inspector

Much thanks to Tomaz, Heiko, Mike and Caolan for always being available
when I am stuck somewhere and guiding me.

sincerely,
Shivam Kumar Singh
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Output of printf

[Mike Kaganski]

Hi,

On 27.07.2020 19:17, anshu khare wrote:
> 
> So recently I built Libreoffice in Microsoft Visual Studio on Windows.

LibreOffice is build in Cygwin terminal on Windows; Visual Studio IDE
cannot do a full build (although can do a limited rebuild after initial
full build had been completed).

> 
> I want to know if soffice.bin is the console window for Libreoffice.sln
> project.

Since version 6.3, soffice.bin process is a console process, and it is
attached to the debugging console window created by Visual Studio when
you start it from the IDE in IDE integration scenatio, if that's what
you are asking.

> 
> If not, then please tell me where to find the console window to generate
> the output of a simple printf statement.

It all lacks the background, why are you asking? Obviously the first
thing to do would be to add some printf somewhere, make sure it gets
executed, and see if it appears on the console. But you omit this
information, so I can only guess that you have tried that (a patch of
your attempted changes would be helpful, or better a gerrit change), and
somehow failed ... and that's why you ask, right?

SAL_WARN/INFO/etc could be also useful; or using Visual Studio
debugger's breakpoints properties allowing you to make the breakpoint to
output something to IDE output window and continue (thus eliminating a
need to change source code, build, then test).

-- 
Best regards,
Mike Kaganski


pEpkey.asc
Description: application/pgp-keys
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loleaflet/js loleaflet/src

[Henry Castro (via logerrit)]

 loleaflet/js/global.js   |   23 ---
 loleaflet/src/core/LOUtil.js |9 -
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 0bd70f83d9e444cf0ea5e3caabab9cc0e504033e
Author: Henry Castro 
AuthorDate: Mon Jul 27 10:04:07 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Jul 27 18:25:58 2020 +0200

loleaflet: move constant parameters to global initialization

This should be initialized when html is loading

Change-Id: Ief99d3a613ddaa86caaf5285795a97e3f56787b5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99511
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index f1046a3c9..61c7fedde 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -2,6 +2,13 @@
 /* global Uint8Array */
 (function (global) {
 
+   global.getParameterByName = function (name) {
+   name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+   var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
+   var results = regex.exec(location.search);
+   return results === null ? '' : results[1].replace(/\+/g, ' ');
+   };
+
var ua = navigator.userAgent.toLowerCase(),
uv = navigator.vendor.toLowerCase(),
doc = document.documentElement,
@@ -34,6 +41,15 @@
navigator.userAgent.toLowerCase().indexOf('trident') != 
-1);
 
global.L = {};
+
+   global.L.Params = {
+   /// Shows close button if non-zero value provided
+   closeButtonEnabled: global.getParameterByName('closebutton'),
+
+   /// Shows revision history file menu option
+   revHistoryEnabled: global.getParameterByName('revisionhistory'),
+   };
+
global.L.Browser = {
 
// @property ie: Boolean
@@ -674,13 +690,6 @@
};
}
 
-   global.getParameterByName = function (name) {
-   name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
-   var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
-   var results = regex.exec(location.search);
-   return results === null ? '' : results[1].replace(/\+/g, ' ');
-   };
-
global._ = function (string) {
// In the mobile app case we can't use the stuff from 
l10n-for-node, as that assumes HTTP.
if (window.ThisIsAMobileApp) {
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index 617d66433..27aec995a 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -1,5 +1,4 @@
 /* -*- js-indent-level: 8 -*- */
-/* global getParameterByName */
 /*
  * L.LOUtil contains various LO related utility functions used throughout the 
code
  */
@@ -162,11 +161,3 @@ L.LOUtil = {
return -1;
}
 };
-
-L.Params = {
-   /// Shows close button if non-zero value provided
-   closeButtonEnabled: getParameterByName('closebutton'),
-
-   /// Shows revision history file menu option
-   revHistoryEnabled: getParameterByName('revisionhistory'),
-};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest: different results depending on execution command

[Michael Stahl]

On 27.07.20 17:54, Xisco Fauli wrote:

Hello Miklos,

On 27/7/20 8:46, Miklos Vajna wrote:

Hi Xisco,

On Fri, Jul 24, 2020 at 07:51:30PM +0200, Xisco Fauli 
 wrote:

as I mentioned yesterday in the ESC meeting, i'm working on a unittest
that is passing for me locally but it fails in Jenkins. The patch is
here: https://gerrit.libreoffice.org/c/core/+/99214

it turned out it passes when executed with 'make CppunitTest_sw_uiwriter
CPPUNIT_TEST_NAME="testTdf132911::TestBody"' but fails when executed
with 'make CppunitTest_sw_uiwriter'.

Any idea why it passes when the test is executed alone and why it fails
when not ?

Most probably one of the tests violate that invariant that none of the
test cases in a suite should alter the global state. You could try to
disable the tests from the suite, i.e. binary search what test causes
the problem. Hopefully you can find a single 2nd test that makes your
new test fail, and then that's easier to investigate that the whole
sw_uiwriter suite, which has 300+ test cases.


After disabling some tests here and there, I found
SwUiWriterTest::testRedlineViewAuthor is the one affecting the execution
of the new test.

I'm not sure why it's happening yet but I do believe it has to do with
the view being set in
https://opengrok.libreoffice.org/xref/core/sw/qa/extras/uiwriter/uiwriter.cxx?r=99d4bf94#5477

I tried to add the following like at the end of the unittest but it
didn't work:

pDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_CLOSEWIN,
SfxCallMode::SYNCHRON);

( similar to destroyView in lokhelper <
https://opengrok.libreoffice.org/xref/core/sfx2/source/view/lokhelper.cxx?r=2f72fa98#93

)


Any idea what is happening and how to solve it? Otherwise I might go
with your second solution and put the test somewhere else.


the problem is that it sets a different redline author; this causes 
different paths to be taken in AppendRedline() with checks like 
pRedl->IsOwnRedline(*pNewRedl).


btw i think i'll revert the fix for that bug because i accidentally 
wrote a different fix for it last week (and now i know why that one only 
worked on my master build, because guess what, it has a user-name set 
for some different bug so the redline author name isn't "Unknown 
Author"...), and today i found out why the 2 commits don't like each other.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Output of printf

[anshu khare]

Hi

I know that at this point it is a very lame question to ask. But if you
could help me with it would be great.

So recently I built Libreoffice in Microsoft Visual Studio on Windows.

I want to know if soffice.bin is the console window for Libreoffice.sln
project.

If not, then please tell me where to find the console window to generate
the output of a simple printf statement.

Thank you
Anshu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppunitTest: different results depending on execution command

[Xisco Fauli]

Hello Miklos,

On 27/7/20 8:46, Miklos Vajna wrote:
> Hi Xisco,
>
> On Fri, Jul 24, 2020 at 07:51:30PM +0200, Xisco Fauli 
>  wrote:
>> as I mentioned yesterday in the ESC meeting, i'm working on a unittest
>> that is passing for me locally but it fails in Jenkins. The patch is
>> here: https://gerrit.libreoffice.org/c/core/+/99214
>>
>> it turned out it passes when executed with 'make CppunitTest_sw_uiwriter
>> CPPUNIT_TEST_NAME="testTdf132911::TestBody"' but fails when executed
>> with 'make CppunitTest_sw_uiwriter'.
>>
>> Any idea why it passes when the test is executed alone and why it fails
>> when not ?
> Most probably one of the tests violate that invariant that none of the
> test cases in a suite should alter the global state. You could try to
> disable the tests from the suite, i.e. binary search what test causes
> the problem. Hopefully you can find a single 2nd test that makes your
> new test fail, and then that's easier to investigate that the whole
> sw_uiwriter suite, which has 300+ test cases.

After disabling some tests here and there, I found
SwUiWriterTest::testRedlineViewAuthor is the one affecting the execution
of the new test.

I'm not sure why it's happening yet but I do believe it has to do with
the view being set in
https://opengrok.libreoffice.org/xref/core/sw/qa/extras/uiwriter/uiwriter.cxx?r=99d4bf94#5477

I tried to add the following like at the end of the unittest but it
didn't work:

pDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_CLOSEWIN,
SfxCallMode::SYNCHRON);

( similar to destroyView in lokhelper <
https://opengrok.libreoffice.org/xref/core/sfx2/source/view/lokhelper.cxx?r=2f72fa98#93
> )

Any idea what is happening and how to solve it? Otherwise I might go
with your second solution and put the test somewhere else.

Cheers

-- 
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/core/Socket.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 40cf3253bbeb63369954bfda58cb7614aac68565
Author: Pranam Lashkari 
AuthorDate: Mon Jul 20 22:53:52 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Jul 27 17:16:04 2020 +0200

leaflet: resolved Formula bar disappears after session timeout

calcinputbar used to disappear because of no proper initialization after
sassion timeout and that set the wrong width which caused this problem

this makes sure that when reconnecting after session timeout,
first inputbar is unloaded and reloaded properly like first time
(when doc was opened)

Change-Id: Ifbf856d0e565e14b2ef697f342ef6d8e63a5fbd2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96953
Reviewed-by: Ashod Nakashian 
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 91dc50696655a56c312f08f7fbf06eb57ce0f258)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99291
Reviewed-by: Pranam Lashkari 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index f950194cc..b26fd758b 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -484,6 +484,8 @@ L.Socket = L.Class.extend({
{
console.debug('idleness: 
reactivating');
map._documentIdle = false;
+   // force reinitialization of 
calcInputBar(formulabar)
+   map.dialog._calcInputBar.id = 
null;
return map._activate();
}
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Session.cpp common/Session.hpp discovery.xml loleaflet/src wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Tomaž Vajngerl (via logerrit)]

 common/Session.cpp   |1 +
 common/Session.hpp   |   11 ++-
 discovery.xml|2 +-
 loleaflet/src/control/Control.Menubar.js |   22 +++---
 loleaflet/src/control/Toolbar.js |2 +-
 wsd/ClientSession.cpp|   16 +++-
 wsd/ClientSession.hpp|3 ++-
 wsd/DocumentBroker.cpp   |4 
 wsd/LOOLWSD.cpp  |7 ++-
 wsd/LOOLWSD.hpp  |   19 +--
 10 files changed, 72 insertions(+), 15 deletions(-)

New commits:
commit ca00470722ec7a7a7b190ca36a1f71da06ed6847
Author: Tomaž Vajngerl 
AuthorDate: Mon Jul 27 11:27:00 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Jul 27 16:40:12 2020 +0200

allow saving a PDF, add "view_comment" state

This adds a "view_comment" in addition to "view" and "edit" state
into discovery.xml. In case it is enabled, the filters let the
comment commands through to core.

In addition add "Save Comment" menu action to allow saving the
comments, which is enabled when in "read-only" with "view_comment"
mode.

Change-Id: I3ab3dbee93ee2167ae96adea7025fc0b385f8201
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99473
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/common/Session.cpp b/common/Session.cpp
index cdccea9d6..14ecb6276 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -52,6 +52,7 @@ Session::Session(const 
std::shared_ptr &protocol,
 _lastActivityTime(std::chrono::steady_clock::now()),
 _isCloseFrame(false),
 _isReadOnly(readOnly),
+_isAllowChangeComments(false),
 _docPassword(""),
 _haveDocPassword(false),
 _isDocPasswordProtected(false),
diff --git a/common/Session.hpp b/common/Session.hpp
index b42cc38e3..e88a59d89 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -76,9 +76,15 @@ public:
 const std::string& getName() const { return _name; }
 bool isDisconnected() const { return _disconnected; }
 
-virtual void setReadOnly(bool bVal = true) { _isReadOnly = bVal; }
+virtual void setReadOnly(bool bValue = true) { _isReadOnly = bValue; }
 bool isReadOnly() const { return _isReadOnly; }
 
+void setAllowChangeComments(bool bValue = true)
+{
+_isAllowChangeComments = bValue;
+}
+bool isAllowChangeComments() const { return _isAllowChangeComments; }
+
 /// overridden to prepend client ids on messages by the Kit
 virtual bool sendBinaryFrame(const char* buffer, int length);
 virtual bool sendTextFrame(const char* buffer, const int length);
@@ -249,6 +255,9 @@ private:
 /// Whether the session is opened as readonly
 bool _isReadOnly;
 
+/// If the session is read-only, are comments allowed
+bool _isAllowChangeComments;
+
 /// The actual URL, also in the child, even if the child never accesses 
that.
 std::string _docURL;
 
diff --git a/discovery.xml b/discovery.xml
index b694f97d3..b0ea602d4 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -306,7 +306,7 @@
 
 
 
-
+
 
 
 
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 0e8c8e561..bbe8e3132 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -254,6 +254,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:PickList', 'presentation'), id: 
'file', type: 'menu', menu: [
{name: _UNO('.uno:Save', 'presentation'), id: 
'save', type: 'action'},
{name: _UNO('.uno:SaveAs', 'presentation'), id: 
'saveas', type: 'action'},
+   {name: _('Save Comments'), id: 'savecomments', 
type: 'action'},
{name: _('Share...'), id:'shareas', type: 
'action'},
{name: _UNO('.uno:Print', 'presentation'), id: 
'print', type: 'action'},
{name: _('See revision history'), id: 
'rev-history', type: 'action'},
@@ -725,15 +726,16 @@ L.Control.Menubar = L.Control.extend({
commandStates: {},
 
// Only these menu options will be visible in readonly mode
-   allowedReadonlyMenus: ['file', 'downloadas', 'view', 'help'],
+   allowedReadonlyMenus: ['file', 'downloadas', 'view', 'insert', 
'help'],
 
allowedViewModeActions: [
-   'shareas', 'print', // file menu
+   'savecomments', 'shareas', 'print', // file menu
'downloadas-pdf', 'downloadas-odt', 'downloadas-doc', 
'downloadas-docx', 'downloadas-rtf', 'downloadas-epub', // file menu
'downloadas-od

[Libreoffice-commits] online.git: loleaflet/css

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/mobilewizard.css |6 +++---
 loleaflet/css/notebookbar.css  |   32 
 2 files changed, 27 insertions(+), 11 deletions(-)

New commits:
commit 65e3a8de12693a4e32b8d0250b1cacdf580ca50a
Author: Pedro Pinto Silva 
AuthorDate: Mon Jul 27 13:16:25 2020 +0200
Commit: Pedro Silva 
CommitDate: Mon Jul 27 16:25:02 2020 +0200

Notebookbar: Aesthetic fixes and make sure mobilewizard rules from mobile 
do not affect desktop

* Some rules from mobile were affecting notebookbar layout (e.g.: writer: 
tab table)
* Fix paddings in every .unolabel
* Adjust .unoarrow and add hover state
* Remove duplicated selectors (mobilewizard.css)
* Add rules (from mobilewizard.css) that are needed uin the notebookbar to 
notebookbar.css with proper parent: .hasnotebookbar

Change-Id: I22282c53ede39d7952bde1ea9625b4d928aaaea0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99477
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 7bd7cb36c..127e12dfd 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -646,17 +646,17 @@ a.leaflet-control-zoom-in {
vertical-align: top;
padding-left: 4%;
 }
-#buttonnone + label, #buttonbefore + label, #buttonafter + label, 
#buttonoptimal + label, #buttonparallel + label, #buttonnone + label, 
#buttonthrough + label{
+#buttonnone + label, #buttonbefore + label, #buttonafter + label, 
#buttonoptimal + label, #buttonparallel + label, #buttonthrough + label{
padding-left: 0;
 }
 #Color > img{
border-radius:100px;
background-color: #696969;
 }
-#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span, 
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground > 
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic > 
span, #Underline > span, #Strikeout > span, #StyleApply > span, 
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span, 
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript > 
span, #SubScript > span, #AlignLeft > span, #AlignRight > span, 
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span, 
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom > 
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span, 
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet > 
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease > 
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span, 
#CellVertCenter > span, #CellVertBot
 tom > span, .mobile-wizard > div[id*='Table'] > span, div[id*='Row'] > span,  
div[id*='Column'] > span, .mobile-wizard > div[id*='Cell'] > span, 
div[id^=Outline] > span, #nolines > img{
+#mobile-wizard #SendToBack > span, #mobile-wizard #ObjectBackOne > span, 
#mobile-wizard  #ObjectForwardOne > span, #mobile-wizard #BringToFront > span, 
#mobile-wizard #SetObjectToBackground > span, #mobile-wizard 
#SetObjectToForeground > #mobile-wizard span, #mobile-wizard #FlipVertical > 
span, #mobile-wizard #FlipHorizontal > span, #mobile-wizard #Bold > span, 
#mobile-wizard #Italic > span, #mobile-wizard #Underline > span, #mobile-wizard 
#Strikeout > span, #mobile-wizard #StyleApply > span, #mobile-wizard 
#StyleUpdateByExample > span, #mobile-wizard #StyleNewByExample > span, 
#mobile-wizard #Shadowed > span, #mobile-wizard #Grow > span, #mobile-wizard 
#Shrink > span, #mobile-wizard #Color > span, #mobile-wizard #Spacing > span, 
#mobile-wizard #SuperScript > span, #mobile-wizard #SubScript > span, 
#mobile-wizard #AlignLeft > span, #mobile-wizard #AlignRight > span, 
#mobile-wizard #AlignHorizontalCenter > span, #mobile-wizard #AlignBlock > 
span, #mobile-wizard #ParaLeftToRight > spa
 n, #mobile-wizard #ParaRightToLeft > span, #mobile-wizard #AlignTop > span, 
#mobile-wizard #AlignVCenter > span, #mobile-wizard #AlignBottom > span, 
#mobile-wizard #IncrementIndent > span, #mobile-wizard #DecrementIndent > span, 
#mobile-wizard #LeftPara > span, #mobile-wizard #RightPara > span, 
#mobile-wizard #CenterPara > span, #mobile-wizard #JustifyPara > span, 
#mobile-wizard #DefaultBullet > span, #mobile-wizard #DefaultNumbering > span, 
#mobile-wizard #ParaspaceIncrease > span, #mobile-wizard #ParaspaceDecrease > 
span, #mobile-wizard #LineSpacing > span, #mobile-wizard #HangingIndent > span, 
#mobile-wizard #CellVertTop > span, #mobile-wizard #CellVertCenter > span, 
#mobile-wizard #CellVertBottom > span, #mobile-wizard div[id*='Table'] > span, 
#mobile-wizard div[id*='Row'] > span,  #mobile-wizard div[id*='Column'] > span, 
#mobile-wizard div[id*='Cell'] > span, #mobile-wizard div[id^='Outline'] > 
span, #mobile-wizard #nolines > img{
display: none !important;
 }
-#SendToBack, #Object

[Libreoffice-commits] core.git: vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 4addedabe6778e70754709290502d721cdef796d
Author: Luboš Luňák 
AuthorDate: Mon Jul 27 14:42:15 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Jul 27 15:57:33 2020 +0200

tweak not caching images in Skia drawing when upscaling (tdf#132438)

The change done for tdf#134237 was meant to avoid caching of very
large images when zooming in. But it turns out that it happens
quite often that we get asked to draw something larger than
the drawing area, such as when scrolling a document with a larger
image. So tweak the check to hopefully avoid only huge images
or when upscaling a lot.

Change-Id: Ifa76e0ef2df78085afc21fd064b77d5b1c9513b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99482
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index a5d2a484ce6a..066311e97c2b 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1363,7 +1363,27 @@ sk_sp 
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
 // better to rely on Skia to clip and draw only the necessary, rather than 
prepare
 // a very large image only to not use most of it.
 if (targetSize.Width() > GetWidth() || targetSize.Height() > GetHeight())
-return image;
+{
+// This is a bit tricky. The condition above just checks that at least 
a part of the resulting
+// image will not be used (it's larger then our drawing area). But 
this may often happen
+// when just scrolling a document with a large image, where the 
caching may very well be worth it.
+// Since the problem is mainly the cost of upscaling and then the size 
of the resulting bitmap,
+// compute a ratio of how much this is going to be scaled up, how much 
this is larger than
+// the drawing area, and then refuse to cache if it's too much.
+const double upscaleRatio = 1.0 * targetSize.Width() / 
bitmap.GetSize().Width()
+* targetSize.Height() / 
bitmap.GetSize().Height();
+const double oversizeRatio
+= 1.0 * targetSize.Width() / GetWidth() * targetSize.Height() / 
GetHeight();
+const double ratio = upscaleRatio * oversizeRatio;
+if (ratio > 10)
+{
+SAL_INFO("vcl.skia.trace", "mergecachebitmaps("
+   << this << "): not caching 
upscaling, ratio:" << ratio
+   << ", " << bitmap.GetSize() << "->" 
<< targetSize
+   << " in " << Size(GetWidth(), 
GetHeight()));
+return image;
+}
+}
 OString key;
 OStringBuffer keyBuf;
 keyBuf.append(targetSize.Width())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b18c44e7e467ab872dc6283d558c57d91ead45cb
Author: Stephan Bergmann 
AuthorDate: Mon Jul 27 15:17:11 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Jul 27 15:58:16 2020 +0200

Missing quoting

Change-Id: I4ad942f7fa490f072e9751f55a42279345d7d181
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99483
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index e89c23732c40..5e846685cf1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4169,7 +4169,7 @@ if test "$enable_gdb_index" != "no"; then
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; 
]])],[have_ggnu_pubnames=TRUE],[have_ggnu_pubnames=])
 if test "$have_ggnu_pubnames" != "TRUE"; then
 if test "$enable_gdb_index" = "yes"; then
-AC_MSG_ERROR( no, --enable-gdb-index not supported )
+AC_MSG_ERROR([no, --enable-gdb-index not supported])
 else
 AC_MSG_RESULT( no )
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/inc

[Julien Nabet (via logerrit)]

 sfx2/inc/SfxRedactionHelper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8e61e79067e476911e173356c5fdbbeafba0a6c
Author: Julien Nabet 
AuthorDate: Wed Jul 22 13:30:21 2020 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 27 15:48:00 2020 +0200

tdf#135032: autoredaction, take into account emails in lowercase

Change-Id: Ie922a9e7203e46b19a0c7418983b1d0d7e787f02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99216
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 26357bcb3838698e041d7079105144dfb72856e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99209
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 6360bea26ddc8e4d42c2f0c50b4f3974a07a8ce4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99490
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index 65835d75f8eb..f1f3303ca59b 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -125,7 +125,7 @@ public:
 private:
 static constexpr OUStringLiteral m_aPredefinedTargets[6] = {
 "\\b(?:\\d[ -]*?){13,16}\\b", //Credit card numbers
-"\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}\\b", //Email addresses
+"\\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}\\b", //Email 
addresses
 
"\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
 
"\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
 "\\b", //IP addresses
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/Library_dbp.mk extensions/source

[Noel Grandin (via logerrit)]

 extensions/Library_dbp.mk |1 
 extensions/source/dbpilots/dbp.component  |   11 ++-
 extensions/source/dbpilots/dbpservices.cxx|   65 --
 extensions/source/dbpilots/dbpservices.hxx|   34 -
 extensions/source/dbpilots/unoautopilot.hxx   |   44 
 extensions/source/dbpilots/wizardservices.cxx |   89 --
 extensions/source/dbpilots/wizardservices.hxx |   63 --
 7 files changed, 51 insertions(+), 256 deletions(-)

New commits:
commit 843eb355cb960413fef3817b9cbff75ac1f72c7d
Author: Noel Grandin 
AuthorDate: Thu Jul 23 09:39:25 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 27 15:33:51 2020 +0200

extensions/dbp: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: Ifc0cd058dd1ad0f2b66657a6a4287049ebcbebe5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99270
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index ccf7151eb2bb..38c58e4f1f0d 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_use_sdk_api,dbp))
 $(eval $(call gb_Library_add_exception_objects,dbp,\
extensions/source/dbpilots/commonpagesdbp \
extensions/source/dbpilots/controlwizard \
-   extensions/source/dbpilots/dbpservices \
extensions/source/dbpilots/dbptools \
extensions/source/dbpilots/gridwizard \
extensions/source/dbpilots/groupboxwiz \
diff --git a/extensions/source/dbpilots/dbp.component 
b/extensions/source/dbpilots/dbp.component
index 5fb9353093db..5cff1fb3c3fe 100644
--- a/extensions/source/dbpilots/dbp.component
+++ b/extensions/source/dbpilots/dbp.component
@@ -18,14 +18,17 @@
  -->
 
 http://openoffice.org/2010/uno-components";>
-  
+xmlns="http://openoffice.org/2010/uno-components";>
+  
 
   
-  
+  
 
   
-  
+  
 
   
 
diff --git a/extensions/source/dbpilots/dbpservices.cxx 
b/extensions/source/dbpilots/dbpservices.cxx
deleted file mode 100644
index fd2f472ae769..
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include "dbpservices.hxx"
-#include 
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C" {
-
-static void dbp_initializeModule()
-{
-std::once_flag aInit;
-std::call_once(aInit, [&]()
-{
-createRegistryInfo_OGroupBoxWizard();
-createRegistryInfo_OListComboWizard();
-createRegistryInfo_OGridWizard();
-return true;
-});
-}
-
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* dbp_component_getFactory(
-const char* pImplementationName,
-void* pServiceManager,
-void* /*pRegistryKey*/)
-{
-dbp_initializeModule();
-
-Reference< XInterface > xRet;
-if (pServiceManager && pImplementationName)
-{
-xRet = compmodule::OModule::getComponentFactory(
-OUString::createFromAscii(pImplementationName),
-static_cast< XMultiServiceFactory* >(pServiceManager));
-}
-
-if (xRet.is())
-xRet->acquire();
-return xRet.get();
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbpservices.hxx 
b/extensions/source/dbpilots/dbpservices.hxx
deleted file mode 100644
index 2feea60c17b3..
--- a/extensions/source/dbpilots/dbpservices.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Sof

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bb4344751092d276411b43c02bd506703010dcac
Author: Christian Lohmaier 
AuthorDate: Mon Jul 27 15:24:25 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 27 15:24:25 2020 +0200

Update git submodules

* Update translations from branch 'master'
  to d0e75e01d08cb94b06a00110a0dd16404bec760c
  - update translations for master

and force-fix errors using pocheck

Change-Id: Iba2b940b559a295467b1a9e77ef87cadb24633e7

diff --git a/translations b/translations
index d602d2af8c3c..d0e75e01d08c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d602d2af8c3cefdf159918d8a455d17318649c2b
+Subproject commit d0e75e01d08cb94b06a00110a0dd16404bec760c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css

[Pranam Lashkari (via logerrit)]

 loleaflet/css/mobilewizard.css |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 24972fe9776a7fdb4acd5609a7d35b18311412bb
Author: Pranam Lashkari 
AuthorDate: Mon Jul 27 12:16:26 2020 +0530
Commit: Aron Budea 
CommitDate: Mon Jul 27 15:05:57 2020 +0200

leaflet: Notebookbar: resolved "Table" text on tab not visible, and button 
layout is messed up

Change-Id: I27ac375e0960af06c429d6185e7e27361a298169
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99467
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 125a5313c..7bd7cb36c 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -653,10 +653,10 @@ a.leaflet-control-zoom-in {
border-radius:100px;
background-color: #696969;
 }
-#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span, 
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground > 
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic > 
span, #Underline > span, #Strikeout > span, #StyleApply > span, 
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span, 
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript > 
span, #SubScript > span, #AlignLeft > span, #AlignRight > span, 
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span, 
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom > 
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span, 
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet > 
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease > 
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span, 
#CellVertCenter > span, #CellVertBot
 tom > span, div[id*='Table'] > span, div[id*='Row'] > span,  div[id*='Column'] 
> span, div[id*='Cell'] > span, div[id^=Outline] > span, #nolines > img{
+#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span, 
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground > 
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic > 
span, #Underline > span, #Strikeout > span, #StyleApply > span, 
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span, 
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript > 
span, #SubScript > span, #AlignLeft > span, #AlignRight > span, 
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span, 
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom > 
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span, 
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet > 
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease > 
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span, 
#CellVertCenter > span, #CellVertBot
 tom > span, .mobile-wizard > div[id*='Table'] > span, div[id*='Row'] > span,  
div[id*='Column'] > span, .mobile-wizard > div[id*='Cell'] > span, 
div[id^=Outline] > span, #nolines > img{
display: none !important;
 }
-#SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront, 
#SetObjectToBackground, #SetObjectToForeground, #FlipVertical, #FlipHorizontal, 
#Bold, #Italic, #Underline, #Strikeout, #StyleApply, #StyleUpdateByExample, 
#StyleNewByExample, #Shadowed, #Grow, #Shrink, #Spacing, #SuperScript, 
#SubScript,#AlignLeft, #AlignRight, #AlignHorizontalCenter, #AlignBlock, 
#ParaRightToLeft, #ParaLeftToRight, #AlignTop, #AlignVCenter, #AlignBottom, 
#IncrementIndent, #DecrementIndent, #LeftPara, #RightPara, #CenterPara, 
#JustifyPara, #DefaultBullet, #DefaultNumbering, #ParaspaceIncrease, 
#ParaspaceDecrease, #LineSpacing, #HangingIndent, #CellVertTop, 
#CellVertCenter, #CellVertBottom, #ParaspaceIncrease, #ParaspaceDecrease, 
div[id*='Row'], div[id*='Column'], #DeleteTable, #MergeCells, div[id^=Outline], 
#EntireCell, #SelectTable, #EntireColumn, #EntireRow, #SplitCell, #SplitTable{
+#SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront, 
#SetObjectToBackground, #SetObjectToForeground, #FlipVertical, #FlipHorizontal, 
#Bold, #Italic, #Underline, #Strikeout, #StyleApply, #StyleUpdateByExample, 
#StyleNewByExample, #Shadowed, #Grow, #Shrink, #Spacing, #SuperScript, 
#SubScript,#AlignLeft, #AlignRight, #AlignHorizontalCenter, #AlignBlock, 
#ParaRightToLeft, #ParaLeftToRight, #AlignTop, #AlignVCenter, #AlignBottom, 
#IncrementIndent, #DecrementIndent, #LeftPara, #RightPara, #CenterPara, 
#JustifyPara, #DefaultBullet, #DefaultNumbering, #ParaspaceIncrease, 
#ParaspaceDecrease, #LineSpacing, #HangingIndent, #CellVertTop, 
#CellVertCenter, #CellVertBottom, #ParaspaceIncrease, #ParaspaceDecrease, 
div[id*='Row'], div[id*='Column'], #DeleteTable, #MergeCells

[Libreoffice-commits] core.git: vcl/README.vars vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/README.vars |1 +
 vcl/skia/salbmp.cxx |   18 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit a9f68d9d9ae8d7c8f79152055795044993b252ea
Author: Luboš Luňák 
AuthorDate: Mon Jul 27 12:18:55 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon Jul 27 14:48:29 2020 +0200

don't duplicate large memory usage in SkiaSalBitmap (tdf#134342)

Since SkiaSalBitmap is required to support bitmap formats that
Skia itself doesn't support (1bpp, 4bpp, 24bpp,etc.), it needs
to store its own copy of the bitmap data and convert to SkImage
for use. With huge images this can lead to large duplicated
memory usage. Since the code can actually drop the buffer and
create it if needed (which it normally is not), just drop large
buffers after converting to SkImage.
Ideally SalBitmap should be able to say which bitmap formats it
supports and VCL code should oblige, which would allow reusing
the same data.

Change-Id: I98af62a51dde5d738cc8afcdd2fcdc25ff89952f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99476
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/README.vars b/vcl/README.vars
index 73c982ef7d3f..68361ce78d77 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -46,6 +46,7 @@ SAL_ENABLESKIA=1 - enable Skia, unless denylisted (and if the 
VCL backend suppor
 SAL_FORCESKIA=1 - force using Skia, even if denylisted
 SAL_SKIA=raster|vulkan - select Skia's drawing method, by default Vulkan is 
used
 SAL_DISABLE_SKIA_CACHE=1 - disable caching of complex images
+SAL_SKIA_KEEP_BITMAP_BUFFER=1 - SkiaSalBitmap will keep its bitmap buffer even 
after storing in SkImage
 
 OpenGL,Skia
 ---
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 6373eeea405a..dda47b46fa25 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -586,7 +586,23 @@ const sk_sp& SkiaSalBitmap::GetSkImage() const
 SkiaZone zone;
 sk_sp image = SkiaHelper::createSkImage(GetAsSkBitmap());
 assert(image);
-const_cast&>(mImage) = image;
+SkiaSalBitmap* thisPtr = const_cast(this);
+thisPtr->mImage = image;
+// The data is now stored both in the SkImage and in our mBuffer, which 
with large
+// images can waste quite a lot of memory. Ideally we should store the 
data in Skia's
+// SkBitmap, but LO wants us to support data formats that Skia doesn't 
support.
+// So just drop our buffer, it usually won't be needed anyway, and it'll 
be converted
+// back by EnsureBitmapData() if yes. Do this only with raster, to avoid 
GPU->CPU
+// transfer in GPU mode. Also don't do this with paletted bitmaps, where 
EnsureBitmapData()
+// would be expensive.
+// Ideally SalBitmap should be able to say which bitmap formats it supports
+// and VCL code should oblige, which would allow reusing the same data.
+static bool keepBitmapBuffer = getenv("SAL_SKIA_KEEP_BITMAP_BUFFER") != 
nullptr;
+constexpr long maxBufferSize = 2000 * 2000 * 4;
+if (!keepBitmapBuffer && SkiaHelper::renderMethodToUse() == 
SkiaHelper::RenderRaster
+&& mPixelsSize.Height() * mScanlineSize > maxBufferSize
+&& (mBitCount > 8 || (mBitCount == 8 && mPalette.IsGreyPalette8Bit(
+thisPtr->ResetToSkImage(mImage);
 SAL_INFO("vcl.skia.trace", "getskimage(" << this << ")");
 return mImage;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridctrl.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 3395e0baa6350e6f9e093fe5af51d283f45fede7
Author: Caolán McNamara 
AuthorDate: Mon Jul 27 10:03:05 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 14:45:22 2020 +0200

Setting the Button repeat is ignored in practice

The timeout used is still the original 90ms, not the attempt to use 22ms so
this doesn't achieve anything. Making 22ms stick is way too fast, so leave
this at the value that is currently actually used.

Change-Id: I7207dd9adebf4e0f7f4e486a71f388bc6760d939
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99470
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index f3b06d9d6453..820df8eb75e9 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -356,13 +356,6 @@ DbGridControl::NavigationBar::NavigationBar(vcl::Window* 
pParent)
 m_aRecordCount->Disable();
 m_aAbsolute->Disable();
 
-AllSettings aSettings = m_aNextBtn->GetSettings();
-MouseSettings aMouseSettings = aSettings.GetMouseSettings();
-aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
-aSettings.SetMouseSettings(aMouseSettings);
-m_aNextBtn->SetSettings(aSettings, true);
-m_aPrevBtn->SetSettings(aSettings, true);
-
 m_aFirstBtn->Show();
 m_aPrevBtn->Show();
 m_aNextBtn->Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css

[Szymon Kłos (via logerrit)]

 loleaflet/css/notebookbar.css |5 +
 1 file changed, 5 insertions(+)

New commits:
commit de0aa9238eb2fcaf4f209b7d006e44990029080f
Author: Szymon Kłos 
AuthorDate: Mon Jul 27 14:04:55 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 27 14:34:49 2020 +0200

notebookbar: don't move arrow to new line for linespacing

When window was small arrow was moved to the next line
and notebookbar layouw was broken.

Change-Id: I7532a25b1a684aaaba70cfd28f9a3ee891f1d446
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99481
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 3cad6dbb6..906cbb76a 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -105,6 +105,11 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
margin: 0px 5px 0px 0px !important;
 }
 
+/* avoid bug with arrow in new line when window is small */
+#LineSpacing.notebookbar {
+   width: 40px;
+}
+
 #buttonbefore.notebookbar, #buttonafter.notebookbar, 
#buttonoptimal.notebookbar, #buttonparallel.notebookbar, 
#buttonnone.notebookbar, #buttonthrough.notebookbar, #bottom.notebookbar, 
#top.notebookbar, #standard.notebookbar, #Bold.notebookbar, 
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar{
margin: 0px !important;
padding: 0px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |5 -
 loleaflet/src/unocommands.js |2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5fe04a4a40a34a4ce7f1cf650375a6caf13c6cac
Author: Szymon Kłos 
AuthorDate: Mon Jul 27 12:20:45 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 27 14:35:19 2020 +0200

Add missing dialogs in menubar

Added dialogs are already converted to be async
and are present in the notebookbar interface.

Change-Id: Ia15f9a5f5524cef20948b45d0d465620091f12ec
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99475
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index ca4274902..0e8c8e561 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -189,6 +189,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:OutlineBullet'},
{uno: '.uno:PageDialog'},
{uno: '.uno:EditRegion'},
+   {uno: '.uno:TitlePageDialog'},
{type: 'separator'},
{uno: '.uno:TransformDialog'},
{uno: '.uno:FormatLine'},
@@ -234,6 +235,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('None (Do not check 
spelling)'), id: 'nonelanguage', uno: 
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{uno: '.uno:WordCountDialog'},
+   {uno: '.uno:LineNumberingDialog'},
{type: 'separator'},
{name: _UNO('.uno:AutoFormatMenu', 'text'), 
type: 'menu', menu: [
{uno: '.uno:OnlineAutoFormat'}]}
@@ -339,7 +341,8 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:TableDeleteMenu', 
'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
{uno: '.uno:DeleteRows'},
{uno: '.uno:DeleteColumns'}]},
-   {uno: '.uno:MergeCells'}]
+   {uno: '.uno:MergeCells'},
+   {uno: '.uno:TableDialog'}]
},
{name: _UNO('.uno:SlideMenu', 'presentation'), type: 
'menu', menu: [
{name: _UNO('.uno:InsertSlide', 
'presentation'), id: 'insertpage', type: 'action'},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 449880c74..0d12241c6 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -204,6 +204,7 @@ var unoCommandsArray = {
LanguageStatus:{global:{menu:_('Language Status'),},},
LayoutStatus:{presentation:{menu:_('Layout'),},},
LeftPara:{global:{context:_('Align Left'),menu:_('Left'),},},
+   LineNumberingDialog:{text:{menu:_('~Line Numbering...'),},},
MasterSlidesPanel:{presentation:{menu:_('Master Slides'),},},
MergeCells:{presentation:{menu:_('Merge 
Cells'),},spreadsheet:{menu:_('Merge Cells'),},text:{menu:_('Merge Cells'),},},
ModifyPage:{presentation:{menu:_('Slide ~Layout'),},},
@@ -315,6 +316,7 @@ var unoCommandsArray = {
Text:{global:{context:_('Insert Text Box'),menu:_('~Text Box'),},},
TextAlign:{global:{menu:_('Alig~n'),},},

ThesaurusDialog:{global:{menu:_('~Thesaurus...'),},text:{menu:_('~Thesaurus...'),},},
+   TitlePageDialog:{text:{menu:_('Title Page...'),},},
ToggleMergeCells:{spreadsheet:{menu:_('M~erge and Center Cells'),},},
ToolsMenu:{global:{menu:_('~Tools'),},},
TrackChanges:{text:{menu:_('~Record'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source sw/qa

[Tünde Tóth (via logerrit)]

 chart2/source/view/charttypes/VSeriesPlotter.cxx |8 +++-
 sw/qa/extras/layout/data/tdf134866.docx  |binary
 sw/qa/extras/layout/layout.cxx   |   16 
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit c0fac974cefffb16e811259fbc66148712533190
Author: Tünde Tóth 
AuthorDate: Fri Jul 24 10:06:40 2020 +0200
Commit: László Németh 
CommitDate: Mon Jul 27 14:11:10 2020 +0200

tdf#134866 Chart OOXML import: fix percentage in custom pie chart label

Custom pie chart label showed incorrect percentage value.

Follow-up of commit 8c1dc30cc9fc96ef3d3ab0c4445959473248ae4d
(tdf#125444 Percentage as custom chart label).

Change-Id: I2fe9cbca876da26a7c3a371c1e711b9e1fc33b1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99353
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index dbb8dbd8fbd4..14b322e8f587 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -533,7 +533,13 @@ uno::Reference< drawing::XShape > 
VSeriesPlotter::createDataLabel( const uno::Re
 }
 case DataPointCustomLabelFieldType_PERCENTAGE:
 {
-aTextList[i] = getLabelTextForValue( rDataSeries, 
nPointIndex, fValue, true );
+if(fSumValue == 0.0)
+   fSumValue = 1.0;
+fValue /= fSumValue;
+if(fValue < 0)
+   fValue *= -1.0;
+
+aTextList[i] = getLabelTextForValue(rDataSeries, 
nPointIndex, fValue, true);
 break;
 }
 case DataPointCustomLabelFieldType_CELLREF:
diff --git a/sw/qa/extras/layout/data/tdf134866.docx 
b/sw/qa/extras/layout/data/tdf134866.docx
new file mode 100644
index ..3358b527133c
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134866.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 710efbf54f89..d6249e412b44 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2785,6 +2785,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf129173)
 pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[22]/text", "56");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134866)
+{
+SwDoc* pDoc = createDoc("tdf134866.docx");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Check the data label of pie chart.
+assertXPathContent(
+pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[2]/text", "100%");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf130031)
 {
 SwDoc* pDoc = createDoc("tdf130031.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/workben

[Miklos Vajna (via logerrit)]

 include/vcl/filter/pdfdocument.hxx |2 
 vcl/source/filter/ipdf/pdfdocument.cxx |   13 +
 xmlsecurity/inc/pdfio/pdfdocument.hxx  |6 
 xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  |   17 +
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |3 
 xmlsecurity/source/pdfio/pdfdocument.cxx   |  140 ++---
 xmlsecurity/workben/pdfverify.cxx  |6 
 8 files changed, 153 insertions(+), 34 deletions(-)

New commits:
commit f6d61d6bb03082420c8f2e4820f8e5d9258ff74c
Author: Miklos Vajna 
AuthorDate: Fri Jul 24 11:29:27 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 27 13:56:21 2020 +0200

xmlsecurity: detect unsigned incremental update between signatures

(cherry picked from commit 7468d5df5ec79783eae84b62bdc5ecf12f0ca255)

Conflicts:
xmlsecurity/source/pdfio/pdfdocument.cxx

Change-Id: I269ed858852ee7d1275adf340c8cc1565fc30693
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99478
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index 281201d888ae..50679a9fd996 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -442,6 +442,8 @@ public:
 std::vector GetSignatureWidgets();
 /// Remove the nth signature from read document in the edit buffer.
 bool RemoveSignature(size_t nPosition);
+/// Get byte offsets of the end of incremental updates.
+const std::vector& GetEOFs() const;
 //@}
 
 /// See vcl::PDFObjectContainer::createObject().
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index e45e1574d34f..009c01f323b6 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -152,6 +152,8 @@ bool PDFDocument::RemoveSignature(size_t nPosition)
 return m_aEditBuffer.good();
 }
 
+const std::vector& PDFDocument::GetEOFs() const { return m_aEOFs; }
+
 sal_Int32 PDFDocument::createObject()
 {
 sal_Int32 nObject = m_aXRef.size();
@@ -2149,7 +2151,16 @@ bool PDFCommentElement::Read(SvStream& rStream)
 m_aComment = aBuf.makeStringAndClear();
 
 if (m_aComment.startsWith("%%EOF"))
-m_rDoc.PushBackEOF(rStream.Tell());
+{
+sal_uInt64 nPos = rStream.Tell();
+if (ch == '\r')
+{
+// If the comment ends with a \r\n, count the \n as well 
to match Adobe Acrobat
+// behavior.
+nPos += 1;
+}
+m_rDoc.PushBackEOF(nPos);
+}
 
 SAL_INFO("vcl.filter", "PDFCommentElement::Read: m_aComment is '" 
<< m_aComment << "'");
 return true;
diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx 
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 996bb1527bb8..f7e36492e746 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -18,6 +18,7 @@ namespace vcl
 namespace filter
 {
 class PDFObjectElement;
+class PDFDocument;
 }
 }
 struct SignatureInformation;
@@ -29,12 +30,13 @@ namespace pdfio
 {
 /**
  * @param rInformation The actual result.
- * @param bLast If this is the last signature in the file, so it covers the 
whole file physically.
+ * @param rDocument the parsed document to see if the signature is partial.
  * @return If we can determinate a result.
  */
 XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& rStream,
  vcl::filter::PDFObjectElement* 
pSignature,
- SignatureInformation& 
rInformation, bool bLast);
+ SignatureInformation& 
rInformation,
+ vcl::filter::PDFDocument& 
rDocument);
 
 } // namespace pdfio
 } // namespace xmlsecurity
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf
new file mode 100644
index ..211a111cb394
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/partial-in-between.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index dc037f47b33f..4f62aae93281 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -94,9 +94,8 @@ std::vector 
PDFSigningTest::verify(const OUString& rURL, s
 for (size_t i = 0; i < aSignatures.size(); ++i)
 {
 SignatureInformation aInfo(i);
-bool bLast = i == aSignatures.size() - 1;
 CPPUNIT_ASSERT(
-xmlsecurity::pdfio::ValidateSignature(aStream, aSign

GSoC Report Week 8 (Yusuf Keten)

[Yusuf Keten]

Hello,

Here is my report which includes the progress in the 8th week.

https://yusufketen.com/post/2020-07-27-libreoffice-gsoc-week-8-report/

I'm waiting for all your feedback.

Best regards,
Yusuf Keten
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/qa sc/source

[Tibor Nagy (via logerrit)]

 sc/qa/unit/data/xlsx/tdf134826.xlsx   |binary
 sc/qa/unit/subsequent_export-test.cxx |   32 
 sc/source/filter/oox/pagesettings.cxx |6 --
 3 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 055735fa8589670f67e016bc3b7835d4cf81641f
Author: Tibor Nagy 
AuthorDate: Fri Jul 17 13:23:41 2020 +0200
Commit: László Németh 
CommitDate: Mon Jul 27 13:39:09 2020 +0200

tdf#134826 XLSX import: extend localized bold/italic footer/header

OOXML formatting code support with Hungarian "félkövér" (semibold)
and "dőlt" (italic), similar to German, according to formatting
code standard of OOXML 18.3.1.46 headerFooter (Header Footer
Settings): "Both font-name and font-type can be localized values."

Co-authored-by: Attila Szűcs (NISZ)

Change-Id: I95de548fe27d4a6c4e9504dc1f746c8d4419222b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99016
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sc/qa/unit/data/xlsx/tdf134826.xlsx 
b/sc/qa/unit/data/xlsx/tdf134826.xlsx
new file mode 100644
index ..dd86afea2cd5
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf134826.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index b645979f6b84..f0e4b5c44c55 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -254,6 +254,7 @@ public:
 void testTdf83779();
 void testTdf134459_HeaderFooterColorXLSX();
 void testTdf134817_HeaderFooterTextWith2SectionXLSX();
+void testHeaderFontStyleXLSX();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -406,6 +407,7 @@ public:
 CPPUNIT_TEST(testTdf83779);
 CPPUNIT_TEST(testTdf134459_HeaderFooterColorXLSX);
 CPPUNIT_TEST(testTdf134817_HeaderFooterTextWith2SectionXLSX);
+CPPUNIT_TEST(testHeaderFontStyleXLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -5182,6 +5184,36 @@ void 
ScExportTest::testTdf134817_HeaderFooterTextWith2SectionXLSX()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testHeaderFontStyleXLSX()
+{
+ScDocShellRef xShell = loadDoc("tdf134826.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocument& rDoc = xShell->GetDocument();
+SfxStyleSheetBase* pStyleSheet = 
rDoc.GetStyleSheetPool()->Find(rDoc.GetPageStyle(0), SfxStyleFamily::Page);
+const SfxItemSet& rItemSet = pStyleSheet->GetItemSet();
+const ScPageHFItem& rHFItem = rItemSet.Get(ATTR_PAGE_HEADERRIGHT);
+const EditTextObject* pTextObj = rHFItem.GetLeftArea();
+
+std::vector rLst;
+
+// first line is bold.
+pTextObj->GetCharAttribs(0, rLst);
+bool bHasBold = std::any_of(rLst.begin(), rLst.end(), [](const 
EECharAttrib& rAttrib) {
+return rAttrib.pAttr->Which() == EE_CHAR_WEIGHT &&
+static_cast(*rAttrib.pAttr).GetWeight() == 
WEIGHT_BOLD; });
+CPPUNIT_ASSERT_MESSAGE("First line should be bold.", bHasBold);
+
+// second line is italic.
+pTextObj->GetCharAttribs(1, rLst);
+bool bHasItalic = std::any_of(rLst.begin(), rLst.end(), [](const 
EECharAttrib& rAttrib) {
+return rAttrib.pAttr->Which() == EE_CHAR_ITALIC &&
+static_cast(*rAttrib.pAttr).GetPosture() == 
ITALIC_NORMAL; });
+CPPUNIT_ASSERT_MESSAGE("Second line should be italic.", bHasItalic);
+
+xShell->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/oox/pagesettings.cxx 
b/sc/source/filter/oox/pagesettings.cxx
index d2baf2b92354..b1854659f4ac 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -453,7 +453,8 @@ const char* const sppcBoldNames[] =
 "demibold",
 "halbfett", // German 'demibold'
 "black",
-"heavy"
+"heavy",
+"f\303\251lk\303\266v\303\251r"  // Hungarian 'bold'
 };
 
 // different names for italic font style (lowercase)
@@ -463,7 +464,8 @@ const char* const sppcItalicNames[] =
 "kursiv",   // German 'italic'
 "oblique",
 "schr\303\204g",// German 'oblique' with uppercase A umlaut
-"schr\303\244g" // German 'oblique' with lowercase A umlaut
+"schr\303\244g",// German 'oblique' with lowercase A umlaut
+"d\305\221lt"   // Hungarian 'italic'
 };
 
 } // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Blurry Shadow Weekly Update

[Ahmad Ganzouri]

Hello,

It has been a very busy week for me because of my exams. However, I have
managed to work on the additional part of extending the UI.

I have added a spin button to control the blur of the shadow through the
shadow tab page in the  area dialog. it works in all modules now.

I will submit the patch today to be reviewed.

Regards,
Ahmad.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1d1ea369da6e027b1ed1453584233f0f7cdcf223
Author: Caolán McNamara 
AuthorDate: Sat Jul 25 20:49:05 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 27 12:05:42 2020 +0200

A GtkButton is already sufficient to get mouse events

Change-Id: Ia61a7906198bf6b6a4ce188d7de9a627c8540af4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99450
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 003af767ca65..e9c7dab0b0e0 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1929,7 +1929,7 @@ protected:
 m_aFocusOutHdl.Call(*this);
 }
 
-void ensureMouseEventWidget()
+virtual void ensureMouseEventWidget()
 {
 if (!m_pMouseEventBox)
 m_pMouseEventBox = ::ensureEventWidget(m_pWidget);
@@ -6662,6 +6662,13 @@ private:
 pThis->signal_clicked();
 }
 
+virtual void ensureMouseEventWidget() override
+{
+// The GtkButton is sufficient to get mouse events without an 
intermediate GtkEventBox
+if (!m_pMouseEventBox)
+m_pMouseEventBox = m_pWidget;
+}
+
 public:
 GtkInstanceButton(GtkButton* pButton, GtkInstanceBuilder* pBuilder, bool 
bTakeOwnership)
 : GtkInstanceContainer(GTK_CONTAINER(pButton), pBuilder, 
bTakeOwnership)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bakos Attila (via logerrit)]

 sw/source/uibase/shells/drwbassh.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 06fd06597796d9e92117602245f3968c93707708
Author: Bakos Attila 
AuthorDate: Mon Jul 20 14:30:39 2020 +0200
Commit: László Németh 
CommitDate: Mon Jul 27 11:56:23 2020 +0200

tdf#124430 Writer Editing: Fix textbox aligning

Before, when align function was used the textboxes
(shape+frame) went apart, now the textframe follows
the shape.

Co-dev: Attila Bánhegyi (NISZ)
Change-Id: I4d69a2f7f4e5ef50d17bb0871c501d6e0026d0e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99048
Reviewed-by: Attila Bakos 
Reviewed-by: László Németh 
Tested-by: Jenkins
Tested-by: László Németh 

diff --git a/sw/source/uibase/shells/drwbassh.cxx 
b/sw/source/uibase/shells/drwbassh.cxx
index bccbe313bdf9..c707b803736b 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -478,6 +479,8 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
 SwFormatHoriOrient 
aHOrient(pFrameFormat->GetFormatAttr(RES_HORI_ORIENT));
 aHOrient.SetHoriOrient( nHorizOrient );
 pFrameFormat->SetFormatAttr(aHOrient);
+if (auto pTxFrm = 
SwTextBoxHelper::getOtherTextBoxFormat(pFrameFormat, RES_DRAWFRMFMT))
+pTxFrm->SetFormatAttr(aHOrient);
 pSh->EndAction();
 }
 
@@ -489,6 +492,8 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
 SwFormatVertOrient 
aVOrient(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT));
 aVOrient.SetVertOrient( nVertOrient );
 pFrameFormat->SetFormatAttr(aVOrient);
+if (auto pTxFrm = 
SwTextBoxHelper::getOtherTextBoxFormat(pFrameFormat, RES_DRAWFRMFMT))
+pTxFrm->SetFormatAttr(aVOrient);
 pSh->EndAction();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_sw_ooxmlexport4 failing with --disable-pch on Windows

[Stephan Bergmann]

On 22/07/2020 10:18, Stephan Bergmann wrote:

Serge, can you see to get that fixed?


I can confirm that 
 
"tdf#134043 reset global state for unit test" fixes 
CppunitTest_sw_ooxmlexpor4 for my --disable-pch Windows build.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Serge Krot (via logerrit)]

 sc/source/filter/xcl97/xcl97rec.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05b1e42a168b9675cff45b6be3ca8c28f01a629a
Author: Serge Krot 
AuthorDate: Tue Jul 21 16:05:15 2020 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 27 11:21:31 2020 +0200

tdf#134769 XLSX export fix: unable to open with MS Excel

Change-Id: I8fff01118e25768ca54c816fcb0eb522da6f38bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99149
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 641dbafcb4c7b00bc9e56b58d12c95a6f05ee88d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99395
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/filter/xcl97/xcl97rec.cxx 
b/sc/source/filter/xcl97/xcl97rec.cxx
index 37c55e9d629c..4a4656f57a94 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -364,8 +364,8 @@ void XclExpObjList::SaveXml( XclExpXmlStream& rStrm )
 return;
 
 SaveDrawingMLObjects( *this, rStrm );
-SaveFormControlObjects( *this, rStrm );
 SaveVmlObjects( *this, rStrm, mnVmlCount );
+SaveFormControlObjects( *this, rStrm );
 }
 
 void XclExpObjList::ResetCounters()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |  148 +-
 1 file changed, 97 insertions(+), 51 deletions(-)

New commits:
commit 14e87a4b15d31a34e6053f6194688f3aa23af991
Author: Michael Stahl 
AuthorDate: Fri Jul 24 19:41:29 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 27 11:17:17 2020 +0200

tdf#133967 sw_redlinehide: fix redline deletion of table containing redlines

A delete redline is created from node 371 to node 1625; there are
existing redlines in the range, so AppendRedline() splits the new
redline into pieces between and on the existing redlines.

Even worse, because some of the existing redlines are in a table,
InsertWithValidRanges() then splits the pieces that overlap the table
into even smaller pieces, such that there are now the table structural
nodes that were in the initial new delete redline's range but are now
covered by none of the pieces.

This means that multiple merged text frames are created, with non-merged
frames between them, and thus the functions
UpdateFramesForAddDeleteRedline() and
UpdateFramesForRemoveDeleteRedline() [for Undo] have to deal with this
unexpected complication.

(regression from sw_redlinehide)

Change-Id: Ibf71c1deb2bc3fa2af16035954d5ef71b6827be5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99411
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index c0e1aa6add8c..00cf50225d1a 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -161,31 +161,55 @@ void UpdateFramesForAddDeleteRedline(SwDoc & rDoc, SwPaM 
const& rPam)
 }
 else
 {
-std::vector frames;
-SwIterator 
aIter(*pStartNode);
-for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+SwTextNode * pNode(pStartNode);
+do
 {
-if (pFrame->getRootFrame()->IsHideRedlines())
+std::vector frames;
+SwIterator 
aIter(*pNode);
+for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
 {
-frames.push_back(pFrame);
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.push_back(pFrame);
+}
 }
+if (frames.empty())
+{
+auto const& layouts(rDoc.GetAllLayouts());
+assert(std::none_of(layouts.begin(), layouts.end(),
+[](SwRootFrame const*const pLayout) { return 
pLayout->IsHideRedlines(); }));
+(void) layouts;
+break;
+}
+auto eMode(sw::FrameMode::Existing);
+SwTextNode * pLast(pNode);
+for (SwTextFrame * pFrame : frames)
+{
+SwTextNode & rFirstNode(pFrame->GetMergedPara()
+? *pFrame->GetMergedPara()->pFirstNode
+: *pNode);
+assert(pNode == pStartNode
+? rFirstNode.GetIndex() <= pNode->GetIndex()
+: &rFirstNode == pNode);
+// clear old one first to avoid DelFrames confusing updates & 
asserts...
+pFrame->SetMergedPara(nullptr);
+pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
+*pFrame, rFirstNode, eMode));
+eMode = sw::FrameMode::New; // Existing is not idempotent!
+// the first node of the new redline is not necessarily the 
first
+// node of the merged frame, there could be another redline 
nearby
+sw::AddRemoveFlysAnchoredToFrameStartingAtNode(*pFrame, 
*pNode, nullptr);
+// if redline is split across table and table cell is empty, 
there's no redline in the cell and so no merged para
+if (pFrame->GetMergedPara())
+{
+pLast = 
const_cast(pFrame->GetMergedPara()->pLastNode);
+}
+}
+SwNodeIndex tmp(*pLast);
+// skip over hidden sections!
+pNode = 
static_cast(pLast->GetNodes().GoNextSection(&tmp, 
/*bSkipHidden=*/true, /*bSkipProtect=*/false));
 }
-auto eMode(sw::FrameMode::Existing);
-for (SwTextFrame * pFrame : frames)
-{
-SwTextNode & rFirstNode(pFrame->GetMergedPara()
-? *pFrame->GetMergedPara()->pFirstNode
-: *pStartNode);
-assert(rFirstNode.GetIndex() <= pStartNode->GetIndex());
-// clear old one first to avoid DelFrames confusing updates & 
asserts...
-pFrame->SetMergedPara(nullptr);
-pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
-*pFrame, rFirstNode, eMode));
-e

[Libreoffice-commits] core.git: sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   22 ++
 sw/source/core/undo/undel.cxx  |   25 ++---
 2 files changed, 36 insertions(+), 11 deletions(-)

New commits:
commit e0b910d3296bd6338f1c3fd67ed97af70b60264a
Author: Michael Stahl 
AuthorDate: Thu Jul 23 12:05:44 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 27 11:15:35 2020 +0200

sw_redlinehide: fix "delete of insert redline"

Don't delete frames on start node in SwUndoDelete::UndoImpl; happens
on SwUiWriterTest::testTdf83260().

(regression from ad0351b84926075297fb74abbe9b31a0455782af)

Change-Id: I271d8bcbe4ab266e9e922e144450f05a24d183cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99410
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 02cf3597baf1..45361b4762d9 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1640,14 +1640,36 @@ void SwUiWriterTest::testTdf83260()
 {
 rUndoManager.Undo();
 }
+// check that every text node has a layout frame
+for (sal_uLong i = 0; i < pDoc->GetNodes().Count(); ++i)
+{
+if (SwTextNode const*const pNode = pDoc->GetNodes()[i]->GetTextNode())
+{
+CPPUNIT_ASSERT(pNode->getLayoutFrame(nullptr, nullptr, nullptr));
+}
+}
 for (auto i = nActions; 0 < i; --i)
 {
 rUndoManager.Redo();
 }
+for (sal_uLong i = 0; i < pDoc->GetNodes().Count(); ++i)
+{
+if (SwTextNode const*const pNode = pDoc->GetNodes()[i]->GetTextNode())
+{
+CPPUNIT_ASSERT(pNode->getLayoutFrame(nullptr, nullptr, nullptr));
+}
+}
 for (auto i = nActions; 0 < i; --i)
 {
 rUndoManager.Undo();
 }
+for (sal_uLong i = 0; i < pDoc->GetNodes().Count(); ++i)
+{
+if (SwTextNode const*const pNode = pDoc->GetNodes()[i]->GetTextNode())
+{
+CPPUNIT_ASSERT(pNode->getLayoutFrame(nullptr, nullptr, nullptr));
+}
+}
 }
 
 void SwUiWriterTest::testTdf130274()
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index cc001373cc37..9a525eb19cbd 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -1058,19 +1058,22 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 if (m_bDisableMakeFrames) // tdf#132944
 {
 assert(!m_bDelFullPara);
-SwTextNode *const pEndNode(aIdx.GetNodes()[m_nEndNode]->GetTextNode());
-SwIterator 
aIter(*pEndNode);
-for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+if (m_nSttNode != m_nEndNode) // never delete start node's frame!
 {
-o3tl::sorted_vector layouts;
-if (pFrame->getRootFrame()->IsHideRedlines())
-{
-assert(pFrame->GetTextNodeFirst() == pEndNode); // can't be 
merged with previous
-layouts.insert(pFrame->getRootFrame());
-}
-for (SwRootFrame const*const pLayout : layouts)
+SwTextNode *const 
pEndNode(aIdx.GetNodes()[m_nEndNode]->GetTextNode());
+SwIterator 
aIter(*pEndNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
 {
-pEndNode->DelFrames(pLayout); // SwUndoRedlineDelete will 
create it
+o3tl::sorted_vector layouts;
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+assert(pFrame->GetTextNodeFirst() == pEndNode); // can't 
be merged with previous
+layouts.insert(pFrame->getRootFrame());
+}
+for (SwRootFrame const*const pLayout : layouts)
+{
+pEndNode->DelFrames(pLayout); // SwUndoRedlineDelete will 
create it
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/css/notebookbar.css   |   12 +++-
 loleaflet/src/control/Control.JSDialogBuilder.js|7 ++-
 loleaflet/src/control/Control.NotebookbarBuilder.js |   15 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit c6b583091ecca80e1951f792c6bf4855dc87dd64
Author: Szymon Kłos 
AuthorDate: Mon Jul 27 10:54:39 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 27 11:15:42 2020 +0200

notebookbar: add dropdown arrows

Arrows added for uno buttons with dropdown menu

Change-Id: I273d97def7919e8884ff62b50dde269ac882f911
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99469
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index f2683637c..3cad6dbb6 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -126,6 +126,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
padding-left: 5px !important;
 }
 
+.unotoolbutton.notebookbar .unoarrow {
+   margin-left: 5px;
+   border: solid #555;
+   border-width: 0 3px 3px 0;
+   display: inline-block;
+   padding: 3px;
+   transform: rotate(45deg);
+   -webkit-transform: rotate(45deg);
+}
+
 .unotoolbutton.notebookbar .unobutton.selected {
box-shadow: 0 0 0px 4px #e6e6e640 !important;
 }
@@ -221,7 +231,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
 }
 
 #ControlCodes.notebookbar {
-   margin-left: 30px !important;
+   margin-left: 35px !important;
 }
 
 #fontnamecombobox.notebookbar ~ .select2 {
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 967e2bd7b..3a99fef0d 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1614,7 +1614,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
parentContainer);
},
 
-   _unoToolButton: function(parentContainer, data, builder) {
+   _unoToolButton: function(parentContainer, data, builder, options) {
var button = null;
 
var controls = {};
@@ -1683,6 +1683,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
controls['label'] = button;
}
 
+   if (options && options.hasDropdownArrow) {
+   var arrow = L.DomUtil.create('i', 'unoarrow', div);
+   controls['arrow'] = arrow;
+   }
+
$(div).click(function () {
if (!$(div).hasClass('disabled')) {
builder.refreshSidebar = true;
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 33f06ccf0..5dbd14d27 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -372,7 +372,8 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
},
 
_insertTableControl: function(parentContainer, data, builder) {
-   var control = builder._unoToolButton(parentContainer, data, 
builder);
+   var options = {hasDropdownArrow: true};
+   var control = builder._unoToolButton(parentContainer, data, 
builder, options);
 
$(control.container).unbind('click');
$(control.container).click(function () {
@@ -388,7 +389,8 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
},
 
_shapesControl: function(parentContainer, data, builder) {
-   var control = builder._unoToolButton(parentContainer, data, 
builder);
+   var options = {hasDropdownArrow: true};
+   var control = builder._unoToolButton(parentContainer, data, 
builder, options);
 
$(control.container).unbind('click');
$(control.container).click(function () {
@@ -404,7 +406,8 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
},
 
_conditionalFormatControl: function(parentContainer, data, builder) {
-   var control = builder._unoToolButton(parentContainer, data, 
builder);
+   var options = {hasDropdownArrow: true};
+   var control = builder._unoToolButton(parentContainer, data, 
builder, options);
 
$(control.container).unbind('click');
$(control.container).click(function () {
@@ -419,7 +422,8 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
},
 
_insertGraphicControl: function(parentContainer, data, builder) {
-   var control = builder._unoToolButton(parentContainer, data, 
builder);
+   var options = {hasDropdownAr

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |   41 +-
 1 file changed, 28 insertions(+), 13 deletions(-)

New commits:
commit 632cc0507353c8a85e7438d6ef082bafb2a2137a
Author: Michael Stahl 
AuthorDate: Wed Jul 22 13:24:15 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Jul 27 11:14:40 2020 +0200

sw: fix AppendRedline() creating empty redlines for Outside

This happens on tdf#133967 bugdoc with the Delete/Delete case first, in
line 1445 - the start positions are equal, so the new redline is empty
=> DocumentRedlineManager.cxx:92: redline table corrupted: empty redline

Similar bugs exist for Delete/Insert case in line 1725 and Format/? case
in line 1892, the latter even checks a nonsensical condition
*pEnd != *pRStt that is always true for Outside case.

It's like that since inital CVS import.

Change-Id: I7ade25380a5a43b14e87db37da8fc84267e89dd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99389
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 6bce5c1d9364..c0e1aa6add8c 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1445,7 +1445,15 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 // Overlaps the current one completely,
 // split the new one
-if( *pEnd != *pREnd )
+if (*pEnd == *pREnd)
+{
+pNewRedl->SetEnd(*pRStt, pEnd);
+}
+else if (*pStt == *pRStt)
+{
+pNewRedl->SetStart(*pREnd, pStt);
+}
+else
 {
 SwRangeRedline* pNew = new SwRangeRedline( 
*pNewRedl );
 pNew->SetStart( *pREnd );
@@ -1454,8 +1462,6 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 n = 0;  // re-initialize
 bDec = true;
 }
-else
-pNewRedl->SetEnd( *pRStt, pEnd );
 }
 break;
 
@@ -1724,7 +1730,13 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 pRedl->PushData( *pNewRedl );
 if( *pEnd == *pREnd )
+{
 pNewRedl->SetEnd( *pRStt, pEnd );
+}
+else if (*pStt == *pRStt)
+{
+pNewRedl->SetStart(*pREnd, pStt);
+}
 else
 {
 pNew = new SwRangeRedline( *pNewRedl );
@@ -1891,20 +1903,23 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 case SwComparePosition::Outside:
 // Overlaps the current one completely,
 // split or shorten the new one
-if( *pEnd != *pREnd )
+if (*pEnd == *pREnd)
 {
-if( *pEnd != *pRStt )
-{
-SwRangeRedline* pNew = new SwRangeRedline( 
*pNewRedl );
-pNew->SetStart( *pREnd );
-pNewRedl->SetEnd( *pRStt, pEnd );
-AppendRedline( pNew, bCallDelete );
-n = 0;  // re-initialize
-bDec = true;
-}
+pNewRedl->SetEnd(*pRStt, pEnd);
+}
+else if (*pStt == *pRStt)
+{
+pNewRedl->SetStart(*pREnd, pStt);
 }
 else
+{
+SwRangeRedline* pNew = new SwRangeRedline( 
*pNewRedl );
+pNew->SetStart( *pREnd );
 pNewRedl->SetEnd( *pRStt, pEnd );
+AppendRedline( pNew, bCallDelete );
+n = 0;  // re-initialize
+bDec = true;
+}
 break;

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

[Szymon Kłos (via logerrit)]

 sw/inc/swabstdlg.hxx|2 +-
 sw/source/ui/dialog/swdlgfact.cxx   |4 ++--
 sw/source/ui/dialog/swdlgfact.hxx   |2 +-
 sw/source/ui/misc/bookmark.cxx  |7 +--
 sw/source/uibase/inc/bookmark.hxx   |3 +--
 sw/source/uibase/shells/textsh1.cxx |6 --
 6 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 721120ff44ef619b032003374109b6db447ab327
Author: Szymon Kłos 
AuthorDate: Mon Jul 20 13:04:11 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 27 10:57:50 2020 +0200

Make Bookmarks dialog async

Change-Id: I820019f6906fef57743886fb1ba9c98217955370
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99041
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99350
Tested-by: Jenkins

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 0b530d170e77..82540628fb06 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -378,7 +378,7 @@ public:
 virtual VclPtr CreateSwAddressAbstractDlg(weld::Window* 
pParent, const SfxItemSet& rSet) = 0;
 virtual VclPtr  
CreateSwAsciiFilterDlg(weld::Window* pParent, SwDocShell& rDocSh,
 SvStream* 
pStream) = 0;
-virtual VclPtr CreateSwInsertBookmarkDlg(weld::Window 
*pParent, SwWrtShell &rSh, SfxRequest& rReq) = 0;
+virtual VclPtr CreateSwInsertBookmarkDlg(weld::Window 
*pParent, SwWrtShell &rSh) = 0;
 
 virtual std::shared_ptr CreateSwBreakDlg(weld::Window 
*pParent, SwWrtShell &rSh) = 0;
 virtual VclPtr CreateSwChangeDBDlg(SwView& rVw) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 639fb25d598c..bd767d220019 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -819,9 +819,9 @@ VclPtr 
SwAbstractDialogFactory_Impl::CreateSwAsciiFilt
 }
 
 VclPtr 
SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg(weld::Window *pParent,
-   
   SwWrtShell &rSh, SfxRequest& rReq)
+   
   SwWrtShell &rSh)
 {
-return 
VclPtr::Create(std::make_shared(pParent,
 rSh, rReq));
+return 
VclPtr::Create(std::make_shared(pParent,
 rSh));
 }
 
 std::shared_ptr 
SwAbstractDialogFactory_Impl::CreateSwBreakDlg(weld::Window* pParent, 
SwWrtShell &rSh)
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index 5c8f0cb0c4e0..bd285ff22fa7 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -658,7 +658,7 @@ public:
 virtual VclPtr CreateSwAddressAbstractDlg(weld::Window* 
pParent, const SfxItemSet& rSet) override;
 virtual VclPtr  
CreateSwAsciiFilterDlg(weld::Window* pParent, SwDocShell& rDocSh,
 SvStream* 
pStream) override;
-virtual VclPtr CreateSwInsertBookmarkDlg(weld::Window 
*pParent, SwWrtShell &rSh, SfxRequest& rReq) override;
+virtual VclPtr CreateSwInsertBookmarkDlg(weld::Window 
*pParent, SwWrtShell &rSh) override;
 virtual std::shared_ptr CreateSwBreakDlg(weld::Window 
*pParent, SwWrtShell &rSh) override;
 virtual VclPtr CreateSwChangeDBDlg(SwView& rVw) 
override;
 virtual VclPtr  CreateSwCharDlg(weld::Window* 
pParent, SwView& pVw, const SfxItemSet& rCoreSet,
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 29f090f94ff6..14c3714d3e48 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -210,10 +210,6 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, InsertHdl, 
weld::Button&, void)
 {
 OUString sBookmark = m_xEditBox->get_text();
 rSh.SetBookmark2(vcl::KeyCode(), sBookmark, m_xHideCB->get_active(), 
m_xConditionED->get_text());
-rReq.AppendItem(SfxStringItem(FN_INSERT_BOOKMARK, sBookmark));
-rReq.Done();
-if (!rReq.IsDone())
-rReq.Ignore();
 
 m_xDialog->response(RET_OK);
 }
@@ -295,10 +291,9 @@ void SwInsertBookmarkDlg::PopulateTable()
 m_nLastBookmarksCount = pMarkAccess->getBookmarksCount();
 }
 
-SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& 
rS, SfxRequest& rRequest)
+SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS)
 : SfxDialogController(pParent, "modules/swriter/ui/insertbookmark.ui", 
"InsertBookmarkDialog")
 , rSh(rS)
-, rReq(rRequest)
 , m_nLastBookmarksCount(0)
 , m_bSorted(false)
 , m_xEditBox(m_xBuilder->weld_entry("name"))
diff --git a/sw/source/uibase/inc/bookmark.hxx 
b/sw/source/uibase/inc/bookmark.hxx
index 3a8ee1506d58..a2000ce9a730 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -65,7 +65,6 @@ public:
 class SwInsertBookmarkDlg : public SfxDialogController
 {
 SwWrtShell&   

[Libreoffice-commits] online.git: loleaflet/images loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/images/lc_customanimation.svg |1 
 loleaflet/images/lc_masterslidespanel.svg   |1 
 loleaflet/images/lc_modifypage.svg  |1 
 loleaflet/images/lc_slidechangewindow.svg   |1 
 loleaflet/src/control/Control.NotebookbarImpress.js |   38 
 5 files changed, 42 insertions(+)

New commits:
commit 815bcfc64f32efbc6f5869459c300ed1b6caa2aa
Author: Szymon Kłos 
AuthorDate: Mon Jul 27 10:21:38 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 27 10:57:12 2020 +0200

notebookbar: sidebar decks switch in impress

Change-Id: I5116d1e6b1502ef67397bb45a9f208f63d458fa6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99468
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/images/lc_customanimation.svg 
b/loleaflet/images/lc_customanimation.svg
new file mode 100644
index 0..6e646d781
--- /dev/null
+++ b/loleaflet/images/lc_customanimation.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_masterslidespanel.svg 
b/loleaflet/images/lc_masterslidespanel.svg
new file mode 100644
index 0..768821edc
--- /dev/null
+++ b/loleaflet/images/lc_masterslidespanel.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_modifypage.svg 
b/loleaflet/images/lc_modifypage.svg
new file mode 100644
index 0..75c2b7b52
--- /dev/null
+++ b/loleaflet/images/lc_modifypage.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
 
\ No newline at end of file
diff --git a/loleaflet/images/lc_slidechangewindow.svg 
b/loleaflet/images/lc_slidechangewindow.svg
new file mode 100644
index 0..d8c2057f3
--- /dev/null
+++ b/loleaflet/images/lc_slidechangewindow.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js 
b/loleaflet/src/control/Control.NotebookbarImpress.js
index 43cff194f..21b7f1ecb 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -42,6 +42,44 @@ L.Control.NotebookbarImpress = 
L.Control.NotebookbarWriter.extend({
];
},
 
+   getOptionsSectionData: function() {
+   return [
+   {
+   'id': 'optionscontainer',
+   'type': 'container',
+   'vertical': 'true',
+   'children': [
+   {
+   'id': 'optionstoolboxdown',
+   'type': 'toolbox',
+   'children': [
+   {
+   'type': 
'toolitem',
+   'text': 
_UNO('.uno:ModifyPage', 'presentation', true),
+   'command': 
'.uno:ModifyPage'
+   },
+   {
+   'type': 
'toolitem',
+   'text': 
_UNO('.uno:SlideChangeWindow', 'presentation', true),
+   'command': 
'.uno:SlideChangeWindow'
+   },
+   {
+   'type': 
'toolitem',
+   'text': 
_UNO('.uno:CustomAnimation', 'presentation', true),
+   'command': 
'.uno:CustomAnimation'
+   },
+   {
+   'type': 
'toolitem',
+   'text': 
_UNO('.uno:MasterSlidesPanel', 'presentation', true),
+   'command': 
'.uno:MasterSlidesPanel'
+   }
+   ]
+   }
+   ]
+   }
+   ];
+   },
+
getTabs: function() {
return [
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mai

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

[Miklos Vajna (via logerrit)]

 sw/inc/htmltbl.hxx|   34 +++
 sw/source/core/doc/htmltbl.cxx|   49 ++
 sw/source/core/doc/swstylemanager.cxx |   22 +--
 sw/source/core/inc/txtfly.hxx |2 -
 sw/source/core/text/txtfly.cxx|   14 -
 5 files changed, 64 insertions(+), 57 deletions(-)

New commits:
commit 66c8463e69bffc0460d778e2686f78a17575d663
Author: Miklos Vajna 
AuthorDate: Mon Jul 27 08:54:03 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 27 10:18:52 2020 +0200

sw: prefix members of SwContourCache, SwHTMLTableLayoutCell, ...

... SwHTMLTableLayoutConstraints and SwStyleManager

See tdf#94879 for motivation.

Change-Id: I950012885edd77a0aa44a5aee1ef1ceb358bdf03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99466
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 8ed20b83fb36..0af7112c 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -82,14 +82,14 @@ public:
 
 class SwHTMLTableLayoutCell
 {
-std::shared_ptr xContents;  ///< Content of cell.
+std::shared_ptr m_xContents;  ///< Content of cell.
 
-sal_uInt16 nRowSpan;   ///< ROWSPAN of cell.
-sal_uInt16 nColSpan;   ///< COLSPAN of cell.
-sal_uInt16 nWidthOption;   ///< Given width of cell in Twip or %.
+sal_uInt16 m_nRowSpan;   ///< ROWSPAN of cell.
+sal_uInt16 m_nColSpan;   ///< COLSPAN of cell.
+sal_uInt16 m_nWidthOption;   ///< Given width of cell in Twip or %.
 
-bool bPercentWidthOption : 1;  ///< nWidth is %-value.
-bool bNoWrapOption : 1;///< NOWRAP-option.
+bool m_bPercentWidthOption : 1;  ///< nWidth is %-value.
+bool m_bNoWrapOption : 1;///< NOWRAP-option.
 
 public:
 
@@ -99,20 +99,20 @@ public:
  bool bNWrapOpt );
 
 /// Set or get content of a cell.
-void SetContents(std::shared_ptr const& rCnts) { 
xContents = rCnts; }
-const std::shared_ptr& GetContents() const { return 
xContents; }
+void SetContents(std::shared_ptr const& rCnts) { 
m_xContents = rCnts; }
+const std::shared_ptr& GetContents() const { return 
m_xContents; }
 
 inline void SetProtected();
 
 /// Set or get ROWSPAN/COLSPAN of cell.
-void SetRowSpan( sal_uInt16 nRSpan ) { nRowSpan = nRSpan; }
-sal_uInt16 GetRowSpan() const { return nRowSpan; }
-sal_uInt16 GetColSpan() const { return nColSpan; }
+void SetRowSpan( sal_uInt16 nRSpan ) { m_nRowSpan = nRSpan; }
+sal_uInt16 GetRowSpan() const { return m_nRowSpan; }
+sal_uInt16 GetColSpan() const { return m_nColSpan; }
 
-sal_uInt16 GetWidthOption() const { return nWidthOption; }
-bool IsPercentWidthOption() const { return bPercentWidthOption; }
+sal_uInt16 GetWidthOption() const { return m_nWidthOption; }
+bool IsPercentWidthOption() const { return m_bPercentWidthOption; }
 
-bool HasNoWrapOption() const { return bNoWrapOption; }
+bool HasNoWrapOption() const { return m_bNoWrapOption; }
 };
 
 class SwHTMLTableLayoutColumn
@@ -340,9 +340,9 @@ public:
 
 inline void SwHTMLTableLayoutCell::SetProtected()
 {
-nRowSpan = 1;
-nColSpan = 1;
-xContents.reset();
+m_nRowSpan = 1;
+m_nColSpan = 1;
+m_xContents.reset();
 }
 
 inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin,
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index f791e7d3435a..e3e642f667ea 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -52,26 +52,26 @@ namespace {
 
 class SwHTMLTableLayoutConstraints
 {
-sal_uInt16 nRow;// start row
-sal_uInt16 nCol;// start column
-sal_uInt16 nColSpan;// the column's COLSPAN
+sal_uInt16 m_nRow; // start row
+sal_uInt16 m_nCol; // start column
+sal_uInt16 m_nColSpan; // the column's COLSPAN
 
-std::unique_ptr pNext;// the next 
constraint
+std::unique_ptr m_pNext; // the next 
constraint
 
-sal_uLong nMinNoAlign, nMaxNoAlign; // provisional result of AL-Pass 1
+sal_uLong m_nMinNoAlign, m_nMaxNoAlign; // provisional result of AL-Pass 1
 
 public:
 SwHTMLTableLayoutConstraints( sal_uLong nMin, sal_uLong nMax, sal_uInt16 
nRow,
 sal_uInt16 nCol, sal_uInt16 nColSp );
 
-sal_uLong GetMinNoAlign() const { return nMinNoAlign; }
-sal_uLong GetMaxNoAlign() const { return nMaxNoAlign; }
+sal_uLong GetMinNoAlign() const { return m_nMinNoAlign; }
+sal_uLong GetMaxNoAlign() const { return m_nMaxNoAlign; }
 
 SwHTMLTableLayoutConstraints *InsertNext( SwHTMLTableLayoutConstraints 
*pNxt );
-SwHTMLTableLayoutConstraints* GetNext() const { return pNext.get(); }
+SwHTMLTableLayoutConstraints* GetNext() const { return m_pNext.get(); }
 
-sal_uInt

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

[Serge Krot (via logerrit)]

 sc/source/filter/xcl97/xcl97rec.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bb924a5d2b48336bbae47244210bbc78763b2ed
Author: Serge Krot 
AuthorDate: Tue Jul 21 16:05:15 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 27 09:57:46 2020 +0200

tdf#134769 XLSX export fix: unable to open with MS Excel

Change-Id: I8fff01118e25768ca54c816fcb0eb522da6f38bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99149
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 641dbafcb4c7b00bc9e56b58d12c95a6f05ee88d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99394

diff --git a/sc/source/filter/xcl97/xcl97rec.cxx 
b/sc/source/filter/xcl97/xcl97rec.cxx
index 503d78ad75f2..3227937b3c03 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -365,8 +365,8 @@ void XclExpObjList::SaveXml( XclExpXmlStream& rStrm )
 return;
 
 SaveDrawingMLObjects( *this, rStrm );
-SaveFormControlObjects( *this, rStrm );
 SaveVmlObjects( *this, rStrm, mnVmlCount );
+SaveFormControlObjects( *this, rStrm );
 }
 
 void XclExpObjList::ResetCounters()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-6' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b9fd13d94d9de1ad2386fc695954dc9a68cbde27
Author: Michael Stahl 
AuthorDate: Tue Jul 21 17:30:55 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 27 09:58:37 2020 +0200

tdf#132911 sw_redlinehide: fix assert in CopyImplImpl()

With Ctrl+A, Ctrl+X, Ctrl+V we get the  bAfterTable = true case;
line 4722 does pCopyPam->GetPoint()->nNode-- and then line 5085 does
pCopyPam->GetPoint()->nNode++ but the problem is that nContent still
points to the same node as initially while the node after the table end
node is now a different one, i.e. nNode and nContent point to different
nodes and something in redlining asserts becuase of that with
"Assertion `m_pIndexReg == rIndex.m_pIndexReg' failed."; we don't get
to step 4 anyway.

(reportedly something changed with commit
4532845e22c10f252840887e55002307227b2390 but it's a mystery what that
would be)

Change-Id: I23744fad543e1e7bfcc11c4b488d4469ba9e509c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99166
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 14bdbc36f0cf3913f6de10c746044b6aadf37095)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99194
Reviewed-by: Xisco Fauli 
(cherry picked from commit 30bab6ff42297c9d7759d31e11e814bcb5d38cee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99196
Tested-by: Xisco Fauli 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 33b7e5fe8f27..f834b8817492 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -5078,10 +5078,10 @@ bool 
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
 pCopyPam->Move( fnMoveForward, bCanMoveBack ? GoInContent : GoInNode );
 else
 {
-// Reset the offset to 0 as it was before the insertion
-pCopyPam->GetPoint()->nContent = 0;
-
 pCopyPam->GetPoint()->nNode++;
+
+// Reset the offset to 0 as it was before the insertion
+
pCopyPam->GetPoint()->nContent.Assign(pCopyPam->GetPoint()->nNode.GetNode().GetContentNode(),
 0);
 // If the next node is a start node, then step back: the start node
 // has been copied and needs to be in the selection for the undo
 if (pCopyPam->GetPoint()->nNode.GetNode().IsStartNode())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-0' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit da896afdeb3eff5d46b4f99caf18d5eef4765144
Author: Michael Stahl 
AuthorDate: Tue Jul 21 17:30:55 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jul 27 09:58:08 2020 +0200

tdf#132911 sw_redlinehide: fix assert in CopyImplImpl()

With Ctrl+A, Ctrl+X, Ctrl+V we get the  bAfterTable = true case;
line 4722 does pCopyPam->GetPoint()->nNode-- and then line 5085 does
pCopyPam->GetPoint()->nNode++ but the problem is that nContent still
points to the same node as initially while the node after the table end
node is now a different one, i.e. nNode and nContent point to different
nodes and something in redlining asserts becuase of that with
"Assertion `m_pIndexReg == rIndex.m_pIndexReg' failed."; we don't get
to step 4 anyway.

(reportedly something changed with commit
4532845e22c10f252840887e55002307227b2390 but it's a mystery what that
would be)

Change-Id: I23744fad543e1e7bfcc11c4b488d4469ba9e509c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99166
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 14bdbc36f0cf3913f6de10c746044b6aadf37095)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99193
Reviewed-by: Xisco Fauli 
(cherry picked from commit 724d5240f69abc675397260fad359080766d0ec5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99197
Tested-by: Xisco Fauli 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 67bda981d6ea..4db8ad56c16c 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -5078,10 +5078,10 @@ bool 
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
 pCopyPam->Move( fnMoveForward, bCanMoveBack ? GoInContent : GoInNode );
 else
 {
-// Reset the offset to 0 as it was before the insertion
-pCopyPam->GetPoint()->nContent = 0;
-
 pCopyPam->GetPoint()->nNode++;
+
+// Reset the offset to 0 as it was before the insertion
+
pCopyPam->GetPoint()->nContent.Assign(pCopyPam->GetPoint()->nNode.GetNode().GetContentNode(),
 0);
 // If the next node is a start node, then step back: the start node
 // has been copied and needs to be in the selection for the undo
 if (pCopyPam->GetPoint()->nNode.GetNode().IsStartNode())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need help for unit tests

[Miklos Vajna]

Hi Regina,

I guess the problem is that static counter in

oox/source/export/shapes.cxx:1970

This could be improved to do the same way as the DOCX export does in

sw/source/filter/ww8/docxattributeoutput.cxx:5165

i.e. do not have a static counter, rather make the counter a member of
the exporter class.

That way you would always get chart1.xml for the first chart of the
document on save.

Regards,

Miklos
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice