Kaydet (Commit) f54c659e authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

avoid object double include in starmath

üst 7438c388
...@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ ...@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/dialog \ starmath/source/dialog \
starmath/source/document \ starmath/source/document \
starmath/source/edit \ starmath/source/edit \
starmath/source/eqnolefilehdr \
starmath/source/format \ starmath/source/format \
starmath/source/mathmlexport \ starmath/source/mathmlexport \
starmath/source/mathmlimport \ starmath/source/mathmlimport \
......
...@@ -33,30 +33,6 @@ ...@@ -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 ) sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
......
...@@ -54,8 +54,28 @@ public: ...@@ -54,8 +54,28 @@ public:
sal_uInt32 nReserved3; // not used sal_uInt32 nReserved3; // not used
sal_uInt32 nReserved4; // not used sal_uInt32 nReserved4; // not used
void Read(SvStorageStream *pS); inline void Read(SvStorageStream *pS)
void Write(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 ); sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment