[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.4' - 7 commits - configure.ac sc/source sd/source sw/qa sw/source vcl/source vcl/unx writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 13 11:01:11 UTC 2018
configure.ac | 2
sc/source/core/data/dptabres.cxx | 8 ++-
sd/source/ui/view/sdwindow.cxx | 4 -
sw/qa/extras/ooxmlexport/data/tdf119143.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 42 ++++++++++++++++++
sw/source/core/doc/docredln.cxx | 4 +
vcl/source/window/window2.cxx | 2
vcl/unx/generic/app/saldisp.cxx | 2
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 18 +++++++
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 5 ++
writerfilter/source/ooxml/model.xml | 24 ++++++++++
11 files changed, 103 insertions(+), 8 deletions(-)
New commits:
commit 2d73d2078ce0072e94dba3b688851f9882402598
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Sep 12 16:01:23 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 13:00:39 2018 +0200
Bump version to 5.3-56
Change-Id: I64cdb0464bc42f28b91775ebe1bbe841c0b36164
(cherry picked from commit 83244cd67b23c68ab908221ff649ca7cd7ab2399)
diff --git a/configure.ac b/configure.ac
index 33551b28594f..fa150761ca90 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([Collabora Office],[5.3.10.55],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.56],[],[],[https://collaboraoffice.com/])
AC_PREREQ([2.59])
commit 289122acd0156b7b718bde755a329e74edfbce1d
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Sep 12 14:59:20 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 13:00:34 2018 +0200
lok: Avoid crash when inserting a table in a redline.
Steps to reproduce:
* turn on changetracking
* write few characters
* insert table
* move the cursor behind the table and type
* crash
Change-Id: Icd7b64d2fe594c2b87c9d3d7fa48a957755cbc3b
Reviewed-on: https://gerrit.libreoffice.org/60390
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 43197a3097d2939c30fd9f242ae52b03bf29f240)
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index cc268b235748..fc92fbcf6a68 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -405,7 +405,9 @@ void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, SwRangeRe
{
for(SwNodeIndex nIdx = pStartPos->nNode; nIdx <= pEndPos->nNode; ++nIdx)
{
- pSh->InvalidateWindows( nIdx.GetNode().GetContentNode()->FindLayoutRect() );
+ SwContentNode* pContentNode = nIdx.GetNode().GetContentNode();
+ if (pContentNode)
+ pSh->InvalidateWindows(pContentNode->FindLayoutRect());
}
}
}
commit 0e1a9f83a2a9daf6679f472eda9df8fb8cd41816
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 6 09:32:03 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 13:00:29 2018 +0200
Bump version to 5.3-55
Change-Id: Ib02683df7abc3df9bcb19f68d4cd9fcaf3e55031
(cherry picked from commit f30b8c7eaf18faf954b6473379296ae2aa081f4e)
diff --git a/configure.ac b/configure.ac
index 66e477674b20..33551b28594f 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([Collabora Office],[5.3.10.54],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.55],[],[],[https://collaboraoffice.com/])
AC_PREREQ([2.59])
commit 12605309cacbf4bf5f3e3ef104e1001060e9123b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 2 21:20:40 2018 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 13:00:24 2018 +0200
ofz#10189 check container size
Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161
Reviewed-on: https://gerrit.libreoffice.org/59913
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
(cherry picked from commit 6ee76d210846b84e93420a321c7908721ffe9e43)
(cherry picked from commit 59e68800029dd91aced2daf1bae41d6ee3e4b6b8)
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index b62c88b4af8d..86a028939ef1 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2869,10 +2869,14 @@ void ScDPResultDimension::LateInitFrom(
{
if ( rParams.IsEnd( nPos ) )
return;
- OSL_ENSURE( nPos <= pItemData.size(), OString::number(pItemData.size()).getStr() );
+ if (nPos >= pItemData.size())
+ {
+ SAL_WARN("sc.core", "pos " << nPos << ", but vector size is " << pItemData.size());
+ return;
+ }
+ SCROW rThisData = pItemData[nPos];
ScDPDimension* pThisDim = rParams.GetDim( nPos );
ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
- SCROW rThisData = pItemData[nPos];
if (!pThisDim || !pThisLevel)
return;
commit c3d8b70d0dae5da6ffb0ad837cf7d67c103210ff
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Aug 27 12:34:12 2018 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 13:00:19 2018 +0200
tdf#119143: introduce tentative directional embedding import support
ECMA-376-1:2016 states that w:dir is functionally equivalent to LRE/RLE+PDF
pair around the enclosed runs. So this patch does just that.
Change-Id: Ibf9775338cc38a3bbc38a42a33fc64ae787b478f
Reviewed-on: https://gerrit.libreoffice.org/59643
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/59672
Reviewed-by: Aron Budea <aron.budea at collabora.com>
Tested-by: Aron Budea <aron.budea at collabora.com>
(cherry picked from commit 348a1e11045ca8d9dbceab43a68d44dbde3f922c)
diff --git a/sw/qa/extras/ooxmlexport/data/tdf119143.docx b/sw/qa/extras/ooxmlexport/data/tdf119143.docx
new file mode 100644
index 000000000000..be0bc03f71c1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119143.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 079fadcca914..7e6b07bde3ec 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -733,6 +733,48 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
getProperty<sal_Int16>(getShape(1), "RelativeWidth"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf119143, "tdf119143.docx")
+{
+ const char sParaTextExpected[] =
+ "\xD8\xB9\xD9\x86\xD8\xAF\xD9\x85\xD8\xA7 \xD9\x8A\xD8\xB1\xD9\x8A\xD8\xAF \xD8\xA7\xD9\x84"
+ "\xD8\xB9\xD8\xA7\xD9\x84\xD9\x85 \xD8\xA3\xD9\x86 \xD9\x8A\xD8\xAA\xD9\x83\xD9\x84\xD9\x91"
+ "\xD9\x85 \xE2\x80\xAC \xD8\x8C \xD9\x81\xD9\x87\xD9\x88 \xD9\x8A\xD8\xAA\xD8\xAD\xD8\xAF"
+ "\xD9\x91\xD8\xAB \xD8\xA8\xD9\x84\xD8\xBA\xD8\xA9 \xD9\x8A\xD9\x88\xD9\x86\xD9\x8A\xD9\x83"
+ "\xD9\x88\xD8\xAF. \xD8\xAA\xD8\xB3\xD8\xAC\xD9\x91\xD9\x84 \xD8\xA7\xD9\x84\xD8\xA2\xD9"
+ "\x86 \xD9\x84\xD8\xAD\xD8\xB6\xD9\x88\xD8\xB1 \xD8\xA7\xD9\x84\xD9\x85\xD8\xA4\xD8\xAA\xD9"
+ "\x85\xD8\xB1 \xD8\xA7\xD9\x84\xD8\xAF\xD9\x88\xD9\x84\xD9\x8A \xD8\xA7\xD9\x84\xD8\xB9\xD8"
+ "\xA7\xD8\xB4\xD8\xB1 \xD9\x84\xD9\x8A\xD9\x88\xD9\x86\xD9\x8A\xD9\x83\xD9\x88\xD8\xAF (Uni"
+ "code Conference)\xD8\x8C \xD8\xA7\xD9\x84\xD8\xB0\xD9\x8A \xD8\xB3\xD9\x8A\xD8\xB9\xD9\x82"
+ "\xD8\xAF \xD9\x81\xD9\x8A 10-12 \xD8\xA2\xD8\xB0\xD8\xA7\xD8\xB1 1997 \xD8\xA8\xD9\x85\xD8"
+ "\xAF\xD9\x8A\xD9\x86\xD8\xA9 \xD9\x85\xD9\x8E\xD8\xA7\xD9\x8A\xD9\x90\xD9\x86\xD9\x92\xD8"
+ "\xAA\xD9\x92\xD8\xB3\xD8\x8C \xD8\xA3\xD9\x84\xD9\x85\xD8\xA7\xD9\x86\xD9\x8A\xD8\xA7. "
+ "\xD9\x88 \xD8\xB3\xD9\x8A\xD8\xAC\xD9\x85\xD8\xB9 \xD8\xA7\xD9\x84\xD9\x85\xD8\xA4\xD8\xAA"
+ "\xD9\x85\xD8\xB1 \xD8\xA8\xD9\x8A\xD9\x86 \xD8\xAE\xD8\xA8\xD8\xB1\xD8\xA7\xD8\xA1 \xD9"
+ "\x85\xD9\x86 \xD9\x83\xD8\xA7\xD9\x81\xD8\xA9 \xD9\x82\xD8\xB7\xD8\xA7\xD8\xB9\xD8\xA7\xD8"
+ "\xAA \xD8\xA7\xD9\x84\xD8\xB5\xD9\x86\xD8\xA7\xD8\xB9\xD8\xA9 \xD8\xB9\xD9\x84\xD9\x89 "
+ "\xD8\xA7\xD9\x84\xD8\xB4\xD8\xA8\xD9\x83\xD8\xA9 \xD8\xA7\xD9\x84\xD8\xB9\xD8\xA7\xD9\x84"
+ "\xD9\x85\xD9\x8A\xD8\xA9 \xD8\xA7\xD9\x86\xD8\xAA\xD8\xB1\xD9\x86\xD9\x8A\xD8\xAA \xD9\x88"
+ "\xD9\x8A\xD9\x88\xD9\x86\xD9\x8A\xD9\x83\xD9\x88\xD8\xAF\xD8\x8C \xD8\xAD\xD9\x8A\xD8\xAB "
+ "\xD8\xB3\xD8\xAA\xD8\xAA\xD9\x85\xD8\x8C \xD8\xB9\xD9\x84\xD9\x89 \xD8\xA7\xD9\x84\xD8\xB5"
+ "\xD8\xB9\xD9\x8A\xD8\xAF\xD9\x8A\xD9\x86 \xD8\xA7\xD9\x84\xD8\xAF\xD9\x88\xD9\x84\xD9\x8A "
+ "\xD9\x88\xD8\xA7\xD9\x84\xD9\x85\xD8\xAD\xD9\x84\xD9\x8A \xD8\xB9\xD9\x84\xD9\x89 \xD8\xAD"
+ "\xD8\xAF \xD8\xB3\xD9\x88\xD8\xA7\xD8\xA1 \xD9\x85\xD9\x86\xD8\xA7\xD9\x82\xD8\xB4\xD8\xA9"
+ " \xD8\xB3\xD8\xA8\xD9\x84 \xD8\xA7\xD8\xB3\xD8\xAA\xD8\xAE\xD8\xAF\xD8\xA7\xD9\x85 \xD9"
+ "\x8A\xD9\x88\xD9\x86\xD9\x83\xD9\x88\xD8\xAF \xD9\x81\xD9\x8A \xD8\xA7\xD9\x84\xD9\x86\xD8"
+ "\xB8\xD9\x85 \xD8\xA7\xD9\x84\xD9\x82\xD8\xA7\xD8\xA6\xD9\x85\xD8\xA9 \xD9\x88\xD9\x81\xD9"
+ "\x8A\xD9\x85\xD8\xA7 \xD9\x8A\xD8\xAE\xD8\xB5 \xD8\xA7\xD9\x84\xD8\xAA\xD8\xB7\xD8\xA8\xD9"
+ "\x8A\xD9\x82\xD8\xA7\xD8\xAA \xD8\xA7\xD9\x84\xD8\xAD\xD8\xA7\xD8\xB3\xD9\x88\xD8\xA8\xD9"
+ "\x8A\xD8\xA9\xD8\x8C \xD8\xA7\xD9\x84\xD8\xAE\xD8\xB7\xD9\x88\xD8\xB7\xD8\x8C \xD8\xAA\xD8"
+ "\xB5\xD9\x85\xD9\x8A\xD9\x85 \xD8\xA7\xD9\x84\xD9\x86\xD8\xB5\xD9\x88\xD8\xB5 \xD9\x88\xD8"
+ "\xA7\xD9\x84\xD8\xAD\xD9\x88\xD8\xB3\xD8\xA8\xD8\xA9 \xD9\x85\xD8\xAA\xD8\xB9\xD8\xAF\xD8"
+ "\xAF\xD8\xA9 \xD8\xA7\xD9\x84\xD9\x84\xD8\xBA\xD8\xA7\xD8\xAA.";
+ // The runs inside <w:dir> were ignored
+ const OUString sParaText = getParagraph(1)->getString();
+ CPPUNIT_ASSERT_EQUAL(
+ OUString::fromUtf8(sParaTextExpected),
+ sParaText);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 388f02603f85..6958d15aaae2 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -387,6 +387,10 @@ void OOXMLFastContextHandler::endCharacterGroup()
}
}
+void OOXMLFastContextHandler::pushBiDiEmbedLevel() {}
+
+void OOXMLFastContextHandler::popBiDiEmbedLevel() {}
+
void OOXMLFastContextHandler::startParagraphGroup()
{
if (isForwardEvents())
@@ -1276,6 +1280,20 @@ void OOXMLFastContextHandlerValue::setDefaultStringValue()
setValue(pValue);
}
}
+
+// ECMA-376-1:2016 17.3.2.8; https://www.unicode.org/reports/tr9/#Explicit_Directional_Embeddings
+void OOXMLFastContextHandlerValue::pushBiDiEmbedLevel()
+{
+ const bool bRtl
+ = mpValue.get() && mpValue.get()->getInt() == NS_ooxml::LN_Value_ST_Direction_rtl;
+ OOXMLFactory::characters(this, OUString(sal_Unicode(bRtl ? 0x202B : 0x202A))); // RLE / LRE
+}
+
+void OOXMLFastContextHandlerValue::popBiDiEmbedLevel()
+{
+ OOXMLFactory::characters(this, OUString(sal_Unicode(0x202C))); // PDF (POP DIRECTIONAL FORMATTING)
+}
+
/*
class OOXMLFastContextHandlerTable
*/
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 62a4e00822df..e21132210d1b 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -144,6 +144,8 @@ public:
void endParagraphGroup();
void startCharacterGroup();
void endCharacterGroup();
+ virtual void pushBiDiEmbedLevel();
+ virtual void popBiDiEmbedLevel();
void startSdt();
void endSdt();
@@ -341,6 +343,9 @@ public:
virtual void setDefaultHexValue() override;
virtual void setDefaultStringValue() override;
+ virtual void pushBiDiEmbedLevel() override;
+ virtual void popBiDiEmbedLevel() override;
+
protected:
OOXMLValue::Pointer_t mpValue;
};
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 76d718450e50..884c559fc2fe 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -13939,12 +13939,27 @@
<element name="sdt">
<ref name="CT_SdtRun"/>
</element>
+ <element name="dir">
+ <ref name="CT_DirContentRun"/>
+ </element>
<element name="r">
<ref name="CT_R"/>
</element>
<ref name="EG_RunLevelElts"/>
</choice>
</define>
+ <define name="CT_DirContentRun">
+ <ref name="EG_PContent"/>
+ <attribute name="val">
+ <ref name="ST_Direction"/>
+ </attribute>
+ </define>
+ <define name="ST_Direction">
+ <choice>
+ <value>ltr</value>
+ <value>rtl</value>
+ </choice>
+ </define>
<define name="CT_SdtContentRun">
<ref name="EG_PContent"/>
</define>
@@ -18128,6 +18143,15 @@
<resource name="CT_SdtEndPr" resource="Properties">
<element name="rPr" tokenid="ooxml:CT_SdtEndPr_rPr"/>
</resource>
+ <resource name="CT_DirContentRun" resource="Value">
+ <attribute name="val" tokenid="ooxml:CT_DirContentRun_val" action="setValue"/>
+ <action name="start" action="pushBiDiEmbedLevel"/>
+ <action name="end" action="popBiDiEmbedLevel"/>
+ </resource>
+ <resource name="ST_Direction" resource="List">
+ <value tokenid="ooxml:Value_ST_Direction_ltr">ltr</value>
+ <value tokenid="ooxml:Value_ST_Direction_rtl">rtl</value>
+ </resource>
<resource name="CT_SdtContentRun" resource="Stream"/>
<resource name="CT_SdtContentBlock" resource="Stream"/>
<resource name="CT_SdtContentRow" resource="Stream"/>
commit 10def938ddcff51753765bce8b155ea642032c19
Author: Pranav Kant <pranavk at collabora.co.uk>
AuthorDate: Tue Jul 17 19:10:48 2018 +0530
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 13:00:00 2018 +0200
lokdialog: no invalidation when in init show
This improves LOK dialog opening time considerably.
libreofficekit/tilebench results:
Before:
profile run:
initialization - 346.5185(ms)
load document - 2162.5881(ms)
open dialog - 7077.8980(ms)
wait for dialog - 52.7742(ms)
render dialog - 256.9597(ms)
post close dialog - 523.7811(ms)
destroy document - 58.3723(ms)
Total: 10.4789(s)
After:
profile run:
initialization - 336.5867(ms)
load document - 2155.5481(ms)
open dialog - 1151.4130(ms)
wait for dialog - 51.5332(ms)
render dialog - 260.3197(ms)
post close dialog - 519.8729(ms)
destroy document - 56.7322(ms)
Total: 4.5320(s)
Change-Id: I6345aca33c5881aba33c8a5f74765b99fe098711
Reviewed-on: https://gerrit.libreoffice.org/57561
Tested-by: Jenkins
Reviewed-by: pranavk <pranavk at collabora.co.uk>
(cherry picked from commit 8de98e61fbc96bf523b3dec7e1e52eb7e2d7693e)
Reviewed-on: https://gerrit.libreoffice.org/57562
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit a861adc9b0f4a527d1fe8c415dab33ce9d396de0)
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 59fe3c2b85a2..df031620d39e 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1013,7 +1013,7 @@ Selection Window::GetSurroundingTextSelection() const
void Window::LogicInvalidate(const Rectangle* pRectangle)
{
DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mpViewShell);
- if (pDrawViewShell && pDrawViewShell->IsInSwitchPage())
+ if (!pDrawViewShell || pDrawViewShell->IsInSwitchPage())
return;
OString sRectangle;
@@ -1026,7 +1026,7 @@ void Window::LogicInvalidate(const Rectangle* pRectangle)
aRectangle = OutputDevice::LogicToLogic(aRectangle, MapUnit::Map100thMM, MapUnit::MapTwip);
sRectangle = aRectangle.toString();
}
- SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
+ SfxViewShell& rSfxViewShell = pDrawViewShell->GetViewShellBase();
SfxLokHelper::notifyInvalidation(&rSfxViewShell, sRectangle);
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e45fee287fd0..7617937925dc 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1399,7 +1399,7 @@ void Window::queue_resize(StateChangedType eReason)
if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier())
{
- if (GetParentDialog())
+ if (!pParent->IsInInitShow())
LogicInvalidate(nullptr);
}
}
commit 8d23bc559a17ec572402412b97733985329d21a8
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jan 27 16:23:52 2017 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 13 12:59:52 2018 +0200
-Werror=int-in-bool-context (GCC 7)
Change-Id: Ide131a586d0d282993dfbf53a783f02d48860647
(cherry picked from commit 53eb2fae381f4ed9d73bcc6d8e76a6f09777ba60)
(cherry picked from commit 700a6a6939605eb9d0bf5f762bf8c4420e8d85bb)
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 0bff9b8352c1..f9b47a0fb4fc 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2263,7 +2263,7 @@ void SalDisplay::PrintInfo() const
SAL_INFO( "vcl", "\tshift ctrl alt \t" << KeyStr( nShiftKeySym_ ) << " (0x" << std::hex << sal::static_int_cast< unsigned int >(nShiftKeySym_) << ") "
<< KeyStr( nCtrlKeySym_ ) << " (0x" << sal::static_int_cast< unsigned int >(nCtrlKeySym_) << ") "
<< KeyStr( nMod1KeySym_ ) << " (0x" << sal::static_int_cast< unsigned int >(nMod1KeySym_) << ")");
- if( XExtendedMaxRequestSize(pDisp_) * 4 )
+ if( XExtendedMaxRequestSize(pDisp_) != 0 )
SAL_INFO( "vcl", "\tXMaxRequestSize \t" << XMaxRequestSize(pDisp_) * 4 << " " << XExtendedMaxRequestSize(pDisp_) * 4 << " [bytes]");
SAL_INFO( "vcl", "\tWMName \t" << getWMAdaptor()->getWindowManagerName() );
}
More information about the Libreoffice-commits
mailing list