[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - 6 commits - configure.ac drawinglayer/source vcl/source wizards/com writerfilter/source

2020-07-05 Thread Jean-Sebastien BEVILACQUA (via logerrit) 
 configure.ac   |2 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 ++--
 vcl/source/control/edit.cxx|3 +--
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java  |3 ++-
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx   |1 +
 writerfilter/source/rtftok/rtfdispatchvalue.cxx|5 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 ++
 8 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit ba352b96595e9b31d57a5fb2829eccca433f28f7
Author: Jean-Sebastien BEVILACQUA 
AuthorDate: Tue Mar 24 15:46:37 2020 +0100
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Tue Mar 24 15:46:37 2020 +0100

bump product versionto 6.2.8.2.M1

Change-Id: If38028f94b37570f7cc5fae69b5ea2c7e5a0ccd8

diff --git a/configure.ac b/configure.ac
index 694ea2d23398..1278e25b65d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.2.8.2.M0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M1],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit a197747b1411c833165ff396aeae819541a67b50
Author: Andrés Maldonado 
AuthorDate: Thu Dec 26 22:46:36 2019 +0100
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Tue Mar 24 15:31:14 2020 +0100

tdf#125901: apply color modifiers when drawing hatch

With this fix, the shadow of a shape with a Hatching fill is no longer
the same color as the hatching (in full screen mode)

Change-Id: I979866e748b5caf2ccafc8a6084ffdb46bc8122c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/73964
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 9c64e8a2948c379c537ee0882afa57882facb26e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85864
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6ac21b0985b0..2b65ac277a07 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1630,7 +1630,7 @@ namespace drawinglayer
 aTransform,
 false,
 eHatch,
-Color(rFillHatchAttribute.getColor()),
+
Color(maBColorModifierStack.getModifiedColor(rFillHatchAttribute.getColor())),
 SvtGraphicFill::GradientType::Linear,
 Color(),
 Color(),
@@ -1651,7 +1651,7 @@ namespace drawinglayer
 
 mpOutputDevice->DrawHatch(aToolsPolyPolygon,
 Hatch(aHatchStyle,
-Color(rFillHatchAttribute.getColor()),
+
Color(maBColorModifierStack.getModifiedColor(rFillHatchAttribute.getColor())),
 basegfx::fround(rFillHatchAttribute.getDistance()),
 basegfx::fround(rFillHatchAttribute.getAngle() / 
F_PI1800)));
 
commit b2f419740375bc13cd6e869ddf0d9cbd9065c49c
Author: Andrés Maldonado 
AuthorDate: Thu Apr 18 15:24:50 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Tue Mar 24 15:28:04 2020 +0100

tdf#124824 FILEOPEN: Error rendering page break between two tables in a RTF

This patch is adapted from an old unpublished Linagora patch by 
mdero...@linagora.com

Change-Id: I49bd9a9797ef42cd110259bd0dd4d4747300da71

diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx 
b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 2603ebe22952..8443cc1a3415 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -100,6 +100,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
 {
 if (m_aStates.top().eDestination == Destination::FOOTNOTESEPARATOR)
 break; // just ignore it - only thing we read in here is 
CHFTNSEP
+m_bNeedTableBreak = false;
 checkFirstRun();
 bool bNeedPap = m_bNeedPap;
 checkNeedPap();
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 72fd4802a601..a433fa9e85d6 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -845,6 +845,11 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 break;
 case RTF_CELLX:
 {
+if (m_bNeedTableBreak && !m_bFirstRun)
+

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - 3 commits - configure.ac README.md scripting/source sfx2/source

2019-10-03 Thread Jean-Sebastien BEVILACQUA (via logerrit) 
 README.md  |5 +++-
 configure.ac   |2 -
 scripting/source/protocolhandler/scripthandler.cxx |9 ++--
 sfx2/source/doc/objmisc.cxx|   23 -
 4 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 41ee200cf4757de946a4b979e90b833b328d1531
Author: Jean-Sebastien BEVILACQUA 
AuthorDate: Tue Oct 1 14:59:17 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Wed Oct 2 14:25:22 2019 +0200

bump product version to 6.1.6.3.M14

Change-Id: I14853887a4b923e00e6b4c66f8e1c2c0598394b7

diff --git a/README.md b/README.md
index d164e4784078..6ae0487c6ac9 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,16 @@ The most recent version reviewed by MIMO can be downloaded 
at parse(aURL.Complete), css::uno::UNO_QUERY_THROW);
+auto const loc = uri->getParameter("location");
+bool bIsDocumentScript = loc == "document";
 
 if ( bIsDocumentScript )
 {
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8594e9522e48..4c192aea9e0f 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1362,19 +1362,22 @@ ErrCode SfxObjectShell::CallXScript( const Reference< 
XInterface >& _rxScriptCon
 SAL_INFO("sfx", "in CallXScript" );
 ErrCode nErr = ERRCODE_NONE;
 
-bool bIsDocumentScript = ( _rScriptURL.indexOf( "location=document" ) >= 0 
);
-// TODO: we should parse the URL, and check whether there is a 
parameter with this name.
-// Otherwise, we might find too much.
-if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( 
_rxScriptContext ) )
-

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - 29 commits - configure.ac forms/source librelogo/source mimo+linagora.png README.md scripting/source sfx2/source solenv/gbuild svx/sourc

2019-09-30 Thread Jean-Sebastien BEVILACQUA (via logerrit) 
 README.md |  189 ++
 configure.ac  |2 
 forms/source/richtext/richtextmodel.cxx   |2 
 librelogo/source/LibreLogo/LibreLogo.py   |   51 
 mimo+linagora.png |binary
 scripting/source/pyprov/pythonscript.py   |   17 +
 sfx2/source/doc/objmisc.cxx   |   13 +
 solenv/gbuild/GeneratedPackage.mk |   45 +---
 svx/source/unodraw/unoshape.cxx   |2 
 sw/inc/unosett.hxx|2 
 sw/source/core/doc/doc.cxx|2 
 sw/source/core/text/porfld.cxx|4 
 sw/source/core/text/porfld.hxx|1 
 sw/source/core/text/txtfld.cxx|   12 +
 sw/source/core/unocore/unosett.cxx|   15 +
 sw/source/core/view/viewsh.cxx|   10 
 sw/source/uibase/app/apphdl.cxx   |   38 ---
 sw/source/uibase/config/StoredChapterNumbering.cxx|2 
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |3 
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx  |   29 +-
 writerfilter/source/rtftok/rtfdispatchvalue.cxx   |7 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|   13 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|2 
 23 files changed, 234 insertions(+), 227 deletions(-)

New commits:
commit 31671adeb09bb5a7234188d1a99bab8c62b9e233
Author: Jean-Sebastien BEVILACQUA 
AuthorDate: Wed Sep 18 14:30:29 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Wed Sep 18 14:30:29 2019 +0200

bump product versionto 6.1.6.3.M13

Change-Id: I60dad7c6c861e8439144d346a6ad619d2dba2ea5

diff --git a/README.md b/README.md
index 761b043465b3..d164e4784078 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,13 @@ The most recent version reviewed by MIMO can be downloaded 
at

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - 5 commits - configure.ac README.md scripting/source

2019-09-19 Thread Jean-Sebastien BEVILACQUA (via logerrit) 
 README.md   |   13 +
 configure.ac|2 +-
 scripting/source/pyprov/pythonscript.py |   17 +++--
 3 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 31b3b6737b7523651f689242c6e03d71bd5ecf85
Author: Jean-Sebastien BEVILACQUA 
AuthorDate: Wed Sep 18 14:30:29 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Thu Sep 19 17:49:44 2019 +0200

bump product versionto 6.1.6.3.M13

Change-Id: I60dad7c6c861e8439144d346a6ad619d2dba2ea5

diff --git a/README.md b/README.md
index 761b043465b3..d164e4784078 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,13 @@ The most recent version reviewed by MIMO can be downloaded 
at

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - 4 commits - configure.ac librelogo/source sfx2/source sw/inc sw/source

2019-08-21 Thread Jean-Sebastien BEVILACQUA (via logerrit) 
 configure.ac   |2 
 librelogo/source/LibreLogo/LibreLogo.py|   51 -
 sfx2/source/doc/objmisc.cxx|   13 +
 sw/inc/unosett.hxx |2 
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 
 sw/source/core/unocore/unosett.cxx |   15 --
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 9 files changed, 92 insertions(+), 10 deletions(-)

New commits:
commit 02445bb18f9bec783418cef8e6d6e5b9e21c0eab
Author: Jean-Sebastien BEVILACQUA 
AuthorDate: Mon Jul 29 14:01:08 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Wed Aug 21 10:27:28 2019 +0200

bump product versionto 6.1.6.3.M12

diff --git a/configure.ac b/configure.ac
index 4ca544750bd2..21c7b66be72f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.6.3.M11],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.6.3.M12],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit 6bc91953388aa0503a0fe09b58a8871fee62eef5
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Wed Aug 21 10:27:19 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23
Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)
Reviewed-on: https://gerrit.libreoffice.org/74290
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 1372c30126d0..fe4a514c9a4e 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -209,7 +209,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index ac3596f78262..14e5320f234d 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -757,7 +757,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 
 SwGrfNumPortion::SwGrfNumPortion(
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -771,7 +771,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index d7c06e2ae4b2..ecdfeec6cff2 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -162,6 +162,7 @@ class SwGrfNumPortion : public SwNumberPortion
 public:
 SwGrfNumPortion( const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 9ba37a923740..06cfa0cd4a35 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame const *pFrame )
@@ -500,8 +501,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {