diff options
Diffstat (limited to 'desktop/source')
217 files changed, 2366 insertions, 2362 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 657c88d840ed..05858e19cdc0 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -467,8 +467,8 @@ void ReplaceStringHookProc( UniString& rStr ) static const char pLastSyncFileName[] = "lastsynchronized"; static const sal_Int32 nStrLenLastSync = 16; - -static bool needsSynchronization( + +static bool needsSynchronization( ::rtl::OUString const & baseSynchronizedURL, ::rtl::OUString const & userSynchronizedURL ) { bool bNeedsSync( false ); @@ -487,21 +487,21 @@ static bool needsSynchronization( OSL_ENSURE(0, "Cannot access lastsynchronized in user layer"); return true; //sync just in case } - + //If last synchronized does not exist in base layer, then do nothing ::osl::DirectoryItem itemBaseFile; ::osl::File::RC err2 = ::osl::DirectoryItem::get(baseSynchronizedURL, itemBaseFile); if (err2 == ::osl::File::E_NOENT) { return true; - + } else if (err2 != ::osl::File::E_None) { OSL_ENSURE(0, "Cannot access file lastsynchronized in base layer"); return true; //sync just in case } - + //compare the modification time of the extension folder and the last //modified file ::osl::FileStatus statUser(FileStatusMask_ModifyTime); @@ -519,7 +519,7 @@ static bool needsSynchronization( else { OSL_ASSERT(0); - bNeedsSync = true; + bNeedsSync = true; } } else @@ -527,7 +527,7 @@ static bool needsSynchronization( OSL_ASSERT(0); bNeedsSync = true; } - + return bNeedsSync; } @@ -552,13 +552,13 @@ static ::rtl::OUString getLastSyncFileURLFromBrandInstallation() { ::rtl::OUString aURL = getBrandSharePreregBundledPathURL(); ::sal_Int32 nLastIndex = aURL.lastIndexOf('/'); - + ::rtl::OUStringBuffer aTmp( aURL ); if ( nLastIndex != aURL.getLength()-1 ) aTmp.appendAscii( "/" ); aTmp.appendAscii( pLastSyncFileName ); - + return aTmp.makeStringAndClear(); } @@ -566,7 +566,7 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation() { ::rtl::OUString aUserBundledPathURL = getUserBundledExtPathURL(); ::sal_Int32 nLastIndex = aUserBundledPathURL.lastIndexOf('/'); - + ::rtl::OUStringBuffer aTmp( aUserBundledPathURL ); if ( nLastIndex != aUserBundledPathURL.getLength()-1 ) @@ -576,10 +576,10 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation() return aTmp.makeStringAndClear(); } -static osl::FileBase::RC copy_bundled_recursive( +static osl::FileBase::RC copy_bundled_recursive( const rtl::OUString& srcUnqPath, const rtl::OUString& dstUnqPath, - sal_Int32 TypeToCopy ) + sal_Int32 TypeToCopy ) throw() { osl::FileBase::RC err = osl::FileBase::E_None; @@ -595,7 +595,7 @@ throw() err = osl::Directory::create( dstUnqPath ); osl::FileBase::RC next = err; - if( err == osl::FileBase::E_None || + if( err == osl::FileBase::E_None || err == osl::FileBase::E_EXIST ) { err = osl::FileBase::E_None; @@ -621,20 +621,20 @@ throw() rtl::OUString newDstUnqPath = dstUnqPath; rtl::OUString tit; - if( aFileStatus.isValid( FileStatusMask_FileName ) ) + if( aFileStatus.isValid( FileStatusMask_FileName ) ) { ::rtl::OUString aFileName = aFileStatus.getFileName(); tit = rtl::Uri::encode( aFileName, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); - + // Special treatment for "lastsychronized" file. Must not be // copied from the bundled folder! if ( IsDoc && aFileName.equalsAscii( pLastSyncFileName )) bFilter = true; } - + if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 ) newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); @@ -680,14 +680,14 @@ void Desktop::Init() { rtl::OUString aUserPath = getUserBundledExtPathURL(); rtl::OUString aPreregBundledPath = getBrandSharePreregBundledPathURL(); - + // copy bundled folder to the user directory osl::FileBase::RC rc = osl::Directory::createPath(aUserPath); (void) rc; copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 ); } } - + // create service factory... Reference < XMultiServiceFactory > rSMgr = CreateApplicationServiceManager(); if( rSMgr.is() ) @@ -1577,7 +1577,7 @@ void Desktop::Main() Reference< ::com::sun::star::task::XRestartManager > xRestartManager; sal_Bool bRestartRequested( sal_False ); sal_Bool bUseSystemFileDialog(sal_True); - int nAcquireCount( 0 ); + int nAcquireCount( 0 ); Reference < css::document::XEventListener > xGlobalBroadcaster; try { @@ -1939,7 +1939,7 @@ void Desktop::Main() FatalError( MakeStartupErrorMessage(exAnyCfg.Message) ); } } - + if ( bRestartRequested ) SetRestartState(); @@ -2103,7 +2103,7 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r // Try to instanciate quickstart service. This service is not mandatory, so // do nothing if service is not available - + // #i105753# the following if was invented for performance // unfortunately this broke the QUARTZ behavior which is to always run // in quickstart mode since Mac applications do not usually quit diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx index a0e7d44e5928..6e6b4c32c7d8 100644 --- a/desktop/source/app/appfirststart.cxx +++ b/desktop/source/app/appfirststart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 82ae6571d953..c33e7c0077ce 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,9 +78,9 @@ #include <unotools/internaloptions.hxx> -#define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) +#define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) -#define DESKTOP_TEMPDIRNAME "soffice.tmp" +#define DESKTOP_TEMPDIRNAME "soffice.tmp" using namespace rtl; using namespace desktop; @@ -229,7 +229,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr ) ::rtl::OUString conDcp; ::rtl::OUString aClientDisplay; ::rtl::OUString aTmpString; - sal_Bool bHeadlessMode = sal_False; + sal_Bool bHeadlessMode = sal_False; // interpret command line arguments CommandLineArgs* pCmdLine = GetCommandLineArgs(); @@ -241,7 +241,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr ) conDcp = aTmpString; // Headless mode for FAT Office - bHeadlessMode = pCmdLine->IsHeadless(); + bHeadlessMode = pCmdLine->IsHeadless(); if ( bHeadlessMode ) Application::EnableHeadlessMode(); @@ -271,7 +271,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr ) } } - ::rtl::OUString aPortalConnect; + ::rtl::OUString aPortalConnect; bool bServer = (bool)pCmdLine->IsServer(); pCmdLine->GetPortalConnectString( aPortalConnect ); @@ -406,7 +406,7 @@ void Desktop::CreateTemporaryDirectory() } // remove possible old directory and base directory - SvtInternalOptions aInternalOpt; + SvtInternalOptions aInternalOpt; // set temp base directory sal_Int32 nLength = aTempBaseURL.getLength(); diff --git a/desktop/source/app/appinit.hxx b/desktop/source/app/appinit.hxx index b4a756aa31ee..01aa78857b2a 100644 --- a/desktop/source/app/appinit.hxx +++ b/desktop/source/app/appinit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx index ac01ec2dd669..61948550ca78 100644 --- a/desktop/source/app/appsys.cxx +++ b/desktop/source/app/appsys.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include <tools/urlobj.hxx> -#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) +#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) namespace desktop { diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx index d2f13ff0aace..2dad7b5d7103 100644 --- a/desktop/source/app/appsys.hxx +++ b/desktop/source/app/appsys.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index b46508a9f3f5..bfc0197b3a7e 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext(); uno::Reference< ui::dialogs::XExecutableDialog > xDialog( deployment::ui::LicenseDialog::create( - xContext, VCLUnoHelper::GetInterface( NULL ), + xContext, VCLUnoHelper::GetInterface( NULL ), licExc.ExtensionName, licExc.Text ) ); sal_Int16 res = xDialog->execute(); if ( res == ui::dialogs::ExecutableDialogResults::CANCEL ) @@ -233,7 +233,7 @@ static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContex uno::Reference< lang::XMultiComponentFactory > xServiceManager( xContext->getServiceManager() ); if( !xServiceManager.is() ) - throw uno::RuntimeException( + throw uno::RuntimeException( UNISTRING( "impl_showExtensionDialog(): unable to obtain service manager from component context" ), uno::Reference< uno::XInterface > () ); xService = xServiceManager->createInstanceWithContext( sServiceName, xContext ); @@ -334,7 +334,7 @@ static void impl_setNeedsCompatCheck() xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); - beans::NamedValue v( OUString::createFromAscii("NodePath"), + beans::NamedValue v( OUString::createFromAscii("NodePath"), makeAny( OUString::createFromAscii("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( @@ -387,7 +387,7 @@ static bool impl_needsCompatCheck() xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); - beans::NamedValue v( OUString::createFromAscii("NodePath"), + beans::NamedValue v( OUString::createFromAscii("NodePath"), makeAny( OUString::createFromAscii("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx index 0777eda34592..ee5c96b8c7b6 100644 --- a/desktop/source/app/checkinstall.cxx +++ b/desktop/source/app/checkinstall.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,9 +52,9 @@ sal_Bool CheckInstallation( OUString& rTitle ) try { Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory(); - Reference< XExactName > xExactName( xSMgr->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.desktop.Evaluation" ))), + Reference< XExactName > xExactName( xSMgr->createInstance( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.desktop.Evaluation" ))), UNO_QUERY ); if ( xExactName.is() ) { @@ -77,7 +77,7 @@ sal_Bool CheckInstallation( OUString& rTitle ) return sal_False; } } - + return sal_True; } else @@ -112,7 +112,7 @@ sal_Bool CheckInstallation( OUString& rTitle ) catch(Exception) { } - + return sal_True; } diff --git a/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx index a4ee8c05c9ef..f37d5ee7eac4 100644 --- a/desktop/source/app/checkinstall.hxx +++ b/desktop/source/app/checkinstall.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 71e749510375..841f55ce5e1b 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -143,15 +143,15 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) UNO_QUERY); // parse command line arguments - sal_Bool bPrintEvent = sal_False; - sal_Bool bOpenEvent = sal_True; - sal_Bool bViewEvent = sal_False; - sal_Bool bStartEvent = sal_False; - sal_Bool bPrintToEvent = sal_False; - sal_Bool bPrinterName = sal_False; - sal_Bool bForceOpenEvent = sal_False; - sal_Bool bForceNewEvent = sal_False; - sal_Bool bDisplaySpec = sal_False; + sal_Bool bPrintEvent = sal_False; + sal_Bool bOpenEvent = sal_True; + sal_Bool bViewEvent = sal_False; + sal_Bool bStartEvent = sal_False; + sal_Bool bPrintToEvent = sal_False; + sal_Bool bPrinterName = sal_False; + sal_Bool bForceOpenEvent = sal_False; + sal_Bool bForceNewEvent = sal_False; + sal_Bool bDisplaySpec = sal_False; sal_Bool bConversionEvent= sal_False; sal_Bool bConversionParamsEvent= sal_False; sal_Bool bBatchPrintEvent= sal_False; @@ -162,20 +162,20 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) for (;;) { - ::rtl::OUString aArg; + ::rtl::OUString aArg; if ( !supplier.next( &aArg ) ) { break; } // convert file URLs to internal form #112849# - if (aArg.indexOf(OUString::createFromAscii("file:"))==0 && + if (aArg.indexOf(OUString::createFromAscii("file:"))==0 && xTranslator.is()) { OUString tmp(xTranslator->translateToInternal(aArg)); if (tmp.getLength() > 0) aArg = tmp; } - String aArgStr = aArg; + String aArgStr = aArg; if ( aArg.getLength() > 0 ) { @@ -188,51 +188,51 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) if ( aArgStr.EqualsIgnoreCaseAscii( "-n" )) { // force new documents based on the following documents - bForceNewEvent = sal_True; - bOpenEvent = sal_False; - bForceOpenEvent = sal_False; - bPrintToEvent = sal_False; - bPrintEvent = sal_False; + bForceNewEvent = sal_True; + bOpenEvent = sal_False; + bForceOpenEvent = sal_False; + bPrintToEvent = sal_False; + bPrintEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-o" )) { // force open documents regards if they are templates or not bForceOpenEvent = sal_True; - bOpenEvent = sal_False; - bForceNewEvent = sal_False; - bPrintToEvent = sal_False; - bPrintEvent = sal_False; + bOpenEvent = sal_False; + bForceNewEvent = sal_False; + bPrintToEvent = sal_False; + bPrintEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-pt" )) { // Print to special printer - bPrintToEvent = sal_True; - bPrinterName = sal_True; - bPrintEvent = sal_False; - bOpenEvent = sal_False; - bForceNewEvent = sal_False; + bPrintToEvent = sal_True; + bPrinterName = sal_True; + bPrintEvent = sal_False; + bOpenEvent = sal_False; + bForceNewEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; bForceOpenEvent = sal_False; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-p" )) { // Print to default printer - bPrintEvent = sal_True; - bPrintToEvent = sal_False; - bOpenEvent = sal_False; - bForceNewEvent = sal_False; + bPrintEvent = sal_True; + bPrintToEvent = sal_False; + bOpenEvent = sal_False; + bForceNewEvent = sal_False; bForceOpenEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-view" )) { @@ -242,9 +242,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) bPrintToEvent = sal_False; bForceNewEvent = sal_False; bForceOpenEvent = sal_False; - bViewEvent = sal_True; + bViewEvent = sal_True; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-show" )) { @@ -256,7 +256,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) bPrintToEvent = sal_False; bForceNewEvent = sal_False; bForceOpenEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-display" )) { @@ -268,7 +268,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) bForceNewEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_True; + bDisplaySpec = sal_True; } else if ( aArgStr.EqualsIgnoreCaseAscii( "-language" )) { @@ -279,7 +279,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) bForceNewEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } #ifdef MACOSX @@ -298,7 +298,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) bForceNewEvent = sal_False; bViewEvent = sal_False; bStartEvent = sal_False; - bDisplaySpec = sal_False; + bDisplaySpec = sal_False; } #endif else if ( aArgStr.EqualsIgnoreCaseAscii( "-convert-to" ) ) diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 68cce08e51d7..05b31f40ec03 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace desktop class CommandLineArgs { public: - enum BoolParam // must be zero based! + enum BoolParam // must be zero based! { CMD_BOOLPARAM_MINIMIZED, CMD_BOOLPARAM_INVISIBLE, @@ -72,7 +72,7 @@ class CommandLineArgs CMD_BOOLPARAM_HELPIMPRESS, CMD_BOOLPARAM_HELPBASE, CMD_BOOLPARAM_PSN, - CMD_BOOLPARAM_COUNT // must be last element! + CMD_BOOLPARAM_COUNT // must be last element! }; enum StringParam // must be zero based! @@ -98,7 +98,7 @@ class CommandLineArgs CMD_STRINGPARAM_INFILTER, CMD_STRINGPARAM_DISPLAY, CMD_STRINGPARAM_LANGUAGE, - CMD_STRINGPARAM_COUNT // must be last element! + CMD_STRINGPARAM_COUNT // must be last element! }; enum GroupParamId @@ -128,54 +128,54 @@ class CommandLineArgs boost::optional< rtl::OUString > getCwdUrl() const { return m_cwdUrl; } // generic methods to access parameter - void SetBoolParam( BoolParam eParam, sal_Bool bNewValue ); + void SetBoolParam( BoolParam eParam, sal_Bool bNewValue ); const rtl::OUString& GetStringParam( StringParam eParam ) const; // Access to bool parameters - sal_Bool IsMinimized() const; - sal_Bool IsInvisible() const; - sal_Bool IsNoRestore() const; - sal_Bool IsNoDefault() const; - sal_Bool IsBean() const; - sal_Bool IsServer() const; - sal_Bool IsHeadless() const; - sal_Bool IsQuickstart() const; + sal_Bool IsMinimized() const; + sal_Bool IsInvisible() const; + sal_Bool IsNoRestore() const; + sal_Bool IsNoDefault() const; + sal_Bool IsBean() const; + sal_Bool IsServer() const; + sal_Bool IsHeadless() const; + sal_Bool IsQuickstart() const; sal_Bool IsNoQuickstart() const; - sal_Bool IsTerminateAfterInit() const; + sal_Bool IsTerminateAfterInit() const; sal_Bool IsNoFirstStartWizard() const; - sal_Bool IsNoLogo() const; - sal_Bool IsNoLockcheck() const; - sal_Bool IsHelp() const; - sal_Bool IsHelpWriter() const; - sal_Bool IsHelpCalc() const; - sal_Bool IsHelpDraw() const; - sal_Bool IsHelpImpress() const; - sal_Bool IsHelpBase() const; - sal_Bool IsHelpMath() const; - sal_Bool IsHelpBasic() const; - sal_Bool IsWriter() const; - sal_Bool IsCalc() const; - sal_Bool IsDraw() const; - sal_Bool IsImpress() const; - sal_Bool IsBase() const; - sal_Bool IsGlobal() const; - sal_Bool IsMath() const; - sal_Bool IsWeb() const; - sal_Bool HasModuleParam() const; + sal_Bool IsNoLogo() const; + sal_Bool IsNoLockcheck() const; + sal_Bool IsHelp() const; + sal_Bool IsHelpWriter() const; + sal_Bool IsHelpCalc() const; + sal_Bool IsHelpDraw() const; + sal_Bool IsHelpImpress() const; + sal_Bool IsHelpBase() const; + sal_Bool IsHelpMath() const; + sal_Bool IsHelpBasic() const; + sal_Bool IsWriter() const; + sal_Bool IsCalc() const; + sal_Bool IsDraw() const; + sal_Bool IsImpress() const; + sal_Bool IsBase() const; + sal_Bool IsGlobal() const; + sal_Bool IsMath() const; + sal_Bool IsWeb() const; + sal_Bool HasModuleParam() const; // Access to string parameters - sal_Bool GetPortalConnectString( ::rtl::OUString& rPara) const; - sal_Bool GetAcceptString( ::rtl::OUString& rPara) const; - sal_Bool GetUnAcceptString( ::rtl::OUString& rPara) const; - sal_Bool GetOpenList( ::rtl::OUString& rPara) const; - sal_Bool GetViewList( ::rtl::OUString& rPara) const; + sal_Bool GetPortalConnectString( ::rtl::OUString& rPara) const; + sal_Bool GetAcceptString( ::rtl::OUString& rPara) const; + sal_Bool GetUnAcceptString( ::rtl::OUString& rPara) const; + sal_Bool GetOpenList( ::rtl::OUString& rPara) const; + sal_Bool GetViewList( ::rtl::OUString& rPara) const; sal_Bool GetStartList( ::rtl::OUString& rPara) const; - sal_Bool GetForceOpenList( ::rtl::OUString& rPara) const; - sal_Bool GetForceNewList( ::rtl::OUString& rPara) const; - sal_Bool GetPrintList( ::rtl::OUString& rPara) const; - sal_Bool GetPrintToList( ::rtl::OUString& rPara ) const; - sal_Bool GetPrinterName( ::rtl::OUString& rPara ) const; + sal_Bool GetForceOpenList( ::rtl::OUString& rPara) const; + sal_Bool GetForceNewList( ::rtl::OUString& rPara) const; + sal_Bool GetPrintList( ::rtl::OUString& rPara) const; + sal_Bool GetPrintToList( ::rtl::OUString& rPara ) const; + sal_Bool GetPrinterName( ::rtl::OUString& rPara ) const; sal_Bool GetLanguage( ::rtl::OUString& rPara ) const; sal_Bool GetInFilter( ::rtl::OUString& rPara ) const; sal_Bool GetConversionList( ::rtl::OUString& rPara ) const; @@ -192,31 +192,31 @@ class CommandLineArgs struct GroupDefinition { - sal_Int32 nCount; - BoolParam* pGroupMembers; + sal_Int32 nCount; + BoolParam* pGroupMembers; }; // no copy and operator= CommandLineArgs( const CommandLineArgs& ); CommandLineArgs operator=( const CommandLineArgs& ); - sal_Bool InterpretCommandLineParameter( const ::rtl::OUString& ); - void ParseCommandLine_Impl( Supplier& supplier ); - void ResetParamValues(); - sal_Bool CheckGroupMembers( GroupParamId nGroup, BoolParam nExcludeMember ) const; + sal_Bool InterpretCommandLineParameter( const ::rtl::OUString& ); + void ParseCommandLine_Impl( Supplier& supplier ); + void ResetParamValues(); + sal_Bool CheckGroupMembers( GroupParamId nGroup, BoolParam nExcludeMember ) const; - void AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam ); - void SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue ); + void AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam ); + void SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue ); boost::optional< rtl::OUString > m_cwdUrl; - sal_Bool m_aBoolParams[ CMD_BOOLPARAM_COUNT ]; // Stores boolean parameters - rtl::OUString m_aStrParams[ CMD_STRINGPARAM_COUNT ]; // Stores string parameters - sal_Bool m_aStrSetParams[ CMD_STRINGPARAM_COUNT ]; // Stores if string parameters are provided on cmdline + sal_Bool m_aBoolParams[ CMD_BOOLPARAM_COUNT ]; // Stores boolean parameters + rtl::OUString m_aStrParams[ CMD_STRINGPARAM_COUNT ]; // Stores string parameters + sal_Bool m_aStrSetParams[ CMD_STRINGPARAM_COUNT ]; // Stores if string parameters are provided on cmdline Count m_eArgumentCount; // Number of Args - mutable ::osl::Mutex m_aMutex; + mutable ::osl::Mutex m_aMutex; // static definition for groups where only one member can be true - static GroupDefinition m_pGroupDefinitions[ CMD_GRPID_COUNT ]; + static GroupDefinition m_pGroupDefinitions[ CMD_GRPID_COUNT ]; }; } diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 9f9b9f722902..110aa3e73124 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace desktop { - // to be able to display the help nicely in a dialog box with propotional font, + // to be able to display the help nicely in a dialog box with propotional font, // we need to split it in chunks... // ___HEAD___ // LEFT RIGHT diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx index 8f11f7e3775f..823e7b4d9f77 100644 --- a/desktop/source/app/cmdlinehelp.hxx +++ b/desktop/source/app/cmdlinehelp.hxx @@ -12,11 +12,11 @@ namespace desktop public: CmdlineHelpDialog ( void ); - FixedText m_ftHead; - FixedText m_ftLeft; - FixedText m_ftRight; - FixedText m_ftBottom; - OKButton m_btOk; + FixedText m_ftHead; + FixedText m_ftLeft; + FixedText m_ftRight; + FixedText m_ftBottom; + OKButton m_btOk; }; #endif } diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 5851acb162c2..3704d842c39d 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,13 +104,13 @@ ConfigurationProvider createDefaultConfigurationProvider( ) if (xServiceManager.is()) { - + xProvider.set( xServiceManager->createInstance(k_PROVIDER), UNO_QUERY); } if (!xProvider.is()) { - OUString const sMsg = OUSTRING("Service \"") + k_PROVIDER + + OUString const sMsg = OUSTRING("Service \"") + k_PROVIDER + OUSTRING("\" is not available at the service manager."); throw lang::ServiceNotRegisteredException(sMsg, xServiceManager); @@ -131,7 +131,7 @@ static void handleGeneralException(uno::Exception& aException, uno::Reference< lang::XMultiServiceFactory > CreateApplicationConfigurationProvider( ) { uno::Reference< lang::XMultiServiceFactory > xProvider; - + try { xProvider = createDefaultConfigurationProvider( ); @@ -145,25 +145,25 @@ uno::Reference< lang::XMultiServiceFactory > CreateApplicationConfigurationProvi catch (backend::CannotConnectException & exception) { handleGeneralException(exception, - getMsgString( STR_CONFIG_ERR_CANNOT_CONNECT, + getMsgString( STR_CONFIG_ERR_CANNOT_CONNECT, "A connection to your configuration settings could not be established. ")); } catch (backend::BackendSetupException & exception) { handleGeneralException(exception, - getMsgString( STR_CONFIG_ERR_CANNOT_CONNECT, + getMsgString( STR_CONFIG_ERR_CANNOT_CONNECT, "A connection to your configuration settings could not be established. ")); } catch (configuration::CannotLoadConfigurationException & exception) { handleGeneralException(exception, - getMsgString( STR_CONFIG_ERR_CANNOT_CONNECT, + getMsgString( STR_CONFIG_ERR_CANNOT_CONNECT, "A connection to your configuration settings could not be established. ")); } catch (uno::Exception & exception) { handleGeneralException(exception, - getMsgString( STR_CONFIG_ERR_ACCESS_GENERAL, + getMsgString( STR_CONFIG_ERR_ACCESS_GENERAL, "A general error occurred while accessing your configuration settings.")); } @@ -196,20 +196,20 @@ namespace void deinstall() { uno::setCurrentContext(m_xChainedContext); } uno::Any getChainedValueByName( OUString const & aName) const - { - return m_xChainedContext.is() - ? m_xChainedContext->getValueByName(aName) - : uno::Any(); + { + return m_xChainedContext.is() + ? m_xChainedContext->getValueByName(aName) + : uno::Any(); } // XCurrentContext virtual uno::Any SAL_CALL - getValueByName( OUString const & aName) + getValueByName( OUString const & aName) throw (uno::RuntimeException); }; - + uno::Any SAL_CALL - SimpleCurrentContext::getValueByName( OUString const & aName) + SimpleCurrentContext::getValueByName( OUString const & aName) throw (uno::RuntimeException) { return getChainedValueByName(aName); @@ -232,7 +232,7 @@ public: // XCurrentContext virtual uno::Any SAL_CALL - getValueByName( OUString const & aName) + getValueByName( OUString const & aName) throw (uno::RuntimeException); private: @@ -240,7 +240,7 @@ private: }; //------------------------------------------------------------------------------ -uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName) +uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName) throw (uno::RuntimeException) { if ( aName.equalsAscii( CONFIG_ERROR_HANDLER ) ) @@ -262,7 +262,7 @@ ConfigurationErrorHandler::~ConfigurationErrorHandler() /// installs the handler into the current context void ConfigurationErrorHandler::activate() { - if (!m_pContext) + if (!m_pContext) { m_pContext = new Context; m_pContext->acquire(); @@ -274,7 +274,7 @@ void ConfigurationErrorHandler::activate() /// deinstalls the handler from the current context, restoring the previous context void ConfigurationErrorHandler::deactivate() { - if (m_pContext) + if (m_pContext) { m_pContext->deinstall(); m_pContext->release(); diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx index 24fb01881396..8254f4111827 100644 --- a/desktop/source/app/configinit.hxx +++ b/desktop/source/app/configinit.hxx @@ -9,7 +9,7 @@ Important: exceptions thrown from that method will contain a readily displayable message. - @return + @return The default configuration provider for the application or<br/> <NULL/>, if startup was canceled @@ -18,11 +18,11 @@ displayable message. @throw com::sun::star::lang::ServiceNotRegisteredException if the ConfigurationProvider service is unknwon - + @throw com::sun::star::lang::WrappedTargetException if the configuration backend could be created, but incurred a failure later - + */ extern com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > @@ -39,7 +39,7 @@ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > { public: typedef com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > InteractionHandler; - + /// Constructor: Uses the default interaction handler ConfigurationErrorHandler() : m_pContext(0), m_xHandler() @@ -58,11 +58,11 @@ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > void activate(); /// deinstalls the handler from the current context, restoring the previous context void deactivate(); - private: + private: class Context; Context * m_pContext; InteractionHandler m_xHandler; - private: + private: // not implemented - suppress copy ConfigurationErrorHandler(const ConfigurationErrorHandler&); void operator=(const ConfigurationErrorHandler&); diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c index 3984a81f26e5..b35aa2cee929 100644 --- a/desktop/source/app/copyright_ascii_ooo.c +++ b/desktop/source/app/copyright_ascii_ooo.c @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - - /* + + /* * copyright text to see as text in the soffice binary * */ - + extern const char copyright_text_1[]; const char copyright_text_1[] = "Copyright © 2000, 2010 Oracle and/or its affiliates, All rights reserved."; diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c index c7d6e7e3c08d..a94966855e1e 100644 --- a/desktop/source/app/copyright_ascii_sun.c +++ b/desktop/source/app/copyright_ascii_sun.c @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - - /* + + /* * copyright text to see as text in the soffice binary * */ - + const char copyright_text_1[] = "Copyright © 2000, 2010 Oracle and/or its affiliates, All rights reserved."; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 9c68d7b9fd2d..035318b4d7d5 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,60 +32,60 @@ #include <svl/solar.hrc> #endif -#define RID_DESKTOP_DIALOG_START 2000 -#define RID_FIRSTSTSTART_START 3000 -#define RID_DESKTOP_STRING_START 10000 +#define RID_DESKTOP_DIALOG_START 2000 +#define RID_FIRSTSTSTART_START 3000 +#define RID_DESKTOP_STRING_START 10000 -#define INFOBOX_CMDLINEHELP (RID_DESKTOP_DIALOG_START+51) -#define INFOBOX_EXPIRED (RID_DESKTOP_DIALOG_START+52) +#define INFOBOX_CMDLINEHELP (RID_DESKTOP_DIALOG_START+51) +#define INFOBOX_EXPIRED (RID_DESKTOP_DIALOG_START+52) -#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100) +#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100) -#define DLG_CMDLINEHELP (RID_DESKTOP_DIALOG_START+101) -#define TXT_DLG_CMDLINEHELP_HEADER (RID_DESKTOP_DIALOG_START+102) -#define TXT_DLG_CMDLINEHELP_LEFT (RID_DESKTOP_DIALOG_START+103) -#define TXT_DLG_CMDLINEHELP_RIGHT (RID_DESKTOP_DIALOG_START+104) -#define TXT_DLG_CMDLINEHELP_BOTTOM (RID_DESKTOP_DIALOG_START+105) -#define BTN_DLG_CMDLINEHELP_OK (RID_DESKTOP_DIALOG_START+106) +#define DLG_CMDLINEHELP (RID_DESKTOP_DIALOG_START+101) +#define TXT_DLG_CMDLINEHELP_HEADER (RID_DESKTOP_DIALOG_START+102) +#define TXT_DLG_CMDLINEHELP_LEFT (RID_DESKTOP_DIALOG_START+103) +#define TXT_DLG_CMDLINEHELP_RIGHT (RID_DESKTOP_DIALOG_START+104) +#define TXT_DLG_CMDLINEHELP_BOTTOM (RID_DESKTOP_DIALOG_START+105) +#define BTN_DLG_CMDLINEHELP_OK (RID_DESKTOP_DIALOG_START+106) -#define QBX_CONFIG_IMPORTSETTINGS (RID_DESKTOP_DIALOG_START+180) +#define QBX_CONFIG_IMPORTSETTINGS (RID_DESKTOP_DIALOG_START+180) #define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190) -#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0) -#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1) -#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2) - -#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100) -#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101) -#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102) -#define STR_BOOTSTRAP_ERR_NO_PATH (RID_DESKTOP_STRING_START+103) -#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104) -#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105) -#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106) -#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107) -#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108) - -#define STR_BOOTSTRAP_ERR_NO_SERVICE (RID_DESKTOP_STRING_START+120) -#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121) -#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122) +#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0) +#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1) +#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2) + +#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100) +#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101) +#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102) +#define STR_BOOTSTRAP_ERR_NO_PATH (RID_DESKTOP_STRING_START+103) +#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104) +#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105) +#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106) +#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107) +#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108) + +#define STR_BOOTSTRAP_ERR_NO_SERVICE (RID_DESKTOP_STRING_START+120) +#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121) +#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122) #define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE (RID_DESKTOP_STRING_START+123) -#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152) +#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152) -#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161) +#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161) -#define STR_CONFIG_ERR_SETTINGS_INCOMPLETE (RID_DESKTOP_STRING_START+182) -#define STR_CONFIG_ERR_CANNOT_CONNECT (RID_DESKTOP_STRING_START+183) -#define STR_CONFIG_ERR_RIGHTS_MISSING (RID_DESKTOP_STRING_START+184) -#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187) -#define STR_CONFIG_ERR_NO_WRITE_ACCESS (RID_DESKTOP_STRING_START+188) +#define STR_CONFIG_ERR_SETTINGS_INCOMPLETE (RID_DESKTOP_STRING_START+182) +#define STR_CONFIG_ERR_CANNOT_CONNECT (RID_DESKTOP_STRING_START+183) +#define STR_CONFIG_ERR_RIGHTS_MISSING (RID_DESKTOP_STRING_START+184) +#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187) +#define STR_CONFIG_ERR_NO_WRITE_ACCESS (RID_DESKTOP_STRING_START+188) #define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE (RID_DESKTOP_STRING_START+189) #define STR_BOOSTRAP_ERR_NOACCESSRIGHTS (RID_DESKTOP_STRING_START+190) -#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206) -#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207) +#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206) +#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207) #endif // _DESKTOP_HRC_ diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index 2f6897adf80e..e333c441817b 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ String STR_BOOTSTRAP_ERR_NO_SUPPORT Text [ en-US ] = "The configuration file \"$1\" does not support the current version."; }; -String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING +String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING { Text [ en-US ] = "The user interface language cannot be determined."; }; diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 8a9b14e351cd..73038d30f7c8 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index b68a73cd9cf9..f0ac41c87ac4 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx index 0a0d23aa18be..347ee542a306 100644 --- a/desktop/source/app/desktopresid.cxx +++ b/desktop/source/app/desktopresid.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx index 432c257b6b65..689a0f11da1c 100644 --- a/desktop/source/app/desktopresid.hxx +++ b/desktop/source/app/desktopresid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 2bcce7a4af82..77cc1c334a27 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ struct DispatchHolder DispatchHolder( const URL& rURL, Reference< XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - URL aURL; + URL aURL; rtl::OUString cwdUrl; Reference< XDispatch > xDispatch; }; @@ -129,7 +129,7 @@ Mutex& DispatchWatcher::GetMutex() return *pWatcherMutex; } -// Create or get the dispatch watcher implementation. This implementation must be +// Create or get the dispatch watcher implementation. This implementation must be // a singleton to prevent access to the framework after it wants to terminate. DispatchWatcher* DispatchWatcher::GetDispatchWatcher() { @@ -143,7 +143,7 @@ DispatchWatcher* DispatchWatcher::GetDispatchWatcher() if ( !xDispatchWatcher.is() ) { pDispatchWatcher = new DispatchWatcher(); - + // We have to hold a reference to ourself forever to prevent our own destruction. xDispatchWatcher = static_cast< cppu::OWeakObject *>( pDispatchWatcher ); } @@ -170,15 +170,15 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY ); - DispatchList::const_iterator p; - std::vector< DispatchHolder > aDispatches; - ::rtl::OUString aAsTemplateArg( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate")); + DispatchList::const_iterator p; + std::vector< DispatchHolder > aDispatches; + ::rtl::OUString aAsTemplateArg( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate")); sal_Bool bSetInputFilter = sal_False; ::rtl::OUString aForcedInputFilter; for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); p++ ) { - const DispatchRequest& aDispatchRequest = *p; + const DispatchRequest& aDispatchRequest = *p; // create parameter array sal_Int32 nCount = 4; @@ -352,7 +352,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch // Set "AsTemplate" argument according to request type if ( aDispatchRequest.aRequestType == REQUEST_FORCENEW || - aDispatchRequest.aRequestType == REQUEST_FORCEOPEN ) + aDispatchRequest.aRequestType == REQUEST_FORCEOPEN ) { sal_Int32 nIndex = aArgs.getLength(); aArgs.realloc( nIndex+1 ); @@ -413,7 +413,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch aDispatchRequest.aRequestType == REQUEST_VIEW || aDispatchRequest.aRequestType == REQUEST_START || aDispatchRequest.aRequestType == REQUEST_FORCEOPEN || - aDispatchRequest.aRequestType == REQUEST_FORCENEW ) + aDispatchRequest.aRequestType == REQUEST_FORCENEW ) { // request is completed OfficeIPCThread::RequestsCompleted( 1 ); diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index d8b08747dd45..6dc2d9362cf1 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ struct OUStringHashCode } }; -class DispatchWatcherHashMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class DispatchWatcherHashMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > { public: inline void free() @@ -87,8 +87,8 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame: DispatchRequest( RequestType aType, const ::rtl::OUString& aFile, boost::optional< rtl::OUString > const & cwdUrl, const ::rtl::OUString& aPrinter, const ::rtl::OUString& aFact ) : aRequestType( aType ), aURL( aFile ), aCwdUrl( cwdUrl ), aPrinterName( aPrinter ), aPreselectedFactory( aFact ) {} - RequestType aRequestType; - rtl::OUString aURL; + RequestType aRequestType; + rtl::OUString aURL; boost::optional< rtl::OUString > aCwdUrl; rtl::OUString aPrinterName; // also conversion params rtl::OUString aPreselectedFactory; @@ -114,11 +114,11 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame: private: DispatchWatcher(); - static ::osl::Mutex& GetMutex(); + static ::osl::Mutex& GetMutex(); - DispatchWatcherHashMap m_aRequestContainer; + DispatchWatcherHashMap m_aRequestContainer; - static ::osl::Mutex* pWatcherMutex; + static ::osl::Mutex* pWatcherMutex; sal_Int16 m_nRequestCount; }; diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index ae4a9f4bacd1..e3563606082a 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,8 +99,8 @@ static OUString locateSofficeIniFile() sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/'); if ( nIndex > 0 ) { - OUString aUserSofficeIniFileURL; - OUStringBuffer aBuffer( aUserDataPath ); + OUString aUserSofficeIniFileURL; + OUStringBuffer aBuffer( aUserDataPath ); aBuffer.appendAscii( CONFIG_DIR ); aBuffer.append( aSofficeIniFileURL.copy( nIndex )); aUserSofficeIniFileURL = aBuffer.makeStringAndClear(); @@ -137,7 +137,7 @@ bool LanguageSelection::prepareLanguage() { m_eStatus = LS_STATUS_CONFIGURATIONACCESS_BROKEN; } - + if(!theConfigProvider.is()) return false; @@ -171,13 +171,13 @@ bool LanguageSelection::prepareLanguage() { m_eStatus = LS_STATUS_CONFIGURATIONACCESS_BROKEN; } - + // get the selected UI language as string bool bCmdLanguage( false ); bool bIniLanguage( false ); OUString aEmpty; OUString aLocaleString = getUserUILanguage(); - + if ( aLocaleString.getLength() == 0 ) { CommandLineArgs* pCmdLineArgs = Desktop::GetCommandLineArgs(); @@ -193,7 +193,7 @@ bool LanguageSelection::prepareLanguage() else aLocaleString = aEmpty; } - + if ( !bCmdLanguage ) { OUString aSOfficeIniURL = locateSofficeIniFile(); @@ -211,7 +211,7 @@ bool LanguageSelection::prepareLanguage() aLocaleString = aEmpty; } } - + // user further fallbacks for the UI language if ( aLocaleString.getLength() == 0 ) aLocaleString = getLanguageString(); @@ -234,19 +234,19 @@ bool LanguageSelection::prepareLanguage() Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW); if ( !bCmdLanguage ) { - // Store language only + // Store language only xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")), makeAny(aLocaleString)); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); } - + if ( bIniLanguage ) { - // Store language only + // Store language only Reference< XPropertySet > xProp2(getConfigAccess("org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW); xProp2->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(aLocaleString)); Reference< XChangesBatch >(xProp2, UNO_QUERY_THROW)->commitChanges(); } - + MsLangId::setConfiguredSystemUILanguage( MsLangId::convertLocaleToLanguage(loc) ); OUString sLocale; @@ -272,7 +272,7 @@ bool LanguageSelection::prepareLanguage() } } - + // #i32939# setting of default document locale // #i32939# this should not be based on the UI language setDefaultLanguage(aLocaleString); @@ -332,12 +332,12 @@ OUString LanguageSelection::getLanguageString() // did we already find a language? if (bFoundLanguage) return aFoundLanguage; - + // check whether the user has selected a specific language OUString aUserLanguage = getUserUILanguage(); if (aUserLanguage.getLength() > 0 ) return aUserLanguage ; - + // try to use system default aUserLanguage = getSystemLanguage(); if (aUserLanguage.getLength() > 0 ) @@ -358,7 +358,7 @@ OUString LanguageSelection::getLanguageString() aFoundLanguage = usFallbackLanguage; return aFoundLanguage; } - + // fallback didn't work use first installed language aUserLanguage = getFirstInstalledLanguage(); diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index fdb229a47956..6db4f5bc24b1 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public: LS_STATUS_CANNOT_DETERMINE_LANGUAGE, LS_STATUS_CONFIGURATIONACCESS_BROKEN }; - + static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str); static rtl::OUString getLanguageString(); static bool prepareLanguage(); diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx index b58ccaf8433a..db23c7db195a 100644 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/app/lockfile.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -197,7 +197,7 @@ namespace desktop { OUString aUserName; Security aSecurity; aSecurity.getUserName( aUserName ); - ByteString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); + ByteString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); ByteString aTime = OUStringToOString( m_aDate, RTL_TEXTENCODING_ASCII_US ); ByteString aStamp = OUStringToOString( m_aId, RTL_TEXTENCODING_ASCII_US ); diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx index 5444714ec88c..0d286e13cafb 100644 --- a/desktop/source/app/lockfile.hxx +++ b/desktop/source/app/lockfile.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ /* Information: * This class implements a mechanism to lock a users installation directory, - * which is necessesary because instances of staroffice could be running on - * different hosts while using the same directory thus causing data + * which is necessesary because instances of staroffice could be running on + * different hosts while using the same directory thus causing data * inconsistency. * When an existing lock is detected, the user will be asked whether he wants * to continue anyway, thus removing the lock and replacing it with a new one * * ideas: - * - store information about user and host and time in the lockfile and display + * - store information about user and host and time in the lockfile and display * these when asking whether to remove the lockfile. * - periodically check the lockfile and warn the user when it gets replaced * @@ -68,8 +68,8 @@ namespace desktop { // separating GUI code: typedef bool (* fpExecWarning)( Lockfile * that ); - - // checks the lockfile, asks user when lockfile is + + // checks the lockfile, asks user when lockfile is // found (iff gui) and returns false when we may not continue sal_Bool check( fpExecWarning execWarning ); @@ -86,7 +86,7 @@ namespace desktop { // flag whether the d'tor should delete the lock sal_Bool m_bRemove; sal_Bool m_bIsLocked; - // ID + // ID rtl::OUString m_aId; rtl::OUString m_aDate; // access to data in file diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index 619102b70c2b..9f61c563fd4b 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ bool Lockfile_execWarning( Lockfile * that ) ByteString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); ByteString aStamp = aConfig.ReadKey( LOCKFILE_STAMPKEY ); ByteString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); - + // display warning and return response QueryBox aBox( NULL, DesktopResId( QBX_USERDATALOCKED ) ); // set box title diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c index 88610ba18ef9..198e42a0caf1 100644 --- a/desktop/source/app/main.c +++ b/desktop/source/app/main.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 065a665e2427..c685596d2626 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -218,9 +218,9 @@ bool addArgument( } -OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; +OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; namespace { struct Security : public rtl::Static<osl::Security, Security> {}; } -::osl::Mutex* OfficeIPCThread::pOfficeIPCThreadMutex = 0; +::osl::Mutex* OfficeIPCThread::pOfficeIPCThreadMutex = 0; // Turns a string in aMsg such as file://home/foo/.libreoffice/3 // Into a hex string of well known length ff132a86... @@ -235,9 +235,9 @@ String CreateMD5FromString( const OUString& aMsg ) if ( handle > 0 ) { const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr(); - sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); - sal_uInt32 nMD5KeyLen = rtl_digest_queryLength( handle ); - sal_uInt8* pMD5KeyBuffer = new sal_uInt8[ nMD5KeyLen ]; + sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); + sal_uInt32 nMD5KeyLen = rtl_digest_queryLength( handle ); + sal_uInt8* pMD5KeyBuffer = new sal_uInt8[ nMD5KeyLen ]; rtl_digest_init( handle, pData, nSize ); rtl_digest_update( handle, pData, nSize ); @@ -359,7 +359,7 @@ throw( RuntimeException ) // ---------------------------------------------------------------------------- -::osl::Mutex& OfficeIPCThread::GetMutex() +::osl::Mutex& OfficeIPCThread::GetMutex() { // Get or create our mutex for thread-saftey if ( !pOfficeIPCThreadMutex ) @@ -377,7 +377,7 @@ void OfficeIPCThread::SetDowning() // We have the order to block all incoming requests. Framework // wants to shutdown and we have to make sure that no loading/printing // requests are executed anymore. - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) pGlobalOfficeIPCThread->mbDowning = true; @@ -388,7 +388,7 @@ static bool s_bInEnableRequests = false; void OfficeIPCThread::EnableRequests( bool i_bEnable ) { // switch between just queueing the requests and executing them - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) { @@ -408,7 +408,7 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable ) sal_Bool OfficeIPCThread::AreRequestsPending() { // Give info about pending requests - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) return ( pGlobalOfficeIPCThread->mnPendingRequests > 0 ); else @@ -418,7 +418,7 @@ sal_Bool OfficeIPCThread::AreRequestsPending() void OfficeIPCThread::RequestsCompleted( int nCount ) { // Remove nCount pending requests from our internal counter - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if ( pGlobalOfficeIPCThread ) { if ( pGlobalOfficeIPCThread->mnPendingRequests > 0 ) @@ -428,7 +428,7 @@ void OfficeIPCThread::RequestsCompleted( int nCount ) OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() { - ::osl::MutexGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if( pGlobalOfficeIPCThread ) return IPC_STATUS_OK; @@ -485,7 +485,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if ( aPreloadData.equalsAscii( "1" )) { - sal_Char szBuffer[32]; + sal_Char szBuffer[32]; sprintf( szBuffer, "%d", SUPD ); aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer), osl_getThreadTextEncoding() ); } @@ -630,7 +630,7 @@ OfficeIPCThread::OfficeIPCThread() : OfficeIPCThread::~OfficeIPCThread() { - ::osl::ClearableMutexGuard aGuard( GetMutex() ); + ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( mpDispatchWatcher ) mpDispatchWatcher->release(); @@ -716,7 +716,7 @@ void SAL_CALL OfficeIPCThread::run() #endif continue; } - CommandLineArgs *pCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); + CommandLineArgs *pCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); if ( aCmdLineArgs->IsQuickstart() ) { @@ -767,7 +767,7 @@ void SAL_CALL OfficeIPCThread::run() // loaded with the "hidden" flag! So they are always checked. bDocRequestSent |= aCmdLineArgs->GetPrintList( pRequest->aPrintList ); bDocRequestSent |= ( aCmdLineArgs->GetPrintToList( pRequest->aPrintToList ) && - aCmdLineArgs->GetPrinterName( pRequest->aPrinterName ) ); + aCmdLineArgs->GetPrinterName( pRequest->aPrinterName ) ); if ( !pCurrentCmdLineArgs->IsInvisible() ) { @@ -1008,7 +1008,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ // protect the dispatch list osl::ClearableMutexGuard aGuard( GetMutex() ); - static DispatchWatcher::DispatchList aDispatchList; + static DispatchWatcher::DispatchList aDispatchList; rtl::OUString aEmpty; // Create dispatch list for dispatch watcher diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 765fc548788c..f075aec313f2 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,14 +54,14 @@ struct ProcessDocumentsRequest boost::optional< ::rtl::OUString > aCwdUrl; ::rtl::OUString aModule; - ::rtl::OUString aOpenList; // Documents that should be opened in the default way + ::rtl::OUString aOpenList; // Documents that should be opened in the default way ::rtl::OUString aViewList; // Documents that should be opened in viewmode ::rtl::OUString aStartList; // Documents/Presentations that should be started - ::rtl::OUString aPrintList; // Documents that should be printed on default printer + ::rtl::OUString aPrintList; // Documents that should be printed on default printer ::rtl::OUString aForceOpenList; // Documents that should be forced to open for editing (even templates) - ::rtl::OUString aForceNewList; // Documents that should be forced to create a new document - ::rtl::OUString aPrinterName; // The printer name that should be used for printing - ::rtl::OUString aPrintToList; // Documents that should be printed on the given printer + ::rtl::OUString aForceNewList; // Documents that should be forced to create a new document + ::rtl::OUString aPrinterName; // The printer name that should be used for printing + ::rtl::OUString aPrintToList; // Documents that should be printed on the given printer ::rtl::OUString aConversionList; ::rtl::OUString aConversionParams; ::rtl::OUString aConversionOut; @@ -73,16 +73,16 @@ class DispatchWatcher; class OfficeIPCThread : public osl::Thread { private: - static OfficeIPCThread* pGlobalOfficeIPCThread; - static ::osl::Mutex* pOfficeIPCThreadMutex; + static OfficeIPCThread* pGlobalOfficeIPCThread; + static ::osl::Mutex* pOfficeIPCThreadMutex; osl::Pipe maPipe; osl::StreamPipe maStreamPipe; - rtl::OUString maPipeIdent; + rtl::OUString maPipeIdent; bool mbDowning; bool mbRequestsEnabled; - int mnPendingRequests; - DispatchWatcher* mpDispatchWatcher; + int mnPendingRequests; + DispatchWatcher* mpDispatchWatcher; /* condition to be set when the request has been processed */ ::osl::Condition cProcessed; @@ -92,7 +92,7 @@ class OfficeIPCThread : public osl::Thread requests from a 2nd office */ ::osl::Condition cReady; - static ::osl::Mutex& GetMutex(); + static ::osl::Mutex& GetMutex(); static const char *sc_aTerminationSequence; static const int sc_nTSeqLength; static const char *sc_aShowSequence; @@ -117,18 +117,18 @@ class OfficeIPCThread : public osl::Thread virtual ~OfficeIPCThread(); // controlling pipe communication during shutdown - static void SetDowning(); + static void SetDowning(); static void EnableRequests( bool i_bEnable = true ); - static sal_Bool AreRequestsPending(); - static void RequestsCompleted( int n = 1 ); - static sal_Bool ExecuteCmdLineRequests( ProcessDocumentsRequest& ); + static sal_Bool AreRequestsPending(); + static void RequestsCompleted( int n = 1 ); + static sal_Bool ExecuteCmdLineRequests( ProcessDocumentsRequest& ); // return FALSE if second office - static Status EnableOfficeIPCThread(); - static void DisableOfficeIPCThread(); + static Status EnableOfficeIPCThread(); + static void DisableOfficeIPCThread(); // start dispatching events... static void SetReady(OfficeIPCThread* pThread = NULL); - + bool AreRequestsEnabled() const { return mbRequestsEnabled && ! mbDowning; } }; diff --git a/desktop/source/app/omutexmember.hxx b/desktop/source/app/omutexmember.hxx index 175eae09fe93..4e33e1313da9 100644 --- a/desktop/source/app/omutexmember.hxx +++ b/desktop/source/app/omutexmember.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,35 +30,35 @@ #define __FRAMEWORK_OMUTEXMEMBER_HXX_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short definition of a public mutex member - @descr You can use this struct as baseclass to get a public mutex member for right initialization. + @short definition of a public mutex member + @descr You can use this struct as baseclass to get a public mutex member for right initialization. Don't use it as member. You can't guarantee the right order of initialization of baseclasses then! And some other helper classes share the mutex with an implementation and must have a valid one. - @seealso See implementation of constructors in derived classes for further informations! + @seealso See implementation of constructors in derived classes for further informations! - @devstatus ready + @devstatus ready *//*-*************************************************************************************************************/ struct OMutexMember { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; }; -#endif // #ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ +#endif // #ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index b718d2798506..b7d190c845e1 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h index 539988834a02..5b07bb4684ed 100644 --- a/desktop/source/app/sofficemain.h +++ b/desktop/source/app/sofficemain.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index f1afda0590d7..ca68ab00ad9d 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx index 6dcb5e91db41..67b4f0081a87 100644 --- a/desktop/source/app/userinstall.hxx +++ b/desktop/source/app/userinstall.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <sal/types.h> #include <rtl/ustring.hxx> -namespace desktop +namespace desktop { class UserInstall @@ -47,7 +47,7 @@ public: E_NoWriteAccess, // no write access E_Unknown // unknown error }; - + static UserInstallError finalize(); }; } diff --git a/desktop/source/app/version.map b/desktop/source/app/version.map index 0ffffcd58635..ad52c57cc1cb 100644 --- a/desktop/source/app/version.map +++ b/desktop/source/app/version.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 0fc8b08a15b7..bb58770c4cdb 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper protected: virtual void SAL_CALL disposing(); virtual ~ProgressLogImpl(); - + public: ProgressLogImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xContext ); - + // XProgressHandler virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException); virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException); @@ -104,7 +104,7 @@ ProgressLogImpl::ProgressLogImpl( OUString log_file; boost::optional< Reference<task::XInteractionHandler> > interactionHandler; comphelper::unwrapArgs( args, log_file, interactionHandler ); - + Reference<ucb::XSimpleFileAccess> xSimpleFileAccess( xContext->getServiceManager()->createInstanceWithContext( OUSTR("com.sun.star.ucb.SimpleFileAccess"), @@ -112,12 +112,12 @@ ProgressLogImpl::ProgressLogImpl( // optional ia handler: if (interactionHandler) xSimpleFileAccess->setInteractionHandler( *interactionHandler ); - + m_xLogFile.set( xSimpleFileAccess->openFileWrite( log_file ), UNO_QUERY_THROW ); Reference<io::XSeekable> xSeekable( m_xLogFile, UNO_QUERY_THROW ); xSeekable->seek( xSeekable->getLength() ); - + // write log stamp OStringBuffer buf; buf.append( @@ -174,12 +174,12 @@ void ProgressLogImpl::update( Any const & Status ) { if (! Status.hasValue()) return; - + OUStringBuffer buf; OSL_ASSERT( m_log_level >= 0 ); for ( sal_Int32 n = 0; n < m_log_level; ++n ) buf.append( static_cast<sal_Unicode>(' ') ); - + OUString msg; if (Status >>= msg) { buf.append( msg ); diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 2716ed23fc0a..410bb01c1afb 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly ) OString cstr_sysPath( OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) ); char const * pcstr_sysPath = cstr_sysPath.getStr(); - + u_int32_t flags = DB_CREATE; if (readOnly) { flags = DB_RDONLY; @@ -104,7 +104,7 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly ) flags = DB_CREATE; } } - + int err = m_db.open( // xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used 0, pcstr_sysPath, 0, DB_HASH, flags/* | DB_THREAD*/, 0664 /* fs mode */ ); @@ -218,7 +218,7 @@ t_string2string_map PersistentMap::getEntries() const int err = m_db.cursor( 0, &pcurs, 0 ); if (err != 0) throw_rtexc(err); - + t_string2string_map ret; for (;;) { Dbt dbKey, dbData; @@ -227,7 +227,7 @@ t_string2string_map PersistentMap::getEntries() const break; if (err != 0) throw_rtexc(err); - + ::std::pair<t_string2string_map::iterator, bool > insertion( ret.insert( t_string2string_map::value_type( t_string2string_map::value_type( diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index b9b7959ccaba..36e7163f283c 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ sal_Bool SAL_CALL component_writeInfo( dp_registry::backend::component::serviceDecl, dp_registry::backend::help::serviceDecl, dp_registry::backend::script::serviceDecl, - dp_registry::backend::sfwk::serviceDecl, + dp_registry::backend::sfwk::serviceDecl, dp_registry::backend::executable::serviceDecl, dp_manager::factory::serviceDecl, dp_log::serviceDecl, diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index 9b2c49bace37..db787eb57808 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ void xml_parse( Reference<xml::sax::XParser> xParser( xContext->getServiceManager()->createInstanceWithContext( OUSTR("com.sun.star.xml.sax.Parser"), xContext ), UNO_QUERY_THROW ); - + // error handler, entity resolver omitted xParser->setDocumentHandler( xDocHandler ); xml::sax::InputSource source; diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx index 8887b40a3946..0291ce5802f1 100644 --- a/desktop/source/deployment/gui/descedit.cxx +++ b/desktop/source/deployment/gui/descedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx index ed8b8f9c333f..27e36e14a0c8 100644 --- a/desktop/source/deployment/gui/descedit.hxx +++ b/desktop/source/deployment/gui/descedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 1c57aa5b800e..043a86f1aff8 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 5f52b042edf3..19b2faf129a0 100755 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #define RID_DLG_EXTENSION_MANAGER RID_DEPLOYMENT_GUI_START #define RID_DLG_UPDATE_REQUIRED (RID_DEPLOYMENT_GUI_START + 11) -#define RID_EM_BTN_CLOSE 10 +#define RID_EM_BTN_CLOSE 10 #define RID_EM_BTN_HELP 11 #define RID_EM_BTN_ADD 12 #define RID_EM_BTN_CHECK_UPDATES 13 @@ -46,19 +46,19 @@ #define RID_EM_FT_MSG 22 // local RIDs: -#define PB_LICENSE_DOWN 50 -#define ML_LICENSE 51 -#define BTN_LICENSE_DECLINE 53 -#define FT_LICENSE_HEADER 54 -#define FT_LICENSE_BODY_1 55 -#define FT_LICENSE_BODY_1_TXT 56 -#define FT_LICENSE_BODY_2 57 -#define FT_LICENSE_BODY_2_TXT 58 -#define FL_LICENSE 69 -#define FI_LICENSE_ARROW1 60 -#define FI_LICENSE_ARROW2 61 -#define IMG_LICENCE_ARROW_HC 62 -#define BTN_LICENSE_ACCEPT 63 +#define PB_LICENSE_DOWN 50 +#define ML_LICENSE 51 +#define BTN_LICENSE_DECLINE 53 +#define FT_LICENSE_HEADER 54 +#define FT_LICENSE_BODY_1 55 +#define FT_LICENSE_BODY_1_TXT 56 +#define FT_LICENSE_BODY_2 57 +#define FT_LICENSE_BODY_2_TXT 58 +#define FL_LICENSE 69 +#define FI_LICENSE_ARROW1 60 +#define FI_LICENSE_ARROW2 61 +#define IMG_LICENCE_ARROW_HC 62 +#define BTN_LICENSE_ACCEPT 63 // local RIDs for "Download and Install" dialog @@ -123,8 +123,8 @@ #define RID_DLG_UPDATE_BROWSERBASED 25 #define RID_DLG_UPDATE_PUBLISHER_LABEL 26 #define RID_DLG_UPDATE_PUBLISHER_LINK 27 -#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28 -#define RID_DLG_UPDATE_RELEASENOTES_LINK 29 +#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28 +#define RID_DLG_UPDATE_RELEASENOTES_LINK 29 #define RID_DLG_UPDATE_NOUPDATE 30 #define RID_DLG_UPDATE_VERSION 31 @@ -173,7 +173,7 @@ #define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) #define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) -#define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START +#define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx index 9bde835bf140..c00123fb912e 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ void AutoScrollEdit::Notify( SfxBroadcaster&, const SfxHint& rHint ) { ULONG nId = ((const TextHint&)rHint).GetId(); if ( nId == TEXT_HINT_VIEWSCROLLED ) - { + { ScrollBar* pScroll = GetVScrollBar(); if ( pScroll ) pScroll->Show(); diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index c49477358c1b..ddec1e81ae93 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace dp_gui { /** This control shows automatically the vertical scroll bar if text is inserted, - that does not fit into the text area. In the resource one uses MultiLineEdit + that does not fit into the text area. In the resource one uses MultiLineEdit and needs to set VScroll = TRUE */ class AutoScrollEdit : public ExtMultiLineEdit, public SfxListener diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src index 4d554ab4ded9..343d75df6a5e 100644 --- a/desktop/source/deployment/gui/dp_gui_backend.src +++ b/desktop/source/deployment/gui/dp_gui_backend.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 7019db610b85..694f764d5ed7 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 48ef45fd15c0..72f8334d38dc 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src index fa7465678326..80b584f89423 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src index 15823288ee20..db2e09769de3 100755 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,9 +121,9 @@ String RID_STR_ERROR_MISSING_LICENSE // Dialog layout // --------------------------------------------------- -// row 1 | multi line edit +// row 1 | multi line edit // --------------------------------------------------- -// row 2 | fixed text +// row 2 | fixed text // --------------------------------------------------- // row 3 | img | fixed text | fixed text | button // ---------------------------------------------------- @@ -131,7 +131,7 @@ String RID_STR_ERROR_MISSING_LICENSE // --------------------------------------------------- // row 5 |fixed line // --------------------------------------------------- -// row 6 | | |button | button +// row 6 | | |button | button // --------------------------------------------------- // | col 1 | col 2 | col3 | col4 | col5 @@ -187,7 +187,7 @@ ModalDialog RID_DLG_LICENSE VScroll = TRUE; ReadOnly = TRUE; }; - + FixedText FT_LICENSE_HEADER { Pos = MAP_APPFONT(COL1_X, ROW2_Y); @@ -195,14 +195,14 @@ ModalDialog RID_DLG_LICENSE WordBreak = TRUE; NoLabel = TRUE; Text [ en-US ] = "Please follow these steps to proceed with the installation of the extension:"; - }; + }; FixedText FT_LICENSE_BODY_1 { Pos = MAP_APPFONT(COL2_X, ROW3_Y); Size = MAP_APPFONT( COL2_WIDTH, ROW3_HEIGHT ); NoLabel = TRUE; Text [ en-US ] = "1."; - }; + }; //spans col3 + col4 FixedText FT_LICENSE_BODY_1_TXT { @@ -211,14 +211,14 @@ ModalDialog RID_DLG_LICENSE WordBreak = TRUE; NoLabel = TRUE; Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text."; - }; + }; FixedText FT_LICENSE_BODY_2 { Pos = MAP_APPFONT(COL2_X, ROW4_Y); Size = MAP_APPFONT(COL2_WIDTH, ROW4_HEIGHT); NoLabel = TRUE; Text [ en-US ] = "2."; - }; + }; FixedText FT_LICENSE_BODY_2_TXT { Pos = MAP_APPFONT(COL3_X, ROW4_Y); @@ -226,22 +226,22 @@ ModalDialog RID_DLG_LICENSE WordBreak = TRUE; NoLabel = TRUE; Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button."; - - }; + + }; PushButton PB_LICENSE_DOWN { TabStop = TRUE ; Pos = MAP_APPFONT(COL5_X , ROW3_Y) ; Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ; Text [ en-US ] = "~Scroll Down"; - + }; FixedLine FL_LICENSE { Pos = MAP_APPFONT ( 0, ROW5_Y) ; Size = MAP_APPFONT ( LIC_DLG_WIDTH, ROW5_HEIGHT ) ; }; - + FixedImage FI_LICENSE_ARROW1 { Pos = MAP_APPFONT (COL1_X, ROW3_Y) ; @@ -252,7 +252,7 @@ ModalDialog RID_DLG_LICENSE MASKCOLOR }; }; - + FixedImage FI_LICENSE_ARROW2 { Pos = MAP_APPFONT (COL1_X, ROW4_Y) ; @@ -263,13 +263,13 @@ ModalDialog RID_DLG_LICENSE MASKCOLOR }; }; - + Image IMG_LICENCE_ARROW_HC { ImageBitmap = Bitmap { File = "sch06300.png"; }; MASKCOLOR }; - + OKButton BTN_LICENSE_ACCEPT { Pos = MAP_APPFONT(COL4_X, ROW6_Y); @@ -279,7 +279,7 @@ ModalDialog RID_DLG_LICENSE DefButton = TRUE; Text [ en-US ] = "Accept"; }; - + CancelButton BTN_LICENSE_DECLINE { Pos = MAP_APPFONT(COL5_X, ROW6_Y); @@ -287,7 +287,7 @@ ModalDialog RID_DLG_LICENSE Text [ en-US ] = "Decline" ; TabStop = TRUE; }; - + }; @@ -338,7 +338,7 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION "Click \'Cancel\' to stop disabling the extension."; }; - + String RID_STR_UNSUPPORTED_PLATFORM { Text [ en-US ] = "The extension \'%Name\' does not work on this computer."; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 4b631a45939a..53628fb8546d 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl { Size m_aOutputSize; bool m_bInterfaceLocked; - + PushButton *m_pOptionsBtn; PushButton *m_pEnableBtn; PushButton *m_pRemoveBtn; @@ -466,13 +466,13 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) { long nDelta = pScrBar->GetDelta(); - + Point aNewOptPt( m_pOptionsBtn->GetPosPixel() - Point( 0, nDelta ) ); Point aNewRemPt( m_pRemoveBtn->GetPosPixel() - Point( 0, nDelta ) ); Point aNewEnPt( m_pEnableBtn->GetPosPixel() - Point( 0, nDelta ) ); DoScroll( nDelta ); - + m_pOptionsBtn->SetPosPixel( aNewOptPt ); m_pRemoveBtn->SetPosPixel( aNewRemPt ); m_pEnableBtn->SetPosPixel( aNewEnPt ); @@ -488,14 +488,14 @@ IMPL_LINK( ExtBoxWithBtns_Impl, HandleOptionsBtn, void*, EMPTYARG ) if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND ) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - + if ( pFact ) { OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value; VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, rtl::OUString() ); - + pDlg->Execute(); - + delete pDlg; } } @@ -601,7 +601,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment:: aInfoBox.SetMessText( aMsgText ); bHadWarning = true; - + if ( RET_OK == aInfoBox.Execute() ) return true; else @@ -617,7 +617,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty return; - try + try { uno::Reference< XSystemShellExecute > xSystemShellExecute( m_xContext->getServiceManager()->createInstanceWithContext( OUSTR( "com.sun.star.system.SystemShellExecute" ), m_xContext), uno::UNO_QUERY_THROW); @@ -849,10 +849,10 @@ bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > & return false; // get the extension with highest version - uno::Sequence<uno::Reference<deployment::XPackage> > seqExtensions = + uno::Sequence<uno::Reference<deployment::XPackage> > seqExtensions = m_pManager->getExtensionManager()->getExtensionsWithSameIdentifier( dp_misc::getIdentifier(xPackage), xPackage->getName(), uno::Reference<ucb::XCommandEnvironment>()); - uno::Reference<deployment::XPackage> extension = + uno::Reference<deployment::XPackage> extension = dp_misc::getExtensionWithHighestVersion(seqExtensions); OSL_ASSERT(extension.is()); std::vector< css::uno::Reference< css::deployment::XPackage > > vEntries; @@ -905,7 +905,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() const OUString title( xPackageType->getShortDescription() ); const ::std::pair< t_string2string::iterator, bool > insertion( title2filter.insert( t_string2string::value_type( title, filter ) ) ); - if ( ! insertion.second ) + if ( ! insertion.second ) { // already existing, append extensions: ::rtl::OUStringBuffer buf; buf.append( insertion.first->second ); @@ -1124,7 +1124,7 @@ void ExtMgrDialog::Resize() Point aPos( RSC_SP_DLG_INNERBORDER_LEFT, aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM - aBtnSize.Height() ); - + m_aHelpBtn.SetPosPixel( aPos ); aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - aBtnSize.Width(); @@ -1142,12 +1142,12 @@ void ExtMgrDialog::Resize() Size aFTSize( m_aGetExtensions.CalcMinimumSize() ); aPos = Point( RSC_SP_DLG_INNERBORDER_LEFT, aPos.Y() - RSC_CD_FIXEDTEXT_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM ); - + m_aGetExtensions.SetPosSizePixel( aPos, aFTSize ); aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - aBtnSize.Width(); m_aCancelBtn.SetPosPixel( Point( aPos.X(), aPos.Y() - ((aBtnSize.Height()-aFTSize.Height())/2) ) ); - + // Calc progress height long nProgressHeight = aFTSize.Height(); @@ -1562,7 +1562,7 @@ void UpdateRequiredDialog::Resize() Point aPos( RSC_SP_DLG_INNERBORDER_LEFT, aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM - aBtnSize.Height() ); - + m_aHelpBtn.SetPosPixel( aPos ); aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - m_aCloseBtn.GetSizePixel().Width(); @@ -1717,7 +1717,7 @@ bool UpdateRequiredDialog::hasActiveEntries() for ( long nIndex = 0; nIndex < nCount; nIndex++ ) { TEntry_Impl pEntry = m_pExtensionBox->GetEntryData( nIndex ); - + if ( !checkDependencies( pEntry->m_xPackage ) ) { bRet = true; @@ -1743,7 +1743,7 @@ void UpdateRequiredDialog::disableAllEntries() } setBusy( false ); - + if ( ! hasActiveEntries() ) m_aCloseBtn.SetText( m_sCloseText ); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 795360732837..bb8c9785d91b 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ public: virtual void Resize(); virtual long Notify( NotifyEvent& rNEvt ); - virtual BOOL Close(); + virtual BOOL Close(); virtual void showProgress( bool bStart ); virtual void updateProgress( const ::rtl::OUString &rText, @@ -219,9 +219,9 @@ public: UpdateRequiredDialog( Window * pParent, TheExtensionManager *pManager ); virtual ~UpdateRequiredDialog(); - virtual short Execute(); + virtual short Execute(); virtual void Resize(); - virtual BOOL Close(); + virtual BOOL Close(); // virtual long Notify( NotifyEvent& rNEvt ); virtual void showProgress( bool bStart ); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src index 7c47365999a0..b74a802ceb0f 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.src +++ b/desktop/source/deployment/gui/dp_gui_dialog2.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -203,9 +203,9 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL // Dialog layout // --------------------------------------------------- -// row 1 | multi line edit +// row 1 | multi line edit // --------------------------------------------------- -// row 2 | fixed text +// row 2 | fixed text // --------------------------------------------------- // row 3 | img | fixed text | fixed text | button // ---------------------------------------------------- @@ -213,7 +213,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL // --------------------------------------------------- // row 5 |fixed line // --------------------------------------------------- -// row 6 | | |button | button +// row 6 | | |button | button // --------------------------------------------------- // | col 1 | col 2 | col3 | col4 | col5 diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 6b904dd65b34..3674759f6f04 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,10 +151,10 @@ class ProgressCmdEnv public: virtual ~ProgressCmdEnv(); - /** When param bAskWhenInstalling = true, then the user is asked if he + /** When param bAskWhenInstalling = true, then the user is asked if he agrees to install this extension. In case this extension is already installed - then the user is also notified and asked if he wants to replace that existing - extension. In first case an interaction request with an InstallException + then the user is also notified and asked if he wants to replace that existing + extension. In first case an interaction request with an InstallException will be handled and in the second case a VersionException will be handled. */ @@ -373,7 +373,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); dp_misc::TRACE( OUSTR("[dp_gui_cmdenv.cxx] incoming request:\n") + ::comphelper::anyToString(request) + OUSTR("\n")); - + lang::WrappedTargetException wtExc; deployment::DependencyException depExc; deployment::LicenseException licExc; @@ -400,7 +400,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & cause = wtExc.TargetException; } update_( cause ); - + // ignore intermediate errors of legacy packages, i.e. // former pkgchk behaviour: const uno::Reference< deployment::XPackage > xPackage( wtExc.Context, uno::UNO_QUERY ); @@ -418,7 +418,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & "vnd.sun.star.legacy-package-bundle") )); } } - abort = !approve; + abort = !approve; } else if (request >>= depExc) { @@ -442,7 +442,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( deployment::ui::LicenseDialog::create( - m_xContext, VCLUnoHelper::GetInterface( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL ), + m_xContext, VCLUnoHelper::GetInterface( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL ), licExc.ExtensionName, licExc.Text ) ); sal_Int16 res = xDialog->execute(); if ( res == ui::dialogs::ExecutableDialogResults::CANCEL ) @@ -481,10 +481,10 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { s = box.GetMessText(); } - else if (id == RID_WARNINGBOX_VERSION_EQUAL) + else if (id == RID_WARNINGBOX_VERSION_EQUAL) { - //hypothetical: requires two instances of an extension with the same - //version to have different display names. Probably the developer forgot + //hypothetical: requires two instances of an extension with the same + //version to have different display names. Probably the developer forgot //to change the version. s = String(ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get())); } @@ -516,7 +516,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & if ( m_pDialogHelper ) { SolarMutexGuard guard; - + approve = m_pDialogHelper->installExtensionWarn( instExc.displayName ); } else @@ -569,7 +569,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (abort) { uno::Reference< task::XInteractionAbort > xInteractionAbort( pConts[ pos ], uno::UNO_QUERY ); - if (xInteractionAbort.is()) { + if (xInteractionAbort.is()) { xInteractionAbort->select(); // don't query again for ongoing continuations: abort = false; @@ -647,7 +647,7 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionURL, const ::rtl::OUString &rRepository, const bool bWarnUser ) -{ +{ ::osl::MutexGuard aGuard( m_mutex ); //If someone called stop then we do not add the extension -> game over! @@ -666,7 +666,7 @@ void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionU //------------------------------------------------------------------------------ void ExtensionCmdQueue::Thread::removeExtension( const uno::Reference< deployment::XPackage > &rPackage ) -{ +{ ::osl::MutexGuard aGuard( m_mutex ); //If someone called stop then we do not remove the extension -> game over! @@ -685,7 +685,7 @@ void ExtensionCmdQueue::Thread::removeExtension( const uno::Reference< deploymen //------------------------------------------------------------------------------ void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment::XPackage > &rPackage ) -{ +{ ::osl::MutexGuard aGuard( m_mutex ); //If someone called stop then we do not remove the extension -> game over! @@ -705,7 +705,7 @@ void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment: //------------------------------------------------------------------------------ void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deployment::XPackage > &rPackage, const bool bEnable ) -{ +{ ::osl::MutexGuard aGuard( m_mutex ); //If someone called stop then we do not remove the extension -> game over! @@ -726,7 +726,7 @@ void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deploymen //------------------------------------------------------------------------------ void ExtensionCmdQueue::Thread::checkForUpdates( const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList ) -{ +{ ::osl::MutexGuard aGuard( m_mutex ); //If someone called stop then we do not update the extension -> game over! @@ -741,7 +741,7 @@ void ExtensionCmdQueue::Thread::checkForUpdates( //------------------------------------------------------------------------------ //Stopping this thread will not abort the installation of extensions. -void ExtensionCmdQueue::Thread::stop() +void ExtensionCmdQueue::Thread::stop() { osl::MutexGuard aGuard( m_mutex ); m_bStopped = true; @@ -750,7 +750,7 @@ void ExtensionCmdQueue::Thread::stop() } //------------------------------------------------------------------------------ -bool ExtensionCmdQueue::Thread::isBusy() +bool ExtensionCmdQueue::Thread::isBusy() { osl::MutexGuard aGuard( m_mutex ); return m_bWorking; @@ -760,15 +760,15 @@ bool ExtensionCmdQueue::Thread::isBusy() ExtensionCmdQueue::Thread::~Thread() {} //------------------------------------------------------------------------------ -void ExtensionCmdQueue::Thread::execute() +void ExtensionCmdQueue::Thread::execute() { #ifdef WNT - //Needed for use of the service "com.sun.star.system.SystemShellExecute" in + //Needed for use of the service "com.sun.star.system.SystemShellExecute" in //DialogHelper::openWebBrowser CoUninitialize(); HRESULT r = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); #endif - for (;;) + for (;;) { if ( m_wakeup.wait() != osl::Condition::result_ok ) { @@ -791,13 +791,13 @@ void ExtensionCmdQueue::Thread::execute() // then input is NONE and we wait again. // We only install the extension which are currently in the queue. // The progressbar will be set to show the progress of the current number - // of extensions. If we allowed to add extensions now then the progressbar may + // of extensions. If we allowed to add extensions now then the progressbar may // have reached the end while we still install newly added extensions. if ( ( eInput == NONE ) || ( nSize == 0 ) ) continue; if ( eInput == STOP ) break; - + ::rtl::Reference< ProgressCmdEnv > currentCmdEnv( new ProgressCmdEnv( m_xContext, m_pDialogHelper, m_sDefaultCmd ) ); // Do not lock the following part with addExtension. addExtension may be called in the main thread. @@ -847,17 +847,17 @@ void ExtensionCmdQueue::Thread::execute() _acceptLicense( currentCmdEnv, pEntry->m_xPackage ); break; } - } - //catch ( deployment::DeploymentException &) - //{ + } + //catch ( deployment::DeploymentException &) + //{ //} - //catch ( lang::IllegalArgumentException &) + //catch ( lang::IllegalArgumentException &) //{ //} - catch ( ucb::CommandAbortedException & ) + catch ( ucb::CommandAbortedException & ) { //This exception is thrown when the user clicks cancel on the progressbar. - //Then we cancel the installation of all extensions and remove them from + //Then we cancel the installation of all extensions and remove them from //the queue. { ::osl::MutexGuard queueGuard2(m_mutex); @@ -866,16 +866,16 @@ void ExtensionCmdQueue::Thread::execute() } break; } - catch ( ucb::CommandFailedException & ) + catch ( ucb::CommandFailedException & ) { - //This exception is thrown when a user clicked cancel in the messagebox which was + //This exception is thrown when a user clicked cancel in the messagebox which was //startet by the interaction handler. For example the user will be asked if he/she //really wants to install the extension. //These interaction are run for exectly one extension at a time. Therefore we continue //with installing the remaining extensions. continue; - } - catch ( uno::Exception & ) + } + catch ( uno::Exception & ) { //Todo display the user an error //see also DialogImpl::SyncPushButton::Click() @@ -883,7 +883,7 @@ void ExtensionCmdQueue::Thread::execute() OUString msg; deployment::DeploymentException dpExc; if ((exc >>= dpExc) && - dpExc.Cause.getValueTypeClass() == uno::TypeClass_EXCEPTION) + dpExc.Cause.getValueTypeClass() == uno::TypeClass_EXCEPTION) { // notify error cause only: msg = reinterpret_cast< uno::Exception const * >( dpExc.Cause.getValue() )->Message; @@ -892,7 +892,7 @@ void ExtensionCmdQueue::Thread::execute() msg = ::comphelper::anyToString(exc); const SolarMutexGuard guard; - ::std::auto_ptr<ErrorBox> box( + ::std::auto_ptr<ErrorBox> box( new ErrorBox( currentCmdEnv->activeDialog(), WB_OK, msg ) ); if ( m_pDialogHelper ) box->SetText( m_pDialogHelper->getWindow()->GetText() ); @@ -1008,7 +1008,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( const SolarMutexGuard guard; pUpdateDialog = new UpdateDialog( m_xContext, m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, vExtensionList, &vData ); - + pUpdateDialog->notifyMenubar( true, false ); // prepare the checking, if there updates to be notified via menu bar icon if ( ( pUpdateDialog->Execute() == RET_OK ) && !vData.empty() ) @@ -1027,7 +1027,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( dataDownload.push_back( *i ); } - short nDialogResult = RET_OK; + short nDialogResult = RET_OK; if ( !dataDownload.empty() ) { nDialogResult = UpdateInstallDialog( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, dataDownload, m_xContext ).Execute(); @@ -1044,7 +1044,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( if ( m_pDialogHelper && ( i->sWebsiteURL.getLength() > 0 ) ) m_pDialogHelper->openWebBrowser( i->sWebsiteURL, m_pDialogHelper->getWindow()->GetText() ); } - } + } } else pUpdateDialog->notifyMenubar( false, false ); // check if there updates to be notified via menu bar icon @@ -1121,7 +1121,7 @@ void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv //------------------------------------------------------------------------------ void ExtensionCmdQueue::Thread::onTerminated() { - ::osl::MutexGuard g(m_mutex); + ::osl::MutexGuard g(m_mutex); m_bTerminated = true; } @@ -1194,7 +1194,7 @@ void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentC dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); } -void ExtensionCmdQueue::stop() +void ExtensionCmdQueue::stop() { m_thread->stop(); } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index f8fd1f1b2e05..8794c5113248 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,13 +51,13 @@ class DialogHelper; class TheExtensionManager; /** - Manages installing of extensions in the GUI mode. Requests for installing - Extensions can be asynchronous. For example, the Extension Manager is running - in an office process and someone uses the system integration to install an Extension. - That is, the user double clicks an extension symbol in a file browser, which then + Manages installing of extensions in the GUI mode. Requests for installing + Extensions can be asynchronous. For example, the Extension Manager is running + in an office process and someone uses the system integration to install an Extension. + That is, the user double clicks an extension symbol in a file browser, which then causes an invocation of "unopkg gui ext". When at that time the Extension Manager already performs a task, triggered by the user (for example, add, update, disable, - enable) then adding of the extension will be postponed until the user has finished + enable) then adding of the extension will be postponed until the user has finished the task. This class also ensures that the extensions are not installed in the main thread. @@ -76,7 +76,7 @@ public: ~ExtensionCmdQueue(); - /** + /** */ void addExtension( const ::rtl::OUString &rExtensionURL, const ::rtl::OUString &rRepository, @@ -90,7 +90,7 @@ public: static void syncRepositories( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); /** This call does not block. It signals the internal thread - that it should install the remaining extensions and then terminate. + that it should install the remaining extensions and then terminate. */ void stop(); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 8f9de5860544..05511135e2dd 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -334,7 +334,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex ) { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); - selectEntry( nIndex ); + selectEntry( nIndex ); } //------------------------------------------------------------------------------ @@ -382,7 +382,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos ) if ( aText.getLength() ) aText += OUSTR("\n"); aText += m_vEntries[ nPos ]->m_sDescription; - + Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); aTextHeight += aRect.GetHeight(); @@ -455,10 +455,10 @@ void ExtensionBox_Impl::DeleteRemoved() void ExtensionBox_Impl::selectEntry( const long nPos ) { //ToDo whe should not use the guard at such a big scope here. - //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be + //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be //modified in this function. //It would be probably best to always use a copy of m_vEntries - //and some other state variables from ExtensionBox_Impl for + //and some other state variables from ExtensionBox_Impl for //the whole painting operation. See issue i86993 ::osl::ClearableMutexGuard guard(m_entriesMutex); @@ -648,7 +648,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET ); DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage ); } - + SetLineColor( Color( COL_LIGHTGRAY ) ); DrawLine( rRect.BottomLeft(), rRect.BottomRight() ); } @@ -1062,7 +1062,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage long nPos = iIndex - m_vEntries.begin(); // Entries mustn't removed here, because they contain a hyperlink control - // which can only be deleted when the thread has the solar mutex. Therefor + // which can only be deleted when the thread has the solar mutex. Therefor // the entry will be moved into the m_vRemovedEntries list which will be // cleared on the next paint event m_vRemovedEntries.push_back( *iIndex ); @@ -1137,7 +1137,7 @@ void ExtensionBox_Impl::checkEntries() long nNewPos = -1; long nPos = 0; bool bNeedsUpdate = false; - + ::osl::ClearableMutexGuard guard(m_entriesMutex); typedef std::vector< TEntry_Impl >::iterator ITER; ITER iIndex = m_vEntries.begin(); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 8120d3b3bfad..4726a0c9e20d 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,14 +145,14 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox Image m_aDefaultImage; Image m_aDefaultImageHC; Link m_aClickHdl; - + ScrollBar *m_pScrollBar; com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener; TheExtensionManager *m_pManager; //This mutex is used for synchronizing access to m_vEntries. - //Currently it is used to synchronize adding, removing entries and + //Currently it is used to synchronize adding, removing entries and //functions like getItemName, getItemDescription, etc. to prevent //that m_vEntries is accessed at an invalid index. //ToDo: There are many more places where m_vEntries is read and which may @@ -194,7 +194,7 @@ public: const Size GetMinOutputSizePixel() const; void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } - TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } + TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } long GetEntryCount() { return (long) m_vEntries.size(); } Rectangle GetEntryRect( const long nPos ) const; bool HasActive() { return m_bHasActive; } diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 94323f6c49d8..a01b8b309d00 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -262,7 +262,7 @@ void ServiceImpl::startExecuteModal( app->SetSettings( as ); String sTitle = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME).get<OUString>() - + String(static_cast<sal_Unicode>(' ')) + + String(static_cast<sal_Unicode>(' ')) + ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION).get<OUString>(); app->SetDisplayName(sTitle); @@ -272,12 +272,12 @@ void ServiceImpl::startExecuteModal( else { // When m_bShowUpdateOnly is set, we are inside the office and the user clicked - // the update notification icon in the menu bar. We must not close the extensions + // the update notification icon in the menu bar. We must not close the extensions // dialog after displaying the update dialog when it has been visible before if ( m_bShowUpdateOnly ) bCloseDialog = ! dp_gui::TheExtensionManager::s_ExtMgr->isVisible(); } - + { const SolarMutexGuard guard; ::rtl::Reference< ::dp_gui::TheExtensionManager > myExtMgr( diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx index 50eb9c393f45..af3a0bd5b980 100644 --- a/desktop/source/deployment/gui/dp_gui_shared.hxx +++ b/desktop/source/deployment/gui/dp_gui_shared.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_system.cxx b/desktop/source/deployment/gui/dp_gui_system.cxx index 6230e72dc39d..0e6416f1616d 100644 --- a/desktop/source/deployment/gui/dp_gui_system.cxx +++ b/desktop/source/deployment/gui/dp_gui_system.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_system.hxx b/desktop/source/deployment/gui/dp_gui_system.hxx index 319d627d2dc8..8c8feb43cf00 100644 --- a/desktop/source/deployment/gui/dp_gui_system.hxx +++ b/desktop/source/deployment/gui/dp_gui_system.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index cac4ae05f65e..564580c520bc 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,7 +94,7 @@ TheExtensionManager::TheExtensionManager( Window *pParent, xNameAccessRepositories = uno::Reference< container::XNameAccess > ( xConfig->createInstanceWithArguments( OUSTR("com.sun.star.configuration.ConfigurationAccess"), uno::Sequence< uno::Any >( args, 1 )), uno::UNO_QUERY_THROW); - try + try { //throws css::container::NoSuchElementException, css::lang::WrappedTargetException uno::Any value = xNameAccessRepositories->getByName( OUSTR( "WebsiteLink" ) ); m_sGetExtensionsURL = value.get< OUString > (); @@ -249,14 +249,14 @@ bool TheExtensionManager::installPackage( const OUString &rPackageURL, bool bWar bool bInstall = true; bool bInstallForAll = false; - // DV! missing function is read only repository from extension manager + // DV! missing function is read only repository from extension manager if ( !bWarnUser && ! m_xExtensionManager->isReadOnlyRepository( SHARED_PACKAGE_MANAGER ) ) bInstall = getDialogHelper()->installForAllUsers( bInstallForAll ); if ( !bInstall ) return false; - if ( bInstallForAll ) + if ( bInstallForAll ) m_pExecuteCmdQueue->addExtension( rPackageURL, SHARED_PACKAGE_MANAGER, false ); else m_pExecuteCmdQueue->addExtension( rPackageURL, USER_PACKAGE_MANAGER, bWarnUser ); @@ -434,7 +434,7 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa void TheExtensionManager::disposing( lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) { - bool shutDown = (rEvt.Source == m_xDesktop); + bool shutDown = (rEvt.Source == m_xDesktop); if ( shutDown && m_xDesktop.is() ) { diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 8289a3469aa0..13ba06d0b3d0 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx index 1ad857ad7b86..3bf0ff0d6c75 100644 --- a/desktop/source/deployment/gui/dp_gui_thread.cxx +++ b/desktop/source/deployment/gui/dp_gui_thread.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx index 624624b0cb3f..eb4fe43c9496 100644 --- a/desktop/source/deployment/gui/dp_gui_thread.hxx +++ b/desktop/source/deployment/gui/dp_gui_thread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index d64fe351673d..314f44935878 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ #include <boost/shared_ptr.hpp> -namespace com { namespace sun { namespace star { namespace deployment { +namespace com { namespace sun { namespace star { namespace deployment { class XPackage; }}}} -namespace com { namespace sun { namespace star { namespace xml { namespace dom { - class XNode; +namespace com { namespace sun { namespace star { namespace xml { namespace dom { + class XNode; }}}}} diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index b2e176550f0f..91f1aff66384 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -287,7 +287,7 @@ private: bool update( UpdateDialog::DisabledUpdate const & du, dp_gui::UpdateData const & data) const; - + css::uno::Reference< css::uno::XComponentContext > m_context; UpdateDialog & m_dialog; std::vector< css::uno::Reference< css::deployment::XPackage > > m_vExtensionList; @@ -341,7 +341,7 @@ void UpdateDialog::Thread::stop() { UpdateDialog::Thread::Entry::Entry( css::uno::Reference< css::deployment::XPackage > const & thePackage, rtl::OUString const & theVersion): - + package(thePackage), version(theVersion), bProvidesOwnUpdate(false), @@ -365,7 +365,7 @@ void UpdateDialog::Thread::execute() } css::uno::Reference<css::deployment::XExtensionManager> extMgr = css::deployment::ExtensionManager::get(m_context); - + std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>, css::uno::Any > > errors; dp_misc::UpdateInfoMap updateInfoMap = dp_misc::getOnlineUpdateInfos( @@ -383,11 +383,11 @@ void UpdateDialog::Thread::execute() DisabledUpdate disableUpdate; //determine if online updates meet the requirements prepareUpdateData(info.info, disableUpdate, updateData); - + //determine if the update is installed in the user or shared repository rtl::OUString sOnlineVersion; if (info.info.is()) - sOnlineVersion = info.version; + sOnlineVersion = info.version; rtl::OUString sVersionUser; rtl::OUString sVersionShared; rtl::OUString sVersionBundled; @@ -406,9 +406,9 @@ void UpdateDialog::Thread::execute() sVersionShared = extensions[1]->getVersion(); if (extensions[2].is() ) sVersionBundled = extensions[2]->getVersion(); - + bool bSharedReadOnly = extMgr->isReadOnlyRepository(OUSTR("shared")); - + dp_misc::UPDATE_SOURCE sourceUser = dp_misc::isUpdateUserExtension( bSharedReadOnly, sVersionUser, sVersionShared, sVersionBundled, sOnlineVersion); dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension( @@ -430,8 +430,8 @@ void UpdateDialog::Thread::execute() if (!update(disableUpdate, updateData)) return; } - - if (sourceShared != dp_misc::UPDATE_SOURCE_NONE) + + if (sourceShared != dp_misc::UPDATE_SOURCE_NONE) { if (sourceShared == dp_misc::UPDATE_SOURCE_BUNDLED) { @@ -441,10 +441,10 @@ void UpdateDialog::Thread::execute() updateData.bIsShared = true; if (!update(disableUpdate, updateData)) return; - } + } } - + SolarMutexGuard g; if (!m_stop) { m_dialog.checkingDone(); @@ -485,16 +485,16 @@ void UpdateDialog::Thread::handleSpecificError( b.append(version); else b.append(data.updateVersion); - - if (data.sWebsiteURL.getLength()) + + if (data.sWebsiteURL.getLength()) { b.append(static_cast< sal_Unicode >(' ')); { SolarMutexGuard g; - if(!m_stop) + if(!m_stop) b.append(m_dialog.m_browserbased); } - } + } return b.makeStringAndClear(); } @@ -845,7 +845,7 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, } catch( const css::uno::Exception& e ) { - dp_misc::TRACE( OUSTR("Caught exception: ") + dp_misc::TRACE( OUSTR("Caught exception: ") + e.Message + OUSTR("\n thread terminated.\n\n")); } } @@ -864,14 +864,14 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ) for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i ) { css::uno::Sequence< rtl::OUString > aItem(2); - + UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i)); - + if ( p->kind == ENABLED_UPDATE ) { dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->index.enabledUpdate ]; aItem[0] = dp_misc::getIdentifier( aUpdData.aInstalledPackage ); - + dp_misc::DescriptionInfoset aInfoset( m_context, aUpdData.aUpdateInfo ); aItem[1] = aInfoset.getVersion(); } @@ -879,7 +879,7 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ) continue; else continue; - + aItemList.realloc( nCount + 1 ); aItemList[ nCount ] = aItem; nCount += 1; @@ -1052,10 +1052,10 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) if (p != NULL) { //When the index is greater or equal than the amount of enabled updates then the "Show all" - //button is probably checked. Then we show first all enabled and then the disabled - //updates. + //button is probably checked. Then we show first all enabled and then the disabled + //updates. USHORT pos = m_updates.GetSelectEntryPos(); - const std::vector< dp_gui::UpdateData >::size_type sizeEnabled = + const std::vector< dp_gui::UpdateData >::size_type sizeEnabled = m_enabledUpdates.size(); const std::vector< UpdateDialog::DisabledUpdate >::size_type sizeDisabled = m_disabledUpdates.size(); @@ -1066,7 +1066,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) else bInserted = showDescription(m_enabledUpdates[pos].aUpdateInfo); } - else if (pos >= sizeEnabled + else if (pos >= sizeEnabled && pos < (sizeEnabled + sizeDisabled)) bInserted = showDescription(m_disabledUpdates[pos - sizeEnabled].aUpdateInfo); @@ -1092,7 +1092,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) ::rtl::Bootstrap::expandMacros(sCurVersion); m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sVersion.getLength(), sCurVersion ); } - + b.append(m_noInstall); b.append(LF); b.append(m_noDependency); @@ -1207,7 +1207,7 @@ IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG) { return 0; } -IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) +IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) { //If users are going to update a shared extension then we need //to warn them @@ -1220,7 +1220,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG) // OSL_ASSERT(isReadOnly(i->aInstalledPackage) == sal_False); } - + for (USHORT i = 0; i < m_updates.getItemCount(); ++i) { UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index b9882123d0fd..a9a8bcf71615 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ public: private: UpdateDialog(UpdateDialog &); // not defined void operator =(UpdateDialog &); // not defined - + struct DisabledUpdate; struct SpecificError; union IndexUnion; @@ -117,7 +117,7 @@ private: friend struct Index; class Thread; friend class Thread; - + class CheckListBox: public SvxCheckListBox { public: CheckListBox( @@ -171,7 +171,7 @@ private: ::com::sun::star::deployment::XPackage > const & aExtension); bool showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, rtl::OUString const & sReleaseNotes); - bool showDescription( ::com::sun::star::uno::Reference< + bool showDescription( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const String& rDescription, bool bWithPublisher ); bool isReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src index 325d98c88d48..59539d55c1fc 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -247,7 +247,7 @@ ModalDialog RID_DLG_UPDATE { String RID_DLG_UPDATE_BROWSERBASED { Text[en-US] = "browser based update"; }; - + String RID_DLG_UPDATE_VERSION { Text[en-US] = "Version"; }; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 685ce8b7c533..cfc42aa8d88c 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ #include "com/sun/star/deployment/ui/LicenseDialog.hpp" #include "com/sun/star/task/XInteractionHandler.hpp" #include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" -#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp" +#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionApprove.hpp" @@ -106,7 +106,7 @@ public: void stop(); - + private: Thread(Thread &); // not defined @@ -145,12 +145,12 @@ class UpdateCommandEnv friend class UpdateInstallDialog::Thread; UpdateInstallDialog & m_updateDialog; - ::rtl::Reference<UpdateInstallDialog::Thread> m_installThread; + ::rtl::Reference<UpdateInstallDialog::Thread> m_installThread; cssu::Reference< cssu::XComponentContext > m_xContext; public: virtual ~UpdateCommandEnv(); - UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, + UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, UpdateInstallDialog & updateDialog, ::rtl::Reference<UpdateInstallDialog::Thread>const & thread); @@ -199,13 +199,13 @@ void UpdateInstallDialog::Thread::stop() { UpdateInstallDialog::Thread::~Thread() {} -void UpdateInstallDialog::Thread::execute() +void UpdateInstallDialog::Thread::execute() { try { - downloadExtensions(); + downloadExtensions(); installExtensions(); } - catch (...) + catch (...) { } @@ -218,7 +218,7 @@ void UpdateInstallDialog::Thread::execute() { //make sure m_dialog is still alive SolarMutexGuard g; - if (! m_stop) + if (! m_stop) m_dialog.updateDone(); } //UpdateCommandEnv keeps a reference to Thread and prevents destruction. Therefore remove it. @@ -227,7 +227,7 @@ void UpdateInstallDialog::Thread::execute() UpdateInstallDialog::UpdateInstallDialog( - Window * parent, + Window * parent, std::vector<dp_gui::UpdateData> & aVecUpdateData, cssu::Reference< cssu::XComponentContext > const & xCtx): ModalDialog( @@ -245,7 +245,7 @@ UpdateInstallDialog::UpdateInstallDialog( m_sErrorDownload(String(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD))), m_sErrorInstallation(String(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION))), m_sErrorLicenseDeclined(String(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED))), - m_sNoInstall(String(DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL))), + m_sNoInstall(String(DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL))), m_sThisErrorOccurred(String(DpGuiResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED))), m_ft_action(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_DOWNLOADING)), m_statusbar(this,DpGuiResId(RID_DLG_UPDATE_INSTALL_STATUSBAR)), @@ -269,21 +269,21 @@ UpdateInstallDialog::UpdateInstallDialog( UpdateInstallDialog::~UpdateInstallDialog() {} -BOOL UpdateInstallDialog::Close() +BOOL UpdateInstallDialog::Close() { m_thread->stop(); return ModalDialog::Close(); } -short UpdateInstallDialog::Execute() -{ +short UpdateInstallDialog::Execute() +{ m_thread->launch(); return ModalDialog::Execute(); } // make sure the solar mutex is locked before calling -void UpdateInstallDialog::updateDone() +void UpdateInstallDialog::updateDone() { if (!m_bError) m_mle_info.InsertText(m_sNoErrors); @@ -293,8 +293,8 @@ void UpdateInstallDialog::updateDone() } // make sure the solar mutex is locked before calling //sets an error message in the text area -void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, - OUString const & exceptionMessage) +void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, + OUString const & exceptionMessage) { String sError; m_bError = true; @@ -302,13 +302,13 @@ void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sE switch (err) { case ERROR_DOWNLOAD: - sError = m_sErrorDownload; + sError = m_sErrorDownload; break; case ERROR_INSTALLATION: - sError = m_sErrorInstallation; + sError = m_sErrorInstallation; break; case ERROR_LICENSE_DECLINED: - sError = m_sErrorLicenseDeclined; + sError = m_sErrorLicenseDeclined; break; default: @@ -316,14 +316,14 @@ void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sE } sError.SearchAndReplace(String(OUSTR("%NAME")), String(sExtension), 0); - //We want to have an empty line between the error messages. However, + //We want to have an empty line between the error messages. However, //there shall be no empty line after the last entry. if (m_bNoEntry) m_bNoEntry = false; else m_mle_info.InsertText(OUSTR("\n")); m_mle_info.InsertText(sError); - //Insert more information about the error + //Insert more information about the error if (exceptionMessage.getLength()) m_mle_info.InsertText(m_sThisErrorOccurred + exceptionMessage + OUSTR("\n")); @@ -331,13 +331,13 @@ void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sE m_mle_info.InsertText(OUSTR("\n")); } -void UpdateInstallDialog::setError(OUString const & exceptionMessage) +void UpdateInstallDialog::setError(OUString const & exceptionMessage) { m_bError = true; m_mle_info.InsertText(exceptionMessage + OUSTR("\n")); } -IMPL_LINK(UpdateInstallDialog, cancelHandler, void *, EMPTYARG) +IMPL_LINK(UpdateInstallDialog, cancelHandler, void *, EMPTYARG) { m_thread->stop(); EndDialog(RET_CANCEL); @@ -348,7 +348,7 @@ IMPL_LINK(UpdateInstallDialog, cancelHandler, void *, EMPTYARG) void UpdateInstallDialog::Thread::downloadExtensions() { - try + try { //create the download directory in the temp folder OUString sTempDir; @@ -358,35 +358,35 @@ void UpdateInstallDialog::Thread::downloadExtensions() //create a unique name for the directory OUString tempEntry, destFolder; if (::osl::File::createTempFile(&sTempDir, 0, &tempEntry ) != ::osl::File::E_None) - throw cssu::Exception(OUSTR("Could not create a temporary file in ") + sTempDir + + throw cssu::Exception(OUSTR("Could not create a temporary file in ") + sTempDir + OUSTR(". No extensions will be installed"), 0 ); - + tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 ); - + destFolder = dp_misc::makeURL( sTempDir, tempEntry ); destFolder += OUSTR("_"); m_sDownloadFolder = destFolder; - try + try { dp_misc::create_folder(0, destFolder, m_updateCmdEnv.get(), true ); - } catch (cssu::Exception & e) + } catch (cssu::Exception & e) { throw cssu::Exception(e.Message + OUSTR(" No extensions will be installed."), 0); } - + sal_uInt16 count = 0; typedef std::vector<UpdateData>::iterator It; for (It i = m_aVecUpdateData.begin(); i != m_aVecUpdateData.end(); i++) { UpdateData & curData = *i; - + if (!curData.aUpdateInfo.is() || curData.aUpdateSource.is()) continue; - //We assume that m_aVecUpdateData contains only information about extensions which + //We assume that m_aVecUpdateData contains only information about extensions which //can be downloaded directly. OSL_ASSERT(curData.sWebsiteURL.getLength() == 0); - + //update the name of the extension which is to be downloaded { SolarMutexGuard g; @@ -405,7 +405,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() OSL_ENSURE(seqDownloadURLs.getLength() > 0, "No download URL provided!"); for (sal_Int32 j = 0; j < seqDownloadURLs.getLength(); j++) { - try + try { OSL_ENSURE(seqDownloadURLs[j].getLength() > 0, "Download URL is empty!"); download(seqDownloadURLs[j], curData); @@ -420,7 +420,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() //cases. Therefore ignore and continue. continue; } - } + } //update the progress and display download error { SolarMutexGuard g; @@ -441,11 +441,11 @@ void UpdateInstallDialog::Thread::downloadExtensions() buf.appendAscii(". "); buf.append(j->second.Message); } - m_dialog.setError(UpdateInstallDialog::ERROR_DOWNLOAD, curData.aInstalledPackage->getDisplayName(), + m_dialog.setError(UpdateInstallDialog::ERROR_DOWNLOAD, curData.aInstalledPackage->getDisplayName(), buf.makeStringAndClear()); } } - + } } catch (cssu::Exception & e) @@ -472,7 +472,7 @@ void UpdateInstallDialog::Thread::installExtensions() sal_uInt16 count = 0; typedef std::vector<UpdateData>::iterator It; for (It i = m_aVecUpdateData.begin(); i != m_aVecUpdateData.end(); i++, count++) - { + { //update the name of the extension which is to be installed { SolarMutexGuard g; @@ -551,7 +551,7 @@ void UpdateInstallDialog::Thread::installExtensions() { exc = e; bError = true; - } + } if (bLicenseDeclined) { @@ -559,7 +559,7 @@ void UpdateInstallDialog::Thread::installExtensions() if (m_stop) { return; } - m_dialog.setError(UpdateInstallDialog::ERROR_LICENSE_DECLINED, + m_dialog.setError(UpdateInstallDialog::ERROR_LICENSE_DECLINED, curData.aInstalledPackage->getDisplayName(), OUString()); } else if (!xExtension.is() || bError) @@ -568,7 +568,7 @@ void UpdateInstallDialog::Thread::installExtensions() if (m_stop) { return; } - m_dialog.setError(UpdateInstallDialog::ERROR_INSTALLATION, + m_dialog.setError(UpdateInstallDialog::ERROR_INSTALLATION, curData.aInstalledPackage->getDisplayName(), exc.Message); } } @@ -587,7 +587,7 @@ void UpdateInstallDialog::Thread::removeTempDownloads() { if (m_sDownloadFolder.getLength()) { - dp_misc::erase_path(m_sDownloadFolder, + dp_misc::erase_path(m_sDownloadFolder, cssu::Reference<css::ucb::XCommandEnvironment>(),false /* no throw: ignore errors */ ); //remove also the temp file which we have used to create the unique name OUString tempFile = m_sDownloadFolder.copy(0, m_sDownloadFolder.getLength() - 1); @@ -619,16 +619,16 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ); destFolder += OUSTR("_"); - + ::ucbhelper::Content destFolderContent; dp_misc::create_folder( &destFolderContent, destFolder, m_updateCmdEnv.get() ); - ::ucbhelper::Content sourceContent; - dp_misc::create_ucb_content( &sourceContent, sDownloadURL, m_updateCmdEnv.get() ); + ::ucbhelper::Content sourceContent; + dp_misc::create_ucb_content( &sourceContent, sDownloadURL, m_updateCmdEnv.get() ); const OUString sTitle(sourceContent.getPropertyValue( dp_misc::StrTitle::get() ).get<OUString>() ); - + if (destFolderContent.transferContent( sourceContent, ::ucbhelper::InsertOperation_COPY, sTitle, css::ucb::NameClash::OVERWRITE )) @@ -648,7 +648,7 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update // ------------------------------------------------------------------------------------------------------- -UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, +UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, UpdateInstallDialog & updateDialog, ::rtl::Reference<UpdateInstallDialog::Thread>const & thread) : m_updateDialog( updateDialog ), @@ -686,8 +686,8 @@ void UpdateCommandEnv::handle( OSL_ASSERT( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION ); dp_misc::TRACE(OUSTR("[dp_gui_cmdenv.cxx] incoming request:\n") + ::comphelper::anyToString(request) + OUSTR("\n\n")); - - css::deployment::VersionException verExc; + + css::deployment::VersionException verExc; bool approve = false; bool abort = false; @@ -695,7 +695,7 @@ void UpdateCommandEnv::handle( { //We must catch the version exception during the update, //because otherwise the user would be confronted with the dialogs, asking //them if they want to replace an already installed version of the same extension. - //During an update we assume that we always want to replace the old version with the + //During an update we assume that we always want to replace the old version with the //new version. approve = true; } @@ -727,7 +727,7 @@ void UpdateCommandEnv::handle( else if (abort) { cssu::Reference< css::task::XInteractionAbort > xInteractionAbort( pConts[ pos ], cssu::UNO_QUERY ); - if (xInteractionAbort.is()) { + if (xInteractionAbort.is()) { xInteractionAbort->select(); // don't query again for ongoing continuations: abort = false; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index a7b11ef355ec..a23488bfbf86 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,14 +107,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; } - rtl::Reference< Thread > m_thread; + rtl::Reference< Thread > m_thread; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext; ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager; //Signals that an error occurred during download and installation bool m_bError; bool m_bNoEntry; bool m_bActivated; - + ::rtl::OUString m_sInstalling; ::rtl::OUString m_sFinished; ::rtl::OUString m_sNoErrors; @@ -124,8 +124,8 @@ private: ::rtl::OUString m_sNoInstall; ::rtl::OUString m_sThisErrorOccurred; - FixedText m_ft_action; - ProgressBar m_statusbar; + FixedText m_ft_action; + ProgressBar m_statusbar; FixedText m_ft_extension_name; FixedText m_ft_results; AutoScrollEdit m_mle_info; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src index d77dd256582c..7c4381775464 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ ModalDialog RID_DLG_UPDATEINSTALL { HelpId = HID_DEPLOYMENT_GUI_UPDATEINSTALL; Size = MAP_APPFONT( (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH + - RSC_SP_DLG_INNERBORDER_RIGHT), + RSC_SP_DLG_INNERBORDER_RIGHT), (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_FLGR_SPACE_Y + LOCAL_LIST_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_FLGR_SPACE_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_DLG_INNERBORDER_BOTTOM)); @@ -60,30 +60,30 @@ ModalDialog RID_DLG_UPDATEINSTALL { Window RID_DLG_UPDATE_INSTALL_STATUSBAR { Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, + RSC_SP_DLG_INNERBORDER_LEFT, (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y)); Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_CHECKBOX_HEIGHT); Border = TRUE; }; - + FixedText RID_DLG_UPDATE_INSTALL_EXTENSION_NAME { Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, + RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y); Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT); Text[en-US] = ""; NoLabel = TRUE; }; - + FixedText RID_DLG_UPDATE_INSTALL_RESULTS { Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, + RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_Y); Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT); Text[en-US] = "Result"; @@ -93,9 +93,9 @@ ModalDialog RID_DLG_UPDATEINSTALL { Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y); Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT); @@ -104,30 +104,30 @@ ModalDialog RID_DLG_UPDATEINSTALL { VScroll = TRUE; TabStop = FALSE; }; - + FixedLine RID_DLG_UPDATE_INSTALL_LINE { Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y); Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT); }; - - OKButton RID_DLG_UPDATE_INSTALL_OK { + + OKButton RID_DLG_UPDATE_INSTALL_OK { Disable = TRUE; Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_CD_PUSHBUTTON_WIDTH, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y); @@ -138,12 +138,12 @@ ModalDialog RID_DLG_UPDATEINSTALL { CancelButton RID_DLG_UPDATE_INSTALL_ABORT { Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH, + RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y); @@ -154,34 +154,34 @@ ModalDialog RID_DLG_UPDATEINSTALL { HelpButton RID_DLG_UPDATE_INSTALL_HELP { Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, + RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y); Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); }; - - + + String RID_DLG_UPDATE_INSTALL_INSTALLING { Text[en-US] = "Installing extensions..."; }; - + String RID_DLG_UPDATE_INSTALL_FINISHED { Text[en-US] = "Installation finished"; }; - + String RID_DLG_UPDATE_INSTALL_NO_ERRORS { Text[en-US] = "No errors."; }; - + String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD { Text[en-US] = "Error while downloading extension %NAME. "; }; - + String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED { Text[en-US] = "The error message is: "; }; @@ -190,14 +190,14 @@ ModalDialog RID_DLG_UPDATEINSTALL { String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION { Text[en-US] = "Error while installing extension %NAME. "; }; - + String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED { Text[en-US] = "The license agreement for extension %NAME was refused. "; }; - + String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{ Text[en-US] = "The extension will not be installed."; - }; - + }; + }; diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src index 878521ad6dd2..cc6edc0ad760 100644 --- a/desktop/source/deployment/gui/dp_gui_versionboxes.src +++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ String RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES { Text [en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n" "The newer version $DEPLOYED, named \'$OLDNAME\', is already installed.\n" "Click \'OK\' to replace the installed extension.\n" - "Click \'Cancel\' to stop the installation."; + "Click \'Cancel\' to stop the installation."; }; WarningBox RID_WARNINGBOX_VERSION_EQUAL { @@ -62,7 +62,7 @@ String RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES { WarningBox RID_WARNINGBOX_VERSION_GREATER { Buttons = WB_OK_CANCEL; DefButton = WB_DEF_OK; - Message[en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n" + Message[en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n" "The older version $DEPLOYED is already installed.\n" "Click \'OK\' to replace the installed extension.\n" "Click \'Cancel\' to stop the installation."; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 2ebd75cbc377..9fd55d293859 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ protected: }; struct LicenseDialogImpl : public ModalDialog -{ +{ cssu::Reference<cssu::XComponentContext> m_xComponentContext; FixedText m_ftHead; FixedText m_ftBody1; @@ -102,7 +102,7 @@ struct LicenseDialogImpl : public ModalDialog LicenseView m_mlLicense; PushButton m_pbDown; FixedLine m_flBottom; - + OKButton m_acceptButton; CancelButton m_declineButton; @@ -121,7 +121,7 @@ struct LicenseDialogImpl : public ModalDialog const ::rtl::OUString & sLicenseText); virtual void Activate(); - + }; LicenseView::LicenseView( Window* pParent, const ResId& rResId ) @@ -229,7 +229,7 @@ LicenseDialogImpl::LicenseDialogImpl( m_fiArrow2.Show(false); m_mlLicense.SetText(sLicenseText); m_ftHead.SetText(m_ftHead.GetText() + OUString('\n') + sExtensionName); - + m_mlLicense.SetEndReachedHdl( LINK(this, LicenseDialogImpl, EndReachedHdl) ); m_mlLicense.SetScrolledHdl( LINK(this, LicenseDialogImpl, ScrolledHdl) ); m_pbDown.SetClickHdl( LINK(this, LicenseDialogImpl, PageDownHdl) ); @@ -307,7 +307,7 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args, //______________________________________________________________________________ void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException) { - + } //______________________________________________________________________________ diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index cb43f74ee528..7e7a8592e66f 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx index 890059fd10a3..4f144667a920 100644 --- a/desktop/source/deployment/inc/db.hxx +++ b/desktop/source/deployment/inc/db.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ #include <rtl/string.hxx> #include "dp_misc_api.hxx" -extern "C" { - typedef void *(*db_malloc_fcn_type)(size_t); - typedef void *(*db_realloc_fcn_type)(void *, size_t); - typedef void (*db_free_fcn_type)(void *); +extern "C" { + typedef void *(*db_malloc_fcn_type)(size_t); + typedef void *(*db_realloc_fcn_type)(void *, size_t); + typedef void (*db_free_fcn_type)(void *); } @@ -62,38 +62,38 @@ namespace berkeleydbproxy { ~Noncopyable() {} }; } - - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbException + + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbException { rtl::OString what_; public: - explicit DbException(rtl::OString const & theWhat) + explicit DbException(rtl::OString const & theWhat) : what_(theWhat) {} - + const char *what() const { return what_.getStr(); } - int get_errno() const + int get_errno() const { return 0; } }; - - + + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : db_internal::Noncopyable - { + { friend class Db; - - private: + + private: DB_ENV* m_pDBENV; - - public: + + public: static char *strerror(int); }; - - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : db_internal::Noncopyable - { - private: + + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : db_internal::Noncopyable + { + private: DB* m_pDBP; - + public: Db(DbEnv* dbbenv,u_int32_t flags); ~Db(); @@ -102,54 +102,54 @@ namespace berkeleydbproxy { int open(DB_TXN *txnid, const char *file, - const char *database, - DBTYPE type, - u_int32_t flags, + const char *database, + DBTYPE type, + u_int32_t flags, int mode); int sync(u_int32_t flags); int del(Dbt *key, u_int32_t flags); - + int get(DB_TXN* txnid, Dbt *key, Dbt *data, u_int32_t flags); int put(DB_TXN* txnid, Dbt *key, Dbt *data, u_int32_t flags); - + int cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags); }; - - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : db_internal::Noncopyable - { + + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : db_internal::Noncopyable + { friend class Db; friend class Dbt; - private: + private: DBC* m_pDBC; - + SAL_DLLPRIVATE explicit Dbc(DBC* pDBC); SAL_DLLPRIVATE ~Dbc(); - + public: int close(); - + int get(Dbt *key, Dbt *data, u_int32_t flags); }; - - class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbt: private DBT - { + + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbt: private DBT + { friend class Db; friend class Dbc; - + public: - Dbt(void *data_arg, u_int32_t size_arg); - - Dbt(); + Dbt(void *data_arg, u_int32_t size_arg); + + Dbt(); Dbt(const Dbt & other); Dbt & operator=(const Dbt & other); - + ~Dbt(); void *get_data() const; void set_data(void *value); - + u_int32_t get_size() const; void set_size(u_int32_t value); }; diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index 07221e173520..2e57c0627573 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index d16e9127af8a..78b824c87ab5 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,41 +123,41 @@ public: */ ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedPlaforms() const; - /** + /** Returns the localized publisher name and the corresponding URL. In case there is no publisher element then a pair of two empty strings is returned. - */ + */ ::std::pair< ::rtl::OUString, ::rtl::OUString > getLocalizedPublisherNameAndURL() const; - - /** + + /** Returns the URL for the release notes corresponding to the office's locale. In case there is no release-notes element then an empty string is returned. - */ + */ ::rtl::OUString getLocalizedReleaseNotesURL() const; /** returns the relative path to the license file. - + In case there is no simple-license element then an empty string is returned. */ ::rtl::OUString getLocalizedLicenseURL() const; /** returns the attributes of the simple-license element - + As long as there is a simple-license element, the function will return the structure. If it does not exist, then the optional object is uninitialized. */ ::boost::optional<SimpleLicenseAttributes> getSimpleLicenseAttributes() const; /** returns the localized display name of the extensions. - + In case there is no localized display-name then an empty string is returned. */ ::rtl::OUString getLocalizedDisplayName() const; /** - returns the download website URL from the update information. + returns the download website URL from the update information. There can be multiple URLs where each is assigned to a particular locale. The function returs the URL which locale matches best the one used in the office. @@ -167,9 +167,9 @@ public: properly as "browser based update". The return value will only then not be initialized if there is no <code><update-website></code>. If the element exists, then it must have at least one child element containing an URL. - - The <code><update-website></code> and <code><update-download></code> - elements are mutually exclusiv. + + The <code><update-website></code> and <code><update-download></code> + elements are mutually exclusiv. @return the download website URL, or an empty <code>optional</code> if none is @@ -177,8 +177,8 @@ public: */ ::boost::optional< ::rtl::OUString > getLocalizedUpdateWebsiteURL() const; - /** returns the relative URL to the description. - + /** returns the relative URL to the description. + The URL is relative to the root directory of the extensions. */ ::rtl::OUString getLocalizedDescriptionURL() const; @@ -203,19 +203,19 @@ public: /** Return the download URLs from the update information. - Because the <code><update-download></code> and the <code><update-website></code> + Because the <code><update-download></code> and the <code><update-website></code> elements are mutually exclusive one may need to determine exacty if the element was provided. @return download URLs */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< ::rtl::OUString > getUpdateDownloadUrls() const; - /** + /** Returns the URL for the icon image. - */ + */ ::rtl::OUString getIconURL( sal_Bool bHighContrast ) const; bool hasDescription() const; @@ -230,34 +230,34 @@ private: /** Retrieves a child element which as lang attribute which matches the office locale. Only top-level children are taken into account. It is also assumed that they are all - of the same element type and have a lang attribute. The matching algoritm is according + of the same element type and have a lang attribute. The matching algoritm is according to RFC 3066, with the exception that only one variant is allowed. @param parent - the expression used to obtain the parent of the localized children. It can be null. + the expression used to obtain the parent of the localized children. It can be null. Then a null reference is returned. */ - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > getLocalizedChild( ::rtl::OUString const & sParent) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> - matchFullLocale(::com::sun::star::uno::Reference< + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> + matchFullLocale(::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent, ::rtl::OUString const & sLocale) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> - matchCountryAndLanguage(::com::sun::star::uno::Reference< + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> + matchCountryAndLanguage(::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent, ::com::sun::star::lang::Locale const & officeLocale) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> matchLanguage( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent, ::com::sun::star::lang::Locale const & officeLocale) const; - + /** If there is no child element with a locale matching the office locale, then we use the first child. In the case of the simple-license we also use the former default locale, which was determined by the default-license-id (/description/registration/simple-license/@default-license-id) and the license-id attributes (/description/registration/simple-license/license-text/@license-id). - However, since OOo 2.4 we use also the first child as default for the license + However, since OOo 2.4 we use also the first child as default for the license unless the two attributes are present. */ - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> getChildWithDefaultLocale( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent) const; /** @@ -267,14 +267,14 @@ private: SAL_DLLPRIVATE ::rtl::OUString getLocalizedHREFAttrFromChild( ::rtl::OUString const & sXPathParent, bool * out_bParentExists) const; - static SAL_DLLPRIVATE ::rtl::OUString + static SAL_DLLPRIVATE ::rtl::OUString localeToString(::com::sun::star::lang::Locale const & locale); - - /** Gets the node value for a given expression. The expression is used in + + /** Gets the node value for a given expression. The expression is used in m_xpath-selectSingleNode. The value of the returned node is return value of this function. */ - SAL_DLLPRIVATE ::rtl::OUString + SAL_DLLPRIVATE ::rtl::OUString getNodeValueFromExpression(::rtl::OUString const & expression) const; ::com::sun::star::uno::Reference< diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx index f58b7663a173..f7b6b1f120fb 100644 --- a/desktop/source/deployment/inc/dp_identifier.hxx +++ b/desktop/source/deployment/inc/dp_identifier.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 7a59e944f6af..3aca761c2d1e 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,13 +58,13 @@ inline void progressUpdate( class ProgressLevel { css::uno::Reference<css::ucb::XProgressHandler> m_xProgressHandler; - + public: inline ~ProgressLevel(); inline ProgressLevel( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, ::rtl::OUString const & status ); - + inline void update( ::rtl::OUString const & status ) const; inline void update( css::uno::Any const & status ) const; }; @@ -119,18 +119,18 @@ class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC AbortChannel : { bool m_aborted; css::uno::Reference<css::task::XAbortChannel> m_xNext; - + public: inline AbortChannel() : m_aborted( false ) {} inline static AbortChannel * get( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel ) { return static_cast<AbortChannel *>(xAbortChannel.get()); } - + inline bool isAborted() const { return m_aborted; } - + // XAbortChannel virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException); - + class SAL_DLLPRIVATE Chain { const ::rtl::Reference<AbortChannel> m_abortChannel; diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index 9e912531e9f8..bbf6d5274b39 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,7 +120,7 @@ oslProcess raiseProcess( ::rtl::OUString const & appURL, //============================================================================== /** writes the argument string to the console. - On Linux/Unix/etc. it converts the UTF16 string to an ANSI string using + On Linux/Unix/etc. it converts the UTF16 string to an ANSI string using osl_getThreadTextEncoding() as target encoding. On Windows it uses WriteFile with the standard out stream. unopkg.com reads the data and prints them out using WriteConsoleW. @@ -130,21 +130,21 @@ void writeConsole(::rtl::OUString const & sText); /** writes the argument string to the console. On Linux/Unix/etc. the string is passed into fprintf without any conversion. - On Windows the string is converted to UTF16 assuming the argument is UTF8 - encoded. The UTF16 string is written to stdout with WriteFile. unopkg.com + On Windows the string is converted to UTF16 assuming the argument is UTF8 + encoded. The UTF16 string is written to stdout with WriteFile. unopkg.com reads the data and prints them out using WriteConsoleW. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC void writeConsole(::rtl::OString const & sText); -/** writes the argument to the console using the error stream. +/** writes the argument to the console using the error stream. Otherwise the same as writeConsole. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC void writeConsoleError(::rtl::OUString const & sText); -/** writes the argument to the console using the error stream. +/** writes the argument to the console using the error stream. Otherwise the same as writeConsole. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC @@ -170,7 +170,7 @@ void TRACE(::rtl::OString const & sText); /** registers or revokes shared or bundled extensions which have been recently added or removed. -*/ +*/ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC void syncRepositories(::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx index fbc248a1dfb2..bc2cee1df2b6 100644 --- a/desktop/source/deployment/inc/dp_misc_api.hxx +++ b/desktop/source/deployment/inc/dp_misc_api.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index 16392c464bf1..b1597f3bb5d3 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ class PersistentMap ::rtl::OUString m_sysPath; mutable Db m_db; void throw_rtexc( int err, char const * msg = 0 ) const; - + public: ~PersistentMap(); PersistentMap( ::rtl::OUString const & url, bool readOnly ); /** in mem db */ PersistentMap(); - + bool has( ::rtl::OString const & key ) const; bool get( ::rtl::OString * value, ::rtl::OString const & key ) const; t_string2string_map getEntries() const; diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx index b2b9fad07f49..f9773efa1a45 100644 --- a/desktop/source/deployment/inc/dp_platform.hxx +++ b/desktop/source/deployment/inc/dp_platform.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ #include "com/sun/star/uno/Sequence.hxx" #include "rtl/ustring.hxx" -namespace dp_misc +namespace dp_misc { - + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString const & getPlatformString(); diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index 132e5df375a6..96fd0492072f 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index 22d54de5885a..c2fcdcd7e09c 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index 1f22b2bb8d40..6d0c79026367 100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dp_misc { -/** returns the default update URL (for the update information) which +/** returns the default update URL (for the update information) which is used when an extension does not provide its own URL. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC @@ -103,7 +103,7 @@ struct UpdateInfo UpdateInfo( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> const & ext); ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> extension; -//version of the update +//version of the update ::rtl::OUString version; ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > info; }; @@ -127,7 +127,7 @@ typedef std::map< ::rtl::OUString, UpdateInfo > UpdateInfoMap; */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC UpdateInfoMap getOnlineUpdateInfos( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const &xContext, + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const &xContext, ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager> const & xExtMgr, ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XUpdateInformationProvider > const & updateInformation, std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > > const * extensionList, diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index f335b986c5e3..c3491a7451de 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h index 4e178e1b37bf..376df332fbf3 100644 --- a/desktop/source/deployment/inc/dp_xml.h +++ b/desktop/source/deployment/inc/dp_xml.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index dabc1e37cf24..950e46174d22 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 2a4d18686346..569e4b7852d5 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index f863dbbb86d6..ba32b3089805 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -302,7 +302,7 @@ void SilentCheckPrerequisitesCommandEnv::handle( // uno::Any request( xRequest->getRequest() ); // OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); -// deployment::LicenseException licExc; +// deployment::LicenseException licExc; // bool approve = false; // bool abort = false; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index c6529ec0e8cc..11b38cdc8892 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -740,9 +740,13 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( if (repository.equals(OUSTR("user"))) bUserDisabled2 = false; + // pass the two values via variables to workaround gcc-4.3.4 specific bug (bnc#655912) + OUString sNewExtensionIdentifier = dp_misc::getIdentifier(xNewExtension); + OUString sNewExtensionFileName = xNewExtension->getName(); + activateExtension( - dp_misc::getIdentifier(xNewExtension), - xNewExtension->getName(), bUserDisabled2, false, xAbortChannel, + sNewExtensionIdentifier, sNewExtensionFileName, + bUserDisabled2, false, xAbortChannel, Reference<ucb::XCommandEnvironment>()); } else diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 1a27f51092d6..6aaf3739e223 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,8 +71,8 @@ namespace xml = com::sun::star::xml ; namespace dp_info { -class PackageInformationProvider : - public ::cppu::WeakImplHelper3< deployment::XPackageInformationProvider, +class PackageInformationProvider : + public ::cppu::WeakImplHelper3< deployment::XPackageInformationProvider, css_ucb::XCommandEnvironment, task::XInteractionHandler > { @@ -91,8 +91,8 @@ class PackageInformationProvider : throw ( uno::RuntimeException ) { return static_cast<task::XInteractionHandler*>(this); }; virtual uno::Reference< css_ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( uno::RuntimeException ) { return uno::Reference< css_ucb::XProgressHandler >(); }; - + throw ( uno::RuntimeException ) { return uno::Reference< css_ucb::XProgressHandler >(); }; + // XPackageInformationProvider virtual rtl::OUString SAL_CALL getPackageLocation( const rtl::OUString& extensionId ) throw ( uno::RuntimeException ); @@ -102,7 +102,7 @@ class PackageInformationProvider : throw ( uno::RuntimeException ); //--------- private: - + uno::Reference< uno::XComponentContext> mxContext; rtl::OUString getPackageLocation( const rtl::OUString& repository, @@ -113,7 +113,7 @@ private: //------------------------------------------------------------------------------ -PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) : +PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) : mxContext( xContext ), mxUpdateInformation( deployment::UpdateInformationProvider::create( xContext ) ) { @@ -144,7 +144,7 @@ rtl::OUString PackageInformationProvider::getPackageLocation( rtl::OUString aLocationURL; uno::Reference<deployment::XExtensionManager> xManager = deployment::ExtensionManager::get(mxContext); - + if ( xManager.is() ) { const uno::Sequence< uno::Reference< deployment::XPackage > > packages( @@ -205,7 +205,7 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI throw ( uno::RuntimeException ) { uno::Sequence< uno::Sequence< rtl::OUString > > aList; - + uno::Reference<deployment::XExtensionManager> extMgr = deployment::ExtensionManager::get(mxContext); @@ -255,7 +255,7 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI if ( ! ds.getLength() ) sOnlineVersion = info.version; } - + rtl::OUString sVersionUser; rtl::OUString sVersionShared; rtl::OUString sVersionBundled; @@ -274,9 +274,9 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI sVersionShared = extensions[1]->getVersion(); if (extensions[2].is() ) sVersionBundled = extensions[2]->getVersion(); - + bool bSharedReadOnly = extMgr->isReadOnlyRepository(OUSTR("shared")); - + dp_misc::UPDATE_SOURCE sourceUser = dp_misc::isUpdateUserExtension( bSharedReadOnly, sVersionUser, sVersionShared, sVersionBundled, sOnlineVersion); dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension( @@ -297,13 +297,13 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI updateVersion = updateVersionShared; if (updateVersion.getLength()) { - + rtl::OUString aNewEntry[2]; aNewEntry[0] = i->first; aNewEntry[1] = updateVersion; aList.realloc( ++nCount ); aList[ nCount-1 ] = ::uno::Sequence< rtl::OUString >( aNewEntry, 2 ); - } + } } return aList; } @@ -322,9 +322,9 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi allExt = mgr->getAllExtensions( uno::Reference< task::XAbortChannel >(), static_cast < XCommandEnvironment *> (this) ); - + uno::Sequence< uno::Sequence< rtl::OUString > > retList; - + sal_Int32 cAllIds = allExt.getLength(); retList.realloc(cAllIds); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 53877d8188d8..3b7432ae8057 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ namespace { OUString getExtensionFolder(OUString const & parentFolder, Reference<ucb::XCommandEnvironment> const & xCmdEnv) { - ::ucbhelper::Content tempFolder( + ::ucbhelper::Content tempFolder( parentFolder, xCmdEnv ); Reference<sdbc::XResultSet> xResultSet( tempFolder.createCursor( @@ -154,12 +154,12 @@ void PackageManagerImpl::initActivationLayer( if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "META-INF") ) ) continue; - + ::ucbhelper::Content sourceContent( Reference<XContentAccess>( xResultSet, UNO_QUERY_THROW )->queryContent(), xCmdEnv ); - + OUString mediaType( detectMediaType( sourceContent, false /* no throw */) ); if (mediaType.getLength() >0) @@ -199,13 +199,13 @@ void PackageManagerImpl::initActivationLayer( //The data base can always be written because it it always in the user installation m_activePackagesDB.reset( new ActivePackages( dbName, false ) ); - + if (! m_readOnly && ! m_context.equals(OUSTR("bundled"))) { // clean up activation layer, scan for zombie temp dirs: ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() ); - - ::ucbhelper::Content tempFolder( + + ::ucbhelper::Content tempFolder( m_activePackages_expanded, xCmdEnv ); Reference<sdbc::XResultSet> xResultSet( tempFolder.createCursor( @@ -220,7 +220,7 @@ void PackageManagerImpl::initActivationLayer( Reference<sdbc::XRow>( xResultSet, UNO_QUERY_THROW )->getString( 1 /* Title */ ) ); - + const char extensionRemoved[] = "removed"; if (title.endsWithAsciiL( extensionRemoved, sizeof(extensionRemoved) - 1)) @@ -233,7 +233,7 @@ void PackageManagerImpl::initActivationLayer( remFile, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ); - } + } else { tempEntries.push_back( ::rtl::Uri::encode( @@ -294,7 +294,7 @@ void PackageManagerImpl::initActivationLayer( false /* no throw: ignore errors */ ); erase_path( url, Reference<XCommandEnvironment>(), false /* no throw: ignore errors */ ); - //delete the xxx.tmpremoved file + //delete the xxx.tmpremoved file erase_path(url + OUSTR("removed"), Reference<XCommandEnvironment>(), false); } @@ -322,7 +322,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( PackageManagerImpl * that = new PackageManagerImpl( xComponentContext, context ); Reference<deployment::XPackageManager> xPackageManager( that ); - + OUString packages, logFile, stampURL; if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") )) { that->m_activePackages = OUSTR( @@ -368,7 +368,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_USER/registry"); logFile = OUSTR( "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_USER/log.txt"); - //No stamp file. We assume that bundled is always readonly. It must not be + //No stamp file. We assume that bundled is always readonly. It must not be //modified from ExtensionManager but only by the installer } else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") )) { @@ -387,13 +387,13 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( OUSTR("invalid context given: ") + context, Reference<XInterface>(), static_cast<sal_Int16>(-1) ); } - + Reference<XCommandEnvironment> xCmdEnv; - + try { //There is no stampURL for the bundled folder if (stampURL.getLength() > 0) - { + { #define CURRENT_STAMP "1" try { //The osl file API does not allow to find out if one can write @@ -424,7 +424,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( that->m_readOnly = true; } } - + if (!that->m_readOnly && logFile.getLength() > 0) { const Any any_logFile(logFile); @@ -437,12 +437,12 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( UNO_QUERY_THROW ); xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv, that->m_xLogFile ) ); } - + that->initRegistryBackends(); that->initActivationLayer( xCmdEnv ); - + return xPackageManager; - + } catch (RuntimeException &) { throw; @@ -488,9 +488,9 @@ void PackageManagerImpl::disposing() m_xRegistry.clear(); m_activePackagesDB.reset(0); m_xComponentContext.clear(); - + t_pm_helper::disposing(); - + } catch (RuntimeException &) { throw; @@ -635,11 +635,11 @@ OUString PackageManagerImpl::insertToActivationLayer( destFolder = makeURL( m_activePackages, tempEntry ); } destFolder += OUSTR("_"); - + // prepare activation folder: ::ucbhelper::Content destFolderContent; create_folder( &destFolderContent, destFolder, xCmdEnv ); - + // copy content into activation temp dir: if (mediaType.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( @@ -665,7 +665,7 @@ OUString PackageManagerImpl::insertToActivationLayer( buf.append(sourceContent.getURL()); } buf.append( static_cast<sal_Unicode>('/') ); - sourceContent = ::ucbhelper::Content( + sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv ); } if (! destFolderContent.transferContent( @@ -673,7 +673,7 @@ OUString PackageManagerImpl::insertToActivationLayer( title, NameClash::OVERWRITE )) throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 ); - + // write to DB: //bundled extensions should only be added by the synchronizeAddedExtensions //functions. Moreover, there is no "temporary folder" for bundled extensions. @@ -697,7 +697,7 @@ void PackageManagerImpl::insertToActivationLayerDB( OUString const & id, ActivePackages::Data const & dbData ) { //access to the database must be guarded. See removePackage - const ::osl::MutexGuard guard( getMutex() ); + const ::osl::MutexGuard guard( getMutex() ); m_activePackagesDB->put( id, dbData ); } @@ -761,7 +761,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) ); else xCmdEnv.set( xCmdEnv_ ); - + try { ::ucbhelper::Content sourceContent; create_ucb_content( &sourceContent, url, xCmdEnv ); // throws exc @@ -772,11 +772,11 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ); OUString destFolder; - + OUString mediaType(mediaType_); if (mediaType.getLength() == 0) mediaType = detectMediaType( sourceContent ); - + Reference<deployment::XPackage> xPackage; // copy file: progressUpdate( @@ -801,7 +801,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( // not work, anyway. docContent.setPropertyValue( OUSTR("MediaType"), Any(mediaType) ); - + // xxx todo: obsolete in the future try { docFolderContent.executeCommand( OUSTR("flush"), Any() ); @@ -813,7 +813,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( destFolder = insertToActivationLayer( properties, mediaType, sourceContent, title, &dbData ); - + // bind activation package: //Because every shared/user extension will be unpacked in a folder, //which was created with a unique name we will always have two different @@ -821,12 +821,12 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( //Therefore bindPackage does not need a guard here. xPackage = m_xRegistry->bindPackage( makeURL( destFolder, title_enc ), mediaType, false, OUString(), xCmdEnv ); - + OSL_ASSERT( xPackage.is() ); if (xPackage.is()) { bool install = false; - try + try { OUString const id = dp_misc::getIdentifier( xPackage ); @@ -834,7 +834,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( if (isInstalled(xPackage)) { //Do not guard the complete function with the getMutex - removePackage(id, xPackage->getName(), xAbortChannel, + removePackage(id, xPackage->getName(), xAbortChannel, xCmdEnv); } install = true; @@ -845,13 +845,13 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( deletePackageFromCache( xPackage, destFolder ); throw; } - if (!install) - { + if (!install) + { deletePackageFromCache( xPackage, destFolder ); } //ToDo: We should notify only if the extension is registered fireModified(); - } + } return xPackage; } catch (RuntimeException &) { @@ -882,7 +882,7 @@ void PackageManagerImpl::deletePackageFromCache( OUString const & destFolder) { try_dispose( xPackage ); - + //we remove the package from the uno cache //no service from the package may be loaded at this time!!! erase_path( destFolder, Reference<XCommandEnvironment>(), @@ -903,25 +903,25 @@ void PackageManagerImpl::removePackage( RuntimeException) { check(); - + Reference<XCommandEnvironment> xCmdEnv; if (m_xLogFile.is()) xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) ); else xCmdEnv.set( xCmdEnv_ ); - + try { Reference<deployment::XPackage> xPackage; { const ::osl::MutexGuard guard(getMutex()); - //Check if this extension exist and throw an IllegalArgumentException + //Check if this extension exist and throw an IllegalArgumentException //if it does not //If the files of the extension are already removed, or there is a //different extension at the same place, for example after updating the //extension, then the returned object is that which uses the database data. xPackage = getDeployedPackage_(id, fileName, xCmdEnv ); - + //Because the extension is only removed the next time the extension //manager runs after restarting OOo, we need to indicate that a //shared extension was "deleted". When a user starts OOo, then it @@ -940,7 +940,7 @@ void PackageManagerImpl::removePackage( OUString aUserName; ::osl::Security aSecurity; aSecurity.getUserName( aUserName ); - + ::rtl::OString stamp = ::rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8); Reference<css::io::XInputStream> xData( ::xmlscript::createInputStream( @@ -1007,7 +1007,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( { ActivePackages::Data val; if (m_activePackagesDB->get( &val, id, fileName )) - { + { return getDeployedPackage_( id, val, xCmdEnv, false ); } throw lang::IllegalArgumentException( @@ -1102,7 +1102,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage( xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) ); else xCmdEnv.set( xCmdEnv_ ); - + try { const ::osl::MutexGuard guard( getMutex() ); return getDeployedPackage_( id, fileName, xCmdEnv ); @@ -1147,7 +1147,7 @@ PackageManagerImpl::getDeployedPackages( xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) ); else xCmdEnv.set( xCmdEnv_ ); - + try { const ::osl::MutexGuard guard( getMutex() ); return getDeployedPackages_( xCmdEnv ); @@ -1194,17 +1194,17 @@ void PackageManagerImpl::reinstallDeployedPackages( throw RuntimeException( OUSTR("You must close any running Office process before " "reinstalling packages!"), static_cast<OWeakObject *>(this) ); - + Reference<XCommandEnvironment> xCmdEnv; if (m_xLogFile.is()) xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) ); else xCmdEnv.set( xCmdEnv_ ); - + try { ProgressLevel progress( xCmdEnv, OUSTR("Reinstalling all deployed packages...") ); - + try_dispose( m_xRegistry ); m_xRegistry.clear(); if (m_registryCache.getLength() > 0) @@ -1274,14 +1274,14 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( bool bRemoved = false; //Check if the URL to the extension is still the same ::ucbhelper::Content contentExtension; - + if (!create_ucb_content( &contentExtension, url, Reference<XCommandEnvironment>(), false)) { bRemoved = true; } - + //The folder is in the extension database, but it can still be deleted. //look for the xxx.tmpremoved file //There can also be the case that a different extension was installed @@ -1289,7 +1289,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( if (!bRemoved && bShared) { ::ucbhelper::Content contentRemoved; - + if (create_ucb_content( &contentRemoved, m_activePackages_expanded + OUSTR("/") + @@ -1315,7 +1315,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( { bRemoved = true; } - + } if (bRemoved) { @@ -1340,7 +1340,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions( bool PackageManagerImpl::synchronizeAddedExtensions( Reference<task::XAbortChannel> const & xAbortChannel, Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) -{ +{ bool bModified = false; ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() ); //check if the folder exist at all. The shared extension folder @@ -1348,14 +1348,14 @@ bool PackageManagerImpl::synchronizeAddedExtensions( if (!create_ucb_content( NULL, m_activePackages_expanded, Reference<css::ucb::XCommandEnvironment>(), false)) return bModified; - ::ucbhelper::Content tempFolder( + ::ucbhelper::Content tempFolder( m_activePackages_expanded, xCmdEnv ); - + Reference<sdbc::XResultSet> xResultSet( tempFolder.createCursor( Sequence<OUString>( &StrTitle::get(), 1 ), ::ucbhelper::INCLUDE_FOLDERS_ONLY ) ); - + while (xResultSet->next()) { try @@ -1385,7 +1385,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( if (::std::find_if( id2temp.begin(), id2temp.end(), match ) == id2temp.end()) { - + // The folder was not found in the data base, so it must be // an added extension OUString url(m_activePackages_expanded + OUSTR("/") + titleEncoded); @@ -1399,7 +1399,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( Reference<XCommandEnvironment>(), false)) continue; sExtFolder = getExtensionFolder( - m_activePackages_expanded + + m_activePackages_expanded + OUString(OUSTR("/")) + titleEncoded + OUSTR("_"), xCmdEnv); url = makeURLAppendSysPathSegment(m_activePackages_expanded, title); url = makeURLAppendSysPathSegment(url, sExtFolder); @@ -1407,7 +1407,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( Reference<deployment::XPackage> xPackage = m_xRegistry->bindPackage( url, OUString(), false, OUString(), xCmdEnv ); if (xPackage.is()) - { + { //Prepare the database entry ActivePackages::Data dbData; @@ -1421,13 +1421,13 @@ bool PackageManagerImpl::synchronizeAddedExtensions( OSL_ENSURE(dbData.version.getLength() > 0, "Extension Manager: bundled and shared extensions must have " "an identifier and a version"); - + OUString id = dp_misc::getIdentifier( xPackage ); //We provide a special command environment that will prevent //showing a license if simple-licens/@accept-by = "admin" //It will also prevent showing the license for bundled extensions - //which is not supported. + //which is not supported. OSL_ASSERT(!m_context.equals(OUSTR("user"))); // shall the license be suppressed? @@ -1439,7 +1439,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( bool bNoLicense = false; if (attr && attr->suppressIfRequired && props.isSuppressedLicense()) bNoLicense = true; - + Reference<ucb::XCommandEnvironment> licCmdEnv( new LicenseCommandEnv(xCmdEnv->getInteractionHandler(), bNoLicense, m_context)); @@ -1458,7 +1458,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( catch (uno::Exception &) { OSL_ASSERT(0); - } + } } return bModified; } @@ -1511,7 +1511,7 @@ Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWit OUString url = makeURL(m_activePackages, i->second.temporaryName); if (bShared) url = makeURLAppendSysPathSegment( url + OUSTR("_"), i->second.fileName); - + Reference<deployment::XPackage> p = m_xRegistry->bindPackage( url, OUString(), false, OUString(), xCmdEnv ); @@ -1560,7 +1560,7 @@ sal_Int32 PackageManagerImpl::checkPrerequisites( throw lang::IllegalArgumentException( OUSTR("PackageManagerImpl::checkPrerequisites: extension is not" " from this repository."), 0, 0); - + ActivePackages::Data dbData; OUString id = dp_misc::getIdentifier(extension); if (m_activePackagesDB->get( &dbData, id, OUString())) @@ -1570,11 +1570,11 @@ sal_Int32 PackageManagerImpl::checkPrerequisites( sal_Int32 prereq = dbData.failedPrerequisites.toInt32(); if ( !(prereq & deployment::Prerequisites::LICENSE)) _xCmdEnv = new NoLicenseCommandEnv(xCmdEnv->getInteractionHandler()); - + sal_Int32 failedPrereq = extension->checkPrerequisites( xAbortChannel, _xCmdEnv, false); dbData.failedPrerequisites = OUString::valueOf(failedPrereq); - insertToActivationLayerDB(id, dbData); + insertToActivationLayerDB(id, dbData); } else { diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 3b335d7e2362..fa4a9078ac42 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,10 +58,10 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper ::rtl::OUString m_registrationData_expanded; ::rtl::OUString m_registryCache; bool m_readOnly; - + ::rtl::OUString m_activePackages; ::rtl::OUString m_activePackages_expanded; - ::std::auto_ptr< ActivePackages > m_activePackagesDB; + ::std::auto_ptr< ActivePackages > m_activePackagesDB; //This mutex is only used for synchronization in addPackage ::osl::Mutex m_addMutex; css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile; @@ -69,7 +69,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper void fireModified(); css::uno::Reference<css::deployment::XPackageRegistry> m_xRegistry; - + void initRegistryBackends(); void initActivationLayer( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); @@ -77,7 +77,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper ::ucbhelper::Content const & ucbContent, bool throw_exc = true ); ::rtl::OUString insertToActivationLayer( css::uno::Sequence<css::beans::NamedValue> const & properties, - ::rtl::OUString const & mediaType, + ::rtl::OUString const & mediaType, ::ucbhelper::Content const & sourceContent, ::rtl::OUString const & title, ActivePackages::Data * dbData ); void insertToActivationLayerDB( @@ -106,20 +106,20 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper css::uno::Reference<css::ucb::XProgressHandler> m_xUserProgress; css::uno::Reference<css::task::XInteractionHandler> m_xUserInteractionHandler; - + public: virtual ~CmdEnvWrapperImpl(); CmdEnvWrapperImpl( css::uno::Reference<css::ucb::XCommandEnvironment> const & xUserCmdEnv, css::uno::Reference<css::ucb::XProgressHandler> const & xLogFile ); - + // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException); virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL getProgressHandler() throw (css::uno::RuntimeException); - + // XProgressHandler virtual void SAL_CALL push( css::uno::Any const & Status ) throw (css::uno::RuntimeException); @@ -127,11 +127,11 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper throw (css::uno::RuntimeException); virtual void SAL_CALL pop() throw (css::uno::RuntimeException); }; - + protected: inline void check(); virtual void SAL_CALL disposing(); - + virtual ~PackageManagerImpl(); inline PackageManagerImpl( css::uno::Reference<css::uno::XComponentContext> @@ -141,12 +141,12 @@ protected: m_context( context ), m_readOnly( true ) {} - + public: static css::uno::Reference<css::deployment::XPackageManager> create( css::uno::Reference<css::uno::XComponentContext> const & xComponentContext, ::rtl::OUString const & context ); - + // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); virtual void SAL_CALL addEventListener( @@ -155,7 +155,7 @@ public: virtual void SAL_CALL removeEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) throw (css::uno::RuntimeException); - + // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) @@ -163,17 +163,17 @@ public: virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) throw (css::uno::RuntimeException); - + // XPackageManager virtual ::rtl::OUString SAL_CALL getContext() throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL createAbortChannel() throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage( ::rtl::OUString const & url, css::uno::Sequence<css::beans::NamedValue> const & properties, @@ -185,7 +185,7 @@ public: css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL importExtension( css::uno::Reference<css::deployment::XPackage> const & extension, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -205,7 +205,7 @@ public: css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - + ::rtl::OUString getDeployPath( ActivePackages::Data const & data ); css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_( ::rtl::OUString const & id, ::rtl::OUString const & fileName, @@ -221,7 +221,7 @@ public: throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - + css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > getDeployedPackages_( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); @@ -234,7 +234,7 @@ public: css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL reinstallDeployedPackages( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc index 6131cc381abf..3dd89f57cf37 100644 --- a/desktop/source/deployment/manager/dp_manager.hrc +++ b/desktop/source/deployment/manager/dp_manager.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src index 7d38b880c37a..7430a8cab046 100644 --- a/desktop/source/deployment/manager/dp_manager.src +++ b/desktop/source/deployment/manager/dp_manager.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 55bd259a276d..ccbaadcb8ac3 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ typedef ::cppu::WeakComponentImplHelper1< class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper { Reference<XComponentContext> m_xComponentContext; - + Reference<deployment::XPackageManager> m_xUserMgr; Reference<deployment::XPackageManager> m_xSharedMgr; Reference<deployment::XPackageManager> m_xBundledMgr; @@ -59,16 +59,16 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper OUString, WeakReference<deployment::XPackageManager>, ::rtl::OUStringHash > t_string2weakref; t_string2weakref m_managers; - + protected: inline void check(); virtual void SAL_CALL disposing(); - + public: virtual ~PackageManagerFactoryImpl(); PackageManagerFactoryImpl( Reference<XComponentContext> const & xComponentContext ); - + // XPackageManagerFactory virtual Reference<deployment::XPackageManager> SAL_CALL getPackageManager( OUString const & context ) throw (RuntimeException); @@ -161,7 +161,7 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context ) if (xRet.is()) return xRet; } - + guard.clear(); xRet.set( PackageManagerImpl::create( m_xComponentContext, context ) ); guard.reset(); diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index a2a568287f16..6477c5aad099 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ ExtensionProperties::ExtensionProperties( m_xCmdEnv(xCmdEnv) { m_propFileUrl = urlExtension + OUSTR("properties"); - + ::std::list< ::std::pair< OUString, OUString> > props; if (! dp_misc::create_ucb_content(NULL, m_propFileUrl, 0, false)) return; - + ::ucbhelper::Content contentProps(m_propFileUrl, m_xCmdEnv); dp_misc::readProperties(props, contentProps); @@ -75,10 +75,10 @@ ExtensionProperties::ExtensionProperties( { if (i->first.equals(OUSTR(PROP_SUPPRESS_LICENSE))) m_prop_suppress_license = i->second; - } + } } -//Writing the file +//Writing the file ExtensionProperties::ExtensionProperties( OUString const & urlExtension, uno::Sequence<css::beans::NamedValue> const & properties, @@ -132,7 +132,7 @@ void ExtensionProperties::write() buf.append(OUSTR("=")); buf.append(*m_prop_suppress_license); } - + ::rtl::OString stamp = ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); Reference<css::io::XInputStream> xData( @@ -163,7 +163,7 @@ bool ExtensionProperties::isExtensionUpdate() ret = true; } return ret; -} +} } // namespace dp_manager diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index 103227f29226..70f6d9f62f47 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace dp_manager { */ class ExtensionProperties { -protected: +protected: ::rtl::OUString m_propFileUrl; const css::uno::Reference<css::ucb::XCommandEnvironment> m_xCmdEnv; ::boost::optional< ::rtl::OUString> m_prop_suppress_license; @@ -55,11 +55,11 @@ protected: ::rtl::OUString getPropertyValue(css::beans::NamedValue const & v); public: - + virtual ~ExtensionProperties() {}; ExtensionProperties(::rtl::OUString const & urlExtension, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); - + ExtensionProperties(::rtl::OUString const & urlExtension, css::uno::Sequence<css::beans::NamedValue> const & properties, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx index 6ba2c25bc92c..ce403181ab50 100644 --- a/desktop/source/deployment/misc/db.cxx +++ b/desktop/source/deployment/misc/db.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace berkeleydbproxy { static void raise_error(int dberr, const char * where); static inline int check_error(int dberr, const char * where) - { - if (dberr) raise_error(dberr,where); + { + if (dberr) raise_error(dberr,where); return dberr; } } @@ -57,9 +57,9 @@ char *DbEnv::strerror(int error) { //---------------------------------------------------------------------------- -Db::Db(DbEnv* pDbenv,u_int32_t flags) +Db::Db(DbEnv* pDbenv,u_int32_t flags) : m_pDBP(0) -{ +{ db_internal::check_error( db_create(&m_pDBP,pDbenv ? pDbenv->m_pDBENV:0,flags),"Db::Db" ); } @@ -71,7 +71,7 @@ Db::~Db() // should not happen // TODO: add assert } - + } @@ -79,27 +79,27 @@ int Db::close(u_int32_t flags) { int error = m_pDBP->close(m_pDBP,flags); m_pDBP = 0; - return db_internal::check_error(error,"Db::close"); + return db_internal::check_error(error,"Db::close"); } -int Db::open(DB_TXN *txnid, +int Db::open(DB_TXN *txnid, const char *file, - const char *database, - DBTYPE type, - u_int32_t flags, + const char *database, + DBTYPE type, + u_int32_t flags, int mode) { int err = m_pDBP->open(m_pDBP,txnid,file,database,type,flags,mode); return db_internal::check_error( err,"Db::open" ); } - + int Db::get(DB_TXN *txnid, Dbt *key, Dbt *data, u_int32_t flags) { int err = m_pDBP->get(m_pDBP,txnid,key,data,flags); // these are non-exceptional outcomes - if (err != DB_NOTFOUND && err != DB_KEYEMPTY) + if (err != DB_NOTFOUND && err != DB_KEYEMPTY) db_internal::check_error( err,"Db::get" ); return err; @@ -118,7 +118,7 @@ int Db::cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags) { DBC * dbc = 0; int error = m_pDBP->cursor(m_pDBP,txnid,&dbc,flags); - + if (!db_internal::check_error(error,"Db::cursor")) *cursorp = new Dbc(dbc); @@ -132,7 +132,7 @@ int Db::sync(u_int32_t flags) { int err; DB *db = m_pDBP; - + if (!db) { db_internal::check_error(EINVAL,"Db::sync"); return (EINVAL); @@ -148,7 +148,7 @@ int Db::del(Dbt *key, u_int32_t flags) { DB *db = m_pDBP; int err; - + if ((err = db->del(db, 0, key, flags)) != 0) { // DB_NOTFOUND is a "normal" return, so should not be // thrown as an error @@ -168,7 +168,7 @@ Dbc::Dbc(DBC * dbc) { } -Dbc::~Dbc() +Dbc::~Dbc() { } @@ -184,16 +184,16 @@ int Dbc::get(Dbt *key, Dbt *data, u_int32_t flags) int err = m_pDBC->c_get(m_pDBC,key,data,flags); // these are non-exceptional outcomes - if (err != DB_NOTFOUND && err != DB_KEYEMPTY) + if (err != DB_NOTFOUND && err != DB_KEYEMPTY) db_internal::check_error( err, "Dbcursor::get" ); - + return err; } //---------------------------------------------------------------------------- Dbt::Dbt() -{ +{ using namespace std; DBT * thispod = this; memset(thispod, 0, sizeof *thispod); @@ -219,7 +219,7 @@ Dbt::Dbt(const Dbt & other) Dbt& Dbt::operator = (const Dbt & other) { - if (this != &other) + if (this != &other) { using namespace std; const DBT *otherpod = &other; @@ -229,12 +229,12 @@ Dbt& Dbt::operator = (const Dbt & other) return *this; } -Dbt::~Dbt() +Dbt::~Dbt() { } void * Dbt::get_data() const -{ +{ return this->data; } @@ -244,23 +244,23 @@ void Dbt::set_data(void *value) } u_int32_t Dbt::get_size() const -{ +{ return this->size; } void Dbt::set_size(u_int32_t value) { - this->size = value; + this->size = value; } //---------------------------------------------------------------------------- void db_internal::raise_error(int dberr, const char * where) { if (!where) where = "<unknown>"; - + const char * dberrmsg = db_strerror(dberr); if (!dberrmsg || !*dberrmsg) dberrmsg = "<unknown DB error>"; - + rtl::OString msg = where; msg += ": "; msg += dberrmsg; diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 0b8b90eeb241..345e4c248b4c 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 2f03d0f425fb..0efc0ae091a0 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #include "com/sun/star/xml/dom/XNodeList.hpp" #include "com/sun/star/xml/dom/XDocumentBuilder.hpp" #include "com/sun/star/xml/xpath/XXPathAPI.hpp" -#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" +#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" #include "cppuhelper/implbase1.hxx" #include "cppuhelper/implbase2.hxx" #include "cppuhelper/weak.hxx" @@ -126,9 +126,9 @@ css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) class ExtensionDescription { public: - /**throws an exception if the description.xml is not + /**throws an exception if the description.xml is not available, cannot be read, does not contain the expected data, - or any other error occured. Therefore it shoult only be used with + or any other error occured. Therefore it shoult only be used with new extensions. Throws com::sun::star::uno::RuntimeException, @@ -143,7 +143,7 @@ public: ~ExtensionDescription(); css::uno::Reference<css::xml::dom::XNode> getRootElement() const - { + { return m_xRoot; } @@ -165,7 +165,7 @@ class NoDescriptionException class FileDoesNotExistFilter : public ::cppu::WeakImplHelper2< css::ucb::XCommandEnvironment, css::task::XInteractionHandler > - + { //css::uno::Reference<css::task::XInteractionHandler> m_xHandler; bool m_bExist; @@ -197,21 +197,21 @@ ExtensionDescription::ExtensionDescription( try { m_sExtensionRootUrl = installDir; //may throw ::com::sun::star::ucb::ContentCreationException - //If there is no description.xml then ucb will start an interaction which + //If there is no description.xml then ucb will start an interaction which //brings up a dialog.We want to prevent this. Therefore we wrap the xCmdEnv //and filter the respective exception out. OUString sDescriptionUri(installDir + OUSTR("/description.xml")); - Reference<css::ucb::XCommandEnvironment> xFilter = + Reference<css::ucb::XCommandEnvironment> xFilter = static_cast<css::ucb::XCommandEnvironment*>( new FileDoesNotExistFilter(xCmdEnv)); ::ucbhelper::Content descContent(sDescriptionUri, xFilter); //throws an com::sun::star::uno::Exception if the file is not available Reference<css::io::XInputStream> xIn; - try - { //throws com.sun.star.ucb.InteractiveAugmentedIOException + try + { //throws com.sun.star.ucb.InteractiveAugmentedIOException xIn = descContent.openStream(); - } + } catch (css::uno::Exception& ) { if ( ! static_cast<FileDoesNotExistFilter*>(xFilter.get())->exist()) @@ -244,7 +244,7 @@ ExtensionDescription::ExtensionDescription( { throw css::uno::Exception(sDescriptionUri + OUSTR(" contains data which cannot be parsed. "), 0); } - + //check for proper root element and namespace Reference<css::xml::dom::XElement> xRoot = xDoc->getDocumentElement(); if (!xRoot.is()) @@ -252,7 +252,7 @@ ExtensionDescription::ExtensionDescription( throw css::uno::Exception( sDescriptionUri + OUSTR(" contains no root element."), 0); } - + if ( ! xRoot->getTagName().equals(OUSTR("description"))) { throw css::uno::Exception( @@ -298,7 +298,7 @@ bool FileDoesNotExistFilter::exist() return m_bExist; } // XCommandEnvironment -Reference<css::task::XInteractionHandler > +Reference<css::task::XInteractionHandler > FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException) { return static_cast<css::task::XInteractionHandler*>(this); @@ -320,13 +320,13 @@ void FileDoesNotExistFilter::handle( throw (css::uno::RuntimeException) { css::uno::Any request( xRequest->getRequest() ); - + css::ucb::InteractiveAugmentedIOException ioexc; if ((request>>= ioexc) && ioexc.Code == css::ucb::IOErrorCode_NOT_EXISTING ) { m_bExist = false; return; - } + } Reference<css::task::XInteractionHandler> xInteraction; if (m_xCommandEnv.is()) { xInteraction = m_xCommandEnv->getInteractionHandler(); @@ -409,7 +409,7 @@ DescriptionInfoset::~DescriptionInfoset() {} } -::rtl::OUString DescriptionInfoset::getVersion() const +::rtl::OUString DescriptionInfoset::getVersion() const { return getNodeValueFromExpression( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("desc:version/@value"))); @@ -446,7 +446,7 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getSupportedPlaforms() aToken = aToken.trim(); if (aToken.getLength()) vec.push_back(aToken); - + } while (nIndex >= 0); @@ -474,7 +474,7 @@ DescriptionInfoset::getUpdateInformationUrls() const { "desc:update-information/desc:src/@xlink:href"))); } -css::uno::Sequence< ::rtl::OUString > +css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUpdateDownloadUrls() const { return getUrls( @@ -492,10 +492,10 @@ DescriptionInfoset::getUpdateDownloadUrls() const if ( bHighContrast && aStrListHC.hasElements() && aStrListHC[0].getLength() ) return aStrListHC[0]; - + if ( aStrList.hasElements() && aStrList[0].getLength() ) return aStrList[0]; - + return ::rtl::OUString(); } @@ -549,7 +549,7 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( ::std::pair< ::rtl::OUString, ::rtl::OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const { - css::uno::Reference< css::xml::dom::XNode > node = + css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:publisher"))); ::rtl::OUString sPublisherName; @@ -589,7 +589,7 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( ::rtl::OUString DescriptionInfoset::getLocalizedDisplayName() const { - css::uno::Reference< css::xml::dom::XNode > node = + css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:display-name"))); if (node.is()) { @@ -613,14 +613,14 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( } -::boost::optional<SimpleLicenseAttributes> +::boost::optional<SimpleLicenseAttributes> DescriptionInfoset::getSimpleLicenseAttributes() const { //Check if the node exist css::uno::Reference< css::xml::dom::XNode > n; if (m_element.is()) { try { - n = m_xpath->selectSingleNode(m_element, + n = m_xpath->selectSingleNode(m_element, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/desc:description/desc:registration/desc:simple-license/@accept-by"))); } catch (css::xml::xpath::XPathException &) { @@ -629,7 +629,7 @@ DescriptionInfoset::getSimpleLicenseAttributes() const if (n.is()) { SimpleLicenseAttributes attributes; - attributes.acceptBy = + attributes.acceptBy = getNodeValueFromExpression(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/desc:description/desc:registration/desc:simple-license/@accept-by"))); @@ -663,7 +663,7 @@ DescriptionInfoset::getSimpleLicenseAttributes() const "/desc:description/desc:extension-description")), NULL); } -css::uno::Reference< css::xml::dom::XNode > +css::uno::Reference< css::xml::dom::XNode > DescriptionInfoset::getLocalizedChild( const ::rtl::OUString & sParent) const { if ( ! m_element.is() || !sParent.getLength()) @@ -685,7 +685,7 @@ DescriptionInfoset::getLocalizedChild( const ::rtl::OUString & sParent) const if (! nodeMatch.is()) { const css::lang::Locale officeLocale = getOfficeLocale(); - nodeMatch = matchCountryAndLanguage(xParent, officeLocale); + nodeMatch = matchCountryAndLanguage(xParent, officeLocale); if ( ! nodeMatch.is()) { nodeMatch = matchLanguage(xParent, officeLocale); @@ -698,14 +698,14 @@ DescriptionInfoset::getLocalizedChild( const ::rtl::OUString & sParent) const return nodeMatch; } -css::uno::Reference<css::xml::dom::XNode> -DescriptionInfoset::matchFullLocale(css::uno::Reference< css::xml::dom::XNode > +css::uno::Reference<css::xml::dom::XNode> +DescriptionInfoset::matchFullLocale(css::uno::Reference< css::xml::dom::XNode > const & xParent, ::rtl::OUString const & sLocale) const { - OSL_ASSERT(xParent.is()); + OSL_ASSERT(xParent.is()); const ::rtl::OUString exp1( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*[@lang=\"")) - + sLocale + + + sLocale + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"]"))); try { return m_xpath->selectSingleNode(xParent, exp1); @@ -715,7 +715,7 @@ DescriptionInfoset::matchFullLocale(css::uno::Reference< css::xml::dom::XNode > } } -css::uno::Reference<css::xml::dom::XNode> +css::uno::Reference<css::xml::dom::XNode> DescriptionInfoset::matchCountryAndLanguage( css::uno::Reference< css::xml::dom::XNode > const & xParent, css::lang::Locale const & officeLocale) const { @@ -724,13 +724,13 @@ DescriptionInfoset::matchCountryAndLanguage( if (officeLocale.Country.getLength()) { - const ::rtl::OUString sLangCountry(officeLocale.Language + + const ::rtl::OUString sLangCountry(officeLocale.Language + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")) + officeLocale.Country); //first try exact match for lang-country const ::rtl::OUString exp1( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*[@lang=\"")) - + sLangCountry + + + sLangCountry + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"]"))); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp1); @@ -744,7 +744,7 @@ DescriptionInfoset::matchCountryAndLanguage( { const ::rtl::OUString exp2( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*[starts-with(@lang,\"")) - + sLangCountry + + + sLangCountry + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-\")]"))); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp2); @@ -758,7 +758,7 @@ DescriptionInfoset::matchCountryAndLanguage( } -css::uno::Reference<css::xml::dom::XNode> +css::uno::Reference<css::xml::dom::XNode> DescriptionInfoset::matchLanguage( css::uno::Reference< css::xml::dom::XNode > const & xParent, css::lang::Locale const & officeLocale) const { @@ -767,8 +767,8 @@ DescriptionInfoset::matchLanguage( //first try exact match for lang const ::rtl::OUString exp1( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*[@lang=\"")) - + officeLocale.Language + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*[@lang=\"")) + + officeLocale.Language + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"]"))); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp1); @@ -782,7 +782,7 @@ DescriptionInfoset::matchLanguage( { const ::rtl::OUString exp2( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*[starts-with(@lang,\"")) - + officeLocale.Language + + officeLocale.Language + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-\")]"))); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp2); @@ -793,8 +793,8 @@ DescriptionInfoset::matchLanguage( return nodeMatch; } -css::uno::Reference<css::xml::dom::XNode> -DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom::XNode > +css::uno::Reference<css::xml::dom::XNode> +DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom::XNode > const & xParent) const { OSL_ASSERT(xParent.is()); @@ -811,8 +811,8 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom { //The old way const ::rtl::OUString exp1( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:license-text[@license-id = \"")) - + nodeDefault->getNodeValue() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:license-text[@license-id = \"")) + + nodeDefault->getNodeValue() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"]"))); try { return m_xpath->selectSingleNode(xParent, exp1); @@ -835,7 +835,7 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom ::rtl::OUString const & sXPathParent, bool * out_bParentExists) const { - css::uno::Reference< css::xml::dom::XNode > node = + css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild(sXPathParent); ::rtl::OUString sURL; diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index b24ccd7def52..f9fb809b5161 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index c42ccd249cb7..57cc3bf2e7ad 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ class InteractionContinuationImpl : public ::cppu::OWeakObject, { const Type m_type; bool * m_pselect; - -public: + +public: inline InteractionContinuationImpl( Type const & type, bool * pselect ) : m_type( type ), m_pselect( pselect ) @@ -58,13 +58,13 @@ public: ::getCppuType( static_cast< Reference<task::XInteractionContinuation> const *>(0) ).isAssignableFrom(m_type) ); } - + // XInterface virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); virtual Any SAL_CALL queryInterface( Type const & type ) throw (RuntimeException); - + // XInteractionContinuation virtual void SAL_CALL select() throw (RuntimeException); }; @@ -107,7 +107,7 @@ class InteractionRequest : { Any m_request; Sequence< Reference<task::XInteractionContinuation> > m_conts; - + public: inline InteractionRequest( Any const & request, diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 851cf8b961a0..f0ac23d2fb19 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #include "boost/scoped_array.hpp" #include "boost/shared_ptr.hpp" #include <comphelper/processfactory.hxx> - + #ifdef WNT #define UNICODE #define _UNICODE @@ -99,29 +99,29 @@ const OUString OfficePipeId::operator () () OUString userPath; ::utl::Bootstrap::PathStatus aLocateResult = ::utl::Bootstrap::locateUserInstallation( userPath ); - if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS || + if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS || aLocateResult == ::utl::Bootstrap::PATH_VALID)) { throw Exception(OUSTR("Extension Manager: Could not obtain path for UserInstallation."), 0); } - + rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); if (digest <= 0) { throw RuntimeException( OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 ); } - + sal_uInt8 const * data = reinterpret_cast<sal_uInt8 const *>(userPath.getStr()); sal_Size size = (userPath.getLength() * sizeof (sal_Unicode)); sal_uInt32 md5_key_len = rtl_digest_queryLength( digest ); ::boost::scoped_array<sal_uInt8> md5_buf( new sal_uInt8 [ md5_key_len ] ); - + rtl_digest_init( digest, data, static_cast<sal_uInt32>(size) ); rtl_digest_update( digest, data, static_cast<sal_uInt32>(size) ); rtl_digest_get( digest, md5_buf.get(), md5_key_len ); rtl_digest_destroy( digest ); - + // create hex-value string from the MD5 value to keep // the string size minimal ::rtl::OUStringBuffer buf; @@ -170,14 +170,14 @@ bool compareExtensionFolderWithLastSynchronizedFile( if (err2 == ::osl::File::E_NOENT) { return true; - + } else if (err2 != ::osl::File::E_None) { OSL_ENSURE(0, "Cannot access file lastsynchronized"); return true; //sync just in case } - + //compare the modification time of the extension folder and the last //modified file ::osl::FileStatus statFolder(FileStatusMask_ModifyTime); @@ -195,7 +195,7 @@ bool compareExtensionFolderWithLastSynchronizedFile( else { OSL_ASSERT(0); - bNeedsSync = true; + bNeedsSync = true; } } else @@ -203,7 +203,7 @@ bool compareExtensionFolderWithLastSynchronizedFile( OSL_ASSERT(0); bNeedsSync = true; } - return bNeedsSync; + return bNeedsSync; } bool needToSyncRepostitory(OUString const & name) @@ -231,7 +231,7 @@ bool needToSyncRepostitory(OUString const & name) { OSL_ASSERT(0); return true; - } + } ::rtl::Bootstrap::expandMacros(folder); ::rtl::Bootstrap::expandMacros(file); return compareExtensionFolderWithLastSynchronizedFile( @@ -285,7 +285,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) // encode for macro expansion: relPath is supposed to have no // macros, so encode $, {} \ (bootstrap mimic) relPath = encodeForRcFile(relPath); - + // encode once more for vnd.sun.star.expand schema: // vnd.sun.star.expand:$UNO_... // will expand to file-url @@ -302,7 +302,7 @@ OUString makeURLAppendSysPathSegment( OUString const & baseURL, OUString const & { OUString segment = relPath_; OSL_ASSERT(segment.indexOf(static_cast<sal_Unicode>('/')) == -1); - + ::rtl::Uri::encode( segment, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); @@ -365,7 +365,7 @@ bool office_is_running() { sFile = sFile.copy(sFile.lastIndexOf('/') + 1); if ( -#if defined UNIX +#if defined UNIX sFile.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(SOFFICE2))) #elif defined WNT || defined OS2 //osl_getExecutableFile should deliver "soffice.bin" on windows @@ -380,8 +380,8 @@ bool office_is_running() || sFile.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(SWRITER))) #else #error "Unsupported platform" -#endif - +#endif + ) ret = true; else @@ -391,7 +391,7 @@ bool office_is_running() { OSL_ENSURE(0, "NOT osl_Process_E_None "); //if osl_getExecutable file than we take the risk of creating a pipe - ret = existsOfficePipe(); + ret = existsOfficePipe(); } return ret; } @@ -412,7 +412,7 @@ oslProcess raiseProcess( 0, // => current working dir 0, 0, // => no env vars &hProcess ); - + switch (rc) { case osl_Process_E_None: break; @@ -428,7 +428,7 @@ oslProcess raiseProcess( default: throw RuntimeException( OUSTR("unmapped error!"), 0 ); } - + return hProcess; } @@ -459,7 +459,7 @@ Reference<XInterface> resolveUnoURL( { Reference<bridge::XUnoUrlResolver> xUnoUrlResolver( bridge::UnoUrlResolver::create( xLocalContext ) ); - + for (;;) { if (abortChannel != 0 && abortChannel->isAborted()) { @@ -480,7 +480,7 @@ Reference<XInterface> resolveUnoURL( void writeConsoleWithStream(::rtl::OUString const & sText, HANDLE stream) { DWORD nWrittenChars = 0; - WriteFile(stream, sText.getStr(), + WriteFile(stream, sText.getStr(), sText.getLength() * 2, &nWrittenChars, NULL); } #else @@ -549,7 +549,7 @@ OUString readConsole() { #ifdef WNT sal_Unicode aBuffer[1024]; - DWORD dwRead = 0; + DWORD dwRead = 0; //unopkg.com feeds unopkg.exe with wchar_t|s if (ReadFile( GetStdHandle(STD_INPUT_HANDLE), &aBuffer, sizeof(aBuffer), &dwRead, NULL ) ) { @@ -600,7 +600,7 @@ void syncRepositories(Reference<ucb::XCommandEnvironment> const & xCmdEnv) if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")))) { - xExtensionManager = + xExtensionManager = deployment::ExtensionManager::get( comphelper_getProcessComponentContext()); diff --git a/desktop/source/deployment/misc/dp_misc.hrc b/desktop/source/deployment/misc/dp_misc.hrc index 55fabac5c5b5..e5d749fc62a1 100644 --- a/desktop/source/deployment/misc/dp_misc.hrc +++ b/desktop/source/deployment/misc/dp_misc.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src index 0d341122af16..78e87c20787a 100644 --- a/desktop/source/deployment/misc/dp_misc.src +++ b/desktop/source/deployment/misc/dp_misc.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 27ab39b60c44..0e67097df572 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ namespace css = ::com::sun::star; namespace dp_misc { -namespace +namespace { struct StrOperatingSystem : public rtl::StaticWithInit<const OUString, StrOperatingSystem> { @@ -122,7 +122,7 @@ namespace bool checkOSandCPU(OUString const & os, OUString const & cpu) { - return os.equals(StrOperatingSystem::get()) + return os.equals(StrOperatingSystem::get()) && cpu.equals(StrCPU::get()); } @@ -136,37 +136,37 @@ namespace else if (token.equals(OUSTR(PLATFORM_LINUX_X86))) ret = checkOSandCPU(OUSTR("Linux"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_LINUX_X86_64))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("X86_64")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("X86_64")); else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86))) ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86_64))) - ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("X86_64")); + ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("X86_64")); else if (token.equals(OUSTR(PLATFORM_LINUX_SPARC))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("SPARC")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("SPARC")); else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC")); else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC64))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC_64")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC_64")); else if (token.equals(OUSTR(PLATFORM_LINUX_ARM_EABI))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_EABI")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_EABI")); else if (token.equals(OUSTR(PLATFORM_LINUX_ARM_OABI))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_OABI")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_OABI")); else if (token.equals(OUSTR(PLATFORM_LINUX_MIPS_EL))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EL")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EL")); else if (token.equals(OUSTR(PLATFORM_LINUX_MIPS_EB))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB")); else if (token.equals(OUSTR(PLATFORM_LINUX_IA64))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64")); else if (token.equals(OUSTR(PLATFORM_LINUX_M68K))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K")); else if (token.equals(OUSTR(PLATFORM_LINUX_S390))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390")); else if (token.equals(OUSTR(PLATFORM_LINUX_S390x))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x")); else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA")); else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA))) - ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA")); + ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA")); else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC))) ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC")); else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64))) diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index ddf50090e99b..eb92eabba38d 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ void checkPrimarySubtag(::rtl::OUString const & tag) if (len < 1 || len > 3) throw Exception(OUSTR("Invalid language string."), 0); - if (len == 1 + if (len == 1 && (arLang[0] != 'i' && arLang[0] != 'x')) throw Exception(OUSTR("Invalid language string."), 0); @@ -132,7 +132,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry) throw Exception(OUSTR("Invalid language string."), 0); //country code bIsCountry = false; - if (len == 2) + if (len == 2) { for (sal_Int32 i = 0; i < 2; i++) { @@ -150,7 +150,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry) for (sal_Int32 i = 0; i < len; i++) { if (!( (arLang[i] >= 'A' && arLang[i] <= 'Z') - || (arLang[i] >= 'a' && arLang[i] <= 'z') + || (arLang[i] >= 'a' && arLang[i] <= 'z') || (arLang[i] >= '0' && arLang[i] <= '9') )) { throw Exception(OUSTR("Invalid language string."), 0); @@ -164,12 +164,12 @@ void checkThirdSubtag(::rtl::OUString const & tag) sal_Int32 len = tag.getLength(); sal_Unicode const * arLang = tag.getStr(); if (len < 1 || len > 8) - throw Exception(OUSTR("Invalid language string."), 0); + throw Exception(OUSTR("Invalid language string."), 0); for (sal_Int32 i = 0; i < len; i++) { if (!( (arLang[i] >= 'A' && arLang[i] <= 'Z') - || (arLang[i] >= 'a' && arLang[i] <= 'z') + || (arLang[i] >= 'a' && arLang[i] <= 'z') || (arLang[i] >= '0' && arLang[i] <= '9') )) { throw Exception(OUSTR("Invalid language string."), 0); @@ -181,7 +181,7 @@ void checkThirdSubtag(::rtl::OUString const & tag) //We parse the string acording to RFC 3066 //We only use the primary sub-tag and two subtags. That is lang-country-variant -//We do some simple tests if the string is correct. Actually this should do a +//We do some simple tests if the string is correct. Actually this should do a //validating parser //We may have the case that there is no country tag, for example en-welsh ::com::sun::star::lang::Locale toLocale( ::rtl::OUString const & slang ) @@ -215,7 +215,7 @@ void checkThirdSubtag(::rtl::OUString const & tag) locale.Variant = variant; } } - + return locale; } diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 01e7de0d1d0b..170a403ddc74 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -280,7 +280,7 @@ bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> OUString file( reinterpret_cast<sal_Char const *>(bytes.getConstArray()), bytes.getLength(), RTL_TEXTENCODING_UTF8); sal_Int32 pos = 0; - + for (;;) { @@ -303,7 +303,7 @@ bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> pos++; } OUString aLine = buf.makeStringAndClear(); - + sal_Int32 posEqual = aLine.indexOf('='); if (posEqual > 0 && (posEqual + 1) < aLine.getLength()) { diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 97453d6b2781..531409f0630a 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ void getOwnUpdateInfos( infos(getUpdateInformation(updateInformation, urls, id, anyError)); if (anyError.hasValue()) out_errors.push_back(std::make_pair(i->second.extension, anyError)); - + for (sal_Int32 j = 0; j < infos.getLength(); ++j) { dp_misc::DescriptionInfoset infoset( @@ -121,7 +121,7 @@ void getOwnUpdateInfos( if (!infoset.hasDescription()) continue; boost::optional< OUString > id2(infoset.getIdentifier()); - if (!id2) + if (!id2) continue; OSL_ASSERT(*id2 == id); if (*id2 == id) @@ -154,7 +154,7 @@ void getDefaultUpdateInfos( Sequence< Reference< xml::dom::XElement > > infos( getUpdateInformation( - updateInformation, + updateInformation, Sequence< OUString >(&sDefaultURL, 1), OUString(), anyError)); if (anyError.hasValue()) out_errors.push_back(std::make_pair(Reference<deployment::XPackage>(), anyError)); @@ -215,14 +215,14 @@ bool onlyBundledExtensions( onlyBundled = false; break; } - + } } else { const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > > > seqAllExt = xExtMgr->getAllExtensions(Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>()); - + for (int pos = seqAllExt.getLength(); pos --; ) { if (!containsBundledOnly(seqAllExt[pos])) @@ -280,7 +280,7 @@ UPDATE_SOURCE isUpdateUserExtension( retVal = UPDATE_SOURCE_BUNDLED; else if (index == 3) retVal = UPDATE_SOURCE_ONLINE; - + } //No update for bundled extensions, they are updated only by the setup //else if (bundledVersion.getLength()) @@ -305,7 +305,7 @@ UPDATE_SOURCE isUpdateUserExtension( retVal = UPDATE_SOURCE_ONLINE; } } - + return retVal; } @@ -318,7 +318,7 @@ UPDATE_SOURCE isUpdateSharedExtension( if (bReadOnlyShared) return UPDATE_SOURCE_NONE; UPDATE_SOURCE retVal = UPDATE_SOURCE_NONE; - + if (sharedVersion.getLength()) { int index = determineHighestVersion( @@ -360,9 +360,9 @@ getExtensionWithHighestVersion( //greatest has a value if (! current.is()) continue; - + if (dp_misc::compareVersions(current->getVersion(), greatest->getVersion()) == dp_misc::GREATER) - greatest = current; + greatest = current; } return greatest; } @@ -375,7 +375,7 @@ extension(ext) UpdateInfoMap getOnlineUpdateInfos( - Reference<uno::XComponentContext> const &xContext, + Reference<uno::XComponentContext> const &xContext, Reference<deployment::XExtensionManager> const & xExtMgr, Reference<deployment::XUpdateInformationProvider > const & updateInformation, std::vector<Reference<deployment::XPackage > > const * extensionList, @@ -390,15 +390,15 @@ UpdateInfoMap getOnlineUpdateInfos( { const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > > > seqAllExt = xExtMgr->getAllExtensions( Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>()); - + //fill the UpdateInfoMap. key = extension identifier, value = UpdateInfo for (int pos = seqAllExt.getLength(); pos --; ) { uno::Sequence<Reference<deployment::XPackage> > const & seqExt = seqAllExt[pos]; - + Reference<deployment::XPackage> extension = getExtensionWithHighestVersion(seqExt); OSL_ASSERT(extension.is()); - + std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert( UpdateInfoMap::value_type( dp_misc::getIdentifier(extension), UpdateInfo(extension))); @@ -414,7 +414,7 @@ UpdateInfoMap getOnlineUpdateInfos( std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert( UpdateInfoMap::value_type( dp_misc::getIdentifier(*i), UpdateInfo(*i))); - OSL_ASSERT(insertRet.second == true); + OSL_ASSERT(insertRet.second == true); } } @@ -442,7 +442,7 @@ OUString getHighestVersion( case 3: return onlineVersion; default: OSL_ASSERT(0); } - + return OUString(); } } //namespace dp_misc diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index 5c563b7dafb7..c999d32cc252 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace dp_misc { ::rtl::OUString e2(getElement(version2, &i2)); if (e1.getLength() < e2.getLength()) { return ::dp_misc::LESS; - } else if (e1.getLength() > e2.getLength()) { + } else if (e1.getLength() > e2.getLength()) { return ::dp_misc::GREATER; } else if (e1 < e2) { return ::dp_misc::LESS; diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index 7de93a00cd86..09f06638ecde 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data writeSimpleElement(OUSTR("java-type-library"), OUString::valueOf((sal_Bool) data.javaTypeLibrary), componentNode); - + writeSimpleList( data.implementationNames, OUSTR("implementation-names"), @@ -101,7 +101,7 @@ void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data OUSTR("key"), OUSTR("value"), componentNode); - + save(); } catch(css::uno::Exception &) @@ -124,7 +124,7 @@ ComponentBackendDb::Data ComponentBackendDb::getEntry(::rtl::OUString const & ur bool bJava = readSimpleElement(OUSTR("java-type-library"), aNode) .equals(OUSTR("true")) ? true : false; retData.javaTypeLibrary = bJava; - + retData.implementationNames = readList( aNode, diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index 2e0e39eea29c..8af1ad639622 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace component { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. The format looks like this: - + <?xml version="1.0"?> <component-backend-db xmlns="http://openoffice.org/extensionmanager/component-registry/2010"> <component url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/5CD5.tmp_/leaves1.oxt/extensionoptions.jar"> @@ -81,7 +81,7 @@ namespace component { </component-backend-db> */ class ComponentBackendDb: public dp_registry::backend::BackendDb -{ +{ protected: virtual ::rtl::OUString getDbNSName(); virtual ::rtl::OUString getNSPrefix(); diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 535e261f7b1b..b1e22d35c0a0 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ typedef ::std::vector< ::std::pair<OUString, OUString> > t_stringpairvec; if (arg.matchAsciiL("-env:", 5)) ret.push_back(arg); } - return ret; + return ret; } bool jarManifestHeaderPresent( @@ -123,17 +123,17 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend const OUString m_loader; ComponentBackendDb::Data m_registeredComponentsDb; - + enum reg { REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED, REG_MAYBE_REGISTERED } m_registered; - + Reference<loader::XImplementationLoader> getComponentInfo( t_stringlist * pImplNames, t_stringpairvec * pSingletons, Reference<XComponentContext> const & xContext ); - + virtual void SAL_CALL disposing(); - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -145,13 +145,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + const Reference<registry::XSimpleRegistry> getRDB() const; - + //Provides the read-only registry (e.g. not the one based on the duplicated //rdb files const Reference<registry::XSimpleRegistry> getRDB_RO() const; - + public: ComponentPackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -161,16 +161,16 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend OUString const & identifier); }; friend class ComponentPackageImpl; - + class TypelibraryPackageImpl : public ::dp_registry::backend::Package { BackendImpl * getMyBackend() const; - + const bool m_jarFile; Reference<container::XHierarchicalNameAccess> m_xTDprov; - + virtual void SAL_CALL disposing(); - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -182,7 +182,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + public: TypelibraryPackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -192,36 +192,36 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend OUString const & identifier); }; friend class TypelibraryPackageImpl; - + t_stringlist m_jar_typelibs; t_stringlist m_rdb_typelibs; t_stringlist & getTypelibs( bool jar ) { return jar ? m_jar_typelibs : m_rdb_typelibs; } - + bool m_unorc_inited; bool m_unorc_modified; bool bSwitchedRdbFiles; - + typedef ::std::hash_map< OUString, Reference<XInterface>, ::rtl::OUStringHash > t_string2object; t_string2object m_backendObjects; - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ); - + virtual void SAL_CALL disposing(); - + const Reference<deployment::XPackageTypeInfo> m_xDynComponentTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xJavaComponentTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xPythonComponentTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xRDBTypelibTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xJavaTypelibTypeInfo; Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos; - + OUString m_commonRDB; OUString m_nativeRDB; @@ -236,37 +236,37 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend ComponentBackendDb::Data readDataFromDb(OUString const & url); - //These rdbs are for writing new service entries. The rdb files are copies + //These rdbs are for writing new service entries. The rdb files are copies //which are created when services are added or removed. Reference<registry::XSimpleRegistry> m_xCommonRDB; Reference<registry::XSimpleRegistry> m_xNativeRDB; //These rdbs are created on the read-only rdbs which are already used - //by UNO since the startup of the current session. + //by UNO since the startup of the current session. Reference<registry::XSimpleRegistry> m_xCommonRDB_RO; Reference<registry::XSimpleRegistry> m_xNativeRDB_RO; - + void unorc_verify_init( Reference<XCommandEnvironment> const & xCmdEnv ); void unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ); - + Reference<XInterface> getObject( OUString const & id ); Reference<XInterface> insertObject( OUString const & id, Reference<XInterface> const & xObject ); void releaseObject( OUString const & id ); - + bool addToUnoRc( bool jarFile, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); bool removeFromUnoRc( bool jarFile, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); bool hasInUnoRc( bool jarFile, OUString const & url ); - - + + public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -342,12 +342,12 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //Throws a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<ComponentPackageImpl *>(this))); } return pBackend; @@ -382,7 +382,7 @@ void BackendImpl::disposing() m_xCommonRDB.clear(); } unorc_flush( Reference<XCommandEnvironment>() ); - + PackageRegistryBackend::disposing(); } catch (RuntimeException &) { @@ -479,7 +479,7 @@ void BackendImpl::initServiceRdbFiles_RO() const Reference<XCommandEnvironment> xCmdEnv; // common rdb for java, native rdb for shared lib components - if (m_commonRDB_RO.getLength() > 0) + if (m_commonRDB_RO.getLength() > 0) { m_xCommonRDB_RO.set( m_xComponentContext->getServiceManager() @@ -488,10 +488,10 @@ void BackendImpl::initServiceRdbFiles_RO() m_xComponentContext), UNO_QUERY_THROW); m_xCommonRDB_RO->open( makeURL(expandUnoRcUrl(getCachePath()), m_commonRDB_RO), - sal_True, //read-only + sal_True, //read-only sal_True); // create data source if necessary } - if (m_nativeRDB_RO.getLength() > 0) + if (m_nativeRDB_RO.getLength() > 0) { m_xNativeRDB_RO.set( m_xComponentContext->getServiceManager() @@ -500,7 +500,7 @@ void BackendImpl::initServiceRdbFiles_RO() m_xComponentContext), UNO_QUERY_THROW); m_xNativeRDB_RO->open( makeURL(expandUnoRcUrl(getCachePath()), m_nativeRDB_RO), - sal_True, //read-only + sal_True, //read-only sal_True); // create data source if necessary } } @@ -561,9 +561,9 @@ BackendImpl::BackendImpl( m_typeInfos[ 2 ] = m_xPythonComponentTypeInfo; m_typeInfos[ 3 ] = m_xRDBTypelibTypeInfo; m_typeInfos[ 4 ] = m_xJavaTypelibTypeInfo; - + const Reference<XCommandEnvironment> xCmdEnv; - + if (transientMode()) { // in-mem rdbs: @@ -677,7 +677,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) @@ -691,11 +691,11 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( name = ucbContent.getPropertyValue( StrTitle::get() ).get<OUString>(); } - + if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.uno-component")) { // xxx todo: probe and evaluate component xml description - + INetContentTypeParameter const * param = params.find( ByteString("platform") ); if (param == 0 || platform_fits( param->m_sValue )) { @@ -777,7 +777,7 @@ void BackendImpl::unorc_verify_init( sal_Int32 index = sizeof ("UNO_JAVA_CLASSPATH=") - 1; do { OUString token( line.getToken( 0, ' ', index ).trim() ); - if (token.getLength() > 0) + if (token.getLength() > 0) { if (create_ucb_content( 0, expandUnoRcTerm(token), xCmdEnv, @@ -798,7 +798,7 @@ void BackendImpl::unorc_verify_init( sal_Int32 index = sizeof ("UNO_TYPES=") - 1; do { OUString token( line.getToken( 0, ' ', index ).trim() ); - if (token.getLength() > 0) + if (token.getLength() > 0) { if (token[ 0 ] == '?') token = token.copy( 1 ); @@ -823,7 +823,7 @@ void BackendImpl::unorc_verify_init( OSL_ASSERT( sep > 0 ); m_commonRDB_RO = line.copy( start, sep - start ); } - + // native rc: if (create_ucb_content( &ucb_content, @@ -848,7 +848,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) return; if (!m_unorc_inited || !m_unorc_modified) return; - + ::rtl::OStringBuffer buf; buf.append(RTL_CONSTASCII_STRINGPARAM("ORIGIN=")); @@ -856,7 +856,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) ::rtl::OString osOrigin = ::rtl::OUStringToOString(sOrigin, RTL_TEXTENCODING_UTF8); buf.append(osOrigin); buf.append(LF); - + if (! m_jar_typelibs.empty()) { t_stringlist::const_iterator iPos( m_jar_typelibs.begin() ); @@ -892,7 +892,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) } // If we duplicated the common or native rdb then we must use those urls - //otherwise we use those of the original files. That is, m_commonRDB_RO and + //otherwise we use those of the original files. That is, m_commonRDB_RO and //m_nativeRDB_RO; OUString sCommonRDB(m_commonRDB.getLength() > 0 ? m_commonRDB : m_commonRDB_RO); OUString sNativeRDB(m_nativeRDB.getLength() > 0 ? m_nativeRDB : m_nativeRDB_RO); @@ -907,7 +907,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) buf.append( RTL_CONSTASCII_STRINGPARAM( " ${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") ); buf.append(LF); - + // write native rc: ::rtl::OStringBuffer buf2; buf2.append(RTL_CONSTASCII_STRINGPARAM("ORIGIN=")); @@ -917,7 +917,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) buf2.append( ::rtl::OUStringToOString( sNativeRDB, RTL_TEXTENCODING_ASCII_US ) ); buf2.append(LF); - + const Reference<io::XInputStream> xData( ::xmlscript::createInputStream( ::rtl::ByteSequence( @@ -929,7 +929,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) ucb_content.writeStream( xData, true /* replace existing */ ); } } - + // write unorc: const Reference<io::XInputStream> xData( ::xmlscript::createInputStream( @@ -939,7 +939,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) ::ucbhelper::Content ucb_content( makeURL( getCachePath(), OUSTR("unorc") ), xCmdEnv ); ucb_content.writeStream( xData, true /* replace existing */ ); - + m_unorc_modified = false; } @@ -980,7 +980,7 @@ bool BackendImpl::removeFromUnoRc( //______________________________________________________________________________ bool BackendImpl::hasInUnoRc( bool jarFile, OUString const & url_ ) -{ +{ const OUString rcterm( dp_misc::makeRcTerm(url_) ); const ::osl::MutexGuard guard( getMutex() ); t_stringlist const & rSet = getTypelibs(jarFile); @@ -1040,7 +1040,7 @@ Reference<XComponentContext> raise_uno_process( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(";urp;uno.ComponentContext") ); const OUString connectStr( buf.makeStringAndClear() ); - + // raise core UNO process to register/run a component, // javavm service uses unorc next to executable to retrieve deployed // jar typelibs @@ -1058,7 +1058,7 @@ Reference<XComponentContext> raise_uno_process( //now add the bootstrap variables which were supplied on the command line ::std::vector<OUString> bootvars = getCmdBootstrapVariables(); args.insert(args.end(), bootvars.begin(), bootvars.end()); - + oslProcess hProcess = raiseProcess( url, comphelper::containerToSequence(args) ); try { @@ -1087,18 +1087,18 @@ BackendImpl::ComponentPackageImpl::getComponentInfo( m_loader, xContext ), UNO_QUERY ); if (! xLoader.is()) return Reference<loader::XImplementationLoader>(); - + // HACK: highly dependent on stoc/source/servicemanager // and stoc/source/implreg implementation which rely on the same // services.rdb format! - + const Reference<registry::XSimpleRegistry> xMemReg( xContext->getServiceManager()->createInstanceWithContext( OUSTR("com.sun.star.registry.SimpleRegistry"), xContext ), UNO_QUERY_THROW ); xMemReg->open( OUString() /* in mem */, false, true ); xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), getURL() ); - + const Sequence< Reference<registry::XRegistryKey> > keys( xMemReg->getRootKey()->openKeys() ); for ( sal_Int32 pos = keys.getLength(); pos--; ) @@ -1106,7 +1106,7 @@ BackendImpl::ComponentPackageImpl::getComponentInfo( Reference<registry::XRegistryKey> const & xImplKey = keys[ pos ]; const OUString implName( xImplKey->getKeyName().copy( 1 /*leading slash*/ ) ); - + // check for singletons: const Reference<registry::XRegistryKey> xSingletonKey( xImplKey->openKey( OUSTR("UNO/SINGLETONS") ) ); @@ -1131,7 +1131,7 @@ BackendImpl::ComponentPackageImpl::getComponentInfo( pImplNames->push_back( implName ); } } - + return xLoader; } @@ -1162,12 +1162,12 @@ BackendImpl::ComponentPackageImpl::isRegistered_( sal_Int32 pos = implNames.getLength(); for ( ; pos--; ) { - checkAborted( abortChannel ); + checkAborted( abortChannel ); const OUString key( pImplNames[ pos ] + OUSTR("/UNO/LOCATION") ); const Reference<registry::XRegistryKey> xKey( xRootKey->openKey(key) ); - if (xKey.is() && xKey->isValid()) + if (xKey.is() && xKey->isValid()) { const OUString location( xKey->getAsciiValue() ); if (location.equalsIgnoreAsciiCase( getURL() )) @@ -1179,7 +1179,7 @@ BackendImpl::ComponentPackageImpl::isRegistered_( //try to match only the file name OUString thisUrl(getURL()); OUString thisFileName(thisUrl.copy(thisUrl.lastIndexOf('/'))); - + OUString locationFileName(location.copy(location.lastIndexOf('/'))); if (locationFileName.equalsIgnoreAsciiCase(thisFileName)) bAmbiguousComponentName = true; @@ -1195,13 +1195,13 @@ BackendImpl::ComponentPackageImpl::isRegistered_( //Different extensions can use the same service implementations. Then the extensions //which was installed last will overwrite the one from the other extension. That is - //the registry will contain the path (the location) of the library or jar of the + //the registry will contain the path (the location) of the library or jar of the //second extension. In this case isRegistered called for the lib of the first extension - //would return "not registered". That would mean that during uninstallation + //would return "not registered". That would mean that during uninstallation //XPackage::registerPackage is not called, because it just was not registered. This is, - //however, necessary for jar files. Registering and unregistering update + //however, necessary for jar files. Registering and unregistering update //uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc - //Therefore, we will return always "is ambiguous" if the path of this component cannot + //Therefore, we will return always "is ambiguous" if the path of this component cannot //be found in the registry and if there is another path and both have the same file name (but //the rest of the path is different). //If the caller cannot precisely determine that this package was registered, then it must @@ -1222,9 +1222,9 @@ void BackendImpl::ComponentPackageImpl::processPackage_( ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) { - BackendImpl * that = getMyBackend(); - - + BackendImpl * that = getMyBackend(); + + const bool java = m_loader.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2") ); const OUString url( getURL() ); @@ -1238,13 +1238,13 @@ void BackendImpl::ComponentPackageImpl::processPackage_( ComponentBackendDb::Data data; data.javaTypeLibrary = isJavaTypelib; if (doRegisterPackage) - { + { Reference <uno::XComponentContext> context(that->getComponentContext()); if (! startup) { context.set( that->getObject( url ), UNO_QUERY ); - + if (! context.is()) { context.set( that->insertObject( url, raise_uno_process( @@ -1253,7 +1253,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( UNO_QUERY_THROW ); } } - + const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() ); const Reference<registry::XImplementationRegistration> xImplReg( context->getServiceManager()->createInstanceWithContext( @@ -1284,7 +1284,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( for ( t_stringlist::const_iterator iPos( implNames.begin() ); iPos != implNames.end(); ++iPos ) { - checkAborted( abortChannel ); + checkAborted( abortChannel ); OUString const & implName = *iPos; // activate factory: const Reference<XInterface> xFactory( @@ -1299,7 +1299,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( OSL_ENSURE( 0, "### factory already registered?" ); } } - + if (! singletons.empty()) { // singletons live insertion: @@ -1340,7 +1340,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( } } } - + m_registered = REG_REGISTERED; getMyBackend()->addDataToDb(url, data); } @@ -1357,7 +1357,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( xContext = that->getComponentContext(); else bRemoteContext = true; - + t_stringlist implNames; t_stringpairvec singletons; if (m_bRemoved) @@ -1385,7 +1385,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( catch (container::NoSuchElementException &) { } } - + if (! singletons.empty()) { // singletons live removal: @@ -1424,20 +1424,20 @@ void BackendImpl::ComponentPackageImpl::processPackage_( } } } - + const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() ); const Reference<registry::XImplementationRegistration> xImplReg( xContext->getServiceManager()->createInstanceWithContext( OUSTR("com.sun.star.registry.ImplementationRegistration"), xContext ), UNO_QUERY_THROW ); xImplReg->revokeImplementation( url, xServicesRDB ); - + if (isJavaTypelib) that->removeFromUnoRc( java, url, xCmdEnv ); - + if (bRemoteContext) that->releaseObject( url ); - + m_registered = REG_NOT_REGISTERED; getMyBackend()->deleteDataFromDb(url); } @@ -1460,12 +1460,12 @@ BackendImpl * BackendImpl::TypelibraryPackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<TypelibraryPackageImpl *>(this))); } return pBackend; @@ -1493,11 +1493,11 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_( ::rtl::Reference<AbortChannel> const &, Reference<XCommandEnvironment> const & xCmdEnv ) { - BackendImpl * that = getMyBackend(); + BackendImpl * that = getMyBackend(); const OUString url( getURL() ); if (doRegisterPackage) - { + { // live insertion: if (m_jarFile) { // xxx todo add to classpath at runtime: ??? @@ -1546,13 +1546,13 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_( xSet->insert( Any(m_xTDprov) ); } } - + that->addToUnoRc( m_jarFile, url, xCmdEnv ); } else // revokePackage() - { + { that->removeFromUnoRc( m_jarFile, url, xCmdEnv ); - + // revoking types at runtime, possible, sensible? if (!m_xTDprov.is()) m_xTDprov.set( that->getObject( url ), UNO_QUERY ); @@ -1564,7 +1564,7 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_( "reflection.theTypeDescriptionManager") ), UNO_QUERY_THROW ); xSet->remove( Any(m_xTDprov) ); - + that->releaseObject( url ); m_xTDprov.clear(); } diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc index 53085a48d185..5e9993ab1222 100644 --- a/desktop/source/deployment/registry/component/dp_component.hrc +++ b/desktop/source/deployment/registry/component/dp_component.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src index 36f2a1cc4a5c..52dfa568ebe3 100644 --- a/desktop/source/deployment/registry/component/dp_component.src +++ b/desktop/source/deployment/registry/component/dp_component.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 5d89c2deca24..2688a277f947 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,9 +76,9 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend class PackageImpl : public ::dp_registry::backend::Package { BackendImpl * getMyBackend() const ; - + const bool m_isSchema; - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -90,7 +90,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + public: inline PackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -103,41 +103,41 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend {} }; friend class PackageImpl; - + t_stringlist m_xcs_files; t_stringlist m_xcu_files; t_stringlist & getFiles( bool xcs ) { return xcs ? m_xcs_files : m_xcu_files; } - + bool m_configmgrini_inited; bool m_configmgrini_modified; std::auto_ptr<ConfigurationBackendDb> m_backendDb; - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, - OUString const & identifier, + OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ); - + ::std::auto_ptr<PersistentMap> m_registeredPackages; // for backwards compatibility virtual void SAL_CALL disposing(); - + const Reference<deployment::XPackageTypeInfo> m_xConfDataTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xConfSchemaTypeInfo; Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos; - + void configmgrini_verify_init( Reference<XCommandEnvironment> const & xCmdEnv ); void configmgrini_flush( Reference<XCommandEnvironment> const & xCmdEnv ); - + bool addToConfigmgrIni( bool isSchema, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); bool removeFromConfigmgrIni( bool isSchema, OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv ); - + void addDataToDb(OUString const & url, ConfigurationBackendDb::Data const & data); ::boost::optional<ConfigurationBackendDb::Data> readDataFromDb(OUString const & url); OUString deleteDataFromDb(OUString const & url); @@ -146,7 +146,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -159,7 +159,7 @@ void BackendImpl::disposing() { try { configmgrini_flush( Reference<XCommandEnvironment>() ); - + PackageRegistryBackend::disposing(); } catch (RuntimeException &) { @@ -196,9 +196,9 @@ BackendImpl::BackendImpl( { m_typeInfos[ 0 ] = m_xConfDataTypeInfo; m_typeInfos[ 1 ] = m_xConfSchemaTypeInfo; - + const Reference<XCommandEnvironment> xCmdEnv; - + if (transientMode()) { //TODO @@ -221,7 +221,7 @@ BackendImpl::BackendImpl( m_registeredPackages.reset( new PersistentMap( makeURL( getCachePath(), OUSTR("registered_packages.db") ), - false ) ); + false ) ); } } @@ -305,7 +305,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) @@ -409,7 +409,7 @@ void BackendImpl::configmgrini_flush( return; if (!m_configmgrini_inited || !m_configmgrini_modified) return; - + ::rtl::OStringBuffer buf; if (! m_xcs_files.empty()) { @@ -443,7 +443,7 @@ void BackendImpl::configmgrini_flush( } buf.append(LF); } - + // write configmgr.ini: const Reference<io::XInputStream> xData( ::xmlscript::createInputStream( @@ -453,7 +453,7 @@ void BackendImpl::configmgrini_flush( ::ucbhelper::Content ucb_content( makeURL( getCachePath(), OUSTR("configmgr.ini") ), xCmdEnv ); ucb_content.writeStream( xData, true /* replace existing */ ); - + m_configmgrini_modified = false; } @@ -514,12 +514,12 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; @@ -541,7 +541,7 @@ BackendImpl::PackageImpl::isRegistered_( //fallback for user extension registered in berkeley DB bReg = that->m_registeredPackages->has( rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 )); - + return beans::Optional< beans::Ambiguous<sal_Bool> >( true, beans::Ambiguous<sal_Bool>( bReg, false ) ); } @@ -602,7 +602,7 @@ OUString replaceOrigin( break; index = nBytes; } - + if ((write_pos + index) > filtered.getLength()) filtered.realloc( (filtered.getLength() + index) * 2 ); rtl_copyMemory( filtered.getArray() + write_pos, pBytes, index ); @@ -611,7 +611,7 @@ OUString replaceOrigin( nBytes -= index; if (nBytes == 0) break; - + // consume %: ++pBytes; --nBytes; @@ -675,7 +675,7 @@ void BackendImpl::PackageImpl::processPackage_( { BackendImpl * that = getMyBackend(); OUString url( getURL() ); - + if (doRegisterPackage) { ConfigurationBackendDb::Data data; @@ -767,7 +767,7 @@ void BackendImpl::PackageImpl::processPackage_( expandUnoRcUrl(url)); } } -} +} } // anon namespace diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc index 01e1905228b3..479f50e20baf 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc +++ b/desktop/source/deployment/registry/configuration/dp_configuration.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src index 7ff749b18459..3570eaf28fad 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.src +++ b/desktop/source/deployment/registry/configuration/dp_configuration.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index 58a2d7d30177..a0cafe03319c 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 7d4d1809ce72..7cb02edf55cc 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ namespace configuration { They will be removed when they are revoked. */ class ConfigurationBackendDb: public dp_registry::backend::BackendDb -{ +{ protected: virtual ::rtl::OUString getDbNSName(); - + virtual ::rtl::OUString getNSPrefix(); virtual ::rtl::OUString getRootElementName(); diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 09a6a04651bf..957c55ef936b 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_desktop.hxx" - + #include "dp_backend.h" #include "dp_ucb.h" #include "rtl/uri.hxx" @@ -91,7 +91,7 @@ PackageRegistryBackend::PackageRegistryBackend( m_cachePath = *cachePath; if (readOnly) m_readOnly = *readOnly; - + if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") )) m_eContext = CONTEXT_USER; else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") )) @@ -126,7 +126,7 @@ void PackageRegistryBackend::disposing() i->second->removeEventListener(this); m_bound.clear(); m_xComponentContext.clear(); - WeakComponentImplHelperBase::disposing(); + WeakComponentImplHelperBase::disposing(); } catch (RuntimeException &) { throw; @@ -153,10 +153,10 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( check(); t_string2ref::const_iterator const iFind( m_bound.find( url ) ); - if (iFind != m_bound.end()) + if (iFind != m_bound.end()) { Reference<deployment::XPackage> xPackage( iFind->second ); - if (xPackage.is()) + if (xPackage.is()) { if (mediaType.getLength() && mediaType != xPackage->getPackageType()->getMediaType()) @@ -167,15 +167,15 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( throw deployment::InvalidRemovedParameterException( OUSTR("XPackageRegistry::bindPackage: bRemoved parameter does not match"), static_cast<OWeakObject*>(this), xPackage->isRemoved(), xPackage); - return xPackage; + return xPackage; } } guard.clear(); - + Reference<deployment::XPackage> xNewPackage; try { - xNewPackage = bindPackage_( url, mediaType, bRemoved, + xNewPackage = bindPackage_( url, mediaType, bRemoved, identifier, xCmdEnv ); } catch (RuntimeException &) { @@ -196,7 +196,7 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( OUSTR("Error binding package: ") + url, static_cast<OWeakObject *>(this), exc ); } - + guard.reset(); ::std::pair< t_string2ref::iterator, bool > insertion( @@ -227,7 +227,7 @@ OUString PackageRegistryBackend::createFolder( //make sure the folder exist ucbhelper::Content dataContent; ::dp_misc::create_folder(&dataContent, sDataFolder, xCmdEnv); - + OUString sDataFolderURL = dp_misc::expandUnoRcUrl(sDataFolder); OUString tempEntry; @@ -266,7 +266,7 @@ void PackageRegistryBackend::deleteUnusedFolders( try { const OUString sDataFolder = makeURL(getCachePath(), relUrl); - ::ucbhelper::Content tempFolder( + ::ucbhelper::Content tempFolder( sDataFolder, Reference<ucb::XCommandEnvironment>()); Reference<sdbc::XResultSet> xResultSet( tempFolder.createCursor( @@ -435,14 +435,14 @@ sal_Bool Package::isBundle() throw (RuntimeException) } //______________________________________________________________________________ -::sal_Int32 Package::checkPrerequisites( - const css::uno::Reference< css::task::XAbortChannel >&, +::sal_Int32 Package::checkPrerequisites( + const css::uno::Reference< css::task::XAbortChannel >&, const css::uno::Reference< css::ucb::XCommandEnvironment >&, - sal_Bool) + sal_Bool) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, + css::ucb::CommandFailedException, + css::ucb::CommandAbortedException, css::uno::RuntimeException) { if (m_bRemoved) @@ -451,11 +451,11 @@ sal_Bool Package::isBundle() throw (RuntimeException) } //______________________________________________________________________________ -::sal_Bool Package::checkDependencies( - const css::uno::Reference< css::ucb::XCommandEnvironment >& ) +::sal_Bool Package::checkDependencies( + const css::uno::Reference< css::ucb::XCommandEnvironment >& ) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, + css::ucb::CommandFailedException, css::uno::RuntimeException) { if (m_bRemoved) @@ -485,7 +485,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException) { if (m_bRemoved) return beans::Optional<OUString>(true, m_identifier); - + return beans::Optional<OUString>(); } @@ -528,7 +528,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw ( deployment::ExtensionRemovedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); return Sequence<OUString>(); } @@ -537,7 +537,7 @@ css::beans::StringPair Package::getPublisherInfo() throw ( deployment::ExtensionRemovedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); css::beans::StringPair aEmptyPair; return aEmptyPair; } @@ -547,7 +547,7 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr throw (deployment::ExtensionRemovedException, RuntimeException ) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); uno::Reference< css::graphic::XGraphic > aEmpty; return aEmpty; @@ -568,7 +568,7 @@ void Package::exportTo( CommandFailedException, CommandAbortedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); ::ucbhelper::Content destFolder( destFolderURL, xCmdEnv ); ::ucbhelper::Content sourceContent( getURL(), xCmdEnv ); @@ -641,7 +641,7 @@ void Package::processPackage_impl( { check(); bool action = false; - + try { try { ::osl::ResettableMutexGuard guard( getMutex() ); @@ -701,7 +701,7 @@ void Package::processPackage_impl( //______________________________________________________________________________ void Package::registerPackage( - sal_Bool startup, + sal_Bool startup, Reference<task::XAbortChannel> const & xAbortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) throw (deployment::DeploymentException, @@ -730,12 +730,12 @@ PackageRegistryBackend * Package::getMyBackend() const { PackageRegistryBackend * pBackend = m_myBackend.get(); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<Package *>(this))); } return pBackend; @@ -753,7 +753,7 @@ beans::Optional< OUString > Package::getRegistrationDataURL() { if (m_bRemoved) throw deployment::ExtensionRemovedException(); - return beans::Optional<OUString>(); + return beans::Optional<OUString>(); } sal_Bool Package::isRemoved() diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index a93bc0b45093..905ff6e95fd0 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ void BackendDb::save() xDataSource->setOutputStream(::xmlscript::createOutputStream(&bytes)); const Reference<css::io::XActiveDataControl> xDataControl(m_doc,css::uno::UNO_QUERY_THROW); xDataControl->start(); - + const Reference<css::io::XInputStream> xData( ::xmlscript::createInputStream(bytes)); ::ucbhelper::Content ucbDb(m_urlDb, 0); - ucbDb.writeStream(xData, true /*replace existing*/); + ucbDb.writeStream(xData, true /*replace existing*/); } css::uno::Reference<css::xml::dom::XDocument> BackendDb::getDocument() @@ -110,7 +110,7 @@ css::uno::Reference<css::xml::dom::XDocument> BackendDb::getDocument() throw css::uno::RuntimeException( OUSTR("Extension manager could not access database file:" ) + m_urlDb, 0); - + if (!m_doc.is()) throw css::uno::RuntimeException( OUSTR("Extension manager could not get root node of data base file: ") @@ -206,7 +206,7 @@ Reference<css::xml::dom::XNode> BackendDb::getKeyElement( const Reference<css::xml::dom::XDocument> doc = getDocument(); const Reference<css::xml::dom::XNode> root = doc->getFirstChild(); const Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI(); - return xpathApi->selectSingleNode(root, sExpression.makeStringAndClear()); + return xpathApi->selectSingleNode(root, sExpression.makeStringAndClear()); } catch(css::uno::Exception &) { @@ -246,14 +246,14 @@ void BackendDb::writeVectorOfPair( { const Reference<css::xml::dom::XElement> pairNode( doc->createElementNS(sNameSpace, sPrefix + sPairTagName)); - + vectorNode->appendChild( Reference<css::xml::dom::XNode>( pairNode, css::uno::UNO_QUERY_THROW)); - + const Reference<css::xml::dom::XElement> firstNode( doc->createElementNS(sNameSpace, sPrefix + sFirstTagName)); - + pairNode->appendChild( Reference<css::xml::dom::XNode>( firstNode, css::uno::UNO_QUERY_THROW)); @@ -271,7 +271,7 @@ void BackendDb::writeVectorOfPair( pairNode->appendChild( Reference<css::xml::dom::XNode>( secondNode, css::uno::UNO_QUERY_THROW)); - + const Reference<css::xml::dom::XText> secondTextNode( doc->createTextNode( i->second)); @@ -286,7 +286,7 @@ void BackendDb::writeVectorOfPair( throw css::deployment::DeploymentException( OUSTR("Extension Manager: failed to write data entry in backend db: ") + m_urlDb, 0, exc); - } + } } ::std::vector< ::std::pair< OUString, OUString > > @@ -349,20 +349,20 @@ void BackendDb::writeSimpleList( const OUString sNameSpace = getDbNSName(); const OUString sPrefix(getNSPrefix() + OUSTR(":")); const Reference<css::xml::dom::XDocument> doc = getDocument(); - + const Reference<css::xml::dom::XElement> listNode( doc->createElementNS(sNameSpace, sPrefix + sListTagName)); xParent->appendChild( Reference<css::xml::dom::XNode>( listNode, css::uno::UNO_QUERY_THROW)); - + typedef ::std::list<OUString>::const_iterator ITC_ITEMS; for (ITC_ITEMS i = list.begin(); i != list.end(); i++) { const Reference<css::xml::dom::XNode> memberNode( doc->createElementNS(sNameSpace, sPrefix + sMemberTagName), css::uno::UNO_QUERY_THROW); - + listNode->appendChild(memberNode); const Reference<css::xml::dom::XNode> textNode( @@ -582,11 +582,11 @@ void RegisteredDb::addEntry(::rtl::OUString const & url) const OUString sNameSpace = getDbNSName(); const OUString sPrefix = getNSPrefix(); const OUString sEntry = getKeyElementName(); - + Reference<css::xml::dom::XDocument> doc = getDocument(); Reference<css::xml::dom::XNode> root = doc->getFirstChild(); -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 //There must not be yet an entry with the same url OUString sExpression( sPrefix + OUSTR(":") + sEntry + OUSTR("[@url = \"") + url + OUSTR("\"]")); @@ -602,7 +602,7 @@ void RegisteredDb::addEntry(::rtl::OUString const & url) Reference<css::xml::dom::XNode> helpNode( helpElement, UNO_QUERY_THROW); root->appendChild(helpNode); - + save(); } catch(css::uno::Exception &) diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index bffdaeae1924..a90f64b9cb39 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,20 +99,20 @@ class PackageRegistryImpl : private MutexHolder, public t_helper ci_string_hash, ci_string_equals > t_string2string; typedef ::std::set< Reference<deployment::XPackageRegistry> > t_registryset; - + t_string2registry m_mediaType2backend; t_string2string m_filter2mediaType; t_registryset m_ambiguousBackends; t_registryset m_allBackends; ::std::vector< Reference<deployment::XPackageTypeInfo> > m_typesInfos; - + void insertBackend( Reference<deployment::XPackageRegistry> const & xBackend ); - + protected: inline void check(); virtual void SAL_CALL disposing(); - + virtual ~PackageRegistryImpl(); PackageRegistryImpl() : t_helper( getMutex() ) {} @@ -125,7 +125,7 @@ public: // XUpdatable virtual void SAL_CALL update() throw (RuntimeException); - + // XPackageRegistry virtual Reference<deployment::XPackage> SAL_CALL bindPackage( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, @@ -161,7 +161,7 @@ void PackageRegistryImpl::disposing() m_mediaType2backend = t_string2registry(); m_ambiguousBackends = t_registryset(); m_allBackends = t_registryset(); - + t_helper::disposing(); } @@ -192,7 +192,7 @@ void PackageRegistryImpl::insertBackend( m_allBackends.insert( xBackend ); typedef ::std::hash_set<OUString, ::rtl::OUStringHash> t_stringset; t_stringset ambiguousFilters; - + const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes( xBackend->getSupportedPackageTypes() ); for ( sal_Int32 pos = 0; pos < packageTypes.getLength(); ++pos ) @@ -200,13 +200,13 @@ void PackageRegistryImpl::insertBackend( Reference<deployment::XPackageTypeInfo> const & xPackageType = packageTypes[ pos ]; m_typesInfos.push_back( xPackageType ); - + const OUString mediaType( normalizeMediaType( xPackageType->getMediaType() ) ); ::std::pair<t_string2registry::iterator, bool> mb_insertion( m_mediaType2backend.insert( t_string2registry::value_type( mediaType, xBackend ) ) ); - if (mb_insertion.second) + if (mb_insertion.second) { // add parameterless media-type, too: sal_Int32 semi = mediaType.indexOf( ';' ); @@ -285,7 +285,7 @@ void PackageRegistryImpl::insertBackend( } #endif } - + // cut out ambiguous filters: t_stringset::const_iterator iPos( ambiguousFilters.begin() ); const t_stringset::const_iterator iEnd( ambiguousFilters.end() ); @@ -302,7 +302,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( { PackageRegistryImpl * that = new PackageRegistryImpl; Reference<deployment::XPackageRegistry> xRet(that); - + // auto-detect all registered package registries: Reference<container::XEnumeration> xEnum( Reference<container::XContentEnumerationAccess>( @@ -334,7 +334,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( create_folder( 0, registryCachePath, Reference<XCommandEnvironment>() ); } - + Reference<deployment::XPackageRegistry> xBackend; Reference<lang::XSingleComponentFactory> xFac( element, UNO_QUERY ); if (xFac.is()) { @@ -356,14 +356,14 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( element, UNO_QUERY_THROW )->getImplementationName(), static_cast<OWeakObject *>(that) ); } - + that->insertBackend( xBackend ); } } - + // Insert bundle back-end. // Always register as last, because we want to add extensions also as folders - // and as a default we accept every folder, which was not recognized by the other + // and as a default we accept every folder, which was not recognized by the other // backends. Reference<deployment::XPackageRegistry> extensionBackend = ::dp_registry::backend::bundle::create( @@ -382,12 +382,12 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ) ); create_folder( 0, registryCachePath, Reference<XCommandEnvironment>()); - - + + #if OSL_DEBUG_LEVEL > 1 // dump tables: { - t_registryset allBackends; + t_registryset allBackends; dp_misc::TRACE("> [dp_registry.cxx] media-type detection:\n\n" ); for ( t_string2string::const_iterator iPos( that->m_filter2mediaType.begin() ); @@ -441,7 +441,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( OSL_ASSERT( allBackends == that->m_allBackends ); } #endif - + return xRet; } @@ -502,7 +502,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( for ( ; iPos != iEnd; ++iPos ) { try { - return (*iPos)->bindPackage( url, mediaType, bRemoved, + return (*iPos)->bindPackage( url, mediaType, bRemoved, identifier, xCmdEnv ); } catch (lang::IllegalArgumentException &) { @@ -532,7 +532,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( getResourceString(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - return iFind->second->bindPackage( url, mediaType, bRemoved, + return iFind->second->bindPackage( url, mediaType, bRemoved, identifier, xCmdEnv ); } } diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src index 68a52621741f..1658e4bdcca2 100644 --- a/desktop/source/deployment/registry/dp_registry.src +++ b/desktop/source/deployment/registry/dp_registry.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ String RID_STR_REVOKING_PACKAGE }; String RID_STR_CANNOT_DETECT_MEDIA_TYPE -{ +{ Text [ en-US ] = "Cannot detect media-type: "; }; diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index b120bd9a4465..eb03c2246417 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend class ExecutablePackageImpl : public ::dp_registry::backend::Package { BackendImpl * getMyBackend() const; - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -83,10 +83,10 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend {} }; friend class ExecutablePackageImpl; - + typedef ::std::hash_map< OUString, Reference<XInterface>, ::rtl::OUStringHash > t_string2object; - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, @@ -101,7 +101,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -126,7 +126,7 @@ BackendImpl::BackendImpl( OUString dbFile = makeURL(getCachePath(), OUSTR("backenddb.xml")); m_backendDb.reset( new ExecutableBackendDb(getComponentContext(), dbFile)); - } + } } void BackendImpl::addDataToDb(OUString const & url) @@ -185,7 +185,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.executable")) { return new BackendImpl::ExecutablePackageImpl( - this, url, name, m_xExecutableTypeInfo, bRemoved, + this, url, name, m_xExecutableTypeInfo, bRemoved, identifier); } } @@ -201,12 +201,12 @@ BackendImpl * BackendImpl::ExecutablePackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<ExecutablePackageImpl *>(this))); } return pBackend; @@ -250,7 +250,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_( attributes |= (osl_File_Attribute_OwnExe | osl_File_Attribute_GrpExe | osl_File_Attribute_OthExe); else if (!getMyBackend()->m_context.equals(OUSTR("bundled"))) - //Bundled extension are required to be in the properly + //Bundled extension are required to be in the properly //installed. That is an executable must have the right flags OSL_ASSERT(0); @@ -268,7 +268,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_( //We currently cannot check if this XPackage represents a content of a particular extension //But we can check if we are within $UNO_USER_PACKAGES_CACHE etc. -//Done for security reasons. For example an extension manifest could contain a path to +//Done for security reasons. For example an extension manifest could contain a path to //an executable outside the extension. bool BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension() { @@ -278,7 +278,7 @@ bool BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension() sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_USER_PACKAGES_CACHE")); else if (getMyBackend()->m_context.equals(OUSTR("shared"))) sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_SHARED_PACKAGES_CACHE")); - else if (getMyBackend()->m_context.equals(OUSTR("bundled"))) + else if (getMyBackend()->m_context.equals(OUSTR("bundled"))) sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$BUNDLED_EXTENSIONS")); else OSL_ASSERT(0); diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx index 0c65a9bf4d2c..56a964597481 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index 1a5828015260..425531911933 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,14 +47,14 @@ namespace executable { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. The format looks like this: - + <?xml version="1.0"?> */ class ExecutableBackendDb: public dp_registry::backend::RegisteredDb -{ +{ protected: virtual ::rtl::OUString getDbNSName(); - + virtual ::rtl::OUString getNSPrefix(); virtual ::rtl::OUString getRootElementName(); diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 38aa08674baf..053929c4b16c 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include "svl/inettype.hxx" #include "unotools/pathoptions.hxx" -#include <l10ntools/compilehelp.hxx> +#include <l10ntools/compilehelp.hxx> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> @@ -68,7 +68,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend BackendImpl * getMyBackend() const; // HelpBackendDb::Data m_dbData; - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -112,15 +112,15 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend Reference< ucb::XSimpleFileAccess > getFileAccess( void ); Reference< ucb::XSimpleFileAccess > m_xSFA; - + const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo; Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos; std::auto_ptr<HelpBackendDb> m_backendDb; - + public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -175,7 +175,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( throw lang::IllegalArgumentException( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType_, type, subType, ¶ms )) @@ -194,7 +194,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( "vnd.sun.star.help")) { return new PackageImpl( - this, url, name, m_xHelpTypeInfo, bRemoved, + this, url, name, m_xHelpTypeInfo, bRemoved, identifier); } } @@ -238,7 +238,7 @@ BackendImpl::PackageImpl::PackageImpl( { // if (bRemoved) // { -// ::boost::optional<HelpBackendDb::Data> opt = +// ::boost::optional<HelpBackendDb::Data> opt = // getMyBackend()->readDataFromDb(url); // if (opt) // m_dbData = *opt; @@ -250,23 +250,23 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; } -bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() +bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() { bool bCompiled = true; rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl(getURL()); - + ::osl::Directory helpFolder(aExpandedHelpURL); if ( helpFolder.open() == ::osl::File::E_None) { @@ -284,7 +284,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() { if (stat.getFileType() != ::osl::FileStatus::Directory) continue; - + //look if there is the folder help.idxl in the language folder OUString compUrl(stat.getFileURL() + OUSTR("/help.idxl")); ::osl::Directory compiledFolder(compUrl); @@ -307,7 +307,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() { //Error OSL_ASSERT(0); - bCompiled = false; + bCompiled = false; } } return bCompiled; @@ -355,11 +355,11 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL() ::boost::optional<HelpBackendDb::Data> data = getMyBackend()->readDataFromDb(getURL()); - + if (data) return beans::Optional<OUString>(true, data->dataUrl); - return beans::Optional<OUString>(true, OUString()); + return beans::Optional<OUString>(true, OUString()); } @@ -406,7 +406,7 @@ void BackendImpl::implProcessHelp { try { - xInvocation = Reference< script::XInvocation >( + xInvocation = Reference< script::XInvocation >( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY ); } @@ -441,12 +441,12 @@ void BackendImpl::implProcessHelp ::dp_misc::create_folder( &langFolderContent, langFolderDest, xCmdEnv); - + rtl::OUString aJarFile( makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr + OUSTR(".jar"))); aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile); - + rtl::OUString aEncodedJarFilePath = rtl::Uri::encode( aJarFile, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, @@ -487,7 +487,7 @@ void BackendImpl::implProcessHelp rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() ); rtl::OUString aOfficeHelpPathFileURL; - ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); + ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); HelpProcessingErrorInfo aErrorInfo; bool bSuccess = compileExtensionHelp( @@ -530,8 +530,8 @@ void BackendImpl::implProcessHelp switch( aErrorInfo.m_eErrorClass ) { case HELPPROCESSING_GENERAL_ERROR: - case HELPPROCESSING_INTERNAL_ERROR: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; - case HELPPROCESSING_XMLPARSING_ERROR: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break; + case HELPPROCESSING_INTERNAL_ERROR: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; + case HELPPROCESSING_XMLPARSING_ERROR: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break; default: ; }; @@ -627,7 +627,7 @@ Reference< ucb::XSimpleFileAccess > BackendImpl::getFileAccess( void ) Reference<XComponentContext> const & xContext = getComponentContext(); if( xContext.is() ) { - m_xSFA = Reference< ucb::XSimpleFileAccess >( + m_xSFA = Reference< ucb::XSimpleFileAccess >( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), xContext ), UNO_QUERY ); @@ -635,7 +635,7 @@ Reference< ucb::XSimpleFileAccess > BackendImpl::getFileAccess( void ) if( !m_xSFA.is() ) { throw RuntimeException( - ::rtl::OUString::createFromAscii( + ::rtl::OUString::createFromAscii( "dp_registry::backend::help::BackendImpl::getFileAccess(), " "could not instatiate SimpleFileAccess." ), Reference< XInterface >() ); diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc index c1e10547ccdd..451144813f25 100644 --- a/desktop/source/deployment/registry/help/dp_help.hrc +++ b/desktop/source/deployment/registry/help/dp_help.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,10 +30,10 @@ #include "deployment.hrc" -#define RID_STR_HELP (RID_DEPLOYMENT_HELP_START+2) +#define RID_STR_HELP (RID_DEPLOYMENT_HELP_START+2) -#define RID_STR_HELPPROCESSING_GENERAL_ERROR (RID_DEPLOYMENT_HELP_START+3) -#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR (RID_DEPLOYMENT_HELP_START+4) +#define RID_STR_HELPPROCESSING_GENERAL_ERROR (RID_DEPLOYMENT_HELP_START+3) +#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR (RID_DEPLOYMENT_HELP_START+4) #endif diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src index 6b6a3f9a6508..6cb9b023e60d 100644 --- a/desktop/source/deployment/registry/help/dp_help.src +++ b/desktop/source/deployment/registry/help/dp_help.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx index 2f3a566e6151..92ce961de6d0 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 71001c9e7d92..4a2eb8ec5922 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ namespace help { They will be removed when they are revoked. */ class HelpBackendDb: public dp_registry::backend::BackendDb -{ +{ protected: virtual ::rtl::OUString getDbNSName(); - + virtual ::rtl::OUString getNSPrefix(); virtual ::rtl::OUString getRootElementName(); diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index afadfc6cf5fd..53de2ef1da24 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,13 +65,13 @@ typedef ::cppu::WeakComponentImplHelper1< //============================================================================== class Package : protected ::dp_misc::MutexHolder, public t_PackageBase { - PackageRegistryBackend * getMyBackend() const; + PackageRegistryBackend * getMyBackend() const; void processPackage_impl( bool registerPackage, bool startup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); - + protected: ::rtl::Reference<PackageRegistryBackend> m_myBackend; const ::rtl::OUString m_url; @@ -81,14 +81,14 @@ protected: const bool m_bRemoved; //Only set if m_bRemoved = true; const ::rtl::OUString m_identifier; - + void check() const; void fireModified(); virtual void SAL_CALL disposing(); - + void checkAborted( ::rtl::Reference< ::dp_misc::AbortChannel > const & abortChannel ); - + // @@@ to be implemented by specific backend: virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> > isRegistered_( @@ -103,7 +103,7 @@ protected: ::rtl::Reference< ::dp_misc::AbortChannel > const & abortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) = 0; - + virtual ~Package(); Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend, ::rtl::OUString const & url, @@ -113,9 +113,9 @@ protected: xPackageType, bool bRemoved, ::rtl::OUString const & identifier); - + public: - + class TypeInfo : public ::cppu::WeakImplHelper1<css::deployment::XPackageTypeInfo> { @@ -148,7 +148,7 @@ public: sal_Bool smallIcon ) throw (css::uno::RuntimeException); }; - + // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); virtual void SAL_CALL addEventListener( @@ -157,7 +157,7 @@ public: virtual void SAL_CALL removeEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) throw (css::uno::RuntimeException); - + // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) @@ -165,7 +165,7 @@ public: virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) throw (css::uno::RuntimeException); - + // XPackage virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL createAbortChannel() throw (css::uno::RuntimeException); @@ -178,21 +178,21 @@ public: css::ucb::CommandAbortedException, css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL checkPrerequisites( - const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, + virtual ::sal_Int32 SAL_CALL checkPrerequisites( + const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv, - sal_Bool noLicenseChecking) + sal_Bool noLicenseChecking) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, + css::ucb::CommandFailedException, + css::ucb::CommandAbortedException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL checkDependencies( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) + virtual ::sal_Bool SAL_CALL checkDependencies( + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, + css::ucb::CommandFailedException, css::uno::RuntimeException); virtual void SAL_CALL registerPackage( @@ -288,7 +288,7 @@ class PackageRegistryBackend ::rtl::OUString, css::uno::Reference<css::deployment::XPackage>, ::rtl::OUStringHash > t_string2ref; t_string2ref m_bound; - + protected: ::rtl::OUString m_cachePath; css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; @@ -306,17 +306,17 @@ protected: StrCannotDetectMediaType, RID_STR_CANNOT_DETECT_MEDIA_TYPE> {}; struct StrUnsupportedMediaType : public ::dp_misc::StaticResourceString< StrUnsupportedMediaType, RID_STR_UNSUPPORTED_MEDIA_TYPE> {}; - + // @@@ to be implemented by specific backend: virtual css::uno::Reference<css::deployment::XPackage> bindPackage_( ::rtl::OUString const & url, ::rtl::OUString const & mediaType, sal_Bool bRemoved, ::rtl::OUString const & identifier, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) = 0; - + void check(); virtual void SAL_CALL disposing(); - + virtual ~PackageRegistryBackend(); PackageRegistryBackend( css::uno::Sequence<css::uno::Any> const & args, @@ -342,26 +342,26 @@ protected: */ static void deleteTempFolder( ::rtl::OUString const & folderUrl); - + public: struct StrRegisteringPackage : public ::dp_misc::StaticResourceString< StrRegisteringPackage, RID_STR_REGISTERING_PACKAGE> {}; struct StrRevokingPackage : public ::dp_misc::StaticResourceString< StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {}; - + inline css::uno::Reference<css::uno::XComponentContext> const & getComponentContext() const { return m_xComponentContext; } - + inline ::rtl::OUString const & getCachePath() const { return m_cachePath; } inline bool transientMode() const { return m_cachePath.getLength() == 0; } inline ::rtl::OUString getContext() const {return m_context; } - + // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) throw (css::uno::RuntimeException); - + // XPackageRegistry virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage( ::rtl::OUString const & url, ::rtl::OUString const & mediaType, diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 5e9b6c0cf703..11dff5a510d3 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,13 +54,13 @@ namespace backend { class BackendDb { private: - + css::uno::Reference<css::xml::dom::XDocument> m_doc; css::uno::Reference<css::xml::xpath::XXPathAPI> m_xpathApi; BackendDb(BackendDb const &); BackendDb & operator = (BackendDb const &); - + protected: const css::uno::Reference<css::uno::XComponentContext> m_xContext; ::rtl::OUString m_urlDb; @@ -79,7 +79,7 @@ protected: css::uno::Reference<css::xml::dom::XNode> getKeyElement( ::rtl::OUString const & url); - + void writeSimpleList( ::std::list< ::rtl::OUString> const & list, ::rtl::OUString const & sListTagName, @@ -100,11 +100,11 @@ protected: css::uno::Reference<css::xml::dom::XNode> writeKeyElement( ::rtl::OUString const & url); - + ::rtl::OUString readSimpleElement( ::rtl::OUString const & sElementName, css::uno::Reference<css::xml::dom::XNode> const & xParent); - + ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > readVectorOfPair( css::uno::Reference<css::xml::dom::XNode> const & parent, @@ -158,7 +158,7 @@ public: ::rtl::OUString const & url); virtual ~RegisteredDb() {}; - + virtual void addEntry(::rtl::OUString const & url); virtual bool getEntry(::rtl::OUString const & url); diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc index 4a3b1d0b1a4a..7f8124b78d1a 100644 --- a/desktop/source/deployment/registry/inc/dp_registry.hrc +++ b/desktop/source/deployment/registry/inc/dp_registry.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx index 0ae1004e7119..c3b0c092c0f7 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index d045dfffef91..ac57bd794e03 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ public: ::std::pair< ::rtl::OUString, ::rtl::OUString> >::const_iterator ITC_ITEMS; }; - + public: ExtensionBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, @@ -85,7 +85,7 @@ public: void addEntry(::rtl::OUString const & url, Data const & data); Data getEntry(::rtl::OUString const & url); - + }; diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 718cdbc06a03..603f52414fa1 100755 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,16 +105,16 @@ class BackendImpl : public ImplBaseT const bool m_legacyBundle; Sequence< Reference<deployment::XPackage> > m_bundle; Sequence< Reference<deployment::XPackage> > * m_pBundle; - + ExtensionBackendDb::Data m_dbData; - + Reference<deployment::XPackage> bindBundleItem( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, //that is, useing data base information OUString const & identifier, Reference<ucb::XCommandEnvironment> const & xCmdEnv, bool notifyDetectionError = true ); - + typedef ::std::vector< Reference<deployment::XPackage> > t_packagevec; void scanBundle( t_packagevec & bundle, @@ -140,10 +140,10 @@ class BackendImpl : public ImplBaseT ::sal_Bool checkLicense( Reference< ucb::XCommandEnvironment > const & xCmdEnv, - DescriptionInfoset const & description, bool bNoLicenseChecking) - throw (deployment::DeploymentException, - ucb::CommandFailedException, - ucb::CommandAbortedException, + DescriptionInfoset const & description, bool bNoLicenseChecking) + throw (deployment::DeploymentException, + ucb::CommandFailedException, + ucb::CommandAbortedException, RuntimeException); // @throws DeploymentException OUString getTextFromURL( @@ -163,11 +163,11 @@ class BackendImpl : public ImplBaseT bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ); - + virtual void SAL_CALL disposing(); - + public: PackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -177,7 +177,7 @@ class BackendImpl : public ImplBaseT bool legacyBundle, bool bRemoved, OUString const & identifier); - + // XPackage virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException); @@ -200,21 +200,21 @@ class BackendImpl : public ImplBaseT ucb::CommandAbortedException, RuntimeException); - virtual ::sal_Int32 SAL_CALL checkPrerequisites( - const Reference< task::XAbortChannel >& xAbortChannel, + virtual ::sal_Int32 SAL_CALL checkPrerequisites( + const Reference< task::XAbortChannel >& xAbortChannel, const Reference< ucb::XCommandEnvironment >& xCmdEnv, ::sal_Bool noLicenseChecking) throw (deployment::ExtensionRemovedException, - deployment::DeploymentException, - ucb::CommandFailedException, - ucb::CommandAbortedException, + deployment::DeploymentException, + ucb::CommandFailedException, + ucb::CommandAbortedException, RuntimeException); - virtual ::sal_Bool SAL_CALL checkDependencies( - const Reference< ucb::XCommandEnvironment >& xCmdEnv ) + virtual ::sal_Bool SAL_CALL checkDependencies( + const Reference< ucb::XCommandEnvironment >& xCmdEnv ) throw (deployment::DeploymentException, deployment::ExtensionRemovedException, - ucb::CommandFailedException, + ucb::CommandFailedException, RuntimeException); virtual beans::Optional<OUString> SAL_CALL getIdentifier() @@ -231,14 +231,14 @@ class BackendImpl : public ImplBaseT virtual OUString SAL_CALL getDisplayName() throw (deployment::ExtensionRemovedException, RuntimeException); - + virtual Reference< graphic::XGraphic > SAL_CALL getIcon( ::sal_Bool bHighContrast ) throw (deployment::ExtensionRemovedException, RuntimeException); - }; + }; friend class PackageImpl; - + Reference<deployment::XPackageRegistry> m_xRootRegistry; const Reference<deployment::XPackageTypeInfo> m_xBundleTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xLegacyBundleTypeInfo; @@ -249,28 +249,28 @@ class BackendImpl : public ImplBaseT void addDataToDb(OUString const & url, ExtensionBackendDb::Data const & data); ExtensionBackendDb::Data readDataFromDb(OUString const & url); void deleteDataFromDb(OUString const & url); - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, Reference<ucb::XCommandEnvironment> const & xCmdEnv ); - + virtual void SAL_CALL disposing(); - + public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext, Reference<deployment::XPackageRegistry> const & xRootRegistry ); - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); virtual sal_Bool SAL_CALL supportsService( OUString const& name ) throw (RuntimeException); virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (RuntimeException); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -406,7 +406,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) @@ -425,13 +425,13 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.package-bundle")) { return new PackageImpl( - this, url, name, m_xBundleTypeInfo, false, bRemoved, + this, url, name, m_xBundleTypeInfo, false, bRemoved, identifier); } else if (subType.EqualsIgnoreCaseAscii( "vnd.sun.star.legacy-package-bundle")) { return new PackageImpl( - this, url, name, m_xLegacyBundleTypeInfo, true, bRemoved, + this, url, name, m_xLegacyBundleTypeInfo, true, bRemoved, identifier); } } @@ -487,12 +487,12 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; @@ -505,7 +505,7 @@ void BackendImpl::PackageImpl::disposing() for ( sal_Int32 pos = 0; pos < len; ++pos ) try_dispose( p[ pos ] ); m_bundle.realloc( 0 ); - + Package::disposing(); } @@ -525,7 +525,7 @@ BackendImpl::PackageImpl::isRegistered_( //and not registered anyway, this does not matter. const Sequence< Reference<deployment::XPackage> > bundle( getBundle( abortChannel.get(), xCmdEnv ) ); - + bool reg = false; bool present = false; bool ambig = false; @@ -549,7 +549,7 @@ BackendImpl::PackageImpl::isRegistered_( { //we never come here in the first iteration if (reg != (status.Value != sal_False)) { - + ambig = true; reg = false; break; @@ -579,7 +579,7 @@ OUString BackendImpl::PackageImpl::getTextFromURL( seq.getConstArray()), seq.getLength(), RTL_TEXTENCODING_UTF8); } catch (css::uno::Exception&) - { + { Any exc( ::cppu::getCaughtException() ); throw css::deployment::DeploymentException( OUSTR("Could not read file ") + licenseUrl, 0, exc); @@ -650,13 +650,13 @@ bool BackendImpl::PackageImpl::checkDependencies( ::sal_Bool BackendImpl::PackageImpl::checkLicense( css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv, - DescriptionInfoset const & info, bool alreadyInstalled) - throw (css::deployment::DeploymentException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, + DescriptionInfoset const & info, bool alreadyInstalled) + throw (css::deployment::DeploymentException, + css::ucb::CommandFailedException, + css::ucb::CommandAbortedException, css::uno::RuntimeException) { - try + try { ::boost::optional<SimpleLicenseAttributes> simplLicAttr = info.getSimpleLicenseAttributes(); @@ -664,11 +664,11 @@ bool BackendImpl::PackageImpl::checkDependencies( return true; OUString sLic = info.getLocalizedLicenseURL(); //If we do not get a localized licence then there is an error in the description.xml - //This should be handled by using a validating parser. Therefore we assume that no + //This should be handled by using a validating parser. Therefore we assume that no //license is available. if (sLic.getLength() == 0) throw css::deployment::DeploymentException( - OUSTR("Could not obtain path to license. Possible error in description.xml"), 0, Any()); + OUSTR("Could not obtain path to license. Possible error in description.xml"), 0, Any()); OUString sHref = m_url_expanded + OUSTR("/") + sLic; OUString sLicense = getTextFromURL(xCmdEnv, sHref); ////determine who has to agree to the license @@ -682,12 +682,12 @@ bool BackendImpl::PackageImpl::checkDependencies( //and the suppress-on-update flag is not set for the new extension // alreadyInstalled | bSuppressOnUpdate | show license //---------------------------------------- - // 0 | 0 | 1 + // 0 | 0 | 1 // 0 | 1 | 1 // 1 | 0 | 1 // 1 | 1 | 0 - - if ( !(alreadyInstalled && simplLicAttr->suppressOnUpdate)) + + if ( !(alreadyInstalled && simplLicAttr->suppressOnUpdate)) { css::deployment::LicenseException licExc( OUString(), 0, getDisplayName(), sLicense, @@ -704,8 +704,8 @@ bool BackendImpl::PackageImpl::checkDependencies( else return false; //throw css::deployment::DeploymentException( - // OUSTR("Extension Manager: User declined the license."), - // static_cast<OWeakObject*>(this), + // OUSTR("Extension Manager: User declined the license."), + // static_cast<OWeakObject*>(this), // Any( css::deployment::LicenseException(OUSTR("User declined the license."), 0, m_name, sLicense))); } return true; @@ -723,14 +723,14 @@ bool BackendImpl::PackageImpl::checkDependencies( } } -::sal_Int32 BackendImpl::PackageImpl::checkPrerequisites( - const css::uno::Reference< css::task::XAbortChannel >&, +::sal_Int32 BackendImpl::PackageImpl::checkPrerequisites( + const css::uno::Reference< css::task::XAbortChannel >&, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv, sal_Bool alreadyInstalled) - throw (css::deployment::DeploymentException, + throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::ucb::CommandFailedException, - css::ucb::CommandAbortedException, + css::ucb::CommandFailedException, + css::ucb::CommandAbortedException, css::uno::RuntimeException) { if (m_bRemoved) @@ -754,9 +754,9 @@ bool BackendImpl::PackageImpl::checkDependencies( return 0; } -::sal_Bool BackendImpl::PackageImpl::checkDependencies( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) - throw (deployment::DeploymentException, +::sal_Bool BackendImpl::PackageImpl::checkDependencies( + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) + throw (deployment::DeploymentException, deployment::ExtensionRemovedException, ucb::CommandFailedException, RuntimeException) @@ -779,7 +779,7 @@ beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier() else identifier = dp_misc::generateIdentifier( getDescriptionInfoset().getIdentifier(), m_name); - + return beans::Optional<OUString>( true, identifier); } @@ -788,7 +788,7 @@ OUString BackendImpl::PackageImpl::getVersion() throw (deployment::ExtensionRemovedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); return getDescriptionInfoset().getVersion(); } @@ -804,7 +804,7 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo() throw (deployment::ExtensionRemovedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); ::std::pair< OUString, OUString > aInfo = getDescriptionInfoset().getLocalizedPublisherNameAndURL(); beans::StringPair aStrPair( aInfo.first, aInfo.second ); return aStrPair; @@ -815,7 +815,7 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool throw (deployment::ExtensionRemovedException, RuntimeException ) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); uno::Reference< graphic::XGraphic > xGraphic; @@ -828,13 +828,13 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool uno::Reference< graphic::XGraphicProvider > xGraphProvider( xContext->getServiceManager()->createInstanceWithContext( OUSTR( "com.sun.star.graphic.GraphicProvider" ), xContext ), uno::UNO_QUERY ); - + if ( xGraphProvider.is() ) { uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); aMediaProps[0].Name = OUSTR( "URL" ); aMediaProps[0].Value <<= aFullIconURL; - + xGraphic = xGraphProvider->queryGraphic( aMediaProps ); } } @@ -852,9 +852,9 @@ void BackendImpl::PackageImpl::processPackage_( { const Sequence< Reference<deployment::XPackage> > bundle( getBundle( abortChannel.get(), xCmdEnv ) ); - + if (doRegisterPackage) - { + { ExtensionBackendDb::Data data; const sal_Int32 len = bundle.getLength(); for ( sal_Int32 pos = 0; pos < len; ++pos ) @@ -867,7 +867,7 @@ void BackendImpl::PackageImpl::processPackage_( try { xPackage->registerPackage( startup, xSubAbortChannel, xCmdEnv ); } - catch (Exception &) + catch (Exception &) { //We even try a rollback if the user cancelled the action (CommandAbortedException) //in order to prevent invalid database entries. @@ -890,7 +890,7 @@ void BackendImpl::PackageImpl::processPackage_( } if (approve && !abort) // ignore error, just continue continue; - + { ProgressLevel progress( xCmdEnv, OUSTR("rollback...") ); @@ -901,7 +901,7 @@ void BackendImpl::PackageImpl::processPackage_( bundle[ pos ]->revokePackage( xSubAbortChannel, xCmdEnv ); } - catch (Exception &) + catch (Exception &) { OSL_ENSURE( 0, ::rtl::OUStringToOString( ::comphelper::anyToString( @@ -912,7 +912,7 @@ void BackendImpl::PackageImpl::processPackage_( } progress.update( OUSTR("rollback finished.") ); } - + deployment::DeploymentException dpExc; if (exc >>= dpExc) { throw ucb::CommandFailedException( @@ -980,11 +980,11 @@ OUString BackendImpl::PackageImpl::getDescription() throw (deployment::ExtensionRemovedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); const OUString sRelativeURL(getDescriptionInfoset().getLocalizedDescriptionURL()); OUString sDescription; - if (sRelativeURL.getLength()) + if (sRelativeURL.getLength()) { OUString sURL = m_url_expanded + OUSTR("/") + sRelativeURL; @@ -1012,7 +1012,7 @@ void BackendImpl::PackageImpl::exportTo( ucb::CommandAbortedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); ::ucbhelper::Content sourceContent( m_url_expanded, xCmdEnv ); OUString title(newTitle); @@ -1022,7 +1022,7 @@ void BackendImpl::PackageImpl::exportTo( title, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ) ); - + if (nameClashAction == ucb::NameClash::ASK) { if (create_ucb_content( @@ -1046,7 +1046,7 @@ void BackendImpl::PackageImpl::exportTo( static_cast<OWeakObject *>(this), Any() ); } erase_path( destURL, xCmdEnv ); - + ::rtl::OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") ); buf.append( ::rtl::Uri::encode( destURL, @@ -1055,7 +1055,7 @@ void BackendImpl::PackageImpl::exportTo( RTL_TEXTENCODING_UTF8 ) ); buf.append( static_cast<sal_Unicode>('/') ); OUString destFolder( buf.makeStringAndClear() ); - + ::ucbhelper::Content destFolderContent( destFolder, xCmdEnv ); { // transfer every item of folder into zip: @@ -1077,19 +1077,19 @@ void BackendImpl::PackageImpl::exportTo( progress.update( Any() ); // animating progress bar } } - + // assure META-INF folder: ::ucbhelper::Content metainfFolderContent; create_folder( &metainfFolderContent, makeURL( destFolderContent.getURL(), OUSTR("META-INF") ), xCmdEnv ); - + if (m_legacyBundle) { // easy to migrate legacy bundles to new format: // just export them once using a .oxt name! // set detected media-types of any bundle item: - + // collect all manifest entries: Sequence< Reference<deployment::XPackage> > bundle; try { @@ -1107,7 +1107,7 @@ void BackendImpl::PackageImpl::exportTo( OSL_ENSURE( 0, ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } - + ::std::vector< Sequence<beans::PropertyValue> > manifest; manifest.reserve( bundle.getLength() ); sal_Int32 baseURLlen = m_url_expanded.getLength(); @@ -1142,7 +1142,7 @@ void BackendImpl::PackageImpl::exportTo( pattribs[ 1 ].Value <<= mediaType; manifest.push_back( attribs ); } - + // write into pipe: Reference<XComponentContext> xContext( getMyBackend()->getComponentContext() ); @@ -1155,7 +1155,7 @@ void BackendImpl::PackageImpl::exportTo( OUSTR("com.sun.star.io.Pipe"), xContext ), UNO_QUERY_THROW ); xManifestWriter->writeManifestSequence( xPipe, comphelper::containerToSequence(manifest) ); - + // write buffered pipe data to content: ::ucbhelper::Content manifestContent( makeURL( metainfFolderContent.getURL(), OUSTR("manifest.xml") ), @@ -1176,14 +1176,14 @@ void BackendImpl::PackageImpl::exportTo( OSL_ENSURE( 0, "### missing META-INF/manifest.xml file!" ); return; } - + if (! metainfFolderContent.transferContent( manifestContent, ::ucbhelper::InsertOperation_COPY, OUString(), ucb::NameClash::OVERWRITE )) throw RuntimeException( OUSTR("UCB transferContent() failed!"), static_cast<OWeakObject *>(this) ); } - + // xxx todo: maybe obsolete in the future try { destFolderContent.executeCommand( OUSTR("flush"), Any() ); @@ -1234,7 +1234,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( xCmdEnv, false /* no throw */ )) mediaType = OUSTR("application/vnd.sun.star." "dialog-library"); - + if (mediaType.getLength() > 0) { const Reference<deployment::XPackage> xPackage( bindBundleItem( getURL(), mediaType, false, OUString(), @@ -1251,7 +1251,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( // .oxt: scanBundle( bundle, AbortChannel::get(xAbortChannel), xCmdEnv ); } - + } catch (RuntimeException &) { throw; @@ -1272,7 +1272,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( static_cast<OWeakObject *>(this), exc ); } } - + // sort: schema before config data, typelibs before components: Sequence< Reference<deployment::XPackage> > ret( bundle.size() ); Reference<deployment::XPackage> * pret = ret.getArray(); @@ -1306,7 +1306,7 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( ++lower_end; } OSL_ASSERT( lower_end == upper_end ); - + const ::osl::MutexGuard guard( getMutex() ); pBundle = m_pBundle; if (pBundle == 0) { @@ -1344,7 +1344,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( // ignore any nested bundles: if (isBundle_(mediaType)) return Reference<deployment::XPackage>(); - + Reference<deployment::XPackage>xPackage; try { xPackage.set( getMyBackend()->m_xRootRegistry->bindPackage( @@ -1371,7 +1371,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( task::XInteractionApprove::static_type(), xCmdEnv, 0, 0 ); } } - + if (xPackage.is()) { const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); @@ -1395,17 +1395,17 @@ void BackendImpl::PackageImpl::scanBundle( if (! create_ucb_content( &manifestContent, makeURL( m_url_expanded, OUSTR("META-INF/manifest.xml") ), - xCmdEnv, false /* no throw */ )) + xCmdEnv, false /* no throw */ )) { OSL_ENSURE( 0, "### missing META-INF/manifest.xml file!" ); return; } - - + + const lang::Locale officeLocale = getOfficeLocale(); OUString descrFile; lang::Locale descrFileLocale; - + const Reference<XComponentContext> xContext( getMyBackend()->getComponentContext() ); Reference<packages::manifest::XManifestReader> xManifestReader( @@ -1430,23 +1430,23 @@ void BackendImpl::PackageImpl::scanBundle( RTL_CONSTASCII_STRINGPARAM("MediaType") )) attribs[i].Value >>= mediaType; } - + if (fullPath.getLength() == 0 || mediaType.getLength() == 0 || mediaType.equalsAsciiL( // opt: exclude common text/xml RTL_CONSTASCII_STRINGPARAM("text/xml") )) continue; - + String type, subType; INetContentTypeParameterList params; if (! INetContentTypes::parse( mediaType, type, subType, ¶ms )) continue; - + INetContentTypeParameter const * param = params.find( ByteString("platform") ); if (param != 0 && !platform_fits( param->m_sValue )) continue; const OUString url( makeURL( packageRootURL, fullPath ) ); - + // check for bundle description: if (type.EqualsIgnoreCaseAscii("application") && subType.EqualsIgnoreCaseAscii( @@ -1475,12 +1475,12 @@ void BackendImpl::PackageImpl::scanBundle( } continue; } - + checkAborted( abortChannel ); - + //We make sure that we only create one XPackage for a particular URL. //Sometime programmers insert the same URL several times in the manifest - //which may lead to DisposedExceptions. + //which may lead to DisposedExceptions. if (bundle.end() == std::find_if(bundle.begin(), bundle.end(), XPackage_eq(url))) { const Reference<deployment::XPackage> xPackage( @@ -1493,7 +1493,7 @@ void BackendImpl::PackageImpl::scanBundle( fprintf(stderr, "manifest.xml contains a duplicate entry!\n"); } } - + if (descrFile.getLength() > 0) { ::ucbhelper::Content descrFileContent; @@ -1527,7 +1527,7 @@ void BackendImpl::PackageImpl::scanLegacyBundle( bool skip_registration ) { ::ucbhelper::Content ucbContent( url, xCmdEnv ); - + // check for platform pathes: const OUString title( ucbContent.getPropertyValue( StrTitle::get() ).get<OUString>() ); @@ -1539,16 +1539,16 @@ void BackendImpl::PackageImpl::scanLegacyBundle( if (title.endsWithIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("skip_registration") )) skip_registration = true; - + OUString ar [] = { StrTitle::get(), OUSTR("IsFolder") }; Reference<sdbc::XResultSet> xResultSet( - ucbContent.createCursor( + ucbContent.createCursor( Sequence<OUString>( ar, ARLEN(ar) ), ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS ) ); while (xResultSet->next()) { checkAborted( abortChannel ); - + const Reference<sdbc::XRow> xRow( xResultSet, UNO_QUERY_THROW ); const OUString title_enc( ::rtl::Uri::encode( xRow->getString( 1 /* Title */ ), @@ -1556,7 +1556,7 @@ void BackendImpl::PackageImpl::scanLegacyBundle( rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ); const OUString path( makeURL( url, title_enc ) ); - + OUString mediaType; const Reference<deployment::XPackage> xPackage( bindBundleItem( path, OUString() /* detect */, false, OUString(), @@ -1567,17 +1567,17 @@ void BackendImpl::PackageImpl::scanLegacyBundle( OSL_ASSERT( xPackageType.is() ); if (xPackageType.is()) mediaType = xPackageType->getMediaType(); - + if (skip_registration && // xxx todo: additional parsing? mediaType.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.sun.star.uno-component") )) continue; - + bundle.push_back( xPackage ); } - + if (mediaType.getLength() == 0 || // script.xlb, dialog.xlb can be met everywhere: mediaType.matchIgnoreAsciiCaseAsciiL( @@ -1599,7 +1599,7 @@ OUString BackendImpl::PackageImpl::getDisplayName() throw (deployment::ExtensionRemovedException, RuntimeException) { if (m_bRemoved) - throw deployment::ExtensionRemovedException(); + throw deployment::ExtensionRemovedException(); OUString sName = getDescriptionInfoset().getLocalizedDisplayName(); if (sName.getLength() == 0) @@ -1613,7 +1613,7 @@ BackendImpl::PackageImpl::getPackagesFromDb( Reference<ucb::XCommandEnvironment> const & xCmdEnv) { ::std::vector<Reference<deployment::XPackage> > retVector; - + typedef ::std::vector< ::std::pair<OUString, OUString> >::const_iterator ITC; for (ITC i = m_dbData.items.begin(); i != m_dbData.items.end(); i++) { @@ -1622,7 +1622,7 @@ BackendImpl::PackageImpl::getPackagesFromDb( OSL_ASSERT(xExtension.is()); retVector.push_back(xExtension); } - + return retVector; } diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc index 3a840b64f0b6..0b258a58cdf3 100644 --- a/desktop/source/deployment/registry/package/dp_package.hrc +++ b/desktop/source/deployment/registry/package/dp_package.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src index 57307040bba4..056a17cb0618 100644 --- a/desktop/source/deployment/registry/package/dp_package.src +++ b/desktop/source/deployment/registry/package/dp_package.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index 1fc4c3d211bc..4dc71b7fd9e3 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ OUString LibraryContainer::get_libname( ::xmlscript::LibDescriptor import; ::ucbhelper::Content ucb_content( url, xCmdEnv ); xml_parse( ::xmlscript::importLibrary( import ), ucb_content, xContext ); - + if (import.aName.getLength() == 0) { throw Exception( StrCannotDetermineLibName::get(), Reference<XInterface>() ); diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index 13e29659d30e..b0f29c1e80f3 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index d578ffcf0c40..45fb378f1c5d 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,11 +68,11 @@ class BackendImpl : public t_helper class PackageImpl : public ::dp_registry::backend::Package { BackendImpl * getMyBackend() const; - + const OUString m_scriptURL; const OUString m_dialogURL; OUString m_dialogName; - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -84,7 +84,7 @@ class BackendImpl : public t_helper bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + public: PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, @@ -94,21 +94,21 @@ class BackendImpl : public t_helper bool bRemoved, OUString const & identifier); }; friend class PackageImpl; - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ); - + void addDataToDb(OUString const & url); void deleteDataFromDb(OUString const & url); bool isRegisteredInDb(OUString const & url); - + // Reference< ucb::XSimpleFileAccess > getFileAccess( void ); -// Reference< ucb::XSimpleFileAccess > m_xSFA; +// Reference< ucb::XSimpleFileAccess > m_xSFA; const Reference<deployment::XPackageTypeInfo> m_xBasicLibTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xDialogLibTypeInfo; @@ -117,10 +117,10 @@ class BackendImpl : public t_helper public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XUpdatable virtual void SAL_CALL update() throw (RuntimeException); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -175,7 +175,7 @@ BackendImpl::BackendImpl( { m_typeInfos[ 0 ] = m_xBasicLibTypeInfo; m_typeInfos[ 1 ] = m_xDialogLibTypeInfo; - + OSL_ASSERT( ! transientMode() ); if (!transientMode()) @@ -183,7 +183,7 @@ BackendImpl::BackendImpl( OUString dbFile = makeURL(getCachePath(), OUSTR("backenddb.xml")); m_backendDb.reset( new ScriptBackendDb(getComponentContext(), dbFile)); - } + } } void BackendImpl::addDataToDb(OUString const & url) @@ -252,7 +252,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) @@ -264,7 +264,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( 0, dialogURL, xCmdEnv, false /* no throw */ )) { dialogURL = OUString(); } - + if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.basic-library")) { OUString scriptURL( makeURL( url, OUSTR("script.xlb"))); @@ -272,8 +272,8 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( 0, scriptURL, xCmdEnv, false /* no throw */ )) { scriptURL = OUString(); } - - return new PackageImpl( + + return new PackageImpl( this, url, xCmdEnv, scriptURL, dialogURL, bRemoved, identifier); } @@ -300,12 +300,12 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; @@ -380,7 +380,7 @@ void BackendImpl::PackageImpl::processPackage_( //user repository. That is, the script of the newly added user extension does //not work anymore. Therefore we must check if the currently active //script comes in fact from the currently processed extension. - + if (bRegistered) { //we also prevent and live deployment at startup @@ -392,20 +392,20 @@ void BackendImpl::PackageImpl::processPackage_( if (sScriptUrl.equals(m_scriptURL)) xScriptLibs->removeLibrary(m_name); } - + if (bDialog && xDialogLibs.is() && xDialogLibs->hasByName(m_dialogName)) { const OUString sDialogUrl = xDialogLibs->getOriginalLibraryLinkURL(m_dialogName); if (sDialogUrl.equals(m_dialogURL)) xDialogLibs->removeLibrary(m_dialogName); } - } + } getMyBackend()->deleteDataFromDb(getURL()); return; } } if (bRegistered) - return; // Already registered + return; // Already registered // Update LibraryContainer bool bScriptSuccess = false; @@ -447,7 +447,7 @@ void BackendImpl::PackageImpl::processPackage_( } - if (bDialog && xDialogLibs.is()) + if (bDialog && xDialogLibs.is()) { bool bCanAdd = true; if (xDialogLibs->hasByName(m_dialogName)) @@ -466,7 +466,7 @@ void BackendImpl::PackageImpl::processPackage_( else { bCanAdd = false; - } + } } if (bCanAdd) @@ -476,7 +476,7 @@ void BackendImpl::PackageImpl::processPackage_( } } } - bool bSuccess = bScript || bDialog; // Something must have happened + bool bSuccess = bScript || bDialog; // Something must have happened if( bRunning && !startup) if( (bScript && !bScriptSuccess) || (bDialog && !bDialogSuccess) ) bSuccess = false; diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc index 8ddfa6f51ffc..f5b52f1b1f31 100644 --- a/desktop/source/deployment/registry/script/dp_script.hrc +++ b/desktop/source/deployment/registry/script/dp_script.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src index 117f4eac945a..21e0cfdcc9f8 100644 --- a/desktop/source/deployment/registry/script/dp_script.src +++ b/desktop/source/deployment/registry/script/dp_script.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx index 8c6a4924212e..436ea3ce5f29 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index 58a749480113..63015ab1e46c 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,16 +48,16 @@ namespace script { They will be removed when they are revoked. */ class ScriptBackendDb: public dp_registry::backend::RegisteredDb -{ +{ protected: virtual ::rtl::OUString getDbNSName(); - + virtual ::rtl::OUString getNSPrefix(); virtual ::rtl::OUString getRootElementName(); virtual ::rtl::OUString getKeyElementName(); - + public: diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index fe0f378160d9..9d66e80f7114 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,13 +94,13 @@ ParcelDescDocHandler::startElement( const OUString& aName, throw ( xml::sax::SAXException, RuntimeException ) { - - dp_misc::TRACE(OUSTR("ParcelDescDocHandler::startElement() for ") + + + dp_misc::TRACE(OUSTR("ParcelDescDocHandler::startElement() for ") + aName + OUSTR("\n")); if ( !skipIndex ) { if ( aName.equals( OUString::createFromAscii( "parcel" ) ) ) - { + { m_sLang = xAttribs->getValueByName( OUString::createFromAscii( "language" ) ); } ++skipIndex; @@ -110,7 +110,7 @@ ParcelDescDocHandler::startElement( const OUString& aName, dp_misc::TRACE(OUSTR("ParcelDescDocHandler::startElement() skipping for ") + aName + OUSTR("\n")); } - + } void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName ) diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 83ffddda1aff..6d2dc52006e3 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ private: sal_Int32 skipIndex; public: ParcelDescDocHandler():m_bIsParsed( false ), skipIndex( 0 ){} - ::rtl::OUString getParcelLanguage() { return m_sLang; } + ::rtl::OUString getParcelLanguage() { return m_sLang; } bool isParsed() { return m_bIsParsed; } // XDocumentHandler virtual void SAL_CALL startDocument() diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 02b6452f33cb..0e8dc29d53c4 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,12 +64,12 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend class PackageImpl : public ::dp_registry::backend::Package { BackendImpl * getMyBackend() const; - + Reference< container::XNameContainer > m_xNameCntrPkgHandler; - OUString m_descr; - + OUString m_descr; + void initPackageHandler(); - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -81,7 +81,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + public: PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, @@ -91,7 +91,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual OUString SAL_CALL getDescription() throw (RuntimeException); }; friend class PackageImpl; - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, @@ -99,12 +99,12 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend Reference<XCommandEnvironment> const & xCmdEnv ); const Reference<deployment::XPackageTypeInfo> m_xTypeInfo; - + public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -114,12 +114,12 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; @@ -143,7 +143,7 @@ BackendImpl::PackageImpl::PackageImpl( m_descr(libType) { initPackageHandler(); - + sal_Int32 segmEnd = url.getLength(); if (url.getLength() > 0 && url[ url.getLength() - 1 ] == '/') --segmEnd; @@ -247,7 +247,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) @@ -258,15 +258,15 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( { OUString lang = OUString::createFromAscii("Script"); OUString sParcelDescURL = makeURL( - url, OUSTR("parcel-descriptor.xml") ); + url, OUSTR("parcel-descriptor.xml") ); ::ucbhelper::Content ucb_content; if (create_ucb_content( &ucb_content, sParcelDescURL, xCmdEnv, false /* no throw */ )) { - ParcelDescDocHandler* pHandler = - new ParcelDescDocHandler(); + ParcelDescDocHandler* pHandler = + new ParcelDescDocHandler(); Reference< xml::sax::XDocumentHandler > xDocHandler = pHandler; @@ -275,7 +275,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( Reference< xml::sax::XParser > xParser( xContext->getServiceManager()->createInstanceWithContext( - OUSTR("com.sun.star.xml.sax.Parser"), xContext ), + OUSTR("com.sun.star.xml.sax.Parser"), xContext ), UNO_QUERY_THROW ); xParser->setDocumentHandler( xDocHandler ); @@ -284,7 +284,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( source.sSystemId = ucb_content.getURL(); xParser->parseStream( source ); - if ( pHandler->isParsed() ) + if ( pHandler->isParsed() ) { lang = pHandler->getParcelLanguage(); } @@ -316,14 +316,14 @@ void BackendImpl::PackageImpl:: initPackageHandler() { if (m_xNameCntrPkgHandler.is()) return; - + BackendImpl * that = getMyBackend(); Any aContext; if ( that->m_eContext == CONTEXT_USER ) { aContext <<= OUSTR("user"); - } + } else if ( that->m_eContext == CONTEXT_SHARED ) { aContext <<= OUSTR("share"); @@ -338,7 +338,7 @@ void BackendImpl::PackageImpl:: initPackageHandler() // NOT supported at the momemtn // TODO } - Reference< provider::XScriptProviderFactory > xFac( + Reference< provider::XScriptProviderFactory > xFac( that->getComponentContext()->getValueByName( OUSTR( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), UNO_QUERY ); @@ -379,11 +379,11 @@ void BackendImpl::PackageImpl::processPackage_( { if ( !m_xNameCntrPkgHandler.is() ) { - dp_misc::TRACE("no package handler!!!!\n"); - throw RuntimeException( OUSTR("No package Handler " ), + dp_misc::TRACE("no package handler!!!!\n"); + throw RuntimeException( OUSTR("No package Handler " ), Reference< XInterface >() ); - } - + } + if (doRegisterPackage) { // will throw if it fails diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc index 0eb619e839e3..ed164251cc23 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src index c8d37ce067ac..32a507240123 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src index dc204e265ec6..b40b505af291 100644 --- a/desktop/source/deployment/unopkg/unopkg.src +++ b/desktop/source/deployment/unopkg/unopkg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/inc/exithelper.hxx b/desktop/source/inc/exithelper.hxx index 25cdc3e1b722..441cc06a1baa 100644 --- a/desktop/source/inc/exithelper.hxx +++ b/desktop/source/inc/exithelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ namespace desktop { - + //============================================================================= /** @short provide helper functions to handle a abnormal exit and contain a list of all "well known" exit codes. @@ -41,10 +41,10 @@ class ExitHelper //------------------------------------------------------------------------- // const public: - + //--------------------------------------------------------------------- /** @short list of all well known exit codes. - + @descr Its not allowed to use exit codes hard coded inside office. All places must use these list to be synchron. @@ -63,9 +63,9 @@ class ExitHelper E_NORMAL_RESTART = 81 }; }; - + } // namespace desktop -#endif // #ifndef _DESKTOP_EXITHELPER_HXX_ +#endif // #ifndef _DESKTOP_EXITHELPER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 2619c4398881..2435467f7639 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #define HID_FIRSTSTART_CANCEL (HID_DESKTOP_START + 13) #define HID_FIRSTSTART_FINISH (HID_DESKTOP_START + 14) #define UID_FIRSTSTART_HELP (HID_DESKTOP_START + 15) -#define UID_BTN_LICENSE_ACCEPT (HID_DESKTOP_START + 16) +#define UID_BTN_LICENSE_ACCEPT (HID_DESKTOP_START + 16) #define HID_FIRSTSTART_UPDATE_CHECK (HID_DESKTOP_START + 17) #define HID_DEPLOYMENT_GUI_UPDATE (HID_DESKTOP_START + 18) #define HID_DEPLOYMENT_GUI_UPDATEINSTALL (HID_DESKTOP_START + 19) diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx index 7ee970235acc..2e5a20e708c6 100644 --- a/desktop/source/migration/cfgfilter.cxx +++ b/desktop/source/migration/cfgfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ namespace desktop { CConfigFilter::CConfigFilter(const strings_v* include, const strings_v* exclude) : m_pvInclude(include) - , m_pvExclude(exclude) + , m_pvExclude(exclude) { -} +} void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs) throw (Exception) @@ -65,7 +65,7 @@ void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs) } if (m_aCurrentComponent.getLength() == 0) m_aCurrentComponent = OUString::createFromAscii("unknown.component"); - + if (!m_xSourceLayer.is()) { throw Exception(); } @@ -79,7 +79,7 @@ void CConfigFilter::pushElement(rtl::OUString aName, sal_Bool bUse) if (!m_elementStack.empty()) { aPath = m_elementStack.top().path; // or use base path aPath += OUString::createFromAscii("/"); - } + } aPath += aName; // create element @@ -106,19 +106,19 @@ sal_Bool CConfigFilter::checkElement(rtl::OUString aName) aFullPath = m_elementStack.top().path + OUString::createFromAscii("/"); aFullPath += aName; - + // check whether any include patterns patch this path for (strings_v::const_iterator i_in = m_pvInclude->begin(); i_in != m_pvInclude->end(); i_in++) { // pattern is beginning of path // or path is a begiing for pattern - if (i_in->match(aFullPath.copy(0, i_in->getLength()>aFullPath.getLength() - ? aFullPath.getLength() : i_in->getLength()), 0)) + if (i_in->match(aFullPath.copy(0, i_in->getLength()>aFullPath.getLength() + ? aFullPath.getLength() : i_in->getLength()), 0)) { bResult = sal_True; break; // one match is enough - } + } } // if match is found, check for exclusion if (bResult) @@ -142,13 +142,13 @@ void CConfigFilter::popElement() } -void SAL_CALL CConfigFilter::readData( +void SAL_CALL CConfigFilter::readData( const Reference< configuration::backend::XLayerHandler >& layerHandler) throw ( com::sun::star::lang::NullPointerException, lang::WrappedTargetException, com::sun::star::configuration::backend::MalformedDataException) { - // when readData is called, the submitted handler will be stored + // when readData is called, the submitted handler will be stored // in m_xLayerHandler. we will then submit ourself as a handler to // the SourceLayer in m_xSourceLayer. // when the source calls our handler functions we will use the patterns that @@ -165,23 +165,23 @@ void SAL_CALL CConfigFilter::readData( } // XLayerHandler -void SAL_CALL CConfigFilter::startLayer() +void SAL_CALL CConfigFilter::startLayer() throw(::com::sun::star::lang::WrappedTargetException) { m_xLayerHandler->startLayer(); } -void SAL_CALL CConfigFilter::endLayer() - throw( +void SAL_CALL CConfigFilter::endLayer() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { m_xLayerHandler->endLayer(); } -void SAL_CALL CConfigFilter::overrideNode( - const OUString& aName, - sal_Int16 aAttributes, +void SAL_CALL CConfigFilter::overrideNode( + const OUString& aName, + sal_Int16 aAttributes, sal_Bool bClear) throw( ::com::sun::star::configuration::backend::MalformedDataException, @@ -191,15 +191,15 @@ void SAL_CALL CConfigFilter::overrideNode( { m_xLayerHandler->overrideNode(aName, aAttributes, bClear); pushElement(aName); - } + } else pushElement(aName, sal_False); } void SAL_CALL CConfigFilter::addOrReplaceNode( - const OUString& aName, - sal_Int16 aAttributes) - throw( + const OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -212,10 +212,10 @@ void SAL_CALL CConfigFilter::addOrReplaceNode( pushElement(aName, sal_False); } -void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( +void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( const OUString& aName, const com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) @@ -229,21 +229,21 @@ void SAL_CALL CConfigFilter::addOrReplaceNodeFromTemplate( pushElement(aName, sal_False); } -void SAL_CALL CConfigFilter::endNode() - throw( +void SAL_CALL CConfigFilter::endNode() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { if (checkCurrentElement()) { - m_xLayerHandler->endNode(); + m_xLayerHandler->endNode(); } popElement(); } -void SAL_CALL CConfigFilter::dropNode( - const OUString& aName ) - throw( +void SAL_CALL CConfigFilter::dropNode( + const OUString& aName ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -254,12 +254,12 @@ void SAL_CALL CConfigFilter::dropNode( } } -void SAL_CALL CConfigFilter::overrideProperty( +void SAL_CALL CConfigFilter::overrideProperty( const OUString& aName, sal_Int16 aAttributes, const Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -271,9 +271,9 @@ void SAL_CALL CConfigFilter::overrideProperty( pushElement(aName, sal_False); } -void SAL_CALL CConfigFilter::setPropertyValue( - const Any& aValue ) - throw( +void SAL_CALL CConfigFilter::setPropertyValue( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -281,10 +281,10 @@ void SAL_CALL CConfigFilter::setPropertyValue( m_xLayerHandler->setPropertyValue(aValue); } -void SAL_CALL CConfigFilter::setPropertyValueForLocale( +void SAL_CALL CConfigFilter::setPropertyValueForLocale( const Any& aValue, - const OUString& aLocale ) - throw( + const OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -292,8 +292,8 @@ void SAL_CALL CConfigFilter::setPropertyValueForLocale( m_xLayerHandler->setPropertyValueForLocale(aValue, aLocale); } -void SAL_CALL CConfigFilter::endProperty() - throw( +void SAL_CALL CConfigFilter::endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { @@ -305,30 +305,30 @@ void SAL_CALL CConfigFilter::endProperty() } -void SAL_CALL CConfigFilter::addProperty( +void SAL_CALL CConfigFilter::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { - if (checkElement(aName)) + if (checkElement(aName)) m_xLayerHandler->addProperty(aName, aAttributes, aType); } -void SAL_CALL CConfigFilter::addPropertyWithValue( +void SAL_CALL CConfigFilter::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const Any& aValue ) - throw( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ) { // add property with value doesn't push the property - if (checkElement(aName)) + if (checkElement(aName)) m_xLayerHandler->addPropertyWithValue(aName, aAttributes, aValue); - + } } // namespace desktop diff --git a/desktop/source/migration/cfgfilter.hxx b/desktop/source/migration/cfgfilter.hxx index 44a5006e8cd3..cec890354e5e 100644 --- a/desktop/source/migration/cfgfilter.hxx +++ b/desktop/source/migration/cfgfilter.hxx @@ -33,7 +33,7 @@ struct element rtl::OUString name; rtl::OUString path; sal_Bool use; - + }; typedef std::stack< element > element_stack; @@ -43,13 +43,13 @@ typedef std::stack< element > element_stack; // XLayer // XLayerHandler class CConfigFilter : public cppu::WeakImplHelper3< - NS_CSS::configuration::backend::XLayer, + NS_CSS::configuration::backend::XLayer, NS_CSS::configuration::backend::XLayerHandler, NS_CSS::lang::XInitialization> { private: - NS_UNO::Reference< NS_CSS::configuration::backend::XLayerHandler > m_xLayerHandler; + NS_UNO::Reference< NS_CSS::configuration::backend::XLayerHandler > m_xLayerHandler; NS_UNO::Reference< NS_CSS::configuration::backend::XLayer > m_xSourceLayer; rtl::OUString m_aCurrentComponent; @@ -72,94 +72,94 @@ public: throw (NS_UNO::Exception); // XLayer - virtual void SAL_CALL readData( + virtual void SAL_CALL readData( const NS_UNO::Reference< NS_CSS::configuration::backend::XLayerHandler >& layerHandler) throw (NS_CSS::lang::NullPointerException, NS_CSS::lang::WrappedTargetException, NS_CSS::configuration::backend::MalformedDataException); // XLayerHandler - virtual void SAL_CALL startLayer() + virtual void SAL_CALL startLayer() throw(::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL endLayer() - throw( + virtual void SAL_CALL endLayer() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, - sal_Int16 aAttributes, + virtual void SAL_CALL overrideNode( + const rtl::OUString& aName, + sal_Int16 aAttributes, sal_Bool bClear) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, - sal_Int16 aAttributes) - throw( + const rtl::OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addOrReplaceNodeFromTemplate( + virtual void SAL_CALL addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const NS_CSS::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endNode() - throw( + virtual void SAL_CALL endNode() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) - throw( + virtual void SAL_CALL dropNode( + const rtl::OUString& aName ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideProperty( + virtual void SAL_CALL overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const NS_UNO::Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValue( - const NS_UNO::Any& aValue ) - throw( + virtual void SAL_CALL setPropertyValue( + const NS_UNO::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValueForLocale( + virtual void SAL_CALL setPropertyValueForLocale( const NS_UNO::Any& aValue, - const rtl::OUString& aLocale ) - throw( + const rtl::OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endProperty() - throw( + virtual void SAL_CALL endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addProperty( + virtual void SAL_CALL addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const NS_UNO::Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addPropertyWithValue( + virtual void SAL_CALL addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const NS_UNO::Any& aValue ) - throw( + const NS_UNO::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 0f3726e663a0..e66d1269ea63 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -451,7 +451,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio // get migration access uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(rMigrationName), uno::UNO_QUERY_THROW ); - + // get migration description from from org.openoffice.Setup/Migration // and build vector of migration steps OUString aMigrationSteps( RTL_CONSTASCII_USTRINGPARAM( "MigrationSteps" )); @@ -559,7 +559,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) aProfileName = (*i_ver).copy( nSeparatorIndex+1 ); } - if ( aVersion.getLength() && aProfileName.getLength() && + if ( aVersion.getLength() && aProfileName.getLength() && ( !aInfo.userdata.getLength() || !aProfileName.toAsciiLowerCase().compareTo( aProductName, aProductName.getLength() ) ) ) { @@ -1021,7 +1021,7 @@ void MigrationImpl::runServices() for (sal_Int32 j=0; j<lToolbars.getLength(); ++j) { ::rtl::OUString sToolbarName = lToolbars[j]; - if (sToolbarName.getLength()>=nCustomLen && + if (sToolbarName.getLength()>=nCustomLen && sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT)) continue; @@ -1109,7 +1109,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } else if (pFound == vNewItems.end()) { - MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); + MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aOldVersionItemsHashMap.find(sResourceURL)==m_aOldVersionItemsHashMap.end()) { ::std::vector< MigrationItem > vMigrationItems; @@ -1142,7 +1142,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } else if (::std::find(vOldItems.begin(), vOldItems.end(), *it) == vOldItems.end()) { - MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); + MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aNewVersionItemsHashMap.find(sResourceURL)==m_aNewVersionItemsHashMap.end()) { ::std::vector< MigrationItem > vMigrationItems; @@ -1158,9 +1158,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } } -void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, - const uno::Reference< container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, +void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, + const uno::Reference< container::XIndexContainer>& xIndexContainer, + const ::rtl::OUString& sModuleIdentifier, const ::rtl::OUString& sResourceURL) { MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL); @@ -1174,7 +1174,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat ::rtl::OUString sParentNodeName = it->m_sParentNodeName; sal_Int32 nIndex = 0; - do + do { ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); if (sToken.getLength()<=0) @@ -1187,7 +1187,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat ::rtl::OUString sLabel; uno::Reference< container::XIndexContainer > xChild; - uno::Sequence< beans::PropertyValue > aPropSeq; + uno::Sequence< beans::PropertyValue > aPropSeq; xTemp->getByIndex(i) >>= aPropSeq; for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j) { @@ -1259,14 +1259,14 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat } uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const -{ +{ uno::Reference< ui::XUIConfigurationManager > xCfgManager; for (sal_Int32 i=0; i<m_lCfgManagerSeq.getLength(); ++i) { if (m_lCfgManagerSeq[i].Name.equals(sModuleShortName)) { - m_lCfgManagerSeq[i].Value >>= xCfgManager; + m_lCfgManagerSeq[i].Value >>= xCfgManager; break; } } diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index ebb7c96c620c..d66cabad941e 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,21 +106,21 @@ struct MigrationItem { } - MigrationItem(const ::rtl::OUString& sParentNodeName, - const ::rtl::OUString& sPrevSibling, - const ::rtl::OUString& sCommandURL, + MigrationItem(const ::rtl::OUString& sParentNodeName, + const ::rtl::OUString& sPrevSibling, + const ::rtl::OUString& sCommandURL, const NS_UNO::Reference< NS_CSS::container::XIndexContainer > xPopupMenu) { m_sParentNodeName = sParentNodeName; - m_sPrevSibling = sPrevSibling; - m_sCommandURL = sCommandURL; - m_xPopupMenu = xPopupMenu; + m_sPrevSibling = sPrevSibling; + m_sCommandURL = sCommandURL; + m_xPopupMenu = xPopupMenu; } MigrationItem& operator=(const MigrationItem& aMigrationItem) { m_sParentNodeName = aMigrationItem.m_sParentNodeName; - m_sPrevSibling = aMigrationItem.m_sPrevSibling; + m_sPrevSibling = aMigrationItem.m_sPrevSibling; m_sCommandURL = aMigrationItem.m_sCommandURL; m_xPopupMenu = aMigrationItem.m_xPopupMenu; @@ -130,17 +130,17 @@ struct MigrationItem sal_Bool operator==(const MigrationItem& aMigrationItem) { return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName && - aMigrationItem.m_sPrevSibling == m_sPrevSibling && - aMigrationItem.m_sCommandURL == m_sCommandURL && + aMigrationItem.m_sPrevSibling == m_sPrevSibling && + aMigrationItem.m_sCommandURL == m_sCommandURL && aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is() ); } ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::std::hash_map< ::rtl::OUString, - ::std::vector< MigrationItem >, - ::rtl::OUStringHash, +typedef ::std::hash_map< ::rtl::OUString, + ::std::vector< MigrationItem >, + ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > MigrationHashMap; struct MigrationItemInfo @@ -164,7 +164,7 @@ struct MigrationItemInfo struct MigrationModuleInfo { ::rtl::OUString sModuleShortName; - sal_Bool bHasMenubar; + sal_Bool bHasMenubar; ::std::vector< ::rtl::OUString > m_vToolbars; MigrationModuleInfo():bHasMenubar(sal_False){}; @@ -172,7 +172,7 @@ struct MigrationModuleInfo //__________________________________________ /** - get the information before copying the ui configuration files of old version to new version + get the information before copying the ui configuration files of old version to new version */ class NewVersionUIInfo { @@ -221,10 +221,10 @@ private: ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const; void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName, - const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, + const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xNewIndexContainer, const ::rtl::OUString& sToolbarName); - void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, + void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, const NS_UNO::Reference< NS_CSS::container::XIndexContainer>& xIndexContainer, const ::rtl::OUString& sModuleIdentifier, const ::rtl::OUString& sResourceURL); diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx index 3030b429d1e9..1f5290f383cf 100644 --- a/desktop/source/migration/services/autocorrmigration.cxx +++ b/desktop/source/migration/services/autocorrmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -282,7 +282,7 @@ namespace migration // ----------------------------------------------------------------------------- //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx index 20021ceb100a..9a8aef32cdda 100644 --- a/desktop/source/migration/services/autocorrmigration.hxx +++ b/desktop/source/migration/services/autocorrmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,18 +86,18 @@ namespace migration throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_AUTOCORRMIGRATION_HXX_ diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 7fdf6e8d0b53..4ed093cfe446 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -271,7 +271,7 @@ namespace migration // ----------------------------------------------------------------------------- //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index 49260cadd522..131092748a63 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,14 +58,14 @@ namespace migration // class BasicMigration // ============================================================================= - typedef ::cppu::WeakImplHelper3< + typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::task::XJob > BasicMigration_BASE; class BasicMigration : public BasicMigration_BASE { - private: + private: ::osl::Mutex m_aMutex; ::rtl::OUString m_sSourceDir; @@ -86,18 +86,18 @@ namespace migration throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_BASICMIGRATION_HXX_ diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index fb102a67bf62..261cf266653c 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index ad40aef9db13..771c161879e0 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index d83d86179325..f6ad3f54bcac 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - //XInitialization + //XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException); @@ -122,88 +122,88 @@ public: css::uno::RuntimeException); // XLayerHandler - virtual void SAL_CALL startLayer() + virtual void SAL_CALL startLayer() throw(::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL endLayer() - throw( + virtual void SAL_CALL endLayer() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, - sal_Int16 aAttributes, + virtual void SAL_CALL overrideNode( + const rtl::OUString& aName, + sal_Int16 aAttributes, sal_Bool bClear) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, - sal_Int16 aAttributes) - throw( + const rtl::OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addOrReplaceNodeFromTemplate( + virtual void SAL_CALL addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endNode() - throw( + virtual void SAL_CALL endNode() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) - throw( + virtual void SAL_CALL dropNode( + const rtl::OUString& aName ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideProperty( + virtual void SAL_CALL overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValue( - const css::uno::Any& aValue ) - throw( + virtual void SAL_CALL setPropertyValue( + const css::uno::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValueForLocale( + virtual void SAL_CALL setPropertyValueForLocale( const css::uno::Any& aValue, - const rtl::OUString& aLocale ) - throw( + const rtl::OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endProperty() - throw( + virtual void SAL_CALL endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addProperty( + virtual void SAL_CALL addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addPropertyWithValue( + virtual void SAL_CALL addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const css::uno::Any& aValue ) - throw( + const css::uno::Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); @@ -212,15 +212,15 @@ public: //---------------- ~JavaMigration(); -private: +private: OUString m_sUserDir; - css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; + css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; void migrateJavarc(); - typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; + typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; typedef ::std::stack< TElementType > TElementStack; TElementStack m_aStack; - + }; JavaMigration::~JavaMigration() @@ -319,7 +319,7 @@ css::uno::Any SAL_CALL JavaMigration::execute( migrateJavarc(); if (m_xLayer.is()) m_xLayer->readData(this); - + return css::uno::Any(); } @@ -338,7 +338,7 @@ void JavaMigration::migrateJavarc() //get the directory CJavaInfo aInfo; javaFrameworkError err = jfw_getJavaInfoByPath(sValue.pData, &aInfo.pData); - + if (err == JFW_E_NONE) { if (jfw_setSelectedJRE(aInfo) != JFW_E_NONE) @@ -358,65 +358,65 @@ void JavaMigration::migrateJavarc() // XLayerHandler -void SAL_CALL JavaMigration::startLayer() +void SAL_CALL JavaMigration::startLayer() throw(css::lang::WrappedTargetException) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::endLayer() - throw( +void SAL_CALL JavaMigration::endLayer() + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::overrideNode( - const ::rtl::OUString&, - sal_Int16, +void SAL_CALL JavaMigration::overrideNode( + const ::rtl::OUString&, + sal_Int16, sal_Bool) throw( MalformedDataException, WrappedTargetException ) - + { } // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addOrReplaceNode( - const ::rtl::OUString&, - sal_Int16) - throw( + const ::rtl::OUString&, + sal_Int16) + throw( MalformedDataException, WrappedTargetException ) { } -void SAL_CALL JavaMigration::endNode() - throw( +void SAL_CALL JavaMigration::endNode() + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::dropNode( - const ::rtl::OUString& ) - throw( +void SAL_CALL JavaMigration::dropNode( + const ::rtl::OUString& ) + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::overrideProperty( +void SAL_CALL JavaMigration::overrideProperty( const ::rtl::OUString& aName, sal_Int16, const Type&, - sal_Bool ) - throw( + sal_Bool ) + throw( MalformedDataException, WrappedTargetException ) { @@ -427,9 +427,9 @@ void SAL_CALL JavaMigration::overrideProperty( } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::setPropertyValue( - const Any& aValue ) - throw( +void SAL_CALL JavaMigration::setPropertyValue( + const Any& aValue ) + throw( MalformedDataException, WrappedTargetException ) { @@ -448,9 +448,9 @@ void SAL_CALL JavaMigration::setPropertyValue( throw WrappedTargetException( OUSTR("[Service implementation " IMPL_NAME "] XLayerHandler::setPropertyValue: jfw_setEnabled failed."), 0, Any()); - + break; - } + } case USER_CLASS_PATH: { OUString cp; @@ -458,11 +458,11 @@ void SAL_CALL JavaMigration::setPropertyValue( throw MalformedDataException( OUSTR("[Service implementation " IMPL_NAME "] XLayerHandler::setPropertyValue received wrong type for UserClassPath property"), 0, Any()); - + if (jfw_setUserClassPath(cp.pData) != JFW_E_NONE) throw WrappedTargetException( OUSTR("[Service implementation " IMPL_NAME - "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed."), 0, Any()); + "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed."), 0, Any()); break; } default: @@ -472,18 +472,18 @@ void SAL_CALL JavaMigration::setPropertyValue( } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::setPropertyValueForLocale( +void SAL_CALL JavaMigration::setPropertyValueForLocale( const Any&, - const ::rtl::OUString& ) - throw( + const ::rtl::OUString& ) + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::endProperty() - throw( +void SAL_CALL JavaMigration::endProperty() + throw( MalformedDataException, WrappedTargetException ) { @@ -492,31 +492,31 @@ void SAL_CALL JavaMigration::endProperty() } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::addProperty( +void SAL_CALL JavaMigration::addProperty( const rtl::OUString&, sal_Int16, const Type& ) - throw( + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL JavaMigration::addPropertyWithValue( +void SAL_CALL JavaMigration::addPropertyWithValue( const rtl::OUString&, sal_Int16, - const Any& ) - throw( + const Any& ) + throw( MalformedDataException, WrappedTargetException ) { } -void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( +void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( const rtl::OUString&, const TemplateIdentifier&, - sal_Int16 ) + sal_Int16 ) throw( MalformedDataException, WrappedTargetException ) diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index c1938e03ae87..96e459521d93 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/migration/services/migrationoo2.xml b/desktop/source/migration/services/migrationoo2.xml index 5bda732f0fba..0c77badebcd3 100644 --- a/desktop/source/migration/services/migrationoo2.xml +++ b/desktop/source/migration/services/migrationoo2.xml @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> migrationoo2.uno </module-name> + <module-name> migrationoo2.uno </module-name> <component-description> <author> Joachim Lingner </author> - <name> com.sun.star.comp.jvmfwk.MigrationOO2</name> + <name> com.sun.star.comp.jvmfwk.MigrationOO2</name> <description> Specifies a factory object to create proxy objects. These proxy object represent a given target object and can be be aggregated. The proxy objects act UNO conform and do NOT provide original target interfaces on queryInterface() calls. </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> C++ </language> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> C++ </language> <status value="final"/> - <supported-service> com.sun.star.reflection.ProxyFactory </supported-service> + <supported-service> com.sun.star.reflection.ProxyFactory </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> <type> com.sun.star.lang.XInitialization </type> <type> com.sun.star.lang.WrappedTargetException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.task.XJob </type> - <type> com.sun.star.beans.NamedValue </type> - <type> com.sun.star.configuration.backend.XLayer </type> - <type> com.sun.star.configuration.backend.XLayerHandler </type> - <type> com.sun.star.configuration.backend.MalformedDataException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.task.XJob </type> + <type> com.sun.star.beans.NamedValue </type> + <type> com.sun.star.configuration.backend.XLayer </type> + <type> com.sun.star.configuration.backend.XLayerHandler </type> + <type> com.sun.star.configuration.backend.MalformedDataException </type> <type> com.sun.star.configuration.backend.TemplateIdentifier </type> </component-description> <component-description> @@ -41,7 +41,7 @@ original target interfaces on queryInterface() calls. <supported-service>com.sun.star.migration.Basic</supported-service> <service-dependency>...</service-dependency> <type>com.sun.star.beans.NamedValue</type> - <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.IllegalArgumentException</type> <type>com.sun.star.lang.XInitialization</type> <type>com.sun.star.task.XJob</type> <type>com.sun.star.lang.XServiceInfo</type> @@ -58,7 +58,7 @@ original target interfaces on queryInterface() calls. <supported-service>com.sun.star.migration.Autocorrection</supported-service> <service-dependency>...</service-dependency> <type>com.sun.star.beans.NamedValue</type> - <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.IllegalArgumentException</type> <type>com.sun.star.lang.XInitialization</type> <type>com.sun.star.task.XJob</type> <type>com.sun.star.lang.XServiceInfo</type> diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx index 54396863bb8c..a8f7babef982 100644 --- a/desktop/source/migration/services/misc.hxx +++ b/desktop/source/migration/services/misc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace migration typedef ::std::auto_ptr< TStringVector > TStringVectorPtr; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_MISC_HXX_ diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 9a0210eae411..e62cd1e2e2e2 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,14 +156,14 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi osl::DirectoryItem aExtDirItem; osl::Directory aExtensionRootDir( sExtensionFolderURL ); - + nRetCode = aExtensionRootDir.open(); if (( nRetCode == osl::Directory::E_None ) && ( aExtensionRootDir.getNextItem( aExtDirItem, nHint ) == osl::Directory::E_None )) { bool bFileStatus = aExtDirItem.getFileStatus(fs) == osl::FileBase::E_None; bool bIsDir = fs.getFileType() == osl::FileStatus::Directory; - + if ( bFileStatus && bIsDir ) { sExtensionFolderURL = fs.getFileURL(); @@ -181,7 +181,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co { ScanResult aResult = SCANRESULT_NOTFOUND; osl::Directory aDir(sExtFolder); - + // get sub dirs if (aDir.open() == osl::FileBase::E_None) { @@ -233,13 +233,13 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_ctx ), uno::UNO_QUERY ); } - + ::rtl::OUString aExtIdentifier; if ( m_xDocBuilder.is() && m_xSimpleFileAccess.is() ) { try { - uno::Reference< io::XInputStream > xIn = + uno::Reference< io::XInputStream > xIn = m_xSimpleFileAccess->openFileRead( sDescriptionXmlURL ); if ( xIn.is() ) @@ -248,7 +248,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript if ( xDoc.is() ) { uno::Reference< xml::dom::XElement > xRoot = xDoc->getDocumentElement(); - if ( xRoot.is() && + if ( xRoot.is() && xRoot->getTagName().equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("description"))) ) { uno::Reference< xml::xpath::XXPathAPI > xPath( @@ -256,24 +256,24 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.xpath.XPathAPI")), m_ctx), uno::UNO_QUERY); - + xPath->registerNS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc")), xRoot->getNamespaceURI()); xPath->registerNS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xlink")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.w3.org/1999/xlink"))); - - try + + try { uno::Reference< xml::dom::XNode > xRootNode( xRoot, uno::UNO_QUERY ); - uno::Reference< xml::dom::XNode > xNode( + uno::Reference< xml::dom::XNode > xNode( xPath->selectSingleNode( - xRootNode, + xRootNode, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:identifier/@value")) )); if ( xNode.is() ) aExtIdentifier = xNode->getNodeValue(); - } + } catch ( xml::xpath::XPathException& ) { } @@ -283,7 +283,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript } } } - + if ( aExtIdentifier.getLength() > 0 ) { // scan extension identifier and try to match with our black list entries @@ -308,9 +308,9 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript if ( aExtIdentifier.getLength() == 0 ) { - // Fallback: + // Fallback: // Try to use the folder name to match our black list - // as some extensions don't provide an identifier in the + // as some extensions don't provide an identifier in the // description.xml! for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ ) { @@ -332,24 +332,24 @@ bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir { if ( !m_xExtensionManager.is() ) { - try + try { m_xExtensionManager = deployment::ExtensionManager::get( m_ctx ); } catch ( ucb::CommandFailedException & ){} catch ( uno::RuntimeException & ) {} } - + if ( m_xExtensionManager.is() ) { try { TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv(); - - uno::Reference< ucb::XCommandEnvironment > xCmdEnv( + + uno::Reference< ucb::XCommandEnvironment > xCmdEnv( static_cast< cppu::OWeakObject* >( pCmdEnv ), uno::UNO_QUERY ); uno::Reference< task::XAbortChannel > xAbortChannel; - uno::Reference< deployment::XPackage > xPackage = + uno::Reference< deployment::XPackage > xPackage = m_xExtensionManager->addExtension( sSourceDir, uno::Sequence<beans::NamedValue>(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), xAbortChannel, xCmdEnv ); @@ -518,7 +518,7 @@ void TmpRepositoryCommandEnv::handle( { uno::Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); - + bool approve = true; bool abort = false; @@ -542,7 +542,7 @@ void TmpRepositoryCommandEnv::handle( else if (abort) { uno::Reference< task::XInteractionAbort > xInteractionAbort( pConts[ pos ], uno::UNO_QUERY ); - if (xInteractionAbort.is()) { + if (xInteractionAbort.is()) { xInteractionAbort->select(); // don't query again for ongoing continuations: abort = false; @@ -581,6 +581,6 @@ Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( // ----------------------------------------------------------------------------- -} // namespace migration +} // namespace migration /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index adadb3b293e6..0843707fb660 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -155,7 +155,7 @@ namespace migration }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_OO3EXTENSIONMIGRATION_HXX_ diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 55576423fe92..152cded83c9b 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,14 +153,14 @@ namespace migration { return aResult; } - } + } #define MAX_HEADER_LENGTH 16 bool IsUserWordbook( const ::rtl::OUString& rFile ) { - static const sal_Char* pVerStr2 = "WBSWG2"; - static const sal_Char* pVerStr5 = "WBSWG5"; - static const sal_Char* pVerStr6 = "WBSWG6"; + static const sal_Char* pVerStr2 = "WBSWG2"; + static const sal_Char* pVerStr5 = "WBSWG5"; + static const sal_Char* pVerStr6 = "WBSWG6"; static const sal_Char* pVerOOo7 = "OOoUserDict1"; bool bRet = false; @@ -169,7 +169,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { sal_Size nSniffPos = pStream->Tell(); static sal_Size nVerOOo7Len = sal::static_int_cast< sal_Size >(strlen( pVerOOo7 )); - sal_Char pMagicHeader[MAX_HEADER_LENGTH]; + sal_Char pMagicHeader[MAX_HEADER_LENGTH]; pMagicHeader[ nVerOOo7Len ] = '\0'; if ((pStream->Read((void *) pMagicHeader, nVerOOo7Len) == nVerOOo7Len)) { @@ -184,8 +184,8 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { pStream->Read(pMagicHeader, nLen); pMagicHeader[nLen] = '\0'; - if ( !strcmp(pMagicHeader, pVerStr2) - || !strcmp(pMagicHeader, pVerStr5) + if ( !strcmp(pMagicHeader, pVerStr2) + || !strcmp(pMagicHeader, pVerStr5) || !strcmp(pMagicHeader, pVerStr6) ) bRet = true; } @@ -210,14 +210,14 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) TStringVectorPtr aFileList = getFiles( m_sSourceDir ); TStringVector::const_iterator aI = aFileList->begin(); while ( aI != aFileList->end() ) - { + { if (IsUserWordbook(*aI) ) { ::rtl::OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() ); ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName; INetURLObject aURL( sTargetName ); aURL.removeSegment(); - checkAndCreateDirectory( aURL ); + checkAndCreateDirectory( aURL ); ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { @@ -229,7 +229,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) } ++aI; } - } + } else { OSL_ENSURE( sal_False, "WordbookMigration::copyFiles: no user installation!" ); @@ -319,7 +319,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) // ----------------------------------------------------------------------------- //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 72077e16b657..8b04417dbaf7 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,18 +86,18 @@ namespace migration throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace migration +} // namespace migration //......................................................................... #endif // _DESKTOP_AUTOCORRMIGRATION_HXX_ diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 01c445630290..19899375973b 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) , m_aConnectString() , m_aProtocol() , m_bInit(sal_False) - , m_bDying(false) + , m_bDying(false) { m_rSMgr = rFactory; m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( @@ -156,7 +156,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments ) throw( Exception ) { // prevent multiple initialization - ClearableMutexGuard aGuard( m_aMutex ); + ClearableMutexGuard aGuard( m_aMutex ); RTL_LOGFILE_CONTEXT( aLog, "destop (lo119109) Acceptor::initialize()" ); sal_Bool bOk = sal_False; @@ -190,7 +190,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments ) // do we want to enable accepting? sal_Bool bEnable = sal_False; if (((nArgs == 1 && (aArguments[0] >>= bEnable)) || - (nArgs == 2 && (aArguments[1] >>= bEnable))) && + (nArgs == 2 && (aArguments[1] >>= bEnable))) && bEnable ) { m_cEnable.set(); diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index e4e22da631bd..4096b3e63c48 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ private: Condition m_cEnable; Reference< XMultiServiceFactory > m_rSMgr; - Reference< XInterface > m_rContext; + Reference< XInterface > m_rContext; Reference< XAcceptor > m_rAcceptor; Reference< XBridgeFactory > m_rBridgeFactory; diff --git a/desktop/source/pagein/file_image.h b/desktop/source/pagein/file_image.h index 4d081713a736..4234140027f2 100644 --- a/desktop/source/pagein/file_image.h +++ b/desktop/source/pagein/file_image.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/pagein/file_image_unx.c b/desktop/source/pagein/file_image_unx.c index fa1af9248d60..41d60e80350c 100644 --- a/desktop/source/pagein/file_image_unx.c +++ b/desktop/source/pagein/file_image_unx.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ int file_image_pagein (file_image * image) if ((w.m_size = image->m_size) == 0) return (0); - if (madvise (w.m_base, w.m_size, MADV_WILLNEED) == -1) + if (madvise (w.m_base, w.m_size, MADV_WILLNEED) == -1) { #ifndef MACOSX return (errno); @@ -111,7 +111,7 @@ int file_image_pagein (file_image * image) } -#ifndef MACOSX +#ifndef MACOSX if ((s = sysconf (_SC_PAGESIZE)) == -1) s = 0x1000; #else diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c index 39c319fc2d72..15623bfd8d1a 100644 --- a/desktop/source/pagein/pagein.c +++ b/desktop/source/pagein/pagein.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ int main (int argc, char **argv) /* next argv */ continue; } - + if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == 0)) { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 743790f73cfd..de8c13bcf7c3 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -1,8 +1,8 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* - * + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ struct ExtensionName const char s_usingText [] = "\n" "using: " APP_NAME " add <options> extension-path...\n" -" " APP_NAME " validate <options> extension-identifier...\n" +" " APP_NAME " validate <options> extension-identifier...\n" " " APP_NAME " remove <options> extension-identifier...\n" " " APP_NAME " list <options> extension-identifier...\n" " " APP_NAME " reinstall <options>\n" @@ -207,7 +207,7 @@ void disposeBridges(Reference<css::uno::XComponentContext> ctx) { const Sequence< Reference<css::bridge::XBridge> >seqBridges = bridgeFac->getExistingBridges(); for (sal_Int32 i = 0; i < seqBridges.getLength(); i++) - { + { Reference<css::lang::XComponent> comp(seqBridges[i], UNO_QUERY); if (comp.is()) { @@ -240,7 +240,7 @@ extern "C" int unopkg_main() OUString repository; OUString cmdArg; ::std::vector<OUString> cmdPackages; - + OptionInfo const * info_shared = getOptionInfo( s_option_infos, OUSTR("shared") ); OptionInfo const * info_force = getOptionInfo( @@ -260,10 +260,10 @@ extern "C" int unopkg_main() OptionInfo const * info_suppressLicense = getOptionInfo( s_option_infos, OUSTR("suppress-license") ); - + Reference<XComponentContext> xComponentContext; Reference<XComponentContext> xLocalComponentContext; - + try { sal_uInt32 nPos = 0; sal_uInt32 nCount = osl_getCommandArgCount(); @@ -278,7 +278,7 @@ extern "C" int unopkg_main() } //consume all bootstrap variables which may occur before the subcommannd while(isBootstrapVariable(&nPos)); - + if(nPos >= nCount) return 0; //get the sub command @@ -289,7 +289,7 @@ extern "C" int unopkg_main() RTL_CONSTASCII_STRINGPARAM("add") ); subcmd_gui = subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gui") ); - + // sun-command options and packages: while (nPos < nCount) { @@ -317,7 +317,7 @@ extern "C" int unopkg_main() OUSTR("\nERROR: unexpected option ") + cmdArg + OUSTR("!\n") + - OUSTR(" Use " APP_NAME " ") + + OUSTR(" Use " APP_NAME " ") + toString(info_help) + OUSTR(" to print all options.\n")); return 1; @@ -334,14 +334,14 @@ extern "C" int unopkg_main() } } } - - if (repository.getLength() == 0) + + if (repository.getLength() == 0) { if (option_shared) repository = OUSTR("shared"); else if (option_bundled) - repository = OUSTR("bundled"); - else + repository = OUSTR("bundled"); + else repository = OUSTR("user"); } else @@ -399,20 +399,20 @@ extern "C" int unopkg_main() //return otherwise we create the registration data again return 0; } - + } xComponentContext = getUNO( disposeGuard, option_verbose, option_shared, subcmd_gui, xLocalComponentContext ); - + Reference<deployment::XExtensionManager> xExtensionManager( deployment::ExtensionManager::get( xComponentContext ) ); Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv( createCmdEnv( xComponentContext, logFile, option_force, option_verbose, option_suppressLicense) ); - + //synchronize bundled/shared extensions //Do not synchronize when command is "reinstall". This could add types and services to UNO and //prevent the deletion of the registry data folder @@ -454,7 +454,7 @@ extern "C" int unopkg_main() throw; else if (p.is()) xExtensionManager->removeExtension( - ::dp_misc::getIdentifier(p), p->getName(), + ::dp_misc::getIdentifier(p), p->getName(), repository, Reference<task::XAbortChannel>(), xCmdEnv ); } @@ -473,20 +473,20 @@ extern "C" int unopkg_main() ::comphelper::sequenceToContainer(vecExtUnaccepted, xExtensionManager->getExtensionsWithUnacceptedLicenses( repository, xCmdEnv)); - + //This vector tells what XPackage in allExtensions has an //unaccepted license. std::vector<bool> vecUnaccepted; std::vector<Reference<deployment::XPackage> > allExtensions; if (cmdPackages.empty()) { - Sequence< Reference<deployment::XPackage> > + Sequence< Reference<deployment::XPackage> > packages = xExtensionManager->getDeployedExtensions( repository, Reference<task::XAbortChannel>(), xCmdEnv ); ::std::vector<Reference<deployment::XPackage> > vec_packages; ::comphelper::sequenceToContainer(vec_packages, packages); - + //First copy the extensions with the unaccepted license //to vector allExtensions. allExtensions.resize(vecExtUnaccepted.size() + vec_packages.size()); @@ -504,7 +504,7 @@ extern "C" int unopkg_main() ::std::fill_n(vecUnaccepted.begin(), vecExtUnaccepted.size(), true); ::std::fill_n(i_unaccepted, vec_packages.size(), false); - + dp_misc::writeConsole( OUSTR("All deployed ") + repository + OUSTR(" extensions:\n\n")); } @@ -546,15 +546,15 @@ extern "C" int unopkg_main() allExtensions.push_back(extension); vecUnaccepted.push_back(bUnacceptedLic); } - + else throw lang::IllegalArgumentException( OUSTR("There is no such extension deployed: ") + cmdPackages[pos],0,-1); } - + } - + printf_packages(allExtensions, vecUnaccepted, xCmdEnv ); } else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("validate") )) @@ -599,7 +599,7 @@ extern "C" int unopkg_main() { Reference<ui::dialogs::XAsynchronousExecutableDialog> xDialog( deployment::ui::PackageManagerDialog::createAndInstall( - xComponentContext, + xComponentContext, cmdPackages.size() > 0 ? cmdPackages[0] : OUString() )); osl::Condition dialogEnded; @@ -618,36 +618,36 @@ extern "C" int unopkg_main() //This is just here so we do not get an error, because of an unknown //sub-command. We do synching before //the sub-commands are processed. - + } else { dp_misc::writeConsoleError( - OUSTR("\nERROR: unknown sub-command ") + + OUSTR("\nERROR: unknown sub-command ") + subCommand + - OUSTR("!\n") + - OUSTR(" Use " APP_NAME " ") + + OUSTR("!\n") + + OUSTR(" Use " APP_NAME " ") + toString(info_help) + OUSTR(" to print all options.\n")); return 1; } - + if (option_verbose) dp_misc::writeConsole(OUSTR("\n"APP_NAME" done.\n")); //Force to release all bridges which connect us to the child processes disposeBridges(xLocalComponentContext); return 0; } - catch (ucb::CommandFailedException &e) + catch (ucb::CommandFailedException &e) { dp_misc::writeConsoleError(e.Message + OUSTR("\n")); - bNoOtherErrorMsg = true; + bNoOtherErrorMsg = true; } - catch (ucb::CommandAbortedException &) + catch (ucb::CommandAbortedException &) { dp_misc::writeConsoleError("\n"APP_NAME" aborted!\n"); } - catch (deployment::DeploymentException & exc) + catch (deployment::DeploymentException & exc) { OUString cause; if (option_verbose) @@ -658,7 +658,7 @@ extern "C" int unopkg_main() { css::uno::Exception e; if (exc.Cause >>= e) - cause = e.Message; + cause = e.Message; } dp_misc::writeConsoleError( @@ -667,7 +667,7 @@ extern "C" int unopkg_main() dp_misc::writeConsoleError( OUSTR(" Cause: ") + cause + OUSTR("\n")); } - catch (LockFileException & e) + catch (LockFileException & e) { if (!subcmd_gui) dp_misc::writeConsoleError(e.Message); @@ -675,10 +675,10 @@ extern "C" int unopkg_main() } catch (::com::sun::star::uno::Exception & e ) { Any exc( ::cppu::getCaughtException() ); - + dp_misc::writeConsoleError( - OUSTR("\nERROR: ") + - OUString(option_verbose ? e.Message + OUSTR("\nException details: \n") + + OUSTR("\nERROR: ") + + OUString(option_verbose ? e.Message + OUSTR("\nException details: \n") + ::comphelper::anyToString(exc) : e.Message) + OUSTR("\n")); } diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 09ad55cac8e4..c6d26b1df1ef 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,8 +92,8 @@ class CommandEnvironmentImpl void update_( Any const & Status ) throw (RuntimeException); void printLicense(const OUString & sName,const OUString& sLicense, - bool & accept, bool & decline); - + bool & accept, bool & decline); + public: virtual ~CommandEnvironmentImpl(); CommandEnvironmentImpl( @@ -102,7 +102,7 @@ public: bool option_force_overwrite, bool option_verbose, bool option_suppress_license); - + // XCommandEnvironment virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (RuntimeException); @@ -113,7 +113,7 @@ public: virtual void SAL_CALL handle( Reference< task::XInteractionRequest > const & xRequest ) throw (RuntimeException); - + // XProgressHandler virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException); virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException); @@ -175,21 +175,21 @@ void CommandEnvironmentImpl::printLicense( OUString sY = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr)); OUString sNO = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr)); OUString sN = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr)); - + OUString sNewLine(RTL_CONSTASCII_USTRINGPARAM("\n")); - + dp_misc::writeConsole(sNewLine + sNewLine + s1 + sNewLine + sNewLine); dp_misc::writeConsole(sLicense + sNewLine + sNewLine); dp_misc::writeConsole(s2 + sNewLine); dp_misc::writeConsole(s3); - + //the user may enter "yes" or "no", we compare in a case insensitive way Reference< css::i18n::XCollator > xCollator( m_xComponentContext->getServiceManager() ->createInstanceWithContext( OUSTR("com.sun.star.i18n.Collator"),m_xComponentContext), - UNO_QUERY_THROW ); - xCollator->loadDefaultCollator(OfficeLocale::get(), + UNO_QUERY_THROW ); + xCollator->loadDefaultCollator(OfficeLocale::get(), css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE); do @@ -238,13 +238,13 @@ void CommandEnvironmentImpl::handle( { Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION ); - dp_misc::TRACE(OUSTR("[unopkg_cmdenv.cxx] incoming request:\n") + dp_misc::TRACE(OUSTR("[unopkg_cmdenv.cxx] incoming request:\n") + ::comphelper::anyToString(request) + OUSTR("\n\n")); - + // selections: bool approve = false; bool abort = false; - + lang::WrappedTargetException wtExc; deployment::LicenseException licExc; deployment::InstallException instExc; @@ -316,16 +316,16 @@ void CommandEnvironmentImpl::handle( else return; // unknown request => no selection at all } - + //In case of a user declining a license abort is true but this is intended, //therefore no logging - if (abort && m_option_verbose && !bLicenseException) - { + if (abort && m_option_verbose && !bLicenseException) + { OUString msg = ::comphelper::anyToString(request); dp_misc::writeConsoleError( OUSTR("\nERROR: ") + msg + OUSTR("\n")); } - + // select: Sequence< Reference<task::XInteractionContinuation> > conts( xRequest->getContinuations() ); @@ -345,7 +345,7 @@ void CommandEnvironmentImpl::handle( else if (abort) { Reference<task::XInteractionAbort> xInteractionAbort( pConts[ pos ], UNO_QUERY ); - if (xInteractionAbort.is()) { + if (xInteractionAbort.is()) { xInteractionAbort->select(); break; } diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c index 07e310c3b402..1d5b31d03f56 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_main.c +++ b/desktop/source/pkgchk/unopkg/unopkg_main.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h index a4d66cf17c05..694cc4155813 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_main.h +++ b/desktop/source/pkgchk/unopkg/unopkg_main.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index e4f5b2fd1aed..9b20f572873f 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) OSL_ASSERT( option_info != 0 ); if (osl_getCommandArgCount() <= *pIndex) return false; - + OUString arg; osl_getCommandArg( *pIndex, &arg.pData ); sal_Int32 len = arg.getLength(); - + if (len < 2 || arg[ 0 ] != '-') return false; - + if (len == 2 && arg[ 1 ] == option_info->m_short_option) { ++(*pIndex); @@ -135,7 +135,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) arg.pData->buffer + 2, option_info->m_name ) == 0) { ++(*pIndex); - dp_misc::TRACE(OUSTR( __FILE__": identified option \'") + dp_misc::TRACE(OUSTR( __FILE__": identified option \'") + OUString::createFromAscii(option_info->m_name) + OUSTR("\'\n")); return true; } @@ -224,16 +224,16 @@ OUString makeAbsoluteFileUrl( OUString tempPath; if ( osl_getSystemPathFromFileURL( sys_path.pData, &tempPath.pData) == osl_File_E_None ) { - file_url = sys_path; + file_url = sys_path; } - else if (throw_exc) + else if (throw_exc) { throw RuntimeException( OUSTR("cannot get file url from system path: ") + sys_path, Reference< XInterface >() ); } } - + OUString abs; if (osl_getAbsoluteFileURL( base_url.pData, file_url.pData, &abs.pData ) != osl_File_E_None) @@ -291,7 +291,7 @@ void printf_package( if (version.getLength() != 0) printf_line( OUSTR("Version"), version, level + 1 ); printf_line( OUSTR("URL"), xPackage->getURL(), level + 1 ); - + beans::Optional< beans::Ambiguous<sal_Bool> > option( xPackage->isRegistered( Reference<task::XAbortChannel>(), xCmdEnv ) ); OUString value; @@ -305,7 +305,7 @@ void printf_package( else value = OUSTR("n/a"); printf_line( OUSTR("is registered"), value, level + 1 ); - + const Reference<deployment::XPackageTypeInfo> xPackageType( xPackage->getPackageType() ); OSL_ASSERT( xPackageType.is() ); @@ -377,7 +377,7 @@ namespace { Reference<XComponentContext> bootstrapStandAlone( DisposeGuard & disposeGuard, bool /*verbose */) { - Reference<XComponentContext> xContext = + Reference<XComponentContext> xContext = ::cppu::defaultBootstrap_InitialComponentContext(); // assure disposing of local component context: @@ -388,7 +388,7 @@ Reference<XComponentContext> bootstrapStandAlone( xContext->getServiceManager(), UNO_QUERY_THROW ); // set global process service factory used by unotools config helpers ::utl::setProcessServiceFactory( xServiceManager ); - + // initialize the ucbhelper ucb, // because the package implementation uses it Sequence<Any> ucb_args( 2 ); @@ -396,7 +396,7 @@ Reference<XComponentContext> bootstrapStandAlone( ucb_args[ 1 ] <<= OUSTR(UCB_CONFIGURATION_KEY2_OFFICE); if (! ::ucbhelper::ContentBroker::initialize( xServiceManager, ucb_args )) throw RuntimeException( OUSTR("cannot initialize UCB!"), 0 ); - + disposeGuard.setDeinitUCB(); return xContext; } @@ -409,7 +409,7 @@ Reference<XComponentContext> connectToOffice( Sequence<OUString> args( 3 ); args[ 0 ] = OUSTR("-nologo"); args[ 1 ] = OUSTR("-nodefault"); - + OUString pipeId( ::dp_misc::generateRandomPipeId() ); ::rtl::OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("-accept=pipe,name=") ); @@ -417,22 +417,22 @@ Reference<XComponentContext> connectToOffice( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(";urp;") ); args[ 2 ] = buf.makeStringAndClear(); OUString appURL( getExecutableDir() + OUSTR("/soffice") ); - + if (verbose) { dp_misc::writeConsole( - OUSTR("Raising process: ") + + OUSTR("Raising process: ") + appURL + OUSTR("\nArguments: -nologo -nodefault ") + - args[2] + + args[2] + OUSTR("\n")); } - + ::dp_misc::raiseProcess( appURL, args ); - + if (verbose) dp_misc::writeConsole("Ok. Connecting..."); - + OSL_ASSERT( buf.getLength() == 0 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("uno:pipe,name=") ); buf.append( pipeId ); @@ -444,7 +444,7 @@ Reference<XComponentContext> connectToOffice( UNO_QUERY_THROW ); if (verbose) dp_misc::writeConsole("Ok.\n"); - + return xRet; } @@ -454,7 +454,7 @@ Reference<XComponentContext> connectToOffice( @return the path. An empty string signifies an error. */ OUString getLockFilePath() -{ +{ OUString ret; OUString sBootstrap(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}")); rtl::Bootstrap::expandMacros(sBootstrap); @@ -462,7 +462,7 @@ OUString getLockFilePath() if (::osl::File::E_None == ::osl::File::getAbsoluteFileURL( sBootstrap, OUSTR(".lock"), sAbs)) { - if (::osl::File::E_None == + if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(sAbs, sBootstrap)) { ret = sBootstrap; @@ -472,7 +472,7 @@ OUString getLockFilePath() return ret; } //============================================================================== -Reference<XComponentContext> getUNO( +Reference<XComponentContext> getUNO( DisposeGuard & disposeGuard, bool verbose, bool shared, bool bGui, Reference<XComponentContext> & out_localContext) { @@ -492,14 +492,14 @@ Reference<XComponentContext> getUNO( xComponentContext.set( connectToOffice( xComponentContext, verbose ) ); } - else + else { if (! s_lockfile.check( 0 )) { String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get())); //Create this string before we call DeInitVCL, because this will kill //the ResMgr - String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); + String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); sMsg = sMsg + OUSTR("\n") + getLockFilePath(); @@ -513,11 +513,11 @@ Reference<XComponentContext> getUNO( throw RuntimeException( OUSTR("Cannot initialize VCL!"), NULL ); { - WarningBox warn(NULL, WB_OK | WB_DEF_OK, sMsg); + WarningBox warn(NULL, WB_OK | WB_DEF_OK, sMsg); warn.SetText(::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME).get<OUString>()); warn.SetIcon(0); - warn.Execute(); + warn.Execute(); } DeInitVCL(); } @@ -526,7 +526,7 @@ Reference<XComponentContext> getUNO( OUSTR("\n") + sError + sMsg + OUSTR("\n")); } } - + return xComponentContext; } @@ -564,7 +564,7 @@ bool hasNoFolder(OUString const & folderUrl) } i = osl::DirectoryItem(); } - + if (rcNext == osl::File::E_NOENT || rcNext == osl::File::E_None) { @@ -576,7 +576,7 @@ bool hasNoFolder(OUString const & folderUrl) dp_misc::writeConsole( OUSTR("unopkg: Error while investigating ") + url + OUSTR("\n")); } - + dir.close(); } else @@ -633,7 +633,7 @@ void removeFolder(OUString const & folderUrl) { dp_misc::writeConsole( OUSTR("unopkg: Error while removing ") + url + OUSTR("\n")); - } + } } } diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index eddb5b3e0f09..232fbf8f5260 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ namespace unopkg { } }; -struct DeploymentResMgr : public rtl::StaticWithInit< ResMgr *, DeploymentResMgr > +struct DeploymentResMgr : public rtl::StaticWithInit< ResMgr *, DeploymentResMgr > { ResMgr * operator () () { return ResMgr::CreateResMgr( "deployment", OfficeLocale::get()); @@ -85,7 +85,7 @@ struct OptionInfo struct LockFileException : public css::uno::Exception { - LockFileException(::rtl::OUString const & sMessage) : + LockFileException(::rtl::OUString const & sMessage) : css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {} }; @@ -150,7 +150,7 @@ public: if (m_xComp.is()) m_xComp->dispose(); } - + inline void reset( css::uno::Reference<css::lang::XComponent> const & xComp ) { diff --git a/desktop/source/pkgchk/unopkg/version.map b/desktop/source/pkgchk/unopkg/version.map index 6d34cb662d2c..8591bb3b5847 100644 --- a/desktop/source/pkgchk/unopkg/version.map +++ b/desktop/source/pkgchk/unopkg/version.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java index 7fc24b80398f..6ac22c7c392e 100644 --- a/desktop/source/registration/com/sun/star/registration/Registration.java +++ b/desktop/source/registration/com/sun/star/registration/Registration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ import java.util.Set; import java.net.HttpURLConnection; public class Registration { - + public static XSingleServiceFactory __getServiceFactory(String implName, XMultiServiceFactory multiFactory, XRegistryKey regKey) { XSingleServiceFactory xSingleServiceFactory = null; @@ -71,65 +71,65 @@ public class Registration { static public class _Registration implements XJob { XComponentContext xComponentContext; - + XStringSubstitution xPathSubstService = null; XExternalUriReferenceTranslator xUriTranslator = null; - + RegistrationData theRegistrationData = null; public _Registration(XComponentContext xComponentContext) { this.xComponentContext = xComponentContext; } - + private String resolvePath(String path) { try { if( xPathSubstService == null || xUriTranslator == null ) { XMultiComponentFactory theServiceManager = xComponentContext.getServiceManager(); if( xPathSubstService == null ) { Object o = theServiceManager.createInstanceWithContext( - "com.sun.star.util.PathSubstitution", + "com.sun.star.util.PathSubstitution", xComponentContext ); - xPathSubstService = (XStringSubstitution) + xPathSubstService = (XStringSubstitution) UnoRuntime.queryInterface(XStringSubstitution.class, o); } - + if( xUriTranslator == null ) { Object o = theServiceManager.createInstanceWithContext( - "com.sun.star.uri.ExternalUriReferenceTranslator", + "com.sun.star.uri.ExternalUriReferenceTranslator", xComponentContext ); xUriTranslator = (XExternalUriReferenceTranslator) UnoRuntime.queryInterface(XExternalUriReferenceTranslator.class, o); } } - + String s = xPathSubstService.substituteVariables(path, true); return xUriTranslator.translateToExternal(s); } catch (java.lang.Exception e) { return path; } } - + private void openBrowser(String url) { try { XMultiComponentFactory theServiceManager = xComponentContext.getServiceManager(); - + Object o = theServiceManager.createInstanceWithContext( - "com.sun.star.system.SystemShellExecute", + "com.sun.star.system.SystemShellExecute", xComponentContext ); - - XSystemShellExecute xShellExecuteService = (XSystemShellExecute) + + XSystemShellExecute xShellExecuteService = (XSystemShellExecute) UnoRuntime.queryInterface(XSystemShellExecute.class, o); xShellExecuteService.execute( url, "", SystemShellExecuteFlags.DEFAULTS ); } catch (java.lang.Exception e) { } - } - + } + private ServiceTag getServiceTagFromRegistrationData(File xmlFile, String productURN) { try { RegistrationData storedRegData = RegistrationData.loadFromXML(new FileInputStream(xmlFile)); Set<ServiceTag> storedServiceTags = storedRegData.getServiceTags(); - + Iterator<ServiceTag> tagIterator = storedServiceTags.iterator(); while( tagIterator.hasNext() ) { ServiceTag tag = tagIterator.next(); @@ -138,7 +138,7 @@ public class Registration { return tag; } } - + // product URN has changed, remove registration data file xmlFile.delete(); } catch (IOException e) { @@ -150,20 +150,20 @@ public class Registration { return null; } - /* + /* * XJob * * NOTE: as this Job hets triggered by the the JobExecutor service from first start * wizard and registration reminder code (because their frames do not implement - * XDispatchProvider), making this an XAsyncJob doesn't make sense as the + * XDispatchProvider), making this an XAsyncJob doesn't make sense as the * JobExecutor waits for the jobFinished call on the listener passed. */ public Object execute(NamedValue[] args) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception { final NamedValue[] f_args = args; - - new Thread( + + new Thread( new Runnable () { public void run() { try { @@ -173,19 +173,19 @@ public class Registration { } } ).start(); - + NamedValue ret[] = new NamedValue[1]; ret[0] = new NamedValue( "Deactivate", new Boolean(false) ); return ret; } - + public synchronized void executeImpl(NamedValue[] args) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception { - + // extract the interesting part of the argument list NamedValue[] theJobConfig = null; NamedValue[] theEnvironment = null; - + int c = args.length; for (int i=0; i<c; ++i) { if (args[i].Name.equals("JobConfig")) @@ -193,12 +193,12 @@ public class Registration { else if (args[i].Name.equals("Environment")) theEnvironment = (NamedValue[]) AnyConverter.toArray(args[i].Value); } - + if (theEnvironment==null) throw new com.sun.star.lang.IllegalArgumentException("no environment"); - + boolean saveConfig = false; - + String productName = ""; String productVersion = ""; String productURN = ""; @@ -207,7 +207,7 @@ public class Registration { String productDefinedInstanceID = ""; String productSource = ""; String vendor = ""; - + String urlRegData = null; String registrationURL = null; @@ -231,14 +231,14 @@ public class Registration { urlRegData = resolvePath(AnyConverter.toString(theJobConfig[i].Value)); } else if( theJobConfig[i].Name.equals("RegistrationURL") ) { registrationURL = AnyConverter.toString(theJobConfig[i].Value); - } else { + } else { System.err.println( theJobConfig[i].Name + " = " + AnyConverter.toString(theJobConfig[i].Value) ); } } if (registrationURL==null) throw new com.sun.star.lang.IllegalArgumentException("no registration url"); - + boolean local_only = false; c = theEnvironment.length; @@ -249,16 +249,16 @@ public class Registration { } } } - - try { - + + try { + /* ensure only one thread accesses/writes registration.xml at a time * regardless how many instances of this Job exist. */ synchronized( _serviceName ) { - + File xmlRegData = new File( new URI( urlRegData ) ); - + ServiceTag tag = getServiceTagFromRegistrationData(xmlRegData, productURN); if( tag == null ) { tag = ServiceTag.newInstance( @@ -273,12 +273,12 @@ public class Registration { System.getProperty("os.arch"), Installer.getZoneName(), productSource); - + theRegistrationData = new RegistrationData(); theRegistrationData.addServiceTag(tag); theRegistrationData.storeToXML( new FileOutputStream( xmlRegData ) ); } - + // Store the service tag in local registry, which might have been installed later if( Registry.isSupported() ) { // ignore communication failures with local service tag client @@ -293,11 +293,11 @@ public class Registration { } } } - + if( ! local_only ) { registrationURL = registrationURL.replaceAll("\\$\\{registry_urn\\}", theRegistrationData.getRegistrationURN()); registrationURL = registrationURL.replaceAll("\\$\\{locale\\}", Locale.getDefault().getLanguage()); - + HttpURLConnection con = (HttpURLConnection) new URL(registrationURL).openConnection(); con.setDoInput(true); con.setDoOutput(true); diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java index 87d83d5339ac..c475b75dd35f 100644 --- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java +++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ import java.net.URI; * * The implementation of the com.sun.servicetag API needs to be * compiled with JDK 5 as well since the consumer of this API - * may require to support JDK 5 (e.g. NetBeans). + * may require to support JDK 5 (e.g. NetBeans). * - * The Desktop.browse() method can be backported in this class + * The Desktop.browse() method can be backported in this class * if needed. The current implementation only supports JDK 6. */ class BrowserSupport { @@ -48,7 +48,7 @@ class BrowserSupport { private static Method browseMethod = null; private static Object desktop = null; private static volatile Boolean result = false; - + private static void initX() { if (desktop != null) { @@ -60,21 +60,21 @@ class BrowserSupport { try { // Determine if java.awt.Desktop is supported Class desktopCls = Class.forName("java.awt.Desktop", true, null); - Method getDesktopM = desktopCls.getMethod("getDesktop"); - browseM = desktopCls.getMethod("browse", URI.class); + Method getDesktopM = desktopCls.getMethod("getDesktop"); + browseM = desktopCls.getMethod("browse", URI.class); Class actionCls = Class.forName("java.awt.Desktop$Action", true, null); - final Method isDesktopSupportedMethod = desktopCls.getMethod("isDesktopSupported"); - Method isSupportedMethod = desktopCls.getMethod("isSupported", actionCls); + final Method isDesktopSupportedMethod = desktopCls.getMethod("isDesktopSupported"); + Method isSupportedMethod = desktopCls.getMethod("isSupported", actionCls); Field browseField = actionCls.getField("BROWSE"); - // isDesktopSupported calls getDefaultToolkit which can block - // infinitely, see 6636099 for details, to workaround we call + // isDesktopSupported calls getDefaultToolkit which can block + // infinitely, see 6636099 for details, to workaround we call // in a thread and time it out, noting that the issue is specific // to X11, it does not hurt for Windows. Thread xthread = new Thread() { public void run() { try { - // support only if Desktop.isDesktopSupported() and + // support only if Desktop.isDesktopSupported() and // Desktop.isSupported(Desktop.Action.BROWSE) return true. result = (Boolean) isDesktopSupportedMethod.invoke(null); } catch (IllegalAccessException e) { @@ -137,7 +137,7 @@ class BrowserSupport { static boolean isSupported() { initX(); - return isBrowseSupported; + return isBrowseSupported; } /** @@ -170,14 +170,14 @@ class BrowserSupport { } // Call Desktop.browse() method - try { + try { if (Util.isVerbose()) { System.out.println("desktop: " + desktop + ":browsing..." + uri); } browseMethod.invoke(desktop, uri); } catch (IllegalAccessException e) { // should never reach here - InternalError x = + InternalError x = new InternalError("Desktop.getDesktop() method not found"); x.initCause(e); throw x; @@ -194,8 +194,8 @@ class BrowserSupport { throw (SecurityException) x; } else { // ignore - } - } + } + } } } } diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java index ba1b5c4b86d5..41d328ca0894 100644 --- a/desktop/source/registration/com/sun/star/servicetag/Installer.java +++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,14 +43,14 @@ public class Installer { // System properties for testing private static String SVCTAG_DIR_PATH = "servicetag.dir.path"; - private static String SVCTAG_ENABLE_REGISTRATION = + private static String SVCTAG_ENABLE_REGISTRATION = "servicetag.registration.enabled"; private final static String SUN_VENDOR = "Sun Microsystems"; private final static String REGISTRATION_XML = "registration.xml"; private final static String SERVICE_TAG_FILE = "servicetag"; private final static String REGISTRATION_HTML_NAME = "register"; - private final static Locale[] knownSupportedLocales = + private final static Locale[] knownSupportedLocales = new Locale[] { Locale.ENGLISH, Locale.JAPANESE, Locale.SIMPLIFIED_CHINESE}; @@ -78,7 +78,7 @@ public class Installer { supportRegistration = isJdk(); } else { supportRegistration = true; - } + } } private Installer() { @@ -87,7 +87,7 @@ public class Installer { // Implementation of ServiceTag.getJavaServiceTag(String) method static ServiceTag getJavaServiceTag(String source) throws IOException { if (!System.getProperty("java.vendor").startsWith(SUN_VENDOR)) { - // Products bundling this implementation may run on + // Products bundling this implementation may run on // Mac OS which is not a Sun JDK return null; } @@ -133,7 +133,7 @@ public class Installer { /** * Returns the Java SE registration data located in - * the <JRE>/lib/servicetag/registration.xml by default. + * the <JRE>/lib/servicetag/registration.xml by default. * * @throws IllegalArgumentException if the registration data * is of invalid format. @@ -166,16 +166,16 @@ public class Installer { /** * Write the registration data to the registration.xml file. * - * The offline registration page has to be regenerated with - * the new registration data. + * The offline registration page has to be regenerated with + * the new registration data. * * @throws java.io.IOException */ - private static synchronized void writeRegistrationXml() + private static synchronized void writeRegistrationXml() throws IOException { if (!svcTagDir.exists()) { // This check is for NetBeans or other products that - // bundles this com.sun.servicetag implementation for + // bundles this com.sun.servicetag implementation for // pre-6u5 release. if (!svcTagDir.mkdir()) { throw new IOException("Failed to create directory: " + svcTagDir); @@ -227,7 +227,7 @@ public class Installer { return urnSet; } - /** + /** * Return the Java SE service tag(s) if it exists. * Typically only one Java SE service tag but it could have two for * Solaris 32-bit and 64-bit on the same install directory. @@ -243,7 +243,7 @@ public class Installer { String jdkUrn = props.getProperty("servicetag.jdk.urn"); String jreUrn = props.getProperty("servicetag.jre.urn"); for (ServiceTag st : svcTags) { - if (st.getProductURN().equals(jdkUrn) || + if (st.getProductURN().equals(jdkUrn) || st.getProductURN().equals(jreUrn)) { result.add(st); } @@ -263,7 +263,7 @@ public class Installer { if (st.getProductDefinedInstanceID().equals(definedId)) { return st; } - } + } return null; } @@ -278,11 +278,11 @@ public class Installer { * its <tt>instance_urn</tt> will be stored to <JRE>/lib/servicetag/servicetag. * * If <JRE>/lib/servicetag/registration.xml exists but is not installed - * in the system service tag registry (i.e. servicetag doesn't exist), + * in the system service tag registry (i.e. servicetag doesn't exist), * this method will install it as described above. * * If the system supports service tag, stclient will be used - * to create the Java SE service tag. + * to create the Java SE service tag. * * A Solaris 32-bit and 64-bit JDK will be installed in the same * directory but the registration.xml will have 2 service tags. @@ -303,7 +303,7 @@ public class Installer { // Add the service tag to the registration data in JDK/JRE newSvcTag = regData.addServiceTag(newSvcTag); - // add if there is a service tag for the OS + // add if there is a service tag for the OS ServiceTag osTag = SolarisServiceTag.getServiceTag(); if (osTag != null && regData.getServiceTag(osTag.getInstanceURN()) == null) { regData.addServiceTag(osTag); @@ -311,7 +311,7 @@ public class Installer { // write to the registration.xml writeRegistrationXml(); } - + // Install the system service tag if supported if (Registry.isSupported()) { installSystemServiceTag(); @@ -320,9 +320,9 @@ public class Installer { } private static void installSystemServiceTag() throws IOException { - // only install the service tag in the registry if + // only install the service tag in the registry if // it has permission to write the servicetag file. - if ((!serviceTagFile.exists() && !svcTagDir.canWrite()) || + if ((!serviceTagFile.exists() && !svcTagDir.canWrite()) || (serviceTagFile.exists() && !serviceTagFile.canWrite())) { return; } @@ -374,7 +374,7 @@ public class Installer { } /** - * Delete the registration data, the offline registration pages and + * Delete the registration data, the offline registration pages and * the service tags in the system service tag registry if installed. * * The registration.xml and servicetag file will be removed. @@ -392,27 +392,27 @@ public class Installer { Registry.getSystemRegistry().removeServiceTag(u); } } - registration = null; + registration = null; } finally { // Delete the registration.xml and servicetag files if exists if (regXmlFile.exists()) { if (!regXmlFile.delete()) { throw new IOException("Failed to delete " + regXmlFile); - } - } + } + } if (serviceTagFile.exists()) { if (!serviceTagFile.delete()) { throw new IOException("Failed to delete " + serviceTagFile); - } + } } } } - + /** * Updates the registration data to contain one single service tag * for the running Java runtime. */ - private static synchronized void updateRegistrationData(String svcTagSource) + private static synchronized void updateRegistrationData(String svcTagSource) throws IOException { RegistrationData regData = getRegistrationData(); ServiceTag curSvcTag = newServiceTag(svcTagSource); @@ -424,7 +424,7 @@ public class Installer { String instanceURN = st.getInstanceURN(); regData.removeServiceTag(instanceURN); - // remove it from the system service tag registry if exists + // remove it from the system service tag registry if exists if (urns.contains(instanceURN) && Registry.isSupported()) { Registry.getSystemRegistry().removeServiceTag(instanceURN); } @@ -435,7 +435,7 @@ public class Installer { } private static void writeInstalledUrns() throws IOException { - // if the Registry is not supported, + // if the Registry is not supported, // remove the servicetag file if (!Registry.isSupported() && serviceTagFile.exists()) { serviceTagFile.delete(); @@ -503,18 +503,18 @@ public class Installer { * For Solaris, it can be dual mode that can support both * 32-bit and 64-bit. the "id" will be set to * "1.6.0_03-b02 sparc sparcv9" - * + * * The "dir" property is included in the service tag to enable - * the Service Tag software to determine if a service tag for + * the Service Tag software to determine if a service tag for * Java SE is invalid and perform appropriate service tag - * cleanup if necessary. See RFE# 6574781 Service Tags Enhancement. + * cleanup if necessary. See RFE# 6574781 Service Tags Enhancement. * */ private static String getProductDefinedId() { StringBuilder definedId = new StringBuilder(); definedId.append("id="); definedId.append(System.getProperty("java.runtime.version")); - + String[] archs = getJreArchs(); for (String name : archs) { definedId.append(" " + name); @@ -550,9 +550,9 @@ public class Installer { String os = System.getProperty("os.name"); if (os.equals("SunOS") || os.equals("Linux")) { - // Traverse the directories under <JRE>/lib. + // Traverse the directories under <JRE>/lib. // If <JRE>/lib/<arch>/libjava.so exists, add <arch> - // to the product defined ID + // to the product defined ID File dir = new File(getJrePath() + File.separator + "lib"); if (dir.isDirectory()) { String[] children = dir.list(); @@ -635,7 +635,7 @@ public class Installer { return null; } - String parent = getRegisterHtmlParent(); + String parent = getRegisterHtmlParent(); // check if the offline registration page is already generated File f = new File(parent, REGISTRATION_HTML_NAME + ".html"); @@ -655,7 +655,7 @@ public class Installer { File htmlFile = new File(parent, name + ".html"); if (isVerbose()) { System.out.print("Offline registration page: " + htmlFile); - System.out.println((htmlFile.exists() ? + System.out.println((htmlFile.exists() ? "" : " not exist. Use register.html")); } if (htmlFile.exists()) { @@ -670,7 +670,7 @@ public class Installer { String language = locale.getLanguage(); String country = locale.getCountry(); String variant = locale.getVariant(); - + List<Locale> locales = new ArrayList<Locale>(3); if (variant.length() > 0) { locales.add(locale); @@ -685,14 +685,14 @@ public class Installer { } return locales; } - - // Remove the offline registration pages + + // Remove the offline registration pages private static void deleteRegistrationHtmlPage() throws IOException { - String parent = getRegisterHtmlParent(); + String parent = getRegisterHtmlParent(); if (parent == null) { return; } - + for (Locale locale : supportedLocales) { String name = REGISTRATION_HTML_NAME; if (!locale.equals(Locale.ENGLISH)) { @@ -702,7 +702,7 @@ public class Installer { if (f.exists()) { if (!f.delete()) { throw new IOException("Failed to delete " + f); - } + } } } } @@ -722,7 +722,7 @@ public class Installer { FilenameFilter ff = new FilenameFilter() { public boolean accept(File dir, String name) { String fname = name.toLowerCase(); - if (fname.startsWith("readme") && fname.endsWith(".html")) { + if (fname.startsWith("readme") && fname.endsWith(".html")) { return true; } return false; @@ -731,7 +731,7 @@ public class Installer { String[] readmes = jdkDir.list(ff); for (String name : readmes) { - String basename = name.substring(0, name.length() - ".html".length()); + String basename = name.substring(0, name.length() - ".html".length()); String[] ss = basename.split("_"); switch (ss.length) { case 1: @@ -744,7 +744,7 @@ public class Installer { supportedLocales.add(new Locale(ss[1], ss[2])); break; default: - // ignore + // ignore break; } } @@ -754,8 +754,8 @@ public class Installer { System.out.println(l); } } - } - + } + private static final String JDK_HEADER_PNG_KEY = "@@JDK_HEADER_PNG@@"; private static final String JDK_VERSION_KEY = "@@JDK_VERSION@@"; private static final String REGISTRATION_URL_KEY = "@@REGISTRATION_URL@@"; @@ -789,7 +789,7 @@ public class Installer { } finally { reader.close(); } - + String resourceFilename = "/com/sun/servicetag/resources/register"; for (Locale locale : supportedLocales) { String name = REGISTRATION_HTML_NAME; @@ -814,7 +814,7 @@ public class Installer { if (isVerbose()) { System.out.println("Generating " + f + " from " + resource + ".html"); } - + br = new BufferedReader(new InputStreamReader(in, "UTF-8")); pw = new PrintWriter(f, "UTF-8"); String line = null; @@ -851,7 +851,7 @@ public class Installer { * A utility class to create a service tag for Java SE. * <p> * <b>Usage:</b><br> - * <blockquote><tt> + * <blockquote><tt> * <JAVA_HOME>/bin/java com.sun.servicetag.Installer * </tt></blockquote> * <p> @@ -893,7 +893,7 @@ public class Installer { if (javaSvcTags.length > archs.length) { // 64-bit has been uninstalled // so remove the service tag - updateRegistrationData(source); + updateRegistrationData(source); } else { // create the service tag createServiceTag(source); diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java index 6f9cc022d223..f81d93589180 100644 --- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java +++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ package com.sun.star.servicetag; // The Service Tags team maintains the latest version of the implementation // for system environment data collection. JDK will include a copy of -// the most recent released version for a JDK release. We rename +// the most recent released version for a JDK release. We rename // the package to com.sun.servicetag so that the Sun Connection // product always uses the latest version from the com.sun.scn.servicetags // package. JDK and users of the com.sun.servicetag API @@ -156,7 +156,7 @@ class LinuxSystemEnvironment extends SystemEnvironment { // reads from dmidecode with the given type and target // returns an empty string if nothing was found or an error occurred - // + // // Sample output segment: // Handle 0x0001 // DMI type 1, 25 bytes. @@ -203,7 +203,7 @@ class LinuxSystemEnvironment extends SystemEnvironment { if (line.contains(key) && indx < line.length()) { return line.substring(indx).trim(); } - String[] ss = line.split(":"); + String[] ss = line.split(":"); return ss[ss.length-1]; } } else if (line.contains(dmiType)) { diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java index 66eb1933210a..9323e5de7e4e 100644 --- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java +++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java @@ -49,8 +49,8 @@ import java.util.Set; import static com.sun.star.servicetag.RegistrationDocument.*; /** - * A {@code RegistrationData} object is a container of one or more - * {@link #getServiceTags service tags} that identify the + * A {@code RegistrationData} object is a container of one or more + * {@link #getServiceTags service tags} that identify the * components for product registration. * Each {@code RegistrationData} object has a {@link #getRegistrationURN * uniform resource name} (URN) as its identifier. @@ -118,20 +118,20 @@ import static com.sun.star.servicetag.RegistrationDocument.*; * <a name="XMLSchema"> * <b>Registration XML Schema</b></a> * <p> - * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from - * and {@link #storeToXML stored} into an XML file in the format described + * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from + * and {@link #storeToXML stored} into an XML file in the format described * by the * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd"> - * registration data schema</a>. The registration data schema is defined by the + * registration data schema</a>. The registration data schema is defined by the * Service Tags Technology. * <p> * Typically the registration data is constructed at installation time * and stored in an XML file for later service tag lookup or registration. - * + * * <p> * <b>Example Usage</b> * <p> - * The examples below show how the {@code RegistrationData} can be + * The examples below show how the {@code RegistrationData} can be * used for product registration. * Exception handling is not shown in these examples for clarity. * <ol> @@ -146,22 +146,22 @@ import static com.sun.star.servicetag.RegistrationDocument.*; * if (Registry.isSupported()) { * Registry.getSystemRegistry().addServiceTag(st); * } - * + * * // add to the registration data * RegistrationData registration = new RegistrationData(); - * registration.addServiceTag(st); + * registration.addServiceTag(st); * </pre></blockquote> * </li> - * <li>At this point, the registration data is ready to - * send to Sun Connection for registration. This example shows how to register + * <li>At this point, the registration data is ready to + * send to Sun Connection for registration. This example shows how to register * the JDK via the <i>Registration Relay Service</i>. * <p> * There are several registration services for Sun Connection. For example, * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService"> * Registration Relay Service</a> is a web application interface that * processes the registration data payload sent via HTTP post - * and hosts the registration user interface for a specified - * registration URL. Refer to the + * and hosts the registration user interface for a specified + * registration URL. Refer to the * Registration Relay Service Specification for details. * <p> * <blockquote><pre> @@ -190,10 +190,10 @@ import static com.sun.star.servicetag.RegistrationDocument.*; * registration.storeToXML(out); * out.close(); * </pre></blockquote> - * </li> - * <li>This example shows how to install service tags that are in the + * </li> + * <li>This example shows how to install service tags that are in the * registration data in the system service tag registry when determined - * to be available. The system service tag registry might not have existed + * to be available. The system service tag registry might not have existed * when the registration data was constructed. * <br> * <blockquote><pre> @@ -206,7 +206,7 @@ import static com.sun.star.servicetag.RegistrationDocument.*; * </pre></blockquote> * </li> * </ol> - * + * * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a> */ public class RegistrationData { @@ -219,7 +219,7 @@ public class RegistrationData { * Creates a {@code RegistrationData} object with a generated * {@link #getRegistrationURN registration URN}. * The following keys in the {@link #getEnvironmentMap environment map} - * will be initialized for the configuration of the + * will be initialized for the configuration of the * running system: * <blockquote> * <tt>hostname</tt>, <tt>osName</tt>, <tt>osVersion</tt> and @@ -230,7 +230,7 @@ public class RegistrationData { public RegistrationData() { this(Util.generateURN()); } - + // package private RegistrationData(String urn) { this.urn = urn; @@ -239,7 +239,7 @@ public class RegistrationData { this.cpuInfo = initCpuInfo(sysEnv); this.svcTagMap = new LinkedHashMap<String, ServiceTag>(); } - + private Map<String, String> initEnvironment(SystemEnvironment sysEnv) { Map<String, String> map = new LinkedHashMap<String, String>(); map.put(ST_NODE_HOSTNAME, sysEnv.getHostname()); @@ -253,7 +253,7 @@ public class RegistrationData { map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber()); map.put(ST_NODE_PHYS_MEM, sysEnv.getPhysMem()); return map; - } + } private Map<String, String> initCpuInfo(SystemEnvironment sysEnv) { Map<String, String> map = new LinkedHashMap<String, String>(); @@ -263,13 +263,13 @@ public class RegistrationData { map.put(ST_NODE_CPU_NAME, sysEnv.getCpuName()); map.put(ST_NODE_CLOCK_RATE, sysEnv.getClockRate()); return map; - } - + } + /** * Returns the uniform resource name of this registration data * in this format: * <tt>urn:st:<32-char {@link java.util.UUID uuid}></tt> - * + * * @return the URN of this registration data. */ public String getRegistrationURN() { @@ -282,8 +282,8 @@ public class RegistrationData { * in the environment map. Subsequent update to the environment * map via the {@link #setEnvironment setEnvironment} method will not be reflected * in the returned map. - * - * @return an environment map for this registration data. + * + * @return an environment map for this registration data. */ public Map<String, String> getEnvironmentMap() { return new LinkedHashMap<String,String>(environment); @@ -302,13 +302,13 @@ public class RegistrationData { } /** - * Sets an element of the specified {@code name} in the environment map + * Sets an element of the specified {@code name} in the environment map * with the given {@code value}. - * + * * @throws IllegalArgumentException if {@code name} is not a valid key * in the environment map, or {@code value} is not valid. */ - public void setEnvironment(String name, String value) { + public void setEnvironment(String name, String value) { if (name == null) { throw new NullPointerException("name is null"); } @@ -326,7 +326,7 @@ public class RegistrationData { } else { throw new IllegalArgumentException("\"" + name + "\" is not an environment element."); - } + } } /** @@ -336,7 +336,7 @@ public class RegistrationData { * @throws IllegalArgumentException if {@code name} is not a valid key * in the cpu info map, or {@code value} is not valid. */ - public void setCpuInfo(String name, String value) { + public void setCpuInfo(String name, String value) { if (name == null) { throw new NullPointerException("name is null"); } @@ -348,12 +348,12 @@ public class RegistrationData { } else { throw new IllegalArgumentException("\"" + name + "\" is not an cpuinfo element."); - } + } } /** * Returns all service tags in this registration data. - * + * * @return a {@link Set Set} of the service tags * in this registration data. */ @@ -362,23 +362,23 @@ public class RegistrationData { } /** - * Adds a service tag to this registration data. + * Adds a service tag to this registration data. * If the given service tag has an empty <tt>instance_urn</tt>, - * this method will generate a URN and place it in the copy - * of the service tag in this registration data. + * this method will generate a URN and place it in the copy + * of the service tag in this registration data. * This method will return the {@code ServiceTag} object * added to this registration data. - * + * * @param st {@code ServiceTag} object to be added. * @return a {@code ServiceTag} object added to this registration data. - * - * @throws IllegalArgumentException if - * a service tag of the same {@link ServiceTag#getInstanceURN + * + * @throws IllegalArgumentException if + * a service tag of the same {@link ServiceTag#getInstanceURN * <tt>instance_urn</tt>} already exists in the registry. */ public synchronized ServiceTag addServiceTag(ServiceTag st) { ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st); - + String instanceURN = svcTag.getInstanceURN(); if (svcTagMap.containsKey(instanceURN)) { throw new IllegalArgumentException("Instance_urn = " + instanceURN + @@ -405,14 +405,14 @@ public class RegistrationData { } /** - * Removes a service tag of the given <tt>instance_urn</tt> from this + * Removes a service tag of the given <tt>instance_urn</tt> from this * registration data. * - * @param instanceURN the <tt>instance_urn</tt> of + * @param instanceURN the <tt>instance_urn</tt> of * the service tag to be removed. * * @return the removed {@code ServiceTag} object; - * or {@code null} if the service tag does not exist in this + * or {@code null} if the service tag does not exist in this * registration data. */ public synchronized ServiceTag removeServiceTag(String instanceURN) { @@ -428,15 +428,15 @@ public class RegistrationData { } /** - * Updates the <tt>product_defined_instance_id</tt> in the service tag + * Updates the <tt>product_defined_instance_id</tt> in the service tag * of the given <tt>instance_urn</tt> in this registration data. - * + * * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated. * @param productDefinedInstanceID the value of the * <tt>product_defined_instance_id</tt> to be set. - * + * * @return the updated {@code ServiceTag} object; - * or {@code null} if the service tag does not exist in this + * or {@code null} if the service tag does not exist in this * registration data. */ public synchronized ServiceTag updateServiceTag(String instanceURN, @@ -452,21 +452,21 @@ public class RegistrationData { svcTagMap.put(instanceURN, svcTag); return svcTag; } - + /** - * Reads the registration data from the XML document on the - * specified input stream. The XML document must be + * Reads the registration data from the XML document on the + * specified input stream. The XML document must be * in the format described by the <a href="#XMLSchema"> * registration data schema</a>. * The specified stream is closed after this method returns. - * + * * @param in the input stream from which to read the XML document. * @return a {@code RegistrationData} object read from the input * stream. - * - * @throws IllegalArgumentException if the input stream + * + * @throws IllegalArgumentException if the input stream * contains an invalid registration data. - * + * * @throws IOException if an error occurred when reading from the input stream. */ public static RegistrationData loadFromXML(InputStream in) throws IOException { @@ -476,15 +476,15 @@ public class RegistrationData { in.close(); } } - + /** - * Writes the registration data to the specified output stream + * Writes the registration data to the specified output stream * in the format described by the <a href="#XMLSchema"> * registration data schema</a> with "UTF-8" encoding. * The specified stream remains open after this method returns. - * + * * @param os the output stream on which to write the XML document. - * + * * @throws IOException if an error occurred when writing to the output stream. */ public void storeToXML(OutputStream os) throws IOException { @@ -492,7 +492,7 @@ public class RegistrationData { os.flush(); } - /** + /** * Returns a newly allocated byte array containing the registration * data in XML format. * @@ -513,7 +513,7 @@ public class RegistrationData { /** * Returns a string representation of this registration data in XML * format. - * + * * @return a string representation of this registration data in XML * format. */ diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java index fb13b581c0ce..4bfa1aa16af6 100644 --- a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java +++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java @@ -116,13 +116,13 @@ class RegistrationDocument { static RegistrationData load(InputStream in) throws IOException { Document document = initializeDocument(in); - + // Gets the registration URN Element root = getRegistrationDataRoot(document); Element registryRoot = getSingletonElementFromRoot(root, ST_NODE_REGISTRY); String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN); - + // Construct a new RegistrationData object from the DOM tree // Initialize the environment map and service tags RegistrationData regData = new RegistrationData(urn); @@ -136,7 +136,7 @@ class RegistrationDocument { return regData; } - static void store(OutputStream os, RegistrationData registration) + static void store(OutputStream os, RegistrationData registration) throws IOException { // create a new document with the root node Document document = initializeDocument(); @@ -146,13 +146,13 @@ class RegistrationDocument { addEnvironmentNodes(document, registration.getEnvironmentMap(), registration.getCpuInfoMap()); - addServiceTagRegistry(document, + addServiceTagRegistry(document, registration.getRegistrationURN(), registration.getServiceTags()); transform(document, os); } - // initialize a document from an input stream + // initialize a document from an input stream private static Document initializeDocument(InputStream in) throws IOException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); SchemaFactory sf = null; @@ -184,17 +184,17 @@ class RegistrationDocument { } catch (NullPointerException nex) { } - + Validator validator = null; if (schema != null) validator = schema.newValidator(); DocumentBuilder builder = factory.newDocumentBuilder(); Document doc = builder.parse(new InputSource(in)); - + if (validator != null) validator.validate(new DOMSource(doc)); - + return doc; } catch (SAXException sxe) { IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing"); @@ -265,24 +265,24 @@ class RegistrationDocument { } } - private static void addServiceTagRegistry(Document document, + private static void addServiceTagRegistry(Document document, String registryURN, Set<ServiceTag> svcTags) { // add service tag registry node and its attributes Element reg = document.createElement(ST_NODE_REGISTRY); reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN); reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION); - + Element root = getRegistrationDataRoot(document); root.appendChild(reg); - + // adds the elements for the service tags for (ServiceTag st : svcTags) { addServiceTagElement(document, reg, st); } } - private static void addServiceTagElement(Document document, + private static void addServiceTagElement(Document document, Element registryRoot, ServiceTag st) { Element svcTag = document.createElement(ST_NODE_SERVICE_TAG); @@ -337,7 +337,7 @@ class RegistrationDocument { } // build environment map from the document - private static void buildEnvironmentMap(Element envRoot, + private static void buildEnvironmentMap(Element envRoot, RegistrationData registration) { registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME)); registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID)); @@ -351,7 +351,7 @@ class RegistrationDocument { registration.setEnvironment(ST_NODE_PHYS_MEM, getTextValue(envRoot, ST_NODE_PHYS_MEM)); } - private static void buildCpuInfoMap(Element cpuInfoRoot, + private static void buildCpuInfoMap(Element cpuInfoRoot, RegistrationData registration) { registration.setCpuInfo(ST_NODE_SOCKETS, getTextValue(cpuInfoRoot, ST_NODE_SOCKETS)); registration.setCpuInfo(ST_NODE_CORES, getTextValue(cpuInfoRoot, ST_NODE_CORES)); @@ -384,7 +384,7 @@ class RegistrationDocument { private static Element getRegistrationDataRoot(Document doc) { Element root = doc.getDocumentElement(); if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) { - throw new IllegalArgumentException("Not a " + + throw new IllegalArgumentException("Not a " + ST_NODE_REGISTRATION_DATA + " node \"" + root.getNodeName() + "\""); } @@ -419,7 +419,7 @@ class RegistrationDocument { getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR), getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH), getTextValue(svcTagElement, ST_NODE_CONTAINER), - getTextValue(svcTagElement, ST_NODE_SOURCE), + getTextValue(svcTagElement, ST_NODE_SOURCE), Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)), Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP)) ); diff --git a/desktop/source/registration/com/sun/star/servicetag/Registry.java b/desktop/source/registration/com/sun/star/servicetag/Registry.java index 932b0d7e1cb5..d1b76071979b 100644 --- a/desktop/source/registration/com/sun/star/servicetag/Registry.java +++ b/desktop/source/registration/com/sun/star/servicetag/Registry.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,20 +39,20 @@ import static com.sun.star.servicetag.Util.*; import static com.sun.star.servicetag.RegistrationDocument.*; /** - * A service tag registry is a XML-based registry containing + * A service tag registry is a XML-based registry containing * the list of {@link ServiceTag service tags} installed in the system. - * The {@code Registry} class provides interfaces + * The {@code Registry} class provides interfaces * to add, remove, update, and get a service tag from a service tag * registry. * This {@code Registry} class may not be supported - * on all systems. The {@link #isSupported} method + * on all systems. The {@link #isSupported} method * can be called to determine if it is supported. * <p> * A registry may implement restrictions to only allow certain users - * to {@link #updateServiceTag update} and - * to {@link #removeServiceTag remove} a service tag record. Typically, + * to {@link #updateServiceTag update} and + * to {@link #removeServiceTag remove} a service tag record. Typically, * only the owner of the service tag, the owner of the registry - * and superuser are authorized to update or remove a service tag in + * and superuser are authorized to update or remove a service tag in * the registry. * * @see <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/ServiceTagDevGuideHelper"> @@ -89,7 +89,7 @@ public class Registry { } // This is only used for testing - stclientPath = System.getProperty(SVCTAG_STCLIENT_CMD); + stclientPath = System.getProperty(SVCTAG_STCLIENT_CMD); if (stclientPath != null) { return stclientPath; } @@ -121,17 +121,17 @@ public class Registry { } /** - * Returns the system service tag registry. The {@code Registry} class + * Returns the system service tag registry. The {@code Registry} class * may not be supported on some platforms; use the {@link #isSupported} * method to determine if it is supported. * * @return the {@code Registry} object for the system service tag registry. * - * @throws UnsupportedOperationException if the {@code Registry} class is + * @throws UnsupportedOperationException if the {@code Registry} class is * not supported. */ public static Registry getSystemRegistry() { - if (isSupported()) { + if (isSupported()) { return registry; } else { throw new UnsupportedOperationException("Registry class is not supported"); @@ -140,8 +140,8 @@ public class Registry { /** * Returns {@code true} if the {@code Registry} class is supported on this system. - * - * @return {@code true} if the {@code Registry} class is supported; + * + * @return {@code true} if the {@code Registry} class is supported; * otherwise, return {@code false}. */ public static boolean isSupported() { @@ -159,8 +159,8 @@ public class Registry { // SvcTagClient // // On Windows, the JAVA_HOME and TEST_DIR path could contain - // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java. - // The SVCTAG_STCLIENT_CMD must be set with a list of + // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java. + // The SVCTAG_STCLIENT_CMD must be set with a list of // space-separated parameters. If a parameter contains spaces, // it must be quoted with '"'. @@ -178,7 +178,7 @@ public class Registry { for (j = i+1; j < len; j++) { if (cmd.charAt(j) == separator) { break; - } + } } if (i == j-1) { @@ -202,7 +202,7 @@ public class Registry { System.out.println(s); } } - } else { + } else { command.add(getSTclient()); } return command; @@ -211,7 +211,7 @@ public class Registry { // Returns null if the service tag record not found; // or throw UnauthorizedAccessException or IOException // based on the exitValue. - private static ServiceTag checkReturnError(int exitValue, + private static ServiceTag checkReturnError(int exitValue, String output, ServiceTag st) throws IOException { switch (exitValue) { @@ -220,15 +220,15 @@ public class Registry { case ST_ERR_NOT_AUTH: if (st != null) { throw new UnauthorizedAccessException( - "Not authorized to access " + st.getInstanceURN() + + "Not authorized to access " + st.getInstanceURN() + " installer_uid=" + st.getInstallerUID()); } else { throw new UnauthorizedAccessException( - "Not authorized:" + output); + "Not authorized:" + output); } - default: + default: throw new IOException("stclient exits with error" + - " (" + exitValue + ")\n" + output); + " (" + exitValue + ")\n" + output); } } @@ -239,14 +239,14 @@ public class Registry { * copy of the service tag in this registry. * This method will return the {@code ServiceTag} representing * the service tag entry to this registry. - * + * * @param st {@code ServiceTag} object * @return a {@code ServiceTag} object representing the service tag * entry to this registry. - * + * * @throws IllegalArgumentException if a service tag of the same * <tt>instance_urn</tt> already exists in this registry. - * + * * @throws java.io.IOException if an I/O error occurs in this operation. */ public ServiceTag addServiceTag(ServiceTag st) throws IOException { @@ -255,7 +255,7 @@ public class Registry { if (st.getInstanceURN().length() > 0) { ServiceTag sysSvcTag = getServiceTag(st.getInstanceURN()); if (sysSvcTag != null) { - throw new IllegalArgumentException("Instance_urn = " + + throw new IllegalArgumentException("Instance_urn = " + st.getInstanceURN() + " already exists"); } command.add("-i"); @@ -314,7 +314,7 @@ public class Registry { return getServiceTag(urn); } else { return checkReturnError(p.exitValue(), output, st); - } + } } finally { if (in != null) { in.close(); @@ -324,16 +324,16 @@ public class Registry { /** * Removes a service tag of the given <tt>instance_urn</tt> from this - * registry. + * registry. * - * @param instanceURN the <tt>instance_urn</tt> of the service tag + * @param instanceURN the <tt>instance_urn</tt> of the service tag * to be removed. - * + * * @return the {@code ServiceTag} object removed from this registry; - * or {@code null} if the service tag does not exist in this registry. - * - * @throws UnauthorizedAccessException if the user is not authorized to - * remove the service tag of the given <tt>instance_urn</tt> + * or {@code null} if the service tag does not exist in this registry. + * + * @throws UnauthorizedAccessException if the user is not authorized to + * remove the service tag of the given <tt>instance_urn</tt> * from this registry. * * @throws java.io.IOException if an I/O error occurs in this operation. @@ -364,24 +364,24 @@ public class Registry { } /** - * Updates the <tt>product_defined_instance_id</tt> in the service tag + * Updates the <tt>product_defined_instance_id</tt> in the service tag * of the specified <tt>instance_urn</tt> in this registry. - * + * * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated. - * @param productDefinedInstanceID the value of the + * @param productDefinedInstanceID the value of the * <tt>product_defined_instance_id</tt> to be set. - * + * * @return the updated {@code ServiceTag} object; * or {@code null} if the service tag does not exist in this * registry. * - * @throws UnauthorizedAccessException if the user is not authorized to + * @throws UnauthorizedAccessException if the user is not authorized to * update the service tag from this registry. * * @throws IOException if an I/O error occurs in this operation. */ public ServiceTag updateServiceTag(String instanceURN, - String productDefinedInstanceID) + String productDefinedInstanceID) throws IOException { ServiceTag svcTag = getServiceTag(instanceURN); if (svcTag == null) { @@ -417,11 +417,11 @@ public class Registry { /** * Returns a {@code ServiceTag} object of the given <tt>instance_urn</tt> * in this registry. - * + * * @param instanceURN the <tt>instance_urn</tt> of the service tag * @return a {@code ServiceTag} object of the given <tt>instance_urn</tt> * in this registry; or {@code null} if not found. - * + * * @throws java.io.IOException if an I/O error occurs in this operation. */ public ServiceTag getServiceTag(String instanceURN) throws IOException { @@ -505,13 +505,13 @@ public class Registry { } /** - * Returns the service tags of the specified + * Returns the service tags of the specified * <tt>product_urn</tt> in this registry. - * + * * @param productURN the <tt>product_urn</tt> to look up * @return a {@code Set} of {@code ServiceTag} objects * of the specified <tt>product_urn</tt> in this registry. - * + * * @throws java.io.IOException if an I/O error occurs in this operation. */ public Set<ServiceTag> findServiceTags(String productURN) throws IOException { diff --git a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java index 4adb36772517..cbaf44e1d0d9 100644 --- a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java +++ b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ import java.io.IOException; import static com.sun.star.servicetag.RegistrationDocument.*; /** - * A service tag is an XML-based data structure that identifies a product or - * a component on a system. The service tag schema is defined by the + * A service tag is an XML-based data structure that identifies a product or + * a component on a system. The service tag schema is defined by the * Service Tags Technology. The location of the DTD file is platform dependent. * On Solaris, see <tt>/usr/share/lib/xml/dtd/servicetag.dtd</tt>. * <p> @@ -54,15 +54,15 @@ import static com.sun.star.servicetag.RegistrationDocument.*; * <li>{@link #getInstallerUID <tt>installer_uid</tt>}</li> * <li>{@link #getTimestamp <tt>timestamp</tt>}</li> * </ul> - * - * The <tt>instance_urn</tt> can be specified when a {@code ServiceTag} + * + * The <tt>instance_urn</tt> can be specified when a {@code ServiceTag} * object is created, or it can be generated when it is added to * a {@link RegistrationData} object, or {@link Registry - * system service tag registry}. The <tt>installer_uid</tt> and + * system service tag registry}. The <tt>installer_uid</tt> and * <tt>timestamp</tt> are set when a {@code ServiceTag} object * is added to a {@link RegistrationData} object, or {@link Registry * system service tag registry}. - * + * * @see <a href="https://sunconnection.sun.com/FAQ/sc_faq.html">Service Tags FAQ</a> */ public class ServiceTag { @@ -72,7 +72,7 @@ public class ServiceTag { private String productVersion; private String productURN; private String productParent; - private String productParentURN; + private String productParentURN; private String productDefinedInstanceID; private String productVendor; private String platformArch; @@ -82,7 +82,7 @@ public class ServiceTag { private Date timestamp; // Service Tag Field Lengths (defined in sthelper.h) - // Since the constants defined in sthelper.h includes the null-terminated + // Since the constants defined in sthelper.h includes the null-terminated // character, so minus 1 from the sthelper.h defined values. private final int MAX_URN_LEN = 256 - 1; private final int MAX_PRODUCT_NAME_LEN = 256 - 1; @@ -124,10 +124,10 @@ public class ServiceTag { setInstallerUID(installerUID); setTimestamp(timestamp); } - + /** * Creates a service tag object with no <tt>instance_urn</tt>. - * + * * @param productName the name of the product. * @param productVersion the version of the product. * @param productURN the uniform resource name of the product @@ -138,9 +138,9 @@ public class ServiceTag { * @param platformArch the operating system architecture. * @param container the container of the product. * @param source the source of the product. - * + * * @throws IllegalArgumentException if any value of the input fields - * does not conform to the service tag XML schema. + * does not conform to the service tag XML schema. */ public static ServiceTag newInstance(String productName, String productVersion, @@ -169,7 +169,7 @@ public class ServiceTag { /** * Creates a service tag object with a specified <tt>instance_urn</tt>. - * + * * @param instanceURN the uniform resource name of this instance. * @param productName the name of the product. * @param productVersion the version of the product. @@ -181,9 +181,9 @@ public class ServiceTag { * @param platformArch the operating system architecture. * @param container the container of the product. * @param source the source of the product. - * - * @throws IllegalArgumentException if any value of the input fields - * does not conform to the service tag XML schema. + * + * @throws IllegalArgumentException if any value of the input fields + * does not conform to the service tag XML schema. */ public static ServiceTag newInstance(String instanceURN, String productName, @@ -214,7 +214,7 @@ public class ServiceTag { // Creates a copy of the ServiceTag instance // with instance_urn and timestamp initialized static ServiceTag newInstanceWithUrnTimestamp(ServiceTag st) { - String instanceURN = + String instanceURN = (st.getInstanceURN().length() == 0 ? Util.generateURN() : st.getInstanceURN()); ServiceTag svcTag = new ServiceTag(instanceURN, @@ -232,18 +232,18 @@ public class ServiceTag { new Date()); return svcTag; } - + /** * Returns a uniform resource name (URN) in this format: * <blockquote> * "<tt>urn:st:<32-char {@link java.util.UUID uuid}></tt>" - * </blockquote> + * </blockquote> * @return a URN. */ public static String generateInstanceURN() { return Util.generateURN(); } - + /** * Returns the uniform resource name of this service tag instance. * @@ -256,7 +256,7 @@ public class ServiceTag { /** * Returns the name of the product. * - * @return the product name. + * @return the product name. */ public String getProductName() { return productName; @@ -265,21 +265,21 @@ public class ServiceTag { /** * Returns the version of the product. * - * @return the product version. + * @return the product version. */ public String getProductVersion() { return productVersion; } - + /** * Returns the uniform resource name of the product. * - * @return the product URN. + * @return the product URN. */ public String getProductURN() { return productURN; } - + /** * Returns the uniform resource name of the product's parent. * @@ -288,25 +288,25 @@ public class ServiceTag { public String getProductParentURN() { return productParentURN; } - + /** * Returns the name of the product's parent. * - * @return the product's parent name. + * @return the product's parent name. */ public String getProductParent() { return productParent; } - + /** * Returns the identifier defined for this product instance. * - * @return the identifier defined for this product instance. + * @return the identifier defined for this product instance. */ public String getProductDefinedInstanceID() { return productDefinedInstanceID; } - + /** * Returns the vendor of the product. * @@ -315,9 +315,9 @@ public class ServiceTag { public String getProductVendor() { return productVendor; } - + /** - * Returns the platform architecture on which the product + * Returns the platform architecture on which the product * is running on. * * @return the platform architecture on which the product is running on. @@ -328,12 +328,12 @@ public class ServiceTag { /** * Returns the timestamp. This timestamp is set when this service tag - * is added to or updated in a {@code RegistrationData} object or + * is added to or updated in a {@code RegistrationData} object or * the system service tag registry. * This method may return {@code null}. * - * @return timestamp when this service tag - * is added to or updated in a {@code RegistrationData} object or + * @return timestamp when this service tag + * is added to or updated in a {@code RegistrationData} object or * the system service tag registry, or {@code null}. */ public Date getTimestamp() { @@ -372,7 +372,7 @@ public class ServiceTag { * * @return the UID of whom this service tag * is added to or updated in the system service tag registry, - * or {@code -1}. + * or {@code -1}. */ public int getInstallerUID() { return installerUID; @@ -380,7 +380,7 @@ public class ServiceTag { // The following setter methods are used to validate the // input field when constructing a ServiceTag instance - + private void setInstanceURN(String instanceURN) { if (instanceURN == null) { throw new NullPointerException("Parameter instanceURN cannot be null"); @@ -391,7 +391,7 @@ public class ServiceTag { } this.instanceURN = instanceURN; } - + private void setProductName(String productName) { if (productName == null) { throw new NullPointerException("Parameter productName cannot be null"); @@ -410,13 +410,13 @@ public class ServiceTag { if (productVersion == null) { throw new NullPointerException("Parameter productVersion cannot be null"); } - + if (productVersion.length() == 0) { throw new IllegalArgumentException("product version cannot be empty"); } if (productVersion.length() > MAX_PRODUCT_VERSION_LEN) { - throw new IllegalArgumentException("productVersion \"" + - productVersion + "\" exceeds maximum length " + + throw new IllegalArgumentException("productVersion \"" + + productVersion + "\" exceeds maximum length " + MAX_PRODUCT_VERSION_LEN); } this.productVersion = productVersion; @@ -442,8 +442,8 @@ public class ServiceTag { } // optional field - can be empty if (productParentURN.length() > MAX_URN_LEN) { - throw new IllegalArgumentException("productParentURN \"" + - productParentURN + "\" exceeds maximum length " + + throw new IllegalArgumentException("productParentURN \"" + + productParentURN + "\" exceeds maximum length " + MAX_URN_LEN); } this.productParentURN = productParentURN; @@ -457,8 +457,8 @@ public class ServiceTag { throw new IllegalArgumentException("product parent cannot be empty"); } if (productParent.length() > MAX_PRODUCT_PARENT_LEN) { - throw new IllegalArgumentException("productParent \"" + - productParent + "\" exceeds maximum length " + + throw new IllegalArgumentException("productParent \"" + + productParent + "\" exceeds maximum length " + MAX_PRODUCT_PARENT_LEN); } this.productParent = productParent; @@ -469,8 +469,8 @@ public class ServiceTag { throw new NullPointerException("Parameter productDefinedInstanceID cannot be null"); } if (productDefinedInstanceID.length() > MAX_URN_LEN) { - throw new IllegalArgumentException("productDefinedInstanceID \"" + - productDefinedInstanceID + "\" exceeds maximum length " + + throw new IllegalArgumentException("productDefinedInstanceID \"" + + productDefinedInstanceID + "\" exceeds maximum length " + MAX_URN_LEN); } // optional field - can be empty @@ -485,13 +485,13 @@ public class ServiceTag { throw new IllegalArgumentException("product vendor cannot be empty"); } if (productVendor.length() > MAX_PRODUCT_VENDOR_LEN) { - throw new IllegalArgumentException("productVendor \"" + - productVendor + "\" exceeds maximum length " + + throw new IllegalArgumentException("productVendor \"" + + productVendor + "\" exceeds maximum length " + MAX_PRODUCT_VENDOR_LEN); } this.productVendor = productVendor; } - + private void setPlatformArch(String platformArch) { if (platformArch == null) { throw new NullPointerException("Parameter platformArch cannot be null"); @@ -500,8 +500,8 @@ public class ServiceTag { throw new IllegalArgumentException("platform architecture cannot be empty"); } if (platformArch.length() > MAX_PLATFORM_ARCH_LEN) { - throw new IllegalArgumentException("platformArch \"" + - platformArch + "\" exceeds maximum length " + + throw new IllegalArgumentException("platformArch \"" + + platformArch + "\" exceeds maximum length " + MAX_PLATFORM_ARCH_LEN); } this.platformArch = platformArch; @@ -520,8 +520,8 @@ public class ServiceTag { throw new IllegalArgumentException("container cannot be empty"); } if (container.length() > MAX_CONTAINER_LEN) { - throw new IllegalArgumentException("container \"" + - container + "\" exceeds maximum length " + + throw new IllegalArgumentException("container \"" + + container + "\" exceeds maximum length " + MAX_CONTAINER_LEN); } this.container = container; @@ -546,13 +546,13 @@ public class ServiceTag { } /** - * Compares this service tag to the specified object. - * The result is {@code true} if and only if the argument is + * Compares this service tag to the specified object. + * The result is {@code true} if and only if the argument is * not {@code null} and is a {@code ServiceTag} object whose - * <tt>instance_urn</tt> is the same as the + * <tt>instance_urn</tt> is the same as the * <tt>instance_urn</tt> of this service tag. * - * @return {@code true} if this service tag is the same as + * @return {@code true} if this service tag is the same as * the specified object. */ @Override @@ -612,17 +612,17 @@ public class ServiceTag { * <p> * This method is designed for Sun software that bundles the JDK * or the JRE to use. It is recommended that the {@code source} - * string contains information about the bundling software + * string contains information about the bundling software * such as the name and the version of the software bundle, * for example, * <blockquote> * <tt>NetBeans IDE 6.0 with JDK 6 Update 5 Bundle</tt> * </blockquote> * in a NetBeans/JDK bundle. - * <p> + * <p> * At the first time to call this method the application * is required to have the write permission to the installed - * directory of this running JDK or JRE instance. + * directory of this running JDK or JRE instance. * * @param source the source that bundles the JDK or the JRE. * @return a {@code ServiceTag} object for the Java platform, diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java index 4f99d890577f..8378c78e76a0 100644 --- a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java +++ b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ import java.io.IOException; import java.util.Set; /** - * Utility class to obtain the service tag for the Solaris Operating System. + * Utility class to obtain the service tag for the Solaris Operating System. */ class SolarisServiceTag { private final static String[] SolarisProductURNs = new String[] { @@ -56,7 +56,7 @@ class SolarisServiceTag { for (ServiceTag st : instances) { // there should have only one service tag for the OS return st; - } + } } } return null; diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java index fa98580fd6b5..a9c094d1afac 100644 --- a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java +++ b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ package com.sun.star.servicetag; // The Service Tags team maintains the latest version of the implementation // for system environment data collection. JDK will include a copy of -// the most recent released version for a JDK release. We rename +// the most recent released version for a JDK release. We rename // the package to com.sun.servicetag so that the Sun Connection // product always uses the latest version from the com.sun.scn.servicetags // package. JDK and users of the com.sun.servicetag API diff --git a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java index db525ea637f4..9b9c7595acc6 100644 --- a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java +++ b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ import javax.net.ssl.HttpsURLConnection; * locale=<locale-lang> * * @see https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/ - * + * */ class SunConnection { @@ -56,7 +56,7 @@ class SunConnection { "https://inventory.sun.com/RegistrationWeb/register"; private static String SANDBOX_TESTING_URL = "https://connection-tst.sun.com/RegistrationWeb/register"; - + // System properties for testing private static String SVCTAG_REGISTER_TESTING = "servicetag.register.testing"; private static String SVCTAG_REGISTRATION_URL = "servicetag.registration.url"; @@ -70,12 +70,12 @@ class SunConnection { * registration relay service in this form: * <registration-url>/<registry_urn>?product=jdk&locale=<locale-lang> * - * The <registration-url> can be overridden by an environment + * The <registration-url> can be overridden by an environment * variable or a system property. * * 1) "servicetag.register.testing" system property to switch to the * Sun Connection registration sandbox testing. - * 2) "servicetag.registration.url" system property to override + * 2) "servicetag.registration.url" system property to override * the URL * 3) Default production URL * @@ -83,15 +83,15 @@ class SunConnection { static URL getRegistrationURL(String registrationURN) { String url = System.getProperty(SVCTAG_REGISTRATION_URL); if (url == null) { - if (System.getProperty(SVCTAG_REGISTER_TESTING) != null) { + if (System.getProperty(SVCTAG_REGISTER_TESTING) != null) { url = SANDBOX_TESTING_URL; } else { url = JDK_REGISTRATION_URL; } } - // trim whitespaces - url = url.trim(); + // trim whitespaces + url = url.trim(); if (url.length() == 0) { throw new InternalError("Empty registration url set"); } @@ -102,13 +102,13 @@ class SunConnection { return new URL(registerURL); } catch (MalformedURLException ex) { // should never reach here - InternalError x = + InternalError x = new InternalError(ex.getMessage()); x.initCause(ex); - throw x; + throw x; } } - + private static String rewriteURL(String url, String registryURN) { StringBuilder sb = new StringBuilder(url.trim()); int len = sb.length(); @@ -125,9 +125,9 @@ class SunConnection { /** * Registers all products in the given product registry. If it fails - * to post the service tag registry, open the browser with the offline + * to post the service tag registry, open the browser with the offline * registration page. - * + * * @param regData registration data to be posted to the Sun Connection * for registration. * @@ -185,7 +185,7 @@ class SunConnection { * @param streg the Service Tag registry * @return true if posting succeeds; otherwise, false. */ - private static boolean postRegistrationData(URL url, + private static boolean postRegistrationData(URL url, RegistrationData registration) { try { HttpsURLConnection con = (HttpsURLConnection) url.openConnection(); @@ -205,7 +205,7 @@ class SunConnection { con.setRequestMethod("POST"); con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\""); con.connect(); - + OutputStream out = con.getOutputStream(); registration.storeToXML(out); out.flush(); @@ -233,7 +233,7 @@ class SunConnection { /** * Opens the offline registratioin page in the browser. - * + * */ private static void openOfflineRegisterPage() throws IOException { @@ -249,7 +249,7 @@ class SunConnection { BrowserSupport.browse(registerPage.toURI()); } catch (FileNotFoundException ex) { // should never reach here - InternalError x = + InternalError x = new InternalError("Error in launching " + registerPage + ": " + ex.getMessage()); x.initCause(ex); throw x; diff --git a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java index ca0a16858670..0f03d0d621b6 100644 --- a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java +++ b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ public class SysnetRegistryHelper { } // This is only used for testing - stclientPath = System.getProperty(SVCTAG_STCLIENT_CMD); + stclientPath = System.getProperty(SVCTAG_STCLIENT_CMD); if (stclientPath != null) { return stclientPath; } @@ -115,8 +115,8 @@ public class SysnetRegistryHelper { // SvcTagClient // // On Windows, the JAVA_HOME and TEST_DIR path could contain - // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java. - // The SVCTAG_STCLIENT_CMD must be set with a list of + // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java. + // The SVCTAG_STCLIENT_CMD must be set with a list of // space-separated parameters. If a parameter contains spaces, // it must be quoted with '"'. @@ -134,7 +134,7 @@ public class SysnetRegistryHelper { for (j = i+1; j < len; j++) { if (cmd.charAt(j) == separator) { break; - } + } } if (i == j-1) { @@ -158,7 +158,7 @@ public class SysnetRegistryHelper { System.out.println(s); } } - } else { + } else { command.add(getSTclient()); } return command; @@ -167,7 +167,7 @@ public class SysnetRegistryHelper { // Returns null if the service tag record not found; // or throw UnauthorizedAccessException or IOException // based on the exitValue. - private static ServiceTag checkReturnError(int exitValue, + private static ServiceTag checkReturnError(int exitValue, String output, ServiceTag st) throws IOException { switch (exitValue) { @@ -176,15 +176,15 @@ public class SysnetRegistryHelper { case ST_ERR_NOT_AUTH: if (st != null) { throw new UnauthorizedAccessException( - "Not authorized to access " + st.getInstanceURN() + + "Not authorized to access " + st.getInstanceURN() + " installer_uid=" + st.getInstallerUID()); } else { throw new UnauthorizedAccessException( - "Not authorized:" + output); + "Not authorized:" + output); } - default: + default: throw new IOException("stclient exits with error" + - " (" + exitValue + ")\n" + output); + " (" + exitValue + ")\n" + output); } } @@ -280,9 +280,9 @@ public class SysnetRegistryHelper { /** * Returns the urn of this registry. - * + * * @return a {@code String} for the urn of this registry. - * + * * @throws java.io.IOException if an I/O error occurs in this operation. */ // Once JDK makes this method available, we'll deprecate this method diff --git a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java index 76eaca37e39a..013c1251bc78 100644 --- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java +++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ package com.sun.star.servicetag; // The Service Tags team maintains the latest version of the implementation // for system environment data collection. JDK will include a copy of -// the most recent released version for a JDK release. We rename +// the most recent released version for a JDK release. We rename // the package to com.sun.servicetag so that the Sun Connection // product always uses the latest version from the com.sun.scn.servicetags // package. JDK and users of the com.sun.servicetag API @@ -394,7 +394,7 @@ public class SystemEnvironment { br.close(); } catch (IOException e) { // ignore - } + } } } } @@ -429,7 +429,7 @@ public class SystemEnvironment { br.close(); } catch (IOException e) { // ignore - } + } } } } diff --git a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java index 898fb614c267..a6d41e07b3cf 100644 --- a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java +++ b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,15 +28,15 @@ package com.sun.star.servicetag; /** - * Thrown if the user is not authorized to + * Thrown if the user is not authorized to * {@link Registry#updateServiceTag update} or - * {@link Registry#removeServiceTag remove} + * {@link Registry#removeServiceTag remove} * a service tag from a {@link Registry}. */ public class UnauthorizedAccessException extends RuntimeException { /** - * Constructs an <code>UnauthorizedAccessException</code> object + * Constructs an <code>UnauthorizedAccessException</code> object * without detail message. */ public UnauthorizedAccessException() { diff --git a/desktop/source/registration/com/sun/star/servicetag/Util.java b/desktop/source/registration/com/sun/star/servicetag/Util.java index 1f54775e7d3c..c1cb14f7c2d5 100644 --- a/desktop/source/registration/com/sun/star/servicetag/Util.java +++ b/desktop/source/registration/com/sun/star/servicetag/Util.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -207,8 +207,8 @@ class Util { private static byte[] stringToByteArray(String str) { return (str + "\u0000").getBytes(); } - - /** + + /** * Converts a null-terminated byte array to java string */ private static String byteArrayToString(byte[] array) { @@ -216,7 +216,7 @@ class Util { } /** - * Gets the stclient path using a well known location from + * Gets the stclient path using a well known location from * the Windows platform Registry, otherwise it will return null. */ static File getWindowsStClientFile() { @@ -235,7 +235,7 @@ class Util { } /** - * This uses reflection to access a private java windows registry + * This uses reflection to access a private java windows registry * interface, any changes to that Class must be appropriately adjusted. * Returns a null if unsuccessful. */ @@ -245,15 +245,15 @@ class Util { Class<?> clazz = Class.forName("java.util.prefs.WindowsPreferences"); // Get the registry methods - Method winRegOpenKeyM = clazz.getDeclaredMethod("WindowsRegOpenKey", + Method winRegOpenKeyM = clazz.getDeclaredMethod("WindowsRegOpenKey", int.class, byte[].class, int.class); winRegOpenKeyM.setAccessible(true); - Method winRegCloseKeyM = clazz.getDeclaredMethod("WindowsRegCloseKey", + Method winRegCloseKeyM = clazz.getDeclaredMethod("WindowsRegCloseKey", int.class); winRegCloseKeyM.setAccessible(true); - Method winRegQueryValueM = clazz.getDeclaredMethod("WindowsRegQueryValueEx", + Method winRegQueryValueM = clazz.getDeclaredMethod("WindowsRegQueryValueEx", int.class, byte[].class); winRegQueryValueM.setAccessible(true); @@ -272,7 +272,7 @@ class Util { int[] result = (int[]) winRegOpenKeyM.invoke(null, HKLM, reg, KEY_READ); if (result[ERROR_CODE] == ERROR_SUCCESS) { - byte[] stvalue = (byte[]) winRegQueryValueM.invoke(null, + byte[] stvalue = (byte[]) winRegQueryValueM.invoke(null, result[NATIVE_HANDLE], key); out = byteArrayToString(stvalue); winRegCloseKeyM.invoke(null, result[NATIVE_HANDLE]); diff --git a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java index 3aa799e16d5e..fd500a8ac810 100644 --- a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java +++ b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ class WindowsSystemEnvironment extends SystemEnvironment { super(); // run a call to make sure things are initialized - // ignore the first call result as the system may + // ignore the first call result as the system may // give inconsistent data on the first invocation ever - getWmicResult("computersystem", "get", "model"); + getWmicResult("computersystem", "get", "model"); setSystemModel(getWmicResult("computersystem", "get", "model")); setSystemManufacturer(getWmicResult("computersystem", "get", "manufacturer")); @@ -131,7 +131,7 @@ class WindowsSystemEnvironment extends SystemEnvironment { * This method invokes wmic outside of the normal environment * collection routines. * - * An initial call to wmic can be costly in terms of time. + * An initial call to wmic can be costly in terms of time. * * <code> * Details of why the first call is costly can be found at: diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx index 520600b4207f..664c0dadb269 100644 --- a/desktop/source/so_comp/evaluation.cxx +++ b/desktop/source/so_comp/evaluation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ using namespace ::com::sun::star::registry; namespace desktop { -static SOEvaluation* pSOEval=0; +static SOEvaluation* pSOEval=0; const char* SOEvaluation::interfaces[] = { @@ -74,16 +74,16 @@ Sequence< OUString > SOEvaluation::GetSupportedServiceNames() { sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *)) - 1; Sequence< OUString > aResult( nSize ); - + for( sal_Int32 i = 0; i < nSize; i++ ) aResult[i] = OUString::createFromAscii( interfaces[i] ); return aResult; } -Reference< XInterface > SAL_CALL SOEvaluation::CreateInstance( +Reference< XInterface > SAL_CALL SOEvaluation::CreateInstance( const Reference< XMultiServiceFactory >& rSMgr ) { - static osl::Mutex aMutex; + static osl::Mutex aMutex; if ( pSOEval == 0 ) { osl::MutexGuard guard( aMutex ); @@ -93,7 +93,7 @@ Reference< XInterface > SAL_CALL SOEvaluation::CreateInstance( return (XComponent*)0; } -SOEvaluation::SOEvaluation( const Reference< XMultiServiceFactory >& xFactory ) : +SOEvaluation::SOEvaluation( const Reference< XMultiServiceFactory >& xFactory ) : m_aListeners( m_aMutex ), m_xServiceManager( xFactory ) { @@ -168,36 +168,36 @@ Any SAL_CALL SOEvaluation::getMaterial() throw( RuntimeException ) Any a; // change here to force recompile 00002 -#ifdef TIMEBOMB +#ifdef TIMEBOMB // Code for extracting/providing time bomb date! int nDay = TIMEBOMB % 100; int nMonth = ( TIMEBOMB % 10000 ) / 100; int nYear = TIMEBOMB / 10000; - com::sun::star::util::Date aDate( nDay, nMonth, nYear ); + com::sun::star::util::Date aDate( nDay, nMonth, nYear ); a <<= aDate; #endif return a; } // XServiceInfo -::rtl::OUString SAL_CALL SOEvaluation::getImplementationName() +::rtl::OUString SAL_CALL SOEvaluation::getImplementationName() throw ( RuntimeException ) { return SOEvaluation::GetImplementationName(); } -sal_Bool SAL_CALL SOEvaluation::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SOEvaluation::supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ) { sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *))-1; - + for( sal_Int32 i = 0; i < nSize; i++ ) if ( rServiceName.equalsAscii( interfaces[i] )) return sal_True; return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SOEvaluation::getSupportedServiceNames() +Sequence< ::rtl::OUString > SAL_CALL SOEvaluation::getSupportedServiceNames() throw ( RuntimeException ) { return SOEvaluation::GetSupportedServiceNames(); diff --git a/desktop/source/so_comp/evaluation.hxx b/desktop/source/so_comp/evaluation.hxx index aff94c3ac6f4..a34cc65253e8 100644 --- a/desktop/source/so_comp/evaluation.hxx +++ b/desktop/source/so_comp/evaluation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,32 +52,32 @@ namespace desktop { class SOEvaluation : public ::cppu::WeakImplHelper4< XExactName, XMaterialHolder, XComponent, XServiceInfo > { - ::osl::Mutex m_aMutex; - ::cppu::OInterfaceContainerHelper m_aListeners; - Reference< XMultiServiceFactory > m_xServiceManager; + ::osl::Mutex m_aMutex; + ::cppu::OInterfaceContainerHelper m_aListeners; + Reference< XMultiServiceFactory > m_xServiceManager; public: SOEvaluation( const Reference < XMultiServiceFactory >& xFactory ); virtual ~SOEvaluation(); - static Reference< XSingleServiceFactory > GetSOEvaluationFactory( Reference< XMultiServiceFactory > & xSMgr ); - static ::rtl::OUString GetImplementationName(); - static Sequence< rtl::OUString > GetSupportedServiceNames(); + static Reference< XSingleServiceFactory > GetSOEvaluationFactory( Reference< XMultiServiceFactory > & xSMgr ); + static ::rtl::OUString GetImplementationName(); + static Sequence< rtl::OUString > GetSupportedServiceNames(); // XComponent - virtual void SAL_CALL dispose() throw ( RuntimeException ); - virtual void SAL_CALL addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException ); - virtual void SAL_CALL removeEventListener(const Reference< XEventListener > & aListener) throw ( RuntimeException ); + virtual void SAL_CALL dispose() throw ( RuntimeException ); + virtual void SAL_CALL addEventListener( const Reference< XEventListener > & aListener) throw ( RuntimeException ); + virtual void SAL_CALL removeEventListener(const Reference< XEventListener > & aListener) throw ( RuntimeException ); // XExactName - virtual rtl::OUString SAL_CALL getExactName( const rtl::OUString& rApproximateName ) throw ( RuntimeException ); + virtual rtl::OUString SAL_CALL getExactName( const rtl::OUString& rApproximateName ) throw ( RuntimeException ); // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw ( RuntimeException ); + virtual Any SAL_CALL getMaterial() throw ( RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ); virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); static const char* interfaces[]; diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx index 15e05a7bf61d..22bad75af489 100644 --- a/desktop/source/so_comp/oemjob.cxx +++ b/desktop/source/so_comp/oemjob.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,9 +54,9 @@ using namespace ::com::sun::star::util; namespace desktop{ char const OEM_PRELOAD_SECTION[] = "Bootstrap"; -char const OEM_PRELOAD[] = "Preload"; -char const STR_TRUE[] = "1"; -char const STR_FALSE[] = "0"; +char const OEM_PRELOAD[] = "Preload"; +char const STR_TRUE[] = "1"; +char const STR_FALSE[] = "0"; const char* OEMPreloadJob::interfaces[] = { @@ -75,7 +75,7 @@ Sequence< OUString > OEMPreloadJob::GetSupportedServiceNames() { sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *)) - 1; Sequence< OUString > aResult( nSize ); - + for( sal_Int32 i = 0; i < nSize; i++ ) aResult[i] = OUString::createFromAscii( interfaces[i] ); return aResult; @@ -84,12 +84,12 @@ Sequence< OUString > OEMPreloadJob::GetSupportedServiceNames() Reference< XInterface > SAL_CALL OEMPreloadJob::CreateInstance( const Reference< XMultiServiceFactory >& rSMgr ) { - static osl::Mutex aMutex; + static osl::Mutex aMutex; osl::MutexGuard guard( aMutex ); return (XComponent*) ( new OEMPreloadJob( rSMgr ) ); } -OEMPreloadJob::OEMPreloadJob( const Reference< XMultiServiceFactory >& xFactory ) : +OEMPreloadJob::OEMPreloadJob( const Reference< XMultiServiceFactory >& xFactory ) : m_aListeners( m_aMutex ), m_xServiceManager( xFactory ) { @@ -118,24 +118,24 @@ void SAL_CALL OEMPreloadJob::removeEventListener( const Reference< XEventListene } // XServiceInfo -::rtl::OUString SAL_CALL OEMPreloadJob::getImplementationName() +::rtl::OUString SAL_CALL OEMPreloadJob::getImplementationName() throw ( RuntimeException ) { return OEMPreloadJob::GetImplementationName(); } -sal_Bool SAL_CALL OEMPreloadJob::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL OEMPreloadJob::supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ) { sal_Int32 nSize = sizeof( interfaces ) / sizeof( const char *); - + for( sal_Int32 i = 0; i < nSize; i++ ) if ( rServiceName.equalsAscii( interfaces[i] )) return sal_True; return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL OEMPreloadJob::getSupportedServiceNames() +Sequence< ::rtl::OUString > SAL_CALL OEMPreloadJob::getSupportedServiceNames() throw ( RuntimeException ) { return OEMPreloadJob::GetSupportedServiceNames(); @@ -151,7 +151,7 @@ throw ( RuntimeException ) { // create OEM preload service dialog Reference <XExecutableDialog> xDialog( m_xServiceManager->createInstance( - OUString::createFromAscii("org.openoffice.comp.preload.OEMPreloadWizard")), + OUString::createFromAscii("org.openoffice.comp.preload.OEMPreloadWizard")), UNO_QUERY ); if ( xDialog.is() ){ // execute OEM preload dialog and check return value @@ -161,11 +161,11 @@ throw ( RuntimeException ) bCont = sal_True; disableOEMPreloadFlag(); } else { - // user declined... + // user declined... // terminate. /* Reference< XDesktop > xDesktop( m_xServiceManager->createInstance( - OUString::createFromAscii("com.sun.star.frame.Desktop")), + OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY ); xDesktop->terminate(); */ @@ -176,7 +176,7 @@ throw ( RuntimeException ) Reference<XModel> rModel; Reference<XCloseable> rClose; for (int i=0; i<args.getLength(); i++) - { + { if (args[i].Name.equalsAscii("EnvType")) args[i].Value >>= aEnvType; else if (args[i].Name.equalsAscii("Frame")) { @@ -186,8 +186,8 @@ throw ( RuntimeException ) else if (args[i].Name.equalsAscii("Model")) { args[i].Value >>= rModel; rClose = Reference<XCloseable>(rModel, UNO_QUERY); - } - } + } + } if (rClose.is()) rClose->close(sal_True); */ bCont = sal_False; @@ -196,9 +196,9 @@ throw ( RuntimeException ) } else { // don't try again bCont = sal_True; - } + } /* - NamedValue nv; + NamedValue nv; nv.Name = OUString::createFromAscii("Deactivate"); nv.Value <<= bDeactivate; Sequence<NamedValue> s(1); @@ -214,10 +214,10 @@ static sal_Bool existsURL( OUString const& _sURL ) { using namespace osl; DirectoryItem aDirItem; - + if (_sURL.getLength() != 0) return ( DirectoryItem::get( _sURL, aDirItem ) == DirectoryItem::E_None ); - + return sal_False; } @@ -227,27 +227,27 @@ static OUString locateIniFile() { OUString aUserDataPath; OUString aSofficeIniFileURL; - + // Retrieve the default file URL for the soffice.ini/rc Bootstrap().getIniName( aSofficeIniFileURL ); if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS ) { const char CONFIG_DIR[] = "/config"; - + sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/'); if ( nIndex > 0 ) { - OUString aUserSofficeIniFileURL; - OUStringBuffer aBuffer( aUserDataPath ); + OUString aUserSofficeIniFileURL; + OUStringBuffer aBuffer( aUserDataPath ); aBuffer.appendAscii( CONFIG_DIR ); aBuffer.append( aSofficeIniFileURL.copy( nIndex )); aUserSofficeIniFileURL = aBuffer.makeStringAndClear(); - + if ( existsURL( aUserSofficeIniFileURL )) return aUserSofficeIniFileURL; } - } + } // Fallback try to use the soffice.ini/rc from program folder return aSofficeIniFileURL; } @@ -270,7 +270,7 @@ void OEMPreloadJob::disableOEMPreloadFlag() { OUString aSofficeIniFileURL = locateIniFile(); if ( aSofficeIniFileURL.getLength() > 0 ) - { + { Config aConfig(aSofficeIniFileURL); aConfig.SetGroup( OEM_PRELOAD_SECTION ); aConfig.WriteKey( OEM_PRELOAD, STR_FALSE ); diff --git a/desktop/source/so_comp/oemjob.hxx b/desktop/source/so_comp/oemjob.hxx index 140ee0e9af10..26c1f0943de9 100644 --- a/desktop/source/so_comp/oemjob.hxx +++ b/desktop/source/so_comp/oemjob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ class OEMPreloadJob : public ::cppu::WeakImplHelper3< XJob, XComponent, XService { private: - ::osl::Mutex m_aMutex; - ::cppu::OInterfaceContainerHelper m_aListeners; - Reference< XMultiServiceFactory > m_xServiceManager; + ::osl::Mutex m_aMutex; + ::cppu::OInterfaceContainerHelper m_aListeners; + Reference< XMultiServiceFactory > m_xServiceManager; sal_Bool checkOEMPreloadFlag(); void disableOEMPreloadFlag(); @@ -62,8 +62,8 @@ public: OEMPreloadJob( const Reference < XMultiServiceFactory >& xFactory ); virtual ~OEMPreloadJob(); - static ::rtl::OUString GetImplementationName(); - static Sequence< rtl::OUString > GetSupportedServiceNames(); + static ::rtl::OUString GetImplementationName(); + static Sequence< rtl::OUString > GetSupportedServiceNames(); // XComponent @@ -72,8 +72,8 @@ public: virtual void SAL_CALL removeEventListener(const Reference< XEventListener > & aListener) throw ( RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw ( RuntimeException ); virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); //XJob diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx index a4709b632f27..c79f36820cb0 100644 --- a/desktop/source/so_comp/services.cxx +++ b/desktop/source/so_comp/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ static const char* pServices[] = static const char* pImplementations[] = { SOEvaluation::implementationName, - OEMPreloadJob::implementationName, + OEMPreloadJob::implementationName, NULL }; @@ -78,7 +78,7 @@ static const char** pSupportedServices[] = SOEvaluation::interfaces, OEMPreloadJob::interfaces, NULL -}; +}; static Sequence<OUString> getSupportedServiceNames(int p) { @@ -89,26 +89,26 @@ getSupportedServiceNames(int p) { aSeq[i] = OUString::createFromAscii(names[i]); } return aSeq; -} +} extern "C" { -void SAL_CALL +void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, + const sal_Char** ppEnvironmentTypeName, uno_Environment**) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL +sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, + void* pServiceManager, void* pRegistryKey) { - Reference<XMultiServiceFactory> xMan( + Reference<XMultiServiceFactory> xMan( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference<XRegistryKey> xKey( + Reference<XRegistryKey> xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; // iterate over service names and register them... @@ -118,7 +118,7 @@ component_writeInfo( for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { pServiceName= pServices[i]; pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") + aImpl = OUString::createFromAscii("/") + OUString::createFromAscii(pImplName) + OUString::createFromAscii("/UNO/SERVICES"); Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); @@ -127,7 +127,7 @@ component_writeInfo( return sal_True; } -void* SAL_CALL +void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, @@ -137,11 +137,11 @@ component_getFactory( if ( pImplementationName && pServiceManager ) { Reference< XSingleServiceFactory > xFactory; - Reference< XMultiServiceFactory > xServiceManager( + Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - + // search implementation - for (int i = 0; (pImplementations[i]!=NULL); i++) { + for (int i = 0; (pImplementations[i]!=NULL); i++) { if ( strcmp(pImplementations[i], pImplementationName ) == 0 ) { // found implementation xFactory = Reference<XSingleServiceFactory>(cppu::createSingleFactory( diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index 1421f53e2401..adcf9c1a5fd1 100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ static const char** pSupportedServices[] = { SplashScreen::interfaces, NULL -}; +}; static Sequence<OUString> getSupportedServiceNames(int p) { @@ -81,26 +81,26 @@ getSupportedServiceNames(int p) { aSeq[i] = OUString::createFromAscii(names[i]); } return aSeq; -} +} extern "C" { -void SAL_CALL +void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, + const sal_Char** ppEnvironmentTypeName, uno_Environment**) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL +sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, + void* pServiceManager, void* pRegistryKey) { - Reference<XMultiServiceFactory> xMan( + Reference<XMultiServiceFactory> xMan( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference<XRegistryKey> xKey( + Reference<XRegistryKey> xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; // iterate over service names and register them... @@ -110,7 +110,7 @@ component_writeInfo( for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { pServiceName= pServices[i]; pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") + aImpl = OUString::createFromAscii("/") + OUString::createFromAscii(pImplName) + OUString::createFromAscii("/UNO/SERVICES"); Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); @@ -119,7 +119,7 @@ component_writeInfo( return sal_True; } -void* SAL_CALL +void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, @@ -129,11 +129,11 @@ component_getFactory( if ( pImplementationName && pServiceManager ) { Reference< XSingleServiceFactory > xFactory; - Reference< XMultiServiceFactory > xServiceManager( + Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - + // search implementation - for (int i = 0; (pImplementations[i]!=NULL); i++) { + for (int i = 0; (pImplementations[i]!=NULL); i++) { if ( strcmp(pImplementations[i], pImplementationName ) == 0 ) { // found implementation xFactory = Reference<XSingleServiceFactory>(cppu::createSingleFactory( diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index c12532ba98f3..57e96829e1ed 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -175,7 +175,7 @@ void SAL_CALL SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) throw (RuntimeException) { - ::osl::ClearableMutexGuard aGuard( _aMutex ); + ::osl::ClearableMutexGuard aGuard( _aMutex ); if (aArguments.getLength() > 0) { aArguments[0] >>= _bVisible; @@ -202,7 +202,7 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::sta _barwidth = 263; if ( NOT_LOADED == _barheight ) _barheight = 8; - if (( _eBitmapMode == BM_FULLSCREEN ) && + if (( _eBitmapMode == BM_FULLSCREEN ) && _bFullScreenSplash ) { if( ( _fXPos >= 0.0 ) && ( _fYPos >= 0.0 )) @@ -214,7 +214,7 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::sta _barwidth = sal_Int32( double( aSize.Width() ) * _fWidth ); if ( _fHeight >= 0.0 ) _barheight = sal_Int32( double( aSize.Width() ) * _fHeight ); - } + } } else { @@ -308,10 +308,10 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) ); OUString sNativeProgress = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) ); - + // Determine full screen splash mode - _bFullScreenSplash = (( sFullScreenSplash.getLength() > 0 ) && + _bFullScreenSplash = (( sFullScreenSplash.getLength() > 0 ) && ( !sFullScreenSplash.equalsAsciiL( "0", 1 ))); // Try to retrieve the relative values for the progress bar. The current @@ -358,7 +358,7 @@ void SplashScreen::loadConfig() _cProgressBarColor = Color( nRed, nGreen, nBlue ); } } - + if( sNativeProgress.getLength() ) { _bNativeProgress = sNativeProgress.toBoolean(); @@ -404,7 +404,7 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap) nWidth = aScreenArea.GetWidth(); nHeight = aScreenArea.GetHeight(); } - + // create file name from screen resolution information OStringBuffer aStrBuf( 128 ); OStringBuffer aResBuf( 32 ); @@ -431,8 +431,8 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap) Application::LoadBrandBitmap ("intro", rBitmap); } -void SplashScreen::determineProgressRatioValues( - double& rXRelPos, double& rYRelPos, +void SplashScreen::determineProgressRatioValues( + double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight ) { sal_Int32 nWidth( 0 ); @@ -473,7 +473,7 @@ void SplashScreen::determineProgressRatioValues( OUString::createFromAscii( szFullScreenProgressPos ) ); OUString sFullScreenProgressSize = implReadBootstrapKey( OUString::createFromAscii( szFullScreenProgressSize ) ); - + if ( sFullScreenProgressPos.getLength() ) { sal_Int32 idx = 0; @@ -508,27 +508,27 @@ void SplashScreen::Paint( const Rectangle&) //native drawing BOOL bNativeOK = FALSE; - + // in case of native controls we need to draw directly to the window if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) ) { DrawBitmapEx( Point(), _aIntroBmp ); - + ImplControlValue aValue( _iProgress * _barwidth / _iMax); Rectangle aDrawRect( Point(_tlx, _tly), Size( _barwidth, _barheight ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect, CTRL_STATE_ENABLED, aValue, rtl::OUString(), - aNativeControlRegion, aNativeContentRegion ) ) + aNativeControlRegion, aNativeContentRegion ) ) { long nProgressHeight = aNativeControlRegion.GetHeight(); aDrawRect.Top() -= (nProgressHeight - _barheight)/2; aDrawRect.Bottom() += (nProgressHeight - _barheight)/2; } - + if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect, - CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE ) + CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE ) { return; } @@ -542,7 +542,7 @@ void SplashScreen::Paint( const Rectangle&) // draw progress... long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace); if (length < 0) length = 0; - + // border _vdev.SetFillColor(); _vdev.SetLineColor( _cProgressFrameColor ); diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 0d4858402b83..c7c3ff5b52ae 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |