From ec583253c3d761847c93a77fa10c065fc334fab9 Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power@suse.com>
Date: Fri, 1 Mar 2013 17:07:06 +0000
Subject: raise warning when saving macro laden doc as a macro-free format
 bnc#791777

Change-Id: Ic947ceef71c86e31fbf0bce74b064aaf91f47178
---
 uui/source/iahndl.cxx | 17 ++++++++++++++++-
 uui/source/ids.hrc    |  2 +-
 uui/source/ids.src    |  5 ++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'uui/source')

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 3ad471bb2765..9c42f2e2b3ef 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -784,11 +784,26 @@ UUIInteractionHelper::handleRequest_impl(
         task::ErrorCodeRequest aErrorCodeRequest;
         if (aAnyRequest >>= aErrorCodeRequest)
         {
-            handleGenericErrorRequest( aErrorCodeRequest.ErrCode,
+            // Sucky special handling for xlsx macro filter warning
+            if ( (sal_uInt32)ERRCODE_SFX_VBASIC_CANTSAVE_STORAGE == (sal_uInt32)aErrorCodeRequest.ErrCode)
+            {
+                std::vector< rtl::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);
+            }
             return true;
         }
 
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index ae175e8019c6..00ce50c433b2 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -137,7 +137,7 @@
 #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 244626477668..3f78df786b93 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -30,7 +30,6 @@ String RID_SAVE_PASSWORD
     Text [ en-US ] = "~Remember password";
 };
 
-
 String STR_WARNING_BROKENSIGNATURE_TITLE
 {
     Text [ en-US ] = "Invalid Document Signature" ;
@@ -397,5 +396,9 @@ 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?";
+    };
 
 };
-- 
cgit v1.2.3