From 680b05a0f4bb60177b08c4117f22ae5c016bc6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 18 Jul 2018 14:47:11 +0100 Subject: [PATCH] Resolves: rhbz#1602589 fix covscan issues --- covscan.patch | 113 +++++++++++++++++++++++++++++++++++++++++++++++ libreoffice.spec | 6 ++- 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 covscan.patch diff --git a/covscan.patch b/covscan.patch new file mode 100644 index 0000000..9cf930a --- /dev/null +++ b/covscan.patch @@ -0,0 +1,113 @@ +From fa5f426359bbe1b6a9c521130bf7bbee2e60f69f Mon Sep 17 00:00:00 2001 +From: rpmbuild +Date: Wed, 18 Jul 2018 15:31:31 +0100 +Subject: [PATCH] foo + +--- + filter/source/svg/presentation_engine.js | 8 ++------ + helpcontent2/to-wiki/wikiconv2.py | 2 -- + solenv/bin/pack_images.py | 2 +- + wizards/com/sun/star/wizards/agenda/TopicsControl.py | 6 ++++-- + wizards/com/sun/star/wizards/document/OfficeDocument.py | 1 - + 5 files changed, 7 insertions(+), 12 deletions(-) + +diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js +index 7dbe377..f4b9db2 100644 +--- a/filter/source/svg/presentation_engine.js ++++ b/filter/source/svg/presentation_engine.js +@@ -7987,7 +7987,7 @@ AnimationBaseNode3.prototype.info = function( bVerbose ) + sInfo += '; keyTimes: ' + this.getKeyTimes().join( ',' ); + + // values +- if( this.getKeyTimes().length ) ++ if( this.getValues().length ) + sInfo += '; values: ' + this.getValues().join( ',' ); + + // formula +@@ -12170,7 +12170,6 @@ SlideTransition.prototype.createSlideTransition = function( aLeavingSlide, aEnte + + case PUSHWIPE_TRANSITION: + { +- var bCombined = false; + var aDirection = null; + switch( this.eTransitionSubType ) + { +@@ -12192,10 +12191,7 @@ SlideTransition.prototype.createSlideTransition = function( aLeavingSlide, aEnte + aDirection = { x: -1.0, y: 0.0 }; + break; + } +- if( bCombined ) +- return null; +- else +- return new MovingSlideChange( aLeavingSlide, aEnteringSlide, aDirection, aDirection ); ++ return new MovingSlideChange( aLeavingSlide, aEnteringSlide, aDirection, aDirection ); + } + + case SLIDEWIPE_TRANSITION: +diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py +index 93f72eb..55ff72f 100755 +--- a/helpcontent2/to-wiki/wikiconv2.py ++++ b/helpcontent2/to-wiki/wikiconv2.py +@@ -1071,8 +1071,6 @@ class Item(ElementBase): + sys.stderr.write('Unhandled item type. Possibly type has been localized.\n') + finally: + raise UnhandledItemType +- return replace_text(self.text) +- + + class Paragraph(ElementBase): + def __init__(self, attrs, parent): +diff --git a/solenv/bin/pack_images.py b/solenv/bin/pack_images.py +index 0f493c8..384b61d 100755 +--- a/solenv/bin/pack_images.py ++++ b/solenv/bin/pack_images.py +@@ -512,7 +512,7 @@ def parse_image_list(imagelist_filenames): + + if line.startswith('%MODULE%'): + key = line.replace('%MODULE%/', '') +- if key in global_image_list: ++ if key in module_image_list: + module_image_list[key] += 1 + else: + module_image_list[key] = 0 +diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py b/wizards/com/sun/star/wizards/agenda/TopicsControl.py +index cc42aa9..6ba529c 100644 +--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py ++++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py +@@ -458,8 +458,9 @@ class TopicsControl(ControlScroller): + + def rowDown(self, guiRow=None, control=None): + try: +- if guiRow is None and control is None: ++ if guiRow is None: + guiRow = self.lastFocusRow - self.nscrollvalue ++ if control is None: + control = self.lastFocusControl + # only perform if this is not the last row. + actuallRow = guiRow + self.nscrollvalue +@@ -490,8 +491,9 @@ class TopicsControl(ControlScroller): + + def rowUp(self, guiRow=None, control=None): + try: +- if guiRow is None and control is None: ++ if guiRow is None: + guiRow = self.lastFocusRow - self.nscrollvalue ++ if control is None: + control = self.lastFocusControl + # only perform if this is not the first row + actuallRow = guiRow + self.nscrollvalue +diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py +index 3886f1e..acef613 100644 +--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py ++++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py +@@ -234,7 +234,6 @@ class OfficeDocument(object): + bState = False + + else: +- xComponent.dispose() + bState = True + + return bState +-- +2.14.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 5085862..a623522 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -279,6 +279,7 @@ Patch8: 0001-Keep-the-still-relevant-part-of-external-icu-icu4c-u.patch Patch9: 0001-We-use-ICU-61-now.patch Patch10: 0001-Upgrade-to-ICU-62.1.patch Patch11: 0001-Use-ICU_MAJOR-instead-of-hard-coded-Upgrade-to-ICU-6.patch +Patch12: covscan.patch %if 0%{?rhel} # not upstreamed @@ -2324,6 +2325,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Wed Jul 18 2018 Caolán McNamara - 1:6.0.6.1-4 +- Resolves: rhbz#1602589 fix covscan issues + * Tue Jul 17 2018 Eike Rathke - 1:6.0.6.1-3 - Upgrade to ICU 61.1 - Upgrade to ICU 62.1