[Libreoffice-commits] .: embedserv/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Dec 11 09:32:01 PST 2012


 embedserv/source/embed/ed_ipersiststr.cxx |    7 +++++++
 embedserv/source/inc/embservconst.h       |    6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 6531960ad606f52ec84956c695b1fd40fda1bb35
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 11 18:31:25 2012 +0100

    Blind Windows-only fix
    
    Change-Id: I66c2c0262d3b1255ec90c1e4ac6c992c91b4a821

diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index f65cd01..3ff0ab7 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -40,11 +40,18 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
+#include <sal/types.h>
 
 #include <string.h>
 
 #define EXT_STREAM_LENGTH 16
 
+namespace {
+
+const sal_Int32 nConstBufferSize = 32000;
+
+}
+
 using namespace ::com::sun::star;
 
 extern ::rtl::OUString  getStorageTypeFromGUID_Impl( GUID* guid );
diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h
index 82b6669..9322aef 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.h
@@ -26,16 +26,10 @@
 #include <comphelper/classids.hxx>
 #endif
 
-#ifndef _SAL_TYPES_H_
-#include <sal/types.h>
-#endif
-
 #if defined __MINGW32__
 #pragma GCC diagnostic warning "-Wmissing-braces"
 #endif
 
-const sal_Int32 nConstBufferSize = 32000;
-
 #define SUPPORTED_FACTORIES_NUM 10
 
 #if defined(__MINGW32__) && !defined(INITGUID)


More information about the Libreoffice-commits mailing list