cws impress190: merging

10 files changed, 311 insertions, 140 deletions

diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl
index 6d59511b75e0..89369160bb45 100644
--- a/svx/qa/unoapi/knownissues.xcl
+++ b/svx/qa/unoapi/knownissues.xcl
@@ -78,4 +78,10 @@ svx.GraphicExporter
 
 ### i98339 ###
 svx.AccessibleControlShape
-# -> disbaled in svx.sce
\ No newline at end of file
+# -> disbaled in svx.sce
+
+### i111114 ###
+svx.AccessiblePresentationOLEShape::com::sun::star::accessibility::XAccessibleComponent
+
+### i111169 ###
+svx.AccessiblePageShape::com::sun::star::accessibility::XAccessibleComponent
diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
index 84237f3c6f4b..82ee2ea6b193 100644
--- a/svx/qa/unoapi/svx.sce
+++ b/svx/qa/unoapi/svx.sce
@@ -1,11 +1,11 @@
 #i98339 -o svx.AccessibleControlShape
--o svx.AccessibleEditableTextPara
--o svx.AccessibleGraphicShape
+#i111278 -o svx.AccessibleEditableTextPara
+#i111252 -o svx.AccessibleGraphicShape
 #i46736 -o svx.AccessibleImageBullet
--o svx.AccessibleOLEShape
--o svx.AccessiblePageShape
--o svx.AccessiblePresentationGraphicShape
--o svx.AccessiblePresentationOLEShape
+#i111252 -o svx.AccessibleOLEShape
+#i111252 -o svx.AccessiblePageShape
+#i111216 -o svx.AccessiblePresentationGraphicShape
+#i111216 -o svx.AccessiblePresentationOLEShape
 #i85539 -o svx.AccessiblePresentationShape
 -o svx.AccessibleShape
 #i90294 -o svx.GraphicExporter
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 28ad49c6b65f..36490775cea1 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -468,6 +468,10 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
             const rtl::OUString sSwitched           ( RTL_CONSTASCII_USTRINGPARAM( "Switched" ) );
             const rtl::OUString sPolar              ( RTL_CONSTASCII_USTRINGPARAM( "Polar" ) );
 //          const rtl::OUString sMap                ( RTL_CONSTASCII_USTRINGPARAM( "Map" ) );
+            const rtl::OUString sRefX               ( RTL_CONSTASCII_USTRINGPARAM( "RefX" ) );
+            const rtl::OUString sRefY               ( RTL_CONSTASCII_USTRINGPARAM( "RefY" ) );
+            const rtl::OUString sRefAngle           ( RTL_CONSTASCII_USTRINGPARAM( "RefAngle" ) );
+            const rtl::OUString sRefR               ( RTL_CONSTASCII_USTRINGPARAM( "RefR" ) );
             const rtl::OUString sRadiusRangeMinimum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMinimum" ) );
             const rtl::OUString sRadiusRangeMaximum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMaximum" ) );
             const rtl::OUString sRangeXMinimum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMinimum" ) );
@@ -526,6 +530,26 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
                 }
             }
 */
+            else if ( rPropVal.Name.equals( sRefX ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefX )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFX;
+            }
+            else if ( rPropVal.Name.equals( sRefY ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefY )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFY;
+            }
+            else if ( rPropVal.Name.equals( sRefAngle ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefAngle )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFANGLE;
+            }
+            else if ( rPropVal.Name.equals( sRefR ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefR )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFR;
+            }
             else if ( rPropVal.Name.equals( sRadiusRangeMinimum ) )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aRadiusRangeMinimum )
