bin/get-bugzilla-attachments-by-mimetype | 39 ++++++++++--------- oox/source/drawingml/customshapeproperties.cxx | 1 oox/source/ppt/timenode.cxx | 2 sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 1 svtools/qa/cppunit/data/gif/fail/CVE-2007-3958-1.gif |binary svtools/qa/cppunit/data/gif/pass/CVE-2011-2131-1.gif |binary svtools/qa/cppunit/filters-test.cxx | 4 + unusedcode.easy | 11 ----- vcl/source/gdi/outdev3.cxx | 13 +++--- 9 files changed, 37 insertions(+), 34 deletions(-)
New commits: commit e0753b7424781d9145af24b653e0a9d5c01a8657 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 17:18:03 2012 +0100 WaE: -Werror=reorder diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index a350c4c..42150b5 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -734,9 +734,9 @@ ButtonBar::BackgroundTheme::BackgroundTheme ( const ::boost::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons) : mpTheme(rpTheme), + meIconSize( Button::IconSize_Large ), maButtonArea(), maBackgroundLocation(), - meIconSize(IconSize_Large), mePosition( BOTTOM ) { UpdateMinimumIconSizes(rButtons); commit 64a111d6846ee6a06a0e9cbdec98e49b9cf3de6a Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 16:21:20 2012 +0100 rearrange order diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index c92a611..c98edd7 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -348,25 +348,25 @@ common_noncore_mimetypes = [ ] for (mimetype,extension) in mimetypes.items(): - get_through_rss_query(novell, mimetype, "novell", extension) + get_through_rss_query(freedesktop, mimetype, "fdo", extension) for (mimetype,extension) in mimetypes.items(): - get_through_rss_query(kde, mimetype, "kde", extension) + get_through_rpc_query(redhatrpc, redhatbug, mimetype, "rhbz", extension) for (mimetype,extension) in mimetypes.items(): - get_through_rss_query(gnome, mimetype, "gnome", extension) + get_through_rss_query(openoffice, mimetype, "ooo", extension) for (mimetype,extension) in mimetypes.items(): - get_through_rss_query(abisource, mimetype, "abi", extension) + get_through_rss_query(novell, mimetype, "novell", extension) for (mimetype,extension) in mimetypes.items(): - get_through_rss_query(freedesktop, mimetype, "fdo", extension) + get_through_rss_query(gnome, mimetype, "gnome", extension) for (mimetype,extension) in mimetypes.items(): - get_through_rpc_query(redhatrpc, redhatbug, mimetype, "rhbz", extension) + get_through_rss_query(abisource, mimetype, "abi", extension) for (mimetype,extension) in mimetypes.items(): - get_through_rss_query(openoffice, mimetype, "ooo", extension) + get_through_rss_query(kde, mimetype, "kde", extension) try: get_launchpad_bugs("lp") commit 3f62c7adfd7bc400021ba2c203b6a66982b01c3d Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 10:51:10 2012 +0100 valgrind: Conditional jump or move depends on uninitialised value diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 0304f25..a350c4c 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -736,6 +736,7 @@ ButtonBar::BackgroundTheme::BackgroundTheme ( : mpTheme(rpTheme), maButtonArea(), maBackgroundLocation(), + meIconSize(IconSize_Large), mePosition( BOTTOM ) { UpdateMinimumIconSizes(rButtons); commit 293cfcdfbc20d1d2b2b56e2283f84678a102186b Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 10:07:51 2012 +0100 valgrind: Conditional jump or move depends on uninitialised value diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 90c0027..4271897 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -56,6 +56,7 @@ CustomShapeProperties::CustomShapeProperties() : mnShapePresetType ( -1 ) , mbMirroredX ( sal_False ) , mbMirroredY ( sal_False ) +, mnTextRotateAngle ( 0 ) , mnArcNum ( 0 ) { } commit 6066637320d38700f0ac05f090494d424942932c Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 09:01:05 2012 +0100 we're more interested in getting emf/wmf samples than pdf diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index bad7a54..c92a611 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -287,7 +287,6 @@ mimetypes = { 'application/docbook+xml': 'docbook', # misc 'text/spreadsheet': 'slk', - 'application/pdf': 'pdf', 'application/vnd.corel-draw': 'cdr', 'application/vnd.lotus-wordpro': 'lwp', 'application/vnd.lotus-1-2-3': 'wks', @@ -312,19 +311,23 @@ mimetypes = { 'application/x-starwriter': 'sdw', 'application/vnd.stardivision.writer': 'sdw5', 'application/vnd.stardivision.writer-global': 'sgl5', -# unusual image mimetypes +# relatively uncommon image mimetypes 'image/cgm': 'cgm', + 'image/tiff': 'tiff', + 'image/vnd.dxf': 'dxf', + 'image/x-emf': 'emf', 'image/x-targa': 'tga', + 'image/x-sgf': 'sgf', + 'image/x-svm': 'svm', + 'image/x-wmf': 'wmf', } # disabled for now, this would download gigs of pngs/jpegs... -common_image_mimetypes = [ +common_noncore_mimetypes = [ # graphics ('image/svg+xml', 'svg'), ('image/x-MS-bmp', 'bmp'), ('image/x-wpg', 'wpg'), - ('image/vnd.dxf', 'dxf'), - ('image/x-emf', 'emf'), ('image/x-eps', 'eps'), ('image/x-met', 'met'), ('image/x-portable-bitmap', 'pbm'), @@ -335,15 +338,13 @@ common_image_mimetypes = [ ('image/x-portable-pixmap', 'ppm'), ('image/vnd.adobe.photoshop', 'psd'), ('image/x-cmu-raster', 'ras'), - ('image/x-sgf', 'sgf'), - ('image/x-svm', 'svm'), - ('image/tiff', 'tiff'), - ('image/x-wmf', 'wmf'), ('image/x-xbitmap', 'xbm'), ('image/x-xpixmap', 'xpm'), ('image/gif', 'gif'), ('image/jpeg', 'jpeg'), ('image/png', 'png'), +# pdf, etc. + ('application/pdf', 'pdf'), ] for (mimetype,extension) in mimetypes.items(): @@ -367,6 +368,9 @@ for (mimetype,extension) in mimetypes.items(): for (mimetype,extension) in mimetypes.items(): get_through_rss_query(openoffice, mimetype, "ooo", extension) -get_launchpad_bugs("lp") +try: + get_launchpad_bugs("lp") +except ImportError: + print "launchpadlib unavailable, skipping Ubuntu tracker" # vim:set shiftwidth=4 softtabstop=4 expandtab: commit 28a2175847b70b8e47929d6b04978420e7f0953e Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 08:52:16 2012 +0100 gif parsing regression test diff --git a/svtools/qa/cppunit/data/gif/fail/.gitignore b/svtools/qa/cppunit/data/gif/fail/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/svtools/qa/cppunit/data/gif/fail/CVE-2007-3958-1.gif b/svtools/qa/cppunit/data/gif/fail/CVE-2007-3958-1.gif new file mode 100644 index 0000000..7e84566 Binary files /dev/null and b/svtools/qa/cppunit/data/gif/fail/CVE-2007-3958-1.gif differ diff --git a/svtools/qa/cppunit/data/gif/indeterminate/.gitignore b/svtools/qa/cppunit/data/gif/indeterminate/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/svtools/qa/cppunit/data/gif/pass/.gitignore b/svtools/qa/cppunit/data/gif/pass/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/svtools/qa/cppunit/data/gif/pass/CVE-2011-2131-1.gif b/svtools/qa/cppunit/data/gif/pass/CVE-2011-2131-1.gif new file mode 100644 index 0000000..190c7b0 Binary files /dev/null and b/svtools/qa/cppunit/data/gif/pass/CVE-2011-2131-1.gif differ diff --git a/svtools/qa/cppunit/filters-test.cxx b/svtools/qa/cppunit/filters-test.cxx index 4168894..483a72b 100644 --- a/svtools/qa/cppunit/filters-test.cxx +++ b/svtools/qa/cppunit/filters-test.cxx @@ -88,6 +88,10 @@ void SvtoolsFiltersTest::testCVEs() testDir(rtl::OUString(), getURLFromSrc("/svtools/qa/cppunit/data/jpg/"), rtl::OUString()); + + testDir(rtl::OUString(), + getURLFromSrc("/svtools/qa/cppunit/data/gif/"), + rtl::OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(SvtoolsFiltersTest); commit 5729de93ad933eedd1828afe21a4eb6d69ec9f91 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 19 07:48:31 2012 +0100 update unused.easy post memtools Table conversion/removal diff --git a/unusedcode.easy b/unusedcode.easy index e1daecd..cf1e982 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -137,19 +137,8 @@ SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*) SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*) -SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const&, unsigned short&) -SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const*, unsigned short) -SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElementArr const*, unsigned short, unsigned short) -SvXMLEmbeddedElementArr::Remove(SvXMLEmbeddedElement* const&, unsigned short) -SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short) -SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short) SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*) -SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const&, unsigned short&) -SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short) -SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short) -SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short) -SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short) SvxAutocorrWordList::Insert(SvxAutocorrWord* const&, unsigned short&) SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short) SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short) commit 85ac2681a390b252408b347cbbc6d01efb0bf850 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 18 22:09:13 2012 +0100 ImplLayout can return NULL diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 67ef1fe..adc2bf7 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -7408,7 +7408,8 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c aSysLayoutData.nSize = sizeof(aSysLayoutData); aSysLayoutData.rGlyphData.reserve( 256 ); - if ( mpMetaFile ) { + if ( mpMetaFile ) + { if (pDXAry) mpMetaFile->AddAction( new MetaTextArrayAction( rStartPt, rStr, pDXAry, nIndex, nLen ) ); else @@ -7417,12 +7418,14 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c if ( !IsDeviceOutputNecessary() ) return aSysLayoutData; - SalLayout* rLayout = ImplLayout( rStr, nIndex, nLen, rStartPt, 0, pDXAry, true ); + SalLayout* pLayout = ImplLayout( rStr, nIndex, nLen, rStartPt, 0, pDXAry, true ); + + if ( !pLayout ) return aSysLayoutData; // setup glyphs Point aPos; sal_GlyphId aGlyphId; - for( int nStart = 0; rLayout->GetNextGlyphs( 1, &aGlyphId, aPos, nStart ); ) + for( int nStart = 0; pLayout->GetNextGlyphs( 1, &aGlyphId, aPos, nStart ); ) { // NOTE: Windows backend is producing unicode chars (ucs4), so on windows, // ETO_GLYPH_INDEX is unusable, unless extra glyph conversion is made. @@ -7437,9 +7440,9 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c } // Get font data - aSysLayoutData.orientation = rLayout->GetOrientation(); + aSysLayoutData.orientation = pLayout->GetOrientation(); - rLayout->Release(); + pLayout->Release(); return aSysLayoutData; } commit d1b9eeab4f259e238906818018e93a6b161e02aa Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 18 22:05:29 2012 +0100 sigh, need import sys diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index cf79a79..bad7a54 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -41,6 +41,7 @@ import feedparser import base64 import re import os, os.path +import sys import xmlrpclib from xml.dom import minidom from xml.sax.saxutils import escape commit 0f13f03a75900b1de6b3de79257c200626ebd12b Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 18 20:23:09 2012 +0100 valgrind: Uninitialised value was created by a stack allocation diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 44ca44b..c831eee 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -239,7 +239,7 @@ namespace oox { namespace ppt { if( mpTarget ) { - sal_Int16 nSubType; + sal_Int16 nSubType(0); maNodeProperties[ NP_TARGET ] = mpTarget->convert( pSlide, nSubType ); if( mpTarget->mnType == XML_spTgt ) {
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits