diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2004-02-21 10:52:14 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2004-02-21 10:52:14 +0000 |
| commit | d4b4ec10846671ec0474eb94936273cd536156e8 (patch) | |
| tree | 70c715009fc9fb3d228f362c9ee96bc12e66bf72 /editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack | |
| parent | Adjust PTHREAD_CFLAGS and THREAD_CFLAGS for ports and standalone (diff) | |
Resolve crash in autopilot for forms.
Diffstat (limited to 'editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack')
| -rw-r--r-- | editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack b/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack new file mode 100644 index 000000000000..34b26e9cfc39 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack @@ -0,0 +1,67 @@ +--- ../sch/source/ui/unoidl/ChXChartObject.cxx 7 Aug 2002 16:01:42 -0000 1.34 ++++ ../sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 +@@ -161,9 +161,11 @@ + // XShape + + // the following 'Hack' methods are copied from svx/unodraw/unoshape.cxx +-// they are needed as long as the drawing layer requires this ++// they are needed as long as the drawing layer requires this. Must ++// prefix these with 'sch' to make sure the symbols don't conflict with ++// those in svx and cause Bad Things To Happen (TM) #i9462# + +-sal_Bool needLogicRectHack( SdrObject* pObj ) ++static sal_Bool sch_needLogicRectHack( SdrObject* pObj ) + { + if( pObj->GetObjInventor() == SdrInventor) + { +@@ -189,9 +191,9 @@ + return sal_False; + } + +-Rectangle getLogicRectHack( SdrObject* pObj ) ++static Rectangle sch_getLogicRectHack( SdrObject* pObj ) + { +- if(needLogicRectHack(pObj)) ++ if(sch_needLogicRectHack(pObj)) + { + return pObj->GetSnapRect(); + } +@@ -201,9 +203,9 @@ + } + } + +-void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) ++static void sch_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) + { +- if(needLogicRectHack(pObj)) ++ if(sch_needLogicRectHack(pObj)) + { + pObj->SetSnapRect( rRect ); + } +@@ -244,7 +246,7 @@ + SdrObject* pObj = GetCurrentSdrObject(); + if( pObj ) + { +- Rectangle aRect( getLogicRectHack( pObj )); ++ Rectangle aRect( sch_getLogicRectHack( pObj )); + Point aPt( aRect.Left(), aRect.Top() ); + + // Position is relative to anchor - calculate absoulte position +@@ -277,7 +279,7 @@ + SdrObject* pObj = GetCurrentSdrObject(); + if( pObj ) + { +- Rectangle aRect( getLogicRectHack( pObj ) ); ++ Rectangle aRect( sch_getLogicRectHack( pObj ) ); + Point aLocalPos( aPosition.X, aPosition.Y ); + + // Position is absolute - position relative to anchor is required +@@ -309,7 +311,7 @@ + SdrObject* pObj = GetCurrentSdrObject(); + if( pObj ) + { +- Rectangle aRect( getLogicRectHack( pObj )); ++ Rectangle aRect( sch_getLogicRectHack( pObj )); + Size aObjSize( aRect.GetWidth(), aRect.GetHeight() ); + return awt::Size( aObjSize.getWidth(), aObjSize.getHeight() ); + } |