remove more warnings about vba export

Change-Id: I8d0e6f69dd4d51d195422e6e934fedc406caec16

5 files changed, 5 insertions, 62 deletions

diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index 5246f5a6dd23..4968f0e10310 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -77,7 +77,6 @@
 #define ERRCODE_SFX_INCOMPLETE_ENCRYPTION    (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 55)
 #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 56)
 #define ERRCODE_SFX_FORMAT_ROWCOL           (ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 57)
-#define ERRCODE_SFX_VBASIC_CANTSAVE_STORAGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 58)
 
 
 //Dies und das
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index f6145406f7a9..63aebd248e24 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -803,41 +803,6 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName )
 
         if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) )
         {
-            // is it possible to get these names from somewhere and not just
-            // hardcode them?
-            OUString sXLSXFilter("Calc MS Excel 2007 XML");
-            OUString sOtherXLSXFilter("Calc Office Open XML");
-            bool bHasMacros = hasMacros( GetModel() );
-            if ( bHasMacros && (  aFilterName == sXLSXFilter  ||  aFilterName == sOtherXLSXFilter ) )
-            {
-                uno::Reference< task::XInteractionHandler > xHandler;
-                GetMediaDescr()[ OUString( "InteractionHandler" ) ] >>= xHandler;
-                if ( xHandler.is() )
-                {
-                    bool bResult = false;
-                    try
-                    {
-                        task::ErrorCodeRequest aErrorCode;
-                        aErrorCode.ErrCode = ERRCODE_SFX_VBASIC_CANTSAVE_STORAGE;
-
-                        uno::Any aRequest = uno::makeAny( aErrorCode );
-                        uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( 2 );
-
-                        ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
-                        aContinuations[ 0 ] = pApprove.get();
-
-                        ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort );
-                        aContinuations[ 1 ] = pAbort.get();
-                        xHandler->handle(::framework::InteractionRequest::CreateRequest (aRequest,aContinuations));
-                        bResult = pApprove->wasSelected();
-                    }
-                    catch( const uno::Exception& )
-                    {
-                    }
-                    if ( !bResult )
-                        return STATUS_SAVEAS;
-                }
-            }
             if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefUIName, aDefExtension,
                                                             true, (bool)( nDefFiltFlags & SfxFilterFlags::ALIEN ) ) )
                 return STATUS_SAVEAS_STANDARDNAME;
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 4fa54a787aed..8f58d8520c90 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -743,26 +743,11 @@ UUIInteractionHelper::handleRequest_impl(
         task::ErrorCodeRequest aErrorCodeRequest;
         if (aAnyRequest >>= aErrorCodeRequest)
         {
-            // Sucky special handling for xlsx macro filter warning
-            if ( (sal_uInt32)ERRCODE_SFX_VBASIC_CANTSAVE_STORAGE == (sal_uInt32)aErrorCodeRequest.ErrCode)
-            {
-                std::vector< OUString > aArguments;
-                handleErrorHandlerRequest( task::InteractionClassification_WARNING,
-                                       ERRCODE_UUI_IO_WARN_CANTSAVE_MACROS,
-                                       aArguments,
-                                       rRequest->getContinuations(),
-                                       bObtainErrorStringOnly,
-                                       bHasErrorString,
-                                       rErrorString);
-            }
-            else
-            {
-                handleGenericErrorRequest( aErrorCodeRequest.ErrCode,
-                                       rRequest->getContinuations(),
-                                       bObtainErrorStringOnly,
-                                       bHasErrorString,
-                                       rErrorString);
-            }
+            handleGenericErrorRequest( aErrorCodeRequest.ErrCode,
+                    rRequest->getContinuations(),
+                    bObtainErrorStringOnly,
+                    bHasErrorString,
+                    rErrorString);
             return true;
         }
 
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 9ff94d8b4745..e70c7a84300d 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -133,7 +133,6 @@
 #define ERRCODE_UUI_LOCKING_NOT_LOCKED                          (ERRCODE_AREA_UUI + 61)
 #define ERRCODE_UUI_LOCKING_LOCK_EXPIRED                        (ERRCODE_AREA_UUI + 62)
 #define ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY                     (ERRCODE_AREA_UUI + 63)
-#define ERRCODE_UUI_IO_WARN_CANTSAVE_MACROS                     (ERRCODE_WARNING_MASK | ( ERRCODE_AREA_UUI + 64))
 #define ERRCODE_AREA_UUI_UNKNOWNAUTH    25000
 #define SSLWARN_TYPE_DOMAINMISMATCH     10
 #define SSLWARN_TYPE_EXPIRED            20
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 13e2bab2b6ed..d7ae643399fc 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -397,11 +397,6 @@ Resource RID_UUI_ERRHDL
         Text [ en-US ] = "Component cannot be loaded, possibly broken or incomplete installation.\nFull error message:\n\n $(ARG1).";
     };
 
-    String (ERRCODE_UUI_IO_WARN_CANTSAVE_MACROS & ERRCODE_RES_MASK)
-    {
-        Text [ en-US ] = "You are saving to a macro-free document format, the macros contained in this document will not be saved.\nDo you wish to continue?";
-    };
-
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */