Kaydet (Commit) 33f178c1 authored tarafından Luboš Luňák's avatar Luboš Luňák

error dialog when a component (e.g. Writer) is not found (bnc#689116)

üst 2ede8b43
......@@ -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.
......
......@@ -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
......
......@@ -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).";
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment