[Libreoffice-commits] .: 2 commits - odk/examples sal/inc

[Libreoffice Gerrit user]

 odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx |    1 +
 sal/inc/rtl/instance.hxx                                           |    2 ++
 sal/inc/rtl/stringutils.hxx                                        |    2 ++
 3 files changed, 5 insertions(+)

New commits:
commit 67a624f47f26358bcf1f1ec240b79fd70b8be1f7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 10 18:23:28 2012 +0100

    Fix SDK example
    
    Change-Id: Ide65bcf203f78d1e8d3286f4ee19846a357fb364

diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
index ea74e86..da96d5b 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
@@ -47,6 +47,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace cppu;
 
+using ::rtl::OString;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
commit 70fd650dbdf5605a1f247252a90e80411b5d70f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 10 18:23:14 2012 +0100

    No config_global.h in SDK
    
    Change-Id: I6e9947f056c0b70d629ac27d57b3d7d115f8d487

diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 9e73af0..1336c13 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_RTL_INSTANCE_HXX
 #define INCLUDED_RTL_INSTANCE_HXX
 
+#if defined LIBO_INTERNAL_ONLY
 #include <config_global.h>
+#endif
 
 #include "osl/doublecheckedlocking.h"
 #include "osl/getglobalmutex.hxx"
diff --git a/sal/inc/rtl/stringutils.hxx b/sal/inc/rtl/stringutils.hxx
index c972d83..4a4d24b 100644
--- a/sal/inc/rtl/stringutils.hxx
+++ b/sal/inc/rtl/stringutils.hxx
@@ -31,7 +31,9 @@
 
 #include "sal/config.h"
 
+#if defined LIBO_INTERNAL_ONLY
 #include <config_global.h>
+#endif
 
 // Manually defining RTL_DISABLE_FAST_STRING allows to force turning fast string concatenation off
 // (e.g. for debugging).