diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-04-26 15:18:09 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-04-26 15:22:42 +0200 |
| commit | 33f178c14bae83f3b98dd327df0bf1b19da18f82 (patch) | |
| tree | f9646832f6fdab2c1418b8ea89086ca74e2be55c /uui | |
| parent | 2ede8b438e0cd0a3cddabcfcc7687c74f2e372a2 (diff) | |
error dialog when a component (e.g. Writer) is not found (bnc#689116)
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 18 | ||||
| -rwxr-xr-x | uui/source/ids.hrc | 1 | ||||
| -rw-r--r-- | uui/source/ids.src | 5 |
3 files changed, 24 insertions, 0 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 79362cc8cf10..3cda495e0afa 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -67,6 +67,7 @@ #include "com/sun/star/ucb/XInteractionReplaceExistingData.hpp" #include "com/sun/star/ucb/XInteractionSupplyName.hpp" #include "com/sun/star/xforms/InvalidDataOnSubmitException.hpp" +#include "com/sun/star/loader/CannotActivateFactoryException.hpp" #include "osl/conditn.hxx" #include "tools/rcid.h" // RSC_STRING @@ -857,6 +858,23 @@ UUIInteractionHelper::handleRequest_impl( return true; } + loader::CannotActivateFactoryException aCannotActivateFactoryException; + if (aAnyRequest >>= aCannotActivateFactoryException) + { + ErrCode nErrorCode = ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY; + std::vector< rtl::OUString > aArguments; + aArguments.push_back( aCannotActivateFactoryException.Message ); + + handleErrorHandlerRequest( task::InteractionClassification_ERROR, + nErrorCode, + aArguments, + rRequest->getContinuations(), + bObtainErrorStringOnly, + bHasErrorString, + rErrorString ); + return true; + } + /////////////////////////////////////////////////////////////////// // Handle requests which do not have a plain string representation. diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index c292befb1663..8e9d18eac258 100755 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -160,6 +160,7 @@ #define ERRCODE_UUI_LOCKING_LOCKED_SELF (ERRCODE_AREA_UUI + 60) #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_AREA_UUI_UNKNOWNAUTH 25000 #define SSLWARN_TYPE_DOMAINMISMATCH 10 diff --git a/uui/source/ids.src b/uui/source/ids.src index 378b513b2e42..ad12f2c6ba5c 100644 --- a/uui/source/ids.src +++ b/uui/source/ids.src @@ -403,6 +403,11 @@ Resource RID_UUI_ERRHDL Text [ en-US ] = "Security Warning: Server Certificate Invalid"; }; + String (ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY & ERRCODE_RES_MASK) + { + Text [ en-US ] = "Component cannot be loaded, possibly broken or incomplete installation.\nFull error message:\n\n $(ARG1)."; + }; + }; |