[Libreoffice-commits] core.git: 3 commits - dbaccess/CppunitTest_dbaccess_RowSetClones.mk include/rtl sd/CppunitTest_sd_export_tests.mk

[Stephan Bergmann]

 dbaccess/CppunitTest_dbaccess_RowSetClones.mk |    4 ++++
 include/rtl/string.hxx                        |    5 +++++
 sd/CppunitTest_sd_export_tests.mk             |    4 +++-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit f20162304d73bc01955e9ef6506c3bd1c7016c48
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Sun Jul 12 18:07:51 2015 +0200

    Rule out OString(std::nullptr_t)
    
    (This is no issue for OUString, as it has two ctors taking a single pointer
    argument, so passing a null pointer is ambiguous anyway.)
    
    Change-Id: I36f44b29eb84eb83e284fa080d706eabb4b485d5

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 1aeecc0..995fe7e 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <cassert>
+#include <cstddef>
 #include <new>
 #include <ostream>
 #include <string.h>
@@ -256,6 +257,10 @@ public:
     }
 #endif
 
+#ifdef LIBO_INTERNAL_ONLY
+    OString(std::nullptr_t) = delete;
+#endif
+
     /**
       Release the string data.
     */
commit 7cedeaeba79bdd54b3bcbadb21c51cc535cf4a5d
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Sun Jul 12 18:07:19 2015 +0200

    Missing dependency (and typo)
    
    Change-Id: Iecf1f652d56a129993f7ac66dce95e93d326e87b

diff --git a/sd/CppunitTest_sd_export_tests.mk 
b/sd/CppunitTest_sd_export_tests.mk
index 6e4555f..3384377 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -77,6 +77,8 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\
     -env:SVG_DISABLE_FONT_EMBEDDING= \
 ))
 
-$(call gb_CppunitTest_get_target,sd_export_test) : $(call 
gb_AllLangResTarget_get_target,sd)
+$(call gb_CppunitTest_get_target,sd_export_tests): \
+    $(call gb_AllLangResTarget_get_target,avmedia) \
+    $(call gb_AllLangResTarget_get_target,sd)
 
 # vim: set noet sw=4 ts=4:
commit a85e1d505b5830bfa9298cf8daab8118ba734404
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Sun Jul 12 18:06:33 2015 +0200

    Missing dependency
    
    Change-Id: I7ff00286fa160a46a735b2a3e59bf0f6e1089c9f

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk 
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 7aa0bec..418525ce4 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -17,6 +17,10 @@ $(eval $(call 
gb_CppunitTest_use_externals,dbaccess_RowSetClones,\
     boost_headers \
 ))
 
+$(eval $(call gb_CppunitTest_use_jars,dbaccess_RowSetClones, \
+    sdbc_hsqldb \
+))
+
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
     basegfx \
     comphelper \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits