removetooltypes01: Rebase to DEV300m99

1 files changed, 12 insertions, 0 deletions

diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 3f849e92b462..5e225e626175 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -367,6 +367,10 @@ namespace sdr { namespace contact {
         ::basegfx::B2DTuple aViewScale, aViewTranslate;
         double nViewRotate(0), nViewShearX(0);
         _rViewTransformation.decompose( aViewScale, aViewTranslate, nViewRotate, nViewShearX );
+
+        ::basegfx::B2DTuple aZoomScale, aZoomTranslate;
+        double nZoomRotate(0), nZoomShearX(0);
+        _rZoomLevelNormalization.decompose( aZoomScale, aZoomTranslate, nZoomRotate, nZoomShearX );
     #endif
 
         // transform the logic bound rect, using the view transformation, to pixel coordinates
@@ -979,6 +983,10 @@ namespace sdr { namespace contact {
         aScaleNormalization.set( 0, 0, (double)aCurrentDeviceMapMode.GetScaleX() );
         aScaleNormalization.set( 1, 1, (double)aCurrentDeviceMapMode.GetScaleY() );
         m_aZoomLevelNormalization *= aScaleNormalization;
+
+    #if OSL_DEBUG_LEVEL > 1
+        m_aZoomLevelNormalization.decompose( aScale, aTranslate, fRotate, fShearX );
+    #endif
    }
 
     //--------------------------------------------------------------------
@@ -1818,6 +1826,10 @@ namespace sdr { namespace contact {
             // disposed the control though it doesn't own it. So, /me thinks we should not bother here.
             return drawinglayer::primitive2d::Primitive2DSequence();
 
+        if ( GetObjectContact().getViewInformation2D().getViewTransformation().isIdentity() )
+            // remove this when #i115754# is fixed
+            return drawinglayer::primitive2d::Primitive2DSequence();
+
         // ignore existing controls which are in alive mode and manually switched to "invisible"
         // #102090# / 2009-06-05 / frank.schoenheit@sun.com
         const ControlHolder& rControl( m_pImpl->getExistentControl() );