[Libreoffice-commits] .: Branch 'feature/gnumake4' - 11 commits - testautomation/chart2 testautomation/global test/inc test/prj test/source testtools/prj testtools/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:06:59 PDT 2011
test/inc/test/gettestargument.hxx | 3
test/inc/test/uniquepipename.hxx | 3
test/prj/build.lst | 2
test/source/cpp/getargument.hxx | 3
test/source/cpp/gettestargument.cxx | 3
test/source/cpp/uniquepipename.cxx | 3
test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 36 ++++++++--
testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 6 -
testautomation/global/sid/all.sid | 1
testtools/prj/build.lst | 2
testtools/source/bridgetest/bridgetest.cxx | 6 -
testtools/source/bridgetest/constructors.cxx | 6 -
testtools/source/bridgetest/cppobj.cxx | 7 -
testtools/source/performance/exports.dxp | 1
testtools/source/performance/ubobject.cxx | 7 -
testtools/source/performance/ubtest.cxx | 6 -
16 files changed, 52 insertions(+), 43 deletions(-)
New commits:
commit 9a66cb7df5d44ca1c7c97cfda0f07b258525b9fc
Merge: 7aaf924... 9832101...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:57:43 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 983210146be38f7d47949149959ba0eeda0e6b5f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Jul 12 12:26:18 2011 +0200
Remove component_getImplementationEnvironment
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 069b00f..b4dde7f 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 9ba26c2..a170c87 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 0782965..920253c 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 9630d7e..51703a0 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 74a4542..657033a 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 fdb2b64..dc4ad4f 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 )
{
commit 599f7e98be23f2e1ff6bff75458713e5697bfd51
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jul 9 15:12:10 2011 +0300
Build cpputools only for desktop OSes
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 0b8f340..bd4bc2f 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
commit 399a5127c34313d8addcd6faeb4683fdd8669ccd
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sat Jul 2 15:05:35 2011 +0200
Remove online registration related code
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index 258ef7c..32be4f2 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
commit 41515f40e6a189bfd969b9fa08d378f48f3bf96c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 1 11:26:04 2011 +0100
WaE: for windows compiler
diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index e58c78e..ed2c4f7 100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -95,9 +95,12 @@ bool Prot::protect(
bool Prot::protect(CppUnit::Functor const & functor)
{
- try {
- return functor();
- } catch (const css::uno::Exception &e) {
+ bool bRet = false;
+ try
+ {
+ bRet = functor();
+ } catch (const css::uno::Exception &e)
+ {
css::uno::Any a(cppu::getCaughtException());
std::cerr
<< convert(rtl::OUString(
@@ -108,7 +111,7 @@ bool Prot::protect(CppUnit::Functor const & functor)
<< std::endl;
throw;
}
- return false;
+ return bRet;
}
}
commit 3e5b29719087d32cbb7c3c13406fd3e5251973bb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 30 16:02:33 2011 +0100
add mode-lines
diff --git a/test/inc/test/gettestargument.hxx b/test/inc/test/gettestargument.hxx
index 21b9df7..4fe1114 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 4b96586..b66492c 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/source/cpp/getargument.hxx b/test/source/cpp/getargument.hxx
index 4ba7e0f..3380fdd 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 757faa7..0bc0006 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 c7614f4..8cb409f 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 b6ac122..e58c78e 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.
*
@@ -116,3 +117,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL
unoexceptionprotector() {
return new Prot;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit aa6235b3c80ca629c824a0457bb61d126adba59e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 30 16:00:46 2011 +0100
implement additional context-less protection api
diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index da54d62..b6ac122 100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -28,6 +28,7 @@
#include <limits>
#include <string>
+#include <iostream>
#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Any.hxx"
@@ -39,8 +40,8 @@
#include "rtl/ustring.hxx"
#include "sal/types.h"
+#include "protectorfactory.hxx"
#include "cppunit/Message.h"
-#include "cppunit/Protector.h"
namespace {
@@ -57,7 +58,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 +68,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 +77,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,13 +85,31 @@ 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)
+{
+ try {
+ return 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 false;
+}
+
}
extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL
commit 4dd008c96b382fa221594626dd5ac2620cd4a763
Author: Regina Henschel <rb.henschel at t-online.de>
Date: Thu Jun 23 18:34:06 2011 +0300
Adapt texts to new B-spline implementation
diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
index 357fa89..71897c2 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
commit 601dbcbe25cb01aed249f7828d0acba3318c25cf
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:09:11 2011 +0200
ause130: #i117218# change .idl handling to gnu make
diff --git a/test/prj/build.lst b/test/prj/build.lst
index bb3d6be..b223c32 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
commit d8509a1b636632fad32b77db66c8a6d4531c0287
Merge: 5b5d30e... 3012fcb...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 17 13:02:09 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 3012fcb96bb8c933d0bce79e281359ebb7c05fd3
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 14 16:53:27 2011 +0200
Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
More information about the Libreoffice-commits
mailing list