desktop/source/app/dispatchwatcher.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d36143ad9ff9bfd777788c14c06c0d406ab0b09d
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jan 19 16:37:33 2015 +0200
operator ?: has lower precedence than <<; << will be evaluated first
Change-Id: I84037cf90c8de534c215200fe19793126ae07b11
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
