[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - desktop/source

Laurent Godard lgodard.libre at laposte.net
Tue Jan 20 08:14:35 PST 2015


 desktop/source/app/dispatchwatcher.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1989572b219966bf0ba8fd6809adca19c22d3057
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Tue Jan 13 15:27:59 2015 +0100

    convert-to : display error messages in console fdo#88326
    
    - source file does not exist
    - requested export filter does not exist and we use default filter (still process though)
    
    Change-Id: I92031ea305e81927357acfc352dbe5a5da205b0d
    (cherry picked from commit de900ebdd4fec0fb06d56583ae22b2adc3608a65)
    Reviewed-on: https://gerrit.libreoffice.org/14041
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 0cc179b..2480c69 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -139,7 +139,7 @@ const SfxFilter* impl_getExportFilterFromUrl( const rtl::OUString& rUrl, const r
         pFilter = impl_lookupExportFilterForUrl( rUrl, rFactory );
     if ( !pFilter )
     {
-        SAL_INFO( "desktop.app", "no export filter for " << rUrl << "found, using the default filter for " << rFactory );
+        std::cerr << "Error:  no export filter for " << rUrl << " found, now using the default filter for " << rFactory << "\n";
         pFilter = SfxFilter::GetDefaultFilterFromFactory( rFactory );
     }
 
@@ -565,7 +565,7 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
                             }
                             catch (const Exception& rException)
                             {
-                                std::cerr << "Error: Please reverify input parameters...";
+                                std::cerr << "Error: Please verify input parameters...";
                                 if (!rException.Message.isEmpty())
                                     std::cerr << " (" << rException.Message << ")";
                                 std::cerr << std::endl;
@@ -663,7 +663,7 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
                 }
                 else
                 {
-                    // place error message here ...
+                    std::cerr << ("Error: source file could not be loaded\n");
                 }
 
                 // remove the document


More information about the Libreoffice-commits mailing list