configure.ac | 2 +-
forms/source/richtext/richtextmodel.cxx | 2 ++
sw/source/core/view/viewsh.cxx | 10 ++++++----
sw/source/uibase/dbui/dbmgr.cxx | 2 +-
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 +++
8 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit d2df9f4a2e38588eead65a64ace16379afb29806
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Fri Jan 18 10:31:53 2019 +0100
Commit: Bevilacqua Jean-Sebastien <reali...@gmail.com>
CommitDate: Wed Jan 23 17:31:36 2019 +0100
bump product version to 6.1.5.1.M6
Change-Id: I92c2179ca91f40a3425c65b8b78d07f26878cf92
diff --git a/configure.ac b/configure.ac
index 4c55cd4933c0..ee91a77cf2d9 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.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.5.1.M6],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 315bcd7294e00490dffd4c8ccde87f9255deec09
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Fri Jan 4 10:48:27 2019 +0100
Commit: Bevilacqua Jean-Sebastien <reali...@gmail.com>
CommitDate: Wed Jan 23 17:30:42 2019 +0100
ACIM1319: 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 e3243079b1510fae761522c7fb7b6b98503dc693
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Fri Dec 14 08:46:02 2018 +0100
Commit: Bevilacqua Jean-Sebastien <reali...@gmail.com>
CommitDate: Wed Jan 23 17:30:34 2019 +0100
acim#910: Fix text color when printing
Change-Id: I747e5a329b61417af0383d7e0716544466558ea8
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index cca527d17578..aae8befd5802 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -76,6 +76,8 @@ namespace frm
getPropertyDefaultByHandle( PROPERTY_ID_WRITING_MODE ) >>=
m_nTextWritingMode;
getPropertyDefaultByHandle( PROPERTY_ID_CONTEXT_WRITING_MODE ) >>=
m_nContextWritingMode;
+ m_bMultiLine = true;
+
implInit();
}
commit daff2f826b68d28aea6a42921a2d79b6aeaa85ae
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Fri Aug 10 11:07:22 2018 +0200
Commit: Bevilacqua Jean-Sebastien <reali...@gmail.com>
CommitDate: Wed Jan 23 17:30:27 2019 +0100
acim#1271: Fix publipostage
Change-Id: I6ab116c5d9499752d1af87fb3c0841a58d75f07a
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index bb3c5c97b7bb..33880756796e 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3392,7 +3392,7 @@ void SwDBManager::RevokeLastRegistrations()
{
if ((m_pDoc && it->first == m_pDoc->GetDocShell()) || it->first ==
nullptr)
{
- RevokeDataSource(it->second);
+ //RevokeDataSource(it->second);
it = m_aUncommitedRegistrations.erase(it);
}
else
commit 4b2f4596abf480e11d25c9aed0517c37e2b57ea9
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Wed Nov 14 09:48:34 2018 +0100
Commit: Bevilacqua Jean-Sebastien <reali...@gmail.com>
CommitDate: Wed Jan 23 17:30:18 2019 +0100
acim#1026: Fix with commit af11abf3626e12d2b4b7dd9d255c6c71bf84cd4b
Change-Id: If36a2e0ba1259cee19f16573c5a67a08e48dcbc4
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 76435e704cd9..8564526c0e96 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -409,10 +409,12 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
if ( bPaintsFromSystem )
PaintDesktop(*GetOut(), aRect);
- if (!comphelper::LibreOfficeKit::isActive())
- pCurrentLayout->PaintSwFrame( *mpOut, aRect );
- else
-
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
+
+
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
+ //if (!comphelper::LibreOfficeKit::isActive())
+ // pCurrentLayout->PaintSwFrame( *mpOut, aRect
);
+ //else
+ //
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
// #i75172# end DrawingLayer paint
DLPostPaint2(true);
commit 7b934063eedf23508ec952426a4036ab3a035e6e
Author: Bevilacqua Jean-Sebastien <reali...@gmail.com>
AuthorDate: Wed Nov 14 09:32:57 2018 +0100
Commit: Bevilacqua Jean-Sebastien <reali...@gmail.com>
CommitDate: Wed Jan 23 17:30:12 2019 +0100
RTF fixes: Port LO 4.3.7.2 Linagora patch
0004-2014011410000016-import-rtf-sautpage-orientation.patch
Change-Id: I81bd2f14fd18ea7fb3703ff82170bb8fecf5d6ab
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index e5ae836bb206..cb21c1f5b9bb 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -98,6 +98,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 11fe8e6237bd..54ad22e57ad5 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -851,6 +851,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 4094dc97dacf..9bd5c48ed9fc 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -260,6 +260,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)
@@ -686,6 +687,8 @@ void RTFDocumentImpl::sectBreak(bool bFinal)
}
m_bNeedPar = false;
m_bNeedSect = false;
+
+ m_bNeedTableBreak = true;
}
Color RTFDocumentImpl::getColorTable(sal_uInt32 nIndex)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
