[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Mar 4 11:34:09 UTC 2019


 toolkit/source/controls/unocontrol.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 3decaa3c549c854c2f59d00d930617c70f5e29db
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Feb 28 21:24:54 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Mar 4 12:34:02 2019 +0100

    tdf#123772 UnoControlDialogModel: Don't ignore property "Sizeable"
    
    which is supposed to make the dialog resizable, but was silently ignored.
    
    Change-Id: Ifa2d2ea70c769f7785ac044ab2b681802c54bc17
    Reviewed-on: https://gerrit.libreoffice.org/68515
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit e55c7ff6df82c597763d2eb551f7ccdaa95cd0a9)
    Reviewed-on: https://gerrit.libreoffice.org/68529
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 011aa72e08df..033780d296d4 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1168,6 +1168,16 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
             aDescr.WindowAttributes |= WindowAttribute::MOVEABLE;
     }
 
+    // Sizeable
+    aPropName = GetPropertyName( BASEPROPERTY_SIZEABLE );
+    if ( xInfo->hasPropertyByName( aPropName ) )
+    {
+        aVal = xPSet->getPropertyValue( aPropName );
+        bool b = bool();
+        if ( ( aVal >>= b ) && b)
+            aDescr.WindowAttributes |= WindowAttribute::SIZEABLE;
+    }
+
     // Closeable
     aPropName = GetPropertyName( BASEPROPERTY_CLOSEABLE );
     if ( xInfo->hasPropertyByName( aPropName ) )


More information about the Libreoffice-commits mailing list