diff options
Diffstat (limited to 'fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 42bab08800b0..48dbfcaa3735 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rII if ( rIID == IID_IFileDialogControlEvents ) *ppObject = (IFileDialogControlEvents*)this; - + if ( *ppObject != NULL ) { ((IUnknown*)*ppObject)->AddRef(); @@ -170,7 +170,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) TFileDialog iDialog (pDialog); TFileOpenDialog iOpen ; TFileDialogCustomize iCustomize; - + #ifdef __MINGW32__ iDialog->QueryInterface(IID_IFileOpenDialog, (void**)(&iOpen)); iDialog->QueryInterface(IID_IFileDialogCustomize, (void**)(&iCustomize)); @@ -182,7 +182,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) // make sure version list match to the current selection always ... // at least an empty version list will be better then the wrong one .-) iCustomize->RemoveAllControlItems(CONTROL_VERSIONLIST); - + HRESULT hResult = E_FAIL; ComPtr< IShellItemArray > iItems; ComPtr< IShellItem > iItem; @@ -201,16 +201,16 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) // we can show one version list only within control if (nCount != 1) return; - + hResult = iItems->GetItemAt(0, &iItem); - } + } else if (iDialog.is()) hResult = iDialog->GetCurrentSelection(&iItem); if ( FAILED(hResult) ) return; - + const ::rtl::OUString sURL = lcl_getURLFromShellItem2(iItem); if (sURL.getLength() < 1) return; @@ -218,21 +218,21 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) INetURLObject aURL(sURL); if (aURL.GetProtocol() != INET_PROT_FILE) return; - + ::rtl::OUString sMain = aURL.GetMainURL(INetURLObject::NO_DECODE); if ( ! ::utl::UCBContentHelper::IsDocument(sURL)) return; -*/ +*/ try { css::uno::Reference< css::embed::XStorage > xStorage = ::comphelper::OStorageHelper::GetStorageFromURL(sURL, css::embed::ElementModes::READ); if ( ! xStorage.is() ) return; - + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); css::uno::Reference< css::document::XDocumentRevisionListPersistence > xReader (xSMGR->createInstance(SERVICENAME_REVISIONPERSISTENCE), css::uno::UNO_QUERY_THROW); css::uno::Sequence< css::util::RevisionTag > lVersions = xReader->load(xStorage); - + for (::sal_Int32 i=0; i<lVersions.getLength(); ++i) { const css::util::RevisionTag& aTag = lVersions[i]; @@ -369,14 +369,14 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi } //----------------------------------------------------------------------------------------- -void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) +void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException ) { m_lListener.addInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener); } //----------------------------------------------------------------------------------------- -void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) +void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException ) { m_lListener.removeInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener); @@ -390,7 +390,7 @@ void VistaFilePickerEventHandler::startListening( const TFileDialog& pBroadcaste if (m_pDialog.is()) return; - + m_pDialog = pBroadcaster; m_pDialog->Advise(this, &m_nListenerHandle); } @@ -412,54 +412,54 @@ static const ::rtl::OUString PROP_PICKER_LISTENER = ::rtl::OUString::createFromA class AsyncPickerEvents : public RequestHandler { public: - + AsyncPickerEvents() {} - + virtual ~AsyncPickerEvents() {} virtual void before() {} - + virtual void doRequest(const RequestRef& rRequest) { const ::sal_Int32 nEventID = rRequest->getRequest(); const ::sal_Int16 nControlID = rRequest->getArgumentOrDefault(PROP_CONTROL_ID, (::sal_Int16)0); const css::uno::Reference< css::ui::dialogs::XFilePickerListener > xListener = rRequest->getArgumentOrDefault(PROP_PICKER_LISTENER, css::uno::Reference< css::ui::dialogs::XFilePickerListener >()); - + if ( ! xListener.is()) return; - + css::ui::dialogs::FilePickerEvent aEvent; aEvent.ElementId = nControlID; - + switch (nEventID) { case VistaFilePickerEventHandler::E_FILE_SELECTION_CHANGED : xListener->fileSelectionChanged(aEvent); break; - + case VistaFilePickerEventHandler::E_DIRECTORY_CHANGED : xListener->directoryChanged(aEvent); break; - + case VistaFilePickerEventHandler::E_HELP_REQUESTED : xListener->helpRequested(aEvent); break; - + case VistaFilePickerEventHandler::E_CONTROL_STATE_CHANGED : xListener->controlStateChanged(aEvent); break; - + case VistaFilePickerEventHandler::E_DIALOG_SIZE_CHANGED : xListener->dialogSizeChanged(); break; - + // no default here. Let compiler detect changes on enum set ! } } - + virtual void after() {} }; @@ -473,20 +473,20 @@ void VistaFilePickerEventHandler::impl_sendEvent( EEventType eEventType, ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( ::getCppuType( ( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*) NULL ) ); if ( ! pContainer) return; - + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) { try { css::uno::Reference< css::ui::dialogs::XFilePickerListener > xListener (pIterator.next(), css::uno::UNO_QUERY); - + RequestRef rRequest(new Request()); rRequest->setRequest (eEventType); rRequest->setArgument(PROP_PICKER_LISTENER, xListener); if ( nControlID ) rRequest->setArgument(PROP_CONTROL_ID, nControlID); - + aNotify.triggerRequestDirectly(rRequest); //aNotify.triggerRequestNonBlocked(rRequest); } |