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 <reali...@gmail.com>
AuthorDate: Tue Mar 24 15:46:37 2020 +0100
Commit: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
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 <amald...@tutanota.com>
AuthorDate: Thu Dec 26 22:46:36 2019 +0100
Commit: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
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 <noel.gran...@collabora.co.uk>
(cherry picked from commit 9c64e8a2948c379c537ee0882afa57882facb26e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85864
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
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 <amaldon...@linagora.com>
AuthorDate: Thu Apr 18 15:24:50 2019 +0200
Commit: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
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)
+ dispatchSymbol(RTF_PAR);
+
+ m_bNeedTableBreak = false;
+
int& rCurrentCellX((Destination::NESTEDTABLEPROPERTIES ==
m_aStates.top().eDestination)
? m_nNestedCurrentCellX
: m_nTopLevelCurrentCellX);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6c97111bed71..3159be676306 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -264,6 +264,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
, m_bNeedCrOrig(false)
, m_bNeedPar(true)
, m_bNeedFinalPar(false)
+ , m_bNeedTableBreak(false)
, m_nNestedCells(0)
, m_nTopLevelCells(0)
, m_nInheritingCells(0)
@@ -700,6 +701,8 @@ void RTFDocumentImpl::sectBreak(bool bFinal)
}
m_bNeedPar = false;
m_bNeedSect = false;
+
+ m_bNeedTableBreak = true;
}
Color RTFDocumentImpl::getColorTable(sal_uInt32 nIndex)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0ecf59aae42a..a9cf69e7b75c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -590,6 +590,8 @@ private:
bool m_bNeedPar;
/// If set, an empty paragraph will be added at the end of the document.
bool m_bNeedFinalPar;
+ /// If there is a need for a page break after a table
+ bool m_bNeedTableBreak;
/// The list table and list override table combined.
RTFSprms m_aListTableSprms;
/// Maps between listoverridetable and listtable indexes.
commit 46f215394df3daa850b68213ca8137a30a293ed8
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Fri Jan 4 10:48:27 2019 +0100
Commit: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
CommitDate: Tue Mar 24 15:24:24 2020 +0100
acim#1319: Clean SQL string
Change-Id: Idd8735021df5f7563312821dcba9da235f93cd50
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 17bc953affa9..17452743c791 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -281,7 +281,8 @@ public class SQLQueryComposer
StringBuilder fromClause = getFromClause();
String sSelectClause = getSelectClause(_baddAliasFieldNames);
StringBuilder queryclause = new
StringBuilder(sSelectClause).append(" ").append(fromClause);
- m_xQueryAnalyzer.setQuery(queryclause.toString());
+ // TDF#122461: Clean SQL string
+ m_xQueryAnalyzer.setQuery(queryclause.toString().replace("\n",
"").replace("\r", ""));
if (CurDBMetaData.getFilterConditions() != null &&
CurDBMetaData.getFilterConditions().length > 0)
{
CurDBMetaData.setFilterConditions(replaceConditionsByAlias(CurDBMetaData.getFilterConditions()));
commit 8524ad7363d1d3a6bf3dba38bf2ecfb807ad7cc0
Author: Arnaud Versini <arnaud.vers...@libreoffice.org>
AuthorDate: Sun Dec 8 11:42:35 2019 +0100
Commit: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
CommitDate: Tue Mar 24 15:20:40 2020 +0100
Fix acim#910: tdf#83248: Use the right text color when printing fields
Reviewed-on: https://gerrit.libreoffice.org/84707
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit 10d345faa087fa49692f38bb2ece22560f423ba7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85848
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Change-Id: I81167207a35d524660b9a1d6740cfce551489c4a
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6e4e49018bff..a47a74447cbd 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1755,7 +1755,6 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
Point aPos = pDev->LogicToPixel( rPos );
Size aSize = pDev->LogicToPixel( rSize );
vcl::Font aFont = GetDrawPixelFont( pDev );
- OutDevType eOutDevType = pDev->GetOutDevType();
pDev->Push();
pDev->SetMapMode();
@@ -1782,7 +1781,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
}
// Content
- if ( ( nFlags & DrawFlags::Mono ) || ( eOutDevType == OUTDEV_PRINTER ) )
+ if ( nFlags & DrawFlags::Mono )
pDev->SetTextColor( COL_BLACK );
else
{
commit b2f3a9f667790fa66b74d0b0586b287df0bf0e5d
Author: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
AuthorDate: Tue Mar 24 14:29:43 2020 +0100
Commit: Jean-Sebastien BEVILACQUA <reali...@gmail.com>
CommitDate: Tue Mar 24 14:29:43 2020 +0100
bump product versionto 6.2.8.2.M0
Change-Id: If804ce6b996f19fdd2c8ce230f540dd860715be0
diff --git a/configure.ac b/configure.ac
index 1182bc1c839c..694ea2d23398 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],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
