AmbigousFilterRequest is only ever extracted, never created

Change-Id: I79c669c1635192199d6ef135e1ab9b48a9e7e63a

4 files changed, 1 insertions, 25 deletions

diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index c2dbeaa7126c..0a990f4600a7 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -38,7 +38,6 @@ namespace framework{
                 But it can be used to intercept problems e.g. during loading of documents.
 
                 In current implementation we solve conflicts for following situations only:
-                    - AmbigousFilterRequest
                     - InteractiveIOException
                     - InteractiveAugmentedIOException
                 All other requests will be aborted.
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 31e5c4faec27..c37deaf69d9c 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -82,7 +82,6 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#include <com/sun/star/document/AmbigousFilterRequest.hpp>
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/document/LockedDocumentRequest.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
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)