ab71: merge with DEV300_m54

6 files changed, 106 insertions, 100 deletions

diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index c80c3b14e63e..6171067f1185 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -142,6 +142,7 @@ namespace toolkit
         ImplRegisterProperty( BASEPROPERTY_EFFECTIVE_MAX );
         ImplRegisterProperty( BASEPROPERTY_EFFECTIVE_MIN );
         ImplRegisterProperty( BASEPROPERTY_ENABLED );
+        ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
         ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
         ImplRegisterProperty( BASEPROPERTY_FORMATKEY );
         ImplRegisterProperty( BASEPROPERTY_FORMATSSUPPLIER );
@@ -161,6 +162,7 @@ namespace toolkit
         ImplRegisterProperty( BASEPROPERTY_ENFORCE_FORMAT );
         ImplRegisterProperty( BASEPROPERTY_WRITING_MODE );
         ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
+        ImplRegisterProperty( BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR );
 
         Any aTreatAsNumber;
         aTreatAsNumber <<= (sal_Bool) sal_True;
@@ -323,8 +325,11 @@ namespace toolkit
                 ++pPropertyNames
             )
         {
-            bSettingValue = ( BASEPROPERTY_EFFECTIVE_VALUE == GetPropertyId( *pPropertyNames ) );
-            bSettingText = ( BASEPROPERTY_TEXT == GetPropertyId( *pPropertyNames ) );
+            if ( BASEPROPERTY_EFFECTIVE_VALUE == GetPropertyId( *pPropertyNames ) )
+                bSettingValue = true;
+
+            if ( BASEPROPERTY_TEXT == GetPropertyId( *pPropertyNames ) )
+                bSettingText = true;
         }
 
         m_bSettingValueAndText = ( bSettingValue && bSettingText );
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 5c4e47e240dc..138b849a190c 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -60,6 +60,7 @@ namespace toolkit
         ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
         ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
         ImplRegisterProperty( BASEPROPERTY_ENABLED );
+        ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
         ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
         ImplRegisterProperty( BASEPROPERTY_HELPURL );
         ImplRegisterProperty( BASEPROPERTY_ORIENTATION );
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 68c3212f5692..2949954bb13c 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -65,6 +65,7 @@ UnoTreeModel::UnoTreeModel()
     ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
     ImplRegisterProperty( BASEPROPERTY_FILLCOLOR );
     ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
     ImplRegisterProperty( BASEPROPERTY_HELPURL );
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 72c24f4b25bd..0775b6ee74f3 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -51,6 +51,7 @@
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <comphelper/stl_types.hxx>
@@ -132,7 +133,6 @@ public:
     inline VclListenerLock( VCLXWindow* _pLockWindow )
         :m_pLockWindow( _pLockWindow )
     {
-//        DBG_ASSERT( m_pLockWindow, "VclListenerLock::VclListenerLock: invalid window!" );
         if ( m_pLockWindow )
             m_pLockWindow->suspendVclEventListening( );
     }
@@ -143,14 +143,23 @@ public:
     }
 
 private:
-    VclListenerLock();                                          // never implemented
+    VclListenerLock();                                      // never implemented
     VclListenerLock( const VclListenerLock& );              // never implemented
     VclListenerLock& operator=( const VclListenerLock& );   // never implemented
 };
 
+typedef ::std::map< ::rtl::OUString, sal_Int32 >    MapString2Int;
 struct UnoControl_Data
 {
-    ::std::set< ::rtl::OUString >   aPropertyNotificationFilter;
+    MapString2Int   aSuspendedPropertyNotifications;
+    /// true if and only if our model has a property ResourceResolver
+    bool            bLocalizationSupport;
+
+    UnoControl_Data()
+        :aSuspendedPropertyNotifications()
+        ,bLocalizationSupport( false )
+    {
+    }
 };
 
 //  ----------------------------------------------------
@@ -245,33 +254,34 @@ Reference< XWindowPeer >    UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
     return xCompatiblePeer;
 }
 
