diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-08-24 23:48:45 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-09-10 04:14:47 +0200 |
| commit | 1f1ec819edc14ad266d49f16116056fd439b7c46 (patch) | |
| tree | 227fad6022a60d22313a9e8ee1a6a62532ed98a1 /uui | |
| parent | no need to warn anymore as we can save VBA now (diff) | |
| download | core-1f1ec819edc14ad266d49f16116056fd439b7c46.tar.gz core-1f1ec819edc14ad266d49f16116056fd439b7c46.zip | |
remove more warnings about vba export
Change-Id: I8d0e6f69dd4d51d195422e6e934fedc406caec16
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 25 | ||||
| -rw-r--r-- | uui/source/ids.hrc | 1 | ||||
| -rw-r--r-- | uui/source/ids.src | 5 |
3 files changed, 5 insertions, 26 deletions
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: */ |