calligra/trunk/068cd9ae.patch

   1 From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001
   2 From: Pierre Ducroquet <pinaraf@pinaraf.info>
   3 Date: Sun, 28 Feb 2021 23:23:02 +0100
   4 Subject: [PATCH] Fix some more warnings
   5
   6 diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
   7 index f47c3dd8d51..d2c96e3d92b 100644
   8 --- a/filters/words/msword-odf/wv2/src/styles.cpp
   9 +++ b/filters/words/msword-odf/wv2/src/styles.cpp
  10 @@ -42,7 +42,6 @@ STD::STD()
  11  }
  12
  13  STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
  14 -throw(InvalidFormatException)
  15  {
  16      clearInternal();
  17      if (!read( baseSize, totalSize, stream, preservePos )) {
  18 @@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
  19  }
  20
  21  bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
  22 -throw(InvalidFormatException)
  23  {
  24      U16 shifterU16;
  25      S32 startOffset=stream->tell();  // address where the STD starts
  26 @@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version )
  27  }
  28
  29
  30 -StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
  31 +StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
  32      : m_udsNum(0)
  33  {
  34      WordVersion version = Word8;
  35 diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h
  36 index ba02def6845..41c8278dd21 100644
  37 --- a/filters/words/msword-odf/wv2/src/styles.h
  38 +++ b/filters/words/msword-odf/wv2/src/styles.h
  39 @@ -58,8 +58,9 @@ struct STD
  40      STD();
  41      /**
  42       * Simply calls read(...)
  43 +     * @throw InvalidFormatException
  44       */
  45 -    STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
  46 +    STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
  47      /**
  48       * Attention: This struct allocates memory on the heap
  49       */
  50 @@ -74,8 +75,9 @@ struct STD
  51       * false the state of stream will be changed!
  52       *
  53       * @return true - success, false - failed
  54 +     * @throw InvalidFormatException
  55       */
  56 -    bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
  57 +    bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
  58
  59      /**
  60       * Same as reading :)
  61 @@ -365,7 +367,10 @@ class WV2_EXPORT Style
  62  class WV2_EXPORT StyleSheet
  63  {
  64  public:
  65 -    StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
  66 +    /**
  67 +     * @throw InvalidFormatException
  68 +     */
  69 +    StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
  70      ~StyleSheet();
  71
  72      /**