[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/source
vcl/source/opengl/OpenGLHelper.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 657f2d1558827e2c886e757df893c7ca067d4e7d
Author: Markus Mohrhard
AuthorDate: Sat Sep 24 23:50:13 2016 +0200
Commit: Samuel Mehrbrodt
CommitDate: Wed Jan 30 16:40:07 2019 +0100
fix the OpenGL selection logic
Now OpenGL is again not used on the build bots.
Change-Id: I7369394c44ab1e16135e2b22f7f8effca0f25d3c
(cherry picked from commit 1a4555f3b3572f398c33bffd1ed2a40705431733)
Reviewed-on: https://gerrit.libreoffice.org/67160
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 73d587c64744..25ef12f69623 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -993,12 +993,13 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
bForceOpenGL = !!getenv("SAL_FORCEGL") ||
officecfg::Office::Common::VCL::ForceOpenGL::get();
bool bRet = false;
+bool bSupportsVCLOpenGL = supportsVCLOpenGL();
// always call supportsVCLOpenGL to de-zombie the glxtest child process on
X11
-if (supportsVCLOpenGL() || bForceOpenGL)
+if (bForceOpenGL)
{
bRet = true;
}
-else
+else if (bSupportsVCLOpenGL)
{
static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/source
vcl/source/opengl/OpenGLHelper.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 9975ea97db2ebd6723c4617e093dc88071b3a0a7
Author: Jan-Marek Glogowski
AuthorDate: Thu Sep 1 12:15:44 2016 +0200
Commit: Thorsten Behrens
CommitDate: Thu Jan 24 13:32:52 2019 +0100
tdf#101822 Always de-zombie the glxtest process
Make sure we wait for the glxtest process.
Change-Id: I143290b80ba83e35f8d0f95d133c25178c5fe563
(cherry picked from commit 3bc2b8c5e0c4213b53a974944189bdf7f8155502)
Reviewed-on: https://gerrit.libreoffice.org/66854
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 12f6151048f7..73d587c64744 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -993,14 +993,11 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
bForceOpenGL = !!getenv("SAL_FORCEGL") ||
officecfg::Office::Common::VCL::ForceOpenGL::get();
bool bRet = false;
-if (bForceOpenGL)
+// always call supportsVCLOpenGL to de-zombie the glxtest child process on
X11
+if (supportsVCLOpenGL() || bForceOpenGL)
{
bRet = true;
}
-else if (!supportsVCLOpenGL())
-{
-bRet = false;
-}
else
{
static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
New commits:
commit c9e980bbb5dd86b7e8b9c538e0b0ac6cbf317871
Author: Caolán McNamara
AuthorDate: Mon Feb 5 10:23:27 2018 +
Commit: Michael Stahl
CommitDate: Tue Jan 22 17:59:59 2019 +0100
tdf#96892 higher precision pdf fixed ints
reverts
commit 5f6065f980756fdb81c7018bedbb7f54e2b8214a
Date: Thu Mar 3 20:44:47 2016 +
coverity#1355126 Logically dead code
maybe we should be using more precision, but we haven't
been in the past
and...
commit cd5cc12d4330d68d0a233a82eda30e983ce202a4
Date: Thu Mar 3 20:42:52 2016 +
nLog10Divisor is 1
and then fix the original appendFixedInt bug wrt higher precision settings
and then bump those settings from 1 decimal place to 3 and adjust our
pdf export test for the new precision
Change-Id: Ib1b4c41ce2e651d5343919b253ffd46895c764ac
Reviewed-on: https://gerrit.libreoffice.org/49227
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 2113de51158a6e6c14931109bb9a4e27303c0eab)
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index d1ce1e0b28d5..201a59e77823 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -510,8 +510,8 @@ void doTestCode()
}
#endif
-static const sal_Int32 nLog10Divisor = 1;
-static const double fDivisor = 10.0;
+static const sal_Int32 nLog10Divisor = 3;
+static const double fDivisor = 1000.0;
static inline double pixelToPoint( double px ) { return px/fDivisor; }
static inline sal_Int32 pointToPixel( double pt ) { return
sal_Int32(pt*fDivisor); }
@@ -845,14 +845,21 @@ static void appendFixedInt( sal_Int32 nValue,
OStringBuffer& rBuffer )
rBuffer.append( '-' );
nValue = -nValue;
}
-const sal_Int32 nFactor = 10;
-const sal_Int32 nInt = nValue / nFactor;
+sal_Int32 nFactor = 1, nDiv = nLog10Divisor;
+while( nDiv-- )
+nFactor *= 10;
+
+sal_Int32 nInt = nValue / nFactor;
rBuffer.append( nInt );
-sal_Int32 nDecimal = nValue % nFactor;
-if (nDecimal)
+if (nFactor > 1 && nValue % nFactor)
{
-rBuffer.append('.');
-rBuffer.append(nDecimal);
+rBuffer.append( '.' );
+do
+{
+nFactor /= 10;
+rBuffer.append((nValue / nFactor) % 10);
+}
+while (nFactor > 1 && nValue % nFactor); // omit trailing zeros
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/source
vcl/source/window/status.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 01161d411e4dfacb36c8889a91430ed44161447c
Author: Thorsten Behrens
Date: Thu Jul 5 17:06:49 2018 +0200
vcl: fix -Werror=shadow
Change-Id: If8897bc7e7a20961b2a325f20351ae9b6942563e
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 09ab700d7a5e..16350be3c052 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -226,7 +226,6 @@ void StatusBar::ImplInitSettings()
void StatusBar::ImplFormat()
{
-ImplStatusItem* pItem;
longnExtraWidth;
longnExtraWidth2;
longnX;
@@ -312,6 +311,7 @@ void StatusBar::ImplFormat()
nX += ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset;
}
+ImplStatusItem* pItem;
for (ImplStatusItem* i : *mpItemList) {
pItem = i;
if ( pItem->mbVisible ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