@@ -1182,131 +1206,141 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
         Handle aHandle;
         if ( ConvertSequenceToEnhancedCustomShape2dHandle( seqHandles[ nIndex ], aHandle ) )
         {
-            sal_Bool bAdjFirst = aHandle.aPosition.First.Type == EnhancedCustomShapeParameterType::ADJUSTMENT;
-            sal_Bool bAdjSecond= aHandle.aPosition.Second.Type == EnhancedCustomShapeParameterType::ADJUSTMENT;
-            if ( bAdjFirst || bAdjSecond )
+            Point aP( rPosition.X, rPosition.Y );
+            // apply the negative object rotation to the controller position
+
+            aP.Move( -aLogicRect.Left(), -aLogicRect.Top() );
+            if ( bFlipH )
+                aP.X() = aLogicRect.GetWidth() - aP.X();
+            if ( bFlipV )
+                aP.Y() = aLogicRect.GetHeight() - aP.Y();
+            if ( nRotateAngle )
             {
-                Point aP( rPosition.X, rPosition.Y );
-                // apply the negative object rotation to the controller position
-
-                aP.Move( -aLogicRect.Left(), -aLogicRect.Top() );
-                if ( bFlipH )
-                    aP.X() = aLogicRect.GetWidth() - aP.X();
-                if ( bFlipV )
-                    aP.Y() = aLogicRect.GetHeight() - aP.Y();
-                if ( nRotateAngle )
-                {
-                    double a = -nRotateAngle * F_PI18000;
-                    RotatePoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), sin( a ), cos( a ) );
-                }
-                const GeoStat aGeoStat( ((SdrObjCustomShape*)pCustomShapeObj)->GetGeoStat() );
-                if ( aGeoStat.nShearWink )
-                {
-                    double nTan = -aGeoStat.nTan;
-                    if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV))
-                        nTan = -nTan;
-                    ShearPoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), nTan );
-                }
+                double a = -nRotateAngle * F_PI18000;
+                RotatePoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), sin( a ), cos( a ) );
+            }
+            const GeoStat aGeoStat( ((SdrObjCustomShape*)pCustomShapeObj)->GetGeoStat() );
+            if ( aGeoStat.nShearWink )
+            {
+                double nTan = -aGeoStat.nTan;
+                if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV))
+                    nTan = -nTan;
+                ShearPoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), nTan );
+            }
 
-                double fPos1 = aP.X();  //( bFlipH ) ? aLogicRect.GetWidth() - aP.X() : aP.X();
-                double fPos2 = aP.Y();  //( bFlipV ) ? aLogicRect.GetHeight() -aP.Y() : aP.Y();
-                fPos1 /= fXScale;
-                fPos2 /= fYScale;
+            double fPos1 = aP.X();  //( bFlipH ) ? aLogicRect.GetWidth() - aP.X() : aP.X();
+            double fPos2 = aP.Y();  //( bFlipV ) ? aLogicRect.GetHeight() -aP.Y() : aP.Y();
+            fPos1 /= fXScale;
+            fPos2 /= fYScale;
 
-                if ( aHandle.nFlags & HANDLE_FLAGS_SWITCHED )
+            if ( aHandle.nFlags & HANDLE_FLAGS_SWITCHED )
+            {
+                if ( aLogicRect.GetHeight() > aLogicRect.GetWidth() )
                 {
-                    if ( aLogicRect.GetHeight() > aLogicRect.GetWidth() )
-                    {
-                        double fX = fPos1;
-                        double fY = fPos2;
-                        fPos1 = fY;
-                        fPos2 = fX;
-                    }
+                    double fX = fPos1;
+                    double fY = fPos2;
+                    fPos1 = fY;
+                    fPos2 = fX;
                 }
+            }
 
-                sal_Int32 nFirstAdjustmentValue = 0, nSecondAdjustmentValue = 0;
+            sal_Int32 nFirstAdjustmentValue = -1, nSecondAdjustmentValue = -1;
+
+            if ( aHandle.aPosition.First.Type == EnhancedCustomShapeParameterType::ADJUSTMENT )
                 aHandle.aPosition.First.Value >>= nFirstAdjustmentValue;
+            if ( aHandle.aPosition.Second.Type == EnhancedCustomShapeParameterType::ADJUSTMENT )
                 aHandle.aPosition.Second.Value>>= nSecondAdjustmentValue;
 
