diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-04-28 21:53:29 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-04-28 21:53:29 -0500 |
| commit | f54c659e240896bc65f3f6f37fc993813630d8d3 (patch) | |
| tree | 33032d5ee20125d9ca0bee2d2c0b9d993928920c /starmath | |
| parent | 7438c388e31ac611af903dc98006b084f565911e (diff) | |
avoid object double include in starmath
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/Library_sm.mk | 1 | ||||
| -rw-r--r-- | starmath/source/eqnolefilehdr.cxx | 24 | ||||
| -rw-r--r-- | starmath/source/eqnolefilehdr.hxx | 24 |
3 files changed, 22 insertions, 27 deletions
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 1fc0a763bf11..bd492dfdc472 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 4da274fb2673..3e7fa57c665a 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 ) diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx index cdc592d8ea0c..e19980529ee2 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 ); |