diff options
Diffstat (limited to 'desktop/source/app')
39 files changed, 327 insertions, 327 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..7701bbae4827 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 ); @@ -636,7 +636,7 @@ throw(::com::sun::star::uno::RuntimeException) void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException ) { osl::ClearableMutexGuard aGuard( GetMutex() ); - sal_Int16 nCount = m_nRequestCount; + sal_Int16 nCount = --m_nRequestCount; aGuard.clear(); 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 |