applied_patches/0304-warning-return-values-lotuswordpro.diff

   1 --- lotuswordpro/source/filter/lwpborderstuff.cxx.old   2008-10-23 13:16:31.000000000 +0200
   2 +++ lotuswordpro/source/filter/lwpborderstuff.cxx       2008-10-23 15:48:06.000000000 +0200
   3 @@ -182,6 +182,9 @@ sal_uInt16  LwpBorderStuff::GetSideType(s
   4                 return m_nBoderGroupIDBottom;
   5                 break;
   6         }
   7 +       // FIXME: this is needed to avoid warning: control reaches end of non-void function
   8 +       //        a better solution would be to enum value for the parameter side
   9 +       return 0;
  10  }
  11
  12  LwpColor       LwpBorderStuff::GetSideColor(sal_uInt16 side)
  13 @@ -201,6 +204,9 @@ LwpColor    LwpBorderStuff::GetSideColor(sa
  14                 return m_aColorBottom;
  15                 break;
  16         }
  17 +       // FIXME: this is needed to avoid warning: control reaches end of non-void function
  18 +       //        a better solution would be to enum value for the parameter side
  19 +       return LwpColor();
  20  }
  21
  22  float  LwpBorderStuff::GetSideWidth(sal_uInt16 side)
  23 @@ -220,6 +226,9 @@ float       LwpBorderStuff::GetSideWidth(sal_u
  24                 return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthBottom));
  25                 break;
  26         }
  27 +       // FIXME: this is needed to avoid warning: control reaches end of non-void function
  28 +       //        a better solution would be to enum value for the parameter side
  29 +       return 0;
  30  }
  31
  32  void LwpBorderStuff::operator = (const LwpBorderStuff& rOther)
  33 --- lotuswordpro/source/filter/lwpmargins.hxx.old       2008-10-23 13:16:32.000000000 +0200
  34 +++ lotuswordpro/source/filter/lwpmargins.hxx   2008-10-23 15:59:21.000000000 +0200
  35 @@ -113,5 +113,8 @@ inline double LwpMargins::GetMarginsValu
  36                 return LwpTools::ConvertFromUnitsToMetric(m_nBottom);
  37                 break;
  38         }
  39 +       // FIXME: this is needed to avoid warning: control reaches end of non-void function
  40 +       //        a better solution would be to enum value for the parameter side
  41 +       return 0;
  42  }
  43 -#endif
  44 \ No newline at end of file
  45 +#endif
  46 --- lotuswordpro/source/filter/xfilter/xfutil.cxx.old   2008-10-23 13:16:32.000000000 +0200
  47 +++ lotuswordpro/source/filter/xfilter/xfutil.cxx       2008-10-23 16:02:44.000000000 +0200
  48 @@ -288,7 +288,7 @@ rtl::OUString       GetCrossoutName(enumXFCros
  49                 return A2OUSTR("X");
  50                 break;
  51         }
  52 -
  53 +       return A2OUSTR("");
  54  }
  55
  56  rtl::OUString  GetTransformName(enumXFTransform type)
  57 @@ -425,6 +425,7 @@ rtl::OUString       GetFrameXRel(enumXFFrameXR
  58                 return A2OUSTR("frame-start-margin");
  59                 break;
  60         }
  61 +       return A2OUSTR("");
  62  }
  63
  64  rtl::OUString  GetFrameYPos(enumXFFrameYPos pos)