diff options
Diffstat (limited to 'desktop/source/deployment/gui/dp_gui_dialog2.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 4b631a45939a..53628fb8546d 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl { Size m_aOutputSize; bool m_bInterfaceLocked; - + PushButton *m_pOptionsBtn; PushButton *m_pEnableBtn; PushButton *m_pRemoveBtn; @@ -466,13 +466,13 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable ) IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) { long nDelta = pScrBar->GetDelta(); - + Point aNewOptPt( m_pOptionsBtn->GetPosPixel() - Point( 0, nDelta ) ); Point aNewRemPt( m_pRemoveBtn->GetPosPixel() - Point( 0, nDelta ) ); Point aNewEnPt( m_pEnableBtn->GetPosPixel() - Point( 0, nDelta ) ); DoScroll( nDelta ); - + m_pOptionsBtn->SetPosPixel( aNewOptPt ); m_pRemoveBtn->SetPosPixel( aNewRemPt ); m_pEnableBtn->SetPosPixel( aNewEnPt ); @@ -488,14 +488,14 @@ IMPL_LINK( ExtBoxWithBtns_Impl, HandleOptionsBtn, void*, EMPTYARG ) if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND ) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - + if ( pFact ) { OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value; VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, rtl::OUString() ); - + pDlg->Execute(); - + delete pDlg; } } @@ -601,7 +601,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment:: aInfoBox.SetMessText( aMsgText ); bHadWarning = true; - + if ( RET_OK == aInfoBox.Execute() ) return true; else @@ -617,7 +617,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle if ( ! sURL.getLength() ) // Nothing to do, when the URL is empty return; - try + try { uno::Reference< XSystemShellExecute > xSystemShellExecute( m_xContext->getServiceManager()->createInstanceWithContext( OUSTR( "com.sun.star.system.SystemShellExecute" ), m_xContext), uno::UNO_QUERY_THROW); @@ -849,10 +849,10 @@ bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > & return false; // get the extension with highest version - uno::Sequence<uno::Reference<deployment::XPackage> > seqExtensions = + uno::Sequence<uno::Reference<deployment::XPackage> > seqExtensions = m_pManager->getExtensionManager()->getExtensionsWithSameIdentifier( dp_misc::getIdentifier(xPackage), xPackage->getName(), uno::Reference<ucb::XCommandEnvironment>()); - uno::Reference<deployment::XPackage> extension = + uno::Reference<deployment::XPackage> extension = dp_misc::getExtensionWithHighestVersion(seqExtensions); OSL_ASSERT(extension.is()); std::vector< css::uno::Reference< css::deployment::XPackage > > vEntries; @@ -905,7 +905,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() const OUString title( xPackageType->getShortDescription() ); const ::std::pair< t_string2string::iterator, bool > insertion( title2filter.insert( t_string2string::value_type( title, filter ) ) ); - if ( ! insertion.second ) + if ( ! insertion.second ) { // already existing, append extensions: ::rtl::OUStringBuffer buf; buf.append( insertion.first->second ); @@ -1124,7 +1124,7 @@ void ExtMgrDialog::Resize() Point aPos( RSC_SP_DLG_INNERBORDER_LEFT, aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM - aBtnSize.Height() ); - + m_aHelpBtn.SetPosPixel( aPos ); aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - aBtnSize.Width(); @@ -1142,12 +1142,12 @@ void ExtMgrDialog::Resize() Size aFTSize( m_aGetExtensions.CalcMinimumSize() ); aPos = Point( RSC_SP_DLG_INNERBORDER_LEFT, aPos.Y() - RSC_CD_FIXEDTEXT_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM ); - + m_aGetExtensions.SetPosSizePixel( aPos, aFTSize ); aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - aBtnSize.Width(); m_aCancelBtn.SetPosPixel( Point( aPos.X(), aPos.Y() - ((aBtnSize.Height()-aFTSize.Height())/2) ) ); - + // Calc progress height long nProgressHeight = aFTSize.Height(); @@ -1562,7 +1562,7 @@ void UpdateRequiredDialog::Resize() Point aPos( RSC_SP_DLG_INNERBORDER_LEFT, aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM - aBtnSize.Height() ); - + m_aHelpBtn.SetPosPixel( aPos ); aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - m_aCloseBtn.GetSizePixel().Width(); @@ -1717,7 +1717,7 @@ bool UpdateRequiredDialog::hasActiveEntries() for ( long nIndex = 0; nIndex < nCount; nIndex++ ) { TEntry_Impl pEntry = m_pExtensionBox->GetEntryData( nIndex ); - + if ( !checkDependencies( pEntry->m_xPackage ) ) { bRet = true; @@ -1743,7 +1743,7 @@ void UpdateRequiredDialog::disableAllEntries() } setBusy( false ); - + if ( ! hasActiveEntries() ) m_aCloseBtn.SetText( m_sCloseText ); } |