CWS-TOOLING: integrate CWS aw065
2009-06-17 13:48:12 +0200 aw r273068 : #99385# corrected small error in SCs selection visualisation 2009-06-16 15:45:28 +0200 wg r273021 : i102838 2009-06-16 12:46:07 +0200 wg r273016 : i102833 2009-06-11 17:40:29 +0200 aw r272895 : #i98870# added implementation for getPageCount helper 2009-06-11 16:39:54 +0200 aw r272885 : #i102663#, #i102667#, #i98870# incluide file typo corrected 2009-06-11 16:24:07 +0200 aw r272881 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added 2009-06-11 16:23:52 +0200 aw r272880 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added 2009-06-09 13:50:29 +0200 aw r272769 : #i98917# added support for the OverlayHatchRectanglePrimitive to follow rotation with it's hatch; simplified OverlayHatchRect 2009-06-09 13:04:06 +0200 aw r272766 : #i98870# re-added PageNumber identification in SdrTextPrimitive2D::get2DDecomposition 2009-06-08 18:56:05 +0200 aw r272744 : #i99385# added some last corrections to OverlayObjects in SD (had to do some merges on resync, needed to optically check and correct) 2009-06-08 11:17:57 +0200 aw r272725 : cws aw065: corrections after resync 2009-06-08 11:02:25 +0200 aw r272723 : cws aw065: corrections after resync 2009-06-08 10:36:22 +0200 aw r272722 : cws aw065: corrections after resync 2009-06-05 18:57:06 +0200 aw r272712 : CWS-TOOLING: rebase CWS aw065 to trunk@272291 (milestone: DEV300:m49) 2009-06-05 14:56:34 +0200 aw r272690 : #i89784# stripped old stuff no longer needed due to text-to-polygon conversion using primitives 2009-06-05 14:50:07 +0200 aw r272688 : #102091# removed on-model-lock suppression for SdrObject::ActionChanged() 2009-06-05 14:47:29 +0200 aw r272687 : #102091# corrected local value buffering in ScenePrimitive2D::get2DDecomposition 2009-06-03 17:53:32 +0200 aw r272599 : #i89784# version before stripping 2009-06-03 17:52:18 +0200 aw r272598 : #i89784# version before stripping 2009-05-28 17:15:47 +0200 aw r272420 : #i101872# old stuff removed/stripped 2009-05-28 17:15:32 +0200 aw r272419 : #i101872# old stuff removed/stripped 2009-05-28 17:15:15 +0200 aw r272418 : #i101872# old stuff removed/stripped 2009-05-28 17:14:45 +0200 aw r272417 : #i101872# old stuff removed/stripped 2009-05-28 12:13:56 +0200 aw r272396 : #i101872# stable hybrid state 2009-05-28 12:13:46 +0200 aw r272395 : #i101872# stable hybrid state 2009-05-28 12:13:35 +0200 aw r272394 : #i101872# stable hybrid state 2009-05-28 12:13:20 +0200 aw r272393 : #i101872# stable hybrid state 2009-05-28 12:13:05 +0200 aw r272392 : #i101872# stable hybrid state 2009-05-28 12:12:51 +0200 aw r272391 : #i101872# stable hybrid state 2009-05-15 16:56:02 +0200 aw r271952 : #i101872# HitTest unifications 2009-05-15 16:55:22 +0200 aw r271951 : #i101872# HitTest unifications 2009-05-15 16:55:12 +0200 aw r271950 : #i101872# HitTest unifications 2009-05-15 16:55:01 +0200 aw r271949 : #i101872# HitTest unifications 2009-05-15 16:54:51 +0200 aw r271948 : #i101872# HitTest unifications 2009-05-15 16:54:35 +0200 aw r271947 : #i101872# HitTest unifications 2009-05-15 16:54:22 +0200 aw r271946 : #i101872# HitTest unifications 2009-05-12 19:08:38 +0200 aw r271834 : #i101684# corrected AutoShape's preparation of text transformation due to different definitions in TextBounds 2009-05-12 15:44:49 +0200 aw r271827 : #i89784# expanded TextLayouterDevice::getTextOutlines() to support DXArray and X-Font scaling 2009-05-11 19:40:40 +0200 aw r271790 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications 2009-05-11 19:40:25 +0200 aw r271789 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications 2009-05-11 19:40:12 +0200 aw r271788 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications 2009-05-11 13:01:53 +0200 aw r271765 : #i99385# corrections and optimizations 2009-05-08 14:48:40 +0200 aw r271718 : #i1016180# added optimizations in model operations when model is locked 2009-05-08 14:11:45 +0200 aw r271716 : #i101679# added flush() calls to OverlayManager when interaction step is prepared 2009-05-07 17:44:03 +0200 aw r271689 : #i99385# last corrections/changes 2009-05-07 17:43:47 +0200 aw r271688 : #i99385# last corrections/changes 2009-05-07 13:20:09 +0200 aw r271654 : #i99385# added changes from WFH 2009-05-07 13:19:38 +0200 aw r271653 : #i99385# added changes from WFH 2009-05-07 13:19:11 +0200 aw r271652 : #i99385# added changes from WFH 2009-05-07 11:33:17 +0200 aw r271643 : #i99385# corrections after resync 2009-05-07 11:17:31 +0200 aw r271642 : #i99385# corrections after resync 2009-05-06 18:46:53 +0200 aw r271609 : CWS-TOOLING: rebase CWS aw065 to trunk@271427 (milestone: DEV300:m47) 2009-05-05 18:24:03 +0200 aw r271548 : #i101443# force new text decomposition when TextBackgroundColor has changed 2009-05-05 17:44:42 +0200 aw r271542 : #i99385# 3rd round, simplifications and corrections done 2009-05-05 17:44:32 +0200 aw r271541 : #i99385# 3rd round, simplifications and corrections done 2009-05-05 17:44:20 +0200 aw r271540 : #i99385# 3rd round, simplifications and corrections done 2009-05-05 17:44:09 +0200 aw r271539 : #i99385# 3rd round, simplifications and corrections done 2009-05-05 15:48:38 +0200 aw r271527 : #i99385# 2nd round, usages checked and corrected 2009-05-05 15:48:15 +0200 aw r271526 : #i99385# 2nd round, usages checked and corrected 2009-05-05 15:48:03 +0200 aw r271525 : #i99385# 2nd round, usages checked and corrected 2009-05-05 15:47:51 +0200 aw r271524 : #i99385# 2nd round, usages checked and corrected 2009-04-27 18:33:10 +0200 aw r271300 : #i99385# state commit after all implementations are done 2009-04-27 15:36:53 +0200 aw r271283 : #i99385# state commit after all implementations are done 2009-04-27 15:27:49 +0200 aw r271280 : #i99385# state commit after all implementations are done 2009-04-27 15:27:33 +0200 aw r271279 : #i99385# state commit after all implementations are done 2009-04-27 15:27:00 +0200 aw r271278 : #i99385# state commit after all implementations are done 2009-04-27 15:26:15 +0200 aw r271277 : #i99385# state commit after all implementations are done 2009-04-27 15:25:40 +0200 aw r271275 : #i99385# state commit after all implementations are done 2009-04-27 15:25:19 +0200 aw r271274 : #i99385# state commit after all implementations are done 2009-04-27 15:24:00 +0200 aw r271272 : #i99385# state commit after all implementations are done 2009-03-19 17:12:00 +0100 aw r269757 : #i100360# corrected bitmap's PefSize calculation for bitmap filled objects when Bitmap is Pixel-based on it's mapping 2009-02-19 17:09:47 +0100 aw r268298 : #i98917# corrected attributes 2009-02-19 17:09:30 +0100 aw r268297 : #i98917# corrected attributes 2009-02-19 17:08:22 +0100 aw r268296 : #i98917# corrected attributes 2009-02-19 11:56:25 +0100 aw r268268 : #i98870# added extra code to react on PageNumber change 2009-02-18 16:57:24 +0100 aw r268243 : #i98917# in OverlayHatchRect::getGeometry the rotation was not applied to the TopLeft of the centered rectangle, but to the already extended one, thus the visualisation was rotating around the wrong edge
This commit is contained in:
Release Engineers
parent
3bcd8fb626
commit
ef19f7554c
4 changed files with 71 additions and 77 deletions
|
|
@ -1375,54 +1375,6 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer)
|
|||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
SdrObject* DlgEdObj::CheckHit( const Point& rPnt, USHORT nTol,const SetOfByte* pSet ) const
|
||||
{
|
||||
// #109994# fixed here, because the drawing layer doesn't handle objects
|
||||
// with a width or height of 0 in a proper way
|
||||
Rectangle aRect_( aOutRect );
|
||||
if ( aRect_.IsEmpty() )
|
||||
{
|
||||
aRect_.Left() -= nTol;
|
||||
aRect_.Top() -= nTol;
|
||||
aRect_.Right() = ( aRect_.Right() == RECT_EMPTY ? aOutRect.Left() + nTol : aRect_.Right() + nTol );
|
||||
aRect_.Bottom() = ( aRect_.Bottom() == RECT_EMPTY ? aOutRect.Top() + nTol : aRect_.Bottom() + nTol );
|
||||
|
||||
if ( aRect_.IsInside( rPnt ) )
|
||||
return (SdrObject*)this;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ))
|
||||
{
|
||||
Rectangle aROuter = aOutRect;
|
||||
aROuter.Left() -= nTol;
|
||||
aROuter.Right() += nTol;
|
||||
aROuter.Top() -= nTol;
|
||||
aROuter.Bottom() += nTol;
|
||||
|
||||
Rectangle aRInner = aOutRect;
|
||||
if( (aRInner.GetSize().Height() > (long)nTol*2) &&
|
||||
(aRInner.GetSize().Width() > (long)nTol*2) )
|
||||
{
|
||||
aRInner.Left() += nTol;
|
||||
aRInner.Right() -= nTol;
|
||||
aRInner.Top() += nTol;
|
||||
aRInner.Bottom() -= nTol;
|
||||
}
|
||||
|
||||
if( aROuter.IsInside( rPnt ) && !aRInner.IsInside( rPnt ) )
|
||||
return (SdrObject*)this;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
return SdrUnoObj::CheckHit( rPnt, nTol, pSet );
|
||||
}
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
TYPEINIT1(DlgEdForm, DlgEdObj);
|
||||
|
|
@ -1857,32 +1809,6 @@ void DlgEdForm::UpdateTabOrderAndGroups()
|
|||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
SdrObject* DlgEdForm::CheckHit( const Point& rPnt, USHORT nTol, const SetOfByte* ) const
|
||||
{
|
||||
Rectangle aROuter = aOutRect;
|
||||
aROuter.Left() -= nTol;
|
||||
aROuter.Right() += nTol;
|
||||
aROuter.Top() -= nTol;
|
||||
aROuter.Bottom() += nTol;
|
||||
|
||||
Rectangle aRInner = aOutRect;
|
||||
if( (aRInner.GetSize().Height() > (long)nTol*2) &&
|
||||
(aRInner.GetSize().Width() > (long)nTol*2) )
|
||||
{
|
||||
aRInner.Left() += nTol;
|
||||
aRInner.Right() -= nTol;
|
||||
aRInner.Top() += nTol;
|
||||
aRInner.Bottom() -= nTol;
|
||||
}
|
||||
|
||||
if( aROuter.IsInside( rPnt ) && !aRInner.IsInside( rPnt ) )
|
||||
return (SdrObject*)this;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
void DlgEdForm::NbcMove( const Size& rSize )
|
||||
{
|
||||
SdrUnoObj::NbcMove( rSize );
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
|
||||
#include <basidesh.hxx>
|
||||
#include <iderdll.hxx>
|
||||
#include "dlgedobj.hxx"
|
||||
|
||||
TYPEINIT1( DlgEdView, SdrView );
|
||||
|
||||
|
|
@ -151,3 +152,68 @@ void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
|
|||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT nTol)
|
||||
{
|
||||
DlgEdObj* pDlgEdObj = dynamic_cast< DlgEdObj* >(pRetval);
|
||||
|
||||
if(pDlgEdObj)
|
||||
{
|
||||
bool bExcludeInner(false);
|
||||
|
||||
if(0 != dynamic_cast< DlgEdForm* >(pRetval))
|
||||
{
|
||||
// from DlgEdForm::CheckHit; exclude inner for DlgEdForm
|
||||
bExcludeInner = true;
|
||||
}
|
||||
else if(pDlgEdObj->supportsService("com.sun.star.awt.UnoControlGroupBoxModel"))
|
||||
{
|
||||
// from DlgEdObj::CheckHit; exclude inner for group shapes
|
||||
bExcludeInner = true;
|
||||
}
|
||||
|
||||
if(bExcludeInner)
|
||||
{
|
||||
// use direct model data; it's a DlgEdObj, so GetLastBoundRect()
|
||||
// will access aOutRect directly
|
||||
const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect());
|
||||
|
||||
if(!aOuterRectangle.IsEmpty()
|
||||
&& RECT_EMPTY != aOuterRectangle.Right()
|
||||
&& RECT_EMPTY != aOuterRectangle.Bottom())
|
||||
{
|
||||
basegfx::B2DRange aOuterRange(
|
||||
aOuterRectangle.Left(), aOuterRectangle.Top(),
|
||||
aOuterRectangle.Right(), aOuterRectangle.Bottom());
|
||||
|
||||
if(nTol)
|
||||
{
|
||||
aOuterRange.grow(-1.0 * nTol);
|
||||
}
|
||||
|
||||
if(aOuterRange.isInside(basegfx::B2DPoint(rPnt.X(), rPnt.Y())))
|
||||
{
|
||||
pRetval = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return pRetval;
|
||||
}
|
||||
|
||||
SdrObject* DlgEdView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
|
||||
{
|
||||
// call parent
|
||||
SdrObject* pRetval = SdrView::CheckSingleSdrObjectHit(rPnt, nTol, pObj, pPV, nOptions, pMVisLay);
|
||||
|
||||
if(pRetval)
|
||||
{
|
||||
// check hitted object locally
|
||||
pRetval = impLocalHitCorrection(pRetval, rPnt, nTol);
|
||||
}
|
||||
|
||||
return pRetval;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// eof
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ public:
|
|||
virtual void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
|
||||
|
||||
virtual void SetLayer(SdrLayerID nLayer);
|
||||
virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -194,8 +193,6 @@ public:
|
|||
virtual void UpdateGroups();
|
||||
virtual void UpdateTabOrderAndGroups();
|
||||
|
||||
virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const;
|
||||
|
||||
::com::sun::star::awt::DeviceInfo getDeviceInfo() const;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@ public:
|
|||
|
||||
virtual void MarkListHasChanged();
|
||||
virtual void MakeVisible( const Rectangle& rRect, Window& rWin );
|
||||
|
||||
protected:
|
||||
// overloaded to handle HitTest for some objects special
|
||||
using SdrView::CheckSingleSdrObjectHit;
|
||||
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
|
||||
};
|
||||
|
||||
#endif //_BASCTL_DLGEDVIEW_HXX
|
||||
|
|
|
|||
Loading…
Reference in a new issue