[Libreoffice-commits] .: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpborderstuff.cxx |    4 +++-
 lotuswordpro/source/filter/lwpborderstuff.hxx |    4 +---
 lotuswordpro/source/filter/lwpcolor.cxx       |    4 +++-
 lotuswordpro/source/filter/lwpcolor.hxx       |    4 +---
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b56db14c3fc7eebb8250574284a730f90ee5f74c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 3 14:48:49 2011 +0000

    fix copy ctor and assignment sigs

diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx
index 6f2db04..9cd8677 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.cxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.cxx
@@ -232,7 +232,7 @@ float	LwpBorderStuff::GetSideWidth(sal_uInt16 side)
     return 0;
 }
 
-void LwpBorderStuff::operator = (const LwpBorderStuff& rOther)
+LwpBorderStuff& LwpBorderStuff::operator = (const LwpBorderStuff& rOther)
 {
     m_nSides = rOther.m_nSides;
     m_nValid = rOther.m_nValid;
@@ -253,6 +253,8 @@ void LwpBorderStuff::operator = (const LwpBorderStuff& rOther)
     m_aColorRight = rOther.m_aColorRight;
     m_aColorTop = rOther.m_aColorTop;
     m_aColorBottom = rOther.m_aColorBottom;
+
+    return *this;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx
index 2dc5757..f1b5174 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.hxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.hxx
@@ -90,9 +90,7 @@ public:
     sal_uInt16	GetSideType(sal_uInt16 side);
     LwpColor	GetSideColor(sal_uInt16 side);
     float		GetSideWidth(sal_uInt16 side);
-    //add by , 01/26/2004
-    void operator = (const LwpBorderStuff& rOther);
-    //end
+    LwpBorderStuff& operator = (const LwpBorderStuff& rOther);
     friend class LwpParaBorderOverride;
 private:
     sal_uInt16		m_nSides;
diff --git a/lotuswordpro/source/filter/lwpcolor.cxx b/lotuswordpro/source/filter/lwpcolor.cxx
index 16775e5..6a15d1a 100644
--- a/lotuswordpro/source/filter/lwpcolor.cxx
+++ b/lotuswordpro/source/filter/lwpcolor.cxx
@@ -141,12 +141,14 @@ void LwpColor::ResolveRGB()
             m_nBlue = 0;
         }
 }
-void LwpColor::operator = (const LwpColor& rOther)
+LwpColor& LwpColor::operator = (const LwpColor& rOther)
 {
     m_nRed = rOther.m_nRed;
     m_nGreen = rOther.m_nGreen;
     m_nBlue = rOther.m_nBlue;
     m_nExtra = rOther.m_nExtra;
+
+    return *this;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpcolor.hxx b/lotuswordpro/source/filter/lwpcolor.hxx
index a8325dc..44a7270 100644
--- a/lotuswordpro/source/filter/lwpcolor.hxx
+++ b/lotuswordpro/source/filter/lwpcolor.hxx
@@ -83,9 +83,7 @@ public:
     sal_uInt16 GetBlue();
     BOOL IsValidColor();
     sal_uInt32 To24Color();
-    //add by , 01/26/2005
-    void operator = (const LwpColor& rOther);
-    //end
+    LwpColor& operator = (const LwpColor& rOther);
     sal_Bool IsTransparent();
 private:
     sal_uInt16 m_nRed;			// When extra is AGLRGB_INDEX, m_nRed holds the