diff options
| author | Carsten Driesner <cd@openoffice.org> | 2010-10-22 14:34:57 +0200 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2010-10-22 14:34:57 +0200 |
| commit | edc04aede95f7b360beb18e02f7a86f5b21d12ff (patch) | |
| tree | 4f772cfc88b67f0067da9eaa88ec9c111b3f0855 | |
| parent | 2f7dbbfc7a2dfa403fa2020263e5f217160ec727 (diff) | |
| parent | 8d22455d3e7c7e8e25bcb8724754fc764f0e713c (diff) | |
fwk149: Merge changes from DEV300_m90
536 files changed, 11836 insertions, 10045 deletions
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst index c82db252aab8..eb140ed45770 100644 --- a/avmedia/prj/d.lst +++ b/avmedia/prj/d.lst @@ -16,3 +16,8 @@ mkdir: %_DEST%\inc%_EXT%\avmedia ..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx ..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar +..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component +..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component +..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component +..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component +..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index d24ae795fd76..a1fed18a0f68 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -497,44 +497,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - rtl::OUString sKeyName = DECLARE_ASCII( "/" ); - sKeyName += avmedia::SoundHandler::impl_getStaticImplementationName(); - sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); - css::uno::Reference< css::registry::XRegistryKey > xNewKey( - static_cast< css::registry::XRegistryKey* >( pRegistryKey )->createKey(sKeyName)); - - if ( xNewKey.is() == sal_True ) - { - css::uno::Sequence< ::rtl::OUString > seqServiceNames = avmedia::SoundHandler::impl_getStaticSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getArray(); - sal_Int32 nLength = seqServiceNames.getLength(); - for ( sal_Int32 nCounter = 0; nCounter < nLength; ++nCounter ) - xNewKey->createKey( pArray[nCounter] ); - } - - bRet = sal_True; - } - catch( css::registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/gstreamer/avmediagst.component b/avmedia/source/gstreamer/avmediagst.component new file mode 100644 index 000000000000..75d39d275f5c --- /dev/null +++ b/avmedia/source/gstreamer/avmediagst.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer"> + <service name="com.sun.star.media.Manager_GStreamer"/> + </implementation> +</component> diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/avmedia/source/gstreamer/exports.dxp +++ b/avmedia/source/gstreamer/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index adcda63fcd9c..26d13ffc938b 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -48,35 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( - "/" AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/" - AVMEDIA_GSTREAMER_MANAGER_SERVICENAME ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk index 2f22c7333778..c648fcc77f89 100644 --- a/avmedia/source/gstreamer/makefile.mk +++ b/avmedia/source/gstreamer/makefile.mk @@ -69,3 +69,11 @@ DEF1EXPORTFILE=exports.dxp .ENDIF .INCLUDE : target.mk + +ALLTAR : $(MISC)/avmediagst.component + +$(MISC)/avmediagst.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + avmediagst.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmediagst.component diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java index ca7a164586d8..3e4387840741 100644 --- a/avmedia/source/java/MediaUno.java +++ b/avmedia/source/java/MediaUno.java @@ -64,13 +64,4 @@ public class MediaUno return null; } - - // ------------------------------------------------------------------------- - - public static boolean __writeRegistryServiceInfo( - com.sun.star.registry.XRegistryKey regKey ) - { - return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( - s_implName, s_serviceName, regKey ); - } } diff --git a/avmedia/source/java/avmedia.jar.component b/avmedia/source/java/avmedia.jar.component new file mode 100644 index 000000000000..d7cc160bd7d0 --- /dev/null +++ b/avmedia/source/java/avmedia.jar.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.media.Manager_Java"> + <service name="com.sun.star.media.Manager_Java"/> + </implementation> +</component> diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk index 37c53a721164..1fe771c117f2 100644 --- a/avmedia/source/java/makefile.mk +++ b/avmedia/source/java/makefile.mk @@ -59,3 +59,11 @@ CUSTOMMANIFESTFILE = manifest # --- Targets ------------------------------------------------------ .INCLUDE: target.mk + +ALLTAR : $(MISC)/avmedia.jar.component + +$(MISC)/avmedia.jar.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component new file mode 100644 index 000000000000..aa0251d74c9d --- /dev/null +++ b/avmedia/source/quicktime/avmediaQuickTime.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime"> + <service name="com.sun.star.media.Manager_QuickTime"/> + </implementation> +</component> diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk index f3c9f244f357..358fce491847 100644 --- a/avmedia/source/quicktime/makefile.mk +++ b/avmedia/source/quicktime/makefile.mk @@ -83,3 +83,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map dummy: @echo " Nothing to build for GUIBASE=$(GUIBASE)" .ENDIF + +ALLTAR : $(MISC)/avmediaQuickTime.component + +$(MISC)/avmediaQuickTime.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx index b2dee4d77838..9ecd77f4b9e0 100644 --- a/avmedia/source/quicktime/quicktimeuno.cxx +++ b/avmedia/source/quicktime/quicktimeuno.cxx @@ -48,35 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( - "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/" - AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component new file mode 100644 index 000000000000..c80c19bff0d9 --- /dev/null +++ b/avmedia/source/win/avmediawin.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.avmedia.Manager_DirectX"> + <service name="com.sun.star.media.Manager_DirectX"/> + </implementation> +</component> diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp index db9c0a52f288..926e49f5f1a5 100644 --- a/avmedia/source/win/exports.dxp +++ b/avmedia/source/win/exports.dxp @@ -1,4 +1,3 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk index b70841e8bdf7..37db25b6a8b7 100644 --- a/avmedia/source/win/makefile.mk +++ b/avmedia/source/win/makefile.mk @@ -80,3 +80,11 @@ SHL1STDLIBS += dxguid.lib .ENDIF .INCLUDE : target.mk + +ALLTAR : $(MISC)/avmediawin.component + +$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + avmediawin.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmediawin.component diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index 645871290413..8b71f10b3f29 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -48,33 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( "/com.sun.star.comp.avmedia.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/xine/exports.dxp b/avmedia/source/xine/exports.dxp index db9c0a52f288..926e49f5f1a5 100644 --- a/avmedia/source/xine/exports.dxp +++ b/avmedia/source/xine/exports.dxp @@ -1,4 +1,3 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx index 4dc4f3f7e1dd..2efe57b2472c 100644 --- a/avmedia/source/xine/xineuno.cxx +++ b/avmedia/source/xine/xineuno.cxx @@ -48,35 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( - "/" AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/" - AVMEDIA_XINE_MANAGER_SERVICENAME ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component new file mode 100644 index 000000000000..fa01dc03eb9c --- /dev/null +++ b/avmedia/util/avmedia.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.framework.SoundHandler"> + <service name="com.sun.star.frame.ContentHandler"/> + </implementation> +</component> diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk index b0d0a6816cf8..a0712204bec1 100644 --- a/avmedia/util/makefile.mk +++ b/avmedia/util/makefile.mk @@ -77,3 +77,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo LibMain>>$@ @echo CT>>$@ .ENDIF + +ALLTAR : $(MISC)/avmedia.component + +$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + avmedia.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmedia.component diff --git a/basic/prj/d.lst b/basic/prj/d.lst index d2a083ebcb1e..d8d0fce41994 100644 --- a/basic/prj/d.lst +++ b/basic/prj/d.lst @@ -57,3 +57,4 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx +..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk index 629586f0441c..31a4dcca8f8b 100644 --- a/basic/util/makefile.mk +++ b/basic/util/makefile.mk @@ -143,4 +143,10 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk $(SRS)$/basic.srs: $(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs + $(SRS)$/sbx.srs > $@ +ALLTAR : $(MISC)/sb.component +$(MISC)/sb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sb.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sb.component diff --git a/basic/util/sb.component b/basic/util/sb.component new file mode 100644 index 000000000000..4687bd1e7d0b --- /dev/null +++ b/basic/util/sb.component @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer"> + <service name="com.sun.star.script.DialogLibraryContainer"/> + <service name="com.sun.star.script.DocumentDialogLibraryContainer"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.ScriptLibraryContainer"> + <service name="com.sun.star.script.DocumentScriptLibraryContainer"/> + <service name="com.sun.star.script.ScriptLibraryContainer"/> + </implementation> +</component> diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst index 9fcccbc73b4c..bbd0d7f34a9a 100644 --- a/configmgr/prj/build.lst +++ b/configmgr/prj/build.lst @@ -1,4 +1,4 @@ -cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport NULL +cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL cg configmgr\inc nmake - all cg_inc NULL cg configmgr\source nmake - all cg_source cg_inc NULL cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst index 17ccdbe86a08..34b6cf3e0010 100644 --- a/configmgr/prj/d.lst +++ b/configmgr/prj/d.lst @@ -1,3 +1,4 @@ ..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll ..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib ..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so +..\%__SRC%\misc\configmgr.component %_DEST%\xml%_EXT%\configmgr.component diff --git a/configmgr/source/README b/configmgr/source/README index b00990d1eeb2..f26c68ecf7c0 100644 --- a/configmgr/source/README +++ b/configmgr/source/README @@ -51,16 +51,13 @@ propertynode.cxx setnode.cxx Internal representations of data nodes. -pad.cxx parsemanager.cxx parser.hxx -span.hxx valueparser.cxx xcdparser.cxx xcsparser.cxx xcuparser.cxx xmldata.cxx -xmlreader.cxx XML file reading. modifications.cxx diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 33b0eca3f65f..32478e96813d 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -29,6 +29,7 @@ #include "sal/config.h" #include <algorithm> +#include <cstddef> #include <list> #include "com/sun/star/beans/Optional.hpp" @@ -43,8 +44,11 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" +#include "osl/conditn.hxx" #include "osl/diagnose.h" #include "osl/file.hxx" +#include "osl/mutex.hxx" +#include "osl/thread.hxx" #include "rtl/bootstrap.hxx" #include "rtl/logfile.h" #include "rtl/ref.hxx" @@ -53,10 +57,12 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "salhelper/simplereferenceobject.hxx" #include "additions.hxx" #include "components.hxx" #include "data.hxx" +#include "lock.hxx" #include "modifications.hxx" #include "node.hxx" #include "nodemap.hxx" @@ -148,6 +154,66 @@ static Components * singleton = 0; } +class Components::WriteThread: + public osl::Thread, public salhelper::SimpleReferenceObject +{ +public: + static void * operator new(std::size_t size) + { return Thread::operator new(size); } + + static void operator delete(void * pointer) + { Thread::operator delete(pointer); } + + WriteThread( + rtl::Reference< WriteThread > * reference, Components & components, + rtl::OUString const & url, Data const & data); + + void flush() { delay_.set(); } + +private: + virtual ~WriteThread() {} + + virtual void SAL_CALL run(); + + virtual void SAL_CALL onTerminated() { release(); } + + rtl::Reference< WriteThread > * reference_; + Components & components_; + rtl::OUString url_; + Data const & data_; + osl::Condition delay_; +}; + +Components::WriteThread::WriteThread( + rtl::Reference< WriteThread > * reference, Components & components, + rtl::OUString const & url, Data const & data): + reference_(reference), components_(components), url_(url), data_(data) +{ + OSL_ASSERT(reference != 0); + acquire(); +} + +void Components::WriteThread::run() { + TimeValue t = { 1, 0 }; // 1 sec + delay_.wait(&t); // must not throw; result_error is harmless and ignored + osl::MutexGuard g(lock); // must not throw + try { + try { + writeModFile(components_, url_, data_); + } catch (css::uno::RuntimeException & e) { + // Silently ignore write errors, instead of aborting: + OSL_TRACE( + "configmgr error writing modifications: %s", + rtl::OUStringToOString( + e.Message, RTL_TEXTENCODING_UTF8).getStr()); + } + } catch (...) { + reference_->clear(); + throw; + } + reference_->clear(); +} + void Components::initSingleton( css::uno::Reference< css::uno::XComponentContext > const & context) { @@ -238,7 +304,23 @@ void Components::addModification(Path const & path) { } void Components::writeModifications() { - writeModFile(*this, getModificationFileUrl(), data_); + if (!writeThread_.is()) { + writeThread_ = new WriteThread( + &writeThread_, *this, getModificationFileUrl(), data_); + writeThread_->create(); + } +} + +void Components::flushModifications() { + rtl::Reference< WriteThread > thread; + { + osl::MutexGuard g(lock); + thread = writeThread_; + } + if (thread.is()) { + thread->flush(); + thread->join(); + } } void Components::insertExtensionXcsFile( @@ -334,12 +416,14 @@ void Components::insertModificationXcuFile( Modifications * modifications) { OSL_ASSERT(modifications != 0); + Partial part(includedPaths, excludedPaths); try { - Partial part(includedPaths, excludedPaths); - parseXcuFile(fileUri, Data::NO_LAYER, data_, &part, modifications, 0); - } catch (css::uno::Exception & e) { //TODO: more specific exception catching + parseFileLeniently( + &parseXcuFile, fileUri, Data::NO_LAYER, data_, &part, modifications, + 0); + } catch (css::container::NoSuchElementException & e) { OSL_TRACE( - "configmgr error inserting %s: %s", + "configmgr error inserting non-existing %s: %s", rtl::OUStringToOString(fileUri, RTL_TEXTENCODING_UTF8).getStr(), rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -492,20 +576,32 @@ Components::Components( "com.sun.star.comp.deployment.configuration." "PackageRegistryBackend/configmgr.ini"))), true); + parseModificationLayer(); + RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "end parsing"); +} + +Components::~Components() {} + +void Components::parseFileLeniently( + FileParser * parseFile, rtl::OUString const & url, int layer, Data & data, + Partial const * partial, Modifications * modifications, + Additions * additions) +{ + OSL_ASSERT(parseFile != 0); try { - parseModificationLayer(); + (*parseFile)(url, layer, data, partial, modifications, additions); + } catch (css::container::NoSuchElementException &) { + throw; } catch (css::uno::Exception & e) { //TODO: more specific exception catching - // Silently ignore unreadable parts of a corrupted user modification - // layer, instead of completely preventing OOo from starting: + // Silently ignore invalid XML files, instead of completely preventing + // OOo from starting: OSL_TRACE( - "configmgr error reading user modification layer: %s", + "configmgr error reading %s: %s", + rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr(), rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } - RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "end parsing"); } -Components::~Components() {} - void Components::parseFiles( int layer, rtl::OUString const & extension, FileParser * parseFile, rtl::OUString const & url, bool recursive) @@ -557,7 +653,8 @@ void Components::parseFiles( file.match(extension, file.getLength() - extension.getLength())) { try { - (*parseFile)(stat.getFileURL(), layer, data_, 0, 0, 0); + parseFileLeniently( + parseFile, stat.getFileURL(), layer, data_, 0, 0, 0); } catch (css::container::NoSuchElementException & e) { throw css::uno::RuntimeException( (rtl::OUString( @@ -584,7 +681,7 @@ void Components::parseFileList( adds = data_.addExtensionXcuAdditions(url, layer); } try { - (*parseFile)(url, layer, data_, 0, 0, adds); + parseFileLeniently(parseFile, url, layer, data_, 0, 0, adds); } catch (css::container::NoSuchElementException & e) { OSL_TRACE( "configmgr file does not exist: %s", @@ -746,13 +843,15 @@ rtl::OUString Components::getModificationFileUrl() const { void Components::parseModificationLayer() { try { - parseXcuFile(getModificationFileUrl(), Data::NO_LAYER, data_, 0, 0, 0); + parseFileLeniently( + &parseXcuFile, getModificationFileUrl(), Data::NO_LAYER, data_, 0, + 0, 0); } catch (css::container::NoSuchElementException &) { OSL_TRACE( "configmgr user registrymodifications.xcu does not (yet) exist"); // Migrate old user layer data (can be removed once migration is no // longer relevant, probably OOo 4; also see hack for xsi namespace in - // XmlReader constructor): + // xmlreader::XmlReader::registerNamespaceIri): parseFiles( Data::NO_LAYER, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")), &parseXcuFile, diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index 880ac95d34a8..1c735efca6ba 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -94,6 +94,11 @@ public: void writeModifications(); + void flushModifications(); + // must be called with configmgr::lock unaquired; must be called before + // shutdown if writeModifications has ever been called (probably + // indirectly, via removeExtensionXcuFile) + void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri); void insertExtensionXcuFile( @@ -123,6 +128,11 @@ private: ~Components(); + void parseFileLeniently( + FileParser * parseFile, rtl::OUString const & url, int layer, + Data & data, Partial const * partial, Modifications * modifications, + Additions * additions); + void parseFiles( int layer, rtl::OUString const & extension, FileParser * parseFile, rtl::OUString const & url, bool recursive); @@ -155,11 +165,14 @@ private: com::sun::star::beans::XPropertySet > > ExternalServices; + class WriteThread; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > context_; Data data_; WeakRootSet roots_; ExternalServices externalServices_; + rtl::Reference< WriteThread > writeThread_; }; } diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component new file mode 100644 index 000000000000..6ed51257005d --- /dev/null +++ b/configmgr/source/configmgr.component @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.ConfigurationProvider"> + <service name="com.sun.star.configuration.ConfigurationProvider"/> + </implementation> + <implementation name="com.sun.star.comp.configuration.ConfigurationRegistry"> + <service name="com.sun.star.configuration.ConfigurationRegistry"/> + </implementation> + <implementation name="com.sun.star.comp.configuration.DefaultProvider"> + <service name="com.sun.star.configuration.DefaultProvider"/> + <singleton name="com.sun.star.configuration.theDefaultProvider"/> + </implementation> + <implementation name="com.sun.star.comp.configuration.Update"> + <service name="com.sun.star.configuration.Update_Service"/> + <singleton name="com.sun.star.configuration.Update"/> + </implementation> +</component> diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index a89540a88158..3cd58b145bff 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -114,6 +114,8 @@ public: private: virtual ~Service() {} + virtual void SAL_CALL disposing() { flushModifications(); } + virtual rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return configuration_provider::getImplementationName(); } @@ -166,6 +168,8 @@ private: virtual css::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException); + void flushModifications() const; + css::uno::Reference< css::uno::XComponentContext > context_; rtl::OUString locale_; }; @@ -241,7 +245,7 @@ Service::createInstanceWithArguments( if (nodepath.getLength() == 0) { badNodePath(); } - // For backwards compatibility, allow a notepath that misses the leading + // For backwards compatibility, allow a nodepath that misses the leading // slash: if (nodepath[0] != '/') { nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath; @@ -326,7 +330,7 @@ void Service::removeRefreshListener( } void Service::flush() throw (css::uno::RuntimeException) { - //TODO + flushModifications(); cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XFlushListener >::get()); if (cont != 0) { @@ -380,6 +384,16 @@ css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) { return loc; } +void Service::flushModifications() const { + Components * components; + { + osl::MutexGuard guard(lock); + Components::initSingleton(context_); + components = &Components::getSingleton(); + } + components->flushModifications(); +} + class Factory: public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >, private boost::noncopyable @@ -456,7 +470,8 @@ Factory::createInstanceWithArgumentsAndContext( " arguments")), 0); } - // For backwards compatibility, allow "Locale" in any case: + // For backwards compatibility, allow "Locale" and (ignored) + // "EnableAsync" in any case: if (name.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("locale"))) { @@ -471,8 +486,9 @@ Factory::createInstanceWithArgumentsAndContext( " one, non-empty, string Locale argument")), 0); } - } else { - //TODO + } else if (!name.equalsIgnoreAsciiCaseAsciiL( + RTL_CONSTASCII_STRINGPARAM("enableasync"))) + { throw css::uno::Exception( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk index 777fed3323d8..94747d9dd803 100644 --- a/configmgr/source/makefile.mk +++ b/configmgr/source/makefile.mk @@ -52,7 +52,6 @@ SLOFILES = \ $(SLO)/modifications.obj \ $(SLO)/node.obj \ $(SLO)/nodemap.obj \ - $(SLO)/pad.obj \ $(SLO)/parsemanager.obj \ $(SLO)/partial.obj \ $(SLO)/propertynode.obj \ @@ -66,8 +65,7 @@ SLOFILES = \ $(SLO)/xcdparser.obj \ $(SLO)/xcsparser.obj \ $(SLO)/xcuparser.obj \ - $(SLO)/xmldata.obj \ - $(SLO)/xmlreader.obj + $(SLO)/xmldata.obj SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLOFILES) @@ -76,9 +74,18 @@ SHL1STDLIBS = \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALHELPERLIB) \ - $(SALLIB) + $(SALLIB) \ + $(XMLREADERLIB) SHL1TARGET = configmgr.uno SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/configmgr.component + +$(MISC)/configmgr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + configmgr.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt configmgr.component diff --git a/configmgr/source/pad.cxx b/configmgr/source/pad.cxx deleted file mode 100644 index c8c7218b6da6..000000000000 --- a/configmgr/source/pad.cxx +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* -* -* 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 "precompiled_configmgr.hxx" -#include "sal/config.h" - -#include "osl/diagnose.h" -#include "rtl/string.h" -#include "sal/types.h" - -#include "pad.hxx" -#include "span.hxx" - -namespace configmgr { - -void Pad::add(char const * begin, sal_Int32 length) { - OSL_ASSERT( - begin != 0 && length >= 0 && !(span_.is() && buffer_.getLength() != 0)); - if (length != 0) { - flushSpan(); - if (buffer_.getLength() == 0) { - span_ = Span(begin, length); - } else { - buffer_.append(begin, length); - } - } -} - -void Pad::addEphemeral(char const * begin, sal_Int32 length) { - OSL_ASSERT( - begin != 0 && length >= 0 && !(span_.is() && buffer_.getLength() != 0)); - if (length != 0) { - flushSpan(); - buffer_.append(begin, length); - } -} - -void Pad::clear() { - OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0)); - span_.clear(); - buffer_.setLength(0); -} - -bool Pad::is() const { - OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0)); - return span_.is() || buffer_.getLength() != 0; -} - -Span Pad::get() const { - OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0)); - if (span_.is()) { - return span_; - } else if (buffer_.getLength() == 0) { - return Span(RTL_CONSTASCII_STRINGPARAM("")); - } else { - return Span(buffer_.getStr(), buffer_.getLength()); - } -} - -void Pad::flushSpan() { - if (span_.is()) { - buffer_.append(span_.begin, span_.length); - span_.clear(); - } -} - -} diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx index 69a5515b977c..c17eddd2976f 100644 --- a/configmgr/source/parsemanager.cxx +++ b/configmgr/source/parsemanager.cxx @@ -32,10 +32,11 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "osl/diagnose.h" #include "sal/types.h" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" #include "parsemanager.hxx" #include "parser.hxx" -#include "xmlreader.hxx" namespace configmgr { @@ -52,28 +53,42 @@ ParseManager::ParseManager( reader_(url), parser_(parser) { OSL_ASSERT(parser.is()); + int id; + id = reader_.registerNamespaceIri( + xmlreader::Span( + RTL_CONSTASCII_STRINGPARAM("http://openoffice.org/2001/registry"))); + OSL_ASSERT(id == NAMESPACE_OOR); + id = reader_.registerNamespaceIri( + xmlreader::Span( + RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/2001/XMLSchema"))); + OSL_ASSERT(id == NAMESPACE_XS); + id = reader_.registerNamespaceIri( + xmlreader::Span( + RTL_CONSTASCII_STRINGPARAM( + "http://www.w3.org/2001/XMLSchema-instance"))); + OSL_ASSERT(id == NAMESPACE_XSI); } bool ParseManager::parse() { for (;;) { switch (itemData_.is() - ? XmlReader::RESULT_BEGIN + ? xmlreader::XmlReader::RESULT_BEGIN : reader_.nextItem( - parser_->getTextMode(), &itemData_, &itemNamespace_)) + parser_->getTextMode(), &itemData_, &itemNamespaceId_)) { - case XmlReader::RESULT_BEGIN: - if (!parser_->startElement(reader_, itemNamespace_, itemData_)) + case xmlreader::XmlReader::RESULT_BEGIN: + if (!parser_->startElement(reader_, itemNamespaceId_, itemData_)) { return false; } break; - case XmlReader::RESULT_END: + case xmlreader::XmlReader::RESULT_END: parser_->endElement(reader_); break; - case XmlReader::RESULT_TEXT: + case xmlreader::XmlReader::RESULT_TEXT: parser_->characters(itemData_); break; - case XmlReader::RESULT_DONE: + case xmlreader::XmlReader::RESULT_DONE: return true; } itemData_.clear(); diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx index 18292859ab98..19d16c74621a 100644 --- a/configmgr/source/parsemanager.hxx +++ b/configmgr/source/parsemanager.hxx @@ -35,9 +35,8 @@ #include "rtl/ref.hxx" #include "sal/types.h" #include "salhelper/simplereferenceobject.hxx" - -#include "span.hxx" -#include "xmlreader.hxx" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" namespace rtl { class OUString; } @@ -55,13 +54,15 @@ public: bool parse(); + enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 }; + private: virtual ~ParseManager(); - XmlReader reader_; + xmlreader::XmlReader reader_; rtl::Reference< Parser > parser_; - Span itemData_; - XmlReader::Namespace itemNamespace_; + xmlreader::Span itemData_; + int itemNamespaceId_; }; } diff --git a/configmgr/source/parser.hxx b/configmgr/source/parser.hxx index da29941953b5..f782e0dbc151 100644 --- a/configmgr/source/parser.hxx +++ b/configmgr/source/parser.hxx @@ -33,23 +33,23 @@ #include <memory> #include "salhelper/simplereferenceobject.hxx" +#include "xmlreader/xmlreader.hxx" -#include "xmlreader.hxx" +namespace xmlreader { struct Span; } namespace configmgr { -struct Span; - class Parser: public salhelper::SimpleReferenceObject { public: - virtual XmlReader::Text getTextMode() = 0; + virtual xmlreader::XmlReader::Text getTextMode() = 0; virtual bool startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name) = 0; + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name) + = 0; - virtual void endElement(XmlReader const & reader) = 0; + virtual void endElement(xmlreader::XmlReader const & reader) = 0; - virtual void characters(Span const & text) = 0; + virtual void characters(xmlreader::Span const & text) = 0; protected: Parser() {} diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index f8c3289664ef..b1ef8d2169bb 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -28,7 +28,6 @@ #include "precompiled_configmgr.hxx" #include "sal/config.h" -#include "com/sun/star/registry/XRegistryKey.hpp" #include "com/sun/star/uno/Exception.hpp" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" @@ -36,9 +35,6 @@ #include "cppuhelper/implementationentry.hxx" #include "osl/diagnose.h" #include "uno/lbnames.h" -#include "rtl/textenc.h" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" #include "sal/types.h" #include "configurationprovider.hxx" @@ -89,47 +85,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) { - return false; - } - try { - css::uno::Reference< css::registry::XRegistryKey >( - (css::uno::Reference< css::registry::XRegistryKey >( - static_cast< css::registry::XRegistryKey * >(pRegistryKey))-> - createKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/com.sun.star.comp.configuration.DefaultProvider/UNO/" - "SINGLETONS/" - "com.sun.star.configuration.theDefaultProvider")))), - css::uno::UNO_SET_THROW)-> - setStringValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.DefaultProvider"))); - css::uno::Reference< css::registry::XRegistryKey >( - (css::uno::Reference< css::registry::XRegistryKey >( - static_cast< css::registry::XRegistryKey * >(pRegistryKey))-> - createKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/com.sun.star.comp.configuration.Update/UNO/" - "SINGLETONS/com.sun.star.configuration.Update")))), - css::uno::UNO_SET_THROW)-> - setStringValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.Update_Service"))); - } catch (css::uno::Exception & e) { - (void) e; - OSL_TRACE( - "configmgr component_writeInfo exception: %s", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); - return false; - } - return true; -} diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index 4adf452c409b..0be173f74919 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -40,16 +40,17 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" #include "localizedvaluenode.hxx" #include "node.hxx" #include "nodemap.hxx" +#include "parsemanager.hxx" #include "propertynode.hxx" -#include "span.hxx" #include "type.hxx" #include "valueparser.hxx" #include "xmldata.hxx" -#include "xmlreader.hxx" namespace configmgr { @@ -74,7 +75,7 @@ bool parseHexDigit(char c, int * value) { return false; } -bool parseValue(Span const & text, sal_Bool * value) { +bool parseValue(xmlreader::Span const & text, sal_Bool * value) { OSL_ASSERT(text.is() && value != 0); if (text.equals(RTL_CONSTASCII_STRINGPARAM("true")) || text.equals(RTL_CONSTASCII_STRINGPARAM("1"))) @@ -91,7 +92,7 @@ bool parseValue(Span const & text, sal_Bool * value) { return false; } -bool parseValue(Span const & text, sal_Int16 * value) { +bool parseValue(xmlreader::Span const & text, sal_Int16 * value) { OSL_ASSERT(text.is() && value != 0); // For backwards compatibility, support hexadecimal values: sal_Int32 n = @@ -110,7 +111,7 @@ bool parseValue(Span const & text, sal_Int16 * value) { return false; } -bool parseValue(Span const & text, sal_Int32 * value) { +bool parseValue(xmlreader::Span const & text, sal_Int32 * value) { OSL_ASSERT(text.is() && value != 0); // For backwards compatibility, support hexadecimal values: *value = @@ -125,7 +126,7 @@ bool parseValue(Span const & text, sal_Int32 * value) { return true; } -bool parseValue(Span const & text, sal_Int64 * value) { +bool parseValue(xmlreader::Span const & text, sal_Int64 * value) { OSL_ASSERT(text.is() && value != 0); // For backwards compatibility, support hexadecimal values: *value = @@ -140,20 +141,22 @@ bool parseValue(Span const & text, sal_Int64 * value) { return true; } -bool parseValue(Span const & text, double * value) { +bool parseValue(xmlreader::Span const & text, double * value) { OSL_ASSERT(text.is() && value != 0); *value = rtl::OString(text.begin, text.length).toDouble(); //TODO: check valid lexical representation return true; } -bool parseValue(Span const & text, rtl::OUString * value) { +bool parseValue(xmlreader::Span const & text, rtl::OUString * value) { OSL_ASSERT(text.is() && value != 0); - *value = xmldata::convertFromUtf8(text); + *value = text.convertFromUtf8(); return true; } -bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) { +bool parseValue( + xmlreader::Span const & text, css::uno::Sequence< sal_Int8 > * value) +{ OSL_ASSERT(text.is() && value != 0); if ((text.length & 1) != 0) { return false; @@ -173,7 +176,9 @@ bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) { return true; } -template< typename T > css::uno::Any parseSingleValue(Span const & text) { +template< typename T > css::uno::Any parseSingleValue( + xmlreader::Span const & text) +{ T val; if (!parseValue(text, &val)) { throw css::uno::RuntimeException( @@ -184,21 +189,23 @@ template< typename T > css::uno::Any parseSingleValue(Span const & text) { } template< typename T > css::uno::Any parseListValue( - rtl::OString const & separator, Span const & text) + rtl::OString const & separator, xmlreader::Span const & text) { comphelper::SequenceAsVector< T > seq; - Span sep; + xmlreader::Span sep; if (separator.getLength() == 0) { - sep = Span(RTL_CONSTASCII_STRINGPARAM(" ")); + sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" ")); } else { - sep = Span(separator.getStr(), separator.getLength()); + sep = xmlreader::Span(separator.getStr(), separator.getLength()); } if (text.length != 0) { - for (Span t(text);;) { + for (xmlreader::Span t(text);;) { sal_Int32 i = rtl_str_indexOfStr_WithLength( t.begin, t.length, sep.begin, sep.length); T val; - if (!parseValue(Span(t.begin, i == -1 ? t.length : i), &val)) { + if (!parseValue( + xmlreader::Span(t.begin, i == -1 ? t.length : i), &val)) + { throw css::uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")), css::uno::Reference< css::uno::XInterface >()); @@ -215,7 +222,7 @@ template< typename T > css::uno::Any parseListValue( } css::uno::Any parseValue( - rtl::OString const & separator, Span const & text, Type type) + rtl::OString const & separator, xmlreader::Span const & text, Type type) { switch (type) { case TYPE_ANY: @@ -266,7 +273,7 @@ ValueParser::ValueParser(int layer): layer_(layer) {} ValueParser::~ValueParser() {} -XmlReader::Text ValueParser::getTextMode() const { +xmlreader::XmlReader::Text ValueParser::getTextMode() const { if (node_.is()) { switch (state_) { case STATE_TEXT: @@ -278,23 +285,24 @@ XmlReader::Text ValueParser::getTextMode() const { return (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST || separator_.getLength() != 0) - ? XmlReader::TEXT_RAW : XmlReader::TEXT_NORMALIZED; + ? xmlreader::XmlReader::TEXT_RAW + : xmlreader::XmlReader::TEXT_NORMALIZED; default: break; } } - return XmlReader::TEXT_NONE; + return xmlreader::XmlReader::TEXT_NONE; } bool ValueParser::startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name) + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name) { if (!node_.is()) { return false; } switch (state_) { case STATE_TEXT: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("it")) && isListType(type_) && separator_.getLength() == 0) { @@ -306,18 +314,18 @@ bool ValueParser::startElement( } // fall through case STATE_IT: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("unicode")) && (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST)) { sal_Int32 scalar = -1; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("scalar"))) { if (!parseValue(reader.getAttributeValue(true), &scalar)) { @@ -352,7 +360,7 @@ bool ValueParser::startElement( } throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } @@ -439,7 +447,7 @@ bool ValueParser::endElement() { return true; } -void ValueParser::characters(Span const & text) { +void ValueParser::characters(xmlreader::Span const & text) { if (node_.is()) { OSL_ASSERT(state_ == STATE_TEXT || state_ == STATE_IT); pad_.add(text.begin, text.length); diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index 4e899f4632dd..c5e1d0a0a45f 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -36,19 +36,19 @@ #include "rtl/ref.hxx" #include "rtl/string.hxx" #include "rtl/ustring.hxx" +#include "xmlreader/pad.hxx" +#include "xmlreader/xmlreader.hxx" -#include "pad.hxx" #include "type.hxx" -#include "xmlreader.hxx" namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace xmlreader { struct Span; } namespace configmgr { class Node; -struct Span; class ValueParser: private boost::noncopyable { public: @@ -56,14 +56,14 @@ public: ~ValueParser(); - XmlReader::Text getTextMode() const; + xmlreader::XmlReader::Text getTextMode() const; bool startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name); + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name); bool endElement(); - void characters(Span const & text); + void characters(xmlreader::Span const & text); void start( rtl::Reference< Node > const & property, @@ -83,7 +83,7 @@ private: rtl::Reference< Node > node_; rtl::OUString localizedName_; State state_; - Pad pad_; + xmlreader::Pad pad_; std::vector< com::sun::star::uno::Any > items_; }; diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index c2573ab67439..5616833abf3d 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -45,6 +45,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "xmlreader/span.hxx" #include "data.hxx" #include "groupnode.hxx" @@ -54,7 +55,6 @@ #include "node.hxx" #include "nodemap.hxx" #include "propertynode.hxx" -#include "span.hxx" #include "type.hxx" #include "writemodfile.hxx" @@ -341,22 +341,23 @@ void writeNode( rtl::Reference< Node > const & parent, rtl::OUString const & name, rtl::Reference< Node > const & node) { - static Span const typeNames[] = { - Span(), Span(), Span(), // TYPE_ERROR, TYPE_NIL, TYPE_ANY - Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")), - Span(RTL_CONSTASCII_STRINGPARAM("xs:short")), - Span(RTL_CONSTASCII_STRINGPARAM("xs:int")), - Span(RTL_CONSTASCII_STRINGPARAM("xs:long")), - Span(RTL_CONSTASCII_STRINGPARAM("xs:double")), - Span(RTL_CONSTASCII_STRINGPARAM("xs:string")), - Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")), - Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) }; + static xmlreader::Span const typeNames[] = { + xmlreader::Span(), xmlreader::Span(), xmlreader::Span(), + // TYPE_ERROR, TYPE_NIL, TYPE_ANY + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:short")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:int")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:long")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:double")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:string")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")), + xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) }; switch (node->kind()) { case Node::KIND_PROPERTY: { diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx index ad774d5ca3e3..a7b66fe60157 100644 --- a/configmgr/source/xcdparser.cxx +++ b/configmgr/source/xcdparser.cxx @@ -37,13 +37,14 @@ #include "rtl/string.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" -#include "span.hxx" +#include "parsemanager.hxx" #include "xcdparser.hxx" #include "xcsparser.hxx" #include "xcuparser.hxx" #include "xmldata.hxx" -#include "xmlreader.hxx" namespace configmgr { @@ -59,22 +60,22 @@ XcdParser::XcdParser(int layer, Dependencies const & dependencies, Data & data): XcdParser::~XcdParser() {} -XmlReader::Text XcdParser::getTextMode() { +xmlreader::XmlReader::Text XcdParser::getTextMode() { return nestedParser_.is() - ? nestedParser_->getTextMode() : XmlReader::TEXT_NONE; + ? nestedParser_->getTextMode() : xmlreader::XmlReader::TEXT_NONE; } bool XcdParser::startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name) + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name) { if (nestedParser_.is()) { OSL_ASSERT(nesting_ != LONG_MAX); ++nesting_; - return nestedParser_->startElement(reader, ns, name); + return nestedParser_->startElement(reader, nsId, name); } switch (state_) { case STATE_START: - if (ns == XmlReader::NAMESPACE_OOR && + if (nsId == ParseManager::NAMESPACE_OOR && name.equals(RTL_CONSTASCII_STRINGPARAM("data"))) { state_ = STATE_DEPENDENCIES; @@ -82,18 +83,19 @@ bool XcdParser::startElement( } break; case STATE_DEPENDENCIES: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("dependency"))) { if (dependency_.getLength() == 0) { - Span attrFile; + xmlreader::Span attrFile; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_NONE && //TODO: _OOR + if (attrNsId == xmlreader::XmlReader::NAMESPACE_NONE && + //TODO: _OOR attrLn.equals(RTL_CONSTASCII_STRINGPARAM("file"))) { attrFile = reader.getAttributeValue(false); @@ -107,7 +109,7 @@ bool XcdParser::startElement( reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - dependency_ = xmldata::convertFromUtf8(attrFile); + dependency_ = attrFile.convertFromUtf8(); if (dependency_.getLength() == 0) { throw css::uno::RuntimeException( (rtl::OUString( @@ -127,19 +129,19 @@ bool XcdParser::startElement( state_ = STATE_COMPONENTS; // fall through case STATE_COMPONENTS: - if (ns == XmlReader::NAMESPACE_OOR && + if (nsId == ParseManager::NAMESPACE_OOR && name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema"))) { nestedParser_ = new XcsParser(layer_, data_); nesting_ = 1; - return nestedParser_->startElement(reader, ns, name); + return nestedParser_->startElement(reader, nsId, name); } - if (ns == XmlReader::NAMESPACE_OOR && + if (nsId == ParseManager::NAMESPACE_OOR && name.equals(RTL_CONSTASCII_STRINGPARAM("component-data"))) { nestedParser_ = new XcuParser(layer_ + 1, data_, 0, 0, 0); nesting_ = 1; - return nestedParser_->startElement(reader, ns, name); + return nestedParser_->startElement(reader, nsId, name); } break; default: // STATE_DEPENDENCY @@ -148,12 +150,12 @@ bool XcdParser::startElement( } throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } -void XcdParser::endElement(XmlReader const & reader) { +void XcdParser::endElement(xmlreader::XmlReader const & reader) { if (nestedParser_.is()) { nestedParser_->endElement(reader); if (--nesting_ == 0) { @@ -174,7 +176,7 @@ void XcdParser::endElement(XmlReader const & reader) { } } -void XcdParser::characters(Span const & text) { +void XcdParser::characters(xmlreader::Span const & text) { if (nestedParser_.is()) { nestedParser_->characters(text); } diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx index 2ad8ecea7f93..a807e011b244 100644 --- a/configmgr/source/xcdparser.hxx +++ b/configmgr/source/xcdparser.hxx @@ -34,14 +34,15 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" +#include "xmlreader/xmlreader.hxx" #include "parser.hxx" -#include "xmlreader.hxx" + +namespace xmlreader { struct Span; } namespace configmgr { struct Data; -struct Span; class XcdParser: public Parser { public: @@ -52,14 +53,14 @@ public: private: virtual ~XcdParser(); - virtual XmlReader::Text getTextMode(); + virtual xmlreader::XmlReader::Text getTextMode(); virtual bool startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name); + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name); - virtual void endElement(XmlReader const & reader); + virtual void endElement(xmlreader::XmlReader const & reader); - virtual void characters(Span const & text); + virtual void characters(xmlreader::Span const & text); enum State { STATE_START, STATE_DEPENDENCIES, STATE_DEPENDENCY, STATE_COMPONENTS }; diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 37b46494c6a7..1deb8e9f3029 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -41,18 +41,19 @@ #include "rtl/string.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" #include "data.hxx" #include "localizedpropertynode.hxx" #include "groupnode.hxx" #include "node.hxx" #include "nodemap.hxx" +#include "parsemanager.hxx" #include "propertynode.hxx" #include "setnode.hxx" -#include "span.hxx" #include "xcsparser.hxx" #include "xmldata.hxx" -#include "xmlreader.hxx" namespace configmgr { @@ -125,18 +126,18 @@ XcsParser::XcsParser(int layer, Data & data): XcsParser::~XcsParser() {} -XmlReader::Text XcsParser::getTextMode() { +xmlreader::XmlReader::Text XcsParser::getTextMode() { return valueParser_.getTextMode(); } bool XcsParser::startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name) + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name) { - if (valueParser_.startElement(reader, ns, name)) { + if (valueParser_.startElement(reader, nsId, name)) { return true; } if (state_ == STATE_START) { - if (ns == XmlReader::NAMESPACE_OOR && + if (nsId == ParseManager::NAMESPACE_OOR && name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema"))) { handleComponentSchema(reader); state_ = STATE_COMPONENT_SCHEMA; @@ -148,7 +149,7 @@ bool XcsParser::startElement( // prop constraints; accepting all four at illegal places (and with // illegal content): if (ignoring_ > 0 || - (ns == XmlReader::NAMESPACE_NONE && + (nsId == xmlreader::XmlReader::NAMESPACE_NONE && (name.equals(RTL_CONSTASCII_STRINGPARAM("info")) || name.equals(RTL_CONSTASCII_STRINGPARAM("import")) || name.equals(RTL_CONSTASCII_STRINGPARAM("uses")) || @@ -160,7 +161,7 @@ bool XcsParser::startElement( } switch (state_) { case STATE_COMPONENT_SCHEMA: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("templates"))) { state_ = STATE_TEMPLATES; @@ -168,7 +169,7 @@ bool XcsParser::startElement( } // fall through case STATE_TEMPLATES_DONE: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("component"))) { state_ = STATE_COMPONENT; @@ -183,13 +184,13 @@ bool XcsParser::startElement( break; case STATE_TEMPLATES: if (elements_.empty()) { - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("group"))) { handleGroup(reader, true); return true; } - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("set"))) { handleSet(reader, true); @@ -203,7 +204,7 @@ bool XcsParser::startElement( switch (elements_.top().node->kind()) { case Node::KIND_PROPERTY: case Node::KIND_LOCALIZED_PROPERTY: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("value"))) { handlePropValue(reader, elements_.top().node); @@ -211,25 +212,25 @@ bool XcsParser::startElement( } break; case Node::KIND_GROUP: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("prop"))) { handleProp(reader); return true; } - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("node-ref"))) { handleNodeRef(reader); return true; } - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("group"))) { handleGroup(reader, false); return true; } - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("set"))) { handleSet(reader, false); @@ -237,7 +238,7 @@ bool XcsParser::startElement( } break; case Node::KIND_SET: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("item"))) { handleSetItem( @@ -260,12 +261,12 @@ bool XcsParser::startElement( } throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } -void XcsParser::endElement(XmlReader const & reader) { +void XcsParser::endElement(xmlreader::XmlReader const & reader) { if (valueParser_.endElement()) { return; } @@ -342,23 +343,23 @@ void XcsParser::endElement(XmlReader const & reader) { } } -void XcsParser::characters(Span const & text) { +void XcsParser::characters(xmlreader::Span const & text) { valueParser_.characters(text); } -void XcsParser::handleComponentSchema(XmlReader & reader) { +void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) { //TODO: oor:version, xml:lang attributes rtl::OStringBuffer buf; buf.append('.'); bool hasPackage = false; bool hasName = false; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package"))) { if (hasPackage) { @@ -371,9 +372,9 @@ void XcsParser::handleComponentSchema(XmlReader & reader) { css::uno::Reference< css::uno::XInterface >()); } hasPackage = true; - Span s(reader.getAttributeValue(false)); + xmlreader::Span s(reader.getAttributeValue(false)); buf.insert(0, s.begin, s.length); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { if (hasName) { @@ -385,7 +386,7 @@ void XcsParser::handleComponentSchema(XmlReader & reader) { css::uno::Reference< css::uno::XInterface >()); } hasName = true; - Span s(reader.getAttributeValue(false)); + xmlreader::Span s(reader.getAttributeValue(false)); buf.append(s.begin, s.length); } } @@ -405,38 +406,36 @@ void XcsParser::handleComponentSchema(XmlReader & reader) { reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - componentName_ = xmldata::convertFromUtf8( - Span(buf.getStr(), buf.getLength())); + componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()). + convertFromUtf8(); } -void XcsParser::handleNodeRef(XmlReader & reader) { +void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) { bool hasName = false; rtl::OUString name; rtl::OUString component(componentName_); bool hasNodeType = false; rtl::OUString nodeType; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component"))) { - component = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + component = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type"))) { hasNodeType = true; - nodeType = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); + nodeType = reader.getAttributeValue(false).convertFromUtf8(); } } if (!hasName) { @@ -465,33 +464,33 @@ void XcsParser::handleNodeRef(XmlReader & reader) { elements_.push(Element(node, name)); } -void XcsParser::handleProp(XmlReader & reader) { +void XcsParser::handleProp(xmlreader::XmlReader & reader) { bool hasName = false; rtl::OUString name; valueParser_.type_ = TYPE_ERROR; bool localized = false; bool nillable = true; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type"))) { valueParser_.type_ = xmldata::parseType( reader, reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("localized"))) { localized = xmldata::parseBoolean(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nillable"))) { nillable = xmldata::parseBoolean(reader.getAttributeValue(true)); @@ -525,16 +524,16 @@ void XcsParser::handleProp(XmlReader & reader) { } void XcsParser::handlePropValue( - XmlReader & reader, rtl::Reference< Node > const & property) + xmlreader::XmlReader & reader, rtl::Reference< Node > const & property) { - Span attrSeparator; + xmlreader::Span attrSeparator; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator"))) { attrSeparator = reader.getAttributeValue(false); @@ -553,22 +552,22 @@ void XcsParser::handlePropValue( valueParser_.start(property); } -void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) { +void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) { bool hasName = false; rtl::OUString name; bool extensible = false; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("extensible"))) { extensible = xmldata::parseBoolean(reader.getAttributeValue(true)); @@ -592,34 +591,32 @@ void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) { name)); } -void XcsParser::handleSet(XmlReader & reader, bool isTemplate) { +void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) { bool hasName = false; rtl::OUString name; rtl::OUString component(componentName_); bool hasNodeType = false; rtl::OUString nodeType; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component"))) { - component = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + component = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type"))) { hasNodeType = true; - nodeType = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); + nodeType = reader.getAttributeValue(false).convertFromUtf8(); } } if (!hasName) { @@ -642,27 +639,25 @@ void XcsParser::handleSet(XmlReader & reader, bool isTemplate) { name)); } -void XcsParser::handleSetItem(XmlReader & reader, SetNode * set) { +void XcsParser::handleSetItem(xmlreader::XmlReader & reader, SetNode * set) { rtl::OUString component(componentName_); bool hasNodeType = false; rtl::OUString nodeType; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component"))) { - component = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + component = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type"))) { hasNodeType = true; - nodeType = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); + nodeType = reader.getAttributeValue(false).convertFromUtf8(); } } set->getAdditionalTemplateNames().push_back( diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx index 196add9a826a..1fac315c0783 100644 --- a/configmgr/source/xcsparser.hxx +++ b/configmgr/source/xcsparser.hxx @@ -34,17 +34,18 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" +#include "xmlreader/xmlreader.hxx" #include "node.hxx" #include "parser.hxx" #include "valueparser.hxx" -#include "xmlreader.hxx" + +namespace xmlreader { struct Span; } namespace configmgr { class SetNode; struct Data; -struct Span; class XcsParser: public Parser { public: @@ -53,29 +54,29 @@ public: private: virtual ~XcsParser(); - virtual XmlReader::Text getTextMode(); + virtual xmlreader::XmlReader::Text getTextMode(); virtual bool startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name); + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name); - virtual void endElement(XmlReader const & reader); + virtual void endElement(xmlreader::XmlReader const & reader); - virtual void characters(Span const & text); + virtual void characters(xmlreader::Span const & text); - void handleComponentSchema(XmlReader & reader); + void handleComponentSchema(xmlreader::XmlReader & reader); - void handleNodeRef(XmlReader & reader); + void handleNodeRef(xmlreader::XmlReader & reader); - void handleProp(XmlReader & reader); + void handleProp(xmlreader::XmlReader & reader); void handlePropValue( - XmlReader & reader, rtl::Reference< Node > const & property); + xmlreader::XmlReader & reader, rtl::Reference< Node > const & property); - void handleGroup(XmlReader & reader, bool isTemplate); + void handleGroup(xmlreader::XmlReader & reader, bool isTemplate); - void handleSet(XmlReader & reader, bool isTemplate); + void handleSet(xmlreader::XmlReader & reader, bool isTemplate); - void handleSetItem(XmlReader & reader, SetNode * set); + void handleSetItem(xmlreader::XmlReader & reader, SetNode * set); enum State { STATE_START, STATE_COMPONENT_SCHEMA, STATE_TEMPLATES, diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index 91f3b244c5a8..1a9575bb6726 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -41,6 +41,8 @@ #include "rtl/string.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" #include "data.hxx" #include "localizedpropertynode.hxx" @@ -49,14 +51,13 @@ #include "modifications.hxx" #include "node.hxx" #include "nodemap.hxx" +#include "parsemanager.hxx" #include "partial.hxx" #include "path.hxx" #include "propertynode.hxx" #include "setnode.hxx" -#include "span.hxx" #include "xcuparser.hxx" #include "xmldata.hxx" -#include "xmlreader.hxx" namespace configmgr { @@ -79,22 +80,22 @@ XcuParser::XcuParser( XcuParser::~XcuParser() {} -XmlReader::Text XcuParser::getTextMode() { +xmlreader::XmlReader::Text XcuParser::getTextMode() { return valueParser_.getTextMode(); } bool XcuParser::startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name) + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name) { - if (valueParser_.startElement(reader, ns, name)) { + if (valueParser_.startElement(reader, nsId, name)) { return true; } if (state_.empty()) { - if (ns == XmlReader::NAMESPACE_OOR && + if (nsId == ParseManager::NAMESPACE_OOR && name.equals(RTL_CONSTASCII_STRINGPARAM("component-data"))) { handleComponentData(reader); - } else if (ns == XmlReader::NAMESPACE_OOR && + } else if (nsId == ParseManager::NAMESPACE_OOR && name.equals(RTL_CONSTASCII_STRINGPARAM("items"))) { state_.push(State(rtl::Reference< Node >(), false)); @@ -102,7 +103,7 @@ bool XcuParser::startElement( throw css::uno::RuntimeException( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("bad root element <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); @@ -110,7 +111,7 @@ bool XcuParser::startElement( } else if (state_.top().ignore) { state_.push(State(false)); } else if (!state_.top().node.is()) { - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("item"))) { handleItem(reader); @@ -118,7 +119,7 @@ bool XcuParser::startElement( throw css::uno::RuntimeException( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("bad items node member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); @@ -126,7 +127,7 @@ bool XcuParser::startElement( } else { switch (state_.top().node->kind()) { case Node::KIND_PROPERTY: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("value"))) { handlePropValue( @@ -137,14 +138,14 @@ bool XcuParser::startElement( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad property node member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } break; case Node::KIND_LOCALIZED_PROPERTY: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("value"))) { handleLocpropValue( @@ -156,7 +157,7 @@ bool XcuParser::startElement( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad localized property node member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); @@ -165,18 +166,18 @@ bool XcuParser::startElement( case Node::KIND_LOCALIZED_VALUE: throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); case Node::KIND_GROUP: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("prop"))) { handleGroupProp( reader, dynamic_cast< GroupNode * >(state_.top().node.get())); - } else if (ns == XmlReader::NAMESPACE_NONE && + } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("node"))) { handleGroupNode(reader, state_.top().node); @@ -185,19 +186,19 @@ bool XcuParser::startElement( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad group node member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } break; case Node::KIND_SET: - if (ns == XmlReader::NAMESPACE_NONE && + if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("node"))) { handleSetNode( reader, dynamic_cast< SetNode * >(state_.top().node.get())); - } else if (ns == XmlReader::NAMESPACE_NONE && + } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals(RTL_CONSTASCII_STRINGPARAM("prop"))) { OSL_TRACE( @@ -209,7 +210,7 @@ bool XcuParser::startElement( throw css::uno::RuntimeException( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("bad set node member <")) + - xmldata::convertFromUtf8(name) + + name.convertFromUtf8() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); @@ -220,7 +221,7 @@ bool XcuParser::startElement( return true; } -void XcuParser::endElement(XmlReader const &) { +void XcuParser::endElement(xmlreader::XmlReader const &) { if (valueParser_.endElement()) { return; } @@ -245,11 +246,11 @@ void XcuParser::endElement(XmlReader const &) { } } -void XcuParser::characters(Span const & text) { +void XcuParser::characters(xmlreader::Span const & text) { valueParser_.characters(text); } -XcuParser::Operation XcuParser::parseOperation(Span const & text) { +XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) { OSL_ASSERT(text.is()); if (text.equals(RTL_CONSTASCII_STRINGPARAM("modify"))) { return OPERATION_MODIFY; @@ -265,11 +266,11 @@ XcuParser::Operation XcuParser::parseOperation(Span const & text) { } throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid op ")) + - xmldata::convertFromUtf8(text)), + text.convertFromUtf8()), css::uno::Reference< css::uno::XInterface >()); } -void XcuParser::handleComponentData(XmlReader & reader) { +void XcuParser::handleComponentData(xmlreader::XmlReader & reader) { rtl::OStringBuffer buf; buf.append('.'); bool hasPackage = false; @@ -277,12 +278,12 @@ void XcuParser::handleComponentData(XmlReader & reader) { Operation op = OPERATION_MODIFY; bool finalized = false; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package"))) { if (hasPackage) { @@ -295,9 +296,9 @@ void XcuParser::handleComponentData(XmlReader & reader) { css::uno::Reference< css::uno::XInterface >()); } hasPackage = true; - Span s(reader.getAttributeValue(false)); + xmlreader::Span s(reader.getAttributeValue(false)); buf.insert(0, s.begin, s.length); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { if (hasName) { @@ -309,13 +310,13 @@ void XcuParser::handleComponentData(XmlReader & reader) { css::uno::Reference< css::uno::XInterface >()); } hasName = true; - Span s(reader.getAttributeValue(false)); + xmlreader::Span s(reader.getAttributeValue(false)); buf.append(s.begin, s.length); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op"))) { op = parseOperation(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized"))) { finalized = xmldata::parseBoolean(reader.getAttributeValue(true)); @@ -337,8 +338,8 @@ void XcuParser::handleComponentData(XmlReader & reader) { reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - componentName_ = xmldata::convertFromUtf8( - Span(buf.getStr(), buf.getLength())); + componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()). + convertFromUtf8(); if (trackPath_) { OSL_ASSERT(path_.empty()); path_.push_back(componentName_); @@ -380,15 +381,15 @@ void XcuParser::handleComponentData(XmlReader & reader) { state_.push(State(node, finalizedLayer < valueParser_.getLayer())); } -void XcuParser::handleItem(XmlReader & reader) { - Span attrPath; +void XcuParser::handleItem(xmlreader::XmlReader & reader) { + xmlreader::Span attrPath; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("path"))) { attrPath = reader.getAttributeValue(false); @@ -401,7 +402,7 @@ void XcuParser::handleItem(XmlReader & reader) { reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - rtl::OUString path(xmldata::convertFromUtf8(attrPath)); + rtl::OUString path(attrPath.convertFromUtf8()); int finalizedLayer; rtl::Reference< Node > node( data_.resolvePathRepresentation( @@ -446,21 +447,23 @@ void XcuParser::handleItem(XmlReader & reader) { state_.push(State(node, finalizedLayer < valueParser_.getLayer())); } -void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) { +void XcuParser::handlePropValue( + xmlreader::XmlReader & reader, PropertyNode * prop) + { bool nil = false; rtl::OString separator; rtl::OUString external; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_XSI && + if (attrNsId == ParseManager::NAMESPACE_XSI && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil"))) { nil = xmldata::parseBoolean(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type"))) { Type type = xmldata::parseType( @@ -473,10 +476,10 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) { css::uno::Reference< css::uno::XInterface >()); } valueParser_.type_ = type; - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator"))) { - Span s(reader.getAttributeValue(false)); + xmlreader::Span s(reader.getAttributeValue(false)); if (s.length == 0) { throw css::uno::RuntimeException( (rtl::OUString( @@ -486,10 +489,10 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) { css::uno::Reference< css::uno::XInterface >()); } separator = rtl::OString(s.begin, s.length); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external"))) { - external = xmldata::convertFromUtf8(reader.getAttributeValue(true)); + external = reader.getAttributeValue(true).convertFromUtf8(); if (external.getLength() == 0) { throw css::uno::RuntimeException( (rtl::OUString( @@ -529,27 +532,27 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) { } void XcuParser::handleLocpropValue( - XmlReader & reader, LocalizedPropertyNode * locprop) + xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop) { rtl::OUString name; bool nil = false; rtl::OString separator; Operation op = OPERATION_FUSE; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_XML && + if (attrNsId == xmlreader::XmlReader::NAMESPACE_XML && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("lang"))) { - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_XSI && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_XSI && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil"))) { nil = xmldata::parseBoolean(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type"))) { Type type = xmldata::parseType( @@ -562,10 +565,10 @@ void XcuParser::handleLocpropValue( css::uno::Reference< css::uno::XInterface >()); } valueParser_.type_ = type; - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator"))) { - Span s(reader.getAttributeValue(false)); + xmlreader::Span s(reader.getAttributeValue(false)); if (s.length == 0) { throw css::uno::RuntimeException( (rtl::OUString( @@ -575,7 +578,7 @@ void XcuParser::handleLocpropValue( css::uno::Reference< css::uno::XInterface >()); } separator = rtl::OString(s.begin, s.length); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op"))) { op = parseOperation(reader.getAttributeValue(true)); @@ -651,32 +654,34 @@ void XcuParser::handleLocpropValue( } } -void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) { +void XcuParser::handleGroupProp( + xmlreader::XmlReader & reader, GroupNode * group) +{ bool hasName = false; rtl::OUString name; Type type = TYPE_ERROR; Operation op = OPERATION_MODIFY; bool finalized = false; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type"))) { type = xmldata::parseType(reader, reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op"))) { op = parseOperation(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized"))) { finalized = xmldata::parseBoolean(reader.getAttributeValue(true)); @@ -726,8 +731,8 @@ void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) { } void XcuParser::handleUnknownGroupProp( - XmlReader const & reader, GroupNode * group, rtl::OUString const & name, - Type type, Operation operation, bool finalized) + xmlreader::XmlReader const & reader, GroupNode * group, + rtl::OUString const & name, Type type, Operation operation, bool finalized) { switch (operation) { case OPERATION_REPLACE: @@ -767,7 +772,7 @@ void XcuParser::handleUnknownGroupProp( } void XcuParser::handlePlainGroupProp( - XmlReader const & reader, GroupNode * group, + xmlreader::XmlReader const & reader, GroupNode * group, NodeMap::iterator const & propertyIndex, rtl::OUString const & name, Type type, Operation operation, bool finalized) { @@ -821,7 +826,7 @@ void XcuParser::handlePlainGroupProp( } void XcuParser::handleLocalizedGroupProp( - XmlReader const & reader, LocalizedPropertyNode * property, + xmlreader::XmlReader const & reader, LocalizedPropertyNode * property, rtl::OUString const & name, Type type, Operation operation, bool finalized) { if (property->getLayer() > valueParser_.getLayer()) { @@ -879,28 +884,28 @@ void XcuParser::handleLocalizedGroupProp( } void XcuParser::handleGroupNode( - XmlReader & reader, rtl::Reference< Node > const & group) + xmlreader::XmlReader & reader, rtl::Reference< Node > const & group) { bool hasName = false; rtl::OUString name; Operation op = OPERATION_MODIFY; bool finalized = false; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op"))) { op = parseOperation(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized"))) { finalized = xmldata::parseBoolean(reader.getAttributeValue(true)); @@ -950,7 +955,7 @@ void XcuParser::handleGroupNode( state_.top().locked || finalizedLayer < valueParser_.getLayer())); } -void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) { +void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) { bool hasName = false; rtl::OUString name; rtl::OUString component(componentName_); @@ -960,36 +965,34 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) { bool finalized = false; bool mandatory = false; for (;;) { - XmlReader::Namespace attrNs; - Span attrLn; - if (!reader.nextAttribute(&attrNs, &attrLn)) { + int attrNsId; + xmlreader::Span attrLn; + if (!reader.nextAttribute(&attrNsId, &attrLn)) { break; } - if (attrNs == XmlReader::NAMESPACE_OOR && + if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { hasName = true; - name = xmldata::convertFromUtf8(reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + name = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component"))) { - component = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + component = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type"))) { hasNodeType = true; - nodeType = xmldata::convertFromUtf8( - reader.getAttributeValue(false)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + nodeType = reader.getAttributeValue(false).convertFromUtf8(); + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op"))) { op = parseOperation(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized"))) { finalized = xmldata::parseBoolean(reader.getAttributeValue(true)); - } else if (attrNs == XmlReader::NAMESPACE_OOR && + } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("mandatory"))) { mandatory = xmldata::parseBoolean(reader.getAttributeValue(true)); diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx index 02ef4e5ff117..6cd600c8aab1 100644 --- a/configmgr/source/xcuparser.hxx +++ b/configmgr/source/xcuparser.hxx @@ -34,6 +34,7 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" +#include "xmlreader/xmlreader.hxx" #include "additions.hxx" #include "node.hxx" @@ -43,7 +44,8 @@ #include "type.hxx" #include "valueparser.hxx" #include "xmldata.hxx" -#include "xmlreader.hxx" + +namespace xmlreader { struct Span; } namespace configmgr { @@ -54,7 +56,6 @@ class Partial; class PropertyNode; class SetNode; struct Data; -struct Span; class XcuParser: public Parser { public: @@ -65,49 +66,50 @@ public: private: virtual ~XcuParser(); - virtual XmlReader::Text getTextMode(); + virtual xmlreader::XmlReader::Text getTextMode(); virtual bool startElement( - XmlReader & reader, XmlReader::Namespace ns, Span const & name); + xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name); - virtual void endElement(XmlReader const & reader); + virtual void endElement(xmlreader::XmlReader const & reader); - virtual void characters(Span const & span); + virtual void characters(xmlreader::Span const & span); enum Operation { OPERATION_MODIFY, OPERATION_REPLACE, OPERATION_FUSE, OPERATION_REMOVE }; - static Operation parseOperation(Span const & text); + static Operation parseOperation(xmlreader::Span const & text); - void handleComponentData(XmlReader & reader); + void handleComponentData(xmlreader::XmlReader & reader); - void handleItem(XmlReader & reader); + void handleItem(xmlreader::XmlReader & reader); - void handlePropValue(XmlReader & reader, PropertyNode * prop); + void handlePropValue(xmlreader::XmlReader & reader, PropertyNode * prop); void handleLocpropValue( - XmlReader & reader, LocalizedPropertyNode * locprop); + xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop); - void handleGroupProp(XmlReader & reader, GroupNode * group); + void handleGroupProp(xmlreader::XmlReader & reader, GroupNode * group); void handleUnknownGroupProp( - XmlReader const & reader, GroupNode * group, rtl::OUString const & name, - Type type, Operation operation, bool finalized); + xmlreader::XmlReader const & reader, GroupNode * group, + rtl::OUString const & name, Type type, Operation operation, + bool finalized); void handlePlainGroupProp( - XmlReader const & reader, GroupNode * group, + xmlreader::XmlReader const & reader, GroupNode * group, NodeMap::iterator const & propertyIndex, rtl::OUString const & name, Type type, Operation operation, bool finalized); void handleLocalizedGroupProp( - XmlReader const & reader, LocalizedPropertyNode * property, + xmlreader::XmlReader const & reader, LocalizedPropertyNode * property, rtl::OUString const & name, Type type, Operation operation, bool finalized); void handleGroupNode( - XmlReader & reader, rtl::Reference< Node > const & group); + xmlreader::XmlReader & reader, rtl::Reference< Node > const & group); - void handleSetNode(XmlReader & reader, SetNode * set); + void handleSetNode(xmlreader::XmlReader & reader, SetNode * set); void recordModification(bool addition); diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx index 07ad4d17a345..7d3d9ead3d2c 100644 --- a/configmgr/source/xmldata.cxx +++ b/configmgr/source/xmldata.cxx @@ -40,12 +40,12 @@ #include "rtl/ref.hxx" #include "rtl/strbuf.hxx" #include "rtl/string.h" -#include "rtl/textcvt.h" -#include "rtl/textenc.h" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "xmlreader/span.hxx" +#include "xmlreader/xmlreader.hxx" #include "data.hxx" #include "groupnode.hxx" @@ -57,9 +57,7 @@ #include "parser.hxx" #include "propertynode.hxx" #include "setnode.hxx" -#include "span.hxx" #include "type.hxx" -#include "xmlreader.hxx" namespace configmgr { @@ -71,90 +69,88 @@ namespace css = com::sun::star; } -rtl::OUString convertFromUtf8(Span const & text) { - OSL_ASSERT(text.is()); - rtl_uString * s = 0; - if (!rtl_convertStringToUString( - &s, text.begin, text.length, RTL_TEXTENCODING_UTF8, - (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | - RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR | - RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) - { - throw css::uno::RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("cannot convert from UTF-8")), - css::uno::Reference< css::uno::XInterface >()); - } - return rtl::OUString(s, SAL_NO_ACQUIRE); -} - -Type parseType(XmlReader const & reader, Span const & text) { +Type parseType( + xmlreader::XmlReader const & reader, xmlreader::Span const & text) +{ OSL_ASSERT(text.is()); sal_Int32 i = rtl_str_indexOfChar_WithLength(text.begin, text.length, ':'); if (i >= 0) { - switch (reader.getNamespace(Span(text.begin, i))) { - case XmlReader::NAMESPACE_OOR: - if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("any"))) + switch (reader.getNamespaceId(xmlreader::Span(text.begin, i))) { + case ParseManager::NAMESPACE_OOR: + if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("any"))) { return TYPE_ANY; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("boolean-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("boolean-list"))) { return TYPE_BOOLEAN_LIST; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("short-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("short-list"))) { return TYPE_SHORT_LIST; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("int-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("int-list"))) { return TYPE_INT_LIST; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("long-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("long-list"))) { return TYPE_LONG_LIST; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("double-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("double-list"))) { return TYPE_DOUBLE_LIST; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("string-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("string-list"))) { return TYPE_STRING_LIST; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("hexBinary-list"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("hexBinary-list"))) { return TYPE_HEXBINARY_LIST; } break; - case XmlReader::NAMESPACE_XS: - if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("boolean"))) + case ParseManager::NAMESPACE_XS: + if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("boolean"))) { return TYPE_BOOLEAN; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("short"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("short"))) { return TYPE_SHORT; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("int"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("int"))) { return TYPE_INT; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("long"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("long"))) { return TYPE_LONG; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("double"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("double"))) { return TYPE_DOUBLE; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("string"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("string"))) { return TYPE_STRING; - } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals( - RTL_CONSTASCII_STRINGPARAM("hexBinary"))) + } else if (xmlreader::Span( + text.begin + i + 1, text.length - (i + 1)). + equals(RTL_CONSTASCII_STRINGPARAM("hexBinary"))) { return TYPE_HEXBINARY; } @@ -165,11 +161,11 @@ Type parseType(XmlReader const & reader, Span const & text) { } throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid type ")) + - convertFromUtf8(text)), + text.convertFromUtf8()), css::uno::Reference< css::uno::XInterface >()); } -bool parseBoolean(Span const & text) { +bool parseBoolean(xmlreader::Span const & text) { OSL_ASSERT(text.is()); if (text.equals(RTL_CONSTASCII_STRINGPARAM("true"))) { return true; @@ -179,7 +175,7 @@ bool parseBoolean(Span const & text) { } throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid boolean ")) + - convertFromUtf8(text)), + text.convertFromUtf8()), css::uno::Reference< css::uno::XInterface >()); } diff --git a/configmgr/source/xmldata.hxx b/configmgr/source/xmldata.hxx index 15a0a36336ad..e60e1082cabb 100644 --- a/configmgr/source/xmldata.hxx +++ b/configmgr/source/xmldata.hxx @@ -33,19 +33,19 @@ #include "type.hxx" namespace rtl { class OUString; } +namespace xmlreader { + class XmlReader; + struct Span; +} namespace configmgr { -class XmlReader; -struct Span; - namespace xmldata { -rtl::OUString convertFromUtf8(Span const & text); - -Type parseType(XmlReader const & reader, Span const & text); +Type parseType( + xmlreader::XmlReader const & reader, xmlreader::Span const & text); -bool parseBoolean(Span const & text); +bool parseBoolean(xmlreader::Span const & text); rtl::OUString parseTemplateReference( rtl::OUString const & component, bool hasNodeType, diff --git a/configmgr/source/xmlreader.cxx b/configmgr/source/xmlreader.cxx deleted file mode 100644 index ac6a08d18604..000000000000 --- a/configmgr/source/xmlreader.cxx +++ /dev/null @@ -1,1054 +0,0 @@ -/************************************************************************* -* -* 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 "precompiled_configmgr.hxx" -#include "sal/config.h" - -#include <cstddef> - -#include "com/sun/star/container/NoSuchElementException.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/XInterface.hpp" -#include "osl/diagnose.h" -#include "osl/file.h" -#include "rtl/string.h" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" -#include "sal/types.h" - -#include "pad.hxx" -#include "span.hxx" -#include "xmlreader.hxx" - -namespace configmgr { - -namespace { - -namespace css = com::sun::star; - -bool isSpace(char c) { - switch (c) { - case '\x09': - case '\x0A': - case '\x0D': - case ' ': - return true; - default: - return false; - } -} - -} - -XmlReader::XmlReader(rtl::OUString const & fileUrl) - SAL_THROW(( - css::container::NoSuchElementException, css::uno::RuntimeException)): - fileUrl_(fileUrl) -{ - switch (osl_openFile(fileUrl_.pData, &fileHandle_, osl_File_OpenFlag_Read)) - { - case osl_File_E_None: - break; - case osl_File_E_NOENT: - throw css::container::NoSuchElementException( - fileUrl_, css::uno::Reference< css::uno::XInterface >()); - default: - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot open ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - oslFileError e = osl_getFileSize(fileHandle_, &fileSize_); - if (e == osl_File_E_None) { - e = osl_mapFile( - fileHandle_, &fileAddress_, fileSize_, 0, - osl_File_MapFlag_WillNeed); - } - if (e != osl_File_E_None) { - e = osl_closeFile(fileHandle_); - if (e != osl_File_E_None) { - OSL_TRACE("osl_closeFile failed with %ld", static_cast< long >(e)); - } - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot mmap ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - namespaces_.push_back( - NamespaceData(Span(RTL_CONSTASCII_STRINGPARAM("xml")), NAMESPACE_XML)); - namespaces_.push_back( - NamespaceData(Span(RTL_CONSTASCII_STRINGPARAM("xsi")), NAMESPACE_XSI)); - // old user layer .xcu files used the xsi namespace prefix without - // declaring a corresponding namespace binding, see issue 77174; reading - // those files during migration would fail without this hack that can be - // removed once migration is no longer relevant (see - // Components::parseModificationLayer) - pos_ = static_cast< char * >(fileAddress_); - end_ = pos_ + fileSize_; - state_ = STATE_CONTENT; -} - -XmlReader::~XmlReader() { - oslFileError e = osl_unmapFile(fileAddress_, fileSize_); - if (e != osl_File_E_None) { - OSL_TRACE("osl_unmapFile failed with %ld", static_cast< long >(e)); - } - e = osl_closeFile(fileHandle_); - if (e != osl_File_E_None) { - OSL_TRACE("osl_closeFile failed with %ld", static_cast< long >(e)); - } -} - -XmlReader::Result XmlReader::nextItem( - Text reportText, Span * data, Namespace * ns) -{ - switch (state_) { - case STATE_CONTENT: - switch (reportText) { - case TEXT_NONE: - return handleSkippedText(data, ns); - case TEXT_RAW: - return handleRawText(data); - case TEXT_NORMALIZED: - return handleNormalizedText(data); - } - case STATE_START_TAG: - return handleStartTag(ns, data); - case STATE_END_TAG: - return handleEndTag(); - case STATE_EMPTY_ELEMENT_TAG: - handleElementEnd(); - return RESULT_END; - default: // STATE_DONE - return RESULT_DONE; - } -} - -bool XmlReader::nextAttribute(Namespace * ns, Span * localName) { - OSL_ASSERT(ns != 0 && localName != 0); - if (firstAttribute_) { - currentAttribute_ = attributes_.begin(); - firstAttribute_ = false; - } else { - ++currentAttribute_; - } - if (currentAttribute_ == attributes_.end()) { - return false; - } - if (currentAttribute_->nameColon == 0) { - *ns = NAMESPACE_NONE; - *localName = Span( - currentAttribute_->nameBegin, - currentAttribute_->nameEnd - currentAttribute_->nameBegin); - } else { - *ns = getNamespace( - Span( - currentAttribute_->nameBegin, - currentAttribute_->nameColon - currentAttribute_->nameBegin)); - *localName = Span( - currentAttribute_->nameColon + 1, - currentAttribute_->nameEnd - (currentAttribute_->nameColon + 1)); - } - return true; -} - -Span XmlReader::getAttributeValue(bool fullyNormalize) { - return handleAttributeValue( - currentAttribute_->valueBegin, currentAttribute_->valueEnd, - fullyNormalize); -} - -XmlReader::Namespace XmlReader::getNamespace(Span const & prefix) const { - for (NamespaceList::const_reverse_iterator i(namespaces_.rbegin()); - i != namespaces_.rend(); ++i) - { - if (prefix.equals(i->prefix)) { - return i->ns; - } - } - return NAMESPACE_OTHER; -} - -rtl::OUString XmlReader::getUrl() const { - return fileUrl_; -} - -void XmlReader::normalizeLineEnds(Span const & text) { - char const * p = text.begin; - sal_Int32 n = text.length; - for (;;) { - sal_Int32 i = rtl_str_indexOfChar_WithLength(p, n, '\x0D'); - if (i < 0) { - break; - } - pad_.add(p, i); - p += i + 1; - n -= i + 1; - if (n == 0 || *p != '\x0A') { - pad_.add(RTL_CONSTASCII_STRINGPARAM("\x0A")); - } - } - pad_.add(p, n); -} - -void XmlReader::skipSpace() { - while (isSpace(peek())) { - ++pos_; - } -} - -bool XmlReader::skipComment() { - if (rtl_str_shortenedCompare_WithLength( - pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("--"), - RTL_CONSTASCII_LENGTH("--")) != - 0) - { - return false; - } - pos_ += RTL_CONSTASCII_LENGTH("--"); - sal_Int32 i = rtl_str_indexOfStr_WithLength( - pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("--")); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within comment) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - pos_ += i + RTL_CONSTASCII_LENGTH("--"); - if (read() != '>') { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "illegal \"--\" within comment in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - return true; -} - -void XmlReader::skipProcessingInstruction() { - sal_Int32 i = rtl_str_indexOfStr_WithLength( - pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("?>")); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad '<?' in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - pos_ += i + RTL_CONSTASCII_LENGTH("?>"); -} - -void XmlReader::skipDocumentTypeDeclaration() { - // Neither is it checked that the doctypedecl is at the correct position in - // the document, nor that it is well-formed: - for (;;) { - char c = read(); - switch (c) { - case '\0': // i.e., EOF - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - case '"': - case '\'': - { - sal_Int32 i = rtl_str_indexOfChar_WithLength( - pos_, end_ - pos_, c); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - pos_ += i + 1; - } - break; - case '>': - return; - case '[': - for (;;) { - c = read(); - switch (c) { - case '\0': // i.e., EOF - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - case '"': - case '\'': - { - sal_Int32 i = rtl_str_indexOfChar_WithLength( - pos_, end_ - pos_, c); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - pos_ += i + 1; - } - break; - case '<': - switch (read()) { - case '\0': // i.e., EOF - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - case '!': - skipComment(); - break; - case '?': - skipProcessingInstruction(); - break; - default: - break; - } - break; - case ']': - skipSpace(); - if (read() != '>') { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "missing \">\" of DTD in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - return; - default: - break; - } - } - default: - break; - } - } -} - -Span XmlReader::scanCdataSection() { - if (rtl_str_shortenedCompare_WithLength( - pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("[CDATA["), - RTL_CONSTASCII_LENGTH("[CDATA[")) != - 0) - { - return Span(); - } - pos_ += RTL_CONSTASCII_LENGTH("[CDATA["); - char const * begin = pos_; - sal_Int32 i = rtl_str_indexOfStr_WithLength( - pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("]]>")); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within CDATA section) of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - pos_ += i + RTL_CONSTASCII_LENGTH("]]>"); - return Span(begin, i); -} - -bool XmlReader::scanName(char const ** nameColon) { - OSL_ASSERT(nameColon != 0 && *nameColon == 0); - for (char const * begin = pos_;; ++pos_) { - switch (peek()) { - case '\0': // i.e., EOF - case '\x09': - case '\x0A': - case '\x0D': - case ' ': - case '/': - case '=': - case '>': - return pos_ != begin; - case ':': - *nameColon = pos_; - break; - default: - break; - } - } -} - -XmlReader::Namespace XmlReader::scanNamespaceIri( - char const * begin, char const * end) -{ - OSL_ASSERT(begin != 0 && begin <= end); - Span iri(handleAttributeValue(begin, end, false)); - struct Iri { - char const * begin; - sal_Int32 length; - XmlReader::Namespace ns; - }; - static Iri const iris[] = { - { RTL_CONSTASCII_STRINGPARAM("http://openoffice.org/2001/registry"), - XmlReader::NAMESPACE_OOR }, - { RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/2001/XMLSchema"), - XmlReader::NAMESPACE_XS }, - { RTL_CONSTASCII_STRINGPARAM( - "http://www.w3.org/2001/XMLSchema-instance"), - XmlReader::NAMESPACE_XSI }, - { RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/XML/1998/namespace"), - XmlReader::NAMESPACE_XML } }; - for (std::size_t i = 0; i < sizeof iris / sizeof iris[0]; ++i) { - if (rtl_str_compare_WithLength( - iri.begin, iri.length, iris[i].begin, iris[i].length) == - 0) - { - return iris[i].ns; - } - } - return XmlReader::NAMESPACE_OTHER; -} - -char const * XmlReader::handleReference(char const * position, char const * end) -{ - OSL_ASSERT(position != 0 && *position == '&' && position < end); - ++position; - if (*position == '#') { - ++position; - sal_Int32 val = 0; - char const * p; - if (*position == 'x') { - ++position; - p = position; - for (;; ++position) { - char c = *position; - if (c >= '0' && c <= '9') { - val = 16 * val + (c - '0'); - } else if (c >= 'A' && c <= 'F') { - val = 16 * val + (c - 'A') + 10; - } else if (c >= 'a' && c <= 'f') { - val = 16 * val + (c - 'a') + 10; - } else { - break; - } - if (val > 0x10FFFF) { // avoid overflow - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "'&#x...' too large in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - } - } else { - p = position; - for (;; ++position) { - char c = *position; - if (c >= '0' && c <= '9') { - val = 10 * val + (c - '0'); - } else { - break; - } - if (val > 0x10FFFF) { // avoid overflow - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "'&#...' too large in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - } - } - if (position == p || *position++ != ';') { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("'&#...' missing ';' in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - OSL_ASSERT(val >= 0 && val <= 0x10FFFF); - if ((val < 0x20 && val != 0x9 && val != 0xA && val != 0xD) || - (val >= 0xD800 && val <= 0xDFFF) || val == 0xFFFE || val == 0xFFFF) - { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "character reference denoting invalid character in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char buf[4]; - sal_Int32 len; - if (val < 0x80) { - buf[0] = static_cast< char >(val); - len = 1; - } else if (val < 0x800) { - buf[0] = static_cast< char >((val >> 6) | 0xC0); - buf[1] = static_cast< char >((val & 0x3F) | 0x80); - len = 2; - } else if (val < 0x10000) { - buf[0] = static_cast< char >((val >> 12) | 0xE0); - buf[1] = static_cast< char >(((val >> 6) & 0x3F) | 0x80); - buf[2] = static_cast< char >((val & 0x3F) | 0x80); - len = 3; - } else { - buf[0] = static_cast< char >((val >> 18) | 0xF0); - buf[1] = static_cast< char >(((val >> 12) & 0x3F) | 0x80); - buf[2] = static_cast< char >(((val >> 6) & 0x3F) | 0x80); - buf[3] = static_cast< char >((val & 0x3F) | 0x80); - len = 4; - } - pad_.addEphemeral(buf, len); - return position; - } else { - struct EntityRef { - char const * inBegin; - sal_Int32 inLength; - char const * outBegin; - sal_Int32 outLength; - }; - static EntityRef const refs[] = { - { RTL_CONSTASCII_STRINGPARAM("amp;"), - RTL_CONSTASCII_STRINGPARAM("&") }, - { RTL_CONSTASCII_STRINGPARAM("lt;"), - RTL_CONSTASCII_STRINGPARAM("<") }, - { RTL_CONSTASCII_STRINGPARAM("gt;"), - RTL_CONSTASCII_STRINGPARAM(">") }, - { RTL_CONSTASCII_STRINGPARAM("apos;"), - RTL_CONSTASCII_STRINGPARAM("'") }, - { RTL_CONSTASCII_STRINGPARAM("quot;"), - RTL_CONSTASCII_STRINGPARAM("\"") } }; - for (std::size_t i = 0; i < sizeof refs / sizeof refs[0]; ++i) { - if (rtl_str_shortenedCompare_WithLength( - position, end - position, refs[i].inBegin, refs[i].inLength, - refs[i].inLength) == - 0) - { - position += refs[i].inLength; - pad_.add(refs[i].outBegin, refs[i].outLength); - return position; - } - } - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("unknown entity reference in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } -} - -Span XmlReader::handleAttributeValue( - char const * begin, char const * end, bool fullyNormalize) -{ - pad_.clear(); - if (fullyNormalize) { - while (begin != end && isSpace(*begin)) { - ++begin; - } - while (end != begin && isSpace(end[-1])) { - --end; - } - char const * p = begin; - enum Space { SPACE_NONE, SPACE_SPAN, SPACE_BREAK }; - // a single true space character can go into the current span, - // everything else breaks the span - Space space = SPACE_NONE; - while (p != end) { - switch (*p) { - case '\x09': - case '\x0A': - case '\x0D': - switch (space) { - case SPACE_NONE: - pad_.add(begin, p - begin); - pad_.add(RTL_CONSTASCII_STRINGPARAM(" ")); - space = SPACE_BREAK; - break; - case SPACE_SPAN: - pad_.add(begin, p - begin); - space = SPACE_BREAK; - break; - case SPACE_BREAK: - break; - } - begin = ++p; - break; - case ' ': - switch (space) { - case SPACE_NONE: - ++p; - space = SPACE_SPAN; - break; - case SPACE_SPAN: - pad_.add(begin, p - begin); - begin = ++p; - space = SPACE_BREAK; - break; - case SPACE_BREAK: - begin = ++p; - break; - } - break; - case '&': - pad_.add(begin, p - begin); - p = handleReference(p, end); - begin = p; - space = SPACE_NONE; - break; - default: - ++p; - space = SPACE_NONE; - break; - } - } - pad_.add(begin, p - begin); - } else { - char const * p = begin; - while (p != end) { - switch (*p) { - case '\x09': - case '\x0A': - pad_.add(begin, p - begin); - begin = ++p; - pad_.add(RTL_CONSTASCII_STRINGPARAM(" ")); - break; - case '\x0D': - pad_.add(begin, p - begin); - ++p; - if (peek() == '\x0A') { - ++p; - } - begin = p; - pad_.add(RTL_CONSTASCII_STRINGPARAM(" ")); - break; - case '&': - pad_.add(begin, p - begin); - p = handleReference(p, end); - begin = p; - break; - default: - ++p; - break; - } - } - pad_.add(begin, p - begin); - } - return pad_.get(); -} - -XmlReader::Result XmlReader::handleStartTag(Namespace * ns, Span * localName) { - OSL_ASSERT(ns != 0 && localName); - char const * nameBegin = pos_; - char const * nameColon = 0; - if (!scanName(&nameColon)) { - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad tag name in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char const * nameEnd = pos_; - NamespaceList::size_type inheritedNamespaces = namespaces_.size(); - bool hasDefaultNs = false; - Namespace defaultNs = NAMESPACE_NONE; - attributes_.clear(); - for (;;) { - char const * p = pos_; - skipSpace(); - if (peek() == '/' || peek() == '>') { - break; - } - if (pos_ == p) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "missing whitespace before attribute in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char const * attrNameBegin = pos_; - char const * attrNameColon = 0; - if (!scanName(&attrNameColon)) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("bad attribute name in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char const * attrNameEnd = pos_; - skipSpace(); - if (read() != '=') { - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '=' in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - skipSpace(); - char del = read(); - if (del != '\'' && del != '"') { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("bad attribute value in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char const * valueBegin = pos_; - sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, del); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unterminated attribute value in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char const * valueEnd = pos_ + i; - pos_ += i + 1; - if (attrNameColon == 0 && - Span(attrNameBegin, attrNameEnd - attrNameBegin).equals( - RTL_CONSTASCII_STRINGPARAM("xmlns"))) - { - hasDefaultNs = true; - defaultNs = scanNamespaceIri(valueBegin, valueEnd); - } else if (attrNameColon != 0 && - Span(attrNameBegin, attrNameColon - attrNameBegin).equals( - RTL_CONSTASCII_STRINGPARAM("xmlns"))) - { - namespaces_.push_back( - NamespaceData( - Span(attrNameColon + 1, attrNameEnd - (attrNameColon + 1)), - scanNamespaceIri(valueBegin, valueEnd))); - } else { - attributes_.push_back( - AttributeData( - attrNameBegin, attrNameEnd, attrNameColon, valueBegin, - valueEnd)); - } - } - if (!hasDefaultNs && !elements_.empty()) { - defaultNs = elements_.top().defaultNamespace; - } - firstAttribute_ = true; - if (peek() == '/') { - state_ = STATE_EMPTY_ELEMENT_TAG; - ++pos_; - } else { - state_ = STATE_CONTENT; - } - if (peek() != '>') { - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '>' in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - ++pos_; - elements_.push( - ElementData( - Span(nameBegin, nameEnd - nameBegin), inheritedNamespaces, - defaultNs)); - if (nameColon == 0) { - *ns = defaultNs; - *localName = Span(nameBegin, nameEnd - nameBegin); - } else { - *ns = getNamespace(Span(nameBegin, nameColon - nameBegin)); - *localName = Span(nameColon + 1, nameEnd - (nameColon + 1)); - } - return RESULT_BEGIN; -} - -XmlReader::Result XmlReader::handleEndTag() { - if (elements_.empty()) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("spurious end tag in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - char const * nameBegin = pos_; - char const * nameColon = 0; - if (!scanName(&nameColon) || - !elements_.top().name.equals(nameBegin, pos_ - nameBegin)) - { - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tag mismatch in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - handleElementEnd(); - skipSpace(); - if (peek() != '>') { - throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '>' in ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - ++pos_; - return RESULT_END; -} - -void XmlReader::handleElementEnd() { - OSL_ASSERT(!elements_.empty()); - namespaces_.resize(elements_.top().inheritedNamespaces); - elements_.pop(); - state_ = elements_.empty() ? STATE_DONE : STATE_CONTENT; -} - -XmlReader::Result XmlReader::handleSkippedText(Span * data, Namespace * ns) { - for (;;) { - sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, '<'); - if (i < 0) { - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("premature end of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - } - pos_ += i + 1; - switch (peek()) { - case '!': - ++pos_; - if (!skipComment() && !scanCdataSection().is()) { - skipDocumentTypeDeclaration(); - } - break; - case '/': - ++pos_; - return handleEndTag(); - case '?': - ++pos_; - skipProcessingInstruction(); - break; - default: - return handleStartTag(ns, data); - } - } -} - -XmlReader::Result XmlReader::handleRawText(Span * text) { - pad_.clear(); - for (char const * begin = pos_;;) { - switch (peek()) { - case '\0': // i.e., EOF - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("premature end of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - case '\x0D': - pad_.add(begin, pos_ - begin); - ++pos_; - if (peek() != '\x0A') { - pad_.add(RTL_CONSTASCII_STRINGPARAM("\x0A")); - } - begin = pos_; - break; - case '&': - pad_.add(begin, pos_ - begin); - pos_ = handleReference(pos_, end_); - begin = pos_; - break; - case '<': - pad_.add(begin, pos_ - begin); - ++pos_; - switch (peek()) { - case '!': - ++pos_; - if (!skipComment()) { - Span cdata(scanCdataSection()); - if (cdata.is()) { - normalizeLineEnds(cdata); - } else { - skipDocumentTypeDeclaration(); - } - } - begin = pos_; - break; - case '/': - *text = pad_.get(); - ++pos_; - state_ = STATE_END_TAG; - return RESULT_TEXT; - case '?': - ++pos_; - skipProcessingInstruction(); - begin = pos_; - break; - default: - *text = pad_.get(); - state_ = STATE_START_TAG; - return RESULT_TEXT; - } - break; - default: - ++pos_; - break; - } - } -} - -XmlReader::Result XmlReader::handleNormalizedText(Span * text) { - pad_.clear(); - char const * flowBegin = pos_; - char const * flowEnd = pos_; - enum Space { SPACE_START, SPACE_NONE, SPACE_SPAN, SPACE_BREAK }; - // a single true space character can go into the current flow, - // everything else breaks the flow - Space space = SPACE_START; - for (;;) { - switch (peek()) { - case '\0': // i.e., EOF - throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("premature end of ")) + - fileUrl_), - css::uno::Reference< css::uno::XInterface >()); - case '\x09': - case '\x0A': - case '\x0D': - switch (space) { - case SPACE_START: - case SPACE_BREAK: - break; - case SPACE_NONE: - case SPACE_SPAN: - space = SPACE_BREAK; - break; - } - ++pos_; - break; - case ' ': - switch (space) { - case SPACE_START: - case SPACE_BREAK: - break; - case SPACE_NONE: - space = SPACE_SPAN; - break; - case SPACE_SPAN: - space = SPACE_BREAK; - break; - } - ++pos_; - break; - case '&': - switch (space) { - case SPACE_START: - break; - case SPACE_NONE: - case SPACE_SPAN: - pad_.add(flowBegin, pos_ - flowBegin); - break; - case SPACE_BREAK: - pad_.add(flowBegin, flowEnd - flowBegin); - pad_.add(RTL_CONSTASCII_STRINGPARAM(" ")); - break; - } - pos_ = handleReference(pos_, end_); - flowBegin = pos_; - flowEnd = pos_; - space = SPACE_NONE; - break; - case '<': - ++pos_; - switch (peek()) { - case '!': - ++pos_; - if (skipComment()) { - space = SPACE_BREAK; - } else { - Span cdata(scanCdataSection()); - if (cdata.is()) { - // CDATA is not normalized (similar to character - // references; it keeps the code simple), but it might - // arguably be better to normalize it: - switch (space) { - case SPACE_START: - break; - case SPACE_NONE: - case SPACE_SPAN: - pad_.add(flowBegin, pos_ - flowBegin); - break; - case SPACE_BREAK: - pad_.add(flowBegin, flowEnd - flowBegin); - pad_.add(RTL_CONSTASCII_STRINGPARAM(" ")); - break; - } - normalizeLineEnds(cdata); - flowBegin = pos_; - flowEnd = pos_; - space = SPACE_NONE; - } else { - skipDocumentTypeDeclaration(); - } - } - break; - case '/': - ++pos_; - pad_.add(flowBegin, flowEnd - flowBegin); - *text = pad_.get(); - state_ = STATE_END_TAG; - return RESULT_TEXT; - case '?': - ++pos_; - skipProcessingInstruction(); - space = SPACE_BREAK; - break; - default: - pad_.add(flowBegin, flowEnd - flowBegin); - *text = pad_.get(); - state_ = STATE_START_TAG; - return RESULT_TEXT; - } - break; - default: - switch (space) { - case SPACE_START: - flowBegin = pos_; - break; - case SPACE_NONE: - case SPACE_SPAN: - break; - case SPACE_BREAK: - pad_.add(flowBegin, flowEnd - flowBegin); - pad_.add(RTL_CONSTASCII_STRINGPARAM(" ")); - flowBegin = pos_; - break; - } - flowEnd = ++pos_; - space = SPACE_NONE; - break; - } - } -} - -} diff --git a/configmgr/source/xmlreader.hxx b/configmgr/source/xmlreader.hxx deleted file mode 100644 index 83ccac148cd4..000000000000 --- a/configmgr/source/xmlreader.hxx +++ /dev/null @@ -1,186 +0,0 @@ -/************************************************************************* -* -* 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_CONFIGMGR_SOURCE_XMLREADER_HXX -#define INCLUDED_CONFIGMGR_SOURCE_XMLREADER_HXX - -#include "sal/config.h" - -#include <stack> -#include <vector> - -#include "boost/noncopyable.hpp" -#include "com/sun/star/container/NoSuchElementException.hpp" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "osl/file.h" -#include "rtl/ustring.hxx" -#include "sal/types.h" - -#include "pad.hxx" -#include "span.hxx" - -namespace configmgr { - -class XmlReader: private boost::noncopyable { -public: - explicit XmlReader(rtl::OUString const & fileUrl) - SAL_THROW(( - com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException)); - - ~XmlReader(); - - enum Namespace { - NAMESPACE_NONE, NAMESPACE_XML, NAMESPACE_OOR, NAMESPACE_XS, - NAMESPACE_XSI, NAMESPACE_OTHER }; - - enum Text { TEXT_NONE, TEXT_RAW, TEXT_NORMALIZED }; - - enum Result { RESULT_BEGIN, RESULT_END, RESULT_TEXT, RESULT_DONE }; - - // RESULT_BEGIN: data = localName, ns = ns - // RESULT_END: data, ns unused - // RESULT_TEXT: data = text, ns unused - Result nextItem(Text reportText, Span * data, Namespace * ns); - - bool nextAttribute(Namespace * ns, Span * localName); - - // the span returned by getAttributeValue is only valid until the next call - // to nextItem or getAttributeValue - Span getAttributeValue(bool fullyNormalize); - - Namespace getNamespace(Span const & prefix) const; - - rtl::OUString getUrl() const; - -private: - inline char read() { return pos_ == end_ ? '\0' : *pos_++; } - - inline char peek() { return pos_ == end_ ? '\0' : *pos_; } - - void normalizeLineEnds(Span const & text); - - void skipSpace(); - - bool skipComment(); - - void skipProcessingInstruction(); - - void skipDocumentTypeDeclaration(); - - Span scanCdataSection(); - - bool scanName(char const ** nameColon); - - Namespace scanNamespaceIri(char const * begin, char const * end); - - char const * handleReference(char const * position, char const * end); - - Span handleAttributeValue( - char const * begin, char const * end, bool fullyNormalize); - - Result handleStartTag(Namespace * ns, Span * localName); - - Result handleEndTag(); - - void handleElementEnd(); - - Result handleSkippedText(Span * data, Namespace * ns); - - Result handleRawText(Span * text); - - Result handleNormalizedText(Span * text); - - struct NamespaceData { - Span prefix; - Namespace ns; - - NamespaceData() {} - - NamespaceData(Span const & thePrefix, Namespace theNs): - prefix(thePrefix), ns(theNs) {} - }; - - typedef std::vector< NamespaceData > NamespaceList; - - struct ElementData { - Span name; - NamespaceList::size_type inheritedNamespaces; - Namespace defaultNamespace; - - ElementData( - Span const & theName, - NamespaceList::size_type theInheritedNamespaces, - Namespace theDefaultNamespace): - name(theName), inheritedNamespaces(theInheritedNamespaces), - defaultNamespace(theDefaultNamespace) - {} - }; - - typedef std::stack< ElementData > ElementStack; - - struct AttributeData { - char const * nameBegin; - char const * nameEnd; - char const * nameColon; - char const * valueBegin; - char const * valueEnd; - - AttributeData( - char const * theNameBegin, char const * theNameEnd, - char const * theNameColon, char const * theValueBegin, - char const * theValueEnd): - nameBegin(theNameBegin), nameEnd(theNameEnd), - nameColon(theNameColon), valueBegin(theValueBegin), - valueEnd(theValueEnd) - {} - }; - - typedef std::vector< AttributeData > Attributes; - - enum State { - STATE_CONTENT, STATE_START_TAG, STATE_END_TAG, STATE_EMPTY_ELEMENT_TAG, - STATE_DONE }; - - rtl::OUString fileUrl_; - oslFileHandle fileHandle_; - sal_uInt64 fileSize_; - void * fileAddress_; - NamespaceList namespaces_; - ElementStack elements_; - char const * pos_; - char const * end_; - State state_; - Attributes attributes_; - Attributes::iterator currentAttribute_; - bool firstAttribute_; - Pad pad_; -}; - -} - -#endif diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index e116ee5740ac..01d82ba9177e 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -31,3 +31,20 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess ..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip ..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip +..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component +..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component +..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component +..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component +..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component +..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component +..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component +..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component +..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component +..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component +..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component +..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component +..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component +..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component +..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component +..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component +..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 52e76f834ab5..1e3f80546d74 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -900,11 +900,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const } //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* serviceManager, com::sun::star::registry::XRegistryKey* registryKey) -{ - return cppu::component_writeInfoHelper(serviceManager, registryKey, entries); -} -//--------------------------------------------------------------------------------------- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey) { return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index 0786d9ea5f9a..be638aebf620 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -50,35 +50,6 @@ extern "C" } //--------------------------------------------------------------------------------------- -sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) -{ - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); - sMainKeyName += OPoolCollection::getImplementationName_Static(); - sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - - try - { - Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName); - if (!xMainKey.is()) - return sal_False; - - Sequence< ::rtl::OUString > sServices = OPoolCollection::getSupportedServiceNames_Static(); - const ::rtl::OUString* pServices = sServices.getConstArray(); - for (sal_Int32 i=0; i<sServices.getLength(); ++i, ++pServices) - xMainKey->createKey(*pServices); - } - catch(InvalidRegistryException&) - { - return sal_False; - } - catch(InvalidValueException&) - { - return sal_False; - } - return sal_True; -} - -//--------------------------------------------------------------------------------------- void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component new file mode 100644 index 000000000000..2fa8a144959c --- /dev/null +++ b/connectivity/source/cpool/dbpool2.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.sdbc.OConnectionPool"> + <service name="com.sun.star.sdbc.ConnectionPool"/> + </implementation> +</component> diff --git a/connectivity/source/cpool/exports.dxp b/connectivity/source/cpool/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/cpool/exports.dxp +++ b/connectivity/source/cpool/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk index 1f6e49c6cbd7..9908a6d242cb 100644 --- a/connectivity/source/cpool/makefile.mk +++ b/connectivity/source/cpool/makefile.mk @@ -78,4 +78,10 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/dbpool2.component +$(MISC)/dbpool2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbpool2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbpool2.component diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component new file mode 100644 index 000000000000..08be953bb9d4 --- /dev/null +++ b/connectivity/source/dbtools/dbtools.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.comp.helper.DatabaseMetaDataResultSet"> + <service name="com.sun.star.sdbc.ResultSet"/> + </implementation> + <implementation name="org.openoffice.comp.helper.ParameterSubstitution"> + <service name="com.sun.star.sdb.ParameterSubstitution"/> + </implementation> +</component> diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/dbtools/exports.dxp +++ b/connectivity/source/dbtools/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index af4ac13e54cc..a73dae3d047d 100644 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -95,3 +95,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo _TI >$@ @echo _real >>$@ + +ALLTAR : $(MISC)/dbtools.component + +$(MISC)/dbtools.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbtools.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbtools.component diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx index be1d716e8cd0..d895fb72b391 100644 --- a/connectivity/source/drivers/adabas/Bservices.cxx +++ b/connectivity/source/drivers/adabas/Bservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "adabas/BDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::adabas; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/adabas/adabas.component b/connectivity/source/drivers/adabas/adabas.component new file mode 100644 index 000000000000..3c359c3d0217 --- /dev/null +++ b/connectivity/source/drivers/adabas/adabas.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbcx.adabas.ODriver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/adabas/adabas.mxp.map b/connectivity/source/drivers/adabas/adabas.mxp.map index 2ce9f111412b..f64c44c13fce 100644 --- a/connectivity/source/drivers/adabas/adabas.mxp.map +++ b/connectivity/source/drivers/adabas/adabas.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/adabas/exports.dxp b/connectivity/source/drivers/adabas/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/adabas/exports.dxp +++ b/connectivity/source/drivers/adabas/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk index 9268f02a3b42..ffc3960391fd 100644 --- a/connectivity/source/drivers/adabas/makefile.mk +++ b/connectivity/source/drivers/adabas/makefile.mk @@ -104,3 +104,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/adabas.component + +$(MISC)/adabas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + adabas.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt adabas.component diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 05ebd274be84..71d90f289a7d 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "ado/ADriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::ado; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADO::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ADO::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/ado/ado.component b/connectivity/source/drivers/ado/ado.component new file mode 100644 index 000000000000..1962a6b710a7 --- /dev/null +++ b/connectivity/source/drivers/ado/ado.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.ado.ODriver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/ado/exports.dxp b/connectivity/source/drivers/ado/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/ado/exports.dxp +++ b/connectivity/source/drivers/ado/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk index 33e470648219..2b3c91a2010c 100644 --- a/connectivity/source/drivers/ado/makefile.mk +++ b/connectivity/source/drivers/ado/makefile.mk @@ -112,3 +112,11 @@ dummy: # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/ado.component + +$(MISC)/ado.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ado.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ado.component diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index b172d9d4cf88..5f0338b55aae 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "calc/CDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::calc; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component new file mode 100644 index 000000000000..be949f70de14 --- /dev/null +++ b/connectivity/source/drivers/calc/calc.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.calc.ODriver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/calc/exports.dxp +++ b/connectivity/source/drivers/calc/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index 8e193524aa45..a7393b3c8e82 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -94,3 +94,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/calc.component + +$(MISC)/calc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + calc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt calc.component diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index 831329a1feba..74019abe364d 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "dbase/DDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::dbase; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component new file mode 100644 index 000000000000..7f913f083680 --- /dev/null +++ b/connectivity/source/drivers/dbase/dbase.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.dbase.ODriver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map index c5b4377b04c3..87eccc45b66a 100644 --- a/connectivity/source/drivers/dbase/dbase.mxp.map +++ b/connectivity/source/drivers/dbase/dbase.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/dbase/exports.dxp +++ b/connectivity/source/drivers/dbase/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index f855cf1f4554..62b7ae96f8fa 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -127,3 +127,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/dbase.component + +$(MISC)/dbase.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbase.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbase.component diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx index 4ae9d4b9113b..29a19e9168eb 100644 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ b/connectivity/source/drivers/evoab/LServices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "LDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::evoab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - OEvoabDriver::getImplementationName_Static(), - OEvoabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/evoab/exports.dxp +++ b/connectivity/source/drivers/evoab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index c11eed9d6c61..555837d15a28 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -35,7 +35,6 @@ using namespace connectivity::evoab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "EVOAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - OEvoabDriver::getImplementationName_Static(), - OEvoabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component new file mode 100644 index 000000000000..a99719388d13 --- /dev/null +++ b/connectivity/source/drivers/evoab2/evoab.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index e8a1cf96cddf..3f5b62903b7a 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -110,3 +110,11 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/evoab.component + +$(MISC)/evoab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + evoab.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt evoab.component diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index a0445c1ca70f..30553af24cfc 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "flat/EDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::flat; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/flat/exports.dxp +++ b/connectivity/source/drivers/flat/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component new file mode 100644 index 000000000000..fe8b79ee73b8 --- /dev/null +++ b/connectivity/source/drivers/flat/flat.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.flat.ODriver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map index 54a8532f7840..2737c61b5a57 100644 --- a/connectivity/source/drivers/flat/flat.mxp.map +++ b/connectivity/source/drivers/flat/flat.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index 2d1f99f759c7..23920f91c21d 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -105,3 +105,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/flat.component + +$(MISC)/flat.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + flat.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt flat.component diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index a3e783a3e9a7..ea0d452f1d05 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -30,13 +30,11 @@ #include "hsqldb/HDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::hsqldb; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -124,31 +97,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriverDelegator::getImplementationName_Static(), - ODriverDelegator::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/hsqldb/exports.dxp b/connectivity/source/drivers/hsqldb/exports.dxp index 7ff56f4f9977..3efc73741d24 100644 --- a/connectivity/source/drivers/hsqldb/exports.dxp +++ b/connectivity/source/drivers/hsqldb/exports.dxp @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component new file mode 100644 index 000000000000..eb8ae477e749 --- /dev/null +++ b/connectivity/source/drivers/hsqldb/hsqldb.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map index b4fc53b320ef..b611aba02d5b 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.map +++ b/connectivity/source/drivers/hsqldb/hsqldb.map @@ -1,7 +1,6 @@ UDK_3_0_0 { global: component_getImplementationEnvironment; - component_writeInfo; component_getFactory; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII; diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index e1a953055c04..5be6fa08cd7b 100644 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -115,3 +115,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/hsqldb.component + +$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + hsqldb.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt hsqldb.component diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/jdbc/exports.dxp +++ b/connectivity/source/drivers/jdbc/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/jdbc/jdbc.component b/connectivity/source/drivers/jdbc/jdbc.component new file mode 100644 index 000000000000..5d7db4690ba5 --- /dev/null +++ b/connectivity/source/drivers/jdbc/jdbc.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.JDBCDriver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map index a4457e2478af..e02823e8c41b 100644 --- a/connectivity/source/drivers/jdbc/jdbc.mxp.map +++ b/connectivity/source/drivers/jdbc/jdbc.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index cadbbdcbcd49..85a8d37b9346 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -34,7 +34,6 @@ using namespace connectivity; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -47,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pModCount ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "SBA::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - java_sql_Driver::getImplementationName_Static(), - java_sql_Driver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk index 46619952163b..510daeac4a9f 100644 --- a/connectivity/source/drivers/jdbc/makefile.mk +++ b/connectivity/source/drivers/jdbc/makefile.mk @@ -110,3 +110,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/jdbc.component + +$(MISC)/jdbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + jdbc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt jdbc.component diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index 5a0f4c3f9917..6b7a1a39a667 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.cxx @@ -30,13 +30,11 @@ #include "KDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::kab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// The following C Api must be provided! -// It consists in three functions that must be exported by the module -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "KAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void*, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - KabDriver::getImplementationName_Static(), - KabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "KAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/kab/exports.dxp b/connectivity/source/drivers/kab/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/kab/exports.dxp +++ b/connectivity/source/drivers/kab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component new file mode 100644 index 000000000000..77227501d36c --- /dev/null +++ b/connectivity/source/drivers/kab/kab1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.kab.Driver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index 219bdd6cd020..c085cddb2d3b 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -138,3 +138,11 @@ dummy: .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/kab1.component + +$(MISC)/kab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kab1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kab1.component diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index b3c303324302..9d2e2faa0ca1 100755 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -30,13 +30,11 @@ #include "MacabDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::macab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// The following C Api must be provided! -// It consists in three functions that must be exported by the module -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "MACAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void*, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - MacabDriver::getImplementationName_Static(), - MacabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "MACAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/macab/exports.dxp b/connectivity/source/drivers/macab/exports.dxp index 9630d7e06768..f0e1c69934bc 100755 --- a/connectivity/source/drivers/macab/exports.dxp +++ b/connectivity/source/drivers/macab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component new file mode 100644 index 000000000000..0a120c041883 --- /dev/null +++ b/connectivity/source/drivers/macab/macab1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.macab.Driver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk index 35532b15ec2d..0565d3171329 100755 --- a/connectivity/source/drivers/macab/makefile.mk +++ b/connectivity/source/drivers/macab/makefile.mk @@ -127,3 +127,11 @@ dummy: .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/macab1.component + +$(MISC)/macab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + macab1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt macab1.component diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 4e595dad57ed..d6a280985969 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -39,7 +39,6 @@ using namespace connectivity::mozab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::mozilla::XMozillaBootstrap; @@ -53,31 +52,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM("/")); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -127,37 +101,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - - REGISTER_PROVIDER( - MozabDriver::getImplementationName_Static(), - MozabDriver::getSupportedServiceNames_Static(), xKey); - - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); - REGISTER_PROVIDER( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")), - aSNS, xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 3a7c169d467d..aeef289bae20 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -238,7 +238,6 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( #include <cppuhelper/factory.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -251,50 +250,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const ::rtl::OUString& aServiceImplName, - const Sequence< ::rtl::OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - ::rtl::OUString aMainKeyName; - aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/")); - aMainKeyName += aServiceImplName; - aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); - REGISTER_PROVIDER( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")), - aSNS, xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager)); diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index 6a4172da205d..b44436e488ce 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -78,6 +78,14 @@ SHL1STDLIBS=\ $(SALLIB) \ $(COMPHELPERLIB) +ALLTAR : $(MISC)/mozbootstrap.component + +$(MISC)/mozbootstrap.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component + .ELSE SLOFILES += \ $(SLO)$/MNSInit.obj \ @@ -90,4 +98,3 @@ SLOFILES += \ # --- Targets ---------------------------------- .INCLUDE : target.mk - diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component new file mode 100644 index 000000000000..5da158924a06 --- /dev/null +++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap"> + <service name="com.sun.star.mozilla.MozillaBootstrap"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/mozab/exports.dxp b/connectivity/source/drivers/mozab/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/mozab/exports.dxp +++ b/connectivity/source/drivers/mozab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index b1e12fde6f8a..852560f1c9a7 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -184,3 +184,11 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo _TI >$@ @echo _real >>$@ + +ALLTAR : $(MISC)/mozab.component + +$(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + mozab.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mozab.component diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component new file mode 100644 index 000000000000..70f5da3bfe72 --- /dev/null +++ b/connectivity/source/drivers/mozab/mozab.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap"> + <service name="com.sun.star.mozilla.MozillaBootstrap"/> + </implementation> + <implementation name="com.sun.star.comp.sdbc.MozabDriver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index 0927f191e6e6..b892e2f51066 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "mysql/YDriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::mysql; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriverDelegator::getImplementationName_Static(), - ODriverDelegator::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/drivers/mysql/exports.dxp +++ b/connectivity/source/drivers/mysql/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index fbb68321cb01..453f4b652f21 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -82,3 +82,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/mysql.component + +$(MISC)/mysql.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + mysql.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mysql.component diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component new file mode 100644 index 000000000000..ced2297fa07f --- /dev/null +++ b/connectivity/source/drivers/mysql/mysql.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.comp.drivers.MySQL.Driver"> + <service name="com.sun.star.sdbc.Driver"/> + <service name="com.sun.star.sdbcx.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk index 508cbfb6df63..426c75bf0142 100644 --- a/connectivity/source/drivers/odbc/makefile.mk +++ b/connectivity/source/drivers/odbc/makefile.mk @@ -76,3 +76,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/odbc.component + +$(MISC)/odbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + odbc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt odbc.component diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component new file mode 100644 index 000000000000..d4e6bc127da2 --- /dev/null +++ b/connectivity/source/drivers/odbc/odbc.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.ODBCDriver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 21bc448a5708..1347a00ea4d4 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -30,13 +30,11 @@ #include "ORealDriver.hxx" #include "odbc/ODriver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> using namespace connectivity::odbc; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; i<Services.getLength(); ++i) - xNewKey->createKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -124,31 +97,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODBCDriver::getImplementationName_Static(), - ODBCDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/manager/exports.dxp b/connectivity/source/manager/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/connectivity/source/manager/exports.dxp +++ b/connectivity/source/manager/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index 52ec191ec836..4880407952f6 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/makefile.mk @@ -76,4 +76,10 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/sdbc2.component +$(MISC)/sdbc2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sdbc2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sdbc2.component diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index f3bdf74c9574..16b88c071493 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; //========================================================================== //= registration @@ -51,38 +50,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const } //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) -{ - - - sal_Bool bReturn = sal_False; - - try - { - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); - sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static(); - sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName); - if (xMainKey.is()) - { - Sequence< ::rtl::OUString > sServices(::drivermanager::OSDBCDriverManager::getSupportedServiceNames_static()); - const ::rtl::OUString* pBegin = sServices.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + sServices.getLength(); - for (;pBegin != pEnd ; ++pBegin) - xMainKey->createKey(*pBegin); - bReturn = sal_True; - } - } - catch(InvalidRegistryException&) - { - } - catch(InvalidValueException&) - { - } - return bReturn; -} - -//--------------------------------------------------------------------------------------- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; diff --git a/connectivity/source/manager/sdbc.mxp.map b/connectivity/source/manager/sdbc.mxp.map index 14e33ebafb65..431725adbbec 100644 --- a/connectivity/source/manager/sdbc.mxp.map +++ b/connectivity/source/manager/sdbc.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component new file mode 100644 index 000000000000..6cce2b1d9fde --- /dev/null +++ b/connectivity/source/manager/sdbc2.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.OSDBCDriverManager"> + <service name="com.sun.star.sdbc.DriverManager"/> + </implementation> +</component> diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index fa7550812bbe..8eb4dd3cc25b 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -155,6 +155,7 @@ class Desktop : public Application sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename ); sal_Bool InitializeConfiguration(); + void FlushConfiguration(); sal_Bool InitializeQuickstartMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr ); void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg ); diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst index dc5d7a99b2d6..0fedcd4c2d49 100644 --- a/desktop/prj/build.lst +++ b/desktop/prj/build.lst @@ -41,3 +41,4 @@ dt desktop\registry\data\org\openoffice\Office nmake - a dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL dt desktop\source\registration\com\sun\star\registration nmake - all sn_regjob sn_svctag NULL +dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 92a4853c2bed..b6e14a5ce722 100644 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -143,3 +143,11 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs +..\%__SRC%\misc\deployment.component %_DEST%\xml%_EXT%\deployment.component +..\%__SRC%\misc\deploymentgui.component %_DEST%\xml%_EXT%\deploymentgui.component +..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component +..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component +..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component +..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml%_EXT%\productregistration.jar.component +..\%__SRC%\misc\socomp.component %_DEST%\xml%_EXT%\socomp.component +..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk index 15faef0dc46e..16223914e740 100644 --- a/desktop/qa/deployment_misc/makefile.mk +++ b/desktop/qa/deployment_misc/makefile.mk @@ -35,20 +35,22 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk CFLAGSCXX += $(CPPUNIT_CFLAGS) -DLLPRE = # no leading "lib" on .so files + +# TODO: On Windows, test_dp_version.cxx fails due to BOOL redefinition between +# windef.h and tools/solar.h caused by including "precompiled_desktop.hxx"; this +# hack to temporarily disable PCH will become unnecessary with the fix for issue +# 112600: +CFLAGSCXX += -DDISABLE_PCH_HACK SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_dp_version.obj -SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB) +SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) SHL1VERSIONMAP = version.map +SHL1RPATH = NONE SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk - -ALLTAR: test - -test .PHONY: $(SHL1TARGETN) - $(TESTSHL2) $(SHL1TARGETN) +.INCLUDE : _cppunit.mk diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index 7b974a8bae73..a5d50f4ac6be 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -32,7 +32,10 @@ #include <cstddef> -#include "testshl/simpleheader.hxx" +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" @@ -83,8 +86,8 @@ void Test::test() { } } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map index 7321bbca16ad..3308588ef6f8 100644 --- a/desktop/qa/deployment_misc/version.map +++ b/desktop/qa/deployment_misc/version.map @@ -27,7 +27,7 @@ UDK_3_0_0 { global: - registerAllTestFunction; + cppunitTestPlugIn; local: *; diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 0215f88d1ff0..b5494f9c9727 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -43,15 +43,14 @@ export SAL_ENABLE_FILE_LOCKING #@# export JITC_PROCESSOR_TYPE=6 # resolve installation directory -sd_cwd="`pwd`" -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi +sd_cwd=`pwd` +sd_res=$0 +while [ -h "$sd_res" ] ; do + cd "`dirname "$sd_res"`" + sd_basename=`basename "$sd_res"` + sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"` +done +cd "`dirname "$sd_res"`" sd_prog=`pwd` cd "$sd_cwd" @@ -96,7 +95,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH fi fi diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index 081e414365cf..a7566155aa0d 100644 --- a/desktop/scripts/unoinfo.sh +++ b/desktop/scripts/unoinfo.sh @@ -29,14 +29,13 @@ set -e # resolve installation directory -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi +sd_res=$0 +while [ -h "$sd_res" ] ; do + cd "`dirname "$sd_res"`" + sd_basename=`basename "$sd_res"` + sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"` +done +cd "`dirname "$sd_res"`" sd_prog=`pwd` case $1 in diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 0fe319735c06..77172e549534 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -31,15 +31,14 @@ SAL_ENABLE_FILE_LOCKING=1 export SAL_ENABLE_FILE_LOCKING # resolve installation directory -sd_cwd="`pwd`" -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi +sd_cwd=`pwd` +sd_res=$0 +while [ -h "$sd_res" ] ; do + cd "`dirname "$sd_res"`" + sd_basename=`basename "$sd_res"` + sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"` +done +cd "`dirname "$sd_res"`" sd_prog=`pwd` cd "$sd_cwd" @@ -57,7 +56,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH fi fi diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 22f67a214a55..76f30e48f6e7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -753,6 +753,7 @@ void Desktop::DeInit() // instead of removing of the configManager just let it commit all the changes RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + FlushConfiguration(); RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); // close splashscreen if it's still open @@ -783,6 +784,7 @@ BOOL Desktop::QueryExit() { RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + FlushConfiguration(); RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); } catch ( RuntimeException& ) @@ -1435,18 +1437,7 @@ USHORT Desktop::Exception(USHORT nError) if ( bAllowRecoveryAndSessionManagement ) bRestart = SaveTasks(); - // because there is no method to flush the condiguration data, we must dispose the ConfigManager - Reference < XFlushable > xCFGFlush( ::utl::ConfigManager::GetConfigManager()->GetConfigurationProvider(), UNO_QUERY ); - if (xCFGFlush.is()) - { - xCFGFlush->flush(); - } - else - { - Reference < XComponent > xCFGDispose( ::utl::ConfigManager::GetConfigManager()->GetConfigurationProvider(), UNO_QUERY ); - if (xCFGDispose.is()) - xCFGDispose->dispose(); - } + FlushConfiguration(); switch( nError & EXC_MAJORTYPE ) { @@ -1928,6 +1919,7 @@ void Desktop::Main() // remove temp directory RemoveTemporaryDirectory(); + FlushConfiguration(); // The acceptors in the AcceptorMap must be released (in DeregisterServices) // with the solar mutex unlocked, to avoid deadlock: nAcquireCount = Application::ReleaseSolarMutex(); @@ -2025,6 +2017,22 @@ sal_Bool Desktop::InitializeConfiguration() return bOk; } +void Desktop::FlushConfiguration() +{ + Reference < XFlushable > xCFGFlush( ::utl::ConfigManager::GetConfigManager()->GetConfigurationProvider(), UNO_QUERY ); + if (xCFGFlush.is()) + { + xCFGFlush->flush(); + } + else + { + // because there is no method to flush the condiguration data, we must dispose the ConfigManager + Reference < XComponent > xCFGDispose( ::utl::ConfigManager::GetConfigManager()->GetConfigurationProvider(), UNO_QUERY ); + if (xCFGDispose.is()) + xCFGDispose->dispose(); + } +} + sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& rSMgr ) { try diff --git a/desktop/source/app/exports.dxp b/desktop/source/app/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/desktop/source/app/exports.dxp +++ b/desktop/source/app/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component new file mode 100644 index 000000000000..11385c7aa8d9 --- /dev/null +++ b/desktop/source/deployment/deployment.component @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.deployment.ExtensionManager"> + <service name="com.sun.star.comp.deployment.ExtensionManager"/> + <singleton name="com.sun.star.deployment.ExtensionManager"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.PackageInformationProvider"> + <service name="com.sun.star.comp.deployment.PackageInformationProvider"/> + <singleton name="com.sun.star.deployment.PackageInformationProvider"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.PackageManagerFactory"> + <service name="com.sun.star.comp.deployment.PackageManagerFactory"/> + <singleton name="com.sun.star.deployment.thePackageManagerFactory"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.ProgressLog"> + <service name="com.sun.star.comp.deployment.ProgressLog"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.component.PackageRegistryBackend"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.configuration.PackageRegistryBackend"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.executable.PackageRegistryBackend"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.help.PackageRegistryBackend"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.script.PackageRegistryBackend"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.sfwk.PackageRegistryBackend"> + <service name="com.sun.star.deployment.PackageRegistryBackend"/> + </implementation> +</component> diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index f7ebf66355ba..f3dc75ae39c5 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -92,27 +92,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) -{ - return component_writeInfoHelper( - pServiceManager, pRegistryKey, - dp_registry::backend::configuration::serviceDecl, - dp_registry::backend::component::serviceDecl, - dp_registry::backend::help::serviceDecl, - dp_registry::backend::script::serviceDecl, - dp_registry::backend::sfwk::serviceDecl, - dp_registry::backend::executable::serviceDecl, - dp_manager::factory::serviceDecl, - dp_log::serviceDecl, - dp_info::serviceDecl, - dp_manager::serviceDecl) && - dp_manager::factory::singleton_entries( pRegistryKey ) && - dp_info::singleton_entries( pRegistryKey ) && - dp_manager::singleton_entries( pRegistryKey); -} - void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component new file mode 100644 index 000000000000..d613f482e791 --- /dev/null +++ b/desktop/source/deployment/gui/deploymentgui.component @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.deployment.ui.LicenseDialog"> + <service name="com.sun.star.deployment.ui.LicenseDialog"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.ui.PackageManagerDialog"> + <service name="com.sun.star.deployment.ui.PackageManagerDialog"/> + </implementation> + <implementation name="com.sun.star.comp.deployment.ui.UpdateRequiredDialog"> + <service name="com.sun.star.deployment.ui.UpdateRequiredDialog"/> + </implementation> +</component> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 78b29624b16e..44d1e30f74b6 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -363,26 +363,28 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse ) // ----------------------------------------------------------------------- MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos ) { - if ( nPos >= (long) getItemCount() ) - return CMD_NONE; + if ( ( nPos >= 0 ) && ( nPos < (long) getItemCount() ) ) + { + if ( ! GetEntryData( nPos )->m_bLocked ) + { + PopupMenu aPopup; - PopupMenu aPopup; + aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) ); - aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) ); + if ( GetEntryData( nPos )->m_bUser ) + { + if ( GetEntryData( nPos )->m_eState == REGISTERED ) + aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); + else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE ) + aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + } - if ( ! GetEntryData( nPos )->m_bLocked ) - { - if ( GetEntryData( nPos )->m_bUser ) - { - if ( GetEntryData( nPos )->m_eState == REGISTERED ) - aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); - else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE ) - aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) ); + + return (MENU_COMMAND) aPopup.Execute( this, rPos ); } - aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) ); } - - return (MENU_COMMAND) aPopup.Execute( this, rPos ); + return CMD_NONE; } //------------------------------------------------------------------------------ diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 29bedf1b229f..567eb9756386 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -356,14 +356,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) -{ - return component_writeInfoHelper( - pServiceManager, pRegistryKey, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl ); -} - void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index 52092a077a4b..fe3921bf506b 100644 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -107,3 +107,11 @@ RESLIB1IMAGES= $(PRJ)$/res .INCLUDE : target.mk + +ALLTAR : $(MISC)/deploymentgui.component + +$(MISC)/deploymentgui.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk index 6d83a5c1004b..991ba7026d72 100644 --- a/desktop/source/deployment/makefile.mk +++ b/desktop/source/deployment/makefile.mk @@ -110,3 +110,11 @@ RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs .INCLUDE : target.mk + +ALLTAR : $(MISC)/deployment.component + +$(MISC)/deployment.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + deployment.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt deployment.component diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index c2801ba1d965..0de1f9e96e91 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -31,6 +31,8 @@ #include "com/sun/star/deployment/VersionException.hpp" #include "com/sun/star/deployment/LicenseException.hpp" #include "com/sun/star/deployment/InstallException.hpp" +#include "com/sun/star/deployment/DependencyException.hpp" +#include "com/sun/star/deployment/PlatformException.hpp" #include "com/sun/star/task/XInteractionApprove.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionHandler.hpp" @@ -250,7 +252,43 @@ void NoLicenseCommandEnv::handle( handle_(approve, abort, xRequest); } +// SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv( +// css::uno::Reference< css::task::XInteractionHandler> const & handler): +// BaseCommandEnv(handler) +// { +// } +SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv() +{ +} + +void SilentCheckPrerequisitesCommandEnv::handle( + Reference< task::XInteractionRequest> const & xRequest ) + throw (uno::RuntimeException) +{ + uno::Any request( xRequest->getRequest() ); + OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); + deployment::LicenseException licExc; + deployment::PlatformException platformExc; + deployment::DependencyException depExc; + bool approve = false; + bool abort = false; + + if (request >>= licExc) + { + approve = true; + handle_(approve, abort, xRequest); + } + else if ((request >>= platformExc) + || (request >>= depExc)) + { + m_Exception = request; + } + else + { + m_UnknownException = request; + } +} // NoExceptionCommandEnv::NoExceptionCommandEnv( // css::uno::Reference< css::task::XInteractionHandler> const & handler, // css::uno::Type const & type): diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index aa21f8281c72..bea11586d462 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -135,6 +135,29 @@ public: }; +/* For use in XExtensionManager::addExtension in the call to + XPackage::checkPrerequisites + It prevents all user interactions. The license is always accepted. + It remembers if there was a platform or a dependency exception in + the member m_bException. if there was any other exception then m_bUnknownException + is set. + + */ +class SilentCheckPrerequisitesCommandEnv : public BaseCommandEnv +{ +public: + SilentCheckPrerequisitesCommandEnv(); + // XInteractionHandler + virtual void SAL_CALL handle( + css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) + throw (css::uno::RuntimeException); + + // Set to true if a PlatformException or a DependencyException were handled. + css::uno::Any m_Exception; + // Set to true if an unknown exception was handled. + css::uno::Any m_UnknownException; +}; + // class NoExceptionCommandEnv : public BaseCommandEnv // { // css::uno::Type m_type; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index c82973f1b680..709cca86c631 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -139,6 +139,37 @@ void writeLastModified(OUString & url, Reference<ucb::XCommandEnvironment> const OUSTR("Failed to update") + url, 0, exc); } } + +class ExtensionRemoveGuard +{ + css::uno::Reference<css::deployment::XPackage> m_extension; + css::uno::Reference<css::deployment::XPackageManager> m_xPackageManager; + +public: + ExtensionRemoveGuard( + css::uno::Reference<css::deployment::XPackage> const & extension, + css::uno::Reference<css::deployment::XPackageManager> const & xPackageManager): + m_extension(extension), m_xPackageManager(xPackageManager) {} + ~ExtensionRemoveGuard(); + + void reset(css::uno::Reference<css::deployment::XPackage> const & extension) { + m_extension = extension; + } +}; + +ExtensionRemoveGuard::~ExtensionRemoveGuard() +{ + try { + if (m_xPackageManager.is() && m_extension.is()) + m_xPackageManager->removePackage( + dp_misc::getIdentifier(m_extension), ::rtl::OUString(), + css::uno::Reference<css::task::XAbortChannel>(), + css::uno::Reference<css::ucb::XCommandEnvironment>()); + } catch (...) { + OSL_ASSERT(0); + } +} + } //end namespace namespace dp_manager { @@ -500,6 +531,107 @@ ExtensionManager::getSupportedPackageTypes() { return m_userRepository->getSupportedPackageTypes(); } +//Do some necessary checks and user interaction. This function does not +//aquire the extension manager mutex and that mutex must not be aquired +//when this function is called. doChecksForAddExtension does synchronous +//user interactions which may require aquiring the solar mutex. +//Returns true if the extension can be installed. +bool ExtensionManager::doChecksForAddExtension( + Reference<deploy::XPackageManager> const & xPackageMgr, + uno::Sequence<beans::NamedValue> const & properties, + css::uno::Reference<css::deployment::XPackage> const & xTmpExtension, + Reference<task::XAbortChannel> const & xAbortChannel, + Reference<ucb::XCommandEnvironment> const & xCmdEnv, + Reference<deploy::XPackage> & out_existingExtension ) + throw (deploy::DeploymentException, + ucb::CommandFailedException, + ucb::CommandAbortedException, + lang::IllegalArgumentException, + uno::RuntimeException) +{ + try + { + Reference<deploy::XPackage> xOldExtension; + const OUString sIdentifier = dp_misc::getIdentifier(xTmpExtension); + const OUString sFileName = xTmpExtension->getName(); + const OUString sDisplayName = xTmpExtension->getDisplayName(); + const OUString sVersion = xTmpExtension->getVersion(); + + try + { + xOldExtension = xPackageMgr->getDeployedPackage( + sIdentifier, sFileName, xCmdEnv); + out_existingExtension = xOldExtension; + } + catch (lang::IllegalArgumentException &) + { + } + bool bCanInstall = false; + + //This part is not guarded against other threads removing, adding, disabling ... + //etc. the same extension. + //checkInstall is safe because it notifies the user if the extension is not yet + //installed in the same repository. Because addExtension has its own guard + //(m_addMutex), another thread cannot add the extension in the meantime. + //checkUpdate is called if the same extension exists in the same + //repository. The user is asked if they want to replace it. Another + //thread + //could already remove the extension. So asking the user was not + //necessary. No harm is done. The other thread may also ask the user + //if he wants to remove the extension. This depends on the + //XCommandEnvironment which it passes to removeExtension. + if (xOldExtension.is()) + { + //throws a CommandFailedException if the user cancels + //the action. + checkUpdate(sVersion, sDisplayName,xOldExtension, xCmdEnv); + } + else + { + //throws a CommandFailedException if the user cancels + //the action. + checkInstall(sDisplayName, xCmdEnv); + } + //Prevent showing the license if requested. + Reference<ucb::XCommandEnvironment> _xCmdEnv(xCmdEnv); + ExtensionProperties props(OUString(), properties, Reference<ucb::XCommandEnvironment>()); + + dp_misc::DescriptionInfoset info(dp_misc::getDescriptionInfoset(xTmpExtension->getURL())); + const ::boost::optional<dp_misc::SimpleLicenseAttributes> licenseAttributes = + info.getSimpleLicenseAttributes(); + + if (licenseAttributes && licenseAttributes->suppressIfRequired + && props.isSuppressedLicense()) + _xCmdEnv = Reference<ucb::XCommandEnvironment>( + new NoLicenseCommandEnv(xCmdEnv->getInteractionHandler())); + + bCanInstall = xTmpExtension->checkPrerequisites( + xAbortChannel, _xCmdEnv, xOldExtension.is() || props.isExtensionUpdate()) == 0 ? true : false; + + return bCanInstall; + } + catch (deploy::DeploymentException& ) { + throw; + } catch (ucb::CommandFailedException & ) { + throw; + } catch (ucb::CommandAbortedException & ) { + throw; + } catch (lang::IllegalArgumentException &) { + throw; + } catch (uno::RuntimeException &) { + throw; + } catch (uno::Exception &) { + uno::Any excOccurred = ::cppu::getCaughtException(); + deploy::DeploymentException exc( + OUSTR("Extension Manager: exception in doChecksForAddExtension"), + static_cast<OWeakObject*>(this), excOccurred); + throw exc; + } catch (...) { + throw uno::RuntimeException( + OUSTR("Extension Manager: unexpected exception in doChecksForAddExtension"), + static_cast<OWeakObject*>(this)); + } +} // Only add to shared and user repository Reference<deploy::XPackage> ExtensionManager::addExtension( @@ -524,165 +656,183 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( throw lang::IllegalArgumentException( OUSTR("No valid repository name provided."), static_cast<cppu::OWeakObject*>(this), 0); - ::osl::MutexGuard guard(getMutex()); + //We must make sure that the xTmpExtension is not create twice, because this + //would remove the first one. + ::osl::MutexGuard addGuard(m_addMutex); + Reference<deploy::XPackage> xTmpExtension = getTempExtension(url, xAbortChannel, xCmdEnv); + //Make sure the extension is removed from the tmp repository in case + //of an exception + ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, m_tmpRepository); const OUString sIdentifier = dp_misc::getIdentifier(xTmpExtension); const OUString sFileName = xTmpExtension->getName(); - const OUString sDisplayName = xTmpExtension->getDisplayName(); - const OUString sVersion = xTmpExtension->getVersion(); - dp_misc::DescriptionInfoset info(dp_misc::getDescriptionInfoset(xTmpExtension->getURL())); - const ::boost::optional<dp_misc::SimpleLicenseAttributes> licenseAttributes = - info.getSimpleLicenseAttributes(); Reference<deploy::XPackage> xOldExtension; Reference<deploy::XPackage> xExtensionBackup; - uno::Any excOccurred1; uno::Any excOccurred2; bool bUserDisabled = false; - try + bool bCanInstall = doChecksForAddExtension( + xPackageManager, + properties, + xTmpExtension, + xAbortChannel, + xCmdEnv, + xOldExtension ); + { - bUserDisabled = isUserDisabled(sIdentifier, sFileName); - try - { - xOldExtension = xPackageManager->getDeployedPackage( - sIdentifier, sFileName, xCmdEnv); - } - catch (lang::IllegalArgumentException &) - { - } - bool bCanInstall = false; - try + // In this garded section (getMutex) we must not use the argument xCmdEnv + // because it may bring up dialogs (XInteractionHandler::handle) this + //may potententially deadlock. See issue + //http://qa.openoffice.org/issues/show_bug.cgi?id=114933 + //By not providing xCmdEnv the underlying APIs will throw an exception if + //the XInteractionRequest cannot be handled + ::osl::MutexGuard guard(getMutex()); + + if (bCanInstall) { - if (xOldExtension.is()) + try { - //throws a CommandFailedException if the user cancels - //the action. - checkUpdate(sVersion, sDisplayName,xOldExtension, xCmdEnv); + bUserDisabled = isUserDisabled(sIdentifier, sFileName); + if (xOldExtension.is()) + { + try + { + xOldExtension->revokePackage( + xAbortChannel, Reference<ucb::XCommandEnvironment>()); + //save the old user extension in case the user aborts + //store the extension in the tmp repository, this will overwrite + //xTmpPackage (same identifier). Do not let the user abort or + //interact + //importing the old extension in the tmp repository will remove + //the xTmpExtension + //no command environment supplied, only this class shall interact + //with the user! + xExtensionBackup = m_tmpRepository->importExtension( + xOldExtension, Reference<task::XAbortChannel>(), + Reference<ucb::XCommandEnvironment>()); + tmpExtensionRemoveGuard.reset(xExtensionBackup); + //xTmpExtension will later be used to check the dependencies + //again. However, only xExtensionBackup will be later removed + //from the tmp repository + xTmpExtension = xExtensionBackup; + OSL_ASSERT(xTmpExtension.is()); + } + catch (lang::DisposedException &) + { + //Another thread might have removed the extension meanwhile + } + } + //check again dependencies but prevent user interaction, + //We can disregard the license, because the user must have already + //accepted it, whe we called checkPrerequisites the first time + SilentCheckPrerequisitesCommandEnv * pSilentCommandEnv = + new SilentCheckPrerequisitesCommandEnv(); + Reference<ucb::XCommandEnvironment> silentCommandEnv(pSilentCommandEnv); + + sal_Int32 failedPrereq = xTmpExtension->checkPrerequisites( + xAbortChannel, silentCommandEnv, true); + if (failedPrereq == 0) + { + xNewExtension = xPackageManager->addPackage( + url, properties, OUString(), xAbortChannel, + Reference<ucb::XCommandEnvironment>()); + //If we add a user extension and there is already one which was + //disabled by a user, then the newly installed one is enabled. If we + //add to another repository then the user extension remains + //disabled. + bool bUserDisabled2 = bUserDisabled; + if (repository.equals(OUSTR("user"))) + bUserDisabled2 = false; + + activateExtension( + dp_misc::getIdentifier(xNewExtension), + xNewExtension->getName(), bUserDisabled2, false, xAbortChannel, + Reference<ucb::XCommandEnvironment>()); + } + else + { + if (pSilentCommandEnv->m_Exception.hasValue()) + ::cppu::throwException(pSilentCommandEnv->m_Exception); + else if ( pSilentCommandEnv->m_UnknownException.hasValue()) + ::cppu::throwException(pSilentCommandEnv->m_UnknownException); + else + throw deploy::DeploymentException ( + OUSTR("Extension Manager: exception during addExtension, ckeckPrerequisites failed"), + static_cast<OWeakObject*>(this), uno::Any()); + } } - else - { - //throws a CommandFailedException if the user cancels - //the action. - checkInstall(sDisplayName, xCmdEnv); + catch (deploy::DeploymentException& ) { + excOccurred2 = ::cppu::getCaughtException(); + } catch (ucb::CommandFailedException & ) { + excOccurred2 = ::cppu::getCaughtException(); + } catch (ucb::CommandAbortedException & ) { + excOccurred2 = ::cppu::getCaughtException(); + } catch (lang::IllegalArgumentException &) { + excOccurred2 = ::cppu::getCaughtException(); + } catch (uno::RuntimeException &) { + excOccurred2 = ::cppu::getCaughtException(); + } catch (...) { + excOccurred2 = ::cppu::getCaughtException(); + deploy::DeploymentException exc( + OUSTR("Extension Manager: exception during addExtension, url: ") + + url, static_cast<OWeakObject*>(this), excOccurred2); + excOccurred2 <<= exc; } - //Prevent showing the license if requested. - Reference<ucb::XCommandEnvironment> _xCmdEnv(xCmdEnv); - ExtensionProperties props(OUString(), properties, Reference<ucb::XCommandEnvironment>()); - if (licenseAttributes && licenseAttributes->suppressIfRequired - && props.isSuppressedLicense()) - _xCmdEnv = Reference<ucb::XCommandEnvironment>( - new NoLicenseCommandEnv(xCmdEnv->getInteractionHandler())); - - bCanInstall = xTmpExtension->checkPrerequisites( - xAbortChannel, _xCmdEnv, xOldExtension.is() || props.isExtensionUpdate()) == 0 ? true : false; - } - catch (deploy::DeploymentException& ) { - excOccurred1 = ::cppu::getCaughtException(); - } catch (ucb::CommandFailedException & ) { - excOccurred1 = ::cppu::getCaughtException(); - } catch (ucb::CommandAbortedException & ) { - excOccurred1 = ::cppu::getCaughtException(); - } catch (lang::IllegalArgumentException &) { - excOccurred1 = ::cppu::getCaughtException(); - } catch (uno::RuntimeException &) { - excOccurred1 = ::cppu::getCaughtException(); - } catch (...) { - excOccurred1 = ::cppu::getCaughtException(); - deploy::DeploymentException exc( - OUSTR("Extension Manager: exception during addExtension, url: ") - + url, static_cast<OWeakObject*>(this), excOccurred1); - excOccurred1 <<= exc; } - if (bCanInstall) + if (excOccurred2.hasValue()) { - if (xOldExtension.is()) + //It does not matter what exception is thrown. We try to + //recover the original status. + //If the user aborted installation then a ucb::CommandAbortedException + //is thrown. + //Use a private AbortChannel so the user cannot interrupt. + try + { + if (xExtensionBackup.is()) + { + Reference<deploy::XPackage> xRestored = + xPackageManager->importExtension( + xExtensionBackup, Reference<task::XAbortChannel>(), + Reference<ucb::XCommandEnvironment>()); + } + activateExtension( + sIdentifier, sFileName, bUserDisabled, false, + Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>()); + } + catch (...) { - xOldExtension->revokePackage(xAbortChannel, xCmdEnv); - //save the old user extension in case the user aborts - //store the extension in the tmp repository, this will overwrite - //xTmpPackage (same identifier). Do not let the user abort or - //interact - Reference<ucb::XCommandEnvironment> tmpCmdEnv( - new TmpRepositoryCommandEnv(xCmdEnv->getInteractionHandler())); - //importing the old extension in the tmp repository will remove - //the xTmpExtension - xTmpExtension = 0; - xExtensionBackup = m_tmpRepository->importExtension( - xOldExtension, Reference<task::XAbortChannel>(), - tmpCmdEnv); } - xNewExtension = xPackageManager->addPackage( - url, properties, OUString(), xAbortChannel, xCmdEnv); - //If we add a user extension and there is already one which was - //disabled by a user, then the newly installed one is enabled. If we - //add to another repository then the user extension remains - //disabled. - bool bUserDisabled2 = bUserDisabled; - if (repository.equals(OUSTR("user"))) - bUserDisabled2 = false; - activateExtension( - dp_misc::getIdentifier(xNewExtension), - xNewExtension->getName(), bUserDisabled2, false, xAbortChannel, xCmdEnv); - fireModified(); + ::cppu::throwException(excOccurred2); } - } - catch (deploy::DeploymentException& ) { - excOccurred2 = ::cppu::getCaughtException(); + } // leaving the garded section (getMutex()) + + try + { + fireModified(); + + }catch (deploy::DeploymentException& ) { + throw; } catch (ucb::CommandFailedException & ) { - excOccurred2 = ::cppu::getCaughtException(); + throw; } catch (ucb::CommandAbortedException & ) { - excOccurred2 = ::cppu::getCaughtException(); + throw; } catch (lang::IllegalArgumentException &) { - excOccurred2 = ::cppu::getCaughtException(); + throw; } catch (uno::RuntimeException &) { - excOccurred2 = ::cppu::getCaughtException(); - } catch (...) { - excOccurred2 = ::cppu::getCaughtException(); + throw; + } catch (uno::Exception &) { + uno::Any excOccurred = ::cppu::getCaughtException(); deploy::DeploymentException exc( - OUSTR("Extension Manager: exception during addExtension, url: ") - + url, static_cast<OWeakObject*>(this), excOccurred2); - excOccurred2 <<= exc; - } - - if (excOccurred2.hasValue()) - { - //It does not matter what exception is thrown. We try to - //recover the original status. - //If the user aborted installation then a ucb::CommandAbortedException - //is thrown. - //Use a private AbortChannel so the user cannot interrupt. - try - { - Reference<ucb::XCommandEnvironment> tmpCmdEnv( - new TmpRepositoryCommandEnv(xCmdEnv->getInteractionHandler())); - if (xExtensionBackup.is()) - { - Reference<deploy::XPackage> xRestored = - xPackageManager->importExtension( - xExtensionBackup, Reference<task::XAbortChannel>(), - tmpCmdEnv); - } - activateExtension( - sIdentifier, sFileName, bUserDisabled, false, - Reference<task::XAbortChannel>(), tmpCmdEnv); - if (xTmpExtension.is() || xExtensionBackup.is()) - m_tmpRepository->removePackage( - sIdentifier, OUString(), xAbortChannel, xCmdEnv); - fireModified(); - } - catch (...) - { - } - ::cppu::throwException(excOccurred2); + OUSTR("Extension Manager: exception in doChecksForAddExtension"), + static_cast<OWeakObject*>(this), excOccurred); + throw exc; + } catch (...) { + throw uno::RuntimeException( + OUSTR("Extension Manager: unexpected exception in doChecksForAddExtension"), + static_cast<OWeakObject*>(this)); } - if (xTmpExtension.is() || xExtensionBackup.is()) - m_tmpRepository->removePackage( - sIdentifier,OUString(), xAbortChannel, xCmdEnv); - - if (excOccurred1.hasValue()) - ::cppu::throwException(excOccurred1); return xNewExtension; } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 64cada7da3ac..683f45a1bd6e 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -235,6 +235,8 @@ private: css::uno::Reference<css::deployment::XPackageManager> m_bundledRepository; css::uno::Reference<css::deployment::XPackageManager> m_tmpRepository; + //only to be used within addExtension + ::osl::Mutex m_addMutex; /* contains the names of all repositories (except tmp) in order of there priority. That is, the first element is "user" follod by "shared" and then "bundled" @@ -296,6 +298,21 @@ private: css::uno::Reference<css::deployment::XPackageManager> getPackageManager(::rtl::OUString const & repository) throw (css::lang::IllegalArgumentException); + + bool doChecksForAddExtension( + css::uno::Reference<css::deployment::XPackageManager> const & xPackageMgr, + css::uno::Sequence<css::beans::NamedValue> const & properties, + css::uno::Reference<css::deployment::XPackage> const & xTmpExtension, + css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, + css::uno::Reference<css::deployment::XPackage> & out_existingExtension ) + throw (css::deployment::DeploymentException, + css::ucb::CommandFailedException, + css::ucb::CommandAbortedException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException); + + }; } diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 52011f1f0ca0..fb6efe0b79aa 100755..100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -90,8 +90,6 @@ getUpdateInformation( Reference<deployment::XUpdateInformationProvider > const & Sequence<Reference< xml::dom::XElement > >(); } -//Put in anonymous namespace - void getOwnUpdateInfos( Reference<uno::XComponentContext> const & xContext, Reference<deployment::XUpdateInformationProvider > const & updateInformation, @@ -185,6 +183,56 @@ void getDefaultUpdateInfos( } } +bool containsBundledOnly(Sequence<Reference<deployment::XPackage> > const & sameIdExtensions) +{ + OSL_ASSERT(sameIdExtensions.getLength() == 3); + if (!sameIdExtensions[0].is() && !sameIdExtensions[1].is() && sameIdExtensions[2].is()) + return true; + else + return false; +} +/** Returns true if the list of extensions are bundled extensions and there are no + other extensions with the same identifier in the shared or user repository. + If extensionList is NULL, then it is checked if there are only bundled extensions. +*/ +bool onlyBundledExtensions( + Reference<deployment::XExtensionManager> const & xExtMgr, + std::vector< Reference<deployment::XPackage > > const * extensionList) +{ + OSL_ASSERT(xExtMgr.is()); + bool onlyBundled = true; + if (extensionList) + { + typedef std::vector<Reference<deployment::XPackage > >::const_iterator CIT; + for (CIT i = extensionList->begin(); i != extensionList->end(); i++) + { + Sequence<Reference<deployment::XPackage> > seqExt = xExtMgr->getExtensionsWithSameIdentifier( + dp_misc::getIdentifier(*i), (*i)->getName(), Reference<ucb::XCommandEnvironment>()); + + if (!containsBundledOnly(seqExt)) + { + onlyBundled = false; + break; + } + + } + } + else + { + const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > > > seqAllExt = + xExtMgr->getAllExtensions(Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>()); + + for (int pos = seqAllExt.getLength(); pos --; ) + { + if (!containsBundledOnly(seqAllExt[pos])) + { + onlyBundled = false; + break; + } + } + } + return onlyBundled; +} } // anon namespace @@ -233,13 +281,14 @@ UPDATE_SOURCE isUpdateUserExtension( retVal = UPDATE_SOURCE_ONLINE; } - else if (bundledVersion.getLength()) - { - int index = determineHighestVersion( - OUString(), OUString(), bundledVersion, onlineVersion); - if (index == 3) - retVal = UPDATE_SOURCE_ONLINE; - } + //No update for bundled extensions, they are updated only by the setup + //else if (bundledVersion.getLength()) + //{ + // int index = determineHighestVersion( + // OUString(), OUString(), bundledVersion, onlineVersion); + // if (index == 3) + // retVal = UPDATE_SOURCE_ONLINE; + //} } else { @@ -278,13 +327,14 @@ UPDATE_SOURCE isUpdateSharedExtension( else if (index == 3) retVal = UPDATE_SOURCE_ONLINE; } - else if (bundledVersion.getLength()) - { - int index = determineHighestVersion( - OUString(), OUString(), bundledVersion, onlineVersion); - if (index == 3) - retVal = UPDATE_SOURCE_ONLINE; - } + //No update for bundled extensions, they are updated only by the setup + //else if (bundledVersion.getLength()) + //{ + // int index = determineHighestVersion( + // OUString(), OUString(), bundledVersion, onlineVersion); + // if (index == 3) + // retVal = UPDATE_SOURCE_ONLINE; + //} return retVal; } @@ -332,7 +382,7 @@ UpdateInfoMap getOnlineUpdateInfos( { OSL_ASSERT(xExtMgr.is()); UpdateInfoMap infoMap; - if (!xExtMgr.is()) + if (!xExtMgr.is() || onlyBundledExtensions(xExtMgr, extensionList)) return infoMap; if (!extensionList) diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index cf9a9ab30b0c..d869993f39c3 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -63,13 +63,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, entries ); -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index 695b6b810808..589701d534d5 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -51,13 +51,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, entries ); -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk index 2f3eb9308ebd..38f97084b36e 100644 --- a/desktop/source/migration/services/makefile.mk +++ b/desktop/source/migration/services/makefile.mk @@ -87,7 +87,7 @@ DEF1NAME=$(SHL1TARGET) COMP2TYPELIST = migrationoo3 SHL2TARGET=migrationoo3.uno -SHL2VERSIONMAP = migrationoo3.map +SHL2VERSIONMAP = $(SOLARENV)/src/component.map SHL2OBJS= \ $(SLO)$/cexportsoo3.obj \ @@ -117,3 +117,18 @@ DEF2NAME=$(SHL2TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/migrationoo3.component + +$(MISC)/migrationoo3.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component + +ALLTAR : $(MISC)/migrationoo2.component + +$(MISC)/migrationoo2.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component new file mode 100644 index 000000000000..2b21ab123b9e --- /dev/null +++ b/desktop/source/migration/services/migrationoo2.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.desktop.migration.Basic"> + <service name="com.sun.star.migration.Basic"/> + </implementation> + <implementation name="com.sun.star.comp.desktop.migration.Wordbooks"> + <service name="com.sun.star.migration.Wordbooks"/> + </implementation> +</component> diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component new file mode 100644 index 000000000000..380c389ab7b9 --- /dev/null +++ b/desktop/source/migration/services/migrationoo3.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.desktop.migration.OOo3Extensions"> + <service name="com.sun.star.migration.Extensions"/> + </implementation> +</component> diff --git a/desktop/source/migration/services/migrationoo3.map b/desktop/source/migration/services/migrationoo3.map deleted file mode 100755 index ac2c3750bfe0..000000000000 --- a/desktop/source/migration/services/migrationoo3.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 4e100fd99665..430737106a59 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -317,23 +317,6 @@ component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, u *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo(void *pServiceManager, void *pRegistryKey) -{ - Reference< XMultiServiceFactory > xMan(reinterpret_cast< XMultiServiceFactory* >(pServiceManager)); - Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey* >(pRegistryKey)); - - // register service - ::rtl::OUString aTempStr; - ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += Acceptor::impl_getImplementationName(); - aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - Reference< XRegistryKey > xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(Acceptor::impl_getSupportedServiceNames()[0]); - - return sal_True; -} - void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *) { diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk index c2d53930b580..809c28414bef 100644 --- a/desktop/source/offacc/makefile.mk +++ b/desktop/source/offacc/makefile.mk @@ -60,3 +60,11 @@ SHL1STDLIBS= \ .INCLUDE : target.mk + +ALLTAR : $(MISC)/offacc.component + +$(MISC)/offacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + offacc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt offacc.component diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component new file mode 100644 index 000000000000..6f0d4a97a2d2 --- /dev/null +++ b/desktop/source/offacc/offacc.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.office.comp.Acceptor"> + <service name="com.sun.star.office.Acceptor"/> + </implementation> +</component> diff --git a/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java index 7fc24b80398f..e5c98dd51ab8 100644 --- a/desktop/source/registration/com/sun/star/registration/Registration.java +++ b/desktop/source/registration/com/sun/star/registration/Registration.java @@ -63,10 +63,6 @@ public class Registration { return xSingleServiceFactory; } - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - return FactoryHelper.writeRegistryServiceInfo(Registration.class.getName(), _serviceName, regKey); - } - static final String _serviceName = "com.sun.star.comp.framework.DoRegistrationJob"; static public class _Registration implements XJob { diff --git a/desktop/source/registration/com/sun/star/registration/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk index 9784166eb91b..859802256256 100644 --- a/desktop/source/registration/com/sun/star/registration/makefile.mk +++ b/desktop/source/registration/com/sun/star/registration/makefile.mk @@ -53,3 +53,10 @@ CUSTOMMANIFESTFILE = manifest .INCLUDE : target.mk +ALLTAR : $(MISC)/productregistration.jar.component + +$(MISC)/productregistration.jar.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)productregistration.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component diff --git a/desktop/source/registration/com/sun/star/registration/productregistration.jar.component b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component new file mode 100644 index 000000000000..c022a98ae010 --- /dev/null +++ b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.registration.Registration"> + <service name="com.sun.star.comp.framework.DoRegistrationJob"/> + </implementation> +</component> diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk index 590f99518c68..7f9ceb4b646a 100644 --- a/desktop/source/so_comp/makefile.mk +++ b/desktop/source/so_comp/makefile.mk @@ -75,3 +75,10 @@ SHL1STDLIBS= \ .INCLUDE : target.mk +ALLTAR : $(MISC)/socomp.component + +$(MISC)/socomp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + socomp.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt socomp.component diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx index d1a2b3139e91..e28d762fc69b 100644 --- a/desktop/source/so_comp/services.cxx +++ b/desktop/source/so_comp/services.cxx @@ -100,32 +100,6 @@ component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo( - void* pServiceManager, - void* pRegistryKey) -{ - Reference<XMultiServiceFactory> xMan( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference<XRegistryKey> xKey( - reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - - // iterate over service names and register them... - OUString aImpl; - const char* pServiceName = NULL; - const char* pImplName = NULL; - for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { - pServiceName= pServices[i]; - pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") - + OUString::createFromAscii(pImplName) - + OUString::createFromAscii("/UNO/SERVICES"); - Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(OUString::createFromAscii(pServiceName)); - } - return sal_True; -} - void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/desktop/source/so_comp/socomp.component b/desktop/source/so_comp/socomp.component new file mode 100644 index 000000000000..a53035223c39 --- /dev/null +++ b/desktop/source/so_comp/socomp.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.desktop.Evaluation"> + <service name="com.sun.star.office.Evaluation"/> + </implementation> + <implementation name="com.sun.star.comp.desktop.OEMPreloadJob"> + <service name="com.sun.star.office.OEMPreloadJob"/> + </implementation> +</component> diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 89609687438c..02483aae83dd 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -87,3 +87,11 @@ DO_PHONY=.PHONY $(INCCOM)$/introbmpnames.hxx $(DO_PHONY): echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@ echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk + +ALLTAR : $(MISC)/spl.component + +$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + spl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt spl.component diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index 349ec2ec0a78..4b1130c71cdf 100755 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -97,32 +97,6 @@ component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo( - void* pServiceManager, - void* pRegistryKey) -{ - Reference<XMultiServiceFactory> xMan( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference<XRegistryKey> xKey( - reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - - // iterate over service names and register them... - OUString aImpl; - const char* pServiceName = NULL; - const char* pImplName = NULL; - for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { - pServiceName= pServices[i]; - pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") - + OUString::createFromAscii(pImplName) - + OUString::createFromAscii("/UNO/SERVICES"); - Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(OUString::createFromAscii(pServiceName)); - } - return sal_True; -} - void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component new file mode 100644 index 000000000000..2caecf5c0e4b --- /dev/null +++ b/desktop/source/splash/spl.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.desktop.FirstStart"> + <service name="com.sun.star.task.Job"/> + </implementation> + <implementation name="com.sun.star.office.comp.SplashScreen"> + <service name="com.sun.star.office.SplashScreen"/> + </implementation> +</component> diff --git a/editeng/util/editeng.dxp b/editeng/util/editeng.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/editeng/util/editeng.dxp +++ b/editeng/util/editeng.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embeddedobj/prj/d.lst b/embeddedobj/prj/d.lst index 69721747166a..e85b439a1e34 100644 --- a/embeddedobj/prj/d.lst +++ b/embeddedobj/prj/d.lst @@ -4,3 +4,5 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* +..\%__SRC%\misc\embobj.component %_DEST%\xml%_EXT%\embobj.component +..\%__SRC%\misc\emboleobj.component %_DEST%\xml%_EXT%\emboleobj.component diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index bd2a64b299f1..8dbbd9ee4980 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -87,47 +87,5 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic return pRet; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - sal_Int32 nInd = 0; - uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ); - - uno::Reference< registry::XRegistryKey > xNewKey; - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - OOoEmbeddedObjectFactory::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - uno::Sequence< ::rtl::OUString > rServices = OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames(); - for( nInd = 0; nInd < rServices.getLength(); nInd++ ) - xNewKey->createKey( rServices.getConstArray()[nInd] ); - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - rServices = OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames(); - for( nInd = 0; nInd < rServices.getLength(); nInd++ ) - xNewKey->createKey( rServices.getConstArray()[nInd] ); - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - UNOEmbeddedObjectCreator::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - rServices = UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames(); - for( nInd = 0; nInd < rServices.getLength(); nInd++ ) - xNewKey->createKey( rServices.getConstArray()[nInd] ); - - return sal_True; - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - } // extern "C" diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component new file mode 100644 index 000000000000..96f8ed0d8d57 --- /dev/null +++ b/embeddedobj/source/msole/emboleobj.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"> + <service name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"/> + <service name="com.sun.star.embed.OLEEmbeddedObjectFactory"/> + </implementation> +</component> diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component new file mode 100644 index 000000000000..644a1d4f19a1 --- /dev/null +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.embed.MSOLEObjectSystemCreator"> + <service name="com.sun.star.comp.embed.MSOLEObjectSystemCreator"/> + <service name="com.sun.star.embed.MSOLEObjectSystemCreator"/> + </implementation> + <implementation name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"> + <service name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"/> + <service name="com.sun.star.embed.OLEEmbeddedObjectFactory"/> + </implementation> +</component> diff --git a/embeddedobj/source/msole/exports.dxp b/embeddedobj/source/msole/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/embeddedobj/source/msole/exports.dxp +++ b/embeddedobj/source/msole/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk index 07b08bce6984..f40e231bc2dd 100644 --- a/embeddedobj/source/msole/makefile.mk +++ b/embeddedobj/source/msole/makefile.mk @@ -130,3 +130,14 @@ DEF1NAME= $(SHL1TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/emboleobj.component + +.IF "$(OS)" == "WNT" +my_platform = .windows +.END + +$(MISC)/emboleobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + emboleobj.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt emboleobj$(my_platform).component diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component new file mode 100644 index 000000000000..e46945dcb7e0 --- /dev/null +++ b/embeddedobj/util/embobj.component @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.embed.EmbeddedObjectCreator"> + <service name="com.sun.star.comp.embed.EmbeddedObjectCreator"/> + <service name="com.sun.star.embed.EmbeddedObjectCreator"/> + </implementation> + <implementation name="com.sun.star.comp.embed.OOoEmbeddedObjectFactory"> + <service name="com.sun.star.comp.embed.OOoEmbeddedObjectFactory"/> + <service name="com.sun.star.embed.OOoEmbeddedObjectFactory"/> + </implementation> + <implementation name="com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"> + <service name="com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"/> + <service name="com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"/> + </implementation> +</component> diff --git a/embeddedobj/util/exports.dxp b/embeddedobj/util/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/embeddedobj/util/exports.dxp +++ b/embeddedobj/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk index 763d64c164c4..eb2416bd4dd5 100644 --- a/embeddedobj/util/makefile.mk +++ b/embeddedobj/util/makefile.mk @@ -87,3 +87,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo CLEAR_THE_FILE > $@ @echo __CT >>$@ + +ALLTAR : $(MISC)/embobj.component + +$(MISC)/embobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + embobj.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt embobj.component diff --git a/eventattacher/prj/d.lst b/eventattacher/prj/d.lst index 5f9f228eda10..202a0a06aec8 100644 --- a/eventattacher/prj/d.lst +++ b/eventattacher/prj/d.lst @@ -1,3 +1,4 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT% +..\%__SRC%\misc\evtatt.component %_DEST%\xml%_EXT%\evtatt.component diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 9ff96cbf1087..effa7cb202ae 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -842,34 +842,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * , void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - // DefaultRegistry - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") ))); - - Sequence< OUString > aSNL - ( ::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static() ); - const OUString * pArray = aSNL.getConstArray(); - for ( sal_Int32 nPos = aSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/eventattacher/source/evtatt.component b/eventattacher/source/evtatt.component new file mode 100644 index 000000000000..3e48d58893fb --- /dev/null +++ b/eventattacher/source/evtatt.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.EventAttacher"> + <service name="com.sun.star.script.EventAttacher"/> + </implementation> +</component> diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk index 632a1fa41ad5..360dcdabd7d7 100644 --- a/eventattacher/source/makefile.mk +++ b/eventattacher/source/makefile.mk @@ -61,3 +61,11 @@ SHL1LIBS= $(SLB)$/$(TARGET).lib # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/evtatt.component + +$(MISC)/evtatt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + evtatt.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt evtatt.component diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst index 695487c56035..c9b2bdd18f06 100644 --- a/fileaccess/prj/d.lst +++ b/fileaccess/prj/d.lst @@ -3,3 +3,4 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml +..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index a7b08778dbdd..ca11639fef33 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -914,32 +914,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - rtl::OUString::createFromAscii("/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); - - const Sequence< rtl::OUString > & rSNL = io_FileAccess::FileAccess_getSupportedServiceNames(); - const rtl::OUString * pArray = rSNL.getConstArray(); - for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component new file mode 100644 index 000000000000..3f14d4053216 --- /dev/null +++ b/fileaccess/source/fileacc.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.SimpleFileAccess"> + <service name="com.sun.star.ucb.SimpleFileAccess"/> + </implementation> +</component> diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk index 2b7826534618..8c8a91b0f675 100644 --- a/fileaccess/source/makefile.mk +++ b/fileaccess/source/makefile.mk @@ -66,3 +66,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib .INCLUDE : target.mk + +ALLTAR : $(MISC)/fileacc.component + +$(MISC)/fileacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fileacc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fileacc.component diff --git a/formula/prj/d.lst b/formula/prj/d.lst index 3ad1e394844f..d2afebacf4d9 100644 --- a/formula/prj/d.lst +++ b/formula/prj/d.lst @@ -35,3 +35,4 @@ mkdir: %_DEST%\inc%_EXT%\formula +..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index 0b45a0e4d02a..d1811dcfa303 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -66,10 +66,4 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * serviceManager, void * registryKey) -{ - return cppu::component_writeInfoHelper( - serviceManager, registryKey, entries); -} } // extern "C" diff --git a/formula/util/for.component b/formula/util/for.component new file mode 100644 index 000000000000..99a1adfbf978 --- /dev/null +++ b/formula/util/for.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="simple.formula.FormulaOpCodeMapperObj"> + <service name="com.sun.star.sheet.FormulaOpCodeMapper"/> + </implementation> +</component> diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index 7ae30b007d00..3c6f91f6073d 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -136,3 +136,11 @@ RESLIB2SRSFILES=$(RES2FILELIST) .INCLUDE : target.mk + +ALLTAR : $(MISC)/for.component + +$(MISC)/for.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + for.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt for.component diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst index 7c4e0bf6024a..4fff0467fc87 100644 --- a/fpicker/prj/d.lst +++ b/fpicker/prj/d.lst @@ -9,6 +9,10 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml -..\source\unx\gnome\fps-gnome-ucd.txt %_DEST%\bin%_EXT%\fps-gnome-ucd.txt -..\source\unx\kde4\fps-kde4-ucd.txt %_DEST%\bin%_EXT%\fps-kde4-ucd.txt -..\source\aqua\fps-aqua-ucd.txt %_DEST%\bin%_EXT%\fps-aqua-ucd.txt +..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component +..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component +..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component +..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component +..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component +..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component +..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx index 127d1f5d60bb..5d5dc16c5d32 100644 --- a/fpicker/source/aqua/FPentry.cxx +++ b/fpicker/source/aqua/FPentry.cxx @@ -95,32 +95,6 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; -} - -//------------------------------------------------ -// -//------------------------------------------------ - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { diff --git a/fpicker/source/aqua/fps-aqua-ucd.txt b/fpicker/source/aqua/fps-aqua-ucd.txt deleted file mode 100644 index d71e8f4a574f..000000000000 --- a/fpicker/source/aqua/fps-aqua-ucd.txt +++ /dev/null @@ -1,13 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalAquaFilePicker -ComponentName=fps_aqua.uno.dylib -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.AquaFilePicker - -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalAquaFolderPicker -ComponentName=fps_aqua.uno.dylib -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.AquaFolderPicker diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component new file mode 100644 index 000000000000..a04443e37ffd --- /dev/null +++ b/fpicker/source/aqua/fps_aqua.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.ui.dialogs.SalAquaFilePicker"> + <service name="com.sun.star.ui.dialogs.AquaFilePicker"/> + </implementation> + <implementation name="com.sun.star.ui.dialogs.SalAquaFolderPicker"> + <service name="com.sun.star.ui.dialogs.AquaFolderPicker"/> + </implementation> +</component> diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk index 10990e22d5e1..ff0473c8a71e 100644 --- a/fpicker/source/aqua/makefile.mk +++ b/fpicker/source/aqua/makefile.mk @@ -83,3 +83,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fps_aqua.component + +$(MISC)/fps_aqua.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_aqua.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_aqua.component diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component new file mode 100644 index 000000000000..7d44d006d960 --- /dev/null +++ b/fpicker/source/generic/fpicker.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.fpicker.FilePicker"> + <service name="com.sun.star.ui.dialogs.FilePicker"/> + </implementation> + <implementation name="com.sun.star.comp.fpicker.FolderPicker"> + <service name="com.sun.star.ui.dialogs.FolderPicker"/> + </implementation> +</component> diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 4589b3319163..7d6417099ae0 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -216,13 +216,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * pServiceManager, void * pRegistryKey) -{ - return cppu::component_writeInfoHelper ( - pServiceManager, pRegistryKey, g_entries); -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk index bfbfb65f3da6..0b2ad77baac6 100644 --- a/fpicker/source/generic/makefile.mk +++ b/fpicker/source/generic/makefile.mk @@ -60,3 +60,11 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fpicker.component + +$(MISC)/fpicker.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fpicker.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fpicker.component diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component new file mode 100644 index 000000000000..3e49f68a49db --- /dev/null +++ b/fpicker/source/office/fps_office.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.svtools.OfficeFilePicker"> + <service name="com.sun.star.ui.dialogs.OfficeFilePicker"/> + </implementation> + <implementation name="com.sun.star.svtools.OfficeFolderPicker"> + <service name="com.sun.star.ui.dialogs.OfficeFolderPicker"/> + </implementation> +</component> diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index 52659e1f76f5..3d06873338de 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -63,13 +63,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return cppu::component_writeInfoHelper ( - pServiceManager, pRegistryKey, g_entries); -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk index adc3c30f9a3d..7481fd867ca7 100644 --- a/fpicker/source/office/makefile.mk +++ b/fpicker/source/office/makefile.mk @@ -86,3 +86,11 @@ RESLIB1SRSFILES=\ # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fps_office.component + +$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_office.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_office.component diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx index 7561d1f4e95f..ccca3dabf72c 100644 --- a/fpicker/source/unx/gnome/FPentry.cxx +++ b/fpicker/source/unx/gnome/FPentry.cxx @@ -99,32 +99,6 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; -} - -//------------------------------------------------ -// -//------------------------------------------------ - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { diff --git a/fpicker/source/unx/gnome/fps-gnome-ucd.txt b/fpicker/source/unx/gnome/fps-gnome-ucd.txt deleted file mode 100644 index 4a84215dc960..000000000000 --- a/fpicker/source/unx/gnome/fps-gnome-ucd.txt +++ /dev/null @@ -1,13 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalGtkFilePicker -ComponentName=fps_gnome.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.GtkFilePicker - -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalGtkFolderPicker -ComponentName=fps_gnome.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.GtkFolderPicker diff --git a/fpicker/source/unx/gnome/fps_gnome.component b/fpicker/source/unx/gnome/fps_gnome.component new file mode 100644 index 000000000000..72bca42f8acf --- /dev/null +++ b/fpicker/source/unx/gnome/fps_gnome.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.ui.dialogs.SalGtkFilePicker"> + <service name="com.sun.star.ui.dialogs.GtkFilePicker"/> + </implementation> + <implementation name="com.sun.star.ui.dialogs.SalGtkFolderPicker"> + <service name="com.sun.star.ui.dialogs.GtkFolderPicker"/> + </implementation> +</component> diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk index 04c6e650ff6f..82b2413dd4af 100644 --- a/fpicker/source/unx/gnome/makefile.mk +++ b/fpicker/source/unx/gnome/makefile.mk @@ -96,3 +96,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fps_gnome.component + +$(MISC)/fps_gnome.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_gnome.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_gnome.component diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx index 3d74c1a09dca..174b1fc440a6 100644 --- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx +++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx @@ -55,27 +55,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) - { - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; - } - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { void* pRet = 0; diff --git a/fpicker/source/unx/kde4/fps-kde4-ucd.txt b/fpicker/source/unx/kde4/fps-kde4-ucd.txt deleted file mode 100644 index 8ecc4e0a0a52..000000000000 --- a/fpicker/source/unx/kde4/fps-kde4-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.KDE4FilePicker -ComponentName=fps_kde4.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.KDE4FilePicker diff --git a/fpicker/source/unx/kde4/fps_kde4.component b/fpicker/source/unx/kde4/fps_kde4.component new file mode 100644 index 000000000000..d627212b75e8 --- /dev/null +++ b/fpicker/source/unx/kde4/fps_kde4.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.ui.dialogs.KDE4FilePicker"> + <service name="com.sun.star.ui.dialogs.KDE4FilePicker"/> + </implementation> +</component> diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk index e245e6618465..7ccf6df6a0ce 100644 --- a/fpicker/source/unx/kde4/makefile.mk +++ b/fpicker/source/unx/kde4/makefile.mk @@ -80,3 +80,11 @@ DEF1VERSIONMAP=exports.map $(MISC)$/KDE4FilePicker.moc.cxx : KDE4FilePicker.hxx $(MOC4) $< -o $@ + +ALLTAR : $(MISC)/fps_kde4.component + +$(MISC)/fps_kde4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_kde4.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_kde4.component diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index e93c3bec18ba..79a2cf3b2865 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -104,31 +104,6 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; -} - -//------------------------------------------------ -// -//------------------------------------------------ - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx index 717359ba511a..3c861cc67ce3 100644 --- a/fpicker/source/win32/folderpicker/Fopentry.cxx +++ b/fpicker/source/win32/folderpicker/Fopentry.cxx @@ -87,31 +87,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp index 028ac4175990..f0e1c69934bc 100644 --- a/fpicker/util/exports.dxp +++ b/fpicker/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/fpicker/util/fop.component b/fpicker/util/fop.component new file mode 100644 index 000000000000..a31c096dd42a --- /dev/null +++ b/fpicker/util/fop.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.ui.dialogs.Win32FolderPicker"> + <service name="com.sun.star.ui.dialogs.SystemFolderPicker"/> + </implementation> +</component> diff --git a/fpicker/util/fps.component b/fpicker/util/fps.component new file mode 100644 index 000000000000..cc18d211028c --- /dev/null +++ b/fpicker/util/fps.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.ui.dialogs.Win32FilePicker"> + <service name="com.sun.star.ui.dialogs.SystemFilePicker"/> + </implementation> +</component> diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk index c249e4259e91..60bd3333cb71 100644 --- a/fpicker/util/makefile.mk +++ b/fpicker/util/makefile.mk @@ -100,3 +100,16 @@ DEF2EXPORTFILE= exports.dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/fop.component $(MISC)/fps.component + +$(MISC)/fop.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fop.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fop.component + +$(MISC)/fps.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps.component diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index e8ea5a0bafe6..afb359348349 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -53,26 +53,6 @@ "registration.log" #endif - /*_____________________________________________________________________________________________________________ - LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) - - Write informations for component_writeInfo() in log file. - _____________________________________________________________________________________________________________*/ - - #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) \ - { \ - ::rtl::OStringBuffer sOut( 1024 ); \ - sOut.append( "component_writeInfo():" ); \ - sOut.append( SINFOTEXT ); \ - WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ - } - - /*_____________________________________________________________________________________________________________ - LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) - - Write informations for component_getFactory() in log file. - _____________________________________________________________________________________________________________*/ - #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ { \ ::rtl::OStringBuffer sOut( 1024 ); \ @@ -88,7 +68,6 @@ _____________________________________________________________________________________________________________*/ #undef LOGFILE_REGISTRATION - #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) #endif // #ifdef ENABLE_REGISTRATIONDEBUG diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 3db6761abc15..11f7c297c645 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -37,10 +37,8 @@ //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/registry/InvalidRegistryException.hpp> //_________________________________________________________________________________________________________________ // other includes @@ -57,67 +55,14 @@ macros for registration of services Please use follow public macros only! - 1) COMPONENTINFO( CLASS ) => use it as parameter for COMPONENT_WRITEINFO( INFOS ) - 2) IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) - 3) COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() - 4) COMPONENTWRITEINFO( INFOS ) => use it to define exported function component_writeInfo() - 5) COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() + IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) + COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() + COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() _________________________________________________________________________________________________________________*/ //***************************************************************************************************************** // public -// use it as parameter for COMPONENT_WRITEINFO( INFOS ) -//***************************************************************************************************************** - -#define COMPONENTINFO( CLASS ) \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False; \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is() == sal_True ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" ) \ - /* Build new keyname */ \ - sKeyName = DECLARE_ASCII( "/" ); \ - sKeyName += CLASS::impl_getStaticImplementationName(); \ - sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); \ - LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" ) \ - LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) ) \ - LOG_REGISTRATION_WRITEINFO( "\" ...\n" ) \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - /* If this new key valid ... */ \ - if ( xNewKey.is() == sal_True ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" ) \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" ) \ - LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) ) \ - LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" ) \ - xNewKey->createKey( pArray[nCounter] ); \ - } \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - } \ - } \ - catch( ::com::sun::star::registry::InvalidRegistryException& ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" ) \ - bReturn = sal_False ; \ - } - -//***************************************************************************************************************** -// public // use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) //***************************************************************************************************************** #define IFFACTORY( CLASS ) \ @@ -144,41 +89,6 @@ ________________________________________________________________________________ //***************************************************************************************************************** // public -// define registration of service -//***************************************************************************************************************** -#define COMPONENTWRITEINFO( INFOS ) \ - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ , \ - void* pRegistryKey ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t[start]\n" ) \ - /* Set default return value for this operation - if it failed. */ \ - sal_Bool bReturn = sal_False ; \ - if ( pRegistryKey != NULL ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" ) \ - /* Define variables for following helper macros! */ \ - /* bReturn will set automaticly. */ \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey ; \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xNewKey ; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames ; \ - const ::rtl::OUString* pArray ; \ - sal_Int32 nLength ; \ - sal_Int32 nCounter ; \ - ::rtl::OUString sKeyName ; \ - xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ); \ - /* This parameter will expand to */ \ - /* "COMPONENT_INFO(a) */ \ - /* ... */ \ - /* COMPONENT_INFO(z)" */ \ - INFOS \ - } \ - LOG_REGISTRATION_WRITEINFO( "\t[end]\n" ) \ - /* Return with result of this operation. */ \ - return bReturn ; \ - } - -//***************************************************************************************************************** -// public // define method to instanciate new services //***************************************************************************************************************** #define COMPONENTGETFACTORY( IFFACTORIES ) \ diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 5c745e09077d..cf994604699a 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -21,3 +21,37 @@ fr framework\source\accelerators nmake - all fr_accelerators fr_t fr framework\source\tabwin nmake - all fr_tabwin fr_threadhelp fr_inc NULL fr framework\util nmake - all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL + +# complex tests +# fails on unxsoli4 +# fr framework\qa\complex\ModuleManager nmake - all fr_qa_complex_modulemanager NULL +# fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL + +# fr framework\qa\complex\accelerators nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL + +# unclear should be remove +# fr framework\qa\complex\api_internal nmake - all fr_qa_complex_api_internal NULL + +# BUG! opens an error box +# fr framework\qa\complex\broken_document nmake - all fr_qa_complex_broken_doc NULL + +# failed: +# fr framework\qa\complex\desktop nmake - all fr_qa_complex_desktop NULL + +# fr framework\qa\complex\dispatches nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL +# fr framework\qa\complex\disposing nmake - all fr_qa_complex_disposing NULL + +# GPF +# fr framework\qa\complex\framework\autosave nmake - all fr_qa_complex_framework_autosave NULL + +# much too complex, will not change to new junit +# fr framework\qa\complex\framework\recovery nmake - all fr_qa_complex_framework_recovery NULL + +# fr framework\qa\complex\imageManager nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL + +# fr framework\qa\complex\loadAllDocuments nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL + +# need cleanups +# fr framework\qa\complex\path_settings nmake - all fr_qa_complex_path_settings NULL +# fr framework\qa\complex\path_substitution nmake - all fr_qa_complex_path_substitution NULL + diff --git a/framework/prj/d.lst b/framework/prj/d.lst index fe6077f57bc8..d3a3d6dd153c 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -50,3 +50,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar ..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml +..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component +..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component +..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component diff --git a/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java index ba0c9e318980..22e3003d86e3 100644 --- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java +++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.java @@ -30,21 +30,27 @@ package complex.ModuleManager; import com.sun.star.beans.*; import com.sun.star.frame.*; import com.sun.star.lang.*; -import com.sun.star.uno.*; +import com.sun.star.uno.AnyConverter; +import com.sun.star.uno.UnoRuntime; import com.sun.star.util.*; import com.sun.star.container.*; -import complexlib.ComplexTestCase; -import helper.URLHelper; -import java.lang.*; -import java.util.*; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ //----------------------------------------------- /** @short todo document me */ -public class CheckXModuleManager extends ComplexTestCase +public class CheckXModuleManager { //------------------------------------------- // some const @@ -71,16 +77,16 @@ public class CheckXModuleManager extends ComplexTestCase @return All test methods. @todo Think about selection of tests from outside ... */ - public String[] getTestMethodNames() - { - return new String[] - { - "checkModuleIdentification" , - "checkModuleConfigurationReadable" , - "checkModuleConfigurationWriteable", - "checkModuleConfigurationQueries" - }; - } +// public String[] getTestMethodNames() +// { +// return new String[] +// { +// "checkModuleIdentification" , +// "checkModuleConfigurationReadable" , +// "checkModuleConfigurationWriteable", +// "checkModuleConfigurationQueries" +// }; +// } //------------------------------------------- /** @short Create the environment for following tests. @@ -88,36 +94,28 @@ public class CheckXModuleManager extends ComplexTestCase @descr Use either a component loader from desktop or from frame */ - public void before() + @Before public void before() throws java.lang.Exception { // get uno service manager from global test environment - m_xSmgr = (XMultiServiceFactory)param.getMSF(); + m_xSmgr = getMSF(); // create module manager - m_xMM = (XModuleManager)UnoRuntime.queryInterface( - XModuleManager.class, - m_xSmgr.createInstance("com.sun.star.frame.ModuleManager")); + m_xMM = UnoRuntime.queryInterface(XModuleManager.class, m_xSmgr.createInstance("com.sun.star.frame.ModuleManager")); // create desktop instance to create a special frame to load documents there. - XFrame xDesktop = (XFrame)UnoRuntime.queryInterface( - XFrame.class, - m_xSmgr.createInstance("com.sun.star.frame.Desktop")); + XFrame xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xSmgr.createInstance("com.sun.star.frame.Desktop")); - m_xLoader = (XComponentLoader)UnoRuntime.queryInterface( - XComponentLoader.class, - xDesktop.findFrame("_blank", 0)); + m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xDesktop.findFrame("_blank", 0)); } //------------------------------------------- /** @short close the environment. */ - public void after() + @After public void after() throws java.lang.Exception { - XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( - XCloseable.class, - m_xLoader); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xLoader); xClose.close(false); m_xLoader = null; @@ -128,7 +126,7 @@ public class CheckXModuleManager extends ComplexTestCase //------------------------------------------- /** @todo document me */ - public void checkModuleIdentification() + @Test public void checkModuleIdentification() throws java.lang.Exception { impl_identifyModulesBasedOnDocs("com.sun.star.text.TextDocument" ); @@ -139,13 +137,14 @@ public class CheckXModuleManager extends ComplexTestCase impl_identifyModulesBasedOnDocs("com.sun.star.drawing.DrawingDocument" ); impl_identifyModulesBasedOnDocs("com.sun.star.presentation.PresentationDocument"); impl_identifyModulesBasedOnDocs("com.sun.star.sdb.OfficeDatabaseDocument" ); - impl_identifyModulesBasedOnDocs("com.sun.star.chart.ChartDocument" ); + // TODO: fails + // impl_identifyModulesBasedOnDocs("com.sun.star.chart.ChartDocument" ); } //------------------------------------------- /** @todo document me */ - public void checkModuleConfigurationReadable() + @Test public void checkModuleConfigurationReadable() throws java.lang.Exception { } @@ -153,7 +152,7 @@ public class CheckXModuleManager extends ComplexTestCase //------------------------------------------- /** @todo document me */ - public void checkModuleConfigurationWriteable() + @Test public void checkModuleConfigurationWriteable() throws java.lang.Exception { // modules supporting real documents @@ -182,7 +181,7 @@ public class CheckXModuleManager extends ComplexTestCase //------------------------------------------- /** @todo document me */ - public void checkModuleConfigurationQueries() + @Test public void checkModuleConfigurationQueries() throws java.lang.Exception { impl_searchModulesByDocumentService("com.sun.star.text.TextDocument" ); @@ -202,14 +201,14 @@ public class CheckXModuleManager extends ComplexTestCase private void impl_searchModulesByDocumentService(String sDocumentService) throws java.lang.Exception { - log.println("search modules matching document service '"+sDocumentService+"' ..."); + System.out.println("search modules matching document service '"+sDocumentService+"' ..."); NamedValue[] lProps = new NamedValue[1]; lProps[0] = new NamedValue(); lProps[0].Name = "ooSetupFactoryDocumentService"; lProps[0].Value = sDocumentService; - XContainerQuery xMM = (XContainerQuery)UnoRuntime.queryInterface(XContainerQuery.class, m_xMM); + XContainerQuery xMM = UnoRuntime.queryInterface(XContainerQuery.class, m_xMM); XEnumeration xResult = xMM.createSubSetEnumerationByProperties(lProps); while(xResult.hasMoreElements()) { @@ -221,18 +220,26 @@ public class CheckXModuleManager extends ComplexTestCase for (i=0; i<c; ++i) { if (lModuleProps[i].Name.equals("ooSetupFactoryModuleIdentifier")) + { sFoundModule = AnyConverter.toString(lModuleProps[i].Value); + } if (lModuleProps[i].Name.equals("ooSetupFactoryDocumentService")) + { sFoundDocService = AnyConverter.toString(lModuleProps[i].Value); + } } if (sFoundModule.length() < 1) - failed("Miss module identifier in result set. Returned data are incomplete."); + { + fail("Miss module identifier in result set. Returned data are incomplete."); + } if ( ! sFoundDocService.equals(sDocumentService)) - failed("Query returned wrong module '"+sFoundModule+"' with DocumentService='"+sFoundDocService+"'."); + { + fail("Query returned wrong module '" + sFoundModule + "' with DocumentService='" + sFoundDocService + "'."); + } - log.println("Found module '"+sFoundModule+"'."); + System.out.println("Found module '"+sFoundModule+"'."); } } @@ -242,9 +249,9 @@ public class CheckXModuleManager extends ComplexTestCase private void impl_identifyModulesBasedOnDocs(String sModule) throws java.lang.Exception { - log.println("check identification of module '"+sModule+"' ..."); + System.out.println("check identification of module '"+sModule+"' ..."); - XNameAccess xMM = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xMM); + XNameAccess xMM = UnoRuntime.queryInterface(XNameAccess.class, m_xMM); PropertyValue[] lModuleProps = (PropertyValue[])AnyConverter.toArray(xMM.getByName(sModule)); int c = lModuleProps.length; int i = 0; @@ -265,7 +272,7 @@ public class CheckXModuleManager extends ComplexTestCase lArgs[0].Value = Boolean.TRUE; XComponent xModel = m_xLoader.loadComponentFromURL(sFactoryURL, "_self", 0, lArgs); - XFrame xFrame = (XFrame)UnoRuntime.queryInterface(XFrame.class, m_xLoader); + XFrame xFrame = UnoRuntime.queryInterface(XFrame.class, m_xLoader); XController xController = xFrame.getController(); String sModuleFrame = m_xMM.identify(xFrame ); @@ -273,11 +280,17 @@ public class CheckXModuleManager extends ComplexTestCase String sModuleModel = m_xMM.identify(xModel ); if ( ! sModuleFrame.equals(sModule)) - failed("Identification of module '"+sModule+"' failed if frame was used as entry point."); + { + fail("Identification of module '" + sModule + "' failed if frame was used as entry point."); + } if ( ! sModuleController.equals(sModule)) - failed("Identification of module '"+sModule+"' failed if controller was used as entry point."); + { + fail("Identification of module '" + sModule + "' failed if controller was used as entry point."); + } if ( ! sModuleModel.equals(sModule)) - failed("Identification of module '"+sModule+"' failed if model was used as entry point."); + { + fail("Identification of module '" + sModule + "' failed if model was used as entry point."); + } } //------------------------------------------- @@ -286,7 +299,7 @@ public class CheckXModuleManager extends ComplexTestCase private void impl_checkReadOnlyPropsOfModule(String sModule) throws java.lang.Exception { - XNameReplace xWrite = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, m_xMM); + XNameReplace xWrite = UnoRuntime.queryInterface(XNameReplace.class, m_xMM); impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryDocumentService" , "test"); impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryActualFilter" , "test"); @@ -309,13 +322,37 @@ public class CheckXModuleManager extends ComplexTestCase lChanges[0].Value = aPropValue; // Note: Exception is expected ! - log.println("check readonly state of module '"+sModule+"' for property '"+sPropName+"' ..."); + System.out.println("check readonly state of module '"+sModule+"' for property '"+sPropName+"' ..."); try { xMM.replaceByName(sModule, lChanges); - failed("Was able to write READONLY property '"+sPropName+"' of module '"+sModule+"' configuration."); + fail("Was able to write READONLY property '"+sPropName+"' of module '"+sModule+"' configuration."); } catch(Throwable ex) {} } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk index bcef75fca4ef..4ad6d8929030 100644 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ b/framework/qa/complex/ModuleManager/makefile.mk @@ -24,60 +24,37 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = CheckXModuleManager -PRJNAME = $(TARGET) -PACKAGE = complex$/ModuleManager - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - OOoRunner.jar mysql.jar - -JAVAFILES = CheckXModuleManager.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -MAXLINELENGTH = 100000 +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_ModuleManager -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/ModuleManager -# --- Parameters for the test -------------------------------------- +# here store only Files which contain a @Test +JAVATESTFILES = \ + CheckXModuleManager.java -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# put here all other files +JAVAFILES = $(JAVATESTFILES) -# test base is java complex -CT_TESTBASE = -TestBase java_complex +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# start the runner application -CT_APP = org.openoffice.Runner +.END -# --- Targets ------------------------------------------------------ - -#.IF "$(depend)" == "" -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -#.ELSE -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -#.ENDIF +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -.INCLUDE : target.mk +ALLTAR : javatest -RUN: run +.END -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index a54f9daaa932..6f7b8952a0b1 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -45,15 +45,24 @@ import com.sun.star.lang.*; import com.sun.star.lang.EventObject; import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XInterface; import com.sun.star.util.*; -import com.sun.star.uno.*; import java.awt.Robot; import java.awt.event.InputEvent; -import complexlib.ComplexTestCase; import util.AccessibilityTools; import util.SOfficeFactory; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ //----------------------------------------------- /** * This <CODE>ComplexTest</CODE> checks the interface @@ -64,7 +73,7 @@ import util.SOfficeFactory; * @short Check the interface XUserInputIntercaption * @descr checks is a simple way the interface XUserInputInteraction */ -public class EventTest extends ComplexTestCase { +public class EventTest { //------------------------------------------- // some const @@ -112,16 +121,16 @@ public class EventTest extends ComplexTestCase { * @return All test methods. * @todo Think about selection of tests from outside ... */ - public String[] getTestMethodNames() { - return new String[] - { "checkTextDocument", - "checkCalcDocument", - "checkDrawDocument", - "checkImpressDocument", - "checkChartDocument", - "checkMathDocument", - }; - } +// public String[] getTestMethodNames() { +// return new String[] +// { "checkTextDocument", +// "checkCalcDocument", +// "checkDrawDocument", +// "checkImpressDocument", +// "checkChartDocument", +// "checkMathDocument", +// }; +// } //------------------------------------------- /** @@ -130,17 +139,17 @@ public class EventTest extends ComplexTestCase { * @descr create an empty test frame, where we can load * different components inside. */ - public void before() { +@Before public void before() { // get uno service manager from global test environment - m_xMSF = (XMultiServiceFactory)param.getMSF(); + m_xMSF = getMSF(); // create frame instance try { // get a soffice factory object - m_SOF = SOfficeFactory.getFactory((XMultiServiceFactory) param.getMSF()); + m_SOF = SOfficeFactory.getFactory(getMSF()); } catch(java.lang.Throwable ex) { - failed("Could not create the XUserInputInterception instance."); + fail("Could not create the XUserInputInterception instance."); } } @@ -151,12 +160,11 @@ public class EventTest extends ComplexTestCase { * @param xDoc the document to close */ public void closeDoc(XInterface xDoc) { - XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( - XCloseable.class, xDoc); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc); try { xClose.close(false); } catch(com.sun.star.util.CloseVetoException exVeto) { - log.println("document couldn't be closed successfully."); + System.out.println("document couldn't be closed successfully."); } } @@ -166,14 +174,14 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XKeyHandler * @see com.sun.star.awt.XMouseClickHandler */ - public void checkTextDocument(){ + @Test public void checkTextDocument(){ XTextDocument xDoc = null; try{ xDoc = m_SOF.createTextDoc("WriterTest"); } catch (com.sun.star.uno.Exception e){ - failed("Could not create a text document: " +e.toString()); + fail("Could not create a text document: " +e.toString()); } checkListener(xDoc); @@ -187,14 +195,14 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XKeyHandler * @see com.sun.star.awt.XMouseClickHandler */ - public void checkImpressDocument(){ + @Test public void checkImpressDocument(){ XComponent xDoc = null; try{ xDoc = m_SOF.createImpressDoc("ImpressTest"); } catch (com.sun.star.uno.Exception e){ - failed("Could not create an impress document: " +e.toString()); + fail("Could not create an impress document: " +e.toString()); } checkListener(xDoc); @@ -208,20 +216,21 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XKeyHandler * @see com.sun.star.awt.XMouseClickHandler */ - public void checkChartDocument(){ - - XChartDocument xDoc = null; - - try{ - xDoc = m_SOF.createChartDoc("ChartTest"); - } catch (com.sun.star.uno.Exception e){ - failed("Could not create a chart document: " +e.toString()); - } - - checkListener(xDoc); - - closeDoc(xDoc); - } +// TODO! +// @Test public void checkChartDocument(){ +// +// XChartDocument xDoc = null; +// +// try{ +// xDoc = m_SOF.createChartDoc("ChartTest"); +// } catch (com.sun.star.uno.Exception e){ +// fail("Could not create a chart document: " +e.toString()); +// } +// +// checkListener(xDoc); +// +// closeDoc(xDoc); +// } /** * creates a math document and check the <CODE>XMouseClickHandler</CODE> and @@ -229,14 +238,14 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XKeyHandler * @see com.sun.star.awt.XMouseClickHandler */ - public void checkMathDocument(){ + @Test public void checkMathDocument(){ XComponent xDoc = null; try{ xDoc = m_SOF.createMathDoc("MathTest"); } catch (com.sun.star.uno.Exception e){ - failed("Could not create a math document: " +e.toString()); + fail("Could not create a math document: " +e.toString()); } checkListener(xDoc); @@ -250,14 +259,14 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XKeyHandler * @see com.sun.star.awt.XMouseClickHandler */ - public void checkDrawDocument(){ + @Test public void checkDrawDocument(){ XComponent xDoc = null; try{ xDoc = m_SOF.createDrawDoc("DrawTest"); } catch (com.sun.star.uno.Exception e){ - failed("Could not create a draw document: " +e.toString()); + fail("Could not create a draw document: " +e.toString()); } checkListener(xDoc); @@ -271,14 +280,14 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XKeyHandler * @see com.sun.star.awt.XMouseClickHandler */ - public void checkCalcDocument(){ + @Test public void checkCalcDocument(){ XSpreadsheetDocument xDoc = null; try{ xDoc = m_SOF.createCalcDoc("CalcTest"); } catch (com.sun.star.uno.Exception e){ - failed("Could not create a calc document: " +e.toString()); + fail("Could not create a calc document: " +e.toString()); } checkListener(xDoc); @@ -293,7 +302,7 @@ public class EventTest extends ComplexTestCase { */ private void checkListener(XInterface xDoc){ - XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDoc); + XModel xModel = UnoRuntime.queryInterface(XModel.class, xDoc); XUserInputInterception xUII = getUII(xModel); @@ -320,15 +329,15 @@ public class EventTest extends ComplexTestCase { xUII.addKeyHandler(keyListener); - log.println("starting thread to check the key listener..."); + System.out.println("starting thread to check the key listener..."); EventTrigger et = new EventTrigger(xModel, EventTriggerType.KEY_TEXT_INTO_DOC); et.run(); util.utils.shortWait(m_threadWait); - log.println("key listener thread should be finished."); + System.out.println("key listener thread should be finished."); - assure("key event does not work!", m_keyPressed && m_keyReleased); + assertTrue("key event does not work!", m_keyPressed && m_keyReleased); xUII.removeKeyHandler(keyListener); } @@ -354,15 +363,15 @@ public class EventTest extends ComplexTestCase { xUII.addMouseClickHandler(mouseListener); - log.println("starting thread to check the mouse listener..."); + System.out.println("starting thread to check the mouse listener..."); EventTrigger et = new EventTrigger(xModel, EventTriggerType.MOUSE_KLICK_INTO_DOC); et.run(); util.utils.shortWait(m_threadWait); - log.println("mouse listener thread should be finished."); + System.out.println("mouse listener thread should be finished."); - assure("mouse event does not work!", m_mousePressed && m_mouseReleased); + assertTrue("mouse event does not work!", m_mousePressed && m_mouseReleased); xUII.removeMouseClickHandler(mouseListener); } @@ -375,10 +384,9 @@ public class EventTest extends ComplexTestCase { XController xController = xModel.getCurrentController(); - XUserInputInterception xUII = (XUserInputInterception) UnoRuntime.queryInterface( - XUserInputInterception.class, xController); + XUserInputInterception xUII = UnoRuntime.queryInterface(XUserInputInterception.class, xController); if (xUII == null) { - failed("could not get XUserInputInterception from XContoller", true); + fail("could not get XUserInputInterception from XContoller"); } return xUII; } @@ -395,7 +403,7 @@ public class EventTest extends ComplexTestCase { * @return returns <CODE>TRUE</CODE> in erery case */ public boolean keyPressed( KeyEvent oEvent ){ - log.println("XKeyHandler: keyPressed-Event"); + System.out.println("XKeyHandler: keyPressed-Event"); m_keyPressed = true; return true; } @@ -406,7 +414,7 @@ public class EventTest extends ComplexTestCase { * @return returns <CODE>TRUE</CODE> in erery case */ public boolean keyReleased( KeyEvent oEvent ){ - log.println("XKeyHandler: keyReleased-Event"); + System.out.println("XKeyHandler: keyReleased-Event"); m_keyReleased = true; return true; } @@ -415,7 +423,7 @@ public class EventTest extends ComplexTestCase { * @param oEvent refers to the object that fired the event. */ public void disposing( EventObject oEvent ){ - log.println("XKeyHandler: disposing-Event"); + System.out.println("XKeyHandler: disposing-Event"); } } @@ -431,7 +439,7 @@ public class EventTest extends ComplexTestCase { * @return returns <CODE>TRUE</CODE> in erery case */ public boolean mousePressed( MouseEvent oEvent ){ - log.println("XMouseClickHandler: mousePressed-Event"); + System.out.println("XMouseClickHandler: mousePressed-Event"); m_mousePressed = true; return true; } @@ -442,7 +450,7 @@ public class EventTest extends ComplexTestCase { * @return returns <CODE>TRUE</CODE> in erery case */ public boolean mouseReleased( MouseEvent oEvent ){ - log.println("XMouseClickHandler: mouseReleased-Event"); + System.out.println("XMouseClickHandler: mouseReleased-Event"); m_mouseReleased = true; return true; } @@ -451,7 +459,7 @@ public class EventTest extends ComplexTestCase { * @param oEvent refers to the object that fired the event. */ public void disposing( EventObject oEvent ){ - log.println("XMouseClickHandler: disposing-Event"); + System.out.println("XMouseClickHandler: disposing-Event"); } }; @@ -529,7 +537,7 @@ public class EventTest extends ComplexTestCase { // get the position and the range of a scroll bar XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) param.getMSF(), + getMSF(), xModel); XAccessible xRoot = at.getAccessibleObject(xWindow); @@ -537,7 +545,7 @@ public class EventTest extends ComplexTestCase { XAccessibleContext xPanel = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); - XAccessibleComponent xPanelCont = (XAccessibleComponent) UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel); + XAccessibleComponent xPanelCont = UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel); // the position of the panel Point point = xPanelCont.getLocationOnScreen(); @@ -549,15 +557,15 @@ public class EventTest extends ComplexTestCase { Robot rob = new Robot(); int x = point.X + (rect.Width / 2); int y = point.Y + (rect.Height / 2); - log.println("try to klick into the middle of the document"); + System.out.println("try to klick into the middle of the document"); rob.mouseMove(x, y); rob.mousePress(InputEvent.BUTTON1_MASK); rob.mouseRelease(InputEvent.BUTTON1_MASK); } catch (java.awt.AWTException e) { - log.println("couldn't press mouse button"); + System.out.println("couldn't press mouse button"); } } catch (java.lang.Exception e){ - log.println("could not click into the scroll bar: " + e.toString()); + System.out.println("could not click into the scroll bar: " + e.toString()); } } @@ -569,11 +577,11 @@ public class EventTest extends ComplexTestCase { private void keyIntoDoc(){ try { Robot rob = new Robot(); - log.println("try to press 'A'"); + System.out.println("try to press 'A'"); rob.keyPress(java.awt.event.KeyEvent.VK_A); rob.keyRelease(java.awt.event.KeyEvent.VK_A); } catch (java.awt.AWTException e) { - log.println("couldn't press key"); + System.out.println("couldn't press key"); } } @@ -591,4 +599,29 @@ public class EventTest extends ComplexTestCase { /** write some text into a spread sheet*/ final public static int KEY_TEXT_INTO_DOC = 2; } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + }
\ No newline at end of file diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk index d3ca648b02f0..8b08bec171ee 100644 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ b/framework/qa/complex/XUserInputInterception/makefile.mk @@ -24,66 +24,110 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = EventTest -PRJNAME = framework -PACKAGE = complex$/XUserInputInterception - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - OOoRunner.jar mysql.jar -JAVAFILES = EventTest.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# we don't want something like this. +# .IF "$(OS)"=="LINUX" +# nothing .PHONY: +# @echo "Test marked as failed on this platform" +# .END -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_xuserinputinterception -# start the runner application -CT_APP = org.openoffice.Runner +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/XUserInputInterception -# --- Targets ------------------------------------------------------ +# here store only Files which contain a @Test +JAVATESTFILES = \ + EventTest.java -.IF "$(depend)" == "" -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -.ELSE -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -.ENDIF +# put here all other files +JAVAFILES = $(JAVATESTFILES) -.INCLUDE : target.mk +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -RUN: run +.END -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk +ALLTAR : javatest +.END +# +# +# +# PRJ = ..$/..$/.. +# TARGET = EventTest +# PRJNAME = framework +# PACKAGE = complex$/XUserInputInterception +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ +# OOoRunner.jar mysql.jar +# JAVAFILES = EventTest.java +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # test looks something like the.full.package.TestName +# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .IF "$(depend)" == "" +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR +# .ELSE +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP +# .ENDIF +# +# .INCLUDE : target.mk +# +# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props +# # cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props +# # jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +# +# RUN: run +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) +# +# +# diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 95a0fce2c92c..b0d89ad81858 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -24,133 +24,159 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package complex.accelerators; // imports -import com.sun.star.awt.*; -import com.sun.star.beans.*; -import com.sun.star.container.*; -import com.sun.star.embed.*; -import com.sun.star.lang.*; -import com.sun.star.ui.*; -import com.sun.star.uno.*; -import com.sun.star.util.*; - -import complexlib.ComplexTestCase; - -import java.lang.*; -import java.util.*; - -import helper.*; - +import com.sun.star.awt.KeyEvent; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.XPropertySet; +import com.sun.star.container.XNameAccess; +import com.sun.star.container.XNameContainer; +import com.sun.star.embed.XStorage; +import com.sun.star.embed.XTransactedObject; +import com.sun.star.lang.XInitialization; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.XSingleServiceFactory; +import com.sun.star.ui.XAcceleratorConfiguration; +import com.sun.star.ui.XUIConfigurationManager; +import com.sun.star.ui.XUIConfigurationPersistence; +import com.sun.star.ui.XUIConfigurationStorage; +import com.sun.star.uno.AnyConverter; +import com.sun.star.uno.XInterface; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XChangesBatch; + +// import complex.accelerators.KeyMapping; + + +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.FileHelper; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ //----------------------------------------------- + /** @short todo document me */ -public class AcceleratorsConfigurationTest extends ComplexTestCase +public class AcceleratorsConfigurationTest { + /** points to the global uno service manager. */ private XMultiServiceFactory m_xSmgr = null; - /** the accelerator configuration for testing. */ private XAcceleratorConfiguration m_xGlobalAccelCfg = null; private XAcceleratorConfiguration m_xModuleAccelCfg = null; private XAcceleratorConfiguration m_xDocumentAccelCfg = null; - /** XCS/XCU based accelerator configuration. */ private XNameAccess m_xConfig = null; - private XNameAccess m_xPrimaryKeys = null; + private XNameAccess m_xPrimaryKeys = null; private XNameAccess m_xSecondaryKeys = null; //------------------------------------------- // test environment - //----------------------------------------------- /** @short todo document me */ - public String[] getTestMethodNames() - { - return new String[] - { - "checkGlobalAccelCfg", - "checkModuleAccelCfg", - "checkDocumentAccelCfg" - }; - } - +// public String[] getTestMethodNames() +// { +// return new String[] +// { +// "checkGlobalAccelCfg", +// "checkModuleAccelCfg", +// "checkDocumentAccelCfg" +// }; +// } //----------------------------------------------- /** @short Create the environment for following tests. */ + @Before public void before() - throws java.lang.Exception + throws java.lang.Exception { // get uno service manager from global test environment - m_xSmgr = (XMultiServiceFactory)param.getMSF(); - - m_xGlobalAccelCfg = (XAcceleratorConfiguration)UnoRuntime.queryInterface( - XAcceleratorConfiguration.class, - m_xSmgr.createInstance("com.sun.star.ui.GlobalAcceleratorConfiguration")); - m_xModuleAccelCfg = (XAcceleratorConfiguration)UnoRuntime.queryInterface( - XAcceleratorConfiguration.class, - m_xSmgr.createInstance("com.sun.star.ui.ModuleAcceleratorConfiguration")); - m_xDocumentAccelCfg = (XAcceleratorConfiguration)UnoRuntime.queryInterface( - XAcceleratorConfiguration.class, - m_xSmgr.createInstance("com.sun.star.ui.DocumentAcceleratorConfiguration")); + m_xSmgr = getMSF(); + + m_xGlobalAccelCfg = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, m_xSmgr.createInstance("com.sun.star.ui.GlobalAcceleratorConfiguration")); + m_xModuleAccelCfg = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, m_xSmgr.createInstance("com.sun.star.ui.ModuleAcceleratorConfiguration")); + m_xDocumentAccelCfg = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, m_xSmgr.createInstance("com.sun.star.ui.DocumentAcceleratorConfiguration")); String sConfigPath = "org.openoffice.Office.Accelerators"; boolean bReadOnly = false; - XNameAccess m_xConfig = openConfig(m_xSmgr, sConfigPath, bReadOnly); - if (m_xConfig != null) + XNameAccess m_xConfig2 = openConfig(m_xSmgr, sConfigPath, bReadOnly); + if (m_xConfig2 != null) { - m_xPrimaryKeys = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xConfig.getByName("PrimaryKeys")); - m_xSecondaryKeys = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xConfig.getByName("SecondaryKeys")); + m_xPrimaryKeys = UnoRuntime.queryInterface(XNameAccess.class, m_xConfig2.getByName("PrimaryKeys")); + m_xSecondaryKeys = UnoRuntime.queryInterface(XNameAccess.class, m_xConfig2.getByName("SecondaryKeys")); } } //------------------------------------------- /** @short close the environment. */ + @After public void after() - throws java.lang.Exception + throws java.lang.Exception { - m_xConfig = null; - m_xGlobalAccelCfg = null; - m_xModuleAccelCfg = null; + m_xConfig = null; + m_xGlobalAccelCfg = null; + m_xModuleAccelCfg = null; m_xDocumentAccelCfg = null; - m_xSmgr = null; + m_xSmgr = null; } //------------------------------------------- /** @todo document me. */ + @Test public void checkGlobalAccelCfg() - throws java.lang.Exception + throws java.lang.Exception { - log.println("\n---- check Global accelerator configuration: ----"); + System.out.println("\n---- check Global accelerator configuration: ----"); String[] sKeys; - XNameAccess xPrimaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class,m_xPrimaryKeys.getByName("Global")); - XNameAccess xSecondaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Global")); + XNameAccess xPrimaryAccess = UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Global")); + XNameAccess xSecondaryAccess = UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Global")); - sKeys = new String[] { "A_MOD1" }; + sKeys = new String[] + { + "A_MOD1" + }; impl_checkGetKeyCommands(m_xGlobalAccelCfg, xPrimaryAccess, sKeys); - sKeys = new String[] { "PASTE", "X_SHIFT" }; - String[] sCommands = new String[] { ".uno:test", ".uno:test" }; + sKeys = new String[] + { + "PASTE", "X_SHIFT" + }; + String[] sCommands = new String[] + { + ".uno:test", ".uno:test" + }; impl_checkSetKeyCommands(m_xGlobalAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys, sCommands); - sKeys = new String[] { "C_MOD1", "CUT" }; + sKeys = new String[] + { + "C_MOD1", "CUT" + }; impl_checkRemoveKeyCommands(m_xGlobalAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys); - String[] sCommandList = new String[] { ".uno:Paste", ".uno:CloseWin" }; + String[] sCommandList = new String[] + { + ".uno:Paste", ".uno:CloseWin" + }; impl_checkGetPreferredKeyEventsForCommandList(m_xGlobalAccelCfg, xPrimaryAccess, sCommandList); } //------------------------------------------- /** @todo document me. */ + @Test public void checkModuleAccelCfg() - throws java.lang.Exception + throws java.lang.Exception { String[] sModules = new String[] { @@ -159,87 +185,171 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase "com.sun.star.presentation.PresentationDocument", "com.sun.star.sheet.SpreadsheetDocument", "com.sun.star.text.TextDocument", - // add other modules here + // add other modules here }; - for (int i=0; i<sModules.length; ++i) + for (int i = 0; i < sModules.length; ++i) { - log.println("\n---- check accelerator configuration depending module: " + sModules[i] + " ----"); + System.out.println("\n---- check accelerator configuration depending module: " + sModules[i] + " ----"); PropertyValue[] aProp = new PropertyValue[2]; aProp[0] = new PropertyValue(); - aProp[0].Name = "ModuleIdentifier"; + aProp[0].Name = "ModuleIdentifier"; aProp[0].Value = sModules[i]; aProp[1] = new PropertyValue(); - aProp[1].Name = "Locale"; + aProp[1].Name = "Locale"; aProp[1].Value = "en-US"; - XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, m_xModuleAccelCfg); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, m_xModuleAccelCfg); xInit.initialize(aProp); // to fill cache - XNameAccess xPrimaryModules = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Modules")); - XNameAccess xSecondaryModules = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Modules")); + XNameAccess xPrimaryModules = UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Modules")); + XNameAccess xSecondaryModules = UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Modules")); String[] sKeys; - XNameAccess xPrimaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xPrimaryModules.getByName(sModules[i])); - XNameAccess xSecondaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xSecondaryModules.getByName(sModules[i])); + XNameAccess xPrimaryAccess = UnoRuntime.queryInterface(XNameAccess.class, xPrimaryModules.getByName(sModules[i])); + XNameAccess xSecondaryAccess = UnoRuntime.queryInterface(XNameAccess.class, xSecondaryModules.getByName(sModules[i])); //-------------------------------------------- if (sModules[i].equals("com.sun.star.presentation.PresentationDocument")) - sKeys = new String[] { "A_SHIFT_MOD1_MOD2" }; + { + sKeys = new String[] + { + "A_SHIFT_MOD1_MOD2" + }; + } else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument")) - sKeys = new String[] { "B_MOD1" }; + { + sKeys = new String[] + { + "B_MOD1" + }; + } else if (sModules[i].equals("com.sun.star.text.TextDocument")) - sKeys = new String[] { "F11_MOD1" }; + { + sKeys = new String[] + { + "F11_MOD1" + }; + } else - sKeys = new String[] { "A_MOD1" }; + { + sKeys = new String[] + { + "A_MOD1" + }; + } impl_checkGetKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, sKeys); //-------------------------------------------- String[] sCommands; if (sModules[i].equals("com.sun.star.presentation.PresentationDocument")) { - sKeys = new String[] { "A_SHIFT_MOD1_MOD2" }; - sCommands = new String[] { ".uno:test" }; + sKeys = new String[] + { + "A_SHIFT_MOD1_MOD2" + }; + sCommands = new String[] + { + ".uno:test" + }; } else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument")) { - sKeys = new String[] { "B_MOD1" }; - sCommands = new String[] { ".uno:test" }; + sKeys = new String[] + { + "B_MOD1" + }; + sCommands = new String[] + { + ".uno:test" + }; } else if (sModules[i].equals("com.sun.star.text.TextDocument")) { - sKeys = new String[] { "F11_MOD1" }; - sCommands = new String[] { ".uno:test" }; + sKeys = new String[] + { + "F11_MOD1" + }; + sCommands = new String[] + { + ".uno:test" + }; } else { - sKeys = new String[] { "PASTE" }; - sCommands = new String[] { ".uno:test" }; + sKeys = new String[] + { + "PASTE" + }; + sCommands = new String[] + { + ".uno:test" + }; } impl_checkSetKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys, sCommands); //-------------------------------------------- if (sModules[i].equals("com.sun.star.presentation.PresentationDocument")) - sKeys = new String[] { "A_SHIFT_MOD1_MOD2" }; + { + sKeys = new String[] + { + "A_SHIFT_MOD1_MOD2" + }; + } else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument")) - sKeys = new String[] { "F5_SHIFT_MOD1" }; + { + sKeys = new String[] + { + "F5_SHIFT_MOD1" + }; + } else if (sModules[i].equals("com.sun.star.text.TextDocument")) - sKeys = new String[] { "BACKSPACE_MOD2" }; + { + sKeys = new String[] + { + "BACKSPACE_MOD2" + }; + } else - sKeys = new String[] { "C_MOD1" }; + { + sKeys = new String[] + { + "C_MOD1" + }; + } impl_checkRemoveKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys); //-------------------------------------------- String[] sCommandList; if (sModules[i].equals("com.sun.star.presentation.PresentationDocument")) - sCommandList = new String[] { ".uno:Presentation" }; + { + sCommandList = new String[] + { + ".uno:Presentation" + }; + } else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument")) - sCommandList = new String[] { ".uno:InsertCell" }; + { + sCommandList = new String[] + { + ".uno:InsertCell" + }; + } else if (sModules[i].equals("com.sun.star.text.TextDocument")) - sCommandList = new String[] { ".uno:SelectionModeBlock" }; + { + sCommandList = new String[] + { + ".uno:SelectionModeBlock" + }; + } else - sCommandList = new String[] { ".uno:Cut" }; + { + sCommandList = new String[] + { + ".uno:Cut" + }; + } impl_checkGetPreferredKeyEventsForCommandList(m_xModuleAccelCfg, xPrimaryAccess, sCommandList); } } @@ -247,17 +357,20 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase //------------------------------------------- /** @todo document me. */ + @Test public void checkDocumentAccelCfg() - throws java.lang.Exception + throws java.lang.Exception { - log.println("\n---- check Document accelerator configuration: ----"); + System.out.println("\n---- check Document accelerator configuration: ----"); String sDocCfgName; - sDocCfgName = "file:///c:/test.cfg"; + String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF()); + sDocCfgName = FileHelper.appendPath(tempDirURL, "test.cfg"); + // sDocCfgName = "file:///c:/test.cfg"; SaveDocumentAcceleratorConfiguration(sDocCfgName); - sDocCfgName = "file:///c:/test.cfg"; + // sDocCfgName = "file:///c:/test.cfg"; LoadDocumentAcceleratorConfiguration(sDocCfgName); } @@ -265,40 +378,40 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private void impl_checkGetKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xAccess, String[] sKeys) - throws java.lang.Exception + throws java.lang.Exception { - log.println("check getKeyCommands..."); + System.out.println("check getKeyCommands..."); - for (int i=0; i<sKeys.length; ++i) + for (int i = 0; i < sKeys.length; ++i) { - if (xAccess.hasByName(sKeys[i]) && getCommandFromConfiguration(xAccess, sKeys[i]).length()>0) + if (xAccess.hasByName(sKeys[i]) && getCommandFromConfiguration(xAccess, sKeys[i]).length() > 0) { - log.println("** get command by " + sKeys[i] + " **"); + System.out.println("** get command by " + sKeys[i] + " **"); String sCmdFromCache = new String(); // get a value using XAcceleratorConfiguration API String sCmdFromConfiguration = new String(); // get a value using configuration API // GET shortcuts/commands using XAcceleratorConfiguration API sCmdFromCache = xAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey(sKeys[i])); - log.println(sKeys[i] + "-->" + sCmdFromCache + ", by XAcceleratorConfiguration API"); + System.out.println(sKeys[i] + "-->" + sCmdFromCache + ", by XAcceleratorConfiguration API"); // GET shortcuts/commands using configuration API sCmdFromConfiguration = getCommandFromConfiguration(xAccess, sKeys[i]); - log.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API"); + System.out.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API"); - assure("values are different by XAcceleratorConfiguration API and configuration API!", sCmdFromCache.equals(sCmdFromConfiguration)); + assertTrue("values are different by XAcceleratorConfiguration API and configuration API!", sCmdFromCache.equals(sCmdFromConfiguration)); String sLocale = "es"; setOfficeLocale(sLocale); sCmdFromConfiguration = getCommandFromConfiguration(xAccess, sKeys[i]); - log.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API" + " for locale:"+ getOfficeLocale()); + System.out.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API" + " for locale:" + getOfficeLocale()); sLocale = "en-US"; setOfficeLocale(sLocale); //reset to default locale } else { - log.println(sKeys[i] + " doesn't exist!"); + System.out.println(sKeys[i] + " doesn't exist!"); } } } @@ -307,20 +420,24 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private void impl_checkSetKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, XNameAccess xSecondaryAccess, String[] sKeys, String[] sCommands) - throws java.lang.Exception + throws java.lang.Exception { - log.println("check setKeyCommands..."); + System.out.println("check setKeyCommands..."); - for (int i=0; i<sKeys.length; ++i) + for (int i = 0; i < sKeys.length; ++i) { if (!xPrimaryAccess.hasByName(sKeys[i]) && !xSecondaryAccess.hasByName(sKeys[i])) { xAccelCfg.setKeyEvent(convertShortcut2AWTKey(sKeys[i]), sCommands[i]); xAccelCfg.store(); if (xPrimaryAccess.hasByName(sKeys[i])) - log.println("add " + sKeys[i] + " successfully!"); + { + System.out.println("add " + sKeys[i] + " successfully!"); + } else - log.println("add " + sKeys[i] + " failed!"); + { + System.out.println("add " + sKeys[i] + " failed!"); + } } else if (xPrimaryAccess.hasByName(sKeys[i])) { @@ -332,12 +449,18 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase String sChangedCommand = getCommandFromConfiguration(xPrimaryAccess, sKeys[i]); if (sCommands[i].equals(sChangedCommand)) - log.println("change " + sKeys[i] + " successfully!"); + { + System.out.println("change " + sKeys[i] + " successfully!"); + } else - log.println("change " + sKeys[i] + " failed!"); + { + System.out.println("change " + sKeys[i] + " failed!"); + } } else - log.println(sKeys[i] + " already exist!"); + { + System.out.println(sKeys[i] + " already exist!"); + } } else if (xSecondaryAccess.hasByName(sKeys[i])) { @@ -349,12 +472,18 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase String sChangedCommand = getCommandFromConfiguration(xPrimaryAccess, sKeys[i]); if (sCommands[i].equals(sChangedCommand)) - log.println("change " + sKeys[i] + " successfully!"); + { + System.out.println("change " + sKeys[i] + " successfully!"); + } else - log.println("change " + sKeys[i] + " failed!"); + { + System.out.println("change " + sKeys[i] + " failed!"); + } } else - log.println(sKeys[i] + " already exist!"); + { + System.out.println(sKeys[i] + " already exist!"); + } } } } @@ -363,33 +492,41 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private void impl_checkRemoveKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, XNameAccess xSecondaryAccess, String[] sKeys) - throws java.lang.Exception + throws java.lang.Exception { - log.println("check removeKeyCommands..."); + System.out.println("check removeKeyCommands..."); - for (int i=0; i<sKeys.length; i++) + for (int i = 0; i < sKeys.length; i++) { if (!xPrimaryAccess.hasByName(sKeys[i]) && !xSecondaryAccess.hasByName(sKeys[i])) { - log.println(sKeys[i] + " doesn't exist!"); + System.out.println(sKeys[i] + " doesn't exist!"); } else if (xPrimaryAccess.hasByName(sKeys[i])) { xAccelCfg.removeKeyEvent(convertShortcut2AWTKey(sKeys[i])); xAccelCfg.store(); if (!xPrimaryAccess.hasByName(sKeys[i])) - log.println("Remove " + sKeys[i] + " successfully!"); + { + System.out.println("Remove " + sKeys[i] + " successfully!"); + } else - log.println("Remove " + sKeys[i] + " failed!"); + { + System.out.println("Remove " + sKeys[i] + " failed!"); + } } else if (xSecondaryAccess.hasByName(sKeys[i])) { xAccelCfg.removeKeyEvent(convertShortcut2AWTKey(sKeys[i])); xAccelCfg.store(); if (!xSecondaryAccess.hasByName(sKeys[i])) - log.println("Remove " + sKeys[i] + " successfully!"); + { + System.out.println("Remove " + sKeys[i] + " successfully!"); + } else - log.println("Remove " + sKeys[i] + " failed!"); + { + System.out.println("Remove " + sKeys[i] + " failed!"); + } } } } @@ -398,25 +535,29 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private void impl_checkGetPreferredKeyEventsForCommandList(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, String[] sCommandList) - throws java.lang.Exception + throws java.lang.Exception { - log.println("check getPreferredKeyEventsForCommandList..."); + System.out.println("check getPreferredKeyEventsForCommandList..."); Object[] oKeyEvents = xAccelCfg.getPreferredKeyEventsForCommandList(sCommandList); for (int i = 0; i < oKeyEvents.length; i++) { - log.println("get preferred key for command "+ sCommandList[i] + ":"); + System.out.println("get preferred key for command " + sCommandList[i] + ":"); - KeyEvent aKeyEvent = (KeyEvent)AnyConverter.toObject(KeyEvent.class, oKeyEvents[i]); + KeyEvent aKeyEvent = (KeyEvent) AnyConverter.toObject(KeyEvent.class, oKeyEvents[i]); String sKeyEvent = convertAWTKey2Shortcut(aKeyEvent); - log.println(sKeyEvent); + System.out.println(sKeyEvent); String sCmdFromConfiguration = getCommandFromConfiguration(xPrimaryAccess, sKeyEvent); - log.println(sCmdFromConfiguration); + System.out.println(sCmdFromConfiguration); if (sCommandList[i].equals(sCmdFromConfiguration)) - log.println("get preferred key correctly!"); + { + System.out.println("get preferred key correctly!"); + } else - log.println("get preferred key failed!"); + { + System.out.println("get preferred key failed!"); + } } } @@ -424,18 +565,20 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private String getCommandFromConfiguration(XNameAccess xAccess, String sKey) - throws java.lang.Exception + throws java.lang.Exception { String sCommand = new String(); if (xAccess.hasByName(sKey)) { - XNameAccess xKey = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xAccess.getByName(sKey)); - XNameAccess xCommand = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xKey.getByName("Command")); + XNameAccess xKey = UnoRuntime.queryInterface(XNameAccess.class, xAccess.getByName(sKey)); + XNameAccess xCommand = UnoRuntime.queryInterface(XNameAccess.class, xKey.getByName("Command")); String sLocale = getOfficeLocale(); if (xCommand.hasByName(sLocale)) - sCommand = (String)UnoRuntime.queryInterface(String.class, xCommand.getByName(sLocale)); + { + sCommand = UnoRuntime.queryInterface(String.class, xCommand.getByName(sLocale)); + } } return sCommand; @@ -445,52 +588,54 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private void insertKeyToConfiguration(XNameAccess xAccess, String sKey, String sCommand) - throws java.lang.Exception + throws java.lang.Exception { - XNameContainer xContainer = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xAccess); + XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess); if (!xContainer.hasByName(sKey)) { - XSingleServiceFactory xFac = (XSingleServiceFactory)UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer); - XInterface xInst = (XInterface)UnoRuntime.queryInterface(XInterface.class, xFac.createInstance()); + XSingleServiceFactory xFac = UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer); + XInterface xInst = UnoRuntime.queryInterface(XInterface.class, xFac.createInstance()); xContainer.insertByName(sKey, xInst); } - XNameAccess xKey = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xContainer.getByName(sKey)); - XNameContainer xCommand = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xKey.getByName("Command")); + XNameAccess xKey = UnoRuntime.queryInterface(XNameAccess.class, xContainer.getByName(sKey)); + XNameContainer xCommand = UnoRuntime.queryInterface(XNameContainer.class, xKey.getByName("Command")); String sLocale = getOfficeLocale(); if (xCommand.hasByName(sLocale)) + { xCommand.insertByName(sLocale, sCommand); + } else + { xCommand.replaceByName(sLocale, sCommand); + } } //------------------------------------------- /** @todo document me. */ private void removeKeyFromConfiguration(XNameAccess xAccess, String sKey) - throws java.lang.Exception + throws java.lang.Exception { - XNameContainer xContainer = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xAccess); + XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess); if (xContainer.hasByName(sKey)) + { xContainer.removeByName(sKey); + } } //------------------------------------------- /** @todo document me. */ private void LoadDocumentAcceleratorConfiguration(String sDocCfgName) - throws java.lang.Exception + throws java.lang.Exception { - XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface( - XSingleServiceFactory.class, - m_xSmgr.createInstance("com.sun.star.embed.StorageFactory")); + XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, m_xSmgr.createInstance("com.sun.star.embed.StorageFactory")); Object aArgs[] = new Object[2]; aArgs[0] = sDocCfgName; aArgs[1] = new Integer(com.sun.star.embed.ElementModes.READ); - XStorage xRootStorage = (XStorage)UnoRuntime.queryInterface( - XStorage.class, - xStorageFactory.createInstanceWithArguments(aArgs)); + XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xStorageFactory.createInstanceWithArguments(aArgs)); XStorage xUIConfig = xRootStorage.openStorageElement("Configurations2", com.sun.star.embed.ElementModes.READ); @@ -500,58 +645,53 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase Object[] lArgs = new Object[1]; lArgs[0] = aProp; - XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, m_xDocumentAccelCfg); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, m_xDocumentAccelCfg); xInit.initialize(lArgs); - String test = m_xDocumentAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey("F2")); - log.println(test); + // TODO: throws css::container::NoSuchElementException + try + { + String test = m_xDocumentAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey("F2")); + System.out.println(test); + } + catch(com.sun.star.container.NoSuchElementException e) + { + System.out.println("NoSuchElementException caught: " + e.getMessage()); + } } //------------------------------------------- /** @todo document me. */ private void SaveDocumentAcceleratorConfiguration(String sDocCfgName) - throws java.lang.Exception + throws java.lang.Exception { - XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface( - XSingleServiceFactory.class, - m_xSmgr.createInstance("com.sun.star.embed.StorageFactory")); + XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, m_xSmgr.createInstance("com.sun.star.embed.StorageFactory")); Object aArgs[] = new Object[2]; aArgs[0] = sDocCfgName; aArgs[1] = new Integer(com.sun.star.embed.ElementModes.WRITE); - XStorage xRootStorage = (XStorage)UnoRuntime.queryInterface( - XStorage.class, - xStorageFactory.createInstanceWithArguments(aArgs)); + XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xStorageFactory.createInstanceWithArguments(aArgs)); XStorage xUIConfig = xRootStorage.openStorageElement("Configurations2", com.sun.star.embed.ElementModes.WRITE); - XUIConfigurationManager xCfgMgr = (XUIConfigurationManager)UnoRuntime.queryInterface( - XUIConfigurationManager.class, - m_xSmgr.createInstance("com.sun.star.ui.UIConfigurationManager")); + XUIConfigurationManager xCfgMgr = UnoRuntime.queryInterface(XUIConfigurationManager.class, m_xSmgr.createInstance("com.sun.star.ui.UIConfigurationManager")); - XUIConfigurationStorage xUICfgStore = (XUIConfigurationStorage)UnoRuntime.queryInterface( - XUIConfigurationStorage.class, - xCfgMgr); + XUIConfigurationStorage xUICfgStore = UnoRuntime.queryInterface(XUIConfigurationStorage.class, xCfgMgr); xUICfgStore.setStorage(xUIConfig); - XPropertySet xUIConfigProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xUIConfig); + XPropertySet xUIConfigProps = UnoRuntime.queryInterface(XPropertySet.class, xUIConfig); xUIConfigProps.setPropertyValue("MediaType", "application/vnd.sun.xml.ui.configuration"); if (xCfgMgr != null) { - XAcceleratorConfiguration xTargetAccMgr = (XAcceleratorConfiguration)UnoRuntime.queryInterface( - XAcceleratorConfiguration.class, - xCfgMgr.getShortCutManager()); - XUIConfigurationPersistence xCommit1 = (XUIConfigurationPersistence)UnoRuntime.queryInterface( - XUIConfigurationPersistence.class, xTargetAccMgr); - XUIConfigurationPersistence xCommit2 = (XUIConfigurationPersistence)UnoRuntime.queryInterface( - XUIConfigurationPersistence.class, xCfgMgr); + XAcceleratorConfiguration xTargetAccMgr = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, xCfgMgr.getShortCutManager()); + XUIConfigurationPersistence xCommit1 = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xTargetAccMgr); + XUIConfigurationPersistence xCommit2 = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xCfgMgr); xCommit1.store(); xCommit2.store(); - XTransactedObject xCommit3 = (XTransactedObject)UnoRuntime.queryInterface( - XTransactedObject.class, xRootStorage); + XTransactedObject xCommit3 = UnoRuntime.queryInterface(XTransactedObject.class, xRootStorage); xCommit3.commit(); } } @@ -560,7 +700,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private com.sun.star.awt.KeyEvent convertShortcut2AWTKey(String sShortcut) - throws java.lang.Exception + throws java.lang.Exception { com.sun.star.awt.KeyEvent aKeyEvent = new com.sun.star.awt.KeyEvent(); KeyMapping aKeyMapping = new KeyMapping(); @@ -570,11 +710,17 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase for (int i = 1; i < sShortcutSplits.length; i++) { if (sShortcutSplits[i].equals("SHIFT")) + { aKeyEvent.Modifiers |= com.sun.star.awt.KeyModifier.SHIFT; + } else if (sShortcutSplits[i].equals("MOD1")) + { aKeyEvent.Modifiers |= com.sun.star.awt.KeyModifier.MOD1; + } else if (sShortcutSplits[i].equals("MOD2")) + { aKeyEvent.Modifiers |= com.sun.star.awt.KeyModifier.MOD2; + } } return aKeyEvent; @@ -584,7 +730,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private String convertAWTKey2Shortcut(com.sun.star.awt.KeyEvent aKeyEvent) - throws java.lang.Exception + throws java.lang.Exception { String sShortcut; @@ -592,11 +738,17 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase sShortcut = aKeyMapping.mapCode2Identifier(aKeyEvent.KeyCode); if ((aKeyEvent.Modifiers & com.sun.star.awt.KeyModifier.SHIFT) == com.sun.star.awt.KeyModifier.SHIFT) + { sShortcut += "_SHIFT"; + } if ((aKeyEvent.Modifiers & com.sun.star.awt.KeyModifier.MOD1) == com.sun.star.awt.KeyModifier.MOD1) + { sShortcut += "_MOD1"; + } if ((aKeyEvent.Modifiers & com.sun.star.awt.KeyModifier.MOD2) == com.sun.star.awt.KeyModifier.MOD2) + { sShortcut += "_MOD2"; + } return sShortcut; } @@ -605,7 +757,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private String getOfficeLocale() - throws java.lang.Exception + throws java.lang.Exception { String sLocale = new String(); @@ -615,9 +767,9 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase if (xRootConfig != null) { - XNameAccess xLocale = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N")); - XPropertySet xSet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xLocale); - sLocale = (String)xSet.getPropertyValue("ooLocale"); + XNameAccess xLocale = UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N")); + XPropertySet xSet = UnoRuntime.queryInterface(XPropertySet.class, xLocale); + sLocale = (String) xSet.getPropertyValue("ooLocale"); } return sLocale; @@ -626,8 +778,8 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase //------------------------------------------- /** @todo document me. */ - private void setOfficeLocale(String sLocale) - throws java.lang.Exception + private void setOfficeLocale(String sLocale) + throws java.lang.Exception { String sConfigPath = "org.openoffice.Setup"; boolean bReadOnly = false; @@ -635,10 +787,10 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase if (xRootConfig != null) { - XNameAccess xLocale = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N")); - XPropertySet xSet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xLocale); + XNameAccess xLocale = UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N")); + XPropertySet xSet = UnoRuntime.queryInterface(XPropertySet.class, xLocale); xSet.setPropertyValue("ooLocale", sLocale); - XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, xRootConfig); + XChangesBatch xBatch = UnoRuntime.queryInterface(XChangesBatch.class, xRootConfig); xBatch.commitChanges(); } } @@ -647,13 +799,11 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase /** @todo document me. */ private XNameAccess openConfig(XMultiServiceFactory xSMGR, - String sConfigPath , - boolean bReadOnly ) - throws java.lang.Exception + String sConfigPath, + boolean bReadOnly) + throws java.lang.Exception { - XMultiServiceFactory xConfigRoot = (XMultiServiceFactory)UnoRuntime.queryInterface( - XMultiServiceFactory.class, - xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider")); + XMultiServiceFactory xConfigRoot = UnoRuntime.queryInterface(XMultiServiceFactory.class, xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider")); PropertyValue[] lParams = new PropertyValue[2]; lParams[0] = new PropertyValue(); @@ -666,21 +816,44 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase Object aConfig; if (bReadOnly) - aConfig = xConfigRoot.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - lParams); + { + aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams); + } else - aConfig = xConfigRoot.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - lParams); + { + aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", lParams); + } - XNameAccess xConfig = (XNameAccess)UnoRuntime.queryInterface( - XNameAccess.class, - aConfig); + XNameAccess xConfig = UnoRuntime.queryInterface(XNameAccess.class, aConfig); if (xConfig == null) + { throw new com.sun.star.uno.Exception("Could not open configuration \"" + sConfigPath + "\""); + } return xConfig; } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/framework/qa/complex/accelerators/helper/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java index b0628e3cc7fd..d09a51162e7c 100644 --- a/framework/qa/complex/accelerators/helper/KeyMapping.java +++ b/framework/qa/complex/accelerators/KeyMapping.java @@ -70,7 +70,7 @@ public class KeyMapping private IdentifierHashMap aIdentifierHashMap; private CodeHashMap aCodeHashMap; - KeyMapping() + public KeyMapping() { KeyIdentifierInfo[] aInfoMap = { new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)), diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk index a0d10f68811b..189a5fddba77 100644 --- a/framework/qa/complex/accelerators/helper/makefile.mk +++ b/framework/qa/complex/accelerators/helper/makefile.mk @@ -25,10 +25,10 @@ # #************************************************************************* -PRJ = ..$/..$/..$/.. +PRJ = ../../../.. TARGET = AcceleratorsConfigurationTest PRJNAME = framework -PACKAGE = complex$/accelerators$/helper +PACKAGE = complex/accelerators/helper # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk index 3af496191d4f..7d5460324849 100644 --- a/framework/qa/complex/accelerators/makefile.mk +++ b/framework/qa/complex/accelerators/makefile.mk @@ -24,63 +24,44 @@ # for a copy of the LGPLv3 License. # #************************************************************************* +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -PRJ = ..$/..$/.. -TARGET = AcceleratorsConfigurationTest -PRJNAME = $(TARGET) -PACKAGE = complex$/accelerators - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ - OOoRunner.jar - -JAVAFILES = AcceleratorsConfigurationTest.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -SUBDIRS=helper +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_accelerators -#----- make a jar from compiled files ------------------------------ +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/accelerators -MAXLINELENGTH = 100000 +# here store only Files which contain a @Test +JAVATESTFILES = \ + AcceleratorsConfigurationTest.java -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + KeyMapping.java -# --- Parameters for the test -------------------------------------- +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +# OOoRunner.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# test base is java complex -CT_TESTBASE = -TestBase java_complex +.END -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -# start the runner application -CT_APP = org.openoffice.Runner +ALLTAR : javatest -# --- Targets ------------------------------------------------------ +.END -#.IF "$(depend)" == "" -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -#.ELSE -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -#.ENDIF -.INCLUDE : target.mk -RUN: run -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) + diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java index 432182222eeb..be979e9234ac 100755 --- a/framework/qa/complex/api_internal/CheckAPI.java +++ b/framework/qa/complex/api_internal/CheckAPI.java @@ -28,7 +28,6 @@ package complex.api_internal; // imports -import complexlib.ComplexTestCase; import helper.OfficeProvider; import helper.ProcessHandler; import com.sun.star.task.XJob; @@ -38,16 +37,27 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.uno.UnoRuntime; import com.sun.star.beans.NamedValue; -import java.io.PrintWriter; import java.util.Vector; import java.util.StringTokenizer; + +// ---------- junit imports ----------------- +import lib.TestParameters; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + /** * This test executes the API tests internally in StarOffice. Prerequiste is * that a OOoRunner.jar is registered inseide of StarOffice. Adjust the joblist * inside of the ChekAPI.props to determine which tetss will be executed. */ -public class CheckAPI extends ComplexTestCase { +public class CheckAPI { // The name of the tested service private final String testName = "StarOfficeAPI"; @@ -56,40 +66,52 @@ public class CheckAPI extends ComplexTestCase { * Return all test methods. * @return The test methods. */ - public String[] getTestMethodNames() { - return new String[]{"checkAPI"}; - } +// public String[] getTestMethodNames() { +// return new String[]{"checkAPI"}; +// } + + /** + * The test parameters + */ + private static TestParameters param = null; /** + * + */ + @Before public void before() + { + param = new TestParameters(); + } + /** * Execute the API tests inside of the Office. If the Office crashes, it * will be restarted and the job will continue after the one that caused the crash. */ - public void checkAPI() { - log.println("Start with test"); + @Test public void checkAPI() { + System.out.println("Start with test"); // if test is idle for 5 minutes, assume that it hangs and kill it. - param.put("TimeOut", new Integer("300000")); + // param.put("TimeOut", new Integer("300000")); /* AppProvider office = (AppProvider)dcl.getInstance("helper.OfficeProvider"); Object msf = office.getManager(param); if (msf == null) { failed("Could not connect an Office."); } param.put("ServiceFactory",msf); */ - XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); + XMultiServiceFactory xMSF = getMSF(); Object oObj = null; try { oObj = xMSF.createInstance("org.openoffice.RunnerService"); } catch(com.sun.star.uno.Exception e) { - failed("Could not create Instance of 'org.openoffice.RunnerService'"); - } - if ( oObj == null ) { - failed("Cannot create 'org.openoffice.RunnerService'"); + fail("Could not create Instance of 'org.openoffice.RunnerService'"); } + assertNotNull("Cannot create 'org.openoffice.RunnerService'", oObj); + // get the parameters for the internal test String paramList = (String)param.get("ParamList"); Vector p = new Vector(); StringTokenizer paramTokens = new StringTokenizer(paramList, " "); - while(paramTokens.hasMoreTokens()) { + while(paramTokens.hasMoreTokens()) + { p.add(paramTokens.nextToken()); } int length = p.size()/2+1; @@ -98,15 +120,17 @@ public class CheckAPI extends ComplexTestCase { internalParams[i] = new NamedValue(); internalParams[i].Name = (String)p.get(i*2); internalParams[i].Value = p.get(i*2+1); - log.println("Name: "+internalParams[i].Name); - log.println("Value: "+(String)internalParams[i].Value); + System.out.println("Name: "+internalParams[i].Name); + System.out.println("Value: "+(String)internalParams[i].Value); } // do we have test jobs? String testJob = (String)param.get("job"); PropertyValue[]props; - if (testJob==null) { - if ( param.get("job1")==null ) { + if (testJob==null) + { + if ( param.get("job1")==null ) + { // get all test jobs from runner service XPropertyAccess xPropAcc = (XPropertyAccess)UnoRuntime.queryInterface(XPropertyAccess.class, oObj); props = xPropAcc.getPropertyValues(); @@ -131,13 +155,13 @@ public class CheckAPI extends ComplexTestCase { props[0].Value = testJob; } - log.println("Props length: "+ props.length); + System.out.println("Props length: "+ props.length); for (int i=0; i<props.length; i++) { - XJob xJob = (XJob)UnoRuntime.queryInterface(XJob.class, oObj); + XJob xJob = UnoRuntime.queryInterface(XJob.class, oObj); internalParams[length-1] = new NamedValue(); internalParams[length-1].Name = "-o"; internalParams[length-1].Value = props[i].Value; - log.println("Executing: " + (String)props[i].Value); + System.out.println("Executing: " + (String)props[i].Value); String erg = null; @@ -146,8 +170,8 @@ public class CheckAPI extends ComplexTestCase { } catch(Throwable t) { // restart and go on with test!! - t.printStackTrace((PrintWriter)log); - failed("Test run '" + (String)props[i].Value +"' could not be executed: Office crashed and is killed!", true); + t.printStackTrace(); + fail("Test run '" + (String)props[i].Value +"' could not be executed: Office crashed and is killed!"); xMSF = null; ProcessHandler handler = (ProcessHandler)param.get("AppProvider"); handler.kill(); @@ -163,12 +187,12 @@ public class CheckAPI extends ComplexTestCase { oObj = xMSF.createInstance("org.openoffice.RunnerService"); } catch(com.sun.star.uno.Exception e) { - failed("Could not create Instance of 'org.openoffice.RunnerService'"); + fail("Could not create Instance of 'org.openoffice.RunnerService'"); } } - log.println(erg); + System.out.println(erg); String processedErg = parseResult(erg); - assure("Run '" + (String)props[i].Value + "' has result '" + processedErg + "'", processedErg == null, true); + assertTrue("Run '" + (String)props[i].Value + "' has result '" + processedErg + "'", processedErg == null); } } @@ -195,6 +219,31 @@ public class CheckAPI extends ComplexTestCase { } return processedErg; } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk index 4d82ba2da689..f1a22011a8e7 100755 --- a/framework/qa/complex/api_internal/makefile.mk +++ b/framework/qa/complex/api_internal/makefile.mk @@ -25,64 +25,39 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = CheckAPI -PRJNAME = $(TARGET) -PACKAGE = complex$/api_internal - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar -JAVAFILES = CheckAPI.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_api_internal -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/api_internal -# start the runner application -CT_APP = org.openoffice.Runner +# here store only Files which contain a @Test +JAVATESTFILES = \ + CheckAPI.java -# --- Targets ------------------------------------------------------ +# put here all other files +JAVAFILES = $(JAVATESTFILES) -.IF "$(depend)" == "" -ALL: ALLTAR $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -.ELSE -ALL: ALLDEP $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -.ENDIF +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +# OOoRunner.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props - cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props - jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -.INCLUDE : target.mk +.END -RUN: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -run: RUN +ALLTAR : javatest +.END diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java index 5318b15bc1ea..f5d41c1e02b1 100755 --- a/framework/qa/complex/broken_document/LoadDocument.java +++ b/framework/qa/complex/broken_document/LoadDocument.java @@ -27,65 +27,74 @@ package complex.broken_document; import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.FrameSearchFlag; +// import com.sun.star.frame.FrameSearchFlag; import com.sun.star.frame.XComponentLoader; import com.sun.star.frame.XFrame; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; + + +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ /** * Check, if message boxes appear when the Office is in "headless" mode. Tests * bug i15809. This test uses the broken document dbf.dbf.emf. */ -public class LoadDocument extends ComplexTestCase { +public class LoadDocument { /** defect file to load **/ - private final String mFileName = "dbf.dbf.emf"; + // private final String mFileName = "dbf.dbf.emf"; /** * Get all test methods. * @return The test methods. */ - public String[] getTestMethodNames() { - return new String[]{"checkHeadlessState"}; - } +// public String[] getTestMethodNames() { +// return new String[]{"checkHeadlessState"}; +// } /** * Start Office with "-headless" parameter, then * load the broken document "dbf.dbf.emf", that brings a message box up in * the ui, see if the headless mode of SOffice changes. */ - public void checkHeadlessState() { - XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); + @Test public void checkHeadlessState() + { + XMultiServiceFactory xMSF = getMSF(); XFrame xDesktop = null; try { - xDesktop = (XFrame)UnoRuntime.queryInterface(XFrame.class, - xMSF.createInstance("com.sun.star.frame.Desktop")); + xDesktop = UnoRuntime.queryInterface(XFrame.class, xMSF.createInstance("com.sun.star.frame.Desktop")); } catch(com.sun.star.uno.Exception e) { - failed("Could not create a desktop instance."); + fail("Could not create a desktop instance."); } - XComponentLoader xDesktopLoader = (XComponentLoader) - UnoRuntime.queryInterface(XComponentLoader.class, xDesktop); + XComponentLoader xDesktopLoader = UnoRuntime.queryInterface(XComponentLoader.class, xDesktop); System.out.println("xDektopLoader is null: " + (xDesktopLoader == null)); PropertyValue[] val = new PropertyValue[0]; - String workingDir = (String)param.get("WorkingDir") + System.getProperty("file.separator") + mFileName; - System.out.println("Working dir: " + workingDir); - String fileUrl = util.utils.getFullURL(workingDir); + // String workingDir = (String)param.get("WorkingDir") + System.getProperty("file.separator") + mFileName; + // System.out.println("Working dir: " + workingDir); + String fileUrl = complex.broken_document.TestDocument.getUrl("dbf.dbf.emf"); System.out.println("File Url: " + fileUrl); try { xDesktopLoader.loadComponentFromURL(fileUrl, "_blank", 0, val); } catch(com.sun.star.io.IOException e) { - failed("Could not load document"); + fail("Could not load document"); } catch(com.sun.star.lang.IllegalArgumentException e) { - failed("Could not load document"); + fail("Could not load document"); } // try again: headless mode defect now? @@ -93,11 +102,35 @@ public class LoadDocument extends ComplexTestCase { xDesktopLoader.loadComponentFromURL(fileUrl, "_blank", 0, val); } catch(com.sun.star.io.IOException e) { - failed("Could not load document"); + fail("Could not load document"); } catch(com.sun.star.lang.IllegalArgumentException e) { - failed("Could not load document"); + fail("Could not load document"); } } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/configmgr/source/pad.hxx b/framework/qa/complex/broken_document/TestDocument.java index 66a51f480023..c282790211e3 100644 --- a/configmgr/source/pad.hxx +++ b/framework/qa/complex/broken_document/TestDocument.java @@ -25,37 +25,17 @@ * ************************************************************************/ -#ifndef INCLUDED_CONFIGMGR_SOURCE_PAD_HXX -#define INCLUDED_CONFIGMGR_SOURCE_PAD_HXX +package complex.broken_document; -#include "sal/config.h" +import java.io.File; +import org.openoffice.test.OfficeFileUrl; -#include "rtl/strbuf.hxx" -#include "sal/types.h" - -#include "span.hxx" - -namespace configmgr { - -class Pad { -public: - void add(char const * begin, sal_Int32 length); - - void addEphemeral(char const * begin, sal_Int32 length); - - void clear(); - - bool is() const; - - Span get() const; - -private: - void flushSpan(); - - Span span_; - rtl::OStringBuffer buffer_; -}; +final class TestDocument +{ + public static String getUrl(String name) + { + return OfficeFileUrl.getAbsolute(new File("test_documents", name)); + } + private TestDocument() {} } - -#endif diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk index c8f24a937159..8b1cf2ac3bfd 100755 --- a/framework/qa/complex/broken_document/makefile.mk +++ b/framework/qa/complex/broken_document/makefile.mk @@ -25,56 +25,41 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = CheckHeadlessState -PRJNAME = $(TARGET) -PACKAGE = complex$/broken_document -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = LoadDocument.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_broken_document -# --- Parameters for the test -------------------------------------- +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/broken_document -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# here store only Files which contain a @Test +JAVATESTFILES = \ + LoadDocument.java -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +# OOoRunner.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# start the runner application -CT_APP = org.openoffice.Runner +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# the current directory for loading the document -CT_WORKDIR = -WorkingDir $(PWD) +.END -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk +ALLTAR : javatest -RUN: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TEST) +.END -run: RUN diff --git a/framework/qa/complex/broken_document/dbf.dbf.emf b/framework/qa/complex/broken_document/test_documents/dbf.dbf.emf index 11e45e9df5d1..11e45e9df5d1 100755 --- a/framework/qa/complex/broken_document/dbf.dbf.emf +++ b/framework/qa/complex/broken_document/test_documents/dbf.dbf.emf diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index 556cadc7d1b0..471f5246b787 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -1,4 +1,4 @@ -package contextMenuInterceptor; +package complex.contextMenuInterceptor; import com.sun.star.accessibility.AccessibleRole; import com.sun.star.accessibility.XAccessible; @@ -9,102 +9,119 @@ import com.sun.star.awt.Rectangle; import com.sun.star.awt.XBitmap; import com.sun.star.awt.XExtendedToolkit; import com.sun.star.awt.XWindow; -import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.XPropertySetInfo; -import com.sun.star.container.XIndexAccess; import com.sun.star.drawing.XShape; -import com.sun.star.frame.XComponentLoader; -import com.sun.star.frame.XController; -import com.sun.star.frame.XDesktop; import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; import com.sun.star.lang.IndexOutOfBoundsException; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XInitialization; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XTypeProvider; -import com.sun.star.text.XTextDocument; -import com.sun.star.ui.XContextMenuInterceptor; import com.sun.star.ui.XContextMenuInterception; +import com.sun.star.ui.XContextMenuInterceptor; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; -import com.sun.star.uno.Exception; -import com.sun.star.util.CloseVetoException; import com.sun.star.util.XCloseable; -import com.sun.star.view.XViewSettingsSupplier; -import complexlib.ComplexTestCase; import java.awt.Robot; import java.awt.event.InputEvent; -import java.io.PrintWriter; -import share.LogWriter; +import java.io.File; import util.AccessibilityTools; import util.DesktopTools; import util.DrawTools; import util.SOfficeFactory; import util.utils; +import org.openoffice.test.OfficeFileUrl; + +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ /** * */ -public class CheckContextMenuInterceptor extends ComplexTestCase { +public class CheckContextMenuInterceptor +{ + XMultiServiceFactory xMSF = null; XFrame xFrame = null; Point point = null; XWindow xWindow = null; + com.sun.star.lang.XComponent xDrawDoc; - public void before() { - xMSF = (XMultiServiceFactory)param.getMSF(); + @Before + public void before() + { + xMSF = getMSF(); } - public void after() { - log.println("release the popup menu"); - try { + @After + public void after() + { + System.out.println("release the popup menu"); + try + { Robot rob = new Robot(); int x = point.X; int y = point.Y; rob.mouseMove(x, y); rob.mousePress(InputEvent.BUTTON1_MASK); rob.mouseRelease(InputEvent.BUTTON1_MASK); - } catch (java.awt.AWTException e) { - log.println("couldn't press mouse button"); + } + catch (java.awt.AWTException e) + { + System.out.println("couldn't press mouse button"); } - com.sun.star.util.XCloseable xClose = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface( - com.sun.star.util.XCloseable.class, xFrame); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame); try { - xClose.close(false); + xClose.close(true); } - catch(com.sun.star.util.CloseVetoException exVeto) + catch (com.sun.star.util.CloseVetoException exVeto) { - failed("Test frame couldn't be closed successfully."); + fail("Test frame couldn't be closed successfully."); } xFrame = null; - } - public String[] getTestMethodNames() { - return new String[]{"checkContextMenuInterceptor"}; +// xClose = UnoRuntime.queryInterface(XCloseable.class, xDrawDoc); +// try +// { +// xClose.close(true); +// } +// catch (com.sun.star.util.CloseVetoException exVeto) +// { +// fail("Test DrawDoc couldn't be closed successfully."); +// } + } - public void checkContextMenuInterceptor() { - log.println(" **** Context Menu Interceptor *** "); +// public String[] getTestMethodNames() { +// return new String[]{"checkContextMenuInterceptor"}; +// } + @Test + public void checkContextMenuInterceptor() + { + System.out.println(" **** Context Menu Interceptor *** "); - try { + try + { // intialize the test document - com.sun.star.lang.XComponent xDrawDoc = DrawTools.createDrawDoc(xMSF); + xDrawDoc = DrawTools.createDrawDoc(xMSF); - SOfficeFactory SOF = SOfficeFactory.getFactory( xMSF); - XShape oShape = SOF.createShape(xDrawDoc,5000,5000,1500,1000,"GraphicObject"); - DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); + SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF); + XShape oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, "GraphicObject"); + DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape); com.sun.star.frame.XModel xModel = - (com.sun.star.frame.XModel)UnoRuntime.queryInterface( - com.sun.star.frame.XModel.class, xDrawDoc); + UnoRuntime.queryInterface(com.sun.star.frame.XModel.class, xDrawDoc); // get the frame for later usage xFrame = xModel.getCurrentController().getFrame(); @@ -115,143 +132,166 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { XBitmap xBitmap = null; // adding graphic as ObjRelation for GraphicObjectShape - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); - log.println( "Inserting a shape into the document"); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape); + System.out.println("Inserting a shape into the document"); try { - oShapeProps.setPropertyValue( - "GraphicURL",util.utils.getFullTestURL("space-metal.jpg")); - xBitmap = (XBitmap) AnyConverter.toObject( - new Type(XBitmap.class),oShapeProps.getPropertyValue - ("GraphicObjectFillBitmap")); - } catch (com.sun.star.lang.WrappedTargetException e) { - } catch (com.sun.star.lang.IllegalArgumentException e) { - } catch (com.sun.star.beans.PropertyVetoException e) { - } catch (com.sun.star.beans.UnknownPropertyException e) { + String sFile = OfficeFileUrl.getAbsolute(new File("space-metal.jpg")); + // String sFile = util.utils.getFullTestURL("space-metal.jpg"); + oShapeProps.setPropertyValue("GraphicURL", sFile); + Object oProp = oShapeProps.getPropertyValue("GraphicObjectFillBitmap"); + xBitmap = (XBitmap) AnyConverter.toObject(new Type(XBitmap.class), oProp); + } + catch (com.sun.star.lang.WrappedTargetException e) + { + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + } + catch (com.sun.star.beans.PropertyVetoException e) + { + } + catch (com.sun.star.beans.UnknownPropertyException e) + { } // reuse the frame com.sun.star.frame.XController xController = xFrame.getController(); - com.sun.star.ui.XContextMenuInterception xContextMenuInterception = null; - com.sun.star.ui.XContextMenuInterceptor xContextMenuInterceptor = null; + XContextMenuInterception xContextMenuInterception = null; + XContextMenuInterceptor xContextMenuInterceptor = null; - if ( xController != null ) + if (xController != null) { - log.println( "Creating context menu interceptor"); + System.out.println("Creating context menu interceptor"); // add our context menu interceptor xContextMenuInterception = - (com.sun.star.ui.XContextMenuInterception)UnoRuntime.queryInterface( - com.sun.star.ui.XContextMenuInterception.class, xController ); + UnoRuntime.queryInterface(XContextMenuInterception.class, xController); - if( xContextMenuInterception != null ) + if (xContextMenuInterception != null) { - ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor( xBitmap ); + ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor(xBitmap); xContextMenuInterceptor = - (com.sun.star.ui.XContextMenuInterceptor)UnoRuntime.queryInterface( - com.sun.star.ui.XContextMenuInterceptor.class, aContextMenuInterceptor ); + UnoRuntime.queryInterface(XContextMenuInterceptor.class, aContextMenuInterceptor); - log.println( "Register context menu interceptor"); - xContextMenuInterception.registerContextMenuInterceptor( xContextMenuInterceptor ); + System.out.println("Register context menu interceptor"); + xContextMenuInterception.registerContextMenuInterceptor(xContextMenuInterceptor); } } - // utils.shortWait(10000); + // utils.shortWait(10000); - openContextMenu((XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc)); + openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc)); checkHelpEntry(); // remove our context menu interceptor - if ( xContextMenuInterception != null && - xContextMenuInterceptor != null ) { - log.println( "Release context menu interceptor"); + if (xContextMenuInterception != null + && xContextMenuInterceptor != null) + { + System.out.println("Release context menu interceptor"); xContextMenuInterception.releaseContextMenuInterceptor( - xContextMenuInterceptor ); + xContextMenuInterceptor); } } - catch ( com.sun.star.uno.RuntimeException ex ) { - ex.printStackTrace((PrintWriter)log); - failed("Runtime exception caught!" + ex.getMessage()); + catch (com.sun.star.uno.RuntimeException ex) + { + // ex.printStackTrace(); + fail("Runtime exception caught!" + ex.getMessage()); } - catch ( java.lang.Exception ex ) { - ex.printStackTrace((PrintWriter)log); - failed("Java lang exception caught!" + ex.getMessage()); + catch (java.lang.Exception ex) + { + // ex.printStackTrace(); + fail("Java lang exception caught!" + ex.getMessage()); } } - private void checkHelpEntry(){ + private void checkHelpEntry() + { XInterface toolkit = null; - log.println("get accesibility..."); - try{ + System.out.println("get accesibility..."); + try + { toolkit = (XInterface) xMSF.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e){ - log.println("could not get Toolkit " + e.toString()); } - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); + catch (com.sun.star.uno.Exception e) + { + System.out.println("could not get Toolkit " + e.toString()); + } + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); XAccessible xRoot = null; AccessibilityTools at = new AccessibilityTools(); - try { - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, - tk.getTopWindow(0)); + try + { + xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); xRoot = at.getAccessibleObject(xWindow); // at.printAccessibleTree((PrintWriter)log, xRoot, param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - at.printAccessibleTree((PrintWriter)log, xRoot, true); + // at.printAccessibleTree(System.out, xRoot, true); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Couldn't get Window"); + System.out.println("Couldn't get Window"); } XAccessibleContext oPopMenu = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU); - log.println("ImplementationName: " + util.utils.getImplName(oPopMenu)); + System.out.println("ImplementationName: " + util.utils.getImplName(oPopMenu)); XAccessible xHelp = null; - try{ - log.println("Try to get first entry of context menu..."); + try + { + System.out.println("Try to get first entry of context menu..."); xHelp = oPopMenu.getAccessibleChild(0); - } catch (IndexOutOfBoundsException e){ - failed("Not possible to get first entry of context menu"); + } + catch (IndexOutOfBoundsException e) + { + fail("Not possible to get first entry of context menu"); } - if (xHelp == null) failed("first entry of context menu is NULL"); + if (xHelp == null) + { + fail("first entry of context menu is NULL"); + } XAccessibleContext xHelpCont = xHelp.getAccessibleContext(); - if ( xHelpCont == null ) - failed("No able to retrieve accessible context from first entry of context menu"); + if (xHelpCont == null) + { + fail("No able to retrieve accessible context from first entry of context menu"); + } String aAccessibleName = xHelpCont.getAccessibleName(); - if ( !aAccessibleName.equals( "Help" )) { - log.println("Accessible name found = "+aAccessibleName ); - failed("First entry of context menu is not from context menu interceptor"); + if (!aAccessibleName.equals("Help")) + { + System.out.println("Accessible name found = " + aAccessibleName); + fail("First entry of context menu is not from context menu interceptor"); } try { - log.println("try to get first children of Help context..."); + System.out.println("try to get first children of Help context..."); XAccessible xHelpChild = xHelpCont.getAccessibleChild(0); - } catch (IndexOutOfBoundsException e){ - failed("not possible to get first children of Help context"); + } + catch (IndexOutOfBoundsException e) + { + fail("not possible to get first children of Help context"); } } - private void openContextMenu(XModel aModel){ + private void openContextMenu(XModel aModel) + { - log.println("try to open contex menu..."); + System.out.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); xWindow = at.getCurrentWindow(xMSF, aModel); @@ -260,14 +300,14 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); - XAccessibleComponent window = (XAccessibleComponent) UnoRuntime.queryInterface( - XAccessibleComponent.class, oObj); + XAccessibleComponent window = UnoRuntime.queryInterface(XAccessibleComponent.class, oObj); point = window.getLocationOnScreen(); Rectangle rect = window.getBounds(); - log.println("klick mouse button..."); - try { + System.out.println("klick mouse button..."); + try + { Robot rob = new Robot(); int x = point.X + (rect.Width / 2); int y = point.Y + (rect.Height / 2); @@ -277,11 +317,36 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { System.out.println("Release Button"); rob.mouseRelease(InputEvent.BUTTON3_MASK); System.out.println("done"); - } catch (java.awt.AWTException e) { - log.println("couldn't press mouse button"); + } + catch (java.awt.AWTException e) + { + System.out.println("couldn't press mouse button"); } utils.shortWait(3000); } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index cb0d95900c6f..6455807f5630 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -1,24 +1,21 @@ -package contextMenuInterceptor; +package complex.contextMenuInterceptor; import com.sun.star.ui.*; -import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XIndexContainer; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.Exception; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.lang.IllegalArgumentException; -public class ContextMenuInterceptor implements XContextMenuInterceptor { +public class ContextMenuInterceptor implements XContextMenuInterceptor +{ - private com.sun.star.awt.XBitmap myBitmap; + private com.sun.star.awt.XBitmap myBitmap; - public ContextMenuInterceptor( com.sun.star.awt.XBitmap aBitmap ) { - myBitmap = aBitmap; - } + public ContextMenuInterceptor(com.sun.star.awt.XBitmap aBitmap) + { + myBitmap = aBitmap; + } - public ContextMenuInterceptorAction notifyContextMenuExecute( - com.sun.star.ui.ContextMenuExecuteEvent aEvent ) throws RuntimeException + public ContextMenuInterceptorAction notifyContextMenuExecute( + com.sun.star.ui.ContextMenuExecuteEvent aEvent) throws RuntimeException { try { @@ -26,103 +23,90 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { // create sub menus, menu entries and separators com.sun.star.container.XIndexContainer xContextMenu = aEvent.ActionTriggerContainer; com.sun.star.lang.XMultiServiceFactory xMenuElementFactory = - (com.sun.star.lang.XMultiServiceFactory)UnoRuntime.queryInterface( - com.sun.star.lang.XMultiServiceFactory.class, xContextMenu ); + UnoRuntime.queryInterface(com.sun.star.lang.XMultiServiceFactory.class, xContextMenu); - if ( xMenuElementFactory != null ) + if (xMenuElementFactory != null) { // create root menu entry for sub menu and sub menu com.sun.star.beans.XPropertySet xRootMenuEntry = - (XPropertySet)UnoRuntime.queryInterface( - com.sun.star.beans.XPropertySet.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); + UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); // create a line separator for our new help sub menu com.sun.star.beans.XPropertySet xSeparator = - (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface( - com.sun.star.beans.XPropertySet.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) ); - Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE ); - xSeparator.setPropertyValue( "SeparatorType", (Object)aSeparatorType ); + UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator")); + Short aSeparatorType = new Short(ActionTriggerSeparatorType.LINE); + xSeparator.setPropertyValue("SeparatorType", (Object) aSeparatorType); // query sub menu for index container to get access com.sun.star.container.XIndexContainer xSubMenuContainer = - (com.sun.star.container.XIndexContainer)UnoRuntime.queryInterface( - com.sun.star.container.XIndexContainer.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer" )); + UnoRuntime.queryInterface(com.sun.star.container.XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer")); // intialize root menu entry "Help" - xRootMenuEntry.setPropertyValue( "Text", new String( "Help" )); - xRootMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5410" )); - xRootMenuEntry.setPropertyValue( "HelpURL", new String( "5410" )); - xRootMenuEntry.setPropertyValue( "SubContainer", (Object)xSubMenuContainer ); - xRootMenuEntry.setPropertyValue( "Image", myBitmap ); + xRootMenuEntry.setPropertyValue("Text", ("Help")); + xRootMenuEntry.setPropertyValue("CommandURL", ("slot:5410")); + xRootMenuEntry.setPropertyValue("HelpURL", ("5410")); + xRootMenuEntry.setPropertyValue("SubContainer", (Object) xSubMenuContainer); + xRootMenuEntry.setPropertyValue("Image", myBitmap); // create menu entries for the new sub menu // intialize help/content menu entry // entry "Content" - XPropertySet xMenuEntry = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, xMenuElementFactory.createInstance ( - "com.sun.star.ui.ActionTrigger" )); - xMenuEntry.setPropertyValue( "Text", new String( "Content" )); - xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5401" )); - xMenuEntry.setPropertyValue( "HelpURL", new String( "5401" )); + XPropertySet xMenuEntry = UnoRuntime.queryInterface(XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); + xMenuEntry.setPropertyValue("Text", ("Content")); + xMenuEntry.setPropertyValue("CommandURL", ("slot:5401")); + xMenuEntry.setPropertyValue("HelpURL", ("5401")); // insert menu entry to sub menu - xSubMenuContainer.insertByIndex ( 0, (Object)xMenuEntry ); + xSubMenuContainer.insertByIndex(0, (Object) xMenuEntry); // intialize help/help agent // entry "Help Agent" - xMenuEntry = (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface( - com.sun.star.beans.XPropertySet.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); - xMenuEntry.setPropertyValue( "Text", new String( "Help Agent" )); - xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5962" )); - xMenuEntry.setPropertyValue( "HelpURL", new String( "5962" )); + xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); + xMenuEntry.setPropertyValue("Text", ("Help Agent")); + xMenuEntry.setPropertyValue("CommandURL", ("slot:5962")); + xMenuEntry.setPropertyValue("HelpURL", ("5962")); // insert menu entry to sub menu - xSubMenuContainer.insertByIndex( 1, (Object)xMenuEntry ); + xSubMenuContainer.insertByIndex(1, (Object) xMenuEntry); // intialize help/tips // entry "Tips" - xMenuEntry = (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface( - com.sun.star.beans.XPropertySet.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); - xMenuEntry.setPropertyValue( "Text", new String( "Tips" )); - xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5404" )); - xMenuEntry.setPropertyValue( "HelpURL", new String( "5404" )); + xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); + xMenuEntry.setPropertyValue("Text", ("Tips")); + xMenuEntry.setPropertyValue("CommandURL", ("slot:5404")); + xMenuEntry.setPropertyValue("HelpURL", ("5404")); // insert menu entry to sub menu - xSubMenuContainer.insertByIndex ( 2, (Object)xMenuEntry ); + xSubMenuContainer.insertByIndex(2, (Object) xMenuEntry); // add separator into the given context menu - xContextMenu.insertByIndex ( 0, (Object)xSeparator ); + xContextMenu.insertByIndex(0, (Object) xSeparator); // add new sub menu into the given context menu - xContextMenu.insertByIndex ( 0, (Object)xRootMenuEntry ); + xContextMenu.insertByIndex(0, (Object) xRootMenuEntry); // The controller should execute the modified context menu and stop notifying other // interceptors. - return com.sun.star.ui.ContextMenuInterceptorAction.EXECUTE_MODIFIED ; + return com.sun.star.ui.ContextMenuInterceptorAction.EXECUTE_MODIFIED; } } - catch ( com.sun.star.beans.UnknownPropertyException ex ) + catch (com.sun.star.beans.UnknownPropertyException ex) { // do something useful // we used a unknown property } - catch ( com.sun.star.lang.IndexOutOfBoundsException ex ) + catch (com.sun.star.lang.IndexOutOfBoundsException ex) { // do something useful // we used an invalid index for accessing a container } - catch ( com.sun.star.uno.Exception ex ) + catch (com.sun.star.uno.Exception ex) { // something strange has happend! } - catch ( java.lang.Throwable ex ) + catch (java.lang.Throwable ex) { - // catch java exceptions � do something useful + // catch java exceptions do something useful } return com.sun.star.ui.ContextMenuInterceptorAction.IGNORED; diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk index f8dcaf26d208..574d98641468 100644 --- a/framework/qa/complex/contextMenuInterceptor/makefile.mk +++ b/framework/qa/complex/contextMenuInterceptor/makefile.mk @@ -25,53 +25,39 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = ContextMenuInterceptor -PRJNAME = framework -PACKAGE = contextMenuInterceptor - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = ContextMenuInterceptor.java CheckContextMenuInterceptor.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_contextMenuInterceptor -# --- Parameters for the test -------------------------------------- +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/contextMenuInterceptor -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand \ - "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# here store only Files which contain a @Test +JAVATESTFILES = \ + CheckContextMenuInterceptor.java -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + ContextMenuInterceptor.java -# replace $/ with . in package name -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +# OOoRunner.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# start the runner application -CT_APP = org.openoffice.Runner +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# --- Targets ------------------------------------------------------ +.END -.INCLUDE : target.mk +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -RUN: run +ALLTAR : javatest -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) -tdoc \\margritte\qaapi\workspace\qadev\testdocs $(CT_PACKAGE).CheckContextMenuInterceptor +.END diff --git a/framework/qa/complex/contextMenuInterceptor/space-metal.jpg b/framework/qa/complex/contextMenuInterceptor/space-metal.jpg Binary files differnew file mode 100644 index 000000000000..d23344389073 --- /dev/null +++ b/framework/qa/complex/contextMenuInterceptor/space-metal.jpg diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java index 88cfa433aa31..0f385edf0cb0 100755 --- a/framework/qa/complex/desktop/DesktopTerminate.java +++ b/framework/qa/complex/desktop/DesktopTerminate.java @@ -27,51 +27,46 @@ package complex.desktop; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.lang.XInitialization; -import com.sun.star.uno.Type; -import com.sun.star.uno.Any; -import com.sun.star.lang.XTypeProvider; -import com.sun.star.lang.XSingleServiceFactory; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XComponent; import com.sun.star.frame.XDesktop; -import com.sun.star.frame.XFramesSupplier; -import com.sun.star.frame.XFrames; -import com.sun.star.registry.XRegistryKey; -import com.sun.star.comp.loader.FactoryHelper; -import com.sun.star.container.XIndexAccess; -import com.sun.star.beans.XPropertySet; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.AnyConverter; -import com.sun.star.frame.XComponentLoader; -import com.sun.star.awt.Rectangle; -import com.sun.star.util.XCloseable; -import helper.ConfigurationRead; -import complexlib.ComplexTestCase; import helper.OfficeProvider; //import complex.persistent_window_states.helper.DocumentHandle; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + /** * Parameters: * <ul> * <li>NoOffice=yes - StarOffice is not started initially.</li> * </ul> */ -public class DesktopTerminate extends ComplexTestCase { +public class DesktopTerminate +{ private XMultiServiceFactory xMSF; - private OfficeProvider oProvider; - private int iOfficeCloseTime = 0; + private int iOfficeCloseTime = 1000; /** * A frunction to tell the framework, which test functions are available. * Right now, it's only 'checkPersistentWindowState'. * @return All test methods. */ - public String[] getTestMethodNames() { - return new String[]{"checkPersistentWindowState"}; - } +// public String[] getTestMethodNames() +// { +// return new String[] +// { +// "checkPersistentWindowState" +// }; +// } /** * Test if all available document types change the @@ -94,65 +89,107 @@ public class DesktopTerminate extends ComplexTestCase { * - close office * - Test finished */ - public void checkPersistentWindowState() + @Test public void checkPersistentWindowState() { - try { - - log.println("Connect the first time."); - log.println("AppExecCommand: " + (String)param.get("AppExecutionCommand")); - log.println("ConnString: " + (String)param.get("ConnectionString")); - oProvider = new OfficeProvider(); - iOfficeCloseTime = param.getInt("OfficeCloseTime"); - if ( iOfficeCloseTime == 0 ) { - iOfficeCloseTime = 1000; - } + try + { - if (!connect()) return; + System.out.println("Connect the first time."); +// System.out.println("AppExecCommand: " + (String) param.get("AppExecutionCommand")); +// System.out.println("ConnString: " + (String) param.get("ConnectionString")); +// oProvider = new OfficeProvider(); +// iOfficeCloseTime = param.getInt("OfficeCloseTime"); +// if (iOfficeCloseTime == 0) +// { +// iOfficeCloseTime = 1000; +// } + + if (!connect()) + { + return; + } - if (!disconnect()) return; + if (!disconnect()) + { + return; + } } - catch(Exception e) { + catch (Exception e) + { e.printStackTrace(); } } - private boolean connect() { - try { - xMSF = (XMultiServiceFactory)oProvider.getManager(param); - try { + private boolean connect() + { + try + { + xMSF = getMSF(); + try + { Thread.sleep(10000); } - catch(java.lang.InterruptedException e) {} + catch (java.lang.InterruptedException e) + { + } } - catch (java.lang.Exception e) { - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Cannot connect the Office."); + catch (java.lang.Exception e) + { + System.out.println(e.getClass().getName()); + System.out.println("Message: " + e.getMessage()); + fail("Cannot connect the Office."); return false; } return true; } - private boolean disconnect() { - try { + private boolean disconnect() + { + try + { XDesktop desk = null; - desk = (XDesktop) UnoRuntime.queryInterface( - XDesktop.class, xMSF.createInstance( - "com.sun.star.frame.Desktop")); + desk = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop")); desk.terminate(); - log.println("Waiting " + iOfficeCloseTime + " milliseconds for the Office to close down"); - try { + System.out.println("Waiting " + iOfficeCloseTime + " milliseconds for the Office to close down"); + try + { Thread.sleep(iOfficeCloseTime); } - catch(java.lang.InterruptedException e) {} + catch (java.lang.InterruptedException e) + { + } xMSF = null; } - catch (java.lang.Exception e) { + catch (java.lang.Exception e) + { e.printStackTrace(); - failed("Cannot dispose the Office."); + fail("Cannot dispose the Office."); return false; } return true; } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + // don't do a tearDown here, desktop is already terminated. + // connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk index 3ad4801eb0d5..74db8d34e160 100755 --- a/framework/qa/complex/desktop/makefile.mk +++ b/framework/qa/complex/desktop/makefile.mk @@ -25,55 +25,38 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = DesktopTerminate -PRJNAME = $(TARGET) -PACKAGE = complex$/desktop - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DesktopTerminate.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_desktop + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/desktop -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# here store only Files which contain a @Test +JAVATESTFILES = \ + DesktopTerminate.java -# start the runner application -CT_APP = org.openoffice.Runner +# put here all other files +JAVAFILES = $(JAVATESTFILES) -# --- Targets ------------------------------------------------------ +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +# OOoRunner.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -.INCLUDE : target.mk +.END -RUN: run +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) -NoOffice yes $(CT_TESTBASE) $(CT_TEST) +ALLTAR : javatest +.END diff --git a/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java index a5b6b25c69d5..fc5b57b1215e 100644 --- a/framework/qa/complex/dispatches/helper/Interceptor.java +++ b/framework/qa/complex/dispatches/Interceptor.java @@ -32,19 +32,18 @@ package complex.dispatches; import com.sun.star.beans.PropertyValue; // exceptions -import com.sun.star.uno.Exception; -import com.sun.star.uno.RuntimeException; - -// interfaces -import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.DispatchDescriptor; import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XDispatchProviderInterceptor; -import com.sun.star.frame.XDispatchProviderInterception; import com.sun.star.frame.XInterceptorInfo; +import com.sun.star.frame.XStatusListener; + +// interfaces + // helper -import com.sun.star.uno.UnoRuntime; -import share.LogWriter; +import com.sun.star.util.URL; // others //import java.lang.*; @@ -54,10 +53,10 @@ import share.LogWriter; /** * implements a configurable interceptor for dispatch events. */ -public class Interceptor implements com.sun.star.frame.XDispatchProvider, - com.sun.star.frame.XDispatch, - com.sun.star.frame.XDispatchProviderInterceptor, - com.sun.star.frame.XInterceptorInfo +public class Interceptor implements XDispatchProvider, + XDispatch, + XDispatchProviderInterceptor, + XInterceptorInfo { // ____________________ @@ -88,8 +87,8 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, The slave can be used inside queryDispatch() to forward requests, which are not handled by this interceptor instance. */ - private com.sun.star.frame.XDispatchProvider m_xSlave = null; - private com.sun.star.frame.XDispatchProvider m_xMaster = null; + private XDispatchProvider m_xSlave = null; + private XDispatchProvider m_xMaster = null; // ____________________ @@ -107,20 +106,14 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, */ private boolean m_bIsRegistered = false; - // ____________________ - - /** used for log output. - */ - private LogWriter m_aLog; // ____________________ /** ctor * It's initialize an object of this class with default values. */ - public Interceptor(LogWriter aLog) + public Interceptor() { - m_aLog = aLog; } // ____________________ @@ -134,27 +127,27 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, // ____________________ /** XDispatchProviderInterceptor */ - public synchronized com.sun.star.frame.XDispatchProvider getSlaveDispatchProvider() + public synchronized XDispatchProvider getSlaveDispatchProvider() { - m_aLog.println("Interceptor.getSlaveDispatchProvider() called"); + System.out.println("Interceptor.getSlaveDispatchProvider() called"); return m_xSlave; } // ____________________ /** XDispatchProviderInterceptor */ - public synchronized com.sun.star.frame.XDispatchProvider getMasterDispatchProvider() + public synchronized XDispatchProvider getMasterDispatchProvider() { - m_aLog.println("Interceptor.getMasterDispatchProvider() called"); + System.out.println("Interceptor.getMasterDispatchProvider() called"); return m_xMaster; } // ____________________ /** XDispatchProviderInterceptor */ - public synchronized void setSlaveDispatchProvider(com.sun.star.frame.XDispatchProvider xSlave) + public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave) { - m_aLog.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called"); + System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called"); if (xSlave != null) { @@ -162,7 +155,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, m_bIsRegistered = true; } else + { m_bIsRegistered = false; + } m_xSlave = xSlave; } @@ -170,9 +165,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, // ____________________ /** XDispatchProviderInterceptor */ - public synchronized void setMasterDispatchProvider(com.sun.star.frame.XDispatchProvider xMaster) + public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster) { - m_aLog.println("Interceptor.setMasterDispatchProvider("+xMaster+") called"); + System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called"); m_xMaster = xMaster; } @@ -180,25 +175,25 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, /** XDispatchProvider */ - public synchronized com.sun.star.frame.XDispatch queryDispatch(com.sun.star.util.URL aURL , + public synchronized XDispatch queryDispatch(URL aURL , String sTargetFrameName, int nSearchFlags ) { - m_aLog.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called"); + System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called"); if (impl_isBlockedURL(aURL.Complete)) { - m_aLog.println("Interceptor.queryDispatch(): URL blocked => returns NULL"); + System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL"); return null; } if (m_xSlave != null) { - m_aLog.println("Interceptor.queryDispatch(): ask slave ..."); + System.out.println("Interceptor.queryDispatch(): ask slave ..."); return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags); } - m_aLog.println("Interceptor.queryDispatch(): no idea => returns this"); + System.out.println("Interceptor.queryDispatch(): no idea => returns this"); return this; } @@ -206,12 +201,12 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, /** XDispatchProvider */ - public com.sun.star.frame.XDispatch[] queryDispatches(com.sun.star.frame.DispatchDescriptor[] lRequests) + public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests) { int i = 0; int c = lRequests.length; - com.sun.star.frame.XDispatch[] lResults = new com.sun.star.frame.XDispatch[c]; + XDispatch[] lResults = new XDispatch[c]; for (i=0; i<c; ++i) { lResults[i] = queryDispatch(lRequests[i].FeatureURL , @@ -226,30 +221,30 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, /** XDispatch */ - public synchronized void dispatch(com.sun.star.util.URL aURL , - com.sun.star.beans.PropertyValue[] lArguments) + public synchronized void dispatch(URL aURL , + PropertyValue[] lArguments) { - m_aLog.println("Interceptor.dispatch('"+aURL.Complete+"') called"); + System.out.println("Interceptor.dispatch('"+aURL.Complete+"') called"); } // ____________________ /** XDispatch */ - public synchronized void addStatusListener(com.sun.star.frame.XStatusListener xListener, + public synchronized void addStatusListener(XStatusListener xListener, com.sun.star.util.URL aURL ) { - m_aLog.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called"); + System.out.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called"); } // ____________________ /** XDispatch */ - public synchronized void removeStatusListener(com.sun.star.frame.XStatusListener xListener, + public synchronized void removeStatusListener(XStatusListener xListener, com.sun.star.util.URL aURL ) { - m_aLog.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called"); + System.out.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called"); } // ____________________ @@ -332,7 +327,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider, for (i=0; i<c; ++i) { if (impl_match(sURL, lBlockedURLs[i])) + { return true; + } } return false; diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index 518ec277ae53..b0ba4b55da75 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -24,110 +24,119 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package complex.dispatches; -import com.sun.star.frame.*; -import com.sun.star.lang.*; -import com.sun.star.util.*; -import com.sun.star.beans.*; -import com.sun.star.uno.*; +import com.sun.star.beans.PropertyValue; +import com.sun.star.frame.DispatchInformation; +import com.sun.star.frame.XComponentLoader; +import com.sun.star.frame.XDispatchInformationProvider; +import com.sun.star.frame.XDispatchProviderInterception; +import com.sun.star.frame.XDispatchProviderInterceptor; +import com.sun.star.frame.XFrame; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XCloseable; +import complex.dispatches.Interceptor; +import java.util.HashMap; + + -import java.util.*; -import complexlib.ComplexTestCase; -import helper.*; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ //----------------------------------------------- /** @short Check the interface XDispatchInformationProvider - @descr Because there exists more then one implementation of a dispatch - object, we have to test all these implementations ... +@descr Because there exists more then one implementation of a dispatch +object, we have to test all these implementations ... */ -public class checkdispatchapi extends ComplexTestCase +public class checkdispatchapi { //------------------------------------------- // some const //------------------------------------------- // member - /** points to the global uno service manager. */ private XMultiServiceFactory m_xMSF = null; private connectivity.tools.HsqlDatabase db; - /** can be used to create new test frames. */ private XFrame m_xDesktop = null; - /** provides XDispatchInformationProvider interface. */ private XFrame m_xFrame = null; //------------------------------------------- // test environment - //------------------------------------------- /** @short A function to tell the framework, - which test functions are available. + which test functions are available. - @return All test methods. - @todo Think about selection of tests from outside ... + @return All test methods. + @todo Think about selection of tests from outside ... */ - public String[] getTestMethodNames() - { - return new String[] - { - "checkDispatchInfoOfWriter", - "checkDispatchInfoOfCalc", - "checkDispatchInfoOfDraw", - "checkDispatchInfoOfImpress", - "checkDispatchInfoOfMath", - "checkDispatchInfoOfChart", - "checkDispatchInfoOfBibliography", - "checkDispatchInfoOfQueryDesign", - "checkDispatchInfoOfTableDesign", - "checkDispatchInfoOfFormGridView", - "checkDispatchInfoOfDataSourceBrowser", - "checkDispatchInfoOfRelationDesign", - "checkDispatchInfoOfBasic", - "checkDispatchInfoOfStartModule", - "checkInterceptorLifeTime", - "checkInterception" - }; - } +// public String[] getTestMethodNames() +// { +// return new String[] +// { +// "checkDispatchInfoOfWriter", +// "checkDispatchInfoOfCalc", +// "checkDispatchInfoOfDraw", +// "checkDispatchInfoOfImpress", +// "checkDispatchInfoOfMath", +// "checkDispatchInfoOfChart", +// "checkDispatchInfoOfBibliography", +// "checkDispatchInfoOfQueryDesign", +// "checkDispatchInfoOfTableDesign", +// "checkDispatchInfoOfFormGridView", +// "checkDispatchInfoOfDataSourceBrowser", +// "checkDispatchInfoOfRelationDesign", +// "checkDispatchInfoOfBasic", +// "checkDispatchInfoOfStartModule", +// "checkInterceptorLifeTime", +// "checkInterception" +// }; +// } //------------------------------------------- /** @short Create the environment for following tests. - @descr create an empty test frame, where we can load - different components inside. + @descr create an empty test frame, where we can load + different components inside. */ - public void before() + @Before public void before() { try { // get uno service manager from global test environment - m_xMSF = (XMultiServiceFactory)param.getMSF(); + m_xMSF = getMSF(); db = new connectivity.tools.HsqlDatabase(m_xMSF); // create desktop - m_xDesktop = (XFrame)UnoRuntime.queryInterface( - XFrame.class, - m_xMSF.createInstance("com.sun.star.frame.Desktop")); + m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); m_xFrame = impl_createNewFrame(); } - catch(java.lang.Throwable ex) + catch (java.lang.Throwable ex) { - failed("Cant initialize test environment."); + fail("Cant initialize test environment."); } } //------------------------------------------- /** @short close the environment. */ - public void after() + @After public void after() { db.close(); impl_closeFrame(m_xFrame); @@ -135,109 +144,115 @@ public class checkdispatchapi extends ComplexTestCase } //------------------------------------------- - public void checkDispatchInfoOfWriter() + @Test public void checkDispatchInfoOfWriter() { impl_checkDispatchInfoOfXXX("private:factory/swriter"); } //------------------------------------------- - public void checkDispatchInfoOfCalc() + @Test public void checkDispatchInfoOfCalc() { impl_checkDispatchInfoOfXXX("private:factory/scalc"); } //------------------------------------------- - public void checkDispatchInfoOfDraw() + @Test public void checkDispatchInfoOfDraw() { impl_checkDispatchInfoOfXXX("private:factory/sdraw"); } //------------------------------------------- - public void checkDispatchInfoOfImpress() + @Test public void checkDispatchInfoOfImpress() { impl_checkDispatchInfoOfXXX("private:factory/simpress"); } //------------------------------------------- - public void checkDispatchInfoOfChart() + @Test public void checkDispatchInfoOfChart() { impl_checkDispatchInfoOfXXX("private:factory/schart"); } //------------------------------------------- - public void checkDispatchInfoOfMath() + @Test public void checkDispatchInfoOfMath() { impl_checkDispatchInfoOfXXX("private:factory/smath"); } //------------------------------------------- - public void checkDispatchInfoOfDataBase() + @Test public void checkDispatchInfoOfDataBase() { impl_checkDispatchInfoOfXXX("private:factory/sdatabase"); } //------------------------------------------- - public void checkDispatchInfoOfBibliography() + @Test public void checkDispatchInfoOfBibliography() { impl_checkDispatchInfoOfXXX(".component:Bibliography/View1"); } //------------------------------------------- - public void checkDispatchInfoOfQueryDesign() + @Test public void checkDispatchInfoOfQueryDesign() { callDatabaseDispatch(".component:DB/QueryDesign"); } //------------------------------------------- - public void checkDispatchInfoOfTableDesign() + @Test public void checkDispatchInfoOfTableDesign() { callDatabaseDispatch(".component:DB/TableDesign"); } //------------------------------------------- - public void checkDispatchInfoOfFormGridView() + @Test public void checkDispatchInfoOfFormGridView() { impl_checkDispatchInfoOfXXX(".component:DB/FormGridView"); } //------------------------------------------- - public void checkDispatchInfoOfDataSourceBrowser() + @Test public void checkDispatchInfoOfDataSourceBrowser() { impl_checkDispatchInfoOfXXX(".component:DB/DataSourceBrowser"); } //------------------------------------------- - public void checkDispatchInfoOfRelationDesign() + @Test public void checkDispatchInfoOfRelationDesign() { callDatabaseDispatch(".component:DB/RelationDesign"); } //------------------------------------------- + private void callDatabaseDispatch(String url) { try { final PropertyValue args = new PropertyValue(); args.Name = "ActiveConnection"; - args.Value = (Object)db.defaultConnection(); + args.Value = (Object) db.defaultConnection(); XFrame xFrame = impl_createNewFrame(); - impl_loadIntoFrame(xFrame, url, new PropertyValue[] { args }); + impl_loadIntoFrame(xFrame, url, new PropertyValue[] + { + args + }); impl_checkDispatchInfo(xFrame); impl_closeFrame(xFrame); - } catch(java.lang.Exception e ) { - } + } + catch (java.lang.Exception e) + { + } } //------------------------------------------- - public void checkDispatchInfoOfBasic() + @Test public void checkDispatchInfoOfBasic() { Object aComponent = impl_createUNOComponent("com.sun.star.script.BasicIDE"); impl_checkDispatchInfo(aComponent); } //------------------------------------------- - public void checkDispatchInfoOfStartModule() + @Test public void checkDispatchInfoOfStartModule() { Object aComponent = impl_createUNOComponent("com.sun.star.frame.StartModule"); impl_checkDispatchInfo(aComponent); @@ -250,60 +265,56 @@ public class checkdispatchapi extends ComplexTestCase // xInterceptor. Otherwhise we cant check some internal states of aInterceptor at the end of this method, because // it was already killed .-) - Interceptor aInterceptor = new Interceptor(log); - com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface( - com.sun.star.frame.XDispatchProviderInterceptor.class, - aInterceptor); + Interceptor aInterceptor = new Interceptor(); + XDispatchProviderInterceptor xInterceptor = UnoRuntime.queryInterface(XDispatchProviderInterceptor.class, aInterceptor); - com.sun.star.frame.XFrame xFrame = impl_createNewFrame(); - com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface( - com.sun.star.frame.XDispatchProviderInterception.class, - xFrame); + XFrame xFrame = impl_createNewFrame(); + XDispatchProviderInterception xInterception = UnoRuntime.queryInterface(XDispatchProviderInterception.class, xFrame); xInterception.registerDispatchProviderInterceptor(xInterceptor); impl_closeFrame(xFrame); - int nRegCount = aInterceptor.getRegistrationCount(); + int nRegCount = aInterceptor.getRegistrationCount(); boolean bIsRegistered = aInterceptor.isRegistered(); - log.println("registration count = "+nRegCount ); - log.println("is registered ? = "+bIsRegistered); + System.out.println("registration count = " + nRegCount); + System.out.println("is registered ? = " + bIsRegistered); if (nRegCount < 1) - failed("Interceptor was never registered."); + { + fail("Interceptor was never registered."); + } if (bIsRegistered) - failed("Interceptor was not deregistered automaticly on closing the corresponding frame."); + { + fail("Interceptor was not deregistered automaticly on closing the corresponding frame."); + } - log.println("Destruction of interception chain works as designed .-)"); + System.out.println("Destruction of interception chain works as designed .-)"); } //------------------------------------------- public void checkInterception() { - String [] lDisabledURLs = new String [1]; - lDisabledURLs[0] = ".uno:Open"; + String[] lDisabledURLs = new String[1]; + lDisabledURLs[0] = ".uno:Open"; - log.println("create and initialize interceptor ..."); - Interceptor aInterceptor = new Interceptor(log); + System.out.println("create and initialize interceptor ..."); + Interceptor aInterceptor = new Interceptor(); aInterceptor.setURLs4URLs4Blocking(lDisabledURLs); - com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface( - com.sun.star.frame.XDispatchProviderInterceptor.class, - aInterceptor); + XDispatchProviderInterceptor xInterceptor = UnoRuntime.queryInterface(XDispatchProviderInterceptor.class, aInterceptor); - log.println("create and initialize frame ..."); - com.sun.star.frame.XFrame xFrame = impl_createNewFrame(); + System.out.println("create and initialize frame ..."); + XFrame xFrame = impl_createNewFrame(); impl_loadIntoFrame(xFrame, "private:factory/swriter", null); - com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface( - com.sun.star.frame.XDispatchProviderInterception.class, - xFrame); + XDispatchProviderInterception xInterception = UnoRuntime.queryInterface(XDispatchProviderInterception.class, xFrame); - log.println("register interceptor ..."); + System.out.println("register interceptor ..."); xInterception.registerDispatchProviderInterceptor(xInterceptor); - log.println("deregister interceptor ..."); + System.out.println("deregister interceptor ..."); xInterception.releaseDispatchProviderInterceptor(xInterceptor); } @@ -311,7 +322,7 @@ public class checkdispatchapi extends ComplexTestCase private void impl_checkDispatchInfoOfXXX(String sXXX) { XFrame xFrame = impl_createNewFrame(); - impl_loadIntoFrame(xFrame, sXXX,null); + impl_loadIntoFrame(xFrame, sXXX, null); impl_checkDispatchInfo(xFrame); impl_closeFrame(xFrame); } @@ -319,26 +330,28 @@ public class checkdispatchapi extends ComplexTestCase //------------------------------------------- /** @short load an URL into the current test frame. */ - private void impl_loadIntoFrame(XFrame xFrame, String sURL,PropertyValue args[]) + private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[]) { - XComponentLoader xLoader = (XComponentLoader)UnoRuntime.queryInterface( - XComponentLoader.class, - xFrame); + XComponentLoader xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame); if (xLoader == null) - failed("Frame does not provide required interface XComponentLoader."); + { + fail("Frame does not provide required interface XComponentLoader."); + } XComponent xDoc = null; try { xDoc = xLoader.loadComponentFromURL(sURL, "_self", 0, args); } - catch(java.lang.Throwable ex) + catch (java.lang.Throwable ex) { xDoc = null; } if (xDoc == null) - failed("Could not load \""+sURL+"\"."); + { + fail("Could not load \"" + sURL + "\"."); + } } //------------------------------------------- @@ -351,112 +364,135 @@ public class checkdispatchapi extends ComplexTestCase { aComponent = m_xMSF.createInstance(sName); } - catch(java.lang.Throwable ex) + catch (java.lang.Throwable ex) { aComponent = null; } if (aComponent == null) - failed("Could not create UNO component \""+sName+"\"."); + { + fail("Could not create UNO component \"" + sName + "\"."); + } return aComponent; } //------------------------------------------- /** @short check the interface XDispatchInformationProvider - at the specified component. + at the specified component. */ private void impl_checkDispatchInfo(Object aComponent) { - XDispatchInformationProvider xInfoProvider = (XDispatchInformationProvider)UnoRuntime.queryInterface( - XDispatchInformationProvider.class, - aComponent); + XDispatchInformationProvider xInfoProvider = UnoRuntime.queryInterface(XDispatchInformationProvider.class, aComponent); if (xInfoProvider == null) { // Warning - log.println("Warning:\tComponent does not provide the [optional!] interface XDispatchInformationProvider."); + System.out.println("Warning:\tComponent does not provide the [optional!] interface XDispatchInformationProvider."); return; } try { short[] lGroups = xInfoProvider.getSupportedCommandGroups(); - int c1 = lGroups.length; - int i1 = 0; - for (i1=0; i1<c1; ++i1) + int c1 = lGroups.length; + int i1 = 0; + for (i1 = 0; i1 < c1; ++i1) { - short nGroup = lGroups[i1]; + short nGroup = lGroups[i1]; DispatchInformation[] lInfos = xInfoProvider.getConfigurableDispatchInformation(nGroup); - int c2 = lInfos.length; - int i2 = 0; + int c2 = lInfos.length; + int i2 = 0; // check for empty lists // Warning if (lInfos.length < 1) - log.println("Warning:\tCould not get any DispatchInformation for group ["+nGroup+"]."); + { + System.out.println("Warning:\tCould not get any DispatchInformation for group [" + nGroup + "]."); + } // check for duplicates (and by the way, if the info item match the requested group) HashMap aCheckMap = new HashMap(c2); - for (i2=0; i2<c2; ++i2) + for (i2 = 0; i2 < c2; ++i2) { DispatchInformation aInfo = lInfos[i2]; if (aInfo.GroupId != nGroup) { // Error - failed("At least one DispatchInformation item does not match the requested group.\n\trequested group=["+nGroup+ - "] returned groupd=["+aInfo.GroupId+"] command=\""+aInfo.Command+"\"", true); // true => dont break this test + fail("At least one DispatchInformation item does not match the requested group.\n\trequested group=[" + nGroup + + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test continue; } if (aCheckMap.containsKey(aInfo.Command)) { // Error - failed("Found a duplicate item: group=["+aInfo.GroupId+"] command=\""+aInfo.Command+"\"", true); // true => dont break this test + fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test continue; } aCheckMap.put(aInfo.Command, aInfo.Command); - log.println("\t["+aInfo.GroupId+"] \""+aInfo.Command+"\""); + System.out.println("\t[" + aInfo.GroupId + "] \"" + aInfo.Command + "\""); } } } - catch(java.lang.Throwable ex) + catch (java.lang.Throwable ex) { - failed("Exception caught during using XDispatchInformationProvider."); - ex.printStackTrace(); + fail("Exception caught during using XDispatchInformationProvider."); + // ex.printStackTrace(); } } //------------------------------------------- - private synchronized com.sun.star.frame.XFrame impl_createNewFrame() + private synchronized XFrame impl_createNewFrame() { - com.sun.star.frame.XFrame xFrame = null; + XFrame xFrame = null; try { xFrame = m_xDesktop.findFrame("_blank", 0); xFrame.getContainerWindow().setVisible(true); } - catch(java.lang.Throwable ex) + catch (java.lang.Throwable ex) { - failed("Could not create the frame instance."); + fail("Could not create the frame instance."); } return xFrame; - } + } //------------------------------------------- - private synchronized void impl_closeFrame(com.sun.star.frame.XFrame xFrame) + private synchronized void impl_closeFrame(XFrame xFrame) { - com.sun.star.util.XCloseable xClose = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface( - com.sun.star.util.XCloseable.class, - xFrame); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame); try { xClose.close(false); } - catch(com.sun.star.util.CloseVetoException exVeto) + catch (com.sun.star.util.CloseVetoException exVeto) { - failed("Test frame couldn't be closed successfully."); + fail("Test frame couldn't be closed successfully."); } } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/framework/qa/complex/dispatches/helper/makefile.mk index be761c54fae4..2b2ccab5ebef 100644 --- a/framework/qa/complex/dispatches/helper/makefile.mk +++ b/framework/qa/complex/dispatches/helper/makefile.mk @@ -24,10 +24,10 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/..$/.. +PRJ = ../../../.. TARGET = checkdispatchapi PRJNAME = framework -PACKAGE = complex$/dispatches$/helper +PACKAGE = complex/dispatches/helper # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -35,10 +35,9 @@ PACKAGE = complex$/dispatches$/helper #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - Generator.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar Generator.jar JAVAFILES = Interceptor.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) MAXLINELENGTH = 100000 diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk index 87eba000cf71..6a5ff79dd793 100644 --- a/framework/qa/complex/dispatches/makefile.mk +++ b/framework/qa/complex/dispatches/makefile.mk @@ -24,69 +24,108 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = checkdispatchapi -PRJNAME = framework -PACKAGE = complex$/dispatches - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - OOoRunner.jar mysql.jar ConnectivityTools.jar -JAVAFILES = checkdispatchapi.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -SUBDIRS=helper - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -# --- Parameters for the test -------------------------------------- +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_dispatches -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/dispatches -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# here store only Files which contain a @Test +JAVATESTFILES = \ + checkdispatchapi.java -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + Interceptor.java -# start the runner application -CT_APP = org.openoffice.Runner +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# --- Targets ------------------------------------------------------ +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -.IF "$(depend)" == "" -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -.ELSE -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -.ENDIF +.END -.INCLUDE : target.mk +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +ALLTAR : javatest -RUN: run +.END -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) +# PRJ = ..$/..$/.. +# TARGET = checkdispatchapi +# PRJNAME = framework +# PACKAGE = complex$/dispatches +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ +# OOoRunner.jar mysql.jar ConnectivityTools.jar +# JAVAFILES = checkdispatchapi.java +# +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# SUBDIRS=helper +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # test looks something like the.full.package.TestName +# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .IF "$(depend)" == "" +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR +# .ELSE +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP +# .ENDIF +# +# .INCLUDE : target.mk +# +# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props +# # cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props +# # jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +# +# RUN: run +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) +# +# +# diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java index 89dea19e08b6..a3365cbda75d 100755 --- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java +++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java @@ -28,47 +28,91 @@ package complex.disposing; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; import com.sun.star.frame.XDesktop; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + /** * This test is for bug110698. The Office is closed and is continually connected * while it closes. This did let the Office freeze. Now when the Office is * closed, the connection is refused. */ -public class GetServiceWhileDisposingOffice extends ComplexTestCase { +public class GetServiceWhileDisposingOffice +{ - public String[] getTestMethodNames() { - return new String[]{"checkServiceWhileDisposing"}; - } +// public String[] getTestMethodNames() +// { +// return new String[] +// { +// "checkServiceWhileDisposing" +// }; +// } - public void checkServiceWhileDisposing() { - XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); + @Test public void checkServiceWhileDisposing() + { + XMultiServiceFactory xMSF = getMSF(); XDesktop xDesktop = null; - try { - xDesktop = (XDesktop)UnoRuntime.queryInterface(XDesktop.class, - xMSF.createInstance("com.sun.star.frame.Desktop")); + try + { + xDesktop = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop")); } - catch(com.sun.star.uno.Exception e) { - failed("Could not create a desktop instance."); + catch (com.sun.star.uno.Exception e) + { + fail("Could not create a desktop instance."); } int step = 0; - try { - log.println("Start the termination of the Office."); + try + { + System.out.println("Start the termination of the Office."); xDesktop.terminate(); - for ( ; step<10000; step++ ) { + for (; step < 10000; step++) + { Object o = xMSF.createInstance("com.sun.star.frame.Desktop"); } } - catch(com.sun.star.lang.DisposedException e) { - log.println("DisposedException in step: " + step); - e.printStackTrace(); + catch (com.sun.star.lang.DisposedException e) + { + System.out.println("DisposedException in step: " + step); } - catch(Exception e) { - e.printStackTrace(); - failed(e.getMessage()); + catch (Exception e) + { + fail(e.getMessage()); } } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + // Office is already terminated. + // connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk index dac80c08afa0..f24960421f21 100755 --- a/framework/qa/complex/disposing/makefile.mk +++ b/framework/qa/complex/disposing/makefile.mk @@ -25,52 +25,37 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = GetServiceWhileDisposingOffice -PRJNAME = $(TARGET) -PACKAGE = complex$/disposing - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = $(TARGET).java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -MAXLINELENGTH = 100000 +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_disposing -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/disposing -# --- Parameters for the test -------------------------------------- +# here store only Files which contain a @Test +JAVATESTFILES = \ + GetServiceWhileDisposingOffice.java -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# put here all other files +JAVAFILES = $(JAVATESTFILES) -# test base is java complex -CT_TESTBASE = -TestBase java_complex +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# start the runner application -CT_APP = org.openoffice.Runner +.END -# --- Targets ------------------------------------------------------ +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -.INCLUDE : target.mk +ALLTAR : javatest -RUN: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) +.END -run: RUN diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 015d9771be59..178f9c0af987 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -27,24 +27,48 @@ package complex.framework.autosave; -import com.sun.star.frame.*; -import com.sun.star.lang.*; -import com.sun.star.util.*; -import com.sun.star.beans.*; -import com.sun.star.uno.*; -import com.sun.star.sheet.*; -import com.sun.star.table.*; + +import com.sun.star.beans.PropertyValue; +import com.sun.star.frame.FeatureStateEvent; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XModel; +import com.sun.star.frame.XStatusListener; +import com.sun.star.frame.XStorable; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.sheet.FillDirection; +import com.sun.star.sheet.XCellSeries; +import com.sun.star.table.XCellRange; +import com.sun.star.util.XCloseable; +import com.sun.star.sheet.XSpreadsheet; +import com.sun.star.sheet.XSpreadsheetDocument; +import com.sun.star.sheet.XSpreadsheets; +import com.sun.star.uno.AnyConverter; +import com.sun.star.uno.Type; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XInterface; +import com.sun.star.util.URL; +import com.sun.star.util.XURLTransformer; import java.util.*; +import util.utils; + -import complexlib.*; -import helper.*; -import util.*; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import util.SOfficeFactory; +import static org.junit.Assert.*; +// ------------------------------------------ //----------------------------------------------- /** @short Check some use cases of the AutoSave feature */ -public class AutoSave extends ComplexTestCase +public class AutoSave { //------------------------------------------- class AutoSaveListener implements XStatusListener @@ -64,9 +88,7 @@ public class AutoSave extends ComplexTestCase { m_xAutoSave = xAutoSave; - XURLTransformer xParser = (XURLTransformer)UnoRuntime.queryInterface( - XURLTransformer.class, - xSMGR.createInstance("com.sun.star.util.URLTransformer")); + XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, xSMGR.createInstance("com.sun.star.util.URLTransformer")); URL[] aURL = new URL[1]; aURL[0] = new URL(); aURL[0].Complete = "vnd.sun.star.autorecovery:/doAutoSave"; @@ -169,13 +191,13 @@ public class AutoSave extends ComplexTestCase @return All test methods. @todo Think about selection of tests from outside ... */ - public String[] getTestMethodNames() - { - return new String[] - { - "checkConcurrentAutoSaveToNormalUISave", - }; - } +// public String[] getTestMethodNames() +// { +// return new String[] +// { +// "checkConcurrentAutoSaveToNormalUISave", +// }; +// } //------------------------------------------- /** @short Create the environment for following tests. @@ -183,22 +205,20 @@ public class AutoSave extends ComplexTestCase @descr create an empty test frame, where we can load different components inside. */ - public void before() + @Before public void before() { m_aLog = new Protocol(Protocol.MODE_HTML | Protocol.MODE_STDOUT, Protocol.FILTER_NONE, utils.getUsersTempDir() + "/complex_log_ascii_01.html"); try { // get uno service manager from global test environment - m_xSMGR = (XMultiServiceFactory)param.getMSF(); + m_xSMGR = getMSF(); // get another helper to e.g. create test documents m_aSOF = SOfficeFactory.getFactory(m_xSMGR); // create AutoSave instance - m_xAutoSave = (XDispatch)UnoRuntime.queryInterface( - XDispatch.class, - m_xSMGR.createInstance("com.sun.star.comp.framework.AutoRecovery")); + m_xAutoSave = UnoRuntime.queryInterface(XDispatch.class, m_xSMGR.createInstance("com.sun.star.comp.framework.AutoRecovery")); // prepare AutoSave // make sure it will be started every 1 min @@ -209,22 +229,20 @@ public class AutoSave extends ComplexTestCase aConfig = null; // is needed to parse dispatch commands - m_xURLParser = (XURLTransformer)UnoRuntime.queryInterface( - XURLTransformer.class, - m_xSMGR.createInstance("com.sun.star.util.URLTransformer")); + m_xURLParser = UnoRuntime.queryInterface(XURLTransformer.class, m_xSMGR.createInstance("com.sun.star.util.URLTransformer")); } catch(java.lang.Throwable ex) { m_aLog.log(ex); - failed("Couldn't create test environment"); + fail("Couldn't create test environment"); } } //------------------------------------------- /** @short close the environment. */ - public void after() + @After public void after() { // ??? } @@ -249,9 +267,7 @@ public class AutoSave extends ComplexTestCase xSheet.getCellByPosition(0, 1).setFormula("=a1+1"); m_aLog.log("Retrieve big range."); XCellRange xRange = xSheet.getCellRangeByName("A1:Z9999"); - XCellSeries xSeries = (XCellSeries)UnoRuntime.queryInterface( - XCellSeries.class, - xRange); + XCellSeries xSeries = UnoRuntime.queryInterface(XCellSeries.class, xRange); m_aLog.log("Duplicate cells from top to bottom inside range."); xSeries.fillAuto(FillDirection.TO_BOTTOM, 2); m_aLog.log("Duplicate cells from left to right inside range."); @@ -281,12 +297,8 @@ public class AutoSave extends ComplexTestCase aURL[0].Complete = ".uno:SaveAs"; m_xURLParser.parseStrict(aURL); - XModel xModel = (XModel)UnoRuntime.queryInterface( - XModel.class, - xDoc); - XDispatchProvider xProvider = (XDispatchProvider)UnoRuntime.queryInterface( - XDispatchProvider.class, - xModel.getCurrentController()); + XModel xModel = UnoRuntime.queryInterface(XModel.class, xDoc); + XDispatchProvider xProvider = UnoRuntime.queryInterface(XDispatchProvider.class, xModel.getCurrentController()); XDispatch xDispatch = xProvider.queryDispatch(aURL[0], "_self", 0); PropertyValue[] lArgs = new PropertyValue[3]; @@ -334,9 +346,7 @@ public class AutoSave extends ComplexTestCase { try { - XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( - XCloseable.class, - xDoc); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc); if (xClose != null) { xClose.close(false); @@ -344,7 +354,9 @@ public class AutoSave extends ComplexTestCase nRetry = 0; } else + { m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesnt provide needed interface!"); + } } catch(com.sun.star.util.CloseVetoException exVeto) { @@ -402,7 +414,7 @@ public class AutoSave extends ComplexTestCase * from another thread. So these operations should be started at the same time. * It should not crash. The AutoSave request must be postphoned. */ - public void checkConcurrentAutoSaveToNormalUISave() + @Test public void checkConcurrentAutoSaveToNormalUISave() { m_aLog.log(Protocol.TYPE_TESTMARK , "AutoSave"); m_aLog.log(Protocol.TYPE_SCOPE_OPEN, "checkConcurrentAutoSaveToNormalUISave()"); @@ -451,4 +463,27 @@ public class AutoSave extends ComplexTestCase closeDoc(xDoc); } } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java b/framework/qa/complex/framework/autosave/ConfigHelper.java index 3bc4683f4fb5..a7f5df8cc72d 100644 --- a/framework/qa/complex/framework/autosave/ConfigHelper.java +++ b/framework/qa/complex/framework/autosave/ConfigHelper.java @@ -1,6 +1,5 @@ package complex.framework.autosave; -import java.lang.*; import com.sun.star.uno.*; import com.sun.star.lang.*; import com.sun.star.container.*; @@ -20,9 +19,7 @@ class ConfigHelper { m_xSMGR = xSMGR; - XMultiServiceFactory xConfigRoot = (XMultiServiceFactory)UnoRuntime.queryInterface( - XMultiServiceFactory.class, - m_xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider")); + XMultiServiceFactory xConfigRoot = UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider")); PropertyValue[] lParams = new PropertyValue[1]; lParams[0] = new PropertyValue(); @@ -31,20 +28,20 @@ class ConfigHelper Object aConfig; if (bReadOnly) - aConfig = xConfigRoot.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - lParams); + { + aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams); + } else - aConfig = xConfigRoot.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - lParams); + { + aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", lParams); + } - m_xConfig = (XHierarchicalNameAccess)UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, - aConfig); + m_xConfig = UnoRuntime.queryInterface(XHierarchicalNameAccess.class, aConfig); if (m_xConfig == null) - throw new com.sun.star.uno.Exception("Could not open configuration \""+sConfigPath+"\""); + { + throw new com.sun.star.uno.Exception("Could not open configuration \"" + sConfigPath + "\""); + } } //----------------------------------------------- @@ -54,9 +51,7 @@ class ConfigHelper { try { - XPropertySet xPath = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, - m_xConfig.getByHierarchicalName(sRelPath)); + XPropertySet xPath = UnoRuntime.queryInterface(XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath)); return xPath.getPropertyValue(sKey); } catch(com.sun.star.uno.Exception ex) @@ -73,9 +68,7 @@ class ConfigHelper { try { - XPropertySet xPath = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, - m_xConfig.getByHierarchicalName(sRelPath)); + XPropertySet xPath = UnoRuntime.queryInterface(XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath)); xPath.setPropertyValue(sKey, aValue); } catch(com.sun.star.uno.Exception ex) @@ -89,9 +82,7 @@ class ConfigHelper { try { - XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface( - XChangesBatch.class, - m_xConfig); + XChangesBatch xBatch = UnoRuntime.queryInterface(XChangesBatch.class, m_xConfig); xBatch.commitChanges(); } catch(com.sun.star.uno.Exception ex) diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk index e903c9ad5f33..2e8e3dca1f76 100644 --- a/framework/qa/complex/framework/autosave/makefile.mk +++ b/framework/qa/complex/framework/autosave/makefile.mk @@ -24,66 +24,104 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/..$/.. -TARGET = AutoSave -PRJNAME = framework -PACKAGE = complex$/framework$/autosave - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - OOoRunner.jar mysql.jar -JAVAFILES = AutoSave.java ConfigHelper.java Protocol.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../../.. +PRJNAME = framework +TARGET = qa_complex_framework_autosave -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/framework/autosave -# start the runner application -CT_APP = org.openoffice.Runner +# here store only Files which contain a @Test +JAVATESTFILES = \ + AutoSave.java -# --- Targets ------------------------------------------------------ +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + ConfigHelper.java \ + Protocol.java -.IF "$(depend)" == "" -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -.ELSE -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -.ENDIF +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -.INCLUDE : target.mk +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +.END -RUN: run - -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk +ALLTAR : javatest +.END +# +# PRJ = ..$/..$/..$/.. +# TARGET = AutoSave +# PRJNAME = framework +# PACKAGE = complex$/framework$/autosave +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ +# OOoRunner.jar mysql.jar +# JAVAFILES = AutoSave.java ConfigHelper.java Protocol.java +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # test looks something like the.full.package.TestName +# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .IF "$(depend)" == "" +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR +# .ELSE +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP +# .ENDIF +# +# .INCLUDE : target.mk +# +# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props +# # cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props +# # jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +# +# RUN: run +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) +# +# +# diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index ee565ff74330..10fc433e7cd1 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -84,6 +84,16 @@ import util.SOfficeFactory; import util.UITools; import util.utils; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + public class RecoveryTest extends ComplexTestCase { static XMultiServiceFactory xMSF; diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java index 8f283a034e20..7db880958ab5 100755 --- a/framework/qa/complex/imageManager/CheckImageManager.java +++ b/framework/qa/complex/imageManager/CheckImageManager.java @@ -1,13 +1,5 @@ -package imageManager; - -import imageManager.interfaces._XComponent; -import imageManager.interfaces._XImageManager; -import imageManager.interfaces._XInitialization; -import imageManager.interfaces._XTypeProvider; -import imageManager.interfaces._XUIConfiguration; -import imageManager.interfaces._XUIConfigurationPersistence; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XIndexAccess; +package complex.imageManager; + import com.sun.star.lang.XComponent; import com.sun.star.lang.XInitialization; import com.sun.star.lang.XMultiServiceFactory; @@ -15,125 +7,135 @@ import com.sun.star.lang.XTypeProvider; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.ui.XImageManager; -import complexlib.ComplexTestCase; import com.sun.star.ui.XModuleUIConfigurationManagerSupplier; import com.sun.star.ui.XUIConfiguration; import com.sun.star.ui.XUIConfigurationManager; import com.sun.star.ui.XUIConfigurationPersistence; -import java.io.PrintWriter; -import share.LogWriter; + + +// ---------- junit imports ----------------- +import lib.TestParameters; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ /** * */ -public class CheckImageManager extends ComplexTestCase { +public class CheckImageManager { boolean checkUIConfigManager = false; XMultiServiceFactory xMSF = null; - - public void before() { - xMSF = (XMultiServiceFactory)param.getMSF(); + /** + * The test parameters + */ + private static TestParameters param = null; + + @Before public void before() + { + xMSF = getMSF(); + param = new TestParameters(); + param.put("ServiceFactory", xMSF); // some qadevOOo functions need the ServiceFactory } - public String[] getTestMethodNames() { - return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"}; - } +// public String[] getTestMethodNames() { +// return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"}; +// } - public void checkImageManagerFromModule() { - log.println(" **** ImageManager from ModuleUIConfigurationManager *** "); + @Test public void checkImageManagerFromModule() + { + System.out.println(" **** ImageManager from ModuleUIConfigurationManager *** "); XUIConfigurationManager xManager = null; try { Object o = (XInterface)xMSF.createInstance( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); XModuleUIConfigurationManagerSupplier xMUICMS = - (XModuleUIConfigurationManagerSupplier)UnoRuntime.queryInterface( - XModuleUIConfigurationManagerSupplier.class, o); + UnoRuntime.queryInterface(XModuleUIConfigurationManagerSupplier.class, o); xManager = xMUICMS.getUIConfigurationManager( "com.sun.star.text.TextDocument"); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((PrintWriter)log); - failed("Exception. " + e.getMessage()); + fail("Exception. " + e.getMessage()); } - XImageManager xImageManager = (XImageManager)UnoRuntime.queryInterface( - XImageManager.class, xManager.getImageManager()); + XImageManager xImageManager = UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager()); performChecks(xImageManager, "ModuleUIConfig", xManager); } public void checkImageManager() { - log.println(" **** ImageManager from UIConfigurationManager *** "); + System.out.println(" **** ImageManager from UIConfigurationManager *** "); XUIConfigurationManager xManager = null; try { - xManager = (XUIConfigurationManager)UnoRuntime.queryInterface( - XUIConfigurationManager.class, xMSF.createInstance( - "com.sun.star.comp.framework.UIConfigurationManager")); + xManager = UnoRuntime.queryInterface(XUIConfigurationManager.class, xMSF.createInstance("com.sun.star.comp.framework.UIConfigurationManager")); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((PrintWriter)log); - failed("Exception. " + e.getMessage()); + fail("Exception. " + e.getMessage()); } - XImageManager xImageManager = (XImageManager)UnoRuntime.queryInterface( - XImageManager.class, xManager.getImageManager()); + XImageManager xImageManager = UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager()); performChecks(xImageManager, "UIConfig", xManager); } private void performChecks(XImageManager xImageManager, String testObjectName, XUIConfigurationManager xManager) { util.dbg.printInterfaces(xImageManager); - OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(log, xManager, xMSF); + OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(xManager, xMSF); param.put("XUIConfiguration.XUIConfigurationListenerImpl", configListener); - XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, xImageManager); - _XInitialization _xInit = new _XInitialization(log, param, xInit); - assure(testObjectName + "::XInitialization.initialize", _xInit._initialize(), true); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImageManager); + _XInitialization _xInit = new _XInitialization(param, xInit); + assertTrue(testObjectName + "::XInitialization.initialize", _xInit._initialize()); // xImageManager is already there, just write a test ;-) - _XImageManager _xImage = new _XImageManager(log, param, xImageManager); - assure(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames(), true); - assure(testObjectName + "::XImageManager.getImages", _xImage._getImages(), true); - assure(testObjectName + "::XImageManager.hasImage", _xImage._hasImage(), true); - assure(testObjectName + "::XImageManager.insertImages", _xImage._insertImages(), true); - assure(testObjectName + "::XImageManager.removeImages", _xImage._removeImages(), true); - assure(testObjectName + "::XImageManager.replaceImages", _xImage._replaceImages(), true); - assure(testObjectName + "::XImageManager.reset", _xImage._reset(), true); - - XTypeProvider xType = (XTypeProvider)UnoRuntime.queryInterface(XTypeProvider.class, xImageManager); - _XTypeProvider _xType = new _XTypeProvider(log,param,xType); - assure(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId(), true); - assure(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes(), true); - - XUIConfiguration xUIConfig = (XUIConfiguration)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); - _XUIConfiguration _xUIConfig = new _XUIConfiguration(log, param, xUIConfig); + _XImageManager _xImage = new _XImageManager(param, xImageManager); + assertTrue(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames()); + assertTrue(testObjectName + "::XImageManager.getImages", _xImage._getImages()); + assertTrue(testObjectName + "::XImageManager.hasImage", _xImage._hasImage()); + assertTrue(testObjectName + "::XImageManager.insertImages", _xImage._insertImages()); + assertTrue(testObjectName + "::XImageManager.removeImages", _xImage._removeImages()); + assertTrue(testObjectName + "::XImageManager.replaceImages", _xImage._replaceImages()); + assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset()); + + XTypeProvider xType = UnoRuntime.queryInterface(XTypeProvider.class, xImageManager); + _XTypeProvider _xType = new _XTypeProvider(param, xType); + assertTrue(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId()); + assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes()); + + XUIConfiguration xUIConfig = UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); + _XUIConfiguration _xUIConfig = new _XUIConfiguration(param, xUIConfig); _xUIConfig.before(); - assure(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener(), true); - assure(testObjectName + "::XUIConfig.removeConfigurationListener", _xUIConfig._removeConfigurationListener(), true); + assertTrue(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener()); + assertTrue(testObjectName + "::XUIConfig.removeConfigurationListener", _xUIConfig._removeConfigurationListener()); XUIConfigurationPersistence xUIConfigPersistence = (XUIConfigurationPersistence)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); - _XUIConfigurationPersistence _xUIConfigPersistence = new _XUIConfigurationPersistence(log, param, xUIConfigPersistence); + _XUIConfigurationPersistence _xUIConfigPersistence = new _XUIConfigurationPersistence(param, xUIConfigPersistence); _xUIConfigPersistence.before(); - assure(testObjectName + "::XUIConfigPersistence.isModified", _xUIConfigPersistence._isModified(), true); - assure(testObjectName + "::XUIConfigPersistence.isReadOnly", _xUIConfigPersistence._isReadOnly(), true); - assure(testObjectName + "::XUIConfigPersistence.reload", _xUIConfigPersistence._reload(), true); - assure(testObjectName + "::XUIConfigPersistence.store", _xUIConfigPersistence._store(), true); - assure(testObjectName + "::XUIConfigPersistence.storeToStorage", _xUIConfigPersistence._storeToStorage(), true); - - XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class, xImageManager); - _XComponent _xComp = new _XComponent(log, param, xComp); + assertTrue(testObjectName + "::XUIConfigPersistence.isModified", _xUIConfigPersistence._isModified()); + // System.out.println(testObjectName + "::XUIConfigPersistence.isReadOnly "+ _xUIConfigPersistence._isReadOnly()); + assertTrue(testObjectName + "::XUIConfigPersistence.isReadOnly", _xUIConfigPersistence._isReadOnly()); + assertTrue(testObjectName + "::XUIConfigPersistence.reload", _xUIConfigPersistence._reload()); + assertTrue(testObjectName + "::XUIConfigPersistence.store", _xUIConfigPersistence._store()); + assertTrue(testObjectName + "::XUIConfigPersistence.storeToStorage", _xUIConfigPersistence._storeToStorage()); + + XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xImageManager); + _XComponent _xComp = new _XComponent(param, xComp); _xComp.before(); - assure(testObjectName + "::XComponent.addEventListener", _xComp._addEventListener(), true); - assure(testObjectName + "::XComponent.removeEventListener", _xComp._removeEventListener(), true); - assure(testObjectName + "::XComponent.dispose", _xComp._dispose(), true); + assertTrue(testObjectName + "::XComponent.addEventListener", _xComp._addEventListener()); + assertTrue(testObjectName + "::XComponent.removeEventListener", _xComp._removeEventListener()); + assertTrue(testObjectName + "::XComponent.dispose", _xComp._dispose()); } class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; - private LogWriter log = null; private XUIConfigurationManager xUIManager = null; private XMultiServiceFactory xMSF = null; - public OXUIConfigurationListenerImpl(LogWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { - log = _log; + public OXUIConfigurationListenerImpl(XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { + this.xUIManager = xUIManager; this.xMSF = xMSF; } @@ -167,23 +169,23 @@ public class CheckImageManager extends ComplexTestCase { } catch(com.sun.star.container.NoSuchElementException e) { - log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); + System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); e.printStackTrace((java.io.PrintWriter)log); } catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); + System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); e.printStackTrace((java.io.PrintWriter)log); } catch(com.sun.star.lang.IllegalAccessException e) { - log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); + System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); e.printStackTrace((java.io.PrintWriter)log); } catch(com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); + System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); e.printStackTrace((java.io.PrintWriter)log); } catch(com.sun.star.lang.WrappedTargetException e) { - log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); + System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception."); e.printStackTrace((java.io.PrintWriter)log); } */ } @@ -194,4 +196,28 @@ public class CheckImageManager extends ComplexTestCase { } } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java index 4e30848b28d2..9affbb9499b5 100755 --- a/framework/qa/complex/imageManager/interfaces/_XComponent.java +++ b/framework/qa/complex/imageManager/_XComponent.java @@ -25,11 +25,9 @@ * ************************************************************************/ -package imageManager.interfaces; +package complex.imageManager; import com.sun.star.container.XNameContainer; -import share.LogWriter; - import com.sun.star.frame.XDesktop; import com.sun.star.lang.EventObject; import com.sun.star.lang.XComponent; @@ -54,7 +52,6 @@ public class _XComponent { private XNameContainer xContainer = null; private XComponent altDispose = null; TestParameters tEnv = null; - LogWriter log = null; boolean listenerDisposed[] = new boolean[2]; String[] Loutput = new String[2]; @@ -78,8 +75,7 @@ public class _XComponent { XEventListener listener1 = new MyEventListener(0, "EV1"); XEventListener listener2 = new MyEventListener(1, "EV2"); - public _XComponent(LogWriter log, TestParameters tEnv, XComponent oObj) { - this.log = log; + public _XComponent(TestParameters tEnv, XComponent oObj) { this.tEnv = tEnv; this.oObj = oObj; } @@ -119,10 +115,14 @@ public class _XComponent { * <code>dispose</code> method call. */ public boolean _removeEventListener() { - if (disposed) return false; + if (disposed) + { + System.out.println("Hint: already disposed."); + return false; + } // the second listener should not be called oObj.removeEventListener( listener2 ); - log.println(Thread.currentThread() + " is removing EL " + listener2); + System.out.println(Thread.currentThread() + " is removing EL " + listener2); return true; } // finished _removeEventListener() @@ -142,24 +142,32 @@ public class _XComponent { public boolean _dispose() { disposed = false; - log.println( "begin dispose" + Thread.currentThread()); + System.out.println( "begin dispose" + Thread.currentThread()); XDesktop oDesk = (XDesktop) tEnv.get("Desktop"); if (oDesk !=null) { oDesk.terminate(); } else { if (altDispose == null) + { oObj.dispose(); + } else + { altDispose.dispose(); + } } try { Thread.sleep(500) ; } catch (InterruptedException e) {} - if (Loutput[0]!=null) log.println(Loutput[0]); - if (Loutput[1]!=null) log.println(Loutput[1]); - log.println( "end dispose" + Thread.currentThread()); + if (Loutput[0]!=null){ + System.out.println(Loutput[0]); + } + if (Loutput[1]!=null) { + System.out.println(Loutput[1]); + } + System.out.println( "end dispose" + Thread.currentThread()); disposed = true; // check that dispose() works OK. diff --git a/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java index ccba1464c106..5887fd8fa0d8 100755 --- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java +++ b/framework/qa/complex/imageManager/_XImageManager.java @@ -24,26 +24,26 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package imageManager.interfaces; +package complex.imageManager; import com.sun.star.graphic.XGraphic; import com.sun.star.ui.ImageType; import com.sun.star.ui.XImageManager; import lib.TestParameters; -import share.LogWriter; + /** * */ public class _XImageManager { - LogWriter log = null; + TestParameters tEnv = null; String[]imageNames = null; XGraphic[] xGraphicArray = null; public XImageManager oObj; - public _XImageManager(LogWriter log, TestParameters tEnv, XImageManager oObj) { - this.log = log; + public _XImageManager( TestParameters tEnv, XImageManager oObj) { + this.tEnv = tEnv; this.oObj = oObj; } @@ -52,7 +52,9 @@ public class _XImageManager { short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; imageNames = oObj.getAllImageNames(s); for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + { System.out.println("###### Image: " + imageNames[i]); + } return imageNames != null; } @@ -71,10 +73,11 @@ public class _XImageManager { short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; try { // check the first image names, 10 at max for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + { result &= oObj.hasImage(s, imageNames[i]); + } } catch(com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace((java.io.PrintWriter)log); result = false; } return result; diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index da957331671b..fcfaf5f981d3 100755 --- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -25,9 +25,9 @@ * ************************************************************************/ -package imageManager.interfaces; +package complex.imageManager; + -import share.LogWriter; import com.sun.star.lang.XInitialization; @@ -48,12 +48,12 @@ import lib.TestParameters; */ public class _XInitialization { - LogWriter log = null; + TestParameters tEnv = null; public static XInitialization oObj = null; - public _XInitialization(LogWriter log, TestParameters tEnv, XInitialization oObj) { - this.log = log; + public _XInitialization(TestParameters tEnv, XInitialization oObj) { + this.tEnv = tEnv; this.oObj = oObj; } @@ -75,8 +75,7 @@ public class _XInitialization { } } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while method calling.") ; - e.printStackTrace((java.io.PrintWriter)log) ; + System.out.println("Exception occured while method calling.") ; result = false ; } diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index 7ea641ca63d5..08b810198d9b 100755 --- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -25,9 +25,8 @@ * ************************************************************************/ -package imageManager.interfaces; +package complex.imageManager; -import share.LogWriter; import com.sun.star.lang.XTypeProvider; @@ -46,13 +45,13 @@ import lib.TestParameters; */ public class _XTypeProvider { - LogWriter log = null; + TestParameters tEnv = null; public static XTypeProvider oObj = null; public static Type[] types = null; - public _XTypeProvider(LogWriter log, TestParameters tEnv, XTypeProvider oObj) { - this.log = log; + public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) { + this.tEnv = tEnv; this.oObj = oObj; } @@ -63,9 +62,9 @@ public class _XTypeProvider { */ public boolean _getImplementationId() { boolean result = true; - log.println("testing getImplementationId() ... "); + System.out.println("testing getImplementationId() ... "); - log.println("The ImplementationId is "+oObj.getImplementationId()); + System.out.println("The ImplementationId is "+oObj.getImplementationId()); result = true; return result; @@ -74,24 +73,24 @@ public class _XTypeProvider { /** - * alls the method and checks the return value.<p> + * Calls the method and checks the return value.<p> * Has <b>OK</b> status if one of the return value equals to the * type <code>com.sun.star.lang.XTypeProvider</code>. */ public boolean _getTypes() { boolean result = false; - log.println("getting Types..."); + System.out.println("getting Types..."); types = oObj.getTypes(); for (int i=0;i<types.length;i++) { int k = i+1; - log.println(k+". Type is "+types[i].toString()); + System.out.println(k+". Type is "+types[i].toString()); if (types[i].toString().equals ("Type[com.sun.star.lang.XTypeProvider]")) { result = true; } } if (!result) { - log.println("Component must provide Type " + System.out.println("Component must provide Type " +"<com.sun.star.lang.XTypeProvider>"); } diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java index a1e9e75cabd3..ec9d5f3fc634 100755 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java +++ b/framework/qa/complex/imageManager/_XUIConfiguration.java @@ -25,20 +25,18 @@ * ************************************************************************/ -package imageManager.interfaces; +package complex.imageManager; + -import com.sun.star.lang.XServiceInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.ui.XModuleUIConfigurationManagerSupplier; import com.sun.star.ui.XUIConfiguration; import com.sun.star.ui.XUIConfigurationListener; import lib.TestParameters; -import share.LogWriter; + public class _XUIConfiguration { - LogWriter log = null; + TestParameters tEnv = null; public XUIConfiguration oObj; XUIConfigurationListenerImpl xListener = null; @@ -51,8 +49,7 @@ public class _XUIConfiguration { } - public _XUIConfiguration(LogWriter log, TestParameters tEnv, XUIConfiguration oObj) { - this.log = log; + public _XUIConfiguration(TestParameters tEnv, XUIConfiguration oObj) { this.tEnv = tEnv; this.oObj = oObj; } diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java index 0e029deb4204..1dec01ad0660 100755 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java +++ b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java @@ -25,26 +25,23 @@ * ************************************************************************/ -package imageManager.interfaces; +package complex.imageManager; import com.sun.star.embed.XStorage; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.ui.XModuleUIConfigurationManagerSupplier; import com.sun.star.ui.XUIConfigurationPersistence; import lib.TestParameters; -import share.LogWriter; + public class _XUIConfigurationPersistence { - LogWriter log = null; + TestParameters tEnv = null; public XUIConfigurationPersistence oObj; private XStorage xStore = null; - public _XUIConfigurationPersistence(LogWriter log, TestParameters tEnv, XUIConfigurationPersistence oObj) { - this.log = log; + public _XUIConfigurationPersistence(TestParameters tEnv, XUIConfigurationPersistence oObj) { + this.tEnv = tEnv; this.oObj = oObj; } @@ -58,7 +55,7 @@ public class _XUIConfigurationPersistence { oObj.reload(); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + } return true; } @@ -68,7 +65,7 @@ public class _XUIConfigurationPersistence { oObj.store(); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + } return true; } @@ -80,7 +77,7 @@ public class _XUIConfigurationPersistence { } catch(com.sun.star.uno.Exception e) { result = false; - e.printStackTrace((java.io.PrintWriter)log); + } return result; } diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk index 039eba576069..f7b6f5ebf035 100755 --- a/framework/qa/complex/imageManager/interfaces/makefile.mk +++ b/framework/qa/complex/imageManager/interfaces/makefile.mk @@ -25,10 +25,10 @@ # #************************************************************************* -PRJ = ..$/..$/..$/.. +PRJ = ../../../.. TARGET = ImageManager PRJNAME = framework -PACKAGE = imageManager$/interfaces +PACKAGE = complex/imageManager/interfaces # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -37,10 +37,16 @@ PACKAGE = imageManager$/interfaces #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = _XComponent.java _XUIConfiguration.java _XImageManager.java \ - _XUIConfigurationPersistence.java _XInitialization.java _XTypeProvider.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVAFILES = \ +_XComponent.java \ +_XUIConfiguration.java \ +_XImageManager.java \ +_XUIConfigurationPersistence.java \ +_XInitialization.java \ +_XTypeProvider.java + +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) #----- make a jar from compiled files ------------------------------ diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk index 3b508b718d31..133e522b13b4 100755 --- a/framework/qa/complex/imageManager/makefile.mk +++ b/framework/qa/complex/imageManager/makefile.mk @@ -25,55 +25,99 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = ImageManager -PRJNAME = framework -PACKAGE = imageManager - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = CheckImageManager.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -MAXLINELENGTH = 100000 +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_imageManager -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/imageManager -# --- Parameters for the test -------------------------------------- +# here store only Files which contain a @Test +JAVATESTFILES = \ + CheckImageManager.java -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand \ - "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + _XComponent.java \ + _XImageManager.java \ + _XInitialization.java \ + _XTypeProvider.java \ + _XUIConfiguration.java \ + _XUIConfigurationPersistence.java -# test base is java complex -CT_TESTBASE = -TestBase java_complex +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# replace $/ with . in package name -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# start the runner application -CT_APP = org.openoffice.Runner +.END -# --- Targets ------------------------------------------------------ +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -.INCLUDE : target.mk +ALLTAR : javatest -RUN: run +.END -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckImageManager +# +# +# PRJ = ..$/..$/.. +# TARGET = ImageManager +# PRJNAME = framework +# PACKAGE = imageManager +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +# JAVAFILES = CheckImageManager.java +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand \ +# "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # replace $/ with . in package name +# CT_PACKAGE = -o $(PACKAGE:s\$/\.\) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .INCLUDE : target.mk +# +# RUN: run +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckImageManager +# +# diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 12368c6e3a89..1c67271fd6bb 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -28,30 +28,17 @@ package complex.loadAllDocuments; import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.comp.loader.FactoryHelper; import com.sun.star.frame.FrameSearchFlag; import com.sun.star.frame.XComponentLoader; import com.sun.star.frame.XFrame; import com.sun.star.frame.XStorable; import com.sun.star.io.XInputStream; import com.sun.star.lang.XComponent; -import com.sun.star.lang.XInitialization; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.lang.XTypeProvider; -import com.sun.star.registry.XRegistryKey; -import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XCloseable; import com.sun.star.ucb.XSimpleFileAccess; -import complex.loadAllDocuments.helper.InteractionHandler; -import complex.loadAllDocuments.helper.StatusIndicator; -import complex.loadAllDocuments.helper.StreamSimulator; - -import complexlib.ComplexTestCase; import helper.URLHelper; @@ -59,9 +46,19 @@ import java.io.File; import java.io.InputStreamReader; import java.util.Enumeration; -import java.util.StringTokenizer; import java.util.Vector; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import org.openoffice.test.OfficeFileUrl; +import static org.junit.Assert.*; +// ------------------------------------------ + //----------------------------------------------- /** @short Check the interface method XComponentLoader.loadComponentFromURL() @@ -80,7 +77,7 @@ import java.util.Vector; @todo We need a further test for accessing UNC pathes on windows! */ -public class CheckXComponentLoader extends ComplexTestCase +public class CheckXComponentLoader { //------------------------------------------- // some const @@ -96,7 +93,7 @@ public class CheckXComponentLoader extends ComplexTestCase /** File/URL separators. */ private static final String fs_url = "/"; - private static final String fs_sys = System.getProperty("file.separator"); + // private static final String fs_sys = System.getProperty("file.separator"); /** used for testing password protected files. */ private static final String SUFFIX_PASSWORD_TEMPFILE = "password_"; @@ -140,18 +137,18 @@ public class CheckXComponentLoader extends ComplexTestCase @return All test methods. @todo Think about selection of tests from outside ... */ - public String[] getTestMethodNames() - { - // TODO think about trigger of sub-tests from outside - return new String[] - { - "checkURLEncoding" , - "checkURLHandling" , - "checkUsingOfMediaDescriptor", - "checkStreamLoading" , - "checkLoadingWithPassword" - }; - } +// public String[] getTestMethodNames() +// { +// // TODO think about trigger of sub-tests from outside +// return new String[] +// { +// "checkURLEncoding" , +// "checkURLHandling" , +// "checkUsingOfMediaDescriptor", +// "checkStreamLoading" , +// "checkLoadingWithPassword" +// }; +// } //------------------------------------------- /** @short Create the environment for following tests. @@ -159,59 +156,51 @@ public class CheckXComponentLoader extends ComplexTestCase @descr Use either a component loader from desktop or from frame */ - public void before() + @Before public void before() { // get uno service manager from global test environment - m_xMSF = (XMultiServiceFactory)param.getMSF(); + m_xMSF = getMSF(); // create stream provider try { - m_xStreamProvider = (XSimpleFileAccess)UnoRuntime.queryInterface( - XSimpleFileAccess.class, - m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess")); + m_xStreamProvider = UnoRuntime.queryInterface(XSimpleFileAccess.class, m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess")); } catch(java.lang.Throwable ex) { - ex.printStackTrace(); - failed("Could not create a stream provider instance."); + fail("Could not create a stream provider instance."); } // create desktop instance try { - m_xDesktop = (XFrame)UnoRuntime.queryInterface( - XFrame.class, - m_xMSF.createInstance("com.sun.star.frame.Desktop")); + m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); } catch(java.lang.Throwable ex) { - ex.printStackTrace(); - failed("Could not create the desktop instance."); + fail("Could not create the desktop instance."); } // create frame instance - m_xFrame = m_xDesktop.findFrame("testFrame_componentLoader" , + m_xFrame = m_xDesktop.findFrame("testFrame_componentLoader", FrameSearchFlag.TASKS | FrameSearchFlag.CREATE); - if (m_xFrame==null) - failed("Couldn't create test frame."); + assertNotNull("Couldn't create test frame.", m_xFrame); // define default loader for testing // TODO think about using of bot loader instances! - m_xLoader = (XComponentLoader)UnoRuntime.queryInterface( - XComponentLoader.class, - m_xDesktop); - if (m_xLoader==null) - failed("Desktop service doesnt support needed component loader interface."); + m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, m_xDesktop); + assertNotNull("Desktop service doesnt support needed component loader interface.", m_xLoader); // get temp path for this environment - m_sTempPath = (String) param.get("TempPath"); - m_sTempPath = "."+fs_sys; + final String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF()); + m_sTempPath = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL); + // m_sTempPath = "."+fs_sys; // get all files from the given directory // TODO URLHelper should ignore directories! m_lTestFiles = new Vector(); - m_sTestDocPath = (String) param.get("TestDocumentPath"); + final String sTestDocURL = OfficeFileUrl.getAbsolute(new File("testdocuments")); + m_sTestDocPath = graphical.FileHelper.getSystemPathFromFileURL(sTestDocURL); try { File aBaseDir = new File(m_sTestDocPath); @@ -232,36 +221,35 @@ public class CheckXComponentLoader extends ComplexTestCase } String sCompletePath = aFile.getAbsolutePath(); - String sSubPath = sCompletePath.substring(nBasePathLength + 1); + String sSubPath = sCompletePath.substring(nBasePathLength); // Some test files are checked into CVS. ignore CVS helper files! - if (sSubPath.indexOf("CVS") > -1) - continue; +// if (sSubPath.indexOf("CVS") > -1) +// { +// continue; +// } m_lTestFiles.add(sSubPath); } } catch(java.lang.Throwable ex) { - ex.printStackTrace(); - failed("Couldn't find test documents."); + fail("Couldn't find test documents."); } } //------------------------------------------- /** @short close the environment. */ - public void after() + @After public void after() { - XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( - XCloseable.class, - m_xFrame); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xFrame); try { xClose.close(false); } catch(com.sun.star.util.CloseVetoException exVeto) - { failed("Test frame couldn't be closed successfully."); } + { fail("Test frame couldn't be closed successfully."); } m_xFrame = null; m_xLoader = null; @@ -270,7 +258,7 @@ public class CheckXComponentLoader extends ComplexTestCase //------------------------------------------- /** @short Look for files in the given directory for loading. */ - public void checkUsingOfMediaDescriptor() + @Test public void checkUsingOfMediaDescriptor() { InteractionHandler xHandler = new InteractionHandler(); StatusIndicator xIndicator = new StatusIndicator(StatusIndicator.SHOWSTATUS_LOG); @@ -292,17 +280,26 @@ public class CheckXComponentLoader extends ComplexTestCase Enumeration aSnapshot = m_lTestFiles.elements(); while (aSnapshot.hasMoreElements()) { - File aSysFile = new File(m_sTestDocPath+fs_sys+(String)aSnapshot.nextElement()); + File aSysFile = new File(m_sTestDocPath, (String)aSnapshot.nextElement()); String sURL = URLHelper.getFileURLFromSystemPath(aSysFile); - loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps); - - // Its not needed to reset this using states! - // Its done internaly ... - if (!xIndicator.wasUsed()) - failed("External progress was not used for loading."); - if (xHandler.wasUsed()) - failed("External interaction handler was not used for loading."); + if (/*! (sURL.endsWith(".jpg") || + sURL.endsWith(".gif"))*/ + true + ) + { + loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps); + // Its not needed to reset this using states! + // Its done internaly ... + if (!xIndicator.wasUsed()) + { + System.out.println("External progress was not used for loading."); + } + if (xHandler.wasUsed()) + { + System.out.println("External interaction handler was not used for loading."); + } + } } } @@ -313,17 +310,23 @@ public class CheckXComponentLoader extends ComplexTestCase String sPrefix ) { File aDir = new File(sTempPath); - if (!aDir.exists()) - failed("Could not access temp directory \""+sTempPath+"\"."); + aDir.mkdirs(); +// if (!aDir.exists()) +// { +// fail("Could not access temp directory \"" + sTempPath + "\"."); +// } + // TODO: create a temp file which not exist! for (int i=0; i<999999; ++i) { File aTempFile = new File(aDir, sSuffix+i+sPrefix); if (!aTempFile.exists()) + { return aTempFile.getAbsolutePath(); + } } - failed("Seems that all temp file names are currently in use!"); + fail("Seems that all temp file names are currently in use!"); return null; } @@ -360,25 +363,19 @@ public class CheckXComponentLoader extends ComplexTestCase { // load it xDoc = xLoader.loadComponentFromURL(sSourceURL, "_blank", 0, lLoadProps); - if (xDoc == null) - failed("Could create office document, which should be saved as temp one."); + assertNotNull("Could create office document, which should be saved as temp one.", xDoc); // save it as temp file - XStorable xStore = (XStorable)UnoRuntime.queryInterface( - XStorable.class, - xDoc); + XStorable xStore = UnoRuntime.queryInterface(XStorable.class, xDoc); xStore.storeAsURL(sTargetURL, lSaveProps); // Dont forget to close this file. Otherwise the temp file is locked! - XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( - XCloseable.class, - xDoc); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc); xClose.close(false); } catch(java.lang.Throwable ex) { - ex.printStackTrace(); - failed("Could not create temp office document."); + fail("Could not create temp office document."); } } @@ -389,7 +386,7 @@ public class CheckXComponentLoader extends ComplexTestCase as password for the ftp connection, or - if none given a default one. */ - public void checkLoadingWithPassword() + @Test public void checkLoadingWithPassword() { String sTempFile = impl_getTempFileName(m_sTempPath, SUFFIX_PASSWORD_TEMPFILE, PREFIX_PASSWORD_TEMPFILE); File aTestFile = new File(sTempFile); @@ -414,14 +411,14 @@ public class CheckXComponentLoader extends ComplexTestCase lArgs2[0].Value = Boolean.TRUE; loadURL(m_xLoader, RESULT_VALID_DOC, sTestURL, "_blank", 0, lArgs1); - loadURL(m_xLoader, RESULT_EMPTY_DOC, sTestURL, "_blank", 0, lArgs2); +// TODO: wrong? loadURL(m_xLoader, RESULT_EMPTY_DOC, sTestURL, "_blank", 0, lArgs2); } /** * Check URL encoding. The first filename that matches "*.sxw" * is used as source for several encodings. */ - public void checkURLEncoding() { + @Test public void checkURLEncoding() { PropertyValue[] lProps = new PropertyValue[1]; lProps[0] = new PropertyValue(); @@ -432,21 +429,17 @@ public class CheckXComponentLoader extends ComplexTestCase InputStreamReader in = new InputStreamReader(System.in); String sSystemEncoding = in.getEncoding(); - log.println("This system's encoding: " + sSystemEncoding); + System.out.println("This system's encoding: " + sSystemEncoding); - if (m_lTestFiles == null) { - failed("Found an empty directory. There are no files for testing."); + assertNotNull("Found an empty directory. There are no files for testing.", m_lTestFiles); - return; - } // get a file name as byte array Enumeration aSnapshot = m_lTestFiles.elements(); byte[] baURL = null; while (aSnapshot.hasMoreElements()) { - File aFile = new File(m_sTestDocPath + fs_sys + - aSnapshot.nextElement()); + File aFile = new File(m_sTestDocPath, (String)aSnapshot.nextElement()); String sFile = URLHelper.getFileURLFromSystemPath(aFile); // take the first sxw file as stream @@ -457,11 +450,7 @@ public class CheckXComponentLoader extends ComplexTestCase } } - if (baURL == null) { - failed("Found no file to load. Cannot test."); - - return; - } + assertNotNull("Found no file to load. Cannot test.", baURL); //construct several different encoded strings String[] sEncoding = new String[] { @@ -477,7 +466,7 @@ public class CheckXComponentLoader extends ComplexTestCase for (int i = 0; i < sEncoding.length; i = i + 2) { try { String encURL = new String(baURL, sEncoding[i]); - log.println("ENC[" + sEncoding[i] + "]"); + System.out.println("ENC[" + sEncoding[i] + "]"); if (sEncoding[i + 1].equals("TRUE")) { loadURL(m_xLoader, RESULT_VALID_DOC, encURL, "_blank", 0, @@ -488,8 +477,8 @@ public class CheckXComponentLoader extends ComplexTestCase lProps); } } catch (java.io.UnsupportedEncodingException e) { - failed("Unsopported Encoding: " + sEncoding[i] + - "\n Not able to test encoding on this platform.", true); + fail("Unsopported Encoding: " + sEncoding[i] + + "\n Not able to test encoding on this platform."); } } } @@ -502,107 +491,107 @@ public class CheckXComponentLoader extends ComplexTestCase * 4. FTP URLs * 5. HTTP URLs */ - public void checkURLHandling() { - PropertyValue[] lProps = new PropertyValue[1]; - - lProps[0] = new PropertyValue(); - lProps[0].Name = "Hidden"; - lProps[0].Value = Boolean.TRUE; - - log.println("check possible but unsupported URLs"); - - String[] sIllegalArgs = new String[] { - "slot:5000", "slot:10909", ".uno:SaveAs", ".uno:Open", - }; - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, - "_blank", 0, lProps); - - log.println("check stupid URLs"); - - sIllegalArgs = new String[] { - "slot:xxx", "slot:111111111", ".uno:save_as", ".uno:open_this", - ".UnO:*", - }; - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, - "_blank", 0, lProps); - - String[] sEmptyDocs = new String[] { - "mailo:hansi.meier@germany.sun.com", "file:/c:\\test/file.cxx", - "file:///c|:\\test/file.cxx", "http_server://staroffice-doc\\", - "c:\\\\test///\\test.sxw", "news_:staroffice-doc", - "newsletter@blubber", "private_factory/swriter", - "private:factory//swriter", "private:factory/swriter/___", - "c:\\test\\test.sxw", "macro:///ImportWizard.Main.Main", - "macro:///Euro.AutoPilotRun.StartAutoPilot", - "service:com.sun.star.frame.Frame", - "mailto:steffen.grund@germany.sun.com", "news:staroffice-doc", - "macro:/ExportWizard", "macro://Euro.AutoPilotRun.StartAutoPilot", - "service:com.sun.star.frame." - }; - - //with cws_loadenv01 changed to IllegalArgumentException - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, - lProps); - - log.println("check case senstive URLs"); - - sIllegalArgs = new String[] { - "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", - }; - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, - "_blank", 0, lProps); - - sEmptyDocs = new String[] { - "private:factory/SWRITER", "private:factory/SWRITER/WEB", - "macro:///importwizard.main.main", - "Macro:///euro.autopilotrun.startautopilot", - "Service:Com.Sun.Star.Frame.Frame", - "Mailto:andreas.schluens@germany.sun.com", "neWs:staroffice-doc", - "News:Staroffice-doc" - }; - - //with cws_loadenv01 changed to IllegalArgumentException - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, - lProps); - - log.println("check FTP URLs"); - - String sFTPURL = (String) param.get("FtpAccess"); - Enumeration aSnapshot = m_lTestFiles.elements(); - - while (aSnapshot.hasMoreElements()) { - String doc = (String) aSnapshot.nextElement(); - - - // if os is windows - doc = doc.replace('\\', '/'); - if (doc.indexOf("CVS")<0) { - loadURL(m_xLoader, RESULT_VALID_DOC, sFTPURL + "/" + doc, - "_blank", 0, lProps); - } - } - - log.println("check HTTP URLs"); - - String sHTTPURL = (String) param.get("HttpAccess"); - aSnapshot = m_lTestFiles.elements(); - - while (aSnapshot.hasMoreElements()) { - String doc = (String) aSnapshot.nextElement(); - - - // if os is windows - doc = doc.replace('\\', '/'); - if (doc.indexOf("CVS")<0) { - loadURL(m_xLoader, RESULT_VALID_DOC, sHTTPURL + "/" + doc, - "_blank", 0, lProps); - } - } - } +// public void checkURLHandling() { +// PropertyValue[] lProps = new PropertyValue[1]; +// +// lProps[0] = new PropertyValue(); +// lProps[0].Name = "Hidden"; +// lProps[0].Value = Boolean.TRUE; +// +// System.out.println("check possible but unsupported URLs"); +// +// String[] sIllegalArgs = new String[] { +// "slot:5000", "slot:10909", ".uno:SaveAs", ".uno:Open", +// }; +// loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, +// "_blank", 0, lProps); +// +// System.out.println("check stupid URLs"); +// +// sIllegalArgs = new String[] { +// "slot:xxx", "slot:111111111", ".uno:save_as", ".uno:open_this", +// ".UnO:*", +// }; +// loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, +// "_blank", 0, lProps); +// +// String[] sEmptyDocs = new String[] { +// "mailo:hansi.meier@germany.sun.com", "file:/c:\\test/file.cxx", +// "file:///c|:\\test/file.cxx", "http_server://staroffice-doc\\", +// "c:\\\\test///\\test.sxw", "news_:staroffice-doc", +// "newsletter@blubber", "private_factory/swriter", +// "private:factory//swriter", "private:factory/swriter/___", +// "c:\\test\\test.sxw", "macro:///ImportWizard.Main.Main", +// "macro:///Euro.AutoPilotRun.StartAutoPilot", +// "service:com.sun.star.frame.Frame", +// "mailto:steffen.grund@germany.sun.com", "news:staroffice-doc", +// "macro:/ExportWizard", "macro://Euro.AutoPilotRun.StartAutoPilot", +// "service:com.sun.star.frame." +// }; +// +// //with cws_loadenv01 changed to IllegalArgumentException +// loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, +// lProps); +// +// System.out.println("check case senstive URLs"); +// +// sIllegalArgs = new String[] { +// "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", +// }; +// loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, +// "_blank", 0, lProps); +// +// sEmptyDocs = new String[] { +// "private:factory/SWRITER", "private:factory/SWRITER/WEB", +// "macro:///importwizard.main.main", +// "Macro:///euro.autopilotrun.startautopilot", +// "Service:Com.Sun.Star.Frame.Frame", +// "Mailto:andreas.schluens@germany.sun.com", "neWs:staroffice-doc", +// "News:Staroffice-doc" +// }; +// +// //with cws_loadenv01 changed to IllegalArgumentException +// loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, +// lProps); +// +// System.out.println("check FTP URLs"); +// +// String sFTPURL = (String) param.get("FtpAccess"); +// Enumeration aSnapshot = m_lTestFiles.elements(); +// +// while (aSnapshot.hasMoreElements()) { +// String doc = (String) aSnapshot.nextElement(); +// +// +// // if os is windows +// doc = doc.replace('\\', '/'); +// if (doc.indexOf("CVS")<0) { +// loadURL(m_xLoader, RESULT_VALID_DOC, sFTPURL + "/" + doc, +// "_blank", 0, lProps); +// } +// } +// +// System.out.println("check HTTP URLs"); +// +// String sHTTPURL = (String) param.get("HttpAccess"); +// aSnapshot = m_lTestFiles.elements(); +// +// while (aSnapshot.hasMoreElements()) { +// String doc = (String) aSnapshot.nextElement(); +// +// +// // if os is windows +// doc = doc.replace('\\', '/'); +// if (doc.indexOf("CVS")<0) { +// loadURL(m_xLoader, RESULT_VALID_DOC, sHTTPURL + "/" + doc, +// "_blank", 0, lProps); +// } +// } +// } /** TODo document me */ - public void checkStreamLoading() + @Test public void checkStreamLoading() { PropertyValue[] lProps = new PropertyValue[2]; @@ -616,11 +605,13 @@ public class CheckXComponentLoader extends ComplexTestCase Enumeration aSnapshot = m_lTestFiles.elements(); while (aSnapshot.hasMoreElements()) { - File aFile = new File(m_sTestDocPath + fs_sys + (String) aSnapshot.nextElement()); + File aFile = new File(m_sTestDocPath, (String) aSnapshot.nextElement()); String sURL = URLHelper.getFileURLFromSystemPath(aFile); - if (sURL.indexOf("CVS") > -1) - continue; +// if (sURL.indexOf("CVS") > -1) +// { +// continue; +// } try { @@ -628,12 +619,15 @@ public class CheckXComponentLoader extends ComplexTestCase lProps[1].Value = xStream; } catch(com.sun.star.uno.Exception e) - { failed("Could not open test file \""+sURL+"\" for stream test."); } + { + fail("Could not open test file \""+sURL+"\" for stream test."); + } // check different version of "private:stream" URL! loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps); - loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream/", "_blank", 0, lProps); - } + // loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps); + // loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream/", "_blank", 0, lProps); + } } /** @@ -664,10 +658,8 @@ public class CheckXComponentLoader extends ComplexTestCase } catch (com.sun.star.io.IOException exIO) { nResult = RESULT_IOEXCEPTION; } catch (com.sun.star.uno.RuntimeException exRuntime) { - exRuntime.printStackTrace(); nResult = RESULT_RUNTIMEEXCEPTION; } catch (Exception e) { - e.printStackTrace(); nResult = RESULT_EXCEPTION; } @@ -677,22 +669,22 @@ public class CheckXComponentLoader extends ComplexTestCase xDoc = null; } } catch (com.sun.star.uno.RuntimeException exClosing) { - log.println("exception during disposing of a document found!" + + System.out.println("exception during disposing of a document found!" + " Doesn't influence test - but should be checked."); } String sMessage = "URL[\"" + sURL + "\"]"; if (nResult == nRequiredResult) { - log.println(sMessage + " expected result [" + + System.out.println(sMessage + " expected result [" + convertResult2String(nResult) + "] "); } else { - failed(sMessage + " unexpected result [" + + fail(sMessage + " unexpected result [" + convertResult2String(nResult) + "] " + "\nrequired was [" + convertResult2String(nRequiredResult) + "]" + - "\nwe got [" + convertResult2String(nResult) + "]", - true); + "\nwe got [" + convertResult2String(nResult) + "]" + ); } } @@ -700,8 +692,9 @@ public class CheckXComponentLoader extends ComplexTestCase String[] sURL, String sTarget, int nFlags, PropertyValue[] lProps) { for (int i = 0; i < sURL.length; i++) - loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, - lProps); + { + loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, lProps); + } } /** @@ -730,4 +723,28 @@ public class CheckXComponentLoader extends ComplexTestCase return "unknown!"; } -}
\ No newline at end of file + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); + +} diff --git a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java index ff4bf87c4f23..92d8f3c34543 100644 --- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java +++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.loadAllDocuments.helper; +package complex.loadAllDocuments; import com.sun.star.beans.PropertyValue; diff --git a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index 61f6d9fc525c..c28993010ed8 100644 --- a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.loadAllDocuments.helper; +package complex.loadAllDocuments; // __________ Imports __________ diff --git a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java index 2f09044960ad..7b59c25d0a79 100644 --- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.loadAllDocuments.helper; +package complex.loadAllDocuments; import com.sun.star.uno.UnoRuntime; import com.sun.star.ucb.XSimpleFileAccess; diff --git a/framework/qa/complex/loadAllDocuments/TestDocument.java b/framework/qa/complex/loadAllDocuments/TestDocument.java new file mode 100644 index 000000000000..fe41a6161c4a --- /dev/null +++ b/framework/qa/complex/loadAllDocuments/TestDocument.java @@ -0,0 +1,41 @@ +/************************************************************************* +* +* 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. +* +************************************************************************/ + +package complex.loadAllDocuments; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +final class TestDocument +{ + public static String getUrl(String name) + { + return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + } + + private TestDocument() {} +} diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/qa/complex/loadAllDocuments/helper/makefile.mk index 98c414c2c1f7..05a3c7a997ea 100644 --- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk +++ b/framework/qa/complex/loadAllDocuments/helper/makefile.mk @@ -24,10 +24,10 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/..$/.. +PRJ = ../../../.. TARGET = CheckXComponentLoader PRJNAME = framework -PACKAGE = complex$/loadAllDocuments$/helper +PACKAGE = complex/loadAllDocuments/helper # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -35,10 +35,9 @@ PACKAGE = complex$/loadAllDocuments$/helper #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - Generator.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar JAVAFILES = InteractionHandler.java StatusIndicator.java StreamSimulator.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) MAXLINELENGTH = 100000 diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk index 02aacd36d20d..ebf0265620bf 100644 --- a/framework/qa/complex/loadAllDocuments/makefile.mk +++ b/framework/qa/complex/loadAllDocuments/makefile.mk @@ -24,68 +24,111 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = CheckXComponentLoader -PRJNAME = framework -PACKAGE = complex$/loadAllDocuments - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - OOoRunner.jar mysql.jar -JAVAFILES = CheckXComponentLoader.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -SUBDIRS = helper - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_loadAllDocuments -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/loadAllDocuments -# start the runner application -CT_APP = org.openoffice.Runner +# here store only Files which contain a @Test +JAVATESTFILES = \ + CheckXComponentLoader.java -# --- Targets ------------------------------------------------------ +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + InteractionHandler.java \ + StatusIndicator.java \ + StreamSimulator.java \ + TestDocument.java -.IF "$(depend)" == "" -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -.ELSE -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -.ENDIF +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -.INCLUDE : target.mk +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props - cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props - jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -RUN: run +ALLTAR : javatest -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -tdoc $(PWD)$/testdocuments +.END +# +# +# PRJ = ..$/..$/.. +# TARGET = CheckXComponentLoader +# PRJNAME = framework +# PACKAGE = complex$/loadAllDocuments +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ +# OOoRunner.jar mysql.jar +# JAVAFILES = +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# SUBDIRS = helper +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # test looks something like the.full.package.TestName +# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .IF "$(depend)" == "" +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR +# .ELSE +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP +# .ENDIF +# +# .INCLUDE : target.mk +# +# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props +# cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props +# jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props +# +# RUN: run +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -tdoc $(PWD)$/testdocuments +# +# +# diff --git a/framework/qa/complex/loadAllDocuments/password_check.sxw b/framework/qa/complex/loadAllDocuments/testdocuments/password_check.sxw Binary files differindex ec545b99e22a..ec545b99e22a 100644 --- a/framework/qa/complex/loadAllDocuments/password_check.sxw +++ b/framework/qa/complex/loadAllDocuments/testdocuments/password_check.sxw diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index cc896a74ea16..36abfd55bbde 100755 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -27,432 +27,992 @@ package complex.path_settings; import com.sun.star.beans.Property; +import com.sun.star.beans.PropertyVetoException; +import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.XFastPropertySet; import com.sun.star.beans.XMultiPropertySet; import com.sun.star.beans.XPropertySet; import com.sun.star.beans.XPropertiesChangeListener; import com.sun.star.beans.XPropertyChangeListener; import com.sun.star.beans.XVetoableChangeListener; +import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.AnyConverter; -import complexlib.ComplexTestCase; -public class PathSettingsTest extends ComplexTestCase { +// ---------- junit imports ----------------- +import java.util.ArrayList; +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + +public class PathSettingsTest +{ private static XMultiServiceFactory xMSF; - // the test object: an instance of the tested service - private static Object oObj = null; + private static Object aPathSettings = null; // the properties of the service - private static Property[] props = null; - private static String[] propNames = null; - private static String[] availablePropNames = new String[]{ - "Addin", - "AutoCorrect", - "Autotext", - "Backup", - "Basic", - "Bitmap", - "Config", - "Dictionary", - "Favorite", - "Filter", - "Gallery", - "Help", - "Linguistic", - "Module", - "Palette", - "Plugin", - "Temp", - "Template", - "UIConfig", - "UserConfig", - "UserDictionary", - "Work", -}; - private static String[] propVals = null; + private static Property[] xPropertyInfoOfPathSettings = null; + private static String[] aPathSettingNames = null; + private static String[] availablePropNames = new String[] + { + "Addin", + "AutoCorrect", + "AutoText", + "Backup", + "Basic", + "Bitmap", + "Config", + "Dictionary", + "Favorite", + "Filter", + "Fingerprint", + "Gallery", + "Graphic", + "Help", + "Linguistic", + "Module", + "Palette", + "Plugin", + "Storage", + "Temp", + "Template", + "UIConfig", + "UserConfig", + "Work", + }; + // every path name from availablePropNames exist in this characteristics + // name + // name_internal + // name_user + // name_writable + private static String[] availablePropNameExtensions = new String[] + { + "", + "_internal", + "_user", + "_writable" + }; + private static String[] aPathSettingValues = null; + ArrayList<Property> aListOfWorkingProperty; /** * A function to tell the framework, which test functions are available. * Right now, it's only 'checkComplexTemplateState'. * @return All test methods. */ - public String[] getTestMethodNames() { - return new String[]{"checkXFastPropertySet", - "checkXMultiPropertySet", - "checkXPropertySet" - }; - } - +// public String[] getTestMethodNames() { +// return new String[]{"checkXFastPropertySet", +// "checkXMultiPropertySet", +// "checkXPropertySet" +// }; +// } /** * Initialize before the tests start: this has to be done only once. - * This methods sets the 'oObj' and 'props' variables. + * This methods sets the 'aPathSettings' and 'xPropertyInfoOfPathSettings' variables. */ - public void before() { - try { - xMSF = (XMultiServiceFactory)param.getMSF(); -// oObj = xMSF.createInstance("com.sun.star.util.PathSettings"); - oObj = xMSF.createInstance("com.sun.star.comp.framework.PathSettings"); - System.out.println("Implementation: " + util.utils.getImplName(oObj)); - System.out.println("Service: "); - util.dbg.getSuppServices(oObj); - if (oObj == null) throw new com.sun.star.uno.Exception(); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); - - props = xProp.getPropertySetInfo().getProperties(); - propNames = new String[props.length]; - propVals = new String[props.length]; + @Before + public void before() + { + try + { + xMSF = getMSF(); +// aPathSettings = xMSF.createInstance("com.sun.star.util.PathSettings"); + aPathSettings = xMSF.createInstance("com.sun.star.comp.framework.PathSettings"); + assertNotNull("Can't instantiate com.sun.star.util.PathSettings.", aPathSettings); +// System.out.println("Implementation: " + util.utils.getImplName(aPathSettings)); +// System.out.println("Service: "); + util.dbg.getSuppServices(aPathSettings); + final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings); + + xPropertyInfoOfPathSettings = xPropSet_of_PathSettings.getPropertySetInfo().getProperties(); + aPathSettingNames = new String[xPropertyInfoOfPathSettings.length]; + aPathSettingValues = new String[xPropertyInfoOfPathSettings.length]; + + aListOfWorkingProperty = new ArrayList<Property>(); // get intitial values and create new ones - log.println("\n---- All properties ----"); - for (int i = 1; i < props.length; i++) { - propNames[i] = props[i].Name; - Object o = xProp.getPropertyValue(propNames[i]); - System.out.println("#### Object: " + o.getClass().getName() + " - " + o.toString()); - propVals[i] = AnyConverter.toString(o); - System.out.println("#### String " + propVals[i]); - log.println("Property Name: " + propNames[i]); - log.println("Property Value: " + propVals[i]); - } - log.println("---- Finish showing properties ----\n"); - } - catch(com.sun.star.uno.Exception e) { - e.printStackTrace(); - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Could not create an instance of the test object."); - } - catch(Exception e) { - e.printStackTrace(); - failed("What exception?"); + for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++) + { + final String sName = xPropertyInfoOfPathSettings[i].Name; + // System.out.println(sName); + aPathSettingNames[i] = sName; + Object o = xPropSet_of_PathSettings.getPropertyValue(sName); + + String sValue = convertToString(o); + aPathSettingValues[i] = sValue; + aListOfWorkingProperty.add(xPropertyInfoOfPathSettings[i]); + } + } + catch (com.sun.star.uno.Exception e) + { + System.out.println(e.getClass().getName()); + System.out.println("Message: " + e.getMessage()); + // fail("Could not create an instance of the test object."); + } + catch (Exception e) + { + fail("What exception?"); } } + private String convertToString(Object o) + { + String sValue = ""; + try + { + if (AnyConverter.isString(o)) + { + sValue = AnyConverter.toString(o); + } + else if (AnyConverter.isArray(o)) + { + Object oValueList = AnyConverter.toArray(o); + String[] aValueList = (String[]) oValueList; + String sValues = ""; + for (int j = 0; j < aValueList.length; j++) + { + if (sValues.length() > 0) + { + sValues += ";"; + } + sValues += aValueList[j]; + } + sValue = sValues; + } + else + { + System.out.println("Can't convert Object to String"); + } + } + catch (com.sun.star.uno.Exception e) + { + /* ignore */ + } + return sValue; + } + /** - * This tests the XFastPropertySet interface implementation. + * Simple existance test, if this fails, the Lists must update */ - public void checkXFastPropertySet() + @Test + public void checkInternalListConsistence() { - log.println("---- Testing the XFastPropertySet interface ----"); - - // creating instances - XFastPropertySet xFPS = (XFastPropertySet) - UnoRuntime.queryInterface(XFastPropertySet.class, oObj); - - String name = null; - // do for all properties - for (int i = 0; i < props.length; i++) { - try { - Property property = props[i]; - name = property.Name; - int handle = property.Handle; - - // get property name and initial value - log.println("Test property with name: " + name); - String val = (String)xFPS.getFastPropertyValue(handle); - log.println("Property has initial value: '" + val + "'"); - - // set to a new correct value - String newVal = changeToCorrectValue(val); - log.println("Try to change to correct value '" + newVal + "'"); - xFPS.setFastPropertyValue(handle, newVal); + // check if all Properties are in the internal test list + for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++) + { + final String sName = xPropertyInfoOfPathSettings[i].Name; + boolean bOccur = checkIfNameExistsInList(sName, availablePropNames, availablePropNameExtensions); + assertTrue("TEST IS WRONG, Name:='" + sName + "' doesn't exist in internal Test list.", bOccur); + } - // check the change - String checkVal = (String)xFPS.getFastPropertyValue(handle); - assure("Did not change value on property " + name + ".", checkVal.equals(newVal)); + // check if all properties in the internal list also exist in real life + for (int i = 0; i < availablePropNames.length; i++) + { + final String aListName = availablePropNames[i]; + for (int j = 0; j < availablePropNameExtensions.length; j++) + { + final String aSubListName = availablePropNameExtensions[j]; + final String aName = aListName + aSubListName; + boolean bOccur = checkIfNameExistsInList(aName, aPathSettingNames, new String[] + { + "" + } /* list must not empty! */); + assertTrue("TEST IS WRONG, Name:='" + aName + "' from the internal test list do not occur in real life path settings.", bOccur); + } + } + } - newVal = changeToIncorrectValue(val); - log.println("Try to change to incorrect value '" + newVal + "'"); - try { - xFPS.setFastPropertyValue(handle, newVal); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("Correctly thrown Exception caught."); + /** + * Simple O(n^n) check if a given String (_sNameMustOccur) exist in the given list(+SubList) values. + * @param _sNameMustOccur + * @param _aList + * @param _aSubList + * @return true, if name occur + */ + private boolean checkIfNameExistsInList(String _sNameMustOccur, String[] _aList, String[] _aSubList) + { + for (int i = 0; i < _aList.length; i++) + { + final String aListName = _aList[i]; + for (int j = 0; j < _aSubList.length; j++) + { + final String aSubListName = _aSubList[j]; + final String aName = aListName + aSubListName; + if (aName.equals(_sNameMustOccur)) + { + return true; } + } + } + return false; + } - // check if changed - checkVal = (String)xFPS.getFastPropertyValue(handle); - assure("Value did change on property " + name + " though it should not have.", - !checkVal.equals(newVal)); - - // set back to initial setting - xFPS.setFastPropertyValue(handle, val); - - // check if changed - checkVal = (String)xFPS.getFastPropertyValue(handle); - assure("Did not change value back to original on property " - + name, checkVal.equals(val)); - log.println("Test of property " + name + " finished\n"); + private String getPropertyValueAsString(String _sName) + { + final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings); + String sValue = ""; + { + Object o; + try + { + o = xPropSet_of_PathSettings.getPropertyValue(_sName); + sValue = convertToString(o); + } + catch (UnknownPropertyException ex) + { } - catch(com.sun.star.uno.Exception e) { -// e.printStackTrace(); - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Unexpected exception on property " + name + "."); - continue; + catch (WrappedTargetException ex) + { } } - log.println("---- Test of XFastPropertySet finished ----\n"); + return sValue; } - - // ____________________ /** - * This tests the XMultiPropertySet interface implementation. + * Shows the path settings + * @throws UnknownPropertyException + * @throws WrappedTargetException */ - public void checkXMultiPropertySet() + @Test + public void showPathSettings() throws UnknownPropertyException, WrappedTargetException + { + System.out.println("\n---- All properties ----"); + final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings); + +// for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++) + for (int i = 0; i < aListOfWorkingProperty.size(); i++) + { + final String sName = aListOfWorkingProperty.get(i).Name; + // aPathSettingWorkingNames[i] = sName; +// System.out.print("PathSettings: Name:="); + System.out.print(sName); + Object o = xPropSet_of_PathSettings.getPropertyValue(sName); + + // System.out.println("#### Object: '" + o.getClass().getName() + "' - '" + o.toString() + "'"); + try + { + final String sValue = AnyConverter.toString(o); + // aPathSettingValues[i] = sValue; + // System.out.println("#### String " + sValue); + // System.out.println("Property Name: " + sName); + // System.out.println("Property Value: " + sValue); +// System.out.print(" ==> "); +// System.out.print(sValue); + } + catch (com.sun.star.uno.Exception e) + { +// System.out.print(" FAILED "); + } + System.out.println(); + } + System.out.println("---- Finish showing properties ----\n"); + } + + private boolean checkPaths(Object _o, Object _o2) { - log.println("---- Testing the XMultiPropertySet interface ----"); - XMultiPropertySet xMPS = (XMultiPropertySet) - UnoRuntime.queryInterface(XMultiPropertySet.class, oObj); - - String[] correctVals = new String[props.length]; - String[] incorrectVals = new String[props.length]; - - // get intitial values and create new ones - for (int i = 0; i < props.length; i++) { - correctVals[i] = changeToCorrectValue(propVals[i]); - incorrectVals[i] = changeToIncorrectValue(propVals[i]); - } - - try { - // add a change listener - MyChangeListener mListener = new MyChangeListener(); - xMPS.addPropertiesChangeListener(propNames, mListener); - - // first change props to correct values - log.println("Change to correct values."); - xMPS.setPropertyValues(propNames, correctVals); - assure("Could not change to correct values with XMultiPropoertySet.", - verifyPropertySet(xMPS,propNames,correctVals)>0); - - // second, change to incorrect values: expect an exception - log.println("Try to change to incorrect values."); - try { - xMPS.setPropertyValues(propNames, incorrectVals); - } - catch(com.sun.star.lang.IllegalArgumentException r) { - log.println("Correctly thrown Exception caught."); - } - assure("Did change to incorrect values with XMultiPropertySet," + - " but should not have.", - verifyPropertySet(xMPS,propNames,correctVals)>0); - - // third, change back to initial values - log.println("Change back to initial values."); - xMPS.setPropertyValues(propNames, propVals); - assure("Could not change back to initial values with" + - " XMultiPropertySet.", - verifyPropertySet(xMPS,propNames,propVals)>0); - - // fire the event for the listener - log.println("Fire event."); - xMPS.firePropertiesChangeEvent(propNames, mListener); - assure("Event was not fired on XMultiPropertySet.", - mListener.changePropertiesEventFired()); - } - catch(com.sun.star.uno.Exception e) { -// e.printStackTrace(); - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Unexpected exception on XMultiPropertySet."); - } - - // test finished - log.println("---- Test of XMultiPropertySet finished ----\n"); + String sLeftPath = ""; + String sRightPath = ""; + if (AnyConverter.isArray(_o)) + { + try + { + Object oValues = AnyConverter.toArray(_o); + sLeftPath = convertToString(oValues); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + } + } + else if (AnyConverter.isString(_o)) + { + try + { + sLeftPath = AnyConverter.toString(_o); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + } + } + + if (AnyConverter.isArray(_o2)) + { + try + { + Object oValues = AnyConverter.toArray(_o2); + sRightPath = convertToString(oValues); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + } + } + else if (AnyConverter.isString(_o2)) + { + try + { + sRightPath = AnyConverter.toString(_o2); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + } + } + return checkPaths(sLeftPath, sRightPath); } /** - * Verify if the values of xProp are the same as vals. - * @param xProp A XMultiPropertySet. - * @param propNames An array with property names. - * @param vals An array with values of the properties - * @return -1 if none are equal, 1 if all are equal, 0 if some were equal - * and some not. - * @throws com.sun.star.lang.IllegalArgumentException + * Check 2 given paths if the _aOtherPath exists in _aPath, _aPath could be a list separated by ';' + * @param _aPath + * @param _aOtherPath + * @return true, if _aOtherPath found */ - private int verifyPropertySet(XMultiPropertySet xProp, - String[] propNames, String[] vals) + private boolean checkPaths(String _aPath, String _aOtherPath) { - int ret=0; - if (vals.length != propNames.length) { - log.println("Length of array parameters must be equal."); - return ret; - } - for (int i = 0; i < vals.length; i++) { - Object[] objs = xProp.getPropertyValues(new String[]{propNames[i]}); - String retVal = (String)objs[0]; - boolean nCheck = retVal.equals(vals[i]); - if (!nCheck) { - log.println("Property '" + propNames[i] + - "' was supposed to have value:"); - log.println(vals[i]); - log.println("but has value:"); - log.println(retVal); - } - // initialize - if (i==0) { - ret = nCheck?1:-1; - continue; - } - // return 0 if equal state changes compared to initial value - if ((nCheck && ret<0) || (!nCheck && ret>0)) { - ret = 0; - } - } - return ret; + if (_aOtherPath.contains(";")) + { + StringTokenizer aToken = new StringTokenizer(_aOtherPath, ";"); + int nCount = 0; + int nFound = 0; + while (aToken.hasMoreElements()) + { + String sPath = (String)aToken.nextElement(); + nCount ++; + if (checkPaths(_aPath, sPath)) + { + nFound++; + } + } + if (nFound == nCount) + { + return true; + } + } + else if(_aPath.contains(";")) + { + StringTokenizer aToken = new StringTokenizer(_aPath, ";"); + while (aToken.hasMoreElements()) + { + String sToken = (String)aToken.nextElement(); + if (sToken.equals(_aOtherPath)) + { + return true; + } + } + return false; + } + else if (_aPath.equals(_aOtherPath)) + { + return true; + } + return false; } - - // ____________________ /** - * This tests the XPropertySet interface implementation. + * This tests the XFastPropertySet interface implementation. */ - public void checkXPropertySet() + @Test + public void checkXFastPropertySet() + { + System.out.println("---- Testing the XFastPropertySet interface ----"); + + + // do for all properties + // xPropertyInfoOfPathSettings.length + for (int i = 0; i < aListOfWorkingProperty.size(); i++) + { + final Property property = aListOfWorkingProperty.get(i); // xPropertyInfoOfPathSettings[i]; + String name = property.Name; + // get property name and initial value + System.out.println("Test property with name: " + name); + boolean bResult; + if (name.endsWith("_writable")) + { + bResult = checkStringProperty(property); + } + else if (name.endsWith("_user")) + { + bResult = checkStringListProperty(property); + } + else if (name.endsWith("_internal")) + { + bResult = checkStringListProperty(property); + } + else + { + // old path settings + bResult = checkStringProperty(property); + } + System.out.print(" Test of property " + name + " finished"); + if (bResult) + { + System.out.println(" [ok]"); + } + else + { + System.out.println(" [FAILED]"); + } + System.out.println(); + } + System.out.println("---- Test of XFastPropertySet finished ----\n"); + } + + private boolean checkStringListProperty(Property property) { - log.println("---- Testing the XPropertySet interface ----"); + // creating instances + boolean bResult = true; + XFastPropertySet xFPS = UnoRuntime.queryInterface(XFastPropertySet.class, aPathSettings); - XPropertySet xPS = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + String name = property.Name; + int handle = property.Handle; - MyChangeListener mListener1 = new MyChangeListener(); - MyChangeListener mListener2 = new MyChangeListener(); + Object oValue; + try + { + oValue = xFPS.getFastPropertyValue(handle); + } + catch (UnknownPropertyException ex) + { + return false; + } + catch (WrappedTargetException ex) + { + return false; + } - for (int i=0; i<props.length; i++) { - // adding listeners - String name = propNames[i]; - log.println("Testing property '" + name + "'"); - try { - log.println("Add 2 Listeners."); - xPS.addPropertyChangeListener(name, mListener1); - xPS.addVetoableChangeListener(name, mListener1); - xPS.addPropertyChangeListener(name, mListener2); - xPS.addVetoableChangeListener(name, mListener2); + if (!AnyConverter.isArray(oValue)) + { + System.out.println(" Internal error, type wrong. PathSetting property with name:" + name + " should be an array."); + return false; + } - // change the property - log.println("Change value."); - String changeVal = changeToCorrectValue(propVals[i]); - xPS.setPropertyValue(name, changeVal); - String newVal = (String)xPS.getPropertyValue(name); + String val; + try + { + Object oValues = AnyConverter.toArray(oValue); - assure("Value did not change on property " + name + ".", - newVal.equals(changeVal)); - assure("Listener 1 was not called.", checkListener(mListener1), true); - assure("Listener 2 was not called.", checkListener(mListener2), true); + final String[] aValues = (String[])oValues; - mListener1.resetListener(); - mListener2.resetListener(); + // aNewValues contains a deep copy of aValues + String[] aNewValues = new String[aValues.length]; + System.arraycopy(aValues, 0, aNewValues, 0, aValues.length); + if (aValues.length > 0) + { + val = aValues[0]; + } + else + { + val = null; + aNewValues = new String[1]; // create a String list + } + System.out.println(" Property has initial value: '" + val + "'"); - log.println("Remove Listener 1."); + // set to a new correct value + String newVal = changeToCorrectValue(val); + assertFalse("newVal must not equal val.", newVal.equals(val)); - xPS.removePropertyChangeListener(name, mListener1); - xPS.removeVetoableChangeListener(name, mListener1); + System.out.println(" Try to change to a correct value '" + newVal + "'"); + aNewValues[0] = newVal; - // change the property - log.println("Change value back."); - xPS.setPropertyValue(name, propVals[i]); - newVal = (String)xPS.getPropertyValue(name); - assure("Value did not change on property " + name, - newVal.equals(propVals[i])); + try + { + try + { + xFPS.setFastPropertyValue(handle, aNewValues); + } + catch (com.sun.star.lang.WrappedTargetException e) + { + System.out.println(" FAIL: setFastPropertyValue(handle:=" + handle + ", name:='" + name + "')" + e.getMessage()); + bResult = false; + } + + // Property_internal can't change we will not arrive bejond this line + + // check the change + Object oObj = xFPS.getFastPropertyValue(handle); + if (!checkPaths(oObj, aNewValues)) + { + System.out.println(" FAIL: Did not change value on property " + name + "."); + bResult = false; + } - assure("Listener was called, although it was removed on" + - " property " + name + ".", !checkListener(mListener1), true); - assure("Listener 2 was not called on property " + name + ".", - checkListener(mListener2), true); + // set back to initial setting + System.out.println(" Try to check"); + try + { + xFPS.setFastPropertyValue(handle, oValue); + } + catch (com.sun.star.beans.PropertyVetoException e) + { + // should not occur + System.out.println(" FAIL: PropertyVetoException caught: " + e.getMessage()); + bResult = false; + } } - catch(com.sun.star.uno.Exception e) { - e.printStackTrace(); - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Unexpcted exception on property " + name); - continue; + catch (com.sun.star.beans.PropertyVetoException e) + { + if (!name.endsWith("_internal")) + { + // should not occur + System.out.println(" FAIL: PropertyVetoException caught: " + e.getMessage()); + bResult = false; + } + else + { + System.out.println(" OK: PropertyVetoException caught: " + e.getMessage() + " it seems not allowed to change internal values."); + } } - log.println("Finish testing property '" + propNames[i] + "'\n"); - } - log.println("---- Test of XPropertySet finished ----\n"); + // check if changed + Object checkVal3 = xFPS.getFastPropertyValue(handle); + if (!checkPaths(checkVal3, oValues)) + { + System.out.println(" FAIL: Can't change value back to original on property " + name); + bResult = false; + } + } + catch (com.sun.star.uno.Exception e) + { + System.out.println(" FAIL: getFastPropertyValue(handle:=" + handle + ", name:='" + name + "')" + e.getMessage()); + bResult = false; + } + return bResult; } - private boolean checkListener(MyChangeListener ml) { - return ml.changePropertyEventFired() || - ml.changePropertiesEventFired() || - ml.vetoableChangeEventFired(); + private boolean checkStringProperty(Property property) + { + boolean bResult = true; + XFastPropertySet xFPS = UnoRuntime.queryInterface(XFastPropertySet.class, aPathSettings); + String name = property.Name; + int handle = property.Handle; + Object oValue; + try + { + oValue = xFPS.getFastPropertyValue(handle); + } + catch (UnknownPropertyException ex) + { + return false; + } + catch (WrappedTargetException ex) + { + return false; + } + + + try + { + String val = ""; + val = AnyConverter.toString(oValue); + System.out.println(" Property has initial value: '" + val + "'"); + + // set to a new correct value + String newVal = changeToCorrectValue(val); + System.out.println(" Try to change to a correct value '" + newVal + "'"); + xFPS.setFastPropertyValue(handle, newVal); + + // check the change + String checkVal = (String) xFPS.getFastPropertyValue(handle); + if (!checkPaths(checkVal, newVal)) + { + System.out.println(" FAIL: Did not change value on property " + name + "."); + bResult = false; + } + newVal = changeToIncorrectValue(val); + System.out.println(" Try to change to incorrect value '" + newVal + "'"); + try + { + xFPS.setFastPropertyValue(handle, newVal); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + System.out.println(" Correctly thrown Exception caught."); + } + + // check if changed + String checkVal2 = (String) xFPS.getFastPropertyValue(handle); + if (!checkPaths(checkVal2, checkVal)) + { + System.out.println(" FAIL: Value did change on property " + name + " though it should not have."); + bResult = false; + } + else + { + System.out.println(" OK: Incorrect value was not set."); + } + // set back to initial setting + System.out.println(" Set back to initial value."); + try + { + xFPS.setFastPropertyValue(handle, val); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + System.out.println(" IllegalArgumentException caught: " + e.getMessage()); + bResult = false; + } + // check if changed + String checkVal3 = (String) xFPS.getFastPropertyValue(handle); + if (!checkVal3.equals(val)) + { + if (!checkPaths(checkVal3, val)) + { + System.out.println(" FAIL: Can't change value back to original on property " + name); + System.out.println(" Value is: " + checkVal3); + + bResult = false; + } + else + { + System.out.println(" OK: the pathsettings contains the original path."); + System.out.println(" Value is: " + checkVal3); + System.out.println(" Value should be: " + val); + } + } + else + { + System.out.println(" OK: Change value back to original on property " + name); + } + } + catch (com.sun.star.uno.Exception e) + { + System.out.println(" FAIL: getFastPropertyValue(handle:=" + handle + ", name:='" + name + "')" + e.getMessage()); + bResult = false; + } + return bResult; } // ____________________ /** + * This tests the XMultiPropertySet interface implementation. + */ + + // The test checkXMultiPropertySet() has been marked as outdated! + +// @Test +// public void checkXMultiPropertySet() +// { +// System.out.println("---- Testing the XMultiPropertySet interface ----"); +// XMultiPropertySet xMPS = UnoRuntime.queryInterface(XMultiPropertySet.class, aPathSettings); +// +// // xPropertyInfoOfPathSettings.length +// String[] propertiesToTest = new String[1]; +// propertiesToTest[0] = availablePropNames[0]; +// +// String[] correctVals = new String[propertiesToTest.length]; +// String[] incorrectVals = new String[propertiesToTest.length]; +// +// String[] aPathSettingWorkingNames = null; +// aPathSettingWorkingNames = new String[propertiesToTest.length]; +// +// // get intitial values and create new ones +// for (int i = 0; i < propertiesToTest.length; i++) +// { +// // Property aProp = aListOfWorkingProperty.get(i); +// final String sName = propertiesToTest[i]; +// final String sValue = getPropertyValueAsString(sName); +// aPathSettingWorkingNames[i] = sName; +// correctVals[i] = changeToCorrectValue(sValue); +// incorrectVals[i] = changeToIncorrectValue(sValue); +// } +// +// try +// { +// // add a change listener +// MyChangeListener mListener = new MyChangeListener(); +// xMPS.addPropertiesChangeListener(aPathSettingWorkingNames, mListener); +// +// // first change xPropertyInfoOfPathSettings to correct values +// System.out.println("Change to correct values."); +// xMPS.setPropertyValues(aPathSettingWorkingNames, correctVals); +// assertTrue("Could not change to correct values with XMultiPropertySet.", +// verifyPropertySet(xMPS, aPathSettingWorkingNames, correctVals) > 0); +// +// // second, change to incorrect values: expect an exception +// System.out.println("Try to change to incorrect values."); +// try +// { +// xMPS.setPropertyValues(aPathSettingWorkingNames, incorrectVals); +// } +// catch (com.sun.star.lang.IllegalArgumentException r) +// { +// System.out.println("Correctly thrown Exception caught."); +// } +// assertTrue("Did change to incorrect values with XMultiPropertySet," +// + " but should not have.", +// verifyPropertySet(xMPS, aPathSettingWorkingNames, correctVals) > 0); +// +// // third, change back to initial values +// System.out.println("Change back to initial values."); +// xMPS.setPropertyValues(aPathSettingWorkingNames, aPathSettingValues); +// assertTrue("Could not change back to initial values with" +// + " XMultiPropertySet.", +// verifyPropertySet(xMPS, aPathSettingWorkingNames, aPathSettingValues) > 0); +// +// // fire the event for the listener +// System.out.println("Fire event."); +// xMPS.firePropertiesChangeEvent(aPathSettingWorkingNames, mListener); +// assertTrue("Event was not fired on XMultiPropertySet.", +// mListener.changePropertiesEventFired()); +// } +// catch (com.sun.star.uno.Exception e) +// { +//// e.printStackTrace(); +// System.out.println(e.getClass().getName()); +// System.out.println("Message: " + e.getMessage()); +// fail("Unexpected exception on XMultiPropertySet."); +// } +// +// // test finished +// System.out.println("---- Test of XMultiPropertySet finished ----\n"); +// } + + /** + * Verify if the values of xPropSet_of_PathSettings are the same as vals. + * @param xPropSet_of_PathSettings A XMultiPropertySet. + * @param aPathSettingWorkingNames An array with property names. + * @param vals An array with values of the properties + * @return -1 if none are equal, 1 if all are equal, 0 if some were equal + * and some not. + * @throws com.sun.star.lang.IllegalArgumentException + */ +// private int verifyPropertySet(XMultiPropertySet xProp, +// String[] propNames, String[] vals) +// { +// int ret = 0; +// if (vals.length != propNames.length) +// { +// System.out.println("Length of array parameters must be equal."); +// return ret; +// } +// for (int i = 0; i < vals.length; i++) +// { +// Object[] objs = xProp.getPropertyValues(new String[] +// { +// propNames[i] +// }); +// String retVal = (String) objs[0]; +// boolean nCheck = retVal.equals(vals[i]); +// if (!nCheck) +// { +// System.out.println("Property '" + propNames[i] +// + "' was supposed to have value:"); +// System.out.println(vals[i]); +// System.out.println("but has value:"); +// System.out.println(retVal); +// } +// // initialize +// if (i == 0) +// { +// ret = nCheck ? 1 : -1; +// continue; +// } +// // return 0 if equal state changes compared to initial value +// if ((nCheck && ret < 0) || (!nCheck && ret > 0)) +// { +// ret = 0; +// } +// } +// return ret; +// } + + // ____________________ + /** + * This tests the XPropertySet interface implementation. + */ + +// The test checkXPropertySet() has been marked as outdated! + + +// @Test +// public void checkXPropertySet() +// { +// System.out.println("---- Testing the XPropertySet interface ----"); +// +// XPropertySet xPS = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings); +// +// MyChangeListener mListener1 = new MyChangeListener(); +// MyChangeListener mListener2 = new MyChangeListener(); +// +// for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++) +// { +// // adding listeners +// String name = aPathSettingNames[i]; +// System.out.println("Testing property '" + name + "'"); +// try +// { +// System.out.println("Add 2 Listeners."); +// xPS.addPropertyChangeListener(name, mListener1); +// xPS.addVetoableChangeListener(name, mListener1); +// xPS.addPropertyChangeListener(name, mListener2); +// xPS.addVetoableChangeListener(name, mListener2); +// +// // change the property +// System.out.println("Change value."); +// String changeVal = changeToCorrectValue(aPathSettingValues[i]); +// xPS.setPropertyValue(name, changeVal); +// String newVal = (String) xPS.getPropertyValue(name); +// +// assertTrue("Value did not change on property " + name + ".", +// newVal.equals(changeVal)); +// +// assertTrue("Listener 1 was not called.", checkListener(mListener1)); +// assertTrue("Listener 2 was not called.", checkListener(mListener2)); +// +// mListener1.resetListener(); +// mListener2.resetListener(); +// +// System.out.println("Remove Listener 1."); +// +// xPS.removePropertyChangeListener(name, mListener1); +// xPS.removeVetoableChangeListener(name, mListener1); +// +// // change the property +// System.out.println("Change value back."); +// xPS.setPropertyValue(name, aPathSettingValues[i]); +// newVal = (String) xPS.getPropertyValue(name); +// assertTrue("Value did not change on property " + name, +// newVal.equals(aPathSettingValues[i])); +// +// assertTrue("Listener was called, although it was removed on" +// + " property " + name + ".", !checkListener(mListener1)); +// assertTrue("Listener 2 was not called on property " + name + ".", +// checkListener(mListener2)); +// } +// catch (com.sun.star.uno.Exception e) +// { +// System.out.println(e.getClass().getName()); +// System.out.println("Message: " + e.getMessage()); +// fail("Unexpcted exception on property " + name); +// } +// System.out.println("Finish testing property '" + aPathSettingNames[i] + "'\n"); +// } +// System.out.println("---- Test of XPropertySet finished ----\n"); +// +// } + +// private boolean checkListener(MyChangeListener ml) +// { +// return ml.changePropertyEventFired() +// || ml.changePropertiesEventFired() +// || ml.vetoableChangeEventFired(); +// } + + // ____________________ + /** * Change the given String to a correct path URL. * @return The changed path URL. */ - private String changeToCorrectValue(String path) { + private String changeToCorrectValue(String path) + { // the simplest possiblity - if ( path == null || path.equals("") ) { - return "file:///tmp"; + if (path == null || path.equals("")) + { + String sTempDir = System.getProperty("java.io.tmpdir"); + sTempDir = util.utils.getFullURL(sTempDir); + return sTempDir; // "file:///tmp"; } - return path + "/tmp"; + return graphical.FileHelper.appendPath(path, "tmp"); } - /** * Change the given String to an incorrect path URL. * @return The changed path URL. */ - private String changeToIncorrectValue(String path) { - // the simplest possiblity + private String changeToIncorrectValue(String path) + { + // return an illegal path return "fileblablabla"; } - /** - * Listener implementation which sets a flag when - * listener was called. - */ + * Listener implementation which sets a flag when + * listener was called. + */ public class MyChangeListener implements XPropertiesChangeListener, - XPropertyChangeListener, - XVetoableChangeListener { - - private boolean propChanged = false; - private boolean propertiesChanged = false; - private boolean disposeCalled = false; - private boolean vetoableChanged = false; - - public void propertiesChange( - com.sun.star.beans.PropertyChangeEvent[] e) { - propertiesChanged = true; - } - - public void vetoableChange(com.sun.star.beans.PropertyChangeEvent pE) - throws com.sun.star.beans.PropertyVetoException { - vetoableChanged = true; - } - - public void propertyChange(com.sun.star.beans.PropertyChangeEvent pE) { - propChanged = true; - } - - public void disposing(com.sun.star.lang.EventObject eventObject) { - disposeCalled = true; - } - - public void resetListener() { - propChanged = false; - propertiesChanged = false; - disposeCalled = false; - vetoableChanged = false; - } - - public boolean changePropertyEventFired() { - return propChanged; - } - public boolean changePropertiesEventFired() { - return propertiesChanged; - } - public boolean vetoableChangeEventFired() { - return vetoableChanged; - } + XPropertyChangeListener, + XVetoableChangeListener + { - }; + private boolean propChanged = false; + private boolean propertiesChanged = false; + private boolean disposeCalled = false; + private boolean vetoableChanged = false; + + public void propertiesChange( + com.sun.star.beans.PropertyChangeEvent[] e) + { + propertiesChanged = true; + } + + public void vetoableChange(com.sun.star.beans.PropertyChangeEvent pE) + throws com.sun.star.beans.PropertyVetoException + { + vetoableChanged = true; + } + + public void propertyChange(com.sun.star.beans.PropertyChangeEvent pE) + { + propChanged = true; + } + + public void disposing(com.sun.star.lang.EventObject eventObject) + { + disposeCalled = true; + } + + public void resetListener() + { + propChanged = false; + propertiesChanged = false; + disposeCalled = false; + vetoableChanged = false; + } + + public boolean changePropertyEventFired() + { + return propChanged; + } + + public boolean changePropertiesEventFired() + { + return propertiesChanged; + } + + public boolean vetoableChangeEventFired() + { + return vetoableChanged; + } + } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk index 70af7817aca3..05900d46e190 100755 --- a/framework/qa/complex/path_settings/makefile.mk +++ b/framework/qa/complex/path_settings/makefile.mk @@ -25,60 +25,38 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = PathSettings -PRJNAME = $(TARGET) -PACKAGE = complex$/path_settings - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar -JAVAFILES = PathSettingsTest.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +# @echo "OOO_SUBSEQUENT_TESTS not set, do nothing." +.ELSE -# --- Parameters for the test -------------------------------------- +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_path_settings -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/path_settings -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# here store only Files which contain a @Test +JAVATESTFILES = \ + PathSettingsTest.java -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# put here all other files +JAVAFILES = $(JAVATESTFILES) -# start the runner application -CT_APP = org.openoffice.Runner +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# --- Targets ------------------------------------------------------ +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -.IF "$(depend)" == "" -ALL : ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF +.END -.INCLUDE : target.mk +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -RUN: run +ALLTAR : javatest -run: - +java -version - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) +.END diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java index 27fe6410eca0..aeea9907e6bc 100755 --- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java +++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java @@ -29,16 +29,26 @@ package complex.path_substitution; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XStringSubstitution; -import complexlib.ComplexTestCase; + import java.util.Vector; +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + /** * */ -public class PathSubstitutionTest extends ComplexTestCase { +public class PathSubstitutionTest +{ private static XMultiServiceFactory xMSF; - // all substitution variables private VariableContainer substVars = null; @@ -47,14 +57,14 @@ public class PathSubstitutionTest extends ComplexTestCase { * Right now, it's only 'checkXStringSubstitution'. * @return All test methods. */ - public String[] getTestMethodNames() { - return new String[]{"checkXStringSubstitution"}; - } - +// public String[] getTestMethodNames() { +// return new String[]{"checkXStringSubstitution"}; +// } /** * Create an array with all substitution variables */ - private void initialize() { + @Before private void initialize() + { substVars = new VariableContainer(); substVars.add("$(prog)", false, true); substVars.add("$(inst)", false, true); @@ -64,65 +74,72 @@ public class PathSubstitutionTest extends ComplexTestCase { substVars.add("$(temp)", false, true); substVars.add("$(lang)", false, false); substVars.add("$(langid)", false, false); - substVars.add("$(vlang)", false,false); + substVars.add("$(vlang)", false, false); // path won't resubstitute - substVars.add("$(path)", false,false); + substVars.add("$(path)", false, false); } /** * One actual test: as the method 'getTestMethodNames()' tells. */ - public void checkXStringSubstitution() + @Test public void checkXStringSubstitution() { - xMSF = (XMultiServiceFactory)param.getMSF(); - log.println("---- Testing the XStringSubstitution interface ----"); - log.println("Create intance of test object.\n"); + xMSF = getMSF(); + System.out.println("---- Testing the XStringSubstitution interface ----"); + System.out.println("Create intance of test object.\n"); XStringSubstitution oObj = null; - try { + try + { Object x = xMSF.createInstance( - "com.sun.star.util.PathSubstitution"); - oObj = (XStringSubstitution) - UnoRuntime.queryInterface(XStringSubstitution.class, x); - if (oObj == null) throw new com.sun.star.uno.Exception(); - } - catch(com.sun.star.uno.Exception e) { - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Could not create an instance of the test object."); + "com.sun.star.util.PathSubstitution"); + oObj = UnoRuntime.queryInterface(XStringSubstitution.class, x); + if (oObj == null) + { + throw new com.sun.star.uno.Exception(); + } + } + catch (com.sun.star.uno.Exception e) + { + System.out.println(e.getClass().getName()); + System.out.println("Message: " + e.getMessage()); + fail("Could not create an instance of the test object."); return; } - initialize(); +// initialize(); - for (int i=0; i<substVars.size(); i++) { + for (int i = 0; i < substVars.size(); i++) + { String var = substVars.getVariable(i); - log.println("Testing var '" + var + "'"); - try { + System.out.println("Testing var '" + var + "'"); + try + { String substVal = oObj.getSubstituteVariableValue(var); - log.println("\tvalue '" + substVal + "'"); - substVars.putValue(i,substVal); + System.out.println("\tvalue '" + substVal + "'"); + substVars.putValue(i, substVal); // simple check: let path in a string replace String substString = var + "/additional/path"; - log.println("Substitute '"+substString+"'"); + System.out.println("Substitute '" + substString + "'"); String newValue = oObj.substituteVariables(substString, true); - log.println("Return value '"+newValue+"'"); + System.out.println("Return value '" + newValue + "'"); // 2do: better check for correct substitution - assure("Did not substitute '" - + substString+"' to '" + newValue + assertTrue("Did not substitute '" + + substString + "' to '" + newValue + "' correctly:", newValue.startsWith(substVal)); // simple check part two: //make substitution backwards if possible - if (substVars.canReSubstitute(i)) { + if (substVars.canReSubstitute(i)) + { substString = substVal + "/additional/path"; - log.println("Substitute backwards '"+substString+"'"); + System.out.println("Substitute backwards '" + substString + "'"); newValue = oObj.reSubstituteVariables(substString); - log.println("Return value '"+newValue+"'"); + System.out.println("Return value '" + newValue + "'"); // 2do: better check for correct substitution - assure("Did not reSubstitute '" + assertTrue("Did not reSubstitute '" + substString + "' to '" + newValue + "' correctly:", checkResubstitute(newValue, var)); } @@ -131,28 +148,32 @@ public class PathSubstitutionTest extends ComplexTestCase { //in middle of text works substString = "file:///starting/" + var + "/path"; - log.println("Substitute '"+substString+"'"); + System.out.println("Substitute '" + substString + "'"); newValue = oObj.substituteVariables(substString, false); - log.println("Return value '"+newValue+"'"); + System.out.println("Return value '" + newValue + "'"); boolean erg = true; - if(substVars.onlySubstituteAtBegin(i)) + if (substVars.onlySubstituteAtBegin(i)) + { // in this case it should not have worked - erg = newValue.indexOf(substVal)==-1; + erg = newValue.indexOf(substVal) == -1; + } else - erg = newValue.indexOf(substVal)!=-1; - - assure("Did not substitute '" + { + erg = newValue.indexOf(substVal) != -1; + } + assertTrue("Did not substitute '" + substString + "' to '" + newValue + "' correctly:", erg); } - catch(com.sun.star.uno.Exception e) { - log.println(e.getClass().getName()); - log.println("Message: " + e.getMessage()); - failed("Could not create an instance of the test object."); + catch (com.sun.star.uno.Exception e) + { + System.out.println(e.getClass().getName()); + System.out.println("Message: " + e.getMessage()); + fail("Could not create an instance of the test object."); return; } - log.println("Finish testing '" + var + "'\n"); + System.out.println("Finish testing '" + var + "'\n"); } // check of greedy resubstitution @@ -161,20 +182,21 @@ public class PathSubstitutionTest extends ComplexTestCase { String instPth = substVars.getValue(inst); String progPth = substVars.getValue(prog); - if (progPth.startsWith(instPth) && instPth.startsWith(progPth)) { - log.println("Greedy ReSubstitute"); + if (progPth.startsWith(instPth) && instPth.startsWith(progPth)) + { + System.out.println("Greedy ReSubstitute"); String substString = progPth + "/additional/path"; String newVal = oObj.reSubstituteVariables(substString); - log.println("String '" + substString + - "' should be resubstituted with"); - log.println("Variable '" + prog + "' instead of Variable '" + - inst + "'"); - assure("Did not reSubstitute '" + substString + System.out.println("String '" + substString + + "' should be resubstituted with"); + System.out.println("Variable '" + prog + "' instead of Variable '" + + inst + "'"); + assertTrue("Did not reSubstitute '" + substString + "' to '" + newVal + "' correctly:", newVal.startsWith(prog)); } - log.println( + System.out.println( "---- Finish testing the XStringSubstitution interface ----"); } @@ -182,65 +204,118 @@ public class PathSubstitutionTest extends ComplexTestCase { * test the resubstitution * @return true, if resubstitution is correct. */ - private boolean checkResubstitute(String subst, String original) { + private boolean checkResubstitute(String subst, String original) + { // simple: subst starts with original - if ( subst.startsWith(original) ) { + if (subst.startsWith(original)) + { return true; } - else { // hard: been resubstituted with a differernt variable. - for (int i=0; i<substVars.size(); i++) { + else + { // hard: been resubstituted with a differernt variable. + for (int i = 0; i < substVars.size(); i++) + { String var = substVars.getVariable(i); - if ( subst.startsWith(var) && original.startsWith(original)) { + if (subst.startsWith(var) && original.startsWith(original)) + { return true; } } } return false; } + /** * Class for containing the substitution variables with their * values and some information. */ - private class VariableContainer { + private class VariableContainer + { + public Vector varName; public Vector varValue; public Vector substAtBegin; public Vector resubst; - public VariableContainer() { + public VariableContainer() + { varName = new Vector(); varValue = new Vector(); substAtBegin = new Vector(); resubst = new Vector(); } - public void add(String var) { + public void add(String var) + { varName.add(var); substAtBegin.add(Boolean.TRUE); resubst.add(Boolean.TRUE); } + public void add(String var, boolean onlySubstAtBegin, - boolean canResubst) { + boolean canResubst) + { varName.add(var); this.substAtBegin.add(new Boolean(onlySubstAtBegin)); this.resubst.add(new Boolean(canResubst)); } - public void putValue(int i, String val) { + public void putValue(int i, String val) + { varValue.add(i, val); } - public int size() { return varName.size(); } - public String getVariable(int i) { return (String)varName.get(i); } - public String getValue(int i) { return (String)varName.get(i); } - public String getValue(String var) { - return (String)varValue.get(varName.indexOf(var)); + public int size() + { + return varName.size(); } - public boolean onlySubstituteAtBegin(int i) { - return ((Boolean)substAtBegin.get(i)).booleanValue(); + + public String getVariable(int i) + { + return (String) varName.get(i); } - public boolean canReSubstitute(int i) { - return ((Boolean)resubst.get(i)).booleanValue(); + + public String getValue(int i) + { + return (String) varName.get(i); } + + public String getValue(String var) + { + return (String) varValue.get(varName.indexOf(var)); + } + + public boolean onlySubstituteAtBegin(int i) + { + return ((Boolean) substAtBegin.get(i)).booleanValue(); + } + + public boolean canReSubstitute(int i) + { + return ((Boolean) resubst.get(i)).booleanValue(); + } + } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk index a266d3fa4123..338affbf70d7 100755 --- a/framework/qa/complex/path_substitution/makefile.mk +++ b/framework/qa/complex/path_substitution/makefile.mk @@ -25,59 +25,98 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = PathSubstitution -PRJNAME = $(TARGET) -PACKAGE = complex$/path_substitution - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar -JAVAFILES = PathSubstitutionTest.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +PRJ = ../../.. +PRJNAME = framework +TARGET = qa_complex_path_substitution -# --- Parameters for the test -------------------------------------- +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/path_substitution -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# here store only Files which contain a @Test +JAVATESTFILES = \ + PathSubstitutionTest.java -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# put here all other files +JAVAFILES = $(JAVATESTFILES) -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# start the runner application -CT_APP = org.openoffice.Runner +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# --- Targets ------------------------------------------------------ +.END -.IF "$(depend)" == "" -ALL : ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -.INCLUDE : target.mk +ALLTAR : javatest -RUN: run +.END -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) +# +# +# +# +# PRJ = ..$/..$/.. +# TARGET = PathSubstitution +# PRJNAME = $(TARGET) +# PACKAGE = complex$/path_substitution +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar +# JAVAFILES = PathSubstitutionTest.java +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # test looks something like the.full.package.TestName +# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .IF "$(depend)" == "" +# ALL : ALLTAR +# .ELSE +# ALL: ALLDEP +# .ENDIF +# +# .INCLUDE : target.mk +# +# RUN: run +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) +# diff --git a/framework/qa/complex/sequence/CheckSequenceOfEnum.java b/framework/qa/complex/sequence/CheckSequenceOfEnum.java deleted file mode 100755 index a09703398f8c..000000000000 --- a/framework/qa/complex/sequence/CheckSequenceOfEnum.java +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * 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. - * - ************************************************************************/ -package complex.sequence; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.enumexample.XEnumSequence; -import com.sun.star.beans.PropertyState; -import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; - -/** - * The test is for bug 111128. The mapping of sequence<enumeration> between - * Java and C++ from the IDL definition was erroneous. This test checks, if - * the mapping works. - */ -public class CheckSequenceOfEnum extends ComplexTestCase { - - /** - * Return all test methods. - * @return The test methods. - */ - public String[] getTestMethodNames() { - return new String[]{"checkSequence"}; - } - - /** - * Check the sequence<enumeration> mapping between Java and C++. - * Since the Office does - * not use such a construct itself, a C++ component with an own defined - * interface is used for testing. - */ - public void checkSequence() { - try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); - Object oObj = xMSF.createInstance("com.sun.star.enumexample.ChangeSequenceOrder"); - assure("Build the shared library 'changeSequenceOrder' in directory 'enumexample' and\n" - + "register the created zip 'EnumSequenceComponent' before executing this test.", oObj != null); - // build a first sequence - PropertyState[] aOriginalSequence = new PropertyState[] { - PropertyState.DIRECT_VALUE, - PropertyState.DEFAULT_VALUE, - PropertyState.AMBIGUOUS_VALUE - }; - XEnumSequence xSequence = (XEnumSequence)UnoRuntime.queryInterface(XEnumSequence.class, oObj); - PropertyState[] aChangedSequence = xSequence.getSequenceInChangedOrder(aOriginalSequence); - assure("Did not return a correct sequence.", checkSequence(aOriginalSequence, aChangedSequence)); - } - catch(Exception e) { - e.printStackTrace(); - failed("Exception!"); - } - } - - private boolean checkSequence(PropertyState[] aOriginalSequence, PropertyState[] aChangedSequence) { - boolean erg = true; - int length = aOriginalSequence.length; - for ( int i=0; i<length; i++ ) { - if ( aOriginalSequence[i] != aChangedSequence[length -1 - i]) { - log.println("Checking '" + aOriginalSequence[i] + "' == '" + aChangedSequence[length - 1 - i] + "'"); - erg = false; - } - if ( aChangedSequence[length - 1 - i].getValue() != PropertyState.fromInt(i).getValue() ) { - log.println("Checking '" + aChangedSequence[length - 1 - i].getValue() + "' == '" + PropertyState.fromInt(i).getValue() + "'"); - erg = false; - } - } - return erg; - } -} - - diff --git a/framework/qa/complex/sequence/makefile.mk b/framework/qa/complex/sequence/makefile.mk deleted file mode 100755 index ba18b278d79a..000000000000 --- a/framework/qa/complex/sequence/makefile.mk +++ /dev/null @@ -1,98 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ = ..$/..$/.. -TARGET = CheckSequenceOfEnum -PRJNAME = $(TARGET) -PACKAGE = complex$/sequence - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar CheckSequenceOfEnum.jar -JAVAFILES = CheckSequenceOfEnum.java - -ENUMSEQUENCEIDL = com.sun.star.enumexample.XEnumSequence - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) com -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF - -# test base is java complex -CT_TESTBASE = -TestBase java_complex - -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).CheckSequenceOfEnum - -# start the runner application -CT_APP = org.openoffice.Runner - -RDB = $(BIN)$/myudkapi.rdb -JAVADIR = $(OUT)$/misc$/java - -# --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL: GENJAVAFILES ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - - -.INCLUDE : target.mk - -$(RDB) : - +idlc -I$(IDL) -I$(SOLARIDLDIR) -O$(BIN) $? - +regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} - +regmerge $@ / $(SOLARBINDIR)$/udkapi.rdb - touch $@ - -GENJAVAFILES : - -+$(MKDIR) $(CLASSDIR) >& $(NULLDEV) - -+$(MKDIR) $(JAVADIR) >& $(NULLDEV) - +javamaker -BUCR -nD -O$(CLASSDIR) $(RDB) -T$(ENUMSEQUENCEIDL) - -RUN: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) - -run: RUN diff --git a/framework/qa/unoapi/framework.sce b/framework/qa/unoapi/framework.sce index dad0c838de66..76f3d1b089ac 100755 --- a/framework/qa/unoapi/framework.sce +++ b/framework/qa/unoapi/framework.sce @@ -2,7 +2,7 @@ -o fwl.FilterFactory -o fwl.FrameLoaderFactory -o fwl.SubstituteVariables --o fwl.TypeDetection +#i113245 -o fwl.TypeDetection #i84346 -o fwl.PathSettings -o fwk.DispatchRecorder -o fwk.DispatchRecorderSupplier @@ -17,7 +17,7 @@ -o fwk.ServiceHandler -o fwk.URLTransformer -o fwk.MacrosMenuController --o fwk.ModuleManager +#i112746 -o fwk.ModuleManager -o fwk.UIElementFactoryManager -o fwk.UICommandDescription -o fwk.LayoutManager diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index 0d93c775ff7e..86ef8c16d1ea 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -47,10 +47,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -63,12 +59,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::HelpOnStartup ) - COMPONENTINFO( ::framework::TabWinFactory ) - COMPONENTINFO( ::framework::SystemExec ) - COMPONENTINFO( ::framework::ShellJob ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else IFFACTORY( ::framework::TabWinFactory ) else IFFACTORY( ::framework::SystemExec ) else diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 55e13252570f..0a7e08c8c93a 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -48,10 +48,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -64,8 +60,5 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::LoginDialog ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 6e3fa878bbb1..4f078d9ab50d 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -47,10 +47,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -117,66 +113,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) - COMPONENTINFO( ::framework::Desktop ) - COMPONENTINFO( ::framework::Frame ) - //COMPONENTINFO( ::framework::Oxt_Handler ) - COMPONENTINFO( ::framework::JobExecutor ) - //COMPONENTINFO( ::framework::DispatchRecorderSupplier ) - //COMPONENTINFO( ::framework::DispatchRecorder ) - //COMPONENTINFO( ::framework::MailToDispatcher ) - //COMPONENTINFO( ::framework::ServiceHandler ) - COMPONENTINFO( ::framework::JobDispatch ) - COMPONENTINFO( ::framework::BackingComp ) - //COMPONENTINFO( ::framework::DispatchHelper ) - COMPONENTINFO( ::framework::LayoutManager ) - //COMPONENTINFO( ::framework::License ) - COMPONENTINFO( ::framework::UIElementFactoryManager ) - COMPONENTINFO( ::framework::PopupMenuControllerFactory ) - //COMPONENTINFO( ::framework::FontMenuController ) - //COMPONENTINFO( ::framework::FontSizeMenuController ) - COMPONENTINFO( ::framework::ObjectMenuController ) - //COMPONENTINFO( ::framework::HeaderMenuController ) - //COMPONENTINFO( ::framework::FooterMenuController ) - COMPONENTINFO( ::framework::ControlMenuController ) - //COMPONENTINFO( ::framework::MacrosMenuController ) - COMPONENTINFO( ::framework::UICommandDescription ) - COMPONENTINFO( ::framework::ModuleManager ) - COMPONENTINFO( ::framework::UIConfigurationManager ) - COMPONENTINFO( ::framework::ModuleUIConfigurationManagerSupplier ) - COMPONENTINFO( ::framework::ModuleUIConfigurationManager ) - COMPONENTINFO( ::framework::MenuBarFactory ) - COMPONENTINFO( ::framework::GlobalAcceleratorConfiguration ) - COMPONENTINFO( ::framework::ModuleAcceleratorConfiguration ) - COMPONENTINFO( ::framework::DocumentAcceleratorConfiguration ) - COMPONENTINFO( ::framework::ToolBoxFactory ) - COMPONENTINFO( ::framework::AddonsToolBoxFactory ) - COMPONENTINFO( ::framework::WindowStateConfiguration ) - COMPONENTINFO( ::framework::ToolbarControllerFactory ) - //COMPONENTINFO( ::framework::ToolbarsMenuController ) - COMPONENTINFO( ::framework::AutoRecovery ) - COMPONENTINFO( ::framework::StatusIndicatorFactory ) - COMPONENTINFO( ::framework::RecentFilesMenuController ) - COMPONENTINFO( ::framework::StatusBarFactory ) - COMPONENTINFO( ::framework::UICategoryDescription ) - COMPONENTINFO( ::framework::StatusbarControllerFactory ) - COMPONENTINFO( ::framework::SessionListener ) - //COMPONENTINFO( ::framework::LogoImageStatusbarController ) - //COMPONENTINFO( ::framework::LogoTextStatusbarController ) - //COMPONENTINFO( ::framework::NewMenuController ) - COMPONENTINFO( ::framework::TaskCreatorService ) - //COMPONENTINFO( ::framework::SimpleTextStatusbarController ) - //COMPONENTINFO( ::framework::UriAbbreviation ) - //COMPONENTINFO( ::framework::PopupMenuDispatcher ) - COMPONENTINFO( ::framework::ImageManager ) - COMPONENTINFO( ::framework::LangSelectionStatusbarController ) - //COMPONENTINFO( ::framework::LanguageSelectionMenuController ) - //COMPONENTINFO( ::framework::TabWindowService ) - COMPONENTINFO( ::framework::WindowContentFactoryManager ) - COMPONENTINFO( ::framework::SubstitutePathVariables ) - COMPONENTINFO( ::framework::PathSettings ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 7382380ef525..111b3550559d 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -47,10 +47,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -82,31 +78,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) - COMPONENTINFO( ::framework::MailToDispatcher ) - COMPONENTINFO( ::framework::NewMenuController ) - COMPONENTINFO( ::framework::ToolbarsMenuController ) - COMPONENTINFO( ::framework::MacrosMenuController ) - COMPONENTINFO( ::framework::FontSizeMenuController ) - COMPONENTINFO( ::framework::HeaderMenuController ) - COMPONENTINFO( ::framework::FooterMenuController ) - COMPONENTINFO( ::framework::FontMenuController ) - COMPONENTINFO( ::framework::ServiceHandler ) - COMPONENTINFO( ::framework::LogoImageStatusbarController ) - COMPONENTINFO( ::framework::LogoTextStatusbarController ) - COMPONENTINFO( ::framework::SimpleTextStatusbarController ) - COMPONENTINFO( ::framework::UriAbbreviation ) - COMPONENTINFO( ::framework::LanguageSelectionMenuController ) - COMPONENTINFO( ::framework::PopupMenuDispatcher ) - COMPONENTINFO( ::framework::DispatchHelper ) - COMPONENTINFO( ::framework::TabWindowService ) - COMPONENTINFO( ::framework::DispatchRecorder ) - COMPONENTINFO( ::framework::DispatchRecorderSupplier ) - COMPONENTINFO( ::framework::Oxt_Handler ) - COMPONENTINFO( ::framework::License ) - COMPONENTINFO( ::framework::PopupMenuController ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 5227cb9f302c..fe8af40f0850 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -973,6 +973,13 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const //----------------------------------------------------------------------------- sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const { + // allow empty path to reset a path. +// idea by LLA to support empty pathes +// if (sPath.getLength() == 0) +// { +// return sal_True; +// } + return (! INetURLObject(sPath).HasError()); } diff --git a/framework/util/fwk.component b/framework/util/fwk.component new file mode 100644 index 000000000000..e6ceb91e8090 --- /dev/null +++ b/framework/util/fwk.component @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.frame.SessionListener"> + <service name="com.sun.star.frame.SessionListener"/> + </implementation> + <implementation name="com.sun.star.comp.framework.AddonsToolBarFactory"> + <service name="com.sun.star.ui.ToolBarFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.AutoRecovery"> + <service name="com.sun.star.frame.AutoRecovery"/> + </implementation> + <implementation name="com.sun.star.comp.framework.BackingComp"> + <service name="com.sun.star.frame.StartModule"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ControlMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.Desktop"> + <service name="com.sun.star.frame.Desktop"/> + </implementation> + <implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration"> + <service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/> + </implementation> + <implementation name="com.sun.star.comp.framework.Frame"> + <service name="com.sun.star.frame.Frame"/> + </implementation> + <implementation name="com.sun.star.comp.framework.GlobalAcceleratorConfiguration"> + <service name="com.sun.star.ui.GlobalAcceleratorConfiguration"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ImageManager"> + <service name="com.sun.star.ui.ImageManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.JobExecutor"> + <service name="com.sun.star.task.JobExecutor"/> + </implementation> + <implementation name="com.sun.star.comp.framework.LangSelectionStatusbarController"> + <service name="com.sun.star.frame.StatusbarController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.LayoutManager"> + <service name="com.sun.star.frame.LayoutManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.MenuBarFactory"> + <service name="com.sun.star.ui.UIElementFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ModuleAcceleratorConfiguration"> + <service name="com.sun.star.ui.ModuleAcceleratorConfiguration"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ModuleManager"> + <service name="com.sun.star.frame.ModuleManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManager"> + <service name="com.sun.star.ui.ModuleUIConfigurationManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier"> + <service name="com.sun.star.ui.ModuleUIConfigurationManagerSupplier"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ObjectMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.PathSettings"> + <service name="com.sun.star.util.PathSettings"/> + </implementation> + <implementation name="com.sun.star.comp.framework.PathSubstitution"> + <service name="com.sun.star.util.PathSubstitution"/> + </implementation> + <implementation name="com.sun.star.comp.framework.PopupMenuControllerFactory"> + <service name="com.sun.star.frame.PopupMenuControllerFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.RecentFilesMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.StatusBarControllerFactory"> + <service name="com.sun.star.frame.StatusbarControllerFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.StatusBarFactory"> + <service name="com.sun.star.ui.StatusBarFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.StatusIndicatorFactory"> + <service name="com.sun.star.task.StatusIndicatorFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.TaskCreator"> + <service name="com.sun.star.frame.TaskCreator"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ToolBarControllerFactory"> + <service name="com.sun.star.frame.ToolBarControllerFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ToolBarFactory"> + <service name="com.sun.star.ui.ToolBarFactory"/> + </implementation> + <implementation name="com.sun.star.comp.framework.UICategoryDescription"> + <service name="com.sun.star.ui.UICategoryDescription"/> + </implementation> + <implementation name="com.sun.star.comp.framework.UICommandDescription"> + <service name="com.sun.star.frame.UICommandDescription"/> + </implementation> + <implementation name="com.sun.star.comp.framework.UIConfigurationManager"> + <service name="com.sun.star.ui.UIConfigurationManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.UIElementFactoryManager"> + <service name="com.sun.star.ui.UIElementFactoryManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.URLTransformer"> + <service name="com.sun.star.util.URLTransformer"/> + </implementation> + <implementation name="com.sun.star.comp.framework.WindowContentFactoryManager"> + <service name="com.sun.star.ui.WindowContentFactoryManager"/> + </implementation> + <implementation name="com.sun.star.comp.framework.WindowStateConfiguration"> + <service name="com.sun.star.ui.WindowStateConfiguration"/> + </implementation> + <implementation name="com.sun.star.comp.framework.jobs.JobDispatch"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> +</component> diff --git a/framework/util/fwl.component b/framework/util/fwl.component new file mode 100644 index 000000000000..aa124d1cdc4b --- /dev/null +++ b/framework/util/fwl.component @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sum.star.comp.framework.LanguageSelectionMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.DispatchRecorder"> + <service name="com.sun.star.frame.DispatchRecorder"/> + </implementation> + <implementation name="com.sun.star.comp.framework.DispatchRecorderSupplier"> + <service name="com.sun.star.frame.DispatchRecorderSupplier"/> + </implementation> + <implementation name="com.sun.star.comp.framework.FontMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.FontSizeMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.FooterMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.HeaderMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.License"> + <service name="com.sun.star.task.Job"/> + </implementation> + <implementation name="com.sun.star.comp.framework.LogoImageStatusbarController"> + <service name="com.sun.star.frame.StatusbarController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.LogoTextStatusbarController"> + <service name="com.sun.star.frame.StatusbarController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.MacrosMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.MailToDispatcher"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.framework.MediaTypeDetectionHelper"> + <service name="com.sun.star.frame.MediaTypeDetectionHelper"/> + </implementation> + <implementation name="com.sun.star.comp.framework.NewMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.OXTFileHandler"> + <service name="com.sun.star.frame.ContentHandler"/> + </implementation> + <implementation name="com.sun.star.comp.framework.PopupMenuController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.PopupMenuControllerDispatcher"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ServiceHandler"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.framework.SimpleTextStatusbarController"> + <service name="com.sun.star.frame.StatusbarController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.TabWindowService"> + <service name="com.sun.star.ui.dialogs.TabContainerWindow"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ToolBarsMenuController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.framework.UriAbbreviation"> + <service name="com.sun.star.util.UriAbbreviation"/> + </implementation> + <implementation name="com.sun.star.comp.framework.services.DispatchHelper"> + <service name="com.sun.star.frame.DispatchHelper"/> + </implementation> +</component> diff --git a/framework/util/fwm.component b/framework/util/fwm.component new file mode 100644 index 000000000000..624249ff4382 --- /dev/null +++ b/framework/util/fwm.component @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.framework.HelpOnStartup"> + <service name="com.sun.star.task.Job"/> + </implementation> + <implementation name="com.sun.star.comp.framework.ShellJob"> + <service name="com.sun.star.task.Job"/> + </implementation> + <implementation name="com.sun.star.comp.framework.SystemExecute"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.framework.TabWindowFactory"> + <service name="com.sun.star.frame.TabWindowFactory"/> + </implementation> +</component> diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index edc5f67ce60a..a3f14341d3f3 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -423,3 +423,23 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo _TI2>>$@ @echo LIBMAIN>>$@ @echo LibMain>>$@ + +ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component + +$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fwk.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fwk.component + +$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fwl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fwl.component + +$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fwm.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fwm.component diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst index 57c332f6f3ea..b85d4cfd9d73 100644 --- a/linguistic/prj/build.lst +++ b/linguistic/prj/build.lst @@ -3,4 +3,8 @@ lg linguistic usr1 - all lg_mkout NULL lg linguistic\prj get - all lg_prj NULL lg linguistic\inc nmake - all lg_inc NULL lg linguistic\source nmake - all lg_src lg_inc NULL + lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL + +# could be we need a Japanese office version +# lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst index 01a755e53cc6..0e0534feafd8 100644 --- a/linguistic/prj/d.lst +++ b/linguistic/prj/d.lst @@ -8,3 +8,4 @@ mkdir: %_DEST%\inc%_EXT%\linguistic ..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx +..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component diff --git a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java index 160a1b42fd78..63412254c29f 100644 --- a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java +++ b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java @@ -43,56 +43,57 @@ import com.sun.star.linguistic2.XConversionDictionaryList; import com.sun.star.sheet.XSpreadsheet; import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.table.XCell; -import com.sun.star.text.XTextCursor; -import com.sun.star.text.XTextDocument; -import com.sun.star.text.XWordCursor; + import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; -import java.io.PrintWriter; import util.DesktopTools; +// import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; -public class HangulHanjaConversion extends ComplexTestCase { +public class HangulHanjaConversion { XMultiServiceFactory xMSF = null; boolean disposed = false; Locale aLocale = new Locale("ko", "KR", ""); short dictType = ConversionDictionaryType.HANGUL_HANJA; - public String[] getTestMethodNames() { - return new String[] { "ConversionDictionaryList" }; - } +// public String[] getTestMethodNames() { +// return new String[] { "ConversionDictionaryList" }; +// } - public void before() { - xMSF = (XMultiServiceFactory) param.getMSF(); + @Before public void before() { + xMSF = getMSF(); } - public void ConversionDictionaryList() { + @Test public void ConversionDictionaryList() { Object ConversionDictionaryList = null; try { ConversionDictionaryList = xMSF.createInstance( "com.sun.star.linguistic2.ConversionDictionaryList"); } catch (com.sun.star.uno.Exception e) { - assure("Couldn't create ConversionDictionaryList", false); + fail("Couldn't create ConversionDictionaryList"); } if (ConversionDictionaryList == null) { - assure("Couldn't create ConversionDictionaryList", false); + fail("Couldn't create ConversionDictionaryList"); } boolean bList = checkXConversionDictionaryList( ConversionDictionaryList); - assure("XConversionDictionaryList doesnt work as expected", bList); + assertTrue("XConversionDictionaryList doesnt work as expected", bList); } private boolean checkXConversionDictionaryList(Object list) { boolean res = true; - XConversionDictionaryList xCList = (XConversionDictionaryList) UnoRuntime.queryInterface( - XConversionDictionaryList.class, - list); + XConversionDictionaryList xCList = UnoRuntime.queryInterface(XConversionDictionaryList.class, list); XConversionDictionary xDict = null; try { @@ -100,28 +101,30 @@ public class HangulHanjaConversion extends ComplexTestCase { dictType); } catch (com.sun.star.lang.NoSupportException e) { res = false; - assure("Couldn't add Dictionary", false); + fail("Couldn't add Dictionary"); } catch (com.sun.star.container.ElementExistException e) { res = false; - assure("Couldn't add Dictionary", false); + fail("Couldn't add Dictionary"); } try { xCList.addNewDictionary("addNewDictionary", aLocale, dictType); res = false; - assure("wrong exception while adding Dictionary again", false); + fail("wrong exception while adding Dictionary again"); } catch (com.sun.star.lang.NoSupportException e) { res = false; - assure("wrong exception while adding Dictionary again", false); + fail("wrong exception while adding Dictionary again"); } catch (com.sun.star.container.ElementExistException e) { } boolean localRes = checkNameContainer(xCList.getDictionaryContainer()); res &= localRes; - assure("getDictionaryContainer didn't work as expected", localRes); + assertTrue("getDictionaryContainer didn't work as expected", localRes); - String FileToLoad = util.utils.getFullTestURL("hangulhanja.sxc"); - XComponent xDoc = DesktopTools.loadDoc(xMSF, FileToLoad, + String FileToLoad = TestDocument.getUrl("hangulhanja.sxc"); + // String FileToLoad = util.utils.getFullTestURL(); + +XComponent xDoc = DesktopTools.loadDoc(xMSF, FileToLoad, new PropertyValue[] { }); XSpreadsheet xSheet = getSheet(xDoc); boolean done = false; @@ -145,7 +148,7 @@ public class HangulHanjaConversion extends ComplexTestCase { } catch (com.sun.star.lang.IllegalArgumentException e) { e.printStackTrace(); res = false; - assure("Exception while checking adding entry", false); + fail("Exception while checking adding entry"); } catch (com.sun.star.container.ElementExistException e) { //ignored } @@ -157,7 +160,7 @@ public class HangulHanjaConversion extends ComplexTestCase { } catch (com.sun.star.lang.IllegalArgumentException e) { e.printStackTrace(); res = false; - assure("Exception while checking adding entry", false); + fail("Exception while checking adding entry"); } catch (com.sun.star.container.ElementExistException e) { //ignored } @@ -165,7 +168,7 @@ public class HangulHanjaConversion extends ComplexTestCase { localRes = xCList.queryMaxCharCount(aLocale, dictType, ConversionDirection.FROM_LEFT) == 42; res &= localRes; - assure("queryMaxCharCount returned the wrong value", localRes); + assertTrue("queryMaxCharCount returned the wrong value", localRes); String[] conversion = null; @@ -177,37 +180,36 @@ public class HangulHanjaConversion extends ComplexTestCase { TextConversionOption.NONE); } catch (com.sun.star.lang.IllegalArgumentException e) { res = false; - assure("Exception while calling queryConversions", false); + fail("Exception while calling queryConversions"); } catch (com.sun.star.lang.NoSupportException e) { res = false; - assure("Exception while calling queryConversions", false); + fail("Exception while calling queryConversions"); } localRes = conversion[0].equals(expectedConversion); res &= localRes; - assure("queryConversions didn't work as expected", localRes); + assertTrue("queryConversions didn't work as expected", localRes); try { xCList.getDictionaryContainer().removeByName("addNewDictionary"); } catch (com.sun.star.container.NoSuchElementException e) { res = false; - assure("exception while removing Dictionary again", false); + fail("exception while removing Dictionary again"); } catch (com.sun.star.lang.WrappedTargetException e) { res = false; - assure("exception while removing Dictionary again", false); + fail("exception while removing Dictionary again"); } localRes = !xCList.getDictionaryContainer() .hasByName("addNewDictionary"); res &= localRes; - assure("Dictionary hasn't been removed properly", localRes); + assertTrue("Dictionary hasn't been removed properly", localRes); - XComponent dicList = (XComponent) UnoRuntime.queryInterface( - XComponent.class, xCList); + XComponent dicList = UnoRuntime.queryInterface(XComponent.class, xCList); XEventListener listen = new EventListener(); dicList.addEventListener(listen); dicList.dispose(); - assure("dispose didn't work", disposed); + assertTrue("dispose didn't work", disposed); dicList.removeEventListener(listen); DesktopTools.closeDoc(xDoc); @@ -244,23 +246,17 @@ public class HangulHanjaConversion extends ComplexTestCase { } private XSpreadsheet getSheet(XComponent xDoc) { - XSpreadsheetDocument xSheetDoc = (XSpreadsheetDocument) UnoRuntime.queryInterface( - XSpreadsheetDocument.class, - xDoc); + XSpreadsheetDocument xSheetDoc = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xDoc); XSpreadsheet xSheet = null; try { - xSheet = (XSpreadsheet) UnoRuntime.queryInterface( - XSpreadsheet.class, - xSheetDoc.getSheets() - .getByName(xSheetDoc.getSheets() - .getElementNames()[0])); + xSheet = UnoRuntime.queryInterface(XSpreadsheet.class, xSheetDoc.getSheets().getByName(xSheetDoc.getSheets().getElementNames()[0])); } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Couldn't get sheet"); - e.printStackTrace((PrintWriter) log); + System.out.println("Couldn't get sheet"); + e.printStackTrace(); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Couldn't get sheet"); - e.printStackTrace((PrintWriter) log); + System.out.println("Couldn't get sheet"); + e.printStackTrace(); } return xSheet; @@ -280,8 +276,8 @@ public class HangulHanjaConversion extends ComplexTestCase { try { re = xSpreadsheet.getCellByPosition(x, y); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Couldn't get word"); - e.printStackTrace((PrintWriter) log); + System.out.println("Couldn't get word"); + e.printStackTrace(); } return re; @@ -342,4 +338,26 @@ public class HangulHanjaConversion extends ComplexTestCase { disposed = true; } } -}
\ No newline at end of file + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} diff --git a/linguistic/qa/complex/linguistic/TestDocument.java b/linguistic/qa/complex/linguistic/TestDocument.java new file mode 100644 index 000000000000..575640662e5f --- /dev/null +++ b/linguistic/qa/complex/linguistic/TestDocument.java @@ -0,0 +1,41 @@ +/************************************************************************* +* +* 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. +* +************************************************************************/ + +package complex.linguistic; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +final class TestDocument +{ + public static String getUrl(String name) + { + return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + } + + private TestDocument() {} +} diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk index 75330e3c5de0..43a88ee0a198 100644 --- a/linguistic/qa/complex/linguistic/makefile.mk +++ b/linguistic/qa/complex/linguistic/makefile.mk @@ -25,49 +25,37 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = HangulHanjaConversion -PRJNAME = linguistic -PACKAGE = complex$/linguistic +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ - OOoRunner.jar mysql.jar -JAVAFILES = HangulHanjaConversion.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ +PRJ = ../../.. +PRJNAME = sc +TARGET = qa_complex_linguistic -MAXLINELENGTH = 100000 +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/linguistic -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +# here store only Files which contain a @Test +JAVATESTFILES = \ + HangulHanjaConversion.java -# --- Parameters for the test -------------------------------------- +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java -# test base is java complex -CT_TESTBASE = -tb java_complex +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# start the runner application -CT_APP = org.openoffice.Runner - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -RUN: run - -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_TEST) -tdoc $(PWD)$/testdocuments +.END +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk +ALLTAR : javatest +.END diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 2916b2ee6eec..c842893d66f1 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -692,31 +692,6 @@ uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( return StaticConvDicList::get(); } - -sal_Bool SAL_CALL ConvDicList_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += ConvDicList::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey(aImpl ); - uno::Sequence< OUString > aServices = - ConvDicList::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL ConvDicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index fe53bf344ac3..01c6838a4d3d 100755 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -438,101 +438,48 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL) return static_cast< ULONG >(-1); SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) ); - ULONG nErr = sal::static_int_cast< ULONG >(-1); - rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - if (nDicVersion >= DIC_VERSION_6) - eEnc = RTL_TEXTENCODING_UTF8; - - if (nDicVersion == DIC_VERSION_7) + // + // Always write as the latest version, i.e. DIC_VERSION_7 + // + rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8; + pStream->WriteLine(ByteString (pVerOOo7)); + if (0 != (nErr = pStream->GetError())) + return nErr; + if (nLanguage == LANGUAGE_NONE) + pStream->WriteLine(ByteString("lang: <none>")); + else { - pStream->WriteLine(ByteString (pVerOOo7)); - if (0 != (nErr = pStream->GetError())) - return nErr; - - if (nLanguage == LANGUAGE_NONE) - pStream->WriteLine(ByteString("lang: <none>")); - else - { - ByteString aLine("lang: "); - aLine += ByteString( String( MsLangId::convertLanguageToIsoString( nLanguage ) ), eEnc); - pStream->WriteLine( aLine ); - } - if (0 != (nErr = pStream->GetError())) - return nErr; - - if (eDicType == DictionaryType_POSITIVE) - pStream->WriteLine(ByteString("type: positive")); - else - pStream->WriteLine(ByteString("type: negative")); - if (0 != (nErr = pStream->GetError())) - return nErr; - - pStream->WriteLine(ByteString("---")); - if (0 != (nErr = pStream->GetError())) - return nErr; - - const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray(); - for (INT32 i = 0; i < nCount; i++) - { - ByteString aOutStr = formatForSave(pEntry[i], eEnc); - pStream->WriteLine (aOutStr); - if (0 != (nErr = pStream->GetError())) - return nErr; - } + ByteString aLine("lang: "); + aLine += ByteString( String( MsLangId::convertLanguageToIsoString( nLanguage ) ), eEnc); + pStream->WriteLine( aLine ); } + if (0 != (nErr = pStream->GetError())) + return nErr; + if (eDicType == DictionaryType_POSITIVE) + pStream->WriteLine(ByteString("type: positive")); else + pStream->WriteLine(ByteString("type: negative")); + if (0 != (nErr = pStream->GetError())) + return nErr; + pStream->WriteLine(ByteString("---")); + if (0 != (nErr = pStream->GetError())) + return nErr; + const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray(); + for (INT32 i = 0; i < nCount; i++) { - sal_Char aWordBuf[BUFSIZE]; - - // write version - const sal_Char *pVerStr = NULL; - if (DIC_VERSION_6 == nDicVersion) - pVerStr = pVerStr6; - else - pVerStr = eDicType == DictionaryType_POSITIVE ? pVerStr2 : pVerStr5; - strcpy( aWordBuf, pVerStr ); // #100211# - checked - USHORT nLen = sal::static_int_cast< USHORT >(strlen( aWordBuf )); - *pStream << nLen; + ByteString aOutStr = formatForSave(pEntry[i], eEnc); + pStream->WriteLine (aOutStr); if (0 != (nErr = pStream->GetError())) return nErr; - pStream->Write(aWordBuf, nLen); - if (0 != (nErr = pStream->GetError())) - return nErr; - - *pStream << nLanguage; - if (0 != (nErr = pStream->GetError())) - return nErr; - *pStream << (sal_Char) (eDicType == DictionaryType_NEGATIVE ? TRUE : FALSE); - if (0 != (nErr = pStream->GetError())) - return nErr; - - const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray(); - for (INT32 i = 0; i < nCount; i++) - { - ByteString aOutStr = formatForSave(pEntry[i], eEnc); - - // the old format would fail (mis-calculation of nLen) and write - // uninitialized junk for combined len >= BUFSIZE - we truncate - // silently here, but BUFSIZE is large anyway. - nLen = aOutStr.Len(); - if (nLen >= BUFSIZE) - nLen = BUFSIZE - 1; - - *pStream << nLen; - if (0 != (nErr = pStream->GetError())) - return nErr; - pStream->Write(aOutStr.GetBuffer(), nLen); - if (0 != (nErr = pStream->GetError())) - return nErr; - } } - //! get return value before Stream is destroyed - ULONG nError = pStream->GetError(); + //If we are migrating from an older version, then on first successful + //write, we're now converted to the latest version, i.e. DIC_VERSION_7 + nDicVersion = DIC_VERSION_7; - return nError; + return nErr; } void DictionaryNeo::launchEvent(INT16 nEvent, diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 817dbeb311ca..0e1a045bb98e 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -796,31 +796,6 @@ uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw( return aSNS; } - -sal_Bool SAL_CALL DicList_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += DicList::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey(aImpl ); - uno::Sequence< rtl::OUString > aServices = - DicList::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 6485e6e841b7..afcf1503bbe9 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1333,27 +1333,3 @@ void * SAL_CALL GrammarCheckingIterator_getFactory( } return pRet; } - - -sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo( - void * /*pServiceManager*/, - registry::XRegistryKey * pRegistryKey ) -{ - try - { - OUString aImpl( '/' ); - aImpl += GrammarCheckingIterator_getImplementationName().getStr(); - aImpl += A2OU( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = pRegistryKey->createKey( aImpl ); - uno::Sequence< OUString > aServices = GrammarCheckingIterator_getSupportedServiceNames(); - for( sal_Int32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch (uno::Exception &) - { - return sal_False; - } -} - diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 21e1b7a58a3c..57041b7c1e4a 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -276,27 +276,6 @@ OUString SAL_CALL GrammarChecker::getImplementationName( ) throw(uno::RuntimeEx return getImplementationName_Static(); } -sal_Bool SAL_CALL GrammarChecker_writeInfo( void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += GrammarChecker::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - uno::Sequence< OUString > aServices = GrammarChecker::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); ++i ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(uno::Exception &) - { - return sal_False; - } -} - uno::Reference< uno::XInterface > SAL_CALL GrammarChecker_CreateInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ ) throw(uno::Exception) diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component new file mode 100644 index 000000000000..f4f3ca603a88 --- /dev/null +++ b/linguistic/source/lng.component @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.lingu2.ConvDicList"> + <service name="com.sun.star.linguistic2.ConversionDictionaryList"/> + </implementation> + <implementation name="com.sun.star.lingu2.DicList"> + <service name="com.sun.star.linguistic2.DictionaryList"/> + </implementation> + <implementation name="com.sun.star.lingu2.LinguProps"> + <service name="com.sun.star.linguistic2.LinguProperties"/> + </implementation> + <implementation name="com.sun.star.lingu2.LngSvcMgr"> + <service name="com.sun.star.linguistic2.LinguServiceManager"/> + </implementation> + <implementation name="com.sun.star.lingu2.ProofreadingIterator"> + <service name="com.sun.star.linguistic2.ProofreadingIterator"/> + </implementation> +</component> diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 77a1fcbd57b0..9cefa6179316 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -665,29 +665,6 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static() return aSNS; } - -sal_Bool SAL_CALL LinguProps_writeInfo( void * /*pServiceManager*/, - XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += LinguProps::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - Reference< XRegistryKey > xNewKey = - pRegistryKey->createKey(aImpl ); - uno::Sequence< OUString > aServices = LinguProps::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, XMultiServiceFactory *pServiceManager, void * ) { diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 6ab3db60d268..0f6add07b466 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -38,42 +38,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -//////////////////////////////////////// -// declaration of external RegEntry-functions defined by the service objects -// - -extern sal_Bool SAL_CALL LngSvcMgr_writeInfo -( - void * /*pServiceManager*/, - XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL DicList_writeInfo -( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL LinguProps_writeInfo -( - void * /*pServiceManager*/, - XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL ConvDicList_writeInfo -( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo -( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey -); - -//extern sal_Bool SAL_CALL GrammarChecker_writeInfo -//( -// void * /*pServiceManager*/, XRegistryKey * pRegistryKey -//); - extern void * SAL_CALL LngSvcMgr_getFactory ( const sal_Char * pImplName, @@ -129,28 +93,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo -( - void * pServiceManager, - XRegistryKey * pRegistryKey -) -{ - sal_Bool bRet = LngSvcMgr_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = LinguProps_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = DicList_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = ConvDicList_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = GrammarCheckingIterator_writeInfo( pServiceManager, pRegistryKey ); -/* - if(bRet) - bRet = GrammarChecker_writeInfo( pServiceManager, pRegistryKey ); -*/ - return bRet; -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 90e433f50f07..9a9f680b4ea2 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -45,6 +45,8 @@ #include <cppuhelper/extract.hxx> #include <rtl/logfile.hxx> +#include <boost/checked_delete.hpp> + #include "lngsvcmgr.hxx" #include "lngopt.hxx" #include "misc.hxx" @@ -605,6 +607,14 @@ LngSvcMgr::LngSvcMgr() : EnableNotification( aNames ); } +void LngSvcMgr::clearSvcInfoArray(SvcInfoArray* pInfo) +{ + if (pInfo) + { + std::for_each(pInfo->begin(), pInfo->end(), boost::checked_deleter<SvcInfo>()); + delete pInfo; + } +} LngSvcMgr::~LngSvcMgr() { @@ -612,10 +622,10 @@ LngSvcMgr::~LngSvcMgr() // will be freed in the destructor of the respective Reference's // xSpellDsp, xGrammarDsp, xHyphDsp, xThesDsp - delete pAvailSpellSvcs; - delete pAvailGrammarSvcs; - delete pAvailHyphSvcs; - delete pAvailThesSvcs; + clearSvcInfoArray(pAvailSpellSvcs); + clearSvcInfoArray(pAvailGrammarSvcs); + clearSvcInfoArray(pAvailHyphSvcs); + clearSvcInfoArray(pAvailThesSvcs); } @@ -652,7 +662,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailSpellSvcs; pAvailSpellSvcs = 0; + clearSvcInfoArray(pAvailSpellSvcs); pAvailSpellSvcs = 0; OUString aNode( aSpellCheckerList ); if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText )) @@ -677,7 +687,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) else if (0 == rName.compareTo( aGrammarCheckerList, aGrammarCheckerList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailGrammarSvcs; pAvailGrammarSvcs = 0; + clearSvcInfoArray(pAvailGrammarSvcs); pAvailGrammarSvcs = 0; OUString aNode( aGrammarCheckerList ); if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText )) @@ -705,7 +715,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) else if (0 == rName.compareTo( aHyphenatorList, aHyphenatorList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailHyphSvcs; pAvailHyphSvcs = 0; + clearSvcInfoArray(pAvailHyphSvcs); pAvailHyphSvcs = 0; OUString aNode( aHyphenatorList ); if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText )) @@ -730,7 +740,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) else if (0 == rName.compareTo( aThesaurusList, aThesaurusList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailThesSvcs; pAvailThesSvcs = 0; + clearSvcInfoArray(pAvailThesSvcs); pAvailThesSvcs = 0; OUString aNode( aThesaurusList ); if (lcl_SeqHasString( aThesaurusListEntries, aKeyText )) @@ -1402,7 +1412,7 @@ uno::Sequence< OUString > SAL_CALL { // don't used cached data here (force re-evaluation in order to have downloaded dictionaries // already found without the need to restart the office - delete pAvailSpellSvcs; pAvailSpellSvcs = 0; + clearSvcInfoArray(pAvailSpellSvcs); pAvailSpellSvcs = 0; GetAvailableSpellSvcs_Impl(); pInfoArray = pAvailSpellSvcs; } @@ -1410,7 +1420,7 @@ uno::Sequence< OUString > SAL_CALL { // don't used cached data here (force re-evaluation in order to have downloaded dictionaries // already found without the need to restart the office - delete pAvailGrammarSvcs; pAvailGrammarSvcs = 0; + clearSvcInfoArray(pAvailGrammarSvcs); pAvailGrammarSvcs = 0; GetAvailableGrammarSvcs_Impl(); pInfoArray = pAvailGrammarSvcs; } @@ -1418,7 +1428,7 @@ uno::Sequence< OUString > SAL_CALL { // don't used cached data here (force re-evaluation in order to have downloaded dictionaries // already found without the need to restart the office - delete pAvailHyphSvcs; pAvailHyphSvcs = 0; + clearSvcInfoArray(pAvailHyphSvcs); pAvailHyphSvcs = 0; GetAvailableHyphSvcs_Impl(); pInfoArray = pAvailHyphSvcs; } @@ -1426,7 +1436,7 @@ uno::Sequence< OUString > SAL_CALL { // don't used cached data here (force re-evaluation in order to have downloaded dictionaries // already found without the need to restart the office - delete pAvailThesSvcs; pAvailThesSvcs = 0; + clearSvcInfoArray(pAvailThesSvcs); pAvailThesSvcs = 0; GetAvailableThesSvcs_Impl(); pInfoArray = pAvailThesSvcs; } @@ -1990,31 +2000,6 @@ uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance( return xService; } - - -sal_Bool SAL_CALL LngSvcMgr_writeInfo( - void * /*pServiceManager*/, - registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += LngSvcMgr::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - uno::Sequence< OUString > aServices = LngSvcMgr::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(uno::Exception &) - { - return sal_False; - } -} - void * SAL_CALL LngSvcMgr_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 953e531960bf..bb6f6cf93732 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -143,6 +143,8 @@ class LngSvcMgr : void SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher, const SvcInfoArray &rAvailSvcs ); + static void clearSvcInfoArray(SvcInfoArray *pInfo); + // utl::ConfigItem (to allow for listening of changes of relevant properties) virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); virtual void Commit(); diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 3f68afb30575..9bbd456ce89d 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -91,9 +91,8 @@ DEF1DES =Linguistic main DLL .IF "$(GUI)"=="WNT" -DEF1EXPORT1 = component_writeInfo -DEF1EXPORT2 = component_getFactory -DEF1EXPORT3 = component_getImplementationEnvironment +DEF1EXPORT1 = component_getFactory +DEF1EXPORT2 = component_getImplementationEnvironment .ENDIF # --- Targets ------------------------------------------------------ @@ -109,3 +108,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo component >> $@ @echo __CT >> $@ + +ALLTAR : $(MISC)/lng.component + +$(MISC)/lng.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + lng.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt lng.component diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu index 7570fda066ca..4ed9be5a3d27 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu @@ -38,7 +38,7 @@ <value xml:lang="en-US">~Text Mode</value> </prop> </node> - <node oor:name=".uno:InsertFormula" oor:op="replace"> + <node oor:name=".uno:ImportFormula" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Import Formula...</value> </prop> diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index c90e58881835..242c800b48db 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -215,11 +215,6 @@ XInitialization { return xSingleServiceFactory; } - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) { - return FactoryHelper.writeRegistryServiceInfo( - SecurityDialog.class.getName(), SecurityDialog.__serviceName, regKey ); - } - // XServiceInfo public String getImplementationName( ) { return getClass().getName(); diff --git a/scripting/java/ScriptFramework.component b/scripting/java/ScriptFramework.component new file mode 100644 index 000000000000..d6f9a8f62bf4 --- /dev/null +++ b/scripting/java/ScriptFramework.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.script.framework.security.SecurityDialog"> + <service name="com.sun.star.script.framework.security.SecurityDialog"/> + </implementation> +</component> diff --git a/scripting/java/ScriptProviderForBeanShell.component b/scripting/java/ScriptProviderForBeanShell.component new file mode 100644 index 000000000000..fe040d71d90d --- /dev/null +++ b/scripting/java/ScriptProviderForBeanShell.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell$_ScriptProviderForBeanShell"> + <service name="com.sun.star.script.browse.BrowseNode"/> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProviderForBeanShell"/> + </implementation> +</component> diff --git a/scripting/java/ScriptProviderForJava.component b/scripting/java/ScriptProviderForJava.component new file mode 100644 index 000000000000..4ea6ea8a1086 --- /dev/null +++ b/scripting/java/ScriptProviderForJava.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.script.framework.provider.java.ScriptProviderForJava$_ScriptProviderForJava"> + <service name="com.sun.star.script.browse.BrowseNode"/> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProviderForJava"/> + </implementation> +</component> diff --git a/scripting/java/ScriptProviderForJavaScript.component b/scripting/java/ScriptProviderForJavaScript.component new file mode 100644 index 000000000000..e9725d865983 --- /dev/null +++ b/scripting/java/ScriptProviderForJavaScript.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript$_ScriptProviderForJavaScript"> + <service name="com.sun.star.script.browse.BrowseNode"/> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProviderForJavaScript"/> + </implementation> +</component> diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index d3a0fdf3bc82..95c727881427 100755 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -123,41 +123,6 @@ public class ScriptProviderForBeanShell return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.beanshell." + - "ScriptProviderForBeanShell$_ScriptProviderForBeanShell"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForBeanShell"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } - } class ScriptImpl implements XScript diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index f4160531c9db..707ea05624d9 100755 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -134,41 +134,6 @@ public class ScriptProviderForJava return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.java." + - "ScriptProviderForJava$_ScriptProviderForJava"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForJava"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } - } class ScriptImpl implements XScript diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index c053b4166063..9f04d9105374 100755 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -124,40 +124,6 @@ public class ScriptProviderForJavaScript return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.javascript." + - "ScriptProviderForJavaScript$_ScriptProviderForJavaScript"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForJavaScript"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } } class ScriptImpl implements XScript { diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk index 6a5a81bf978c..dc8ee1abdc46 100755 --- a/scripting/java/makefile.mk +++ b/scripting/java/makefile.mk @@ -36,3 +36,37 @@ TARGET=scriptruntimeforjava ALLTAR : ANTBUILD .ENDIF .ENDIF + +ALLTAR : \ + $(MISC)/ScriptFramework.component \ + $(MISC)/ScriptProviderForBeanShell.component \ + $(MISC)/ScriptProviderForJava.component \ + $(MISC)/ScriptProviderForJavaScript.component + +$(MISC)/ScriptFramework.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptFramework.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component + +$(MISC)/ScriptProviderForBeanShell.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForBeanShell.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForBeanShell.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForBeanShell.component + +$(MISC)/ScriptProviderForJava.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJava.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component + +$(MISC)/ScriptProviderForJavaScript.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForJavaScript.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJavaScript.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForJavaScript.component diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst index ef216fe84f8a..4b9d435af7a0 100644 --- a/scripting/prj/d.lst +++ b/scripting/prj/d.lst @@ -15,3 +15,15 @@ mkdir: %_DEST%\bin%_EXT%\pyuno ..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib +..\%__SRC%\misc\mailmerge.component %_DEST%\xml%_EXT%\mailmerge.component +..\%__SRC%\misc\pythonscript.component %_DEST%\xml%_EXT%\pythonscript.component +..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml%_EXT%\ScriptFramework.component +..\%__SRC%\misc\ScriptProviderForBeanShell.component %_DEST%\xml%_EXT%\ScriptProviderForBeanShell.component +..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml%_EXT%\ScriptProviderForJava.component +..\%__SRC%\misc\ScriptProviderForJavaScript.component %_DEST%\xml%_EXT%\ScriptProviderForJavaScript.component +..\%__SRC%\misc\basprov.component %_DEST%\xml%_EXT%\basprov.component +..\%__SRC%\misc\dlgprov.component %_DEST%\xml%_EXT%\dlgprov.component +..\%__SRC%\misc\protocolhandler.component %_DEST%\xml%_EXT%\protocolhandler.component +..\%__SRC%\misc\scriptframe.component %_DEST%\xml%_EXT%\scriptframe.component +..\%__SRC%\misc\stringresource.component %_DEST%\xml%_EXT%\stringresource.component +..\%__SRC%\misc\vbaevents.component %_DEST%\xml%_EXT%\vbaevents.component diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component new file mode 100644 index 000000000000..528ab6544e1e --- /dev/null +++ b/scripting/source/basprov/basprov.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.scripting.ScriptProviderForBasic"> + <service name="com.sun.star.script.browse.BrowseNode"/> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProviderForBasic"/> + </implementation> +</component> diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 69cc6f40cd3d..ed6c9d7e6a5b 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -589,13 +589,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::basprov::s_component_entries ); - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk index 5001e5db288e..c98f961e6bd3 100644 --- a/scripting/source/basprov/makefile.mk +++ b/scripting/source/basprov/makefile.mk @@ -71,3 +71,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/basprov.component + +$(MISC)/basprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + basprov.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt basprov.component diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component new file mode 100644 index 000000000000..f7ceed336cf6 --- /dev/null +++ b/scripting/source/dlgprov/dlgprov.component @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.scripting.DialogProvider"> + <service name="com.sun.star.awt.ContainerWindowProvider"/> + <service name="com.sun.star.awt.DialogProvider"/> + <service name="com.sun.star.awt.DialogProvider2"/> + </implementation> +</component> diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 0fc0778c71d9..ffa128381d39 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -853,13 +853,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::dlgprov::s_component_entries ); - } - void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk index 6c8ec298c760..111dca58edc2 100644 --- a/scripting/source/dlgprov/makefile.mk +++ b/scripting/source/dlgprov/makefile.mk @@ -80,3 +80,11 @@ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ echo $@ + +ALLTAR : $(MISC)/dlgprov.component + +$(MISC)/dlgprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dlgprov.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dlgprov.component diff --git a/scripting/source/protocolhandler/exports.dxp b/scripting/source/protocolhandler/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/scripting/source/protocolhandler/exports.dxp +++ b/scripting/source/protocolhandler/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk index c782c1a188f5..ec69c00b209d 100644 --- a/scripting/source/protocolhandler/makefile.mk +++ b/scripting/source/protocolhandler/makefile.mk @@ -61,3 +61,11 @@ DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/protocolhandler.component + +$(MISC)/protocolhandler.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component new file mode 100644 index 000000000000..db177a896ca4 --- /dev/null +++ b/scripting/source/protocolhandler/protocolhandler.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ScriptProtocolHandler"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> +</component> diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 1e6adb6e7804..4e81426d7d53 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -537,27 +537,6 @@ extern "C" *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager , - void * pRegistryKey ) - { - (void)pServiceManager; - - Reference< css::registry::XRegistryKey > xKey( - reinterpret_cast< css::registry::XRegistryKey* >( pRegistryKey ) ) ; - - ::rtl::OUString aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); - aStr += - ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName(); - - aStr += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ); - Reference< css::registry::XRegistryKey > xNewKey = xKey->createKey( aStr ); - xNewKey->createKey( - ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME ) - ); - - return sal_True; - } - void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index dbade7172e6e..94ea78f80c73 100755 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -982,42 +982,6 @@ extern "C" } /** - * This function creates an implementation section in the registry and another subkey - * - * for each supported service. - * @param pServiceManager the service manager - * @param pRegistryKey the registry key - */ - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) - { - if (::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, - ::scripting_runtimemgr::s_entries )) - { - try - { - // MasterScriptProviderFactory Mangager singleton - registry::XRegistryKey * pKey = - reinterpret_cast< registry::XRegistryKey * >(pRegistryKey); - - Reference< registry::XRegistryKey >xKey = pKey->createKey( - OUSTR("com.sun.star.script.provider.MasterScriptProviderFactory/UNO/SINGLETONS/com.sun.star.script.provider.theMasterScriptProviderFactory")); - xKey->setStringValue( OUSTR("com.sun.star.script.provider.MasterScriptProviderFactory") ); - // BrowseNodeFactory Mangager singleton - xKey = pKey->createKey( - OUSTR("com.sun.star.script.browse.BrowseNodeFactory/UNO/SINGLETONS/com.sun.star.script.browse.theBrowseNodeFactory")); - xKey->setStringValue( OUSTR("com.sun.star.script.browse.BrowseNodeFactory") ); - return sal_True; - } - catch (Exception &) - { - } - } - return sal_False; - } - - /** * This function is called to get service factories for an implementation. * * @param pImplName name of implementation diff --git a/scripting/source/provider/exports.dxp b/scripting/source/provider/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/scripting/source/provider/exports.dxp +++ b/scripting/source/provider/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/pyprov/mailmerge.component b/scripting/source/pyprov/mailmerge.component new file mode 100644 index 000000000000..dd6a65e9a1ce --- /dev/null +++ b/scripting/source/pyprov/mailmerge.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Python" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.pyuno.MailMessage"> + <service name="com.sun.star.mail.MailMessage"/> + </implementation> + <implementation name="org.openoffice.pyuno.MailServiceProvider"> + <service name="com.sun.star.mail.MailServiceProvider"/> + </implementation> +</component> diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk index 3c0278595181..42c161adbbc8 100644 --- a/scripting/source/pyprov/makefile.mk +++ b/scripting/source/pyprov/makefile.mk @@ -47,3 +47,17 @@ $(DLLDEST)$/%.py: %.py cp $? $@ .INCLUDE : target.mk + +ALLTAR : $(MISC)/mailmerge.component $(MISC)/pythonscript.component + +$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + mailmerge.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mailmerge.component + +$(MISC)/pythonscript.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt pythonscript.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_PYTHON)pythonscript' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt pythonscript.component diff --git a/scripting/source/pyprov/pythonscript.component b/scripting/source/pyprov/pythonscript.component new file mode 100644 index 000000000000..08f895097203 --- /dev/null +++ b/scripting/source/pyprov/pythonscript.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Python" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.pyuno.LanguageScriptProviderForPython"> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProviderForPython"/> + </implementation> +</component> diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 48f21367e762..4780d58acc88 100755 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -486,68 +486,6 @@ extern "C" } /** - * This function creates an implementation section in the registry and another subkey - * - * for each supported service. - * @param pServiceManager the service manager - * @param pRegistryKey the registry key - */ - sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) - { - if (::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, - ::scripting_runtimemgr::s_entries )) - { - try - { - // register RuntimeManager singleton - - registry::XRegistryKey * pKey = - reinterpret_cast< registry::XRegistryKey * >(pRegistryKey); - - Reference< registry::XRegistryKey > xKey( - pKey->createKey( - - OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeManager"))); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager") ); - - // ScriptStorage Mangaer singleton - - xKey = pKey->createKey( - OUSTR("drafts.com.sun.star.script.framework.storage.ScriptStorageManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.storage.theScriptStorageManager")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.storage.ScriptStorageManager") ); - // Singleton entries are not handled by the setup process - // below is the only alternative at the momement which - // is to programmatically do this. - - // "Java" Runtime singleton entry - - xKey = pKey->createKey( - OUSTR("com.sun.star.scripting.runtime.java.ScriptRuntimeForJava$_ScriptRuntimeForJava/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForJava")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForJava") ); - - // "JavaScript" Runtime singleton entry - - xKey = pKey->createKey( - OUSTR("com.sun.star.scripting.runtime.javascript.ScriptRuntimeForJavaScript$_ScriptRuntimeForJavaScript/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForJavaScript")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForJavaScript") ); - - // "BeanShell" Runtime singleton entry - - xKey = pKey->createKey( - OUSTR("com.sun.star.scripting.runtime.beanshell.ScriptRuntimeForBeanShell$_ScriptRuntimeForBeanShell/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForBeanShell")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForBeanShell") ); - - return sal_True; - } - catch (Exception & exc) - { - } - } - return sal_False; - } - - /** * This function is called to get service factories for an implementation. * * @param pImplName name of implementation diff --git a/scripting/source/runtimemgr/exports.dxp b/scripting/source/runtimemgr/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/scripting/source/runtimemgr/exports.dxp +++ b/scripting/source/runtimemgr/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/storage/exports.dxp b/scripting/source/storage/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/scripting/source/storage/exports.dxp +++ b/scripting/source/storage/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk index dfc2d1979190..71f8ee39e748 100644 --- a/scripting/source/stringresource/makefile.mk +++ b/scripting/source/stringresource/makefile.mk @@ -60,3 +60,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/stringresource.component + +$(MISC)/stringresource.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt stringresource.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt stringresource.component diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component new file mode 100644 index 000000000000..6d64d9553945 --- /dev/null +++ b/scripting/source/stringresource/stringresource.component @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.scripting.StringResource"> + <service name="com.sun.star.resource.StringResource"/> + </implementation> + <implementation name="com.sun.star.comp.scripting.StringResourceWithLocation"> + <service name="com.sun.star.resource.StringResourceWithLocation"/> + </implementation> + <implementation name="com.sun.star.comp.scripting.StringResourceWithStorage"> + <service name="com.sun.star.resource.StringResourceWithStorage"/> + </implementation> +</component> diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 58b6c21b522f..0c0e9dd454ca 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -3080,13 +3080,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::stringresource::s_component_entries ); - } - void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk index 1946c61d1e0b..287bbe2b052b 100644..100755 --- a/scripting/source/vbaevents/makefile.mk +++ b/scripting/source/vbaevents/makefile.mk @@ -91,3 +91,11 @@ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ echo $@ + +ALLTAR : $(MISC)/vbaevents.component + +$(MISC)/vbaevents.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + vbaevents.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt vbaevents.component diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 9f38acb7e2a6..a6d4b287cfd6 100755 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -110,16 +110,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - OSL_TRACE("In component_writeInfo"); - if ( ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, s_component_entries ) ) - return sal_True; - return sal_False; - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component new file mode 100644 index 000000000000..e8cbf3d88ff7 --- /dev/null +++ b/scripting/source/vbaevents/vbaevents.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="ooo.vba.EventListener"> + <service name="ooo.vba.EventListener"/> + </implementation> + <implementation name="ooo.vba.VBAToOOEventDesc"> + <service name="ooo.vba.VBAToOOEventDesc"/> + </implementation> +</component> diff --git a/scripting/util/exports.dxp b/scripting/util/exports.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/scripting/util/exports.dxp +++ b/scripting/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/util/makefile.mk b/scripting/util/makefile.mk index f18970f164f8..04435caab11f 100644 --- a/scripting/util/makefile.mk +++ b/scripting/util/makefile.mk @@ -65,3 +65,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/scriptframe.component + +$(MISC)/scriptframe.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt scriptframe.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt scriptframe.component diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component new file mode 100644 index 000000000000..5b3fe8c396d5 --- /dev/null +++ b/scripting/util/scriptframe.component @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.script.browse.BrowseNodeFactory"> + <service name="com.sun.star.script.browse.BrowseNodeFactory"/> + <singleton name="com.sun.star.script.browse.theBrowseNodeFactory"/> + </implementation> + <implementation name="com.sun.star.script.provider.MasterScriptProvider"> + <service name="com.sun.star.script.browse.BrowseNode"/> + <service name="com.sun.star.script.provider.MasterScriptProvider"/> + <service name="com.sun.star.script.provider.ScriptProvider"/> + </implementation> + <implementation + name="com.sun.star.script.provider.MasterScriptProviderFactory"> + <service name="com.sun.star.script.provider.MasterScriptProviderFactory"/> + <singleton + name="com.sun.star.script.provider.theMasterScriptProviderFactory"/> + </implementation> + <implementation name="com.sun.star.script.provider.ScriptURIHelper"> + <service name="com.sun.star.script.provider.ScriptURIHelper"/> + </implementation> +</component> diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index fb331889a573..f9702063713a 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -73,7 +73,6 @@ #define UNOPROPERTYVALUE ::com::sun::star::beans::PropertyValue #define UNOREFERENCE ::com::sun::star::uno::Reference #define UNORUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define UNOINVALIDREGISTRYEXCEPTION ::com::sun::star::registry::InvalidRegistryException #define UNOSEQUENCE ::com::sun::star::uno::Sequence #define UNOTYPE ::com::sun::star::uno::Type #define UNOURL ::com::sun::star::util::URL @@ -591,52 +590,6 @@ sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd ); } //************************************************************************************************************************ -// definition for "extern c component_writeInfo()" -//************************************************************************************************************************ -#define COMPONENT_INFO(CLASS) \ - \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False ; \ - \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is () ) \ - { \ - /* Build new keyname */ \ - sKeyName = UNOOUSTRING::createFromAscii( "/" ) ; \ - sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += UNOOUSTRING::createFromAscii( "/UNO/SERVICES" ); \ - \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - \ - /* If this new key valid ... */ \ - if ( xNewKey.is () ) \ - { \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - xNewKey->createKey( pArray [nCounter] ); \ - } \ - \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - } \ - } \ - catch( UNOINVALIDREGISTRYEXCEPTION& ) \ - { \ - bReturn = sal_False ; \ - } \ - -//************************************************************************************************************************ // definition for "extern c component_getFactory()" //************************************************************************************************************************ #define CREATEFACTORY(CLASS) \ diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 96320614eaaf..1e471312c6cf 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -23,3 +23,9 @@ sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NUL sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL + +# fails on unxsoli4 +# sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL + +# sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL +# sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 0748aa19cd65..0768000425eb 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -44,3 +44,4 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx ..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx +..\%__SRC%\misc\sfx.component %_DEST%\xml%_EXT%\sfx.component diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java deleted file mode 100644 index d5dc17e183eb..000000000000 --- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java +++ /dev/null @@ -1,243 +0,0 @@ -/************************************************************************* - * - * 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. - * - ************************************************************************/ -package complex.framework; - -import com.sun.star.awt.XWindow; -import com.sun.star.document.XEventBroadcaster; -import com.sun.star.document.XEventListener; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import complex.framework.DocHelper.WriterHelper; -import complexlib.ComplexTestCase; -import java.util.ArrayList; -import com.sun.star.task.XJobExecutor; -import com.sun.star.util.URL; -import util.UITools; - -/** - * This testcase checks the GlobalEventBroadcaster - * it will add an XEventListener and verify the Events - * raised when opening/changing and closing Office Documents - */ -public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase { - XMultiServiceFactory m_xMSF = null; - XEventBroadcaster m_xEventBroadcaster = null; - ArrayList notifyEvents = new ArrayList(); - XTextDocument xTextDoc; - XSpreadsheetDocument xSheetDoc; - XEventListener m_xEventListener = new EventListenerImpl(); - - public String[] getTestMethodNames() { - return new String[] { - "initialize", "checkWriter", "cleanup" - }; - } - - public void initialize() { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - log.println("check wether there is a valid MultiServiceFactory"); - - if (m_xMSF == null) { - assure("## Couldn't get MultiServiceFactory make sure your Office is started", - true); - } - - log.println("... done"); - - log.println( - "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); - - Object GlobalEventBroadcaster = null; - Object dispatcher = null; - - try { - GlobalEventBroadcaster = m_xMSF.createInstance( - "com.sun.star.frame.GlobalEventBroadcaster"); - } catch (com.sun.star.uno.Exception e) { - assure("## Exception while creating instance", false); - } - - log.println("... done"); - - log.println("check wether the created instance is valid"); - - if (GlobalEventBroadcaster == null) { - assure("couldn't create service", false); - } - - log.println("... done"); - - log.println( - "try to query the XEventBroadcaster from the gained Object"); - m_xEventBroadcaster = (XEventBroadcaster) UnoRuntime.queryInterface( - XEventBroadcaster.class, - GlobalEventBroadcaster); - - if (util.utils.isVoid(m_xEventBroadcaster)) { - assure("couldn't get XEventBroadcaster", false); - } - - log.println("... done"); - - log.println("adding Listener"); - m_xEventBroadcaster.addEventListener(m_xEventListener); - log.println("... done"); - } - - public void checkWriter() { - log.println("-- Checking Writer --"); - - WriterHelper wHelper = new WriterHelper(m_xMSF); - String[] expected; - boolean locRes = true; - log.println("opening an empty writer doc"); - notifyEvents.clear(); - xTextDoc = wHelper.openEmptyDoc(); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; - - assure("Wrong events fired when opening empty doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("changing the writer doc"); - notifyEvents.clear(); - xTextDoc.getText().setString("GlobalEventBroadcaster"); - shortWait(); - expected = new String[] { "OnModifyChanged" }; - - assure("Wrong events fired when changing doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("closing the empty writer doc"); - notifyEvents.clear(); - wHelper.closeDoc(xTextDoc); - shortWait(); - expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assure("Wrong events fired when closing empty doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("opening an writer doc via Window-New Window"); - notifyEvents.clear(); - xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; - - assure("Wrong events fired when opening an writer doc via Window-New Window", - proveExpectation(expected)); - log.println("... done"); - - log.println("closing the created writer doc"); - notifyEvents.clear(); - - wHelper.closeDoc(xTextDoc); - shortWait(); - expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assure("Wrong events fired when closing Window-New Window", - proveExpectation(expected)); - - log.println("... done"); - - log.println("Opening document with label wizard"); - xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); - shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit ().getActiveTopWindow ()); - UITools ut = new UITools(m_xMSF,xWindow); - notifyEvents.clear(); - log.println("pressing button 'New Document'"); - try{ - ut.clickButton ("New Document"); - } catch (Exception e) { - log.println("Couldn't press Button"); - } - log.println("... done"); - shortWait(); - shortWait(); - shortWait(); - expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; - - assure("Wrong events fired when starting labels wizard", - proveExpectation(expected)); - - log.println("-- Done Writer --"); - } - - public void cleanup() { - log.println("removing Listener"); - m_xEventBroadcaster.removeEventListener(m_xEventListener); - log.println("... done"); - } - - /** - * Sleeps for 0.5 sec. to allow StarOffice to react on <code> - * reset</code> call. - */ - private void shortWait() { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - log.println("While waiting :" + e); - } - } - - private boolean proveExpectation(String[] expected) { - boolean locRes = true; - boolean failure = false; - - log.println("Fired Events:"); - for (int k=0;k<notifyEvents.size();k++) { - System.out.println("\t- "+notifyEvents.get(k)); - } - - for (int i = 0; i < expected.length; i++) { - locRes = notifyEvents.contains(expected[i]); - - if (!locRes) { - log.println("The event " + expected[i] + " isn't fired"); - failure = true; - } - } - - return !failure; - } - - public class EventListenerImpl implements XEventListener { - public void disposing(com.sun.star.lang.EventObject eventObject) { - log.println("disposing: " + eventObject.Source.toString()); - } - - public void notifyEvent(com.sun.star.document.EventObject eventObject) { - notifyEvents.add(eventObject.EventName); - } - } -} diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java index cff1dd341d48..0c4eb44c4a35 100644 --- a/sfx2/qa/complex/docinfo/DocumentProperties.java +++ b/sfx2/qa/complex/docinfo/DocumentProperties.java @@ -26,9 +26,12 @@ ************************************************************************/ package complex.docinfo; +import com.sun.star.beans.*; +import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertyContainer; import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.XPropertySetInfo; import com.sun.star.document.XDocumentInfo; import com.sun.star.document.XDocumentInfoSupplier; import com.sun.star.frame.XComponentLoader; @@ -37,233 +40,324 @@ import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.text.XTextDocument; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; import com.sun.star.util.Date; -import complexlib.ComplexTestCase; + import util.DesktopTools; import util.WriterTools; +import org.junit.After; +import org.junit.AfterClass; +// import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public class DocumentProperties +{ -public class DocumentProperties extends ComplexTestCase { XMultiServiceFactory m_xMSF = null; XTextDocument xTextDoc = null; + XTextDocument xTextDocSecond = null; - public String[] getTestMethodNames() { - return new String[] {"checkDocInfo", "cleanup"}; - } - - public void checkDocInfo() { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - - log.println( - "check wether there is a valid MultiServiceFactory"); - - if (m_xMSF == null) { - assure("## Couldn't get MultiServiceFactory make sure your Office is started", - true); - } +// public String[] getTestMethodNames() { +// return new String[] {"checkDocInfo", "cleanup"}; +// } + @Test public void checkDocInfo() + { + m_xMSF = getMSF(); - log.println("... done"); - - log.println("Opening a Writer document"); - xTextDoc = WriterTools.createTextDoc(m_xMSF); - log.println("... done"); - - XDocumentInfoSupplier xDocInfoSup = - (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, - xTextDoc); - XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); - XPropertyContainer xPropContainer = - (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, - xDocInfo); - - log.println("Trying to add a existing property"); - - boolean worked = - addProperty(xPropContainer, "Author", (short) 0, ""); - assure("Could set an existing property", !worked); - log.println("...done"); - - log.println("Trying to add a integer property"); - worked = - addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, - new Integer(17)); - assure("Couldn't set an integer property", worked); - log.println("...done"); - - log.println("Trying to add a double property"); - worked = - addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE , - new Double(17.7)); - assure("Couldn't set an double property", worked); - log.println("...done"); - - log.println("Trying to add a boolean property"); - worked = - addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, - Boolean.TRUE); - assure("Couldn't set an boolean property", worked); - log.println("...done"); - - log.println("Trying to add a date property"); - worked = - addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, - new Date()); - assure("Couldn't set an date property", worked); - log.println("...done"); - - log.println("trying to remove a read only Property"); - try { - xPropContainer.removeProperty ("intValue"); - assure("Could remove read only property", false); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...OK"); - } - log.println("...done"); + System.out.println("check wether there is a valid MultiServiceFactory"); + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); + // TODO: need other temp directory! String tempdir = System.getProperty("java.io.tmpdir"); String fs = System.getProperty("file.separator"); - if (!tempdir.endsWith(fs)) { + if (!tempdir.endsWith(fs)) + { tempdir += fs; } - tempdir = util.utils.getFullURL(tempdir); - - log.println("Storing the document"); - - try { - XStorable store = - (XStorable) UnoRuntime.queryInterface(XStorable.class, - xTextDoc); - store.storeToURL(tempdir + "DocInfo.oot", - new PropertyValue[] {}); - DesktopTools.closeDoc(xTextDoc); - } catch (Exception e) { - assure("Couldn't store document", false); + final String sTempDocument = tempdir + "DocInfo.oot"; + + if (true) + { + System.out.println("... done"); + + + System.out.println("Opening a Writer document"); + xTextDoc = WriterTools.createTextDoc(m_xMSF); + System.out.println("... done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("Trying to add a existing property"); + + boolean worked = addProperty(xPropContainer, "Author", (short) 0, ""); + assertTrue("Could set an existing property", !worked); + System.out.println("...done"); + + System.out.println("Trying to add a integer property"); + worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17)); + assertTrue("Couldn't set an integer property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a double property"); + worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7)); + assertTrue("Couldn't set an double property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a boolean property"); + worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE); + assertTrue("Couldn't set an boolean property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a date property"); + worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date()); + assertTrue("Couldn't set an date property", worked); + System.out.println("...done"); + + System.out.println("trying to remove a read only Property"); + try + { + xPropContainer.removeProperty("intValue"); + fail("Could remove read only property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer); + showPropertySet(xProps2); + + + System.out.println("Storing the document"); + try + { + XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); + store.storeToURL(sTempDocument, new PropertyValue[] {}); + DesktopTools.closeDoc(xTextDoc); + } + catch (Exception e) + { + fail("Couldn't store document"); + } + + System.out.println("...done"); } - log.println("...done"); - - log.println("loading the document"); - - try { - XComponentLoader xCL = - (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, - m_xMSF.createInstance( - "com.sun.star.frame.Desktop")); - XComponent xComp = - xCL.loadComponentFromURL(tempdir + "DocInfo.oot", - "_blank", 0, new PropertyValue[] {}); - xTextDoc = - (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, - xComp); - } catch (Exception e) { - assure("Couldn't load document", false); - } - log.println("...done"); - - xDocInfoSup = - (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, - xTextDoc); - xDocInfo = xDocInfoSup.getDocumentInfo(); - - XPropertySet xProps = - (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, - xDocInfo); - - assure("Integer doesn't work", - checkType(xProps, "intValue", "java.lang.Integer")); - assure("Double doesn't work", - checkType(xProps, "doubleValue", "java.lang.Double")); - assure("Boolean doesn't work", - checkType(xProps, "booleanValue", "java.lang.Boolean")); - assure("Date doesn't work", - checkType(xProps, "dateValue", - "com.sun.star.util.DateTime")); - - xPropContainer = - (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, - xDocInfo); - - log.println("trying to remove a not user defined Property"); - try { - xPropContainer.removeProperty ("Author"); - assure("Could remove non user defined property", false); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...OK"); - } - log.println("...done"); - - log.println("Trying to remove a user defined property"); - try { - xPropContainer.removeProperty ("dateValue"); - log.println("\t...OK"); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...FAILED"); - assure("Could not remove user defined property", false); + if (true) + { + System.out.println("loading the document"); + + try + { + XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); + XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {}); + xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp); + } + catch (Exception e) + { + fail("Couldn't load document"); + } + + System.out.println("...done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo); + showPropertySet(xProps); + + assertTrue("Double doesn't work", checkType(xProps, "doubleValue", "java.lang.Double")); + assertTrue("Boolean doesn't work", checkType(xProps, "booleanValue", "java.lang.Boolean")); + + // TODO: dateValue does not exist. + // assertTrue("Date doesn't work", checkType(xProps, "dateValue", "com.sun.star.util.DateTime")); + + // TODO: is java.lang.Double + // assertTrue("Integer doesn't work", checkType(xProps, "intValue", "java.lang.Integer")); + + xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("trying to remove a not user defined Property"); + try + { + xPropContainer.removeProperty("Author"); + fail("Could remove non user defined property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + + System.out.println("Trying to remove a user defined property"); + try + { + xPropContainer.removeProperty("booleanValue"); + System.out.println("\t...OK"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...FAILED"); + fail("Could not remove user defined property"); + } + showPropertySet(xProps); + System.out.println("...done"); } - log.println("...done"); - } - public void cleanup() { + @After public void cleanup() + { + DesktopTools.closeDoc(xTextDocSecond); DesktopTools.closeDoc(xTextDoc); } + private void showPropertySet(XPropertySet xProps) + { + try + { + // get an XPropertySet, here the one of a text cursor + // XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor); + + // get the property info interface of this XPropertySet + XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo(); + + // get all properties (NOT the values) from XPropertySetInfo + Property[] aProps = xPropsInfo.getProperties(); + int i; + for (i = 0; i < aProps.length; ++i) { + // number of property within this info object + System.out.print("Property #" + i); + + // name of property + System.out.print(": Name<" + aProps[i].Name); + + // handle of property (only for XFastPropertySet) + System.out.print("> Handle<" + aProps[i].Handle); + + // type of property + System.out.print("> " + aProps[i].Type.toString()); + + // attributes (flags) + System.out.print(" Attributes<"); + short nAttribs = aProps[i].Attributes; + if ((nAttribs & PropertyAttribute.MAYBEVOID) != 0) + System.out.print("MAYBEVOID|"); + if ((nAttribs & PropertyAttribute.BOUND) != 0) + System.out.print("BOUND|"); + if ((nAttribs & PropertyAttribute.CONSTRAINED) != 0) + System.out.print("CONSTRAINED|"); + if ((nAttribs & PropertyAttribute.READONLY) != 0) + System.out.print("READONLY|"); + if ((nAttribs & PropertyAttribute.TRANSIENT) != 0) + System.out.print("TRANSIENT|"); + if ((nAttribs & PropertyAttribute.MAYBEAMBIGUOUS ) != 0) + System.out.print("MAYBEAMBIGUOUS|"); + if ((nAttribs & PropertyAttribute.MAYBEDEFAULT) != 0) + System.out.print("MAYBEDEFAULT|"); + if ((nAttribs & PropertyAttribute.REMOVEABLE) != 0) + System.out.print("REMOVEABLE|"); + System.out.println("0>"); + } + } catch (Exception e) { + // If anything goes wrong, give the user a stack trace + e.printStackTrace(System.out); + } + } + private boolean checkType(XPropertySet xProps, String aName, - String expected) { + String expected) + { boolean ret = true; - log.println("Checking " + expected); + System.out.println("Checking " + expected); String getting = - getPropertyByName(xProps, aName).getClass().getName(); + getPropertyByName(xProps, aName).getClass().getName(); - if (!getting.equals(expected)) { - log.println("\t Expected: " + expected); - log.println("\t Detting: " + getting); + if (!getting.equals(expected)) + { + System.out.println("\t Expected: " + expected); + System.out.println("\t Getting: " + getting); ret = false; } - if (ret) { - log.println("...OK"); + if (ret) + { + System.out.println("...OK"); } - return ret; } - private Object getPropertyByName(XPropertySet xProps, String aName) { + private Object getPropertyByName(XPropertySet xProps, String aName) + { Object ret = null; - try { + try + { ret = xProps.getPropertyValue(aName); - } catch (Exception e) { - log.println("\tCouldn't get Property " + aName); - log.println("\tMessage " + e); + } + catch (Exception e) + { + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); } return ret; } private boolean addProperty(XPropertyContainer xPropContainer, - String aName, short attr, Object defaults) { + String aName, short attr, Object defaults) + { boolean ret = true; - try { + try + { xPropContainer.addProperty(aName, attr, defaults); - } catch (Exception e) { + } + catch (Exception e) + { ret = false; - log.println("\tCouldn't get Property " + aName); - log.println("\tMessage " + e); + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); } return ret; } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 8c3525541062..626b648a6d06 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -25,32 +25,39 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = DocumentProperties +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. PRJNAME = sfx2 -PACKAGE = complex$/docinfo +TARGET = qa_complex_docinfo -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/docinfo +JAVATESTFILES = \ + DocumentProperties.java + +JAVAFILES = $(JAVATESTFILES) -#----- compile .java files ----------------------------------------- +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DocumentProperties.java +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -#----- make a jar from compiled files ------------------------------ +ALLTAR : javatest -MAXLINELENGTH = 100000 +.END -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk -run: - $(JAVAI) $(JAVAIFLAGS) -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) diff --git a/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java new file mode 100644 index 000000000000..c6dc073095b1 --- /dev/null +++ b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java @@ -0,0 +1,281 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ +package complex.framework; + +import com.sun.star.awt.XWindow; +import com.sun.star.document.XEventBroadcaster; +import com.sun.star.document.XEventListener; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.sheet.XSpreadsheetDocument; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import complex.framework.DocHelper.WriterHelper; + +import java.util.ArrayList; + +import util.UITools; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + + +/** + * This testcase checks the GlobalEventBroadcaster + * it will add an XEventListener and verify the Events + * raised when opening/changing and closing Office Documents + */ +public class CheckGlobalEventBroadcaster_writer1 { + XMultiServiceFactory m_xMSF = null; + XEventBroadcaster m_xEventBroadcaster = null; + ArrayList notifyEvents = new ArrayList(); + // XTextDocument xTextDoc; + XSpreadsheetDocument xSheetDoc; + XEventListener m_xEventListener = new EventListenerImpl(); + +// public String[] getTestMethodNames() { +// return new String[] { +// "initialize", "checkWriter", "cleanup" +// }; +// } + + @Before public void initialize() { + m_xMSF = getMSF(); + System.out.println("check wether there is a valid MultiServiceFactory"); + + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); + + System.out.println("... done"); + + System.out.println( + "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); + + Object GlobalEventBroadcaster = null; + Object dispatcher = null; + + try { + GlobalEventBroadcaster = m_xMSF.createInstance( + "com.sun.star.frame.GlobalEventBroadcaster"); + } catch (com.sun.star.uno.Exception e) { + fail("## Exception while creating instance"); + } + + System.out.println("... done"); + + System.out.println("check wether the created instance is valid"); + + assertNotNull("couldn't create service", GlobalEventBroadcaster); + + System.out.println("... done"); + + System.out.println( + "try to query the XEventBroadcaster from the gained Object"); + m_xEventBroadcaster = UnoRuntime.queryInterface(XEventBroadcaster.class, GlobalEventBroadcaster); + + if (util.utils.isVoid(m_xEventBroadcaster)) { + fail("couldn't get XEventBroadcaster"); + } + + System.out.println("... done"); + + System.out.println("adding Listener"); + m_xEventBroadcaster.addEventListener(m_xEventListener); + System.out.println("... done"); + } + + @Test public void checkWriter() { + System.out.println("-- Checking Writer --"); + + WriterHelper wHelper = new WriterHelper(m_xMSF); + String[] expected; + boolean locRes = true; + System.out.println("opening an empty writer doc"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openEmptyDoc(); + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; + + assertTrue("Wrong events fired when opening empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("changing the writer doc"); + notifyEvents.clear(); + xTextDoc.getText().setString("GlobalEventBroadcaster"); + shortWait(); + expected = new String[] { "OnModifyChanged" }; + + assertTrue("Wrong events fired when changing doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the empty writer doc"); + notifyEvents.clear(); + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("opening an writer doc via Window-New Window"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); + + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; + + assertTrue("Wrong events fired when opening an writer doc via Window-New Window", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the created writer doc"); + notifyEvents.clear(); + + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing Window-New Window", + proveExpectation(expected)); + + System.out.println("... done"); + // TODO: It seems not possible to close the document without interactiv question + // there the follow test will not be execute + if (false) { + System.out.println("Opening document with label wizard"); + XTextDocument xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); + shortWait(); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit().getActiveTopWindow()); + UITools ut = new UITools(m_xMSF,xWindow); + notifyEvents.clear(); + System.out.println("pressing button 'New Document'"); + try{ + ut.clickButton ("New Document"); + } catch (Exception e) { + System.out.println("Couldn't press Button"); + } + System.out.println("... done"); + shortWait(); + shortWait(); + shortWait(); + expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; + + assertTrue("Wrong events fired when starting labels wizard", + proveExpectation(expected)); + + System.out.println("Try to close document..."); + wHelper.closeDoc(xTextDoc); + shortWait(); + wHelper.closeFromDialog(); + shortWait(); + xTextDoc = null; + } + + System.out.println("-- Done Writer --"); + } + + @After public void cleanup() { + System.out.println("removing Listener"); + m_xEventBroadcaster.removeEventListener(m_xEventListener); + System.out.println("... done"); + } + + /** + * Sleeps for 0.5 sec. to allow StarOffice to react on <code> + * reset</code> call. + */ + private void shortWait() { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + private boolean proveExpectation(String[] expected) { + boolean locRes = true; + boolean failure = false; + + System.out.println("Fired Events:"); + for (int k=0;k<notifyEvents.size();k++) { + System.out.println("\t- "+notifyEvents.get(k)); + } + + for (int i = 0; i < expected.length; i++) { + locRes = notifyEvents.contains(expected[i]); + + if (!locRes) { + System.out.println("The event " + expected[i] + " isn't fired"); + failure = true; + } + } + + return !failure; + } + + public class EventListenerImpl implements XEventListener { + public void disposing(com.sun.star.lang.EventObject eventObject) { + System.out.println("disposing: " + eventObject.Source.toString()); + } + + public void notifyEvent(com.sun.star.document.EventObject eventObject) { + notifyEvents.add(eventObject.EventName); + } + } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() CheckGlobalEventBroadcaster_writer1"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} diff --git a/sfx2/qa/complex/DocHelper/DialogThread.java b/sfx2/qa/complex/framework/DialogThread.java index 7151ccbb292d..7151ccbb292d 100644 --- a/sfx2/qa/complex/DocHelper/DialogThread.java +++ b/sfx2/qa/complex/framework/DialogThread.java diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk index 6b6ac9191cdb..ad614cfca3f8 100644 --- a/sfx2/qa/complex/DocHelper/makefile.mk +++ b/sfx2/qa/complex/framework/DocHelper/makefile.mk @@ -25,10 +25,10 @@ # #************************************************************************* -PRJ = ..$/..$/.. +PRJ = ../../../.. TARGET = DocHelper PRJNAME = $(TARGET) -PACKAGE = complex$/framework$/dochelper +PACKAGE = complex/framework/dochelper # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -37,8 +37,11 @@ PACKAGE = complex$/framework$/dochelper #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DialogThread.java WriterHelper.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVAFILES = \ + DialogThread.java \ + WriterHelper.java + +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) # --- Targets ------------------------------------------------------ diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java index a61280c45fe5..3f61cb21b3dd 100644 --- a/sfx2/qa/complex/DocumentMetadataAccessTest.java +++ b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java @@ -27,15 +27,14 @@ package complex.framework; -import complexlib.ComplexTestCase; +// import complexlib.ComplexTestCase; import helper.StreamSimulator; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.Any; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.lang.XComponent; -import com.sun.star.lang.XInitialization; + import com.sun.star.lang.XServiceInfo; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.WrappedTargetException; @@ -46,17 +45,23 @@ import com.sun.star.beans.Pair; import com.sun.star.beans.StringPair; import com.sun.star.container.XEnumerationAccess; import com.sun.star.container.XEnumeration; -import com.sun.star.container.ElementExistException; -import com.sun.star.container.NoSuchElementException; import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; import com.sun.star.util.XCloseable; import com.sun.star.frame.XStorable; -import com.sun.star.frame.XLoadable; import com.sun.star.text.XTextDocument; import com.sun.star.text.XTextRange; import com.sun.star.text.XText; import com.sun.star.rdf.*; +import lib.TestParameters; + + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /** * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess @@ -68,7 +73,7 @@ import com.sun.star.rdf.*; * * @author mst */ -public class DocumentMetadataAccessTest extends ComplexTestCase +public class DocumentMetadataAccessTest { XMultiServiceFactory xMSF; XComponentContext xContext; @@ -105,72 +110,77 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XRepositorySupplier xRS; XDocumentMetadataAccess xDMA; - public String[] getTestMethodNames () - { - return new String[] { "check", "checkRDFa" }; - } +// public String[] getTestMethodNames () +// { +// return new String[] { "check", "checkRDFa" }; +// } + /** + * The test parameters + */ + private static TestParameters param = null; - public void before() + @Before public void before() { try { - xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); + xMSF = getMSF(); + param = new TestParameters(); + param.put("ServiceFactory", xMSF); // important for param.getMSF() + + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); + xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + tempDir); + System.out.println("tempdir: " + tempDir); foo = URI.create(xContext, "uri:foo"); - assure("foo", null != foo); + assertNotNull("foo", foo); bar = URI.create(xContext, "uri:bar"); - assure("bar", null != bar); + assertNotNull("bar", bar); baz = URI.create(xContext, "uri:baz"); - assure("baz", null != baz); + assertNotNull("baz", baz); blank1 = BlankNode.create(xContext, "_:1"); - assure("blank1", null != blank1); + assertNotNull("blank1", blank1); blank2 = BlankNode.create(xContext, "_:2"); - assure("blank2", null != blank2); + assertNotNull("blank2", blank2); blank3 = BlankNode.create(xContext, "_:3"); - assure("blank3", null != blank3); + assertNotNull("blank3", blank3); blank4 = BlankNode.create(xContext, "_:4"); - assure("blank4", null != blank4); + assertNotNull("blank4", blank4); rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); - assure("rdf_type", null != rdf_type); + assertNotNull("rdf_type", rdf_type); rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); - assure("rdfs_label", null != rdfs_label); + assertNotNull("rdfs_label", rdfs_label); pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); - assure("pkg_Document", null != pkg_Document); + assertNotNull("pkg_Document", pkg_Document); pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); - assure("pkg_hasPart", null != pkg_hasPart); + assertNotNull("pkg_hasPart", pkg_hasPart); pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); - assure("pkg_MetadataFile", null != pkg_MetadataFile); + assertNotNull("pkg_MetadataFile", pkg_MetadataFile); odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); - assure("odf_ContentFile", null != odf_ContentFile); + assertNotNull("odf_ContentFile", odf_ContentFile); odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); - assure("odf_StylesFile", null != odf_StylesFile); + assertNotNull("odf_StylesFile", odf_StylesFile); odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); - assure("odf_Element", null != odf_Element); + assertNotNull("odf_Element", odf_Element); } catch (Exception e) { report(e); } } - public void after() + @After public void after() { xRep = null; xRS = null; xDMA = null; } - public void check() + @Test public void check() { XComponent xComp = null; XComponent xComp2 = null; @@ -178,7 +188,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XEnumeration xStmtsEnum; XNamedGraph xManifest; - log.println("Creating document with Repository..."); + System.out.println("Creating document with Repository..."); // we cannot create a XDMA directly, we must create // a document and get it from there :( @@ -188,40 +198,37 @@ public class DocumentMetadataAccessTest extends ComplexTestCase loadProps[0].Name = "Hidden"; loadProps[0].Value = new Boolean(true); xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); - XTextDocument xText = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, xComp); - - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); - XDocumentMetadataAccess xDMA = (XDocumentMetadataAccess) - UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); - assure("xDMA null", null != xDMA); + XTextDocument xText = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertNotNull("xRS null", xRS); + XDocumentMetadataAccess xDMA = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); + assertNotNull("xDMA null", xDMA); xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); + assertNotNull("xRep null", xRep); - log.println("...done"); + System.out.println("...done"); - log.println("Checking that new repository is initialized..."); + System.out.println("Checking that new repository is initialized..."); XURI xBaseURI = (XURI) xDMA; String baseURI = xBaseURI.getStringValue(); - assure("new: baseURI", - null != xBaseURI && !xBaseURI.getStringValue().equals("")); + assertNotNull("new: baseURI", xBaseURI ); + assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); - assure("new: # graphs", 1 == xRep.getGraphNames().length); + assertTrue("new: # graphs", 1 == xRep.getGraphNames().length); XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), manifestPath); xManifest = xRep.getGraph(manifest); - assure("new: manifest graph", null != xManifest); + assertTrue("new: manifest graph", null != xManifest); Statement[] manifestStmts = getManifestStmts(xBaseURI); xStmtsEnum = xRep.getStatements(null, null, null); - assure("new: manifest graph", eq(xStmtsEnum, manifestStmts)); + assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts)); - log.println("...done"); + System.out.println("...done"); - log.println("Checking some invalid args..."); + System.out.println("Checking some invalid args..."); String content = "behold, for i am the content."; XTextRange xTR = new TestRange(content); @@ -229,205 +236,201 @@ public class DocumentMetadataAccessTest extends ComplexTestCase try { xDMA.getElementByURI(null); - assure("getElementByURI: null allowed", false); + fail("getElementByURI: null allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.getMetadataGraphsWithType(null); - assure("getMetadataGraphsWithType: null URI allowed", false); + fail("getMetadataGraphsWithType: null URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("", new XURI[0]); - assure("addMetadataFile: empty filename allowed", false); + fail("addMetadataFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("/foo", new XURI[0]); - assure("addMetadataFile: absolute filename allowed", false); + fail("addMetadataFile: absolute filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("fo\"o", new XURI[0]); - assure("addMetadataFile: invalid filename allowed", false); + fail("addMetadataFile: invalid filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("../foo", new XURI[0]); - assure("addMetadataFile: filename with .. allowed", false); + fail("addMetadataFile: filename with .. allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("foo/../../bar", new XURI[0]); - assure("addMetadataFile: filename with nest .. allowed", false); + fail("addMetadataFile: filename with nest .. allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("foo/././bar", new XURI[0]); - assure("addMetadataFile: filename with nest . allowed", false); + fail("addMetadataFile: filename with nest . allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("content.xml", new XURI[0]); - assure("addMetadataFile: content.xml allowed", false); + fail("addMetadataFile: content.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("styles.xml", new XURI[0]); - assure("addMetadataFile: styles.xml allowed", false); + fail("addMetadataFile: styles.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("meta.xml", new XURI[0]); - assure("addMetadataFile: meta.xml allowed", false); + fail("addMetadataFile: meta.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("settings.xml", new XURI[0]); - assure("addMetadataFile: settings.xml allowed", false); + fail("addMetadataFile: settings.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", foo, new XURI[0]); - assure("importMetadataFile: null stream allowed", false); + fail("importMetadataFile: null stream allowed"); } catch (IllegalArgumentException e) { // ignore } + + final String sEmptyRDF = TestDocument.getUrl("empty.rdf"); try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", foo, new XURI[0]); - assure("importMetadataFile: empty filename allowed", false); + fail("importMetadataFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", foo, new XURI[0]); - assure("importMetadataFile: meta.xml filename allowed", false); + fail("importMetadataFile: meta.xml filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "foo", null, new XURI[0]); - assure("importMetadataFile: null base URI allowed", false); + fail("importMetadataFile: null base URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "foo", rdf_type, new XURI[0]); - assure("importMetadataFile: non-absolute base URI allowed", - false); + fail("importMetadataFile: non-absolute base URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.removeMetadataFile(null); - assure("removeMetadataFile: null URI allowed", false); + fail("removeMetadataFile: null URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addContentOrStylesFile(""); - assure("addContentOrStylesFile: empty filename allowed", - false); + fail("addContentOrStylesFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addContentOrStylesFile("/content.xml"); - assure("addContentOrStylesFile: absolute filename allowed", - false); + fail("addContentOrStylesFile: absolute filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addContentOrStylesFile("foo.rdf"); - assure("addContentOrStylesFile: invalid filename allowed", - false); + fail("addContentOrStylesFile: invalid filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.removeContentOrStylesFile(""); - assure("removeContentOrStylesFile: empty filename allowed", - false); + fail("removeContentOrStylesFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.loadMetadataFromStorage(null, foo, null); - assure("loadMetadataFromStorage: null storage allowed", false); + fail("loadMetadataFromStorage: null storage allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.storeMetadataToStorage(null/*, base*/); - assure("storeMetadataToStorage: null storage allowed", false); + fail("storeMetadataToStorage: null storage allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.loadMetadataFromMedium(new PropertyValue[0]); - assure("loadMetadataFromMedium: empty medium allowed", false); + fail("loadMetadataFromMedium: empty medium allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.storeMetadataToMedium(new PropertyValue[0]); - assure("storeMetadataToMedium: empty medium allowed", false); + fail("storeMetadataToMedium: empty medium allowed"); } catch (IllegalArgumentException e) { // ignore } - log.println("...done"); + System.out.println("...done"); - log.println("Checking file addition/removal..."); + System.out.println("Checking file addition/removal..."); xDMA.removeContentOrStylesFile(contentPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (content)", + assertTrue("removeContentOrStylesFile (content)", eq(xStmtsEnum, new Statement[] { manifestStmts[0], manifestStmts[2], manifestStmts[4] })); xDMA.addContentOrStylesFile(contentPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (content)", + assertTrue("addContentOrStylesFile (content)", eq(xStmtsEnum, manifestStmts)); xDMA.removeContentOrStylesFile(stylesPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (styles)", + assertTrue("removeContentOrStylesFile (styles)", eq(xStmtsEnum, new Statement[] { manifestStmts[0], manifestStmts[1], manifestStmts[3] })); xDMA.addContentOrStylesFile(stylesPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (styles)", + assertTrue("addContentOrStylesFile (styles)", eq(xStmtsEnum, manifestStmts)); XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), @@ -440,44 +443,41 @@ public class DocumentMetadataAccessTest extends ComplexTestCase new Statement(xFoo, rdf_type, bar, manifest); xDMA.addMetadataFile(fooPath, new XURI[] { bar }); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addMetadataFile", + assertTrue("addMetadataFile", eq(xStmtsEnum, merge(manifestStmts, new Statement[] { xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar }))); XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); - assure("getMetadataGraphsWithType", + assertTrue("getMetadataGraphsWithType", graphsBar.length == 1 && eq(graphsBar[0], xFoo)); xDMA.removeMetadataFile(xFoo); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeMetadataFile", + assertTrue("removeMetadataFile", eq(xStmtsEnum, manifestStmts)); - log.println("...done"); + System.out.println("...done"); - log.println("Checking mapping..."); + System.out.println("Checking mapping..."); - XEnumerationAccess xTextEnum = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, - xText.getText()); + XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText()); Object o = xTextEnum.createEnumeration().nextElement(); - XMetadatable xMeta1 = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, o); + XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o); XURI uri; XMetadatable xMeta; xMeta = xDMA.getElementByURI(xMeta1); - assure("getElementByURI: null", null != xMeta); + assertTrue("getElementByURI: null", null != xMeta); String XmlId = xMeta.getMetadataReference().Second; String XmlId1 = xMeta1.getMetadataReference().Second; - assure("getElementByURI: no xml id", !XmlId.equals("")); - assure("getElementByURI: different xml id", XmlId.equals(XmlId1)); + assertTrue("getElementByURI: no xml id", !XmlId.equals("")); + assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1)); - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing and loading..."); + System.out.println("Checking storing and loading..."); XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), fooBarPath); @@ -485,23 +485,23 @@ public class DocumentMetadataAccessTest extends ComplexTestCase fooBarPath); xDMA.addMetadataFile(fooBarPath, new XURI[0]); xStmtsEnum = xRep.getStatements(null, null, null); - assure("addMetadataFile", + assertTrue("addMetadataFile", eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); Statement xFoobar_FooBarFoo = new Statement(foo, bar, foo, xFoobar); xRep.getGraph(xFoobar).addStatement(foo, bar, foo); xStmtsEnum = xRep.getStatements(null, null, null); - assure("addStatement", + assertTrue("addStatement", eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, new Statement[] { xFoobar_FooBarFoo })))); PropertyValue noMDNoContentFile = new PropertyValue(); noMDNoContentFile.Name = "URL"; - noMDNoContentFile.Value = util.utils.getFullTestURL("CUSTOM.odt"); + noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt"); PropertyValue noMDFile = new PropertyValue(); noMDFile.Name = "URL"; - noMDFile.Value = util.utils.getFullTestURL("TEST.odt"); + noMDFile.Value = TestDocument.getUrl("TEST.odt"); PropertyValue file = new PropertyValue(); file.Name = "URL"; file.Value = tempDir + "TESTDMA.odt"; @@ -525,71 +525,67 @@ public class DocumentMetadataAccessTest extends ComplexTestCase // this should re-init xDMA.loadMetadataFromMedium(argsEmptyNoContent); xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", !baseURI.equals(xDMA.getStringValue())); Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA); xStmtsEnum = xRep.getStatements(null, null, null); // there is no content or styles file in here, so we have just // the package stmt - assure("loadMetadataFromMedium (no metadata, no content)", + assertTrue("loadMetadataFromMedium (no metadata, no content)", eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); // this should re-init xDMA.loadMetadataFromMedium(argsEmpty); xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", !baseURI.equals(xDMA.getStringValue())); Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); xStmtsEnum = xRep.getStatements(null, null, null); - assure("loadMetadataFromMedium (no metadata)", + assertTrue("loadMetadataFromMedium (no metadata)", eq(xStmtsEnum, manifestStmts3)); xDMA.loadMetadataFromMedium(args); xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); + assertTrue("xRep null", null != xRep); Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA); Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA, fooBarPath); xStmtsEnum = xRep.getStatements(null, null, null); - assure("some graph(s) not reloaded", + assertTrue("some graph(s) not reloaded", graphs.length == xRep.getGraphNames().length); XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(), fooBarPath); Statement xFoobar_FooBarFoo4 = new Statement(foo, bar, foo, xFoobar4); - assure("loadMetadataFromMedium (re-load)", + assertTrue("loadMetadataFromMedium (re-load)", eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, new Statement[] { xFoobar_FooBarFoo4 })))); - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing and loading via model..."); + System.out.println("Checking storing and loading via model..."); String f = tempDir + "TESTPARA.odt"; - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xRS); + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xRS); xStor.storeToURL(f, new PropertyValue[0]); xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); - XDocumentMetadataAccess xDMA2 = (XDocumentMetadataAccess) - UnoRuntime.queryInterface(XDocumentMetadataAccess.class, - xComp2); - assure("xDMA2 null", null != xDMA2); + XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2); + assertTrue("xDMA2 null", null != xDMA2); - XRepositorySupplier xRS2 = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); - assure("xRS2 null", null != xRS2); + XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); + assertTrue("xRS2 null", null != xRS2); XRepository xRep2 = xRS2.getRDFRepository(); - assure("xRep2 null", null != xRep2); + assertTrue("xRep2 null", null != xRep2); Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, @@ -600,11 +596,11 @@ public class DocumentMetadataAccessTest extends ComplexTestCase new Statement(foo, bar, foo, xFoobar5); xStmtsEnum = xRep.getStatements(null, null, null); XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); - assure("load: repository differs", + assertTrue("load: repository differs", eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, new Statement[] { xFoobar_FooBarFoo5 })))); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); @@ -614,49 +610,48 @@ public class DocumentMetadataAccessTest extends ComplexTestCase } } - public void checkRDFa() + @Test public void checkRDFa() { XComponent xComp = null; - String file; try { - file = util.utils.getFullTestURL("TESTRDFA.odt"); + final String file = TestDocument.getUrl("TESTRDFA.odt"); xComp = loadRDFa(file); if (xComp != null) { - file = tempDir + "TESTRDFA.odt"; - storeRDFa(xComp, file); + final String sNewFile = tempDir + "TESTRDFA.odt"; + storeRDFa(xComp, sNewFile); close(xComp); - xComp = loadRDFa(file); + + xComp = loadRDFa(sNewFile); } } finally { close(xComp); } } - public void storeRDFa(XComponent xComp, String file) + private void storeRDFa(XComponent xComp, String file) { try { - log.println("Storing test document..."); + System.out.println("Storing test document..."); - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xComp); + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp); xStor.storeToURL(file, new PropertyValue[0]); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); } } - public XComponent loadRDFa(String file) + private XComponent loadRDFa(String file) { XComponent xComp = null; try { - log.println("Loading test document..."); + System.out.println("Loading test document..."); PropertyValue[] loadProps = new PropertyValue[1]; loadProps[0] = new PropertyValue(); @@ -667,46 +662,39 @@ public class DocumentMetadataAccessTest extends ComplexTestCase xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertTrue("xRS null", null != xRS); - XDocumentRepository xRep = (XDocumentRepository) - UnoRuntime.queryInterface(XDocumentRepository.class, - xRS.getRDFRepository()); - assure("xRep null", null != xRep); + XDocumentRepository xRep = UnoRuntime.queryInterface(XDocumentRepository.class, xRS.getRDFRepository()); + assertTrue("xRep null", null != xRep); - XTextDocument xTextDoc = (XTextDocument) - UnoRuntime.queryInterface(XTextDocument.class, xComp); + XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); XText xText = xTextDoc.getText(); - XEnumerationAccess xEA = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, xText); + XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); XEnumeration xEnum = xEA.createEnumeration(); - log.println("...done"); + System.out.println("...done"); - log.println("Checking RDFa in loaded test document..."); + System.out.println("Checking RDFa in loaded test document..."); XMetadatable xPara; Pair<Statement[], Boolean> result; Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 1", + assertTrue("RDFa: 1", !result.Second && eq(result.First, new Statement[] { x_FooBarLit1 })); Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 2", + assertTrue("RDFa: 2", !result.Second && eq(result.First, new Statement[] { x_FooBarLit2 @@ -714,54 +702,47 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_BlankBarLit3 = new Statement(blank1, bar, mkLit("3"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 3", + assertTrue("RDFa: 3", !result.Second && eq(result.First, new Statement[] { x_BlankBarLit3 })); - XBlankNode b3 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); + XBlankNode b3 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); Statement x_BlankBarLit4 = new Statement(blank2, bar, mkLit("4"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 4", + assertTrue("RDFa: 4", !result.Second && eq(result.First, new Statement[] { x_BlankBarLit4 })); - XBlankNode b4 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); + XBlankNode b4 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); Statement x_BlankBarLit5 = new Statement(blank1, bar, mkLit("5"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 5", + assertTrue("RDFa: 5", !result.Second && eq(result.First, new Statement[] { x_BlankBarLit5 })); - XBlankNode b5 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); + XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); - assure("RDFa: 3 != 4", + assertTrue("RDFa: 3 != 4", !b3.getStringValue().equals(b4.getStringValue())); - assure("RDFa: 3 == 5", + assertTrue("RDFa: 3 == 5", b3.getStringValue().equals(b5.getStringValue())); Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 6", + assertTrue("RDFa: 6", !result.Second && eq(result.First, new Statement[] { x_FooBarLit6, x_FooBazLit6 @@ -770,10 +751,9 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 7", + assertTrue("RDFa: 7", !result.Second && eq(result.First, new Statement[] { x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 @@ -784,28 +764,25 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_FooBarLit = new Statement(foo, bar, lit, null); Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 8", + assertTrue("RDFa: 8", result.Second && eq(result.First, new Statement[] { x_FooBarLit })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 9", + assertTrue("RDFa: 9", result.Second && eq(result.First, new Statement[] { x_FooBarLit })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 10", + assertTrue("RDFa: 10", result.Second && eq(result.First, new Statement[] { x_FooBarLittype @@ -813,10 +790,9 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_FooBarLit11 = new Statement(foo, bar, mkLit("11", bar), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 11", + assertTrue("RDFa: 11", !result.Second && eq(result.First, new Statement[] { x_FooBarLit11 @@ -825,19 +801,17 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XURI xFile = URI.createNS(xContext, file, "/" + contentPath); Statement x_FileBarLit12 = new Statement(xFile, bar, mkLit("12"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 12", + assertTrue("RDFa: 12", !result.Second && eq(result.First, new Statement[] { x_FileBarLit12 })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 13", + assertTrue("RDFa: 13", result.Second && eq(result.First, new Statement[] { x_FooBarLit @@ -845,51 +819,45 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_FooLabelLit14 = new Statement(foo, rdfs_label, mkLit("14"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 14", + assertTrue("RDFa: 14", result.Second && eq(result.First, new Statement[] { - x_FooBarLit + /* x_FooLabelLit14 */ x_FooBarLit })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 15", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 15", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 16", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 16", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 17", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 17", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 18", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 18", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 19", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 19", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( + xPara = UnoRuntime.queryInterface( XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 20", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 20", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( + xPara = UnoRuntime.queryInterface( XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 21", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 21", eq(result.First, new Statement[] { } )); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); @@ -905,33 +873,35 @@ public class DocumentMetadataAccessTest extends ComplexTestCase { if (e instanceof WrappedTargetException) { - log.println("Cause:"); + System.out.println("Cause:"); Exception cause = (Exception) (((WrappedTargetException)e).TargetException); - log.println(cause.toString()); + System.out.println(cause.toString()); report2(cause); } else if (e instanceof WrappedTargetRuntimeException) { - log.println("Cause:"); + System.out.println("Cause:"); Exception cause = (Exception) (((WrappedTargetRuntimeException)e).TargetException); - log.println(cause.toString()); + System.out.println(cause.toString()); report2(cause); } } public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); + System.out.println("Exception occurred:"); + e.printStackTrace(); report2(e); - failed(); + fail(); } static void close(XComponent i_comp) { try { - XCloseable xClos = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, i_comp); - if (xClos != null) xClos.close(true); + XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp); + if (xClos != null) + { + xClos.close(true); + } } catch (Exception e) { } } @@ -960,14 +930,16 @@ public class DocumentMetadataAccessTest extends ComplexTestCase } public static String toS(XNode n) { - if (null == n) return "< null >"; + if (null == n) + { + return "< null >"; + } return n.getStringValue(); } static boolean isBlank(XNode i_node) { - XBlankNode blank = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, i_node); + XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node); return blank != null; } @@ -1000,7 +972,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase java.util.Collection c = new java.util.Vector(); while (i_Enum.hasMoreElements()) { Statement s = (Statement) i_Enum.nextElement(); -//log.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); +//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); c.add(s); } // return (Statement[]) c.toArray(); @@ -1035,11 +1007,17 @@ public class DocumentMetadataAccessTest extends ComplexTestCase { XNode[] left = (XNode[]) i_Left; XNode[] right = (XNode[]) i_Right; - if (left.length != right.length) throw new RuntimeException(); + if (left.length != right.length) + { + throw new RuntimeException(); + } for (int i = 0; i < left.length; ++i) { int eq = (left[i].getStringValue().compareTo( right[i].getStringValue())); - if (eq != 0) return eq; + if (eq != 0) + { + return eq; + } } return 0; } @@ -1078,23 +1056,23 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XURI lG = i_Left.Graph; XURI rG = i_Right.Graph; if (!eq(lG, rG)) { - log.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); + System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); return false; } if (!eq(i_Left.Subject, i_Right.Subject)) { - log.println("Subjects differ: " + + System.out.println("Subjects differ: " + i_Left.Subject.getStringValue() + " != " + i_Right.Subject.getStringValue()); return false; } if (!eq(i_Left.Predicate, i_Right.Predicate)) { - log.println("Predicates differ: " + + System.out.println("Predicates differ: " + i_Left.Predicate.getStringValue() + " != " + i_Right.Predicate.getStringValue()); return false; } if (!eq(i_Left.Object, i_Right.Object)) { - log.println("Objects differ: " + + System.out.println("Objects differ: " + i_Left.Object.getStringValue() + " != " + i_Right.Object.getStringValue()); return false; @@ -1105,7 +1083,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase static boolean eq(Statement[] i_Result, Statement[] i_Expected) { if (i_Result.length != i_Expected.length) { - log.println("eq: different lengths: " + i_Result.length + " " + + System.out.println("eq: different lengths: " + i_Result.length + " " + i_Expected.length); return false; } @@ -1113,8 +1091,13 @@ public class DocumentMetadataAccessTest extends ComplexTestCase java.util.Arrays.asList(i_Expected).toArray(); java.util.Arrays.sort(i_Result, new StmtComp()); java.util.Arrays.sort(expected, new StmtComp()); - for (int i = 0; i < expected.length; ++i) { - if (!eq(i_Result[i], expected[i])) return false; + for (int i = 0; i < expected.length; ++i) + { + // This is better for debug! + final Statement a = i_Result[i]; + final Statement b = expected[i]; + final boolean cond = eq(a, b); + if (!cond) return false; } return true; } @@ -1141,15 +1124,15 @@ public class DocumentMetadataAccessTest extends ComplexTestCase static boolean eq(XQuerySelectResult i_Result, String[] i_Vars, XNode[][] i_Bindings) throws Exception { - String[] vars = (String[]) i_Result.getBindingNames(); + String[] vars = i_Result.getBindingNames(); XEnumeration iter = (XEnumeration) i_Result; XNode[][] bindings = toSeqs(iter); if (vars.length != i_Vars.length) { - log.println("var lengths differ"); + System.out.println("var lengths differ"); return false; } if (bindings.length != i_Bindings.length) { - log.println("binding lengths differ: " + i_Bindings.length + + System.out.println("binding lengths differ: " + i_Bindings.length + " vs " + bindings.length ); return false; } @@ -1157,16 +1140,16 @@ public class DocumentMetadataAccessTest extends ComplexTestCase java.util.Arrays.sort(i_Bindings, new BindingComp()); for (int i = 0; i < i_Bindings.length; ++i) { if (i_Bindings[i].length != i_Vars.length) { - log.println("TEST ERROR!"); + System.out.println("TEST ERROR!"); throw new Exception(); } if (bindings[i].length != i_Vars.length) { - log.println("binding length and var length differ"); + System.out.println("binding length and var length differ"); return false; } for (int j = 0; j < i_Vars.length; ++j) { if (!eq(bindings[i][j], i_Bindings[i][j])) { - log.println("bindings differ: " + + System.out.println("bindings differ: " + toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); return false; } @@ -1174,7 +1157,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase } for (int i = 0; i < i_Vars.length; ++i) { if (!vars[i].equals(i_Vars[i])) { - log.println("variable names differ: " + + System.out.println("variable names differ: " + vars[i] + " != " + i_Vars[i]); return false; } @@ -1253,17 +1236,27 @@ public class DocumentMetadataAccessTest extends ComplexTestCase public String getLocalName() { return ""; } public StringPair getMetadataReference() - { return new StringPair(m_Stream, m_XmlId); } + { + return new StringPair(m_Stream, m_XmlId); + } public void setMetadataReference(StringPair i_Ref) throws IllegalArgumentException - { m_Stream = (String)i_Ref.First; m_XmlId = (String)i_Ref.Second; } + { + m_Stream = i_Ref.First; + m_XmlId = i_Ref.Second; + } public void ensureMetadataReference() - { m_Stream = "content.xml"; m_XmlId = "42"; } + { + m_Stream = "content.xml"; + m_XmlId = "42"; + } public String getImplementationName() { return null; } public String[] getSupportedServiceNames() { return null; } public boolean supportsService(String i_Svc) - { return i_Svc.equals("com.sun.star.text.Paragraph"); } + { + return i_Svc.equals("com.sun.star.text.Paragraph"); + } public XText getText() { return null; } public XTextRange getStart() { return null; } @@ -1271,5 +1264,29 @@ public class DocumentMetadataAccessTest extends ComplexTestCase public String getString() { return m_Text; } public void setString(String i_Str) { m_Text = i_Str; } } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentMetadataAccessTest"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/framework/DocumentPropertiesTest.java index ae7970227c75..20a0746c8322 100644 --- a/sfx2/qa/complex/DocumentMetaData.java +++ b/sfx2/qa/complex/framework/DocumentPropertiesTest.java @@ -27,14 +27,11 @@ package complex.framework; -import complexlib.ComplexTestCase; -import helper.StreamSimulator; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.Any; import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XSingleServiceFactory; + import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.lang.Locale; import com.sun.star.lang.EventObject; @@ -51,10 +48,16 @@ import com.sun.star.beans.NamedValue; import com.sun.star.beans.PropertyAttribute; import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.IllegalTypeException; -import com.sun.star.embed.XStorage; -import com.sun.star.io.XInputStream; + import com.sun.star.document.XDocumentProperties; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /** * Test case for the service com.sun.star.document.DocumentProperties. @@ -63,13 +66,13 @@ import com.sun.star.document.XDocumentProperties; * * @author mst */ -public class DocumentMetaData extends ComplexTestCase +public class DocumentPropertiesTest { - public String[] getTestMethodNames () { - return new String[] { "check", "cleanup" }; - } +// public String[] getTestMethodNames () { +// return new String[] { "check", "cleanup" }; +// } - public void cleanup() { + @After public void cleanup() { // nothing to do } @@ -95,19 +98,18 @@ public class DocumentMetaData extends ComplexTestCase } } - public void check() { + @Test public void check() { try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - XComponentContext xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + // TODO: Path to temp String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + temp); + System.out.println("tempdir: " + temp); PropertyValue[] noArgs = { }; PropertyValue mimetype = new PropertyValue(); @@ -120,61 +122,56 @@ public class DocumentMetaData extends ComplexTestCase cfile.Value = temp + "EMPTY.odt"; PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - log.println("Creating service DocumentProperties..."); + System.out.println("Creating service DocumentProperties..."); Object oDP = // xMSF.createInstanceWithContext( // "com.sun.star.document.DocumentProperties", xContext); xMSF.createInstance("com.sun.star.document.DocumentProperties"); - XDocumentProperties xDP = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - log.println("...done"); + System.out.println("...done"); - log.println("Checking initialize ..."); + System.out.println("Checking initialize ..."); - XDocumentProperties xDP2 = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, - xMSF.createInstance( - "com.sun.star.document.DocumentProperties")); - XInitialization xInit = (XInitialization) - UnoRuntime.queryInterface(XInitialization.class, xDP2); + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); xInit.initialize(new Object[] { }); - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing default-initialized meta data ..."); + System.out.println("Checking storing default-initialized meta data ..."); // xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); xDP2.storeToMedium("", mimeEmptyArgs); - log.println("...done"); + System.out.println("...done"); - log.println("Checking loading default-initialized meta data ..."); + System.out.println("Checking loading default-initialized meta data ..."); // xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); xDP2.loadFromMedium("", mimeEmptyArgs); - assure ("Author", "".equals(xDP2.getAuthor())); + assertTrue ("Author", "".equals(xDP2.getAuthor())); - log.println("...done"); + System.out.println("...done"); - log.println("(Not) Checking preservation of custom meta data ..."); + System.out.println("(Not) Checking preservation of custom meta data ..."); - xDP2.loadFromMedium(util.utils.getFullTestURL("CUSTOM.odt"), + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), noArgs); - assure ("Author", "".equals(xDP2.getAuthor())); + assertTrue ("Author", "".equals(xDP2.getAuthor())); xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); //FIXME: now what? comparing for binary equality seems useless // we could unzip the written file and grep for the custom stuff // but would that work on windows... - log.println("...done"); + System.out.println("...done"); - log.println("Checking loading from test document..."); + System.out.println("Checking loading from test document..."); - String file = util.utils.getFullTestURL("TEST.odt"); + String file = TestDocument.getUrl("TEST.odt"); xDP.loadFromMedium(file, noArgs); /* XInputStream xStream = new StreamSimulator("./testdocuments/TEST.odt", true, param); @@ -188,68 +185,68 @@ public class DocumentMetaData extends ComplexTestCase XStorage.class, oStor); xDP.loadFromStorage(xStor);*/ - log.println("...done"); + System.out.println("...done"); - log.println("Checking meta-data import..."); + System.out.println("Checking meta-data import..."); - assure ("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assure ("Generator", + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("Generator", "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" .equals(xDP.getGenerator())); - assure ("CreationDate", 2007 == xDP.getCreationDate().Year); - assure ("Title", "Urgent Memo".equals(xDP.getTitle())); - assure ("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); - assure ("Description", + assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); + assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); + assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); + assertTrue("Description", "Modern internal company memorandum in full-blocked style" .equals(xDP.getDescription())); -// assure ("Language", "".equals(xDP.getLanguage())); - assure ("ModifiedBy", +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assure ("ModificationDate", 10 == xDP.getModificationDate().Month); - assure ("PrintedBy", + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assure ("PrintDate", 29 == xDP.getPrintDate().Day); - assure ("TemplateName", + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", "Modern Memo".equals(xDP.getTemplateName())); - assure ("TemplateURL", + assertTrue("TemplateURL", xDP.getTemplateURL().endsWith("memmodern.ott")); - assure ("TemplateDate", 17 == xDP.getTemplateDate().Hours); - assure ("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); - assure ("AutoloadSecs", 0 == xDP.getAutoloadSecs()); - assure ("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); - assure ("EditingCycles", 3 == xDP.getEditingCycles()); - assure ("EditingDuration", 320 == xDP.getEditingDuration()); + assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); + assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); + assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); + assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); + assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); + assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); String[] kws = xDP.getKeywords(); - assure ("Keywords", fromArray(kws).containsAll( + assertTrue("Keywords", fromArray(kws).containsAll( fromArray(new Object[] { "Asien", "Memo", "Reis" }))); NamedValue[] ds = xDP.getDocumentStatistics(); /* for (int i = 0; i < ds.length; ++i) { - log.println("nv: " + ds[i].Name + " " + ds[i].Value); + System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); } NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - log.println("eq: " + nv1.equals(nv2)); // grrr, this is false... + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... */ - assure ("DocumentStatistics:WordCount", containsNV(ds, + assertTrue("DocumentStatistics:WordCount", containsNV(ds, new NamedValue("WordCount", new Integer(23)))); - assure ("DocumentStatistics:PageCount", containsNV(ds, + assertTrue("DocumentStatistics:PageCount", containsNV(ds, new NamedValue("PageCount", new Integer(1)))); XPropertyContainer udpc = xDP.getUserDefinedProperties(); XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, udpc); - assure ("UserDefined 1", "Dies ist ein wichtiger Hinweis" + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" .equals(udps.getPropertyValue("Hinweis"))); - assure ("UserDefined 2", ("Kann Spuren von N" + assertTrue("UserDefined 2", ("Kann Spuren von N" + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") + "ssen enthalten") .equals(udps.getPropertyValue("Warnung"))); - log.println("...done"); + System.out.println("...done"); - log.println("Checking meta-data updates..."); + System.out.println("Checking meta-data updates..."); String str; DateTime dt = new DateTime(); @@ -258,75 +255,75 @@ public class DocumentMetaData extends ComplexTestCase str = "me"; xDP.setAuthor(str); - assure ("setAuthor", str.equals(xDP.getAuthor())); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); str = "the computa"; xDP.setGenerator(str); - assure ("setGenerator", str.equals(xDP.getGenerator())); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); dt.Year = 2038; dt.Month = 1; dt.Day = 1; xDP.setCreationDate(dt); - assure ("setCreationDate", dt.Year == xDP.getCreationDate().Year); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); str = "El t'itulo"; xDP.setTitle(str); - assure ("setTitle", str.equals(xDP.getTitle())); + assertTrue("setTitle", str.equals(xDP.getTitle())); str = "Ein verkommenes Subjekt"; xDP.setSubject(str); - assure ("setSubject", str.equals(xDP.getSubject())); + assertTrue("setSubject", str.equals(xDP.getSubject())); str = "Este descripci'on no es importante"; xDP.setDescription(str); - assure ("setDescription", str.equals(xDP.getDescription())); + assertTrue("setDescription", str.equals(xDP.getDescription())); l.Language = "en"; l.Country = "GB"; xDP.setLanguage(l); Locale l2 = xDP.getLanguage(); - assure ("setLanguage Lang", l.Language.equals(l2.Language)); - assure ("setLanguage Cty", l.Country.equals(l2.Country)); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); str = "myself"; xDP.setModifiedBy(str); - assure ("setModifiedBy", str.equals(xDP.getModifiedBy())); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); dt.Year = 2042; xDP.setModificationDate(dt); - assure ("setModificationDate", + assertTrue("setModificationDate", dt.Year == xDP.getModificationDate().Year); str = "i didnt do it"; xDP.setPrintedBy(str); - assure ("setPrintedBy", str.equals(xDP.getPrintedBy())); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); dt.Year = 2024; xDP.setPrintDate(dt); - assure ("setPrintDate", dt.Year == xDP.getPrintDate().Year); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); str = "blah"; xDP.setTemplateName(str); - assure ("setTemplateName", str.equals(xDP.getTemplateName())); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); str = "gopher://some-hole-in-the-ground/"; xDP.setTemplateURL(str); - assure ("setTemplateURL", str.equals(xDP.getTemplateURL())); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); dt.Year = 2043; xDP.setTemplateDate(dt); - assure ("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); str = "http://nowhere/"; xDP.setAutoloadURL(str); - assure ("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); i = 3661; // this might not work (due to conversion via double...) xDP.setAutoloadSecs(i); -// log.println("set: " + i + " get: " + xDP.getAutoloadSecs()); - assure ("setAutoloadSecs", i == xDP.getAutoloadSecs()); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); str = "_blank"; xDP.setDefaultTarget(str); - assure ("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); i = 42; xDP.setEditingCycles((short) i); - assure ("setEditingCycles", i == xDP.getEditingCycles()); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); i = 84; xDP.setEditingDuration(i); - assure ("setEditingDuration", i == xDP.getEditingDuration()); + assertTrue("setEditingDuration", i == xDP.getEditingDuration()); str = ""; String[] kws2 = new String[] { "keywordly", "keywordlike", "keywordalicious" }; xDP.setKeywords(kws2); kws = xDP.getKeywords(); - assure ("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); NamedValue[] ds2 = new NamedValue[] { new NamedValue("SyllableCount", new Integer(9)), @@ -334,16 +331,16 @@ public class DocumentMetaData extends ComplexTestCase new NamedValue("SentenceCount", new Integer(7)) }; xDP.setDocumentStatistics(ds2); ds = xDP.getDocumentStatistics(); - assure ("setDocumentStatistics:SyllableCount", containsNV(ds, + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, new NamedValue("SyllableCount", new Integer(9)))); - assure ("setDocumentStatistics:FrameCount", containsNV(ds, + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, new NamedValue("FrameCount", new Integer(2)))); - assure ("setDocumentStatistics:SentenceCount", containsNV(ds, + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, new NamedValue("SentenceCount", new Integer(7)))); - log.println("...done"); + System.out.println("...done"); - log.println("Checking user-defined meta-data updates..."); + System.out.println("Checking user-defined meta-data updates..."); // actually, this tests the PropertyBag service // but maybe the DocumentProperties service will be implemented @@ -384,109 +381,108 @@ public class DocumentMetaData extends ComplexTestCase udpc.removeProperty("Info 1"); udpc.removeProperty("Removed"); } catch (UnknownPropertyException e) { - assure("removeProperty failed", false); + fail("removeProperty failed"); } try { udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, new String[] { "foo", "bar" }); - assure("inserting value of non-supported type did not fail", - false); + fail("inserting value of non-supported type did not fail"); } catch (IllegalTypeException e) { // ignore } - assure ("UserDefined bool", new Boolean(b).equals( + assertTrue("UserDefined bool", new Boolean(b).equals( udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) + assertTrue("UserDefined duration", eqDuration(dur, (Duration) udps.getPropertyValue("FrobDuration"))); - assure ("UserDefined time", eqTime(t, (Time) + assertTrue("UserDefined time", eqTime(t, (Time) udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) + assertTrue("UserDefined date", eqDate(date, (Date) udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( + assertTrue("UserDefined float", new Double(d).equals( udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( + assertTrue("UserDefined string", "bar".equals( udps.getPropertyValue("Foo"))); - assure ("UserDefined empty name", "eeeeek".equals( + assertTrue("UserDefined empty name", "eeeeek".equals( udps.getPropertyValue(""))); try { udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); + fail("UserDefined remove didn't"); } catch (UnknownPropertyException e) { // ok } - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing meta-data to file..."); + System.out.println("Checking storing meta-data to file..."); xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - log.println("...done"); + System.out.println("...done"); - log.println("Checking loading meta-data from stored file..."); + System.out.println("Checking loading meta-data from stored file..."); xDP.loadFromMedium(temp + "TEST.odt", noArgs); - log.println("...done"); + System.out.println("...done"); - log.println("Checking user-defined meta-data from stored file..."); + System.out.println("Checking user-defined meta-data from stored file..."); udpc = xDP.getUserDefinedProperties(); udps = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, udpc); - assure ("UserDefined bool", new Boolean(b).equals( + assertTrue("UserDefined bool", new Boolean(b).equals( udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) + assertTrue("UserDefined duration", eqDuration(dur, (Duration) udps.getPropertyValue("FrobDuration"))); // this is now a Duration! Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, t.Hours, t.Minutes, t.Seconds, (short)(10 * t.HundredthSeconds)); - assure ("UserDefined time", eqDuration(t_dur, (Duration) + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) + assertTrue("UserDefined date", eqDate(date, (Date) udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( + assertTrue("UserDefined float", new Double(d).equals( udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( + assertTrue("UserDefined string", "bar".equals( udps.getPropertyValue("Foo"))); try { udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); + fail("UserDefined remove didn't"); } catch (UnknownPropertyException e) { // ok } - log.println("...done"); + System.out.println("...done"); - log.println("Checking notification listener interface..."); + System.out.println("Checking notification listener interface..."); Listener listener = new Listener(); XModifyBroadcaster xMB = (XModifyBroadcaster) UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); xMB.addModifyListener(listener); xDP.setAuthor("not me"); - assure ("Listener Author", listener.reset()); + assertTrue("Listener Author", listener.reset()); udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Listener UserDefined Add", listener.reset()); + assertTrue("Listener UserDefined Add", listener.reset()); udps.setPropertyValue("Listener", "bar"); - assure ("Listener UserDefined Set", listener.reset()); + assertTrue("Listener UserDefined Set", listener.reset()); udpc.removeProperty("Listener"); - assure ("Listener UserDefined Remove", listener.reset()); + assertTrue("Listener UserDefined Remove", listener.reset()); xMB.removeModifyListener(listener); udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Removed Listener UserDefined Add", !listener.reset()); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); @@ -538,9 +534,32 @@ public class DocumentMetaData extends ComplexTestCase } public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); - failed(); + System.out.println("Exception occurred:"); + e.printStackTrace(); + fail(); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentPropertiesTest"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/configmgr/source/span.hxx b/sfx2/qa/complex/framework/TestDocument.java index 689618613700..8cc6ef7756b1 100644 --- a/configmgr/source/span.hxx +++ b/sfx2/qa/complex/framework/TestDocument.java @@ -25,40 +25,15 @@ * ************************************************************************/ -#ifndef INCLUDED_CONFIGMGR_SOURCE_SPAN_HXX -#define INCLUDED_CONFIGMGR_SOURCE_SPAN_HXX +package complex.framework; -#include "sal/config.h" +import java.io.File; +import org.openoffice.test.OfficeFileUrl; -#include "rtl/string.h" -#include "sal/types.h" - -namespace configmgr { - -struct Span { - char const * begin; - sal_Int32 length; - - inline Span(): begin(0), length(0) {} - // init length to avoid compiler warnings - - inline Span(char const * theBegin, sal_Int32 theLength): - begin(theBegin), length(theLength) {} - - inline void clear() throw() { begin = 0; } - - inline bool is() const { return begin != 0; } - - inline bool equals(Span const & text) const { - return rtl_str_compare_WithLength( - begin, length, text.begin, text.length) == 0; +final class TestDocument { + public static String getUrl(String name) { + return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); } - inline bool equals(char const * textBegin, sal_Int32 textLength) const { - return equals(Span(textBegin, textLength)); - } -}; - + private TestDocument() {} } - -#endif diff --git a/sfx2/qa/complex/DocHelper/WriterHelper.java b/sfx2/qa/complex/framework/WriterHelper.java index b65e8e915423..d3f19703bb9d 100644 --- a/sfx2/qa/complex/DocHelper/WriterHelper.java +++ b/sfx2/qa/complex/framework/WriterHelper.java @@ -73,19 +73,20 @@ public class WriterHelper { * @return if an error occurs the errormessage is returned and an empty String if not */ public String closeDoc(XTextDocument xTextDoc) { - XCloseable closer = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, xTextDoc); + XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); String err = ""; try { closer.close(true); } catch (com.sun.star.util.CloseVetoException e) { err = "couldn't close document " + e; + System.out.println(err); } return err; } + private XTextDocument xLocalDoc = null; /** a TextDocument is opened by pressing a button in a dialog given by uno-URL * @param url the uno-URL of the dialog to be opened * @param createButton the language dependend label of the button to be pressed @@ -95,9 +96,8 @@ public class WriterHelper { */ public XTextDocument openFromDialog(String url, String createButton, boolean destroyLocal) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - XComponent comp = (XComponent) UnoRuntime.queryInterface( - XComponent.class, xLocalDoc); + xLocalDoc = WriterTools.createTextDoc(m_xMSF); + XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); DialogThread diagThread = new DialogThread(comp, m_xMSF, url); diagThread.start(); shortWait(); @@ -107,8 +107,7 @@ public class WriterHelper { AccessibilityTools at = new AccessibilityTools(); Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface( - XWindow.class, atw); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = at.getAccessibleObject(xWindow); XAccessibleContext buttonContext = at.getAccessibleObjectForRole( @@ -116,9 +115,7 @@ public class WriterHelper { AccessibleRole.PUSH_BUTTON, createButton); - XAccessibleAction buttonAction = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - buttonContext); + XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); try { System.out.println("Name: " + @@ -133,16 +130,26 @@ public class WriterHelper { XDesktop xDesktop = getDesktop(); - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); if (destroyLocal) { closeDoc(xLocalDoc); + xLocalDoc = null; } return returnDoc; } + public void closeFromDialog() + { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + public void kill() + { + XDesktop xDesktop = getDesktop(); + xDesktop.terminate(); + } + public XTextDocument DocByAutopilot(XMultiServiceFactory msf, int[] indexes, boolean destroyLocal, @@ -156,8 +163,7 @@ public class WriterHelper { e.printStackTrace(); } - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); shortWait(); @@ -165,15 +171,13 @@ public class WriterHelper { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, - atw); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = at.getAccessibleObject(xWindow); XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); - XAccessibleSelection sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); + XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); for (int k = 0; k < indexes.length; k++) { try { @@ -181,8 +185,7 @@ public class WriterHelper { shortWait(); ARoot = ARoot.getAccessibleChild(indexes[k]) .getAccessibleContext(); - sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); + sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { } } @@ -191,17 +194,13 @@ public class WriterHelper { atw = tk.getActiveTopWindow(); - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); xRoot = at.getAccessibleObject(xWindow); //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, - bName)); + XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); try { action.doAccessibleAction(0); @@ -212,17 +211,13 @@ public class WriterHelper { atw = tk.getActiveTopWindow(); - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); xRoot = at.getAccessibleObject(xWindow); at.printAccessibleTree(new PrintWriter(System.out),xRoot); - action = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, - "Yes")); + action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); try { if (action != null) action.doAccessibleAction(0); @@ -233,9 +228,7 @@ public class WriterHelper { XDesktop xDesktop = getDesktop(); - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); if (destroyLocal) { closeDoc(xLocalDoc); @@ -269,8 +262,7 @@ public class WriterHelper { e.printStackTrace(); } - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); return tk; } @@ -288,8 +280,7 @@ public class WriterHelper { e.printStackTrace(); } - XDesktop xDesktop = (XDesktop) UnoRuntime.queryInterface( - XDesktop.class, desk); + XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); return xDesktop; } diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/framework/makefile.mk index b8bc897fccf7..325135b9133c 100644 --- a/sfx2/qa/complex/makefile.mk +++ b/sfx2/qa/complex/framework/makefile.mk @@ -25,37 +25,41 @@ # #************************************************************************* -PRJ = ..$/.. -TARGET = CheckGlobalEventBroadcaster_writer1 -PRJNAME = $(TARGET) -PACKAGE = complex$/framework +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_framework +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/framework +JAVATESTFILES = \ + DocumentPropertiesTest.java \ + DocumentMetadataAccessTest.java \ + CheckGlobalEventBroadcaster_writer1.java -#----- compile .java files ----------------------------------------- +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java \ + WriterHelper.java \ + DialogThread.java -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = CheckGlobalEventBroadcaster_writer1.java \ - DocumentMetaData.java \ - DocumentMetadataAccessTest.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -SUBDIRS = DocHelper -#----- make a jar from compiled files ------------------------------ +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -MAXLINELENGTH = 100000 +.END -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -# --- Targets ------------------------------------------------------ +ALLTAR : javatest -.INCLUDE : target.mk +.END -run: - +java -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -sce tests.sce -tdoc $(PWD)$/testdocuments diff --git a/sfx2/qa/complex/testdocuments/CUSTOM.odt b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt Binary files differindex 831a8f451dfd..831a8f451dfd 100644 --- a/sfx2/qa/complex/testdocuments/CUSTOM.odt +++ b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt diff --git a/sfx2/qa/complex/testdocuments/TEST.odt b/sfx2/qa/complex/framework/testdocuments/TEST.odt Binary files differindex 7c6f0b60f7b0..7c6f0b60f7b0 100644 --- a/sfx2/qa/complex/testdocuments/TEST.odt +++ b/sfx2/qa/complex/framework/testdocuments/TEST.odt diff --git a/sfx2/qa/complex/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt Binary files differindex d59739142df6..d59739142df6 100644 --- a/sfx2/qa/complex/testdocuments/TESTRDFA.odt +++ b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt diff --git a/sfx2/qa/complex/framework/testdocuments/empty.rdf b/sfx2/qa/complex/framework/testdocuments/empty.rdf new file mode 100644 index 000000000000..af62bab39dfa --- /dev/null +++ b/sfx2/qa/complex/framework/testdocuments/empty.rdf @@ -0,0 +1,13 @@ +<?xml version="1.0"?> + +<RDF + xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:s="http://www.w3.org/2000/01/rdf-schema#"> + +<!-- + This is the RDF Schema for the RDF data model as described in the + Resource Description Framework (RDF) Model and Syntax Specification + http://www.w3.org/TR/REC-rdf-syntax --> + +</RDF> diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java index 0136f8941df5..29fcaba8cb7a 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java +++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java @@ -26,44 +26,76 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import complexlib.ComplexTestCase; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + /* Document here */ -public class StandaloneDocumentInfoUnitTest extends ComplexTestCase { +public class StandaloneDocumentInfoUnitTest { private XMultiServiceFactory m_xMSF = null; - public String[] getTestMethodNames() { - return new String[] { - "ExecuteTest01"}; - } +// public String[] getTestMethodNames() { +// return new String[] { +// "ExecuteTest01"}; +// } - public String[] getTestObjectNames() { - return new String[] {"StandaloneDocumentInfoUnitTest"}; - } +// public String[] getTestObjectNames() { +// return new String[] {"StandaloneDocumentInfoUnitTest"}; +// } - public void before() { + @Before public void before() { try { - m_xMSF = (XMultiServiceFactory)param.getMSF(); + m_xMSF = getMSF(); } catch(Exception e) { - failed( "Failed to create service factory!" ); + fail( "Failed to create service factory!" ); } if( m_xMSF ==null ) { - failed( "Failed to create service factory!" ); + fail( "Failed to create service factory!" ); } } - public void after() { + @After public void after() { m_xMSF = null; } - public void ExecuteTest01() { - StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF, log); - assure( "Test01 failed!", aTest.test() ); + @Test public void ExecuteTest01() { + StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF); + assertTrue( "Test01 failed!", aTest.test() ); + } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/standalonedocumentinfo/Test01.java index 92c59d81e1c4..2f9a6266b4e2 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java +++ b/sfx2/qa/complex/standalonedocumentinfo/Test01.java @@ -26,14 +26,6 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import com.sun.star.beans.Property; -import com.sun.star.beans.XProperty; -import com.sun.star.beans.XPropertySetInfo; -import com.sun.star.io.IOException; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import complexlib.ComplexTestCase; - import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.document.XStandaloneDocumentInfo; import com.sun.star.io.XTempFile; @@ -43,19 +35,15 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.AnyConverter; -import com.sun.star.task.ErrorCodeIOException; -import java.util.Properties; -import java.util.Random; -import share.LogWriter; public class Test01 implements StandaloneDocumentInfoTest { XMultiServiceFactory m_xMSF = null; TestHelper m_aTestHelper = null; - public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { + public Test01 ( XMultiServiceFactory xMSF ) { m_xMSF = xMSF; - m_aTestHelper = new TestHelper( aLogWriter, "Test01: " ); + m_aTestHelper = new TestHelper( "Test01: " ); } public boolean test() { @@ -71,19 +59,16 @@ public class Test01 implements StandaloneDocumentInfoTest { m_aTestHelper.Message ( "==============================" ); //create a new temporary file Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" ); - XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface ( - XTempFile.class, oTempFile ); + XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile); //create a text document and initiallize it Object oTextDocument = m_xMSF.createInstance ( "com.sun.star.text.TextDocument" ); - XLoadable xLoadable = (XLoadable) UnoRuntime.queryInterface ( - XLoadable.class, oTextDocument ); + XLoadable xLoadable = UnoRuntime.queryInterface(XLoadable.class, oTextDocument); xLoadable.initNew(); m_aTestHelper.Message ( "New document initialized." ); //store the instance to the temporary file URL - XStorable xStorable = (XStorable) UnoRuntime.queryInterface ( - XStorable.class, oTextDocument ); + XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, oTextDocument); String sURL = AnyConverter.toString ( xTempFile.getUri () ); PropertyValue aProps[] = new PropertyValue[2]; aProps[0] = new PropertyValue(); @@ -101,15 +86,13 @@ public class Test01 implements StandaloneDocumentInfoTest { Object oStandaloneDocInfo = m_xMSF.createInstance ( "com.sun.star.document.StandaloneDocumentInfo" ); XStandaloneDocumentInfo xStandaloneDocInfo = - (XStandaloneDocumentInfo) UnoRuntime.queryInterface ( - XStandaloneDocumentInfo.class, oStandaloneDocInfo ); + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo); xStandaloneDocInfo.loadFromURL ( sURL ); m_aTestHelper.Message ( "StandaloneDocumentInfo loaded." ); //get the title from the object and check it XPropertySet xPropSet = - (XPropertySet)UnoRuntime.queryInterface ( - XPropertySet.class, oStandaloneDocInfo ); + UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo); String sTitle = xPropSet.getPropertyValue ( "Title" ).toString (); m_aTestHelper.Message ( "Get title: " + sTitle ); if ( sTitle.compareTo ( sDocTitle[i] ) != 0 ) { @@ -134,14 +117,12 @@ public class Test01 implements StandaloneDocumentInfoTest { Object oStandaloneDocInfo_ = m_xMSF.createInstance ( "com.sun.star.document.StandaloneDocumentInfo" ); XStandaloneDocumentInfo xStandaloneDocInfo_ = - (XStandaloneDocumentInfo)UnoRuntime.queryInterface ( - XStandaloneDocumentInfo.class, oStandaloneDocInfo_ ); + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo_); xStandaloneDocInfo_.loadFromURL ( sURL ); m_aTestHelper.Message ( "New StandaloneDocumentInfo loaded." ); //get the title and check it - XPropertySet xPropSet_ = (XPropertySet)UnoRuntime.queryInterface ( - XPropertySet.class, oStandaloneDocInfo_ ); + XPropertySet xPropSet_ = UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo_); String sTitle_ = xPropSet_.getPropertyValue ( "Title" ).toString (); m_aTestHelper.Message ( "Get new title: " + sTitle_ ); if ( sTitle_.compareTo ( sTitle ) != 0 ) { diff --git a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java index f319fe412227..f6d63e1b7793 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java +++ b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java @@ -26,23 +26,23 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import share.LogWriter; public class TestHelper { - LogWriter m_aLogWriter; + String m_sTestPrefix; - /** Creates a new instance of TestHelper */ - public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) { - m_aLogWriter = aLogWriter; + /** Creates a new instance of TestHelper + * @param sTestPrefix + */ + public TestHelper ( String sTestPrefix ) { m_sTestPrefix = sTestPrefix; } public void Error ( String sError ) { - m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError ); + System.out.println ( m_sTestPrefix + "Error: " + sError ); } public void Message ( String sMessage ) { - m_aLogWriter.println ( m_sTestPrefix + sMessage ); + System.out.println ( m_sTestPrefix + sMessage ); } } diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk index c65556aeb763..aade48dbd789 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk +++ b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk @@ -25,61 +25,32 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = StandaloneDocumentInfoUnitTest -PRJNAME = binfilter -PACKAGE = complex$/standalonedocumentinfo - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar - -JAVAFILES =\ - StandaloneDocumentInfoUnitTest.java\ - StandaloneDocumentInfoTest.java\ - Test01.java\ - TestHelper.java\ - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_standalonedocumentinfo -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/standalonedocumentinfo +JAVATESTFILES = \ + StandaloneDocumentInfoUnitTest.java -# start the runner application -CT_APP = org.openoffice.Runner +JAVAFILES = $(JAVATESTFILES) \ + StandaloneDocumentInfoTest.java \ + Test01.java \ + TestHelper.java -# --- Targets ------------------------------------------------------ +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END +.INCLUDE: settings.mk .INCLUDE: target.mk +.INCLUDE: installationtest.mk -RUN: run - -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) - - +ALLTAR : javatest +.END diff --git a/sfx2/qa/unoapi/sfx.sce b/sfx2/qa/unoapi/sfx.sce index 6176c0668731..ce72c463ee55 100644 --- a/sfx2/qa/unoapi/sfx.sce +++ b/sfx2/qa/unoapi/sfx.sce @@ -1,5 +1,5 @@ -o sfx.AppDispatchProvider --o sfx.DocumentTemplates +#i113306 -o sfx.DocumentTemplates -o sfx.FrameLoader -o sfx.SfxMacroLoader #i111283 -o sfx.StandaloneDocumentInfo diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 6f9d3b258745..b0aae115aa9b 100755..100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2124,166 +2124,6 @@ SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( - void* , - void* pRegistryKey ) -{ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) ) ; - - // register actual implementations and their services - ::rtl::OUString aImpl; - ::rtl::OUString aTempStr; - ::rtl::OUString aKeyStr; - Reference< XRegistryKey > xNewKey; - Reference< XRegistryKey > xLoaderKey; - - // PluginObject - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::PluginObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") ); - - #if 0 - // AppletObject - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::AppletObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") ); - #endif - - // IFrameObject - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::IFrameObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") ); - - // global app event broadcaster - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxGlobalEvents_Impl::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") ); - - // global app dispatcher - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxAppDispatchProvider::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.ProtocolHandler") ); - - // standalone document info - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxStandaloneDocumentInfoObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.StandaloneDocumentInfo") ); - - // frame loader - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxFrameLoader_Impl::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - Sequence < ::rtl::OUString > aServices = SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames(); - sal_Int32 nCount = aServices.getLength(); - for ( sal_Int16 i=0; i<nCount; i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - // macro loader - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxMacroLoader::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.ProtocolHandler") ); - - // - sfx document templates - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxDocTplService::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.DocumentTemplates") ); - - // quickstart wrapper service - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ShutdownIcon::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.office.Quickstart") ); - - // application script library container service - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxApplicationScriptLibraryContainer::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ApplicationScriptLibraryContainer") ); - - // application dialog library container service - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxApplicationDialogLibraryContainer::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ApplicationDialogLibraryContainer") ); - - // converter of fs folders to packages - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += OPackageStructureCreator::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - Sequence< ::rtl::OUString > rServices = OPackageStructureCreator::impl_getStaticSupportedServiceNames(); - for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) - xNewKey->createKey( rServices.getConstArray()[ind] ); - - // subfilter to parse a stream in OASIS format generated by the filter - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::OwnSubFilterService::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - rServices = ::sfx2::OwnSubFilterService::impl_getStaticSupportedServiceNames(); - for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) - xNewKey->createKey( rServices.getConstArray()[ind] ); - - // document meta data - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += comp_SfxDocumentMetaData::_getImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") ); - - return sal_True; -} - SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , void* pServiceManager , diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 14474dd2904d..f18e903eb6e4 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2380,12 +2380,5 @@ extern "C" void * SAL_CALL component_getFactory( return ::cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } - -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * serviceManager, void * registryKey) -{ - return ::cppu::component_writeInfoHelper(serviceManager, registryKey, - entries); -} #endif diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index bc765b95340c..031594c647fb 100755 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -60,6 +60,7 @@ #include <osl/file.hxx> #include <vcl/graph.hxx> #include <svtools/filter.hxx> +#include <svl/lngmisc.hxx> #include <sfx2/mnumgr.hxx> @@ -244,7 +245,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) //! item ids should start with values > 0, since 0 has special meaning const USHORT nId = i + 1; - String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) ); + String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) ); pThesSubMenu->InsertItem( nId, aItemText ); ::rtl::OUString aCmd( ::rtl::OUString::createFromAscii( ".uno:ThesaurusFromContext?WordReplace:string=" ) ); aCmd += aItemText; diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index de1137bd6a74..d82c0a6dbdf3 100755 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -61,39 +61,6 @@ SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem); //////////////////////////////////////////////////////////// -String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText ) -{ - // The strings returned by the thesaurus sometimes have some - // explanation text put in between '(' and ')' or a trailing '*'. - // These parts should not be put in the ReplaceEdit Text that may get - // inserted into the document. Thus we strip them from the text. - - String aText( rText ); - - xub_StrLen nPos = aText.Search( sal_Unicode('(') ); - while (STRING_NOTFOUND != nPos) - { - xub_StrLen nEnd = aText.Search( sal_Unicode(')'), nPos ); - if (STRING_NOTFOUND != nEnd) - aText.Erase( nPos, nEnd-nPos+1 ); - else - break; - nPos = aText.Search( sal_Unicode('(') ); - } - - nPos = aText.Search( sal_Unicode('*') ); - if (STRING_NOTFOUND != nPos) - aText.Erase( nPos ); - - // remove any possible remaining ' ' that may confuse the thesaurus - // when it gets called with the text - aText.EraseLeadingAndTrailingChars( sal_Unicode(' ') ); - - return aText; -} - -//////////////////////////////////////////////////////////// - /* Ctor; setzt Select-Handler am Menu und traegt Menu diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 14d7473cb7c0..0b86a534de52 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -46,10 +46,6 @@ namespace css = ::com::sun::star; //////////////////////////////////////////////////////////// -String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText ); - -//////////////////////////////////////////////////////////// - class SfxThesSubMenuControl : public SfxMenuControl { PopupMenu* pMenu; diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index 2d93e7692d86..f520e2097e7e 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -162,3 +162,11 @@ SHL3NOCHECK=TRUE .INCLUDE : target.mk + +ALLTAR : $(MISC)/sfx.component + +$(MISC)/sfx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sfx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sfx.component diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component new file mode 100644 index 000000000000..1c28afd4177f --- /dev/null +++ b/sfx2/util/sfx.component @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="SfxDocumentMetaData"> + <service name="com.sun.star.document.DocumentProperties"/> + </implementation> + <implementation name="com.sun.star.comp.desktop.QuickstartWrapper"> + <service name="com.sun.star.office.Quickstart"/> + </implementation> + <implementation name="com.sun.star.comp.document.OwnSubFilter"> + <service name="com.sun.star.comp.document.OwnSubFilter"/> + <service name="com.sun.star.document.OwnSubFilter"/> + </implementation> + <implementation name="com.sun.star.comp.embed.PackageStructureCreator"> + <service name="com.sun.star.comp.embed.PackageStructureCreator"/> + <service name="com.sun.star.embed.PackageStructureCreator"/> + </implementation> + <implementation name="com.sun.star.comp.office.FrameLoader"> + <service name="com.sun.star.frame.SynchronousFrameLoader"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.AppDispatchProvider"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.ApplicationDialogLibraryContainer"> + <service name="com.sun.star.script.ApplicationDialogLibraryContainer"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.ApplicationScriptLibraryContainer"> + <service name="com.sun.star.script.ApplicationScriptLibraryContainer"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.DocumentTemplates"> + <service name="com.sun.star.frame.DocumentTemplates"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.GlobalEventBroadcaster"> + <service name="com.sun.star.frame.GlobalEventBroadcaster"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.IFrameObject"> + <service name="com.sun.star.frame.SpecialEmbeddedObject"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.PluginObject"> + <service name="com.sun.star.frame.SpecialEmbeddedObject"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.SfxMacroLoader"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.sfx2.StandaloneDocumentInfo"> + <service name="com.sun.star.document.StandaloneDocumentInfo"/> + </implementation> +</component> diff --git a/shell/prj/d.lst b/shell/prj/d.lst index ea8be0bbaf04..3ef183dbdf42 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -10,6 +10,7 @@ ..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin%_EXT%\propertyhdl_x64.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\misc\cmdmail.component %_DEST%\xml%_EXT%\cmdmail.component ..\%__SRC%\bin\open-url %_DEST%\bin%_EXT%\open-url ..\%__SRC%\bin\cde-open-url %_DEST%\bin%_EXT%\cde-open-url @@ -21,5 +22,13 @@ ..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml -..\%__SRC%\misc\*-ucd.txt %_DEST%\bin%_EXT%\*-ucd.txt +..\%__SRC%\misc\desktopbe1.component %_DEST%\xml%_EXT%\desktopbe1.component +..\%__SRC%\misc\gconfbe1.component %_DEST%\xml%_EXT%\gconfbe1.component +..\%__SRC%\misc\kde4be1.component %_DEST%\xml%_EXT%\kde4be1.component +..\%__SRC%\misc\kdebe1.component %_DEST%\xml%_EXT%\kdebe1.component ..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h +..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component +..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component +..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component +..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component +..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 21371755b479..e628e8e1b830 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -282,9 +282,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/desktopbe/desktopbe1-ucd.txt b/shell/source/backends/desktopbe/desktopbe1-ucd.txt deleted file mode 100644 index fd874a82ead5..000000000000 --- a/shell/source/backends/desktopbe/desktopbe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.DesktopBackend -ComponentName=desktopbe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.DesktopBackend diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component new file mode 100644 index 000000000000..9ef142107698 --- /dev/null +++ b/shell/source/backends/desktopbe/desktopbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.DesktopBackend"> + <service name="com.sun.star.configuration.backend.DesktopBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk index 29260821d551..66ad8cf99e1e 100644 --- a/shell/source/backends/desktopbe/makefile.mk +++ b/shell/source/backends/desktopbe/makefile.mk @@ -48,6 +48,12 @@ SHL1TARGET = desktopbe1.uno SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) -UNIXTEXT = $(MISC)/desktopbe1-ucd.txt - .INCLUDE: target.mk + +ALLTAR : $(MISC)/desktopbe1.component + +$(MISC)/desktopbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + desktopbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt desktopbe1.component diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 122d1cad02b3..fb3fdb114305 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -231,9 +231,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/gconfbe/gconfbe1-ucd.txt b/shell/source/backends/gconfbe/gconfbe1-ucd.txt deleted file mode 100644 index daa5444ff0c5..000000000000 --- a/shell/source/backends/gconfbe/gconfbe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.GconfBackend -ComponentName=gconfbe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.GconfBackend diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component new file mode 100644 index 000000000000..7638e05b544a --- /dev/null +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.GconfBackend"> + <service name="com.sun.star.configuration.backend.GconfBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk index a8d9b23aa9df..9e77a0867ab0 100644 --- a/shell/source/backends/gconfbe/makefile.mk +++ b/shell/source/backends/gconfbe/makefile.mk @@ -39,7 +39,6 @@ VISIBILITY_HIDDEN=TRUE # no "lib" prefix DLLPRE = -UCDSRCEXT = txt .IF "$(ENABLE_LOCKDOWN)" == "YES" CFLAGS+=-DENABLE_LOCKDOWN @@ -89,8 +88,10 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk -ALLTAR : $(MISC)/$(TARGET)1-ucd.txt - -$(MISC)/$(TARGET)1-ucd.txt : $$(@:b).$(UCDSRCEXT) - cat $< | tr -d "\015" > $@ +ALLTAR : $(MISC)/gconfbe1.component +$(MISC)/gconfbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + gconfbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt gconfbe1.component diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 44ddb49bd025..2bf3d144a5dc 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -250,9 +250,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/kde4be/kde4be1-ucd.txt b/shell/source/backends/kde4be/kde4be1-ucd.txt deleted file mode 100644 index 9671199b26e3..000000000000 --- a/shell/source/backends/kde4be/kde4be1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.KDE4Backend -ComponentName=kde4be1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.KDE4Backend diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component new file mode 100644 index 000000000000..8ea7ae121088 --- /dev/null +++ b/shell/source/backends/kde4be/kde4be1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend"> + <service name="com.sun.star.configuration.backend.KDE4Backend"/> + </implementation> +</component> diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk index 1f9093a95aee..477e47ca6100 100644 --- a/shell/source/backends/kde4be/makefile.mk +++ b/shell/source/backends/kde4be/makefile.mk @@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE CFLAGSCXX+=-Wno-shadow .ENDIF -UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt - # no "lib" prefix DLLPRE = @@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets --- .INCLUDE : target.mk + +ALLTAR : $(MISC)/kde4be1.component + +$(MISC)/kde4be1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kde4be1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kde4be1.component diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 53a00cf35987..ad38a6cfc854 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -250,9 +250,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/kdebe/kdebe1-ucd.txt b/shell/source/backends/kdebe/kdebe1-ucd.txt deleted file mode 100644 index adf7e17431f8..000000000000 --- a/shell/source/backends/kdebe/kdebe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.KDEBackend -ComponentName=kdebe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.KDEBackend diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component new file mode 100644 index 000000000000..393fbc80d538 --- /dev/null +++ b/shell/source/backends/kdebe/kdebe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.KDEBackend"> + <service name="com.sun.star.configuration.backend.KDEBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index 31bf77b47b54..b1b12ad3c6f3 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE CFLAGSCXX+=-Wno-shadow .ENDIF -UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt - # no "lib" prefix DLLPRE = @@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets --- .INCLUDE : target.mk + +ALLTAR : $(MISC)/kdebe1.component + +$(MISC)/kdebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kdebe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kdebe1.component diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component new file mode 100644 index 000000000000..7236a6198281 --- /dev/null +++ b/shell/source/backends/localebe/localebe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.LocaleBackend"> + <service name="com.sun.star.configuration.backend.LocaleBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 576501e4da9f..0ec9c0665125 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -72,13 +72,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk index bd12bcdb28ce..1efe3ed5e498 100644 --- a/shell/source/backends/localebe/makefile.mk +++ b/shell/source/backends/localebe/makefile.mk @@ -70,3 +70,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/localebe1.component + +$(MISC)/localebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + localebe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt localebe1.component diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component new file mode 100644 index 000000000000..10bac2e2b6a0 --- /dev/null +++ b/shell/source/backends/macbe/macbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend"> + <service name="com.sun.star.configuration.backend.MacOSXBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 18cf2806c16b..ab49bbb779f3 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -73,13 +73,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk index c3a58ec9f5c6..dd20834b2635 100644 --- a/shell/source/backends/macbe/makefile.mk +++ b/shell/source/backends/macbe/makefile.mk @@ -76,3 +76,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk .ENDIF # "$(OS)" != "MACOSX" + +ALLTAR : $(MISC)/macbe1.component + +$(MISC)/macbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + macbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt macbe1.component diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk index 9f79fa706fbf..7d8a6be14b21 100644 --- a/shell/source/backends/wininetbe/makefile.mk +++ b/shell/source/backends/wininetbe/makefile.mk @@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/wininetbe1.component + +$(MISC)/wininetbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + wininetbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt wininetbe1.component diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component new file mode 100644 index 000000000000..d8930280fb2a --- /dev/null +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.WinInetBackend"> + <service name="com.sun.star.configuration.backend.WinInetBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 862600009e30..ed6cdceb4a3e 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -73,13 +73,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component new file mode 100644 index 000000000000..7e56741d16c1 --- /dev/null +++ b/shell/source/cmdmail/cmdmail.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.system.SimpleCommandMail"> + <service name="com.sun.star.system.SimpleCommandMail"/> + </implementation> +</component> diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index aacef87396c4..740f87cd76f1 100755 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -54,7 +54,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail" #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" -#define COMP_REGKEY_NAME "/com.sun.star.comp.system.SimpleCommandMail/UNO/SERVICES/com.sun.star.system.SimpleCommandMail" //----------------------------------------------------------------------- // @@ -85,29 +84,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME ) ) ); - return sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - } - } - - return sal_False; -} - //---------------------------------------------------------------------- // component_getFactory //---------------------------------------------------------------------- diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp index 028ac4175990..f0e1c69934bc 100644 --- a/shell/source/cmdmail/exports.dxp +++ b/shell/source/cmdmail/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk index 5781afe8f5dd..e4d5ec48b925 100644 --- a/shell/source/cmdmail/makefile.mk +++ b/shell/source/cmdmail/makefile.mk @@ -62,3 +62,10 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/cmdmail.component + +$(MISC)/cmdmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + cmdmail.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt cmdmail.component diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk index 4bf77436f668..1a26d377b142 100644 --- a/shell/source/unix/exec/makefile.mk +++ b/shell/source/unix/exec/makefile.mk @@ -88,3 +88,11 @@ run_test : $(BIN)$/$(TESTAPP1).sh $(BIN)$/$(TESTAPP1).sh : $$(@:f) $(COPY) $< $@ -chmod +x $@ + +ALLTAR : $(MISC)/syssh.component + +$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + syssh.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index da5e5613f955..d1eff582ea59 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -83,29 +83,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// component_writeInfo -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_REGKEY_NAME ) ) ); - return sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - } - } - - return sal_False; -} - //---------------------------------------------------------------------- // component_getFactory //---------------------------------------------------------------------- diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component new file mode 100644 index 000000000000..030240dff3bf --- /dev/null +++ b/shell/source/unix/exec/syssh.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.system.SystemShellExecute"> + <service name="com.sun.star.system.SystemShellExecute"/> + </implementation> +</component> diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index a542d046fc59..727cfe269f07 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -85,32 +85,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( - OUString::createFromAscii( SYSSHEXEC_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp index 028ac4175990..f0e1c69934bc 100644 --- a/shell/source/win32/exports.dxp +++ b/shell/source/win32/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk index 9a9564ed76ca..7a01eefed89e 100644 --- a/shell/source/win32/makefile.mk +++ b/shell/source/win32/makefile.mk @@ -67,3 +67,11 @@ DEF1EXPORTFILE= exports.dxp INCLUDE!:=$(subst,/stl, $(INCLUDE)) .EXPORT : INCLUDE + +ALLTAR : $(MISC)/syssh.component + +$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + syssh.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp index 028ac4175990..f0e1c69934bc 100644 --- a/shell/source/win32/simplemail/exports.dxp +++ b/shell/source/win32/simplemail/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk index 84a209e4c072..abd35e408e2d 100644 --- a/shell/source/win32/simplemail/makefile.mk +++ b/shell/source/win32/simplemail/makefile.mk @@ -77,3 +77,11 @@ APP1DEF=$(MISC)$/$(APP1TARGET).def .INCLUDE : target.mk + +ALLTAR : $(MISC)/smplmail.component + +$(MISC)/smplmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + smplmail.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt smplmail.component diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component new file mode 100644 index 000000000000..59246c6d1551 --- /dev/null +++ b/shell/source/win32/simplemail/smplmail.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.system.SimpleSystemMail"> + <service name="com.sun.star.system.SimpleSystemMail"/> + </implementation> +</component> diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index e65d93a95fca..9970baa28122 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -85,32 +85,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( - OUString::createFromAscii( COMP_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component new file mode 100644 index 000000000000..1e783f5221ae --- /dev/null +++ b/shell/source/win32/syssh.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.system.SystemShellExecute"> + <service name="com.sun.star.system.SystemShellExecute"/> + </implementation> +</component> diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 2403c04c43a0..f8b71ea69440 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -552,3 +552,6 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table ..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* +..\%__SRC%\misc\svx.component %_DEST%\xml%_EXT%\svx.component +..\%__SRC%\misc\svxcore.component %_DEST%\xml%_EXT%\svxcore.component +..\%__SRC%\misc\textconversiondlgs.component %_DEST%\xml%_EXT%\textconversiondlgs.component diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl index 89369160bb45..b26db6b7f99e 100644 --- a/svx/qa/unoapi/knownissues.xcl +++ b/svx/qa/unoapi/knownissues.xcl @@ -85,3 +85,6 @@ svx.AccessiblePresentationOLEShape::com::sun::star::accessibility::XAccessibleCo ### i111169 ### svx.AccessiblePageShape::com::sun::star::accessibility::XAccessibleComponent + +### i114642 ### +svx.SvxUnoTextContent::com::sun::star::style::CharacterProperties diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 1f1d69781756..588623dbb39a 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -77,44 +77,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const Sequence< OUString >& rServices) -{ - Reference< XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - XRegistryKey *pKey = reinterpret_cast< XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionDirectionControl_getImplementationName(),::svx::ExtrusionDirectionControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionLightingControl_getImplementationName(),::svx::ExtrusionLightingControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionSurfaceControl_getImplementationName(),::svx::ExtrusionSurfaceControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkAlignmentControl_getImplementationName(),::svx::FontWorkAlignmentControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkCharacterSpacingControl_getImplementationName(),::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() ); - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index 47a75f668b2f..d59bc9bb1cba 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -243,7 +243,7 @@ namespace svx{ int ret = -1; rtl::OUString path1( RTL_CONSTASCII_USTRINGPARAM( - "$BRAND_BASE_DIR/program/crash_report.bin")); + "$BRAND_BASE_DIR/program/crashrep")); rtl::Bootstrap::expandMacros(path1); rtl::OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh index 98e2cc1c845a..a760b8e085d0 100644 --- a/svx/source/gengal/gengal.sh +++ b/svx/source/gengal/gengal.sh @@ -67,17 +67,17 @@ case $sd_platform in ;; Darwin) - DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH+:${DYLD_LIBRARY_PATH}} + DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} export DYLD_LIBRARY_PATH ;; HP-UX) - SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}} + SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}} export SHLIB_PATH ;; *) - LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} + LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} export LD_LIBRARY_PATH ;; esac diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index e21ea8fc6e4b..d80f871d8b3c 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -32,7 +32,7 @@ StringArray RID_ATTR_NAMES { - ItemList = + ItemList [ en-US ] = { < "Scale" ; SID_ATTR_ZOOM ; > ; < "Brush" ; SID_ATTR_BRUSH ; > ; diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk index b5013ca9d165..ec0cdca2620e 100644 --- a/svx/source/unodialogs/textconversiondlgs/makefile.mk +++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk @@ -88,3 +88,11 @@ $(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc $(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc $(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc + +ALLTAR : $(MISC)/textconversiondlgs.component + +$(MISC)/textconversiondlgs.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index e397ba9e5860..02d18cef9c45 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -53,13 +53,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, g_entries_unodialogs_chinesetranslation ); -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component b/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component new file mode 100644 index 000000000000..184743583645 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog"> + <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/> + </implementation> +</component> diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index bf7a848d71c6..dbe9c735e2bd 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -261,60 +261,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - registry::XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const uno::Sequence< OUString >& rServices) -{ - uno::Reference< registry::XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, SvxShapeCollection::getImplementationName_Static(), SvxShapeCollection::getSupportedServiceNames_Static() ); - writeInfo( pKey, SvxUnoColorTable::getImplementationName_Static(), SvxUnoColorTable::getSupportedServiceNames_Static() ); - writeInfo( pKey, EnhancedCustomShapeEngine_getImplementationName(), EnhancedCustomShapeEngine_getSupportedServiceNames() ); - writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() ); - writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() ); - writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() ); - - writeInfo( pKey, svx::FindTextToolbarController::getImplementationName_Static(), svx::FindTextToolbarController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::DownSearchToolboxController::getImplementationName_Static(), svx::DownSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::UpSearchToolboxController::getImplementationName_Static(), svx::UpSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::FindbarDispatcher::getImplementationName_Static(), svx::FindbarDispatcher::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); - - // XPrimitiveFactory2D - writeInfo( pKey, - drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), - drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() ); -// writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index ea875d8d9427..4be296d51219 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -644,8 +644,10 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() // #i68101# { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + // #i112587# + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, {0,0,0,0,0,0} - }; return aControlPropertyMap_Impl; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 1f2d4fd3145b..1613f5d652e0 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1804,6 +1804,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const { case OWN_ATTR_VALUE_FILLBITMAP: { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const Graphic& rGraphic = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic(); if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE) @@ -1822,6 +1823,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const aDestStrm.GetEndOfData()); rValue <<= aSeq; } + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); break; } @@ -1833,10 +1836,13 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const } else { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true); OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); aURL += OUString::createFromAscii( rGrafObj.GetUniqueID().GetBuffer() ); rValue <<= aURL; + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); } break; } @@ -1851,8 +1857,11 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const case OWN_ATTR_VALUE_GRAPHIC: { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); Reference< graphic::XGraphic > xGraphic( static_cast< SdrGrafObj* >( mpObj.get() )->GetGraphic().GetXGraphic() ); rValue <<= xGraphic; + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); break; } diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp index 227006cc4e9f..e8f2e0a94819 100644 --- a/svx/util/gal.dxp +++ b/svx/util/gal.dxp @@ -17,5 +17,4 @@ Gallery_InsertSdrObj Gallery_GetThemeNameFromId Gallery_BeginLocking Gallery_EndLocking -component_writeInfo component_getFactory diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 050decc8d4f5..18f52487e483 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -196,3 +196,17 @@ RESLIB1SRSFILES= $(SRSFILELIST) .INCLUDE : target.mk + +ALLTAR : $(MISC)/svx.component $(MISC)/svxcore.component + +$(MISC)/svx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svx.component + +$(MISC)/svxcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svxcore.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svxcore.component diff --git a/svx/util/svx.component b/svx/util/svx.component new file mode 100644 index 000000000000..5907d69fef50 --- /dev/null +++ b/svx/util/svx.component @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.Draw.GraphicExporter"> + <service name="com.sun.star.drawing.GraphicExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicExportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicImportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider"> + <service name="com.sun.star.gallery.GalleryThemeProvider"/> + </implementation> + <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"> + <service name="com.sun.star.graphic.PrimitiveFactory2D"/> + </implementation> + <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher"> + <service name="com.sun.star.comp.svx.FindbarDispatcher"/> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.svx.RecoveryUI"> + <service name="com.sun.star.dialog.RecoveryUI"/> + </implementation> + <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine"> + <service name="com.sun.star.drawing.CustomShapeEngine"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxShapeCollection"> + <service name="com.sun.star.drawing.ShapeCollection"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxUnoColorTable"> + <service name="com.sun.star.drawing.ColorTable"/> + </implementation> + <implementation name="com.sun.star.svx.DownSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FindTextToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FontHeightToolBoxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.UpSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/svx/util/svx.dxp +++ b/svx/util/svx.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component new file mode 100644 index 000000000000..2f829cb52a77 --- /dev/null +++ b/svx/util/svxcore.component @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionDirectionController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionLightingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/sysui/util/exports.dxp b/sysui/util/exports.dxp index 028ac4175990..f0e1c69934bc 100644 --- a/sysui/util/exports.dxp +++ b/sysui/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index dad79213047e..8d8c87f3ae4b 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -16,3 +16,7 @@ uc ucb\source\ucp\tdoc nmake - all uc_tdoc uc_inc NULL uc ucb\source\ucp\expand nmake - all uc_expand uc_inc NULL uc ucb\source\ucp\ext nmake - all uc_ext uc_inc NULL uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL + +uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL +# fails, please fix +# uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst index b02c8184a6e9..65a32e21fba3 100644 --- a/ucb/prj/d.lst +++ b/ucb/prj/d.lst @@ -31,5 +31,16 @@ ..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml ..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml%_EXT%\ucptdoc.xml -..\%__SRC%\misc\ucpgvfs-ucd.txt %_DEST%\bin%_EXT%\ucpgvfs-ucd.txt -..\%__SRC%\misc\ucpgio-ucd.txt %_DEST%\bin%_EXT%\ucpgio-ucd.txt +..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml%_EXT%\ucpgvfs.component +..\%__SRC%\misc\ucpgio.component %_DEST%\xml%_EXT%\ucpgio.component +..\%__SRC%\misc\cached1.component %_DEST%\xml%_EXT%\cached1.component +..\%__SRC%\misc\srtrs1.component %_DEST%\xml%_EXT%\srtrs1.component +..\%__SRC%\misc\ucb1.component %_DEST%\xml%_EXT%\ucb1.component +..\%__SRC%\misc\ucpdav1.component %_DEST%\xml%_EXT%\ucpdav1.component +..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml%_EXT%\ucpexpand1.component +..\%__SRC%\misc\ucpext.component %_DEST%\xml%_EXT%\ucpext.component +..\%__SRC%\misc\ucpfile1.component %_DEST%\xml%_EXT%\ucpfile1.component +..\%__SRC%\misc\ucpftp1.component %_DEST%\xml%_EXT%\ucpftp1.component +..\%__SRC%\misc\ucphier1.component %_DEST%\xml%_EXT%\ucphier1.component +..\%__SRC%\misc\ucppkg1.component %_DEST%\xml%_EXT%\ucppkg1.component +..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml%_EXT%\ucptdoc1.component diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java index a20a96829e0b..a039c0c14e87 100755 --- a/ucb/qa/complex/tdoc/CheckContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckContentProvider.java @@ -42,20 +42,15 @@ import com.sun.star.ucb.XContentIdentifier; import com.sun.star.ucb.XContentIdentifierFactory; import com.sun.star.ucb.XContentProvider; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; -import complex.tdoc.interfaces._XChild; -import complex.tdoc.interfaces._XCommandInfoChangeNotifier; -import complex.tdoc.interfaces._XComponent; -import complex.tdoc.interfaces._XServiceInfo; -import complex.tdoc.interfaces._XTypeProvider; -import complex.tdoc.interfaces._XCommandProcessor; -import complex.tdoc.interfaces._XContent; -import complex.tdoc.interfaces._XPropertiesChangeNotifier; -import complex.tdoc.interfaces._XPropertyContainer; -import complex.tdoc.interfaces._XPropertySetInfoChangeNotifier; -import lib.TestEnvironment; import util.WriterTools; -import util.utils; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /** * Check the TransientDocumentsContentProvider (TDOC). Three documents are @@ -66,7 +61,7 @@ import util.utils; * with an accept parameter (writer is initially opened). Otherwise loaded * documents are not found. */ -public class CheckContentProvider extends ComplexTestCase { +public class CheckContentProvider { private final String testDocuments[] = new String[]{"filter.sxw", "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; @@ -89,37 +84,38 @@ public class CheckContentProvider extends ComplexTestCase { * Important is, that the test of the element comes first, then the test of * its interfaces. **/ - public String[] getTestMethodNames() { - return new String[]{"checkTDOCRoot", - "checkTDOCRootInterfaces", - "checkTDOCDocument", - "checkTDOCDocumentInterfaces", - "checkTDOCFolder", - "checkTDOCFolderInterfaces", - "checkTDOCStream", - "checkTDOCStreamInterfaces", - }; - } +// public String[] getTestMethodNames() { +// return new String[]{"checkTDOCRoot", +// "checkTDOCRootInterfaces", +// "checkTDOCDocument", +// "checkTDOCDocumentInterfaces", +// "checkTDOCFolder", +// "checkTDOCFolderInterfaces", +// "checkTDOCStream", +// "checkTDOCStreamInterfaces", +// }; +// } /** * Open some documents before the test */ - public void before() { - xMSF = (XMultiServiceFactory)param.getMSF(); + @Before public void before() { + xMSF = getMSF(); xTextDoc = new XTextDocument[countDocs]; - log.println("Open some new documents."); + System.out.println("Open some new documents."); for (int i=0; i<countDocs; i++) { - String fileName = utils.getFullTestURL(testDocuments[i]); + String fileName = TestDocument.getUrl(testDocuments[i]); System.out.println("Doc " + i + ": " + fileName); xTextDoc[i] = WriterTools.loadTextDoc(xMSF, fileName); + assertNotNull("Can't load document " + fileName, xTextDoc[i]); } } /** * Close the documents */ - public void after() { - log.println("Close all documents."); + @After public void after() { + System.out.println("Close all documents."); for (int i=0; i<countDocs; i++) { xTextDoc[i].dispose(); } @@ -128,18 +124,16 @@ public class CheckContentProvider extends ComplexTestCase { /** * Check the tdcp root. */ - public void checkTDOCRoot() { + @Test public void checkTDOCRoot() { try { // create a content provider Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider"); XContentProvider xContentProvider = - (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o); + UnoRuntime.queryInterface(XContentProvider.class, o); // create the ucb XContentIdentifierFactory xContentIdentifierFactory = - (XContentIdentifierFactory)UnoRuntime.queryInterface( - XContentIdentifierFactory.class, xMSF.createInstance( - "com.sun.star.ucb.UniversalContentBroker")); + UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker")); // create a content identifier from the ucb for tdoc XContentIdentifier xContentIdentifier = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/"); @@ -147,7 +141,7 @@ public class CheckContentProvider extends ComplexTestCase { xContent = xContentProvider.queryContent(xContentIdentifier); String content = xContent.getContentType(); - log.println("#### Content root: " + content); + System.out.println("#### Content root: " + content); // try to get some documents: should be "countDocs" at least. XContentIdentifier[] xContentId = new XContentIdentifier[countDocs+5]; @@ -160,66 +154,68 @@ public class CheckContentProvider extends ComplexTestCase { int returnVal = xContentProvider.compareContentIds(xContentId[i], xContentIdentifier); String cont = null; if (xCont[i] != null) + { cont = xCont[i].getContentType(); - log.println("Document Content " + i + ": " + cont + " compare with root: " + returnVal); + } + System.out.println("Document Content " + i + ": " + cont + " compare with root: " + returnVal); xContentId[i] = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/" + i + "/content.xml"); // get content xCont[i] = xContentProvider.queryContent(xContentId[i]); cont = null; if (xCont[i] != null) + { cont = xCont[i].getContentType(); - log.println("\tContent.xml Content " + i + ": " + cont); + } + System.out.println("\tContent.xml Content " + i + ": " + cont); } util.dbg.printInterfaces(xContent); } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Unexpected Exception: " + e.getMessage()); + e.printStackTrace(); + fail("Unexpected Exception: " + e.getMessage()); } } /** * Check the interfaces of the root. */ - public void checkTDOCRootInterfaces() { + @Test public void checkTDOCRootInterfaces() { checkInterfaces(false); } /** * Check the tdcp document: document 3 is used. */ - public void checkTDOCDocument() { + @Test public void checkTDOCDocument() { try { xContent = null; Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider"); XContentProvider xContentProvider = - (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o); + UnoRuntime.queryInterface(XContentProvider.class, o); // create the ucb XContentIdentifierFactory xContentIdentifierFactory = - (XContentIdentifierFactory)UnoRuntime.queryInterface( - XContentIdentifierFactory.class, xMSF.createInstance( - "com.sun.star.ucb.UniversalContentBroker")); + UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker")); // create a content identifier from the ucb for tdoc XContentIdentifier xContentIdentifier = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/3"); // get content xContent = xContentProvider.queryContent(xContentIdentifier); - + // assertNotNull(xContent); String content = xContent.getContentType(); - log.println("#### Document root: " + content); + System.out.println("#### Document root: " + content); } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Unexpected Exception: " + e.getMessage()); + e.printStackTrace(); + fail("Unexpected Exception: " + e.getMessage()); } } /** * Check the interfaces on the document. */ - public void checkTDOCDocumentInterfaces() { + @Test public void checkTDOCDocumentInterfaces() { checkInterfaces(true); } @@ -227,17 +223,15 @@ public class CheckContentProvider extends ComplexTestCase { * Check a folder on document 2 (document 2 contains an embedded picture and * therefore contans a subfolder "Pictures" */ - public void checkTDOCFolder() { + @Test public void checkTDOCFolder() { try { xContent = null; Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider"); XContentProvider xContentProvider = - (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o); + UnoRuntime.queryInterface(XContentProvider.class, o); // create the ucb XContentIdentifierFactory xContentIdentifierFactory = - (XContentIdentifierFactory)UnoRuntime.queryInterface( - XContentIdentifierFactory.class, xMSF.createInstance( - "com.sun.star.ucb.UniversalContentBroker")); + UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker")); // create a content identifier from the ucb for tdoc XContentIdentifier xContentIdentifier = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/2/Pictures"); @@ -245,36 +239,34 @@ public class CheckContentProvider extends ComplexTestCase { xContent = xContentProvider.queryContent(xContentIdentifier); String content = xContent.getContentType(); - log.println("#### Folder type: " + content); + System.out.println("#### Folder type: " + content); } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Unexpected Exception: " + e.getMessage()); + e.printStackTrace(); + fail("Unexpected Exception: " + e.getMessage()); } } /** * Check the interfaces on the folder. */ - public void checkTDOCFolderInterfaces() { + @Test public void checkTDOCFolderInterfaces() { checkInterfaces(true); } /** * Open a stream to the embedded picture of document 1. */ - public void checkTDOCStream() { + @Test public void checkTDOCStream() { try { xContent = null; Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider"); XContentProvider xContentProvider = - (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o); + UnoRuntime.queryInterface(XContentProvider.class, o); // create the ucb XContentIdentifierFactory xContentIdentifierFactory = - (XContentIdentifierFactory)UnoRuntime.queryInterface( - XContentIdentifierFactory.class, xMSF.createInstance( - "com.sun.star.ucb.UniversalContentBroker")); + UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker")); // create a content identifier from the ucb for tdoc XContentIdentifier xContentIdentifier = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/1/Pictures/10000000000000640000004B9C743800.gif"); @@ -282,18 +274,18 @@ public class CheckContentProvider extends ComplexTestCase { xContent = xContentProvider.queryContent(xContentIdentifier); String content = xContent.getContentType(); - log.println("#### Folder type: " + content); + System.out.println("#### Folder type: " + content); } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Unexpected Exception: " + e.getMessage()); + e.printStackTrace(); + fail("Unexpected Exception: " + e.getMessage()); } } /** * Check the interfaces on the stream. */ - public void checkTDOCStreamInterfaces() { + @Test public void checkTDOCStreamInterfaces() { checkInterfaces(true); } @@ -319,80 +311,105 @@ public class CheckContentProvider extends ComplexTestCase { private void checkInterfaces(boolean hasParent) { // check the XTypeProvider interface _XTypeProvider xTypeProvider = new _XTypeProvider(); - xTypeProvider.oObj = (XTypeProvider)UnoRuntime.queryInterface(XTypeProvider.class, xContent); - xTypeProvider.log = log; - assure("getImplementationId()", xTypeProvider._getImplementationId()); - assure("getTypes()", xTypeProvider._getTypes()); + xTypeProvider.oObj = UnoRuntime.queryInterface(XTypeProvider.class, xContent); + // xTypeProvider.log = log; + assertNotNull("getImplementationId()", xTypeProvider._getImplementationId()); + assertNotNull("getTypes()", xTypeProvider._getTypes()); // check the XSewrviceInfo interface _XServiceInfo xServiceInfo = new _XServiceInfo(); - xServiceInfo.oObj = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, xContent); - xServiceInfo.log = log; - assure("getImplementationName()", xServiceInfo._getImplementationName()); - assure("getSupportedServiceNames()", xServiceInfo._getSupportedServiceNames()); - assure("supportsService()", xServiceInfo._supportsService()); + xServiceInfo.oObj = UnoRuntime.queryInterface(XServiceInfo.class, xContent); + // xServiceInfo.log = log; + assertNotNull("getImplementationName()", xServiceInfo._getImplementationName()); + assertNotNull("getSupportedServiceNames()", xServiceInfo._getSupportedServiceNames()); + assertNotNull("supportsService()", xServiceInfo._supportsService()); // check the XCommandProcessor interface _XCommandProcessor xCommandProcessor = new _XCommandProcessor(); - xCommandProcessor.oObj = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent); - xCommandProcessor.log = log; - xCommandProcessor.before((XMultiServiceFactory)param.getMSF()); - assure("createCommandIdentifier()", xCommandProcessor._createCommandIdentifier()); - assure("execute()", xCommandProcessor._execute()); - assure("abort()", xCommandProcessor._abort()); + xCommandProcessor.oObj = UnoRuntime.queryInterface(XCommandProcessor.class, xContent); + // xCommandProcessor.log = log; + xCommandProcessor.before(getMSF()); + assertNotNull("createCommandIdentifier()", xCommandProcessor._createCommandIdentifier()); + assertNotNull("execute()", xCommandProcessor._execute()); + assertNotNull("abort()", xCommandProcessor._abort()); // check the XChild interface _XChild xChild = new _XChild(); - xChild.oObj = (XChild)UnoRuntime.queryInterface(XChild.class, xContent); - xChild.log = log; + xChild.oObj = UnoRuntime.queryInterface(XChild.class, xContent); + // xChild.log = log; // hasParent dermines, if this content has a parent - assure("getParent()", xChild._getParent(hasParent)); + assertNotNull("getParent()", xChild._getParent(hasParent)); // parameter does dermine, if this funczion is supported: generally not supported with tdcp content - assure("setParent()", xChild._setParent(false)); + assertNotNull("setParent()", xChild._setParent(false)); // check the XPropertyChangeNotifier interface _XPropertiesChangeNotifier xPropChange = new _XPropertiesChangeNotifier(); - xPropChange.oObj = (XPropertiesChangeNotifier)UnoRuntime.queryInterface(XPropertiesChangeNotifier.class, xContent); - xPropChange.log = log; - assure("addPropertiesChangeListener()", xPropChange._addPropertiesChangeListener()); - assure("removePropertiesChangeListener()", xPropChange._removePropertiesChangeListener()); + xPropChange.oObj = UnoRuntime.queryInterface(XPropertiesChangeNotifier.class, xContent); + // xPropChange.log = log; + assertNotNull("addPropertiesChangeListener()", xPropChange._addPropertiesChangeListener()); + assertNotNull("removePropertiesChangeListener()", xPropChange._removePropertiesChangeListener()); // check the XPropertySetInfoChangeNotifier interface _XPropertySetInfoChangeNotifier xPropSetInfo = new _XPropertySetInfoChangeNotifier(); - xPropSetInfo.oObj = (XPropertySetInfoChangeNotifier)UnoRuntime.queryInterface(XPropertySetInfoChangeNotifier.class, xContent); - xPropSetInfo.log = log; - assure("addPropertiesChangeListener()", xPropSetInfo._addPropertiesChangeListener()); - assure("removePropertiesChangeListener()", xPropSetInfo._removePropertiesChangeListener()); + xPropSetInfo.oObj = UnoRuntime.queryInterface(XPropertySetInfoChangeNotifier.class, xContent); + // xPropSetInfo.log = log; + assertNotNull("addPropertiesChangeListener()", xPropSetInfo._addPropertiesChangeListener()); + assertNotNull("removePropertiesChangeListener()", xPropSetInfo._removePropertiesChangeListener()); // check the XCommandInfoChangeNotifier interface _XCommandInfoChangeNotifier xCommandChange = new _XCommandInfoChangeNotifier(); - xCommandChange.oObj = (XCommandInfoChangeNotifier)UnoRuntime.queryInterface(XCommandInfoChangeNotifier.class, xContent); - xCommandChange.log = log; - assure("addCommandInfoChangeListener()", xCommandChange._addCommandInfoChangeListener()); - assure("removeCommandInfoChangeListener()", xCommandChange._removeCommandInfoChangeListener()); + xCommandChange.oObj = UnoRuntime.queryInterface(XCommandInfoChangeNotifier.class, xContent); + // xCommandChange.log = log; + assertNotNull("addCommandInfoChangeListener()", xCommandChange._addCommandInfoChangeListener()); + assertNotNull("removeCommandInfoChangeListener()", xCommandChange._removeCommandInfoChangeListener()); // check the XContent interface _XContent xCont = new _XContent(); - xCont.oObj = (XContent)UnoRuntime.queryInterface(XContent.class, xContent); - xCont.log = log; - assure("addContentEventListener()", xCont._addContentEventListener()); - assure("getContentType()", xCont._getContentType()); - assure("getIdentifier()", xCont._getIdentifier()); - assure("removeContentEventListener()", xCont._removeContentEventListener()); + xCont.oObj = UnoRuntime.queryInterface(XContent.class, xContent); + // xCont.log = log; + assertNotNull("addContentEventListener()", xCont._addContentEventListener()); + assertNotNull("getContentType()", xCont._getContentType()); + assertNotNull("getIdentifier()", xCont._getIdentifier()); + assertNotNull("removeContentEventListener()", xCont._removeContentEventListener()); // check the XPropertyContainer interface _XPropertyContainer xPropCont = new _XPropertyContainer(); - xPropCont.oObj = (XPropertyContainer)UnoRuntime.queryInterface(XPropertyContainer.class, xContent); - xPropCont.log = log; - assure("addProperty()", xPropCont._addProperty()); - assure("removeProperty()", xPropCont._removeProperty()); + xPropCont.oObj = UnoRuntime.queryInterface(XPropertyContainer.class, xContent); + // xPropCont.log = log; + assertNotNull("addProperty()", xPropCont._addProperty()); + assertNotNull("removeProperty()", xPropCont._removeProperty()); // check the XComponent interface _XComponent xComponent = new _XComponent(); - xComponent.oObj = (XComponent)UnoRuntime.queryInterface(XComponent.class, xContent); - xComponent.log = log; - assure("addEventListener()", xComponent._addEventListener()); - assure("removeEventListener()", xComponent._removeEventListener()); + xComponent.oObj = UnoRuntime.queryInterface(XComponent.class, xContent); + // xComponent.log = log; + assertNotNull("addEventListener()", xComponent._addEventListener()); + assertNotNull("removeEventListener()", xComponent._removeEventListener()); // assure("dispose()", xComponent._dispose()); } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java index b492fd219119..ed121e92f9f1 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java @@ -30,28 +30,28 @@ import com.sun.star.beans.Property; import com.sun.star.beans.XPropertySetInfo; import com.sun.star.frame.XModel; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.sdbc.XResultSet; import com.sun.star.text.XTextDocument; import com.sun.star.ucb.Command; -import com.sun.star.ucb.OpenCommandArgument2; -import com.sun.star.ucb.OpenMode; import com.sun.star.ucb.XCommandProcessor; import com.sun.star.ucb.XContent; -import com.sun.star.ucb.XContentAccess; import com.sun.star.ucb.XContentIdentifier; import com.sun.star.ucb.XContentIdentifierFactory; import com.sun.star.ucb.XContentProvider; -import com.sun.star.ucb.XDynamicResultSet; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; import util.WriterTools; -import util.utils; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /** * */ -public class CheckTransientDocumentsContent extends ComplexTestCase{ +public class CheckTransientDocumentsContent { + // TODO: document doesn't exists private final String testDocuments[] = new String[]{"sForm.sxw"};//, "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; @@ -61,17 +61,18 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{ return new String[] {"checkTransientDocumentsContent"}; } - public void before() { - xMSF = (XMultiServiceFactory)param.getMSF(); + @Before public void before() { + xMSF = getMSF(); xTextDoc = new XTextDocument[countDocs]; - log.println("Open some documents."); + System.out.println("Open some documents."); for (int i=0; i<countDocs; i++) { - String fileName = utils.getFullTestURL(testDocuments[i]); + String fileName = TestDocument.getUrl(testDocuments[i]); xTextDoc[i] = WriterTools.loadTextDoc(xMSF, fileName); + assertNotNull("Can't load document " + fileName, xTextDoc[i]); } } - public void after() { - log.println("Close all documents."); + @After public void after() { + System.out.println("Close all documents."); for (int i=0; i<countDocs; i++) { xTextDoc[i].dispose(); } @@ -80,15 +81,13 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{ /** * Check the content of one document */ - public void checkTransientDocumentsContent() { + @Test public void checkTransientDocumentsContent() { try { // create the ucb XContentIdentifierFactory xContentIdentifierFactory = - (XContentIdentifierFactory)UnoRuntime.queryInterface( - XContentIdentifierFactory.class, xMSF.createInstance( - "com.sun.star.ucb.UniversalContentBroker")); + UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker")); XContentProvider xContentProvider = - (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, xContentIdentifierFactory); + UnoRuntime.queryInterface(XContentProvider.class, xContentIdentifierFactory); // create a content identifier from the ucb for tdoc XContentIdentifier xContentIdentifier = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/1"); @@ -96,7 +95,7 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{ XContent xContent = xContentProvider.queryContent(xContentIdentifier); // actual test: commands to get some properties - XCommandProcessor xCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent); + XCommandProcessor xCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xContent); // build up the command Command command = new Command(); command.Name = "getPropertySetInfo"; @@ -106,16 +105,16 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{ Object result = xCommandProcessor.execute(command, 0, null); // check the result - log.println("Result: "+ result.getClass().toString()); - XPropertySetInfo xPropertySetInfo = (XPropertySetInfo)UnoRuntime.queryInterface(XPropertySetInfo.class, result); + System.out.println("Result: "+ result.getClass().toString()); + XPropertySetInfo xPropertySetInfo = UnoRuntime.queryInterface(XPropertySetInfo.class, result); Property[] props = xPropertySetInfo.getProperties(); boolean res = false; for(int i=0; i<props.length; i++) { String propName = props[i].Name; res |= propName.equals("DocumentModel"); - log.println("Found property: " + propName + " type: " + props[i].Type.getTypeName()); + System.out.println("Found property: " + propName + " type: " + props[i].Type.getTypeName()); } - assure("Did not find property 'DocumentModel' in the Property array.", res); + assertNotNull("Did not find property 'DocumentModel' in the Property array.", res); // get on property command.Name = "getPropertyValues"; @@ -130,16 +129,38 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{ result = xCommandProcessor.execute(command, 0, null); // check the result - log.println("Result: "+ result.getClass().toString()); + System.out.println("Result: "+ result.getClass().toString()); - XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, result); - assure("Did not get property 'DocumentModel'.", xModel == null); + XModel xModel = UnoRuntime.queryInterface(XModel.class, result); + assertTrue("Did not get property 'DocumentModel'.", xModel == null); } catch (com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Could not create test objects."); + e.printStackTrace(); + fail("Could not create test objects."); } } + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + + } diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java index ddac0cbb2d47..d5aebc7fc3cd 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java @@ -41,15 +41,23 @@ import com.sun.star.ucb.XContentIdentifierFactory; import com.sun.star.ucb.XContentProvider; import com.sun.star.ucb.XDynamicResultSet; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; +// import complexlib.ComplexTestCase; import util.WriterTools; -import util.utils; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /** * */ -public class CheckTransientDocumentsContentProvider extends ComplexTestCase { - private final String testDocuments[] = new String[]{"sForm.sxw", "chinese.sxw", "Iterator.sxw"}; +public class CheckTransientDocumentsContentProvider { + // TODO: document doesn't exists + private final String testDocuments[] = new String[]{/*"sForm.sxw",*/ "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; private XTextDocument[] xTextDoc = null; @@ -58,17 +66,18 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase { return new String[]{"checkTransientDocumentsContentProvider"}; } - public void before() { - xMSF = (XMultiServiceFactory)param.getMSF(); + @Before public void before() { + xMSF = getMSF(); xTextDoc = new XTextDocument[countDocs]; - log.println("Open some documents."); + System.out.println("Open some documents."); for (int i=0; i<countDocs; i++) { - String fileName = utils.getFullTestURL(testDocuments[i]); + String fileName = TestDocument.getUrl(testDocuments[i]); xTextDoc[i] = WriterTools.loadTextDoc(xMSF, fileName); + assertNotNull("Can't load document " + fileName, xTextDoc[i]); } } - public void after() { - log.println("Close all documents."); + @After public void after() { + System.out.println("Close all documents."); for (int i=0; i<countDocs; i++) { xTextDoc[i].dispose(); } @@ -78,18 +87,16 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase { * Check the provider of document content: open some documents * and look if they are accessible. */ - public void checkTransientDocumentsContentProvider() { + @Test public void checkTransientDocumentsContentProvider() { try { // create a content provider Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider"); XContentProvider xContentProvider = - (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o); + UnoRuntime.queryInterface(XContentProvider.class, o); // create the ucb XContentIdentifierFactory xContentIdentifierFactory = - (XContentIdentifierFactory)UnoRuntime.queryInterface( - XContentIdentifierFactory.class, xMSF.createInstance( - "com.sun.star.ucb.UniversalContentBroker")); + UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker")); // create a content identifier from the ucb for tdoc XContentIdentifier xContentIdentifier = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/"); @@ -97,7 +104,7 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase { XContent xContent = xContentProvider.queryContent(xContentIdentifier); // actual test: execute an "open" command with the content - XCommandProcessor xCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent); + XCommandProcessor xCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xContent); // build up the command Command command = new Command(); OpenCommandArgument2 commandarg2 = new OpenCommandArgument2(); @@ -109,35 +116,59 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase { Object result = xCommandProcessor.execute(command, 0, null); // check the result - log.println("Result: "+ result.getClass().toString()); - XDynamicResultSet xDynamicResultSet = (XDynamicResultSet)UnoRuntime.queryInterface(XDynamicResultSet.class, result); + System.out.println("Result: "+ result.getClass().toString()); + XDynamicResultSet xDynamicResultSet = UnoRuntime.queryInterface(XDynamicResultSet.class, result); // check bug of wrong returned service name. - XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, xDynamicResultSet); + XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, xDynamicResultSet); String[] sNames = xServiceInfo.getSupportedServiceNames(); String serviceName = sNames[0]; if (sNames.length > 1) - failed("Implementation has been changed. Check this test!"); - assure("The service name '" + serviceName + "' is not valid.", !serviceName.equals("com.sun.star.ucb.DynamicContentResultSet"), true); + { + fail("Implementation has been changed. Check this test!"); + } + assertTrue("The service name '" + serviceName + "' is not valid.", !serviceName.equals("com.sun.star.ucb.DynamicContentResultSet")); XResultSet xResultSet = xDynamicResultSet.getStaticResultSet(); - XContentAccess xContentAccess = (XContentAccess)UnoRuntime.queryInterface(XContentAccess.class, xResultSet); + XContentAccess xContentAccess = UnoRuntime.queryInterface(XContentAccess.class, xResultSet); // iterate over the result: three docs were opened, we should have at least three content identifier strings int countContentIdentifiers = 0; while(xResultSet.next()) { countContentIdentifiers++; String identifier = xContentAccess.queryContentIdentifierString(); - log.println("Identifier of row " + xResultSet.getRow() + ": " + identifier); + System.out.println("Identifier of row " + xResultSet.getRow() + ": " + identifier); } // some feeble test: if the amount >2, we're ok. // 2do: check better - assure("Did only find " + countContentIdentifiers + " open documents." + + assertTrue("Did only find " + countContentIdentifiers + " open documents." + " Should have been at least 3.", countContentIdentifiers>2); } catch (com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Could not create test objects."); + e.printStackTrace(); + fail("Could not create test objects."); } } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java index 229f5d388697..30411458daee 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java @@ -34,49 +34,50 @@ import com.sun.star.embed.XStorage; import com.sun.star.frame.XModel; import com.sun.star.frame.XTransientDocumentsDocumentContentFactory; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XServiceInfo; import com.sun.star.sdbc.XResultSet; import com.sun.star.sdbc.XRow; import com.sun.star.text.XTextDocument; import com.sun.star.ucb.Command; import com.sun.star.ucb.ContentInfo; -import com.sun.star.ucb.InsertCommandArgument; import com.sun.star.ucb.OpenCommandArgument2; import com.sun.star.ucb.OpenMode; import com.sun.star.ucb.XCommandProcessor; import com.sun.star.ucb.XContent; -import com.sun.star.ucb.XContentAccess; -import com.sun.star.ucb.XContentIdentifier; -import com.sun.star.ucb.XContentIdentifierFactory; -import com.sun.star.ucb.XContentProvider; import com.sun.star.ucb.XDynamicResultSet; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; import util.WriterTools; import util.utils; - +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /** * */ -public class CheckTransientDocumentsDocumentContent extends ComplexTestCase { +public class CheckTransientDocumentsDocumentContent { + // TODO: document doesn't exists private final String testDocuments = "sForm.sxw"; private final String folderName = "TestFolder"; private XMultiServiceFactory xMSF = null; private XTextDocument xTextDoc = null; - public String[] getTestMethodNames() { - return new String[]{"checkTransientDocumentsDocumentContent"}; - } +// public String[] getTestMethodNames() { +// return new String[]{"checkTransientDocumentsDocumentContent"}; +// } - public void before() { - xMSF = (XMultiServiceFactory)param.getMSF(); - log.println("Open a document."); - String fileName = utils.getFullTestURL(testDocuments); + @Before public void before() { + xMSF = getMSF(); + System.out.println("Open a document."); + String fileName = TestDocument.getUrl(testDocuments); xTextDoc = WriterTools.loadTextDoc(xMSF, fileName); + assertNotNull(xTextDoc); } - public void after() { - log.println("Close all documents."); + @After public void after() { + System.out.println("Close all documents."); xTextDoc.dispose(); } @@ -84,30 +85,28 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase { * Check the provider of document content: open some documents * and look if they are accessible. */ - public void checkTransientDocumentsDocumentContent() { + @Test public void checkTransientDocumentsDocumentContent() { try { // create a content provider Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory"); XTransientDocumentsDocumentContentFactory xTransientDocumentsDocumentContentFactory = - (XTransientDocumentsDocumentContentFactory)UnoRuntime.queryInterface( - XTransientDocumentsDocumentContentFactory.class, o); + UnoRuntime.queryInterface(XTransientDocumentsDocumentContentFactory.class, o); // get the model from the opened document XModel xModel = xTextDoc.getCurrentController().getModel(); // a little additional check for 114733 - XDocumentSubStorageSupplier xDocumentSubStorageSupplier = (XDocumentSubStorageSupplier) - UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class, xModel); + XDocumentSubStorageSupplier xDocumentSubStorageSupplier = UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class, xModel); String[]names = xDocumentSubStorageSupplier.getDocumentSubStoragesNames(); for (int i=0; i<names.length; i++) { - log.println("SubStorage names " + i + ": " +names[i]); + System.out.println("SubStorage names " + i + ": " +names[i]); } XStorage xStorage = xDocumentSubStorageSupplier.getDocumentSubStorage(names[0], ElementModes.READWRITE); - assure("Could not get a storage from the XDocumentStorageSupplier.", xStorage != null); + assertTrue("Could not get a storage from the XDocumentStorageSupplier.", xStorage != null); // get content XContent xContent = xTransientDocumentsDocumentContentFactory.createDocumentContent(xModel); // actual test: execute some commands - XCommandProcessor xCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent); + XCommandProcessor xCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xContent); // create the command and arguments Command command = new Command(); @@ -123,19 +122,19 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase { command.Argument = cmargs2; Object result = xCommandProcessor.execute(command, 0, null); - XDynamicResultSet xDynamicResultSet = (XDynamicResultSet)UnoRuntime.queryInterface(XDynamicResultSet.class, result); + XDynamicResultSet xDynamicResultSet = UnoRuntime.queryInterface(XDynamicResultSet.class, result); XResultSet xResultSet = xDynamicResultSet.getStaticResultSet(); - XRow xRow = (XRow)UnoRuntime.queryInterface(XRow.class, xResultSet); + XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet); // create the new folder 'folderName': first, check if it's already there while(xResultSet.next()) { String existingFolderName = xRow.getString(1); - log.println("Found existing folder: '" + existingFolderName + "'"); + System.out.println("Found existing folder: '" + existingFolderName + "'"); if (folderName.equals(existingFolderName)) { - failed("Cannot create a new folder: folder already exists: adapt test or choose a different document."); + fail("Cannot create a new folder: folder already exists: adapt test or choose a different document."); } } // create a folder - log.println("Create new folder "+ folderName); + System.out.println("Create new folder "+ folderName); ContentInfo contentInfo = new ContentInfo(); contentInfo.Type = "application/vnd.sun.star.tdoc-folder"; @@ -143,10 +142,10 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase { command.Argument = contentInfo; result = xCommandProcessor.execute(command, 0, null); - XContent xNewFolder = (XContent)UnoRuntime.queryInterface(XContent.class, result); + XContent xNewFolder = UnoRuntime.queryInterface(XContent.class, result); - XCommandProcessor xFolderCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xNewFolder); - log.println("Got the new folder: " + utils.getImplName(xNewFolder)); + XCommandProcessor xFolderCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xNewFolder); + System.out.println("Got the new folder: " + utils.getImplName(xNewFolder)); // name the new folder PropertyValue[] titleProp = new PropertyValue[1]; @@ -170,10 +169,33 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase { xFolderCommandProcessor.execute(commitCommand, 0, null); */ } catch (com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); - failed("Could not create test objects."); + e.printStackTrace(); + fail("Could not create test objects."); } } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + + } diff --git a/ucb/qa/complex/tdoc/TestDocument.java b/ucb/qa/complex/tdoc/TestDocument.java new file mode 100644 index 000000000000..875b75ccb0d0 --- /dev/null +++ b/ucb/qa/complex/tdoc/TestDocument.java @@ -0,0 +1,39 @@ +/************************************************************************* +* +* 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. +* +************************************************************************/ + +package complex.tdoc; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +final class TestDocument { + public static String getUrl(String name) { + return OfficeFileUrl.getAbsolute(new File("test_documents", name)); + } + + private TestDocument() {} +} diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/_XChild.java index 351fc6f84aa1..4ed71e62008a 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XChild.java +++ b/ucb/qa/complex/tdoc/_XChild.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import lib.MultiMethodTest; import lib.Status; diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java index 9800c5c0a398..ab32873e9ffb 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.ucb.XCommandInfoChangeListener; import com.sun.star.ucb.XCommandInfoChangeNotifier; diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java index 2fc31a4bd586..92411d05456f 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.Property; import com.sun.star.beans.XPropertySetInfo; diff --git a/ucb/qa/complex/tdoc/interfaces/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java index 1716e51d1358..16d5c9bebeea 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XComponent.java +++ b/ucb/qa/complex/tdoc/_XComponent.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.container.XNameContainer; import lib.MultiMethodTest; diff --git a/ucb/qa/complex/tdoc/interfaces/_XContent.java b/ucb/qa/complex/tdoc/_XContent.java index 4c84ecc1d8df..820d2cef0fc7 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XContent.java +++ b/ucb/qa/complex/tdoc/_XContent.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.ucb.XContent; import com.sun.star.ucb.XContentEventListener; diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java index 790f295c7be5..88e080cd9ec2 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.XPropertiesChangeListener; import com.sun.star.beans.XPropertiesChangeNotifier; diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java b/ucb/qa/complex/tdoc/_XPropertyContainer.java index fd7ff94c8f8f..e425a703d403 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java +++ b/ucb/qa/complex/tdoc/_XPropertyContainer.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.XPropertyContainer; import share.LogWriter; diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java index ec1d7d64ada5..4671a0d21571 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.XPropertySetInfoChangeListener; import com.sun.star.beans.XPropertySetInfoChangeNotifier; diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java index 761cca87998a..9c2089f212f9 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java +++ b/ucb/qa/complex/tdoc/_XServiceInfo.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import lib.MultiMethodTest; diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java index aef931bdeef1..f8247e7016fe 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java +++ b/ucb/qa/complex/tdoc/_XTypeProvider.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import lib.MultiMethodTest; diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk index 3a57d1501ca4..5399383f19e6 100755 --- a/ucb/qa/complex/tdoc/interfaces/makefile.mk +++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk @@ -25,10 +25,10 @@ # #************************************************************************* -PRJ = ..$/..$/..$/.. +PRJ = ../../../.. TARGET = TransientDocument PRJNAME = $(TARGET) -PACKAGE = complex$/tdoc$/interfaces +PACKAGE = complex/tdoc/interfaces # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk index 175184de0f27..01f8ec0f76fa 100755 --- a/ucb/qa/complex/tdoc/makefile.mk +++ b/ucb/qa/complex/tdoc/makefile.mk @@ -25,62 +25,49 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = TransientDocument -PRJNAME = $(TARGET) -PACKAGE = complex.tdoc - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = CheckContentProvider.java \ - CheckTransientDocumentsContent.java \ - CheckTransientDocumentsContentProvider.java \ - CheckTransientDocumentsDocumentContent.java - -# CheckSimpleFileAccess.java \ -#----- make a jar from compiled files ------------------------------ +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -MAXLINELENGTH = 100000 +PRJ = ../../.. +PRJNAME = sc +TARGET = qa_complex_tdoc -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/tdoc -# --- Parameters for the test -------------------------------------- +JAVATESTFILES = \ + CheckContentProvider.java \ + CheckTransientDocumentsContent.java \ + CheckTransientDocumentsContentProvider.java \ + CheckTransientDocumentsDocumentContent.java -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand \ - "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java \ + _XChild.java \ + _XCommandInfoChangeNotifier.java \ + _XCommandProcessor.java \ + _XComponent.java \ + _XContent.java \ + _XPropertiesChangeNotifier.java \ + _XPropertyContainer.java \ + _XPropertySetInfoChangeNotifier.java \ + _XServiceInfo.java \ + _XTypeProvider.java -# test base is java complex -CT_TESTBASE = -TestBase java_complex +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# replace $/ with . in package name -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# start the runner application -CT_APP = org.openoffice.Runner +.END -# test document path -CT_TESTDOCS = -tdoc $(PWD)$/..$/test_documents - -# --- Targets ------------------------------------------------------ +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -run: ALLTAR - @echo . - @echo "The followig tests are available:" - @echo $(foreach,i,$(JAVAFILES) "dmake $(i:b) ") +ALLTAR : javatest -.INCLUDE : target.mk +.END -Check%: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_TESTDOCS) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).$@ diff --git a/ucb/qa/complex/test_documents/Iterator.sxw b/ucb/qa/complex/tdoc/test_documents/Iterator.sxw Binary files differindex 9a7f8961bb47..9a7f8961bb47 100644 --- a/ucb/qa/complex/test_documents/Iterator.sxw +++ b/ucb/qa/complex/tdoc/test_documents/Iterator.sxw diff --git a/ucb/qa/complex/test_documents/chinese.sxw b/ucb/qa/complex/tdoc/test_documents/chinese.sxw Binary files differindex 53b242a292c3..53b242a292c3 100644 --- a/ucb/qa/complex/test_documents/chinese.sxw +++ b/ucb/qa/complex/tdoc/test_documents/chinese.sxw diff --git a/ucb/qa/complex/test_documents/filter.sxw b/ucb/qa/complex/tdoc/test_documents/filter.sxw Binary files differindex e4b077c65f11..e4b077c65f11 100644 --- a/ucb/qa/complex/test_documents/filter.sxw +++ b/ucb/qa/complex/tdoc/test_documents/filter.sxw diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java index f7b1d2a8e918..445525927703 100755 --- a/ucb/qa/complex/ucb/UCB.java +++ b/ucb/qa/complex/ucb/UCB.java @@ -34,7 +34,6 @@ package complex.ucb; * Window>Preferences>Java>Code Generation>Code and Comments */ -import complexlib.ComplexTestCase; import java.util.List; import java.util.Vector; @@ -42,13 +41,22 @@ import com.sun.star.beans.Property; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.sdbc.XResultSet; import com.sun.star.sdbc.XRow; -import com.sun.star.uno.XComponentContext; +// import com.sun.star.uno.XComponentContext; import com.sun.star.ucb.*; -import com.sun.star.bridge.XUnoUrlResolver; +// import com.sun.star.bridge.XUnoUrlResolver; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XMultiComponentFactory; -import com.sun.star.beans.XPropertySet; +// import com.sun.star.uno.XComponentContext; +// import com.sun.star.lang.XMultiComponentFactory; +// import com.sun.star.beans.XPropertySet; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + /** * @author rpiterman * This class is used to copy the content of a folder to @@ -56,12 +64,12 @@ import com.sun.star.beans.XPropertySet; * There is an incosistency with argument order. * It should be always: dir,filename. */ -public class UCB extends ComplexTestCase { +public class UCB { private Object ucb; - public String[] getTestMethodNames() { - return new String[] {"checkWrongFtpConnection"}; - } +// public String[] getTestMethodNames() { +// return new String[] {"checkWrongFtpConnection"}; +// } public void init(XMultiServiceFactory xmsf) throws Exception { String[] keys = new String[2]; @@ -79,11 +87,13 @@ public class UCB extends ComplexTestCase { /** * target name can be "", in which case the name stays lige the source name - * @param sourceDir - * @param filename - * @param targetDir - * @param targetName - * @return + + * @param xContent + * @param aCommandName + * @param aArgument + * @return + * @throws com.sun.star.ucb.CommandAbortedException + * @throws com.sun.star.uno.Exception */ public Object executeCommand( @@ -92,9 +102,7 @@ public class UCB extends ComplexTestCase { Object aArgument) throws com.sun.star.ucb.CommandAbortedException, com.sun.star.uno.Exception { XCommandProcessor xCmdProcessor = - (XCommandProcessor) UnoRuntime.queryInterface( - XCommandProcessor.class, - xContent); + UnoRuntime.queryInterface(XCommandProcessor.class, xContent); Command aCommand = new Command(); aCommand.Name = aCommandName; aCommand.Handle = -1; // not available @@ -118,39 +126,44 @@ public class UCB extends ComplexTestCase { XDynamicResultSet xSet; xSet = - (XDynamicResultSet) UnoRuntime.queryInterface( - XDynamicResultSet.class, - executeCommand(xContent, "open", aArg)); + UnoRuntime.queryInterface(XDynamicResultSet.class, executeCommand(xContent, "open", aArg)); XResultSet xResultSet = xSet.getStaticResultSet(); List files = new Vector(); - if (xResultSet.first()) { + if (xResultSet.first()) + { // obtain XContentAccess interface for child content access and XRow for properties - XContentAccess xContentAccess = - (XContentAccess) UnoRuntime.queryInterface( - XContentAccess.class, - xResultSet); - XRow xRow = - (XRow) UnoRuntime.queryInterface(XRow.class, xResultSet); - do { + XContentAccess xContentAccess = UnoRuntime.queryInterface(XContentAccess.class, xResultSet); + XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet); + do + { // Obtain URL of child. String aId = xContentAccess.queryContentIdentifierString(); // First column: Title (column numbers are 1-based!) String aTitle = xRow.getString(1); - if (aTitle.length() == 0 && xRow.wasNull()); - //ignore + if (aTitle.length() == 0 && xRow.wasNull()) + { + //ignore + } else - files.add(aTitle); + { + files.add(aTitle); + } } while (xResultSet.next()); // next child } if (verifier != null) - for (int i = 0; i < files.size(); i++) - if (!verifier.verify(files.get(i))) - files.remove(i--); - + { + for (int i = 0; i < files.size(); i++) + { + if (!verifier.verify(files.get(i))) + { + files.remove(i--); + } + } + } return files; } @@ -165,45 +178,46 @@ public class UCB extends ComplexTestCase { pv[0].Handle = -1; Object row = executeCommand(content, "getPropertyValues", pv); - XRow xrow = (XRow) UnoRuntime.queryInterface(XRow.class, row); + XRow xrow = UnoRuntime.queryInterface(XRow.class, row); if (type.equals(String.class)) - return xrow.getString(1); + { + return xrow.getString(1); + } else if (type.equals(Boolean.class)) - return xrow.getBoolean(1) ? Boolean.TRUE : Boolean.FALSE; + { + return xrow.getBoolean(1) ? Boolean.TRUE : Boolean.FALSE; + } else if (type.equals(Integer.class)) - return new Integer(xrow.getInt(1)); + { + return new Integer(xrow.getInt(1)); + } else if (type.equals(Short.class)) - return new Short(xrow.getShort(1)); + { + return new Short(xrow.getShort(1)); + } else - return null; + { + return null; + } } - public Object getContent(String path) throws Exception { - XContentIdentifier id = - ( - (XContentIdentifierFactory) UnoRuntime.queryInterface( - XContentIdentifierFactory.class, - ucb)).createContentIdentifier( - path); - - return ( - (XContentProvider) UnoRuntime.queryInterface( - XContentProvider.class, - ucb)).queryContent( - id); + public Object getContent(String path) throws Exception + { + XContentIdentifier id = (UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb)).createContentIdentifier(path); + return (UnoRuntime.queryInterface(XContentProvider.class, ucb)).queryContent(id); } public static interface Verifier { public boolean verify(Object object); } - public void checkWrongFtpConnection() { + @Test public void checkWrongFtpConnection() { //localhost ;Lo-1.Germany.sun.com; 10.16.65.155 try { - XMultiServiceFactory xLocMSF = (XMultiServiceFactory)param.getMSF(); + XMultiServiceFactory xLocMSF = getMSF(); String acountUrl = "ftp://noname:nopasswd@nohost"; - log.println(acountUrl); + System.out.println(acountUrl); init(xLocMSF); Object content = getContent(acountUrl); @@ -211,22 +225,45 @@ public class UCB extends ComplexTestCase { aArg.Mode = OpenMode.ALL; // FOLDER, DOCUMENTS -> simple filter aArg.Priority = 32768; // Ignored by most implementations - log.println("now executing open"); + System.out.println("now executing open"); executeCommand(content, "open", aArg); - failed("Expected 'IllegalArgumentException' was not thrown."); + fail("Expected 'IllegalArgumentException' was not thrown."); } catch (com.sun.star.lang.IllegalArgumentException ex) { //TODO error message; - log.println("Correct exception thrown: " + ex.getClass().toString()); - } catch(com.sun.star.ucb.InteractiveNetworkResolveNameException ex) { - log.println("This Exception is correctly thrown when no Proxy in StarOffice is used."); - log.println("To reproduce the bug behaviour, use a Proxy and try again."); + System.out.println("Correct exception thrown: " + ex.getClass().toString()); + } catch(com.sun.star.ucb.InteractiveNetworkException ex) { + System.out.println("This Exception is correctly thrown when no Proxy in StarOffice is used."); + System.out.println("To reproduce the bug behaviour, use a Proxy and try again."); } catch (Exception ex) { - ex.printStackTrace((java.io.PrintWriter)log); + ex.printStackTrace(); String exceptionName = ex.toString(); - log.println("ExName: '"+exceptionName+"'"); - failed("Wrong exception thrown: " + exceptionName); + System.out.println("ExName: '"+exceptionName+"'"); + fail("Wrong exception thrown: " + exceptionName); } // System.exit(0); } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk index 4664bd3cfae7..4ac3928c9e5e 100755 --- a/ucb/qa/complex/ucb/makefile.mk +++ b/ucb/qa/complex/ucb/makefile.mk @@ -25,54 +25,38 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = UCB -PRJNAME = $(TARGET) -PACKAGE = complex$/ucb - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = UCB.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -#----- make a jar from compiled files ------------------------------ +PRJ = ../../.. +PRJNAME = UCB +TARGET = qa_complex_ucb -MAXLINELENGTH = 100000 +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/ucb +JAVATESTFILES = \ + UCB.java -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +JAVAFILES = $(JAVATESTFILES) -# --- Parameters for the test -------------------------------------- +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y +.END -# test base is java complex -CT_TESTBASE = -TestBase java_complex +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +ALLTAR : javatest -# start the runner application -CT_APP = org.openoffice.Runner +.END -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk -RUN: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) -run: RUN diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component new file mode 100644 index 000000000000..aa19e54b5da3 --- /dev/null +++ b/ucb/source/cacher/cached1.component @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.CachedContentResultSetFactory"> + <service name="com.sun.star.ucb.CachedContentResultSetFactory"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.CachedContentResultSetStubFactory"> + <service name="com.sun.star.ucb.CachedContentResultSetStubFactory"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.CachedDynamicResultSetFactory"> + <service name="com.sun.star.ucb.CachedDynamicResultSetFactory"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory"> + <service name="com.sun.star.ucb.CachedDynamicResultSetStubFactory"/> + </implementation> +</component> diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 3aa0f1de5357..f429286cfdee 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -41,45 +41,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { @@ -87,44 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // CachedContentResultSetFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedContentResultSetFactory::getImplementationName_Static(), - CachedContentResultSetFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // CachedContentResultSetStubFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedContentResultSetStubFactory::getImplementationName_Static(), - CachedContentResultSetStubFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // CachedDynamicResultSetFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedDynamicResultSetFactory::getImplementationName_Static(), - CachedDynamicResultSetFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // CachedDynamicResultSetStubFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedDynamicResultSetStubFactory::getImplementationName_Static(), - CachedDynamicResultSetStubFactory::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk index 600fefc174f7..24d245ec6ce8 100644 --- a/ucb/source/cacher/makefile.mk +++ b/ucb/source/cacher/makefile.mk @@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/cached1.component + +$(MISC)/cached1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + cached1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt cached1.component diff --git a/ucb/source/core/exports2.dxp b/ucb/source/core/exports2.dxp index a1936474f752..8091459f4d84 100644 --- a/ucb/source/core/exports2.dxp +++ b/ucb/source/core/exports2.dxp @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory _ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk index 34765eb74289..6360f82320d2 100644 --- a/ucb/source/core/makefile.mk +++ b/ucb/source/core/makefile.mk @@ -74,3 +74,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucb1.component + +$(MISC)/ucb1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucb1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucb1.component diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component new file mode 100644 index 000000000000..e9d408822cc9 --- /dev/null +++ b/ucb/source/core/ucb1.component @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.CommandEnvironment"> + <service name="com.sun.star.ucb.CommandEnvironment"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.UcbContentProviderProxyFactory"> + <service name="com.sun.star.ucb.ContentProviderProxyFactory"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.UcbPropertiesManager"> + <service name="com.sun.star.ucb.PropertiesManager"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.UcbStore"> + <service name="com.sun.star.ucb.Store"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.UniversalContentBroker"> + <service name="com.sun.star.ucb.UniversalContentBroker"/> + </implementation> +</component> diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 340fa5db0c0f..a4e5bdc1dccf 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -29,7 +29,6 @@ #include "precompiled_ucb.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include "ucb.hxx" #include "ucbstore.hxx" #include "ucbprops.hxx" @@ -39,46 +38,6 @@ using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::registry; - -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( @@ -88,52 +47,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Universal Content Broker. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UniversalContentBroker::getImplementationName_Static(), - UniversalContentBroker::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // UCB Store. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UcbStore::getImplementationName_Static(), - UcbStore::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // UCB PropertiesManager. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UcbPropertiesManager::getImplementationName_Static(), - UcbPropertiesManager::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // UCP Proxy Factory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UcbContentProviderProxyFactory::getImplementationName_Static(), - UcbContentProviderProxyFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Command Environment. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ucb_cmdenv::UcbCommandEnvironment::getImplementationName_Static(), - ucb_cmdenv::UcbCommandEnvironment::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 9500db4f45b6..cd5cb7856d7a 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -274,8 +274,9 @@ UcbStore::createPropertySetRegistry( const OUString& ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( !m_pImpl->m_xTheRegistry.is() ) - m_pImpl->m_xTheRegistry = new PropertySetRegistry( m_xSMgr, *this ); + m_pImpl->m_xTheRegistry = new PropertySetRegistry( m_xSMgr, getInitArgs() ); } + return m_pImpl->m_xTheRegistry; } @@ -294,22 +295,6 @@ void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments ) } //========================================================================= -// -// New methods. -// -//========================================================================= - -void UcbStore::removeRegistry() -{ - if ( m_pImpl->m_xTheRegistry.is() ) - { - osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); - if ( m_pImpl->m_xTheRegistry.is() ) - m_pImpl->m_xTheRegistry = 0; - } -} - -//========================================================================= const Sequence< Any >& UcbStore::getInitArgs() const { return m_pImpl->m_aInitArgs; @@ -323,7 +308,7 @@ const Sequence< Any >& UcbStore::getInitArgs() const struct PropertySetRegistry_Impl { - UcbStore* m_pCreator; + const Sequence< Any > m_aInitArgs; PropertySetMap_Impl m_aPropSets; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XInterface > m_xRootReadAccess; @@ -332,18 +317,11 @@ struct PropertySetRegistry_Impl sal_Bool m_bTriedToGetRootReadAccess; // #82494# sal_Bool m_bTriedToGetRootWriteAccess; // #82494# - PropertySetRegistry_Impl( UcbStore& rCreator ) - : m_pCreator( &rCreator ), + PropertySetRegistry_Impl( const Sequence< Any > &rInitArgs ) + : m_aInitArgs( rInitArgs ), m_bTriedToGetRootReadAccess( sal_False ), m_bTriedToGetRootWriteAccess( sal_False ) { - m_pCreator->acquire(); - } - - ~PropertySetRegistry_Impl() - { - m_pCreator->removeRegistry(); - m_pCreator->release(); } }; @@ -359,9 +337,9 @@ struct PropertySetRegistry_Impl PropertySetRegistry::PropertySetRegistry( const Reference< XMultiServiceFactory >& rXSMgr, - UcbStore& rCreator ) + const Sequence< Any > &rInitArgs ) : m_xSMgr( rXSMgr ), - m_pImpl( new PropertySetRegistry_Impl( rCreator ) ) + m_pImpl( new PropertySetRegistry_Impl( rInitArgs ) ) { } @@ -1094,8 +1072,7 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider() osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( !m_pImpl->m_xConfigProvider.is() ) { - const Sequence< Any >& rInitArgs - = m_pImpl->m_pCreator->getInitArgs(); + const Sequence< Any >& rInitArgs = m_pImpl->m_aInitArgs; if ( rInitArgs.getLength() > 0 ) { diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 8c339337f890..7a7a76cb1b99 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -93,9 +93,6 @@ public: throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - // New - void removeRegistry(); - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getInitArgs() const; }; @@ -132,7 +129,8 @@ public: PropertySetRegistry( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rXSMgr, - UcbStore& rCreator ); + const ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Any >& rInitArgs); virtual ~PropertySetRegistry(); // XInterface diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk index 68a9959589d2..008e39b4bce3 100644 --- a/ucb/source/sorter/makefile.mk +++ b/ucb/source/sorter/makefile.mk @@ -61,3 +61,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/srtrs1.component + +$(MISC)/srtrs1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + srtrs1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt srtrs1.component diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index d96b4bcff796..5ad9a529e1f2 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -30,51 +30,10 @@ #include <sortdynres.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::registry; - -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( @@ -84,20 +43,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // SortedDynamicResultSetFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - SortedDynamicResultSetFactory::getImplementationName_Static(), - SortedDynamicResultSetFactory::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component new file mode 100644 index 000000000000..c32705160c0f --- /dev/null +++ b/ucb/source/sorter/srtrs1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.SortedDynamicResultSetFactory"> + <service name="com.sun.star.ucb.SortedDynamicResultSetFactory"/> + </implementation> +</component> diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk index 32de160318f2..70e441171a44 100644 --- a/ucb/source/ucp/expand/makefile.mk +++ b/ucb/source/ucp/expand/makefile.mk @@ -59,3 +59,11 @@ DEF1NAME = $(SHL1TARGET) .ENDIF # L10N_framework .INCLUDE : target.mk + +ALLTAR : $(MISC)/ucpexpand1.component + +$(MISC)/ucpexpand1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpexpand1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpexpand1.component diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 710cf137ba06..069aa894692b 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -273,14 +273,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, s_entries ); -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component new file mode 100644 index 000000000000..c8a7e8e18c68 --- /dev/null +++ b/ucb/source/ucp/expand/ucpexpand1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.ExpandContentProvider"> + <service name="com.sun.star.ucb.ExpandContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk index 23c30b3bda5b..e106b8e1ba31 100644 --- a/ucb/source/ucp/ext/makefile.mk +++ b/ucb/source/ucp/ext/makefile.mk @@ -63,3 +63,11 @@ SHL1DEF = $(MISC)$/$(SHL1TARGET).def DEF1NAME = $(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/ucpext.component + +$(MISC)/ucpext.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpext.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpext.component diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component new file mode 100644 index 000000000000..2982529e539c --- /dev/null +++ b/ucb/source/ucp/ext/ucpext.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.comp.ucp.ext.ContentProvider"> + <service name="com.sun.star.ucb.ExtensionContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 8daa33f5cf8c..ce525c2da665 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -80,12 +80,6 @@ extern "C" } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::ucb::ucp::ext::s_aServiceEntries ); - } - - //------------------------------------------------------------------------------------------------------------------ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); diff --git a/ucb/source/ucp/file/exports2.dxp b/ucb/source/ucp/file/exports2.dxp index 6c42314f228b..4804c8d0ae57 100644 --- a/ucb/source/ucp/file/exports2.dxp +++ b/ucb/source/ucp/file/exports2.dxp @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory _ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk index 8007a2492399..3d97cb23873c 100644 --- a/ucb/source/ucp/file/makefile.mk +++ b/ucb/source/ucp/file/makefile.mk @@ -78,3 +78,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpfile1.component + +$(MISC)/ucpfile1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpfile1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpfile1.component diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index a456d2acbd32..2b9c09a7d0fa 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -31,7 +31,6 @@ #include <osl/file.hxx> #include <osl/socket.h> #include <cppuhelper/factory.hxx> -#include <com/sun/star/registry/XRegistryKey.hpp> #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif @@ -53,45 +52,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::container; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { @@ -99,20 +59,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // File Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - fileaccess::shell::getImplementationName_static(), - fileaccess::shell::getSupportedServiceNames_static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component new file mode 100644 index 000000000000..28032451220a --- /dev/null +++ b/ucb/source/ucp/file/ucpfile1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.FileProvider"> + <service name="com.sun.star.ucb.FileContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index fb62acd1cbc0..8e5c88ad66c1 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -36,45 +36,6 @@ using namespace com::sun::star; using namespace ftp; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { @@ -82,21 +43,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // FTP Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - FTPContentProvider::getImplementationName_Static(), - FTPContentProvider::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk index a0f141004089..c2f1ce154a56 100644 --- a/ucb/source/ucp/ftp/makefile.mk +++ b/ucb/source/ucp/ftp/makefile.mk @@ -104,3 +104,11 @@ DEF1NAME=$(SHL1TARGET) + +ALLTAR : $(MISC)/ucpftp1.component + +$(MISC)/ucpftp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpftp1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpftp1.component diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component new file mode 100644 index 000000000000..fa4cfe6e7557 --- /dev/null +++ b/ucb/source/ucp/ftp/ucpftp1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.FTPContentProvider"> + <service name="com.sun.star.ucb.FTPContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index b39bc4462bbe..750f7408e7ec 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -102,55 +102,12 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -static sal_Bool writeInfo( void *pRegistryKey, - const rtl::OUString &rImplementationName, uno::Sequence< rtl::OUString > const &rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * > (pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - {} - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void *pRegistryKey ) -{ - return pRegistryKey && - writeInfo( pRegistryKey, - ::gio::ContentProvider::getImplementationName_Static(), - ::gio::ContentProvider::getSupportedServiceNames_Static() ); -} - extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk index 86b32fbc0739..4cca611c7ece 100644 --- a/ucb/source/ucp/gio/makefile.mk +++ b/ucb/source/ucp/gio/makefile.mk @@ -37,8 +37,6 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk .IF "$(L10N_framework)"=="" -UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt - .IF "$(ENABLE_GIO)"!="" COMPILER_WARN_ALL=TRUE PKGCONFIG_MODULES=gio-2.0 @@ -79,3 +77,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map .ENDIF # L10N_framework .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpgio.component + +$(MISC)/ucpgio.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpgio.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpgio.component diff --git a/ucb/source/ucp/gio/ucpgio-ucd.txt b/ucb/source/ucp/gio/ucpgio-ucd.txt deleted file mode 100644 index ce7657fa73e3..000000000000 --- a/ucb/source/ucp/gio/ucpgio-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.GIOContentProvider -ComponentName=ucpgio1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ucb.GIOContentProvider diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component new file mode 100644 index 000000000000..caa8fc361f7f --- /dev/null +++ b/ucb/source/ucp/gio/ucpgio.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.GIOContentProvider"> + <service name="com.sun.star.ucb.GIOContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index 52376bf4153e..77415982c63d 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -143,42 +143,6 @@ ContentProvider::queryContent( //============================ shlib entry points ============================================= - -// cut and paste verbatim from webdav (that sucks). -static sal_Bool -writeInfo( void *pRegistryKey, - const rtl::OUString &rImplementationName, - uno::Sequence< rtl::OUString > const &rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try { - xKey = static_cast< registry::XRegistryKey * > - (pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) { - try { - xKey->createKey( rServiceNames[ n ] ); - - } catch ( registry::InvalidRegistryException const & ) { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **/*ppEnv*/ ) @@ -186,15 +150,6 @@ component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" sal_Bool SAL_CALL -component_writeInfo( void */*pServiceManager*/, - void *pRegistryKey ) -{ - return pRegistryKey && - writeInfo( pRegistryKey, - ::gvfs::ContentProvider::getImplementationName_Static(), - ::gvfs::ContentProvider::getSupportedServiceNames_Static() ); -} extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk index a0e8a0bda3bb..87fcca87cf70 100644 --- a/ucb/source/ucp/gvfs/makefile.mk +++ b/ucb/source/ucp/gvfs/makefile.mk @@ -37,8 +37,6 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk .IF "$(L10N_framework)"=="" -UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt - .IF "$(ENABLE_GNOMEVFS)"!="" COMPILER_WARN_ALL=TRUE PKGCONFIG_MODULES=gnome-vfs-2.0 @@ -84,3 +82,10 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map .INCLUDE: target.mk +ALLTAR : $(MISC)/ucpgvfs.component + +$(MISC)/ucpgvfs.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpgvfs.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpgvfs.component diff --git a/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt b/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt deleted file mode 100644 index e9ecce6effd2..000000000000 --- a/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.GnomeVFSContentProvider -ComponentName=ucpgvfs1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ucb.GnomeVFSContentProvider diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component new file mode 100644 index 000000000000..cec3e4d1e2b1 --- /dev/null +++ b/ucb/source/ucp/gvfs/ucpgvfs.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.GnomeVFSContentProvider"> + <service name="com.sun.star.ucb.GnomeVFSContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index e645e006032e..1830ecc35625 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -29,7 +29,6 @@ #include "precompiled_ucb.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include "hierarchyprovider.hxx" #include "hierarchydatasource.hxx" @@ -37,45 +36,6 @@ using namespace com::sun::star; using namespace hierarchy_ucp; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { @@ -83,29 +43,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Hierarchy Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - HierarchyContentProvider::getImplementationName_Static(), - HierarchyContentProvider::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Hierarchy Data Source. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - HierarchyDataSource::getImplementationName_Static(), - HierarchyDataSource::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk index 00b481b5e7a1..9263faa24b08 100644 --- a/ucb/source/ucp/hierarchy/makefile.mk +++ b/ucb/source/ucp/hierarchy/makefile.mk @@ -82,3 +82,11 @@ DEF1NAME=$(SHL1TARGET) .ENDIF # L10N_framework .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucphier1.component + +$(MISC)/ucphier1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucphier1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucphier1.component diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component new file mode 100644 index 000000000000..5483187d8674 --- /dev/null +++ b/ucb/source/ucp/hierarchy/ucphier1.component @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.HierarchyContentProvider"> + <service name="com.sun.star.ucb.HierarchyContentProvider"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.HierarchyDataSource"> + <service name="com.sun.star.ucb.DefaultHierarchyDataSource"/> + <service name="com.sun.star.ucb.HierarchyDataSource"/> + </implementation> +</component> diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx index 3e4639e25806..0f5666e2bb53 100644 --- a/ucb/source/ucp/odma/odma_services.cxx +++ b/ucb/source/ucp/odma/odma_services.cxx @@ -40,45 +40,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { diff --git a/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk index a8cdf7430703..b78150aed2cb 100644 --- a/ucb/source/ucp/package/makefile.mk +++ b/ucb/source/ucp/package/makefile.mk @@ -87,3 +87,11 @@ DEF1NAME=$(SHL1TARGET) .ENDIF # L10N_framework .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucppkg1.component + +$(MISC)/ucppkg1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucppkg1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucppkg1.component diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 251ce8c78dd1..ad4af686d2d6 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -34,50 +34,6 @@ using namespace com::sun::star; -namespace { - -//========================================================================= -sal_Bool writeInfo( - void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -} // namespace - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -86,21 +42,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Write info into registry. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ::package_ucp::ContentProvider::getImplementationName_Static(), - ::package_ucp::ContentProvider::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component new file mode 100644 index 000000000000..a2e2418b5602 --- /dev/null +++ b/ucb/source/ucp/package/ucppkg1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.PackageContentProvider"> + <service name="com.sun.star.ucb.PackageContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk index 83e9599eed72..82c76b34b206 100644 --- a/ucb/source/ucp/tdoc/makefile.mk +++ b/ucb/source/ucp/tdoc/makefile.mk @@ -92,3 +92,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucptdoc1.component + +$(MISC)/ucptdoc1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucptdoc1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucptdoc1.component diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 6f9641d5159b..fc34fd78b1a4 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -39,45 +39,6 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { @@ -85,29 +46,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Transient Documents Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ContentProvider::getImplementationName_Static(), - ContentProvider::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Transient Documents Document Content Factory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - DocumentContentFactory::getImplementationName_Static(), - DocumentContentFactory::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component new file mode 100644 index 000000000000..8ba1471bd933 --- /dev/null +++ b/ucb/source/ucp/tdoc/ucptdoc1.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.TransientDocumentsContentProvider"> + <service name="com.sun.star.ucb.TransientDocumentsContentProvider"/> + </implementation> + <implementation name="com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory"> + <service name="com.sun.star.frame.TransientDocumentsDocumentContentFactory"/> + </implementation> +</component> diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 73ee298697e8..162d58266406 100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -158,3 +158,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ---------------------------------------------------------- .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpdav1.component + +$(MISC)/ucpdav1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpdav1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpdav1.component diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component new file mode 100644 index 000000000000..4e18b566e1a4 --- /dev/null +++ b/ucb/source/ucp/webdav/ucpdav1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.WebDAVContentProvider"> + <service name="com.sun.star.ucb.WebDAVContentProvider"/> + </implementation> +</component> diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 9fb6d9e82bcf..7a38636e9dc7 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -35,45 +35,6 @@ using namespace com::sun::star; //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { @@ -81,21 +42,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // WebDAV Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ::webdav_ucp::ContentProvider::getImplementationName_Static(), - ::webdav_ucp::ContentProvider::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/uui/prj/d.lst b/uui/prj/d.lst index 30c6f812fd5b..46b0118319fb 100644 --- a/uui/prj/d.lst +++ b/uui/prj/d.lst @@ -7,3 +7,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid ..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib ..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml +..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 11f6627ed8b9..1185dd1eb57d 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -519,7 +519,8 @@ executePasswordDialog( task::PasswordRequestMode nMode, ::rtl::OUString aDocName, bool bMSCryptoMode, - bool bIsPasswordToModify ) + bool bIsPasswordToModify, + bool bIsSimplePasswordRequest ) SAL_THROW((uno::RuntimeException)) { try @@ -530,21 +531,36 @@ executePasswordDialog( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if( nMode == task::PasswordRequestMode_PASSWORD_CREATE ) { - const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0; // 0 -> allow any length + if (bIsSimplePasswordRequest) + { + std::auto_ptr< PasswordDialog > pDialog( + new PasswordDialog( pParent, nMode, xManager.get(), aDocName, + bIsPasswordToModify, bIsSimplePasswordRequest ) ); + pDialog->SetMinLen(0); + + rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); + rInfo.SetPassword( pDialog->GetPassword() ); + } + else + { + const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0; // 0 -> allow any length - VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create(); - AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify ); - std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp ); + VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create(); + AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify ); + std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp ); - rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); - rInfo.SetPassword( pDialog->GetPasswordToOpen() ); - rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() ); - rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() ); + rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); + rInfo.SetPassword( pDialog->GetPasswordToOpen() ); + rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() ); + rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() ); + } } - else + else // enter password or reenter password { std::auto_ptr< PasswordDialog > pDialog( - new PasswordDialog( pParent, nMode, xManager.get(), aDocName, bIsPasswordToModify ) ); + new PasswordDialog( pParent, nMode, xManager.get(), aDocName, + bIsPasswordToModify, bIsSimplePasswordRequest ) ); + pDialog->SetMinLen(0); rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); rInfo.SetPassword( bIsPasswordToModify ? String() : pDialog->GetPassword() ); @@ -567,7 +583,8 @@ handlePasswordRequest_( rContinuations, ::rtl::OUString aDocumentName, bool bMSCryptoMode, - bool bIsPasswordToModify ) + bool bIsPasswordToModify, + bool bIsSimplePasswordRequest = false ) SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionRetry > xRetry; @@ -582,7 +599,7 @@ handlePasswordRequest_( LoginErrorInfo aInfo; executePasswordDialog( pParent, aInfo, nMode, - aDocumentName, bMSCryptoMode, bIsPasswordToModify ); + aDocumentName, bMSCryptoMode, bIsPasswordToModify, bIsSimplePasswordRequest ); switch (aInfo.GetResult()) { @@ -742,7 +759,8 @@ UUIInteractionHelper::handlePasswordRequest( rRequest->getContinuations(), rtl::OUString(), false /* bool bMSCryptoMode */, - false /* bool bIsPasswordToModify */); + false /* bool bIsPasswordToModify */, + true /* bool bIsSimplePasswordRequest */ ); return true; } diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 9be81479ef59..f9c9e2fd2d15 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -56,6 +56,7 @@ #define RID_UUI_ERRHDL (RID_UUI_START + 20) #define DLG_UUI_MASTERPASSWORD_CRT (RID_UUI_START + 21) #define DLG_UUI_PASSWORD (RID_UUI_START + 22) +#define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23) #define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24) #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25) #define DLG_UUI_UNKNOWNAUTH (RID_UUI_START + 26) @@ -93,6 +94,8 @@ #define STR_RENAME_OR_REPLACE (RID_UUI_START + 58) #define STR_NAME_CLASH_RENAME_ONLY (RID_UUI_START + 59) #define STR_SAME_NAME_USED (RID_UUI_START + 60) +#define STR_ENTER_SIMPLE_PASSWORD (RID_UUI_START + 61) +#define STR_CONFIRM_SIMPLE_PASSWORD (RID_UUI_START + 62) #define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0) #define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1) diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src index bf6a97c3b0ff..736e0f9ae1df 100755..100644 --- a/uui/source/logindlg.src +++ b/uui/source/logindlg.src @@ -175,20 +175,20 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 177 , 8 ) ; }; - OKButton BTN_LOGIN_OK + HelpButton BTN_LOGIN_HELP { Pos = MAP_APPFONT( 6 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; - DefButton = TRUE ; }; - CancelButton BTN_LOGIN_CANCEL + OKButton BTN_LOGIN_OK { Pos = MAP_APPFONT( 66 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; + DefButton = TRUE ; }; - HelpButton BTN_LOGIN_HELP + CancelButton BTN_LOGIN_CANCEL { Pos = MAP_APPFONT( 121 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index af2ef194f22e..1622be0b38ab 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -93,7 +93,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ), pResourceMgr ( pResMgr ), - nMinLen ( 5 ) + nMinLen ( 1 ) { FreeResource(); diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src index 870cc8a2456f..439026d3f6e1 100644 --- a/uui/source/masterpasscrtdlg.src +++ b/uui/source/masterpasscrtdlg.src @@ -86,7 +86,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ; Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ; WordBreak = TRUE ; - Text [ en-US ] = "Caution: Make sure you remember the Master Password you have set. If you forget your Master Password, you will be unable to access any of the information protected by it. Passwords are case-sensitive and at least five characters long."; + Text [ en-US ] = "Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case-sensitive."; }; FixedLine FL_CAUTIONTEXT { diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index c89184f54bc1..348d2f833e15 100755..100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -25,67 +25,119 @@ * ************************************************************************/ +#include "passworddlg.hxx" +#include "passworddlg.hrc" +#include "ids.hrc" + #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC -#include <ids.hrc> -#endif -#ifndef UUI_PASSWORDDLG_HRC -#include <passworddlg.hrc> -#endif -#include <passworddlg.hxx> -// PasswordDialog--------------------------------------------------------- +using namespace ::com::sun::star; + // ----------------------------------------------------------------------- -IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +static void lcl_Move( Window &rWin, long nOffset ) { - EndDialog( RET_OK ); - return 1; + Point aTmp( rWin.GetPosPixel() ); + aTmp.Y() += nOffset; + rWin.SetPosPixel( aTmp ); } // ----------------------------------------------------------------------- PasswordDialog::PasswordDialog( Window* _pParent, - ::com::sun::star::task::PasswordRequestMode nDlgMode, + task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, rtl::OUString& aDocURL, - bool bOpenToModify ) + bool bOpenToModify, + bool bIsSimplePasswordRequest ) :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD, *pResMgr ) ) ,aFTPassword( this, ResId( FT_PASSWORD, *pResMgr )) ,aEDPassword( this, ResId( ED_PASSWORD, *pResMgr )) + ,aFTConfirmPassword( this, ResId( FT_CONFIRM_PASSWORD, *pResMgr )) + ,aEDConfirmPassword( this, ResId( ED_CONFIRM_PASSWORD, *pResMgr )) ,aOKBtn ( this, ResId( BTN_PASSWORD_OK, *pResMgr )) ,aCancelBtn ( this, ResId( BTN_PASSWORD_CANCEL, *pResMgr )) ,aHelpBtn ( this, ResId( BTN_PASSWORD_HELP, *pResMgr )) ,aFixedLine1( this, ResId( FL_FIXED_LINE_1, *pResMgr )) + ,nMinLen(1) + ,aPasswdMismatch( ResId( STR_PASSWORD_MISMATCH, *pResMgr )) ,nDialogMode( nDlgMode ) ,pResourceMgr ( pResMgr ) { - if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) + if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER ) { - USHORT nErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; + const USHORT nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; + const USHORT nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId; String aErrorMsg( ResId( nErrStrId, *pResourceMgr )); - ErrorBox aErrorBox( _pParent, WB_OK, aErrorMsg ); + ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); aErrorBox.Execute(); } + // default settings for enter password or reenter passwd... + String aTitle( ResId( STR_TITLE_ENTER_PASSWORD, *pResourceMgr ) ); + aFTConfirmPassword.Hide(); + aEDConfirmPassword.Hide(); + aFTConfirmPassword.Enable( FALSE ); + aEDConfirmPassword.Enable( FALSE ); + + // settings for create password + if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE) + { + aTitle = String( ResId( STR_TITLE_CREATE_PASSWORD, *pResourceMgr ) ); + + aFTConfirmPassword.SetText( String( ResId( STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr ) ) ); + + aFTConfirmPassword.Show(); + aEDConfirmPassword.Show(); + aFTConfirmPassword.Enable( TRUE ); + aEDConfirmPassword.Enable( TRUE ); + } + else + { + // shrink dialog by size of hidden controls and move rest up accordingly + + long nDelta = aFixedLine1.GetPosPixel().Y() - aFTConfirmPassword.GetPosPixel().Y(); + + lcl_Move( aFixedLine1, -nDelta ); + lcl_Move( aOKBtn, -nDelta ); + lcl_Move( aCancelBtn, -nDelta ); + lcl_Move( aHelpBtn, -nDelta ); + + Size aNewDlgSize = GetSizePixel(); + aNewDlgSize.Height() -= nDelta; + SetSizePixel( aNewDlgSize ); + } + + SetText( aTitle ); + USHORT nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN; aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) ); + aFTPassword.SetText( aFTPassword.GetText() + aDocURL ); + if (bIsSimplePasswordRequest) + { + DBG_ASSERT( aDocURL.getLength() == 0, "A simple password request should not have a document URL! Use document password request instead." ); + aFTPassword.SetText( String( ResId( STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr ) ) ); + } FreeResource(); - aFTPassword.SetText( aFTPassword.GetText() + aDocURL ); - aOKBtn.SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) ); - long nLabelWidth = aFTPassword.GetSizePixel().Width(); - long nLabelHeight = aFTPassword.GetSizePixel().Height(); - long nTextWidth = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() ); - long nTextHeight = aFTPassword.GetTextHeight(); + + // + // move controls down by extra height needed for aFTPassword + // (usually only needed if a URL was provided) + // + + long nLabelWidth = aFTPassword.GetSizePixel().Width(); + long nLabelHeight = aFTPassword.GetSizePixel().Height(); + long nTextWidth = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() ); + long nTextHeight = aFTPassword.GetTextHeight(); Rectangle aLabelRect( aFTPassword.GetPosPixel(), aFTPassword.GetSizePixel() ); Rectangle aRect = aFTPassword.GetTextRect( aLabelRect, aFTPassword.GetText() ); @@ -105,13 +157,31 @@ PasswordDialog::PasswordDialog( aNewLabelSize.Height() = nNewLabelHeight; aFTPassword.SetPosSizePixel( aFTPassword.GetPosPixel(), aNewLabelSize ); - Window* pControls[] = { &aEDPassword, &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn }; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] ); - for ( int i = 0; i < nCCount; ++i ) + lcl_Move( aEDPassword, nDelta ); + lcl_Move( aFTConfirmPassword, nDelta ); + lcl_Move( aEDConfirmPassword, nDelta ); + lcl_Move( aFixedLine1, nDelta ); + lcl_Move( aOKBtn, nDelta ); + lcl_Move( aCancelBtn, nDelta ); + lcl_Move( aHelpBtn, nDelta ); +} + + +IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +{ + bool bEDPasswdValid = aEDPassword.GetText().Len() >= nMinLen; + bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText(); + bool bValid = (!aEDConfirmPassword.IsVisible() && bEDPasswdValid) || + (aEDConfirmPassword.IsVisible() && bEDPasswdValid && !bPasswdMismatch); + + if (aEDConfirmPassword.IsVisible() && bPasswdMismatch) { - Point aNewPos =(*pControls[i]).GetPosPixel(); - aNewPos.Y() += nDelta; - pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() ); + ErrorBox aErrorBox( this, WB_OK, aPasswdMismatch ); + aErrorBox.Execute(); } + else if (bValid) + EndDialog( RET_OK ); + return 1; } + diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc index ad7517b7a62b..e9a8bb5b5b04 100644 --- a/uui/source/passworddlg.hrc +++ b/uui/source/passworddlg.hrc @@ -29,12 +29,18 @@ #define PASSWORDDLG_HRC // local identifiers -#define BTN_PASSWORD_OK 1 -#define ED_PASSWORD 2 -#define FT_PASSWORD 3 -#define FL_FIXED_LINE_1 4 -#define BTN_PASSWORD_HELP 5 -#define BTN_PASSWORD_CANCEL 6 +#define BTN_PASSWORD_OK 1 +#define ED_PASSWORD 2 +#define FT_PASSWORD 3 +#define FT_CONFIRM_PASSWORD 4 +#define ED_CONFIRM_PASSWORD 5 +#define FL_FIXED_LINE_1 6 +#define BTN_PASSWORD_HELP 7 +#define BTN_PASSWORD_CANCEL 8 + +#define STR_TITLE_CREATE_PASSWORD 9 +#define STR_TITLE_ENTER_PASSWORD 10 +#define STR_PASSWORD_MISMATCH 11 #endif // PASSWORDDLG_HRC diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index fe5fe7f2ef84..b94dbab82444 100755..100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -37,21 +37,28 @@ #include <vcl/fixed.hxx> //============================================================================ + class PasswordDialog : public ModalDialog { FixedText aFTPassword; Edit aEDPassword; + FixedText aFTConfirmPassword; + Edit aEDConfirmPassword; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; FixedLine aFixedLine1; + USHORT nMinLen; + String aPasswdMismatch; DECL_LINK( OKHdl_Impl, OKButton * ); public: - PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, bool bOpenToModify = false ); + PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, + bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); + void SetMinLen( USHORT nMin ) { nMinLen = nMin; } String GetPassword() const { return aEDPassword.GetText(); } private: @@ -60,3 +67,4 @@ private: }; #endif // PASSWORDDLG_HXX + diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index 33767057e1bd..52f8fbfac134 100755..100644 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -41,48 +41,61 @@ ModalDialog DLG_UUI_PASSWORD Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT( 145, 91 ); - Text [ en-US ] = "Enter password"; + Size = MAP_APPFONT( 165, 95 ); FixedText FT_PASSWORD { - Pos = MAP_APPFONT( 3, 4 ); - Size = MAP_APPFONT( 139, 28 ); + Pos = MAP_APPFONT( 3, 6 ); + Size = MAP_APPFONT( 159, 8 ); WordBreak = TRUE; }; Edit ED_PASSWORD { - Pos = MAP_APPFONT( 3, 51 ); - Size = MAP_APPFONT( 139, 13 ); + Pos = MAP_APPFONT( 3, 17 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; - FixedLine FL_FIXED_LINE_1 + FixedText FT_CONFIRM_PASSWORD { - Pos = MAP_APPFONT( 0, 66 ); - Size = MAP_APPFONT( 145, 6 ); + Pos = MAP_APPFONT( 3, 34 ); + Size = MAP_APPFONT( 159, 8 ); + WordBreak = TRUE; }; - OKButton BTN_PASSWORD_OK + Edit ED_CONFIRM_PASSWORD { - Pos = MAP_APPFONT( 27, 72 ); - Size = MAP_APPFONT( 37, 15 ); - DefButton = TRUE ; - DefButton = TRUE; + Pos = MAP_APPFONT( 3, 45 ); + Size = MAP_APPFONT( 159, 12 ); + Border = TRUE ; + PassWord = TRUE ; }; - CancelButton BTN_PASSWORD_CANCEL + FixedLine FL_FIXED_LINE_1 { - Pos = MAP_APPFONT( 66, 72 ); - Size = MAP_APPFONT( 37, 15 ); + Pos = MAP_APPFONT( 0, 63 ); + Size = MAP_APPFONT( 165, 8 ); }; HelpButton BTN_PASSWORD_HELP { - Pos = MAP_APPFONT( 105, 72 ); - Size = MAP_APPFONT( 37, 15 ); + Pos = MAP_APPFONT( 3, 76 ); + Size = MAP_APPFONT( 50, 14 ); + }; + + OKButton BTN_PASSWORD_OK + { + Pos = MAP_APPFONT( 59, 76 ); + Size = MAP_APPFONT( 50, 14 ); + DefButton = TRUE ; + }; + + CancelButton BTN_PASSWORD_CANCEL + { + Pos = MAP_APPFONT( 112, 76 ); + Size = MAP_APPFONT( 50, 14 ); }; String STR_ENTER_PASSWORD_TO_OPEN @@ -94,5 +107,30 @@ ModalDialog DLG_UUI_PASSWORD { Text [ en-US ] = "Enter password to modify file: \n"; }; + + String STR_ENTER_SIMPLE_PASSWORD + { + Text [ en-US ] = "Enter password: "; + }; + + String STR_CONFIRM_SIMPLE_PASSWORD + { + Text [ en-US ] = "Confirm password: "; + }; + + String STR_TITLE_CREATE_PASSWORD + { + Text [ en-US ] = "Set Password"; + }; + + String STR_TITLE_ENTER_PASSWORD + { + Text [ en-US ] = "Enter Password"; + }; + + String STR_PASSWORD_MISMATCH + { + Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ; + }; }; diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src index 91b244ae543e..3d4307ad4f80 100755..100644 --- a/uui/source/passworderrs.src +++ b/uui/source/passworderrs.src @@ -43,7 +43,12 @@ String STR_ERROR_PASSWORD_TO_MODIFY_WRONG String STR_ERROR_MASTERPASSWORD_WRONG { - Text [ en-US ] = "The wrong Master Password has been entered. %PRODUCTNAME could not access web login information protected by Master Password.\n\nNote: Passwords are case-sensitive and at least five characters long."; + Text [ en-US ] = "The master password is incorrect."; +}; + +String STR_ERROR_SIMPLE_PASSWORD_WRONG +{ + Text [ en-US ] = "The password is incorrect."; }; String STR_ERROR_PASSWORDS_NOT_IDENTICAL diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 95d4d65b6faf..4ceb59c4c389 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -41,49 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -namespace { - -sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - { - return sal_False; - } - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -} // namespace - //============================================================================ // // component_getImplementationEnvironment @@ -99,43 +56,6 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, //============================================================================ // -// component_writeInfo -// -//============================================================================ - -extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * pRegistryKey) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // UUI Interaction Handler. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - OUString::createFromAscii( - UUIInteractionHandler::m_aImplementationName ), - UUIInteractionHandler::getSupportedServiceNames_static() ) && - - ////////////////////////////////////////////////////////////////////// - // UUI Interaction Request String Resolver. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - OUString::createFromAscii( - UUIInteractionRequestStringResolver::m_aImplementationName ), - UUIInteractionRequestStringResolver::getSupportedServiceNames_static() ) && - - ////////////////////////////////////////////////////////////////////// - // UUI Password Container Interaction Handler. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - uui::PasswordContainerInteractionHandler::getImplementationName_Static(), - uui::PasswordContainerInteractionHandler::getSupportedServiceNames_Static() ); -} - -//============================================================================ -// // component_getFactory // //============================================================================ diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk index 163a7bb5502e..8a77e71b5e8d 100644 --- a/uui/util/makefile.mk +++ b/uui/util/makefile.mk @@ -62,3 +62,11 @@ RESLIB1SRSFILES = \ $(SRS)$/source.srs .INCLUDE: target.mk + +ALLTAR : $(MISC)/uui.component + +$(MISC)/uui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + uui.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt uui.component diff --git a/uui/util/uui.component b/uui/util/uui.component new file mode 100644 index 000000000000..0a15ad6eb8e5 --- /dev/null +++ b/uui/util/uui.component @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.comp.uui.PasswordContainerInteractionHandler"> + <service name="com.sun.star.task.PasswordContainerInteractionHandler"/> + </implementation> + <implementation name="com.sun.star.comp.uui.UUIInteractionHandler"> + <service name="com.sun.star.configuration.backend.InteractionHandler"/> + <service name="com.sun.star.task.InteractionHandler"/> + <service name="com.sun.star.uui.InteractionHandler"/> + </implementation> + <implementation + name="com.sun.star.comp.uui.UUIInteractionRequestStringResolver"> + <service name="com.sun.star.task.InteractionRequestStringResolver"/> + </implementation> +</component> diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst index 2d20ab1f982d..a5457b730409 100644 --- a/vbahelper/prj/d.lst +++ b/vbahelper/prj/d.lst @@ -26,4 +26,5 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx ..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx ..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx +..\%__SRC%\misc\msforms.component %_DEST%\xml%_EXT%\msforms.component ..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 8e6cf29e8ec5..152517be3958 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -57,16 +57,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - OSL_TRACE("In component_writeInfo"); - - // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, - controlprovider::serviceDecl, userform::serviceDecl ); - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk index dda4be0cbc81..9469df473685 100644 --- a/vbahelper/util/makefile.mk +++ b/vbahelper/util/makefile.mk @@ -102,3 +102,11 @@ SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib # --- Targets ----------------------------------------------------------- .INCLUDE : target.mk + +ALLTAR : $(MISC)/msforms.component + +$(MISC)/msforms.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + msforms.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt msforms.component diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component new file mode 100644 index 000000000000..98ce4a8451d4 --- /dev/null +++ b/vbahelper/util/msforms.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="ControlProviderImpl"> + <service name="ooo.vba.ControlProvider"/> + </implementation> + <implementation name="ScVbaUserForm"> + <service name="ooo.vba.msforms.UserForm"/> + </implementation> +</component> diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst index 67fe323757bb..740ff554ee34 100644 --- a/xmlhelp/prj/d.lst +++ b/xmlhelp/prj/d.lst @@ -7,4 +7,6 @@ ..\util\*.xsl %_DEST%\bin%_EXT%\*.* ..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib%_EXT%\ihelplinker.lib ..\%__SRC%\bin\helpxsl.zip %_DEST%\pck%_EXT%\helpxsl.zip - +..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml%_EXT%\LuceneHelpWrapper.component +..\%__SRC%\misc\tvhlp1.component %_DEST%\xml%_EXT%\tvhlp1.component +..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml%_EXT%\ucpchelp1.component diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java index b12eb20f9485..44b4ed091b47 100755 --- a/xmlhelp/source/com/sun/star/help/HelpComponent.java +++ b/xmlhelp/source/com/sun/star/help/HelpComponent.java @@ -68,10 +68,8 @@ import java.io.PrintStream; import java.io.File; */ -/** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a - * method, that writes the information into the given registry key - * (<CODE>__writeRegistryServiceInfo</CODE>). +/** This class capsulates the class, that implements the minimal component and a + * factory for creating the service (<CODE>__getComponentFactory</CODE>). */ public class HelpComponent { @@ -98,25 +96,6 @@ public class HelpComponent return xFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) - { - boolean bSuccessHelpSearch = Factory.writeRegistryServiceInfo - (HelpSearch._HelpSearch.class.getName(), - HelpSearch._HelpSearch.getServiceNames(), regKey); - boolean bSuccessHelpIndexer = Factory.writeRegistryServiceInfo - (HelpIndexer.class.getName(), - HelpIndexer.getServiceNames(), regKey); - - return bSuccessHelpSearch && bSuccessHelpIndexer; - } /** This method is a member of the interface for initializing an object * directly after its creation. * @param object This array of arbitrary objects will be passed to the diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java index 3324701f197d..dc31514afcb0 100644 --- a/xmlhelp/source/com/sun/star/help/HelpSearch.java +++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java @@ -54,10 +54,8 @@ import org.apache.lucene.search.WildcardQuery; import com.sun.star.script.XInvocation; import com.sun.star.beans.XIntrospectionAccess; -/** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a - * method, that writes the information into the given registry key - * (<CODE>__writeRegistryServiceInfo</CODE>). +/** This class capsulates the class, that implements the minimal component and a + * factory for creating the service (<CODE>__getComponentFactory</CODE>). */ public class HelpSearch { @@ -314,19 +312,6 @@ public class HelpSearch return xFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - return Factory.writeRegistryServiceInfo(_HelpSearch.class.getName(), - _HelpSearch.getServiceNames(), - regKey); - } /** This method is a member of the interface for initializing an object * directly after its creation. * @param object This array of arbitrary objects will be passed to the diff --git a/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component b/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component new file mode 100644 index 000000000000..04b35bcb12ec --- /dev/null +++ b/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.help.HelpIndexer"> + <service name="com.sun.star.help.HelpIndexer"/> + </implementation> + <implementation name="com.sun.star.help.HelpSearch$_HelpSearch"> + <service name="com.sun.star.help.HelpSearch"/> + </implementation> +</component> diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index ffa08b30cfed..a67f755a1cb2 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -76,6 +76,14 @@ fix_system_lucene: @echo "Fix Java Class-Path entry for Lucene libraries from system." @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \ -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF + +ALLTAR : $(MISC)/LuceneHelpWrapper.component + +$(MISC)/LuceneHelpWrapper.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt LuceneHelpWrapper.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt LuceneHelpWrapper.component .ELSE all: @echo java disabled diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index b0da4e0cdec0..e6d73a4ba2eb 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -36,46 +36,6 @@ using namespace com::sun::star; //========================================================================= -static sal_Bool writeInfo( - void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -//========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { @@ -83,21 +43,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Write info into registry. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ::chelp::ContentProvider::getImplementationName_Static(), - ::chelp::ContentProvider::getSupportedServiceNames_Static() ); -} - -//========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk index 0c385862d772..be0ed8e76f2f 100644 --- a/xmlhelp/source/treeview/makefile.mk +++ b/xmlhelp/source/treeview/makefile.mk @@ -67,3 +67,11 @@ DEF1DES=UCB : Treeview help .INCLUDE: target.mk + +ALLTAR : $(MISC)/tvhlp1.component + +$(MISC)/tvhlp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + tvhlp1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt tvhlp1.component diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 8ebfc22f082a..0a6852cdae3b 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -255,49 +255,6 @@ TVFactory::CreateInstance( return Reference< XInterface >::query( xP ); } - - -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - - - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) @@ -307,20 +264,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - - -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - (void)pServiceManager; - - return pRegistryKey && writeInfo( pRegistryKey, - TVFactory::getImplementationName_static(), - TVFactory::getSupportedServiceNames_static() ); -} - - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey ) diff --git a/xmlhelp/source/treeview/tvhlp1.component b/xmlhelp/source/treeview/tvhlp1.component new file mode 100644 index 000000000000..525de73e0062 --- /dev/null +++ b/xmlhelp/source/treeview/tvhlp1.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.help.TreeViewImpl"> + <service name="com.sun.star.help.TreeView"/> + <service name="com.sun.star.ucb.HiearchyDataSource"/> + </implementation> +</component> diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index 66551f15bffc..e060db9efe04 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -82,3 +82,11 @@ ZIP1LIST=main_transform*.xsl idxcaption.xsl idxcontent.xsl .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpchelp1.component + +$(MISC)/ucpchelp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpchelp1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpchelp1.component diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component new file mode 100644 index 000000000000..a8bb64124e9c --- /dev/null +++ b/xmlhelp/util/ucpchelp1.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="CHelpContentProvider"> + <service name="com.sun.star.help.XMLHelp"/> + <service name="com.sun.star.ucb.HelpContentProvider"/> + </implementation> +</component> diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst index 7784bca0474f..9bbfe05f3ac4 100644 --- a/xmloff/prj/d.lst +++ b/xmloff/prj/d.lst @@ -116,3 +116,5 @@ mkdir: %_DEST%\inc%_EXT%\xmloff\table ..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\misc\xo.component %_DEST%\xml%_EXT%\xo.component +..\%__SRC%\misc\xof.component %_DEST%\xml%_EXT%\xof.component diff --git a/xmloff/qa/unoapi/knownissues.xcl b/xmloff/qa/unoapi/knownissues.xcl index ac15aad11e71..974280f032bd 100644 --- a/xmloff/qa/unoapi/knownissues.xcl +++ b/xmloff/qa/unoapi/knownissues.xcl @@ -14,3 +14,12 @@ xmloff.Impress.XMLStylesImporter::com::sun::star::xml::sax::XDocumentHandler xmloff.Draw.XMLStylesExporter xmloff.Impress.XMLStylesExporter #-> disabled in xmloff.sce + +### i112778 ### +xmloff.Draw.XMLContentExporter::com::sun::star::document::XFilter +xmloff.Draw.XMLMetaExporter::com::sun::star::document::XFilter +xmloff.Impress.XMLMetaExporter::com::sun::star::document::XFilter + +### i114211 ### +xmloff.Draw.XMLStylesImporter::com::sun::star::lang::XInitialization +xmloff.Impress.XMLStylesImporter::com::sun::star::lang::XInitialization diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 010318d6af49..4556e21e8152 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -167,117 +167,6 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& rImplementationName, const uno::Sequence< OUString >& rServices ) -{ - uno::Reference< registry::XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -#define WRITEINFO(className)\ - writeInfo( pKey, className##_getImplementationName(), className##_getSupportedServiceNames() ) - -XMLOFF_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if( pRegistryKey ) - { - try - { - registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ); - - // impress oasis import - WRITEINFO( XMLImpressImportOasis ); - WRITEINFO( XMLImpressStylesImportOasis ); - WRITEINFO( XMLImpressContentImportOasis ); - WRITEINFO( XMLImpressMetaImportOasis ); - WRITEINFO( XMLImpressSettingsImportOasis ); - - // impress oasis export - WRITEINFO( XMLImpressExportOasis ); - WRITEINFO( XMLImpressStylesExportOasis ); - WRITEINFO( XMLImpressContentExportOasis ); - WRITEINFO( XMLImpressMetaExportOasis ); - WRITEINFO( XMLImpressSettingsExportOasis ); - - // animation import - WRITEINFO( AnimationsImport ); - - // impress OOo export - WRITEINFO( XMLImpressExportOOO ); - WRITEINFO( XMLImpressStylesExportOOO ); - WRITEINFO( XMLImpressContentExportOOO ); - WRITEINFO( XMLImpressMetaExportOOO ); - WRITEINFO( XMLImpressSettingsExportOOO ); - - // draw oasis import - WRITEINFO( XMLDrawImportOasis ); - WRITEINFO( XMLDrawStylesImportOasis ); - WRITEINFO( XMLDrawContentImportOasis ); - WRITEINFO( XMLDrawMetaImportOasis ); - WRITEINFO( XMLDrawSettingsImportOasis ); - - // draw oasis export - WRITEINFO( XMLDrawExportOasis ); - WRITEINFO( XMLDrawStylesExportOasis ); - WRITEINFO( XMLDrawContentExportOasis ); - WRITEINFO( XMLDrawMetaExportOasis ); - WRITEINFO( XMLDrawSettingsExportOasis ); - - // draw OOo export - WRITEINFO( XMLDrawExportOOO ); - WRITEINFO( XMLDrawStylesExportOOO ); - WRITEINFO( XMLDrawContentExportOOO ); - WRITEINFO( XMLDrawMetaExportOOO ); - WRITEINFO( XMLDrawSettingsExportOOO ); - - // drawing layer export - WRITEINFO( XMLDrawingLayerExport ); - - // impress xml clipboard export - WRITEINFO( XMLImpressClipboardExport ); - - // chart oasis import - WRITEINFO( SchXMLImport ); - WRITEINFO( SchXMLImport_Meta ); - WRITEINFO( SchXMLImport_Styles ); - WRITEINFO( SchXMLImport_Content ); - - // chart oasis export - WRITEINFO( SchXMLExport_Oasis ); - WRITEINFO( SchXMLExport_Oasis_Meta ); - WRITEINFO( SchXMLExport_Oasis_Styles ); - WRITEINFO( SchXMLExport_Oasis_Content ); - - // chart OOo export - WRITEINFO( SchXMLExport ); - WRITEINFO( SchXMLExport_Styles ); - WRITEINFO( SchXMLExport_Content ); - - // meta - WRITEINFO( XMLMetaImportComponent ); - WRITEINFO( XMLMetaExportComponent ); - - WRITEINFO( XMLVersionListPersistence ); - - // meta OOo - WRITEINFO( XMLMetaExportOOO ); - - // writer auto text events - WRITEINFO( XMLAutoTextEventExport ); - WRITEINFO( XMLAutoTextEventImport ); - WRITEINFO( XMLAutoTextEventExportOOO ); - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_True; -} - #define SINGLEFACTORY(classname)\ if( classname##_getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )\ {\ diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 862326495a70..2ad03f6576de 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2282,7 +2282,9 @@ void SdXMLExport::_ExportStyles(BOOL bUsed) // write draw:style-name for object graphic-styles GetShapeExport()->ExportGraphicDefaults(); - GetShapeExport()->GetShapeTableExport()->exportTableStyles(); + // do not export in ODF 1.1 or older + if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + GetShapeExport()->GetShapeTableExport()->exportTableStyles(); // write presentation styles ImpWritePresentationStyles(); diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 76942cf817db..1290d545c6b3 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -915,10 +915,12 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: { xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), uno::makeAny( aVisArea ) ); } - catch( com::sun::star::uno::Exception e ) + catch( com::sun::star::uno::Exception /*e*/ ) { +/* #i79978# since old documents may contain invalid view settings, this is nothing to worry the user about. uno::Sequence<OUString> aSeq(0); SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL ); +*/ } } diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index 3f52fcd50084..238fdebefa55 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -1117,38 +1117,46 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, sal_True ); - if( !bIsEmptyPresObj ) + // do not export in ODF 1.1 or older + if( mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) { - uno::Reference< container::XNamed > xTemplate( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) ), uno::UNO_QUERY ); - if( xTemplate.is() ) + if( !bIsEmptyPresObj ) { - const OUString sTemplate( xTemplate->getName() ); - if( sTemplate.getLength() ) + uno::Reference< container::XNamed > xTemplate( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) ), uno::UNO_QUERY ); + if( xTemplate.is() ) { - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TEMPLATE_NAME, sTemplate ); - - for( const XMLPropertyMapEntry* pEntry = &aXMLTableShapeAttributes[0]; pEntry->msApiName; pEntry++ ) + const OUString sTemplate( xTemplate->getName() ); + if( sTemplate.getLength() ) { - try - { - sal_Bool bBool = sal_False; - const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) ); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TEMPLATE_NAME, sTemplate ); - xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool; - if( bBool ) - mrExport.AddAttribute(pEntry->mnNameSpace, pEntry->meXMLName, XML_TRUE ); - } - catch( uno::Exception& ) + for( const XMLPropertyMapEntry* pEntry = &aXMLTableShapeAttributes[0]; pEntry->msApiName; pEntry++ ) { - DBG_ERROR("XMLShapeExport::ImpExportTableShape(), exception caught!"); + try + { + sal_Bool bBool = sal_False; + const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) ); + + xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool; + if( bBool ) + mrExport.AddAttribute(pEntry->mnNameSpace, pEntry->meXMLName, XML_TRUE ); + } + catch( uno::Exception& ) + { + DBG_ERROR("XMLShapeExport::ImpExportTableShape(), exception caught!"); + } } } } - } - uno::Reference< table::XColumnRowRange > xRange( xPropSet->getPropertyValue( msModel ), uno::UNO_QUERY_THROW ); - GetShapeTableExport()->exportTable( xRange ); + uno::Reference< table::XColumnRowRange > xRange( xPropSet->getPropertyValue( msModel ), uno::UNO_QUERY_THROW ); + GetShapeTableExport()->exportTable( xRange ); + } + } + + if( !bIsEmptyPresObj ) + { uno::Reference< graphic::XGraphic > xGraphic( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReplacementGraphic" ) ) ), uno::UNO_QUERY ); if( xGraphic.is() ) try { diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 98255edf68d0..6f9710392e2a 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1247,7 +1247,6 @@ void XMLEnhancedCustomShapeContext::EndElement() { switch( EASGet( pValues->Name ) ) { - case EAS_Position : case EAS_RangeYMinimum : case EAS_RangeYMaximum : case EAS_RangeXMinimum : @@ -1259,6 +1258,8 @@ void XMLEnhancedCustomShapeContext::EndElement() pValues->Value.getValue()), pH ); } break; + + case EAS_Position : case EAS_Polar : { CheckAndResolveEquationParameter( (*((com::sun::star::drawing::EnhancedCustomShapeParameterPair*) diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index e3bb398a6126..50e14db40e5d 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -146,39 +146,6 @@ void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTyp *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xMasterKey( reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ) ); - - const ServiceDescriptor* pDescriptor = getServiceDescriptors(); - while ( pDescriptor->getImplementationName ) - { - ::rtl::OUString sNewKeyName( RTL_CONSTASCII_USTRINGPARAM("/") ); - sNewKeyName += pDescriptor->getImplementationName(); - sNewKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); - - uno::Reference< registry::XRegistryKey > xNewKey( xMasterKey->createKey( sNewKeyName ) ); - - uno::Sequence< ::rtl::OUString > aServices = pDescriptor->getSupportedServiceNames(); - const ::rtl::OUString* pServices = aServices.getConstArray(); - for( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices ) - xNewKey->createKey( *pServices); - - ++pDescriptor; - } - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "xof::component_writeInfo: InvalidRegistryException!" ); - } - } - return sal_True; -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = NULL; diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk index bba8deb6db2b..031549fcb39b 100644 --- a/xmloff/source/transform/makefile.mk +++ b/xmloff/source/transform/makefile.mk @@ -93,3 +93,11 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk + +ALLTAR : $(MISC)/xof.component + +$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xof.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xof.component diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component new file mode 100644 index 000000000000..8f9c88f7fa0d --- /dev/null +++ b/xmloff/source/transform/xof.component @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.Calc.XMLContentImporter"> + <service name="com.sun.star.comp.Calc.XMLContentImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Calc.XMLImporter"> + <service name="com.sun.star.comp.Calc.XMLImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Calc.XMLMetaImporter"> + <service name="com.sun.star.comp.Calc.XMLMetaImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Calc.XMLSettingsImporter"> + <service name="com.sun.star.comp.Calc.XMLSettingsImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Calc.XMLStylesImporter"> + <service name="com.sun.star.comp.Calc.XMLStylesImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Chart.XMLContentImporter"> + <service name="com.sun.star.comp.Chart.XMLContentImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Chart.XMLImporter"> + <service name="com.sun.star.comp.Chart.XMLImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Chart.XMLStylesImporter"> + <service name="com.sun.star.comp.Chart.XMLStylesImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Draw.XMLContentImporter"> + <service name="com.sun.star.comp.Draw.XMLContentImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Draw.XMLImporter"> + <service name="com.sun.star.comp.Draw.XMLImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Draw.XMLMetaImporter"> + <service name="com.sun.star.comp.Draw.XMLMetaImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Draw.XMLSettingsImporter"> + <service name="com.sun.star.comp.Draw.XMLSettingsImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Draw.XMLStylesImporter"> + <service name="com.sun.star.comp.Draw.XMLStylesImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Impress.XMLContentImporter"> + <service name="com.sun.star.comp.Impress.XMLContentImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Impress.XMLImporter"> + <service name="com.sun.star.comp.Impress.XMLImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Impress.XMLMetaImporter"> + <service name="com.sun.star.comp.Impress.XMLMetaImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Impress.XMLSettingsImporter"> + <service name="com.sun.star.comp.Impress.XMLSettingsImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Impress.XMLStylesImporter"> + <service name="com.sun.star.comp.Impress.XMLStylesImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Math.XMLMetaImporter"> + <service name="com.sun.star.comp.Math.XMLMetaImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Math.XMLSettingsImporter"> + <service name="com.sun.star.comp.Math.XMLSettingsImporter"/> + </implementation> + <implementation name="com.sun.star.comp.OOo2OasisTransformer"> + <service name="com.sun.star.comp.OOo2OasisTransformer"/> + </implementation> + <implementation name="com.sun.star.comp.Oasis2OOoTransformer"> + <service name="com.sun.star.comp.Oasis2OOoTransformer"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"> + <service name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLContentImporter"> + <service name="com.sun.star.comp.Writer.XMLContentImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLImporter"> + <service name="com.sun.star.comp.Writer.XMLImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLMetaImporter"> + <service name="com.sun.star.comp.Writer.XMLMetaImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLSettingsImporter"> + <service name="com.sun.star.comp.Writer.XMLSettingsImporter"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLStylesImporter"> + <service name="com.sun.star.comp.Writer.XMLStylesImporter"/> + </implementation> + <implementation name="com.sun.star.document.XMLMetaImporter"> + <service name="com.sun.star.document.XMLMetaImporter"/> + </implementation> +</component> diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index b8745b6b8fff..857067985c50 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -86,3 +86,11 @@ DEF1DES =XML Office Lib # --- Targets ---------------------------------------------------------- .ENDIF .INCLUDE : target.mk + +ALLTAR : $(MISC)/xo.component + +$(MISC)/xo.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xo.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xo.component diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component new file mode 100644 index 000000000000..7fe2119636d1 --- /dev/null +++ b/xmloff/util/xo.component @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="SchXMLExport.Compact"> + <service name="com.sun.star.comp.Chart.XMLExporter"/> + </implementation> + <implementation name="SchXMLExport.Content"> + <service name="com.sun.star.comp.Chart.XMLContentExporter"/> + </implementation> + <implementation name="SchXMLExport.Oasis.Compact"> + <service name="com.sun.star.comp.Chart.XMLOasisExporter"/> + </implementation> + <implementation name="SchXMLExport.Oasis.Content"> + <service name="com.sun.star.comp.Chart.XMLOasisContentExporter"/> + </implementation> + <implementation name="SchXMLExport.Oasis.Meta"> + <service name="com.sun.star.comp.Chart.XMLOasisMetaExporter"/> + </implementation> + <implementation name="SchXMLExport.Oasis.Styles"> + <service name="com.sun.star.comp.Chart.XMLOasisStylesExporter"/> + </implementation> + <implementation name="SchXMLExport.Styles"> + <service name="com.sun.star.comp.Chart.XMLStylesExporter"/> + </implementation> + <implementation name="SchXMLImport"> + <service name="com.sun.star.comp.Chart.XMLOasisImporter"/> + </implementation> + <implementation name="SchXMLImport.Content"> + <service name="com.sun.star.comp.Chart.XMLOasisContentImporter"/> + </implementation> + <implementation name="SchXMLImport.Meta"> + <service name="com.sun.star.comp.Chart.XMLOasisMetaImporter"/> + </implementation> + <implementation name="SchXMLImport.Styles"> + <service name="com.sun.star.comp.Chart.XMLOasisStylesImporter"/> + </implementation> + <implementation name="XMLDrawContentExportOOO"> + <service name="com.sun.star.comp.Draw.XMLContentExporter"/> + </implementation> + <implementation name="XMLDrawContentExportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/> + </implementation> + <implementation name="XMLDrawExportOOO"> + <service name="com.sun.star.comp.Draw.XMLExporter"/> + </implementation> + <implementation name="XMLDrawExportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisExporter"/> + </implementation> + <implementation name="XMLDrawImportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisImporter"/> + </implementation> + <implementation name="XMLDrawMetaExportOOO"> + <service name="com.sun.star.comp.Draw.XMLMetaExporter"/> + </implementation> + <implementation name="XMLDrawMetaExportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/> + </implementation> + <implementation name="XMLDrawSettingsExportOOO"> + <service name="com.sun.star.comp.Draw.XMLSettingsExporter"/> + </implementation> + <implementation name="XMLDrawSettingsExportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/> + </implementation> + <implementation name="XMLDrawStylesExportOOO"> + <service name="com.sun.star.comp.Draw.XMLStylesExporter"/> + </implementation> + <implementation name="XMLDrawStylesExportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/> + </implementation> + <implementation name="XMLDrawingLayerExport"> + <service name="com.sun.star.comp.DrawingLayer.XMLExporter"/> + </implementation> + <implementation name="XMLImpressClipboardExport"> + <service name="com.sun.star.comp.Impress.XMLClipboardExporter"/> + </implementation> + <implementation name="XMLImpressContentExportOOO"> + <service name="com.sun.star.comp.Impress.XMLContentExporter"/> + </implementation> + <implementation name="XMLImpressContentExportOasis"> + <service name="com.sun.star.comp.Impress.XMLOasisContentExporter"/> + </implementation> + <implementation name="XMLImpressContentImportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisContentImporter"/> + <service name="com.sun.star.comp.Impress.XMLOasisContentImporter"/> + </implementation> + <implementation name="XMLImpressExportOOO"> + <service name="com.sun.star.comp.Impress.XMLExporter"/> + </implementation> + <implementation name="XMLImpressExportOasis"> + <service name="com.sun.star.comp.Impress.XMLOasisExporter"/> + </implementation> + <implementation name="XMLImpressImportOasis"> + <service name="com.sun.star.comp.Impress.XMLOasisImporter"/> + </implementation> + <implementation name="XMLImpressMetaExportOOO"> + <service name="com.sun.star.comp.Impress.XMLMetaExporter"/> + </implementation> + <implementation name="XMLImpressMetaExportOasis"> + <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/> + </implementation> + <implementation name="XMLImpressMetaImportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisMetaImporter"/> + <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/> + </implementation> + <implementation name="XMLImpressSettingsExportOOO"> + <service name="com.sun.star.comp.Impress.XMLSettingsExporter"/> + </implementation> + <implementation name="XMLImpressSettingsExportOasis"> + <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/> + </implementation> + <implementation name="XMLImpressSettingsImportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/> + <service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/> + </implementation> + <implementation name="XMLImpressStylesExportOOO"> + <service name="com.sun.star.comp.Impress.XMLStylesExporter"/> + </implementation> + <implementation name="XMLImpressStylesExportOasis"> + <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/> + </implementation> + <implementation name="XMLImpressStylesImportOasis"> + <service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/> + <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/> + </implementation> + <implementation name="XMLMetaExportComponent"> + <service name="com.sun.star.document.XMLOasisMetaExporter"/> + </implementation> + <implementation name="XMLMetaExportOOo"> + <service name="com.sun.star.document.XMLMetaExporter"/> + </implementation> + <implementation name="XMLMetaImportComponent"> + <service name="com.sun.star.document.XMLOasisMetaImporter"/> + </implementation> + <implementation name="XMLVersionListPersistence"> + <service name="com.sun.star.document.DocumentRevisionListPersistence"/> + </implementation> + <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"> + <service name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"/> + </implementation> + <implementation + name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"> + <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"/> + </implementation> + <implementation + name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"> + <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"/> + </implementation> + <implementation name="xmloff::AnimationsImport"> + <service name="com.sun.star.comp.Xmloff.AnimationsImport"/> + </implementation> +</component> diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst index 51b2891e4926..2f1ff7e37785 100644 --- a/xmlscript/prj/d.lst +++ b/xmlscript/prj/d.lst @@ -11,3 +11,4 @@ mkdir: %_DEST%\inc%_EXT%\xmlscript ..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd +..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index b95665eef01e..0d4d8db169ac 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -115,15 +115,6 @@ extern "C" // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::xmlscript::s_entries ); - } - - // ----------------------------------------------------------------------------- - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk index 3ccf63dc3b89..ba731470b2e4 100644 --- a/xmlscript/util/makefile.mk +++ b/xmlscript/util/makefile.mk @@ -74,3 +74,11 @@ $(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt @echo ------------------------------ @echo Making: $@ $(TYPE) xcr.flt > $@ + +ALLTAR : $(MISC)/xcr.component + +$(MISC)/xcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xcr.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xcr.component diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xcr.component new file mode 100644 index 000000000000..5ffe7f862fd7 --- /dev/null +++ b/xmlscript/util/xcr.component @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler"> + <service name="com.sun.star.xml.input.SaxDocumentHandler"/> + </implementation> + <implementation name="com.sun.star.comp.xmlscript.XMLBasicExporter"> + <service name="com.sun.star.document.XMLBasicExporter"/> + </implementation> + <implementation name="com.sun.star.comp.xmlscript.XMLBasicImporter"> + <service name="com.sun.star.document.XMLBasicImporter"/> + </implementation> + <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicExporter"> + <service name="com.sun.star.document.XMLOasisBasicExporter"/> + </implementation> + <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter"> + <service name="com.sun.star.document.XMLOasisBasicImporter"/> + </implementation> +</component> |
