[Libreoffice-commits] core.git: 2 commits - comphelper/source framework/source io/source sal/inc sdext/source solenv/gbuild
Peter Foley
pefoley2 at verizon.net
Sat Mar 30 13:54:27 PDT 2013
comphelper/source/misc/synchronousdispatch.cxx | 3 +--
framework/source/services/sessionlistener.cxx | 9 +++------
io/source/stm/opump.cxx | 21 ++++++---------------
sal/inc/sal/log-areas.dox | 4 ++++
sdext/source/pdfimport/wrapper/wrapper.cxx | 3 +--
solenv/gbuild/AllLangResTarget.mk | 2 +-
6 files changed, 16 insertions(+), 26 deletions(-)
New commits:
commit 8c1b2f380188f7c7194845dd014e802427967273
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 30 15:35:35 2013 -0400
use proper gbuild capitalization
Change-Id: I4824395653052486956572cedf3b56b94f9df39e
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index f6f7feb..73002af 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -51,7 +51,7 @@ gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependenci
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command
-$(call gb_Output_announce,$(3),$(true),srs,1)
+$(call gb_Output_announce,$(3),$(true),SRS,1)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\
commit 8ffb20747c77e5875237a9bceca28f4cb4ec9bb3
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Mar 30 15:34:22 2013 -0400
fix loplugin unused warnings
Change-Id: I23fc6bf62e74f192f77c74ed48d5276737375f3c
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index 71d7a93..d56f78b 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -72,8 +72,7 @@ uno::Reference< lang::XComponent > SynchronousDispatch::dispatch(
}
catch ( uno::Exception& )
{
- OUString aMsg = "SynchronousDispatch::dispatch() Error while dispatching! ";
- OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+ SAL_WARN("comphelper","SynchronousDispatch::dispatch() Error while dispatching!");
}
}
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index d9881c0..1a88f56 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -150,8 +150,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (const com::sun::star::uno::Exception& e) {
- OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_FAIL(aMsg.getStr());
+ SAL_WARN("fwk.session",e.Message);
// save failed, but tell manager to go on if we havent yet dispatched the request
// in case of synchronous saving the notification is done by the caller
if ( bAsync && m_rSessionManager.is() )
@@ -179,8 +178,7 @@ void SessionListener::QuitSessionQuietly()
args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (const com::sun::star::uno::Exception& e) {
- OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_FAIL(aMsg.getStr());
+ SAL_WARN("fwk.session",e.Message);
}
}
@@ -263,8 +261,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
m_bRestored = sal_True;
} catch (const com::sun::star::uno::Exception& e) {
- OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_FAIL(aMsg.getStr());
+ SAL_WARN("fwk.session",e.Message);
}
return m_bRestored;
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 74b3869..e1ca00d 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -20,7 +20,7 @@
#include <stdio.h>
-#include <osl/diagnose.h>
+#include <sal/log.hxx>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
@@ -48,10 +48,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace com::sun::star::io;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-
#include "factreg.hxx"
namespace io_stm {
@@ -137,8 +133,7 @@ void Pump::fireError( const Any & exception )
}
catch ( const RuntimeException &e )
{
- OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
- OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() );
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
}
}
}
@@ -166,8 +161,7 @@ void Pump::fireClose()
}
catch ( const RuntimeException &e )
{
- OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
- OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() );
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
}
}
}
@@ -184,8 +178,7 @@ void Pump::fireStarted()
}
catch ( const RuntimeException &e )
{
- OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
- OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() );
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
}
}
}
@@ -201,8 +194,7 @@ void Pump::fireTerminated()
}
catch ( const RuntimeException &e )
{
- OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
- OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners", sMessage.getStr() );
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
}
}
}
@@ -308,8 +300,7 @@ void Pump::run()
{
// we are the last on the stack.
// this is to avoid crashing the program, when e.g. a bridge crashes
- OString sMessage = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
- OSL_ENSURE( !"com.sun.star.comp.stoc.Pump: unexpected exception", sMessage.getStr() );
+ SAL_WARN("io.streams","com.sun.star.comp.stoc.Pump: unexpected exception during calling listeners" << e.Message);
}
}
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 5ea51fa..05c0f97 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -137,6 +137,10 @@ certain functionality.
@li @c i18n - module independent i18n related, e.g. language tag usage
+ at section io
+
+ at li @c io.streams
+
@section jvmfwk
@li @c jfw
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 8492457..9a3c63f 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -642,8 +642,7 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl()
aFileName = aPbmFile;
else
{
- OSL_PRECOND( aToken.compareTo( aPpmMarker ) == 0,
- "Invalid bitmap format" );
+ SAL_WARN_IF(aToken.compareTo( aPpmMarker ),"sdext.pdfimport","Invalid bitmap format");
aFileName = aPpmFile;
}
More information about the Libreoffice-commits
mailing list