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

8 files changed, 149 insertions, 40 deletions

diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 0c4f2e6962a6..97ba5fb045b6 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/awt/XCurrencyField.hpp>
 #include <com/sun/star/awt/XPatternField.hpp>
 #include <com/sun/star/awt/XProgressBar.hpp>
+#include <com/sun/star/graphic/XGraphicObject.hpp>
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/helper/macros.hxx>
@@ -67,6 +68,9 @@
 
 #include <list>
 
+#define UNO_NAME_GRAPHOBJ_URLPREFIX                             "vnd.sun.star.GraphicObject:"
+#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX                  "vnd.sun.star.Package:"
+
 
 //  ----------------------------------------------------
 //  class UnoControlEditModel
@@ -220,6 +224,8 @@ private:
     bool                                                                                    mbAdjustingImagePosition;
     bool                                                                                    mbAdjustingGraphic;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
+    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
 protected:
     ImageProducerControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
     ImageProducerControlModel( const ImageProducerControlModel& _rSource ) : com::sun::star::awt::XImageProducer(), UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
@@ -346,6 +352,8 @@ public:
 //  ----------------------------------------------------
 class UnoControlImageControlModel : public ImageProducerControlModel
 {
+private:
+    bool    mbAdjustingImageScaleMode;
 
 protected:
     ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
@@ -353,7 +361,7 @@ protected:
 
 public:
                                     UnoControlImageControlModel();
-                                    UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : ImageProducerControlModel( rModel ) {;}
+                                    UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : ImageProducerControlModel( rModel ), mbAdjustingImageScaleMode( false ) { }
 
     UnoControlModel*    Clone() const { return new UnoControlImageControlModel( *this ); }
 
@@ -365,6 +373,9 @@ public:
 
     // ::com::sun::star::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, ImageProducerControlModel, szServiceName2_UnoControlImageControlModel )
+
+    // ::cppu::OPropertySetHelper
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
 };
 
 //  ----------------------------------------------------
diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index 5e30558a3ee6..ef2f06ba12af 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -188,6 +188,7 @@ namespace rtl {
 #define BASEPROPERTY_URL                            134  // ::rtl::OUString
 #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
 #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
+#define BASEPROPERTY_IMAGE_SCALE_MODE               137
 
 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
 #define BASEPROPERTY_FONTDESCRIPTORPART_START           1000
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 80937076a5ea..8cb7ed60f2a4 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -146,6 +146,27 @@ TOOLKIT_DLLPUBLIC WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt
         bMessBox = sal_True;
     }
 
+    bool bDecoratedWindow = false;
+    if  (   bMessBox
+        ||  ( nCompType == WINDOW_DIALOG )
+        ||  ( nCompType == WINDOW_MODELESSDIALOG )
+        ||  ( nCompType == WINDOW_MODALDIALOG )
+        ||  ( nCompType == WINDOW_SYSTEMDIALOG )
+        ||  ( nCompType == WINDOW_PATHDIALOG )
+        ||  ( nCompType == WINDOW_FILEDIALOG )
+        ||  ( nCompType == WINDOW_PRINTERSETUPDIALOG )
+        ||  ( nCompType == WINDOW_PRINTDIALOG )
+        ||  ( nCompType == WINDOW_COLORDIALOG )
+        ||  ( nCompType == WINDOW_FONTDIALOG )
+        ||  ( nCompType == WINDOW_DOCKINGWINDOW )
+        ||  ( nCompType == WINDOW_TABDIALOG )
+        ||  ( nCompType == WINDOW_BUTTONDIALOG )
+        ||  ( nCompType == WINDOW_SYSTEMCHILDWINDOW )
+        )
+    {
+        bDecoratedWindow = true;
+    }
+
     if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::BORDER )
         nWinBits |= WB_BORDER;
     if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::NOBORDER )
@@ -216,15 +237,18 @@ TOOLKIT_DLLPUBLIC WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt
     }
 
 
-    if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::NODECORATION )
+    if ( bDecoratedWindow )
     {
-        // No decoration removes several window attributes and must
-        // set WB_NOBODER!
-        nWinBits &= ~WB_BORDER;
-        nWinBits &= ~WB_SIZEABLE;
-        nWinBits &= ~WB_MOVEABLE;
-        nWinBits &= ~WB_CLOSEABLE;
-        nWinBits |= WB_NOBORDER;
+        if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::NODECORATION )
+        {
+            // No decoration removes several window attributes and must
+            // set WB_NOBORDER!
+            nWinBits &= ~WB_BORDER;
+            nWinBits &= ~WB_SIZEABLE;
+            nWinBits &= ~WB_MOVEABLE;
+            nWinBits &= ~WB_CLOSEABLE;
+            nWinBits |= WB_NOBORDER;
+        }
     }
 
     return nWinBits;
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 06e41611f793..23b59f37f56f 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <comphelper/processfactory.hxx>
 
 #ifndef _SV_BUTTON_HXX
@@ -69,6 +70,7 @@ using ::com::sun::star::graphic::XGraphic;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt::VisualEffect;
+namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
 
 static double ImplCalcLongValue( double nValue, sal_uInt16 nDigits )
 {
@@ -663,6 +665,7 @@ void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_IMAGEURL,
                      BASEPROPERTY_PRINTABLE,
                      BASEPROPERTY_SCALEIMAGE,
+                     BASEPROPERTY_IMAGE_SCALE_MODE,
                      BASEPROPERTY_TABSTOP,
                      0);
     VCLXImageConsumer::ImplGetPropertyIds( rIds );
@@ -716,22 +719,34 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const :
     ::vos::OGuard aGuard( GetMutex() );
 
     ImageControl* pImageControl = (ImageControl*)GetWindow();
-    if ( pImageControl )
+
+    sal_uInt16 nPropType = GetPropertyId( PropertyName );
+    switch ( nPropType )
     {
-        sal_uInt16 nPropType = GetPropertyId( PropertyName );
-        switch ( nPropType )
+        case BASEPROPERTY_IMAGE_SCALE_MODE:
         {
-            case BASEPROPERTY_SCALEIMAGE:
+            sal_Int16 nScaleMode( ImageScaleMode::Anisotropic );
+            if ( pImageControl && ( Value >>= nScaleMode ) )
             {
-                sal_Bool b = sal_Bool();
-                if ( Value >>= b )
-                     pImageControl->SetScaleImage( b );
+                pImageControl->SetScaleMode( nScaleMode );
             }
-            break;
-            default:
-                VCLXImageConsumer::setProperty( PropertyName, Value );
-                break;
         }
+        break;
+
+        case BASEPROPERTY_SCALEIMAGE:
+        {
+            // this is for compatibility only, nowadays, the ImageScaleMode property should be used
+            sal_Bool bScaleImage = sal_False;
+            if ( pImageControl && ( Value >>= bScaleImage ) )
+            {
+                pImageControl->SetScaleMode( bScaleImage ? ImageScaleMode::Anisotropic : ImageScaleMode::None );
+            }
+        }
+        break;
+
+        default:
+            VCLXImageConsumer::setProperty( PropertyName, Value );
+            break;
     }
 }
 
@@ -741,18 +756,21 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const :
 
     ::com::sun::star::uno::Any aProp;
     ImageControl* pImageControl = (ImageControl*)GetWindow();
-    if ( pImageControl )
+    sal_uInt16 nPropType = GetPropertyId( PropertyName );
+
+    switch ( nPropType )
     {
-        sal_uInt16 nPropType = GetPropertyId( PropertyName );
-        switch ( nPropType )
-        {
-            case BASEPROPERTY_SCALEIMAGE:
-                 aProp <<= (sal_Bool)pImageControl->IsScaleImage();
-                break;
-            default:
-                aProp = VCLXImageConsumer::getProperty( PropertyName );
-                break;
-        }
+        case BASEPROPERTY_IMAGE_SCALE_MODE:
+            aProp <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::Anisotropic );
+            break;
+
+        case BASEPROPERTY_SCALEIMAGE:
+            aProp <<= ( pImageControl && pImageControl->GetScaleMode() != ImageScaleMode::None ) ? sal_True : sal_False;
+            break;
+
+        default:
+            aProp = VCLXImageConsumer::getProperty( PropertyName );
+            break;
     }
     return aProp;
 }
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index e9327d82a7b0..74846ed7071d 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -308,7 +308,6 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
             case BASEPROPERTY_REPEAT_DELAY:         aDefault <<= (sal_Int32)  50;   break;    // 50 milliseconds
             case BASEPROPERTY_DEFAULTCONTROL:       aDefault <<= ((UnoControlModel*)this)->getServiceName();    break;
 
-
             case BASEPROPERTY_AUTOHSCROLL:
             case BASEPROPERTY_AUTOVSCROLL:
             case BASEPROPERTY_MOVEABLE:
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index a269b6183ea1..40536a66d124 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -37,7 +37,9 @@
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/graphic/GraphicObject.hpp>
 #include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/awt/ImageScaleMode.hpp>
 
 
 #include <toolkit/controls/formattedcontrol.hxx>
@@ -576,11 +578,21 @@ uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) co
 
     return UnoControlModel::ImplGetDefaultValue( nPropId );
 }
-namespace
-{
-    uno::Reference< graphic::XGraphic > lcl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
+    uno::Reference< graphic::XGraphic > ImageProducerControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
     {
         uno::Reference< graphic::XGraphic > xGraphic;
+
+        if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) )
+        {
+            // graphic manager uniqueid
+            rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
+            // get the DefaultContext
+            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+            mxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
+        }
+        else // linked
+            mxGrfObj = NULL; // release the GraphicObject
+
         if ( !_rURL.getLength() )
             return xGraphic;
 
