[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source
toolkit/source/controls/tabpagemodel.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b8412f1d8b70ee097f8cf00bf159514bd443ea07
Author: Vasily Melenchuk
AuthorDate: Wed Feb 6 00:41:25 2019 +0300
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 15:02:17 2019 +0200
basic: fix for UnoControlTabPageModel get/set properties
The userformscontainers is required property to pass checks in
getter/setter, but returning true instead of actual type is
not a best idea. So let's return actually expected dummy empty
container.
Change-Id: I5cc3e5462ed82f6f2f8e5a45d9fc2d9f9ce1c76f
Reviewed-on: https://gerrit.libreoffice.org/67431
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 24e7d98219191ccdab3673ac96fa866c449cac5f)
Reviewed-on: https://gerrit.libreoffice.org/70235
Reviewed-by: Thorsten Behrens
diff --git a/toolkit/source/controls/tabpagemodel.cxx
b/toolkit/source/controls/tabpagemodel.cxx
index 044da501575e..5ddbe3d0f8ef 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -87,9 +87,10 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16
nPropId ) const
break;
case BASEPROPERTY_USERFORMCONTAINEES:
{
-// We do not have here any usercontainers (yet?), but let's return
something back
+// We do not have here any usercontainers (yet?), but let's return
empty container back
// so normal properties could be set without triggering
UnknownPropertyException
-return makeAny(true);
+aAny <<= uno::Reference< XNameContainer >();
+break;
}
default:
aAny = UnoControlModel::ImplGetDefaultValue( nPropId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source
toolkit/source/controls/unocontrol.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 3decaa3c549c854c2f59d00d930617c70f5e29db
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 28 21:24:54 2019 +0100
Commit: Thorsten Behrens
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
(cherry picked from commit e55c7ff6df82c597763d2eb551f7ccdaa95cd0a9)
Reviewed-on: https://gerrit.libreoffice.org/68529
Reviewed-by: Thorsten Behrens
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 ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source
toolkit/source/awt/vclxtoolkit.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 08aa78cc52ea49fea2454096e97875f1d4b4cecc
Author: Vasily Melenchuk
AuthorDate: Thu Jan 31 06:57:50 2019 +0300
Commit: Thorsten Behrens
CommitDate: Wed Feb 6 16:15:03 2019 +0100
tdf#87884: UnoControlTabPageModel is using tabs w/o WB_NOBORDER
No border attribute is a special case for vcl/TabControl, so by defualt
created with corresponding UNO interface tabs were invisible.
To create invisible tabs there is already "tabcontrolnotabs"(?)
Change-Id: I3cc9baef9106f6c3fb5688daadbb5844d2b2a008
Reviewed-on: https://gerrit.libreoffice.org/67188
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 18f2e73f51c0f09c94f1a2b701d8e064adb39bf5)
Reviewed-on: https://gerrit.libreoffice.org/67400
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 57f18a22ad45..2eb26ff41a94 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1488,7 +1488,10 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow**
ppNewComp,
if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
"tabpagecontainer" ) )
{
-pNewWindow = VclPtr::Create( pParent, nWinBits
);
+// TabControl has a special case for tabs without border:
they are displayed
+// in a different way, so we need to ensure that this
style is not set, so
+// we can guarantee normal tab behavior
+pNewWindow = VclPtr::Create( pParent, nWinBits
& (~WB_NOBORDER));
*ppNewComp = new VCLXTabPageContainer;
}
else if ( aServiceName == "animatedimages" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source
toolkit/source/controls/tabpagemodel.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit aa7b71cd17898cd47f4bd7f12cfe5036cd40cb57
Author: Vasily Melenchuk
AuthorDate: Wed Jan 23 15:11:38 2019 +0300
Commit: Michael Stahl
CommitDate: Wed Feb 6 11:23:58 2019 +0100
tdf#87884: basic: fix for UnknownPropertyException
UnoControlTabPageModel had no USERFOMRCONTAINERS property
and this was causing an exception during any attempt to set
its properties.
Change-Id: Icc432d7a431ecd861ac4f00a96ec75165bec168c
Reviewed-on: https://gerrit.libreoffice.org/66801
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit 3deab788199395712b7d4641be5b11623b2ed964)
Reviewed-on: https://gerrit.libreoffice.org/67398
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/toolkit/source/controls/tabpagemodel.cxx
b/toolkit/source/controls/tabpagemodel.cxx
index e5afd1c4be25..044da501575e 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -55,6 +55,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference<
XComponentContext > c
ImplRegisterProperty( BASEPROPERTY_TITLE );
ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
ImplRegisterProperty( BASEPROPERTY_HELPURL );
+ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES );
}
OUString SAL_CALL UnoControlTabPageModel::getImplementationName()
@@ -84,6 +85,12 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16
nPropId ) const
case BASEPROPERTY_DEFAULTCONTROL:
aAny <<= OUString("com.sun.star.awt.tab.UnoControlTabPage");
break;
+case BASEPROPERTY_USERFORMCONTAINEES:
+{
+// We do not have here any usercontainers (yet?), but let's return
something back
+// so normal properties could be set without triggering
UnknownPropertyException
+return makeAny(true);
+}
default:
aAny = UnoControlModel::ImplGetDefaultValue( nPropId );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
