summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorDaniel Rentz <dr@openoffice.org>2009-07-31 10:34:51 +0000
committerDaniel Rentz <dr@openoffice.org>2009-07-31 10:34:51 +0000
commit0a9ccd2034bb41758b261ef811a378fd7a0bad40 (patch)
treea7018fb4f379aeb90666a92ffca80d0cda935e01 /sw/source
parentb5d79ba0c2c3a07331406eb0f3bbb3d40986320f (diff)
#i12587# preparation for chart-shapes: count DFF drawings dynamically
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/escher.hxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx7
2 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 0ca507f50b46..be0860407958 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -121,7 +121,7 @@ protected:
SdrLayerID GetInvisibleHellId() const;
public:
- SwBasicEscherEx(SvStream* pStrm, SwWW8Writer& rWrt, UINT32 nDrawings = 1);
+ SwBasicEscherEx(SvStream* pStrm, SwWW8Writer& rWrt);
INT32 WriteGrfFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId);
INT32 WriteOLEFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId);
void WriteEmptyFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index bc0bd7806782..862325a3d63d 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1339,9 +1339,8 @@ void SwEscherEx::WritePictures()
// Output- Routines for Escher Export
-SwBasicEscherEx::SwBasicEscherEx(SvStream* pStrm, SwWW8Writer& rWW8Wrt,
- UINT32 nDrawings)
- : EscherEx(*pStrm, nDrawings), rWrt(rWW8Wrt), pEscherStrm(pStrm),
+SwBasicEscherEx::SwBasicEscherEx(SvStream* pStrm, SwWW8Writer& rWW8Wrt)
+ : EscherEx(*pStrm), rWrt(rWW8Wrt), pEscherStrm(pStrm),
pPictStrm(0)
{
Init();
@@ -1939,7 +1938,7 @@ void SwBasicEscherEx::WritePictures()
}
SwEscherEx::SwEscherEx(SvStream* pStrm, SwWW8Writer& rWW8Wrt)
- : SwBasicEscherEx(pStrm, rWW8Wrt, rWW8Wrt.pHFSdrObjs->size() ? 2 : 1),
+ : SwBasicEscherEx(pStrm, rWW8Wrt),
pTxtBxs(0)
{
aHostData.SetClientData(&aWinwordAnchoring);