-                if ( aHandle.nFlags & HANDLE_FLAGS_POLAR )
+            if ( aHandle.nFlags & HANDLE_FLAGS_POLAR )
+            {
+                double fXRef, fYRef, fAngle;
+                GetParameter( fXRef, aHandle.aPolar.First, sal_False, sal_False );
+                GetParameter( fYRef, aHandle.aPolar.Second, sal_False, sal_False );
+                const double fDX = fPos1 - fXRef;
+                fAngle = -( atan2( -fPos2 + fYRef, ( ( fDX == 0.0L ) ? 0.000000001 : fDX ) ) / F_PI180 );
+                double fX = ( fPos1 - fXRef );
+                double fY = ( fPos2 - fYRef );
+                double fRadius = sqrt( fX * fX + fY * fY );
+                if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MINIMUM )
+                {
+                    double fMin;
+                    GetParameter( fMin,  aHandle.aRadiusRangeMinimum, sal_False, sal_False );
+                    if ( fRadius < fMin )
+                        fRadius = fMin;
+                }
+                if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM )
+                {
+                    double fMax;
+                    GetParameter( fMax, aHandle.aRadiusRangeMaximum, sal_False, sal_False );
+                    if ( fRadius > fMax )
+                        fRadius = fMax;
+                }
+                if ( nFirstAdjustmentValue >= 0 )
+                    SetAdjustValueAsDouble( fRadius, nFirstAdjustmentValue );
+                if ( nSecondAdjustmentValue >= 0 )
+                    SetAdjustValueAsDouble( fAngle,  nSecondAdjustmentValue );
+            }
+            else
+            {
+                if ( aHandle.nFlags & HANDLE_FLAGS_REFX )
+                {
+                    nFirstAdjustmentValue = aHandle.nRefX;
+                    fPos1 *= 100000.0;
+                    fPos1 /= nCoordWidth;
+                }
+                if ( aHandle.nFlags & HANDLE_FLAGS_REFY )
                 {
-                    double fXRef, fYRef, fAngle;
-                    GetParameter( fXRef, aHandle.aPolar.First, sal_False, sal_False );
-                    GetParameter( fYRef, aHandle.aPolar.Second, sal_False, sal_False );
-                    const double fDX = fPos1 - fXRef;
-                    fAngle = -( atan2( -fPos2 + fYRef, ( ( fDX == 0.0L ) ? 0.000000001 : fDX ) ) / F_PI180 );
-                    double fX = ( fPos1 - fXRef );
-                    double fY = ( fPos2 - fYRef );
-                    double fRadius = sqrt( fX * fX + fY * fY );
-                    if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MINIMUM )
+                    nSecondAdjustmentValue = aHandle.nRefY;
+                    fPos2 *= 100000.0;
+                    fPos2 /= nCoordHeight;
+                }
+                if ( nFirstAdjustmentValue >= 0 )
+                {
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MINIMUM )        // check if horizontal handle needs to be within a range
                     {
-                        double fMin;
-                        GetParameter( fMin,  aHandle.aRadiusRangeMinimum, sal_False, sal_False );
-                        if ( fRadius < fMin )
-                            fRadius = fMin;
+                        double fXMin;
+                        GetParameter( fXMin, aHandle.aXRangeMinimum, sal_False, sal_False );
+                        if ( fPos1 < fXMin )
+                            fPos1 = fXMin;
                     }
-                    if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM )
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MAXIMUM )        // check if horizontal handle needs to be within a range
                     {
-                        double fMax;
-                        GetParameter( fMax, aHandle.aRadiusRangeMaximum, sal_False, sal_False );
-                        if ( fRadius > fMax )
-                            fRadius = fMax;
+                        double fXMax;
+                        GetParameter( fXMax, aHandle.aXRangeMaximum, sal_False, sal_False );
+                        if ( fPos1 > fXMax )
+                            fPos1 = fXMax;
                     }