-bool UnoControl::ImplMapPlaceHolder( ::rtl::OUString& rPlaceHolder )
+bool UnoControl::ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable )
 {
-    rtl::OUString aMappedValue;
+    if  (   !mpData->bLocalizationSupport
+        ||  ( _rPossiblyLocalizable.getLength() == 0 )
+        ||  ( _rPossiblyLocalizable[0] != '&' )
+            // TODO: make this reasonable. At the moment, everything which by accident starts with a & is considered
+            // localizable, which is probably wrong.
+        )
+        return false;
 
-    Reference< XPropertySet > xPropSet( mxModel, UNO_QUERY );
-    if ( xPropSet.is() )
+    try
     {
-        Any a;
-        Reference< resource::XStringResourceResolver > xStringResourceResolver;
-        a = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" )));
-        if ( a >>= xStringResourceResolver )
+        Reference< XPropertySet > xPropSet( mxModel, UNO_QUERY_THROW );
+        Reference< resource::XStringResourceResolver > xStringResourceResolver(
+            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ),
+            UNO_QUERY
+        );
+        if ( xStringResourceResolver.is() )
         {
-            if ( xStringResourceResolver.is() )
-            {
-                try
-                {
-                    rPlaceHolder = xStringResourceResolver->resolveString( rPlaceHolder );
-                    return true;
-                }
-                catch ( resource::MissingResourceException& )
-                {
-                    return false;
-                }
-            }
+            ::rtl::OUString aLocalizationKey( _rPossiblyLocalizable.copy( 1 ) );
+            _rPossiblyLocalizable = xStringResourceResolver->resolveString( aLocalizationKey );
+            return true;
         }
     }
-
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
     return false;
 }
 
@@ -284,56 +294,36 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An
 
     if ( mxVclWindowPeer.is() )
     {
-        Any aVal( rVal );
-
-        // We now support a mapping for language dependent properties. This is the
-        // central method to implement it.
-        if (( rPropName.equalsAsciiL( "Text",            4 )) ||
-            ( rPropName.equalsAsciiL( "Label",           5 )) ||
-            ( rPropName.equalsAsciiL( "Title",           5 )) ||
-            ( rPropName.equalsAsciiL( "HelpText",        8 )) ||
-            ( rPropName.equalsAsciiL( "CurrencySymbol", 14 )) ||
-            ( rPropName.equalsAsciiL( "StringItemList", 14 )) )
-        {
-            rtl::OUString aValue;
-            uno::Sequence< rtl::OUString > aSeqValue;
+        Any aConvertedValue( rVal );
 
-            if ( aVal >>= aValue )
+        if ( mpData->bLocalizationSupport )
+        {
+            // We now support a mapping for language dependent properties. This is the
+            // central method to implement it.
+            if (( rPropName.equalsAsciiL( "Text",            4 )) ||
+                ( rPropName.equalsAsciiL( "Label",           5 )) ||
+                ( rPropName.equalsAsciiL( "Title",           5 )) ||
+                ( rPropName.equalsAsciiL( "HelpText",        8 )) ||
+                ( rPropName.equalsAsciiL( "CurrencySymbol", 14 )) ||
+                ( rPropName.equalsAsciiL( "StringItemList", 14 )) )
             {
-                // Map single string value
-                if (( aValue.getLength() > 0 ) &&
-                    ( aValue.compareToAscii( "&", 1 ) == 0 ))
+                ::rtl::OUString aValue;
+                uno::Sequence< rtl::OUString > aSeqValue;
+                if ( aConvertedValue >>= aValue )
                 {
-                    // Magic symbol '&' found at first place. Interpret as a place
-                    // holder identifier. Now try to map it to the real value. The
-                    // magic symbol must be removed.
-                    rtl::OUString aKeyValue( aValue.copy( 1 ));
-                    if ( ImplMapPlaceHolder( aKeyValue ))
-                        aVal <<= aKeyValue;
+                    if ( ImplCheckLocalize( aValue ) )
+                        aConvertedValue <<= aValue;
                 }
-            }
-            else if ( aVal >>= aSeqValue )
-            {
-                // Map sequence strings
-                for ( sal_Int32 i = 0; i < aSeqValue.getLength(); i++ )
+                else if ( aConvertedValue >>= aSeqValue )
                 {
-                    aValue = aSeqValue[i];
-                    if (( aValue.getLength() > 0 ) &&
-                        ( aValue.compareToAscii( "&", 1 ) == 0 ))
-                    {
-                        // Magic symbol '&' found at first place. Interpret as a place
-                        // holder identifier. Now try to map it to the real value. The
-                        // magic symbol must be removed.
-                        rtl::OUString aKeyValue( aValue.copy( 1 ));
-                        if ( ImplMapPlaceHolder( aKeyValue ))
-                            aSeqValue[i] = aKeyValue;
-                    }
+                    for ( sal_Int32 i = 0; i < aSeqValue.getLength(); i++ )
+                        ImplCheckLocalize( aSeqValue[i] );
+                    aConvertedValue <<= aSeqValue;
                 }
-                aVal <<= aSeqValue;
             }
         }
 
-        mxVclWindowPeer->setProperty( rPropName, aVal );
+        mxVclWindowPeer->setProperty( rPropName, aConvertedValue );
     }
 }
 
