[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - offapi/com
offapi/com/sun/star/style/ParagraphProperties.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2be27e4bf562978361b29cfcfaa91086271303a Author: Stephan Bergmann AuthorDate: Wed Feb 26 17:40:17 2020 +0100 Commit: Noel Grandin CommitDate: Thu Feb 27 07:29:26 2020 +0100 Fix @since tag This UNOIDL entity had been included in libreoffice-6-4 prior to the first LO 6.4 release at libreoffice-6.4.0.3-buildfix1 with ad86ebb1f86f6347ccb9bbe40b0ca080562cbae8 "tdf#121658 Add option to not hyphenate words in CAPS". Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89564 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit bf749968d0bed09234192862bcc709c9ca7af66d) Conflicts: offapi/com/sun/star/style/ParagraphProperties.idl Change-Id: I34df2ebeb56fdfe72bc9e19cc77eddd8a97a5c59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89602 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl index 30aa9a28c608..a806c7c479ae 100644 --- a/offapi/com/sun/star/style/ParagraphProperties.idl +++ b/offapi/com/sun/star/style/ParagraphProperties.idl @@ -410,7 +410,7 @@ published service ParagraphProperties /** Specifies whether words written in CAPS will be hyphenated. Setting to `true` will disable hyphenation of words written in CAPS for this paragraph. -@since LibreOffice 6.5 +@since LibreOffice 6.4 */ [optional, property] boolean ParaHyphenationNoCaps; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - offapi/com offapi/UnoApi_offapi.mk sw/source vcl/unx
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/accessibility/XAccessibleContext3.idl | 45 ++
sw/source/core/access/acccontext.cxx | 42 ++
sw/source/core/access/acccontext.hxx |5 +
vcl/unx/gtk3/a11y/gtk3atklistener.cxx | 58 --
5 files changed, 127 insertions(+), 24 deletions(-)
New commits:
commit 6b5c7f8e5eb548b25c6119fe10cd8919f5275274
Author: Noel Grandin
AuthorDate: Tue Nov 26 11:53:13 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 27 16:49:19 2019 +0100
tdf#108642 load accessibility children faster
Reduces the cost of repeatedly iterating over the page objects, by
adding a new XAccessibleContext3 interface to return accesibility
children in one call.
This takes the load time from 5.6s to 3.2s.
Change-Id: Ifcc20fa7e7ab8ad50417073882c8c3a2405d1eaa
Reviewed-on: https://gerrit.libreoffice.org/83850
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 980c859480be431311ba803c5251694160dcb3d5)
Reviewed-on: https://gerrit.libreoffice.org/83887
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 81dbf3c3441b..12ab8e2057e9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1634,6 +1634,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/accessibility,\
XAccessibleComponent \
XAccessibleContext \
XAccessibleContext2 \
+ XAccessibleContext3 \
XAccessibleEditableText \
XAccessibleEventBroadcaster \
XAccessibleEventListener \
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext3.idl
b/offapi/com/sun/star/accessibility/XAccessibleContext3.idl
new file mode 100644
index ..8bc4dee3d1f0
--- /dev/null
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext3.idl
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star_accessibility_XAccessibleContext3_idl__
+#define __com_sun_star_accessibility_XAccessibleContext3_idl__
+
+module com { module sun { module star { module accessibility {
+
+ interface XAccessible;
+
+/** Implement this interface to speed up operations when iterating over large
amounts of children.
+ *
+@since LibreOffice 6.4
+*/
+interface XAccessibleContext3 : ::com::sun::star::uno::XInterface
+{
+/** Return the children.
+
+The order in which the children are enumerated is implementation
+dependent.
+*/
+sequence getAccessibleChildren();
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index d1436b3f0c1d..8c4c7881fff9 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -616,6 +616,48 @@ uno::Reference< XAccessible> SAL_CALL
return xChild;
}
+css::uno::Sequence> SAL_CALL
+SwAccessibleContext::getAccessibleChildren()
+{
+SolarMutexGuard aGuard;
+
+ThrowIfDisposed();
+
+std::list< sw::access::SwAccessibleChild > aChildren;
+GetChildren( *GetMap(), aChildren );
+
+std::vector> aRet;
+aRet.reserve(aChildren.size());
+for (const auto & rSwChild : aChildren)
+{
+uno::Reference< XAccessible > xChild;
+if( rSwChild.GetSwFrame() )
+{
+::rtl::Reference < SwAccessibleContext > xChildImpl(
+GetMap()->GetContextImpl( rSwChild.GetSwFrame(),
!m_isDisposing ) );
+if( xChildImpl.is() )
+{
+xChildImpl->SetParent( this );
+xChild = xChildImpl.get();
+}
+}
+else if ( rSwChild.GetDrawObject() )
+{
+::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl(
+GetMap()->GetContextImpl( rSwChild.GetDrawObject(),
+ this, !m_isDisposing) );
+if( xChildImpl.is() )
+xChild =
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - offapi/com toolkit/source
offapi/com/sun/star/awt/XStyleSettings.idl |9 -
toolkit/source/awt/stylesettings.cxx | 50 ++---
toolkit/source/awt/stylesettings.hxx |6 ---
3 files changed, 11 insertions(+), 54 deletions(-)
New commits:
commit 65767523ba5ad8e974a3144b33ad0e9d627a53f7
Author: Tomaž Vajngerl
AuthorDate: Wed Nov 13 15:33:27 2019 +0100
Commit: Tomaž Vajngerl
CommitDate: Wed Nov 13 23:04:32 2019 +0100
revert action button changes to UNO XStyleSetting
As there is no need for this UNO changes instead set the values
with other appropriate button settings so the previous behaviour
is retained.
Change-Id: I5952a9ce9f2f72faeb12a7a945c53ed048719b27
Reviewed-on: https://gerrit.libreoffice.org/82620
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit c1fb36e477b1d0063ceb3eb74fa556b4187562cc)
Reviewed-on: https://gerrit.libreoffice.org/82634
Tested-by: Tomaž Vajngerl
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl
b/offapi/com/sun/star/awt/XStyleSettings.idl
index 6150033787c9..47a55d6e4e62 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -61,18 +61,9 @@ interface XStyleSettings
/// specifies the color to use for text on buttons which are hovered with
the mouse
[attribute] ::com::sun::star::util::Color ButtonRolloverTextColor;
-/// specifies the color to use for text on action buttons which are
hovered with the mouse
-[attribute] ::com::sun::star::util::Color ActionButtonRolloverTextColor;
-
/// specifies the color to use for text on buttons
[attribute] ::com::sun::star::util::Color ButtonTextColor;
-/// specifies the color to use for text on a default action buttons
-[attribute] ::com::sun::star::util::Color DefaultActionButtonTextColor;
-
-/// specifies the color to use for text on action buttons
-[attribute] ::com::sun::star::util::Color ActionButtonTextColor;
-
[attribute] ::com::sun::star::util::Color CheckedColor;
diff --git a/toolkit/source/awt/stylesettings.cxx
b/toolkit/source/awt/stylesettings.cxx
index eb76209040b8..55abed46bf87 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -236,19 +236,11 @@ namespace toolkit
{
StyleMethodGuard aGuard( *m_pData );
lcl_setStyleColor( *m_pData,
::SetButtonRolloverTextColor, _buttonrollovertextcolor );
-}
-
-
-::sal_Int32 SAL_CALL
WindowStyleSettings::getActionButtonRolloverTextColor()
-{
-StyleMethodGuard aGuard( *m_pData );
-return lcl_getStyleColor( *m_pData,
::GetActionButtonRolloverTextColor );
-}
-
-
-void SAL_CALL WindowStyleSettings::setActionButtonRolloverTextColor(
::sal_Int32 _buttonrollovertextcolor )
-{
-StyleMethodGuard aGuard( *m_pData );
+// Also need to set ActionButtonRolloverTextColor as this setting
can't be
+// set through the UNO interface otherwise.
+// Previously this setting was used to set colors for both scenarios,
+// but action button setting was added to differentiate the buttons
from
+// "normal" buttons in some themes.
lcl_setStyleColor( *m_pData,
::SetActionButtonRolloverTextColor, _buttonrollovertextcolor );
}
@@ -264,33 +256,13 @@ namespace toolkit
{
StyleMethodGuard aGuard( *m_pData );
lcl_setStyleColor( *m_pData, ::SetButtonTextColor,
_buttontextcolor );
-}
-
-::sal_Int32 SAL_CALL WindowStyleSettings::getDefaultActionButtonTextColor()
-{
-StyleMethodGuard aGuard( *m_pData );
-return lcl_getStyleColor( *m_pData,
::GetDefaultActionButtonTextColor );
-}
-
-
-void SAL_CALL WindowStyleSettings::setDefaultActionButtonTextColor(
::sal_Int32 _buttontextcolor )
-{
-StyleMethodGuard aGuard( *m_pData );
-lcl_setStyleColor( *m_pData,
::SetDefaultActionButtonTextColor, _buttontextcolor );
-}
-
-
-::sal_Int32 SAL_CALL WindowStyleSettings::getActionButtonTextColor()
-{
-StyleMethodGuard aGuard( *m_pData );
-return lcl_getStyleColor( *m_pData,
::GetActionButtonTextColor );
-}
-
-
-void SAL_CALL WindowStyleSettings::setActionButtonTextColor( ::sal_Int32
_buttontextcolor )
-{
-StyleMethodGuard aGuard( *m_pData );
+// Also need to set ActionButtonTextColor and
DefaultActionButtonTextColor
+// as this two settings can't be set through the UNO interface
otherwise.
+// Previously this setting was used to set colors for all three
scenarios,
+// but action button setting was added to differentiate the buttons
from
+// "normal" buttons in some themes.
lcl_setStyleColor( *m_pData, ::SetActionButtonTextColor,
_buttontextcolor );
+lcl_setStyleColor( *m_pData,
::SetDefaultActionButtonTextColor, _buttontextcolor );
}
diff --git