-                    if ( bAdjFirst )
-                        SetAdjustValueAsDouble( fRadius, nFirstAdjustmentValue );
-                    if ( bAdjSecond )
-                        SetAdjustValueAsDouble( fAngle,  nSecondAdjustmentValue );
+                    SetAdjustValueAsDouble( fPos1, nFirstAdjustmentValue );
                 }
-                else
+                if ( nSecondAdjustmentValue >= 0 )
                 {
-                    if ( bAdjFirst )
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MINIMUM )        // check if vertical handle needs to be within a range
                     {
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MINIMUM )        // check if horizontal handle needs to be within a range
-                        {
-                            double fXMin;
-                            GetParameter( fXMin, aHandle.aXRangeMinimum, sal_False, sal_False );
-                            if ( fPos1 < fXMin )
-                                fPos1 = fXMin;
-                        }
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MAXIMUM )        // check if horizontal handle needs to be within a range
-                        {
-                            double fXMax;
-                            GetParameter( fXMax, aHandle.aXRangeMaximum, sal_False, sal_False );
-                            if ( fPos1 > fXMax )
-                                fPos1 = fXMax;
-                        }
-                        SetAdjustValueAsDouble( fPos1, nFirstAdjustmentValue );
+                        double fYMin;
+                        GetParameter( fYMin, aHandle.aYRangeMinimum, sal_False, sal_False );
+                        if ( fPos2 < fYMin )
+                            fPos2 = fYMin;
                     }
-                    if ( bAdjSecond )
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MAXIMUM )        // check if vertical handle needs to be within a range
                     {
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MINIMUM )        // check if vertical handle needs to be within a range
-                        {
-                            double fYMin;
-                            GetParameter( fYMin, aHandle.aYRangeMinimum, sal_False, sal_False );
-                            if ( fPos2 < fYMin )
-                                fPos2 = fYMin;
-                        }
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MAXIMUM )        // check if vertical handle needs to be within a range
-                        {
-                            double fYMax;
-                            GetParameter( fYMax, aHandle.aYRangeMaximum, sal_False, sal_False );
-                            if ( fPos2 > fYMax )
-                                fPos2 = fYMax;
-                        }
-                        SetAdjustValueAsDouble( fPos2, nSecondAdjustmentValue );
+                        double fYMax;
+                        GetParameter( fYMax, aHandle.aYRangeMaximum, sal_False, sal_False );
+                        if ( fPos2 > fYMax )
+                            fPos2 = fYMax;
                     }
+                    SetAdjustValueAsDouble( fPos2, nSecondAdjustmentValue );
                 }
-                // and writing them back into the GeometryItem
-                SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)
-                    (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
-                const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
-                com::sun::star::beans::PropertyValue aPropVal;
-                aPropVal.Name = sAdjustmentValues;
-                aPropVal.Value <<= seqAdjustmentValues;
-                aGeometryItem.SetPropertyValue( aPropVal );
-                pCustomShapeObj->SetMergedItem( aGeometryItem );
-                bRetValue = sal_True;
             }
+            // and writing them back into the GeometryItem
+            SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)
+                (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
+            const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
+            com::sun::star::beans::PropertyValue aPropVal;
+            aPropVal.Name = sAdjustmentValues;
+            aPropVal.Value <<= seqAdjustmentValues;
+            aGeometryItem.SetPropertyValue( aPropVal );
+            pCustomShapeObj->SetMergedItem( aGeometryItem );
+            bRetValue = sal_True;
         }
     }
     return bRetValue;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index 00df4b04f389..b3b944513e60 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -67,6 +67,10 @@ class SvxMSDffAdjustmentHandle;
 #define HANDLE_FLAGS_RANGE_Y_MAXIMUM        0x0100
 #define HANDLE_FLAGS_RADIUS_RANGE_MINIMUM   0x0200
 #define HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM   0x0400
+#define HANDLE_FLAGS_REFX                   0x0800
+#define HANDLE_FLAGS_REFY                   0x1000
+#define HANDLE_FLAGS_REFANGLE               0x2000
+#define HANDLE_FLAGS_REFR                   0x4000
 
 // MSDFF_HANDLE_FLAGS_RANGE_Y seems to be not defined in
 // escher, but we are using it internally in to differentiate
