[Libreoffice-commits] .: connectivity/source

[Caolán McNamara]

 connectivity/source/drivers/macab/MacabHeader.cxx  |    3 ++-
 connectivity/source/drivers/macab/MacabHeader.hxx  |    2 +-
 connectivity/source/drivers/macab/MacabRecords.cxx |    3 ++-
 connectivity/source/drivers/macab/MacabRecords.hxx |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit c535169929b6671ddbda88301c19c2210ec795cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 18 20:32:14 2011 +0000

    cppcheck: better formed operator=

diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 1151952..39fb28c 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -306,10 +306,11 @@ MacabHeader::iterator::~iterator ()
 {
 }
 
-void MacabHeader::iterator::operator= (MacabHeader *_record)
+MacabHeader::iterator& MacabHeader::iterator::operator= (MacabHeader *_record)
 {
     id = 0;
     record = _record;
+    return *this;
 }
 
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index b0dc282..f24b593 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -57,7 +57,7 @@ namespace connectivity
                         sal_Int32 id;
                         MacabHeader *record;
                     public:
-                        void operator= (MacabHeader *_record);
+                        iterator& operator= (MacabHeader *_record);
                         iterator();
                         ~iterator();
                         void operator++ ();
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 9e005d3..ec82ba5 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -1154,10 +1154,11 @@ MacabRecords::iterator::~iterator ()
 }
 
 // -------------------------------------------------------------------------
-void MacabRecords::iterator::operator= (MacabRecords *_records)
+MacabRecords::iterator& MacabRecords::iterator::operator= (MacabRecords *_records)
 {
     id = 0;
     records = _records;
+    return *this;
 }
 
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index dfd6cb8..0ac946b 100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -121,7 +121,7 @@ namespace connectivity
                         MacabRecords *records;
                     public:
                         sal_Int32 id;
-                        void operator= (MacabRecords *_records);
+                        iterator& operator= (MacabRecords *_records);
                         iterator();
                         ~iterator();
                         void operator++ ();