[Libreoffice-commits] core.git: sc/source

Stephan Bergmann sbergman at redhat.com
Thu Mar 27 15:36:57 PDT 2014


 sc/source/filter/inc/xerecord.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a85145a359f5f21b2d57d822b2785a85c6566856
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 27 23:36:28 2014 +0100

    Work around MSC "'override' cannot be used with 'inline'" bug
    
    Change-Id: I16b931a3383794e646ab71011510926e49da3599

diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 8f44da3..0d88ff4 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -207,7 +207,7 @@ public:
 
 private:
     /** Writes the body of the record. */
-    inline virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE { rStrm << maValue; }
+    virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE { rStrm << maValue; }
     // inlining prevents warning in wntmsci10
 
 private:
@@ -369,14 +369,14 @@ public:
     inline void         RemoveAllRecords() { maRecs.clear(); }
 
     /** Writes the complete record list. */
-    inline virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE
+    virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE
     {
         // inlining prevents warning in wntmsci10
         for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt )
             (*aIt)->Save( rStrm );
     }
 
-    inline virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE
+    virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE
     {
         // inlining prevents warning in wntmsci10
         for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt )


More information about the Libreoffice-commits mailing list