Skip to content

C
core
Kaydet (Commit) 2ef7f7ef authored tarafından August Sodora's avatar August Sodora
Dosyalara gözat
Seçenekler

Remove testtoolloader

üst f19e6305
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 254 deletions
bin/distro-install-file-lists
Dosyayı görüntüle @ 2ef7f7ef
......@@ -123,7 +123,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Testtool $FILELISTSDIR/testtool_list.txt
merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
else
merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filters_list.txt
......@@ -132,7 +131,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/filters_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Testtool $FILELISTSDIR/testtool_list.txt
merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt
fi
else
......@@ -143,7 +141,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Testtool $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
fi
......@@ -420,7 +417,6 @@ else
create_package_directory gid_Module_Root_Files_5 pkg/libreoffice-common
create_package_directory gid_Module_Root_Files_6 pkg/libreoffice-common
create_package_directory gid_Module_Root_Files_7 pkg/libreoffice-common
create_package_directory gid_Module_Optional_Testtool pkg/libreoffice-qa-tools
if [ -e gid_Module_Optional_Pymailmerge ]; then
create_package_directory gid_Module_Optional_Pymailmerge pkg/libreoffice-emailmerge
else # post m26
......
cui/source/options/optimprove.cxx
Dosyayı görüntüle @ 2ef7f7ef
......@@ -46,7 +46,6 @@
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/uieventslogger.hxx>
#include <tools/testtoolloader.hxx>
namespace lang = ::com::sun::star::lang;
namespace uno = ::com::sun::star::uno;
......@@ -190,7 +189,6 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG )
::comphelper::ConfigurationHelper::E_STANDARD );
// TODO: refactor
::comphelper::UiEventsLogger::reinit();
::tools::InitTestToolLib();
}
EndDialog( RET_OK );
return 0;
......
cui/source/options/optimprove2.cxx
Dosyayı görüntüle @ 2ef7f7ef
......@@ -26,8 +26,6 @@
*
************************************************************************/
// include ---------------------------------------------------------------
#define _SVX_OPTIMPROVE_CXX
#include <optimprove.hxx>
......@@ -49,7 +47,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/synchronousdispatch.hxx>
#include <comphelper/uieventslogger.hxx>
#include <tools/testtoolloader.hxx>
#include <osl/file.hxx>
#define C2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
......@@ -185,7 +182,6 @@ sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ )
::comphelper::ConfigurationHelper::flush( xConfig );
// TODO: refactor
::comphelper::UiEventsLogger::reinit();
::tools::InitTestToolLib();
}
catch( uno::Exception& )
{
......
desktop/source/app/app.cxx
Dosyayı görüntüle @ 2ef7f7ef
......@@ -96,7 +96,6 @@
#include <com/sun/star/frame/XUIControllerRegistration.hpp>
#include <com/sun/star/java/XJavaVM.hpp>
#include <tools/testtoolloader.hxx>
#include <tools/solar.h>
#include <toolkit/unohlp.hxx>
#include <osl/security.hxx>
......@@ -1680,11 +1679,6 @@ int Desktop::Main()
*/
Application::GetDefaultDevice();
// initialize test-tool library (if available)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ tools::InitTestToolLib" );
tools::InitTestToolLib();
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} tools::InitTestToolLib" );
// Check if bundled or shared extensions were added /removed
// and process those extensions (has to be done before checking
// the extension dependencies!
......@@ -1930,7 +1924,6 @@ int Desktop::doShutdown()
sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
DeregisterServices();
Application::AcquireSolarMutex(nAcquireCount);
tools::DeInitTestToolLib();
// be sure that path/language options gets destroyed before
// UCB is deinitialized
RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> dispose path/language options" );
......
padmin/source/pamain.cxx
Dosyayı görüntüle @ 2ef7f7ef
......@@ -29,8 +29,6 @@
#include <stdio.h>
#include <unistd.h>
#include "tools/testtoolloader.hxx"
#include "vcl/svapp.hxx"
#include "vcl/wrkwin.hxx"
#include "vcl/unowrap.hxx"
......@@ -56,8 +54,6 @@ using namespace comphelper;
using ::rtl::OUString;
// -----------------------------------------------------------------------
class MyApp : public Application
{
public:
......@@ -152,9 +148,6 @@ int MyApp::Main()
return EXIT_FAILURE;
}
// initialize test-tool library (if available)
tools::InitTestToolLib();
ResMgr::SetReadStringHook( MyApp::ReadStringHook );
pPADialog = PADialog::Create( NULL , sal_False );
......@@ -163,8 +156,6 @@ int MyApp::Main()
pPADialog->Execute();
delete pPADialog;
tools::DeInitTestToolLib();
/*
* clean up UCB
*/
......
tools/Library_tl.mk
Dosyayı görüntüle @ 2ef7f7ef
......@@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/string/tstring \
tools/source/string/tustring \
tools/source/string/reversemap \
tools/source/testtoolloader/testtoolloader \
tools/source/zcodec/zcodec \
))
......@@ -145,5 +144,5 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
endif
# no -DTOOLS_DLLIMPLEMENTATION on toolsdll
# -DEXCEPTIONS_OFF -fno-exceptions on datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
# -DEXCEPTIONS_OFF -fno-exceptions on datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring
# vim: set noet sw=4 ts=4:
tools/Package_inc.mk
Dosyayı görüntüle @ 2ef7f7ef
......@@ -86,7 +86,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibr
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
......
tools/inc/tools/testtoolloader.hxx deleted 100644 → 0
Dosyayı görüntüle @ f19e6305
/* -*- 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.
*
* 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 _TOOLS_TESTTOOLLOADER_HXX_
#define _TOOLS_TESTTOOLLOADER_HXX_
#include "tools/toolsdllapi.h"
namespace tools
{
TOOLS_DLLPUBLIC void InitTestToolLib();
TOOLS_DLLPUBLIC void DeInitTestToolLib();
}
#endif // _TOOLS_TESTTOOLLOADER_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
tools/source/testtoolloader/testtoolloader.cxx deleted 100644 → 0
Dosyayı görüntüle @ f19e6305
/* -*- 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.
*
* 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.
*
************************************************************************/
#include "tools/testtoolloader.hxx"
#include <osl/module.h>
#include <rtl/logfile.hxx>
#include <osl/process.h>
#include "tools/solar.h"
#include "tools/string.hxx"
#include "tools/debug.hxx"
#include <comphelper/uieventslogger.hxx>
using ::rtl::OUString;
namespace tools
{
typedef void ( *pfunc_CreateRemoteControl)();
typedef void ( *pfunc_DestroyRemoteControl)();
typedef void ( *pfunc_CreateEventLogger)();
typedef void ( *pfunc_DestroyEventLogger)();
static oslModule aTestToolModule = 0;
// are we to be automated at all?
static bool bAutomate = false;
static bool bLoggerStarted = false;
sal_uInt32 GetCommandLineParamCount()
{
return osl_getCommandArgCount();
}
String GetCommandLineParam( sal_uInt32 nParam )
{
::rtl::OUString aParam;
oslProcessError eError = osl_getCommandArg( nParam, &aParam.pData );
if ( eError == osl_Process_E_None )
return String( aParam );
else
{
OSL_FAIL( "Unable to get CommandLineParam" );
return String();
}
}
extern "C" { static void SAL_CALL thisModule() {} }
void LoadLib()
{
if ( !aTestToolModule )
{
aTestToolModule = osl_loadModuleRelative(
&thisModule,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("sts"))).pData,
SAL_LOADMODULE_GLOBAL );
}
}
void InitTestToolLib()
{
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::InitTestToolLib" );
sal_uInt32 i;
for ( i = 0 ; i < GetCommandLineParamCount() ; i++ )
{
if ( GetCommandLineParam( i ).EqualsIgnoreCaseAscii("/enableautomation")
|| GetCommandLineParam( i ).EqualsIgnoreCaseAscii("-enableautomation"))
{
bAutomate = true;
break;
}
}
if ( bAutomate )
{
OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateRemoteControl" ));
LoadLib();
if ( aTestToolModule )
{
oslGenericFunction pInitFunc = osl_getFunctionSymbol(
aTestToolModule, aFuncName.pData );
if ( pInitFunc )
(reinterpret_cast< pfunc_CreateRemoteControl >(pInitFunc))();
else
{
OSL_TRACE( "Unable to get Symbol 'CreateRemoteControl' from library %s while loading testtool support.", SVLIBRARY( "sts" ) );
}
}
else
{
OSL_TRACE( "Unable to access library %s while loading testtool support.", SVLIBRARY( "sts" ) );
}
}
if ( ::comphelper::UiEventsLogger::isEnabled() )
{
OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateEventLogger" ));
LoadLib();
if ( aTestToolModule )
{
oslGenericFunction pInitFunc = osl_getFunctionSymbol(
aTestToolModule, aFuncName.pData );
if ( pInitFunc )
{
(reinterpret_cast< pfunc_CreateEventLogger >(pInitFunc))();
bLoggerStarted = sal_True;
}
else
{
OSL_TRACE( "Unable to get Symbol 'CreateEventLogger' from library %s while loading testtool support.", SVLIBRARY( "sts" ) );
}
}
else
{
OSL_TRACE( "Unable to access library %s while loading testtool support.", SVLIBRARY( "sts" ) );
}
}
}
void DeInitTestToolLib()
{
if ( aTestToolModule )
{
if ( bAutomate )
{
OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyRemoteControl" ));
oslGenericFunction pDeInitFunc = osl_getFunctionSymbol(
aTestToolModule, aFuncName.pData );
if ( pDeInitFunc )
(reinterpret_cast< pfunc_DestroyRemoteControl >(pDeInitFunc))();
}
if ( bLoggerStarted /*::comphelper::UiEventsLogger::isEnabled()*/ )
{
OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyEventLogger" ));
oslGenericFunction pDeInitFunc = osl_getFunctionSymbol(
aTestToolModule, aFuncName.pData );
if ( pDeInitFunc )
{
(reinterpret_cast< pfunc_DestroyEventLogger >(pDeInitFunc))();
bLoggerStarted = sal_False;
}
}
osl_unloadModule( aTestToolModule );
}
}
} // namespace tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment