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

[Tor Lillqvist]

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

New commits:
commit 9cebcb0d49f92c08d5a8b9eb9c02959b86d6aefb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 19 16:37:33 2015 +0200

    operator ?: has lower precedence than <<; << will be evaluated first
    
    Change-Id: I84037cf90c8de534c215200fe19793126ae07b11
    Reviewed-on: https://gerrit.libreoffice.org/14043
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 80eb9b6..b22be3d 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -631,8 +631,7 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
                         OString aTargetURL8 = OUStringToOString(aTempName, osl_getThreadTextEncoding() );
 
                         std::cout << "print " << aSource8 << " -> " << aTargetURL8;
-                        std::cout << " using " << aPrinterName.isEmpty() ?
-                                                       "<default_printer>" : OUStringToOString( aPrinterName, osl_getThreadTextEncoding() );
+                        std::cout << " using " << (aPrinterName.isEmpty() ? "<default_printer>" : OUStringToOString( aPrinterName, osl_getThreadTextEncoding() ));
                         std::cout << std::endl;
 
                         // create the custom printer, if given