[Libreoffice-commits] core.git: 3 commits - sc/source vcl/unx

[Markus Mohrhard]

 sc/source/filter/xml/xmlexprt.cxx |    1 -
 vcl/unx/glxtest.cxx               |   12 ------------
 2 files changed, 13 deletions(-)

New commits:
commit eb38796f83f86e07ea0a0b7030eb86ef228a13f0
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Dec 6 08:00:23 2014 +0100

    that just looks wrong, related fdo#51935
    
    And many more documents. Detected by the new asserts in the document
    export code.
    
    Change-Id: I207ab433b096c3cbaecf1b993595eb36e6553a5e

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index f82e0b4..724c030 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1054,7 +1054,6 @@ void ScXMLExport::ExportExternalRefCacheStyles()
         uno::Any aVal;
         aVal <<= nNumFmt;
         vector<XMLPropertyState> aProps;
-        aProps.push_back(XMLPropertyState(nEntryIndex, aVal));
         aVal <<= aDefaultStyle;
         aProps.push_back(XMLPropertyState(nEntryIndex, aVal));
 
commit c36e3eda553dd90630930c79b83a69587c152a55
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Dec 5 09:16:10 2014 +0100

    no need for extern C here
    
    Change-Id: I81a2af7aa5a52a0b19d05a64eacf89ed957a9ce8

diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
index e3f16f0..8b9408d 100644
--- a/vcl/unx/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -93,13 +93,6 @@ x_error_handler(Display *, XErrorEvent *ev)
   return 0;
 }
 
-
-// glxtest is declared inside extern "C" so that the name is not mangled.
-// The name is used in build/valgrind/x86_64-redhat-linux-gnu.sup to suppress
-// memory leak errors because we run it inside a short lived fork and we don't
-// care about leaking memory
-extern "C" {
-
 void glxtest()
 {
   // we want to redirect to /dev/null stdout, stderr, and while we're at it,
@@ -243,8 +236,6 @@ void glxtest()
   write(write_end_of_the_pipe, buf, length);
 }
 
-}
-
 /** \returns true in the child glxtest process, false in the parent process */
 bool fire_glxtest_process()
 {
commit c1699eab389809407990cc8f1dabe46f7edf7a5b
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Dec 5 04:51:05 2014 +0100

    remove some mozilla env variables
    
    Change-Id: Ic0884c2e6a051a7767ac965a7daadfe64537b13d

diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
index 9e2fba4..e3f16f0 100644
--- a/vcl/unx/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -112,9 +112,6 @@ void glxtest()
     dup2(fd, i);
   close(fd);
 
-  if (getenv("MOZ_AVOID_OPENGL_ALTOGETHER"))
-    fatal_error("The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
-
   ///// Open libGL and load needed symbols /////
 #ifdef __OpenBSD__
   #define LIBGL_FILENAME "libGL.so"