@@ -145,12 +149,20 @@ class EnhancedCustomShape2d : public SfxItemSet
             com::sun::star::drawing::EnhancedCustomShapeParameterPair   aPosition;
             com::sun::star::drawing::EnhancedCustomShapeParameterPair   aPolar;
 
+            sal_Int32   nRefX;
+            sal_Int32   nRefY;
+            sal_Int32   nRefAngle;
+            sal_Int32   nRefR;
+
             com::sun::star::drawing::EnhancedCustomShapeParameter       aRadiusRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter       aRadiusRangeMaximum;
             com::sun::star::drawing::EnhancedCustomShapeParameter       aXRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter       aXRangeMaximum;
             com::sun::star::drawing::EnhancedCustomShapeParameter       aYRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter       aYRangeMaximum;
+
+            Handle() : bMirroredX ( sal_False ), bMirroredY ( sal_False ), bSwitched( sal_False ),
+                nRefX( -1 ), nRefY( -1 ), nRefAngle( -1 ), nRefR( -1 ) {};
         };
 
         sal_Bool                    IsFlipVert() { return bFlipV; };
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 5f3aa24394a3..01dc2c0591cc 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -831,6 +831,18 @@ void SvxSearchDialog::CalculateDelta_Impl()
         pMoreBtn->AddWindow( &aNoFormatBtn );
     }
 
+    if (bDrawApp || bImpressApp)
+    {
+        // "Find All" button is hidden--align "Find" vertically to the
+        // search listbox
+        Point aNewPt(aSearchBtn.GetPosPixel());
+        const Size aBtnSz(aSearchBtn.GetSizePixel());
+        const Size aLBSz(aSearchLB.GetSizePixel());
+        const int nOff((aLBSz.Height() - aBtnSz.Height()) / 2);
+        aNewPt.Y() = aSearchLB.GetPosPixel().Y() + nOff;
+        aSearchBtn.SetPosPixel(aNewPt);
+    }
+
     if ( bDrawApp )
     {
         // Draw App: "Regular expressions" and "Search for Styles" check boxes are hidden
@@ -1016,6 +1028,8 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
         if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_DRAW )
         {
+            aSearchAllBtn.Hide();
+
             aRegExpBtn.Hide();
             aLayoutBtn.Hide();
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index e22ee66e0ea2..e02e8664c6ac 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3683,11 +3683,8 @@ namespace svxform
         m_aURLED.DisableHistory();
         m_aFilePickerBtn.SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
 
-        // load the filter name from svtools resource
-        ByteString aResMgrName( "svt" );
-        ResMgr* pSvtResMgr = ResMgr::CreateResMgr(
-            aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-        m_sAllFilterName = String( ResId( STR_FILTERNAME_ALL, *pSvtResMgr ) );
+        // load the filter name from fps_office resource
+        m_sAllFilterName = String( ResId( STR_FILTERNAME_ALL, *CREATEVERSIONRESMGR(fps_office) ) );
     }
 
     AddInstanceDialog::~AddInstanceDialog()
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index ba7ba492c2fb..e6559850ea5d 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -90,25 +90,7 @@ class ScriptEventListenerWrapper : public ScriptEventListener_BASE
 public:
     ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) : pModel(&_rModel)
     {
-        Reference < XPropertySet > xProps(
-            ::comphelper::getProcessServiceFactory(), UNO_QUERY );
-        if ( xProps.is() )
-        {
-            Reference< XComponentContext > xCtx( xProps->getPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
-            if ( xCtx.is() )
-            {
-                Reference< XMultiComponentFactory > xMFac(
-                    xCtx->getServiceManager(), UNO_QUERY );
-                if ( xMFac.is() )
-                {
-                    m_vbaListener.set( xMFac->createInstanceWithContext(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "ooo.vba.EventListener"  ) ), xCtx ),
-                                UNO_QUERY_THROW );
-                }
-            }
-        }
+
     }
     // XEventListener
     virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException ){}
