summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdovirt.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 22:26:42 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 22:26:42 +0000
commit1465e059c6be5157e6c3a98bba78539da8e4efff (patch)
tree6258a9a613779fae812d7fbc6fe618c15f103b7d /svx/source/svdraw/svdovirt.cxx
parent7212431bf21213246296c957a373002345665e1b (diff)
INTEGRATION: CWS aw033 (1.13.12); FILE MERGED
2008/07/10 13:00:58 aw 1.13.12.10: #i39532# XOutputDevice removed, PrepareDelete removed 2008/05/14 14:03:14 aw 1.13.12.9: RESYNC: (1.19-1.20); FILE MERGED 2008/01/29 10:27:33 aw 1.13.12.8: updated refresh for ActionChanged(), diverse removals 2008/01/22 12:29:33 aw 1.13.12.7: adaptions and 1st stripping 2007/08/09 19:04:49 aw 1.13.12.6: RESYNC: (1.18-1.19); FILE MERGED 2007/03/20 14:20:51 aw 1.13.12.5: RESYNC: (1.17-1.18); FILE MERGED 2006/11/28 19:41:39 aw 1.13.12.4: RESYNC: (1.16-1.17); FILE MERGED 2006/09/26 19:38:26 aw 1.13.12.3: RESYNC: (1.13-1.16); FILE MERGED 2006/05/12 12:46:30 aw 1.13.12.2: code changes for primitive support 2005/10/28 11:40:32 aw 1.13.12.1: #i39532#
Diffstat (limited to 'svx/source/svdraw/svdovirt.cxx')
-rw-r--r--svx/source/svdraw/svdovirt.cxx16
1 files changed, 3 insertions, 13 deletions
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index d244c98e7d22..b87df98704c1 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svdovirt.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
* This file is part of OpenOffice.org.
*
@@ -33,7 +33,6 @@
#include <svx/svdovirt.hxx>
#include <svx/xpool.hxx>
-#include "svdxout.hxx"
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdhdl.hxx>
@@ -160,15 +159,6 @@ void SdrVirtObj::SetChanged()
SdrObject::SetChanged();
}
-sal_Bool SdrVirtObj::DoPaintObject(XOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec) const
-{
- Point aOfs(rOut.GetOffset());
- rOut.SetOffset(aOfs+aAnchor);
- sal_Bool bRet(rRefObj.DoPaintObject(rOut, rInfoRec));
- rOut.SetOffset(aOfs);
- return bRet;
-}
-
SdrObject* SdrVirtObj::CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const
{
Point aPnt(rPnt-aAnchor);
@@ -635,9 +625,9 @@ Pointer SdrVirtObj::GetMacroPointer(const SdrObjMacroHitRec& rRec) const
return rRefObj.GetMacroPointer(rRec); // Todo: Positionsversatz
}
-void SdrVirtObj::PaintMacro(XOutputDevice& rXOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const
+void SdrVirtObj::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const
{
- rRefObj.PaintMacro(rXOut,rDirtyRect,rRec); // Todo: Positionsversatz
+ rRefObj.PaintMacro(rOut,rDirtyRect,rRec); // Todo: Positionsversatz
}
FASTBOOL SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec)