Merge branch 'master' into feature/gnumake4feature/gnumake4

16 files changed, 52 insertions, 43 deletions

diff --git a/test/inc/test/gettestargument.hxx b/test/inc/test/gettestargument.hxx
index 21b9df7a0..4fe11147b 100644
--- a/test/inc/test/gettestargument.hxx
+++ b/test/inc/test/gettestargument.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ OOO_DLLPUBLIC_TEST bool getTestArgument(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/uniquepipename.hxx b/test/inc/test/uniquepipename.hxx
index 4b96586a0..b66492ce2 100644
--- a/test/inc/test/uniquepipename.hxx
+++ b/test/inc/test/uniquepipename.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/prj/build.lst b/test/prj/build.lst
index bb3d6bedd..b223c324e 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,4 +1,4 @@
-te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv stlport unoil qadevOOo NULL
+te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv stlport unoil qadevOOo NULL
 te test\inc nmake - all inc NULL
 te test\source\cpp nmake - all source_cpp inc NULL
 te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL
diff --git a/test/source/cpp/getargument.hxx b/test/source/cpp/getargument.hxx
index 4ba7e0f47..3380fdd2e 100644
--- a/test/source/cpp/getargument.hxx
+++ b/test/source/cpp/getargument.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
@@ -42,3 +43,5 @@ bool getArgument(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/cpp/gettestargument.cxx b/test/source/cpp/gettestargument.cxx
index 757faa751..0bc00062e 100644
--- a/test/source/cpp/gettestargument.cxx
+++ b/test/source/cpp/gettestargument.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,5 @@ bool getTestArgument(rtl::OUString const & name, rtl::OUString * value) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/cpp/uniquepipename.cxx b/test/source/cpp/uniquepipename.cxx
index c7614f4f3..8cb409f62 100644
--- a/test/source/cpp/uniquepipename.cxx
+++ b/test/source/cpp/uniquepipename.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ rtl::OUString uniquePipeName(rtl::OUString const & name) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index da54d62d6..ed2c4f7d4 100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
@@ -28,6 +29,7 @@
 
 #include <limits>
 #include <string>
+#include <iostream>
 
 #include "boost/noncopyable.hpp"
 #include "com/sun/star/uno/Any.hxx"
@@ -39,8 +41,8 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
+#include "protectorfactory.hxx"
 #include "cppunit/Message.h"
-#include "cppunit/Protector.h"
 
 namespace {
 
@@ -57,7 +59,8 @@ std::string convert(rtl::OUString const & s16) {
          : static_cast< std::string::size_type >(s8.getLength())));
 }
 
-class Prot: public CppUnit::Protector, private boost::noncopyable {
+class Prot : public cppunittester::LibreOfficeProtector, private boost::noncopyable
+{
 public:
     Prot() {}
 
@@ -66,6 +69,8 @@ public:
     virtual bool protect(
         CppUnit::Functor const & functor,
         CppUnit::ProtectorContext const & context);
+
+    virtual bool protect(CppUnit::Functor const & functor);
 };
 
 bool Prot::protect(
@@ -73,7 +78,7 @@ bool Prot::protect(
 {
     try {
         return functor();
-    } catch (css::uno::Exception & e) {
+    } catch (const css::uno::Exception &e) {
         css::uno::Any a(cppu::getCaughtException());
         reportError(
             context,
@@ -81,16 +86,39 @@ bool Prot::protect(
                 convert(
                     rtl::OUString(
                         RTL_CONSTASCII_USTRINGPARAM(
-                            "uncaught exception of type "))
+                            "An uncaught exception of type "))
                     + a.getValueTypeName()),
                 convert(e.Message)));
     }
     return false;
 }
 
+bool Prot::protect(CppUnit::Functor const & functor)
+{
+    bool bRet = false;
+    try
+    {
+        bRet = functor();
+    } catch (const css::uno::Exception &e)
+    {
+        css::uno::Any a(cppu::getCaughtException());
+        std::cerr
+            << convert(rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "An uncaught exception of type "))
+                        + a.getValueTypeName())
+            << std::endl << "Exception Message was: " << convert(e.Message)
+            << std::endl;
+        throw;
+    }
+    return bRet;
+}
+
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL
 unoexceptionprotector() {
     return new Prot;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
index 357fa89c4..71897c2d8 100644
--- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
+++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
@@ -416,7 +416,7 @@ testcase tCreateNewLineChart
     BSpline.check        
     printlog "Set Resolution to 33"
     Resolution.SetText "33"        
-    printlog "et Data Points Order to 5"    
+    printlog "et Degree of polynomials to 5"
     DataPointsOrder.SetText "5"    
     printlog "Close 'Smooth Lines' dialog"
     if fCloseSmoothLinePropertiesOK() > 0 then
@@ -524,9 +524,9 @@ testcase tCreateNewLineChart
         if Resolution.GetText <> "33" then
             warnlog "Value for Resolution '33' wasn't preserved after save and reload."
         endif        
-        printlog "Check if 'Data Points Order' has value '5'"
+        printlog "Check if 'Degree of polynomials' has value '5'"
         if DataPointsOrder.GetText <> "5" then
-            warnlog "Value for Data Points Order '5' wasn't preserved after save and reload."
+            warnlog "Value for Degree of polynomials '5' wasn't preserved after save and reload."
         endif        
         printlog "Close 'Smooth Lines' dialog"
         if fCloseSmoothLinePropertiesOK() > 0 then
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index 258ef7c2d..32be4f2e4 100755
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -597,7 +597,6 @@ HilfeInhalt .uno:HelpIndex
 HilfeHelferlein .uno:HelperDialog
 HilfeTip .uno:HelpTip
 HilfeAktiveHilfe .uno:ActiveHelp
-HilfeOnlineregistrierung .uno:OnlineRegistrationDlg
 HilfeInfoUeber .uno:About
 
 
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 0b8f340cc..bd4bc2f9a 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,4 +1,4 @@
-tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
+tt testtools : DESKTOP:cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
 tt testtools\inc nmake - all tt_inc NULL
 tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
 tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 069b00fba..b4dde7ff0 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1297,12 +1297,6 @@ static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
 extern "C"
 {
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 9ba26c289..a170c8710 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -504,10 +504,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 07829658a..920253c20 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -1183,13 +1183,6 @@ static Reference< XInterface > SAL_CALL Test_Impl_create( const Reference< XMult
 
 extern "C"
 {
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/testtools/source/performance/exports.dxp b/testtools/source/performance/exports.dxp
index 9630d7e06..51703a046 100644
--- a/testtools/source/performance/exports.dxp
+++ b/testtools/source/performance/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
 component_writeInfo
 component_getFactory
diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx
index 74a45428c..657033af8 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -256,13 +256,6 @@ static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMu
 
 extern "C"
 {
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * pServiceManager, void * pRegistryKey )
 {
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index fdb2b642c..dc4ad4fe7 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -1288,12 +1288,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
 extern "C"
 {
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * pServiceManager, void * pRegistryKey )
 {