Index: xmlscript/dtd/dialog.dtd
===================================================================
--- xmlscript/dtd/dialog.dtd	(revision 1560355)
+++ xmlscript/dtd/dialog.dtd	(working copy)
@@ -247,6 +247,7 @@
 <!ATTLIST dlg:img %default-attributes;
                   dlg:src CDATA #IMPLIED
                   dlg:scale-image %boolean; #IMPLIED
+                  dlg:scale-mode (none|isotropic|anisotropic); #IMPLIED
                   dlg:tabstop %boolean; #IMPLIED
                   >
 
Index: xmlscript/source/xmldlg_imexp/exp_share.hxx
===================================================================
--- xmlscript/source/xmldlg_imexp/exp_share.hxx	(revision 1560355)
+++ xmlscript/source/xmldlg_imexp/exp_share.hxx	(working copy)
@@ -153,6 +153,8 @@
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
 	void readSelectionTypeAttr(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+    void readImageScaleModeAttr(
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
 	//
     inline void addBoolAttr(
         ::rtl::OUString const & rAttrName, sal_Bool bValue )
Index: xmlscript/source/xmldlg_imexp/imp_share.hxx
===================================================================
--- xmlscript/source/xmldlg_imexp/imp_share.hxx	(revision 1560355)
+++ xmlscript/source/xmldlg_imexp/imp_share.hxx	(working copy)
@@ -447,6 +447,9 @@
 	bool importSelectionTypeProperty(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
+    bool importImageScaleModeProperty(
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
 };
 
 //==============================================================================
Index: xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
===================================================================
--- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	(revision 1560355)
+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	(working copy)
@@ -591,6 +591,8 @@
     readDefaults();
     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) );
+    readImageScaleModeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleMode") ),
+                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-mode") ) );
     readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":src") ) );
     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
Index: xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
===================================================================
--- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	(revision 1560355)
+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	(working copy)
@@ -38,6 +38,7 @@
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontWidth.hpp>
 #include <com/sun/star/awt/ImagePosition.hpp>
+#include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/awt/PushButtonType.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
@@ -968,6 +969,36 @@
     }
 }
 //__________________________________________________________________________________________________
+void ElementDescriptor::readImageScaleModeAttr( OUString const & rPropName, OUString const & rAttrName )
+{
+    if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
+    {
+        Any aImageScaleMode( _xProps->getPropertyValue( rPropName ) );
+        
+        if (aImageScaleMode.getValueTypeClass() == TypeClass_SHORT)
+        {
+            sal_Int16 nImageScaleMode;
+            aImageScaleMode >>= nImageScaleMode;
+            
+            switch(nImageScaleMode)
+            {
+                case ::awt::ImageScaleMode::NONE:
+                    addAttribute( rAttrName, OUString( RTL_CONSTASCII_USTRINGPARAM("none") ) );
+                    break;
+                case ::awt::ImageScaleMode::ISOTROPIC:
+                    addAttribute( rAttrName, OUString( RTL_CONSTASCII_USTRINGPARAM("isotropic") ) );
+                    break;
+                case ::awt::ImageScaleMode::ANISOTROPIC:
+                    addAttribute( rAttrName, OUString( RTL_CONSTASCII_USTRINGPARAM("anisotropic") ) );
+                    break;
+                default:
+                    OSL_ENSURE( 0, "### illegal image scale mode value.");
+                    break;
+            }
+        }
+    }
+}
+//__________________________________________________________________________________________________
 void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible )
 {
     Any a( _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) );
Index: xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
===================================================================
--- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	(revision 1560355)
+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	(working copy)
@@ -999,6 +999,9 @@
 	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
 							   OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ),
 							   _xAttributes );
+	ctx.importImageScaleModeProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleMode") ), 
+									 OUString( RTL_CONSTASCII_USTRINGPARAM("scale-mode") ),
+									 _xAttributes );
 	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
 							  OUString( RTL_CONSTASCII_USTRINGPARAM("src") ),
 							  _xAttributes );
Index: xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
===================================================================
--- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx	(revision 1560355)
+++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx	(working copy)
@@ -44,6 +44,7 @@
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontWidth.hpp>
 #include <com/sun/star/awt/ImagePosition.hpp>
+#include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/awt/PushButtonType.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
@@ -1339,6 +1340,43 @@
     return false;
 }
 
+//__________________________________________________________________________________________________
+bool ImportContext::importImageScaleModeProperty(
+    OUString const & rPropName, OUString const & rAttrName,
+    Reference< xml::input::XAttributes > const & xAttributes )
+{
+    OUString aImageScaleMode(
+        xAttributes->getValueByUidName(
+            _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
+    if (!aImageScaleMode.isEmpty())
+    {
+        sal_Int16 nImageScaleMode;
+        
+        if (aImageScaleMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        {
+            nImageScaleMode = awt::ImageScaleMode::NONE;
+        }
+        else if (aImageScaleMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("isotropic") ))
+        {
+            nImageScaleMode = awt::ImageScaleMode::ISOTROPIC;
+        }
+        else if (aImageScaleMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("anisotropic") ))
+        {
+            nImageScaleMode = awt::ImageScaleMode::ANISOTROPIC;
+        }
+        else
+        {
+            throw xml::sax::SAXException(
+                OUString( RTL_CONSTASCII_USTRINGPARAM("invalid scale image mode value!") ),
+                Reference< XInterface >(), Any() );
+        }
+        
+        _xControlModel->setPropertyValue( rPropName, makeAny( nImageScaleMode ) );
+        return true;
+    }
+    return false;
+}
+
 //==================================================================================================
 struct StringTriple
 {