[Libreoffice-commits] .: starmath/Library_sm.mk starmath/source

[Norbert Thiebaud]

 starmath/Library_sm.mk            |    1 -
 starmath/source/eqnolefilehdr.cxx |   26 +-------------------------
 starmath/source/eqnolefilehdr.hxx |   24 ++++++++++++++++++++++--
 3 files changed, 23 insertions(+), 28 deletions(-)

New commits:
commit c5eb0db75a8582a33eebf9b5b8e674f609e07b7e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Apr 28 21:53:29 2011 -0500

    avoid object double include in starmath

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 1fc0a76..bd492df 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
         starmath/source/dialog \
         starmath/source/document \
         starmath/source/edit \
-        starmath/source/eqnolefilehdr \
         starmath/source/format \
         starmath/source/mathmlexport \
         starmath/source/mathmlimport \
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index 04c2e17..efcdcf5 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -33,30 +33,6 @@
 
 //////////////////////////////////////////////////////////////////////
 
-void EQNOLEFILEHDR::Read(SvStorageStream *pS)
-{
-    *pS >> nCBHdr;
-    *pS >> nVersion;
-    *pS >> nCf;
-    *pS >> nCBObject;
-    *pS >> nReserved1;
-    *pS >> nReserved2;
-    *pS >> nReserved3;
-    *pS >> nReserved4;
-}
-
-
-void EQNOLEFILEHDR::Write(SvStorageStream *pS)
-{
-    *pS << nCBHdr;
-    *pS << nVersion;
-    *pS << nCf;
-    *pS << nCBObject;
-    *pS << nReserved1;
-    *pS << nReserved2;
-    *pS << nReserved3;
-    *pS << nReserved4;
-}
 
 
 sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
@@ -78,7 +54,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
     EQNOLEFILEHDR aHdr;
     aHdr.Read(pS);
     *pS >> nVer;
-    
+
     if (!pS->GetError())
     {
         nVersion = nVer;
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index cca3c49..1d382b8 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -54,8 +54,28 @@ public:
     sal_uInt32   nReserved3; // not used
     sal_uInt32   nReserved4; // not used
 
-    void Read(SvStorageStream *pS);
-    void Write(SvStorageStream *pS);
+    inline void Read(SvStorageStream *pS)
+    {
+        *pS >> nCBHdr;
+        *pS >> nVersion;
+        *pS >> nCf;
+        *pS >> nCBObject;
+        *pS >> nReserved1;
+        *pS >> nReserved2;
+        *pS >> nReserved3;
+        *pS >> nReserved4;
+    }
+    inline void Write(SvStorageStream *pS)
+    {
+        *pS << nCBHdr;
+        *pS << nVersion;
+        *pS << nCf;
+        *pS << nCBObject;
+        *pS << nReserved1;
+        *pS << nReserved2;
+        *pS << nReserved3;
+        *pS << nReserved4;
+    }
 };
 
 sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );