diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:26:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:26:19 +0000 |
| commit | a1ab12488a19711c6be01cd56c9b2a5d97e49d5b (patch) | |
| tree | c0334e785b777d86121006546d0a08e6fdaca555 /svx | |
| parent | 6a8f72cb1bb040453de8e2594682de8db5646f88 (diff) | |
INTEGRATION: CWS aw033 (1.21.12); FILE MERGED
2008/07/10 13:00:58 aw 1.21.12.13: #i39532# XOutputDevice removed, PrepareDelete removed
2008/05/16 10:54:57 aw 1.21.12.12: adaptions after resync
2008/05/14 14:04:05 aw 1.21.12.11: RESYNC: (1.27-1.28); FILE MERGED
2008/01/22 12:29:33 aw 1.21.12.10: adaptions and 1st stripping
2007/08/09 19:04:23 aw 1.21.12.9: RESYNC: (1.26-1.27); FILE MERGED
2007/08/07 15:47:30 aw 1.21.12.8: #i39532# include is not needed, removed
2007/08/07 15:45:55 aw 1.21.12.7: #i39532# migrated describePDFControl to toolkit
2007/03/20 14:20:43 aw 1.21.12.6: RESYNC: (1.25-1.26); FILE MERGED
2006/12/11 17:41:00 aw 1.21.12.5: #i39532# changes after resync
2006/11/28 19:41:25 aw 1.21.12.4: RESYNC: (1.24-1.25); FILE MERGED
2006/09/26 19:37:50 aw 1.21.12.3: RESYNC: (1.21-1.24); FILE MERGED
2006/08/09 17:20:07 aw 1.21.12.2: #i39532#
2006/05/12 12:46:30 aw 1.21.12.1: code changes for primitive support
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdouno.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index e5a091cf11f3..ddf6e87fe51a 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svdouno.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.29 $ * * This file is part of OpenOffice.org. * @@ -48,7 +48,6 @@ #include <comphelper/types.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <svx/svdouno.hxx> -#include "svdxout.hxx" #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> #include "svdglob.hxx" // Stringcache @@ -57,11 +56,7 @@ #include <svx/svdview.hxx> #include <svx/svdorect.hxx> #include "svdviter.hxx" -#ifndef SVX_SOURCE_FORM_FORMPDFEXPORT_HXX -#include "formpdfexport.hxx" -#endif #include <rtl/ref.hxx> - #include <set> #include <memory> #include <svx/sdrpagewindow.hxx> @@ -285,13 +280,6 @@ namespace }; } -// ---------------------------------------------------------------------------- -sal_Bool SdrUnoObj::DoPaintObject(XOutputDevice& /*rXOut*/, const SdrPaintInfoRec& /*rInfoRec*/) const -{ - DBG_ERROR( "SdrUnoObj::DoPaintObject: dead code!" ); - return sal_False; -} - SdrObject* SdrUnoObj::CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const { return ImpCheckHit(rPnt, nTol, pVisiLayer, TRUE, TRUE); @@ -570,7 +558,11 @@ void SdrUnoObj::SetUnoControlModel( uno::Reference< awt::XControlModel > xModel) // invalidate all ViewObject contacts ViewContactOfUnoControl* pVC = NULL; if ( impl_getViewContact( pVC ) ) - pVC->invalidateAllContacts( ViewContactOfUnoControl::SdrUnoObjAccessControl() ); + { + // FlushViewContact() removes all existing VOCs. This is always allowed + // since they will be re-created on demand (and with the changed model) + FlushViewContact(); + } } //------------------------------------------------------------------------ @@ -620,3 +612,6 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) { return new ::sdr::contact::ViewContactOfUnoControl( *this ); } + +// ----------------------------------------------------------------------------- +// eof |