diff options
63 files changed, 76 insertions, 2702 deletions
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst index 620d0e7f0cba..1ef391627a63 100644 --- a/configmgr/prj/build.lst +++ b/configmgr/prj/build.lst @@ -1,7 +1,6 @@ cg configmgr : offapi comphelper cppuhelper tools vos NULL cg configmgr usr1 - all cg_mkout NULL cg configmgr\inc nmake - all cg_inc NULL -cg configmgr\source\cmdtools nmake - all cg_cmdtools cg_inc NULL cg configmgr\source\misc nmake - all cg_misc cg_inc NULL cg configmgr\source\data nmake - all cg_data cg_inc NULL cg configmgr\source\tree nmake - all cg_tree cg_inc NULL @@ -14,6 +13,6 @@ cg configmgr\source\api2 nmake - all cg_api2 cg_inc NULL cg configmgr\source\treemgr nmake - all cg_treemgr cg_inc NULL cg configmgr\source\registry nmake - all cg_reg cg_inc NULL cg configmgr\source\platformbe nmake - all cg_platformbe cg_inc NULL -cg configmgr\util nmake - all cg_util cg_platformbe cg_api cg_api2 cg_cmdtools cg_misc cg_reg cg_trcache cg_data cg_tree cg_treemgr cg_xml cg_backend cg_localbe NULL +cg configmgr\util nmake - all cg_util cg_platformbe cg_api cg_api2 cg_misc cg_reg cg_trcache cg_data cg_tree cg_treemgr cg_xml cg_backend cg_localbe NULL cg configmgr\source\localbe nmake - all cg_localbe cg_inc NULL diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst index 2a85e1a9f13e..3f4a1d35a121 100644 --- a/configmgr/prj/d.lst +++ b/configmgr/prj/d.lst @@ -6,8 +6,5 @@ mkdir: %_DEST%\inc%_EXT%\configmgr ..\%__SRC%\bin\behelper*.dll %_DEST%\bin%_EXT%\behelper*.dll ..\%__SRC%\bin\configmg*.dll %_DEST%\bin%_EXT%\configmg*.dll ..\%__SRC%\bin\sysmgr*.dll %_DEST%\bin%_EXT%\sysmgr*.dll -..\%__SRC%\bin\setofficelang.exe %_DEST%\bin%_EXT%\setofficelang.exe -..\%__SRC%\bin\setofficelang %_DEST%\bin%_EXT%\setofficelang.bin -..\%__SRC%\misc\setofficelang.sh %_DEST%\bin%_EXT%\setofficelang ..\%__SRC%\misc\configmgr2.uno.xml %_DEST%\xml%_EXT%\configmgr2.uno.xml diff --git a/configmgr/qa/unit/configmgrrc b/configmgr/qa/unit/configmgrrc index 66c561726e9b..b162e77c2e00 100644 --- a/configmgr/qa/unit/configmgrrc +++ b/configmgr/qa/unit/configmgrrc @@ -18,5 +18,5 @@ CFG_BackendService=com.sun.star.comp.configuration.backend.MultiStratumBackend CFG_SchemaSupplier=com.sun.star.comp.configuration.backend.LocalSchemaSupplier CFG_LocalDataSvc=com.sun.star.comp.configuration.backend.LocalStratum CFG_LocalModuleDataSvc=com.sun.star.comp.configuration.backend.LocalMultiStratum -# CFG_Strata=${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;?com.sun.star.comp.configuration.backend.SystemIntegration:;?com.sun.star.comp.configuration.backend.PolicyLayerBackend:;${CFG_LocalDataSvc}:$CFG_UserLayerUrl +# CFG_Strata=${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UserLayerUrl CFG_Strata=${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalDataSvc}:$CFG_UserLayerUrl diff --git a/configmgr/source/api2/apinotifierimpl.cxx b/configmgr/source/api2/apinotifierimpl.cxx index 9edf8f22c557..3e7fe8585a4b 100644 --- a/configmgr/source/api2/apinotifierimpl.cxx +++ b/configmgr/source/api2/apinotifierimpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: apinotifierimpl.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.14.1 $ * * This file is part of OpenOffice.org. * @@ -243,13 +243,6 @@ void implAddListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans::X OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot add listener - node not found:")) += ex.message(), rNode.getUnoInstance() ); } - catch (configuration::WrappedUnoException& ex) - { - throw css::lang::WrappedTargetException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: adding a listener failed: ")) += ex.message(), - rNode.getUnoInstance(), - ex.getAnyUnoException()); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -280,13 +273,6 @@ void implRemoveListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot remove listener - node not found:")) += ex.message(), rNode.getUnoInstance() ); } - catch (configuration::WrappedUnoException& ex) - { - throw css::lang::WrappedTargetException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: removing a listener failed: ")) += ex.message(), - rNode.getUnoInstance(), - ex.getAnyUnoException()); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -318,13 +304,6 @@ void implAddListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans::X OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot add listener - node not found:")) += ex.message(), rNode.getUnoInstance() ); } - catch (configuration::WrappedUnoException& ex) - { - throw css::lang::WrappedTargetException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: adding a listener failed: ")) += ex.message(), - rNode.getUnoInstance(), - ex.getAnyUnoException()); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -353,13 +332,6 @@ void implRemoveListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot remove listener - node not found:")) += ex.message(), rNode.getUnoInstance() ); } - catch (configuration::WrappedUnoException& ex) - { - throw css::lang::WrappedTargetException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: removing a listener failed: ")) += ex.message(), - rNode.getUnoInstance(), - ex.getAnyUnoException()); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); diff --git a/configmgr/source/api2/elementimpl.cxx b/configmgr/source/api2/elementimpl.cxx index 61f17d6adde4..eefd476a3294 100644 --- a/configmgr/source/api2/elementimpl.cxx +++ b/configmgr/source/api2/elementimpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: elementimpl.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.14.1 $ * * This file is part of OpenOffice.org. * @@ -473,13 +473,6 @@ void implCommitChanges( UpdateRootElement& rElement ) throw(css::lang::WrappedTa rElement.getCommitter().commit(); } - // map configuration::Exceptions - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rElement.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration: can't commit Changes: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); diff --git a/configmgr/source/api2/propsetaccessimpl.cxx b/configmgr/source/api2/propsetaccessimpl.cxx index 58337f6fa772..fa5d195d45d9 100644 --- a/configmgr/source/api2/propsetaccessimpl.cxx +++ b/configmgr/source/api2/propsetaccessimpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: propsetaccessimpl.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.4.1 $ * * This file is part of OpenOffice.org. * @@ -377,12 +377,6 @@ void implSetPropertyValue( NodeGroupAccess& rNode, const OUString& sPropertyName Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw PropertyVetoException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -462,12 +456,6 @@ void implSetPropertyValues( NodeGroupAccess& rNode, const Sequence< OUString >& Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw PropertyVetoException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -550,12 +538,6 @@ void implSetHierarchicalPropertyValue( NodeGroupAccess& rNode, const OUString& a Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw PropertyVetoException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -642,12 +624,6 @@ void implSetHierarchicalPropertyValues( NodeGroupAccess& rNode, const Sequence< Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw PropertyVetoException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -697,12 +673,6 @@ Any implGetPropertyValue( NodeGroupInfoAccess& rNode,const OUString& aPropertyNa Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw UnknownPropertyException( e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Property Value: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -958,12 +928,6 @@ beans::PropertyState implGetPropertyState( NodeAccess& rNode, const OUString& sP Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw UnknownPropertyException( e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get PropertyState: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -1289,12 +1253,6 @@ Any implGetPropertyDefault( NodeGroupInfoAccess& rNode, const OUString& sPropert Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw UnknownPropertyException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Default: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -1357,12 +1315,6 @@ Sequence< Any > implGetPropertyDefaults( NodeGroupInfoAccess& rNode, const Seque Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw UnknownPropertyException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Default: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); diff --git a/configmgr/source/api2/updateimpl.cxx b/configmgr/source/api2/updateimpl.cxx index 9a0ccf843e6f..c8a509da9fbb 100644 --- a/configmgr/source/api2/updateimpl.cxx +++ b/configmgr/source/api2/updateimpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: updateimpl.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.14.1 $ * * This file is part of OpenOffice.org. * @@ -159,12 +159,6 @@ void implReplaceByName(NodeGroupAccess& rNode, const OUString& sName, const Any& e.setContext( rNode.getUnoInstance() ); e.illegalArgument(2); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Value: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -244,12 +238,6 @@ void implReplaceByName(NodeTreeSetAccess& rNode, const OUString& sName, const An e.setContext( rNode.getUnoInstance() ); e.illegalArgument(2); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -319,12 +307,6 @@ void implReplaceByName(NodeValueSetAccess& rNode, const OUString& sName, const A e.setContext( rNode.getUnoInstance() ); e.illegalArgument(2); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -396,12 +378,6 @@ void implInsertByName(NodeTreeSetAccess& rNode, const OUString& sName, const Any e.setContext( rNode.getUnoInstance() ); e.illegalArgument(2); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot insert into Set: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -469,12 +445,6 @@ void implInsertByName(NodeValueSetAccess& rNode, const OUString& sName, const An e.setContext( rNode.getUnoInstance() ); e.illegalArgument(2); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot insert into Set: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -534,12 +504,6 @@ void implRemoveByName(NodeTreeSetAccess& rNode, const OUString& sName ) Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw NoSuchElementException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot remove Set Element: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); @@ -596,12 +560,6 @@ void implRemoveByName(NodeValueSetAccess& rNode, const OUString& sName ) Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); throw NoSuchElementException( sMessage += e.message(), xContext ); } - catch (configuration::WrappedUnoException& ex) - { - Reference<uno::XInterface> xContext( rNode.getUnoInstance() ); - OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot remove Set Element: ") ); - throw WrappedTargetException( sMessage += ex.extractMessage(), xContext, ex.getAnyUnoException() ); - } catch (configuration::Exception& ex) { ExceptionMapper e(ex); diff --git a/configmgr/source/cmdtools/makefile.mk b/configmgr/source/cmdtools/makefile.mk index 3ecec92fcf73..e69de29bb2d1 100644 --- a/configmgr/source/cmdtools/makefile.mk +++ b/configmgr/source/cmdtools/makefile.mk @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.13 $ -# -# 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 = ..$/.. -PRJNAME = configmgr -PRJINC = $(PRJ)$/source -TARGET = cmdtools -LIBTARGET = NO -ENABLE_EXCEPTIONS = TRUE - -# Targettype should be CUI, but we need to be able to run the tools on Windows -# without a shell: -.IF "$(GUI)" == "WNT" -TARGETTYPE = GUI -APP1NOSAL = TRUE -.ELSE -TARGETTYPE = CUI -.ENDIF - -.INCLUDE: settings.mk - -APP1TARGET = setofficelang -APP1OBJS = \ - $(OBJ)$/setofficelang.obj \ - $(OBJ)$/unomain.obj -APP1STDLIBS = \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -OBJFILES = $(APP1OBJS) - -UNIXTEXT = $(MISC)/setofficelang.sh - -.INCLUDE: target.mk diff --git a/configmgr/source/cmdtools/setofficelang.cxx b/configmgr/source/cmdtools/setofficelang.cxx index 3fcff6363a21..e69de29bb2d1 100644 --- a/configmgr/source/cmdtools/setofficelang.cxx +++ b/configmgr/source/cmdtools/setofficelang.cxx @@ -1,355 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: setofficelang.cxx,v $ - * $Revision: 1.6 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_configmgr.hxx" - -#include <stdio.h> - -#include "unomain.hxx" - -#include <osl/thread.h> -#include <rtl/ustring.hxx> - -//============================================================================= -const int OPERATION_SUCCEEDED = 0; -const int ERROR_LANGUAGE_NOT_SUPPORTED = 1; -const int ERROR_INVALID_ARGS = 2; -const int ERROR_RUNTIME_FAILURE = 3; -//============================================================================= - -rtl::OUString const k_BaseSettingsPath( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); -rtl::OUString const k_AppSettingsPath( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Linguistic/General")); -rtl::OUString const k_LocaleListSetting( RTL_CONSTASCII_USTRINGPARAM("Office/InstalledLocales") ); -rtl::OUString const k_LocaleSetting( RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale") ); -rtl::OUString const k_UILocaleSetting( RTL_CONSTASCII_USTRINGPARAM("UILocale") ); - -//============================================================================= -static inline rtl::OString narrow(rtl::OUString const & aString) -{ - return rtl::OUStringToOString( aString, osl_getThreadTextEncoding() ); -} -//============================================================================= -static void usage() -{ - rtl::OString sApp = narrow( unoapp::getAppCommandPath() ); - - fprintf(stderr, "%s - set the user interface language " - "of a OpenOffice.org/StarOffice/StarSuite " - "installation\n", sApp.getStr()); - fprintf(stderr, "\nusage : %s [-afcpl] <language> ..\n", sApp.getStr()); - fprintf(stderr, "\n Options:" - "\n -a Change the default language of the installation. " - "\n This may require administrative rights. " - "\n -f Force selection of language. " - "\n Skips the check if this language is installed. " - "\n -c Display current active language. " - "\n -p Display current preferred language. " - "\n -l List all installed languages. "); - fprintf(stderr, "\n <language> - A language specified by its ISO code (e.g. 'en-US','de') or '-' for default. " - "\n This language must be supported by the office installation\n" - "\n If multiple languages are listed, the first one that is installed is used.\n"); - fprintf(stderr, "\nResult codes: 0 - Setting language successfull" - "\n 1 - The language is not supported by this office installation" - "\n 2 - Invalid arguments" - "\n 3 - An internal error occurred\n"); - fflush(stdout); -} - -//--------------------------------------------------------------------------- - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/util/XChangesBatch.hpp> -#include <com/sun/star/container/XNameReplace.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/uno/Sequence.hxx> -namespace uno = ::com::sun::star::uno; -namespace lang = ::com::sun::star::lang; -namespace util = ::com::sun::star::util; -namespace beans = ::com::sun::star::beans; -namespace container = ::com::sun::star::container; -using rtl::OUString; -//--------------------------------------------------------------------------- - -static uno::Reference< lang::XMultiServiceFactory > createProvider(uno::Reference< uno::XComponentContext > const & xContext, bool bAdmin=false); -static uno::Reference< uno::XInterface > createView(uno::Reference< lang::XMultiServiceFactory > const & xProvider, OUString const & aNodepath, bool bUpdate = false); -static uno::Reference< util::XChangesBatch > createUpdateView(uno::Reference< lang::XMultiServiceFactory > const & xProvider, OUString const & aNodepath); -static void disposeComponent(uno::BaseReference const & xComp); -// -------------------------------------------------------------------------- - -int SAL_CALL unoapp::uno_main(uno::Reference< uno::XComponentContext > const & xContext) - SAL_THROW( (uno::Exception) ) -{ - // get args - uno::Sequence< OUString > const aArgs( getAppCommandArgs() ); - - sal_Int32 const nArgC = aArgs.getLength(); - - sal_Int32 ix = 0; - - // get options - bool bAdminMode = false; - bool bForce = false; - bool bShowCurrentLang = false; - bool bShowSelectedLang = false; - bool bListInstalledLangs = false; - - bool bInfoRequest = false; - - while (ix < nArgC && aArgs[ix].matchAsciiL("-",1)) - { - sal_Int32 const nOptCount = aArgs[ix].getLength() -1; - if (nOptCount <= 0) - { - // a lone "-" means set-to-default-locale - break; - } - - sal_Unicode const * const pOpts = aArgs[ix].getStr() + 1; - for (sal_Int32 opt = 0; opt < nOptCount; ++opt) - { - switch (pOpts[opt]) - { - case 'a': bAdminMode = true; break; - case 'f': bForce = true; break; - case 'c': bShowCurrentLang = true; bInfoRequest = true; break; - case 'p': bShowSelectedLang = true; bInfoRequest = true; break; - case 'l': bListInstalledLangs = true; bInfoRequest = true; break; - default: - usage(); - return ERROR_INVALID_ARGS; - } - } - - ++ix; - } - - if ((nArgC <= ix) && !bInfoRequest) - { - // no more remaining args and no info request - usage(); - return ERROR_INVALID_ARGS; - } - - try - { - uno::Reference< lang::XMultiServiceFactory > xProvider = createProvider(xContext); - uno::Reference< lang::XMultiServiceFactory > xAppProvider = createProvider(xContext,bAdminMode); - OSL_ASSERT( xProvider.is()); - OSL_ASSERT( xAppProvider.is()); - uno::Reference< container::XHierarchicalNameAccess > xBaseSettings( - createView(xProvider,k_BaseSettingsPath), uno::UNO_QUERY_THROW ); - - if (bShowCurrentLang) - { - rtl::OUString aCurrentLocaleU; - if (!(xBaseSettings->getByHierarchicalName(k_LocaleSetting) >>= aCurrentLocaleU) ) - return ERROR_RUNTIME_FAILURE; - - rtl::OString aCurrentLocale = ::rtl::OUStringToOString(aCurrentLocaleU, RTL_TEXTENCODING_ASCII_US); - printf("%s\n", aCurrentLocale.getStr()); - } - if (bShowSelectedLang) - { - uno::Reference< container::XNameAccess > xAppSettings( createView(xAppProvider,k_AppSettingsPath), uno::UNO_QUERY_THROW ); - rtl::OUString aSelectedLocaleU; - if (!(xAppSettings->getByName(k_UILocaleSetting) >>= aSelectedLocaleU) ) - return ERROR_RUNTIME_FAILURE; - - rtl::OString aSelectedLocale = ::rtl::OUStringToOString(aSelectedLocaleU, RTL_TEXTENCODING_ASCII_US); - if (aSelectedLocale.getLength() == 0) aSelectedLocale="-"; - printf("%s\n", aSelectedLocale.getStr()); - - disposeComponent(xAppSettings); - } - - uno::Reference< container::XNameAccess > xSupportedLocales; - xBaseSettings->getByHierarchicalName(k_LocaleListSetting) >>= xSupportedLocales; - - if (bListInstalledLangs) - { - if (!xSupportedLocales.is()) - return ERROR_RUNTIME_FAILURE; - - uno::Sequence< OUString > aSupportedLocales = xSupportedLocales->getElementNames(); - for (sal_Int32 i=0; i<aSupportedLocales.getLength(); ++i) - { - rtl::OString aLocale = ::rtl::OUStringToOString(aSupportedLocales[i], RTL_TEXTENCODING_ASCII_US); - printf("%s\n", aLocale.getStr()); - } - } - if (nArgC > ix) - { - bool bLocaleFound = false; - - uno::Reference< util::XChangesBatch > xAppView = createUpdateView(xAppProvider,k_AppSettingsPath); - uno::Reference< container::XNameReplace > xSettings(xAppView, uno::UNO_QUERY_THROW); - - if (!xSupportedLocales.is()) - return ERROR_RUNTIME_FAILURE; - - for ( ; ix < nArgC; ++ix) - { - OUString const aTargetLocale = aArgs[ix]; - if (aTargetLocale.equalsAscii("-")) - { - uno::Reference< beans::XPropertyState > xSettingsState(xSettings, uno::UNO_QUERY); - // if we can't reset, we treat this as unsupported language - if (!xSettingsState.is()) - continue; - - bLocaleFound = true; - xSettingsState->setPropertyToDefault(k_UILocaleSetting); - xAppView->commitChanges(); - break; - } - else if (bForce || xSupportedLocales->hasByName(aTargetLocale)) - { - bLocaleFound = true; - xSettings->replaceByName(k_UILocaleSetting, uno::makeAny(aTargetLocale)); - xAppView->commitChanges(); - break; - } - } - - disposeComponent(xAppView); - - if (!bLocaleFound) - return ERROR_LANGUAGE_NOT_SUPPORTED; - } - disposeComponent(xBaseSettings); - if (xAppProvider != xProvider) - disposeComponent(xAppProvider); - disposeComponent(xProvider); - } - catch (uno::Exception & e) - { - fprintf(stderr, "\nERROR: - An exception occurred: '%s'\n", narrow(e.Message).getStr()); - return ERROR_RUNTIME_FAILURE; - } - return OPERATION_SUCCEEDED; -} -// -------------------------------------------------------------------------- - -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/ServiceNotRegisteredException.hpp> -#include <com/sun/star/beans/NamedValue.hpp> -#include <rtl/ustrbuf.hxx> -namespace lang = com::sun::star::lang; -namespace beans = com::sun::star::beans; - -// -------------------------------------------------------------------------- -static uno::Reference< uno::XInterface > createService(uno::Reference< uno::XComponentContext > const & xContext, OUString aService) -{ - - uno::Reference< lang::XMultiComponentFactory > xFactory = xContext->getServiceManager(); - if (!xFactory.is()) - { - rtl::OUStringBuffer sMsg; - sMsg.appendAscii("Missing object ! "); - sMsg.appendAscii("UNO context has no service manager."); - - throw uno::RuntimeException(sMsg.makeStringAndClear(),NULL); - } - - uno::Reference< uno::XInterface > xInstance = xFactory->createInstanceWithContext(aService,xContext); - if (!xInstance.is()) - { - rtl::OUStringBuffer sMsg; - sMsg.appendAscii("Missing service ! "); - sMsg.appendAscii("Service manager can't instantiate service "); - sMsg.append(aService).appendAscii(". "); - - throw lang::ServiceNotRegisteredException(sMsg.makeStringAndClear(),NULL); - } - - return xInstance; -} - -// -------------------------------------------------------------------------- -static uno::Reference< lang::XMultiServiceFactory > createProvider(uno::Reference< uno::XComponentContext > const & xContext, bool bAdmin) -{ - static const rtl::OUString kProvider( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")) ; - static const rtl::OUString kAdminProvider( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.AdministrationProvider")) ; - - const rtl::OUString & selectedProvider = bAdmin ? kAdminProvider : kProvider; - - uno::Reference< lang::XMultiServiceFactory > xRet( createService(xContext,selectedProvider), uno::UNO_QUERY_THROW ); - - return xRet; -} -// -------------------------------------------------------------------------- -static uno::Reference< uno::XInterface > createView(uno::Reference< lang::XMultiServiceFactory > const & xProvider, OUString const & aNodepath, bool bUpdate) -{ - static const OUString kInfoViewService( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")) ; - static const OUString kUpdateViewService( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")) ; - static const OUString kNodepath(RTL_CONSTASCII_USTRINGPARAM("nodepath")) ; - static const OUString kAsync(RTL_CONSTASCII_USTRINGPARAM("EnableAsync")) ; - - const OUString & kViewService = bUpdate ? kUpdateViewService : kInfoViewService; - uno::Sequence< uno::Any > aViewArgs(2); - aViewArgs[0] <<= beans::NamedValue( kNodepath, uno::makeAny(aNodepath) ); - aViewArgs[1] <<= beans::NamedValue( kAsync, uno::makeAny(sal_False) ); - - uno::Reference< uno::XInterface > xView( xProvider->createInstanceWithArguments(kViewService,aViewArgs) ); - return xView; -} -// -------------------------------------------------------------------------- -//#if OSL_DEBUG_LEVEL > 0 -#if 0 // currently not used in debug builds! -static uno::Reference< container::XHierarchicalNameAccess > createInfoView(uno::Reference< lang::XMultiServiceFactory > const & xProvider, OUString const & aNodepath) -{ - uno::Reference< container::XHierarchicalNameAccess > xView( createView(xProvider,aNodepath, false), uno::UNO_QUERY_THROW ); - return xView; -} -#endif -// -------------------------------------------------------------------------- -static uno::Reference< util::XChangesBatch > createUpdateView(uno::Reference< lang::XMultiServiceFactory > const & xProvider, OUString const & aNodepath) -{ - uno::Reference< util::XChangesBatch > xView( createView(xProvider,aNodepath,true), uno::UNO_QUERY_THROW ); - return xView; -} - -// -------------------------------------------------------------------------- -static void disposeComponent(uno::BaseReference const & xComp) -{ - uno::Reference< lang::XComponent > xComponent(xComp,uno::UNO_QUERY); - if (xComponent.is()) - xComponent->dispose(); -} - -// -------------------------------------------------------------------------- - - diff --git a/configmgr/source/cmdtools/setofficelang.sh b/configmgr/source/cmdtools/setofficelang.sh index 98664e4d84d4..e69de29bb2d1 100644 --- a/configmgr/source/cmdtools/setofficelang.sh +++ b/configmgr/source/cmdtools/setofficelang.sh @@ -1,102 +0,0 @@ -#!/bin/sh -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: setofficelang.sh,v $ -# -# $Revision: 1.2 $ -# -# 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. -# -#************************************************************************* - -# enable file locking -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_prog="`pwd`" - -cd .. -sd_binary=`basename "$0"`".bin" -sd_inst="`pwd`" - -# change back directory -cd "$sd_cwd" - -# check if all required patches are installed -if [ -x "$sd_prog/sopatchlevel.sh" ]; then - "$sd_prog/sopatchlevel.sh" - if [ $? -eq 1 ]; then - exit 0 - fi -fi - -# set search path for shared libraries -sd_platform=`uname -s` -case $sd_platform in - AIX) - LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}} - export LIBPATH - ;; - - Darwin) - 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}} - export SHLIB_PATH - ;; - - IRIX*) - LD_LIBRARYN32_PATH=${sd_prog}${LD_LIBRARYN32_PATH+:${LD_LIBRARYN32_PATH}} - export LD_LIBRARYN32_PATH - ;; - - *) - LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} - export LD_LIBRARY_PATH - ;; -esac - -# misc. environment variables -unset XENVIRONMENT - -# set path so that other apps can be started just by name -PATH="$sd_prog":$PATH -export PATH - -# execute binary -exec "$sd_prog/$sd_binary" "$@" diff --git a/configmgr/source/cmdtools/unomain.cxx b/configmgr/source/cmdtools/unomain.cxx index 4d8647ed003e..e69de29bb2d1 100644 --- a/configmgr/source/cmdtools/unomain.cxx +++ b/configmgr/source/cmdtools/unomain.cxx @@ -1,145 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: unomain.cxx,v $ - * $Revision: 1.7 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_configmgr.hxx" - -#include <stdio.h> - -#include "unomain.hxx" - -#include <sal/main.h> - -#include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/bootstrap.hxx> - -#include <rtl/string.hxx> - -#include <rtl/process.h> -#include <osl/thread.h> -#include <osl/file.h> - -namespace uno = ::com::sun::star::uno; - -namespace -{ - struct AutoDispose - { - typedef uno::Reference< ::com::sun::star::lang::XComponent > Component; - AutoDispose() - : component() - {} - - ~AutoDispose() - { - if (component.is()) - component->dispose(); - } - - void set( Component const & xComp ) - { - component = xComp; - } - void set( uno::BaseReference const & xComp ) - { - component.set(xComp,uno::UNO_QUERY); - } - - Component component; - }; -} - -::rtl::OUString SAL_CALL unoapp::getAppCommandURL() -{ - rtl::OUString aURL; - OSL_VERIFY( osl_Process_E_None == osl_getExecutableFile(&aURL.pData) ); - return aURL; -} - -::rtl::OUString SAL_CALL unoapp::getAppCommandPath() -{ - rtl::OUString const aURL = getAppCommandURL(); - - rtl::OUString aPath; - OSL_VERIFY( osl_File_E_None == osl_getSystemPathFromFileURL(aURL.pData,&aPath.pData) ); - - return aPath; -} - -::rtl::OUString SAL_CALL unoapp::getAppCommandName() -{ - rtl::OUString aURL = getAppCommandURL(); - - sal_Int32 const nNameIndex = aURL.lastIndexOf( sal_Unicode('/') ); - - return aURL.copy(nNameIndex+1); -} - -uno::Sequence< ::rtl::OUString > SAL_CALL unoapp::getAppCommandArgs() -{ - sal_uInt32 const count = rtl_getAppCommandArgCount(); - - uno::Sequence< ::rtl::OUString > aResult( count ); - ::rtl::OUString * pResult = aResult.getArray(); - - for (sal_uInt32 i = 0; i < count; ++i) - { - rtl_getAppCommandArg( i, & pResult[i].pData); - } - - return aResult; -} - -bool unoapp::g_bQuiet = false; - -SAL_IMPLEMENT_MAIN() -{ - AutoDispose aDisposer; - try - { - uno::Reference< uno::XComponentContext > xUnoContext = cppu::defaultBootstrap_InitialComponentContext(); - - aDisposer.component.set( xUnoContext, uno::UNO_QUERY ); - - return unoapp::uno_main(xUnoContext); - } - catch (uno::Exception & e) - { - using namespace rtl; - OString sApp = OUStringToOString( unoapp::getAppCommandName(), osl_getThreadTextEncoding() ); - OString sMessage = OUStringToOString( e.Message, osl_getThreadTextEncoding() ); - - if (!unoapp::g_bQuiet) - fprintf( stderr, "%s - Unhandled exception caught in main: \"%s\"\n", sApp.getStr(), sMessage.getStr() ); - - return 42; - } -} - diff --git a/configmgr/source/cmdtools/unomain.hxx b/configmgr/source/cmdtools/unomain.hxx index 5714e3d964bd..e69de29bb2d1 100644 --- a/configmgr/source/cmdtools/unomain.hxx +++ b/configmgr/source/cmdtools/unomain.hxx @@ -1,63 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: unomain.hxx,v $ - * $Revision: 1.4 $ - * - * 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_UNOMAIN_HXX -#define INCLUDED_UNOMAIN_HXX - -#include <rtl/ustring.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> - -namespace unoapp -{ -//----------------------------------------------------------------------------- - namespace uno = ::com::sun::star::uno; - - /// helper: retrieves the full file URL of the application - extern ::rtl::OUString SAL_CALL getAppCommandURL(); - /// helper: retrieves the full system path of the application - extern ::rtl::OUString SAL_CALL getAppCommandPath(); - /// helper: retrieves the name of the application - extern ::rtl::OUString SAL_CALL getAppCommandName(); - /// helper: retrieves all the commandline arguments of the application (skipping -env: arguments) - extern uno::Sequence< ::rtl::OUString > SAL_CALL getAppCommandArgs(); - - /// global variable that allows to suppress all error output from the unoapp launcher, if set to <TRUE/> - extern bool g_bQuiet; - - /// entrypoint that must be implemented by the application - extern int SAL_CALL uno_main( uno::Reference< uno::XComponentContext > const & xContext) - SAL_THROW( (uno::Exception) ); -//----------------------------------------------------------------------------- -} - - -#endif // INCLUDED_UNOMAIN_HXX diff --git a/configmgr/source/inc/configexcept.hxx b/configmgr/source/inc/configexcept.hxx index b982de7a1491..fd39c68709b2 100644 --- a/configmgr/source/inc/configexcept.hxx +++ b/configmgr/source/inc/configexcept.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: configexcept.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.4.1 $ * * This file is part of OpenOffice.org. * @@ -89,25 +89,6 @@ namespace configmgr virtual OUString message() const; }; //------------------------------------------------------------------------- - - class WrappedUnoException : public Exception - { - uno::Any m_aUnoException; - public: - WrappedUnoException(uno::Any const& aUnoException); - - OUString extractMessage() const; - uno::Exception extractUnoException() const; - uno::Any const& getAnyUnoException() const; - - virtual OUString message() const; - }; - template <class Except> - WrappedUnoException rethrowWrapped(Except const& anException) - { - throw WrappedUnoException( uno::makeAny(anException) ); - } - //------------------------------------------------------------------------- } //----------------------------------------------------------------------------- diff --git a/configmgr/source/treemgr/configexcept.cxx b/configmgr/source/treemgr/configexcept.cxx index b86734703d24..4cd32a423f1b 100644 --- a/configmgr/source/treemgr/configexcept.cxx +++ b/configmgr/source/treemgr/configexcept.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: configexcept.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.4.1 $ * * This file is part of OpenOffice.org. * @@ -133,45 +133,6 @@ namespace configmgr return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(c_sTypeMismatch)).concat( m_sTypes ); } //----------------------------------------------------------------------------- - - WrappedUnoException::WrappedUnoException(uno::Any const& aUnoException) - : Exception("UNO Service failed") - , m_aUnoException(aUnoException) - { - OSL_ENSURE( m_aUnoException.getValueTypeClass() == uno::TypeClass_EXCEPTION, - "ERROR: Wrapping a non-exception into a WrappedUnoException !"); - - } - //--------------------------------------------------------------------- - - OUString WrappedUnoException::extractMessage() const - { - return extractUnoException().Message; - } - //--------------------------------------------------------------------- - - uno::Exception WrappedUnoException::extractUnoException() const - { - uno::Exception e; - OSL_VERIFY( m_aUnoException >>= e ); - return e; - } - //--------------------------------------------------------------------- - - uno::Any const& WrappedUnoException::getAnyUnoException() const - { - return m_aUnoException; - } - //--------------------------------------------------------------------- - - OUString WrappedUnoException::message() const - { - return OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGMGR: Used Service failed with a")) - += m_aUnoException.getValueType().getTypeName() - += OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) - += extractMessage(); - } -//----------------------------------------------------------------------------- } namespace configapi diff --git a/configmgr/source/treemgr/configgroup.cxx b/configmgr/source/treemgr/configgroup.cxx index 8ed0ab510ef7..a62516a1051f 100644 --- a/configmgr/source/treemgr/configgroup.cxx +++ b/configmgr/source/treemgr/configgroup.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: configgroup.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.14.1 $ * * This file is part of OpenOffice.org. * @@ -197,8 +197,6 @@ bool convertCompatibleValue(UnoTypeConverter const& xTypeConverter, uno::Any& rC catch(css::script::CannotConvertException&) { // try to do more conversion here ?! - - // throw a WrappedUnoException here ?! return false; } catch(uno::Exception&) diff --git a/connectivity/qa/connectivity/makefile.mk b/connectivity/qa/connectivity/makefile.mk index c02518add3b3..9dd5daf4e92e 100644 --- a/connectivity/qa/connectivity/makefile.mk +++ b/connectivity/qa/connectivity/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.60.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/connectivity #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ $(TARGET).java diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index 191ee0b22dfe..499db941f81a 100644 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.60.1 $ # # This file is part of OpenOffice.org. # @@ -44,7 +44,7 @@ all: #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar # Do not use $/ with the $(FIND) command as for W32-4nt this leads to a backslash # in a posix command. In this special case use / instead of $/ .IF "$(GUI)"=="OS2" diff --git a/connectivity/qa/drivers/dbase/makefile.mk b/connectivity/qa/drivers/dbase/makefile.mk index 2448a0811e16..63a4d5a25569 100644 --- a/connectivity/qa/drivers/dbase/makefile.mk +++ b/connectivity/qa/drivers/dbase/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.60.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/connectivity #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ DBaseDateFunctions.java\ DBaseDriverTest.java\ diff --git a/connectivity/qa/drivers/jdbc/makefile.mk b/connectivity/qa/drivers/jdbc/makefile.mk index e9d72040ae13..1e641bdd6241 100644 --- a/connectivity/qa/drivers/jdbc/makefile.mk +++ b/connectivity/qa/drivers/jdbc/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.26.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/connectivity #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ LongVarCharTest.java diff --git a/embeddedobj/qa/embedding/makefile.mk b/embeddedobj/qa/embedding/makefile.mk index 6b249e7c292a..1d516e77e2e0 100644 --- a/embeddedobj/qa/embedding/makefile.mk +++ b/embeddedobj/qa/embedding/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.14.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/embedding #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ EmbeddingUnitTest.java\ diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk index 0c7413fac425..d635ce250f1b 100644 --- a/embeddedobj/test/Container1/makefile.mk +++ b/embeddedobj/test/Container1/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.14.1 $ # # This file is part of OpenOffice.org. # @@ -44,7 +44,7 @@ PACKAGE = embeddedobj$/test #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar JAVAFILES = \ EmbedContApp.java\ diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk index cc2bf747baed..31abe2725847 100644 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ b/framework/qa/complex/ModuleManager/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,7 @@ PACKAGE = complex$/ModuleManager #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ OOoRunner.jar mysql.jar JAVAFILES = CheckXModuleManager.java diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk index 6985f034794c..1658a6db799d 100644 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ b/framework/qa/complex/XUserInputInterception/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.76.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/XUserInputInterception #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +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) diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk index c9cb211523a7..36556d6f03fe 100755 --- a/framework/qa/complex/api_internal/makefile.mk +++ b/framework/qa/complex/api_internal/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/api_internal #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar mysql.jar +JARFILES = mysql.jar sandbox.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) diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk index 65d20b563ec3..6f20fc5aa474 100755 --- a/framework/qa/complex/broken_document/makefile.mk +++ b/framework/qa/complex/broken_document/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/broken_document #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar sandbox.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) diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk index 502b927442d0..b9cfad982ded 100644 --- a/framework/qa/complex/contextMenuInterceptor/makefile.mk +++ b/framework/qa/complex/contextMenuInterceptor/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = contextMenuInterceptor #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar mysql.jar sandbox.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) diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk index 476afc0b3b78..22f1824d7540 100755 --- a/framework/qa/complex/desktop/makefile.mk +++ b/framework/qa/complex/desktop/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/desktop #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +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) diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/framework/qa/complex/dispatches/helper/makefile.mk index 4a0acfedb712..ab8ad5c1d4d9 100644 --- a/framework/qa/complex/dispatches/helper/makefile.mk +++ b/framework/qa/complex/dispatches/helper/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/dispatches$/helper #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ Generator.jar OOoRunner.jar JAVAFILES = Interceptor.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk index 8e93f97943ff..cd74271e1a15 100644 --- a/framework/qa/complex/dispatches/makefile.mk +++ b/framework/qa/complex/dispatches/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.76.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/dispatches #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ OOoRunner.jar mysql.jar ConnectivityTools.jar JAVAFILES = checkdispatchapi.java diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk index 304731884467..1dd1194db1af 100755 --- a/framework/qa/complex/disposing/makefile.mk +++ b/framework/qa/complex/disposing/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/disposing #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar sandbox.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) diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk index 0d41bffbdb8b..1a2e633fb433 100644 --- a/framework/qa/complex/framework/autosave/makefile.mk +++ b/framework/qa/complex/framework/autosave/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.76.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/framework$/autosave #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +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) diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk index e7a164785aeb..fb08f7438399 100755 --- a/framework/qa/complex/framework/recovery/makefile.mk +++ b/framework/qa/complex/framework/recovery/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/framework$/recovery #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = RecoveryTest.java RecoveryTools.java CrashThread.java TimeoutThread.java KlickButtonThread.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk index f06054a8de50..d9da36437e25 100755 --- a/framework/qa/complex/imageManager/interfaces/makefile.mk +++ b/framework/qa/complex/imageManager/interfaces/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = imageManager$/interfaces #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = sandbox.jar 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 diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk index a796464f5016..eb52b2beba1d 100755 --- a/framework/qa/complex/imageManager/makefile.mk +++ b/framework/qa/complex/imageManager/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = imageManager #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar mysql.jar sandbox.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) diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/qa/complex/loadAllDocuments/helper/makefile.mk index 82cee7115dd7..9ea874686ce5 100644 --- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk +++ b/framework/qa/complex/loadAllDocuments/helper/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.76.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/loadAllDocuments$/helper #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ Generator.jar JAVAFILES = InteractionHandler.java StatusIndicator.java StreamSimulator.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk index d226ccc9c611..8b43eb76c1f2 100644 --- a/framework/qa/complex/loadAllDocuments/makefile.mk +++ b/framework/qa/complex/loadAllDocuments/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.76.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/loadAllDocuments #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +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) diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk index b328d591248c..605c95a68468 100755 --- a/framework/qa/complex/path_settings/makefile.mk +++ b/framework/qa/complex/path_settings/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/path_settings #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar mysql.jar +JARFILES = sandbox.jar 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) diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk index 760e3e492d2d..3ca7dadd9953 100755 --- a/framework/qa/complex/path_substitution/makefile.mk +++ b/framework/qa/complex/path_substitution/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/path_substitution #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar mysql.jar +JARFILES = sandbox.jar 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) diff --git a/framework/qa/complex/sequence/makefile.mk b/framework/qa/complex/sequence/makefile.mk index 5091a93760d7..97b9e7dbb220 100755 --- a/framework/qa/complex/sequence/makefile.mk +++ b/framework/qa/complex/sequence/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/sequence #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar CheckSequenceOfEnum.jar +JARFILES = mysql.jar sandbox.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 diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk index 991369d5f86a..b53b25c76c39 100644 --- a/linguistic/qa/complex/linguistic/makefile.mk +++ b/linguistic/qa/complex/linguistic/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.24.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/linguistic #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ +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) diff --git a/officecfg/org/openoffice/configuration/Decoder.java b/officecfg/org/openoffice/configuration/Decoder.java index c17381a20d3e..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/Decoder.java +++ b/officecfg/org/openoffice/configuration/Decoder.java @@ -1,382 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Decoder.java,v $ - * $Revision: 1.5 $ - * - * 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 org.openoffice.configuration; - - -/** - * Title: Decoder - * Description: decoding of set element names given encoded (base64) - */ -public class Decoder extends Object -{ - //=========================================================== - // encoding table - //=========================================================== - static final int[] aEncodingTable = - { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '.' }; - - static class ModifiedUTF7Buffer extends Object - { - StringBuffer aBuffer; - int nValue; - int nFilled = 0; - - public ModifiedUTF7Buffer(StringBuffer _aBuffer) - { - aBuffer = _aBuffer; - } - - public void write(char c) - { - switch (nFilled) - { - case 0: - nValue = ((int)c) << 8; - nFilled = 2; - break; - case 1: - nValue |= ((int)c); - nFilled = 3; - flush(); - break; - case 2: - nValue |= ((int)c) >> 8; - nFilled = 3; - flush(); - nValue = (((int)c) & 0xFF) << 16; - nFilled = 1; - break; - } - } - - void flush() - { - switch (nFilled) - { - case 1: - aBuffer.append((char)aEncodingTable[nValue >> 18]); - aBuffer.append((char)aEncodingTable[nValue >> 12 & 63]); - break; - - case 2: - aBuffer.append((char)aEncodingTable[nValue >> 18]); - aBuffer.append((char)aEncodingTable[nValue >> 12 & 63]); - aBuffer.append((char)aEncodingTable[nValue >> 6 & 63]); - break; - - case 3: - aBuffer.append((char)aEncodingTable[nValue >> 18]); - aBuffer.append((char)aEncodingTable[nValue >> 12 & 63]); - aBuffer.append((char)aEncodingTable[nValue >> 6 & 63]); - aBuffer.append((char)aEncodingTable[nValue & 63]); - break; - } - nFilled = 0; - nValue = 0; - } - }; - - - //=========================================================== - // decoding table - //=========================================================== - static final int[] aModifiedBase64 - = { 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 65, 65, // !"#$%&' - 65, 65, 65, 65, 65, 62, 63, 65, // ()*+,-./ - 52, 53, 54, 55, 56, 57, 58, 59, // 01234567 - 60, 61, 65, 65, 65, 65, 65, 65, // 89:;<=>? - 65, 0, 1, 2, 3, 4, 5, 6, // @ABCDEFG - 7, 8, 9, 10, 11, 12, 13, 14, // HIJKLMNO - 15, 16, 17, 18, 19, 20, 21, 22, // PQRSTUVW - 23, 24, 25, 65, 65, 65, 65, 64, // XYZ[\]^_ - 65, 26, 27, 28, 29, 30, 31, 32, // `abcdefg - 33, 34, 35, 36, 37, 38, 39, 40, // hijklmno - 41, 42, 43, 44, 45, 46, 47, 48, // pqrstuvw - 49, 50, 51, 65, 65, 65, 65, 65 // xyz{|}~ - }; - - static boolean isUsAsciiAlphaDigit(char c) - { - return isUsAsciiAlphaDigit(c,true); - } - - static boolean isUsAsciiAlphaDigit(char c, boolean bDigitAllowed) - { - return c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' - || bDigitAllowed && c >= '0' && c <= '9'; - } - - static boolean write(int nUTF16Char, StringBuffer pBuffer, boolean bInitial) - { - if (isUsAsciiAlphaDigit((char)nUTF16Char, !bInitial) - || !bInitial&& (nUTF16Char == (int)'-' || nUTF16Char == (int)'.')) - return false; - pBuffer.append((char)nUTF16Char); - return true; - } - - //=========================================================== - // return the next position after the decoded part - // or -1 if an invalid character was found - //=========================================================== - static int decodeModifiedUTF7(String sSource, int nStartPos, - boolean bInitial, StringBuffer aBuffer) - { - final int nEnd = sSource.length(); - - int nUTF16Char = 0; - int nFilled = 0; - for (int nPos = nStartPos; nPos < nEnd; ++nPos) - { - - char c = sSource.charAt(nPos); - - int nc = (int)c; - int nDigit = nc < 128 ? aModifiedBase64[nc] : 65; - - switch (nDigit) - { - default: // valid character - switch (nFilled) - { - case 2: - nUTF16Char |= nDigit >> 2; - if (!write(nUTF16Char, aBuffer, bInitial)) - return -1; - break; - - case 5: - nUTF16Char |= nDigit >> 4; - if (!write(nUTF16Char, aBuffer, bInitial)) - return -1; - break; - - case 7: - nUTF16Char |= nDigit; - if (!write(nUTF16Char, aBuffer, bInitial)) - return -1; - break; - } - bInitial = false; - switch (nFilled) - { - - case 0: - nUTF16Char = nDigit << 10; - ++nFilled; - break; - - case 1: - nUTF16Char |= nDigit << 4; - ++nFilled; - break; - - case 2: - nUTF16Char = (nDigit & 3) << 14; - ++nFilled; - break; - - case 3: - nUTF16Char |= nDigit << 8; - ++nFilled; - break; - - case 4: - nUTF16Char |= nDigit << 2; - ++nFilled; - break; - - case 5: - nUTF16Char = (nDigit & 15) << 12; - ++nFilled; - break; - - case 6: - nUTF16Char |= nDigit << 6; - ++nFilled; - break; - - case 7: - nFilled = 0; - break; - } - break; - - case 64: // terminating '_' - switch (nFilled) - { - case 3: - case 6: - if (nUTF16Char != 0) - break; - case 0: - // success - return ++nPos; - } - case 65: // invalid character - return -1; - } - } - return -1; - } - - // return null, if the string was invalid - public static String decodeValid(String sSource) - { - StringBuffer aTarget = new StringBuffer(); - - final int nEnd = sSource.length(); - - int nPos = 0; - int nCopyEnd = 0; - - while(nPos < nEnd) - { - char c = sSource.charAt(nPos); - if (!isUsAsciiAlphaDigit(c, nPos != 0)) - switch (c) - { - case '_': - aTarget.append(sSource.substring(nCopyEnd, nPos )); - ++nPos; - - nPos = decodeModifiedUTF7(sSource, nPos, nPos == 1, aTarget); - if (nPos < 0) - return null; - - nCopyEnd = nPos; - continue; - - case '-': - case '.': - if (nPos != 0) - break; - default: - return null; - } - ++nPos; - } - - // System.out.println("Encoded string:" + sSource); - if (nCopyEnd == 0) - return sSource; - else - { - aTarget.append(sSource.substring(nCopyEnd)); - // System.out.println("Decoded string:" + aTarget.toString()); - return aTarget.toString(); - } - } - - // return the original value, if the string was invalid - public static String decode(String sSource) - { - String sResult = decodeValid(sSource); - System.out.println("Encoded string:" + sSource); - if (sResult == null) - System.out.println("Decoded string:" + "null"); - else - System.out.println("Decoded string:" + sResult); - return sResult != null ? sResult : sSource; - } - - public static String encode(String sSource) - { - StringBuffer aTarget = new StringBuffer(); - final int nEnd = sSource.length(); - int nCopyEnd = 0; - int nPos = 0; - while(nPos < nEnd) - { - char c = sSource.charAt(nPos); - if (!isUsAsciiAlphaDigit(c, nPos != 0)) - switch (c) - { - case '-': - case '.': - if (nPos != 0) - break; - default: - aTarget.append(sSource.substring(nCopyEnd, nPos )); - aTarget.append('_'); - - ModifiedUTF7Buffer aBuffer = new ModifiedUTF7Buffer(aTarget); - for (;;) - { - aBuffer.write(c); - nPos++; - if (nPos == nEnd) - break; - c = sSource.charAt(nPos); - if (isUsAsciiAlphaDigit(c) || c == '-' || c == '.') - break; - } - aBuffer.flush(); - aTarget.append('_'); - nCopyEnd = nPos; - continue; - } - nPos++; - } - - if (nCopyEnd == 0) - return sSource; - else - { - aTarget.append(sSource.substring(nCopyEnd)); - return aTarget.toString(); - } - } - - - public static void main(String args[]) - { - if (args.length != 1) - System.out.println("Usage : Convert filname"); - - String str = Decoder.decode(args[0]); - if(str == null) { - System.out.println("Our String is null"); - } else { - System.out.println("Our String " + str); - } - } - -} - - diff --git a/officecfg/org/openoffice/configuration/FileHelper.java b/officecfg/org/openoffice/configuration/FileHelper.java index d2a0ae0d4a53..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/FileHelper.java +++ b/officecfg/org/openoffice/configuration/FileHelper.java @@ -1,74 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: FileHelper.java,v $ - * $Revision: 1.5 $ - * - * 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 org.openoffice.configuration; -import java.io.*; - - -/** - * Title: File - * Description: decoding of set element names given encoded (base64) - */ -public class FileHelper extends Object -{ - // returns true if a file exists, otherwise false - public static boolean exists(String sSource) - { - File aFile = new File(sSource); - - try { - System.out.println("Path: " + aFile.getAbsoluteFile().toURL().toString()); - } catch (Exception e) - { - e.printStackTrace(); - } - return aFile.exists(); - } - - public static String makeAbs(String sSource) - { - String absPath = new String(); - File aFile = new File(sSource); - - try { - absPath = aFile.toURL().toString(); - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6351751 - if (absPath.substring(0, 5) == "file:" && absPath.substring(5, 7) != "//") - absPath = "file://" + absPath.substring(5, absPath.length()); - if (absPath.charAt(absPath.length()-1) == '/') - absPath = absPath.substring(0, absPath.length()-1); - } catch (Exception e) - { - e.printStackTrace(); - } - return absPath; - } -} - - diff --git a/officecfg/org/openoffice/configuration/Generator.java b/officecfg/org/openoffice/configuration/Generator.java index 3a15cde1b733..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/Generator.java +++ b/officecfg/org/openoffice/configuration/Generator.java @@ -1,97 +0,0 @@ - -/** - * Title: Import of configuration schemas<p> - * Description: <p> - * Copyright: Copyright (c) <p> - * Company: <p> - * @author - * @version 1.0 - */ -package org.openoffice.configuration; - -import java.util.*; -import java.io.*; -import com.jclark.xsl.sax.Driver; - -public class Generator { - - public Generator() throws Exception - { - // set the driver for xt - System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser"); - } - - /** - * creating a abs path of a source path - */ - static public String getAbsolutePath(String orgPath) throws IOException - { - String absolutePath = new String(); - if (orgPath.length() > 0) - { - StringTokenizer tokenizer = new StringTokenizer(orgPath, File.pathSeparator); - absolutePath = new File(tokenizer.nextToken()).getAbsoluteFile().toURL().toString(); - while (tokenizer.hasMoreTokens()) - { - absolutePath += File.pathSeparator; - absolutePath += tokenizer.nextToken(); - } - } - return absolutePath; - } - - public void generate(String argv []) throws Exception - { - try - { - // make sure that all directories exist - argv[2] = new File(argv[2]).getAbsoluteFile().toString(); - File path = new File(argv[2]).getParentFile().getAbsoluteFile(); - path.mkdirs(); - - Driver.main(argv); - - String[] args = new String[1]; - args[0] = argv[2]; - Trim.main(args); - } - catch (Exception e) - { - e.printStackTrace(); - throw e; - } - } - - public static void main (String argv []) - { - if (argv.length < 4) { - System.err.println ("Usage: cmd <filename> <xsl-file> <out-file> <include-path> [transformation parameters]"); - System.err.println ("<filename>: Configuration description file"); - System.err.println ("<xsl-file>: transformation file"); - System.err.println ("<out-file>: output file"); - System.err.println ("<include-path>: Path where to find imported configuration files"); - System.exit (1); - } - - try - { - Generator generator = new Generator(); - - String[] args = new String[argv.length + 1]; - for (int i = 0; i < argv.length; i++) - args[i] = argv[i]; - - // handle the path parameter for the source - args[3] = "path=" + getAbsolutePath(argv[3]); - args[argv.length] = "pathSeparator=" + File.pathSeparator; - - // create the instance file - generator.generate((String[])args.clone()); - } - catch (Exception pce) { - // Parser with specified options can't be built - pce.printStackTrace(); - System.exit (1); - } - } -} diff --git a/officecfg/org/openoffice/configuration/Inspector.java b/officecfg/org/openoffice/configuration/Inspector.java index e15de4c90f28..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/Inspector.java +++ b/officecfg/org/openoffice/configuration/Inspector.java @@ -1,179 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Inspector.java,v $ - * $Revision: 1.4 $ - * - * 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 org.openoffice.configuration; - -import java.io.*; -import org.xml.sax.*; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; - -/** - * Title: Inspector - * Description: Validates an xml document against a dtd and retrieves the necessary - package and component informations<p> - */ -public class Inspector extends HandlerBase -{ - public java.lang.String componentName; - public java.lang.String packageName; - public java.lang.String categoryName; - public java.lang.String transformationFile; - - public Inspector() - { - componentName = new String(); - packageName = new String(); - transformationFile = new String("instance.xsl"); - } - - //=========================================================== - // SAX DocumentHandler methods - //=========================================================== - public InputSource resolveEntity(java.lang.String publicId, - java.lang.String systemId) - throws SAXException - { - // take the transformation file 'instance2.xsl' if schema.description2.dtd is used - if (new File(systemId).getName().equalsIgnoreCase("schema.description2.dtd")) - transformationFile = "instance2.xsl"; - - return new InputSource(systemId); - } - - - //=========================================================== - // SAX DocumentHandler methods - //=========================================================== - - public void setDocumentLocator (Locator l) - { - // Save this to resolve relative URIs or to give diagnostics. - System.out.println ("** Start validating: " + l.getSystemId()); - } - - public void startElement(java.lang.String name, - AttributeList attributes) throws SAXException - { - if (componentName.length() == 0 && name == "schema:component") - { - componentName = attributes.getValue("cfg:name"); - packageName = attributes.getValue("cfg:package"); - categoryName = attributes.getValue("schema:category"); - - if (categoryName == null) - categoryName = new String("PrivateApplProfile"); - } - } - - public void startDocument () - throws SAXException - { - } - - public void endDocument () - throws SAXException - { - System.out.println ("** Document is valid!"); - } - - //=========================================================== - // SAX ErrorHandler methods - //=========================================================== - - // treat validation errors as fatal - public void error (SAXParseException e) - throws SAXParseException - { - throw e; - } - - // dump warnings too - public void warning (SAXParseException err) - throws SAXParseException - { - System.out.println ("** Warning" - + ", line " + err.getLineNumber () - + ", uri " + err.getSystemId ()); - System.out.println(" " + err.getMessage ()); - } - - //=========================================================== - // Helpers ... - //=========================================================== - - public static void main (String argv []) - { - if (argv.length != 1) { - System.err.println ("Usage: cmd filename"); - System.exit (1); - } - // Use the validating parser - SAXParserFactory factory = SAXParserFactory.newInstance(); - factory.setValidating(true); - try - { - // Parse the input - SAXParser saxParser = factory.newSAXParser(); - saxParser.parse( new File(argv [0]), new Inspector() ); - } - catch (SAXParseException spe) { - // Error generated by the parser - System.out.println ("\n** Parsing error" - + ", line " + spe.getLineNumber () - + ", uri " + spe.getSystemId ()); - System.out.println(" " + spe.getMessage() ); - System.exit (1); - } - catch (SAXException sxe) { - // Error generated by this application - // (or a parser-initialization error) - Exception x = sxe; - if (sxe.getException() != null) - x = sxe.getException(); - x.printStackTrace(); - System.exit (1); - } - catch (ParserConfigurationException pce) { - // Parser with specified options can't be built - pce.printStackTrace(); - System.exit (1); - - } - catch (IOException ioe) { - // I/O error - ioe.printStackTrace(); - System.exit (1); - } - - System.exit (0); - } - -} diff --git a/officecfg/org/openoffice/configuration/Trim.java b/officecfg/org/openoffice/configuration/Trim.java index 6eedd52f2d08..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/Trim.java +++ b/officecfg/org/openoffice/configuration/Trim.java @@ -1,49 +0,0 @@ - -/** - * Title: Import of configuration schemas<p> - * Description: <p> - * Copyright: Copyright (c) <p> - * Company: <p> - * @author - * @version 1.0 - */ -package org.openoffice.configuration; - -import java.util.*; -import java.io.*; - -class Trim -{ - public static void main (String argv []) - { - try - { - BufferedReader reader = new BufferedReader(new FileReader(argv[0])); - FileWriter out = new FileWriter(argv[0] + ".trim" ,false); - String line = ""; - boolean hadLine = false; - while ((line = reader.readLine()) != null) - { - if (line.trim().length() > 0) - { - hadLine = true; - out.write(line); - out.write("\n"); - } - else if (hadLine) - { - out.write("\n"); - hadLine = false; - } - } - out.flush(); - out.close(); - reader.close(); - - new File(argv[0]).delete(); - new File(argv[0] + ".trim").renameTo(new File(argv[0])); - } - catch (Exception e) - {} - } -}
\ No newline at end of file diff --git a/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java b/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java index d419f2120701..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java +++ b/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java @@ -1,234 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: XMLDefaultGenerator.java,v $ - * $Revision: 1.6 $ - * - * 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 org.openoffice.configuration; - -import org.xml.sax.*; -import org.w3c.dom.*; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.SAXParser; -import java.util.*; -import java.io.*; -import com.jclark.xsl.sax.Driver; - -/** - * Title: XMLDefaultGenerator<p> - * Description: Tool for generating configuration default data<p> - */ -public class XMLDefaultGenerator { - - public static final String FILE_EXT = ".xml"; - - protected String packageName = null; - protected String componentName = null; - protected String categoryName = null; - protected String transformationFile = null; - - /** - * construct the generator by validation of the source file - */ - public XMLDefaultGenerator(String sourceFile) throws Exception - { - // set the driver for xt - System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser"); - evaluateSchema(sourceFile); - } - - public String getComponentName() {return componentName;} - public String getPackageName() {return packageName;} - public String getCategoryName() {return categoryName;} - - /** - * construct the generator by validation of the source file - */ - protected void evaluateSchema(String schemaFile) throws Exception - { - try - { - SAXParserFactory factory = SAXParserFactory.newInstance(); - // factory.setValidating(true); - - // Parse the input - SAXParser saxParser = factory.newSAXParser(); - Inspector inspector = new Inspector(); - saxParser.parse( new File(new File(schemaFile).getAbsolutePath()).toURL().toString(), inspector ); - - // get the necessary information for generation - packageName = inspector.packageName; - componentName = inspector.componentName; - categoryName = inspector.categoryName; - transformationFile = inspector.transformationFile; - } - catch (SAXParseException spe) { - // Error generated by the parser - System.out.println ("\n** Parsing error" - + ", line " + spe.getLineNumber () - + ", uri " + spe.getSystemId ()); - System.out.println(" " + spe.getMessage() ); - throw spe; - } - catch (SAXException sxe) { - // Error generated by this application - // (or a parser-initialization error) - Exception x = sxe; - if (sxe.getException() != null) - x = sxe.getException(); - x.printStackTrace(); - throw sxe; - } - catch (IOException ioe) { - // I/O error - ioe.printStackTrace(); - throw ioe; - } - catch (Exception pce) { - // Parser with specified options can't be built - pce.printStackTrace(); - throw pce; - } - } - - /** - * creating the destination file name - */ - public String getTargetName(String aRoot, String aKind) throws Exception - { - String aRelPath = packageName.replace('.', File.separatorChar); - - // create the instance directory - File aFile = new File(aRoot + File.separatorChar + aKind + File.separatorChar + - aRelPath + File.separatorChar + componentName + FILE_EXT); - - return aFile.getPath(); - } - - /** - * generating the target document - */ - public void generate(String argv [], boolean asTemplate) throws Exception - { - // add the necessary transformation parameters - { - String[] args = new String[argv.length + 1]; - for (int i = 0; i < argv.length; i++) - args[i] = argv[i]; - - args[1] = argv[1] + File.separator + transformationFile; - - // handle the path parameter for the source - args[3] = "path=" + Generator.getAbsolutePath(argv[3]); - args[argv.length] = "pathSeparator=" + File.pathSeparator; - argv = args; - } - - try - { - // make sure that all directories exist - File path = new File(argv[2]).getParentFile(); - path.mkdirs(); - - String[] args = null; - // templates need a new argument, which is used for - // as parameter for the xsl translation - if (asTemplate) - { - args = new String[argv.length + 1]; - for (int i = 0; i < argv.length; i++) - args[i] = argv[i]; - - args[argv.length] = "templates=true"; - } - else - args = argv; - - Driver.main(args); - } - catch (Exception e) - { - e.printStackTrace(); - throw e; - } - } - - /** - * generating the instance document - */ - protected void generateInstanceFile(String argv []) throws Exception - { - argv[2] = getTargetName(argv[2], "instance"); - generate(argv, false); - } - - /** - * generating the template document - */ - protected void generateTemplateFile(String argv []) throws Exception - { - argv[2] = getTargetName(argv[2], "template"); - generate(argv, true); - } - - public static void main (String argv []) - { - if (argv.length < 4) { - System.err.println ("Usage: cmd <filename> <xsldir> <outdir> <include-path> [transformation parameters]"); - System.err.println ("<filename>: Configuration description file"); - System.err.println ("<xsldir>: Directory where to locate the transformation files used"); - System.err.println ("<outdir>: Directory where to generate the output files"); - System.err.println ("<include-path>: Path where to find imported configuration files"); - System.exit (1); - } - - try - { - XMLDefaultGenerator generator = new XMLDefaultGenerator(argv [0]); - - String[] args = new String[argv.length + 1]; - for (int i = 0; i < argv.length; i++) - args[i] = argv[i]; - - String url = new File(argv[2] + File.separator + "template") - .getAbsoluteFile().toURL().toString(); - args[argv.length] = "templateURL=" + url; - - // create the instance file - generator.generateInstanceFile((String[])args.clone()); - - // create the template file - generator.generateTemplateFile((String[])args.clone()); - } - catch (Exception pce) { - // Parser with specified options can't be built - pce.printStackTrace(); - System.exit (1); - } - } -} diff --git a/officecfg/org/openoffice/configuration/makefile.mk b/officecfg/org/openoffice/configuration/makefile.mk index 05e2dc4085fb..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/configuration/makefile.mk +++ b/officecfg/org/openoffice/configuration/makefile.mk @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.14 $ -# -# 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=..$/..$/.. - -PRJNAME=officecfg -TARGET =cfgimport -PACKAGE=org$/openoffice$/configuration - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -JARFILES = xml-apis.jar xercesImpl.jar - -JAVACLASSFILES= \ - $(CLASSDIR)$/$(PACKAGE)$/XMLDefaultGenerator.class \ - $(CLASSDIR)$/$(PACKAGE)$/Generator.class \ - $(CLASSDIR)$/$(PACKAGE)$/Trim.class \ - $(CLASSDIR)$/$(PACKAGE)$/Decoder.class \ - $(CLASSDIR)$/$(PACKAGE)$/Inspector.class - -JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -RC_SUBDIRSDEPS=$(JAVATARGET) - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - -.IF "$(JARTARGETN)"!="" -$(JARTARGETN) : $(JAVACLASSFILES) $(JAVATARGET) -.ENDIF # "$(JARTARGETN)"!="" - diff --git a/officecfg/org/openoffice/helper/DefaultNamespaceRemover.java b/officecfg/org/openoffice/helper/DefaultNamespaceRemover.java index 47747b701084..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/helper/DefaultNamespaceRemover.java +++ b/officecfg/org/openoffice/helper/DefaultNamespaceRemover.java @@ -1,96 +0,0 @@ -/** - * Title: workaround for xslt bug with default namespaces - * Description: removes the first default namespace from a given xml file<p> - * Copyright: null<p> - * Company: null<p> - * @author Svante Schubert - * @version 1.0 - */ -package org.openoffice.helper; - -import java.io.*; - - -public class DefaultNamespaceRemover -{ - private static final boolean debug = false; - - public static void main (String argv []) - { - - if (argv.length != 2){ - System.err.println("Usage: "); - System.err.println("DefaultNamespaceRemover <inputfile> <outputfile>"); - System.exit(1); - } - - //****************************** - //parse and write the html file - //****************************** - try{ - - BufferedReader in = new BufferedReader(new InputStreamReader (new FileInputStream (argv[0]), "UTF8")); - BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(argv[1]), "UTF8")); - String sLine = null; - StringBuffer sBuffer = null; - boolean isNamespaceRemoved = false; - int nodeIndex1 = -1; - int nodeIndex2 = -1; - int delimiterIndex1 = -1; - int delimiterIndex2 = -1; - String lineEnd = System.getProperty("line.separator"); - - while((sLine = in.readLine()) != null) - { - // as long the namespace has to be removed - if(isNamespaceRemoved){ - out.write(sLine + lineEnd); - if(debug) System.out.println(sLine + lineEnd); - }else{ - //see if a defaultnamespace exists in the input line - if((nodeIndex1 = sLine.indexOf("xmlns=")) != -1 || (nodeIndex2 = sLine.indexOf("xmlns =")) != -1) - { - // take the valid starting point of the default namespace node - if(nodeIndex1 == -1) - nodeIndex1 = nodeIndex2; - - // for possible delimiter " see if it exist after default namespace node, then get the next - if((delimiterIndex1 = sLine.indexOf('\"', nodeIndex1)) != -1) - delimiterIndex1 = sLine.indexOf('\"', delimiterIndex1 + 1); - - // for possible delimiter ' see if it exist after default namespace node, then get the next - if((delimiterIndex2 = sLine.indexOf('\'', nodeIndex2)) != -1) - delimiterIndex2 = sLine.indexOf('\'', delimiterIndex2 + 1); - - // if the first delimiter ('"') does not exist in string, take the other for granted - if(delimiterIndex1 == -1) - delimiterIndex1 = delimiterIndex2; - // otherwise both delimiters exist, so get the first - else if(delimiterIndex2 != -1) - if(delimiterIndex2 < delimiterIndex1) - delimiterIndex1 = delimiterIndex2; - - sBuffer = new StringBuffer(sLine); - // +2 for the delimiter itself and the following space - sBuffer.delete(nodeIndex1, delimiterIndex1 + 2); - out.write(new String(sBuffer) + lineEnd); - if(debug) System.out.println(new String(sBuffer) + lineEnd); - isNamespaceRemoved = true; - }else{ - out.write(sLine + lineEnd); - if(debug) System.out.println(sLine + lineEnd); - } - } - } - in.close(); - out.flush(); - if(out != null) - out.close(); - } - catch(Exception e) - { - System.out.println("Error by parsing the html file: "+e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/officecfg/org/openoffice/helper/PrettyPrinter.java b/officecfg/org/openoffice/helper/PrettyPrinter.java index cbae59a4d57f..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/helper/PrettyPrinter.java +++ b/officecfg/org/openoffice/helper/PrettyPrinter.java @@ -1,297 +0,0 @@ -/** - * Title: pretty printing for xml files - * Description: Validates an xml document against a dtd<p> - * Copyright: null<p> - * Company: null<p> - * @author Dirk Grobler - * @version 1.4 - */ -package org.openoffice.helper; - -import java.io.*; -import org.xml.sax.*; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; - -public class PrettyPrinter extends HandlerBase -{ - /* for debugging - static private java.io.PrintWriter logf = null; - private void log(String msg) { logf.println(msg); } - private void logcall(String method) - { log( indentLevel + ": " + method + "()" ); } - private void logcall(String method,String arg) - { log( indentLevel + ": " + method + "(\""+arg+"\")" ); } - private void logcall(String method,String arg, Object arg2) - { log( indentLevel + ": " + method + "(\""+arg+"\", " + arg2 + ")" ); } - /* -- */ - - public static void main (String argv []) - { - if (argv.length != 2) { - System.err.println ("Usage: cmd filename outfile"); - System.exit (1); - } - - // Use the validating parser - SAXParserFactory factory = SAXParserFactory.newInstance(); - factory.setValidating(false); - try { - - // logf = new java.io.PrintWriter(new BufferedWriter( new OutputStreamWriter(new FileOutputStream(argv[1]+".pp.log"), "UTF8"))); - - // Set the output file - out = new java.io.BufferedWriter(new OutputStreamWriter(new FileOutputStream(argv[1]), "UTF8")); - - // Parse the input - SAXParser saxParser = factory.newSAXParser(); - saxParser.parse( new File(argv [0]), new PrettyPrinter() ); - - if (out != null) - out.close(); - - // logf.close(); - - } catch (SAXParseException spe) { - // Error generated by the parser - System.out.println ("\n** Parsing error" - + ", line " + spe.getLineNumber () - + ", uri " + spe.getSystemId ()); - System.out.println(" " + spe.getMessage() ); - - // Use the contained exception, if any - Exception x = spe; - if (spe.getException() != null) - x = spe.getException(); - x.printStackTrace(); - - } catch (SAXException sxe) { - // Error generated by this application - // (or a parser-initialization error) - Exception x = sxe; - if (sxe.getException() != null) - x = sxe.getException(); - x.printStackTrace(); - - } catch (ParserConfigurationException pce) { - // Parser with specified options can't be built - pce.printStackTrace(); - - } catch (IOException ioe) { - // I/O error - ioe.printStackTrace(); - } - - System.exit (0); - } - - static private java.io.BufferedWriter out = null; - private String indentString = "\t"; // Amount to indent - private boolean bHasContentOrSubElements = true; - private int indentLevel = 0; - - private static int NONE = 0; - private static int START_ELEMENT = 1; - private static int CONTENT = 2; - private static int END_ELEMENT = 3; - private int nStatus = NONE; - - //=========================================================== - // replacing XML conform - //=========================================================== - private String transform(String aSource) - { - int nLen = aSource.length(); - StringBuffer aBuffer = new StringBuffer(nLen); - for (int i = 0; i < nLen; i++) - { - char c = aSource.charAt(i); - switch (c) - { - case '<': - aBuffer.append("<"); - break; - case '>': - aBuffer.append(">"); - break; - case '&': - aBuffer.append("&"); - break; - case '"': - aBuffer.append("""); - break; - case '\'': - aBuffer.append("'"); - break; - default: - aBuffer.append(c); - } - } - return aBuffer.toString(); - } - - //=========================================================== - // SAX DocumentHandler methods - //=========================================================== - - public void setDocumentLocator (Locator l) - { - } - - public void startDocument () - throws SAXException - { - // logcall( "startDocument" ); - emit ("<?xml version='1.0' encoding='UTF-8'?>"); - nl(); - } - - public void endDocument () - throws SAXException - { - // logcall( "endDocument" ); - nl(); - try { - nl(); - out.flush (); - } catch (IOException e) { - throw new SAXException ("I/O error", e); - } - } - - public void startElement (String name, AttributeList attrs) - throws SAXException - { - // logcall( "startElement", name, attrs ); - if (indentLevel != 0 && (nStatus == START_ELEMENT)) - emit (">"); - - nStatus = START_ELEMENT; - - nl(); emit ("<"+ name); - if (attrs != null) { - for (int i = 0; i < attrs.getLength (); i++) { - emit (" "); - emit (attrs.getName (i)); - emit ("="); - emit ("\""); - emit (transform(attrs.getValue (i))); - emit ("\""); - } - } - indentLevel++; - } - - public void endElement (String name) - throws SAXException - { - // logcall( "endElement", name ); - indentLevel--; - if (nStatus == START_ELEMENT) - emit ("/>"); - else - { - // treat the value special - if (nStatus != CONTENT) -// if (name != "value" && name != "defaultvalue") - nl(); - emit ("</"+name+">"); - } - nStatus = END_ELEMENT; - } - - public void characters (char buf [], int offset, int len) - throws SAXException - { - String s = new String(buf, offset, len); - - // ignore some whitespace (particularly isolated linebreaks) - if (nStatus != CONTENT && s.trim().equals("")) - { - // Q: reroute to ignorableWhitespace ? - if (nStatus != START_ELEMENT || - s.equals("\n") || s.equals("\r") || - s.equals(System.getProperty("line.separator")) ) - { - // logcall("#ignored# characters",s); - return; - } - } - - // logcall("characters",s); - if (nStatus == START_ELEMENT) - emit (">"); - emit(transform(s)); - nStatus = CONTENT; - } - - public void ignorableWhitespace (char buf [], int offset, int len) - throws SAXException - { - // Q: actually ignore this ? - - String s = new String(buf, offset, len); - // logcall("ignorableWhitespace",s); - if (nStatus == START_ELEMENT) - emit (">"); - emit(transform(s)); - nStatus = CONTENT; - } - - public void processingInstruction (String target, String data) - throws SAXException - { - } - - //=========================================================== - // SAX ErrorHandler methods - //=========================================================== - - // treat validation errors as fatal - public void error (SAXParseException e) - throws SAXParseException - { - throw e; - } - - // dump warnings too - public void warning (SAXParseException err) - throws SAXParseException - { - System.out.println ("** Warning" - + ", line " + err.getLineNumber () - + ", uri " + err.getSystemId ()); - System.out.println(" " + err.getMessage ()); - } - - //=========================================================== - // Helpers ... - //=========================================================== - - // Wrap I/O exceptions in SAX exceptions, to - // suit handler signature requirements - private void emit (String s) - throws SAXException - { - try { - out.write (s); - } catch (IOException e) { - throw new SAXException ("I/O error", e); - } - } - - // Start a new line - // and indent the next line appropriately - private void nl () - throws SAXException - { - String lineEnd = System.getProperty("line.separator"); - try { - out.write (lineEnd); - for (int i=0; i < indentLevel; i++) out.write(indentString); - } catch (IOException e) { - throw new SAXException ("I/O error", e); - } - } -} diff --git a/officecfg/org/openoffice/helper/Validator.java b/officecfg/org/openoffice/helper/Validator.java index 6802f0bcbe60..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/helper/Validator.java +++ b/officecfg/org/openoffice/helper/Validator.java @@ -1,163 +0,0 @@ -/** - * Title: Validation of xml files - * Description: Validates an xml document against a dtd<p> - * Copyright: null<p> - * Company: null<p> - * @author Dirk Grobler - * @version 1.0 - */ -package org.openoffice.helper; - -import java.io.*; -import org.xml.sax.*; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; - -public class Validator extends HandlerBase -{ - public static void main (String argv []) - { - if (argv.length != 1) { - System.err.println ("Usage: cmd filename"); - System.exit (1); - } - // Use the validating parser - SAXParserFactory factory = SAXParserFactory.newInstance(); - factory.setValidating(true); - try - { - // Set up output stream - out = new OutputStreamWriter (System.out, "UTF8"); - - // Parse the input - SAXParser saxParser = factory.newSAXParser(); - saxParser.parse( new File(argv [0]), new Validator() ); - } - catch (SAXParseException spe) { - // Error generated by the parser - System.out.println ("\n** Parsing error" - + ", line " + spe.getLineNumber () - + ", uri " + spe.getSystemId ()); - System.out.println(" " + spe.getMessage() ); - System.exit (1); - } - catch (SAXException sxe) { - // Error generated by this application - // (or a parser-initialization error) - Exception x = sxe; - if (sxe.getException() != null) - x = sxe.getException(); - x.printStackTrace(); - System.exit (1); - } - catch (ParserConfigurationException pce) { - // Parser with specified options can't be built - pce.printStackTrace(); - System.exit (1); - - } - catch (IOException ioe) { - // I/O error - ioe.printStackTrace(); - System.exit (1); - } - - System.exit (0); - } - - //=========================================================== - // SAX DocumentHandler methods - //=========================================================== - public InputSource resolveEntity(java.lang.String publicId, - java.lang.String systemId) - throws SAXException - { - return new InputSource(systemId); - } - - static private Writer out; - //=========================================================== - // SAX DocumentHandler methods - //=========================================================== - - public void setDocumentLocator (Locator l) - { - // Save this to resolve relative URIs or to give diagnostics. - try { - out.write ("** Start validating: "); - out.write (l.getSystemId()); - out.flush (); - } catch (IOException e) { - // Ignore errors - } - } - - public void startDocument () - throws SAXException - { - } - - public void endDocument () - throws SAXException - { - nl(); emit ("** Document is valid!"); - try { - nl(); - out.flush (); - } catch (IOException e) { - throw new SAXException ("I/O error", e); - } - } - - //=========================================================== - // SAX ErrorHandler methods - //=========================================================== - - // treat validation errors as fatal - public void error (SAXParseException e) - throws SAXParseException - { - throw e; - } - - // dump warnings too - public void warning (SAXParseException err) - throws SAXParseException - { - System.out.println ("** Warning" - + ", line " + err.getLineNumber () - + ", uri " + err.getSystemId ()); - System.out.println(" " + err.getMessage ()); - } - - //=========================================================== - // Helpers ... - //=========================================================== - - // Wrap I/O exceptions in SAX exceptions, to - // suit handler signature requirements - private void emit (String s) - throws SAXException - { - try { - out.write (s); - out.flush (); - } catch (IOException e) { - throw new SAXException ("I/O error", e); - } - } - - // Start a new line - // and indent the next line appropriately - private void nl () - throws SAXException - { - String lineEnd = System.getProperty("line.separator"); - try { - out.write (lineEnd); - } catch (IOException e) { - throw new SAXException ("I/O error", e); - } - } -} diff --git a/officecfg/org/openoffice/helper/makefile.mk b/officecfg/org/openoffice/helper/makefile.mk index a230f037f8c0..e69de29bb2d1 100644 --- a/officecfg/org/openoffice/helper/makefile.mk +++ b/officecfg/org/openoffice/helper/makefile.mk @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.12 $ -# -# 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=..$/..$/.. - -PRJNAME=officecfg -TARGET =schema -PACKAGE=org$/openoffice$/helper - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -JARFILES = xml-apis.jar xercesImpl.jar - -JAVACLASSFILES= \ - $(CLASSDIR)$/$(PACKAGE)$/DefaultNamespaceRemover.class \ - $(CLASSDIR)$/$(PACKAGE)$/Validator.class \ - $(CLASSDIR)$/$(PACKAGE)$/PrettyPrinter.class - -JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -RC_SUBDIRSDEPS=$(JAVATARGET) - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.IF "$(JARTARGETN)"!="" -$(JARTARGETN) : $(JAVACLASSFILES) $(JAVATARGET) -.ENDIF # "$(JARTARGETN)"!="" - diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst index 7a02091a2ae0..106501f96cf2 100644 --- a/officecfg/prj/d.lst +++ b/officecfg/prj/d.lst @@ -56,7 +56,6 @@ mkdir: %_DEST%\pck%_EXT% ..\%__SRC%\misc\*.map %_DEST%\pck%_EXT% ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT% -..\%__SRC%\class\*.jar %_DEST%\bin%_EXT% mkdir: %_DEST%\xml%_EXT%\processing diff --git a/scripting/java/build.xml b/scripting/java/build.xml index 3bc7ffa1900c..adf4b872c4d4 100755 --- a/scripting/java/build.xml +++ b/scripting/java/build.xml @@ -8,7 +8,7 @@ $RCSfile: build.xml,v $ - $Revision: 1.36 $ + $Revision: 1.36.20.1 $ This file is part of OpenOffice.org. @@ -53,7 +53,6 @@ <path id="idlclasspath"> <pathelement location="${solar.jar}/jurt.jar"/> <pathelement location="${solar.jar}/unoil.jar"/> - <pathelement location="${solar.jar}/jut.jar"/> <pathelement location="${solar.jar}/juh.jar"/> <pathelement location="${solar.jar}/java_uno.jar"/> <pathelement location="${solar.jar}/ridl.jar"/> diff --git a/scripting/workben/build.xml b/scripting/workben/build.xml index 8f4e5160c6f3..2c8cedda8dc8 100755 --- a/scripting/workben/build.xml +++ b/scripting/workben/build.xml @@ -8,7 +8,7 @@ $RCSfile: build.xml,v $ - $Revision: 1.31 $ + $Revision: 1.31.20.1 $ This file is part of OpenOffice.org. @@ -49,7 +49,6 @@ <pathelement location="${solar.jar}/unoil.jar"/> <!-- <pathelement location="${prj}/../unoil/${inpath}/class/unoil.jar"/> --> <pathelement location="${solar.jar}/jurt.jar"/> - <pathelement location="${solar.jar}/jut.jar"/> <pathelement location="${solar.jar}/juh.jar"/> <pathelement location="${solar.jar}/java_uno.jar"/> <pathelement location="${solar.jar}/ridl.jar"/> @@ -58,7 +57,6 @@ <pathelement location="${solar.jar}/unoil.jar"/> <!-- pathelement location="${prj}/../unoil/${inpath}/class/unoil.jar"/ --> <pathelement location="${solar.jar}/jurt.jar"/> - <pathelement location="${solar.jar}/jut.jar"/> <pathelement location="${solar.jar}/juh.jar"/> <pathelement location="${solar.jar}/java_uno.jar"/> <pathelement location="${solar.jar}/ridl.jar"/> diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/DocHelper/makefile.mk index 01b1f6fa751f..2f14197c365f 100644 --- a/sfx2/qa/complex/DocHelper/makefile.mk +++ b/sfx2/qa/complex/DocHelper/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.134.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/framework$/dochelper #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +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) diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index c9d248254e63..7c074ccbe838 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.134.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/docinfo #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = DocumentProperties.java #----- make a jar from compiled files ------------------------------ diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/makefile.mk index 79b3462ea277..102c641f2732 100644 --- a/sfx2/qa/complex/makefile.mk +++ b/sfx2/qa/complex/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.134.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/framework #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = CheckGlobalEventBroadcaster_writer1.java \ DocumentMetaData.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk index 519d6d7442b8..850fc305d502 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk +++ b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.134.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/standalonedocumentinfo #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ StandaloneDocumentInfoUnitTest.java\ diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk index 530f59464123..4656c805fd34 100755 --- a/ucb/qa/complex/tdoc/interfaces/makefile.mk +++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.32.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/tdoc$/interfaces #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = _XChild.java \ _XCommandInfoChangeNotifier.java \ _XCommandProcessor.java \ diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk index e73870e41fde..50aada12e72a 100755 --- a/ucb/qa/complex/tdoc/makefile.mk +++ b/ucb/qa/complex/tdoc/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.32.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex.tdoc #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = CheckContentProvider.java \ CheckTransientDocumentsContent.java \ CheckTransientDocumentsContentProvider.java \ diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk index 8e6ee2eb8199..147b1b306454 100755 --- a/ucb/qa/complex/ucb/makefile.mk +++ b/ucb/qa/complex/ucb/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.32.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/ucb #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar sandbox.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) diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst index b6a2d60efd66..a726e8366e0f 100644 --- a/xmlhelp/prj/build.lst +++ b/xmlhelp/prj/build.lst @@ -1,4 +1,4 @@ -xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene unotools NULL +xh xmlhelp : ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene unotools NULL xh xmlhelp usr1 - all xh_mkout NULL xh xmlhelp\inc nmake - all xh_inc NULL xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL diff --git a/xmlhelp/util/ucpchelp.xml b/xmlhelp/util/ucpchelp.xml index 333895606a66..7897b0db8151 100644 --- a/xmlhelp/util/ucpchelp.xml +++ b/xmlhelp/util/ucpchelp.xml @@ -39,7 +39,6 @@ <project-build-dependency> sablot </project-build-dependency> <project-build-dependency> unoil </project-build-dependency> <project-build-dependency> offuh </project-build-dependency> - <project-build-dependency> jut </project-build-dependency> <project-build-dependency> external </project-build-dependency> <project-build-dependency> XmlSearch </project-build-dependency> <project-build-dependency> ucbhelper </project-build-dependency> |