CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 89 insertions, 30 deletions

diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 5287653bd367..e6930edeba95 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -30,42 +30,61 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <vcl/event.hxx>
 #include <vcl/imgctrl.hxx>
 
+#include <com/sun/star/awt/ImageScaleMode.hdl>
+
+namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
+
 // -----------------------------------------------------------------------
 
 ImageControl::ImageControl( Window* pParent, WinBits nStyle ) :
     FixedImage( pParent, nStyle )
 {
-    mbScaleImage = TRUE;
+    mnScaleMode = ImageScaleMode::Anisotropic;
 }
 
 // -----------------------------------------------------------------------
 
-void ImageControl::SetScaleImage( BOOL bScale )
+void ImageControl::SetScaleMode( const ::sal_Int16 _nMode )
 {
-    if ( bScale != mbScaleImage )
+    if ( _nMode != mnScaleMode )
     {
-        mbScaleImage = bScale;
+        mnScaleMode = _nMode;
         Invalidate();
     }
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImageControl::IsScaleImage() const
+void ImageControl::Resize()
 {
-    // Make inline when changing member from dummy...
-    return mbScaleImage;
+    Invalidate();
 }
 
-
 // -----------------------------------------------------------------------
-
-void ImageControl::Resize()
+namespace
 {
-    Invalidate();
+    static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& _rBitmapSize )
+    {
+        const Size aPaintSize = _rPaintRect.GetSize();
+
+        const double nRatioX = 1.0 * aPaintSize.Width() / _rBitmapSize.Width();
+        const double nRatioY = 1.0 * aPaintSize.Height() / _rBitmapSize.Height();
+        const double nRatioMin = ::std::min( nRatioX, nRatioY );
+
+        return Size( long( _rBitmapSize.Width() * nRatioMin ), long( _rBitmapSize.Height() * nRatioMin ) );
+    }
+
+    static Point lcl_centerWithin( const Rectangle& _rArea, const Size& _rObjectSize )
+    {
+        Point aPos( _rArea.TopLeft() );
+        aPos.X() += ( _rArea.GetWidth() - _rObjectSize.Width() ) / 2;
+        aPos.Y() += ( _rArea.GetHeight() - _rObjectSize.Height() ) / 2;
+        return aPos;
+    }
 }
 
 // -----------------------------------------------------------------------
@@ -84,42 +103,82 @@ void ImageControl::UserDraw( const UserDrawEvent& rUDEvt )
         //  nStyle |= IMAGE_DRAW_COLORTRANSFORM;
     }
 
+    const Rectangle& rPaintRect = rUDEvt.GetRect();
+    const Size&      rBitmapSize = maBmp.GetSizePixel();
+
     if( nStyle & IMAGE_DRAW_COLORTRANSFORM )
     {
         // only images support IMAGE_DRAW_COLORTRANSFORM
         Image aImage( maBmp );
         if ( !!aImage )
         {
-            if ( mbScaleImage )
-                rUDEvt.GetDevice()->DrawImage( rUDEvt.GetRect().TopLeft(),
-                                                rUDEvt.GetRect().GetSize(),
-                                                aImage, nStyle );
-            else
+            switch ( mnScaleMode )
             {
-                // Center...
-                Point aPos( rUDEvt.GetRect().TopLeft() );
-                aPos.X() += ( rUDEvt.GetRect().GetWidth() - maBmp.GetSizePixel().Width() ) / 2;
-                aPos.Y() += ( rUDEvt.GetRect().GetHeight() - maBmp.GetSizePixel().Height() ) / 2;
-                rUDEvt.GetDevice()->DrawImage( aPos, aImage, nStyle );
+            case ImageScaleMode::None:
+            {
+                rUDEvt.GetDevice()->DrawImage(
+                    lcl_centerWithin( rPaintRect, rBitmapSize ), aImage, nStyle );
             }
+            break;
+
+            case ImageScaleMode::Isotropic:
+            {
+                const Size aPaintSize = lcl_calcPaintSize( rPaintRect, rBitmapSize );
+                rUDEvt.GetDevice()->DrawImage(
+                    lcl_centerWithin( rPaintRect, aPaintSize ),
+                    aPaintSize,
+                    aImage, nStyle );
+            }
+            break;
+
+            case ImageScaleMode::Anisotropic:
+            {
+                rUDEvt.GetDevice()->DrawImage(
+                    rPaintRect.TopLeft(),
+                    rPaintRect.GetSize(),
+                    aImage, nStyle );
+            }
+            break;
+
+            default:
+                OSL_ENSURE( false, "ImageControl::UserDraw: unhandled scale mode!" );
+                break;
+
+            }   // switch ( mnScaleMode )
         }
     }
     else
     {
-        if ( mbScaleImage )
+        switch ( mnScaleMode )
         {
+        case ImageScaleMode::None:
+        {
+            maBmp.Draw( rUDEvt.GetDevice(), lcl_centerWithin( rPaintRect, rBitmapSize ) );
+        }
+        break;
+
+        case ImageScaleMode::Isotropic:
+        {
+            const Size aPaintSize = lcl_calcPaintSize( rPaintRect, rBitmapSize );
             maBmp.Draw( rUDEvt.GetDevice(),
-                        rUDEvt.GetRect().TopLeft(),
-                        rUDEvt.GetRect().GetSize() );
+                        lcl_centerWithin( rPaintRect, aPaintSize ),
+                        aPaintSize );
         }
-        else
+        break;
+
+        case ImageScaleMode::Anisotropic:
         {
-            // Center...
-            Point aPos( rUDEvt.GetRect().TopLeft() );
-            aPos.X() += ( rUDEvt.GetRect().GetWidth() - maBmp.GetSizePixel().Width() ) / 2;
-            aPos.Y() += ( rUDEvt.GetRect().GetHeight() - maBmp.GetSizePixel().Height() ) / 2;
-            maBmp.Draw( rUDEvt.GetDevice(), aPos );
+            maBmp.Draw( rUDEvt.GetDevice(),
+                        rPaintRect.TopLeft(),
+                        rPaintRect.GetSize() );
         }
+        break;
+
+        default:
+                OSL_ENSURE( false, "ImageControl::UserDraw: unhandled scale mode!" );
+            break;
+
+        }   // switch ( mnScaleMode )
     }
 }