diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
commit | 8c59580b88a33d7f0c892c9c53776716ad661fcf (patch) | |
tree | da43a9c8f3ba7cba7afca05894acc8712f6e36ce /test/inc | |
parent | e62f74cabe9558e003d3105df7a69e3841dfc9ce (diff) | |
parent | 36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts:
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/smoketest.cxx
test/source/cpp/getargument.cxx
test/source/cpp/officeconnection.cxx
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
testautomation/framework/optional/includes/filedlg_cjk_folders.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/e_all.sid
testautomation/global/win/bars.win
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/testComponent.component
Diffstat (limited to 'test/inc')
-rw-r--r-- | test/inc/test/gettestargument.hxx (renamed from test/inc/test/getargument.hxx) | 15 | ||||
-rw-r--r-- | test/inc/test/officeconnection.hxx | 12 | ||||
-rw-r--r-- | test/inc/test/uniquepipename.hxx | 44 |
3 files changed, 57 insertions, 14 deletions
diff --git a/test/inc/test/getargument.hxx b/test/inc/test/gettestargument.hxx index 082159291cdb..21b9df7a097e 100644 --- a/test/inc/test/getargument.hxx +++ b/test/inc/test/gettestargument.hxx @@ -1,5 +1,5 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* +* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. @@ -22,10 +22,11 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. +* ************************************************************************/ -#ifndef INCLUDED_TEST_GETARGUMENT_HXX -#define INCLUDED_TEST_GETARGUMENT_HXX +#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX +#define INCLUDED_TEST_GETTESTARGUMENT_HXX #include "sal/config.h" @@ -35,13 +36,11 @@ namespace rtl { class OUString; } namespace test { -// Obtain the value of an argument tunneled in via an "arg-<name>" bootstrap -// variable: -OOO_DLLPUBLIC_TEST bool getArgument( +// Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>" +// bootstrap variable): +OOO_DLLPUBLIC_TEST bool getTestArgument( rtl::OUString const & name, rtl::OUString * value); } #endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/officeconnection.hxx b/test/inc/test/officeconnection.hxx index b46d751f96dd..4c764b1693d0 100644 --- a/test/inc/test/officeconnection.hxx +++ b/test/inc/test/officeconnection.hxx @@ -34,8 +34,8 @@ #include "osl/process.h" #include "test/detail/testdllapi.hxx" -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; } } } } namespace test { @@ -52,13 +52,13 @@ public: void tearDown(); - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - getFactory() const; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + getComponentContext() const; private: oslProcess process_; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - factory_; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + context_; }; } diff --git a/test/inc/test/uniquepipename.hxx b/test/inc/test/uniquepipename.hxx new file mode 100644 index 000000000000..4b96586a0299 --- /dev/null +++ b/test/inc/test/uniquepipename.hxx @@ -0,0 +1,44 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX +#define INCLUDED_TEST_UNIQUEPIPENAME_HXX + +#include "sal/config.h" + +#include "test/detail/testdllapi.hxx" + +namespace rtl { class OUString; } + +namespace test { + +// Create a system-wide unique name (for use with osl::Pipe): +OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name); + +} + +#endif |