core.git: accessibility/source
accessibility/source/extended/accessibleiconchoicectrl.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit ceca4cde363154b0c7e276d65fc87ec94eb0bb9a
Author: Michael Weghorn
AuthorDate: Tue May 28 15:07:30 2024 +0200
Commit: Michael Weghorn
CommitDate: Wed May 29 09:46:56 2024 +0200
a11y: Don't report dummy a11y name for icon choice control
If no a11y name is set for the `SvtIconChoiceCtrl`, don't
report any, rather than using "IconChoiceControl" as
accessible name.
Having the Orca screen reader (when used with the qt6 VCL plugin)
announce "IconChoiceControl" and then the name of the actually
selected item e.g. in Writer's "Insert" -> "Hyperlink" or the
"Format" -> "Page Setup" dialog is rather confusing when an
entry in the control gets focus.
Change-Id: Ie7e25d5a65c57be118abf2dcaff0648430f26154
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168155
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 33b15d5f54c8..877816466a19 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -194,10 +194,7 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
-OUString sName = getCtrl()->GetAccessibleName();
-if ( sName.isEmpty() )
-sName = "IconChoiceControl";
-return sName;
+return getCtrl()->GetAccessibleName();
}
// XAccessibleSelection
core.git: accessibility/source
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit c61f6a78022de6b29f031f3ac6726520032de187
Author: Michael Weghorn
AuthorDate: Tue May 28 14:44:29 2024 +0200
Commit: Michael Weghorn
CommitDate: Wed May 29 09:46:36 2024 +0200
a11y: Report focused state for icon choice control entries
Handle the FOCUSABLE and FOCUSED a11y states in
`AccessibleIconChoiceCtrlEntry::getAccessibleStateSet`.
Without this, the currently focused tab item would
e.g. not be reported by Orca when using the qt6 VCL
plugin in Writer's "Insert" -> "Hyperlink" dialog
or in "Format" -> "Page Style" that was recently
converted to use vertical tabs.
Monitoring AT-SPI events showed that an
`object:state-changed:focused` event was sent
on the AT-SPI layer (see also
`AccessibleIconChoiceCtrl::ProcessWindowEvent` that sends
an `AccessibleEventId::ACTIVE_DESCENDANT_CHANGED` event):
However, the focused state is not set, so Orca
would not report the item as the new focus item:
95.1 object:state-changed:focused(0, 0, [list item | Mail])
source: [list item | Mail]
application: [application | soffice.bin]
With this change in place, the state is properly
set now and Orca announces the newly focused item:
31.0 object:state-changed:focused(1, 0, [list item | Mail])
source: [list item | Mail]
application: [application | soffice.bin]
Change-Id: I41667c842e607f494b9e0e236b8c6f2f9ca95dfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168154
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 5f4761770f03..95e9c4375004 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -297,6 +297,7 @@ namespace accessibility
if ( IsAlive_Impl() )
{
+nStateSet |= AccessibleStateType::FOCUSABLE;
nStateSet |= AccessibleStateType::TRANSIENT;
nStateSet |= AccessibleStateType::SELECTABLE;
nStateSet |= AccessibleStateType::ENABLED;
@@ -308,7 +309,11 @@ namespace accessibility
}
if ( m_pIconCtrl && m_pIconCtrl->GetCursor() ==
m_pIconCtrl->GetEntry( m_nIndex ) )
+{
nStateSet |= AccessibleStateType::SELECTED;
+if (m_pIconCtrl->HasChildPathFocus())
+nStateSet |= AccessibleStateType::FOCUSED;
+}
}
else
nStateSet |= AccessibleStateType::DEFUNC;
core.git: accessibility/source
accessibility/source/extended/accessibletabbar.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ad3f86880bd6f5a0800a2820177715dc88c13a3c
Author: HakimOttey
AuthorDate: Wed May 1 17:45:38 2024 -0400
Commit: Michael Weghorn
CommitDate: Mon May 20 07:47:44 2024 +0200
Change for loop to have getAccessibleChildCount in accessibletabbar
Change-Id: Ic020b1cd36abe2c568a119dfd400c718dc9de452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166989
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 711d2a7b8c5c..beae5dd61331 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -358,7 +358,7 @@ namespace accessibility
OExternalLockGuard aGuard( this );
Reference< XAccessible > xChild;
-for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
+for( sal_Int64 i = 0; i < getAccessibleChildCount(); ++i )
{
Reference< XAccessible > xAcc = getAccessibleChild( i );
if ( xAcc.is() )
core.git: accessibility/source
accessibility/source/extended/accessiblelistbox.cxx |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit c24db71bc56c5d81a6e8fb72b6d6358992d0 Author: Michael Weghorn AuthorDate: Fri May 10 13:33:35 2024 +0200 Commit: Michael Weghorn CommitDate: Fri May 10 16:24:12 2024 +0200 tdf#160971 a11y: Add null check in AccessibleListBox::getAccessibleRole Add a null check in `AccessibleListBox::getAccessibleRole`. Otherwise, LO Writer crashes on exit when using the qt6 VCL plugin with Orca running for this scenario: 1) start Writer with the qt6 VCL plugin 2) press F6 until focus is in the formatting toolbar 3) use tab key to get to the editable comboboxes 4) use up/down keys to change entries 5) use Alt+Down to expand combobox 6) switch between entries using up/down keys 7) close Writer The reason is that the window gets unset when when `SvTreeListBox::dispose` emits the `VclEventId::ObjectDying` event, see `VCLXAccessibleComponent::ProcessWindowEvent`. But then, Qt's AT-SPI adaptor wants to query the accessible role when the `AccessibleEventId::CHILD` event is forwarded in our Qt a11y bridge, which previously resulted in a nullptr dereference with the below backtrace. Just return `AccessibleRole::LIST` for the null case. Backtrace: 1 std::__uniq_ptr_impl>::_M_ptr unique_ptr.h 199 0x7f0c1ee0b055 2 std::unique_ptr>::get unique_ptr.h 470 0x7f0c1ee0b035 3 std::unique_ptr>::operator bool unique_ptr.h 487 0x7f0c1ee4abc5 4 vcl::Window::GetStyle window2.cxx 989 0x7f0c1f0e594d 5 accessibility::AccessibleListBox::getAccessibleRole accessiblelistbox.cxx 347 0x7f0be055205a 6 QtAccessibleWidget::role QtAccessibleWidget.cxx380 0x7f0c151cc242 7 AtSpiAdaptor::pathForInterface atspiadaptor.cpp 1771 0x7f0c13a8b112 8 AtSpiAdaptor::notifyAboutDestruction atspiadaptor.cpp 1419 0x7f0c13a86e81 9 AtSpiAdaptor::notify atspiadaptor.cpp 988 0x7f0c13a8246b 10 QSpiAccessibleBridge::notifyAccessibilityUpdate qspiaccessiblebridge.cpp 85 0x7f0c13ad9bf2 11 QAccessible::updateAccessibility qaccessible.cpp 940 0x7f0c13a603aa 12 QtAccessibleEventListener::notifyEvent QtAccessibleEventListener.cxx 232 0x7f0c151c1363 13 comphelper::AccessibleEventNotifier::addEvent accessibleeventnotifier.cxx 256 0x7f0c270ee1b7 14 comphelper::OCommonAccessibleComponent::NotifyAccessibleEvent accessiblecomponenthelper.cxx 127 0x7f0c270e95b1 15 VCLXAccessibleComponent::ProcessWindowEvent vclxaccessiblecomponent.cxx 229 0x7f0c20e80720 16 VCLXAccessibleComponent::WindowEventListener vclxaccessiblecomponent.cxx 109 0x7f0c20e7fbbe 17 VCLXAccessibleComponent::LinkStubWindowEventListener vclxaccessiblecomponent.cxx 98 0x7f0c20e7f58d 18 Link::Call link.hxx 111 0x7f0c1efa2898 19 vcl::Window::CallEventListeners event.cxx 262 0x7f0c1ef9f62e 20 vcl::Window::dispose window.cxx163 0x7f0c1f0f6513 21 Control::dispose ctrl.cxx 65 0x7f0c1f177a06 22 SvTreeListBox::dispose treelistbox.cxx 1340 0x7f0c1f464d1b 23 SvTabListBox::dispose svtabbx.cxx 243 0x7f0c1f407a09 24 VclReferenceBase::disposeOnce
core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBox.cxx|6 +-
accessibility/source/extended/AccessibleGridControl.cxx |7 ++-
accessibility/source/extended/AccessibleGridControlTable.cxx |2 +-
accessibility/source/extended/AccessibleGridControlTableCell.cxx |2 +-
4 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 1425cbc50a9183477a12e413a0519867c0a589fa
Author: Caolán McNamara
AuthorDate: Fri May 3 08:31:26 2024 +0100
Commit: Caolán McNamara
CommitDate: Fri May 3 15:01:33 2024 +0200
WaE: C6011 Dereferencing NULL pointer warnings
Change-Id: I8a15be14850b9fe48f80820f4308c35748497727
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167034
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 8408c0abe23a..705df2536cfe 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -168,23 +168,19 @@ void SAL_CALL AccessibleBrowseBox::grabFocus()
}
// XServiceInfo
-
OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
{
return u"com.sun.star.comp.svtools.AccessibleBrowseBox"_ustr;
}
-
// internal virtual methods
-
tools::Rectangle AccessibleBrowseBox::implGetBoundingBox()
{
vcl::Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
-OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
+assert(pParent && "implGetBoundingBox - missing parent window");
return mpBrowseBox->GetWindowExtentsRelative( *pParent );
}
-
AbsoluteScreenPixelRectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
{
return mpBrowseBox->GetWindowExtentsAbsolute();
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index b2577ea588b3..88af9f423d8e 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -178,27 +178,25 @@ void SAL_CALL AccessibleGridControl::grabFocus()
}
// XServiceInfo ---
-
OUString SAL_CALL AccessibleGridControl::getImplementationName()
{
return u"com.sun.star.accessibility.AccessibleGridControl"_ustr;
}
-
// internal virtual methods ---
tools::Rectangle AccessibleGridControl::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
-OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
+assert(pParent && "implGetBoundingBox - missing parent window");
return m_aTable.GetWindowExtentsRelative( *pParent );
}
-
AbsoluteScreenPixelRectangle
AccessibleGridControl::implGetBoundingBoxOnScreen()
{
return m_aTable.GetWindowExtentsAbsolute();
}
+
// internal helper methods
css::uno::Reference< css::accessibility::XAccessible >
AccessibleGridControl::implGetTable()
@@ -210,7 +208,6 @@ css::uno::Reference< css::accessibility::XAccessible >
AccessibleGridControl::im
return m_xTable;
}
-
css::uno::Reference< css::accessibility::XAccessible >
AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType
eObjType )
{
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 1f1a0436951c..9ee3d4af4f56 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -344,7 +344,7 @@ void AccessibleGridControlTable::commitEvent(sal_Int16
nEventId, const css::uno:
tools::Rectangle AccessibleGridControlTable::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
-DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
+assert(pParent && "implGetBoundingBox - missing parent window");
tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( *pParent ));
tools::Rectangle aTableRect( m_aTable.calcTableRect() );
tools::Long nX = aGridRect.Left() + aTableRect.Left();
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 63bb24304c71..86d3da7ddb32 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -320,7 +320,7 @@ namespace accessibility
tools::Rectangle AccessibleGridControlTableCell::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
-DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
+assert(pParent && "implGetBoundingBox -
core.git: accessibility/source vcl/source
accessibility/source/standard/vclxaccessibletoolbox.cxx | 11 --- vcl/source/window/accessibility.cxx |2 +- 2 files changed, 9 insertions(+), 4 deletions(-) New commits: commit 825dde03999a55d02e4d5bc88a4d5beacb65e67f Author: Michael Stahl AuthorDate: Tue Mar 5 19:21:21 2024 +0100 Commit: Michael Stahl CommitDate: Thu Mar 7 10:52:12 2024 +0100 vcl,accessibility: try to fix a crash while disposing SvxFontNameBox_Impl This happened in a 6.3 based branch, no idea how to reproduce it. Clearly the SvxFontNameBox_Impl is being disposed and in its base class Window::dispose() when a call to SvxFontNameBox_Impl::CreateAccessible() happens, which seems very suspicious; try to prevent that. mergedlo.dll!ImplListBox::InsertEntry(long nPos, const rtl::OUString & rStr) Zeile 2225 unter d:\lomergedlo.dll!ComboBox::InsertEntry(const rtl::OUString & rStr, long nPos) Zeile 886 unter d:\lomergedlo.dll!FontNameBox::Fill(const FontList * pList) Zeile 447 unter d:\lo[Inlineframe] mergedlo.dll!SvxFontNameBox_Impl::Fill(const FontList * pList) Zeile 236 unter d:\lomergedlo.dll!lcl_GetDocFontList(const FontList * * ppFontList, SvxFontNameBox_Impl * pBox) Zeile 1290 unter d:\lomergedlo.dll!SvxFontNameBox_Impl::FillList() Zeile 1331 unter d:\lomergedlo.dll!SvxFontNameBox_Impl::CreateAccessible() Zeile 3739 unter d:\lomergedlo.dll!vcl::Window::GetAccessible(bool bCreate) Zeile 129 unter d:\lo acclo.dll!VCLXAccessibleToolBox::getAccessibleChild(long i) Zeile 733 unter d:\lo acclo.dll!VCLXAccessibleToolBox::GetItemWindowAccessible(const VclWindowEvent & rVclWindowEvent) Zeile 784 unter d:\lo acclo.dll!VCLXAccessibleToolBox::GetChildAccessible(const VclWindowEvent & rVclWindowEvent) Zeile 795 unter d:\lo mergedlo.dll!VCLXAccessibleComponent::ProcessWindowChildEvent(const VclWindowEvent & rVclWindowEvent) Zeile 165 unter d:\lo acclo.dll!VCLXAccessibleToolBox::ProcessWindowChildEvent(const VclWindowEvent & rVclWindowEvent) Zeile 657 unter d:\lo mergedlo.dll!VCLXAccessibleComponent::WindowChildEventListener(VclWindowEvent & rEvent) Zeile 129 unter d:\lo mergedlo.dll!VCLXAccessibleComponent::LinkStubWindowChildEventListener(void * instance, VclWindowEvent & data) Zeile 118 unter d:\lo[Inlineframe] mergedlo.dll!Link::Call(VclWindowEvent &) Zeile 84 unter d:\lo mergedlo.dll!vcl::Window::CallEventListeners(VclEventId nEvent, void * pData) Zeile 280 unter d:\lomergedlo.dll!vcl::Window::ImplResetReallyVisible() Zeile 735 unter d:\lomergedlo.dll!vcl::Window::ImplResetReallyVisible() Zeile 747 unter d:\lomergedlo.dll!vcl::Window::Show(bool bVisible, ShowFlags nFlags) Zeile 2198 unter d:\lomergedlo.dll!vcl::Window::Show(bool bVisible, ShowFlags nFlags) Zeile 2176 unter d:\lo[Inlineframe] mergedlo.dll!vcl::Window::Hide() Zeile 925 unter d:\lomergedlo.dll!vcl::Window::dispose() Zeile 402 unter d:\lomergedlo.dll!Edit::dispose() Zeile 258 unter d:\lomergedlo.dll!ComboBox::dispose() Zeile 132 unter d:\lomergedlo.dll!SvxFontNameBox_Impl::dispose() Zeile 1322 unter d:\lo[Inlineframe] mergedlo.dll!VclPtr::disposeAndClear() Zeile 206 unter d:\lomergedlo.dll!SvxFontNameToolBoxControl::dispose() Zeile 3309 unter d:\lo mergedlo.dll!framework::ToolBarManager::RemoveControllers() Zeile 651 unter d:\lomergedlo.dll!framework::ToolBarManager::dispose() Zeile 468 unter d:\lomergedlo.dll!framework::ToolBarWrapper::dispose() Zeile 105 unter d:\lo mergedlo.dll!framework::ToolbarLayoutManager::destroyToolbars() Zeile 666 unter d:\lo mergedlo.dll!framework::ToolbarLayoutManager::reset() Zeile 364 unter d:\lo mergedlo.dll!framework::LayoutManager::implts_reset(bool bAttached) Zeile 458 unter d:\lo mergedlo.dll!framework::LayoutManager::frameAction(const com::sun::star::frame::FrameActionEvent & aEvent) Zeile 2757 unter d:\lomergedlo.dll!`anonymous namespace'::XFrameImpl::implts_sendFrameActionEvent(const com::sun::star::frame::FrameAction & aAction) Zeile 2952 unter d:\lomergedlo.dll!`anonymous namespace'::XFrameImpl::setComponent(const com::sun::star::uno::Reference & xComponentWindow, const com::sun::star::uno::Reference & xController) Zeile 1470 unter d:\lomergedlo.dll!`anonymous namespace'::XFrameImpl::close(unsigned char bDeliverOwnership) Zeile 1701 unter d:\lo mergedlo.dll!framework::pattern::frame::closeIt(const com::sun::star::uno::Reference &
core.git: accessibility/source
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 34 +---
1 file changed, 15 insertions(+), 19 deletions(-)
New commits:
commit 492a683c70d98d005bcb472770be33d3277499d7
Author: Michael Weghorn
AuthorDate: Mon Feb 26 15:13:19 2024 +0100
Commit: Michael Weghorn
CommitDate: Mon Feb 26 22:37:34 2024 +0100
tdf#159910 a11y: Slightly simplify VCLXAccessibleToolBoxItem::GetText
* Avoid deep nesting by returning non-empty value right away.
* Drop the `if (!sWinText.isEmpty())` before the last assignment.
At this point, `sRet` is already empty, so reassigning an empty
string makes no difference.
Change-Id: Ib17e363f761e3ce09b359cebb1599042a8f6b8bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163956
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 3b6bad772162..63ec17cdff7c 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -116,27 +116,23 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
OUString VCLXAccessibleToolBoxItem::GetText() const
{
-OUString sRet;
// no text for separators and spaces
-if ( m_pToolBox && m_nItemId > ToolBoxItemId(0) )
-{
-sRet = m_pToolBox->GetItemText( m_nItemId );
-if (sRet.isEmpty())
-{
-sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
-if (sRet.isEmpty())
-{
-vcl::Window* pItemWindow = m_pToolBox->GetItemWindow(
m_nItemId );
-if ( m_nRole == AccessibleRole::PANEL && pItemWindow &&
pItemWindow->GetAccessible().is() &&
- pItemWindow->GetAccessible()->getAccessibleContext().is()
)
-{
-OUString sWinText =
pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
-if (!sWinText.isEmpty())
-sRet = sWinText;
-}
-}
-}
+if (!m_pToolBox || m_nItemId <= ToolBoxItemId(0))
+return OUString();
+
+OUString sRet = m_pToolBox->GetItemText( m_nItemId );
+if (!sRet.isEmpty())
+return sRet;
+sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
+if (!sRet.isEmpty())
+return sRet;
+
+vcl::Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
+if ( m_nRole == AccessibleRole::PANEL && pItemWindow &&
pItemWindow->GetAccessible().is() &&
+ pItemWindow->GetAccessible()->getAccessibleContext().is() )
+{
+sRet =
pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
}
return sRet;
}
core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBox.cxx |2 +-
accessibility/source/extended/AccessibleBrowseBoxBase.cxx |2 +-
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |2 +-
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx|2 +-
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |2 +-
accessibility/source/extended/AccessibleBrowseBoxTable.cxx|2 +-
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx|2 +-
accessibility/source/extended/AccessibleGridControl.cxx |2 +-
accessibility/source/extended/AccessibleGridControlBase.cxx |2 +-
accessibility/source/extended/AccessibleGridControlHeader.cxx |2 +-
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |2 +-
accessibility/source/extended/AccessibleGridControlTable.cxx |2 +-
accessibility/source/extended/AccessibleGridControlTableCell.cxx |2 +-
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |2 +-
accessibility/source/extended/accessibleiconchoicectrl.cxx|8
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |8
accessibility/source/extended/accessiblelistbox.cxx |8
accessibility/source/extended/accessiblelistboxentry.cxx |8
accessibility/source/extended/accessibletabbar.cxx|4 ++--
accessibility/source/extended/accessibletabbarpage.cxx|4 ++--
accessibility/source/extended/accessibletabbarpagelist.cxx|4 ++--
accessibility/source/extended/accessibletablistboxtable.cxx |2 +-
accessibility/source/standard/vclxaccessiblebutton.cxx|4 ++--
accessibility/source/standard/vclxaccessiblecheckbox.cxx |4 ++--
accessibility/source/standard/vclxaccessiblecombobox.cxx |4 ++--
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |4 ++--
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |4 ++--
accessibility/source/standard/vclxaccessibleedit.cxx |4 ++--
accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx|4 ++--
accessibility/source/standard/vclxaccessiblefixedtext.cxx |4 ++--
accessibility/source/standard/vclxaccessibleheaderbar.cxx |4 ++--
accessibility/source/standard/vclxaccessiblemenu.cxx |4 ++--
accessibility/source/standard/vclxaccessiblepopupmenu.cxx |4 ++--
accessibility/source/standard/vclxaccessiblescrollbar.cxx |4 ++--
accessibility/source/standard/vclxaccessiblestatusbar.cxx |4 ++--
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |4 ++--
accessibility/source/standard/vclxaccessibletabcontrol.cxx|4 ++--
accessibility/source/standard/vclxaccessibletabpage.cxx |4 ++--
accessibility/source/standard/vclxaccessibletextfield.cxx |4 ++--
accessibility/source/standard/vclxaccessibletoolbox.cxx |4 ++--
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10
+-
41 files changed, 78 insertions(+), 78 deletions(-)
New commits:
commit 0f6f5048d223731aa52b768a77244d0208711391
Author: Arnaud VERSINI
AuthorDate: Tue Dec 26 14:18:14 2023 +0100
Commit: Michael Weghorn
CommitDate: Fri Dec 29 00:36:51 2023 +0100
use string OUString literals in a11y for XServiceInfo impl.
Used in getImplementationName and getSupportedServiceNames
Change-Id: I003db960123c66d4d47b99aec678b156bf4c4d91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161301
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 6085ff9ec3ce..8408c0abe23a 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -171,7 +171,7 @@ void SAL_CALL AccessibleBrowseBox::grabFocus()
OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
{
-return "com.sun.star.comp.svtools.AccessibleBrowseBox";
+return u"com.sun.star.comp.svtools.AccessibleBrowseBox"_ustr;
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 121655d78823..8d9a0577e638 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -304,7 +304,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService(
Sequence< OUString > SAL_CALL
AccessibleBrowseBoxBase::getSupportedServiceNames()
{
-return { "com.sun.star.accessibility.AccessibleContext" };
+return { u"com.sun.star.accessibility.AccessibleContext"_ustr };
}
// other public methods
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebutton.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 97c9b0ccedeecf37c565adffb9f3823558013848
Author: Michael Weghorn
AuthorDate: Thu Nov 2 13:28:22 2023 +0100
Commit: Michael Weghorn
CommitDate: Thu Nov 2 15:54:24 2023 +0100
tdf#112661 tdf#112662 a11y: Fix toggling button via a11y action
`PushButton::Click does not` toggle a `PushButton`
that is a toggle button. Therefore, call
`PushButton::Check` and `PushButton::Toggle` instead
when the acessible "press" action is performed on
a toggle button, which makes this work as expected.
The same is already done in the UITest code, see
`ButtonUIObject::execute`.
The originally rerported issue in tdf#112661 and
tdf#112662 was that there was no action available
for the "Templates" and "Recent Documents" toggle
buttons in the start center via the NSAccessibility
API on macOS at all. By now, the "press" action was
available, but performing the action (e.g. using
the Ctrl+CapsLock+Space keyboard shortcut for
VoiceOver) didn't have any effect.
The same was true when performing the action via
Accerciser using the AT-SPI Action interface when
using the qt6 VCL plugin on Linux.
With this change in place, toggling between
showing the templates and the recently used
documents in the start center works using that
action, just as it does when clicking on one
of the toggle buttons in the UI using the mouse.
For gtk3, which is using native GtkToggleButtons,
this was already working without this change in place.
Change-Id: Ie3f02ec914239e0718ca1bfb4ba701f0831bb16a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158807
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 52153a0c22b9..31c8188b99ab 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -167,7 +167,18 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction (
sal_Int32 nIndex )
VclPtr< PushButton > pButton = GetAs< PushButton >();
if ( pButton )
-pButton->Click();
+{
+if (pButton->isToggleButton())
+{
+// PushButton::Click doesn't toggle when it's a toggle button
+pButton->Check(!pButton->IsChecked());
+pButton->Toggle();
+}
+else
+{
+pButton->Click();
+}
+}
return true;
}
[Libreoffice-commits] core.git: accessibility/source vcl/source
accessibility/source/extended/accessiblelistboxentry.cxx | 17 +++
vcl/source/treelist/svimpbox.cxx |8 +++
2 files changed, 25 insertions(+)
New commits:
commit eafef8fd195654f0e7dbd007bcc7fa0f6d29b599
Author: Michael Weghorn
AuthorDate: Tue Oct 24 10:03:44 2023 +0200
Commit: Michael Weghorn
CommitDate: Tue Oct 24 12:58:14 2023 +0200
tdf#135921 a11y Send event when toggling listbox checkbox
When toggling the state of the checkbox in a listbox/
treelist entry using the mouse or the keyboard, emit
a `VclEventId::CheckboxToggle` event and process
that in the a11y class that's used for the case
where there's just a single checkbox (like in the
spelling options dialog), `AccessibleListBoxEntry`
by sending a corresponding STATE_CHANGED event
on the a11y layer.
This makes Orca with the qt6 VCL plugin and NVDA on Windows
announce the new value when toggling a checkbox in the
Spelling options dialog using either the mouse or the
keyboard.
As mentioned in the previous commit,
Change-Id Ic78f9052d166be0da17a76261a09da02b8a11cd7
tdf#135921 a11y: Toggle listbox item checkbox on space
, the case where a listbox entry has multiple checkboxes
(like the autocorrect options dialog in Writer)
uses different a11y classes and toggling a checkbox there
still doesn't result in the new value being announced.
Change-Id: I36a2b0a3fa3154279fb06af023fdb96f699fac2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158375
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 69feac418805..10433d882730 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -84,6 +85,22 @@ namespace accessibility
switch ( rEvent.GetId() )
{
+case VclEventId::CheckboxToggle:
+{
+// assert this object is represented as a checkbox on a11y
layer (LABEL role is used for
+// SvButtonState::Tristate, s.
AccessibleListBoxEntry::getAccessibleRole)
+assert(getAccessibleRole() == AccessibleRole::CHECK_BOX
+ || getAccessibleRole() == AccessibleRole::LABEL);
+Any aOldValue;
+Any aNewValue;
+if (getAccessibleStateSet() & AccessibleStateType::CHECKED)
+aNewValue <<= AccessibleStateType::CHECKED;
+else
+aOldValue <<= AccessibleStateType::CHECKED;
+
+NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue);
+break;
+}
case VclEventId::ObjectDying :
{
if ( m_pTreeListBox )
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 559882560a12..0deea8f69820 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -1849,7 +1849,12 @@ bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent&
rMEvt )
m_pActiveButton->SetStateHilighted( false );
tools::Long nMouseX = rMEvt.GetPosPixel().X();
if (pEntry == m_pActiveEntry && m_pView->GetItem(m_pActiveEntry,
nMouseX) == m_pActiveButton)
+{
+const bool bChecked = m_pActiveButton->IsStateChecked();
m_pActiveButton->ClickHdl(m_pActiveEntry);
+if (m_pActiveButton->IsStateChecked() != bChecked)
+CallEventListeners(VclEventId::CheckboxToggle, m_pActiveEntry);
+}
InvalidateEntry(m_pActiveEntry);
if (m_pCursor == m_pActiveEntry)
ShowCursor(true);
@@ -2333,8 +2338,11 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
if (pButtonItem)
{
SvLBoxButton* pButton =
static_cast(pButtonItem);
+const bool bChecked = pButton->IsStateChecked();
pButton->ClickHdl(m_pCursor);
InvalidateEntry(m_pCursor);
+if (pButton->IsStateChecked() != bChecked)
+CallEventListeners(VclEventId::CheckboxToggle,
m_pActiveEntry);
}
else
bKeyUsed = false;
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/helper/characterattributeshelper.cxx | 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 9b462abdb36ce73ad627a0b603b24d3f35ffc1ee
Author: Arnaud Versini
AuthorDate: Thu Sep 21 11:25:30 2023 +0200
Commit: Mike Kaganski
CommitDate: Tue Oct 3 16:06:42 2023 +0200
accessibility: avoid OUString creation by using unicode OUString literals
Change-Id: I0f1f8c4e7601c68af607d6c540527e2979520586
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157136
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/accessibility/source/helper/characterattributeshelper.cxx
b/accessibility/source/helper/characterattributeshelper.cxx
index 1d6120ff483c..7e2a2334bf57 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -28,19 +28,19 @@ using namespace ::com::sun::star::beans;
CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont,
sal_Int32 nBackColor, sal_Int32 nColor )
{
-m_aAttributeMap.emplace( OUString( "CharBackColor" ), Any( nBackColor
) );
-m_aAttributeMap.emplace( OUString( "CharColor" ), Any( nColor ) );
-m_aAttributeMap.emplace( OUString( "CharFontCharSet" ), Any(
static_cast(rFont.GetCharSet()) ) );
-m_aAttributeMap.emplace( OUString( "CharFontFamily" ),Any(
static_cast(rFont.GetFamilyType()) ) );
-m_aAttributeMap.emplace( OUString( "CharFontName" ), Any(
rFont.GetFamilyName() ) );
-m_aAttributeMap.emplace( OUString( "CharFontPitch" ), Any(
static_cast(rFont.GetPitch()) ) );
-m_aAttributeMap.emplace( OUString( "CharFontStyleName" ), Any(
rFont.GetStyleName() ) );
-m_aAttributeMap.emplace( OUString( "CharHeight" ),Any(
static_cast(rFont.GetFontSize().Height()) ) );
-m_aAttributeMap.emplace( OUString( "CharScaleWidth" ),Any(
static_cast(rFont.GetFontSize().Width()) ) );
-m_aAttributeMap.emplace( OUString( "CharStrikeout" ), Any(
static_cast(rFont.GetStrikeout()) ) );
-m_aAttributeMap.emplace( OUString( "CharUnderline" ), Any(
static_cast(rFont.GetUnderline()) ) );
-m_aAttributeMap.emplace( OUString( "CharWeight" ),Any(
static_cast(rFont.GetWeight()) ) );
-m_aAttributeMap.emplace( OUString( "CharPosture" ), Any(
vcl::unohelper::ConvertFontSlant(rFont.GetItalic()) ) );
+m_aAttributeMap.emplace( u"CharBackColor"_ustr, Any( nBackColor ) );
+m_aAttributeMap.emplace( u"CharColor"_ustr, Any( nColor ) );
+m_aAttributeMap.emplace( u"CharFontCharSet"_ustr, Any(
static_cast(rFont.GetCharSet()) ) );
+m_aAttributeMap.emplace( u"CharFontFamily"_ustr,Any(
static_cast(rFont.GetFamilyType()) ) );
+m_aAttributeMap.emplace( u"CharFontName"_ustr, Any(
rFont.GetFamilyName() ) );
+m_aAttributeMap.emplace( u"CharFontPitch"_ustr, Any(
static_cast(rFont.GetPitch()) ) );
+m_aAttributeMap.emplace( u"CharFontStyleName"_ustr, Any(
rFont.GetStyleName() ) );
+m_aAttributeMap.emplace( u"CharHeight"_ustr,Any(
static_cast(rFont.GetFontSize().Height()) ) );
+m_aAttributeMap.emplace( u"CharScaleWidth"_ustr,Any(
static_cast(rFont.GetFontSize().Width()) ) );
+m_aAttributeMap.emplace( u"CharStrikeout"_ustr, Any(
static_cast(rFont.GetStrikeout()) ) );
+m_aAttributeMap.emplace( u"CharUnderline"_ustr, Any(
static_cast(rFont.GetUnderline()) ) );
+m_aAttributeMap.emplace( u"CharWeight"_ustr,Any(
static_cast(rFont.GetWeight()) ) );
+m_aAttributeMap.emplace( u"CharPosture"_ustr, Any(
vcl::unohelper::ConvertFontSlant(rFont.GetItalic()) ) );
}
[Libreoffice-commits] core.git: accessibility/source comphelper/source cppcanvas/source helpcompiler/source include/comphelper include/connectivity include/cui sc/source sd/source svx/source
accessibility/source/standard/vclxaccessiblecombobox.cxx |1 + accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |1 + accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |1 + accessibility/source/standard/vclxaccessiblelist.cxx |1 + accessibility/source/standard/vclxaccessiblelistbox.cxx |1 + accessibility/source/standard/vclxaccessibleradiobutton.cxx |1 + accessibility/source/standard/vclxaccessibletextfield.cxx|1 + comphelper/source/misc/compbase.cxx |1 + comphelper/source/misc/syntaxhighlight.cxx |1 + cppcanvas/source/mtfrenderer/polypolyaction.cxx |1 + cppcanvas/source/tools/canvasgraphichelper.cxx |1 + cppcanvas/source/wrapper/implcanvas.cxx |1 + cppcanvas/source/wrapper/implsprite.cxx |1 + helpcompiler/source/BasCodeTagger.cxx|1 + include/comphelper/accessiblecomponenthelper.hxx |1 - include/comphelper/accessibleselectionhelper.hxx |1 - include/comphelper/asyncnotification.hxx |1 - include/comphelper/bytereader.hxx|1 - include/comphelper/compbase.hxx |1 - include/comphelper/fileurl.hxx |3 ++- include/comphelper/propshlp.hxx |1 - include/comphelper/seqstream.hxx |1 - include/comphelper/sequence.hxx |1 - include/comphelper/singletonref.hxx |1 - include/comphelper/stl_types.hxx |3 --- include/comphelper/syntaxhighlight.hxx |3 +-- include/comphelper/weakeventlistener.hxx |1 - include/connectivity/paramwrapper.hxx|1 - include/connectivity/sdbcx/VCollection.hxx |1 - include/cui/cuicharmap.hxx |2 -- sc/source/ui/unoobj/cellsuno.cxx |1 + sc/source/ui/unoobj/dapiuno.cxx |1 + sc/source/ui/unoobj/docuno.cxx |1 + sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx|1 + sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx|1 + svx/source/dialog/charmap.cxx|1 + 36 files changed, 23 insertions(+), 20 deletions(-) New commits: commit 2f85eb7a2dcd9a53245897c87d16f5a51772846b Author: Gabor Kelemen AuthorDate: Mon Sep 11 15:19:28 2023 +0200 Commit: Gabor Kelemen CommitDate: Fri Sep 22 09:33:13 2023 +0200 tdf#146619 Recheck include/c* with IWYU Change-Id: I0cf6f675483bddf82e7347b484a874c71963bfd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156984 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index e537f7199eaa..363c9b4c7514 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -18,6 +18,7 @@ */ #include +#include #include using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 97fcebb04a2b..b5de8062450e 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -19,6 +19,7 @@ #include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 641c1bdc4b3f..f76b00a41231 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -18,6 +18,7 @@ */ #include +#include #include using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 62ac35a82aff..36573dcbb385 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 4b5ed9377442..673000f22165 100644 ---
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBox.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f05605997ffcfbf3b7969f565556a261c8e61a42 Author: Noel Grandin AuthorDate: Tue Sep 12 13:31:50 2023 +0200 Commit: Noel Grandin CommitDate: Tue Sep 12 14:49:08 2023 +0200 loplugin:unodispose in accessibility Change-Id: I7e4f464c9130318c8b10d8e00e01ce4b6c05e06a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156840 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 056d2c1b5f1c..6085ff9ec3ce 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -287,6 +287,7 @@ void AccessibleBrowseBoxAccess::dispose() m_xContext->dispose(); m_xContext.clear(); } +m_xParent.clear(); }
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblelist.cxx | 28 +--
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit f6a6b1454c7c765c0fc2ef9dc3e6111509a88307
Author: Michael Weghorn
AuthorDate: Thu Sep 7 14:08:57 2023 +0200
Commit: Michael Weghorn
CommitDate: Thu Sep 7 21:02:48 2023 +0200
tdf#157137 a11y: Don't report active descendant when not focused
Since an active descendant is the UI element with keyboard focus,
only send an `ACTIVE_DESCENDANT_CHANGED` event in `VCLXAccessibleList`
if the listbox/combobox actually has focus, not when the selection
changed otherwise, e.g. because the value was changed programmatically
because it depends on another UI control (like the paper size
in the print dialog depends on the selected printer.
Change-Id: I008e742ccf3b81c70832707b2f3a6551827a0706
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/15
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 67061aac3ab0..62ac35a82aff 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -251,6 +251,12 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
bHasDropDownList)
}
}
+// since an active descendant is the UI element with keyboard focus, only
send
+// ACTIVE_DESCENDANT_CHANGED if the listbox/combobox has focus
+vcl::Window* pWindow = GetWindow();
+assert(pWindow);
+const bool bFocused = pWindow->HasChildPathFocus();
+
if (m_aBoxType == COMBOBOX)
{
//VCLXAccessibleDropDownComboBox
@@ -259,10 +265,13 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
bHasDropDownList)
{
if ( aNewValue.hasValue() || aOldValue.hasValue() )
{
-NotifyAccessibleEvent(
-AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-aOldValue,
-aNewValue );
+if (bFocused)
+{
+NotifyAccessibleEvent(
+AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+aOldValue,
+aNewValue );
+}
NotifyListItem(aNewValue);
}
@@ -277,10 +286,13 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
bHasDropDownList)
{
if ( aNewValue.hasValue() || aOldValue.hasValue() )
{
-NotifyAccessibleEvent(
-AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-aOldValue,
-aNewValue );
+if (bFocused)
+{
+NotifyAccessibleEvent(
+AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+aOldValue,
+aNewValue );
+}
NotifyListItem(aNewValue);
}
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 14 -
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 13de5fc5396db63d4bd2f3e5fb4dc66c7ddd601f
Author: Noel Grandin
AuthorDate: Tue Sep 5 16:29:19 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Sep 6 09:22:35 2023 +0200
simplify VclEventId::TabpageRemoved handling
Change-Id: I9fe97a8d71fb898c0603ec76f7b86afb19c60654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156572
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index a0990d51febd..e03e913041f8 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -181,18 +181,14 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const
VclWindowEvent& rVclWin
{
if ( m_pTabControl )
{
+OExternalLockGuard aGuard( this );
sal_uInt16 nPageId =
static_cast(reinterpret_cast(rVclWindowEvent.GetData()));
-for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i <
nCount; ++i )
+for ( sal_Int64 i = 0, nCount = m_aAccessibleChildren.size();
i < nCount; ++i )
{
-Reference< XAccessible > xChild( getAccessibleChild( i ) );
-if ( xChild.is() )
+if ( m_aAccessibleChildren[i] &&
m_aAccessibleChildren[i]->GetPageId() == nPageId )
{
-VCLXAccessibleTabPage* pVCLXAccessibleTabPage =
static_cast< VCLXAccessibleTabPage* >( xChild.get() );
-if ( pVCLXAccessibleTabPage &&
pVCLXAccessibleTabPage->GetPageId() == nPageId )
-{
-RemoveChild( i );
-break;
-}
+RemoveChild( i );
+break;
}
}
}
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletoolbox.cxx | 41 +++-
1 file changed, 8 insertions(+), 33 deletions(-)
New commits:
commit e151ea63b0fb1d099410dab141953621a2d67328
Author: Michael Weghorn
AuthorDate: Tue Sep 5 15:12:43 2023 +0200
Commit: Michael Weghorn
CommitDate: Wed Sep 6 07:50:08 2023 +0200
a11y: Drop unnecessary casting/code for toolbox items
All (top-level) toolbox items have always been
`VCLXAccessibleToolBoxItem` ever since
commit f7da8972336b8ce3e0fb71b0c50464508837a5f3
Author: Jens-Heiner Rechtien
Date: Wed Jun 27 14:41:59 2007 +
INTEGRATION: CWS a11ysep (1.1.2); FILE ADDED
2007/02/28 07:29:13 fs 1.1.2.4: #i1#
2006/10/05 08:20:15 fs 1.1.2.3: MANUAL RESYNC m130->m185:
file had been modified in MWS, but moved herein in CWS
2005/09/28 11:35:38 fs 1.1.2.2: manual resync (files have been
moved herein from another location): licence change
2005/03/07 08:29:10 fs 1.1.2.1: #i44293# moved implementations
herein from toolkit module
, so the dynamic_cast to check whether an item is a
`OToolBoxWindowItem` is unnecessary and misleading
when reading the code.
This is even easier to see now after
commit af08e6c2f46a6d99b2e18fe176c15ec2b6edb2fd
Author: Noel Grandin
Date: Wed Aug 30 14:02:11 2023 +0200
use concrete type for ToolBoxItemsMap
`OToolBoxWindowItem`s are only set as children
for the `VCLXAccessibleToolBoxItem`s, s.
`VCLXAccessibleToolBox::getAccessibleChild`.
Also drop now unused
`OToolBoxWindowItem::getIndexInParent` and
`OToolBoxWindowItem::setIndexInParent`.
Change-Id: I7dcef304942ed25b77918f01cf9b679b6be6e23c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156566
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index a3ea0ec99d72..acb1d2547133 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -83,10 +83,6 @@ namespace
private:
sal_Int32 m_nIndexInParent;
-public:
-sal_Int32getIndexInParent() const{ return
m_nIndexInParent; }
-void setIndexInParent( sal_Int32 _nNewIndex ){
m_nIndexInParent = _nNewIndex; }
-
public:
OToolBoxWindowItem(sal_Int32 _nIndexInParent,
const css::uno::Reference< css::uno::XComponentContext >&
_rxContext,
@@ -253,26 +249,17 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl(
ToolBox::ImplToolItems::si
void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator
const & _rMapPos,
bool _bNotifyRemoval )
{
-Reference< XAccessible > xItemAcc( _rMapPos->second );
+rtl::Reference xItemAcc(_rMapPos->second);
if ( !xItemAcc.is() )
return;
if ( _bNotifyRemoval )
{
-NotifyAccessibleEvent( AccessibleEventId::CHILD, Any( xItemAcc ),
Any() );
+NotifyAccessibleEvent(AccessibleEventId::CHILD,
Any(Reference(xItemAcc)), Any());
}
-auto pWindowItem = dynamic_cast(xItemAcc.get());
-if ( !pWindowItem )
-{
-static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get()
)->ReleaseToolBox();
-::comphelper::disposeComponent( xItemAcc );
-}
-else
-{
-Reference< XAccessibleContext > xContext(
pWindowItem->getContextNoCreate() );
-::comphelper::disposeComponent( xContext );
-}
+xItemAcc->ReleaseToolBox();
+xItemAcc->dispose();
}
void VCLXAccessibleToolBox::UpdateItem_Impl( ToolBox::ImplToolItems::size_type
_nPos)
@@ -292,24 +279,12 @@ void VCLXAccessibleToolBox::UpdateItem_Impl(
ToolBox::ImplToolItems::size_type _
//TODO: ToolBox::ImplToolItems::size_type -> sal_Int32!
while ( m_aAccessibleChildren.end() != aIndexAdjust )
{
-Reference< XAccessible > xItemAcc( aIndexAdjust->second );
-
-auto pWindowItem = dynamic_cast(xItemAcc.get());
-if ( !pWindowItem )
-{
-VCLXAccessibleToolBoxItem* pItem = static_cast<
VCLXAccessibleToolBoxItem* >( xItemAcc.get() );
-if ( pItem )
-{
-sal_Int32 nIndex = pItem->getIndexInParent( );
-nIndex++;
-pItem->setIndexInParent( nIndex );
-}
-}
-else
+rtl::Reference xItem(aIndexAdjust->second);
+if (xItem.is())
{
-sal_Int32 nIndex = pWindowItem->getIndexInParent( );
+sal_Int32 nIndex = xItem->getIndexInParent();
nIndex++;
-pWindowItem->setIndexInParent( nIndex );
+xItem->setIndexInParent(nIndex);
}
++aIndexAdjust;
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblelist.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 51de048ae97cbd371457dbc07120e30db9ee4187 Author: Michael Weghorn AuthorDate: Mon Sep 4 17:19:03 2023 +0200 Commit: Michael Weghorn CommitDate: Mon Sep 4 21:41:21 2023 +0200 tdf#157088 a11y: Dispose list items with list Don't only clear, but also dispose the list items when the `VCLXAccessibleList` gets disposed. Interestingly, there was already a comment saying // Dispose all items in the list. , but that wasn't done so far... Fixes a crash on exit with the below backtrace after using the font color toolbox item with the qt6 VCL plugin and Orca running: 1 __pthread_kill_implementation pthread_kill.c 44 0x7fe2a2ea80fc 2 __pthread_kill_internalpthread_kill.c 78 0x7fe2a2ea815f 3 __GI_raise raise.c 26 0x7fe2a2e5a472 4 __GI_abort abort.c 79 0x7fe2a2e444b2 5 __assert_fail_base assert.c92 0x7fe2a2e443d5 6 __assert_fail assert.c101 0x7fe2a2e533a2 7 (anonymous namespace)::implLookupClient accessibleeventnotifier.cxx 140 0x7fe2a21138a4 8 comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing accessibleeventnotifier.cxx 185 0x7fe2a2113bb8 9 VCLXAccessibleListItem::disposing vclxaccessiblelistitem.cxx 164 0x7fe26870cb58 10 cppu::WeakAggComponentImplHelperBase::dispose implbase.cxx230 0x7fe2a1c755e3 11 cppu::WeakAggComponentImplHelperBase::release implbase.cxx204 0x7fe2a1c75312 12 cppu::WeakAggComponentImplHelper6::release compbase6.hxx 142 0x7fe26870fc0c 13 com::sun::star::uno::Reference::~Reference Reference.hxx 114 0x7fe28f2428a7 14 QtAccessibleWidget::~QtAccessibleWidgetQtAccessibleWidget.hxx 39 0x7fe28f262cf9 15 QtAccessibleWidget::~QtAccessibleWidgetQtAccessibleWidget.hxx 39 0x7fe28f262dd0 16 QAccessibleCache::deleteInterface qaccessiblecache.cpp173 0x7fe28e0c8e4b 17 QAccessibleCache::~QAccessibleCacheqaccessiblecache.cpp31 0x7fe28e0c845c 18 QAccessibleCache::~QAccessibleCacheqaccessiblecache.cpp32 0x7fe28e0c84e2 19 cleanupAccessibleCache qaccessiblecache.cpp24 0x7fe28e0c83c8 20 qt_call_post_routines qcoreapplication.cpp327 0x7fe28e9a4593 21 QApplication::~QApplicationqapplication.cpp663 0x7fe28cf9dff6 22 QApplication::~QApplicationqapplication.cpp717 0x7fe28cf9e2f4 23 std::default_delete::operator() unique_ptr.h99 0x7fe28f2cf3ae 24 std::__uniq_ptr_impl>::reset unique_ptr.h211 0x7fe28f2cf7f6 25 std::unique_ptr>::resetunique_ptr.h509 0x7fe28f2cd72d 26 QtInstance::~QtInstanceQtInstance.cxx 273 0x7fe28f2c614f 27 QtInstance::~QtInstanceQtInstance.cxx 274 0x7fe28f2c6226 28 DestroySalInstance salplug.cxx 389 0x7fe299a62611 29 DeInitVCL svmain.cxx 600 0x7fe299b41226 30 ImplSVMain svmain.cxx 229 0x7fe299b3f9f7 31 SVMain svmain.cxx 236 0x7fe299b3fa53 32 soffice_main sofficemain.cxx 94 0x7fe2a30a1b5d 33 sal_main main.c 51 0x55c86565c9d4 34 main main.c 49 0x55c86565c9ba Change-Id: I42ddcf5501ddfb363aeae10a86f1c38251e6793b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156522 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 57f9b1eabcb3..101c5815c0ac 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -107,6 +108,8 @@ void SAL_CALL VCLXAccessibleList::disposing() VCLXAccessibleComponent::disposing(); // Dispose all items in the list. +for (Reference& rxChild : m_aAccessibleChildren) +comphelper::disposeComponent(rxChild); m_aAccessibleChildren.clear();
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessiblelistboxentry.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e3b4bb25d4ef1684e1a370a34bc13ec65df23ea5
Author: Xisco Fauli
AuthorDate: Fri Sep 1 12:19:40 2023 +0200
Commit: Michael Weghorn
CommitDate: Fri Sep 1 20:38:27 2023 +0200
accessibility: fix crash in getAccessibleActionDescription
See
https://crashreport.libreoffice.org/stats/signature/SvTreeListEntry::HasChildren()
Change-Id: I21879ad531a5c61b3a6808c373454522557e2ff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156403
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index e0c96fe8d845..db994d94fcd1 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -788,9 +788,10 @@ namespace accessibility
//Sometimes, a List or Tree may have both checkbox and label
at the same time
return OUString();
}
-}else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN)) || nIndex
== 0 )
+}
+else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN)) || nIndex
== 0 )
{
-if( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() )
+if( pEntry && (pEntry->HasChildren() ||
pEntry->HasChildrenOnDemand()) )
return m_pTreeListBox->IsExpanded( pEntry ) ?
AccResId(STR_SVT_ACC_ACTION_COLLAPSE) :
AccResId(STR_SVT_ACC_ACTION_EXPAND);
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletabcontrol.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit bbd1eaeb4f8a923d861aae15264b2d4138590642
Author: Michael Weghorn
AuthorDate: Thu Aug 31 14:47:06 2023 +0200
Commit: Michael Weghorn
CommitDate: Thu Aug 31 17:00:23 2023 +0200
a11y: Re-add check for empty reference in VCLXAccessibleTabControl
It got lost with
commit a3f77a61c03340b79930e89d5c4045d814b93edf
Date: Wed Aug 30 14:43:18 2023 +0200
use concrete type for
VCLXAccessibleTabControl::m_aAccessibleChildren
and resulted in a crash when e.g. doing the following
with the qt6 VCL plugin on Linux:
1) open attachment 189287 from tdf#104833
2) "Tools" -> "Macros" -> "Organize Dialogs"
3) select the dialog from the doc
4) select "Edit"
Change-Id: I2c4aea951976738c575943a64d01eaac2766fdd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156343
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 0855b0f177aa..a0990d51febd 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -218,7 +218,10 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const
VclWindowEvent& rVclWin
// dispose all tab pages
for (const rtl::Reference& i :
m_aAccessibleChildren)
-i->dispose();
+{
+if (i.is())
+i->dispose();
+}
m_aAccessibleChildren.clear();
}
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 19 -
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit bf15445b7102a4e2bea2f96891093bc4bf07c4c6
Author: Michael Weghorn
AuthorDate: Wed Aug 23 17:46:37 2023 +0200
Commit: Michael Weghorn
CommitDate: Wed Aug 23 22:21:59 2023 +0200
tdf#99609 tdf#156473 a11y: Check whether row header exists
Don't allow using `BBINDEX_ROWHEADERBAR` as the
child index unconditionally, but only if the
browse box actually has a row header.
An `AccessibleTabListBox` doesn't have a header
and instead returns the table when requesting the
child at index 1 (`BBINDEX_ROWHEADERBAR`).
Now that row headers are propagated to the Windows
platform accessibility layer with
commit 2b30d37bd555188733a006e1a5796461ab11d326
Date: Thu Aug 3 15:48:48 2023 +0100
tdf#156473 wina11y: Fix invalid write due to row/col mismatch
in place, NVDA confusingly started announcing all cells
in the currently selected row as row headers for
the currently selected cell in the Expert Configuration
dialog, because of the table being returned without
this change in place (while the cells in that table don't
actually have any row headers).
Related backtrace of how the table was returned
for the row headers:
1 accessibility::AccessibleTabListBox::getAccessibleChild
accessibletablistbox.cxx 90 0x7fffb8ab64bb
2 accessibility::AccessibleBrowseBoxTable::implGetHeaderBar
AccessibleBrowseBoxTable.cxx 214 0x7fffb8a7e241
3
accessibility::AccessibleBrowseBoxTable::getAccessibleRowHeaders
AccessibleBrowseBoxTable.cxx 116 0x7fffb8a7da02
4 QtAccessibleWidget::rowHeaderCells
QtAccessibleWidget.cxx 1808 0x7fffe3e51e97
5 AtSpiAdaptor::tableCellInterface
atspiadaptor.cpp 2801 0x7fffe2cee526
6 AtSpiAdaptor::handleMessage
atspiadaptor.cpp 1450 0x7fffe2cde6ee
7 QDBusConnectionPrivate::activateObject
qdbusintegrator.cpp 1416 0x7fffe14cc216
8 QDBusActivateObjectEvent::placeMetaCall
qdbusintegrator.cpp 1572 0x7fffe14cceba
9 QObject::event
qobject.cpp 1438 0x7fffe3621280
10 QApplicationPrivate::notify_helper
qapplication.cpp 3287 0x7fffe1ba2414
11 QApplication::notify
qapplication.cpp 3238 0x7fffe1ba2224
12 QCoreApplication::notifyInternal2
qcoreapplication.cpp 1123 0x7fffe35a3c34
13 QCoreApplication::sendEvent
qcoreapplication.cpp 1557 0x7fffe35a46f5
14 QCoreApplicationPrivate::sendPostedEvents
qcoreapplication.cpp 1924 0x7fffe35a55b2
15 QCoreApplication::sendPostedEvents
qcoreapplication.cpp 1781 0x7fffe35a4eba
16 postEventSourceDispatch
qeventdispatcher_glib.cpp240 0x7fffe39b26d3
17 ??
0x7fffe97135b4
18 ??
0x7fffe9716607
19 g_main_context_iteration
0x7fffe9716bfc
20 QEventDispatcherGlib::processEvents
qeventdispatcher_glib.cpp390 0x7fffe39b2f67
...
Also add an assert that
`AccessibleBrowseBoxTable::implGetHeaderBar` only
gets called with indices for row/col header, not
arbitrary integers.
Change-Id: Id7ebab9bfa8a7f05cb43da1bf5756e5980f4ed20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156012
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index cdf918359a64..09c7448be4bd 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -205,19 +205,24 @@ AbsoluteScreenPixelRectangle
AccessibleBrowseBoxTable::implGetBoundingBoxOnScree
Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
sal_Int32 nChildIndex )
{
+assert(nChildIndex == vcl::BBINDEX_ROWHEADERBAR || nChildIndex ==
[Libreoffice-commits] core.git: accessibility/source animations/source canvas/source comphelper/source compilerplugins/clang framework/source scripting/source sc/source sfx2/source solenv/CompilerTest
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |2
accessibility/source/standard/vclxaccessiblelistitem.cxx|1
accessibility/source/standard/vclxaccessibletoolbox.cxx |1
animations/source/animcore/animcore.cxx |1
canvas/source/cairo/cairo_canvasfont.cxx|2
canvas/source/cairo/cairo_textlayout.cxx|4
canvas/source/opengl/ogl_canvasfont.cxx |2
canvas/source/opengl/ogl_textlayout.cxx |4
canvas/source/tools/parametricpolypolygon.cxx |2
canvas/source/vcl/canvasfont.cxx|4
canvas/source/vcl/textlayout.cxx|4
comphelper/source/streaming/seqstream.cxx |1
compilerplugins/clang/locking2.cxx | 716
++
compilerplugins/clang/locking2.py | 79 +
compilerplugins/clang/test/locking2.cxx | 50
framework/source/uielement/statusbaritem.cxx|2
sc/source/ui/unoobj/PivotTableDataSequence.cxx |2
sc/source/ui/unoobj/linkuno.cxx |3
scripting/source/basprov/baslibnode.cxx |2
sfx2/source/sidebar/UnoDeck.cxx |2
sfx2/source/sidebar/UnoPanels.cxx |2
solenv/CompilerTest_compilerplugins_clang.mk|1
svtools/source/control/accessibleruler.cxx |1
svx/source/accessibility/svxrectctaccessiblecontext.cxx |2
24 files changed, 846 insertions(+), 44 deletions(-)
New commits:
commit 7ffa7e56c0202227f2ec75fce5234bb2bf89e455
Author: Noel Grandin
AuthorDate: Fri Aug 18 11:30:32 2023 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 19 17:40:47 2023 +0200
loplugin: new global analysis locking2
look for methods where we don't need to guard access
to the field, because the field is never modified
Change-Id: I62c33cc3f52881557515765d3733c4afc78547aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155836
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 44ac61e9252a..9e7b75cf1488 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -261,8 +261,6 @@ namespace accessibility
sal_Int64 SAL_CALL
AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( )
{
-::osl::MutexGuard aGuard( m_aMutex );
-
return m_nIndex;
}
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index e1bb9cb18883..5339f93824a9 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -211,7 +211,6 @@ Reference< XAccessible > SAL_CALL
VCLXAccessibleListItem::getAccessibleParent(
sal_Int64 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( )
{
-::osl::MutexGuard aGuard( m_aMutex );
return m_nIndexInParent;
}
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index a1a2d5b03d54..aaea955d10f6 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -70,7 +70,6 @@ namespace
sal_Int64 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent(
)
{
-::osl::MutexGuard aGuard( m_aMutex );
return m_nIndexInParent;
}
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 03c815021c93..7592109c4855 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -912,7 +912,6 @@ Sequence< OUString >
AnimationNode::getSupportedServiceNames()
// XAnimationNode
sal_Int16 SAL_CALL AnimationNode::getType()
{
-std::unique_lock aGuard( m_aMutex );
return mnNodeType;
}
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx
b/canvas/source/cairo/cairo_canvasfont.cxx
index 82f300e8a205..2445f408853c 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -116,8 +116,6 @@ namespace cairocanvas
rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( )
{
-SolarMutexGuard aGuard;
-
return maFontRequest;
}
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index ff12a6092c13..31ef31fa7a49 100644
---
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleGridControlHeader.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit f7ff0468616d3ed8ded78598649a32bcb4e1ef1a
Author: Michael Weghorn
AuthorDate: Wed Aug 2 13:42:35 2023 +0200
Commit: Michael Weghorn
CommitDate: Thu Aug 3 16:54:49 2023 +0200
tdf#156473 a11y: Implement AccessibleGridControlHeader::getAccessibleCellAt
With this in place, selecting a grid control cell from the tdf#156473
example in Accerciser's treeview of the LO a11y hierarchy now shows
a corresponding row and header cell.
Change-Id: I89978051cdb285a02cbce7a560a788b6d24ca7ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155251
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 86b3228d42a8..ebe5f9d09d9e 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -161,11 +161,15 @@ sal_Bool SAL_CALL
AccessibleGridControlHeader::isAccessibleColumnSelected( sal_I
{
return false;
}
-//not implemented
+
Reference< XAccessible > SAL_CALL
AccessibleGridControlHeader::getAccessibleCellAt(
-sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
+sal_Int32 nRow, sal_Int32 nColumn)
{
-return nullptr;
+SolarMutexGuard g;
+
+ensureIsAlive();
+ensureIsValidAddress(nRow, nColumn);
+return implGetChild(nRow, nColumn);
}
// not selectable
sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleGridControlTable.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit de9de202a6336f3ba8da0d2deeb8e1e34ac569ab
Author: Michael Weghorn
AuthorDate: Tue Aug 1 19:09:48 2023 +0200
Commit: Michael Weghorn
CommitDate: Wed Aug 2 05:09:33 2023 +0200
tdf#156473 a11y: Properly retrireve a11y context from XAccessible
... by using `XAccessible::getAccessibleContext` rather
than trying to just query for the `XAccessibleContext`
interface on the `XAccessible` object.
(While in many cases, the class implementing
both interfaces is the same, that doesn't have to be
the case.)
Change-Id: I281082672447c7bfd2812d7f3cd54c74414df66e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155193
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 4629a4b3ee66..e0c1a9a1d27f 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -372,7 +372,11 @@ Reference< XAccessibleTable >
AccessibleGridControlTable::implGetHeaderBar(
sal_Int32 nChildIndex )
{
Reference< XAccessible > xRet;
-Reference< XAccessibleContext > xContext( m_xParent, uno::UNO_QUERY );
+
+if (!m_xParent.is())
+return nullptr;
+
+Reference xContext = m_xParent->getAccessibleContext();
if( xContext.is() )
{
try
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleGridControlTable.cxx | 14 +++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 256926cace5819b0107e8d24579e05bcab9b5a7e
Author: Michael Weghorn
AuthorDate: Tue Aug 1 18:12:18 2023 +0200
Commit: Michael Weghorn
CommitDate: Wed Aug 2 05:09:07 2023 +0200
tdf#156473 a11y: Don't use selection index as child index
`XAccessibleSelection::getSelectedAccessibleChild` takes
the index into the selection, not the child index, as its
documentation (in
`offapi/com/sun/star/accessibility/XAccessibleSelection.idl`)
says:
> @param nSelectedChildIndex
> This index refers only to the selected children, not to all the
> children of this object. Even if all children are selected, the
> indices enumerating the selected children need not be the same
> as those enumerating all children. If only single selection is
> supported the only valid value is 0.
The previous handling here in
`AccessibleGridControlTable::getSelectedAccessibleChild`
was treating it as the child index, though. Therefore
trying to get the selected children would break once
any row other than the first was selected.
Fix this by calculating the actual row/column index
of the cell from the given *selection* index.
This could be observed e.g. with the qt6 VCL plugin by
querying selection from Accerciser, with the last row
selected in the table from the tdf#156473 macro in LO
and the corresponding table object selected in
Accerciser's tree view of the LO a11y hierarchy:
Before:
In [41]: sel = acc.querySelection()
In [42]: sel.nSelectedChildren
Out[42]: 5
In [43]: sel.getSelectedChild(0)
In [44]: sel.getSelectedChild(0) == None
Out[44]: True
With the fix in place:
In [48]: sel = acc.querySelection()
In [49]: sel.nSelectedChildren
Out[49]: 5
In [50]: sel.getSelectedChild(0)
Out[50]:
In [51]: sel.getSelectedChild(0).name
Out[51]: 'C1 , R4 , '
In [52]: sel.getSelectedChild(1).name
Out[52]: 'C2 , R4 , '
In [53]: sel.getSelectedChild(4).name
Out[53]: 'Column 5 , R4 , '
Change-Id: Id7d42a89b913d2ed101a9edb45dee5f3d870dbbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155190
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 579826195be2..4629a4b3ee66 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -253,10 +253,16 @@ AccessibleGridControlTable::getSelectedAccessibleChild(
sal_Int64 nSelectedChild
SolarMutexGuard aSolarGuard;
ensureIsAlive();
-if(isAccessibleChildSelected(nSelectedChildIndex))
-return getAccessibleChild(nSelectedChildIndex);
-else
-return nullptr;
+if (nSelectedChildIndex < 0 || nSelectedChildIndex >=
getSelectedAccessibleChildCount())
+throw lang::IndexOutOfBoundsException("Invalid index into selection",
*this);
+
+const sal_Int32 nColCount = getAccessibleColumnCount();
+assert(nColCount > 0 && "Column count non-positive, but child count > 0");
+const sal_Int32 nIndexInSelectedRowsSequence = nSelectedChildIndex /
nColCount;
+const Sequence aSelectedRows = getSelectedAccessibleRows();
+const sal_Int32 nRowIndex = aSelectedRows[nIndexInSelectedRowsSequence];
+const sal_Int32 nColIndex = nSelectedChildIndex % nColCount;
+return getAccessibleCellAt(nRowIndex, nColIndex);
}
//not implemented yet, because only row selection possible
void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild(
[Libreoffice-commits] core.git: accessibility/source include/svtools include/vcl svtools/source vcl/source
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |2 +-
accessibility/source/extended/accessiblebrowseboxcell.cxx |4 ++--
include/svtools/brwbox.hxx |2 +-
include/vcl/accessibletableprovider.hxx |2 +-
include/vcl/toolkit/svtabbx.hxx |2 +-
svtools/source/brwbox/brwbox2.cxx |2 +-
vcl/source/treelist/svtabbx.cxx |2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 175c01e4307ba04883e531fd7899d35f160c2d6b
Author: Noel Grandin
AuthorDate: Wed Jul 26 12:15:55 2023 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 27 09:44:09 2023 +0200
rename GetFieldRectPixelAbs to GetFieldRectPixel
since it can return either absolute or relative values
Change-Id: I23f2403879eded3ec4b3ca20a639ea18b28f5de9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154937
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 619e7780947e..67ffa47a3415 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -123,7 +123,7 @@ namespace
nCol = 0;
}
-tools::Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol,
true, _bOnScreen));
+tools::Rectangle aRet(_pBrowseBox->GetFieldRectPixel( nRow , nCol,
true, _bOnScreen));
return tools::Rectangle(aRet.TopLeft() -
Point(0,aRet.GetHeight()),aRet.GetSize());
}
}
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx
b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 4996b7eedcd2..a5fbb47bc4f4 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -57,12 +57,12 @@ namespace accessibility
::tools::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
{
-return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false,
false );
+return mpBrowseBox->GetFieldRectPixel( m_nRowPos, m_nColPos, false,
/*bOnScreen*/false );
}
::tools::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
{
-return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false
);
+return mpBrowseBox->GetFieldRectPixel( m_nRowPos, m_nColPos, false,
/*bOnScreen*/true );
}
} // namespace accessibility
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 1d106d1ddaf1..b25ce4a7d827 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -703,7 +703,7 @@ public:
@return
the Rectangle
*/
-virtual tools::Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,
sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) override;
+virtual tools::Rectangle GetFieldRectPixel(sal_Int32 _nRowId, sal_uInt16
_nColId, bool _bIsHeader, bool _bOnScreen) override;
/// return if and only if the accessible object for this instance
has been created and is alive
bool isAccessibleAlive( ) const;
diff --git a/include/vcl/accessibletableprovider.hxx
b/include/vcl/accessibletableprovider.hxx
index 4986e2504b9c..67c16e8febfe 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -88,7 +88,7 @@ public:
virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar,
bool _bOnScreen = true ) = 0;
virtual tools::Rectangle calcTableRect( bool _bOnScreen =
true ) = 0;
-virtual tools::Rectangle GetFieldRectPixelAbs( sal_Int32
_nRow, sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen = true ) = 0;
+virtual tools::Rectangle GetFieldRectPixel( sal_Int32 _nRow,
sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen ) = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
index 3039c1aebe8d..b9aed978e3c5 100644
--- a/include/vcl/toolkit/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -166,7 +166,7 @@ public:
virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar,
bool _bOnScreen = true ) override;
virtual tools::Rectangle calcTableRect( bool _bOnScreen =
true ) override;
-virtual tools::Rectangle GetFieldRectPixelAbs( sal_Int32
_nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) override;
+virtual
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBoxBase.cxx |2 +- accessibility/source/extended/AccessibleGridControlBase.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit bcd3ae98a1292a02b8a2c56e114c6016a9a7df51 Author: Michael Weghorn AuthorDate: Fri Jul 21 14:56:00 2023 +0200 Commit: Michael Weghorn CommitDate: Fri Jul 21 16:53:22 2023 +0200 tdf#99609 a11y Set old/new value correctly in a11y event again ... after commit 7835f97113460922cfe14685baa7bcaea2de736a Date: Tue Jul 18 16:28:08 2023 +0200 add IndexHint -1 for 2 commitEvent methods in accessibility had switched from using the default AccessibleEventObject ctor and setting all of the members manually, but presumably unintentionally swapped old and new value along the way, since the ctor takes the new value as 3rd and the old value as 4th argument. I ran into this because because announcement of the items in the Expert Configuration dialog with Orca and the qt6 VCL plugin dialog no longer worked after merging commit 452c17e08fd8f18d032788170d873b019c8e9716 Author: Michael Weghorn Date: Fri Jul 21 08:27:09 2023 +0200 tdf#99609 a11y: Announce the correct entry in tab list box , while it did still work with the tdf#99609 commit series on top of master just a few days old. Change-Id: I516a3067ca04b2e4a06011148ac2690bd301fefa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154719 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 60d4eb805a67..da793c01540b 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -422,7 +422,7 @@ void AccessibleBrowseBoxBase::commitEvent( return; // build an event object -AccessibleEventObject aEvent(*this, _nEventId, _rOldValue, _rNewValue, -1); +AccessibleEventObject aEvent(*this, _nEventId, _rNewValue, _rOldValue, -1); // let the notifier handle this event diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 2be880e3e37f..4777b159f309 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -344,7 +344,7 @@ void AccessibleGridControlBase::commitEvent( return; // build an event object -AccessibleEventObject aEvent(*this, _nEventId, _rOldValue, _rNewValue, -1); +AccessibleEventObject aEvent(*this, _nEventId, _rNewValue, _rOldValue, -1); // let the notifier handle this event
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessibletablistboxtable.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 645197d81fec7328b1ddef9d2996a2b068451b61
Author: Michael Weghorn
AuthorDate: Fri Jul 21 11:33:04 2023 +0200
Commit: Michael Weghorn
CommitDate: Fri Jul 21 15:03:30 2023 +0200
tdf#99609 a11y: Fix reporting selection in tab list table more
Besides the issue already fixed in
Change-Id I394027695616b17f7290136d8ee10c06a0282e80
("tdf#99609 a11y: Fix reporting selection in tab list table"),
the previous use of `GetEntry` here in
`AccessibleTabListBoxTable` is problematic, as described
for the previous uses in `SvTabListBox` and replaced in
Change-Id I35f7280d2c386a9a8e04e636ebf34850a733c84a
("tdf#99609 a11y: Announce the correct entry in tab list box")
and follow-up commits.
Therefore, replace that here as well. Instead of
having to use `SvTabListBox::GetEntryOnPos`, just
use the existing `SvTabListBox` methods that already
take a row index (and use `SvTabListBox::GetEntryOnPos`
internally).
This fixes querying the selected status of children (=cells)
via the Selection interface.
Sample use in Accerciser before, with the
tree view in the Expert Configuration dialog
selected in Accerciser's treeview of the a11y hierachy,
and entry "org.openoffice.Interaction" selected in the
dialog.
Before:
In [6]: sel = acc.querySelection()
In [7]: sel.getSelectedChild(0).getIndexInParent()
Out[7]: 56
In [8]: sel.isChildSelected(56)
Out[8]: False
In [9]: sel.selectChild(56)
Out[9]: True
In [10]: sel.getSelectedChild(0).getIndexInParent()
Out[10]: 112
With the fix in place:
In [11]: sel = acc.querySelection()
In [12]: sel.getSelectedChild(0).getIndexInParent()
Out[12]: 56
In [13]: sel.isChildSelected(56)
Out[13]: True
In [14]: sel.selectChild(56)
Out[14]: True
In [15]: sel.getSelectedChild(0).getIndexInParent()
Out[15]: 56
In [16]: sel.selectChild(114)
Out[16]: True
In [17]: sel.getSelectedChild(0).getIndexInParent()
Out[17]: 112
(112 instead of 114 for the index of the first selected
child is OK because selecting a cell selects the whole
row and child with index 112 is the first cell in the same
row as the child with index 114.)
Change-Id: I28cd1633dae601818e2a1d310859bd4d55d311ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154714
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index a6997d37d5bf..7157febc3ea3 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -211,7 +211,7 @@ namespace accessibility
void AccessibleTabListBoxTable::implSelectRow( sal_Int32 _nRow, bool
_bSelect )
{
if ( m_pTabListBox )
-m_pTabListBox->Select( m_pTabListBox->GetEntry( _nRow ), _bSelect
);
+m_pTabListBox->SelectRow(_nRow, _bSelect);
}
sal_Int32 AccessibleTabListBoxTable::implGetRowCount() const
@@ -280,7 +280,7 @@ namespace accessibility
ensureIsAlive();
ensureValidIndex( nChildIndex );
-return m_pTabListBox && m_pTabListBox->IsSelected(
m_pTabListBox->GetEntry( implGetRow( nChildIndex ) ) );
+return m_pTabListBox &&
m_pTabListBox->IsRowSelected(implGetRow(nChildIndex));
}
void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( )
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBoxBase.cxx |6 +- accessibility/source/extended/AccessibleGridControlBase.cxx |6 +- 2 files changed, 2 insertions(+), 10 deletions(-) New commits: commit 7835f97113460922cfe14685baa7bcaea2de736a Author: Julien Nabet AuthorDate: Tue Jul 18 16:28:08 2023 +0200 Commit: Julien Nabet CommitDate: Wed Jul 19 14:53:12 2023 +0200 add IndexHint -1 for 2 commitEvent methods in accessibility Change-Id: I3a2d4e0935d48e8d7ff57745dc05aa3e85bd0bdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154590 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index a3b0b0891c53..60d4eb805a67 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -422,11 +422,7 @@ void AccessibleBrowseBoxBase::commitEvent( return; // build an event object -AccessibleEventObject aEvent; -aEvent.Source = *this; -aEvent.EventId = _nEventId; -aEvent.OldValue = _rOldValue; -aEvent.NewValue = _rNewValue; +AccessibleEventObject aEvent(*this, _nEventId, _rOldValue, _rNewValue, -1); // let the notifier handle this event diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 37e3235ee711..2be880e3e37f 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -344,11 +344,7 @@ void AccessibleGridControlBase::commitEvent( return; // build an event object -AccessibleEventObject aEvent; -aEvent.Source = *this; -aEvent.EventId = _nEventId; -aEvent.OldValue = _rOldValue; -aEvent.NewValue = _rNewValue; +AccessibleEventObject aEvent(*this, _nEventId, _rOldValue, _rNewValue, -1); // let the notifier handle this event
[Libreoffice-commits] core.git: accessibility/source include/vcl vcl/source
accessibility/source/standard/vclxaccessibletabpage.cxx | 24 ++--
include/vcl/tabctrl.hxx | 12 --
vcl/source/control/tabctrl.cxx | 85
3 files changed, 12 insertions(+), 109 deletions(-)
New commits:
commit 160ea29f0003812ab1d4e1f6689c608c879ef509
Author: Noel Grandin
AuthorDate: Wed Jun 28 14:55:32 2023 +0200
Commit: Noel Grandin
CommitDate: Thu Jun 29 08:36:11 2023 +0200
maLayoutLineToPageId and maLayoutPageIdToLine are dead.
I removed the code in ImplDrawItem that added data to them,
because ImplDrawItem was only ever called with bLayout with false,
and removing the bLayout param removed that code.
That removal happened in:
commit f0f973da8560e16cba85d2c9465c3a8c4c0ebbb3
Author: Noel Grandin
Date: Wed Mar 16 08:49:35 2016 +0200
loplugin:constantparams in vcl/
And that happened because
I noticed that ImplPaint was only ever called with bLayout==false,
which meant I removed that param and passed bLayout==false to
ImplDrawItem,
in:
commit 911ae0aeca443fb4b5e400ae0f939567b580e443
Author: Noel Grandin
Date: Fri Feb 26 09:36:26 2016 +0200
loplugin:unuseddefaultparams in /include/vcl
which was because the last call to ImplPaint with bLayout == true
was removed in:
commit a6b9d9a19fb8c5c9f166682f52941aee25b89c94
Author: Tomaž Vajngerl
Date: Wed May 6 13:00:13 2015 +0900
refactor "TabControl" to use RenderContext
Change-Id: Id234257201726de95e2c10bfacb30670123ca8a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153713
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 0dae45ca840c..89b0d6c29b2a 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -586,7 +586,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds(
sal_Int32 nIndex )
if ( m_pTabControl )
{
tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
-tools::Rectangle aCharRect = m_pTabControl->GetCharacterBounds(
m_nPageId, nIndex );
+tools::Rectangle aCharRect; // m_pTabControl->GetCharacterBounds(
m_nPageId, nIndex );
aCharRect.Move( -aPageRect.Left(), -aPageRect.Top() );
aBounds = AWTRectangle( aCharRect );
}
@@ -595,21 +595,21 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds(
sal_Int32 nIndex )
}
-sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint )
+sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& /*aPoint*/
)
{
OExternalLockGuard aGuard( this );
sal_Int32 nIndex = -1;
-if ( m_pTabControl )
-{
-sal_uInt16 nPageId = 0;
-tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
-Point aPnt( VCLPoint( aPoint ) );
-aPnt += aPageRect.TopLeft();
-sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
-if ( nI != -1 && m_nPageId == nPageId )
-nIndex = nI;
-}
+//if ( m_pTabControl )
+//{
+//sal_uInt16 nPageId = 0;
+//tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId
);
+//Point aPnt( VCLPoint( aPoint ) );
+//aPnt += aPageRect.TopLeft();
+//sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
+//if ( nI != -1 && m_nPageId == nPageId )
+//nIndex = nI;
+//}
return nIndex;
}
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 3da709d77807..f7db263d2eac 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -69,7 +69,6 @@ protected:
SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext&
rRenderContext, ImplTabItem const * pItem,
const tools::Rectangle& rCurRect,
bool bFirstInGroup,
bool bLastInGroup);
-SAL_DLLPRIVATE void ImplFreeLayoutData();
SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent
);
DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, ListBox&, void );
@@ -78,7 +77,6 @@ protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle
);
-virtual voidFillLayoutData() const override;
virtual const vcl::Font&GetCanonicalFont( const StyleSettings& _rStyle
) const override;
virtual const Color&GetCanonicalTextColor( const StyleSettings&
_rStyle ) const override;
virtual boolImplPlaceTabs( tools::Long nWidth );
@@ -154,16 +152,6 @@ public:
voidSetActivatePageHdl( const
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source extensions/source framework/source include/toolkit include/vcl sc/source sd/source sfx2/source sw/source toolkit/inc to
accessibility/source/extended/accessibletabbar.cxx |2 accessibility/source/standard/accessiblemenucomponent.cxx|2 basctl/source/accessibility/accessibledialogcontrolshape.cxx |1 basctl/source/accessibility/accessibledialogwindow.cxx |1 basctl/source/basicide/baside2.hxx |2 basctl/source/basicide/baside2b.cxx |4 - basctl/source/basicide/textwindowpeer.cxx|2 basctl/source/basicide/textwindowpeer.hxx|4 - basctl/source/dlged/dlged.cxx|1 chart2/source/controller/main/ChartController.cxx|2 extensions/source/bibliography/bibload.cxx |1 extensions/source/bibliography/framectr.cxx |1 framework/source/layoutmanager/helpers.cxx |7 +- framework/source/layoutmanager/helpers.hxx |4 - framework/source/layoutmanager/layoutmanager.cxx |6 - framework/source/layoutmanager/toolbarlayoutmanager.cxx |2 framework/source/layoutmanager/toolbarlayoutmanager.hxx |2 include/toolkit/controls/unocontrol.hxx | 12 +-- include/vcl/toolkit/unowrap.hxx |6 - include/vcl/window.hxx |8 +- sc/source/ui/view/gridwin.cxx|1 sd/source/ui/presenter/PresenterHelper.cxx |2 sfx2/source/doc/iframe.cxx |2 sfx2/source/notebookbar/NotebookbarTabControl.cxx|1 sfx2/source/view/ipclient.cxx|2 sfx2/source/view/sfxbasecontroller.cxx |2 sfx2/source/view/userinputinterception.cxx |2 sw/source/uibase/uiview/viewling.cxx |1 toolkit/inc/controls/svmedit.hxx |2 toolkit/inc/controls/unocontrolcontainer.hxx |2 toolkit/inc/helper/unowrapper.hxx|6 - toolkit/source/awt/vclxtoolkit.cxx |4 - toolkit/source/controls/svmedit.cxx |4 - toolkit/source/controls/unocontrol.cxx | 27 +--- toolkit/source/controls/unocontrolcontainer.cxx |2 toolkit/source/helper/unowrapper.cxx |8 +- vbahelper/source/msforms/vbacontrol.cxx | 34 ++- vbahelper/source/msforms/vbacontrol.hxx |4 - vcl/inc/window.h |4 - vcl/qa/cppunit/lifecycle.cxx |2 vcl/source/app/salvtables.cxx|2 vcl/source/control/ivctrl.cxx|2 vcl/source/treelist/iconview.cxx |2 vcl/source/treelist/treelistbox.cxx |2 vcl/source/window/accessibility.cxx |2 vcl/source/window/stacking.cxx |1 vcl/source/window/window.cxx |8 +- vcl/unx/gtk3/gtkinst.cxx |1 48 files changed, 112 insertions(+), 90 deletions(-) New commits: commit bfdf5d290be3fccb631d50cfea52fbe43fff4dce Author: Noel Grandin AuthorDate: Fri Mar 31 19:15:11 2023 +0200 Commit: Noel Grandin CommitDate: Sat Apr 1 14:42:17 2023 +0200 use more XVclWindowPeer Rather than using it's superclass XWindowPeer and implicitly relying on it being XVclWindowPeer and casting it everywhere. Change-Id: Icfb46f3b920d00f4a167a31803a71bbb0368d05c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149894 Tested-by: Noel Grandin Reviewed-by: Noel Grandin diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index cb7568946ae3..518d068d65ba 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 92718c9b52ba..997abc9817ae 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 36e84bfea9fc..62a260948ff9 100644 ---
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang connectivity/source extensions/source fpicker/source sd/source sfx2/source slideshow/source svl/source svx/source sw/source t
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |4
accessibility/source/extended/accessiblelistboxentry.cxx|2
accessibility/source/standard/vclxaccessibletextfield.cxx |2
compilerplugins/clang/test/unnecessarylocking.cxx | 53 ++
compilerplugins/clang/unnecessarylocking.cxx| 195
+++---
connectivity/source/drivers/firebird/Connection.cxx |1
connectivity/source/drivers/flat/EDatabaseMetaData.cxx |2
connectivity/source/drivers/mysqlc/mysqlc_connection.cxx|2
extensions/source/propctrlr/formcomponenthandler.cxx|1
fpicker/source/office/contentenumeration.cxx|1
sd/source/ui/unoidl/randomnode.cxx |1
sfx2/source/appl/shutdownicon.cxx |2
slideshow/source/engine/slideshowimpl.cxx |4
slideshow/source/engine/slideview.cxx |4
svl/source/numbers/zforlist.cxx |1
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |1
svx/source/accessibility/svxrectctaccessiblecontext.cxx |2
sw/source/core/unocore/unocoll.cxx |1
toolkit/source/controls/unocontrolmodel.cxx | 11
ucb/source/sorter/sortresult.cxx|2
20 files changed, 201 insertions(+), 91 deletions(-)
New commits:
commit 50b68c341f2543c4d841fce4d4b3e080f4491e1d
Author: Noel Grandin
AuthorDate: Thu Mar 9 14:28:47 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 10 11:34:00 2023 +
improve loplugin:unnecessarylocking
to find more locking we can remove
Change-Id: Ief7bc5ec2a1ff31f22a0ad366910b7fcc4725818
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148599
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index f8933e49a5ff..82e8ba091f22 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -626,8 +626,6 @@ namespace accessibility
sal_Int32 SAL_CALL
AccessibleIconChoiceCtrlEntry::getAccessibleActionCount( )
{
-::osl::MutexGuard aGuard( m_aMutex );
-
// three actions supported
return ACCESSIBLE_ACTION_COUNT;
}
@@ -665,8 +663,6 @@ namespace accessibility
Reference< XAccessibleKeyBinding >
AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex )
{
-::osl::MutexGuard aGuard( m_aMutex );
-
Reference< XAccessibleKeyBinding > xRet;
checkActionIndex_Impl( nIndex );
// ... which key?
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index e22c8ce2ba5d..826d9f54cb1e 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -808,8 +808,6 @@ namespace accessibility
Reference< XAccessibleKeyBinding >
AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex )
{
-::osl::MutexGuard aGuard( m_aMutex );
-
Reference< XAccessibleKeyBinding > xRet;
checkActionIndex_Impl( nIndex );
// ... which key?
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx
b/accessibility/source/standard/vclxaccessibletextfield.cxx
index e5121affd7ce..86593506 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -74,8 +74,6 @@ Reference SAL_CALL
VCLXAccessibleTextField::getAccessibleChild (sal
sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole()
{
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
return AccessibleRole::TEXT;
}
diff --git a/compilerplugins/clang/test/unnecessarylocking.cxx
b/compilerplugins/clang/test/unnecessarylocking.cxx
index 6dda5d333191..a2319623140a 100644
--- a/compilerplugins/clang/test/unnecessarylocking.cxx
+++ b/compilerplugins/clang/test/unnecessarylocking.cxx
@@ -8,14 +8,17 @@
*/
#include
+#include
static std::mutex gSolarMutex;
-class SolarMutexGuard : public std::unique_lock
+class SolarMutexGuard
{
+std::unique_lock lock;
+
public:
SolarMutexGuard()
-: std::unique_lock(gSolarMutex)
+: lock(gSolarMutex)
{
}
};
@@ -25,8 +28,8 @@ namespace test1
struct Foo
{
int m_foo;
-// expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
int bar1()
+// expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
{
SolarMutexGuard guard;
return 1;
@@
[Libreoffice-commits] core.git: accessibility/source basctl/source comphelper/Library_comphelper.mk comphelper/source compilerplugins/clang include/comphelper include/IwyuFilter_include.yaml solenv/cl
accessibility/source/extended/accessibleiconchoicectrl.cxx|1 accessibility/source/extended/accessiblelistbox.cxx |1 accessibility/source/extended/accessibletabbar.cxx|1 accessibility/source/extended/accessibletabbarpage.cxx|1 accessibility/source/extended/accessibletabbarpagelist.cxx|1 accessibility/source/extended/textwindowaccessibility.cxx |1 accessibility/source/standard/accessiblemenubasecomponent.cxx |1 accessibility/source/standard/accessiblemenucomponent.cxx |1 accessibility/source/standard/accessiblemenuitemcomponent.cxx |1 accessibility/source/standard/svtaccessiblenumericfield.cxx |1 accessibility/source/standard/vclxaccessiblebutton.cxx|1 accessibility/source/standard/vclxaccessiblecheckbox.cxx |1 accessibility/source/standard/vclxaccessibleedit.cxx |1 accessibility/source/standard/vclxaccessibleheaderbaritem.cxx |1 accessibility/source/standard/vclxaccessiblemenu.cxx |1 accessibility/source/standard/vclxaccessiblemenubar.cxx |1 accessibility/source/standard/vclxaccessiblemenuitem.cxx |1 accessibility/source/standard/vclxaccessiblepopupmenu.cxx |1 accessibility/source/standard/vclxaccessibleradiobutton.cxx |1 accessibility/source/standard/vclxaccessiblescrollbar.cxx |1 accessibility/source/standard/vclxaccessiblestatusbar.cxx |1 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |1 accessibility/source/standard/vclxaccessibletabcontrol.cxx|1 accessibility/source/standard/vclxaccessibletabpage.cxx |1 accessibility/source/standard/vclxaccessibletabpagewindow.cxx |1 accessibility/source/standard/vclxaccessibletextcomponent.cxx |1 accessibility/source/standard/vclxaccessibletoolbox.cxx |1 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |1 basctl/source/accessibility/accessibledialogcontrolshape.cxx |1 basctl/source/accessibility/accessibledialogwindow.cxx|1 comphelper/Library_comphelper.mk |1 comphelper/source/misc/accessiblecomponenthelper.cxx | 206 comphelper/source/misc/accessiblecontexthelper.cxx| 248 -- comphelper/source/misc/accessibleselectionhelper.cxx |1 comphelper/source/misc/accessibletexthelper.cxx |1 compilerplugins/clang/mergeclasses.results|1 include/IwyuFilter_include.yaml |4 include/comphelper/accessiblecomponenthelper.hxx | 117 include/comphelper/accessiblecontexthelper.hxx| 140 - solenv/clang-format/excludelist |1 svx/source/accessibility/charmapacc.cxx |1 svx/source/inc/charmapacc.hxx |4 toolkit/inc/controls/accessiblecontrolcontext.hxx |2 toolkit/source/awt/vclxaccessiblecomponent.cxx|1 toolkit/source/controls/accessiblecontrolcontext.cxx |1 45 files changed, 366 insertions(+), 393 deletions(-) New commits: commit ec98e7769048d44c6d274e3edcac19d5cbc74348 Author: Stephan Bergmann AuthorDate: Fri Jan 6 18:43:28 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 6 19:02:05 2023 + Merge comphelper::OAccessibleContextHelper into comphelper::OCommonAccessibleComponent Change-Id: I586ae8fe2842fd879ae2ae506c659d06dda16843 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145160 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 72ce9854e204..f9f3599bb4b4 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index df4a9a759c0f..d9507fefd4b3 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 8d192b9fe277..0a9747a3e708 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
[Libreoffice-commits] core.git: accessibility/source basctl/source basic/inc basic/source configmgr/source
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |4 +-
accessibility/source/extended/AccessibleGridControlTableCell.cxx |4 +-
accessibility/source/standard/vclxaccessiblelistitem.cxx |4 +-
basctl/source/basicide/basobj2.cxx |4 +-
basctl/source/inc/basobj.hxx |2 -
basic/inc/sbxform.hxx|4 +-
basic/source/sbx/sbxform.cxx | 12 +++---
configmgr/source/access.cxx | 15 ---
configmgr/source/access.hxx |2 -
configmgr/source/data.cxx| 20
+-
configmgr/source/data.hxx|2 -
configmgr/source/partial.cxx |8 ++--
12 files changed, 41 insertions(+), 40 deletions(-)
New commits:
commit 0a7eac8576f313dcaf27ee45326d71fd6b5aea1e
Author: Noel Grandin
AuthorDate: Tue Sep 27 09:37:15 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Sep 27 13:31:20 2022 +0200
use more string_view in accessibility..configmgr
Change-Id: Ie16d36faac7d06e275348ed68e6c6b2518534fd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140636
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 0b9110e361cf..12571484e69d 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -29,9 +29,9 @@ namespace accessibility
namespace
{
/// @throws css::lang::IndexOutOfBoundsException
-void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText )
+void checkIndex_Impl( sal_Int32 _nIndex, std::u16string_view _sText )
{
-if ( _nIndex >= _sText.getLength() )
+if ( _nIndex >= static_cast(_sText.size()) )
throw css::lang::IndexOutOfBoundsException();
}
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index f8a699f54823..91d84902bdee 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -33,9 +33,9 @@ namespace accessibility
// FIXME this is a copy'n'paste from
// source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that...
/// @throws css::lang::IndexOutOfBoundsException
-void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText )
+void checkIndex_Impl( sal_Int32 _nIndex, std::u16string_view _sText )
{
-if ( _nIndex >= _sText.getLength() )
+if ( _nIndex >= static_cast(_sText.size()) )
throw css::lang::IndexOutOfBoundsException();
}
}
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index b7d7d9f50d79..55fd0693718d 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -41,9 +41,9 @@
namespace
{
/// @throws css::lang::IndexOutOfBoundsException
-void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText )
+void checkIndex_Impl( sal_Int32 _nIndex, std::u16string_view _sText )
{
-if ( _nIndex < 0 || _nIndex > _sText.getLength() )
+if ( _nIndex < 0 || _nIndex > static_cast(_sText.size()) )
throw css::lang::IndexOutOfBoundsException();
}
}
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 1b63b99b092a..d145d14fb634 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -77,9 +77,9 @@ void Organize(weld::Window* pParent, sal_Int16 tabId)
weld::DialogController::runAsync(xDlg, [](int) {});
}
-bool IsValidSbxName( const OUString& rName )
+bool IsValidSbxName( std::u16string_view rName )
{
-for ( sal_Int32 nChar = 0; nChar < rName.getLength(); nChar++ )
+for ( size_t nChar = 0; nChar < rName.size(); nChar++ )
{
sal_Unicode c = rName[nChar];
bool bValid = (
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 46d0f9392896..90cb82c13b61 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -45,7 +45,7 @@ namespace basctl
voidBasicStopped( bool* pbAppWindowDisabled = nullptr, bool*
pbDispatcherLocked = nullptr, sal_uInt16* pnWaitCount = nullptr,
SfxUInt16Item** ppSWActionCount = nullptr,
SfxUInt16Item** ppSWLockViewCount = nullptr );
-bool
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/helper/characterattributeshelper.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit aa0a39f2be0cf9d633c3654babc6f738d67f871f Author: Michael Weghorn AuthorDate: Fri Sep 23 20:26:52 2022 +0200 Commit: Michael Weghorn CommitDate: Sun Sep 25 14:44:03 2022 +0200 a11y: Use FontSlant for "CharPosture" The platform a11y integration code expects a `FontSlant` in the "CharPosture" `Any` (s. e.g. `get_style_value`/`FontSlant2Style` in `vcl/unx/gtk3/a11y/atktextattributes.cxx` or `QtAccessibleWidget::attributes`) and that's also what e.g. Writer sets for that attribute for text in the document, so do the same in `CharacterAttributesHelper::CharacterAttributesHelper`. After handling for "CharPosture" was added for the Qt-based VCL plugins in commit 99841da686625428b8ad2e219dd19e5fbfb145f5 Author: Michael Weghorn Date: Tue Jul 20 13:23:21 2021 +0200 qt a11y: Report font style text attribute (e.g. italic) , clicking through the a11y hierarchy of e.g. Writer's "Page Style" dialog in Accerciser's treeview of the LO a11y hierarchy would otherwise crash LO when used with the qt6 VCL plugin. With this in place, the style is reported correctly there. (Tested by temporarily setting "oblique" style using glade for the "Next style" label in the "Organizer" tab in that dialog's UI file.) Change-Id: Ibea42db067e0cdb3b85c80dbcca5939b3dfe5570 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140527 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index 9cbeaaee8a7c..1d6120ff483c 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -19,6 +19,7 @@ #include #include +#include #include using namespace ::com::sun::star::uno; @@ -39,7 +40,7 @@ CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont, sa m_aAttributeMap.emplace( OUString( "CharStrikeout" ), Any( static_cast(rFont.GetStrikeout()) ) ); m_aAttributeMap.emplace( OUString( "CharUnderline" ), Any( static_cast(rFont.GetUnderline()) ) ); m_aAttributeMap.emplace( OUString( "CharWeight" ),Any( static_cast(rFont.GetWeight()) ) ); -m_aAttributeMap.emplace( OUString( "CharPosture" ), Any( static_cast(rFont.GetItalic()) ) ); +m_aAttributeMap.emplace( OUString( "CharPosture" ), Any( vcl::unohelper::ConvertFontSlant(rFont.GetItalic()) ) ); }
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessiblelistboxentry.cxx|2 +-
accessibility/source/standard/vclxaccessiblemenubar.cxx |2 +-
accessibility/source/standard/vclxaccessibletoolboxitem.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 993695d75faa23776d6a664a214cc69546f1f8ae
Author: Mike Kaganski
AuthorDate: Mon Sep 19 08:32:52 2022 +0300
Commit: Mike Kaganski
CommitDate: Mon Sep 19 08:25:05 2022 +0200
OSL_ENSURE->assert where we would crash if not true
Change-Id: Ib6c2806070ae11b5542fcbba284f2640400bf984
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140131
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index f87227dd4531..e22c8ce2ba5d 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -321,7 +321,7 @@ namespace accessibility
Reference< XAccessible > xParent;
if ( !xParent.is() )
{
-OSL_ENSURE( m_aEntryPath.size(),
"AccessibleListBoxEntry::getAccessibleParent: invalid path!" );
+assert( m_aEntryPath.size() ); // invalid path
if ( m_aEntryPath.size() == 1 )
{ // we're a top level entry
// -> our parent is the tree listbox itself
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx
b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 13d1e1db62da..641d10336699 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -66,7 +66,7 @@ bool VCLXAccessibleMenuBar::IsFocused()
IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&,
rEvent, void )
{
-OSL_ENSURE( rEvent.GetWindow(),
"VCLXAccessibleMenuBar::WindowEventListener: no window!" );
+assert( rEvent.GetWindow() );
if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || (
rEvent.GetId() == VclEventId::ObjectDying ) )
{
ProcessWindowEvent( rEvent );
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index c7b49af7de17..a91b7bb80f37 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -66,7 +66,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
m_bIndeterminate( false )
{
-OSL_ENSURE( m_pToolBox, "invalid toolbox" );
+assert( m_pToolBox );
m_nItemId = m_pToolBox->GetItemId( m_nIndexInParent );
m_sOldName = GetText();
m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessibletablistbox.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d29958304b3ff87115ed5af16b482327ea05ce14
Author: PoonamShokeen
AuthorDate: Thu Sep 1 15:02:48 2022 -0500
Commit: Hossein
CommitDate: Thu Sep 15 15:20:43 2022 +0200
tdf#42982 improve UNO API error reporting
Change-Id: Ibaf4bb0a9c9a8f613fd63ccd53a0e29d840fb21a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137904
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/accessibility/source/extended/accessibletablistbox.cxx
b/accessibility/source/extended/accessibletablistbox.cxx
index ef915d08fa01..f4bffa6e7442 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -100,7 +100,7 @@ namespace accessibility
xRet = implGetTable();
if ( !xRet.is() )
-throw RuntimeException();
+throw RuntimeException("getAccessibleChild called with NULL
xRet",static_cast< cppu::OWeakObject * >(this));
return xRet;
}
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format toolkit/inc toolkit/source vcl/inc vcl/source
accessibility/source/standard/vclxaccessiblescrollbar.cxx |2
include/vcl/toolkit/scrbar.hxx|9 +--
solenv/clang-format/excludelist |2
toolkit/inc/helper/scrollabledialog.hxx |2
toolkit/source/awt/vclxtoolkit.cxx|2
toolkit/source/awt/vclxwindows.cxx|2
toolkit/source/controls/table/tablecontrol_impl.cxx |2
toolkit/source/controls/table/tabledatawindow.cxx |2
vcl/inc/pch/precompiled_vcl.hxx | 37 +++---
vcl/inc/slider.hxx|2
vcl/inc/svimpbox.hxx |2
vcl/source/control/imivctl.hxx|4 -
vcl/source/control/imp_listbox.cxx|4 -
vcl/source/control/scrbar.cxx |2
vcl/source/edit/vclmedit.cxx |4 -
vcl/source/window/builder.cxx |2
vcl/source/window/layout.cxx |2
vcl/source/window/tabpage.cxx |2
vcl/source/window/window2.cxx |2
19 files changed, 46 insertions(+), 40 deletions(-)
New commits:
commit 6f377e7baef480745ec7514c252087710ab9f2b0
Author: Caolán McNamara
AuthorDate: Mon Aug 8 12:38:55 2022 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 9 10:01:15 2022 +0200
move scrbar.hxx to vcl/toolkit
Change-Id: I77038cbf500976703ad41365da9a675a698863a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137979
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 57ea5365b141..130b6d71aabb 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -27,7 +27,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/include/vcl/scrbar.hxx b/include/vcl/toolkit/scrbar.hxx
similarity index 97%
rename from include/vcl/scrbar.hxx
rename to include/vcl/toolkit/scrbar.hxx
index dd8f309152b6..32704522bbaf 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/toolkit/scrbar.hxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SCRBAR_HXX
-#define INCLUDED_VCL_SCRBAR_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include
#include
@@ -147,6 +150,4 @@ public:
virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
};
-#endif // INCLUDED_VCL_SCRBAR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2f49fd77545a..0cd36cb7d1c3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6386,7 +6386,6 @@ include/vcl/salgtype.hxx
include/vcl/salnativewidgets.hxx
include/vcl/scheduler.hxx
include/vcl/scopedbitmapaccess.hxx
-include/vcl/scrbar.hxx
include/vcl/seleng.hxx
include/vcl/settings.hxx
include/vcl/split.hxx
@@ -6428,6 +6427,7 @@ include/vcl/toolkit/menubtn.hxx
include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/prgsbar.hxx
include/vcl/toolkit/roadmap.hxx
+include/vcl/toolkit/scrbar.hxx
include/vcl/toolkit/spin.hxx
include/vcl/toolkit/spinfld.hxx
include/vcl/toolkit/svlbitm.hxx
diff --git a/toolkit/inc/helper/scrollabledialog.hxx
b/toolkit/inc/helper/scrollabledialog.hxx
index 26068b4f5c98..b93751c6802d 100644
--- a/toolkit/inc/helper/scrollabledialog.hxx
+++ b/toolkit/inc/helper/scrollabledialog.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
#include
-#include
+#include
namespace toolkit
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 18daef169414..b0650c8602c7 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -111,7 +111,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index e444d6d3ae9d..15b7b3c146cf 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -52,7 +52,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx
b/toolkit/source/controls/table/tablecontrol_impl.cxx
index 9b70c0c2ddb1..1569adba520e 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -33,7 +33,7 @@
#include
[Libreoffice-commits] core.git: accessibility/source chart2/source dbaccess/source desktop/source drawinglayer/source filter/source framework/source include/tools oox/source reportdesign/source sc/qa
accessibility/source/extended/AccessibleGridControlHeader.cxx |8 - chart2/source/controller/accessibility/AccessibleBase.cxx |2 chart2/source/controller/main/ChartController_Window.cxx |6 chart2/source/controller/main/PositionAndSizeHelper.cxx | 38 ++-- dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx |2 desktop/source/lib/init.cxx |2 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |4 filter/source/msfilter/msdffimp.cxx |8 - framework/source/layoutmanager/toolbarlayoutmanager.cxx | 80 +- include/tools/gen.hxx | 13 - oox/source/export/shapes.cxx |4 oox/source/export/vmlexport.cxx |2 reportdesign/source/core/sdr/RptObject.cxx|4 reportdesign/source/ui/misc/UITools.cxx |6 reportdesign/source/ui/report/ReportController.cxx|2 reportdesign/source/ui/report/ReportSection.cxx | 18 +- reportdesign/source/ui/report/ViewsWindow.cxx | 36 ++-- sc/qa/unit/filters-test.cxx | 12 - sc/qa/unit/jumbosheets-test.cxx |8 - sc/qa/unit/subsequent_filters_test.cxx|4 sc/source/filter/xml/xmlexprt.cxx | 12 - sc/source/ui/view/tabview.cxx |2 sc/source/ui/view/tabview3.cxx|4 sd/qa/unit/misc-tests.cxx |2 sd/qa/unit/tiledrendering/tiledrendering.cxx | 28 +-- sd/source/ui/accessibility/AccessiblePageShape.cxx|4 sd/source/ui/animations/CustomAnimationList.cxx |2 sd/source/ui/dlg/headerfooterdlg.cxx |4 sd/source/ui/table/tablefunction.cxx |8 - sd/source/ui/unoidl/unomodel.cxx |2 sd/source/ui/view/drviewsh.cxx|4 sfx2/source/control/recentdocsview.cxx|2 sfx2/source/control/thumbnailviewitem.cxx |6 slideshow/source/engine/rehearsetimingsactivity.cxx |4 svl/source/items/rectitem.cxx |8 - svtools/source/control/tabbar.cxx |6 svx/source/accessibility/AccessibleShape.cxx |4 svx/source/customshapes/EnhancedCustomShape3d.cxx |8 - svx/source/sdr/contact/viewcontactofe3dscene.cxx |4 svx/source/sdr/properties/defaultproperties.cxx |4 svx/source/svdraw/svdedtv1.cxx|2 svx/source/svdraw/svdoashp.cxx|2 svx/source/table/accessiblecell.cxx |2 svx/source/table/svdotable.cxx|6 svx/source/table/tablelayouter.cxx| 16 +- svx/source/tbxctrls/fontworkgallery.cxx |2 svx/source/unodraw/unoshape.cxx |2 sw/qa/extras/tiledrendering/tiledrendering.cxx|4 sw/qa/extras/uiwriter/uiwriter.cxx|2 sw/source/core/crsr/FormFieldButton.cxx |2 sw/source/core/crsr/contentcontrolbutton.cxx |2 sw/source/core/doc/textboxhelper.cxx | 10 - sw/source/core/draw/dflyobj.cxx |4 sw/source/filter/html/htmlflywriter.cxx |4 sw/source/filter/ww8/docxsdrexport.cxx| 17 +- sw/source/filter/ww8/wrtw8esh.cxx | 12 - sw/source/uibase/docvw/HeaderFooterWin.cxx|2 sw/source/uibase/docvw/PageBreakWin.cxx |4 toolkit/source/awt/vclxtoolkit.cxx|4 tools/qa/cppunit/test_rectangle.cxx | 10 - tools/source/generic/gen.cxx |5 vbahelper/source/vbahelper/vbahelper.cxx |6 vcl/qa/cppunit/complextext.cxx|4 vcl/source/app/svapp.cxx |2 vcl/source/control/button.cxx |2 vcl/source/control/combobox.cxx |6 vcl/source/control/fixedhyper.cxx |4 vcl/source/control/imp_listbox.cxx|2 vcl/source/control/scrbar.cxx |4 vcl/source/filter/ipdf/pdfdocument.cxx
[Libreoffice-commits] core.git: accessibility/source basic/source chart2/source connectivity/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source forms/source i18
accessibility/source/extended/accessibletabbar.cxx |3 - accessibility/source/extended/accessibletabbarpagelist.cxx | 13 +++-- accessibility/source/standard/accessiblemenubasecomponent.cxx | 21 - accessibility/source/standard/vclxaccessiblelist.cxx|2 accessibility/source/standard/vclxaccessiblestatusbar.cxx | 15 +++--- accessibility/source/standard/vclxaccessibletabcontrol.cxx | 10 ++-- basic/source/classes/sb.cxx |5 +- basic/source/sbx/sbxarray.cxx |2 basic/source/sbx/sbxcoll.cxx|5 +- chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx |3 - chart2/source/model/main/BaseCoordinateSystem.cxx |2 chart2/source/tools/AxisHelper.cxx |5 +- chart2/source/tools/CommonConverters.cxx|3 - chart2/source/tools/DiagramHelper.cxx |7 +-- chart2/source/tools/InternalData.cxx|5 +- chart2/source/tools/ObjectIdentifier.cxx|7 +-- chart2/source/tools/RegressionCurveHelper.cxx |3 - chart2/source/view/axes/VCartesianAxis.cxx |3 - chart2/source/view/charttypes/AreaChart.cxx |3 - chart2/source/view/charttypes/NetChart.cxx |3 - chart2/source/view/charttypes/VSeriesPlotter.cxx|5 +- connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |3 - connectivity/source/commontools/paramwrapper.cxx|3 - connectivity/source/drivers/file/FPreparedStatement.cxx |3 - connectivity/source/drivers/file/FResultSet.cxx |3 - connectivity/source/drivers/file/FResultSetMetaData.cxx |3 - connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |3 - connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |2 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx |3 - connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |3 - connectivity/source/drivers/postgresql/pq_xcolumns.cxx |3 - connectivity/source/drivers/postgresql/pq_xcontainer.cxx|7 +-- connectivity/source/drivers/postgresql/pq_xindexes.cxx |3 - connectivity/source/drivers/postgresql/pq_xkeys.cxx |3 - connectivity/source/drivers/postgresql/pq_xtables.cxx |3 - connectivity/source/drivers/postgresql/pq_xusers.cxx|3 - connectivity/source/drivers/postgresql/pq_xviews.cxx|3 - connectivity/source/inc/file/FResultSet.hxx |3 - connectivity/source/parse/sqliterator.cxx |5 +- dbaccess/source/core/api/RowSet.cxx |2 dbaccess/source/core/api/RowSetCache.cxx|8 +-- dbaccess/source/core/api/StaticSet.cxx |5 +- dbaccess/source/core/dataaccess/bookmarkcontainer.cxx |3 - dbaccess/source/core/dataaccess/definitioncontainer.cxx |3 - dbaccess/source/ui/control/ColumnControlWindow.cxx |3 - dbaccess/source/ui/dlg/indexfieldscontrol.cxx |3 - dbaccess/source/ui/tabledesign/TEditControl.cxx |3 - dbaccess/source/ui/uno/copytablewizard.cxx |3 - desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 11 ++-- drawinglayer/source/processor3d/zbufferprocessor3d.cxx |3 - editeng/source/editeng/editdoc.cxx | 23 +- editeng/source/editeng/editeng.cxx |3 - editeng/source/editeng/impedit2.cxx |2 extensions/source/propctrlr/formmetadata.cxx|3 - extensions/source/propctrlr/genericpropertyhandler.cxx |3 - forms/source/component/ListBox.cxx |2 forms/source/component/entrylisthelper.cxx |9 ++- forms/source/misc/InterfaceContainer.cxx|9 ++- forms/source/xforms/binding.cxx |3 - i18nutil/source/utility/scripttypedetector.cxx |5 +- linguistic/source/lngopt.cxx|4 + oox/source/ppt/comments.cxx |3 - reportdesign/source/core/api/Functions.cxx |3 -
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang editeng/source scripting/source sc/source sd/source sfx2/source solenv/CompilerTest_compilerplugins_clang.mk starmath/source
accessibility/source/extended/AccessibleGridControlTableCell.cxx |6
compilerplugins/clang/test/unnecessarylocking.cxx| 71 +++
compilerplugins/clang/unnecessarylocking.cxx | 215
++
editeng/source/accessibility/AccessibleImageBullet.cxx |6
sc/source/core/data/dptabsrc.cxx |7
sc/source/ui/unoobj/cellsuno.cxx |3
sc/source/ui/unoobj/chartuno.cxx |1
sc/source/ui/unoobj/docuno.cxx |2
sc/source/ui/unoobj/eventuno.cxx |2
sc/source/ui/unoobj/nameuno.cxx |2
sc/source/ui/unoobj/shapeuno.cxx |2
sc/source/ui/unoobj/targuno.cxx |1
sc/source/ui/unoobj/tokenuno.cxx |1
scripting/source/basprov/baslibnode.cxx |2
scripting/source/basprov/basmodnode.cxx |2
sd/source/ui/accessibility/AccessibleOutlineView.cxx |5
sfx2/source/sidebar/UnoDecks.cxx |2
sfx2/source/sidebar/UnoPanels.cxx|2
solenv/CompilerTest_compilerplugins_clang.mk |1
starmath/source/accessibility.cxx|4
sw/source/core/unocore/unoframe.cxx |2
sw/source/core/unocore/unolinebreak.cxx |2
sw/source/core/unocore/unoparagraph.cxx |1
sw/source/core/unocore/unostyle.cxx |4
sw/source/core/unocore/unotextmarkup.cxx |5
sw/source/uibase/uno/unotxdoc.cxx| 12
toolkit/source/awt/vclxwindows.cxx |1
vcl/source/graphic/UnoGraphicProvider.cxx|4
vcl/source/uitest/uno/uitest_uno.cxx |5
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx |2
30 files changed, 292 insertions(+), 83 deletions(-)
New commits:
commit f2c02331a7dc0a924bbf30cbc279e92621e89590
Author: Noel Grandin
AuthorDate: Thu May 19 15:34:58 2022 +0200
Commit: Noel Grandin
CommitDate: Fri May 20 08:03:27 2022 +0200
new loplugin:unnecessary locking
off by default, since each warning needs careful inspection
Change-Id: I805c1d1cdde531a1afdc76e87b22f879fc3c9753
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134641
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index a3a8afa4895a..20bf37698e9d 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -262,20 +262,14 @@ namespace accessibility
OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( )
{
-SolarMutexGuard aSolarGuard;
-
return OUString();
}
sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart( )
{
-SolarMutexGuard aSolarGuard;
-
return 0;
}
sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd( )
{
-SolarMutexGuard aSolarGuard;
-
return 0;
}
sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32
nStartIndex, sal_Int32 nEndIndex )
diff --git a/compilerplugins/clang/test/unnecessarylocking.cxx
b/compilerplugins/clang/test/unnecessarylocking.cxx
new file mode 100644
index ..6dda5d333191
--- /dev/null
+++ b/compilerplugins/clang/test/unnecessarylocking.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include
+
+static std::mutex gSolarMutex;
+
+class SolarMutexGuard : public std::unique_lock
+{
+public:
+SolarMutexGuard()
+: std::unique_lock(gSolarMutex)
+{
+}
+};
+
+namespace test1
+{
+struct Foo
+{
+int m_foo;
+// expected-error@+1 {{unnecessary locking [loplugin:unnecessarylocking]}}
+int bar1()
+{
+SolarMutexGuard guard;
+return 1;
+}
+// no warning expected
+int bar2()
+{
+SolarMutexGuard guard;
+return m_foo;
+}
+};
+}
+
+namespace test2
+{
+struct Foo
+{
+std::mutex m_aMutex;
+int m_foo;
+
+// expected-error@+1 {{unnecessary
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/textwindowaccessibility.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ffdad488a8d2cd52e7bc81c9dee7c9aa562d80e8
Author: Stephan Bergmann
AuthorDate: Wed May 4 22:35:17 2022 +0200
Commit: Stephan Bergmann
CommitDate: Thu May 5 07:14:56 2022 +0200
Just use Any ctor instead of makeAny in accessibility
Change-Id: I7860a176bfd44d8f5071ece03229bc7f768d9d52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133851
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 4b37b1c78dd7..26186c44ae89 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -2097,9 +2097,9 @@ void Document::handleSelectionChangeNotification()
xParagraph->notifyEvent(
css::accessibility::AccessibleEventId::
CARET_CHANGED,
-css::uno::makeAny< ::sal_Int32 >(
+css::uno::Any( ::sal_Int32 (
nNewLastPara == m_nSelectionLastPara
-? m_nSelectionLastPos : 0),
+? m_nSelectionLastPos : 0)),
css::uno::Any(nNewLastPos));
}
}
@@ -2216,7 +2216,7 @@ void Document::disposeParagraphs()
// static
css::uno::Any Document::mapFontColor(::Color const & rColor)
{
-return css::uno::makeAny(rColor.GetRGBColor());
+return css::uno::Any(rColor.GetRGBColor());
// FIXME keep transparency?
}
[Libreoffice-commits] core.git: accessibility/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source forms/source include/comphelper include/connectivity include/oox inc
accessibility/source/standard/vclxaccessibletoolbox.cxx|4 ++-- chart2/source/inc/BaseCoordinateSystem.hxx |2 +- chart2/source/model/main/BaseCoordinateSystem.cxx |2 +- chart2/source/view/inc/VDataSeries.hxx |2 +- chart2/source/view/main/VDataSeries.cxx|2 +- comphelper/source/misc/accimplaccess.cxx |2 +- connectivity/source/commontools/ConnectionWrapper.cxx |2 +- connectivity/source/commontools/TConnection.cxx|2 +- connectivity/source/commontools/TTableHelper.cxx |2 +- connectivity/source/drivers/calc/CTable.cxx|2 +- connectivity/source/drivers/dbase/DIndex.cxx |2 +- connectivity/source/drivers/dbase/DTable.cxx |2 +- connectivity/source/drivers/file/FConnection.cxx |2 +- connectivity/source/drivers/file/FResultSet.cxx|2 +- connectivity/source/drivers/file/FTable.cxx|2 +- connectivity/source/drivers/firebird/Connection.cxx|2 +- connectivity/source/drivers/firebird/Connection.hxx|2 +- connectivity/source/drivers/flat/ETable.cxx|2 +- connectivity/source/drivers/hsqldb/HTable.cxx |2 +- connectivity/source/drivers/mysql_jdbc/YTable.cxx |2 +- connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |2 +- connectivity/source/drivers/mysqlc/mysqlc_connection.hxx |2 +- connectivity/source/drivers/writer/WTable.cxx |2 +- connectivity/source/inc/TConnection.hxx|2 +- connectivity/source/inc/calc/CTable.hxx|2 +- connectivity/source/inc/dbase/DIndex.hxx |2 +- connectivity/source/inc/dbase/DTable.hxx |2 +- connectivity/source/inc/file/FConnection.hxx |2 +- connectivity/source/inc/file/FResultSet.hxx|2 +- connectivity/source/inc/file/FTable.hxx|2 +- connectivity/source/inc/flat/ETable.hxx|2 +- connectivity/source/inc/hsqldb/HTable.hxx |2 +- connectivity/source/inc/mysql/YTable.hxx |2 +- connectivity/source/inc/writer/WTable.hxx |2 +- connectivity/source/sdbcx/VDescriptor.cxx |2 +- cui/source/dialogs/QrCodeGenDialog.cxx |2 +- dbaccess/source/core/api/RowSet.cxx|4 ++-- dbaccess/source/core/api/RowSet.hxx|4 ++-- dbaccess/source/core/api/TableDeco.cxx |2 +- dbaccess/source/core/api/querydescriptor.cxx |2 +- dbaccess/source/core/api/querydescriptor.hxx |2 +- dbaccess/source/core/api/table.cxx |2 +- dbaccess/source/core/dataaccess/ContentHelper.cxx |2 +- dbaccess/source/core/dataaccess/databasecontext.cxx|2 +- dbaccess/source/core/inc/ContentHelper.hxx |2 +- dbaccess/source/core/inc/TableDeco.hxx |2 +- dbaccess/source/core/inc/databasecontext.hxx |2 +- dbaccess/source/core/inc/table.hxx |2 +- dbaccess/source/ui/inc/JoinExchange.hxx|2 +- dbaccess/source/ui/querydesign/JoinExchange.cxx|2 +- forms/source/richtext/richtextmodel.cxx|2 +- forms/source/richtext/richtextmodel.hxx|2 +- include/comphelper/accimplaccess.hxx |2 +- include/connectivity/ConnectionWrapper.hxx |2 +- include/connectivity/TTableHelper.hxx |2 +- include/connectivity/sdbcx/VDescriptor.hxx |2 +- include/oox/export/chartexport.hxx |2 +- include/oox/shape/ShapeContextHandler.hxx |2 +- include/sfx2/thumbnailview.hxx |2 +- include/sfx2/weldutils.hxx |2 +- include/svtools/embedhlp.hxx |2 +- include/svx/colorbox.hxx |2 +- include/svx/sxmtpitm.hxx |2 +- include/vcl/graph.hxx |2 +- oox/source/export/chartexport.cxx |2 +- oox/source/shape/WpgContext.hxx|2 +- package/inc/ZipPackage.hxx |2 +- package/inc/ZipPackageFolder.hxx |2 +- package/inc/ZipPackageStream.hxx |2 +- package/source/zippackage/ZipPackage.cxx |2 +- package/source/zippackage/ZipPackageFolder.cxx |2 +-
[Libreoffice-commits] core.git: accessibility/source sc/source svtools/source
accessibility/source/extended/AccessibleGridControlTable.cxx |4 -
sc/source/ui/Accessibility/AccessibleCsvControl.cxx |4 -
svtools/source/brwbox/brwbox1.cxx| 42 +--
svtools/source/table/tablecontrol_impl.cxx |8 +-
4 files changed, 30 insertions(+), 28 deletions(-)
New commits:
commit 5a9340bc0e20817ecf23dc1e12653751ca1d
Author: Michael Weghorn
AuthorDate: Mon Mar 28 15:24:23 2022 +0200
Commit: Michael Weghorn
CommitDate: Tue Mar 29 06:51:02 2022 +0200
a11y: Use new table model change types for row/col ins/del
This ports most existing uses of the now deprecated
`AccessibleTableModelChangeType::INSERT` and
`AccessibleTableModelChangeType::DELETE` to emit
events of the the four new table model change types
added in
Change-Id I30821a5acafa4f3d1dafdfc219f3b4568d9a6e89,
"a11y: Add new table model change types for row/col insertion/del"
instead, which among others fixes the a11y events that are sent
on the platform level for gtk3 and macOS,
s. commit message of the mentioned change for more details.
From all I can see, `AccessibleGridControlTable::commitEvent`
is just meant to handle removal of rows, not columns,
so add a corresponding assert there.
(See how only row-related a11y events are emitted
in `svtools/source/table/tablecontrol_impl.cxx`,
and the "columns aren't selectable" comment for
`AccessibleGridControlTable::isAccessibleColumnSelected`.
Given that the full range of rows would previously
have been sent in the `AccessibleTableModelChangeType::DELETE`
event for column removal, this should still have worked in
practice, since this would have cleared the whole vector,
and elements would have been inserted on demand as needed
again later. However, if that should ever be needed in
the future, it should be handled more explicitly.)
The handling of sending events when rows or columns
are inserted or deleted in a Calc spreadsheet is more
fundamentally broken and will be handled in a separate
commit.
Change-Id: Icfd5e326143e8e90cc513e430bfabbba39e7bdc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132218
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 3c635e910d72..00788cdf2d31 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -312,7 +312,9 @@ void AccessibleGridControlTable::commitEvent(sal_Int16
nEventId, const css::uno:
AccessibleTableModelChange aChange;
if (rNewValue >>= aChange)
{
-if (aChange.Type == AccessibleTableModelChangeType::DELETE)
+assert(aChange.Type !=
AccessibleTableModelChangeType::COLUMNS_REMOVED);
+
+if (aChange.Type == AccessibleTableModelChangeType::ROWS_REMOVED)
{
int nColCount = m_aTable.GetColumnCount();
// check valid index - entries are inserted lazily
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 7db93dbe6d25..e9a4a1deef65 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1163,7 +1163,7 @@ void ScAccessibleCsvGrid::SendInsertColumnEvent(
sal_uInt32 nFirstColumn, sal_uI
if( nFirstColumn <= nLastColumn )
{
AccessibleTableModelChange aModelChange(
-AccessibleTableModelChangeType::INSERT, 0, implGetRowCount() - 1,
+AccessibleTableModelChangeType::COLUMNS_INSERTED, -1, -1,
lcl_GetApiColumn( nFirstColumn ), lcl_GetApiColumn( nLastColumn )
);
Any aOldAny, aNewAny;
aNewAny <<= aModelChange;
@@ -1176,7 +1176,7 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent(
sal_uInt32 nFirstColumn, sal_uI
if( nFirstColumn <= nLastColumn )
{
AccessibleTableModelChange aModelChange(
-AccessibleTableModelChangeType::DELETE, 0, implGetRowCount() - 1,
+AccessibleTableModelChangeType::COLUMNS_REMOVED, -1, -1,
lcl_GetApiColumn( nFirstColumn ), lcl_GetApiColumn( nLastColumn )
);
Any aOldAny, aNewAny;
aNewAny <<= aModelChange;
diff --git a/svtools/source/brwbox/brwbox1.cxx
b/svtools/source/brwbox/brwbox1.cxx
index 64efb0e7023f..18a5f772613f 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -495,9 +495,9 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId,
sal_uInt16 nPos )
commitTableEvent(
TABLE_MODEL_CHANGED,
makeAny( AccessibleTableModelChange(
-DELETE,
-0,
-GetRowCount(),
+
[Libreoffice-commits] core.git: accessibility/source basic/source
accessibility/source/extended/accessiblelistboxentry.cxx | 10 +-
basic/source/classes/sbxmod.cxx |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1fb1f0be10b5d6ce3be5bb364b4c9a8eb0d31b54
Author: Deep17
AuthorDate: Sun Mar 6 18:10:46 2022 -0500
Commit: Ilmari Lauhakangas
CommitDate: Mon Mar 7 21:19:01 2022 +0100
tdf#42982: improve UNO API error reporting
Change-Id: I82adf31db09d2157ee8f1c776f33e8a0107c3b51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131090
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index be1d98650324..a1e38012dfff 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -554,7 +554,7 @@ namespace accessibility
EnsureIsAlive();
SvTreeListEntry* pEntry = m_pTreeListBox->GetEntry( VCLPoint( _aPoint
) );
if ( !pEntry )
-throw RuntimeException();
+throw
RuntimeException("AccessibleListBoxEntry::getAccessibleAtPoint - pEntry cannot
be empty!");
Reference< XAccessible > xAcc;
uno::Reference xListBox(m_wListBox);
@@ -878,7 +878,7 @@ namespace accessibility
SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
if ( !pParent )
-throw RuntimeException();
+throw
RuntimeException("AccessibleListBoxEntry::clearAccessibleSelection - pParent
cannot be empty!");
sal_Int32 nCount = m_pTreeListBox->GetLevelChildCount( pParent );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
@@ -897,7 +897,7 @@ namespace accessibility
SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
if ( !pParent )
-throw RuntimeException();
+throw
RuntimeException("AccessibleListBoxEntry::selectAllAccessibleChildren - pParent
cannot be empty!");
sal_Int32 nCount = m_pTreeListBox->GetLevelChildCount( pParent );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
@@ -918,7 +918,7 @@ namespace accessibility
SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
if ( !pParent )
-throw RuntimeException();
+throw
RuntimeException("AccessibleListBoxEntry::getSelectedAccessibleChildCount -
pParent cannot be empty!");
nCount = m_pTreeListBox->GetLevelChildCount( pParent );
for ( i = 0; i < nCount; ++i )
{
@@ -945,7 +945,7 @@ namespace accessibility
SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
if ( !pParent )
-throw RuntimeException();
+throw
RuntimeException("AccessibleListBoxEntry::getSelectedAccessibleChild - pParent
cannot be empty!");
nCount = m_pTreeListBox->GetLevelChildCount( pParent );
for ( i = 0; i < nCount; ++i )
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index e9502a29aa13..93feaf984d4d 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -198,7 +198,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName,
const Sequence< Any >&
return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex,
aOutParam );
SbMethodRef pMethod = getMethod( aFunctionName );
if ( !pMethod.is() )
-throw RuntimeException();
+throw RuntimeException("DocObjectWrapper::invoke - Could not get the
method reference!");
// check number of parameters
sal_Int32 nParamsCount = aParams.getLength();
SbxInfo* pInfo = pMethod->GetInfo();
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleGridControlHeader.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 5189fd943a522b8158002d6c34a897a9034b8819
Author: Michael Weghorn
AuthorDate: Thu Mar 3 16:30:18 2022 +0100
Commit: Michael Weghorn
CommitDate: Fri Mar 4 08:04:31 2022 +0100
a11y: Use more conventional indentation of 4 spaces
I hadn't even noticed that 5 spaces were used
until the Jenkins CI build for my change adding
a single line only indented by 4 spaces failed [1] due
to our clang indentation plugin...
[1]
https://gerrit.libreoffice.org/c/core/+/130924/1#message-7a5209670085f69e53fd592ba41c2bd4b74a360a
Change-Id: I859e8de4c02ff33c6a9fee957d868cf6e4ddd907
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130932
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 7c6c2df5925d..122e6ab50575 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -74,11 +74,11 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32
nChildIndex )
sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
{
- ensureIsAlive();
- if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR &&
m_aTable.HasColHeader())
- return 1;
- else
- return 0;
+ensureIsAlive();
+if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR &&
m_aTable.HasColHeader())
+return 1;
+else
+return 0;
}
// XAccessibleComponent ---
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleGridControlTable.cxx | 12 ---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit dc4c55c51d52340c84e21da92d61d3488a253cd3
Author: Michael Weghorn
AuthorDate: Wed Feb 23 14:08:11 2022 +0100
Commit: Michael Weghorn
CommitDate: Thu Feb 24 07:21:12 2022 +0100
a11y: Simplify AccessibleGridControlTable::getAccessibleCellAt
Call 'AccessibleGridControlTable::getAccessibleChild'
with the calculated child index instead of duplicating
the handling to retrieve/create the proper
accessible object.
Change-Id: I8135f379f304d0e8ac61806eba9b3bd6c644f3a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130443
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 8938ba83a122..da634269b049 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -181,18 +181,8 @@ Reference< XAccessible > SAL_CALL
AccessibleGridControlTable::getAccessibleCellA
ensureIsAlive();
ensureIsValidAddress( nRow, nColumn );
-sal_Int32 nCount = getAccessibleChildCount();
sal_Int32 nChildIndex = nRow*m_aTable.GetColumnCount() + nColumn;
-if(m_aCellVector.empty() || m_aCellVector.size() !=
static_cast(nCount))
-{
-m_aCellVector.resize(nCount);
-}
-if(!m_aCellVector[nChildIndex].is())
-{
-rtl::Reference pCell = new
AccessibleGridControlTableCell(this, m_aTable, nRow, nColumn);
-m_aCellVector[nChildIndex] = pCell;
-}
-return m_aCellVector[nChildIndex];
+return getAccessibleChild(nChildIndex);
}
sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected(
[Libreoffice-commits] core.git: accessibility/source basic/source connectivity/source editeng/source sc/source
accessibility/source/standard/vclxaccessibleedit.cxx |2 -
basic/source/runtime/methods.cxx |5 ++--
basic/source/runtime/runtime.cxx |2 -
basic/source/sbx/sbxstr.cxx |2 -
connectivity/source/drivers/file/FStringFunctions.cxx | 21 --
editeng/source/editeng/impedit3.cxx |4 +--
sc/source/core/data/table4.cxx|4 +--
7 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 5bd55c22c1bd3e4daed48f9c162557dc9161d4ac
Author: Mike Kaganski
AuthorDate: Sun Feb 6 07:09:38 2022 +0100
Commit: Mike Kaganski
CommitDate: Sun Feb 6 13:13:49 2022 +0100
We know the length here
Change-Id: I630b7fbda7c9ebf578e74260a0d67eea32e9e429
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129549
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx
b/accessibility/source/standard/vclxaccessibleedit.cxx
index 87cfcdb62f30..d41c29737d62 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -135,7 +135,7 @@ OUString VCLXAccessibleEdit::implGetText()
sal_Unicode cEchoChar = pEdit->GetEchoChar();
if ( !cEchoChar )
cEchoChar = '*';
-OUStringBuffer sTmp;
+OUStringBuffer sTmp(aText.getLength());
aText = comphelper::string::padToLength(sTmp, aText.getLength(),
cEchoChar).makeStringAndClear();
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index fd0c0531168c..7113e6e34f4c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1610,8 +1610,9 @@ void SbRtl_Tab(StarBASIC *, SbxArray & rPar, bool)
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
{
-OUStringBuffer aStr;
-comphelper::string::padToLength(aStr, rPar.Get(1)->GetLong(), '\t');
+const sal_Int32 nCount = std::max(rPar.Get(1)->GetLong(),
sal_Int32(0));
+OUStringBuffer aStr(nCount);
+comphelper::string::padToLength(aStr, nCount, '\t');
rPar.Get(0)->PutString(aStr.makeStringAndClear());
}
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index afc785e76b32..6cdc371d4147 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -4585,7 +4585,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar,
SbxDataType t, sal_uInt3
if( bFixedString )
{
sal_uInt16 nCount = static_cast( nOp2 >> 17 ); // len
= all bits above 0x1
-OUStringBuffer aBuf;
+OUStringBuffer aBuf(nCount);
comphelper::string::padToLength(aBuf, nCount);
pVar->PutString(aBuf.makeStringAndClear());
}
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index 0c6fc19d514b..4e447bb600bb 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -302,7 +302,7 @@ SbxArray* StringToByteArray(const OUString& rStr)
OUString ByteArrayToString(SbxArray* pArr)
{
sal_uInt32 nCount = pArr->Count();
-OUStringBuffer aStrBuf;
+OUStringBuffer aStrBuf((nCount + 1) / 2);
sal_Unicode aChar = 0;
for( sal_uInt32 i = 0 ; i < nCount ; i++ )
{
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx
b/connectivity/source/drivers/file/FStringFunctions.cxx
index 619c1a128dbf..94152bc5d01c 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -18,6 +18,8 @@
*/
#include
+
+#include
#include
using namespace connectivity;
@@ -61,7 +63,7 @@ ORowSetValue OOp_Char::operate(const
std::vector& lhs) const
if (lhs.empty())
return ORowSetValue();
-OUStringBuffer sRet;
+OUStringBuffer sRet(static_cast(lhs.size()));
std::vector::const_reverse_iterator aIter = lhs.rbegin();
std::vector::const_reverse_iterator aEnd = lhs.rend();
for (; aIter != aEnd; ++aIter)
@@ -151,13 +153,9 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs)
const
if (lhs.isNull())
return lhs;
-const char c = ' ';
-OUStringBuffer sRet;
-sal_Int32 nCount = lhs.getInt32();
-for (sal_Int32 i = 0; i < nCount; ++i)
-{
-sRet.appendAscii(, 1);
-}
+sal_Int32 nCount = std::max(lhs.getInt32(), sal_Int32(0));
+OUStringBuffer sRet(nCount);
+comphelper::string::padToLength(sRet, nCount, ' ');
return sRet.makeStringAndClear();
}
@@ -184,11 +182,12 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,
const ORowSetValue& rh
if (lhs.isNull() || rhs.isNull())
return lhs;
-OUStringBuffer sRet;
-sal_Int32 nCount = rhs.getInt32();
+const OUString s = lhs.getString();
+const sal_Int32
[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basegfx/source basic/source
accessibility/source/extended/accessiblelistboxentry.cxx | 39 ++--
avmedia/source/viewer/mediawindow.cxx| 56 +++---
basctl/source/basicide/basobj2.cxx | 41 ++--
basctl/source/basicide/basobj3.cxx | 32 +--
basctl/source/basicide/scriptdocument.cxx| 29 +--
basegfx/source/inc/hommatrixtemplate.hxx | 28 +--
basegfx/source/polygon/b2dpolygon.cxx| 53 ++---
basegfx/source/polygon/b2dpolygontools.cxx | 138 +++
basegfx/source/polygon/b2dpolygontriangulator.cxx| 28 +--
basegfx/source/polygon/b2dtrapezoid.cxx | 40 ++--
basic/source/classes/sbxmod.cxx | 56 +++---
basic/source/runtime/dllmgr-none.cxx | 41 ++--
basic/source/runtime/runtime.cxx | 59 +++---
basic/source/sbx/sbxvalue.cxx| 62 +++---
14 files changed, 345 insertions(+), 357 deletions(-)
New commits:
commit 26f46b861d8504033685b2eec4d003eef8109a27
Author: Noel Grandin
AuthorDate: Tue Dec 21 13:29:14 2021 +0200
Commit: Noel Grandin
CommitDate: Tue Dec 21 13:43:06 2021 +0100
loplugin:flatten in accessibility..basic
Change-Id: If2cc282c2b135d634daf393a082c29049b10a677
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127223
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 716955b69595..be1d98650324 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -409,30 +409,29 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
SvTreeListBox* pBox = m_pTreeListBox;
-if(pBox)
+if(!pBox)
+return AccessibleRole::UNKNOWN;
+
+SvTreeFlags treeFlag = pBox->GetTreeFlags();
+if(treeFlag & SvTreeFlags::CHKBTN )
{
-SvTreeFlags treeFlag = pBox->GetTreeFlags();
-if(treeFlag & SvTreeFlags::CHKBTN )
+SvTreeListEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath );
+SvButtonState eState = pBox->GetCheckButtonState( pEntry );
+switch( eState )
{
-SvTreeListEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath
);
-SvButtonState eState = pBox->GetCheckButtonState( pEntry );
-switch( eState )
-{
-case SvButtonState::Checked:
-case SvButtonState::Unchecked:
-return AccessibleRole::CHECK_BOX;
-case SvButtonState::Tristate:
-default:
-return AccessibleRole::LABEL;
-}
+case SvButtonState::Checked:
+case SvButtonState::Unchecked:
+return AccessibleRole::CHECK_BOX;
+case SvButtonState::Tristate:
+default:
+return AccessibleRole::LABEL;
}
-if (GetRoleType() == 0)
-return AccessibleRole::LIST_ITEM;
-else
-//o is: return AccessibleRole::LABEL;
-return AccessibleRole::TREE_ITEM;
}
-return AccessibleRole::UNKNOWN;
+if (GetRoleType() == 0)
+return AccessibleRole::LIST_ITEM;
+else
+//o is: return AccessibleRole::LABEL;
+return AccessibleRole::TREE_ITEM;
}
OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( )
diff --git a/avmedia/source/viewer/mediawindow.cxx
b/avmedia/source/viewer/mediawindow.cxx
index 4ff32f636eb6..039ef62d4693 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -300,45 +300,45 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const
OUString& rReferer, bo
{
const INetURLObject aURL( rURL );
-if( aURL.GetProtocol() != INetProtocol::NotValid )
+if( aURL.GetProtocol() == INetProtocol::NotValid )
+return false;
+
+if( bDeep || pPreferredSizePixel )
{
-if( bDeep || pPreferredSizePixel )
+try
{
-try
-{
-uno::Reference< media::XPlayer > xPlayer(
priv::MediaWindowImpl::createPlayer(
-aURL.GetMainURL(
INetURLObject::DecodeMechanism::Unambiguous ),
-rReferer, nullptr
) );
+uno::Reference< media::XPlayer > xPlayer(
priv::MediaWindowImpl::createPlayer(
+aURL.GetMainURL(
INetURLObject::DecodeMechanism::Unambiguous ),
+rReferer, nullptr ) );
-
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleGridControlTable.cxx |3 -
accessibility/source/extended/AccessibleGridControlTableBase.cxx |3 -
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 22
+-
3 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit ada320547db4c7ddbb05d10df4140ea988f29973
Author: Mike Kaganski
AuthorDate: Thu Oct 28 16:01:34 2021 +0300
Commit: Mike Kaganski
CommitDate: Thu Oct 28 20:09:41 2021 +0200
Prepare for removal of non-const operator[] from Sequence in accessibility
Change-Id: I9454befb46767255451c490eab17e331eb8bb9dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124334
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index ffb8108d0f24..8938ba83a122 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -238,8 +238,9 @@ void SAL_CALL
AccessibleGridControlTable::selectAllAccessibleChildren()
ensureIsAlive();
Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
+auto selectedRowsRange = asNonConstRange(selectedRows);
for(tools::Long i=0; i&
{
sal_Int32 const selectionCount( m_aTable.GetSelectedRowCount() );
rSeq.realloc( selectionCount );
+auto pSeq = rSeq.getArray();
for ( sal_Int32 i=0; i
VCLXAccessibleMenuItem::getAccessibleActionKe
{
Reference< XAccessibleContext > xParentContext(
xParent->getAccessibleContext() );
if ( xParentContext.is() && xParentContext->getAccessibleRole() ==
AccessibleRole::MENU_BAR )
-aSeq1[0].Modifiers |= awt::KeyModifier::MOD2;
+aSeq1.getArray()[0].Modifiers |= awt::KeyModifier::MOD2;
}
pKeyBindingHelper->AddKeyBinding( aSeq1 );
@@ -490,14 +490,18 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
static_cast< sal_Int16 >(aAccelKeyCode.GetFunction())
}
};
-if ( aAccelKeyCode.IsShift() )
-aSeq3[0].Modifiers |= awt::KeyModifier::SHIFT;
-if ( aAccelKeyCode.IsMod1() )
-aSeq3[0].Modifiers |= awt::KeyModifier::MOD1;
-if ( aAccelKeyCode.IsMod2() )
-aSeq3[0].Modifiers |= awt::KeyModifier::MOD2;
-if ( aAccelKeyCode.IsMod3() )
-aSeq3[0].Modifiers |= awt::KeyModifier::MOD3;
+if (aAccelKeyCode.GetModifier() != 0)
+{
+auto pSeq3 = aSeq3.getArray();
+if ( aAccelKeyCode.IsShift() )
+pSeq3[0].Modifiers |= awt::KeyModifier::SHIFT;
+if ( aAccelKeyCode.IsMod1() )
+pSeq3[0].Modifiers |= awt::KeyModifier::MOD1;
+if ( aAccelKeyCode.IsMod2() )
+pSeq3[0].Modifiers |= awt::KeyModifier::MOD2;
+if ( aAccelKeyCode.IsMod3() )
+pSeq3[0].Modifiers |= awt::KeyModifier::MOD3;
+}
pKeyBindingHelper->AddKeyBinding( aSeq3 );
}
}
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 27 ++-
1 file changed, 18 insertions(+), 9 deletions(-)
New commits:
commit c82aa206ab496248dd107c41ff5f66ec5a2399ac
Author: Julien Nabet
AuthorDate: Sun Oct 17 12:12:22 2021 +0200
Commit: Caolán McNamara
CommitDate: Sun Oct 17 22:05:27 2021 +0200
Simplify Sequence in accessibility
+ retrieve a missing aKeyEvent.GetCharCode() aSeq3
Change-Id: If575513996304f67b8e87a145052cb1b9279a212
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123719
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index f8b125c1400e..8ad81ee06ed9 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -440,8 +440,15 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
// activation key
KeyEvent aKeyEvent = m_pParent->GetActivationKey(
m_pParent->GetItemId( m_nItemPos ) );
vcl::KeyCode aKeyCode = aKeyEvent.GetKeyCode();
-Sequence< awt::KeyStroke > aSeq1(1);
-aSeq1[0].Modifiers = 0;
+Sequence< awt::KeyStroke > aSeq1
+{
+{
+0, // Modifiers
+static_cast< sal_Int16 >(aKeyCode.GetCode()),
+aKeyEvent.GetCharCode(),
+static_cast< sal_Int16 >( aKeyCode.GetFunction())
+}
+};
Reference< XAccessible > xParent( getAccessibleParent() );
if ( xParent.is() )
{
@@ -449,9 +456,6 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
if ( xParentContext.is() && xParentContext->getAccessibleRole() ==
AccessibleRole::MENU_BAR )
aSeq1[0].Modifiers |= awt::KeyModifier::MOD2;
}
-aSeq1[0].KeyCode = aKeyCode.GetCode();
-aSeq1[0].KeyChar = aKeyEvent.GetCharCode();
-aSeq1[0].KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() );
pKeyBindingHelper->AddKeyBinding( aSeq1 );
// complete menu activation key sequence
@@ -477,8 +481,15 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
vcl::KeyCode aAccelKeyCode = m_pParent->GetAccelKey(
m_pParent->GetItemId( m_nItemPos ) );
if ( aAccelKeyCode.GetCode() != 0 )
{
-Sequence< awt::KeyStroke > aSeq3(1);
-aSeq3[0].Modifiers = 0;
+Sequence< awt::KeyStroke > aSeq3
+{
+{
+0, // Modifiers
+static_cast< sal_Int16 >(aAccelKeyCode.GetCode()),
+aKeyEvent.GetCharCode(),
+static_cast< sal_Int16 >(aAccelKeyCode.GetFunction())
+}
+};
if ( aAccelKeyCode.IsShift() )
aSeq3[0].Modifiers |= awt::KeyModifier::SHIFT;
if ( aAccelKeyCode.IsMod1() )
@@ -487,8 +498,6 @@ Reference< XAccessibleKeyBinding >
VCLXAccessibleMenuItem::getAccessibleActionKe
aSeq3[0].Modifiers |= awt::KeyModifier::MOD2;
if ( aAccelKeyCode.IsMod3() )
aSeq3[0].Modifiers |= awt::KeyModifier::MOD3;
-aSeq3[0].KeyCode = aAccelKeyCode.GetCode();
-aSeq3[0].KeyFunc = static_cast< sal_Int16 >(
aAccelKeyCode.GetFunction() );
pKeyBindingHelper->AddKeyBinding( aSeq3 );
}
}
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source comphelper/source compilerplugins/clang configmgr/source connectivity/source cppuhelper/source cui/source dbaccess/sour
UnoControls/source/base/basecontainercontrol.cxx |2 accessibility/source/standard/vclxaccessibleedit.cxx |5 basctl/source/basicide/scriptdocument.cxx |2 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |2 chart2/source/model/template/ColumnLineDataInterpreter.cxx |4 chart2/source/tools/ReferenceSizeProvider.cxx |4 chart2/source/view/axes/VCoordinateSystem.cxx |4 chart2/source/view/main/VDataSeries.cxx|2 comphelper/source/property/opropertybag.cxx|2 comphelper/source/property/property.cxx| 18 -- comphelper/source/property/propertycontainerhelper.cxx |2 compilerplugins/clang/sequenceloop.cxx | 83 -- compilerplugins/clang/test/constvars.cxx | 15 - compilerplugins/clang/test/sequenceloop.cxx| 35 configmgr/source/writemodfile.cxx |4 connectivity/source/commontools/ConnectionWrapper.cxx |2 connectivity/source/commontools/dbtools.cxx|9 - connectivity/source/drivers/jdbc/JStatement.cxx|2 connectivity/source/drivers/odbc/OStatement.cxx|2 connectivity/source/sdbcx/VDescriptor.cxx |2 cppuhelper/source/factory.cxx |2 cui/source/customize/cfg.cxx |2 cui/source/dialogs/AdditionsDialog.cxx |2 cui/source/options/optaboutconfig.cxx |4 cui/source/options/optgenrl.cxx|2 dbaccess/source/core/api/TableDeco.cxx |2 dbaccess/source/core/api/definitioncolumn.cxx |2 dbaccess/source/core/api/table.cxx |2 dbaccess/source/core/dataaccess/databasedocument.cxx |2 dbaccess/source/core/dataaccess/datasource.cxx |4 dbaccess/source/filter/xml/xmlExport.cxx |2 dbaccess/source/ui/browser/formadapter.cxx |2 dbaccess/source/ui/browser/sbamultiplex.cxx|2 dbaccess/source/ui/browser/unodatbr.cxx|2 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx |2 dbaccess/source/ui/querydesign/querycontroller.cxx |2 desktop/source/lib/init.cxx| 14 - editeng/source/accessibility/AccessibleEditableTextPara.cxx|2 embeddedobj/source/commonembedding/embedobj.cxx|2 extensions/source/propctrlr/formcomponenthandler.cxx |2 extensions/source/propctrlr/stringrepresentation.cxx |2 filter/source/pdf/pdffilter.cxx|2 forms/source/misc/InterfaceContainer.cxx |2 framework/source/fwe/classes/addonsoptions.cxx |6 i18npool/source/calendar/calendarImpl.cxx |2 i18npool/source/collator/collatorImpl.cxx |4 i18npool/source/localedata/localedata.cxx |6 i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx |2 i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx |2 i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx |2 i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx |2 i18npool/source/transliteration/transliterationImpl.cxx| 10 - i18npool/source/transliteration/transliteration_OneToOne.cxx |2 i18npool/source/transliteration/transliteration_body.cxx |2 include/com/sun/star/uno/Sequence.h|4 include/com/sun/star/uno/Sequence.hxx |8 include/comphelper/basicio.hxx |2 include/comphelper/propertysequence.hxx|4 include/comphelper/sequence.hxx|2 linguistic/source/lngsvcmgr.cxx|8 oox/source/drawingml/customshapeproperties.cxx |2 oox/source/export/chartexport.cxx |2
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source framework/source include/sfx2 inclu
accessibility/source/extended/AccessibleBrowseBox.cxx |2 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |4 accessibility/source/extended/AccessibleGridControl.cxx|2 accessibility/source/extended/AccessibleGridControlBase.cxx|4 accessibility/source/extended/accessibleiconchoicectrlentry.cxx|6 - accessibility/source/extended/accessiblelistboxentry.cxx |6 - accessibility/source/extended/accessibletabbar.cxx |2 accessibility/source/extended/accessibletabbarpagelist.cxx |2 accessibility/source/standard/accessiblemenubasecomponent.cxx |2 accessibility/source/standard/vclxaccessiblelistitem.cxx |2 accessibility/source/standard/vclxaccessibletabpage.cxx|2 basctl/source/accessibility/accessibledialogwindow.cxx |4 basctl/source/basicide/bastypes.cxx|2 basctl/source/dlged/dlgedfunc.cxx |4 basctl/source/dlged/dlgedview.cxx |2 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2 dbaccess/source/ui/browser/sbagrid.cxx |4 dbaccess/source/ui/querydesign/JoinTableView.cxx |4 dbaccess/source/ui/querydesign/TableWindowAccess.cxx |4 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|6 - desktop/source/lib/init.cxx| 10 - drawinglayer/source/processor2d/vclprocessor2d.cxx |4 editeng/source/accessibility/AccessibleEditableTextPara.cxx|6 - editeng/source/accessibility/AccessibleImageBullet.cxx |2 editeng/source/accessibility/AccessibleStringWrap.cxx |2 editeng/source/editeng/impedit.cxx | 12 +- editeng/source/outliner/outlin2.cxx|2 editeng/source/outliner/outlvw.cxx |8 - editeng/source/uno/unoedprx.cxx|2 extensions/source/scanner/grid.cxx |2 framework/source/layoutmanager/toolbarlayoutmanager.cxx| 24 ++-- include/sfx2/LokControlHandler.hxx |4 include/tools/gen.hxx | 14 +- include/tools/poly.hxx |2 include/vcl/region.hxx |4 oox/source/vml/vmldrawing.cxx |2 reportdesign/source/ui/report/SectionView.cxx |2 reportdesign/source/ui/report/StartMarker.cxx |2 reportdesign/source/ui/report/ViewsWindow.cxx |4 reportdesign/source/ui/report/dlgedfunc.cxx|2 sc/qa/unit/tiledrendering/tiledrendering.cxx |2 sc/source/core/data/documen5.cxx |2 sc/source/core/data/documen9.cxx |8 - sc/source/core/data/drwlayer.cxx | 12 +- sc/source/core/tool/detfunc.cxx|6 - sc/source/filter/html/htmlexp2.cxx |2 sc/source/ui/Accessibility/AccessibleContextBase.cxx |4 sc/source/ui/Accessibility/AccessibleDocument.cxx |2 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 14 +- sc/source/ui/dbgui/csvgrid.cxx |2 sc/source/ui/dbgui/csvruler.cxx|2 sc/source/ui/drawfunc/fudraw.cxx |2 sc/source/ui/drawfunc/fusel2.cxx |2 sc/source/ui/unoobj/docuno.cxx |2 sc/source/ui/view/gridwin.cxx | 16 +- sc/source/ui/view/gridwin2.cxx |4 sc/source/ui/view/prevloc.cxx |8 - sc/source/ui/view/printfun.cxx |4 sc/source/ui/view/tabview3.cxx |2 sd/qa/unit/tiledrendering/tiledrendering.cxx |2 sd/source/ui/animations/motionpathtag.cxx |2 sd/source/ui/annotations/annotationmanager.cxx |2 sd/source/ui/docshell/sdclient.cxx |2 sd/source/ui/func/fudraw.cxx |2 sd/source/ui/func/fupoor.cxx |4
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/accessiblemenuitemcomponent.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d383a70c46e0dcbe74d6765cd5a394428c198917 Author: Baran Aytas AuthorDate: Wed Sep 1 01:09:17 2021 +0300 Commit: Michael Weghorn CommitDate: Mon Sep 6 07:48:16 2021 +0200 tdf#114441: Convert use of sal_uLong to better integer types Change-Id: I15dac18e25d9a0c49a3c1e7c08407d1d2b23467a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121410 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 4b0707291eff..e61c7452e9ec 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -131,7 +131,7 @@ void OAccessibleMenuItemComponent::Click() // that the popup menus are executed synchronously. AllSettings aSettings = pWindow->GetSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings(); -sal_uLong nDelay = aMouseSettings.GetMenuDelay(); +sal_Int32 nDelay = aMouseSettings.GetMenuDelay(); aMouseSettings.SetMenuDelay( 0 ); aSettings.SetMouseSettings( aMouseSettings ); pWindow->SetSettings( aSettings );
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format vcl/inc vcl/source
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |1
accessibility/source/extended/accessiblelistboxentry.cxx|1
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |2
include/vcl/ctrl.hxx| 55 ++
include/vcl/toolkit/controllayout.hxx | 80
--
solenv/clang-format/excludelist |1
vcl/inc/pch/precompiled_vcl.hxx |1
vcl/inc/toolbox.h |1
vcl/source/control/button.cxx |7
vcl/source/control/combobox.cxx |3
vcl/source/control/ctrl.cxx | 41 ++---
vcl/source/control/edit.cxx |3
vcl/source/control/fixed.cxx| 11 -
vcl/source/control/imp_listbox.cxx |9 -
vcl/source/control/listbox.cxx |3
vcl/source/control/spinfld.cxx |3
vcl/source/control/tabctrl.cxx | 11 -
vcl/source/outdev/text.cxx |2
vcl/source/toolkit/group.cxx|7
vcl/source/window/menu.cxx |1
20 files changed, 98 insertions(+), 145 deletions(-)
New commits:
commit 2c1ae17421af0fc0e398b66bc2a07f27977a5bf0
Author: Noel Grandin
AuthorDate: Sun Aug 8 21:08:37 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 8 22:32:12 2021 +0200
no need to allocate ControlLayoutData separately
Change-Id: I239befdaa05beea5200c81f23d0af861c9fc3baa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120177
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index b4ed1db209ab..8cc2f083ad63 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index ceacee0b4489..06cc2cf6897e 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -29,7 +29,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index b647036c316d..8406742060ac 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -30,10 +30,10 @@
#include
#include
#include
+#include
#include
#include
#include
-#include
#include
#include
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index cde59c6f9e0f..a6797cc734bb 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -20,19 +20,68 @@
#ifndef INCLUDED_VCL_CTRL_HXX
#define INCLUDED_VCL_CTRL_HXX
+#include
#include
+#include
#include
#include
-#include
+#include
+#include
// forward
class StyleSettings;
-namespace vcl { struct ControlLayoutData; }
+class Control;
+
+namespace vcl
+{
+
+struct VCL_DLLPUBLIC ControlLayoutData
+{
+// contains the string really displayed
+// there must be exactly one bounding rectangle in m_aUnicodeBoundRects
+// for every character in m_aDisplayText
+OUStringm_aDisplayText;
+// the bounding rectangle of every character
+// where one character may consist of many glyphs
+std::vector< tools::Rectangle >m_aUnicodeBoundRects;
+// start indices of lines
+std::vector< tools::Long > m_aLineIndices;
+// notify parent control on destruction
+VclPtr m_pParent;
+
+ControlLayoutData();
+~ControlLayoutData();
+
+tools::Rectangle GetCharacterBounds( tools::Long nIndex ) const;
+// returns the character index for corresponding to rPoint (in control
coordinates)
+// -1 is returned if no character is at that point
+tools::Long GetIndexForPoint( const Point& rPoint ) const;
+// returns the number of lines in the result of GetDisplayText()
+tools::Long GetLineCount() const;
+// returns the interval [start,end] of line nLine
+// returns [-1,-1] for an invalid line
+::Pair GetLineStartEnd( tools::Long nLine ) const;
+/** ToRelativeLineIndex changes a layout data index to a count relative to
its line.
+
+This is
[Libreoffice-commits] core.git: accessibility/source binaryurp/source
accessibility/source/extended/AccessibleGridControlHeader.cxx |6 ++
accessibility/source/extended/AccessibleGridControlTable.cxx |3 +--
binaryurp/source/bridge.cxx |3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 3e8e5f079e032a2b7b709bc01113f14da893263c
Author: Julien Nabet
AuthorDate: Sat Jun 5 00:21:06 2021 +0200
Commit: Julien Nabet
CommitDate: Sat Jun 5 16:21:03 2021 +0200
Simplify Sequences initializations (accessibility/binaryurp)
Change-Id: I4b388b7faa1dc47f27d29aaaff9041fe81a29f71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116739
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index d5f80820a4e3..7c6c2df5925d 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -140,14 +140,12 @@ Reference< XAccessibleTable > SAL_CALL
AccessibleGridControlHeader::getAccessibl
//not selectable
Sequence< sal_Int32 > SAL_CALL
AccessibleGridControlHeader::getSelectedAccessibleRows()
{
-Sequence< sal_Int32 > aSelSeq(0);
-return aSelSeq;
+return {};
}
//columns aren't selectable
Sequence< sal_Int32 > SAL_CALL
AccessibleGridControlHeader::getSelectedAccessibleColumns()
{
-Sequence< sal_Int32 > aSelSeq(0);
-return aSelSeq;
+return {};
}
//row headers not selectable
sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleRowSelected(
sal_Int32 /*nRow*/ )
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index eb222d6ed6ac..ffb8108d0f24 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -155,8 +155,7 @@ Sequence< sal_Int32 > SAL_CALL
AccessibleGridControlTable::getSelectedAccessible
//columns aren't selectable
Sequence< sal_Int32 > SAL_CALL
AccessibleGridControlTable::getSelectedAccessibleColumns()
{
-Sequence< sal_Int32 > aSelSeq(0);
-return aSelSeq;
+return {};
}
sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected(
sal_Int32 nRow )
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index acefb175e8ec..007e7e9440df 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -951,8 +951,7 @@ void Bridge::sendCommitChangeRequest() {
assert(mode_ == MODE_REQUESTED || mode_ == MODE_REPLY_1);
css::uno::Sequence< css::bridge::ProtocolProperty > s(1);
s[0].Name = "CurrentContext";
-std::vector< BinaryAny > a;
-a.push_back(mapCppToBinaryAny(css::uno::Any(s)));
+std::vector< BinaryAny > a { mapCppToBinaryAny(css::uno::Any(s)) };
sendProtPropRequest(OutgoingRequest::KIND_COMMIT_CHANGE, a);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source dbaccess/source extensions/source forms/source include/vcl sc/source sd/source sfx2/source sw/source toolkit/inc toolki
accessibility/source/extended/accessibletabbar.cxx |2
accessibility/source/standard/accessiblemenucomponent.cxx|2
basctl/source/accessibility/accessibledialogcontrolshape.cxx |2
basctl/source/accessibility/accessibledialogwindow.cxx |2
basctl/source/basicide/baside2.hxx |2
basctl/source/basicide/baside2b.cxx |9 +-
basctl/source/basicide/textwindowpeer.cxx|2
basctl/source/basicide/textwindowpeer.hxx|9 +-
chart2/source/controller/main/ChartController.cxx|2
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx |2
dbaccess/source/ui/querydesign/JAccess.cxx |2
dbaccess/source/ui/querydesign/TableWindowAccess.cxx |2
extensions/source/bibliography/bibload.cxx |2
extensions/source/bibliography/framectr.cxx |6 -
forms/source/richtext/richtextcontrol.cxx|2
forms/source/solar/component/navbarcontrol.cxx |2
include/vcl/toolkit/unowrap.hxx |5 -
include/vcl/window.hxx | 12 +--
sc/source/ui/view/gridwin.cxx|2
sd/source/ui/presenter/PresenterHelper.cxx |2
sfx2/source/doc/iframe.cxx |4 -
sfx2/source/view/ipclient.cxx|3
sfx2/source/view/sfxbasecontroller.cxx |2
sfx2/source/view/userinputinterception.cxx |4 -
sw/source/uibase/docvw/AnnotationWin2.cxx|2
toolkit/inc/controls/svmedit.hxx |2
toolkit/inc/helper/unowrapper.hxx|4 -
toolkit/source/awt/vclxaccessiblecomponent.cxx |2
toolkit/source/awt/vclxtoolkit.cxx |6 -
toolkit/source/awt/vclxwindow.cxx|2
toolkit/source/controls/svmedit.cxx |7 +-
toolkit/source/helper/unowrapper.cxx | 22 +++
vcl/inc/window.h |3
vcl/qa/cppunit/lifecycle.cxx |2
vcl/source/app/salvtables.cxx|7 +-
vcl/source/control/fmtfield.cxx |2
vcl/source/control/ivctrl.cxx|3
vcl/source/treelist/treelistbox.cxx |3
vcl/source/window/accessibility.cxx |4 -
vcl/source/window/dialog.cxx |2
vcl/source/window/dockwin.cxx|2
vcl/source/window/stacking.cxx |3
vcl/source/window/syswin.cxx |2
vcl/source/window/window.cxx | 34 ++-
vcl/source/window/window2.cxx|2
vcl/unx/gtk3/gtkinst.cxx |3
46 files changed, 105 insertions(+), 98 deletions(-)
New commits:
commit 32b09faca508ae4aac7e100c98a2fe56d3302eef
Author: Noel Grandin
AuthorDate: Thu May 13 10:40:44 2021 +0200
Commit: Noel Grandin
CommitDate: Thu May 13 14:48:24 2021 +0200
Revert "simplify the vcl<->toolkit connection"
because it introduces a link-time dependency of vcl on toolkit,
and toolkit already depends on vcl
This reverts commit f7a86c5cdf4323c99d26512bf78de7f7c380667d.
Change-Id: Ibdd4f3e8221d70e2abd8fcbda67f85af3ac0396e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115547
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index f450bfc526f0..218ed1cab071 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -458,7 +458,7 @@ namespace accessibility
Reference< awt::XFont > xFont;
if ( m_pTabBar )
{
-auto xDev = m_pTabBar->GetComponentInterfaceAs();
+Reference< awt::XDevice > xDev(
m_pTabBar->GetComponentInterface(), UNO_QUERY );
if ( xDev.is() )
{
vcl::Font aFont;
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index e004c2b1942b..be9b1e6f453e 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -301,7 +301,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont(
)
vcl::Window* pWindow = m_pMenu->GetWindow();
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source dbaccess/source extensions/source forms/source include/vcl sc/source sd/source sfx2/source sw/source toolkit/inc toolki
accessibility/source/extended/accessibletabbar.cxx |2
accessibility/source/standard/accessiblemenucomponent.cxx|2
basctl/source/accessibility/accessibledialogcontrolshape.cxx |2
basctl/source/accessibility/accessibledialogwindow.cxx |2
basctl/source/basicide/baside2.hxx |2
basctl/source/basicide/baside2b.cxx |9 +-
basctl/source/basicide/textwindowpeer.cxx|2
basctl/source/basicide/textwindowpeer.hxx|9 --
chart2/source/controller/main/ChartController.cxx|2
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx |2
dbaccess/source/ui/querydesign/JAccess.cxx |2
dbaccess/source/ui/querydesign/TableWindowAccess.cxx |2
extensions/source/bibliography/bibload.cxx |2
extensions/source/bibliography/framectr.cxx |6 -
forms/source/richtext/richtextcontrol.cxx|2
forms/source/solar/component/navbarcontrol.cxx |2
include/vcl/toolkit/unowrap.hxx |5 -
include/vcl/window.hxx | 12 ++-
sc/source/ui/view/gridwin.cxx|2
sd/source/ui/presenter/PresenterHelper.cxx |2
sfx2/source/doc/iframe.cxx |4 -
sfx2/source/view/ipclient.cxx|3
sfx2/source/view/sfxbasecontroller.cxx |2
sfx2/source/view/userinputinterception.cxx |4 -
sw/source/uibase/docvw/AnnotationWin2.cxx|2
toolkit/inc/controls/svmedit.hxx |2
toolkit/inc/helper/unowrapper.hxx|4 -
toolkit/source/awt/vclxaccessiblecomponent.cxx |2
toolkit/source/awt/vclxtoolkit.cxx |6 -
toolkit/source/awt/vclxwindow.cxx|2
toolkit/source/controls/svmedit.cxx |7 --
toolkit/source/helper/unowrapper.cxx | 22 +++
vcl/inc/window.h |3
vcl/qa/cppunit/lifecycle.cxx |2
vcl/source/app/salvtables.cxx|7 --
vcl/source/control/fmtfield.cxx |2
vcl/source/control/ivctrl.cxx|3
vcl/source/treelist/treelistbox.cxx |3
vcl/source/window/accessibility.cxx |4 -
vcl/source/window/dialog.cxx |2
vcl/source/window/dockwin.cxx|2
vcl/source/window/stacking.cxx |3
vcl/source/window/syswin.cxx |2
vcl/source/window/window.cxx | 34 ---
vcl/source/window/window2.cxx|2
vcl/unx/gtk3/gtkinst.cxx |3
46 files changed, 98 insertions(+), 105 deletions(-)
New commits:
commit f7a86c5cdf4323c99d26512bf78de7f7c380667d
Author: Noel Grandin
AuthorDate: Wed May 12 15:07:37 2021 +0200
Commit: Noel Grandin
CommitDate: Wed May 12 19:57:24 2021 +0200
simplify the vcl<->toolkit connection
No need to store two different pointers and hide the
underlying class behind an UNO interface
Change-Id: I72c55e912caa9eae1cffa6c9d1b1d480e5668d40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115496
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 218ed1cab071..f450bfc526f0 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -458,7 +458,7 @@ namespace accessibility
Reference< awt::XFont > xFont;
if ( m_pTabBar )
{
-Reference< awt::XDevice > xDev(
m_pTabBar->GetComponentInterface(), UNO_QUERY );
+auto xDev = m_pTabBar->GetComponentInterfaceAs();
if ( xDev.is() )
{
vcl::Font aFont;
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index be9b1e6f453e..e004c2b1942b 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -301,7 +301,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont(
)
vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
-Reference< awt::XDevice > xDev(
[Libreoffice-commits] core.git: accessibility/source basctl/source dbaccess/source include/toolkit toolkit/source
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |1 +
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |8
+---
accessibility/source/standard/vclxaccessiblelistbox.cxx |2 +-
basctl/source/basicide/textwindowpeer.cxx|1 +
dbaccess/source/ui/uno/ColumnControl.cxx |1 +
include/toolkit/awt/vclxwindow.hxx |8
+++-
toolkit/source/controls/tkscrollbar.cxx |1 +
toolkit/source/controls/unocontrol.cxx |1 +
toolkit/source/controls/unocontrols.cxx |1 +
toolkit/source/hatchwindow/hatchwindowfactory.cxx|1 +
10 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 2577a6be556b688d9c3dbca8dea2860586e63e11
Author: Caolán McNamara
AuthorDate: Sun Apr 11 20:24:16 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 12 09:49:17 2021 +0200
forward decl vcl::Window in toolkit/awt/vclxwindow.hxx
Change-Id: I488f994fc890cacd20a6fdc224a098fe0caf3070
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113960
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 97fcebb04a2b..1e5e7608c3bb 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -21,6 +21,7 @@
#include
#include
+#include
using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 2bee1b51f8fc..28991e818d4a 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -17,11 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include
-
#include
-
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -34,21 +32,17 @@
VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWi
{
}
-
bool VCLXAccessibleDropDownListBox::IsValid() const
{
return GetWindow();
}
-
// XServiceInfo
-
OUString VCLXAccessibleDropDownListBox::getImplementationName()
{
return "com.sun.star.comp.toolkit.AccessibleDropDownListBox";
}
-
Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames()
{
return
comphelper::concatSequences(VCLXAccessibleBox::getSupportedServiceNames(),
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx
b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 26602167379a..25319aa912ea 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -18,8 +18,8 @@
*/
#include
-
#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/basctl/source/basicide/textwindowpeer.cxx
b/basctl/source/basicide/textwindowpeer.cxx
index 8375f353f8a3..fc458453778b 100644
--- a/basctl/source/basicide/textwindowpeer.cxx
+++ b/basctl/source/basicide/textwindowpeer.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include "textwindowpeer.hxx"
namespace {
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx
b/dbaccess/source/ui/uno/ColumnControl.cxx
index 6cf6e248e55e..51930de95119 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -20,6 +20,7 @@
#include "ColumnControl.hxx"
#include "ColumnPeer.hxx"
#include
+#include
#include
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/include/toolkit/awt/vclxwindow.hxx
b/include/toolkit/awt/vclxwindow.hxx
index 090a52cde8d4..289d242a297b 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -17,12 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
+#pragma once
#include
#include
-#include
+#include
#include
#include
@@ -45,6 +44,7 @@
namespace comphelper { class OInterfaceContainerHelper2; }
namespace com::sun::star::accessibility { class XAccessibleContext; }
+namespace vcl { class Window; }
class VclWindowEvent;
@@ -225,6 +225,4 @@ public:
virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL
getStyleSettings() override;
};
-#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/tkscrollbar.cxx
b/toolkit/source/controls/tkscrollbar.cxx
index d2d1c2248921..f3c6ac33cb35 100644
---
[Libreoffice-commits] core.git: accessibility/source connectivity/source sdext/source sd/source
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |2 +-
connectivity/source/cpool/ZConnectionPool.cxx |2 +-
sd/source/ui/framework/module/SlideSorterModule.cxx|4
sdext/source/presenter/PresenterCurrentSlideObserver.cxx |3 +++
4 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit f153be729ed12ea301642e7d2551ec60b70a2a61
Author: Henry Castro
AuthorDate: Thu Apr 1 17:07:04 2021 -0400
Commit: Henry Castro
CommitDate: Thu Apr 8 13:58:11 2021 +0200
lok: remove event listener when disposing
In order to prevent that the event listener
holds the object reference count when removed,
ensure they are removed when disposing the object.
Change-Id: I7cb4cb7d87acfc9610c2498760ade531456fe22e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113493
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 7827d686a3e8..d621e2e8bf64 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -329,7 +329,7 @@ namespace accessibility
{
if ( _rSource.Source == mxParent )
{
-dispose();
+dispose();
}
}
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx
b/connectivity/source/cpool/ZConnectionPool.cxx
index 2917ce019700..cc90fa464e16 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -189,7 +189,7 @@ void SAL_CALL OConnectionPool::disposing( const
css::lang::EventObject& Source )
}
else
{
-m_xDriverNode.clear();
+m_xDriverNode.clear();
}
}
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 1aa96bd0b2d4..b6e9e658b099 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -237,6 +237,10 @@ void SAL_CALL SlideSorterModule::disposing()
{
if (mxConfigurationController.is())
{
+uno::Reference const
xComponent(mxConfigurationController, UNO_QUERY);
+if (xComponent.is())
+xComponent->removeEventListener(this);
+
mxConfigurationController->removeConfigurationChangeListener(this);
mxConfigurationController = nullptr;
}
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index b7769219c7fe..0cd33d9c0beb 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -57,6 +57,9 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing()
mxSlideShowController->removeSlideShowListener(static_cast(this));
mxSlideShowController = nullptr;
}
+
+if (mpPresenterController.is())
+mpPresenterController->removeEventListener(this);
}
//- XSlideShowListener
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source canvas/source chart2/source compilerplugins/clang sc/source sd/source writerfilter/source
accessibility/source/standard/vclxaccessibletoolbox.cxx |4
canvas/source/opengl/ogl_canvashelper.cxx|3
chart2/source/controller/main/ChartController_Window.cxx |6 -
compilerplugins/clang/refcounting.cxx| 72 +--
compilerplugins/clang/test/refcounting.cxx | 22
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |3
sd/source/ui/dlg/sdtreelb.cxx|3
writerfilter/source/ooxml/OOXMLFastHelper.hxx|6 -
8 files changed, 104 insertions(+), 15 deletions(-)
New commits:
commit 04e7a34a19b3658de57c4f2b3b0fa8445b01f199
Author: Noel
AuthorDate: Fri Mar 5 15:51:07 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 8 07:37:26 2021 +0100
loplugin:refcounting check for one more case
where we might be holding something newly created by pointer
instead of by *::Reference
Change-Id: Ife6f7acae4252bf56dcdeb95d72e43c523444f97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112138
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index acd2c4f18899..a04685730c85 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -593,8 +593,8 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const
VclWindowEvent& rVclWindow
if ( pWin && pWin->GetParent() &&
pWin->GetParent()->GetType() == WindowType::TOOLBOX )
{
-VCLXAccessibleToolBox* pParent = static_cast<
VCLXAccessibleToolBox* >(
-
pWin->GetParent()->GetAccessible()->getAccessibleContext().get() );
+auto pParentAccContext =
pWin->GetParent()->GetAccessible()->getAccessibleContext();
+VCLXAccessibleToolBox* pParent = static_cast<
VCLXAccessibleToolBox* >( pParentAccContext.get() );
if ( pParent )
pParent->ReleaseSubToolBox(static_cast(pWin.get()));
}
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index d64e1ba1d7f0..0484f710ae53 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -679,7 +679,8 @@ namespace oglcanvas
ScopedVclPtrInstance< VirtualDevice > pVDev;
pVDev->EnableOutput(false);
-CanvasFont*
pFont=dynamic_cast(xLayoutetText->getFont().get());
+auto pLayoutFont = xLayoutetText->getFont();
+CanvasFont* pFont=dynamic_cast(pLayoutFont.get());
const rendering::StringContext& rTxt=xLayoutetText->getText();
if( pFont && rTxt.Length )
{
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index a8d71e903fd3..afd4de8a5e75 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -863,7 +863,8 @@ void ChartController::execute_MouseButtonUp( const
MouseEvent& rMEvt )
m_xUndoManager );
bool bChanged = false;
-ChartModel* pModel =
dynamic_cast(getModel().get());
+css::uno::Reference< css::frame::XModel > xModel =
getModel();
+ChartModel* pModel =
dynamic_cast(xModel.get());
assert(pModel);
if ( eObjectType == OBJECTTYPE_LEGEND )
bChanged =
DiagramHelper::switchDiagramPositioningToExcludingPositioning( *pModel, false ,
true );
@@ -2090,7 +2091,8 @@ void ChartController::sendPopupRequest(OUString const &
rCID, tools::Rectangle a
OUString sPivotTableName = xPivotTableDataProvider->getPivotTableName();
-PopupRequest* pPopupRequest =
dynamic_cast(pChartModel->getPopupRequest().get());
+css::uno::Reference xPopupRequest =
pChartModel->getPopupRequest();
+PopupRequest* pPopupRequest =
dynamic_cast(xPopupRequest.get());
if (!pPopupRequest)
return;
diff --git a/compilerplugins/clang/refcounting.cxx
b/compilerplugins/clang/refcounting.cxx
index 319a23b83a9b..9157a1910add 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -73,6 +73,7 @@ private:
const RecordDecl* parent, const std::string&
rDeclName);
bool visitTemporaryObjectExpr(Expr const * expr);
+bool isCastingReference(const Expr* expr);
};
bool containsXInterfaceSubclass(const clang::Type* pType0);
@@ -693,6 +694,56 @@ bool RefCounting::VisitVarDecl(const VarDecl * varDecl) {
<< pointeeType
<< varDecl->getSourceRange();
}
+
[Libreoffice-commits] core.git: accessibility/source include/vcl reportdesign/source svx/source toolkit/source vcl/inc vcl/source
accessibility/source/standard/accessiblemenubasecomponent.cxx |1 +
include/vcl/menu.hxx |4 +++-
include/vcl/toolkit/edit.hxx |2 +-
include/vcl/toolkit/treelistbox.hxx |1 -
reportdesign/source/ui/inc/ReportControllerObserver.hxx |3 ++-
svx/source/fmcomp/fmgridcl.cxx|1 -
toolkit/source/controls/tree/treecontrolpeer.cxx |3 ++-
vcl/inc/jsdialog/jsdialogbuilder.hxx |1 +
vcl/source/control/combobox.cxx |1 +
vcl/source/control/roadmap.cxx|1 +
vcl/source/edit/vclmedit.cxx |2 ++
vcl/source/uitest/uiobject.cxx|1 +
vcl/source/window/builder.cxx |1 +
13 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit c02696d7f9e4f56954e1c37452949762872f1f8e
Author: Caolán McNamara
AuthorDate: Mon Feb 22 16:35:25 2021 +
Commit: Caolán McNamara
CommitDate: Mon Feb 22 20:26:08 2021 +0100
forward declare some things and avoid includes
Change-Id: I8bf6e23904c932de646aa84fffab1b5549dbdf31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111349
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 7d5d2eebdd3e..e873322f9c56 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 01bf9bc1f80b..55b4ca10ed71 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -28,8 +28,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
@@ -49,8 +49,10 @@ class CommandEvent;
class MenuFloatingWindow;
class SalMenu;
class MenuBarWindow;
+class VclMenuEvent;
struct SystemMenuData;
enum class FloatWinPopupFlags;
+enum class VclEventId;
namespace com::sun::star::awt { class XPopupMenu; }
namespace com::sun::star::accessibility { class XAccessible; }
diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx
index 6cad804c208e..b622c4bc2e65 100644
--- a/include/vcl/toolkit/edit.hxx
+++ b/include/vcl/toolkit/edit.hxx
@@ -31,7 +31,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -44,6 +43,7 @@ namespace weld {
class Widget;
}
+class PopupMenu;
class VclBuilder;
struct DDInfo;
struct Impl_IMEInfos;
diff --git a/include/vcl/toolkit/treelistbox.hxx
b/include/vcl/toolkit/treelistbox.hxx
index 895c6c15d860..3cd50dddee65 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -36,7 +36,6 @@
#include
#include
#include
-#include
#include
class SvTreeListBox;
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index ec6be058bf9b..d77fb3f2ef78 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -25,12 +25,13 @@
#include
-#include
#include
#include "FormattedFieldBeautifier.hxx"
#include "FixedTextColor.hxx"
+class VclSimpleEvent;
+
namespace rptui
{
class OReportController;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 817d642a19a9..10e5e980a74f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -60,7 +60,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/toolkit/source/controls/tree/treecontrolpeer.cxx
b/toolkit/source/controls/tree/treecontrolpeer.cxx
index 1b302d551db9..1f7a22a5217e 100644
--- a/toolkit/source/controls/tree/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -18,7 +18,6 @@
*/
-#include
#include
#include
#include
@@ -41,6 +40,8 @@
#include
#include
+#include
+#include
using namespace ::com::sun::star;
using namespace css::uno;
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index a06d8850496e..8c9e2789fedf 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
class ToolBox;
class ComboBox;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index f9c96478c9b8..acf3a0c26d36 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
#include
diff
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBox.cxx|4 ++--
accessibility/source/extended/AccessibleGridControl.cxx |6 +++---
accessibility/source/extended/accessiblelistbox.cxx | 10 +-
accessibility/source/extended/accessiblelistboxentry.cxx |4 ++--
accessibility/source/standard/vclxaccessiblelistitem.cxx |2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit fb6519ed62cf1fb7071ca2d9d22bfc37c093a751
Author: Noel
AuthorDate: Tue Feb 16 08:54:42 2021 +0200
Commit: Noel Grandin
CommitDate: Tue Feb 16 11:48:31 2021 +0100
loplugin:referencecasting in accessibility
Change-Id: If66b3c1829b02298b7c9c31172d2a66ad11dce30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110967
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 390c04a87f18..28698162ed48 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -194,7 +194,7 @@ css::uno::Reference< css::accessibility::XAccessible >
AccessibleBrowseBox::impl
mxTable = createAccessibleTable();
}
-return mxTable.get();
+return mxTable;
}
css::uno::Reference< css::accessibility::XAccessible >
@@ -303,7 +303,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext
> SAL_CALL Accessibl
if ( !m_xContext.is() )
m_xContext = new AccessibleBrowseBox( m_xParent, this, m_rBrowseBox );
-return m_xContext.get();
+return m_xContext;
}
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 2c41881fb4f3..db7a1461a859 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -211,7 +211,7 @@ css::uno::Reference< css::accessibility::XAccessible >
AccessibleGridControl::im
{
m_xTable = createAccessibleTable();
}
-return m_xTable.get();
+return m_xTable;
}
@@ -275,7 +275,7 @@ void AccessibleGridControl::commitCellEvent(sal_Int16
_nEventId,const Any& _rNew
for(sal_Int32 i=0;i xAccessible
= getAccessibleChild(i);
-if(css::uno::Reference< css::accessibility::XAccessible
>(m_xTable.get()) == xAccessible)
+if(css::uno::Reference< css::accessibility::XAccessible
>(m_xTable) == xAccessible)
{
std::vector< AccessibleGridControlTableCell* >& rCells =
m_xTable->getCellVector();
@@ -391,7 +391,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext
> SAL_CALL Accessibl
if (!m_xContext.is() && m_pTable)
m_xContext = new AccessibleGridControl(m_xParent, this, *m_pTable);
-return m_xContext.get();
+return m_xContext;
}
diff --git a/accessibility/source/extended/accessiblelistbox.cxx
b/accessibility/source/extended/accessiblelistbox.cxx
index 94050529fce4..345a4aa4e8d2 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -132,7 +132,7 @@ namespace accessibility
uno::Any aOldValue;
aOldValue <<= m_xFocusedChild;
-m_xFocusedChild.set(implGetAccessible(*pEntry).get());
+m_xFocusedChild.set(implGetAccessible(*pEntry));
aNewValue <<= m_xFocusedChild;
NotifyAccessibleEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
@@ -159,7 +159,7 @@ namespace accessibility
{
uno::Any aNewValue;
uno::Any aOldValue;
-aOldValue <<=
uno::Reference(entry.second.get());
+aOldValue <<=
uno::Reference(entry.second);
NotifyAccessibleEvent( AccessibleEventId::CHILD,
aOldValue, aNewValue );
}
for (auto const& entry : m_mapEntry)
@@ -178,7 +178,7 @@ namespace accessibility
SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >(
rVclWindowEvent.GetData() );
if ( pEntry )
{
-Reference const
xChild(implGetAccessible(*pEntry).get());
+Reference const
xChild(implGetAccessible(*pEntry));
const short nAccEvent =
( rVclWindowEvent.GetId() ==
VclEventId::ItemExpanded )
? AccessibleEventId::LISTBOX_ENTRY_EXPANDED
@@ -227,7 +227,7 @@ namespace accessibility
{
uno::Any aNewValue;
uno::Any aOldValue;
-aOldValue <<= uno::Reference(mi->second.get());
+aOldValue <<= uno::Reference(mi->second);
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format vcl/inc vcl/source vcl/workben
accessibility/source/standard/vclxaccessiblebutton.cxx |2
include/vcl/button.hxx | 231 -
include/vcl/toolkit/button.hxx | 206 +++
include/vcl/toolkit/menubtn.hxx|2
include/vcl/toolkit/morebtn.hxx|2
solenv/clang-format/excludelist|1
vcl/inc/pch/precompiled_vcl.hxx|1
vcl/source/control/DropdownBox.cxx |2
vcl/source/control/PriorityMergedHBox.cxx |2
vcl/workben/svpclient.cxx |2
10 files changed, 211 insertions(+), 240 deletions(-)
New commits:
commit 2b7a38bbf689e9872c0e739936e43953f105c01d
Author: Caolán McNamara
AuthorDate: Mon Dec 7 11:35:32 2020 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 12:17:22 2021 +0100
move Button to vcl/toolkit
Change-Id: I11e4fbab2e70342683febacf444fbe08dabf2417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107346
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f0ade105ce27..4c912530f8bf 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -29,7 +29,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
deleted file mode 100644
index 6faf8dadc5b7..
--- a/include/vcl/button.hxx
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- 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 INCLUDED_VCL_BUTTON_HXX
-#define INCLUDED_VCL_BUTTON_HXX
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-namespace com::sun::star::frame { struct FeatureStateEvent; }
-template class VclPtr;
-
-class Color;
-class ImplCommonButtonData;
-enum class DrawButtonFlags;
-
-class VCL_DLLPUBLIC Button : public Control
-{
-private:
-std::unique_ptr mpButtonData;
-Link maClickHdl;
-
-/// Command URL (like .uno:Save) in case the button should handle it.
-OUString maCommand;
-
-Button (const Button &) = delete;
-Button & operator= (const Button &) =
delete;
-public:
-SAL_DLLPRIVATE DrawTextFlagsImplGetTextStyle( WinBits nWinStyle,
DrawFlags nDrawFlags );
-SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev,
Point& rPos, Size& rSize,
- sal_uLong nImageSep,
- DrawTextFlags nTextStyle,
tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false );
-SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle
);
-SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const;
-SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign );
-/// The x-coordinate of the vertical separator line, use in MenuButton
subclass only.
-SAL_DLLPRIVATE tools::Long ImplGetSeparatorX() const;
-SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX );
-
-protected:
-explicitButton( WindowType nType );
-
-// for drawing RadioButton or CheckButton that has Text and/or Image
-SAL_DLLPRIVATE void ImplDrawRadioCheck(OutputDevice* pDev, WinBits
nWinStyle, DrawFlags nDrawFlags,
- const Point& rPos, const Size&
rSize,
- const Size& rImageSize,
tools::Rectangle& rStateRect,
- tools::Rectangle& rMouseRect);
-SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const;
-
-public:
-virtual~Button() override;
-virtual voiddispose() override;
-
-virtual voidClick();
-
-voidSetClickHdl( const Link& rLink ) {
maClickHdl = rLink; }
-
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source cui/source dbaccess/source extensions/source forms/source framework/source include/toolkit reportdesign/source sd/sourc
accessibility/source/standard/vclxaccessiblestatusbar.cxx |2
accessibility/source/standard/vclxaccessibletabcontrol.cxx|2
accessibility/source/standard/vclxaccessibletabpagewindow.cxx |2
basctl/source/accessibility/accessibledialogcontrolshape.cxx |2
chart2/source/controller/inc/ChartController.hxx |2
chart2/source/controller/main/ChartController.cxx |6 +-
cui/source/customize/cfg.cxx |2
dbaccess/source/ui/browser/brwview.cxx|2
dbaccess/source/ui/browser/genericcontroller.cxx |2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx |2
dbaccess/source/ui/uno/ColumnControl.cxx |2
extensions/source/propctrlr/defaulthelpprovider.cxx |2
extensions/source/propctrlr/propcontroller.cxx|2
forms/source/richtext/richtextcontrol.cxx |2
forms/source/solar/component/navbarcontrol.cxx|2
framework/source/layoutmanager/layoutmanager.cxx |2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 22 +-
framework/source/uielement/popuptoolbarcontroller.cxx |4 -
include/toolkit/awt/vclxaccessiblecomponent.hxx | 10 ++--
include/toolkit/awt/vclxwindow.hxx| 10 ++--
include/toolkit/helper/vclunohelper.hxx |6 +-
reportdesign/source/ui/misc/statusbarcontroller.cxx |2
sd/source/ui/framework/factories/BasicViewFactory.cxx |2
sd/source/ui/slideshow/slideshowimpl.cxx |2
sfx2/source/appl/sfxhelp.cxx |4 -
sfx2/source/dialog/backingcomp.cxx|6 +-
sfx2/source/view/lokcharthelper.cxx |2
svtools/source/uno/popupwindowcontroller.cxx |2
svtools/source/uno/statusbarcontroller.cxx|2
svtools/source/uno/toolboxcontroller.cxx |2
svx/source/dialog/srchdlg.cxx |4 -
svx/source/fmcomp/fmgridif.cxx|2
svx/source/form/fmtextcontrolshell.cxx|2
svx/source/form/formcontroller.cxx|2
toolkit/inc/controls/accessiblecontrolcontext.hxx |2
toolkit/source/awt/vclxaccessiblecomponent.cxx|4 -
toolkit/source/awt/vclxtopwindow.cxx | 18
toolkit/source/awt/vclxwindows.cxx|2
toolkit/source/controls/accessiblecontrolcontext.cxx |4 -
toolkit/source/helper/vclunohelper.cxx| 12 ++---
40 files changed, 82 insertions(+), 82 deletions(-)
New commits:
commit 1aa31294b2d3fb562ba33d5d873da62439944f07
Author: Noel Grandin
AuthorDate: Mon Jan 25 20:25:51 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Jan 25 20:21:48 2021 +0100
avoid some ref-counting
can just return a pointer here, instead of VclPtr.
Change-Id: I9ab8962cbbe84ed4dfcfd658a6d758112914cb89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109923
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index e84825ea0b3f..bd70676f58cc 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -38,7 +38,7 @@ using namespace ::comphelper;
VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
{
-m_pStatusBar = static_cast< StatusBar *>( GetWindow().get() );
+m_pStatusBar = GetAs();
if ( m_pStatusBar )
m_aAccessibleChildren.assign( m_pStatusBar->GetItemCount(), Reference<
XAccessible >() );
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 26f384fbbbce..20e2ff120cc3 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -44,7 +44,7 @@ using namespace ::comphelper;
VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
{
-m_pTabControl = static_cast< TabControl* >( GetWindow().get() );
+m_pTabControl = GetAs();
if (!m_pTabControl)
return;
if (m_pTabControl->isDisposed())
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 30dc29b34213..c8408d24be97 100644
---
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a8f6a8722457ec8b6c02f41b628b5cee75b330f1 Author: Caolán McNamara AuthorDate: Thu Jan 21 12:55:29 2021 + Commit: Caolán McNamara CommitDate: Thu Jan 21 20:38:28 2021 +0100 constant 'Focused object has invalid index in parent' a11y warning clicking in a cell in the databrowser always produces a11y warnings, the EditBrowseBoxTableCell parent was set to AccessibleBrowseBoxAccess but AccessibleBrowseBoxAccess cannot find it as a child. It appears to be constructed with an EditBrowseBoxTableCellAccess as parent, changing this to reflect that ownership results in no more warnings Change-Id: Icdbf7157511ab606bf564f2f48df3a02bd7ede88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109759 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 7aefcc98bfad..06165071b621 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -207,7 +207,7 @@ namespace accessibility css::uno::Reference< css::accessibility::XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext(); css::uno::Reference< css::accessibility::XAccessible > xMe( this ); -xMyContext = new EditBrowseBoxTableCell( m_xParent, xMe, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos ); +xMyContext = new EditBrowseBoxTableCell( xMe, m_xParent, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos ); m_aContext = xMyContext; } return xMyContext; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source dbaccess/source extensions/source include/sfx2 include/svx include/vcl reportdesign/source sc/source sfx2/source svx/so
accessibility/source/standard/vclxaccessibletabcontrol.cxx |1 + basctl/source/basicide/baside2b.cxx|1 + chart2/source/controller/main/ChartController_Window.cxx |1 + dbaccess/source/ui/app/AppControllerGen.cxx|3 ++- dbaccess/source/ui/browser/sbagrid.cxx |1 + dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |1 + extensions/source/bibliography/toolbar.cxx |1 + include/sfx2/dispatch.hxx |2 +- include/sfx2/sidebar/TabBar.hxx|3 ++- include/sfx2/templatelocalview.hxx |1 - include/svx/gridctrl.hxx |2 +- include/vcl/notebookbar/NotebookBarAddonsMerger.hxx|1 - reportdesign/source/ui/dlg/GroupsSorting.cxx |1 + reportdesign/source/ui/report/ReportSection.cxx|1 + sc/source/ui/vba/vbaapplication.cxx|2 ++ sc/source/ui/view/gridwin.cxx |1 + sc/source/ui/view/tabcont.cxx |1 + sfx2/source/appl/newhelp.hxx |1 + sfx2/source/control/dispatch.cxx |1 + sfx2/source/dialog/backingwindow.cxx |1 + sfx2/source/notebookbar/NotebookbarTabControl.cxx |1 + sfx2/source/view/viewsh.cxx|3 ++- svx/source/dialog/svxruler.cxx |1 + sw/source/uibase/ribbar/workctrl.cxx |1 + vcl/source/window/NotebookBarAddonsMerger.cxx |1 + 25 files changed, 27 insertions(+), 7 deletions(-) New commits: commit 25214daa344412a7b67c8a89b832e5f3e6dc90fa Author: Caolán McNamara AuthorDate: Tue Dec 15 09:55:30 2020 + Commit: Caolán McNamara CommitDate: Tue Dec 15 13:41:42 2020 +0100 don't need to include vcl/menu.hxx here Change-Id: I16c4c2fd84ea8af6b7601e49c38630bbbfdb2cb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107746 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 29fea97781a6..26f384fbbbce 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index e3ac323e11ff..4a8ab6fe0e54 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 51ebcbf9b567..d9879174656d 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -78,6 +78,7 @@ #include #include #include +#include #include #include #include diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 2466f22df062..1d7019a81b29 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -52,10 +52,11 @@ #include #include #include -#include +#include #include #include #include +#include #include namespace dbaui diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 65b30505fbfc..ba5db408ba2d 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -39,6 +39,7 @@ #include #include +#include #include #include diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 1bcb127d9ba6..082a1949d875 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -38,6 +38,7 @@ #include #include #include "QTableWindow.hxx" +#include #include #include #include "QueryDesignFieldUndoAct.hxx" diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 61e583e238ec..9770428804e3 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index ee46d5c89909..6e87c89217f4 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -30,9 +30,9 @@ #include #include -#include #include +class
[Libreoffice-commits] core.git: accessibility/source chart2/source chart2/workbench connectivity/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source filter/source forms/
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |3 chart2/source/model/filter/XMLFilter.cxx|2 chart2/source/tools/WrappedPropertySet.cxx |4 chart2/workbench/addin/sampleaddin.cxx |2 connectivity/source/commontools/DateConversion.cxx |2 connectivity/source/commontools/dbexception.cxx |3 connectivity/source/commontools/dbtools.cxx |8 - connectivity/source/commontools/predicateinput.cxx |2 connectivity/source/drivers/file/fcomp.cxx |3 connectivity/source/drivers/hsqldb/HStorageAccess.cxx |7 - connectivity/source/drivers/hsqldb/HStorageMap.cxx |2 connectivity/source/drivers/hsqldb/StorageFileAccess.cxx|2 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx |7 - connectivity/source/drivers/mork/MResultSet.cxx |3 connectivity/source/manager/mdrivermanager.cxx |2 cui/source/dialogs/showcols.cxx |6 cui/source/options/optasian.cxx |7 - cui/source/options/sdbcdriverenum.cxx |3 dbaccess/source/core/dataaccess/ContentHelper.cxx |3 dbaccess/source/core/dataaccess/documentdefinition.cxx |4 dbaccess/source/filter/xml/dbloader2.cxx|4 dbaccess/source/filter/xml/xmlExport.cxx|2 dbaccess/source/filter/xml/xmlHierarchyCollection.cxx |3 dbaccess/source/filter/xml/xmlQuery.cxx |3 dbaccess/source/filter/xml/xmlTable.cxx |5 dbaccess/source/ui/app/AppDetailPageHelper.cxx |2 dbaccess/source/ui/browser/sbagrid.cxx |2 dbaccess/source/ui/control/tabletree.cxx|2 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |3 dbaccess/source/ui/querydesign/TableWindow.cxx |5 dbaccess/source/ui/relationdesign/RelationTableView.cxx |5 desktop/source/deployment/gui/dp_gui_dialog2.cxx|4 editeng/source/accessibility/AccessibleEditableTextPara.cxx |2 editeng/source/misc/hangulhanja.cxx |2 embeddedobj/source/commonembedding/miscobj.cxx |3 filter/source/svg/svgexport.cxx |3 forms/source/component/Button.cxx |2 forms/source/component/ComboBox.cxx |2 forms/source/component/Currency.cxx |3 forms/source/component/DatabaseForm.cxx |4 forms/source/component/Grid.cxx |3 forms/source/component/ImageControl.cxx |2 forms/source/component/clickableimage.cxx |3 forms/source/runtime/formoperations.cxx |7 - forms/source/xforms/submission/submission_get.cxx |3 forms/source/xforms/submission/submission_post.cxx |3 forms/source/xforms/submission/submission_put.cxx |3 fpicker/source/office/fpsmartcontent.cxx|3 linguistic/source/gciterator.cxx|2 oox/source/helper/binarystreambase.cxx |5 oox/source/ppt/slidetransition.cxx |5 package/source/zippackage/ZipPackageStream.cxx |6 reportdesign/source/core/api/FixedLine.cxx |3 reportdesign/source/core/api/ReportDefinition.cxx |4 reportdesign/source/core/sdr/PropertyForward.cxx|2 reportdesign/source/core/sdr/RptObject.cxx |2 reportdesign/source/filter/xml/xmlCell.cxx |3 reportdesign/source/filter/xml/xmlComponent.cxx |3 reportdesign/source/filter/xml/xmlCondPrtExpr.cxx |3 reportdesign/source/filter/xml/xmlFormatCondition.cxx |3 reportdesign/source/filter/xml/xmlFormattedField.cxx|3 reportdesign/source/filter/xml/xmlFunction.cxx |5 reportdesign/source/filter/xml/xmlGroup.cxx |5 reportdesign/source/filter/xml/xmlHelper.cxx|3 reportdesign/source/filter/xml/xmlImage.cxx |3 reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx |3 reportdesign/source/filter/xml/xmlReport.cxx|2 reportdesign/source/filter/xml/xmlReportElement.cxx |3
[Libreoffice-commits] core.git: accessibility/source include/vcl
accessibility/source/standard/vclxaccessibleradiobutton.cxx |2
include/vcl/button.hxx | 120
include/vcl/toolkit/button.hxx | 120
3 files changed, 121 insertions(+), 121 deletions(-)
New commits:
commit 0945e840a4cdbe2e6542f8fa035f70932ec1ad0e
Author: Caolán McNamara
AuthorDate: Sat Nov 14 15:24:42 2020 +
Commit: Caolán McNamara
CommitDate: Fri Nov 20 21:20:43 2020 +0100
move RadioButton to be toolkit only
Change-Id: Ie548ad3c471745297242a390fd2e500fa699de19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105836
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 4b408cb35b57..aae9c76731f7 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -30,7 +30,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index b91f87481305..627c68192acc 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -215,126 +215,6 @@ inline bool PushButton::IsChecked() const
return (GetState() == TRISTATE_TRUE);
}
-class VCL_DLLPUBLIC RadioButton : public Button
-{
-private:
-friend class VclBuilder;
-
-std::shared_ptr< std::vector< VclPtr< RadioButton > > > m_xGroup;
-tools::Rectangle maStateRect;
-tools::Rectangle maMouseRect;
-Image maImage;
-boolmbChecked;
-boolmbRadioCheck;
-boolmbStateChanged;
-boolmbUsesExplicitGroup;
-Link maToggleHdl;
-SAL_DLLPRIVATE void ImplInitRadioButtonData();
-SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow,
WinBits nStyle );
-SAL_DLLPRIVATE void ImplInitSettings( bool bBackground );
-SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext&
rRenderContext);
-SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
- const Point& rPos, const Size& rSize,
- const Size& rImageSize, tools::Rectangle&
rStateRect,
- tools::Rectangle& rMouseRect );
-SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext&
rRenderContext );
-SAL_DLLPRIVATE void ImplUncheckAllOther();
-SAL_DLLPRIVATE Size ImplGetRadioImageSize() const;
-SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const;
-
-RadioButton(const RadioButton &) = delete;
-RadioButton& operator= (const RadioButton &) =
delete;
-
-protected:
-using Control::ImplInitSettings;
-using Window::ImplInit;
-SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
-
-public:
-SAL_DLLPRIVATE void ImplCallClick( bool bGrabFocus = false,
GetFocusFlags nFocusFlags = GetFocusFlags::NONE );
-
-protected:
-virtual voidFillLayoutData() const override;
-virtual const vcl::Font&
-GetCanonicalFont( const StyleSettings& _rStyle ) const
override;
-virtual const Color&
-GetCanonicalTextColor( const StyleSettings& _rStyle )
const override;
-voidImplAdjustNWFSizes() override;
-
-public:
-/*
- bUsesExplicitGroup of true means that group() is used to set what
radiobuttons are part of a group
- while false means that contiguous radiobuttons are considered part of a
group where WB_GROUP designates
- the start of the group and all contiguous radiobuttons without WB_GROUP
set form the rest of the group.
-
- true is fairly straightforward, false leads to trick situations and is
the legacy case
-*/
-explicitRadioButton(vcl::Window* pParent, bool bUsesExplicitGroup
= true, WinBits nWinStyle = 0);
-virtual ~RadioButton() override;
-virtual voiddispose() override;
-
-virtual voidMouseButtonDown( const MouseEvent& rMEvt ) override;
-virtual voidTracking( const TrackingEvent& rTEvt ) override;
-virtual voidKeyInput( const KeyEvent& rKEvt ) override;
-virtual voidKeyUp( const KeyEvent& rKEvt ) override;
-virtual voidPaint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect ) override;
-virtual voidDraw( OutputDevice* pDev, const Point& rPos, DrawFlags
nFlags ) override;
-virtual voidResize() override;
-virtual voidGetFocus() override;
-virtual voidLoseFocus() override;
-virtual voidStateChanged( StateChangedType nType ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-
-
[Libreoffice-commits] core.git: accessibility/source include/vcl vcl/source
accessibility/source/standard/vclxaccessibletabpage.cxx | 18
include/vcl/tabctrl.hxx |6 ++
vcl/source/control/tabctrl.cxx | 34
vcl/source/window/builder.cxx | 26 +++-
4 files changed, 73 insertions(+), 11 deletions(-)
New commits:
commit 7541fac2c0d5341f4d362779594ae236f05ff9a6
Author: Caolán McNamara
AuthorDate: Mon Aug 31 19:17:39 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Sep 2 09:37:08 2020 +0200
tdf#136331 implement applying atk properties to tab pages
Change-Id: I2ee57dbdb3d743fe1dd3d505a3aa2f479ffa62b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101765
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index fb0936f2f360..ab981634a7db 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -339,34 +339,34 @@ sal_Int32
VCLXAccessibleTabPage::getAccessibleIndexInParent( )
return nIndexInParent;
}
-
-sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( )
+sal_Int16 VCLXAccessibleTabPage::getAccessibleRole()
{
OExternalLockGuard aGuard( this );
return AccessibleRole::PAGE_TAB;
}
-
-OUString VCLXAccessibleTabPage::getAccessibleDescription()
+OUString VCLXAccessibleTabPage::getAccessibleDescription()
{
OExternalLockGuard aGuard( this );
OUString sDescription;
if ( m_pTabControl )
-sDescription = m_pTabControl->GetHelpText( m_nPageId );
+sDescription = m_pTabControl->GetAccessibleDescription( m_nPageId );
return sDescription;
}
-
-OUString VCLXAccessibleTabPage::getAccessibleName( )
+OUString VCLXAccessibleTabPage::getAccessibleName()
{
OExternalLockGuard aGuard( this );
-return GetPageText();
-}
+OUString sName;
+if ( m_pTabControl )
+sName = m_pTabControl->GetAccessibleName( m_nPageId );
+return sName;
+}
Reference< XAccessibleRelationSet >
VCLXAccessibleTabPage::getAccessibleRelationSet( )
{
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 4fe386da3d15..edfa86cf37f0 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -152,6 +152,12 @@ public:
voidSetPageName( sal_uInt16 nPageId, const OString& rName
) const;
OString GetPageName( sal_uInt16 nPageId ) const;
+void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr );
+OUString GetAccessibleName( sal_uInt16 nItemId ) const;
+
+void SetAccessibleDescription( sal_uInt16 nItemId, const OUString& rStr );
+OUString GetAccessibleDescription( sal_uInt16 nItemId ) const;
+
voidSetPageImage( sal_uInt16 nPageId, const Image& rImage
);
using Control::SetHelpId;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index b5275f6cb539..c3c894cb451d 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -53,6 +53,8 @@ public:
OUStringmaText;
OUStringmaFormatText;
OUStringmaHelpText;
+OUStringmaAccessibleName;
+OUStringmaAccessibleDescription;
OString maTabName;
tools::RectanglemaRect;
sal_uInt16 mnLine;
@@ -1948,6 +1950,38 @@ const OUString& TabControl::GetHelpText( sal_uInt16
nPageId ) const
return pItem->maHelpText;
}
+void TabControl::SetAccessibleName(sal_uInt16 nPageId, const OUString& rName)
+{
+ImplTabItem* pItem = ImplGetItem( nPageId );
+assert( pItem );
+pItem->maAccessibleName = rName;
+}
+
+OUString TabControl::GetAccessibleName( sal_uInt16 nPageId ) const
+{
+ImplTabItem* pItem = ImplGetItem( nPageId );
+assert( pItem );
+if (!pItem->maAccessibleName.isEmpty())
+return pItem->maAccessibleName;
+return OutputDevice::GetNonMnemonicString(pItem->maText);
+}
+
+void TabControl::SetAccessibleDescription(sal_uInt16 nPageId, const OUString&
rDesc)
+{
+ImplTabItem* pItem = ImplGetItem( nPageId );
+assert( pItem );
+pItem->maAccessibleDescription = rDesc;
+}
+
+OUString TabControl::GetAccessibleDescription( sal_uInt16 nPageId ) const
+{
+ImplTabItem* pItem = ImplGetItem( nPageId );
+assert( pItem );
+if (!pItem->maAccessibleDescription.isEmpty())
+return pItem->maAccessibleDescription;
+return pItem->maHelpText;
+}
+
void TabControl::SetPageName( sal_uInt16 nPageId, const OString& rName ) const
{
ImplTabItem* pItem = ImplGetItem( nPageId );
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d3f9febb7208..03f686f0a664 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2599,10 +2599,14 @@ VclPtr
[Libreoffice-commits] core.git: accessibility/source include/vcl vcl/source
accessibility/source/standard/accessiblemenubasecomponent.cxx |5 +
accessibility/source/standard/accessiblemenuitemcomponent.cxx |2
include/vcl/builder.hxx |7 +
include/vcl/menu.hxx |4
include/vcl/vclevent.hxx |1
vcl/source/window/builder.cxx | 42 +++---
vcl/source/window/menu.cxx| 30 +++
vcl/source/window/menuitemlist.hxx|1
8 files changed, 78 insertions(+), 14 deletions(-)
New commits:
commit 7d0279121f099aa36fcee3f0df207bdbcee75ad4
Author: Caolán McNamara
AuthorDate: Thu Aug 27 10:34:36 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 14:33:23 2020 +0200
tdf#136162 implement applying atk properties to gen menus
Change-Id: I77dbc21910b01524d281869a83d9d12efd419bf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101446
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 3c5cdd53c71f..4dbb71c554cf 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -579,6 +579,11 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const
VclMenuEvent& rVclMen
RemoveChild( nItemPos );
}
break;
+case VclEventId::MenuAccessibleNameChanged:
+{
+UpdateAccessibleName( nItemPos );
+}
+break;
case VclEventId::MenuItemTextChanged:
{
UpdateAccessibleName( nItemPos );
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index c4e08609fe04..951d913e20c3 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -336,7 +336,7 @@ OUString
OAccessibleMenuItemComponent::getAccessibleDescription( )
OUString sDescription;
if ( m_pParent )
-sDescription = m_pParent->GetHelpText( m_pParent->GetItemId(
m_nItemPos ) );
+sDescription = m_pParent->GetAccessibleDescription(
m_pParent->GetItemId( m_nItemPos ) );
return sDescription;
}
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index c15b671cd8b2..6a642a1c7149 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -345,8 +345,10 @@ private:
voidextractStock(const OString , stringmap );
voidextractMnemonicWidget(const OString , stringmap );
-voidhandleChild(vcl::Window *pParent, xmlreader::XmlReader
);
-VclPtr handleObject(vcl::Window *pParent,
xmlreader::XmlReader );
+// either pParent or pAtkProps must be set, pParent for a child of a
widget, pAtkProps for
+// collecting the atk info for a GtkMenuItem
+voidhandleChild(vcl::Window *pParent, stringmap *pAtkProps,
xmlreader::XmlReader );
+VclPtr handleObject(vcl::Window *pParent, stringmap
*pAtkProps, xmlreader::XmlReader );
voidhandlePacking(vcl::Window *pCurrent, vcl::Window *pParent,
xmlreader::XmlReader );
static std::vector
handleStyle(xmlreader::XmlReader , int );
static OString getStyleClass(xmlreader::XmlReader );
@@ -363,6 +365,7 @@ private:
const OString ,
const OString ,
stringmap ,
+ stringmap ,
accelmap );
voidhandleMenuChild(Menu *pParent, xmlreader::XmlReader );
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index bea9e2a39268..9522204de0b6 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -372,8 +372,12 @@ public:
vcl::Window* GetWindow() const { return pWindow; }
+void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr );
OUString GetAccessibleName( sal_uInt16 nItemId ) const;
+void SetAccessibleDescription( sal_uInt16 nItemId, const OUString& rStr );
+OUString GetAccessibleDescription( sal_uInt16 nItemId ) const;
+
// returns whether the item a position nItemPos is highlighted or not.
bool IsHighlighted( sal_uInt16 nItemPos ) const;
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index ad24a61740a2..a0a11c6a0870 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -67,6 +67,7 @@ enum class VclEventId
ListboxSelect,
ListboxTreeFocus,
ListboxTreeSelect,
+MenuAccessibleNameChanged,
MenuActivate,
MenuDeactivate,
MenuDehighlight,
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1b2f0aef2263..2fd07524b137 100644
--- a/vcl/source/window/builder.cxx
+++
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format toolkit/inc toolkit/source vcl/inc vcl/jsdialog vcl/source
accessibility/source/standard/vclxaccessibleedit.cxx |2 +-
include/vcl/toolkit/vclmedit.hxx |9 +
solenv/clang-format/excludelist |2 +-
toolkit/inc/controls/svmedit.hxx |2 +-
toolkit/source/awt/vclxtoolkit.cxx |2 +-
vcl/inc/pch/precompiled_vcl.hxx |4 ++--
vcl/jsdialog/jsdialogbuilder.cxx |2 +-
vcl/source/app/salvtables.cxx|2 +-
vcl/source/edit/vclmedit.cxx |2 +-
vcl/source/uitest/uiobject.cxx |2 +-
vcl/source/window/builder.cxx|2 +-
vcl/source/window/layout.cxx |2 +-
12 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit cee0a2a93e2956e1a29019ef3ca92d4dd5d69c1f
Author: Caolán McNamara
AuthorDate: Tue Aug 18 15:55:27 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Aug 19 10:12:19 2020 +0200
move VclMultiLineEdit to toolkit-only headers
Change-Id: I2e8728061e484f79768fcfe67d674cb76367a94d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100951
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx
b/accessibility/source/standard/vclxaccessibleedit.cxx
index 0da8a6ff70b1..10a28afc626c 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -34,7 +34,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx
similarity index 97%
rename from include/vcl/vclmedit.hxx
rename to include/vcl/toolkit/vclmedit.hxx
index 9292ebe037cd..a15ca2aaa901 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/toolkit/vclmedit.hxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_VCLMEDIT_HXX
-#define INCLUDED_VCL_VCLMEDIT_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include
#include
@@ -177,6 +180,4 @@ public:
virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
};
-#endif // INCLUDED_VCL_VCLMEDIT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 5150456678a5..66f37795aa41 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7445,6 +7445,7 @@ include/vcl/toolkit/treelist.hxx
include/vcl/toolkit/treelistbox.hxx
include/vcl/toolkit/treelistentry.hxx
include/vcl/toolkit/unowrap.hxx
+include/vcl/toolkit/vclmedit.hxx
include/vcl/toolkit/viewdataentry.hxx
include/vcl/transfer.hxx
include/vcl/txtattr.hxx
@@ -7457,7 +7458,6 @@ include/vcl/vclenum.hxx
include/vcl/vclevent.hxx
include/vcl/vcllayout.hxx
include/vcl/vclmain.hxx
-include/vcl/vclmedit.hxx
include/vcl/vclptr.hxx
include/vcl/vclreferencebase.hxx
include/vcl/vectorgraphicdata.hxx
diff --git a/toolkit/inc/controls/svmedit.hxx b/toolkit/inc/controls/svmedit.hxx
index b783ce79487c..33586c84f064 100644
--- a/toolkit/inc/controls/svmedit.hxx
+++ b/toolkit/inc/controls/svmedit.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include
+#include
class MultiLineEdit : public VclMultiLineEdit
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 4f7dc2150d61..ab4d8ae58585 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -64,7 +64,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index b6fa73b6d062..29f9379fe5b3 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-08-12 11:16:23 using:
+ Generated on 2020-08-18 15:54:52 using:
./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module
--include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -325,6 +325,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -332,7 +333,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 93214876f3e5..af48c181bff6 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include
#include
JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr aWindow)
[Libreoffice-commits] core.git: accessibility/source basegfx/source basic/qa basic/source
accessibility/source/extended/textwindowaccessibility.cxx |2 +-
basegfx/source/polygon/b2dpolygontools.cxx|4 ++--
basic/qa/vba_tests/partition.vb |2 +-
basic/source/classes/sb.cxx |2 +-
basic/source/classes/sbunoobj.cxx |4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d7484b08c636801b474582c1e940dc8e497b74e8
Author: Andrea Gelmini
AuthorDate: Mon Aug 17 17:41:07 2020 +0200
Commit: Julien Nabet
CommitDate: Mon Aug 17 19:42:42 2020 +0200
Fix typos
Change-Id: Id31299912b822baf9eecbb03cba53339f0528ae8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100867
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 68814bac9b7e..83866419abc4 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -889,7 +889,7 @@ Document::retrieveCharacterBounds(Paragraph const *
pParagraph,
// XXX numeric overflow (2x)
// FIXME If the vertical extends of the two cursors do not match,
assume
// nIndex is the last character on the line; the bounding box will then
-// extend to m_rEnginge.GetMaxTextWidth():
+// extend to m_rEngine.GetMaxTextWidth():
::sal_Int32 nWidth = (aLeft.Top() == aRight.Top()
&& aLeft.Bottom() == aRight.Bottom())
? static_cast< ::sal_Int32 >(aRight.Left() - aLeft.Left())
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index 19aa7ee634b0..fa772be9e199 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -171,7 +171,7 @@ namespace basegfx::utils
B2DCubicBezier aBezier;
aBezier.setStartPoint(rCandidate.getB2DPoint(0));
-// perf: try to avoid too many realloctions by guessing
the result's pointcount
+// perf: try to avoid too many reallocations by guessing
the result's pointcount
aRetval.reserve(nPointCount*4);
// add start point (always)
@@ -254,7 +254,7 @@ namespace basegfx::utils
B2DCubicBezier aBezier;
aBezier.setStartPoint(rCandidate.getB2DPoint(0));
-// perf: try to avoid too many realloctions by guessing
the result's pointcount
+// perf: try to avoid too many reallocations by guessing
the result's pointcount
aRetval.reserve(nPointCount*4);
// add start point (always)
diff --git a/basic/qa/vba_tests/partition.vb b/basic/qa/vba_tests/partition.vb
index d134a4227fbd..e4c2bda6743e 100644
--- a/basic/qa/vba_tests/partition.vb
+++ b/basic/qa/vba_tests/partition.vb
@@ -48,7 +48,7 @@ Function verify_testPartition() as String
verify_testPartition = result
Exit Function
errorHandler:
-TestLog_ASSERT (false), "verify_testPartion failed, hit error handler"
+TestLog_ASSERT (false), "verify_testPartition failed, hit error handler"
End Function
Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional
testComment As String)
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c9f34e90ae16..a2c1e165c8db 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1767,7 +1767,7 @@ bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
return false;
}
// #95459 Delete dialogs, otherwise endless recursion
-// in SbxVarable::GetType() if dialogs are accessed
+// in SbxVariable::GetType() if dialogs are accessed
sal_uInt32 nObjCount = pObjs->Count32();
std::unique_ptr ppDeleteTab(new SbxVariable*[ nObjCount ]);
sal_uInt32 nObj;
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 8ce98b6c3b48..f004cce017d8 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1545,7 +1545,7 @@ static Any invokeAutomationMethod( const OUString& Name,
Sequence< Any > const &
return aRetAny;
}
-// Debugging help method to readout the imlemented interfaces of an object
+// Debugging help method to readout the implemented interfaces of an object
static OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const
Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
{
Type aIfaceType = cppu::UnoType::get();
@@ -1734,7 +1734,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const
OUString& rClass)
return bResult;
}
-// Debugging help method to readout the imlemented interfaces of an object
+// Debugging help method to readout the implemented interfaces of
[Libreoffice-commits] core.git: accessibility/source include/sfx2 include/vcl sfx2/inc sfx2/source toolkit/inc toolkit/source vcl/inc vcl/jsdialog vcl/workben
accessibility/source/standard/vclxaccessiblebutton.cxx |2
accessibility/source/standard/vclxaccessiblecheckbox.cxx|2
accessibility/source/standard/vclxaccessibleradiobutton.cxx |2
include/sfx2/sidebar/TabBar.hxx |2
include/vcl/button.hxx | 101
include/vcl/toolkit/button.hxx | 98 +++
sfx2/inc/sidebar/ControlFactory.hxx |3
sfx2/inc/sidebar/MenuButton.hxx |4
sfx2/source/sidebar/ControlFactory.cxx |2
sfx2/source/sidebar/MenuButton.cxx |4
toolkit/inc/controls/filectrl.hxx |2
toolkit/source/awt/vclxwindows.cxx |2
vcl/inc/jsdialog/jsdialogbuilder.hxx|2
vcl/jsdialog/jsdialogbuilder.cxx|1
vcl/workben/vcldemo.cxx |2
15 files changed, 113 insertions(+), 116 deletions(-)
New commits:
commit bcea211b66910ee6cf6a51e4baa950b3f897e310
Author: Caolán McNamara
AuthorDate: Sun Jul 12 17:22:54 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Jul 12 20:28:56 2020 +0200
move CheckBox to toolkit-only headers
Change-Id: Id1b2dd11bd0ebd9c88cf7e86d990a1990d760b2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98605
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f0ade105ce27..4c912530f8bf 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -29,7 +29,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index a1074af9836d..a15ae4013ceb 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -30,7 +30,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 4b408cb35b57..aae9c76731f7 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -30,7 +30,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 70ff1ec29ebb..055167890ee4 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -91,7 +91,7 @@ public:
private:
css::uno::Reference mxFrame;
-VclPtr mpMenuButton;
+VclPtr mpMenuButton;
class Item
{
public:
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3f998d5d6402..0819ff1b5aab 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -335,107 +335,6 @@ public:
virtual FactoryFunction GetUITestFactory() const override;
};
-class VCL_DLLPUBLIC CheckBox : public Button
-{
-private:
-tools::Rectangle maStateRect;
-tools::Rectangle maMouseRect;
-TriStatemeState;
-TriStatemeSaveValue;
-boolmbTriState;
-Link maToggleHdl;
-// when mbLegacyNoTextAlign is set then the old behaviour where
-// the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement
-// occurs, otherwise the image ( checkbox box ) is placed
-// to the left or right ( depending on RTL or LTR settings )
-boolmbLegacyNoTextAlign;
-SAL_DLLPRIVATE void ImplInitCheckBoxData();
-SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window*
pPrevWindow, WinBits nStyle );
-SAL_DLLPRIVATE void ImplInitSettings( bool bBackground );
-SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags
nDrawFlags,
-const Point& rPos, const Size& rSize,
-const Size& rImageSize, tools::Rectangle&
rStateRect,
-tools::Rectangle& rMouseRect );
-SAL_DLLPRIVATE void ImplDrawCheckBox(vcl::RenderContext&
rRenderContext );
-SAL_DLLPRIVATE long ImplGetImageToTextDistance() const;
-SAL_DLLPRIVATE Size ImplGetCheckImageSize() const;
-
-CheckBox(const CheckBox &) = delete;
-CheckBox& operator= (const CheckBox &) =
delete;
-
-protected:
-using Control::ImplInitSettings;
-using Window::ImplInit;
-SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle
);
-
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblescrollbar.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 80f92c3ce3c72bf48d4b34c11537407e1a3b7a3c
Author: Stephan Bergmann
AuthorDate: Tue Jun 30 15:18:31 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Jun 30 18:29:06 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: accessibility
Change-Id: Ibb44e313924970319c3409323160ca7f5a6d184e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 277aea285021..329aaec906bc 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -105,7 +105,7 @@ Sequence< OUString >
VCLXAccessibleScrollBar::getSupportedServiceNames()
// XAccessibleAction
-static constexpr sal_Int32 ACCESSIBLE_ACTION_COUNT=4;
+constexpr sal_Int32 ACCESSIBLE_ACTION_COUNT=4;
sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibleheaderbar.cxx |1 -
accessibility/source/standard/vclxaccessiblemenubar.cxx |4
2 files changed, 5 deletions(-)
New commits:
commit 970ca51795ed720cdc5a35f4d8bcdb75926e59cf
Author: Arnaud Versini
AuthorDate: Sun Jun 21 14:50:08 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Jun 21 22:02:08 2020 +0200
accessibility : don't initialize manually VclPtr
Change-Id: Iee3bbe796dfc8a4e8bc15447a6a54a5c33160494
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96812
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessibleheaderbar.cxx
b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
index 08c085b50fe6..e8bff335766b 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbar.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
@@ -36,7 +36,6 @@ using namespace ::comphelper;
VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow )
:VCLXAccessibleComponent( pVCLWindow )
-,m_pHeadBar(nullptr)
{
m_pHeadBar = GetAs< HeaderBar >();
}
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx
b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 0aae134438eb..27a02607b225 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -43,10 +43,6 @@ VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu )
if ( m_pWindow )
m_pWindow->AddEventListener( LINK( this, VCLXAccessibleMenuBar,
WindowEventListener ) );
}
-else
-{
-m_pWindow = nullptr;
-}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source basic/qa comphelper/source compilerplugins/clang cppcanvas/source cppuhelper/source extensions/source include/oox oox/source sc/inc sc/qa sc/source
accessibility/source/standard/vclxaccessiblecombobox.cxx |2 accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |2 accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |2 accessibility/source/standard/vclxaccessiblelistbox.cxx |2 basic/qa/cppunit/basictest.cxx |2 comphelper/source/misc/configuration.cxx |8 - compilerplugins/clang/simplifypointertobool.cxx | 35 compilerplugins/clang/test/simplifypointertobool.cxx | 39 + cppcanvas/source/mtfrenderer/implrenderer.cxx|2 cppcanvas/source/tools/canvasgraphichelper.cxx |3 cppcanvas/source/wrapper/basegfxfactory.cxx |9 - cppcanvas/source/wrapper/implbitmap.cxx |6 cppcanvas/source/wrapper/implpolypolygon.cxx |3 cppcanvas/source/wrapper/vclfactory.cxx |3 cppuhelper/source/servicemanager.cxx | 22 +- extensions/source/propctrlr/browserlistbox.cxx |2 extensions/source/propctrlr/propcontroller.hxx |2 include/oox/ole/axcontrol.hxx|2 oox/source/ppt/pptshape.cxx |4 oox/source/shape/ShapeContextHandler.cxx |2 sc/inc/document.hxx |2 sc/qa/extras/scpdfexport.cxx |4 sc/qa/unit/bugfix-test.cxx |2 sc/qa/unit/copy_paste_test.cxx |4 sc/qa/unit/ucalc_formula.cxx |4 sc/source/core/data/document10.cxx |2 sc/source/filter/excel/xecontent.cxx |2 sc/source/filter/excel/xilink.cxx|2 sc/source/filter/inc/richstring.hxx |2 sc/source/ui/unoobj/linkuno.cxx |2 sd/source/core/EffectMigration.cxx |2 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |2 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |4 sd/source/ui/animations/CustomAnimationList.cxx |2 sd/source/ui/animations/CustomAnimationPane.cxx |2 sd/source/ui/animations/motionpathtag.cxx|2 sd/source/ui/framework/factories/FullScreenPane.cxx |2 sd/source/ui/framework/factories/Pane.cxx|2 sd/source/ui/presenter/PresenterHelper.cxx |4 sd/source/ui/presenter/SlideRenderer.cxx |2 sd/source/ui/sidebar/MasterPageContainer.cxx | 24 +-- sd/source/ui/sidebar/MasterPageContainerQueue.cxx|4 sd/source/ui/sidebar/PanelBase.cxx |2 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |4 sd/source/ui/slidesorter/controller/SlideSorterController.cxx|4 sd/source/ui/slidesorter/controller/SlsClipboard.cxx |2 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 12 - sd/source/ui/slidesorter/controller/SlsFocusManager.cxx |4 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 12 - sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |8 - sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx |2 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |4 sd/source/ui/slidesorter/model/SlideSorterModel.cxx |4 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx|2 sd/source/ui/slidesorter/shell/SlideSorter.cxx |8 - sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 50 +++--- sd/source/ui/slidesorter/view/SlideSorterView.cxx|4 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx|2 sd/source/ui/view/FormShellManager.cxx |2 sd/source/ui/view/ViewShellBase.cxx |2 sd/source/ui/view/ViewShellManager.cxx |4 sd/source/ui/view/drviews1.cxx |4 sd/source/ui/view/drviews4.cxx | 14 - sd/source/ui/view/grviewsh.cxx |2 sd/source/ui/view/viewshe2.cxx | 34 ++-- sd/source/ui/view/viewshel.cxx | 76 +- sdext/source/presenter/PresenterAccessibility.cxx|2
[Libreoffice-commits] core.git: accessibility/source basctl/source basegfx/source basic/source
accessibility/source/extended/accessibletabbarpagelist.cxx|6 +++---
accessibility/source/standard/accessiblemenubasecomponent.cxx |2 +-
accessibility/source/standard/vclxaccessiblestatusbar.cxx |8
accessibility/source/standard/vclxaccessibletabcontrol.cxx|4 ++--
basctl/source/basicide/basidesh.cxx |4 ++--
basctl/source/basicide/brkdlg.cxx |2 +-
basegfx/source/polygon/b2dpolygoncutandtouch.cxx |2 +-
basegfx/source/polygon/b2dsvgpolypolygon.cxx |2 +-
basic/source/classes/sbxmod.cxx |4 ++--
basic/source/comp/dim.cxx |6 +++---
basic/source/sbx/sbxobj.cxx |2 +-
11 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 5f19287a9cd4167e3be937e3df820446f2e30518
Author: Noel Grandin
AuthorDate: Wed May 27 14:49:41 2020 +0200
Commit: Noel Grandin
CommitDate: Thu May 28 09:05:11 2020 +0200
loplugin:simplifybool in accessibility..basic
Change-Id: Ibf6cef4baa2d3d400d953ac8bc97a66b5901def9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94972
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 680e0e70ba97..7fd901037c07 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -88,7 +88,7 @@ namespace accessibility
void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i )
{
-if ( !(i >= 0 && i <
static_cast(m_aAccessibleChildren.size())) )
+if ( i < 0 || i >=
static_cast(m_aAccessibleChildren.size()) )
return;
Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
@@ -106,7 +106,7 @@ namespace accessibility
void AccessibleTabBarPageList::InsertChild( sal_Int32 i )
{
-if ( !(i >= 0 && i <=
static_cast(m_aAccessibleChildren.size())) )
+if ( i < 0 || i > static_cast(m_aAccessibleChildren.size())
)
return;
// insert entry in child list
@@ -125,7 +125,7 @@ namespace accessibility
void AccessibleTabBarPageList::RemoveChild( sal_Int32 i )
{
-if ( !(i >= 0 && i <
static_cast(m_aAccessibleChildren.size())) )
+if ( i < 0 || i >=
static_cast(m_aAccessibleChildren.size()) )
return;
// get the accessible of the removed page
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index d3070d1bacb6..3c5cdd53c71f 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -409,7 +409,7 @@ void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i
)
void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i )
{
-if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size()))
)
+if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) )
return;
// keep the accessible of the removed item
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index ff6351c6bd7c..e84825ea0b3f 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -62,7 +62,7 @@ void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i,
bool bShowing )
void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i )
{
-if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size()))
)
+if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) )
return;
Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
@@ -80,7 +80,7 @@ void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i )
void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i )
{
-if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size()))
)
+if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) )
return;
Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
@@ -98,7 +98,7 @@ void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i )
void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i )
{
-if ( !(i >= 0 && i <=
static_cast(m_aAccessibleChildren.size())) )
+if ( i < 0 || i > static_cast(m_aAccessibleChildren.size()) )
return;
// insert entry in child list
@@ -117,7 +117,7 @@ void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i )
void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i )
{
-if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size()))
)
+if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) )
return;
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format toolkit/source vcl/Executable_vcldemo.mk vcl/inc vcl/qa vcl/source vcl/workben
accessibility/source/helper/acc_factory.cxx |2 +- accessibility/source/standard/vclxaccessiblebox.cxx |2 +- accessibility/source/standard/vclxaccessiblelist.cxx |2 +- include/vcl/toolkit/combobox.hxx |4 include/vcl/toolkit/field.hxx|2 +- solenv/clang-format/blacklist|2 +- toolkit/source/awt/vclxtoolkit.cxx |2 +- toolkit/source/awt/vclxwindows.cxx |2 +- vcl/Executable_vcldemo.mk|4 vcl/inc/jsdialog/jsdialogbuilder.hxx |4 ++-- vcl/inc/salvtables.hxx |2 +- vcl/qa/cppunit/lifecycle.cxx |2 +- vcl/source/app/salvtables.cxx|2 +- vcl/source/control/combobox.cxx |2 +- vcl/source/uitest/uiobject.cxx |2 +- vcl/workben/vcldemo.cxx |2 +- 16 files changed, 23 insertions(+), 15 deletions(-) New commits: commit 4a231d1fc13fa13ec48e7d41d0a8c59a2527a3f4 Author: Caolán McNamara AuthorDate: Wed May 13 15:58:03 2020 +0100 Commit: Caolán McNamara CommitDate: Wed May 20 20:24:32 2020 +0200 move ComboBox to toolkit-only headers Change-Id: If5f0ab1fba8fa7302b7c0e8d2b25761ab64c97e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94143 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 68fb48922a9b..02d75771fb98 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 109a76b6c364..fd382ff5b06b 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 5eae30ecd602..e405b30fb4c3 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/vcl/combobox.hxx b/include/vcl/toolkit/combobox.hxx similarity index 98% rename from include/vcl/combobox.hxx rename to include/vcl/toolkit/combobox.hxx index ee5f72bcad8d..81bd8c2dfc57 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_VCL_COMBOBOX_HXX #define INCLUDED_VCL_COMBOBOX_HXX +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif + #include #include #include diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index ce3f1277e862..e78b174e74a5 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -25,7 +25,7 @@ #endif #include -#include +#include #include #include diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 15313bf28a61..6c5a6a477d3e 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7332,7 +7332,6 @@ include/vcl/cairo.hxx include/vcl/calendar.hxx include/vcl/canvastools.hxx include/vcl/checksum.hxx -include/vcl/combobox.hxx include/vcl/commandevent.hxx include/vcl/commandinfoprovider.hxx include/vcl/ctrl.hxx @@ -7451,6 +7450,7 @@ include/vcl/threadex.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx include/vcl/toolkit/button.hxx +include/vcl/toolkit/combobox.hxx include/vcl/toolkit/controllayout.hxx include/vcl/toolkit/dialog.hxx include/vcl/toolkit/field.hxx diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 773b3e930537..b7f6f2f43f91 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -81,7 +81,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 97b7fa6677b5..ab190525b478 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index 55848b280339..a9a8d195fdc9 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -26,6 +26,10 @@ $(eval $(call
[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source canvas/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source desktop/source drawinglay
accessibility/source/extended/accessibletabbar.cxx |1 accessibility/source/standard/accessiblemenucomponent.cxx |1 avmedia/source/framework/mediaitem.cxx |1 avmedia/source/viewer/mediawindow.cxx |1 basctl/source/basicide/baside2b.cxx |1 canvas/source/tools/canvastools.cxx |1 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx |3 chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx |2 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |1 chart2/source/controller/dialogs/TitleDialogData.cxx |4 chart2/source/controller/dialogs/dlg_DataEditor.cxx |1 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx |1 chart2/source/controller/dialogs/dlg_View3D.cxx |2 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx |2 chart2/source/controller/dialogs/tp_DataSource.cxx |3 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |1 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |1 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |2 chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |2 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |1 chart2/source/controller/main/DragMethod_PieSegment.cxx |1 chart2/source/controller/main/DragMethod_RotateDiagram.cxx |1 chart2/source/controller/main/ObjectHierarchy.cxx |1 chart2/source/controller/main/PositionAndSizeHelper.cxx |3 chart2/source/controller/main/SelectionHelper.cxx |1 chart2/source/controller/main/ShapeController.cxx |2 chart2/source/controller/main/UndoCommandDispatch.cxx |1 chart2/source/model/template/BarChartTypeTemplate.cxx |1 chart2/source/tools/ChartViewHelper.cxx |1 chart2/source/tools/DataSeriesHelper.cxx |1 chart2/source/tools/LifeTime.cxx |1 chart2/source/tools/RangeHighlighter.cxx |1 chart2/source/tools/ReferenceSizeProvider.cxx |2 chart2/source/tools/StatisticsHelper.cxx |2 chart2/source/tools/WrappedDefaultProperty.cxx |3 chart2/source/view/axes/VAxisBase.cxx |1 chart2/source/view/axes/VCartesianAxis.cxx |2 chart2/source/view/axes/VPolarAngleAxis.cxx |1 chart2/source/view/charttypes/CandleStickChart.cxx |1 chart2/source/view/charttypes/PieChart.cxx |1 comphelper/source/misc/componentmodule.cxx |3 comphelper/source/processfactory/processfactory.cxx |2 connectivity/source/commontools/dbtools2.cxx |2 connectivity/source/commontools/paramwrapper.cxx |1 connectivity/source/drivers/mork/MColumnAlias.cxx |1 connectivity/source/drivers/writer/WDatabaseMetaData.cxx |1 connectivity/source/drivers/writer/WTable.cxx |1 cui/source/customize/cfg.cxx |1 cui/source/options/optasian.cxx |1 cui/source/options/optlingu.cxx |3 cui/source/tabpages/numfmt.cxx |1 dbaccess/source/core/api/querycomposer.cxx |1 dbaccess/source/filter/xml/xmlDatabase.cxx |1 dbaccess/source/filter/xml/xmlExport.cxx
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format vcl/inc vcl/source
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |2 +-
accessibility/source/extended/accessiblelistboxentry.cxx|2 +-
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |2 +-
include/vcl/toolkit/controllayout.hxx |4
solenv/clang-format/blacklist |2 +-
vcl/inc/controldata.hxx |2 +-
vcl/inc/toolbox.h |2 +-
vcl/source/control/tabctrl.cxx |2 +-
vcl/source/outdev/text.cxx |2 +-
vcl/source/window/menu.cxx |2 +-
10 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit f924658e45f256544e43c3fdb2af9b585d0f0933
Author: Caolán McNamara
AuthorDate: Sat Apr 25 20:22:06 2020 +0100
Commit: Caolán McNamara
CommitDate: Sat Apr 25 22:44:00 2020 +0200
controllayout.hxx can be a toolkit-only header
Change-Id: I4ad08decf432a890cdf7acf475d15210ba813f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92903
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 2add209c4d65..aac52d59c113 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 22dc36aef3a1..6c8c0a1d52da 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index ac6e4aff65b2..b0a97f951a59 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -33,7 +33,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/include/vcl/controllayout.hxx
b/include/vcl/toolkit/controllayout.hxx
similarity index 95%
rename from include/vcl/controllayout.hxx
rename to include/vcl/toolkit/controllayout.hxx
index 3e311ba45306..ffd643f640ee 100644
--- a/include/vcl/controllayout.hxx
+++ b/include/vcl/toolkit/controllayout.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_CONTROLLAYOUT_HXX
#define INCLUDED_VCL_CONTROLLAYOUT_HXX
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
+
#include
#include
#include
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 66b455d7fda1..ddfe3e914923 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7350,7 +7350,6 @@ include/vcl/checksum.hxx
include/vcl/combobox.hxx
include/vcl/commandevent.hxx
include/vcl/commandinfoprovider.hxx
-include/vcl/controllayout.hxx
include/vcl/ctrl.hxx
include/vcl/cursor.hxx
include/vcl/cvtgrf.hxx
@@ -7467,6 +7466,7 @@ include/vcl/textview.hxx
include/vcl/threadex.hxx
include/vcl/timer.hxx
include/vcl/toolbox.hxx
+include/vcl/toolkit/controllayout.hxx
include/vcl/toolkit/dialog.hxx
include/vcl/toolkit/field.hxx
include/vcl/toolkit/fixedhyper.hxx
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index fddd371d8a2e..ed6e3a368967 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_INC_CONTROLDATA_HXX
#include
-#include
+#include
namespace vcl
{
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index b534b219245f..bf4c51c5d0f8 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_INC_TOOLBOX_H
#include
-#include
+#include
#include
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 9d05aa450b4a..c02ed29fddff 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -28,7 +28,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index f17f3375f246..fa0c7b128dab 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -37,7 +37,7 @@
#include
#include
#include
-#include
+#include
#ifdef MACOSX
# include
#endif
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c3cf735253aa..bcfbdbb37773 100644
---
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessibleiconchoicectrl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b762eaba776abde3173a39df3133d1d1b40ccd44
Author: Ian Barkley-Yeung
AuthorDate: Sun Apr 5 21:07:04 2020 -0700
Commit: Noel Grandin
CommitDate: Tue Apr 21 07:52:37 2020 +0200
tdf#42982: Improve UNO API error reporting
Add more info to the exception in
AccessibleIconChoiceCtrl::getAccessibleChild()
Change-Id: Ie6e778f76719eb463508647f0367e089ab0ae8ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92514
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 679a6157de0c..f521a235e8d2 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -162,7 +162,10 @@ namespace accessibility
VclPtr pCtrl = getCtrl();
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry(i);
if ( !pEntry )
-throw RuntimeException();
+throw RuntimeException("getAccessibleChild: Entry "
+ + OUString::number(i) + " not found",
+static_cast(
+static_cast(this)));
return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source animations/source
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 28 -
accessibility/source/extended/AccessibleGridControl.cxx | 80 +--
accessibility/source/extended/AccessibleGridControlBase.cxx | 28 -
accessibility/source/extended/accessibleiconchoicectrl.cxx | 84 +--
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 28 -
accessibility/source/extended/accessiblelistbox.cxx | 200 +++
accessibility/source/extended/accessiblelistboxentry.cxx| 50 -
accessibility/source/extended/accessibletabbar.cxx | 30 -
accessibility/source/extended/accessibletabbarpagelist.cxx | 118 ++--
accessibility/source/extended/accessibletablistboxtable.cxx | 200 +++
accessibility/source/extended/textwindowaccessibility.cxx | 238
-
accessibility/source/standard/accessiblemenubasecomponent.cxx | 156 ++---
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 60 +-
accessibility/source/standard/vclxaccessiblebutton.cxx | 32 -
accessibility/source/standard/vclxaccessiblelist.cxx| 52 -
accessibility/source/standard/vclxaccessiblelistitem.cxx| 30 -
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 22
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 114 ++--
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 78 +-
accessibility/source/standard/vclxaccessibletabpage.cxx | 30 -
accessibility/source/standard/vclxaccessibletabpagewindow.cxx | 26
accessibility/source/standard/vclxaccessibletoolbox.cxx | 264
+-
animations/source/animcore/animcore.cxx | 134 ++---
23 files changed, 1041 insertions(+), 1041 deletions(-)
New commits:
commit 4f3f61a621a0e66fd0eab4886a3aa51e10513ad3
Author: Noel Grandin
AuthorDate: Sat Apr 18 15:11:01 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 18 21:46:57 2020 +0200
loplugin:flatten in accessibility
Change-Id: I5e02fe0288845210f1d8e41db0342967858098fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92487
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 1bdb03948087..7b519e57ab4a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -268,21 +268,21 @@ void SAL_CALL
AccessibleBrowseBoxBase::addAccessibleEventListener(
void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener(
const css::uno::Reference<
css::accessibility::XAccessibleEventListener>& _rxListener )
{
-if( _rxListener.is() && getClientId( ) )
+if( !(_rxListener.is() && getClientId( )) )
+return;
+
+::osl::MutexGuard aGuard( getMutex() );
+sal_Int32 nListenerCount = AccessibleEventNotifier::removeEventListener(
getClientId( ), _rxListener );
+if ( !nListenerCount )
{
-::osl::MutexGuard aGuard( getMutex() );
-sal_Int32 nListenerCount =
AccessibleEventNotifier::removeEventListener( getClientId( ), _rxListener );
-if ( !nListenerCount )
-{
-// no listeners anymore
-// -> revoke ourself. This may lead to the notifier thread dying
(if we were the last client),
-// and at least to us not firing any events anymore, in case
somebody calls
-// NotifyAccessibleEvent, again
-
-AccessibleEventNotifier::TClientId nId( getClientId( ) );
-setClientId( 0 );
-AccessibleEventNotifier::revokeClient( nId );
-}
+// no listeners anymore
+// -> revoke ourself. This may lead to the notifier thread dying (if
we were the last client),
+// and at least to us not firing any events anymore, in case somebody
calls
+// NotifyAccessibleEvent, again
+
+AccessibleEventNotifier::TClientId nId( getClientId( ) );
+setClientId( 0 );
+AccessibleEventNotifier::revokeClient( nId );
}
}
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index b98104c7695e..5738c6f3fd98 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -293,56 +293,56 @@ void AccessibleGridControl::commitCellEvent(sal_Int16
_nEventId,const Any& _rNew
void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any&
_rNewValue,const Any& _rOldValue)
{
-if ( m_xTable.is() )
+if ( !m_xTable.is() )
+return;
+
+if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED)
{
-if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED)
+const sal_Int32 nCurrentRow = m_aTable.GetCurrentRow();
+const
[Libreoffice-commits] core.git: accessibility/source basctl/source dbaccess/source desktop/source editeng/source include/svx include/vcl reportdesign/source sc/source sd/source sfx2/source starmath/so
accessibility/source/extended/accessibletabbarpagelist.cxx |2 basctl/source/basicide/baside2.cxx |2 basctl/source/basicide/baside2b.cxx |4 - basctl/source/dlged/dlged.cxx |4 - basctl/source/dlged/dlgedview.cxx |2 basctl/source/inc/IDEComboBox.hxx |2 basctl/source/inc/propbrw.hxx |1 dbaccess/source/ui/app/AppDetailPageHelper.cxx |2 dbaccess/source/ui/browser/brwview.cxx |4 - dbaccess/source/ui/querydesign/JoinTableView.cxx|4 - dbaccess/source/ui/querydesign/QueryTableView.cxx |2 desktop/source/app/app.cxx |2 editeng/source/editeng/impedit.cxx |4 - include/svx/float3d.hxx |1 include/vcl/window.hxx |2 reportdesign/source/ui/inc/propbrw.hxx |2 reportdesign/source/ui/report/SectionView.cxx |2 sc/source/ui/view/colrowba.cxx |4 - sc/source/ui/view/drawview.cxx |2 sc/source/ui/view/gridwin.cxx |2 sc/source/ui/view/gridwin3.cxx |2 sc/source/ui/view/tabview.cxx | 12 ++-- sc/source/ui/view/tabview4.cxx |4 - sc/source/ui/view/tabview5.cxx |4 - sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx |2 sd/source/ui/view/sdwindow.cxx |2 sfx2/source/appl/newhelp.cxx|2 sfx2/source/doc/doctemplates.cxx|2 starmath/source/edit.cxx|2 starmath/source/view.cxx|2 svtools/source/brwbox/brwbox1.cxx |2 svtools/source/brwbox/brwhead.cxx |2 svtools/source/brwbox/datwin.cxx|4 - svtools/source/brwbox/editbrowsebox.cxx |6 +- svtools/source/control/scrwin.cxx |4 - svtools/source/control/tabbar.cxx | 14 ++-- svx/source/fmcomp/gridcell.cxx |2 svx/source/inc/datanavi.hxx |1 svx/source/svdraw/sdrpaintwindow.cxx|2 svx/source/svdraw/svdpntv.cxx |2 svx/source/tbxctrls/tbcontrl.cxx|1 sw/source/core/view/viewsh.cxx |8 +- sw/source/uibase/uiview/pview.cxx |2 sw/source/uibase/uiview/viewport.cxx|2 sw/source/uibase/wrtsh/wrtsh2.cxx |4 - toolkit/source/awt/vclxwindow.cxx |6 +- vcl/source/app/help.cxx |2 vcl/source/control/button.cxx |2 vcl/source/control/edit.cxx |2 vcl/source/control/imivctl1.cxx | 10 +-- vcl/source/control/imp_listbox.cxx |8 +- vcl/source/control/scrbar.cxx |2 vcl/source/control/slider.cxx |6 +- vcl/source/edit/textview.cxx|4 - vcl/source/treelist/iconviewimpl.cxx| 16 ++--- vcl/source/treelist/svimpbox.cxx| 34 +--- vcl/source/treelist/treelistbox.cxx |4 - vcl/source/window/menufloatingwindow.cxx|4 - vcl/source/window/paint.cxx | 10 +-- vcl/source/window/split.cxx |4 - vcl/source/window/splitwin.cxx |2 vcl/source/window/toolbox.cxx |4 - vcl/source/window/winproc.cxx |2 vcl/workben/vcldemo.cxx |2 64 files changed, 127 insertions(+), 137 deletions(-) New commits: commit be53f32655973c7a18824d5145eed992be788d2f Author: Noel Grandin AuthorDate: Thu Mar 12 13:55:55 2020 +0200 Commit: Noel Grandin CommitDate: Sat Apr 11 17:56:01 2020 +0200 rename vcl::Window::Update to PaintImmediately To make the code easier to read. Change-Id: Iebc648150391939fba5d1cd815c72dbcf02ceec6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90378 Tested-by: Jenkins Reviewed-by: Noel
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang include/vcl vcl/source
accessibility/source/extended/accessiblelistboxentry.cxx | 14 -
compilerplugins/clang/virtualdead.py |2
compilerplugins/clang/virtualdead.results| 93 ++--
compilerplugins/clang/virtualdead.unusedparams.results | 112 +++
include/vcl/treelistbox.hxx |3
vcl/source/treelist/treelistbox.cxx | 18 --
6 files changed, 114 insertions(+), 128 deletions(-)
New commits:
commit 6df92df74b68d5965ae3fbe9ce5cdc484f03ff20
Author: Noel Grandin
AuthorDate: Thu Apr 2 14:38:04 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 21:23:23 2020 +0200
loplugin:virtualdead
Change-Id: I5698862e5890d3208bc7012b0ce5b60520797c2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91571
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index c5e65ee5a1d4..7b5b055f4d95 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -444,7 +444,7 @@ namespace accessibility
SvTreeListEntry* pEntry = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
if( getAccessibleRole() == AccessibleRole::TREE_ITEM )
{
-return m_pTreeListBox->GetEntryLongDescription( pEntry );
+return OUString();
}
//want to count the real column number in the list box.
sal_uInt16 iRealItemCount = 0;
@@ -476,17 +476,7 @@ namespace accessibility
EnsureIsAlive();
-OUString sRet(implGetText());
-
-SvTreeListEntry* pEntry = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
-
-OUString altText = m_pTreeListBox->GetEntryAltText( pEntry );
-if (!altText.isEmpty())
-{
-sRet += " " + altText;
-}
-
-return sRet;
+return implGetText();
}
Reference< XAccessibleRelationSet > SAL_CALL
AccessibleListBoxEntry::getAccessibleRelationSet( )
diff --git a/compilerplugins/clang/virtualdead.py
b/compilerplugins/clang/virtualdead.py
index eccfbd4f76e3..142743685bf4 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import sys
import re
diff --git a/compilerplugins/clang/virtualdead.results
b/compilerplugins/clang/virtualdead.results
index 87e6431675e0..9a39282eff04 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -1,40 +1,40 @@
-basic/source/comp/codegen.cxx:464
-void OffSetAccumulator::start(const unsigned char *,)
+basic/source/comp/codegen.cxx:478
+void (anonymous namespace)::OffSetAccumulator::start(const unsigned char
*,)
empty
-basic/source/comp/codegen.cxx:476
-_Bool OffSetAccumulator::processParams()
+basic/source/comp/codegen.cxx:490
+_Bool (anonymous namespace)::OffSetAccumulator::processParams()
0
-basic/source/comp/codegen.cxx:526
-_Bool BufferTransformer::processParams()
+basic/source/comp/codegen.cxx:540
+_Bool (anonymous namespace)::BufferTransformer::processParams()
1
-desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
-class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
-"http://openoffi
-include/basegfx/utils/unopolypolygon.hxx:97
-void basegfx::unotools::UnoPolyPolygon::modifying()const
-empty
-include/canvas/base/bitmapcanvasbase.hxx:80
+canvas/inc/base/bitmapcanvasbase.hxx:79
unsigned char canvas::BitmapCanvasBase::hasAlpha()
1
-include/canvas/base/bufferedgraphicdevicebase.hxx:108
+canvas/inc/base/bufferedgraphicdevicebase.hxx:107
void canvas::BufferedGraphicDeviceBase::destroyBuffers()
empty
-include/canvas/base/graphicdevicebase.hxx:235
+canvas/inc/base/graphicdevicebase.hxx:234
unsigned char canvas::GraphicDeviceBase::hasFullScreenMode()
0
-include/canvas/base/graphicdevicebase.hxx:240
+canvas/inc/base/graphicdevicebase.hxx:239
unsigned char canvas::GraphicDeviceBase::enterFullScreenMode(unsigned
char,)
0
-include/canvas/base/graphicdevicebase.hxx:306
+canvas/inc/base/graphicdevicebase.hxx:305
void canvas::GraphicDeviceBase::removePropertyChangeListener(const class
rtl::OUString &,const class com::sun::star::uno::Reference &,)
empty
-include/canvas/base/graphicdevicebase.hxx:319
+canvas/inc/base/graphicdevicebase.hxx:318
void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class
rtl::OUString &,const class com::sun::star::uno::Reference &,)
empty
+desktop/source/deployment/registry/inc/dp_backenddb.hxx:120
+class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
+"http://openoffi
+include/basegfx/utils/unopolypolygon.hxx:97
+void basegfx::unotools::UnoPolyPolygon::modifying()const
+empty
[Libreoffice-commits] core.git: accessibility/source avmedia/source basic/source binaryurp/source chart2/source comphelper/source compilerplugins/clang configmgr/source connectivity/source cppuhelper/
accessibility/source/standard/vclxaccessiblelist.cxx |2 accessibility/source/standard/vclxaccessibletabcontrol.cxx|9 accessibility/source/standard/vclxaccessibletoolbox.cxx |7 avmedia/source/gstreamer/gstframegrabber.cxx |4 avmedia/source/gstreamer/gstplayer.cxx|4 basic/source/runtime/runtime.cxx |4 basic/source/sbx/sbxarray.cxx |4 basic/source/sbx/sbxbyte.cxx |5 basic/source/sbx/sbxint.cxx |3 binaryurp/source/bridgefactory.cxx|3 chart2/source/controller/accessibility/AccessibleBase.cxx |3 chart2/source/controller/dialogs/DataBrowser.cxx |5 chart2/source/controller/dialogs/DataBrowserModel.cxx | 11 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx |4 chart2/source/controller/main/ElementSelector.cxx |3 chart2/source/model/main/BaseCoordinateSystem.cxx |3 chart2/source/tools/ExplicitCategoriesProvider.cxx|3 chart2/source/view/axes/Tickmarks_Equidistant.hxx |4 comphelper/source/eventattachermgr/eventattachermgr.cxx |9 comphelper/source/streaming/oslfile2streamwrap.cxx|3 compilerplugins/clang/test/unsignedcompare.cxx| 16 compilerplugins/clang/unsignedcompare.cxx | 231 ++ configmgr/source/dconf.cxx| 22 configmgr/source/writemodfile.cxx |3 connectivity/source/commontools/dbtools.cxx |3 connectivity/source/commontools/parameters.cxx|5 connectivity/source/drivers/dbase/DTable.cxx | 17 connectivity/source/drivers/dbase/dindexnode.cxx |3 connectivity/source/drivers/file/FStatement.cxx |5 connectivity/source/drivers/flat/ETable.cxx |9 connectivity/source/drivers/mork/MResultSet.cxx |3 connectivity/source/drivers/odbc/OResultSet.cxx |3 connectivity/source/drivers/odbc/OTools.cxx |5 cppuhelper/source/servicemanager.cxx |7 cui/source/options/optgenrl.cxx |5 cui/source/tabpages/numfmt.cxx|5 dbaccess/source/core/api/RowSet.cxx |9 dbaccess/source/core/api/RowSetBase.cxx |3 dbaccess/source/core/api/RowSetCache.cxx |3 dbaccess/source/ui/browser/formadapter.cxx|9 dbaccess/source/ui/control/RelationControl.cxx|5 dbaccess/source/ui/dlg/generalpage.cxx|5 dbaccess/source/ui/dlg/paramdialog.cxx|7 dbaccess/source/ui/misc/WCopyTable.cxx|4 dbaccess/source/ui/querydesign/JAccess.cxx|3 dbaccess/source/ui/querydesign/QueryDesignView.cxx|3 drawinglayer/source/tools/emfpbrush.cxx | 15 drawinglayer/source/tools/emfppath.cxx|3 drawinglayer/source/tools/emfppen.cxx |5 editeng/source/accessibility/AccessibleParaManager.cxx| 35 - editeng/source/editeng/editobj.cxx| 12 editeng/source/editeng/edtspell.cxx |3 editeng/source/editeng/impedit2.cxx |5 editeng/source/editeng/impedit3.cxx |3 editeng/source/editeng/impedit4.cxx |3 editeng/source/items/textitem.cxx |3 editeng/source/outliner/outliner.cxx |3 editeng/source/outliner/outlobj.cxx |5 editeng/source/outliner/paralist.cxx | 10 editeng/source/outliner/paralist.hxx |3 editeng/source/uno/unotext2.cxx |3 emfio/source/reader/mtftools.cxx |6 emfio/source/reader/wmfreader.cxx |3 extensions/source/dbpilots/groupboxwiz.cxx|5 extensions/source/scanner/sane.cxx|4 extensions/source/scanner/scanunx.cxx |9
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblelist.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 0f6bbde666382f1517e8ba7d94e692a86ebca28b
Author: Stephan Bergmann
AuthorDate: Sun Jan 26 14:53:23 2020 +0100
Commit: Stephan Bergmann
CommitDate: Sun Jan 26 15:51:15 2020 +0100
Use properly typed variable for iteration
...avoiding explicit casts to smaller sal_uInt16 from larger sal_Int32.
(Adding
a o3tl::make_unsigned to silence a resulting -Werror,-Wsign-compare.)
Change-Id: Iff1636e961db6edfac274cf8f7440369e841f9c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87441
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 2077fcdf874b..b549c6d0c008 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -620,11 +621,11 @@ void VCLXAccessibleList::UpdateEntryRange_Impl()
UpdateVisibleLineCount();
sal_Int32 nBegin = std::min( m_nLastTopEntry, nTop );
sal_Int32 nEnd = std::max( m_nLastTopEntry + m_nVisibleLineCount, nTop
+ m_nVisibleLineCount );
-for (sal_uInt16 i = static_cast(nBegin); (i <=
static_cast(nEnd)); ++i)
+for (sal_Int32 i = nBegin; (i <= nEnd); ++i)
{
bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount )
);
Reference< XAccessible > xHold;
-if ( i < m_aAccessibleChildren.size() )
+if ( o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
xHold = m_aAccessibleChildren[i];
else if ( bVisible )
xHold = CreateChild(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source basic/source chart2/source dbaccess/source filter/source framework/source package/source sc/source sd/source sfx2/source svtools/source svx/source
accessibility/source/standard/vclxaccessiblelist.cxx|2 +-
accessibility/source/standard/vclxaccessibletoolbox.cxx |2 +-
basic/source/classes/sb.cxx |2 +-
basic/source/classes/sbxmod.cxx |2 +-
basic/source/runtime/runtime.cxx|4 ++--
basic/source/sbx/sbxbase.cxx|4 ++--
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |2 +-
dbaccess/source/core/dataaccess/documentdefinition.cxx |4 ++--
filter/source/svg/svgexport.cxx |8
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |2 +-
framework/source/uielement/menubarmanager.cxx |2 +-
framework/source/uielement/toolbarmanager.cxx |2 +-
package/source/xstor/ohierarchyholder.cxx |4 ++--
sc/source/core/data/documen8.cxx|2 +-
sc/source/core/tool/addinlis.cxx|2 +-
sc/source/ui/Accessibility/AccessibleContextBase.cxx|4 ++--
sc/source/ui/unoobj/cellsuno.cxx|2 +-
sc/source/ui/unoobj/chart2uno.cxx |2 +-
sc/source/ui/unoobj/dapiuno.cxx |2 +-
sd/source/filter/eppt/pptexsoundcollection.cxx |2 +-
sd/source/ui/slideshow/slideshowimpl.cxx|4 ++--
sd/source/ui/slideshow/slideshowviewimpl.cxx|2 +-
sd/source/ui/view/viewshel.cxx |8
sfx2/source/appl/linksrc.cxx|2 +-
sfx2/source/control/statcach.cxx|2 +-
sfx2/source/doc/objxtor.cxx |2 +-
sfx2/source/doc/sfxbasemodel.cxx|4 ++--
sfx2/source/view/sfxbasecontroller.cxx |2 +-
svtools/source/uno/miscservices.cxx |2 +-
svx/source/accessibility/ChildrenManagerImpl.cxx|2 +-
svx/source/sdr/overlay/overlaymanagerbuffered.cxx |2 +-
sw/source/core/ole/ndole.cxx|4 ++--
sw/source/core/view/printdata.cxx |2 +-
sw/source/filter/html/swhtml.cxx|4 ++--
sw/source/uibase/uno/unotxdoc.cxx |2 +-
toolkit/source/awt/vclxaccessiblecomponent.cxx |2 +-
vcl/source/control/ivctrl.cxx |2 +-
vcl/source/treelist/treelistbox.cxx |2 +-
vcl/source/window/dndeventdispatcher.cxx|2 +-
vcl/source/window/menu.cxx |2 +-
vcl/unx/generic/dtrans/X11_clipboard.cxx|2 +-
41 files changed, 56 insertions(+), 56 deletions(-)
New commits:
commit b9fe4f26eaf1099b8d0907b8d9cbf52c86914466
Author: Noel Grandin
AuthorDate: Sat Jan 25 15:05:53 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Jan 26 08:01:13 2020 +0100
rename some local variables
mostly to make the job of my very aggressive unused local vars plugin
easier
Change-Id: Ifc21a920841f8589f8b7e10de39dba6622a5d501
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87399
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index deb5ca1c723f..2077fcdf874b 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -347,7 +347,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEve
{
// Create a reference to this object to prevent an early release of the
// listbox (VclEventId::ObjectDying).
-Reference< XAccessible > xTemp = this;
+Reference< XAccessible > xHoldAlive = this;
switch ( rVclWindowEvent.GetId() )
{
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 1508cf0b5184..c456b93997b4 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -495,7 +495,7 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet(
utl::AccessibleStateSetHelpe
void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
// to prevent an early release of the toolbox (VclEventId::ObjectDying)
-Reference< XAccessibleContext > xTemp = this;
+Reference< XAccessibleContext > xHoldAlive = this;
switch ( rVclWindowEvent.GetId() )
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 310bc293dfdb..12f2e2bea8c2 100644
---
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibleheaderbar.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bca204a32525f0c1aa811bab667a2136269453bd
Author: Stephan Bergmann
AuthorDate: Sat Jan 25 13:43:37 2020 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 25 17:28:33 2020 +0100
Avoid explicit cast to smaller sal_uInt16 from larger sal_Int32
...in what might be an attempt to avoid warnings about signed vs. unsigned
comparisons. (The mismatch had been there ever since
b755fb8c0f6b1282f62c12f378c0a5ecac64d490 "Integrate branch of
IAccessible2".)
Change-Id: I492a5d7bc41311de48b7ea1c7f646c2f5f982e93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87398
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/standard/vclxaccessibleheaderbar.cxx
b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
index 9eb46e5fea05..08c085b50fe6 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbar.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -82,7 +83,7 @@ css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL
Reference< XAccessible > xChild;
// search for the child
-if ( static_cast(i) >= m_aAccessibleChildren.size() )
+if ( o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
xChild = CreateChild (i);
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source connectivity/source i18npool/source sax/source sd/source stoc/source svl/source svtools/source svx/source
accessibility/source/standard/vclxaccessibleheaderbar.cxx |3 +--
connectivity/source/drivers/firebird/Column.cxx |4 +---
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |3 +--
sax/source/fastparser/legacyfastparser.cxx|3 +--
sd/source/ui/unoidl/sddetect.cxx |3 +--
sd/source/ui/unoidl/unomodule.cxx |3 +--
stoc/source/security/file_policy.cxx |3 +--
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx |3 +--
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |3 +--
svl/source/numbers/supservs.cxx |3 +--
svtools/source/uno/addrtempuno.cxx|3 +--
svx/source/customshapes/EnhancedCustomShapeEngine.cxx |3 +--
svx/source/tbxctrls/fontworkgallery.cxx |3 +--
13 files changed, 13 insertions(+), 27 deletions(-)
New commits:
commit 15abfe9ae976a0d940725cdd570facc372981393
Author: Mesut Çifci
AuthorDate: Tue Jan 14 14:35:40 2020 +0300
Commit: Stephan Bergmann
CommitDate: Wed Jan 15 14:52:04 2020 +0100
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: Ice7c0ecc8ee05a5c3b0af458c8191bdde322
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86752
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/standard/vclxaccessibleheaderbar.cxx
b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
index 65558bf26630..9eb46e5fea05 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbar.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
@@ -57,8 +57,7 @@ OUString VCLXAccessibleHeaderBar::getImplementationName()
Sequence< OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
{
-Sequence aNames { "com.sun.star.awt.AccessibleHeaderBar" };
-return aNames;
+return { "com.sun.star.awt.AccessibleHeaderBar" };
}
// ===XAccessibleContext===
diff --git a/connectivity/source/drivers/firebird/Column.cxx
b/connectivity/source/drivers/firebird/Column.cxx
index 31767bf9c4b5..aa8abf9bb75c 100644
--- a/connectivity/source/drivers/firebird/Column.cxx
+++ b/connectivity/source/drivers/firebird/Column.cxx
@@ -45,9 +45,7 @@ void Column::construct()
css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames( )
{
-css::uno::Sequence< OUString > aSupported { "com.sun.star.sdbc.Firebird" };
-
-return aSupported;
+return { "com.sun.star.sdbc.Firebird" };
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 69cf0cad795e..6f7f966cbe01 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -148,8 +148,7 @@ sal_Bool SAL_CALL OrdinalSuffixService::supportsService(
const OUString& rServic
Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames()
{
-Sequence< OUString > aRet { cOrdinalSuffix };
-return aRet;
+return { cOrdinalSuffix };
}
}
diff --git a/sax/source/fastparser/legacyfastparser.cxx
b/sax/source/fastparser/legacyfastparser.cxx
index 6399e5069a44..6b11fbb3754a 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -362,8 +362,7 @@ sal_Bool SaxLegacyFastParser::supportsService(const
OUString& ServiceName)
Sequence< OUString > SaxLegacyFastParser::getSupportedServiceNames()
{
-Sequence seq { "com.sun.star.xml.sax.LegacyFastParser" };
-return seq;
+return { "com.sun.star.xml.sax.LegacyFastParser" };
}
} //namespace
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 5a7ed99dcc8b..fb66f4fabc59 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -146,8 +146,7 @@ sal_Bool SAL_CALL SdFilterDetect::supportsService( const
OUString& sServiceName
// XServiceInfo
Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames()
{
-Sequence seqServiceNames {
"com.sun.star.frame.ExtendedTypeDetection" };
-return seqServiceNames ;
+return { "com.sun.star.frame.ExtendedTypeDetection" };
}
diff --git a/sd/source/ui/unoidl/unomodule.cxx
b/sd/source/ui/unoidl/unomodule.cxx
index 813bfcdb2aff..0ea5527b3548 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -115,8 +115,7 @@ sal_Bool SAL_CALL SdUnoModule::supportsService( const
OUString& sServiceName )
uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( )
{
-uno::Sequence aSeq { "com.sun.star.drawing.ModuleDispatcher" };
-return aSeq;
+return { "com.sun.star.drawing.ModuleDispatcher" };
}
[Libreoffice-commits] core.git: accessibility/source dbaccess/source oox/source package/source sfx2/source stoc/source testtools/source ucb/source
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx |3 +--
dbaccess/source/core/api/column.cxx |6 ++
oox/source/core/filterdetect.cxx |3 +--
oox/source/shape/ShapeContextHandler.cxx |3 +--
package/source/zippackage/ZipPackageFolder.cxx|3 +--
sfx2/source/appl/shutdownicon.cxx |3 +--
stoc/source/implementationregistration/implreg.cxx|3 +--
testtools/source/bridgetest/constructors.cxx |3 +--
ucb/source/ucp/cmis/cmis_repo_content.cxx |3 +--
9 files changed, 10 insertions(+), 20 deletions(-)
New commits:
commit c4f0c87b2f4ac68accc202731e0328ab101a073e
Author: Mesut Çifci
AuthorDate: Mon Jan 13 03:35:14 2020 +0300
Commit: Stephan Bergmann
CommitDate: Mon Jan 13 10:48:02 2020 +0100
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: I1c1e7b42211c51f572698efd3135e388f8fb2979
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86648
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index 89e485cad0fe..a6fd0a7e3f8d 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -106,8 +106,7 @@ sal_Bool VCLXAccessibleHeaderBarItem::supportsService(
const OUString& rServiceN
Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames()
{
-Sequence< OUString > aNames { "com.sun.star.awt.AccessibleHeaderBarItem" };
-return aNames;
+return { "com.sun.star.awt.AccessibleHeaderBarItem" };
}
// XAccessible
diff --git a/dbaccess/source/core/api/column.cxx
b/dbaccess/source/core/api/column.cxx
index 8b96a438292e..59780891c3a3 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -98,8 +98,7 @@ sal_Bool OColumn::supportsService( const OUString&
_rServiceName )
Sequence< OUString > OColumn::getSupportedServiceNames( )
{
-Sequence aSNS { SERVICE_SDBCX_COLUMN };
-return aSNS;
+return { SERVICE_SDBCX_COLUMN };
}
// OComponentHelper
@@ -190,8 +189,7 @@ sal_Bool OColumns::supportsService( const OUString&
_rServiceName )
Sequence< OUString > OColumns::getSupportedServiceNames( )
{
-Sequence aSNS { SERVICE_SDBCX_CONTAINER };
-return aSNS;
+return { SERVICE_SDBCX_CONTAINER };
}
void OColumns::append( const OUString& _rName, OColumn* _pColumn )
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c83dab9d6f74..8325752360ec 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -371,8 +371,7 @@ sal_Bool SAL_CALL FilterDetect::supportsService( const
OUString& rServiceName )
Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames()
{
-Sequence aServiceNames {
"com.sun.star.frame.ExtendedTypeDetection" };
-return aServiceNames;
+return { "com.sun.star.frame.ExtendedTypeDetection" };
}
// com.sun.star.document.XExtendedFilterDetection interface ---
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index acc8624af602..9db23f51b325 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -599,8 +599,7 @@ OUString ShapeContextHandler::getImplementationName()
uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
{
-uno::Sequence< OUString > s {
"com.sun.star.xml.sax.FastShapeContextHandler" };
-return s;
+return { "com.sun.star.xml.sax.FastShapeContextHandler" };
}
sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString &
ServiceName)
diff --git a/package/source/zippackage/ZipPackageFolder.cxx
b/package/source/zippackage/ZipPackageFolder.cxx
index fdc7231059a6..3a6b7ee19bbd 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -414,8 +414,7 @@ OUString ZipPackageFolder::getImplementationName()
uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames()
{
-uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolder" };
-return aNames;
+return { "com.sun.star.packages.PackageFolder" };
}
sal_Bool SAL_CALL ZipPackageFolder::supportsService( OUString const &
rServiceName )
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 8ec370eddc1c..740cbc702a63 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -100,8 +100,7 @@ sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString
const & ServiceName)
css::uno::Sequence SAL_CALL ShutdownIcon::getSupportedServiceNames()
{
-
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/inc/floatingwindowaccessible.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 7cf98c89c19e68b369a296d55c2e9bdf1b42d356 Author: Ayhan Yalçınsoy AuthorDate: Fri Dec 20 21:12:36 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Dec 20 20:57:30 2019 +0100 tdf#124176:Use pragma once instead of include guards Change-Id: I7f71f0142759362fcfb30364694e3f4fc590274c Reviewed-on: https://gerrit.libreoffice.org/85551 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index 94670742e69c..1a7cb4008458 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX -#define INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX +#pragma once #include @@ -30,6 +29,4 @@ public: virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override; }; -#endif // INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang include/sfx2 include/vcl libreofficekit/qa sfx2/source svtools/source vcl/source
accessibility/source/extended/accessibletablistboxtable.cxx |4
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 44
compilerplugins/clang/unusedfields.readonly.results | 28
++---
compilerplugins/clang/unusedfields.untouched.results| 52
+-
compilerplugins/clang/unusedfields.writeonly.results| 32
++
include/sfx2/prnmon.hxx |2
include/vcl/svtabbx.hxx | 10 -
include/vcl/vclevent.hxx|1
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |1
sfx2/source/view/printer.cxx| 12 --
svtools/source/control/inettbc.cxx |7 -
vcl/source/treelist/svtabbx.cxx |4
12 files changed, 81 insertions(+), 116 deletions(-)
New commits:
commit b07b192720702ff1f0385b6c6a521117f93b7038
Author: Noel Grandin
AuthorDate: Wed Nov 20 19:10:49 2019 +0200
Commit: Noel Grandin
CommitDate: Thu Nov 21 18:27:56 2019 +0100
loplugin:unusedfields
Change-Id: Ic4cb8444123864fdaee64960f00a05b3066ae5fc
Reviewed-on: https://gerrit.libreoffice.org/83387
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index 0ae2fa008a92..e0e3ca23ebc4 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -192,10 +192,6 @@ namespace accessibility
break;
}
-case VclEventId::TableCellNameChanged :
-{
-break;
-}
default: break;
}
}
diff --git
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 3e98bea722c3..097ab09ea836 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -128,7 +128,7 @@ cppu/source/uno/check.cxx:134
(anonymous namespace)::Char3 c3 char
cppu/source/uno/check.cxx:138
(anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/dialogs/colorpicker.cxx:710
+cui/source/dialogs/colorpicker.cxx:723
cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl
cui/source/factory/dlgfact.cxx:1392
SvxMacroAssignDialog m_aItems class SfxItemSet
@@ -360,10 +360,16 @@ include/vcl/NotebookBarAddonsMerger.hxx:45
AddonsParams sControlType class rtl::OUString
include/vcl/NotebookBarAddonsMerger.hxx:46
AddonsParams nWidth sal_uInt16
+include/vcl/svtabbx.hxx:40
+TabListBoxEventData m_pEntry class SvTreeListEntry *const
+include/vcl/svtabbx.hxx:41
+TabListBoxEventData m_nColumn const sal_uInt16
+include/vcl/svtabbx.hxx:42
+TabListBoxEventData m_sOldText const class rtl::OUString
include/xmloff/shapeimport.hxx:140
SdXML3DLightContext mbSpecular _Bool
-libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35
-GtvApplicationWindowPrivate lokDialog GtkWidget *
+libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:37
+(anonymous namespace)::GtvApplicationWindowPrivate lokDialog GtkWidget *
libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:52
GtvApplicationWindow parent_instance GtkApplicationWindow
libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:56
@@ -446,23 +452,23 @@ sal/osl/unx/thread.cxx:95
osl_thread_priority_st m_Lowest int
sal/osl/unx/thread.cxx:113
osl_thread_global_st m_priority struct osl_thread_priority_st
-sal/qa/osl/condition/osl_Condition.cxx:68
+sal/qa/osl/condition/osl_Condition.cxx:72
osl_Condition::ctors bRes1 _Bool
-sal/qa/osl/condition/osl_Condition.cxx:198
+sal/qa/osl/condition/osl_Condition.cxx:202
osl_Condition::wait bRes2 _Bool
-sal/qa/osl/condition/osl_Condition.cxx:269
+sal/qa/osl/condition/osl_Condition.cxx:273
osl_Condition::check bRes2 _Bool
-sal/qa/osl/file/osl_File.cxx:1586
+sal/qa/osl/file/osl_File.cxx:1590
osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1586
+sal/qa/osl/file/osl_File.cxx:1590
osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1591
osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1591
osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1587
+sal/qa/osl/file/osl_File.cxx:1591
osl_FileStatus::getFileType
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang include/vcl vcl/inc vcl/source
accessibility/source/extended/accessibletablistboxtable.cxx | 56 --
compilerplugins/clang/singlevalfields.could-be-bool.results | 18
compilerplugins/clang/singlevalfields.py|2
compilerplugins/clang/singlevalfields.results | 280 ++--
include/vcl/svtabbx.hxx |2
include/vcl/treelistbox.hxx |2
vcl/inc/svimpbox.hxx|3
vcl/source/treelist/svimpbox.cxx|1
vcl/source/treelist/svtabbx.cxx | 45 -
vcl/source/treelist/treelistbox.cxx | 10
10 files changed, 171 insertions(+), 248 deletions(-)
New commits:
commit 5b374877b573cf716123a0d0c04a84ccc91e8c86
Author: Noel Grandin
AuthorDate: Sat Nov 16 13:49:37 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 16 20:19:54 2019 +0100
loplugin:singlevalfields
Change-Id: I31fd6b251dee9d1ee1a9ac59964034d0136e1f3e
Reviewed-on: https://gerrit.libreoffice.org/82978
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index 20548bab8b6a..0ae2fa008a92 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -105,29 +105,8 @@ namespace accessibility
Reference< XAccessible > xChild =
m_pTabListBox->CreateAccessibleCell( nRow,
nCol );
uno::Any aOldValue, aNewValue;
-
-if ( m_pTabListBox->IsTransientChildrenDisabled() )
-{
-aNewValue <<= AccessibleStateType::FOCUSED;
-TriState eState = TRISTATE_INDET;
-if ( m_pTabListBox->IsCellCheckBox( nRow,
nCol, eState ) )
-{
-AccessibleCheckBoxCell* pCell =
-static_cast< AccessibleCheckBoxCell*
>( xChild.get() );
-pCell->commitEvent(
AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
-}
-else
-{
-AccessibleBrowseBoxTableCell* pCell =
-static_cast<
AccessibleBrowseBoxTableCell* >( xChild.get() );
-pCell->commitEvent(
AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
-}
-}
-else
-{
-aNewValue <<= xChild;
-commitEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aNewValue, aOldValue );
-}
+aNewValue <<= xChild;
+commitEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aNewValue, aOldValue );
}
}
break;
@@ -215,37 +194,6 @@ namespace accessibility
case VclEventId::TableCellNameChanged :
{
-if ( m_pTabListBox->IsTransientChildrenDisabled() )
-{
-commitEvent( AccessibleEventId::SELECTION_CHANGED,
Any(), Any() );
-TabListBoxEventData* pData = static_cast<
TabListBoxEventData* >( rVclWindowEvent.GetData() );
-SvTreeListEntry* pEntry = pData != nullptr ?
pData->m_pEntry : nullptr;
-if ( pEntry )
-{
-sal_Int32 nRow = m_pTabListBox->GetEntryPos(
pEntry );
-sal_uInt16 nCol = pData->m_nColumn;
-Reference< XAccessible > xChild =
-m_pTabListBox->CreateAccessibleCell( nRow,
nCol );
-uno::Any aOldValue, aNewValue;
-aOldValue <<= pData->m_sOldText;
-OUString sNewText( m_pTabListBox->GetCellText(
nRow, nCol ) );
-aNewValue <<= sNewText;
-TriState eState = TRISTATE_INDET;
-
-if ( m_pTabListBox->IsCellCheckBox( nRow, nCol,
eState ) )
-{
-AccessibleCheckBoxCell* pCell =
-static_cast< AccessibleCheckBoxCell* >(
xChild.get() );
-pCell->commitEvent(
AccessibleEventId::NAME_CHANGED, aNewValue, aOldValue );
-
[Libreoffice-commits] core.git: accessibility/source basic/source bridges/source chart2/source compilerplugins/clang desktop/source editeng/source hwpfilter/source idl/source include/typelib include/v
accessibility/source/extended/AccessibleGridControl.cxx |2 accessibility/source/extended/AccessibleGridControlBase.cxx |2 basic/source/basmgr/basmgr.cxx |2 basic/source/comp/io.cxx | 22 ++-- basic/source/sbx/sbxconv.hxx |9 + bridges/source/cpp_uno/shared/component.cxx |2 chart2/source/view/main/PropertyMapper.cxx |4 compilerplugins/clang/indentation.cxx| 47 compilerplugins/clang/test/indentation.cxx | 33 ++ desktop/source/migration/services/wordbookmigration.cxx |2 editeng/source/editeng/impedit3.cxx |2 editeng/source/editeng/impedit4.cxx |2 hwpfilter/source/mzstring.h |5 idl/source/objects/slot.cxx |2 include/typelib/typedescription.h|2 include/vbahelper/vbacollectionimpl.hxx |6 - oox/source/vml/vmlshapecontext.cxx |2 sc/qa/unit/opencl-test.cxx | 14 +- sc/source/core/opencl/formulagroupcl.cxx |4 sc/source/filter/excel/xestream.cxx |2 sc/source/filter/lotus/tool.cxx |4 sc/source/ui/dataprovider/datatransformation.cxx |2 sc/source/ui/vba/vbaformat.cxx | 21 ++- sc/source/ui/view/tabvwshf.cxx |2 sc/source/ui/view/viewfunc.cxx |2 sd/source/filter/eppt/pptexanimations.cxx| 10 - sd/source/filter/eppt/pptx-epptbase.cxx |4 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |6 - sd/source/ui/view/sdview3.cxx|2 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx|2 sfx2/source/doc/sfxbasemodel.cxx |2 sfx2/source/view/frmload.cxx | 58 +-- soltools/cpp/_tokens.c |4 soltools/mkdepend/include.c |2 svtools/source/brwbox/editbrowsebox.cxx |2 svtools/source/filter/exportdialog.cxx |2 svx/source/table/cellcursor.cxx |2 sw/source/core/fields/expfld.cxx |2 sw/source/core/frmedt/fews.cxx |2 sw/source/core/layout/fly.cxx|6 - sw/source/core/layout/frmtool.cxx|2 sw/source/core/layout/ftnfrm.cxx |4 sw/source/core/text/txtfrm.cxx |2 sw/source/core/unocore/unofield.cxx |2 sw/source/uibase/docvw/edtwin2.cxx |2 sw/source/uibase/shells/basesh.cxx | 15 +- unotools/source/config/configitem.cxx| 32 +++--- vbahelper/source/vbahelper/vbacolorformat.cxx|2 vcl/source/app/help.cxx |2 vcl/source/control/roadmap.cxx |2 vcl/source/filter/jpeg/transupp.c| 20 +-- vcl/source/window/winproc.cxx|2 vcl/unx/generic/print/genprnpsp.cxx |2 vcl/unx/generic/printer/printerinfomanager.cxx |2 writerfilter/source/dmapper/DomainMapper_Impl.cxx|9 - xmloff/source/chart/SchXMLImport.cxx |6 - xmloff/source/draw/shapeexport.cxx | 41 +++ 57 files changed, 270 insertions(+), 180 deletions(-) New commits: commit 7b99cdb2d77a3feaf9b782c1e656f2d922e2746e Author: Noel Grandin AuthorDate: Tue Nov 5 15:20:22 2019 +0200 Commit: Noel Grandin CommitDate: Wed Nov 6 06:27:51 2019 +0100 loplugin:indentation find broken if statements so I don't read the "then" block as being a sequential statements Change-Id: Ib2004acd3518bd4ebd2246f02a26c2c0a8bbab4c Reviewed-on: https://gerrit.libreoffice.org/82069 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 6f3e51928e8a..b98104c7695e 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -162,7 +162,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
[Libreoffice-commits] core.git: accessibility/source chart2/source config_host/config_feature_desktop.h.in config_host/config_feature_opencl.h.in config_host/config_features.h.in configure.ac cui/sour
accessibility/source/helper/acc_factory.cxx |2 - chart2/source/view/main/ChartView.cxx |2 - config_host/config_feature_desktop.h.in | 28 config_host/config_feature_opencl.h.in | 13 + config_host/config_features.h.in| 27 --- configure.ac|2 + cui/source/dialogs/about.cxx|2 - cui/source/options/treeopt.cxx |2 + desktop/source/app/app.cxx |2 + desktop/source/app/officeipcthread.cxx |1 desktop/source/app/opencl.cxx |2 - desktop/source/deployment/registry/help/dp_help.cxx |2 - framework/source/layoutmanager/layoutmanager.cxx|2 - sc/inc/formulagroup.hxx |2 - sc/source/core/data/formulacell.cxx |2 - sc/source/core/tool/formulagroup.cxx|2 - sc/source/ui/docshell/docsh.cxx |1 sc/source/ui/unoobj/docuno.cxx |2 - sc/source/ui/view/viewfun4.cxx |2 + sfx2/source/appl/app.cxx|2 - sfx2/source/appl/workwin.cxx|2 - sfx2/source/control/dispatch.cxx|2 - sfx2/source/view/viewfrm.cxx|2 - svx/source/sdr/contact/objectcontactofpageview.cxx |2 - svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 - svx/source/unodraw/unopage.cxx |1 sw/inc/viewopt.hxx |2 - sw/inc/viscrs.hxx |2 - sw/qa/extras/odfimport/odfimport.cxx|2 + sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |2 + sw/qa/extras/rtfimport/rtfimport.cxx|2 + toolkit/source/helper/accessibilityclient.cxx |2 - vcl/source/app/svmain.cxx |1 vcl/source/helper/svtaccessiblefactory.cxx |2 - vcl/source/window/builder.cxx |2 - vcl/source/window/dialog.cxx|2 - vcl/source/window/mouse.cxx |1 37 files changed, 82 insertions(+), 49 deletions(-) New commits: commit 4704acf63f4fed3a99fc95ff63c82eb5a9ae3908 Author: Luboš Luňák AuthorDate: Mon Oct 14 15:43:34 2019 +0200 Commit: Tor Lillqvist CommitDate: Tue Oct 15 08:26:59 2019 +0200 move HAVE_FEATURE_DESKTOP/OPENCL to their dedicated headers HAVE_FEATURE_OPENCL is included by a common Calc header and HAVE_FEATURE_DESKTOP is included by a common Writer header, causing pretty much their full rebuilds if any feature changes. Change-Id: If29bf78bd4fd70b37981e0826a57fd255c89 Reviewed-on: https://gerrit.libreoffice.org/80776 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 48458e8b62d3..076b865c5ff5 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 6824c4f516c9..8601e82e4803 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/config_host/config_feature_desktop.h.in b/config_host/config_feature_desktop.h.in new file mode 100644 index ..489f684afead --- /dev/null +++ b/config_host/config_feature_desktop.h.in @@ -0,0 +1,28 @@ +/* A feature split out from config_features.h because it affects many files. + */ + +#ifndef CONFIG_FEATURE_DESKTOP_H +#define CONFIG_FEATURE_DESKTOP_H + +/* DESKTOP - Whether we have a "normal" desktop UI or not. + * + * Non-DESKTOP in practice means touch-based mobile devices, Android + * or iOS for now. Support for those is work in progress. + * + * Non-DESKTOP implies that the OS makes sure that only one instance + * of each LibreOffice-based "app" at a time can be running, and thus + * the LibreOffice code does not need to handle such things itself. + * + * Non-DESKTOP implies no traditional inter-app drag and drop concept. + * + * Non-DESKTOP implies no traditional help mechanism, and to some + * extent (as noticed, and as possible without making the code too + * ugly) the related code is ifdeffed out. + * + * Non-DESKTOP implies no traditional desktop-style GUI elements like + * toolbars and scrollbars presented by the LO code. + */ + +#define HAVE_FEATURE_DESKTOP 0 + +#endif diff
[Libreoffice-commits] core.git: accessibility/source basic/source chart2/source connectivity/source dbaccess/source editeng/source helpcompiler/inc include/vcl lotuswordpro/source odk/examples reportd
accessibility/source/standard/accessiblemenuitemcomponent.cxx |2 basic/source/classes/sbxmod.cxx |2 basic/source/runtime/iosys.cxx |6 chart2/source/view/main/VLegend.cxx |2 connectivity/source/drivers/ado/ADatabaseMetaData.cxx |2 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |4 connectivity/source/drivers/odbc/OConnection.cxx |4 dbaccess/source/ui/dlg/DbAdminImpl.cxx |2 dbaccess/source/ui/misc/TokenWriter.cxx | 87 -- editeng/source/items/frmitems.cxx | 58 ++ editeng/source/items/optitems.cxx |3 editeng/source/items/paraitem.cxx |5 editeng/source/items/textitem.cxx |7 editeng/source/rtf/svxrtf.cxx |2 helpcompiler/inc/HelpCompiler.hxx |2 include/vcl/weld.hxx |2 lotuswordpro/source/filter/xfilter/xfstylecont.cxx |2 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx |4 reportdesign/source/filter/xml/xmlExport.cxx |2 sax/qa/cppunit/xmlimport.cxx | 12 - sc/source/core/data/attrib.cxx |2 sc/source/core/data/docpool.cxx |8 sc/source/core/opencl/formulagroupcl.cxx |2 sc/source/filter/excel/xecontent.cxx |2 sc/source/ui/app/inputhdl.cxx |2 sc/source/ui/view/gridwin.cxx |2 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2 sd/source/ui/annotations/annotationmanager.cxx |2 sd/source/ui/dlg/custsdlg.cxx |4 setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx |2 sfx2/source/dialog/mailmodel.cxx |2 sfx2/source/dialog/versdlg.cxx |8 sfx2/source/doc/DocumentMetadataAccess.cxx |2 sfx2/source/doc/sfxbasemodel.cxx |2 sfx2/source/doc/templatedlg.cxx |6 stoc/source/defaultregistry/defaultregistry.cxx |6 stoc/source/implementationregistration/implreg.cxx |4 stoc/source/javavm/javavm.cxx |7 svx/qa/unit/customshapes.cxx | 14 - svx/source/form/fmshimp.cxx |8 svx/source/form/fmsrcimp.cxx |2 svx/source/svdraw/presetooxhandleadjustmentrelations.cxx |2 svx/source/svdraw/svdattr.cxx |2 sw/qa/extras/globalfilter/globalfilter.cxx |4 sw/source/core/access/acctable.cxx |4 sw/source/filter/ww8/ww8par5.cxx |2 sw/source/uibase/utlui/attrdesc.cxx | 44 ++--- test/source/bootstrapfixture.cxx |3 vcl/source/gdi/mtfxmldump.cxx |4 vcl/source/uitest/logger.cxx |4 vcl/source/window/builder.cxx |2 vcl/source/window/tabdlg.cxx |2 vcl/unx/generic/printer/cupsmgr.cxx |4 vcl/unx/gtk3/gtk3gtkinst.cxx |2 vcl/unx/gtk3/gtk3gtksalmenu.cxx |6
[Libreoffice-commits] core.git: accessibility/source basctl/source basic/source xmloff/source xmlsecurity/source
accessibility/source/extended/accessibleiconchoicectrl.cxx |4 +-
basctl/source/basicide/basides1.cxx|8 ++--
basctl/source/basicide/basides2.cxx|4 +-
basctl/source/basicide/basidesh.cxx|4 +-
basic/source/runtime/methods1.cxx | 26 ++---
xmloff/source/style/impastpl.cxx |2 -
xmloff/source/text/XMLTextListAutoStylePool.cxx|2 -
xmlsecurity/source/helper/xmlsignaturehelper2.cxx |2 -
8 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 261fa8cdf4626c9785e0ca4776e44eab4b9222e0
Author: Christian Barth
AuthorDate: Thu Oct 3 20:22:04 2019 +0200
Commit: Michael Stahl
CommitDate: Wed Oct 9 16:25:24 2019 +0200
tdf#114441 changed some sal_uLong to better fitting types
Change-Id: I114a6b028eb59a1ae38c31bc20439a35643fe972
Reviewed-on: https://gerrit.libreoffice.org/80159
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index ba0ec3c1e645..c16579694be2 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -72,7 +72,7 @@ namespace accessibility
SvxIconChoiceCtrlEntry* pEntry = static_cast<
SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
-sal_uLong nPos = getCtrl()->GetEntryListPos(
pEntry );
+sal_Int32 nPos = getCtrl()->GetEntryListPos(
pEntry );
Reference< XAccessible > xChild = new
AccessibleIconChoiceCtrlEntry( *getCtrl(), nPos, this );
uno::Any aOldValue, aNewValue;
aNewValue <<= xChild;
@@ -96,7 +96,7 @@ namespace accessibility
}
if ( pEntry )
{
-sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
+sal_Int32 nPos = pCtrl->GetEntryListPos( pEntry );
Reference< XAccessible > xChild = new
AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this );
uno::Any aOldValue, aNewValue;
aNewValue <<= xChild;
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 2486543d1635..9c06a7c93c20 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1155,10 +1155,10 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool
bUpdateTabBar, bool bRemembe
}
if ( bUpdateTabBar )
{
-sal_uLong nKey = GetWindowId( pCurWin );
-if ( pCurWin && ( pTabBar->GetPagePos(
static_cast(nKey) ) == TAB_PAGE_NOTFOUND ) )
-pTabBar->InsertPage( static_cast(nKey),
pCurWin->GetTitle() ); // has just been faded in
-pTabBar->SetCurPageId( static_cast(nKey) );
+sal_uInt16 nKey = GetWindowId( pCurWin );
+if ( pCurWin && ( pTabBar->GetPagePos( nKey ) == TAB_PAGE_NOTFOUND
) )
+pTabBar->InsertPage( nKey, pCurWin->GetTitle() ); // has
just been faded in
+pTabBar->SetCurPageId( nKey );
}
if ( pCurWin && pCurWin->IsSuspended() )// if the window is shown
in the case of an error...
pCurWin->SetStatus( pCurWin->GetStatus() & ~BASWIN_SUSPENDED );
diff --git a/basctl/source/basicide/basides2.cxx
b/basctl/source/basicide/basides2.cxx
index 1715afb81f98..675ff8d5c093 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -134,7 +134,7 @@ VclPtr Shell::CreateBasWin( const
ScriptDocument& rDocument, const
{
bCreatingWindow = true;
-sal_uLong nKey = 0;
+sal_uInt16 nKey = 0;
VclPtr pWin;
OUString aLibName( rLibName );
@@ -192,7 +192,7 @@ VclPtr Shell::CreateBasWin( const
ScriptDocument& rDocument, const
aModName += " (" + sObjName + ")";
}
}
-pTabBar->InsertPage( static_cast(nKey), aModName );
+pTabBar->InsertPage( nKey, aModName );
pTabBar->Sort();
if(pWin)
{
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index 01d5f4a1d199..6d9b75af2f8d 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -732,8 +732,8 @@ void Shell::RemoveWindow( BaseWindow* pWindow_, bool
bDestroy, bool bAllowChange
VclPtr pWindowTmp( pWindow_ );
DBG_ASSERT( pWindow_, "Cannot delete NULL-Pointer!" );
-sal_uLong nKey = GetWindowId( pWindow_ );
-pTabBar->RemovePage( static_cast(nKey) );
+sal_uInt16 nKey = GetWindowId( pWindow_ );
+
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang include/vcl svtools/inc svtools/source vcl/inc vcl/unx
accessibility/source/extended/AccessibleGridControlTable.cxx |4 +-
compilerplugins/clang/virtualdead.results| 15 ---
include/vcl/accessibletable.hxx |2 -
svtools/inc/table/tablecontrol.hxx |2 -
svtools/source/table/tablecontrol.cxx| 12
vcl/inc/unx/saldata.hxx |3 --
vcl/unx/generic/app/saldata.cxx |9 --
7 files changed, 2 insertions(+), 45 deletions(-)
New commits:
commit 250c2ec78b9218a4d42f1fc6cdb12b15687d6eeb
Author: Noel Grandin
AuthorDate: Thu Sep 26 08:17:45 2019 +0200
Commit: Noel Grandin
CommitDate: Thu Sep 26 20:13:30 2019 +0200
loplugin:virtualdead in vcl
Change-Id: I54cacce6d843f41f220ac5350868bd6d70dbc6b4
Reviewed-on: https://gerrit.libreoffice.org/79585
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index dabafb4b719e..93df16335d91 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -111,7 +111,7 @@ OUString SAL_CALL
AccessibleGridControlTable::getAccessibleRowDescription( sal_I
ensureIsAlive();
ensureIsValidRow( nRow );
-return m_aTable.GetRowDescription( nRow );
+return "row description";
}
OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription(
sal_Int32 nColumn )
@@ -120,7 +120,7 @@ OUString SAL_CALL
AccessibleGridControlTable::getAccessibleColumnDescription( sa
ensureIsAlive();
ensureIsValidColumn( nColumn );
-return m_aTable.GetColumnDescription( static_cast(nColumn) );
+return "col description";
}
Reference< XAccessibleTable > SAL_CALL
AccessibleGridControlTable::getAccessibleRowHeaders()
diff --git a/compilerplugins/clang/virtualdead.results
b/compilerplugins/clang/virtualdead.results
index 64e263fbb9ff..d12c812faf4c 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -181,12 +181,6 @@ include/vbahelper/vbahelperinterface.hxx:91
include/vbahelper/vbareturntypes.hxx:41
type-parameter-?-? ooo::vba::DefaultReturnHelper::getValue()
unknown2
-include/vcl/accessibletable.hxx:94
-class rtl::OUString
vcl::table::IAccessibleTable::GetRowDescription(int,)const
-"row description"
-include/vcl/accessibletable.hxx:96
-class rtl::OUString
vcl::table::IAccessibleTable::GetColumnDescription(unsigned short,)const
-"col description"
sc/source/core/opencl/formulagroupcl.cxx:1059
void
sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class
std::__cxx11::basic_stringstream &,)
empty
@@ -262,15 +256,6 @@ vcl/inc/salprn.hxx:85
vcl/inc/salprn.hxx:116
enum SalPrinterError SalPrinter::GetErrorCode()
0
-vcl/inc/unx/saldata.hxx:54
-void X11SalData::initNWF()
-empty
-vcl/inc/unx/saldata.hxx:55
-void X11SalData::deInitNWF()
-empty
-vcl/inc/wizdlg.hxx:214
-_Bool vcl::RoadmapWizard::leaveState(short,)
-1
writerfilter/inc/ooxml/OOXMLDocument.hxx:216
void writerfilter::ooxml::OOXMLDocument::setXNoteType(unsigned int,)
empty
diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
index f132466c1590..738832a3adcb 100644
--- a/include/vcl/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -91,9 +91,7 @@ public:
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32
_nColumnPos,sal_Int32 nIndex)= 0;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32
_nColumnPos,const Point& _rPoint)= 0;
virtual void FillAccessibleStateSetForCell(
::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16
_nColumnPos ) const= 0;
-virtual OUString GetRowDescription( sal_Int32 _nRow ) const = 0;
virtual OUString GetRowName(sal_Int32 _nIndex) const = 0;
-virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
virtual OUString GetColumnName( sal_Int32 _nIndex ) const = 0;
virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32
_nColPos) const = 0;
diff --git a/svtools/inc/table/tablecontrol.hxx
b/svtools/inc/table/tablecontrol.hxx
index 2b8b88de90b6..41b1491af34c 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -146,9 +146,7 @@ namespace svt { namespace table
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32
_nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32
_nColumnPos,const Point& _rPoint) override;
virtual void FillAccessibleStateSetForCell(
::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16
_nColumnPos )
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx |2 accessibility/source/extended/AccessibleGridControlTable.cxx | 11 accessibility/source/extended/textwindowaccessibility.cxx| 148 +++--- accessibility/source/standard/vclxaccessiblecombobox.cxx |7 accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |7 accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |7 accessibility/source/standard/vclxaccessiblelist.cxx |7 accessibility/source/standard/vclxaccessiblelistbox.cxx |7 accessibility/source/standard/vclxaccessibleradiobutton.cxx |8 accessibility/source/standard/vclxaccessibletextfield.cxx|7 accessibility/source/standard/vclxaccessibletoolbox.cxx |7 11 files changed, 78 insertions(+), 140 deletions(-) New commits: commit 396869e0e71bd33f5d962779abf72f35d01245e5 Author: Arkadiy Illarionov AuthorDate: Tue Sep 3 20:24:49 2019 +0300 Commit: Arkadiy Illarionov CommitDate: Thu Sep 5 14:53:10 2019 +0200 Simplify Sequence iterations in accessibility Use range-based loops, STL and comphelper functions. Change-Id: I600f6eeffd606859c24cdce8faeaead29abfb843 Reviewed-on: https://gerrit.libreoffice.org/78573 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index f22238fd1b17..5a88993125aa 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -343,7 +343,7 @@ sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex( if( (nSelectedChildIndex < 0) || (nSelectedChildIndex >= aSelSeq.getLength()) ) throw lang::IndexOutOfBoundsException(); -return aSelSeq[ nSelectedChildIndex ]; +return aSelSeq.getConstArray()[ nSelectedChildIndex ]; } void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex ) diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 587c8fb7b9dc..dabafb4b719e 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -165,17 +165,8 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 ensureIsAlive(); ensureIsValidRow( nRow ); -bool bSelected = false; Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows(); -for(int i=0; i Document::retrieveCharacterAttributes( Paragraph const * pParagraph, ::sal_Int32 nIndex, @@ -929,81 +916,65 @@ Document::retrieveCharacterAttributes( vcl::Font aFont = m_rEngine.GetFont(); const sal_Int32 AttributeCount = 9; -sal_Int32 i = 0; -css::uno::Sequence< css::beans::PropertyValue > aAttribs( AttributeCount ); +std::vector< css::beans::PropertyValue > aAttribs; +aAttribs.reserve(AttributeCount); + +css::beans::PropertyValue aAttrib; +aAttrib.Handle = -1; +aAttrib.State = css::beans::PropertyState_DIRECT_VALUE; //character background color -aAttribs[i].Name = "CharBackColor"; -aAttribs[i].Handle = -1; -aAttribs[i].Value = mapFontColor( aFont.GetFillColor() ); -aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; -i++; +aAttrib.Name = "CharBackColor"; +aAttrib.Value = mapFontColor( aFont.GetFillColor() ); +aAttribs.push_back(aAttrib); //character color -aAttribs[i].Name = "CharColor"; -aAttribs[i].Handle = -1; -//aAttribs[i].Value = mapFontColor( aFont.GetColor() ); -aAttribs[i].Value = mapFontColor( m_rEngine.GetTextColor() ); -aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; -i++; +aAttrib.Name = "CharColor"; +//aAttrib.Value = mapFontColor( aFont.GetColor() ); +aAttrib.Value = mapFontColor( m_rEngine.GetTextColor() ); +aAttribs.push_back(aAttrib); //character font name -aAttribs[i].Name = "CharFontName"; -aAttribs[i].Handle = -1; -aAttribs[i].Value <<= aFont.GetFamilyName(); -aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; -i++; +aAttrib.Name = "CharFontName"; +aAttrib.Value <<= aFont.GetFamilyName(); +aAttribs.push_back(aAttrib); //character height -aAttribs[i].Name = "CharHeight"; -aAttribs[i].Handle = -1; -aAttribs[i].Value <<= static_cast(aFont.GetFontHeight()); -aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; -i++; +aAttrib.Name = "CharHeight"; +aAttrib.Value <<= static_cast(aFont.GetFontHeight()); +aAttribs.push_back(aAttrib); //character posture -aAttribs[i].Name = "CharPosture"; -aAttribs[i].Handle = -1; -aAttribs[i].Value <<= static_cast(aFont.GetItalic()); -
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletoolbox.cxx | 48
1 file changed, 13 insertions(+), 35 deletions(-)
New commits:
commit ed5064d819ff423766311516f2cdf0707b41cab3
Author: Arkadiy Illarionov
AuthorDate: Tue Sep 3 01:26:56 2019 +0300
Commit: Stephan Bergmann
CommitDate: Tue Sep 3 08:40:50 2019 +0200
tdf#39593 Drop OToolBoxWindowItem::isWindowItem
Replace with comphelper::getUnoTunnelImplementation.
Also use isUnoTunnelId().
Change-Id: I1cf42a483a5c2c9734e4c1f8dd3ba76fd9c7f5e6
Reviewed-on: https://gerrit.libreoffice.org/78429
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 7683923ce4b8..7d266d2b6de1 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -93,7 +94,7 @@ namespace
sal_Int32getIndexInParent() const{ return
m_nIndexInParent; }
void setIndexInParent( sal_Int32 _nNewIndex ){
m_nIndexInParent = _nNewIndex; }
-static boolisWindowItem( const Reference< XAccessible >& _rxAcc,
OToolBoxWindowItem** /* [out] */ _ppImplementation );
+static Sequence< sal_Int8 > getUnoTunnelId();
public:
OToolBoxWindowItem(sal_Int32 _nIndexInParent,
@@ -120,7 +121,6 @@ namespace
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >&
aIdentifier ) override;
-static Sequence< sal_Int8 > getUnoTunnelImplementationId();
};
IMPLEMENT_FORWARD_XINTERFACE2( OToolBoxWindowItem, OAccessibleWrapper,
OToolBoxWindowItem_Base )
@@ -132,21 +132,7 @@ namespace
return new OToolBoxWindowItemContext( m_nIndexInParent,
getComponentContext(), _rxInnerContext, this, getParent() );
}
-bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >&
_rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation )
-{
-OToolBoxWindowItem* pImplementation = nullptr;
-
-Reference< XUnoTunnel > xTunnel( _rxAcc, UNO_QUERY );
-if ( xTunnel.is() )
-pImplementation = reinterpret_cast< OToolBoxWindowItem* >(
xTunnel->getSomething( getUnoTunnelImplementationId() ) );
-
-if ( _ppImplementation )
-*_ppImplementation = pImplementation;
-
-return pImplementation != nullptr;
-}
-
-Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelImplementationId()
+Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelId()
{
static ::cppu::OImplementationId implId;
@@ -155,9 +141,7 @@ namespace
sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence<
sal_Int8 >& _rId )
{
-if ( ( _rId.getLength() == 16 )
-&& ( memcmp( getUnoTunnelImplementationId().getConstArray(),
_rId.getConstArray(), 16 ) == 0 )
-)
+if (isUnoTunnelId(_rId))
return reinterpret_cast< sal_Int64>( this );
return 0;
@@ -316,19 +300,16 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem(
ToolBoxItemsMap::iterator co
NotifyAccessibleEvent( AccessibleEventId::CHILD, Any( xItemAcc ),
Any() );
}
-OToolBoxWindowItem* pWindowItem = nullptr;
-if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, ) )
+auto pWindowItem =
comphelper::getUnoTunnelImplementation(xItemAcc);
+if ( !pWindowItem )
{
static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get()
)->ReleaseToolBox();
::comphelper::disposeComponent( xItemAcc );
}
else
{
-if ( pWindowItem )
-{
-Reference< XAccessibleContext > xContext(
pWindowItem->getContextNoCreate() );
-::comphelper::disposeComponent( xContext );
-}
+Reference< XAccessibleContext > xContext(
pWindowItem->getContextNoCreate() );
+::comphelper::disposeComponent( xContext );
}
}
@@ -350,8 +331,8 @@ void VCLXAccessibleToolBox::UpdateItem_Impl(
ToolBox::ImplToolItems::size_type _
{
Reference< XAccessible > xItemAcc( aIndexAdjust->second );
-OToolBoxWindowItem* pWindowItem = nullptr;
-if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, ) )
+auto pWindowItem =
comphelper::getUnoTunnelImplementation(xItemAcc);
+if ( !pWindowItem )
{
VCLXAccessibleToolBoxItem* pItem = static_cast<
VCLXAccessibleToolBoxItem* >( xItemAcc.get() );
if ( pItem )
@@ -363,12 +344,9 @@ void VCLXAccessibleToolBox::UpdateItem_Impl(
ToolBox::ImplToolItems::size_type _
}
else
{
-if ( pWindowItem )
-{
-sal_Int32 nIndex =