@@ -603,7 +615,6 @@ namespace
 
         return xGraphic;
     }
-}
 
 void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
 {
@@ -621,7 +632,7 @@ void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_I
                 mbAdjustingGraphic = true;
                 ::rtl::OUString sImageURL;
                 OSL_VERIFY( rValue >>= sImageURL );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( lcl_getGraphicFromURL_nothrow( sImageURL ) ) );
+                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) );
                 mbAdjustingGraphic = false;
             }
             break;
@@ -942,6 +953,7 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(
 //  class UnoControlImageControlModel
 //  ----------------------------------------------------
 UnoControlImageControlModel::UnoControlImageControlModel()
+    :mbAdjustingImageScaleMode( false )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
 }
@@ -956,6 +968,9 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
     if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
         return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlImageControl ) );
 
+    if ( nPropId == BASEPROPERTY_IMAGE_SCALE_MODE )
+        return makeAny( awt::ImageScaleMode::Anisotropic );
+
     return ImageProducerControlModel::ImplGetDefaultValue( nPropId );
 }
 
@@ -977,6 +992,44 @@ uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getProper
     return xInfo;
 }
 
+void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception)
+{
+    ImageProducerControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
+
+    // ScaleImage is an older (and less powerful) version of ScaleMode, but keep both in sync as far as possible
+    try
+    {
+        switch ( _nHandle )
+        {
+        case BASEPROPERTY_IMAGE_SCALE_MODE:
+            if ( !mbAdjustingImageScaleMode && ImplHasProperty( BASEPROPERTY_SCALEIMAGE ) )
+            {
+                mbAdjustingImageScaleMode = true;
+                sal_Int16 nScaleMode( awt::ImageScaleMode::Anisotropic );
+                OSL_VERIFY( _rValue >>= nScaleMode );
+                setPropertyValue( GetPropertyName( BASEPROPERTY_SCALEIMAGE ), uno::makeAny( sal_Bool( nScaleMode != awt::ImageScaleMode::None ) ) );
+                mbAdjustingImageScaleMode = false;
+            }
+            break;
+        case BASEPROPERTY_SCALEIMAGE:
+            if ( !mbAdjustingImageScaleMode && ImplHasProperty( BASEPROPERTY_IMAGE_SCALE_MODE ) )
+            {
+                mbAdjustingImageScaleMode = true;
+                sal_Bool bScale = sal_True;
+                OSL_VERIFY( _rValue >>= bScale );
+                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), uno::makeAny( bScale ? awt::ImageScaleMode::Anisotropic : awt::ImageScaleMode::None ) );
+                mbAdjustingImageScaleMode = false;
+            }
+            break;
+        }
+    }
+    catch( const Exception& )
+    {
+        mbAdjustingImageScaleMode = false;
+        throw;
+    }
+}
+
 //  ----------------------------------------------------
 //  class UnoImageControlControl
 //  ----------------------------------------------------
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index e57d238b8982..2b5fe908bedf 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: formpdfexport.cxx,v $
  *
- * $Revision: 1.2 $
+ * $Revision: 1.2.6.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -374,8 +374,10 @@ namespace toolkitform
                     if ( xPSI->hasPropertyByName( sBorderColorPropertyName ) )
                     {
                         sal_Int32 nBoderColor = COL_TRANSPARENT;
-                        xModelProps->getPropertyValue( sBorderColorPropertyName ) >>= nBoderColor;
-                        _rpDescriptor->BorderColor = Color( nBoderColor );
+                        if ( xModelProps->getPropertyValue( sBorderColorPropertyName ) >>= nBoderColor )
+                            _rpDescriptor->BorderColor = Color( nBoderColor );
+                        else
+                            _rpDescriptor->BorderColor = Color( COL_BLACK );
                     }
                 }
             }
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 17122badfe1d..16181629c9d4 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -215,6 +215,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_2     ( "RepeatDelay",            REPEAT_DELAY,       sal_Int32,          BOUND, MAYBEDEFAULT ),
 //            DECL_PROP_3     ( "ResourceResolver",       RESOURCERESOLVER,   Reference< ::com::sun::star::resource::XStringResourceResolver >, BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "ScaleImage",             SCALEIMAGE,         bool,               BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2     ( "ScaleMode",              IMAGE_SCALE_MODE,   sal_Int16,          BOUND, MAYBEDEFAULT ),
             DECL_DEP_PROP_3 ( "ScrollValue",            SCROLLVALUE,        sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "ScrollValueMax",         SCROLLVALUE_MAX,    sal_Int32,          BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "ScrollValueMin",         SCROLLVALUE_MIN,    sal_Int32,          BOUND, MAYBEDEFAULT ),