cairo/ExternalProject_cairo.mk | 1 + sw/source/filter/html/htmldraw.cxx | 4 ++-- sw/source/filter/html/htmlplug.cxx | 9 ++++++--- sw/source/filter/html/htmltab.cxx | 12 +++++++++--- 4 files changed, 18 insertions(+), 8 deletions(-)
New commits: commit 03f973ccefd07dbceaa4993206ee4f2f1296d321 Author: Michael Stahl <[email protected]> Date: Thu Aug 15 15:00:58 2013 +0200 sw: fix more clang tinderbox warnings Change-Id: Ia72a9ca955c8209c97b2138cd442fe3e9e68f227 diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index af8ae2f..2f021ac 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -311,8 +311,8 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) break; case HTML_O_LOOP: - if( rOption.GetString(). - equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_LOOP_infinite) ) + if (rOption.GetString(). + equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_LOOP_infinite)) { nCount = 0; } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 51efbf9d..cdbb471 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -363,9 +363,12 @@ void SwHTMLParser::InsertEmbed() aSpace.Height() = (long)rOption.GetNumber(); break; case HTML_O_UNKNOWN: - if( rOption.GetTokenString().equalsIgnoreAsciiCaseAscii( OOO_STRING_SW_HTML_O_Hidden ) ) - bHidden = - !rOption.GetString().equalsIgnoreAsciiCaseAscii( sHTML_O_Hidden_False ); + if (rOption.GetTokenString().equalsIgnoreAsciiCase( + OOO_STRING_SW_HTML_O_Hidden)) + { + bHidden = !rOption.GetString().equalsIgnoreAsciiCase( + sHTML_O_Hidden_False); + } break; } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index ad700b2..cae2782 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -4876,8 +4876,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) const HTMLOption& rOption = rHTMLOptions[--i]; if( HTML_O_ALIGN == rOption.GetToken() ) { - if( rOption.GetString().equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_VA_bottom)) + if (rOption.GetString().equalsIgnoreAsciiCase( + OOO_STRING_SVTOOLS_HTML_VA_bottom)) + { bTop = sal_False; + } } } @@ -5142,9 +5145,12 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, break; case HTML_O_BORDER: // BORDER und BORDER=BORDER wie BORDER=1 behandeln - if( !rOption.GetString().isEmpty() && - !rOption.GetString().equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_O_border) ) + if (!rOption.GetString().isEmpty() && + !rOption.GetString().equalsIgnoreAsciiCase( + OOO_STRING_SVTOOLS_HTML_O_border)) + { nBorder = (sal_uInt16)rOption.GetNumber(); + } else nBorder = 1; commit a1230334d42250f7376f0a887e5303fa218234bb Author: Michael Stahl <[email protected]> Date: Thu Aug 15 14:55:07 2013 +0200 fdo#65244: cairo configure fails to detect libpng... ... unless there is _some_ libpng.pc on the system due to the weird way it uses pkg-config. Work around that by setting an png_REQUIRES variable, which lets it use the supplied png_CFLAGS and png_LIBS. Change-Id: I3ec4b96551e3ce624748c05fe3ab9727b191ea78 diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 4ba9023..1aac702 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ ZLIB3RDLIB=-lz \ + png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
