summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2001-01-16 12:03:53 +0000
committerOliver Bolte <obo@openoffice.org>2001-01-16 12:03:53 +0000
commitb3bb839838f0161cd55cee4971fb385eff816384 (patch)
tree07e3118016f03d6137ef3e44adf15598fad1cb03
parent5a659ca08a76c4f894aac7a60cac3b8790c1cc2f (diff)
#65293# parse error linux compiler
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx15
1 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 9c707702cc14..4a3e5ccdf1e7 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wrtw8esh.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: sj $ $Date: 2000-12-13 14:13:35 $
+ * last change: $Author: obo $ $Date: 2001-01-16 13:01:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1823,7 +1823,8 @@ void SwEscherEx::WriteGrfFlyFrame( const SwFrmFmt& rFmt, UINT32 nShapeId )
else
aSize = OutputDevice::LogicToLogic( aSize, aGraphic.GetPrefMapMode(), aMap100mm );
- Rectangle aRect( Point(), aSize );
+ Point aEmptyPoint = Point();
+ Rectangle aRect( aEmptyPoint, aSize );
sal_uInt32 nBlibId = GetBlibID( *QueryPicStream(), aUniqueId, aRect, NULL );
if ( nBlibId )
@@ -2094,7 +2095,8 @@ void SwEscherEx::WriteFlyFrameAttr( const SwFrmFmt& rFmt, EscherPropertyContaine
else
aSize = OutputDevice::LogicToLogic( aSize, aGraphic.GetPrefMapMode(), aMap100mm );
- Rectangle aRect( Point(), aSize );
+ Point aEmptyPoint = Point();
+ Rectangle aRect( aEmptyPoint, aSize );
sal_uInt32 nBlibId = GetBlibID( *QueryPicStream(), aUniqueId, aRect, NULL );
if ( nBlibId )
@@ -2297,11 +2299,14 @@ BOOL SwMSConvertControls::ExportControl(Writer &rWrt, const SdrObject *pObj)
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtw8esh.cxx,v 1.6 2000-12-13 14:13:35 sj Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtw8esh.cxx,v 1.7 2001-01-16 13:01:59 obo Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.6 2000/12/13 14:13:35 sj
+ AddWmf, AddGraphic had been removed from EscherEx, UniqueId from GraphicObject is now used to get the GraphicId
+
Revision 1.5 2000/12/11 14:31:03 sj
now using EscherPropertyContainer to create the ESCHER_OPT atom