diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /desktop | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
42 files changed, 532 insertions, 532 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 9ffe7648c011..91b3157950d7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -366,7 +366,7 @@ void DoRestartActionsIfNecessary(bool quickstart) { } -// ---------------------------------------------------------------------------- + ResMgr* Desktop::GetDesktopResManager() { @@ -397,7 +397,7 @@ ResMgr* Desktop::GetDesktopResManager() namespace { -// ---------------------------------------------------------------------------- + // Get a message string securely. There is a fallback string if the resource // is not available. @@ -1078,7 +1078,7 @@ sal_Bool Desktop::isUIOnSessionShutdownAllowed() ::get(); } -//----------------------------------------------- + /** @short check if recovery must be started or not. @param bCrashed [boolean ... out!] @@ -1108,7 +1108,7 @@ void impl_checkRecoveryState(sal_Bool& bCrashed , bSessionDataExists = elements && session; } -//----------------------------------------------- + /* @short start the recovery wizard. @param bEmergencySave diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index cec9b910721a..68f7aa026d22 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star::ucb; namespace desktop { -// ----------------------------------------------------------------------------- + static void configureUcb() { diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 30c2946586ac..148609b250ec 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -99,7 +99,7 @@ public: virtual void SAL_CALL pop() throw (uno::RuntimeException); }; -//----------------------------------------------------------------------------- + SilentCommandEnv::SilentCommandEnv( uno::Reference<uno::XComponentContext> const & xContext, Desktop* pDesktop ): @@ -109,27 +109,27 @@ SilentCommandEnv::SilentCommandEnv( mnProgress( 25 ) {} -//----------------------------------------------------------------------------- + SilentCommandEnv::~SilentCommandEnv() { mpDesktop->SetSplashScreenText( OUString() ); } -//----------------------------------------------------------------------------- + Reference<task::XInteractionHandler> SilentCommandEnv::getInteractionHandler() throw (uno::RuntimeException) { return this; } -//----------------------------------------------------------------------------- + Reference<ucb::XProgressHandler> SilentCommandEnv::getProgressHandler() throw (uno::RuntimeException) { return this; } -//----------------------------------------------------------------------------- + // XInteractionHandler void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest ) throw (uno::RuntimeException) @@ -178,7 +178,7 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe } } -//----------------------------------------------------------------------------- + // XProgressHandler void SilentCommandEnv::push( uno::Any const & rStatus ) throw (uno::RuntimeException) @@ -195,7 +195,7 @@ void SilentCommandEnv::push( uno::Any const & rStatus ) } } -//----------------------------------------------------------------------------- + void SilentCommandEnv::update( uno::Any const & rStatus ) throw (uno::RuntimeException) { @@ -206,7 +206,7 @@ void SilentCommandEnv::update( uno::Any const & rStatus ) } } -//----------------------------------------------------------------------------- + void SilentCommandEnv::pop() throw (uno::RuntimeException) { mnLevel -= 1; @@ -236,9 +236,9 @@ static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContex return nRet; } -//------------------------------------------------------------------------------ + // Check dependencies of all packages -//------------------------------------------------------------------------------ + static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext > &xContext ) { uno::Sequence< uno::Sequence< uno::Reference< deployment::XPackage > > > xAllPackages; @@ -314,9 +314,9 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext return true; } -//------------------------------------------------------------------------------ + // resets the 'check needed' flag (needed, if aborted) -//------------------------------------------------------------------------------ + static void impl_setNeedsCompatCheck() { try { @@ -339,10 +339,10 @@ static void impl_setNeedsCompatCheck() catch (const Exception&) {} } -//------------------------------------------------------------------------------ + // to check if we need checking the dependencies of the extensions again, we compare // the build id of the office with the one of the last check -//------------------------------------------------------------------------------ + static bool impl_needsCompatCheck() { bool bNeedsCheck = false; @@ -381,7 +381,7 @@ static bool impl_needsCompatCheck() return bNeedsCheck; } -//------------------------------------------------------------------------------ + // Do we need to check the dependencies of the extensions? // When there are unresolved issues, we can't continue with startup sal_Bool Desktop::CheckExtensionDependencies() diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 047c01b3f5e2..894fb80931a9 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -128,7 +128,7 @@ CommandLineArgs::CommandLineArgs( Supplier& supplier ) ParseCommandLine_Impl( supplier ); } -// ---------------------------------------------------------------------------- + void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) { diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 11ee1f858f1b..b53b93bf981e 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -29,21 +29,21 @@ #include <stdio.h> #include <com/sun/star/task/InteractionHandler.hpp> -// ---------------------------------------------------------------------------- + namespace uno = ::com::sun::star::uno; namespace lang = ::com::sun::star::lang; using uno::UNO_QUERY; -// ---------------------------------------------------------------------------- + // must be aligned with configmgr/source/misc/configinteractionhandler static char const CONFIG_ERROR_HANDLER[] = "configuration.interaction-handler"; -// ---------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- + + // ConfigurationErrorHandler -// ---------------------------------------------------------------------------- + namespace { @@ -82,7 +82,7 @@ namespace } -// ---------------------------------------------------------------------------- + class ConfigurationErrorHandler::Context : public SimpleCurrentContext { public: @@ -104,7 +104,7 @@ private: InteractionHandler m_xHandler; }; -//------------------------------------------------------------------------------ + uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName) throw (uno::RuntimeException) { @@ -117,13 +117,13 @@ uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString c return SimpleCurrentContext::getValueByName( aName ); } -//------------------------------------------------------------------------------ + ConfigurationErrorHandler::~ConfigurationErrorHandler() { deactivate(); } -//------------------------------------------------------------------------------ + /// installs the handler into the current context void ConfigurationErrorHandler::activate() { @@ -135,7 +135,7 @@ void ConfigurationErrorHandler::activate() m_pContext->install(); } -//------------------------------------------------------------------------------ + /// deinstalls the handler from the current context, restoring the previous context void ConfigurationErrorHandler::deactivate() { @@ -146,7 +146,7 @@ void ConfigurationErrorHandler::deactivate() m_pContext = 0; } } -//------------------------------------------------------------------------------ + ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefaultInteractionHandler() { @@ -154,7 +154,7 @@ ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefa InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY ); return xHandler; } -//------------------------------------------------------------------------------ + diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx index 8018c9ed72d4..87784a83cbe5 100644 --- a/desktop/source/app/desktopresid.cxx +++ b/desktop/source/app/desktopresid.cxx @@ -20,7 +20,7 @@ #include "desktopresid.hxx" #include "app.hxx" -// ----------------------------------------------------------------------- + namespace desktop { diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 44d8c893bb6f..2f2ce3e47ff0 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -325,7 +325,7 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign return osl_Signal_ActCallNextHdl; } -// ---------------------------------------------------------------------------- + // The OfficeIPCThreadController implementation is a bookkeeper for all pending requests // that were created by the OfficeIPCThread. The requests are waiting to be processed by diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 663ffa0458fd..b5a29ed42b80 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -62,12 +62,12 @@ public: virtual void SAL_CALL pop() throw (RuntimeException); }; -//______________________________________________________________________________ + ProgressLogImpl::~ProgressLogImpl() { } -//______________________________________________________________________________ + void ProgressLogImpl::disposing() { try { @@ -83,7 +83,7 @@ void ProgressLogImpl::disposing() } } -//______________________________________________________________________________ + ProgressLogImpl::ProgressLogImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xContext ) @@ -125,7 +125,7 @@ ProgressLogImpl::ProgressLogImpl( log_write( buf.makeStringAndClear() ); } -//______________________________________________________________________________ + void ProgressLogImpl::log_write( OString const & text ) { try { @@ -144,7 +144,7 @@ void ProgressLogImpl::log_write( OString const & text ) } // XProgressHandler -//______________________________________________________________________________ + void ProgressLogImpl::push( Any const & Status ) throw (RuntimeException) { @@ -153,7 +153,7 @@ void ProgressLogImpl::push( Any const & Status ) ++m_log_level; } -//______________________________________________________________________________ + void ProgressLogImpl::update( Any const & Status ) throw (RuntimeException) { @@ -178,7 +178,7 @@ void ProgressLogImpl::update( Any const & Status ) buf.makeStringAndClear(), osl_getThreadTextEncoding() ) ); } -//______________________________________________________________________________ + void ProgressLogImpl::pop() throw (RuntimeException) { OSL_ASSERT( m_log_level > 0 ); diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 637d0b996f86..850bdb3e068a 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -169,7 +169,7 @@ bool PersistentMap::open() return readAll(); } -//______________________________________________________________________________ + bool PersistentMap::readAll() { // prepare for re-reading the map-file @@ -293,7 +293,7 @@ void PersistentMap::add( OString const & key, OString const & value ) m_bIsDirty = r.second; } -//______________________________________________________________________________ + void PersistentMap::put( OString const & key, OString const & value ) { add( key, value); diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx index 0a30de2f0e0b..019202f89fe0 100644 --- a/desktop/source/deployment/gui/descedit.cxx +++ b/desktop/source/deployment/gui/descedit.cxx @@ -40,7 +40,7 @@ DescriptionEdit::DescriptionEdit( Window* pParent, const ResId& rResId ) : Init(); } -// ----------------------------------------------------------------------- + void DescriptionEdit::Init() { @@ -53,7 +53,7 @@ void DescriptionEdit::Init() EnableCursor( false ); } -// ----------------------------------------------------------------------- + void DescriptionEdit::Clear() { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 66cdab2ed355..b887cb7a2047 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -89,7 +89,7 @@ namespace dp_gui { #define SHARED_PACKAGE_MANAGER "shared" #define BUNDLED_PACKAGE_MANAGER "bundled" -//------------------------------------------------------------------------------ + struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles > { const OUString operator () () { @@ -100,9 +100,9 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles > } }; -//------------------------------------------------------------------------------ + // ExtBoxWithBtns_Impl -//------------------------------------------------------------------------------ + enum MENU_COMMAND { @@ -130,7 +130,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl bool HandleTabKey( bool bReverse ); MENU_COMMAND ShowPopupMenu( const Point &rPos, const long nPos ); - //----------------- + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); DECL_DLLPRIVATE_LINK( HandleOptionsBtn, void * ); @@ -151,7 +151,7 @@ public: virtual void RecalcAll(); virtual void selectEntry( const long nPos ); - //----------------- + void enableButtons( bool bEnable ); }; @@ -170,7 +170,7 @@ Size ExtBoxWithBtns_Impl::GetOptimalSize() const return LogicToPixel(Size(250, 150), MAP_APPFONT); } -//------------------------------------------------------------------------------ + void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog) { setExtensionManager(pParentDialog->getExtensionManager()); @@ -211,7 +211,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtBoxWithBtns(Window *pPar return new ExtBoxWithBtns_Impl(pParent); } -//------------------------------------------------------------------------------ + ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl() { delete m_pOptionsBtn; @@ -219,7 +219,7 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl() delete m_pRemoveBtn; } -// ----------------------------------------------------------------------- + void ExtBoxWithBtns_Impl::RecalcAll() { const sal_Int32 nActive = getSelIndex(); @@ -242,7 +242,7 @@ void ExtBoxWithBtns_Impl::RecalcAll() } -//------------------------------------------------------------------------------ + //This function may be called with nPos < 0 void ExtBoxWithBtns_Impl::selectEntry( const long nPos ) { @@ -252,7 +252,7 @@ void ExtBoxWithBtns_Impl::selectEntry( const long nPos ) ExtensionBox_Impl::selectEntry( nPos ); } -// ----------------------------------------------------------------------- + void ExtBoxWithBtns_Impl::SetButtonPos( const Rectangle& rRect ) { Size aBtnSize( m_pOptionsBtn->GetSizePixel() ); @@ -266,7 +266,7 @@ void ExtBoxWithBtns_Impl::SetButtonPos( const Rectangle& rRect ) m_pEnableBtn->SetPosPixel( aBtnPos ); } -// ----------------------------------------------------------------------- + void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) { bool bShowOptionBtn = true; @@ -313,7 +313,7 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) m_pRemoveBtn->Hide(); } -// ----------------------------------------------------------------------- + bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse ) { sal_Int32 nIndex = getSelIndex(); @@ -360,7 +360,7 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse ) return false; } -// ----------------------------------------------------------------------- + MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos ) { if ( nPos >= (long) getItemCount() ) @@ -388,7 +388,7 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long return (MENU_COMMAND) aPopup.Execute( this, rPos ); } -//------------------------------------------------------------------------------ + void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt ) { if ( m_bInterfaceLocked ) @@ -429,7 +429,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt ) } } -//------------------------------------------------------------------------------ + bool ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -450,7 +450,7 @@ bool ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt ) return true; } -//------------------------------------------------------------------------------ + void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) { m_bInterfaceLocked = ! bEnable; @@ -469,7 +469,7 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) } } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) { long nDelta = pScrBar->GetDelta(); @@ -487,7 +487,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) { const sal_Int32 nActive = getSelIndex(); @@ -510,7 +510,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn) { const sal_Int32 nActive = getSelIndex(); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn) { const sal_Int32 nActive = getSelIndex(); @@ -545,9 +545,9 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn) return 1; } -//------------------------------------------------------------------------------ + // DialogHelper -//------------------------------------------------------------------------------ + DialogHelper::DialogHelper( const uno::Reference< uno::XComponentContext > &xContext, Dialog *pWindow ) : m_pVCLWindow( pWindow ), @@ -557,21 +557,21 @@ DialogHelper::DialogHelper( const uno::Reference< uno::XComponentContext > &xCon m_xContext = xContext; } -//------------------------------------------------------------------------------ + DialogHelper::~DialogHelper() { if ( m_nEventID ) Application::RemoveUserEvent( m_nEventID ); } -//------------------------------------------------------------------------------ + ResId DialogHelper::getResId( sal_uInt16 nId ) { const SolarMutexGuard guard; return ResId( nId, *DeploymentGuiResMgr::get() ); } -//------------------------------------------------------------------------------ + OUString DialogHelper::getResourceString(sal_uInt16 id) { const SolarMutexGuard guard; @@ -583,7 +583,7 @@ OUString DialogHelper::getResourceString(sal_uInt16 id) return ret; } -//------------------------------------------------------------------------------ + bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > &xPackage ) { if ( xPackage->getRepositoryName() == SHARED_PACKAGE_MANAGER ) @@ -592,7 +592,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > return false; } -//------------------------------------------------------------------------------ + bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage, Window *pParent, const sal_uInt16 nResID, @@ -618,7 +618,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment:: return true; } -//------------------------------------------------------------------------------ + void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle ) const { if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty @@ -642,7 +642,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle } } -//------------------------------------------------------------------------------ + bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; @@ -655,7 +655,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const return ( RET_OK == aInfo.Execute() ); } -//------------------------------------------------------------------------------ + bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const { const SolarMutexGuard guard; @@ -683,7 +683,7 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const return true; } -//------------------------------------------------------------------------------ + void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller ) { if ( m_nEventID ) @@ -692,9 +692,9 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller ) m_nEventID = Application::PostUserEvent( rLink, pCaller ); } -//------------------------------------------------------------------------------ + // ExtMgrDialog -//------------------------------------------------------------------------------ + ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager) : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui") , DialogHelper(pManager->getContext(), (Dialog*) this) @@ -747,19 +747,19 @@ ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager) m_aTimeoutTimer.SetTimeoutHdl( LINK( this, ExtMgrDialog, TimeOutHdl ) ); } -//------------------------------------------------------------------------------ + ExtMgrDialog::~ExtMgrDialog() { m_aTimeoutTimer.Stop(); } -//------------------------------------------------------------------------------ + void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL ) { m_pGetExtensions->SetURL( rURL ); } -//------------------------------------------------------------------------------ + long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, bool bLicenseMissing ) { @@ -788,20 +788,20 @@ long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage } } -//------------------------------------------------------------------------------ + void ExtMgrDialog::prepareChecking() { m_pExtensionBox->prepareChecking(); } -//------------------------------------------------------------------------------ + void ExtMgrDialog::checkEntries() { const SolarMutexGuard guard; m_pExtensionBox->checkEntries(); } -//------------------------------------------------------------------------------ + bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; @@ -814,7 +814,7 @@ bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const return ( RET_OK == aInfo.Execute() ); } -//------------------------------------------------------------------------------ + bool ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage, bool bEnable ) { @@ -837,7 +837,7 @@ bool ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage > & return true; } -//------------------------------------------------------------------------------ + bool ExtMgrDialog::removePackage( const uno::Reference< deployment::XPackage > &xPackage ) { if ( !xPackage.is() ) @@ -857,7 +857,7 @@ bool ExtMgrDialog::removePackage( const uno::Reference< deployment::XPackage > & return true; } -//------------------------------------------------------------------------------ + bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > &xPackage ) { if ( !xPackage.is() ) @@ -878,7 +878,7 @@ bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > & return true; } -//------------------------------------------------------------------------------ + bool ExtMgrDialog::acceptLicense( const uno::Reference< deployment::XPackage > &xPackage ) { if ( !xPackage.is() ) @@ -889,7 +889,7 @@ bool ExtMgrDialog::acceptLicense( const uno::Reference< deployment::XPackage > & return true; } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() { const uno::Reference< uno::XComponentContext > xContext( m_pManager->getContext() ); @@ -956,7 +956,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() return files; } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn) { if ( m_xAbortChannel.is() ) @@ -980,7 +980,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleCloseBtn) } -// ------------------------------------------------------------------------------ + IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1012,7 +1012,7 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface ) return 0; } -// ------------------------------------------------------------------------------ + void ExtMgrDialog::showProgress( bool _bStart ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1035,7 +1035,7 @@ void ExtMgrDialog::showProgress( bool _bStart ) DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), (void*) bStart ); } -// ----------------------------------------------------------------------- + void ExtMgrDialog::updateProgress( const long nProgress ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1043,7 +1043,7 @@ void ExtMgrDialog::updateProgress( const long nProgress ) m_nProgress = nProgress; } -// ----------------------------------------------------------------------- + void ExtMgrDialog::updateProgress( const OUString &rText, const uno::Reference< task::XAbortChannel > &xAbortChannel) { @@ -1054,14 +1054,14 @@ void ExtMgrDialog::updateProgress( const OUString &rText, m_bProgressChanged = true; } -//------------------------------------------------------------------------------ + void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage ) { const SolarMutexGuard aGuard; m_pExtensionBox->updateEntry( xPackage ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn) { setBusy( true ); @@ -1077,14 +1077,14 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx) { // re-creates the list of packages with addEntry selecting the packages m_pManager->createPackageList(); return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn) { m_pManager->checkUpdates( false, true ); @@ -1092,7 +1092,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { openWebBrowser( pHyperlink->GetURL(), GetText() ); @@ -1100,7 +1100,7 @@ IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl) { if ( m_bStopProgress ) @@ -1138,7 +1138,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl) return 1; } -//------------------------------------------------------------------------------ + // VCL::Window / Dialog bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) @@ -1175,7 +1175,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) return true; } -//------------------------------------------------------------------------------ + bool ExtMgrDialog::Close() { bool bRet = m_pManager->queryTermination(); @@ -1187,9 +1187,9 @@ bool ExtMgrDialog::Close() return bRet; } -//------------------------------------------------------------------------------ + // UpdateRequiredDialog -//------------------------------------------------------------------------------ + UpdateRequiredDialog::UpdateRequiredDialog( Window *pParent, TheExtensionManager *pManager ) : ModalDialog( pParent, getResId( RID_DLG_UPDATE_REQUIRED ) ), DialogHelper( pManager->getContext(), (Dialog*) this ), @@ -1264,7 +1264,7 @@ UpdateRequiredDialog::UpdateRequiredDialog( Window *pParent, TheExtensionManager m_aTimeoutTimer.SetTimeoutHdl( LINK( this, UpdateRequiredDialog, TimeOutHdl ) ); } -//------------------------------------------------------------------------------ + UpdateRequiredDialog::~UpdateRequiredDialog() { m_aTimeoutTimer.Stop(); @@ -1272,7 +1272,7 @@ UpdateRequiredDialog::~UpdateRequiredDialog() delete m_pExtensionBox; } -//------------------------------------------------------------------------------ + long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, bool bLicenseMissing ) { @@ -1287,13 +1287,13 @@ long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::X return 0; } -//------------------------------------------------------------------------------ + void UpdateRequiredDialog::prepareChecking() { m_pExtensionBox->prepareChecking(); } -//------------------------------------------------------------------------------ + void UpdateRequiredDialog::checkEntries() { const SolarMutexGuard guard; @@ -1306,7 +1306,7 @@ void UpdateRequiredDialog::checkEntries() } } -//------------------------------------------------------------------------------ + bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage, bool bEnable ) { @@ -1315,7 +1315,7 @@ bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac return true; } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn) { if ( m_xAbortChannel.is() ) @@ -1332,7 +1332,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn) return 1; } -// ------------------------------------------------------------------------------ + IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1360,7 +1360,7 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface ) return 0; } -// ------------------------------------------------------------------------------ + void UpdateRequiredDialog::showProgress( bool _bStart ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1383,7 +1383,7 @@ void UpdateRequiredDialog::showProgress( bool _bStart ) DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), (void*) bStart ); } -// ----------------------------------------------------------------------- + void UpdateRequiredDialog::updateProgress( const long nProgress ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1391,7 +1391,7 @@ void UpdateRequiredDialog::updateProgress( const long nProgress ) m_nProgress = nProgress; } -// ----------------------------------------------------------------------- + void UpdateRequiredDialog::updateProgress( const OUString &rText, const uno::Reference< task::XAbortChannel > &xAbortChannel) { @@ -1402,7 +1402,7 @@ void UpdateRequiredDialog::updateProgress( const OUString &rText, m_bProgressChanged = true; } -//------------------------------------------------------------------------------ + void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage ) { // We will remove all updated packages with satisfied dependencies, but @@ -1421,7 +1421,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment:: } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1442,7 +1442,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1460,7 +1460,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { openWebBrowser( pHyperlink->GetURL(), GetText() ); @@ -1468,7 +1468,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl) { if ( m_bStopProgress ) @@ -1506,7 +1506,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl) return 1; } -//------------------------------------------------------------------------------ + // VCL::Window / Dialog void UpdateRequiredDialog::Resize() { @@ -1575,7 +1575,7 @@ void UpdateRequiredDialog::Resize() m_aProgressText.SetPosSizePixel( aPos, aFTSize ); } -//------------------------------------------------------------------------------ + // VCL::Dialog short UpdateRequiredDialog::Execute() { @@ -1599,7 +1599,7 @@ short UpdateRequiredDialog::Execute() return Dialog::Execute(); } -//------------------------------------------------------------------------------ + // VCL::Dialog bool UpdateRequiredDialog::Close() { @@ -1618,9 +1618,9 @@ bool UpdateRequiredDialog::Close() return false; } -//------------------------------------------------------------------------------ + // Check dependencies of all packages -//------------------------------------------------------------------------------ + bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage > &xPackage ) const { bool bRegistered = false; @@ -1659,7 +1659,7 @@ bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment:: return bDependenciesValid; } -//------------------------------------------------------------------------------ + bool UpdateRequiredDialog::hasActiveEntries() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1680,7 +1680,7 @@ bool UpdateRequiredDialog::hasActiveEntries() return bRet; } -//------------------------------------------------------------------------------ + void UpdateRequiredDialog::disableAllEntries() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1700,9 +1700,9 @@ void UpdateRequiredDialog::disableAllEntries() m_aCloseBtn.SetText( m_sCloseText ); } -//------------------------------------------------------------------------------ + // ShowLicenseDialog -//------------------------------------------------------------------------------ + ShowLicenseDialog::ShowLicenseDialog( Window * pParent, const uno::Reference< deployment::XPackage > &xPackage ) : ModalDialog(pParent, "ShowLicenseDialog", "desktop/ui/showlicensedialog.ui") @@ -1723,14 +1723,14 @@ UpdateRequiredDialogService::UpdateRequiredDialogService( uno::Sequence< uno::An { } -//------------------------------------------------------------------------------ + // XExecutableDialog -//------------------------------------------------------------------------------ + void UpdateRequiredDialogService::setTitle( OUString const & ) throw ( uno::RuntimeException ) { } -//------------------------------------------------------------------------------ + sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException ) { ::rtl::Reference< ::dp_gui::TheExtensionManager > xManager( TheExtensionManager::get( @@ -1743,7 +1743,7 @@ sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException ) return nRet; } -//------------------------------------------------------------------------------ + SelectedPackage::~SelectedPackage() {} } //namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index fb5e42c3bf5c..51afc8a3d1db 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -181,7 +181,7 @@ public: virtual void SAL_CALL pop() throw ( uno::RuntimeException ); }; -//------------------------------------------------------------------------------ + struct ExtensionCmd { enum E_CMD_TYPE { ADD, ENABLE, DISABLE, REMOVE, CHECK_FOR_UPDATES, ACCEPT_LICENSE }; @@ -215,7 +215,7 @@ struct ExtensionCmd typedef ::boost::shared_ptr< ExtensionCmd > TExtensionCmd; -//------------------------------------------------------------------------------ + class ExtensionCmdQueue::Thread: public salhelper::Thread { public: @@ -276,7 +276,7 @@ private: bool m_bWorking; }; -//------------------------------------------------------------------------------ + void ProgressCmdEnv::startProgress() { m_nCurrentProgress = 0; @@ -285,14 +285,14 @@ void ProgressCmdEnv::startProgress() m_pDialogHelper->showProgress( true ); } -//------------------------------------------------------------------------------ + void ProgressCmdEnv::stopProgress() { if ( m_pDialogHelper ) m_pDialogHelper->showProgress( false ); } -//------------------------------------------------------------------------------ + void ProgressCmdEnv::progressSection( const OUString &rText, const uno::Reference< task::XAbortChannel > &xAbortChannel ) { @@ -308,7 +308,7 @@ void ProgressCmdEnv::progressSection( const OUString &rText, } } -//------------------------------------------------------------------------------ + void ProgressCmdEnv::updateProgress() { if ( ! m_bAborted ) @@ -319,32 +319,32 @@ void ProgressCmdEnv::updateProgress() } } -//------------------------------------------------------------------------------ + ProgressCmdEnv::~ProgressCmdEnv() { // TODO: stop all threads and wait } -//------------------------------------------------------------------------------ + // XCommandEnvironment -//------------------------------------------------------------------------------ + uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler() throw ( uno::RuntimeException ) { return this; } -//------------------------------------------------------------------------------ + uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler() throw ( uno::RuntimeException ) { return this; } -//------------------------------------------------------------------------------ + // XInteractionHandler -//------------------------------------------------------------------------------ + void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest ) throw ( uno::RuntimeException ) { @@ -549,16 +549,16 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } } -//------------------------------------------------------------------------------ + // XProgressHandler -//------------------------------------------------------------------------------ + void ProgressCmdEnv::push( uno::Any const & rStatus ) throw( uno::RuntimeException ) { update_( rStatus ); } -//------------------------------------------------------------------------------ + void ProgressCmdEnv::update_( uno::Any const & rStatus ) throw( uno::RuntimeException ) { @@ -578,21 +578,21 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus ) updateProgress(); } -//------------------------------------------------------------------------------ + void ProgressCmdEnv::update( uno::Any const & rStatus ) throw( uno::RuntimeException ) { update_( rStatus ); } -//------------------------------------------------------------------------------ + void ProgressCmdEnv::pop() throw( uno::RuntimeException ) { update_( uno::Any() ); // no message } -//------------------------------------------------------------------------------ + ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, TheExtensionManager *pManager, const uno::Reference< uno::XComponentContext > & rContext ) : @@ -613,7 +613,7 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, OSL_ASSERT( pDialogHelper ); } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL, const OUString &rRepository, const bool bWarnUser ) @@ -625,7 +625,7 @@ void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL, } } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::removeExtension( const uno::Reference< deployment::XPackage > &rPackage ) { if ( rPackage.is() ) @@ -635,7 +635,7 @@ void ExtensionCmdQueue::Thread::removeExtension( const uno::Reference< deploymen } } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment::XPackage > &rPackage ) { if ( rPackage.is() ) @@ -645,7 +645,7 @@ void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment: } } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deployment::XPackage > &rPackage, const bool bEnable ) { @@ -658,7 +658,7 @@ void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deploymen } } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::checkForUpdates( const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList ) { @@ -666,7 +666,7 @@ void ExtensionCmdQueue::Thread::checkForUpdates( _insert( pEntry ); } -//------------------------------------------------------------------------------ + //Stopping this thread will not abort the installation of extensions. void ExtensionCmdQueue::Thread::stop() { @@ -676,17 +676,17 @@ void ExtensionCmdQueue::Thread::stop() m_wakeup.set(); } -//------------------------------------------------------------------------------ + bool ExtensionCmdQueue::Thread::isBusy() { osl::MutexGuard aGuard( m_mutex ); return m_bWorking; } -//------------------------------------------------------------------------------ + ExtensionCmdQueue::Thread::~Thread() {} -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::execute() { #ifdef WNT @@ -841,7 +841,7 @@ void ExtensionCmdQueue::Thread::execute() #endif } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv, const OUString &rPackageURL, const OUString &rRepository, @@ -891,7 +891,7 @@ void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv rCmdEnv->setWarnUser( false ); } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv, const uno::Reference< deployment::XPackage > &xPackage ) { @@ -919,7 +919,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE UpdateDialog::createNotifyJob( false, aItemList ); } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::_checkForUpdates( const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList ) { @@ -973,7 +973,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( delete pUpdateDialog; } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv, const uno::Reference< deployment::XPackage > &xPackage ) { @@ -997,7 +997,7 @@ void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdE {} } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv, const uno::Reference< deployment::XPackage > &xPackage ) { @@ -1021,7 +1021,7 @@ void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmd {} } -//------------------------------------------------------------------------------ + void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv, const uno::Reference< deployment::XPackage > &xPackage ) { @@ -1058,7 +1058,7 @@ void ExtensionCmdQueue::Thread::_insert(const TExtensionCmd& rExtCmd) m_wakeup.set(); } -//------------------------------------------------------------------------------ + ExtensionCmdQueue::ExtensionCmdQueue( DialogHelper * pDialogHelper, TheExtensionManager *pManager, const uno::Reference< uno::XComponentContext > &rContext ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 8a12b207b5c5..18e4f84b9342 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -58,9 +58,9 @@ bool FindWeakRef::operator () (uno::WeakReference< deployment::XPackage > const } } // end namespace -//------------------------------------------------------------------------------ + // struct Entry_Impl -//------------------------------------------------------------------------------ + Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage, const PackageState eState, const bool bReadOnly ) : m_bActive( false ), @@ -108,11 +108,11 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage, catch (const uno::RuntimeException &) {} } -//------------------------------------------------------------------------------ + Entry_Impl::~Entry_Impl() {} -//------------------------------------------------------------------------------ + sal_Int32 Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const { sal_Int32 eCompare = pCollator->compareString( m_sTitle, pEntry->m_sTitle ); @@ -131,7 +131,7 @@ sal_Int32 Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_ return eCompare; } -//------------------------------------------------------------------------------ + void Entry_Impl::checkDependencies() { try { @@ -154,9 +154,9 @@ void Entry_Impl::checkDependencies() } } } -//------------------------------------------------------------------------------ + // ExtensionRemovedListener -//------------------------------------------------------------------------------ + void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) { @@ -168,14 +168,14 @@ void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt ) } } -//------------------------------------------------------------------------------ + ExtensionRemovedListener::~ExtensionRemovedListener() { } -//------------------------------------------------------------------------------ + // ExtensionBox_Impl -//------------------------------------------------------------------------------ + ExtensionBox_Impl::ExtensionBox_Impl( Window* pParent, TheExtensionManager *pManager ) : IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ), m_bHasScrollBar( false ), @@ -259,7 +259,7 @@ void ExtensionBox_Impl::Init() Show(); } -//------------------------------------------------------------------------------ + ExtensionBox_Impl::~ExtensionBox_Impl() { if ( ! m_bInDelete ) @@ -289,13 +289,13 @@ ExtensionBox_Impl::~ExtensionBox_Impl() delete m_pCollator; } -//------------------------------------------------------------------------------ + sal_Int32 ExtensionBox_Impl::getItemCount() const { return static_cast< sal_Int32 >( m_vEntries.size() ); } -//------------------------------------------------------------------------------ + sal_Int32 ExtensionBox_Impl::getSelIndex() const { if ( m_bHasActive ) @@ -307,7 +307,7 @@ sal_Int32 ExtensionBox_Impl::getSelIndex() const return ENTRY_NOTFOUND; } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const { if ( nIndex < 0 ) @@ -316,7 +316,7 @@ void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const throw lang::IllegalArgumentException( "There is no element at the provided position. The position exceeds the number of available list entries",0, 0 ); } -//------------------------------------------------------------------------------ + OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -324,7 +324,7 @@ OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const return m_vEntries[ nIndex ]->m_sTitle; } -//------------------------------------------------------------------------------ + OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -332,7 +332,7 @@ OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const return m_vEntries[ nIndex ]->m_sVersion; } -//------------------------------------------------------------------------------ + OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -340,7 +340,7 @@ OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const return m_vEntries[ nIndex ]->m_sDescription; } -//------------------------------------------------------------------------------ + OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -348,7 +348,7 @@ OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const return m_vEntries[ nIndex ]->m_sPublisher; } -//------------------------------------------------------------------------------ + OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -356,7 +356,7 @@ OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const return m_vEntries[ nIndex ]->m_sPublisherURL; } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::select( sal_Int32 nIndex ) { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -364,7 +364,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex ) selectEntry( nIndex ); } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::select( const OUString & sName ) { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -381,7 +381,7 @@ void ExtensionBox_Impl::select( const OUString & sName ) } } -//------------------------------------------------------------------------------ + // Title + description void ExtensionBox_Impl::CalcActiveHeight( const long nPos ) { @@ -422,13 +422,13 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos ) m_nActiveHeight = aTextHeight + 2; } -//------------------------------------------------------------------------------ + const Size ExtensionBox_Impl::GetMinOutputSizePixel() const { return Size( 200, 80 ); } -//------------------------------------------------------------------------------ + Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -450,7 +450,7 @@ Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const return Rectangle( aPos, aSize ); } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::DeleteRemoved() { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -476,7 +476,7 @@ void ExtensionBox_Impl::DeleteRemoved() m_bInDelete = false; } -//------------------------------------------------------------------------------ + //This function may be called with nPos < 0 void ExtensionBox_Impl::selectEntry( const long nPos ) { @@ -521,7 +521,7 @@ void ExtensionBox_Impl::selectEntry( const long nPos ) guard.clear(); } -// ----------------------------------------------------------------------- + void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -681,7 +681,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr DrawLine( rRect.BottomLeft(), rRect.BottomRight() ); } -// ----------------------------------------------------------------------- + void ExtensionBox_Impl::RecalcAll() { if ( m_bHasActive ) @@ -732,13 +732,13 @@ void ExtensionBox_Impl::RecalcAll() m_bNeedsRecalc = false; } -// ----------------------------------------------------------------------- + bool ExtensionBox_Impl::HandleTabKey( bool ) { return false; } -// ----------------------------------------------------------------------- + bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode ) { if ( m_vEntries.empty() ) @@ -783,7 +783,7 @@ bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode ) return true; } -// ----------------------------------------------------------------------- + void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ ) { if ( !m_bInDelete ) @@ -810,7 +810,7 @@ void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ ) } } -// ----------------------------------------------------------------------- + long ExtensionBox_Impl::GetTotalHeight() const { long nHeight = m_vEntries.size() * m_nStdHeight; @@ -823,7 +823,7 @@ long ExtensionBox_Impl::GetTotalHeight() const return nHeight; } -// ----------------------------------------------------------------------- + void ExtensionBox_Impl::SetupScrollBar() { const Size aSize = GetOutputSizePixel(); @@ -856,13 +856,13 @@ void ExtensionBox_Impl::SetupScrollBar() m_bHasScrollBar = bNeedsScrollBar; } -// ----------------------------------------------------------------------- + void ExtensionBox_Impl::Resize() { RecalcAll(); } -//------------------------------------------------------------------------------ + long ExtensionBox_Impl::PointToPos( const Point& rPos ) { long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight; @@ -878,7 +878,7 @@ long ExtensionBox_Impl::PointToPos( const Point& rPos ) return nPos; } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) { long nPos = PointToPos( rMEvt.GetPosPixel() ); @@ -892,7 +892,7 @@ void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) } } -//------------------------------------------------------------------------------ + bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) @@ -936,7 +936,7 @@ bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) return true; } -//------------------------------------------------------------------------------ + bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart, const long nEnd, long &nPos ) { @@ -1017,7 +1017,7 @@ void ExtensionBox_Impl::addEventListenerOnce( } } -//------------------------------------------------------------------------------ + long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage, bool bLicenseMissing ) { @@ -1073,7 +1073,7 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > & return nPos; } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage ) { typedef std::vector< TEntry_Impl >::iterator ITER; @@ -1103,7 +1103,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage } } -//------------------------------------------------------------------------------ + //This function is also called as a result of removing an extension. //see PackageManagerImpl::removePackage //The gui is a registered as listener on the package. Removing it will cause the @@ -1156,7 +1156,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage } } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::RemoveUnlocked() { bool bAllRemoved = false; @@ -1183,7 +1183,7 @@ void ExtensionBox_Impl::RemoveUnlocked() } } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::prepareChecking() { m_bInCheckMode = true; @@ -1195,7 +1195,7 @@ void ExtensionBox_Impl::prepareChecking() } } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::checkEntries() { long nNewPos = -1; @@ -1255,14 +1255,14 @@ void ExtensionBox_Impl::checkEntries() } } -//------------------------------------------------------------------------------ + void ExtensionBox_Impl::SetScrollHdl( const Link& rLink ) { if ( m_pScrollBar ) m_pScrollBar->SetScrollHdl( rLink ); } -// ----------------------------------------------------------------------- + void ExtensionBox_Impl::DoScroll( long nDelta ) { m_nTopIndex += nDelta; @@ -1275,7 +1275,7 @@ void ExtensionBox_Impl::DoScroll( long nDelta ) m_pScrollBar->SetPosPixel( aNewSBPt ); } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar ) { DoScroll( pScrBar->GetDelta() ); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index d19f175bf365..44083b4d2d7e 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -60,17 +60,17 @@ public: virtual void DeInit(); }; -//______________________________________________________________________________ + MyApp::~MyApp() { } -//______________________________________________________________________________ + MyApp::MyApp() { } -//______________________________________________________________________________ + int MyApp::Main() { return EXIT_SUCCESS; @@ -166,7 +166,7 @@ public: throw (RuntimeException); }; -//______________________________________________________________________________ + ServiceImpl::ServiceImpl( Sequence<Any> const& args, Reference<XComponentContext> const& xComponentContext) : m_xComponentContext(xComponentContext), @@ -188,7 +188,7 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args, } // XAsynchronousExecutableDialog -//______________________________________________________________________________ + void ServiceImpl::setDialogTitle( OUString const & title ) throw (RuntimeException) { @@ -205,7 +205,7 @@ void ServiceImpl::setDialogTitle( OUString const & title ) m_initialTitle = title; } -//______________________________________________________________________________ + void ServiceImpl::startExecuteModal( Reference< ui::dialogs::XDialogClosedListener > const & xListener ) throw (RuntimeException) @@ -296,7 +296,7 @@ void ServiceImpl::startExecuteModal( } // XJobExecutor -//______________________________________________________________________________ + void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException) { if ( rEvent == "SHOW_UPDATE_DIALOG" ) diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 21964b4a9096..189f397efc6d 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -41,13 +41,13 @@ using namespace ::com::sun::star; namespace dp_gui { -//------------------------------------------------------------------------------ + ::rtl::Reference< TheExtensionManager > TheExtensionManager::s_ExtMgr; -//------------------------------------------------------------------------------ + // TheExtensionManager -//------------------------------------------------------------------------------ + TheExtensionManager::TheExtensionManager( Window *pParent, const uno::Reference< uno::XComponentContext > &xContext ) : @@ -95,7 +95,7 @@ TheExtensionManager::TheExtensionManager( Window *pParent, } } -//------------------------------------------------------------------------------ + TheExtensionManager::~TheExtensionManager() { delete m_pUpdReqDialog; @@ -103,7 +103,7 @@ TheExtensionManager::~TheExtensionManager() delete m_pExecuteCmdQueue; } -//------------------------------------------------------------------------------ + void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) { const SolarMutexGuard guard; @@ -128,7 +128,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) } } -//------------------------------------------------------------------------------ + void TheExtensionManager::Show() { const SolarMutexGuard guard; @@ -136,7 +136,7 @@ void TheExtensionManager::Show() getDialog()->Show(); } -//------------------------------------------------------------------------------ + void TheExtensionManager::SetText( const OUString &rTitle ) { const SolarMutexGuard guard; @@ -144,7 +144,7 @@ void TheExtensionManager::SetText( const OUString &rTitle ) getDialog()->SetText( rTitle ); } -//------------------------------------------------------------------------------ + void TheExtensionManager::ToTop( sal_uInt16 nFlags ) { const SolarMutexGuard guard; @@ -152,7 +152,7 @@ void TheExtensionManager::ToTop( sal_uInt16 nFlags ) getDialog()->ToTop( nFlags ); } -//------------------------------------------------------------------------------ + bool TheExtensionManager::Close() { if ( m_pExtMgrDialog ) @@ -163,7 +163,7 @@ bool TheExtensionManager::Close() return true; } -//------------------------------------------------------------------------------ + sal_Int16 TheExtensionManager::execute() { sal_Int16 nRet = 0; @@ -178,13 +178,13 @@ sal_Int16 TheExtensionManager::execute() return nRet; } -//------------------------------------------------------------------------------ + bool TheExtensionManager::isVisible() { return getDialog()->IsVisible(); } -//------------------------------------------------------------------------------ + bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bParentVisible*/ ) { std::vector< uno::Reference< deployment::XPackage > > vEntries; @@ -217,7 +217,7 @@ bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bPare return true; } -//------------------------------------------------------------------------------ + bool TheExtensionManager::installPackage( const OUString &rPackageURL, bool bWarnUser ) { if ( rPackageURL.isEmpty() ) @@ -243,7 +243,7 @@ bool TheExtensionManager::installPackage( const OUString &rPackageURL, bool bWar return true; } -//------------------------------------------------------------------------------ + bool TheExtensionManager::queryTermination() { if ( dp_misc::office_is_running() ) @@ -253,7 +253,7 @@ bool TheExtensionManager::queryTermination() return true; } -//------------------------------------------------------------------------------ + void TheExtensionManager::terminateDialog() { if ( ! dp_misc::office_is_running() ) @@ -267,7 +267,7 @@ void TheExtensionManager::terminateDialog() } } -//------------------------------------------------------------------------------ + void TheExtensionManager::createPackageList() { uno::Sequence< uno::Sequence< uno::Reference< deployment::XPackage > > > xAllPackages; @@ -317,7 +317,7 @@ void TheExtensionManager::createPackageList() } } -//------------------------------------------------------------------------------ + PackageState TheExtensionManager::getPackageState( const uno::Reference< deployment::XPackage > &xPackage ) const { try { @@ -345,7 +345,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym } } -//------------------------------------------------------------------------------ + bool TheExtensionManager::isReadOnly( const uno::Reference< deployment::XPackage > &xPackage ) const { if ( m_xExtensionManager.is() && xPackage.is() ) @@ -356,7 +356,7 @@ bool TheExtensionManager::isReadOnly( const uno::Reference< deployment::XPackage return true; } -//------------------------------------------------------------------------------ + // The function investigates if the extension supports options. bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPackage > &xPackage ) const { @@ -408,7 +408,7 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa return bOptions; } -//------------------------------------------------------------------------------ + // XEventListener void TheExtensionManager::disposing( lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) @@ -435,7 +435,7 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt ) } } -//------------------------------------------------------------------------------ + // XTerminateListener void TheExtensionManager::queryTermination( ::lang::EventObject const & ) throw ( frame::TerminationVetoException, uno::RuntimeException ) @@ -458,14 +458,14 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & ) } } -//------------------------------------------------------------------------------ + void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) { disposing( rEvt ); } -//------------------------------------------------------------------------------ + // XModifyListener void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) throw ( uno::RuntimeException ) @@ -475,7 +475,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) getDialogHelper()->checkEntries(); } -//------------------------------------------------------------------------------ + ::rtl::Reference< TheExtensionManager > TheExtensionManager::get( const uno::Reference< uno::XComponentContext > &xContext, const uno::Reference< awt::XWindow > &xParent, const OUString & extensionURL ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index d91dd066c15c..d8839023e3a1 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -160,7 +160,7 @@ struct UpdateDialog::SpecificError { sal_uInt16 m_nID; }; -//------------------------------------------------------------------------------ + struct UpdateDialog::IgnoredUpdate { OUString sExtensionID; OUString sVersion; @@ -169,14 +169,14 @@ struct UpdateDialog::IgnoredUpdate { IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ); }; -//------------------------------------------------------------------------------ + UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ): sExtensionID( rExtensionID ), sVersion( rVersion ), bRemoved( false ) {} -//------------------------------------------------------------------------------ + struct UpdateDialog::Index { Kind m_eKind; @@ -188,7 +188,7 @@ struct UpdateDialog::Index Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ); }; -//------------------------------------------------------------------------------ + UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ): m_eKind( theKind ), m_bIgnored( false ), @@ -197,9 +197,9 @@ UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, con m_aName( rName ) {} -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + class UpdateDialog::Thread: public salhelper::Thread { public: Thread( @@ -562,7 +562,7 @@ UpdateDialog::UpdateDialog( getIgnoredUpdates(); } -//------------------------------------------------------------------------------ + UpdateDialog::~UpdateDialog() { storeIgnoredUpdates(); @@ -577,7 +577,7 @@ UpdateDialog::~UpdateDialog() } } -//------------------------------------------------------------------------------ + bool UpdateDialog::Close() { m_thread->stop(); return ModalDialog::Close(); @@ -589,9 +589,9 @@ short UpdateDialog::Execute() { return ModalDialog::Execute(); } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource, Image const & normalStaticImage ): SvxCheckListBox( &dialog, resource, normalStaticImage ), @@ -601,17 +601,17 @@ UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & r m_dialog(dialog) {} -//------------------------------------------------------------------------------ + UpdateDialog::CheckListBox::~CheckListBox() {} -//------------------------------------------------------------------------------ + sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const { sal_uLong i = GetEntryCount(); OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max()); return sal::static_int_cast< sal_uInt16 >(i); } -//------------------------------------------------------------------------------ + void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event ) { // When clicking on a selected entry in an SvxCheckListBox, the entry's @@ -626,7 +626,7 @@ void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event ) m_dialog.enableOk(); } -//------------------------------------------------------------------------------ + void UpdateDialog::CheckListBox::MouseButtonUp(MouseEvent const & event) { // When clicking on an entry's checkbox in an SvxCheckListBox, the entry's // checkbox is toggled on mouse button up: @@ -639,7 +639,7 @@ void UpdateDialog::CheckListBox::KeyInput(KeyEvent const & event) { m_dialog.enableOk(); } -//------------------------------------------------------------------------------ + void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos ) { SvTreeListEntry *pData = GetEntry( rPos ); @@ -690,9 +690,9 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos ) } } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind ) { m_updates.InsertEntry( pEntry->m_aName, LISTBOX_APPEND, static_cast< void * >( pEntry ), kind ); @@ -708,7 +708,7 @@ sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKi return 0; } -//------------------------------------------------------------------------------ + void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind kind ) { m_all.Enable(); @@ -722,7 +722,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind } } -//------------------------------------------------------------------------------ + void UpdateDialog::addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ) { @@ -749,7 +749,7 @@ void UpdateDialog::addEnabledUpdate( OUString const & name, m_descriptions.Enable(); } -//------------------------------------------------------------------------------ + void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data ) { sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() ); @@ -765,7 +765,7 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data ) addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox ); } -//------------------------------------------------------------------------------ + void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data ) { sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() ); @@ -1045,7 +1045,7 @@ bool UpdateDialog::showDescription( const OUString& rDescription, bool bWithPubl return true; } -//------------------------------------------------------------------------------ + void UpdateDialog::getIgnoredUpdates() { uno::Reference< lang::XMultiServiceFactory > xConfig( @@ -1069,7 +1069,7 @@ void UpdateDialog::getIgnoredUpdates() } } -//------------------------------------------------------------------------------ + void UpdateDialog::storeIgnoredUpdates() { if ( m_bModified && ( !m_ignoredUpdates.empty() ) ) @@ -1108,7 +1108,7 @@ void UpdateDialog::storeIgnoredUpdates() m_bModified = false; } -//------------------------------------------------------------------------------ + bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) { bool bIsIgnored = false; @@ -1153,7 +1153,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) return bIsIgnored; } -//------------------------------------------------------------------------------ + void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ) { OUString aExtensionID; @@ -1200,7 +1200,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, } } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(UpdateDialog, selectionHandler) { diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index a0c3c18548c1..9a63b1e97dc7 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -294,13 +294,13 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args, } // XExecutableDialog -//______________________________________________________________________________ + void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException) { } -//______________________________________________________________________________ + sal_Int16 LicenseDialog::execute() throw (RuntimeException) { return vcl::solarthread::syncExecute( diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index a57c531d82c6..4b328bf2fdaf 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -53,14 +53,14 @@ BaseCommandEnv::~BaseCommandEnv() { } // XCommandEnvironment -//______________________________________________________________________________ + Reference<task::XInteractionHandler> BaseCommandEnv::getInteractionHandler() throw (uno::RuntimeException) { return this; } -//______________________________________________________________________________ + Reference<ucb::XProgressHandler> BaseCommandEnv::getProgressHandler() throw (uno::RuntimeException) { diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index d900b2d5ba59..7f52de4726ec 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -161,7 +161,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard() namespace dp_manager { -//------------------------------------------------------------------------------ + //ToDo: bundled extension ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) : @@ -176,7 +176,7 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x m_repositoryNames.push_back("bundled"); } -//------------------------------------------------------------------------------ + ExtensionManager::~ExtensionManager() { @@ -1452,7 +1452,7 @@ sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository) { return getPackageManager(repository)->isReadOnly(); } -//------------------------------------------------------------------------------ + namespace sdecl = comphelper::service_decl; sdecl::class_<ExtensionManager> servicePIP; @@ -1463,7 +1463,7 @@ extern sdecl::ServiceDecl const serviceDecl( "com.sun.star.comp.deployment.ExtensionManager"); // XModifyBroadcaster -//______________________________________________________________________________ + void ExtensionManager::addModifyListener( Reference<util::XModifyListener> const & xListener ) throw (uno::RuntimeException) @@ -1472,7 +1472,7 @@ void ExtensionManager::addModifyListener( rBHelper.addListener( ::getCppuType( &xListener ), xListener ); } -//______________________________________________________________________________ + void ExtensionManager::removeModifyListener( Reference<util::XModifyListener> const & xListener ) throw (uno::RuntimeException) diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index f6f71643c21a..66fd651ca185 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -74,7 +74,7 @@ class PackageInformationProvider : throw ( uno::RuntimeException ); virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() throw ( uno::RuntimeException ); -//--------- + private: uno::Reference< uno::XComponentContext> mxContext; @@ -85,7 +85,7 @@ private: uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation; }; -//------------------------------------------------------------------------------ + PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) : mxContext( xContext ), @@ -93,13 +93,13 @@ PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XCo { } -//------------------------------------------------------------------------------ + PackageInformationProvider::~PackageInformationProvider() { } -//------------------------------------------------------------------------------ + OUString PackageInformationProvider::getPackageLocation( const OUString & repository, const OUString& _rExtensionId ) @@ -134,7 +134,7 @@ OUString PackageInformationProvider::getPackageLocation( return aLocationURL; } -//------------------------------------------------------------------------------ + OUString SAL_CALL PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) @@ -158,7 +158,7 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) return aLocationURL; } -//------------------------------------------------------------------------------ + uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) @@ -271,7 +271,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) return aList; } -//------------------------------------------------------------------------------ + uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList() throw ( uno::RuntimeException ) { @@ -318,7 +318,7 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider:: } -//------------------------------------------------------------------------------ + namespace sdecl = comphelper::service_decl; sdecl::class_<PackageInformationProvider> servicePIP; diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 3bc0c7895979..e1d6effae671 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -108,7 +108,7 @@ OUString getExtensionFolder(OUString const & parentFolder, return title; } } -//______________________________________________________________________________ + void PackageManagerImpl::initActivationLayer( Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -280,7 +280,7 @@ void PackageManagerImpl::initActivationLayer( } } -//______________________________________________________________________________ + void PackageManagerImpl::initRegistryBackends() { if (!m_registryCache.isEmpty()) @@ -326,7 +326,7 @@ static bool isMacroURLReadOnly( const OUString &rMacro ) return bError; } -//______________________________________________________________________________ + Reference<deployment::XPackageManager> PackageManagerImpl::create( Reference<XComponentContext> const & xComponentContext, OUString const & context ) @@ -430,12 +430,12 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( } } -//______________________________________________________________________________ + PackageManagerImpl::~PackageManagerImpl() { } -//______________________________________________________________________________ + void PackageManagerImpl::fireModified() { ::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer( @@ -447,7 +447,7 @@ void PackageManagerImpl::fireModified() } } -//______________________________________________________________________________ + void PackageManagerImpl::disposing() { try { @@ -475,7 +475,7 @@ void PackageManagerImpl::disposing() } // XComponent -//______________________________________________________________________________ + void PackageManagerImpl::dispose() throw (RuntimeException) { //Do not call check here. We must not throw an exception here if the object @@ -483,7 +483,7 @@ void PackageManagerImpl::dispose() throw (RuntimeException) WeakComponentImplHelperBase::dispose(); } -//______________________________________________________________________________ + void PackageManagerImpl::addEventListener( Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) { @@ -492,7 +492,7 @@ void PackageManagerImpl::addEventListener( WeakComponentImplHelperBase::addEventListener( xListener ); } -//______________________________________________________________________________ + void PackageManagerImpl::removeEventListener( Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) { @@ -502,14 +502,14 @@ void PackageManagerImpl::removeEventListener( } // XPackageManager -//______________________________________________________________________________ + OUString PackageManagerImpl::getContext() throw (RuntimeException) { check(); return m_context; } -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -517,7 +517,7 @@ PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException) return m_xRegistry->getSupportedPackageTypes(); } -//______________________________________________________________________________ + Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel() throw (RuntimeException) { @@ -526,7 +526,7 @@ Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel() } // XModifyBroadcaster -//______________________________________________________________________________ + void PackageManagerImpl::addModifyListener( Reference<util::XModifyListener> const & xListener ) throw (RuntimeException) @@ -535,7 +535,7 @@ void PackageManagerImpl::addModifyListener( rBHelper.addListener( ::getCppuType( &xListener ), xListener ); } -//______________________________________________________________________________ + void PackageManagerImpl::removeModifyListener( Reference<util::XModifyListener> const & xListener ) throw (RuntimeException) @@ -544,7 +544,7 @@ void PackageManagerImpl::removeModifyListener( rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } -//______________________________________________________________________________ + OUString PackageManagerImpl::detectMediaType( ::ucbhelper::Content const & ucbContent_, bool throw_exc ) { @@ -583,7 +583,7 @@ OUString PackageManagerImpl::detectMediaType( return mediaType; } -//______________________________________________________________________________ + OUString PackageManagerImpl::insertToActivationLayer( Sequence<beans::NamedValue> const & properties, OUString const & mediaType, ::ucbhelper::Content const & sourceContent_, @@ -652,7 +652,7 @@ OUString PackageManagerImpl::insertToActivationLayer( return destFolder; } -//______________________________________________________________________________ + void PackageManagerImpl::insertToActivationLayerDB( OUString const & id, ActivePackages::Data const & dbData ) { @@ -661,7 +661,7 @@ void PackageManagerImpl::insertToActivationLayerDB( m_activePackagesDB->put( id, dbData ); } -//______________________________________________________________________________ + /* The function returns true if there is an extension with the same id already installed which needs to be uninstalled, before the new extension can be installed. */ @@ -679,7 +679,7 @@ bool PackageManagerImpl::isInstalled( } // XPackageManager -//______________________________________________________________________________ + Reference<deployment::XPackage> PackageManagerImpl::importExtension( Reference<deployment::XPackage> const & extension, Reference<task::XAbortChannel> const & xAbortChannel, @@ -850,7 +850,7 @@ void PackageManagerImpl::deletePackageFromCache( false /* no throw: ignore errors */ ); } -//______________________________________________________________________________ + void PackageManagerImpl::removePackage( OUString const & id, OUString const & fileName, Reference<task::XAbortChannel> const & /*xAbortChannel*/, @@ -938,7 +938,7 @@ void PackageManagerImpl::removePackage( } } -//______________________________________________________________________________ + OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data ) { OUStringBuffer buf; @@ -956,7 +956,7 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data ) return makeURL( m_activePackages, buf.makeStringAndClear() ); } -//______________________________________________________________________________ + Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( OUString const & id, OUString const & fileName, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -971,7 +971,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } -//______________________________________________________________________________ + Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( OUString const & id, ActivePackages::Data const & data, Reference<XCommandEnvironment> const & xCmdEnv, bool ignoreAlienPlatforms ) @@ -1009,7 +1009,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( return xExtension; } -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getDeployedPackages_( Reference<XCommandEnvironment> const & xCmdEnv ) @@ -1045,7 +1045,7 @@ PackageManagerImpl::getDeployedPackages_( return comphelper::containerToSequence(packages); } -//______________________________________________________________________________ + Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage( OUString const & id, OUString const & fileName, Reference<XCommandEnvironment> const & xCmdEnv_ ) @@ -1088,7 +1088,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage( } } -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getDeployedPackages( Reference<task::XAbortChannel> const &, @@ -1133,7 +1133,7 @@ PackageManagerImpl::getDeployedPackages( } } -//______________________________________________________________________________ + //ToDo: the function must not call registerPackage, do this in @@ -1562,12 +1562,12 @@ sal_Int32 PackageManagerImpl::checkPrerequisites( } -//______________________________________________________________________________ + PackageManagerImpl::CmdEnvWrapperImpl::~CmdEnvWrapperImpl() { } -//______________________________________________________________________________ + PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl( Reference<XCommandEnvironment> const & xUserCmdEnv, Reference<XProgressHandler> const & xLogFile ) @@ -1580,7 +1580,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl( } // XCommandEnvironment -//______________________________________________________________________________ + Reference<task::XInteractionHandler> PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler() throw (RuntimeException) @@ -1588,7 +1588,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler() return m_xUserInteractionHandler; } -//______________________________________________________________________________ + Reference<XProgressHandler> PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler() throw (RuntimeException) @@ -1597,7 +1597,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler() } // XProgressHandler -//______________________________________________________________________________ + void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status ) throw (RuntimeException) { @@ -1607,7 +1607,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status ) m_xUserProgress->push( Status ); } -//______________________________________________________________________________ + void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status ) throw (RuntimeException) { @@ -1617,7 +1617,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status ) m_xUserProgress->update( Status ); } -//______________________________________________________________________________ + void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException) { if (m_xLogFile.is()) diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index e2d1259fd3cc..e23dba62a555 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -74,7 +74,7 @@ extern sdecl::ServiceDecl const serviceDecl( "com.sun.star.comp.deployment.PackageManagerFactory", "com.sun.star.comp.deployment.PackageManagerFactory" ); -//______________________________________________________________________________ + PackageManagerFactoryImpl::PackageManagerFactoryImpl( Reference<XComponentContext> const & xComponentContext ) : t_pmfac_helper( getMutex() ), @@ -82,12 +82,12 @@ PackageManagerFactoryImpl::PackageManagerFactoryImpl( { } -//______________________________________________________________________________ + PackageManagerFactoryImpl::~PackageManagerFactoryImpl() { } -//______________________________________________________________________________ + inline void PackageManagerFactoryImpl::check() { ::osl::MutexGuard guard( getMutex() ); @@ -99,7 +99,7 @@ inline void PackageManagerFactoryImpl::check() } } -//______________________________________________________________________________ + void PackageManagerFactoryImpl::disposing() { // dispose all managers: @@ -118,7 +118,7 @@ void PackageManagerFactoryImpl::disposing() } // XPackageManagerFactory -//______________________________________________________________________________ + Reference<deployment::XPackageManager> PackageManagerFactoryImpl::getPackageManager( OUString const & context ) throw (RuntimeException) diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index f25165e4eff4..92c4cf97eed2 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -58,19 +58,19 @@ public: }; // XInterface -//______________________________________________________________________________ + void InteractionContinuationImpl::acquire() throw () { OWeakObject::acquire(); } -//______________________________________________________________________________ + void InteractionContinuationImpl::release() throw () { OWeakObject::release(); } -//______________________________________________________________________________ + Any InteractionContinuationImpl::queryInterface( Type const & type ) throw (RuntimeException) { @@ -83,7 +83,7 @@ Any InteractionContinuationImpl::queryInterface( Type const & type ) } // XInteractionContinuation -//______________________________________________________________________________ + void InteractionContinuationImpl::select() throw (RuntimeException) { *m_pselect = true; @@ -112,13 +112,13 @@ public: }; // XInteractionRequest -//______________________________________________________________________________ + Any InteractionRequest::getRequest() throw (RuntimeException) { return m_request; } -//______________________________________________________________________________ + Sequence< Reference< task::XInteractionContinuation > > InteractionRequest::getContinuations() throw (RuntimeException) { @@ -162,7 +162,7 @@ bool interactContinuation( Any const & request, } // XAbortChannel -//______________________________________________________________________________ + void AbortChannel::sendAbort() throw (RuntimeException) { m_aborted = true; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index f148d4cfbb0c..f79aeb1f8461 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -335,7 +335,7 @@ public: void initServiceRdbFiles(); }; -//______________________________________________________________________________ + BackendImpl::ComponentPackageImpl::ComponentPackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -389,19 +389,19 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const } -//______________________________________________________________________________ + void BackendImpl::ComponentPackageImpl::disposing() { Package::disposing(); } -//______________________________________________________________________________ + void BackendImpl::TypelibraryPackageImpl::disposing() { Package::disposing(); } -//______________________________________________________________________________ + void BackendImpl::disposing() { try { @@ -599,7 +599,7 @@ void BackendImpl::revokeEntryFromDb(OUString const & url) } // XPackageRegistry -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > BackendImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -615,7 +615,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT } // PackageRegistryBackend -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::bindPackage_( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, @@ -746,7 +746,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } -//______________________________________________________________________________ + void BackendImpl::unorc_verify_init( Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -866,7 +866,7 @@ void BackendImpl::unorc_verify_init( } } -//______________________________________________________________________________ + void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) { if (transientMode()) @@ -990,7 +990,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) m_unorc_modified = false; } -//______________________________________________________________________________ + bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -1009,7 +1009,7 @@ bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_, return false; } -//______________________________________________________________________________ + bool BackendImpl::removeFromUnoRc( RcItem kind, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -1024,7 +1024,7 @@ bool BackendImpl::removeFromUnoRc( return true; } -//______________________________________________________________________________ + bool BackendImpl::hasInUnoRc( RcItem kind, OUString const & url_ ) { @@ -1043,14 +1043,14 @@ css::uno::Reference< css::uno::XComponentContext > BackendImpl::getRootContext() return rootContext.is() ? rootContext : getComponentContext(); } -//______________________________________________________________________________ + void BackendImpl::releaseObject( OUString const & id ) { const ::osl::MutexGuard guard( getMutex() ); m_backendObjects.erase( id ); } -//______________________________________________________________________________ + Reference<XInterface> BackendImpl::getObject( OUString const & id ) { const ::osl::MutexGuard guard( getMutex() ); @@ -1061,7 +1061,7 @@ Reference<XInterface> BackendImpl::getObject( OUString const & id ) return iFind->second; } -//______________________________________________________________________________ + Reference<XInterface> BackendImpl::insertObject( OUString const & id, Reference<XInterface> const & xObject ) { @@ -1072,7 +1072,7 @@ Reference<XInterface> BackendImpl::insertObject( return insertion.first->second; } -//------------------------------------------------------------------------------ + Reference<XComponentContext> raise_uno_process( Reference<XComponentContext> const & xContext, ::rtl::Reference<AbortChannel> const & abortChannel ) @@ -1123,7 +1123,7 @@ Reference<XComponentContext> raise_uno_process( } } -//------------------------------------------------------------------------------ + namespace { void extractComponentData( @@ -1294,7 +1294,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveRemoval( } // Package -//______________________________________________________________________________ + //We could use here BackendImpl::hasActiveEntry. However, this check is just as well. //And it also shows the problem if another extension has overwritten an implementation //entry, because it contains the same service implementation @@ -1375,7 +1375,7 @@ BackendImpl::ComponentPackageImpl::isRegistered_( m_registered == REG_REGISTERED, bAmbiguous) ); } -//______________________________________________________________________________ + void BackendImpl::ComponentPackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, @@ -1488,7 +1488,7 @@ BackendImpl * BackendImpl::TypelibraryPackageImpl::getMyBackend() const } return pBackend; } -//______________________________________________________________________________ + beans::Optional< beans::Ambiguous<sal_Bool> > BackendImpl::TypelibraryPackageImpl::isRegistered_( ::osl::ResettableMutexGuard &, @@ -1504,7 +1504,7 @@ BackendImpl::TypelibraryPackageImpl::isRegistered_( false /* IsAmbiguous */ ) ); } -//______________________________________________________________________________ + void BackendImpl::TypelibraryPackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index d3bee88724a9..a133cb5e2b3a 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -155,7 +155,7 @@ public: using PackageRegistryBackend::disposing; }; -//______________________________________________________________________________ + void BackendImpl::disposing() { try { @@ -174,7 +174,7 @@ void BackendImpl::disposing() } } -//______________________________________________________________________________ + BackendImpl::BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ) @@ -284,7 +284,7 @@ bool BackendImpl::activateEntry(OUString const & url) // XPackageRegistry -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > BackendImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -299,7 +299,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT } // PackageRegistryBackend -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::bindPackage_( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, @@ -360,7 +360,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } -//______________________________________________________________________________ + void BackendImpl::configmgrini_verify_init( Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -417,7 +417,7 @@ void BackendImpl::configmgrini_verify_init( } } -//______________________________________________________________________________ + void BackendImpl::configmgrini_flush( Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -473,7 +473,7 @@ void BackendImpl::configmgrini_flush( m_configmgrini_modified = false; } -//______________________________________________________________________________ + bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) { @@ -492,7 +492,7 @@ bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & return false; } -//______________________________________________________________________________ + bool BackendImpl::removeFromConfigmgrIni( bool isSchema, OUString const & url_, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -524,7 +524,7 @@ bool BackendImpl::removeFromConfigmgrIni( // Package -//______________________________________________________________________________ + BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { @@ -566,7 +566,7 @@ BackendImpl::PackageImpl::isRegistered_( true, beans::Ambiguous<sal_Bool>( bReg, false ) ); } -//------------------------------------------------------------------------------ + OUString encodeForXml( OUString const & text ) { // encode conforming xml: @@ -599,7 +599,7 @@ OUString encodeForXml( OUString const & text ) return buf.makeStringAndClear(); } -//______________________________________________________________________________ + OUString replaceOrigin( OUString const & url, OUString const & destFolder, Reference< XCommandEnvironment > const & xCmdEnv, Reference< XComponentContext > const & xContext, bool & out_replaced) { @@ -686,7 +686,7 @@ OUString replaceOrigin( return newUrl; } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 41daf4a15c1c..ad4a63d99ac6 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -50,12 +50,12 @@ using namespace ::com::sun::star::ucb; namespace dp_registry { namespace backend { -//______________________________________________________________________________ + PackageRegistryBackend::~PackageRegistryBackend() { } -//______________________________________________________________________________ + void PackageRegistryBackend::disposing( lang::EventObject const & event ) throw (RuntimeException) { @@ -69,7 +69,7 @@ void PackageRegistryBackend::disposing( lang::EventObject const & event ) } } -//______________________________________________________________________________ + PackageRegistryBackend::PackageRegistryBackend( Sequence<Any> const & args, Reference<XComponentContext> const & xContext ) @@ -101,7 +101,7 @@ PackageRegistryBackend::PackageRegistryBackend( m_eContext = CONTEXT_UNKNOWN; } -//______________________________________________________________________________ + void PackageRegistryBackend::check() { ::osl::MutexGuard guard( getMutex() ); @@ -112,7 +112,7 @@ void PackageRegistryBackend::check() } } -//______________________________________________________________________________ + void PackageRegistryBackend::disposing() { try { @@ -134,7 +134,7 @@ void PackageRegistryBackend::disposing() } // XPackageRegistry -//______________________________________________________________________________ + Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -301,12 +301,12 @@ void PackageRegistryBackend::deleteUnusedFolders( } -//______________________________________________________________________________ + Package::~Package() { } -//______________________________________________________________________________ + Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend, OUString const & url, OUString const & rName, @@ -336,14 +336,14 @@ Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend, } } -//______________________________________________________________________________ + void Package::disposing() { m_myBackend.clear(); WeakComponentImplHelperBase::disposing(); } -//______________________________________________________________________________ + void Package::check() const { ::osl::MutexGuard guard( getMutex() ); @@ -355,7 +355,7 @@ void Package::check() const } // XComponent -//______________________________________________________________________________ + void Package::dispose() throw (RuntimeException) { //Do not call check here. We must not throw an exception here if the object @@ -363,7 +363,7 @@ void Package::dispose() throw (RuntimeException) WeakComponentImplHelperBase::dispose(); } -//______________________________________________________________________________ + void Package::addEventListener( Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) { @@ -372,7 +372,7 @@ void Package::addEventListener( WeakComponentImplHelperBase::addEventListener( xListener ); } -//______________________________________________________________________________ + void Package::removeEventListener( Reference<lang::XEventListener> const & xListener ) throw (RuntimeException) { @@ -382,7 +382,7 @@ void Package::removeEventListener( } // XModifyBroadcaster -//______________________________________________________________________________ + void Package::addModifyListener( Reference<util::XModifyListener> const & xListener ) throw (RuntimeException) @@ -391,7 +391,7 @@ void Package::addModifyListener( rBHelper.addListener( ::getCppuType( &xListener ), xListener ); } -//______________________________________________________________________________ + void Package::removeModifyListener( Reference<util::XModifyListener> const & xListener ) throw (RuntimeException) @@ -400,7 +400,7 @@ void Package::removeModifyListener( rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } -//______________________________________________________________________________ + void Package::checkAborted( ::rtl::Reference<AbortChannel> const & abortChannel ) { @@ -411,7 +411,7 @@ void Package::checkAborted( } // XPackage -//______________________________________________________________________________ + Reference<task::XAbortChannel> Package::createAbortChannel() throw (RuntimeException) { @@ -419,13 +419,13 @@ Reference<task::XAbortChannel> Package::createAbortChannel() return new AbortChannel; } -//______________________________________________________________________________ + sal_Bool Package::isBundle() throw (RuntimeException) { return false; // default } -//______________________________________________________________________________ + ::sal_Int32 Package::checkPrerequisites( const css::uno::Reference< css::task::XAbortChannel >&, const css::uno::Reference< css::ucb::XCommandEnvironment >&, @@ -441,7 +441,7 @@ sal_Bool Package::isBundle() throw (RuntimeException) return 0; } -//______________________________________________________________________________ + ::sal_Bool Package::checkDependencies( const css::uno::Reference< css::ucb::XCommandEnvironment >& ) throw (css::deployment::DeploymentException, @@ -455,7 +455,7 @@ sal_Bool Package::isBundle() throw (RuntimeException) } -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackage> > Package::getBundle( Reference<task::XAbortChannel> const &, Reference<XCommandEnvironment> const & ) @@ -466,7 +466,7 @@ Sequence< Reference<deployment::XPackage> > Package::getBundle( return Sequence< Reference<deployment::XPackage> >(); } -//______________________________________________________________________________ + OUString Package::getName() throw (RuntimeException) { return m_name; @@ -480,7 +480,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException) return beans::Optional<OUString>(); } -//______________________________________________________________________________ + OUString Package::getVersion() throw ( deployment::ExtensionRemovedException, RuntimeException) @@ -490,13 +490,13 @@ OUString Package::getVersion() throw ( return OUString(); } -//______________________________________________________________________________ + OUString Package::getURL() throw (RuntimeException) { return m_url; } -//______________________________________________________________________________ + OUString Package::getDisplayName() throw ( deployment::ExtensionRemovedException, RuntimeException) { @@ -505,7 +505,7 @@ OUString Package::getDisplayName() throw ( return m_displayName; } -//______________________________________________________________________________ + OUString Package::getDescription() throw ( deployment::ExtensionRemovedException,RuntimeException) { @@ -514,7 +514,7 @@ OUString Package::getDescription() throw ( return OUString(); } -//______________________________________________________________________________ + OUString Package::getLicenseText() throw ( deployment::ExtensionRemovedException,RuntimeException) { @@ -523,7 +523,7 @@ OUString Package::getLicenseText() throw ( return OUString(); } -//______________________________________________________________________________ + Sequence<OUString> Package::getUpdateInformationURLs() throw ( deployment::ExtensionRemovedException, RuntimeException) { @@ -532,7 +532,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw ( return Sequence<OUString>(); } -//______________________________________________________________________________ + css::beans::StringPair Package::getPublisherInfo() throw ( deployment::ExtensionRemovedException, RuntimeException) { @@ -542,7 +542,7 @@ css::beans::StringPair Package::getPublisherInfo() throw ( return aEmptyPair; } -//______________________________________________________________________________ + uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContrast*/ ) throw (deployment::ExtensionRemovedException, RuntimeException ) { @@ -553,14 +553,14 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr return aEmpty; } -//______________________________________________________________________________ + Reference<deployment::XPackageTypeInfo> Package::getPackageType() throw (RuntimeException) { return m_xPackageType; } -//______________________________________________________________________________ + void Package::exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -578,7 +578,7 @@ void Package::exportTo( throw RuntimeException( "UCB transferContent() failed!", 0 ); } -//______________________________________________________________________________ + void Package::fireModified() { ::cppu::OInterfaceContainerHelper * container = rBHelper.getContainer( @@ -599,7 +599,7 @@ void Package::fireModified() } // XPackage -//______________________________________________________________________________ + beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( Reference<task::XAbortChannel> const & xAbortChannel, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -632,7 +632,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( } } -//______________________________________________________________________________ + void Package::processPackage_impl( bool doRegisterPackage, bool startup, @@ -710,7 +710,7 @@ void Package::processPackage_impl( fireModified(); } -//______________________________________________________________________________ + void Package::registerPackage( sal_Bool startup, Reference<task::XAbortChannel> const & xAbortChannel, @@ -725,7 +725,7 @@ void Package::registerPackage( processPackage_impl( true /* register */, startup, xAbortChannel, xCmdEnv ); } -//______________________________________________________________________________ + void Package::revokePackage( sal_Bool startup, Reference<task::XAbortChannel> const & xAbortChannel, @@ -775,39 +775,39 @@ sal_Bool Package::isRemoved() } -//______________________________________________________________________________ + Package::TypeInfo::~TypeInfo() { } // XPackageTypeInfo -//______________________________________________________________________________ + OUString Package::TypeInfo::getMediaType() throw (RuntimeException) { return m_mediaType; } -//______________________________________________________________________________ + OUString Package::TypeInfo::getDescription() throw (deployment::ExtensionRemovedException, RuntimeException) { return getShortDescription(); } -//______________________________________________________________________________ + OUString Package::TypeInfo::getShortDescription() throw (deployment::ExtensionRemovedException, RuntimeException) { return m_shortDescr; } -//______________________________________________________________________________ + OUString Package::TypeInfo::getFileFilter() throw (RuntimeException) { return m_fileFilter; } -//______________________________________________________________________________ + /************************** * Get Icon * diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index cc1584865967..deeefa1cb2f3 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -129,7 +129,7 @@ public: }; -//______________________________________________________________________________ + inline void PackageRegistryImpl::check() { ::osl::MutexGuard guard( getMutex() ); @@ -140,7 +140,7 @@ inline void PackageRegistryImpl::check() } } -//______________________________________________________________________________ + void PackageRegistryImpl::disposing() { // dispose all backends: @@ -156,12 +156,12 @@ void PackageRegistryImpl::disposing() t_helper::disposing(); } -//______________________________________________________________________________ + PackageRegistryImpl::~PackageRegistryImpl() { } -//______________________________________________________________________________ + OUString normalizeMediaType( OUString const & mediaType ) { OUStringBuffer buf; @@ -175,7 +175,7 @@ OUString normalizeMediaType( OUString const & mediaType ) return buf.makeStringAndClear(); } -//______________________________________________________________________________ + void PackageRegistryImpl::packageRemoved( OUString const & url, OUString const & mediaType) @@ -294,7 +294,7 @@ void PackageRegistryImpl::insertBackend( } } -//______________________________________________________________________________ + Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( OUString const & context, OUString const & cachePath, bool readOnly, @@ -443,7 +443,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( } // XUpdatable: broadcast to backends -//______________________________________________________________________________ + void PackageRegistryImpl::update() throw (RuntimeException) { check(); @@ -457,7 +457,7 @@ void PackageRegistryImpl::update() throw (RuntimeException) } // XPackageRegistry -//______________________________________________________________________________ + Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -533,7 +533,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( } } -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException) { diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index bdcafdd63cfa..4b89487ea703 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -125,7 +125,7 @@ public: }; -//______________________________________________________________________________ + BackendImpl::BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ) @@ -154,7 +154,7 @@ BackendImpl::BackendImpl( } // XPackageRegistry -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > BackendImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -170,7 +170,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT } // PackageRegistryBackend -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::bindPackage_( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, @@ -323,7 +323,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() return bCompiled; } -//______________________________________________________________________________ + beans::Optional< beans::Ambiguous<sal_Bool> > BackendImpl::PackageImpl::isRegistered_( ::osl::ResettableMutexGuard &, @@ -339,7 +339,7 @@ BackendImpl::PackageImpl::isRegistered_( return beans::Optional< beans::Ambiguous<sal_Bool> >( true, beans::Ambiguous<sal_Bool>( bReg, false ) ); } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 0b6dece25682..f5c954ead33c 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -285,7 +285,7 @@ public: } }; -//______________________________________________________________________________ + BackendImpl::BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext, @@ -316,7 +316,7 @@ BackendImpl::BackendImpl( } } -//______________________________________________________________________________ + void BackendImpl::disposing() { m_xRootRegistry.clear(); @@ -343,7 +343,7 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames() } // XPackageRegistry -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > BackendImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -368,7 +368,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT // PackageRegistryBackend -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::bindPackage_( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, @@ -498,7 +498,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const } return pBackend; } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::disposing() { sal_Int32 len = m_bundle.getLength(); @@ -511,7 +511,7 @@ void BackendImpl::PackageImpl::disposing() } // Package -//______________________________________________________________________________ + beans::Optional< beans::Ambiguous<sal_Bool> > BackendImpl::PackageImpl::isRegistered_( ::osl::ResettableMutexGuard &, @@ -683,7 +683,7 @@ bool BackendImpl::PackageImpl::checkDependencies( //Only use interaction if there is no version of this extension already installed //and the suppress-on-update flag is not set for the new extension // alreadyInstalled | bSuppressOnUpdate | show license - //---------------------------------------- + // 0 | 0 | 1 // 0 | 1 | 1 // 1 | 0 | 1 @@ -808,7 +808,7 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo() return aStrPair; } -//______________________________________________________________________________ + uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool bHighContrast ) throw (deployment::ExtensionRemovedException, RuntimeException ) { @@ -835,7 +835,7 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool return xGraphic; } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, @@ -968,7 +968,7 @@ void BackendImpl::PackageImpl::processPackage_( } } -//______________________________________________________________________________ + OUString BackendImpl::PackageImpl::getDescription() throw (deployment::ExtensionRemovedException, RuntimeException) { @@ -996,7 +996,7 @@ OUString BackendImpl::PackageImpl::getDescription() return m_oldDescription; } -//______________________________________________________________________________ + OUString BackendImpl::PackageImpl::getLicenseText() throw (deployment::ExtensionRemovedException, RuntimeException) { @@ -1021,7 +1021,7 @@ OUString BackendImpl::PackageImpl::getLicenseText() return sLicense; } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::exportTo( OUString const & destFolderURL, OUString const & newTitle, sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) @@ -1209,13 +1209,13 @@ void BackendImpl::PackageImpl::exportTo( } } -//______________________________________________________________________________ + sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException) { return true; } -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( Reference<task::XAbortChannel> const & xAbortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) @@ -1344,7 +1344,7 @@ inline bool isBundle_( OUString const & mediaType ) mediaType.matchIgnoreAsciiCase( "application/vnd.sun.star.legacy-package-bundle")); } -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, @@ -1398,7 +1398,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( return xPackage; } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::scanBundle( t_packagevec & bundle, ::rtl::Reference<AbortChannel> const & abortChannel, @@ -1543,7 +1543,7 @@ void BackendImpl::PackageImpl::scanBundle( } } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::scanLegacyBundle( t_packagevec & bundle, OUString const & url, diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index 42d917a3eb78..00817957e153 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -45,7 +45,7 @@ struct StrCannotDetermineLibName : public StaticResourceString< StrCannotDetermineLibName, RID_STR_CANNOT_DETERMINE_LIBNAME> {}; } -//______________________________________________________________________________ + OUString LibraryContainer::get_libname( OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv, diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 5bd7239b61c8..d85093cd3e43 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -110,7 +110,7 @@ public: }; -//______________________________________________________________________________ + BackendImpl::PackageImpl::PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, OUString const & url, @@ -138,7 +138,7 @@ BackendImpl::PackageImpl::PackageImpl( m_displayName = m_name; } -//______________________________________________________________________________ + BackendImpl::BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ) @@ -182,14 +182,14 @@ bool BackendImpl::hasActiveEntry(OUString const & url) } // XUpdatable -//______________________________________________________________________________ + void BackendImpl::update() throw (RuntimeException) { // Nothing to do here after fixing i70283!? } // XPackageRegistry -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > BackendImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -210,7 +210,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT } // PackageRegistryBackend -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::bindPackage_( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 7486909aefdf..c2d5442be957 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -115,7 +115,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const } return pBackend; } -//______________________________________________________________________________ + OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException) { if (m_descr.isEmpty()) @@ -124,13 +124,13 @@ OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException) return m_descr; } -//______________________________________________________________________________ + OUString BackendImpl::PackageImpl::getLicenseText() throw (RuntimeException) { return Package::getDescription(); } -//______________________________________________________________________________ + BackendImpl::PackageImpl::PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, OUString const & url, OUString const & libType, bool bRemoved, @@ -156,7 +156,7 @@ BackendImpl::PackageImpl::PackageImpl( dp_misc::TRACE("PakageImpl displayName is " + m_displayName); } -//______________________________________________________________________________ + BackendImpl::BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ) @@ -175,7 +175,7 @@ BackendImpl::BackendImpl( // XPackageRegistry -//______________________________________________________________________________ + Sequence< Reference<deployment::XPackageTypeInfo> > BackendImpl::getSupportedPackageTypes() throw (RuntimeException) { @@ -189,7 +189,7 @@ void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*me } // PackageRegistryBackend -//______________________________________________________________________________ + Reference<deployment::XPackage> BackendImpl::bindPackage_( OUString const & url, OUString const & mediaType_, sal_Bool bRemoved, OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) @@ -314,7 +314,7 @@ void BackendImpl::PackageImpl:: initPackageHandler() } // Package -//______________________________________________________________________________ + beans::Optional< beans::Ambiguous<sal_Bool> > BackendImpl::PackageImpl::isRegistered_( ::osl::ResettableMutexGuard &, @@ -329,7 +329,7 @@ BackendImpl::PackageImpl::isRegistered_( false /* IsAmbiguous */ ) ); } -//______________________________________________________________________________ + void BackendImpl::PackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index c35a167e8a94..e61607d5d6bc 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -45,7 +45,7 @@ namespace migration return OUString("com.sun.star.comp.desktop.migration.Basic"); } - // ----------------------------------------------------------------------------- + Sequence< OUString > BasicMigration_getSupportedServiceNames() { @@ -62,13 +62,13 @@ namespace migration { } - // ----------------------------------------------------------------------------- + BasicMigration::~BasicMigration() { } - // ----------------------------------------------------------------------------- + TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const { @@ -105,7 +105,7 @@ namespace migration return aResult; } - // ----------------------------------------------------------------------------- + ::osl::FileBase::RC BasicMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) { @@ -123,7 +123,7 @@ namespace migration } } - // ----------------------------------------------------------------------------- + void BasicMigration::copyFiles() { @@ -158,16 +158,16 @@ namespace migration } } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString BasicMigration::getImplementationName() throw (RuntimeException) { return BasicMigration_getImplementationName(); } - // ----------------------------------------------------------------------------- + sal_Bool BasicMigration::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) @@ -175,16 +175,16 @@ namespace migration return cppu::supportsService(this, ServiceName); } - // ----------------------------------------------------------------------------- + Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException) { return BasicMigration_getSupportedServiceNames(); } - // ----------------------------------------------------------------------------- + // XInitialization - // ----------------------------------------------------------------------------- + void BasicMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) { @@ -208,9 +208,9 @@ namespace migration } } - // ----------------------------------------------------------------------------- + // XJob - // ----------------------------------------------------------------------------- + Any BasicMigration::execute( const Sequence< beans::NamedValue >& ) throw (lang::IllegalArgumentException, Exception, RuntimeException) @@ -233,7 +233,7 @@ namespace migration return static_cast< lang::XTypeProvider * >( new BasicMigration() ); } - // ----------------------------------------------------------------------------- + //......................................................................... } // namespace migration diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 849bb8863e41..05f1cd523790 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -196,7 +196,7 @@ public: - //---------------- + ~JavaMigration(); private: @@ -340,7 +340,7 @@ void SAL_CALL JavaMigration::startLayer() throw(css::lang::WrappedTargetException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::endLayer() throw( @@ -348,7 +348,7 @@ void SAL_CALL JavaMigration::endLayer() WrappedTargetException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::overrideNode( const OUString&, @@ -361,7 +361,7 @@ void SAL_CALL JavaMigration::overrideNode( { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::addOrReplaceNode( const OUString&, @@ -378,7 +378,7 @@ void SAL_CALL JavaMigration::endNode() WrappedTargetException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::dropNode( const OUString& ) @@ -387,7 +387,7 @@ void SAL_CALL JavaMigration::dropNode( WrappedTargetException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::overrideProperty( const OUString& aName, @@ -403,7 +403,7 @@ void SAL_CALL JavaMigration::overrideProperty( else if ( aName == "UserClassPath" ) m_aStack.push(TElementStack::value_type(aName, USER_CLASS_PATH)); } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::setPropertyValue( const Any& aValue ) @@ -448,7 +448,7 @@ void SAL_CALL JavaMigration::setPropertyValue( } } } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::setPropertyValueForLocale( const Any&, @@ -458,7 +458,7 @@ void SAL_CALL JavaMigration::setPropertyValueForLocale( WrappedTargetException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::endProperty() throw( @@ -468,7 +468,7 @@ void SAL_CALL JavaMigration::endProperty() if (!m_aStack.empty()) m_aStack.pop(); } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::addProperty( const OUString&, @@ -479,7 +479,7 @@ void SAL_CALL JavaMigration::addProperty( WrappedTargetException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL JavaMigration::addPropertyWithValue( const OUString&, @@ -501,7 +501,7 @@ void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( { } -// ----------------------------------------------------------------------------- + //ToDo enable java, user class path } //end namespace jfw diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 5d03d2258491..720054b5aef5 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -73,7 +73,7 @@ OUString OO3ExtensionMigration_getImplementationName() return *pImplName; } -// ----------------------------------------------------------------------------- + Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames() { @@ -100,7 +100,7 @@ m_ctx(ctx) { } -// ----------------------------------------------------------------------------- + OO3ExtensionMigration::~OO3ExtensionMigration() { @@ -322,16 +322,16 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir ) } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException) { return OO3ExtensionMigration_getImplementationName(); } -// ----------------------------------------------------------------------------- + sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) @@ -339,16 +339,16 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName) return cppu::supportsService(this, ServiceName); } -// ----------------------------------------------------------------------------- + Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException) { return OO3ExtensionMigration_getSupportedServiceNames(); } -// ----------------------------------------------------------------------------- + // XInitialization -// ----------------------------------------------------------------------------- + void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) { @@ -408,9 +408,9 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& ) return Any(); } -// ----------------------------------------------------------------------------- + // TmpRepositoryCommandEnv -// ----------------------------------------------------------------------------- + TmpRepositoryCommandEnv::TmpRepositoryCommandEnv() { @@ -420,14 +420,14 @@ TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv() { } // XCommandEnvironment -//______________________________________________________________________________ + uno::Reference< task::XInteractionHandler > TmpRepositoryCommandEnv::getInteractionHandler() throw ( uno::RuntimeException ) { return this; } -//______________________________________________________________________________ + uno::Reference< ucb::XProgressHandler > TmpRepositoryCommandEnv::getProgressHandler() throw ( uno::RuntimeException ) { @@ -491,7 +491,7 @@ Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( ctx) ); } -// ----------------------------------------------------------------------------- + } // namespace migration diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 1f4c05121f6b..38ccca46c2b0 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -56,7 +56,7 @@ namespace migration return *pImplName; } - // ----------------------------------------------------------------------------- + Sequence< OUString > WordbookMigration_getSupportedServiceNames() { @@ -82,13 +82,13 @@ namespace migration { } - // ----------------------------------------------------------------------------- + WordbookMigration::~WordbookMigration() { } - // ----------------------------------------------------------------------------- + TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const { @@ -125,7 +125,7 @@ namespace migration return aResult; } - // ----------------------------------------------------------------------------- + ::osl::FileBase::RC WordbookMigration::checkAndCreateDirectory( INetURLObject& rDirURL ) { @@ -186,7 +186,7 @@ bool IsUserWordbook( const OUString& rFile ) } - // ----------------------------------------------------------------------------- + void WordbookMigration::copyFiles() { @@ -224,16 +224,16 @@ bool IsUserWordbook( const OUString& rFile ) } } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString WordbookMigration::getImplementationName() throw (RuntimeException) { return WordbookMigration_getImplementationName(); } - // ----------------------------------------------------------------------------- + sal_Bool WordbookMigration::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) @@ -241,16 +241,16 @@ bool IsUserWordbook( const OUString& rFile ) return cppu::supportsService(this, ServiceName); } - // ----------------------------------------------------------------------------- + Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException) { return WordbookMigration_getSupportedServiceNames(); } - // ----------------------------------------------------------------------------- + // XInitialization - // ----------------------------------------------------------------------------- + void WordbookMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) { @@ -274,9 +274,9 @@ bool IsUserWordbook( const OUString& rFile ) } } - // ----------------------------------------------------------------------------- + // XJob - // ----------------------------------------------------------------------------- + Any WordbookMigration::execute( const Sequence< beans::NamedValue >& ) throw (lang::IllegalArgumentException, Exception, RuntimeException) @@ -299,7 +299,7 @@ bool IsUserWordbook( const OUString& rFile ) return static_cast< lang::XTypeProvider * >( new WordbookMigration() ); } - // ----------------------------------------------------------------------------- + //......................................................................... } // namespace migration diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 5d11e0f9cebb..68a26d565fc9 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -258,7 +258,7 @@ Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName ) } // component management stuff... -// ---------------------------------------------------------------------------- + extern "C" { using namespace desktop; diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 9b4ec1acb5d1..3ad157bd0a4f 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -64,7 +64,7 @@ struct ExtensionName } }; -//------------------------------------------------------------------------------ + const char s_usingText [] = "\n" "using: " APP_NAME " add <options> extension-path...\n" @@ -104,7 +104,7 @@ const char s_usingText [] = "To learn more about the Extension Manager and extensions, see:\n" "http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/Extensions\n\n"; -//------------------------------------------------------------------------------ + const OptionInfo s_option_infos [] = { { RTL_CONSTASCII_STRINGPARAM("help"), 'h', false }, { RTL_CONSTASCII_STRINGPARAM("version"), 'V', false }, diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index dd35330a2c8f..046cce00bc7a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -94,7 +94,7 @@ public: }; -//______________________________________________________________________________ + CommandEnvironmentImpl::CommandEnvironmentImpl( Reference<XComponentContext> const & xComponentContext, OUString const & log_file, @@ -118,7 +118,7 @@ CommandEnvironmentImpl::CommandEnvironmentImpl( } } -//______________________________________________________________________________ + CommandEnvironmentImpl::~CommandEnvironmentImpl() { try { @@ -186,14 +186,14 @@ void CommandEnvironmentImpl::printLicense( } // XCommandEnvironment -//______________________________________________________________________________ + Reference< task::XInteractionHandler > CommandEnvironmentImpl::getInteractionHandler() throw (RuntimeException) { return this; } -//______________________________________________________________________________ + Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler() throw (RuntimeException) { @@ -201,7 +201,7 @@ Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler() } // XInteractionHandler -//______________________________________________________________________________ + void CommandEnvironmentImpl::handle( Reference<task::XInteractionRequest> const & xRequest ) throw (RuntimeException) @@ -321,7 +321,7 @@ void CommandEnvironmentImpl::handle( } // XProgressHandler -//______________________________________________________________________________ + void CommandEnvironmentImpl::push( Any const & Status ) throw (RuntimeException) { @@ -332,7 +332,7 @@ void CommandEnvironmentImpl::push( Any const & Status ) m_xLogFile->push( Status ); } -//______________________________________________________________________________ + void CommandEnvironmentImpl::update_( Any const & Status ) throw (RuntimeException) { @@ -374,7 +374,7 @@ void CommandEnvironmentImpl::update_( Any const & Status ) dp_misc::writeConsole(msg + "\n"); } -//______________________________________________________________________________ + void CommandEnvironmentImpl::update( Any const & Status ) throw (RuntimeException) { @@ -383,7 +383,7 @@ void CommandEnvironmentImpl::update( Any const & Status ) m_xLogFile->update( Status ); } -//______________________________________________________________________________ + void CommandEnvironmentImpl::pop() throw (RuntimeException) { OSL_ASSERT( m_logLevel > 0 ); diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 2a72df64d377..97b32ada28d0 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -241,14 +241,14 @@ OUString makeAbsoluteFileUrl( namespace { -//------------------------------------------------------------------------------ + inline void printf_space( sal_Int32 space ) { while (space--) dp_misc::writeConsole(" "); } -//------------------------------------------------------------------------------ + void printf_line( OUString const & name, OUString const & value, sal_Int32 level ) { @@ -256,7 +256,7 @@ void printf_line( dp_misc::writeConsole(name + ": " + value + "\n"); } -//------------------------------------------------------------------------------ + void printf_package( Reference<deployment::XPackage> const & xPackage, Reference<XCommandEnvironment> const & xCmdEnv, sal_Int32 level ) @@ -352,7 +352,7 @@ void printf_packages( namespace { -//------------------------------------------------------------------------------ + Reference<XComponentContext> bootstrapStandAlone() { Reference<XComponentContext> xContext = @@ -370,7 +370,7 @@ Reference<XComponentContext> bootstrapStandAlone() return xContext; } -//------------------------------------------------------------------------------ + Reference<XComponentContext> connectToOffice( Reference<XComponentContext> const & xLocalComponentContext, bool verbose ) diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx index 9f77cabbd4ad..e7584c0b0ac8 100644 --- a/desktop/win32/source/guiloader/genericloader.cxx +++ b/desktop/win32/source/guiloader/genericloader.cxx @@ -40,7 +40,7 @@ #include "tools/pathutils.hxx" #include "../extendloaderenvironment.hxx" -//--------------------------------------------------------------------------- + static int GenericMain() { @@ -142,7 +142,7 @@ static int GenericMain() return dwExitCode; } -//--------------------------------------------------------------------------- + #ifdef __MINGW32__ int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) @@ -153,7 +153,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) return GenericMain(); } -//--------------------------------------------------------------------------- + #ifdef __MINGW32__ int __cdecl main() diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 63cc0cc595e1..1dee9e90396a 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -115,7 +115,7 @@ BOOL WINAPI ConvertSidToStringSid( PSID pSid, LPTSTR* StringSid ) } -//--------------------------------------------------------------------------- + static LPTSTR *GetCommandArgs( int *pArgc ) { @@ -127,7 +127,7 @@ static LPTSTR *GetCommandArgs( int *pArgc ) #endif } -//--------------------------------------------------------------------------- + namespace { |