@@ -455,13 +445,13 @@ void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvent
     {
         ::osl::MutexGuard aGuard( GetMutex() );
 
-        if ( !mpData->aPropertyNotificationFilter.empty() )
+        if ( !mpData->aSuspendedPropertyNotifications.empty() )
         {
             // strip the property which we are currently updating (somewhere up the stack)
             PropertyChangeEvent* pEvents = aEvents.getArray();
             PropertyChangeEvent* pEventsEnd = pEvents + aEvents.getLength();
             for ( ; pEvents < pEventsEnd; )
-                if ( mpData->aPropertyNotificationFilter.find( pEvents->PropertyName ) != mpData->aPropertyNotificationFilter.end() )
+                if ( mpData->aSuspendedPropertyNotifications.find( pEvents->PropertyName ) != mpData->aSuspendedPropertyNotifications.end() )
                 {
                     if ( pEvents != pEventsEnd )
                         ::std::copy( pEvents + 1, pEventsEnd, pEvents );
@@ -481,17 +471,22 @@ void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvent
 
 void UnoControl::ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock )
 {
+    MapString2Int::iterator pos = mpData->aSuspendedPropertyNotifications.find( rPropertyName );
     if ( bLock )
     {
-        OSL_PRECOND( mpData->aPropertyNotificationFilter.find( rPropertyName ) == mpData->aPropertyNotificationFilter.end(),
-            "UnoControl::ImplLockPropertyChangeNotification: already locked!" );
-        mpData->aPropertyNotificationFilter.insert( rPropertyName );
+        if ( pos == mpData->aSuspendedPropertyNotifications.end() )
+            pos = mpData->aSuspendedPropertyNotifications.insert( MapString2Int::value_type( rPropertyName, 0 ) ).first;
+        ++pos->second;
     }
     else
     {
-        OSL_PRECOND( mpData->aPropertyNotificationFilter.find( rPropertyName ) != mpData->aPropertyNotificationFilter.end(),
-            "UnoControl::ImplLockPropertyChangeNotification: not locked!" );
-        mpData->aPropertyNotificationFilter.erase( rPropertyName );
+        OSL_ENSURE( pos != mpData->aSuspendedPropertyNotifications.end(), "UnoControl::ImplLockPropertyChangeNotification: property not locked!" );
+        if ( pos != mpData->aSuspendedPropertyNotifications.end() )
+        {
+            OSL_ENSURE( pos->second > 0, "UnoControl::ImplLockPropertyChangeNotification: invalid suspension counter!" );
+            if ( 0 == --pos->second )
+                mpData->aSuspendedPropertyNotifications.erase( pos );
+        }
     }
 }
 
@@ -1054,7 +1049,13 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException)
     }
 
     if ( xDrawPeerView.is() )
+    {
+    Reference< XVclWindowPeer > xWindowPeer;
+    xWindowPeer.set( xDrawPeer, UNO_QUERY );
+    if ( xWindowPeer.is() )
+        xWindowPeer->setDesignMode( mbDesignMode );
         xDrawPeerView->draw( x, y );
+    }
 
     if ( bDisposeDrawPeer )
         xDrawPeer->dispose();
@@ -1377,16 +1378,28 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw
     if( xPropSet.is() )
         xPropSet->removePropertiesChangeListener( xListener );
 
+    mpData->bLocalizationSupport = false;
     mxModel = rxModel;
+
     if( mxModel.is() )
     {
-        xPropSet = Reference< XMultiPropertySet > ( mxModel, UNO_QUERY );
-        if( xPropSet.is() )
+        try
         {
+            xPropSet.set( mxModel, UNO_QUERY_THROW );
+            Reference< XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), UNO_SET_THROW );
+
             Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet );
             xPropSet->addPropertiesChangeListener( aNames, xListener );
+
+            mpData->bLocalizationSupport = xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+            mxModel.clear();
         }
     }
+
     return mxModel.is();
 }
 
@@ -1413,7 +1426,6 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
         // remember this
         mbDesignMode = bOn;
         xWindow = xWindow.query( getPeer() );
