avmedia/source/gstreamer/gstplayer.cxx | 14 +++----------- filter/source/svg/svgreader.cxx | 7 ++++--- l10ntools/source/helpmerge.cxx | 5 +++-- 3 files changed, 10 insertions(+), 16 deletions(-)
New commits: commit 5d14f80c1e12508659fc337b5e6208e5bc018001 Author: Thorsten Behrens <tbehr...@suse.com> Date: Fri Feb 17 15:05:19 2012 +0100 Make avmedia module buildable with dbglevel=3 again. diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index a8d2642..fa1dcbd 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -230,22 +230,14 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) } } -#if OSL_DEBUG_LEVEL > 2 - sal_Bool aSuccess = -#endif - maSizeCondition.set(); - DBG( "%p set condition result: %d", this, aSuccess ); + maSizeCondition.set(); } } } } else if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) { if( mnWidth == 0 ) { // an error occurred, set condition so that OOo thread doesn't wait for us -#if OSL_DEBUG_LEVEL > 2 - sal_Bool aSuccess = -#endif - maSizeCondition.set(); - DBG( "%p set condition result: %d", this, aSuccess ); + maSizeCondition.set(); } } @@ -537,7 +529,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( ) TimeValue aTimeout = { 10, 0 }; #if OSL_DEBUG_LEVEL > 2 - oslConditionResult aResult = + osl::Condition::Result aResult = #endif maSizeCondition.wait( &aTimeout ); commit 1984e0b41e0449b6c5b1a94411a4e7559d2ca746 Author: Thorsten Behrens <tbehr...@suse.com> Date: Fri Feb 17 13:42:12 2012 +0100 Make l10ntools module buildable with dbglevel=3 again. diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index ceb0f1e..4cbf8d5 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -32,6 +32,7 @@ #include <functional> #include <osl/file.hxx> +#include <sal/log.hxx> // local includes #include <stdio.h> #include <stdlib.h> @@ -70,7 +71,7 @@ void HelpParser::Dump(LangHashMap* rElem_in,const rtl::OString & sKey_in) { x=posn->first; y=posn->second->ToOString(); - fprintf(stdout,"key=%s value=%s\n",x.GetBuffer(),y.getStr()); + fprintf(stdout,"key=%s value=%s\n",x.getStr(),y.getStr()); } fprintf(stdout,"+--------------------------+\n"); } @@ -291,7 +292,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile #if OSL_DEBUG_LEVEL > 2 printf("*********************DUMPING HASHMAP***************************************"); Dump(aXMLStrHM); - printf("DBG: sHelpFile = %s\n",sHelpFile.GetBuffer() ); + printf("DBG: sHelpFile = %s\n",sHelpFile.getStr() ); #endif pResData.sGId = pos->first; commit 49b54b37e86df2c66fdcdafa08e8f9275ca44fb1 Author: Thorsten Behrens <tbehr...@suse.com> Date: Thu Feb 16 18:08:34 2012 +0100 Make filters module buildable with dbglevel=3 again. diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index f941cba..5d46c7c 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -1771,6 +1771,9 @@ static void writeShapes( StatePool& rStat visitElements(aVisitor, xElem); } +} // namespace + + #if OSL_DEBUG_LEVEL > 2 struct DumpingVisitor { @@ -1813,8 +1816,6 @@ static void dumpTree( const uno::Reference<xml::dom::XElement> xElem ) } #endif -} // namespace - SVGReader::SVGReader(const uno::Reference<lang::XMultiServiceFactory>& xServiceFactory, const uno::Reference<io::XInputStream>& xInputStream, @@ -2768,7 +2769,7 @@ bool importSvg(SvStream & rStream, Graphic & rGraphic ) svgi::visitElements(aVisitor, xDocElem); #if OSL_DEBUG_LEVEL > 2 - dumpTree(xDocElem); + svgi::dumpTree(xDocElem); #endif // render all shapes to mtf _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits