[Libreoffice-commits] .: 3 commits - connectivity/CppunitTest_connectivity_ado.mk connectivity/source

[Libreoffice Gerrit user]

 connectivity/CppunitTest_connectivity_ado.mk |    8 +++++++-
 connectivity/source/inc/ado/Aolewrap.hxx     |    3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ad410afdfa5609e0bf4ea643d9b027064371588d
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Nov 3 14:19:25 2012 +0100

    fix strange copy ctor that triggers a missing base initialization warning

diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 4e1debe..c4462a1 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -94,8 +94,9 @@ namespace connectivity
             }
 
             WpOLEBase(const WpOLEBase<T>& aWrapper)
+                : WpBase( aWrapper )
+                , pInterface( aWrapper.pInterface )
             {
-                operator=(aWrapper);
             }
 
             virtual ~WpOLEBase()
commit 363cf6579930565094b908e7c9390bea29f290e8
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Nov 3 14:19:00 2012 +0100

    ado headers need -fpermissive with gcc

diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index ccd2f63..8594b17 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -24,6 +24,12 @@ $(eval $(call gb_CppunitTest_use_ure,connectivity_ado))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_ado))
 
+ifeq ($(COM),GCC)
+$(eval $(call gb_CppunitTest_add_cxxflags,connectivity_ado,\
+	-fpermissive \
+))
+endif
+
 $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_ado, \
 	connectivity/qa/connectivity/ado/DriverTest \
 ))
commit 5cf2d86ac8347c3456b25f1fadacd8088d9b03b8
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Nov 3 14:18:35 2012 +0100

    fix copy&paste

diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index 04706b7..ccd2f63 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_api,connectivity_ado,\
 
 $(eval $(call gb_CppunitTest_use_ure,connectivity_ado))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork))
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_ado))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_ado, \
 	connectivity/qa/connectivity/ado/DriverTest \