chart2/source/inc/CommonFunctors.hxx | 5 +++--
oox/source/export/drawingml.cxx | 2 +-
vcl/source/opengl/OpenGLContext.cxx | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 4ff0032528d7aebb0de5cf045a39972a2769029f
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Sep 7 21:13:26 2015 +0200
avoid some OpenGL calls when vcl OpenGL is not enabled
There are even more and it is causing a number of performance issues.
This just fixes the most obvious place.
Change-Id: Id85c13b5b7f4bb0bc077e62c39258067e17c0094
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 83a1811..a80d24b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1309,7 +1309,7 @@ bool OpenGLContext::isCurrent()
return false;
#elif defined( UNX )
GLXDrawable nDrawable = mbPixmap ? m_aGLWin.glPix : m_aGLWin.win;
- return (glXGetCurrentContext() == m_aGLWin.ctx &&
+ return (m_aGLWin.ctx && glXGetCurrentContext() == m_aGLWin.ctx &&
glXGetCurrentDrawable() == nDrawable);
#endif
}
commit 442eb1ab9d8c1ad970993ef6c8a49e89601b7432
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Sep 7 21:11:28 2015 +0200
related tdf#93676, we want to export all significant digits
The code comment mentions correctly that we want to show all significant
digits but a value of -1 means that the last digit before the decimal
point is rounded away.
Change-Id: Id91a6076e37629502281c5dda426018f93d1e465
diff --git a/chart2/source/inc/CommonFunctors.hxx
b/chart2/source/inc/CommonFunctors.hxx
index 226eeed..fac5cd9 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -84,8 +84,9 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public
::std::unary_function< ::co
return ::rtl::math::doubleToUString(
* pDouble,
rtl_math_StringFormat_Automatic,
- -1, // use maximum decimal places available
- sal_Char( '.' ) // decimal separator
+ rtl_math_DecimalPlaces_Max, // use maximum decimal places
available
+ sal_Char( '.' ), // decimal separator
+ true // remove trailing zeros
);
}
else if( eClass == ::com::sun::star::uno::TypeClass_STRING )
commit a052479f3c85bdedddfa38cb03b0858003c965c3
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Sep 7 19:47:17 2015 +0200
related tdf#93676: make the bold property explicit for run export
Change-Id: I5f7f993f2cf0604ec62cea3460b651c07a7b4383
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index eeae323..83fd6f0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1209,7 +1209,7 @@ void DrawingML::WriteRunProperties( Reference<
XPropertySet > rRun, bool bIsFiel
PropertyState eState;
SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(
Application::GetSettings().GetLanguageTag().getLanguageType() );
bool bComplex = ( nScriptType == SvtScriptType::COMPLEX );
- const char* bold = NULL;
+ const char* bold = "0";
const char* italic = NULL;
const char* underline = NULL;
const char* strikeout = NULL;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