-
         // dispose our current AccessibleContext, if we have one
         // (changing the design mode implies having a new implementation for this context,
         // so the old one must be declared DEFUNC)
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 0f54a204a010..cc5faa27eec8 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/awt/FontWidth.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
+#include <com/sun/star/awt/MouseWheelBehavior.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/io/XMarkableStream.hpp>
@@ -294,6 +295,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
             case BASEPROPERTY_IMAGEALIGN:           aDefault <<= (sal_Int16) 1 /*ImageAlign::TOP*/; break;
             case BASEPROPERTY_IMAGEPOSITION:        aDefault <<= (sal_Int16) 12 /*ImagePosition::Centered*/; break;
             case BASEPROPERTY_PUSHBUTTONTYPE:       aDefault <<= (sal_Int16) 0 /*PushButtonType::STANDARD*/; break;
+            case BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR:aDefault <<= (sal_Int16) awt::MouseWheelBehavior::SCROLL_FOCUS_ONLY; break;
 
             case BASEPROPERTY_DATEMAX:              aDefault <<= (sal_Int32) Date( 31, 12, 2200 ).GetDate();    break;
             case BASEPROPERTY_DATEMIN:              aDefault <<= (sal_Int32) Date( 1, 1, 1900 ).GetDate();  break;
@@ -338,13 +340,13 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
             case BASEPROPERTY_HARDLINEBREAKS:
             case BASEPROPERTY_NOLABEL:              aDefault <<= (sal_Bool) sal_False; break;
 
-            case BASEPROPERTY_WHEELWITHOUTFOCUS:
             case BASEPROPERTY_HIDEINACTIVESELECTION:
             case BASEPROPERTY_ENFORCE_FORMAT:
             case BASEPROPERTY_AUTOCOMPLETE:
             case BASEPROPERTY_SCALEIMAGE:
             case BASEPROPERTY_ENABLED:
             case BASEPROPERTY_PRINTABLE:
+            case BASEPROPERTY_ENABLEVISIBLE:
             case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
 
             case BASEPROPERTY_HELPTEXT:
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 53b28cb7f2ac..3abacef7b67f 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -230,17 +230,7 @@ void UnoEditControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, cons
         {
             ::rtl::OUString sText;
             rVal >>= sText;
-            if (( sText.getLength() > 0 ) &&
-                ( sText.compareToAscii( "&", 1 ) == 0 ))
-            {
-                // Magic symbol '&' found at first place. Interpret as a place
-                // holder identifier. Now try to map it to the real value. The
-                // magic symbol must be removed.
-                rtl::OUString aKeyValue( sText.copy( 1 ));
-                if ( UnoControl::ImplMapPlaceHolder( aKeyValue ))
-                   sText = aKeyValue;
-            }
-
+            ImplCheckLocalize( sText );
             xTextComponent->setText( sText );
             bDone = sal_True;
         }
@@ -491,6 +481,7 @@ UnoControlFileControlModel::UnoControlFileControlModel()
     ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
     ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
     ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
     ImplRegisterProperty( BASEPROPERTY_HELPURL );
@@ -1788,6 +1779,7 @@ UnoControlGroupBoxModel::UnoControlGroupBoxModel()
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
     ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
     ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
     ImplRegisterProperty( BASEPROPERTY_HELPURL );
@@ -3532,16 +3524,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropNa
         {
             // same comment as in UnoControl::ImplSetPeerProperty - see there
             ::rtl::OUString sText( Text );
-            if (( Text.getLength() > 0 ) &&
-                ( Text.compareToAscii( "&", 1 ) == 0 ))
-            {
-                // Magic symbol '&' found at first place. Interpret as a place
-                // holder identifier. Now try to map it to the real value. The
-                // magic symbol must be removed.
-                rtl::OUString aKeyValue( Text.copy( 1 ));
-                if ( UnoControl::ImplMapPlaceHolder( aKeyValue ))
-                   sText = aKeyValue;
-            }
+            ImplCheckLocalize( sText );
             xPF->setString( sText );
             xPF->setMasks( EditMask, LiteralMask );
         }
@@ -3613,6 +3596,7 @@ UnoControlProgressBarModel::UnoControlProgressBarModel()
     ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
     ImplRegisterProperty( BASEPROPERTY_FILLCOLOR );
     ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
     ImplRegisterProperty( BASEPROPERTY_HELPURL );
@@ -3742,6 +3726,7 @@ UnoControlFixedLineModel::UnoControlFixedLineModel()
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
     ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
     ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
     ImplRegisterProperty( BASEPROPERTY_HELPURL );