@@ -136,6 +118,33 @@ public:
 private:
     void setModel()
     {
+        if ( !m_vbaListener.is() )
+                {
+            Reference < XPropertySet > xProps(
+            ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+            if ( xProps.is() )
+            {
+                Reference< XComponentContext > xCtx( xProps->getPropertyValue(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
+                if ( xCtx.is() )
+                {
+                    Reference< XMultiComponentFactory > xMFac(
+                    xCtx->getServiceManager(), UNO_QUERY );
+                    SfxObjectShellRef xObjSh = pModel->GetObjectShell();
+                    Reference< XMultiServiceFactory > xDocFac;
+                    if ( xObjSh.Is() )
+                        xDocFac.set( xObjSh->GetModel(), UNO_QUERY );
+
+                    if ( xMFac.is() )
+                    {
+                        m_vbaListener.set( xMFac->createInstanceWithContext(
+                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                                "ooo.vba.EventListener"  ) ), xCtx ),
+                                    UNO_QUERY_THROW );
+                    }
+                }
+            }
+        }
         Reference< XPropertySet > xProps( m_vbaListener, UNO_QUERY );
         if ( xProps.is() )
         {
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 5abd9c4b26f1..0f3325a0027e 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -259,6 +259,8 @@ namespace sdr
 
         void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel)
         {
+            OSL_ASSERT(pNewModel!=NULL);
+
             if(pSrcPool && pDestPool && (pSrcPool != pDestPool))
             {
                 if(mpItemSet)
@@ -291,8 +293,24 @@ namespace sdr
                         }
                         else
                         {
-                            // StyleSheet is NOT from the correct pool; use default
-                            ImpAddStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True);
+                            // StyleSheet is NOT from the correct pool.
+                            // Look one up in the right pool with the same
+                            // name or use the default.
+
+                            // Look up the style in the new document.
+                            OSL_ASSERT(pNewModel->GetStyleSheetPool() != NULL);
+                            SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>(
+                                pNewModel->GetStyleSheetPool()->Find(
+                                    pStySheet->GetName(),
+                                    SFX_STYLE_FAMILY_ALL));
+                            if (pNewStyleSheet == NULL
+                                || &pNewStyleSheet->GetPool().GetPool() != pDestPool)
+                            {
+                                // There is no copy of the style in the new
+                                // document.  Use the default as a fallback.
+                                pNewStyleSheet = pNewModel->GetDefaultStyleSheet();
+                            }
+                            ImpAddStyleSheet(pNewStyleSheet, sal_True);
                         }
                     }
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 58e0b7bdb425..6ab27c85aaf0 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -700,7 +700,10 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
         for ( i = 0; i < nCount; i++ )
         {
             if ( seqAdjustmentValues[ i ].State != com::sun::star::beans::PropertyState_DIRECT_VALUE )
+            {
                 seqAdjustmentValues[ i ].Value <<= pDefData[ i ];
+                seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
+            }
         }
     }
     aPropVal.Name = sAdjustmentValues;
@@ -2075,7 +2078,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                     sal_Int32 nXDiff = aBoundRect.Left() - aRect.Left();
                     sal_Int32 nYDiff = aBoundRect.Top() - aRect.Top();
 
-                    if (nShearWink&&(bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX))
+                    if (nShearWink&&((bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX)))
                     {
                         nShearWink = -nShearWink;
                         fTan = -fTan;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 1e79962736aa..13b8e758ce12 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -577,6 +577,37 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw()
 }
 
 //----------------------------------------------------------------------
+// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
+{
+    DBG_TESTSOLARMUTEX();
+    if(mpModel)
+    {
+        SfxMapUnit eMapUnit = mpModel->GetItemPool().GetMetric(0);
+        if(eMapUnit != SFX_MAPUNIT_100TH_MM)
+        {
+            switch(eMapUnit)
+            {
+                case SFX_MAPUNIT_TWIP :
+                {
+                    basegfx::B2DHomMatrix aTransform;
+                    const double fMMToTWIPS(72.0 / 127.0);
+
+                    aTransform.scale(fMMToTWIPS, fMMToTWIPS);
+                    rPolyPolygon.transform(aTransform);
+                    break;
+                }
+                default:
+                {
+                    DBG_ERROR("Missing unit translation to PoolMetric!");
+                }
+            }
+        }
+    }
+}
+// <--
+
+//----------------------------------------------------------------------
 void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 {
     DBG_TESTSOLARMUTEX();
@@ -604,6 +635,38 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 }
 
 //----------------------------------------------------------------------
+// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
+{
+    DBG_TESTSOLARMUTEX();
+    SfxMapUnit eMapUnit = SFX_MAPUNIT_100TH_MM;
+    if(mpModel)
+    {
+        eMapUnit = mpModel->GetItemPool().GetMetric(0);
+        if(eMapUnit != SFX_MAPUNIT_100TH_MM)
+        {
+            switch(eMapUnit)
+            {
+                case SFX_MAPUNIT_TWIP :
+                {
+                    basegfx::B2DHomMatrix aTransform;
+                    const double fTWIPSToMM(127.0 / 72.0);
+                    aTransform.scale(fTWIPSToMM, fTWIPSToMM);
+                    rPolyPolygon.transform(aTransform);
+                    break;
+                }
+                default:
+                {
+                    DBG_ERROR("Missing unit translation to 100th mm!");
+                }
+            }
+        }
+    }
+}
+// <--
+//----------------------------------------------------------------------
+
+
 //----------------------------------------------------------------------
 void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
   SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap )
@@ -635,7 +698,6 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
                         {
                             if(rSet.GetPool()->IsWhich(pEntry->nWID))
                                 rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
-
                             // setzen
                             SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
                         }
@@ -650,7 +712,6 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
 }
 
 
-
 void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
 {
     DBG_TESTSOLARMUTEX();
@@ -2505,10 +2566,15 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     if( rValue >>= aUnoPoint )
                     {
                         Point aPoint( aUnoPoint.X, aUnoPoint.Y );
+
+                        // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+                        // perform metric change before applying anchor position,
+                        // because the anchor position is in pool metric.
+                        ForceMetricToItemPoolMetric( aPoint );
+                        // <--
                         if( mpModel->IsWriter() )
                             aPoint += mpObj->GetAnchorPos();
 
-                        ForceMetricToItemPoolMetric( aPoint );
                         pEdgeObj->SetTailPoint( pProperty->nWID == OWN_ATTR_EDGE_START_POS, aPoint );
                         return true;
                     }
@@ -2532,6 +2598,9 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     if ( rValue >>= aPolyPoly )
                     {
                         basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) );
+                        // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+                        ForceMetricToItemPoolMetric( aNewPolyPolygon );
+                        // <--
                         if( mpModel->IsWriter() )
                         {
                             Point aPoint( mpObj->GetAnchorPos() );
@@ -2554,6 +2623,9 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         {
             Point aPoint( aUnoPoint.X, aUnoPoint.Y );
 
+            // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+            ForceMetricToItemPoolMetric( aPoint );
+            // <--
             if( mpModel->IsWriter() )
                 aPoint += mpObj->GetAnchorPos();
 
@@ -2970,6 +3042,9 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                         Point aPoint( mpObj->GetAnchorPos() );
                         aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y()));
                     }
+                    // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051
+                    ForceMetricTo100th_mm( aPolyPoly );
+                    // <--
                     drawing::PolyPolygonBezierCoords aRetval;
                     SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
                     rValue <<= aRetval;
@@ -2990,6 +3065,9 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             if( mpModel->IsWriter() )
                 aPoint -= mpObj->GetAnchorPos();
 
+            // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051
+            ForceMetricTo100th_mm( aPoint );
+            // <--
             awt::Point aUnoPoint( aPoint.X(), aPoint.Y() );
 
             rValue <<= aUnoPoint;