diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:48:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 03:45:29 -0600 |
| commit | c4399bcd13cbe1cfa89c782e6667906c0b8bbb89 (patch) | |
| tree | 3691b0e8387a6cc1600b5e1ffcced3d904918693 /uui/source/iahndl.cxx | |
| parent | f993a8930a660b23f099c91a6dc636fb4cbe6f87 (diff) | |
Remove visual noise from uui
Change-Id: I64fa42929aad00fc63f2937527dd3539f9d6f7f3
Reviewed-on: https://gerrit.libreoffice.org/8337
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 0d01d30febe6..907fa49ca51c 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -337,7 +337,7 @@ UUIInteractionHelper::tryOtherInteractionHandler( namespace { - // ................................................................................................................. + static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation ) { const ::com::sun::star::uno::TypeDescription aTypeDesc( i_rTypeName ); @@ -834,9 +834,9 @@ UUIInteractionHelper::handleRequest_impl( } - /////////////////////////////////////////////////////////////////// + // Handle requests which do not have a plain string representation. - /////////////////////////////////////////////////////////////////// + if (!bObtainErrorStringOnly) { if ( handleAuthenticationRequest( rRequest ) ) @@ -899,9 +899,9 @@ UUIInteractionHelper::handleRequest_impl( return true; } - /////////////////////////////////////////////////////////////// + // Last chance: interaction handlers registered in the configuration - /////////////////////////////////////////////////////////////// + // typed InteractionHandlers (ooo.Interactions) if ( handleTypedHandlerImplementations( rRequest ) ) @@ -1301,7 +1301,7 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest( // TODO: this static variable is somewhat hacky. Formerly (before the dialog was moved from SFX2 to the // interaction handler implementation), this was stored in SFX_APP()'s impl structure, in member // bODFVersionWarningLater. Of course, we do not have access to it here. - // + // A proper solution which I would envision would be: // - There's a central implementation (this one here) of css.task.InteractionHandler // - There's a configuration which maps UNO names to service names @@ -1314,7 +1314,7 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest( // This way, the FutureDocumentVersionProductUpdateRequest could be handled in SFX (or any other // suitable place), again, and we would only have one place where we remember the s_bDeferredToNextSession // flag. - // + // Note: The above pattern has been implemented in CWS autorecovery. Now the remaining task is to move the // handling of this interaction to SFX, again. @@ -1447,9 +1447,9 @@ UUIInteractionHelper::handleBrokenPackageRequest( } } -//========================================================================= + // ErrorResource Implementation -//========================================================================= + bool ErrorResource::getString(ErrCode nErrorCode, OUString &rString) |