Index: source/unodraw/unoshape.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/unodraw/unoshape.cxx,v
retrieving revision 1.109
diff -u -r1.109 unoshape.cxx
--- source/unodraw/unoshape.cxx	4 Feb 2004 13:21:23 -0000	1.109
+++ source/unodraw/unoshape.cxx	20 Feb 2004 00:43:50 -0000
@@ -1067,8 +1067,10 @@
 // XShape
 
 //----------------------------------------------------------------------
+// This code also existed in sch, and those duplicate symbols
+// cause Bad Things To Happen (TM)  #i9462#.  Prefixing with 'svx'.
 
-sal_Bool needLogicRectHack( SdrObject* pObj )
+sal_Bool svx_needLogicRectHack( SdrObject* pObj )
 {
 	if( pObj->GetObjInventor() == SdrInventor)
 	{
@@ -1096,9 +1098,9 @@
 
 //----------------------------------------------------------------------
 
-Rectangle getLogicRectHack( SdrObject* pObj )
+Rectangle svx_getLogicRectHack( SdrObject* pObj )
 {
-	if(needLogicRectHack(pObj))
+	if(svx_needLogicRectHack(pObj))
 	{
 		return pObj->GetSnapRect();
 	}
@@ -1110,9 +1112,9 @@
 
 //----------------------------------------------------------------------
 
-void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
+void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
 {
-	if(needLogicRectHack(pObj))
+	if(svx_needLogicRectHack(pObj))
 	{
 		pObj->SetSnapRect( rRect );
 	}
@@ -1130,7 +1132,7 @@
 
 	if( pObj && pModel)
 	{
-		Rectangle aRect( getLogicRectHack(pObj) );
+		Rectangle aRect( svx_getLogicRectHack(pObj) );
 		Point aPt( aRect.Left(), aRect.Top() );
 
 		// Position is relativ to anchor, so recalc to absolut position
@@ -1157,7 +1159,7 @@
 		// transformation matrix
 		if(!pObj->ISA(E3dCompoundObject))
 		{
-			Rectangle aRect( getLogicRectHack(pObj) );
+			Rectangle aRect( svx_getLogicRectHack(pObj) );
 			Point aLocalPos( Position.X, Position.Y );
 			ForceMetricToItemPoolMetric(aLocalPos);
 
@@ -1183,7 +1185,7 @@
 
 	if( pObj && pModel)
 	{
-		Rectangle aRect( getLogicRectHack(pObj) );
+		Rectangle aRect( svx_getLogicRectHack(pObj) );
 		Size aObjSize( aRect.GetWidth(), aRect.GetHeight() );
 		ForceMetricTo100th_mm(aObjSize);
 		return ::com::sun::star::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() );
@@ -1200,7 +1202,7 @@
 
 	if( pObj && pModel)
 	{
-		Rectangle aRect( getLogicRectHack(pObj) );
+		Rectangle aRect( svx_getLogicRectHack(pObj) );
 		Size aLocalSize( rSize.Width, rSize.Height );
 		ForceMetricToItemPoolMetric(aLocalSize);
 		if(pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_MEASURE )
@@ -1213,7 +1215,7 @@
 		else
 		{
 			aRect.SetSize(aLocalSize);
-			setLogicRectHack( pObj, aRect );
+			svx_setLogicRectHack( pObj, aRect );
 		}
 
 		pModel->SetChanged();