[Libreoffice-commits] core.git: oox/source

Tor Lillqvist tml at collabora.com
Wed Feb 15 22:42:59 UTC 2017


 oox/source/export/drawingml.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 50089a812be66d37ea7b660da11f08079ff5277f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 16 00:41:52 2017 +0200

    Try harder to fix Android tinderbox
    
    Change-Id: I4f3f112d4cd301d3ee1806cd2d26564ac3852723

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a57fc82..1824072 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -104,6 +104,17 @@ using ::css::io::XOutputStream;
 using ::sax_fastparser::FSHelperPtr;
 using ::sax_fastparser::FastSerializerHelper;
 
+#if defined(ANDROID)
+namespace std
+{
+template<typename T>
+T lround(T x)
+{
+    return ::lround(x);
+}
+}
+#endif
+
 namespace oox {
 namespace drawingml {
 
@@ -1912,17 +1923,6 @@ void DrawingML::WriteLinespacing( LineSpacing& rSpacing )
     }
 }
 
-#if defined(ANDROID)
-namespace std
-{
-template<typename T>
-T lround(T x)
-{
-    return ::lround(x);
-}
-}
-#endif
-
 void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rParagraph )
 {
     Reference< XPropertySet > rXPropSet( rParagraph, UNO_QUERY );


More information about the Libreoffice-commits mailing list