summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-07-23 10:49:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-07-23 10:49:30 +0100
commit23e818d4f5cb6dff4c2238fa42a38496a9a85255 (patch)
treeb8613d117497286df89a049bf849e5426c7b772e /framework/source
parent2c5f02539d8e1ae079b2ee68838024865610b6d8 (diff)
AmbigousFilterRequest is only ever extracted, never created
Change-Id: I79c669c1635192199d6ef135e1ab9b48a9e7e63a
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/interaction/quietinteraction.cxx12
-rw-r--r--framework/source/services/desktop.cxx12
2 files changed, 1 insertions, 23 deletions
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 680fe0922e51..3b27f1815d4d 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/document/XInteractionFilterSelect.hpp>
#include <com/sun/star/document/XInteractionFilterOptions.hpp>
-#include <com/sun/star/document/AmbigousFilterRequest.hpp>
#include <com/sun/star/document/FilterOptionsRequest.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
@@ -81,20 +80,9 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
// differ between abortable interactions (error, unknown filter ...)
// and other ones (ambigous but not unknown filter ...)
css::task::ErrorCodeRequest aErrorCodeRequest;
- css::document::AmbigousFilterRequest aAmbigousFilterRequest;
css::document::LockedDocumentRequest aLockedDocumentRequest;
css::document::FilterOptionsRequest aFilterOptionsRequest;
- if (aRequest>>=aAmbigousFilterRequest)
- {
- if (xFilter.is())
- {
- // user selected filter wins every time!
- xFilter->setFilter( aAmbigousFilterRequest.SelectedFilter );
- xFilter->select();
- }
- }
- else
if( aRequest >>= aErrorCodeRequest )
{
// warnings can be ignored => approve
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 10bb545f1464..781ce634e8a7 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -46,7 +46,6 @@
#include <com/sun/star/task/XInteractionAbort.hpp>
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/document/XInteractionFilterSelect.hpp>
-#include <com/sun/star/document/AmbigousFilterRequest.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
#include <com/sun/star/ucb/InteractiveIOException.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
@@ -1220,16 +1219,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
// differ between abortable interactions (error, unknown filter ...)
// and other ones (ambigous but not unknown filter ...)
css::task::ErrorCodeRequest aErrorCodeRequest;
- css::document::AmbigousFilterRequest aAmbigousFilterRequest;
- if( aRequest >>= aAmbigousFilterRequest )
- {
- if( xFilterSelect.is() )
- {
- xFilterSelect->setFilter( aAmbigousFilterRequest.SelectedFilter ); // user selected filter wins!
- xFilterSelect->select();
- }
- }
- else if( aRequest >>= aErrorCodeRequest )
+ if( aRequest >>= aErrorCodeRequest )
{
bool bWarning = ((aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
if (xApprove.is() && bWarning)