core.git: accessibility/inc accessibility/source include/vcl sc/source vcl/source
accessibility/inc/extended/accessibleiconchoicectrlentry.hxx|3 --- accessibility/source/extended/accessibleiconchoicectrlentry.cxx |9 - include/vcl/toolkit/ivctrl.hxx |2 -- sc/source/filter/inc/connectionsbuffer.hxx |7 --- vcl/source/control/imivctl.hxx |1 - vcl/source/control/ivctrl.cxx |5 - 6 files changed, 27 deletions(-) New commits: commit b7f9de9bc1abfe4562aea730d9f0b1a61fbd6d21 Author: Noel Grandin AuthorDate: Tue Jul 23 12:13:08 2024 +0200 Commit: Noel Grandin CommitDate: Tue Jul 23 18:39:57 2024 +0200 loplugin:unusedmethods Change-Id: I1863f86f064f02c7e37425ff6c74e7b370460295 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170896 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index c94672c877f2..30ac955caf9c 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -64,9 +64,6 @@ namespace accessibility boolIsAlive_Impl() const; boolIsShowing_Impl() const; -/// @throws css::lang::DisposedException -/// @throws css::uno::RuntimeException -tools::Rectangle GetBoundingBox(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen(); diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 1d6fe874c203..696f7cbea2c0 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -135,15 +135,6 @@ namespace accessibility return bShowing; } -tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() -{ -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( m_aMutex ); - -EnsureIsAlive(); -return GetBoundingBox_Impl(); -} - AbsoluteScreenPixelRectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() { SolarMutexGuard aSolarGuard; diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx index 0e22da6bb385..0944ce5001a8 100644 --- a/include/vcl/toolkit/ivctrl.hxx +++ b/include/vcl/toolkit/ivctrl.hxx @@ -146,8 +146,6 @@ public: virtual ~SvtIconChoiceCtrl() override; virtual voiddispose() override; -WinBits GetStyle() const; - voidSetFont( const vcl::Font& rFont ); voidSetPointFont( const vcl::Font& rFont ); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 6278b8b50044..66272793c4cf 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -191,9 +191,6 @@ public: getSequenceOfAny(css::uno::Reference& xFastAttributeList); /** Returns the unique connection identifier. */ sal_Int32getConnectionId() const { return maModel.mnId; } -/** Returns the version of the application which last refreshed this connection. */ -sal_Int16getConnectionRefreshedVersion() const { return maModel.mnRefreshedVersion; } -OUStringgetConnectionName() const { return maModel.maName; } /** Returns the source data type of the connection. */ sal_Int32getConnectionType() const { return maModel.mnType; } /** Returns read-only access to the connection model data. */ @@ -207,10 +204,6 @@ public: { return maModel.maOlapPrSequenceAny; } -css::uno::Sequence getTextPrSequenceAny() const -{ -return maModel.mxTextPr->maTextPrSequenceAny; -} private: ConnectionModel maModel; diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx index 8363149bf60e..e616215bc7ef 100644 --- a/vcl/source/control/imivctl.hxx +++ b/vcl/source/control/imivctl.hxx @@ -146,7 +146,6 @@ class SvxIconChoiceCtrl_Impl DECL_LINK( ScrollUpDownHdl, ScrollBar*, void ); DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void ); DECL_LINK( UserEventHdl, void*, void ); -DECL_LINK( AutoArrangeHdl, Timer*, void ); DECL_LINK( DocRectChangedHdl, Timer*, void ); DECL_LINK( VisRectChangedHdl, Timer*, void ); diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index 8cf5eca9c8a0..ba35056e7588 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -189,11 +189,6 @@
core.git: accessibility/inc accessibility/source basctl/source framework/source include/toolkit reportdesign/inc reportdesign/source sc/source sfx2/inc sfx2/source solenv/clang-format svtools/source s
accessibility/inc/pch/precompiled_acc.hxx|2 accessibility/source/extended/AccessibleBrowseBox.cxx|9 - accessibility/source/extended/AccessibleBrowseBoxBase.cxx| 15 +- accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 10 - accessibility/source/extended/AccessibleBrowseBoxTable.cxx |5 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |9 - accessibility/source/extended/AccessibleGridControl.cxx | 10 - accessibility/source/extended/AccessibleGridControlBase.cxx | 15 +- accessibility/source/extended/AccessibleGridControlHeader.cxx|5 accessibility/source/extended/AccessibleGridControlTable.cxx |5 accessibility/source/extended/AccessibleGridControlTableCell.cxx |8 - accessibility/source/extended/AccessibleIconView.cxx |5 accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 20 +-- accessibility/source/extended/accessiblelistboxentry.cxx | 25 ++-- accessibility/source/extended/accessibletabbar.cxx | 10 - accessibility/source/extended/accessibletabbarpage.cxx |4 accessibility/source/extended/accessibletabbarpagelist.cxx |8 - accessibility/source/extended/textwindowaccessibility.cxx|6 accessibility/source/standard/accessiblemenubasecomponent.cxx|6 accessibility/source/standard/accessiblemenucomponent.cxx|6 accessibility/source/standard/accessiblemenuitemcomponent.cxx|8 - accessibility/source/standard/vclxaccessibleedit.cxx |4 accessibility/source/standard/vclxaccessibleheaderbaritem.cxx|5 accessibility/source/standard/vclxaccessiblelist.cxx |7 - accessibility/source/standard/vclxaccessiblelistitem.cxx | 17 +- accessibility/source/standard/vclxaccessiblemenuitem.cxx |6 accessibility/source/standard/vclxaccessiblestatusbar.cxx|4 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx|8 - accessibility/source/standard/vclxaccessibletabpage.cxx | 12 - accessibility/source/standard/vclxaccessibletabpagewindow.cxx|4 accessibility/source/standard/vclxaccessibletextcomponent.cxx|6 accessibility/source/standard/vclxaccessibletoolbox.cxx |5 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |8 - basctl/source/accessibility/accessibledialogcontrolshape.cxx |3 basctl/source/accessibility/accessibledialogwindow.cxx |9 - framework/source/layoutmanager/toolbarlayoutmanager.cxx | 27 ++-- include/toolkit/helper/convert.hxx | 61 - reportdesign/inc/pch/precompiled_rptui.hxx |1 reportdesign/source/ui/inspection/GeometryHandler.cxx|9 - reportdesign/source/ui/misc/UITools.cxx |4 reportdesign/source/ui/report/ReportController.cxx |4 reportdesign/source/ui/report/ReportSection.cxx | 11 + reportdesign/source/ui/report/ViewsWindow.cxx|9 - sc/source/ui/Accessibility/AccessibleContextBase.cxx | 18 +- sc/source/ui/Accessibility/AccessibleDocument.cxx| 13 +- sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 22 ++- sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 11 + sc/source/ui/Accessibility/AccessiblePreviewCell.cxx |5 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx |5 sc/source/ui/unoobj/shapeuno.cxx | 10 + sc/source/ui/unoobj/viewuno.cxx |6 sfx2/inc/pch/precompiled_sfx.hxx |1 sfx2/source/statbar/stbitem.cxx |3 sfx2/source/view/ipclient.cxx|9 - sfx2/source/view/sfxbasecontroller.cxx |6 solenv/clang-format/excludelist |1 svtools/source/control/accessibleruler.cxx | 15 +- svx/source/accessibility/svxpixelctlaccessiblecontext.cxx|4 svx/source/accessibility/svxrectctaccessiblecontext.cxx |4 svx/source/svdraw/svdoole2.cxx |7 - toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 - toolkit/source/awt/vclxmenu.cxx |6 toolkit/source/awt/vclxregion.cxx| 16 +- toolkit/source/awt/vclxtoolkit.cxx |3 toolkit/source/awt/vclxwindow.cxx| 26 ++-- toolkit/source/awt/vclxwindows.cxx | 62 +- toolkit/source/controls/tree/treecontrol
core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibleedit.hxx |3 + accessibility/inc/standard/vclxaccessibletextcomponent.hxx|5 ++ accessibility/source/standard/vclxaccessibleedit.cxx | 16 accessibility/source/standard/vclxaccessibletextcomponent.cxx | 18 +- 4 files changed, 41 insertions(+), 1 deletion(-) New commits: commit ab7a94b8403e7fc89398a603a10e9002bd7e2077 Author: Michael Weghorn AuthorDate: Fri May 10 15:35:23 2024 +0200 Commit: Michael Weghorn CommitDate: Fri May 10 21:49:49 2024 +0200 tdf#160971 a11y: Send full text on changed combobox text When the text of an editable combobox is changed (e.g. using the up/down keys), the Orca screen reader on Linux announces the newly inserted text. This has been the case for other GTK or Qt applications for a while, and with recent Orca commit [1] commit 3a9e6b8d7b16bf2fc7919868cfd1a16e44422710 Author: Michael Weghorn Date: Fri May 10 10:16:58 2024 +0200 soffice: Use default logic for editable combobox value change , the same logic is used for LibreOffice as well. For the gtk3 VCL plugin which has a custom combobox implementation using native GTK widgets, this generally works since commit 9f078ed7b625e86182d64d5ccfbb410cdd38081c Author: Michael Weghorn Date: Tue May 7 10:04:16 2024 +0200 tdf#160971 gtk3 a11y: Set role for custom editable combobox However, the qt6 VCL plugin uses the VCL combobox implementation, and only the actual difference between the text of the previous and current entry was sent in the TEXT_CHANGED event, resulting in Orca only announcing those letters that were added/changed, e.g. just "ans Narrow" when changing the font in the Writer formatting toolbar from "Liberation Serif" to "Liberation Sans Narrow". This doesn't really make clear what entry is selected. Align the a11y event with what GTK and Qt do and set the full old and new entry texts in the event. To do that, add a new virtual `VCLXAccessibleTextComponent:PreferFullTextInTextChangedEvent` that defaults to false to keep the previous behavior as default, and override it for `VCLXAccessibleEdit` to return true in the case that the edit is the subedit of a combobox (the parent has a combobox role). Use this in `VCLXAccessibleTextComponent::SetText` to determine whether to notify just of the changed characters or to send the whole old/new text. With this in place, Orca also announces the whole new entry text (e.g. "Liberation Sans Narrow" for the above example) when using the qt6 VCL plugin. (It currently additionally announces an extra "Selection deleted" when switching entries, as the text selection also changes, but that aspect is to be handled separate from this change here.) [1] https://gitlab.gnome.org/GNOME/orca/-/commit/3a9e6b8d7b16bf2fc7919868cfd1a16e44422710 Change-Id: I240aa0ad5ac9585e007d67a8c69e305cf1f38185 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167479 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index b3b6a239b9d7..187a03264718 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -50,6 +50,9 @@ protected: virtual OUStringimplGetText() override; virtual voidimplGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; +// VCLXAccessibleTextComponent +virtual boolPreferFullTextInTextChangedEvent() override; + public: VCLXAccessibleEdit( VCLXWindow* pVCLXindow ); diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index 3585dd778574..9678eb15469b 100644 --- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -40,6 +40,11 @@ class VCLXAccessibleTextComponent : public cppu::ImplInheritanceHelper< protected: voidSetText( const OUString& sText ); +// Whether text segments for old/new value in AccessibleEventId::TEXT_CHANGED +// event should always include the whole old and new text instead of just +// the characters that changed between the two +virtual boolPreferFullTextInTextChangedEvent() { return false; }; + virtual voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; // OCommonAccessibleText diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleed
core.git: accessibility/inc
accessibility/inc/extended/accessibletabbar.hxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit b420a5cd2424d2fc5efa3fcc395d14366f4b2773 Author: Michael Weghorn AuthorDate: Mon May 6 12:38:33 2024 +0200 Commit: Michael Weghorn CommitDate: Tue May 7 06:07:11 2024 +0200 a11y: Drop AccessibleChildren typedef Change-Id: I13946bb4a991dceeb26a0a9364f6067397b94001 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167197 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index b921fdb16719..86848679ffbb 100644 --- a/accessibility/inc/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -38,9 +38,7 @@ namespace accessibility css::accessibility::XAccessible, css::lang::XServiceInfo> { -typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; - -AccessibleChildren m_aAccessibleChildren; +std::vector> m_aAccessibleChildren; virtual voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; voidFillAccessibleStateSet( sal_Int64& rStateSet );
core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelistitem.hxx|9 - accessibility/source/standard/vclxaccessiblelistitem.cxx | 90 ++- 2 files changed, 42 insertions(+), 57 deletions(-) New commits: commit 6658a384245f04b433fb540c757b9bd9be43e1c3 Author: Noel Grandin AuthorDate: Wed Mar 27 12:15:14 2024 +0200 Commit: Noel Grandin CommitDate: Thu Mar 28 06:43:03 2024 +0100 convert VCLXAccessibleListItem to comphelper::WeakComponentImplHelper Change-Id: I82b7dd9b0cdf379c710870a295c8f33ed9fff681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165437 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 260c132bbfa1..83142b50ed6f 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -26,8 +26,7 @@ #include #include #include -#include -#include +#include #include #include @@ -42,7 +41,7 @@ namespace com::sun::star::awt { // class VCLXAccessibleListItem -- -typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible +typedef ::comphelper::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster @@ -51,7 +50,7 @@ typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ -class VCLXAccessibleListItem final : public ::cppu::BaseMutex, +class VCLXAccessibleListItem final : public ::comphelper::OCommonAccessibleText, public VCLXAccessibleListItem_BASE { @@ -69,7 +68,7 @@ private: virtual ~VCLXAccessibleListItem() override = default; /** this function is called upon disposing the component */ -virtual void SAL_CALL disposing() override; +virtual void disposing(std::unique_lock& rGuard) override; // OCommonAccessibleText virtual OUStringimplGetText() override; diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 5339f93824a9..31b889ebc3b5 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -60,8 +60,7 @@ using namespace ::com::sun::star; // Ctor() and Dtor() VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, rtl::Reference< VCLXAccessibleList > _xParent) -: VCLXAccessibleListItem_BASE(m_aMutex) -, m_nIndexInParent(_nIndexInParent) +: m_nIndexInParent(_nIndexInParent) , m_bSelected(false) , m_bVisible(false) , m_nClientId(0) @@ -142,26 +141,25 @@ Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() // XComponent -void SAL_CALL VCLXAccessibleListItem::disposing() +void VCLXAccessibleListItem::disposing(std::unique_lock& rGuard) { -comphelper::AccessibleEventNotifier::TClientId nId( 0 ); -Reference< XInterface > xEventSource; -{ -::osl::MutexGuard aGuard( m_aMutex ); - -VCLXAccessibleListItem_BASE::disposing(); -m_sEntryText.clear(); -m_xParent = nullptr; +VCLXAccessibleListItem_BASE::disposing(rGuard); -nId = m_nClientId; -m_nClientId = 0; -if ( nId ) -xEventSource = *this; -} +m_sEntryText.clear(); +m_xParent = nullptr; +comphelper::AccessibleEventNotifier::TClientId nId = m_nClientId; +m_nClientId = 0; +Reference< XInterface > xEventSource; +if ( nId ) +xEventSource = *this; // Send a disposing to all listeners. if ( nId ) -comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this ); +{ +rGuard.unlock(); +comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this ); +rGuard.lock(); +} } // XServiceInfo @@ -204,7 +202,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sa Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( ) { -::osl::MutexGuard aGuard( m_aMutex ); +std::unique_lock aGuard( m_aMutex ); return m_xParent; } @@ -228,7 +226,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) { -::osl::MutexGuard aGuard( m_aMutex ); +std::unique_lock aGuard( m_aMutex ); // entry text == accessible name r
core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx|1 accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 57 +--- 2 files changed, 26 insertions(+), 32 deletions(-) New commits: commit 86dff3ca4e994f69bf9ba6656ac3e1164a29ca11 Author: Michael Weghorn AuthorDate: Mon Feb 26 15:55:42 2024 +0100 Commit: Michael Weghorn CommitDate: Mon Feb 26 22:38:31 2024 +0100 tdf#159910 a11y: Merge VCLXAccessibleToolBoxItem::{,impl}GetText `VCLXAccessibleToolBoxItem::implGetText` was just calling `VCLXAccessibleToolBoxItem::GetText`, and both of them were used from different places. Just move the implementation to `VCLXAccessibleToolBoxItem::implGetText` right away, drop `VCLXAccessibleToolBoxItem::implGetText` and adjust callers to unify this. Change-Id: I0f4a4652f9e1259826a566d42b4b6998fc8ac7db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163958 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index 5bff8ef95374..9676762d54bb 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -50,7 +50,6 @@ private: boolm_bIndeterminate; css::uno::Reference< css::accessibility::XAccessible >m_xChild; -OUString GetText() const; public: sal_Int32getIndexInParent() const{ return m_nIndexInParent; } diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 63ec17cdff7c..f8545eacc422 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -69,7 +69,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In { assert( m_pToolBox ); m_nItemId = m_pToolBox->GetItemId( m_nIndexInParent ); -m_sOldName = GetText(); +m_sOldName = implGetText(); m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId ); m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) == TRISTATE_INDET ); ToolBoxItemType eType = m_pToolBox->GetItemType( m_nIndexInParent ); @@ -114,29 +114,6 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem() { } -OUString VCLXAccessibleToolBoxItem::GetText() const -{ -// no text for separators and spaces -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; -} - void VCLXAccessibleToolBoxItem::SetFocus( bool _bFocus ) { if ( m_bHasFocus != _bFocus ) @@ -238,7 +215,25 @@ awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( ) OUString VCLXAccessibleToolBoxItem::implGetText() { -return GetText(); +// no text for separators and spaces +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; } Locale VCLXAccessibleToolBoxItem::implGetLocale() @@ -362,7 +357,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) OExternalLockGuard aGuard( this ); // entry text == accessible name -return GetText(); +return implGetText(); } Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) @@ -411,26 +406,26 @@ OUString VCLXAccessibleToolBoxItem::getText() { OExternalLockGuard aGuard( this ); -return GetText(); +return implGetText(); } sal_Int32 VCLXAccessibleToolBoxItem::getCharacterCount() { -return GetText().getLength(); +return implGetText().getLength(); } sal_Unicode VCLXAccessibleToolBoxItem::getCharacter( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); - retur
core.git: accessibility/inc codemaker/source compilerplugins/clang sc/inc vcl/inc
accessibility/inc/standard/vclxaccessiblemenuitem.hxx |2 codemaker/source/cppumaker/cpputype.cxx |2 compilerplugins/clang/unnecessaryvirtual-dead.results | 12 - compilerplugins/clang/unnecessaryvirtual.results | 212 ++ sc/inc/patattr.hxx|2 vcl/inc/jsdialog/jsdialogbuilder.hxx |8 6 files changed, 185 insertions(+), 53 deletions(-) New commits: commit 6583f5d6b2120d1602c8a55c4e8dcc2b83503862 Author: Noel Grandin AuthorDate: Mon Jan 15 12:46:15 2024 +0200 Commit: Noel Grandin CommitDate: Mon Jan 15 13:56:05 2024 +0100 loplugin:unnecessaryvirtual Change-Id: I14ee125874b6f0f1ff5406a3eafea0b19df1a7f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162082 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index 4eec5fa6746e..aa6a0afc814a 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -41,7 +41,7 @@ class VCLXAccessibleMenuItem : public cppu::ImplInheritanceHelper< protected: virtual boolIsFocused() override; virtual boolIsSelected() override; -virtual boolIsCheckable(); +boolIsCheckable(); virtual boolIsChecked() override; virtual boolIsHighlighted() override; diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index c67772eb2e88..f600cff8ad8c 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -189,7 +189,7 @@ public: virtual void dumpHppFile(FileStream& o, codemaker::cppumaker::Includes & includes) = 0; -virtual void dumpEmbindCppFile(FileStream& o); +void dumpEmbindCppFile(FileStream& o); OUString dumpHeaderDefine(FileStream& o, std::u16string_view extension) const; diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index ae2c471b216c..65b8bb57a09b 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -8,19 +8,21 @@ canvas/inc/base/graphicdevicebase.hxx:318 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference &,) include/basegfx/utils/unopolypolygon.hxx:93 void basegfx::unotools::UnoPolyPolygon::modifying()const -include/comphelper/propmultiplex2.hxx:54 -void comphelper::OPropertyChangeListener2::_disposing(const struct com::sun::star::lang::EventObject &,) sc/source/core/opencl/opbase.hxx:447 void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class sc::opencl::outputstream &,) slideshow/source/engine/animationfactory.cxx:617 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() -vcl/inc/font/LogicalFontInstance.hxx:126 +ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:2002 +void std::messages::do_close(int,)const +ux-gnu/../../../include/c++/13/streambuf:583 +void std::basic_streambuf::imbue(const class std::locale &,) +vcl/inc/font/LogicalFontInstance.hxx:123 void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,) vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) -vcl/inc/salinst.hxx:204 +vcl/inc/salinst.hxx:203 void SalInstance::releaseMainThread() -vcl/inc/salinst.hxx:213 +vcl/inc/salinst.hxx:212 void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,) vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index 96c0ef52a9b5..3ddcc5fe93be 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -1,3 +1,5 @@ +accessibility/inc/standard/vclxaccessiblemenuitem.hxx:44 +_Bool VCLXAccessibleMenuItem::IsCheckable() basic/source/comp/codegen.cxx:478 void (anonymous namespace)::OffSetAccumulator::start(const unsigned char *,) basic/source/comp/codegen.cxx:479 @@ -214,6 +216,8 @@ canvas/inc/rendering/isurface.hxx:34 void canvas::ISurface::~ISurface() chart2/source/inc/WeakListenerAdapter.hxx:52 void chart::WeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,) +codemaker/source/cppumaker/cpputype.cxx:192 +void (anonymous namespace)::CppuType::dumpEmbindCppFile(class FileStream &,) extensions/source/dbpilots/unoautopilot.hxx:81 class cppu::IPropertyArrayHelper * dbp::OUnoAutoPilot::createArrayHelper()const extensions/source/propctrlr/commoncontrol.hxx:129 @@ -252,18 +256,14 @@ include/comphelper/intera
[Libreoffice-commits] core.git: accessibility/inc basctl/inc canvas/qa canvas/source chart2/inc comphelper/inc cppcanvas/inc cppcanvas/qa cui/inc dbaccess/inc desktop/inc desktop/source drawinglayer/i
accessibility/inc/pch/precompiled_acc.hxx |1 basctl/inc/pch/precompiled_basctl.hxx |1 canvas/qa/cppunit/canvastest.cxx |4 canvas/source/directx/dx_vcltools.cxx |8 canvas/source/vcl/canvashelper.cxx|2 chart2/inc/pch/precompiled_chartcontroller.hxx|1 comphelper/inc/pch/precompiled_comphelper.hxx |1 cppcanvas/inc/pch/precompiled_cppcanvas.hxx |1 cppcanvas/qa/extras/emfplus/emfplus.cxx |2 cui/inc/pch/precompiled_cui.hxx |1 dbaccess/inc/pch/precompiled_dba.hxx |1 desktop/inc/pch/precompiled_sofficeapp.hxx|1 desktop/source/lib/init.cxx |4 drawinglayer/inc/texture/texture3d.hxx|5 drawinglayer/qa/unit/vclmetafileprocessor2d.cxx |2 drawinglayer/qa/unit/vclpixelprocessor2d.cxx |2 drawinglayer/source/processor2d/cairopixelprocessor2d.cxx |6 drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx |8 drawinglayer/source/texture/texture3d.cxx |4 editeng/inc/pch/precompiled_editeng.hxx |1 emfio/source/reader/wmfreader.cxx |2 filter/source/msfilter/msdffimp.cxx |2 filter/source/msfilter/svdfppt.cxx|2 forms/source/component/imgprod.cxx| 11 - framework/inc/pch/precompiled_fwk.hxx |1 include/vcl/BitmapInfoAccess.hxx | 52 + include/vcl/BitmapReadAccess.hxx | 51 + include/vcl/BitmapWriteAccess.hxx | 54 +- include/vcl/alpha.hxx |9 - include/vcl/bitmap.hxx| 11 - include/vcl/scopedbitmapaccess.hxx| 123 -- reportdesign/inc/pch/precompiled_rpt.hxx |1 reportdesign/inc/pch/precompiled_rptui.hxx|1 sc/inc/pch/precompiled_sc.hxx |1 sc/source/filter/excel/xeescher.cxx |2 sd/inc/pch/precompiled_sdui.hxx |1 sd/qa/unit/PNGExportTests.cxx | 30 +-- sd/qa/unit/import-tests2.cxx |2 sd/qa/unit/tiledrendering/tiledrendering.cxx |2 sd/source/ui/dlg/vectdlg.cxx |2 slideshow/inc/pch/precompiled_slideshow.hxx |1 solenv/clang-format/excludelist |1 svtools/inc/pch/precompiled_svt.hxx |1 svx/inc/pch/precompiled_svxcore.hxx |1 svx/qa/unit/customshapes.cxx |8 svx/source/svdraw/svdetc.cxx |2 sw/inc/pch/precompiled_msword.hxx |1 sw/inc/pch/precompiled_swui.hxx |1 sw/inc/pch/precompiled_vbaswobj.hxx |1 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |2 sw/qa/extras/tiledrendering/tiledrendering.cxx| 16 - vbahelper/inc/pch/precompiled_msforms.hxx |1 vcl/backendtest/outputdevice/bitmap.cxx |6 vcl/backendtest/outputdevice/common.cxx |2 vcl/inc/canvasbitmap.hxx | 13 - vcl/inc/pch/precompiled_vcl.hxx |2 vcl/qa/cppunit/BackendTest.cxx|6 vcl/qa/cppunit/BitmapExTest.cxx | 28 +-- vcl/qa/cppunit/BitmapFilterTest.cxx |4 vcl/qa/cppunit/BitmapProcessorTest.cxx| 10 - vcl/qa/cppunit/BitmapScaleTest.cxx|4 vcl/qa/cppunit/BitmapTest.cxx | 18 +- vcl/qa/cppunit/GraphicTest.cxx|2 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |2 vcl/qa/cppunit/canvasbitmaptest.cxx | 20 -- vcl/qa/cppunit/cjktext.cxx|4 vcl/qa/cppunit/drawmode.cxx |6 vcl/qa/cppunit/gen/gen.cxx|4 vcl/qa/cppunit/gradient.cxx |2 vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx| 10 - vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx| 12 - vcl/qa/cppunit/jpeg/JpegReaderTest.cxx|4 vcl/qa/cppunit/jpeg/JpegWriterTest.cxx|4 vcl/qa/cppunit/outdev.cxx |
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessiblelistboxentry.hxx|2 + accessibility/source/extended/accessiblelistboxentry.cxx | 28 +-- 2 files changed, 12 insertions(+), 18 deletions(-) New commits: commit f1dbbfe278c8673d98e2eb3d8ad460b9f7364642 Author: Michael Weghorn AuthorDate: Mon Oct 23 12:04:54 2023 +0200 Commit: Michael Weghorn CommitDate: Mon Oct 23 20:35:52 2023 +0200 a11y: Don't throw exception on valid list box entry action index `checkActionIndex_Impl` was previously throwing an IndexOutOfBoundsException for any index other than 0. The // only three actions comment in there was only adding to the confusion... Convert that helper function to a method of the class and take the actual count of actions into account. Also drop the misleading `ACCESSIBLE_ACTION_COUNT` define altogether, and just return 1 at the only remaining place using it. This fixes a crash seen with the qt6 VCL plugin and Orca running when opening the spelling options dialog ("Tools" -> "Spelling", then press the "Options..." button). 1 __pthread_kill_implementation pthread_kill.c 44 0x7f29908a80fc 2 __pthread_kill_internal pthread_kill.c 78 0x7f29908a815f 3 __GI_raise raise.c26 0x7f299085a472 4 __GI_abort abort.c79 0x7f29908444b2 5 ?? 0x7f29904a09db 6 ?? 0x7f29904affaa 7 std::terminate() 0x7f29904b0015 8 __cxa_throw 0x7f29904b0268 9 (anonymous namespace)::checkActionIndex_Impl accessiblelistboxentry.cxx 49 0x7f29562aeb82 10 accessibility::AccessibleListBoxEntry::getAccessibleActionDescription accessiblelistboxentry.cxx 770 0x7f29562b2b9b 11 QtAccessibleWidget::actionNames QtAccessibleWidget.cxx 805 0x7f297c84a8d7 12 QAccessibleBridgeUtils::effectiveActionNames qaccessiblebridgeutils.cpp 25 0x7f297b6c90a5 13 AtSpiAdaptor::actionInterface atspiadaptor.cpp 1862 0x7f297b6e2cc0 14 AtSpiAdaptor::handleMessage atspiadaptor.cpp 1438 0x7f297b6de432 15 QDBusConnectionPrivate::activateObject qdbusintegrator.cpp1438 0x7f2979ec0ecb 16 QDBusActivateObjectEvent::placeMetaCall qdbusintegrator.cpp1594 0x7f2979ec1bb0 17 QObject::event qobject.cpp1446 0x7f297c02116e 18 QApplicationPrivate::notify_helper qapplication.cpp 3295 0x7f297a59d714 19 QApplication::notify qapplication.cpp 3246 0x7f297a59d524 20 QCoreApplication::notifyInternal2 qcoreapplication.cpp 1131 0x7f297bfa23ba 21 QCoreApplication::sendEvent qcoreapplication.cpp 1572 0x7f297bfa2ead 22 QCoreApplicationPrivate::sendPostedEvents qcoreapplication.cpp 1937 0x7f297bfa3ea6 23 QCoreApplication::sendPostedEvents qcoreapplication.cpp 1794 0x7f297bfa37ae 24 postEventSourceDispatch qeventdispatcher_glib.cpp 244 0x7f297c3b9108 25 ?? 0x7f29835111b4 26 ?? 0x7f29835142d7 27 g_main_context_iteration 0x7f29835148f0 28 QEventDispatcherGlib::processEvents qeventdispatcher_glib.cpp 394 0x7f297c3b999d 29 QXcbGlibEventDispatcher::processEvents qxcbeventdispatcher.cpp96 0x7f2979c67036 30 QtInstance::ImplYield QtInstance.cxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/inc avmedia/source basctl/inc basctl/source basic/source chart2/inc chart2/source compilerplugins/clang connectivity/inc
UnoControls/source/inc/progressmonitor.hxx |4 accessibility/inc/strings.hxx | 14 accessibility/source/standard/vclxaccessiblescrollbar.cxx |8 avmedia/inc/bitmaps.hlst|4 avmedia/inc/helpids.h | 22 avmedia/source/gstreamer/gstwindow.cxx |2 basctl/inc/bitmaps.hlst | 28 basctl/inc/helpids.h| 24 basctl/inc/strings.hxx | 50 basctl/source/basicide/baside2b.cxx |2 basctl/source/basicide/bastype2.cxx |4 basctl/source/basicide/bastype3.cxx |2 basctl/source/basicide/moduldl2.cxx |2 basctl/source/inc/dlgeddef.hxx | 24 basic/source/inc/namecont.hxx |2 chart2/inc/bitmaps.hlst | 238 - chart2/inc/unonames.hxx | 46 chart2/source/controller/inc/helpids.h |8 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |4 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |4 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |4 chart2/source/inc/servicenames.hxx | 44 chart2/source/inc/servicenames_charttypes.hxx | 40 chart2/source/inc/servicenames_coosystems.hxx |4 chart2/source/model/filter/XMLFilter.cxx|2 chart2/source/tools/StatisticsHelper.cxx|4 chart2/source/view/main/VDataSeries.cxx |4 compilerplugins/clang/ostr.cxx |8 connectivity/inc/strings.hxx| 112 connectivity/source/drivers/evoab2/NDriver.hxx |2 connectivity/source/inc/dbase/DIndex.hxx|2 cui/inc/bitmaps.hlst| 122 cui/source/customize/macropg.cxx|2 cui/source/dialogs/scriptdlg.cxx|2 cui/source/inc/cfg.hxx | 28 cui/source/inc/helpids.h| 55 dbaccess/inc/bitmaps.hlst | 36 dbaccess/inc/helpids.h | 170 dbaccess/inc/strings.hxx| 469 +- dbaccess/source/core/api/RowSet.cxx |4 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |2 dbaccess/source/core/api/columnsettings.cxx | 16 dbaccess/source/core/api/definitioncolumn.cxx | 10 dbaccess/source/core/dataaccess/databasedocument.cxx|2 dbaccess/source/core/dataaccess/documentcontainer.cxx |2 dbaccess/source/filter/xml/xmlExport.cxx| 22 dbaccess/source/ui/app/AppController.cxx|2 dbaccess/source/ui/browser/unodatbr.cxx |8 dbaccess/source/ui/dlg/ConnectionPage.cxx |2 dbaccess/source/ui/misc/UITools.cxx |2 dbaccess/source/ui/misc/WCopyTable.cxx |2 dbaccess/source/ui/misc/databaseobjectview.cxx |8 dbaccess/source/ui/uno/copytablewizard.cxx |2 desktop/inc/bitmaps.hlst|8 desktop/inc/strings.hxx |2 desktop/source/deployment/registry/inc/dp_backend.h |2 desktop/source/deployment/registry/package/dp_package.cxx |2 desktop/source/inc/helpids.h|4 desktop/source/lib/init.cxx |4 extensions/inc/bitmaps.hlst | 66 extensions/inc/helpids.h| 566 +-- extensions/inc/propctrlr.h | 114 extensions/source/bibliography/toolbar.cxx |6 extensions/source/propctrlr/cellbindinghelper.cxx |4 extensions/source/propctrlr/formcomponenthandler.cxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessibletabbarpagelist.hxx|4 +--- accessibility/source/extended/accessibletabbarpagelist.cxx |1 - 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit 2a3023bc91d6f16133b5c869a1159342f9223228 Author: Michael Weghorn AuthorDate: Sat Oct 14 20:49:53 2023 +0200 Commit: Michael Weghorn CommitDate: Sun Oct 15 00:10:37 2023 +0200 a11y: Add include to fix clang-cl build Without this, my clang-cl build on windows would fail like this: In file included from C:/tools/cygwin/home/user/development/git/libreoffice/accessibility/source/extended/accessibletabbarbase.cxx:20: In file included from C:/tools/cygwin/home/user/development/git/libreoffice/accessibility/inc\extended/accessibletabbarbase.hxx:24: In file included from C:/tools/cygwin/home/user/development/git/libreoffice/include\vcl/vclptr.hxx:25: C:/tools/cygwin/home/user/development/git/libreoffice/include\rtl/ref.hxx(129,20): error: member access into incomplete type 'accessibility::AccessibleTabBarPage' 129 | m_pBody->release(); |^ C:/PROGRA~1/MICROS~2/2022/COMMUN~1/VC/Tools/MSVC/1437~1.328/Include\xmemory(321,21): note: in instantiation of member function 'rtl::Reference::~Reference' requested here 321 | _Location->~_Ty(); | ^ C:/tools/cygwin/home/user/development/git/libreoffice/accessibility/inc\extended/accessibletabbarpagelist.hxx(32,11): note: forward declaration of 'accessibility::AccessibleTabBarPage' 32 | class AccessibleTabBarPage; | ^ 1 error generated. make[1]: *** [C:/tools/cygwin/home/user/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:340: C:/tools/cygwin/home/user/development/git/libreoffice/workdir/CxxObject/accessibility/source/extended/accessibletabbarbase.o] Error 1 make: *** [Makefile:121: accessibility] Error 2 Change-Id: I3961fb95602b96667f33ea0b087e1df5375faf19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157982 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx index d3f3d56f317d..b3045aa77c6f 100644 --- a/accessibility/inc/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx @@ -24,14 +24,12 @@ #include #include #include +#include #include namespace accessibility { -class AccessibleTabBarPage; - - class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper< AccessibleTabBarBase, css::accessibility::XAccessible, diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 5faaed6846e2..8ad6b168ebaf 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include
[Libreoffice-commits] core.git: accessibility/inc basctl/inc bin/find-can-be-private-symbols.functions.results bin/find-unneeded-includes canvas/source chart2/inc comphelper/source config_host/config_
accessibility/inc/pch/precompiled_acc.hxx |2 basctl/inc/pch/precompiled_basctl.hxx |2 bin/find-can-be-private-symbols.functions.results |6 - bin/find-unneeded-includes |1 canvas/source/cairo/cairo_textlayout.cxx |2 canvas/source/directx/dx_textlayout_drawhelper.cxx |2 canvas/source/opengl/ogl_canvashelper.cxx |2 canvas/source/vcl/textlayout.cxx |4 chart2/inc/pch/precompiled_chartcontroller.hxx |2 chart2/inc/pch/precompiled_chartcore.hxx |2 comphelper/source/misc/simplefileaccessinteraction.cxx |2 comphelper/source/misc/stillreadwriteinteraction.cxx |2 comphelper/source/property/propertysetinfo.cxx |4 config_host/config_global.h.in |3 configure.ac | 16 -- cppcanvas/source/inc/implrenderer.hxx |4 cppcanvas/source/mtfrenderer/implrenderer.cxx |2 cppcanvas/source/mtfrenderer/textaction.cxx|4 cppcanvas/source/mtfrenderer/textaction.hxx|7 - cui/inc/pch/precompiled_cui.hxx|2 dbaccess/inc/pch/precompiled_dbu.hxx |2 editeng/inc/outleeng.hxx |4 editeng/inc/pch/precompiled_editeng.hxx|2 editeng/source/editeng/editeng.cxx |2 editeng/source/editeng/impedit3.cxx| 10 - editeng/source/items/svxfont.cxx | 24 ++-- editeng/source/outliner/outleeng.cxx |2 editeng/source/outliner/outliner.cxx |4 editeng/source/uno/unoipset.cxx|2 editeng/source/uno/unotext.cxx |4 filter/source/config/cache/basecontainer.cxx |2 filter/source/config/cache/cacheitem.cxx |4 filter/source/config/cache/cacheitem.hxx |6 - filter/source/config/cache/filtercache.cxx |4 filter/source/config/cache/filtercache.hxx |4 framework/inc/pch/precompiled_fwk.hxx |2 include/comphelper/propertysetinfo.hxx |6 - include/editeng/editeng.hxx|6 - include/editeng/outliner.hxx | 12 +- include/editeng/svxfont.hxx| 13 +- include/editeng/unoipset.hxx |2 include/editeng/unotext.hxx|6 - include/o3tl/span.hxx | 100 - include/sfx2/dispatch.hxx |4 include/svl/itemprop.hxx | 10 - include/svx/sdr/properties/defaultproperties.hxx |4 include/svx/unoprov.hxx|4 include/svx/unoshape.hxx | 12 +- include/ucbhelper/interceptedinteraction.hxx |6 - include/vcl/kernarray.hxx |6 - include/vcl/metaact.hxx|4 include/vcl/outdev.hxx | 12 +- include/vcl/pdfwriter.hxx |2 include/xmloff/txtparae.hxx|6 - linguistic/source/lngopt.cxx |2 o3tl/CppunitTest_o3tl_tests.mk |1 o3tl/qa/test-span.cxx | 60 -- oox/inc/pch/precompiled_oox.hxx|2 reportdesign/inc/pch/precompiled_rpt.hxx |2 reportdesign/inc/pch/precompiled_rptui.hxx |2 sc/inc/optuno.hxx |2 sc/inc/pch/precompiled_sc.hxx |2 sc/source/ui/unoobj/PivotTableDataProvider.cxx |2 sc/source/ui/unoobj/PivotTableDataSequence.cxx |2 sc/source/ui/unoobj/afmtuno.cxx|4 sc/source/ui/unoobj/appluno.cxx|2 sc/source/ui/unoobj/cellsuno.cxx |2 sc/source/ui/unoobj/chart2uno.cxx |4 sc/source/ui/unoobj/condformatuno.cxx | 12 +- sc/source/ui/unoobj/confuno.cxx|2 sc/source/ui/unoobj/dapiuno.cxx|6 - sc/source/ui/unoobj/datauno.cxx|6 - sc/source/ui/unoobj/defltuno.cxx |2 sc/source/ui/unoobj/docuno.cxx |6 - sc/source/ui/unoobj/fmtuno.cxx |2 sc/source/ui/unoobj/linkuno.cxx|2 sc/source/ui/unoobj/nameuno.cxx|4 sc/source/ui/
[Libreoffice-commits] core.git: accessibility/inc sd/source sfx2/source svtools/source sw/inc sw/source vcl/inc vcl/qt5 writerperfect/inc writerperfect/source xmlsecurity/inc
accessibility/inc/extended/accessibletabbarpage.hxx|2 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |1 sd/source/ui/inc/sdtreelb.hxx |9 - sfx2/source/control/thumbnailviewacc.cxx | 12 -- sfx2/source/control/thumbnailviewacc.hxx |4 svtools/source/control/valueacc.cxx|7 - svtools/source/control/valueimp.hxx|2 sw/inc/AnnotationWin.hxx |1 sw/inc/txtatr.hxx |1 sw/inc/unodraw.hxx |1 sw/source/core/doc/CntntIdxStore.cxx |8 - sw/source/core/inc/mvsave.hxx |2 sw/source/uibase/docvw/AnnotationWin.cxx |6 - vcl/inc/qt5/QtMenu.hxx |1 vcl/inc/qt5/QtTools.hxx|5 - vcl/qt5/QtMenu.cxx |9 - writerperfect/inc/WPXSvInputStream.hxx |1 writerperfect/source/common/WPXSvInputStream.cxx | 61 - xmlsecurity/inc/certificatechooser.hxx |1 19 files changed, 134 deletions(-) New commits: commit 747a9838ee53a4d2c005729419047b1ffde0db70 Author: Noel Grandin AuthorDate: Wed Sep 13 12:40:18 2023 +0200 Commit: Noel Grandin CommitDate: Wed Sep 13 13:28:16 2023 +0200 loplugin:unusedmethods Change-Id: I00f228451574ca9f9e352d233c7f326c88e90a95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156892 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index 5fd91f19b538..052650c19de0 100644 --- a/accessibility/inc/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -54,8 +54,6 @@ namespace accessibility voidSetSelected( bool bSelected ); voidSetPageText( const OUString& sPageText ); -sal_uInt16 GetPageId() const { return m_nPageId; } - voidFillAccessibleStateSet( sal_Int64& rStateSet ); // OCommonAccessibleComponent diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 8bcf8e33024b..0ab119fe19eb 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -52,7 +52,6 @@ private: OUStringGetItemName(); voidSetItemText( const OUString& sItemText ); OUStringGetItemText(); -sal_uInt16 GetItemId() const { return m_nItemId; } voidFillAccessibleStateSet( sal_Int64& rStateSet ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 712a6ebf3860..1f6026b557d4 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -176,15 +176,6 @@ public: bool IsEditingActive() const {return m_bEditing;} -void start_editing() -{ -std::unique_ptr xIter(m_xTreeView->make_iterator()); -if (m_xTreeView->get_cursor(xIter.get())) -{ -m_xTreeView->start_editing(*xIter); -} -} - void set_sensitive(bool bSensitive) { m_xTreeView->set_sensitive(bSensitive); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 54a3af71fb93..ac1e320be25b 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -44,12 +44,6 @@ ThumbnailViewAcc::~ThumbnailViewAcc() { } -ThumbnailViewAcc* ThumbnailViewAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) -noexcept -{ -return dynamic_cast(rxData.get()); -} - uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewAcc::getAccessibleContext() { ThrowIfDisposed(); @@ -539,12 +533,6 @@ void ThumbnailViewAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOld } } -ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) -noexcept -{ -return dynamic_cast(rxData.get()); -} - void ThumbnailViewAcc::GetFocus() { // Broadcast the state change. diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 1fcf9d3ac9a6..63ea533009ad 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -56,8 +56,6 @@ public: bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } -static ThumbnailViewAcc* getImplementati
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/accessiblelistboxentry.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f53ed5e832289560a75e685ededb66732fa16659 Author: Noel Grandin AuthorDate: Sun Sep 10 19:40:16 2023 +0200 Commit: Noel Grandin CommitDate: Mon Sep 11 13:56:45 2023 +0200 AccessibleListBoxEntry does not need to implement XAggreggation Checked on jenkins using 'make check' and +void SAL_CALL setDelegator(css::uno::Reference const &) final { assert(false); } Change-Id: I92ec69dfab2aa5eb2acbb9804359853ffc27e565 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156801 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 69b1e702bdb3..52964a80c4d1 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ namespace accessibility class AccessibleListBox; // class AccessibleListBoxEntry -- -typedef ::cppu::WeakAggComponentImplHelper9< css::accessibility::XAccessible +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/textwindowaccessibility.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0c4cdb001fa95252e4b5c1e78dcaaa082511e8b9 Author: Noel Grandin AuthorDate: Sun Sep 10 19:39:31 2023 +0200 Commit: Noel Grandin CommitDate: Mon Sep 11 13:54:45 2023 +0200 accessibility::Paragraph does not need to implement XAggreggation Checked on jenkins using 'make check' and +void SAL_CALL setDelegator(css::uno::Reference const &) final { assert(false); } Change-Id: Ic0e9e3d58792fb21950a66253176eba413861600 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156800 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index db6e0f5423b0..52d5f2175761 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -116,7 +116,7 @@ private: typedef std::vector< ParagraphInfo > Paragraphs; -typedef ::cppu::WeakAggComponentImplHelper7< +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent,
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/standard/vclxaccessiblelistitem.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dfd890c414352b1abab62d6a38bf45561bb874ab Author: Noel Grandin AuthorDate: Sun Sep 10 19:38:48 2023 +0200 Commit: Noel Grandin CommitDate: Mon Sep 11 12:45:40 2023 +0200 VCLXAccessibleList does not need to implement XAggreggation Checked on jenkins using 'make check' and +void SAL_CALL setDelegator(css::uno::Reference const &) final { assert(false); } Change-Id: I561af7931b5863857311df3cd6c3a85ad494f578 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156799 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 046f1df125a3..260c132bbfa1 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ namespace com::sun::star::awt { // class VCLXAccessibleListItem -- -typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/accessibleiconchoicectrlentry.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8b08885042d93aa1e0884fe9197a161a36d54267 Author: Noel Grandin AuthorDate: Sun Sep 10 19:40:57 2023 +0200 Commit: Noel Grandin CommitDate: Mon Sep 11 11:46:10 2023 +0200 AccessibleIconChoiceCtrlEntry does not need to implement XAggreggation Checked on jenkins using 'make check' and +void SAL_CALL setDelegator(css::uno::Reference const &) final { assert(false); } Change-Id: I80459b404d610847395d2eae4d529a808c53f3d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156802 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index 3a6c8bfdfdf7..b2430481e58c 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ namespace accessibility { -typedef ::cppu::WeakAggComponentImplHelper8< css::accessibility::XAccessible +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible , css::accessibility::XAccessibleContext , css::accessibility::XAccessibleComponent , css::accessibility::XAccessibleEventBroadcaster
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessiblelistboxentry.hxx|4 +-- accessibility/source/extended/accessiblelistboxentry.cxx | 17 +++ 2 files changed, 10 insertions(+), 11 deletions(-) New commits: commit e0766ffbf7fae8f250d735ed1473909fcec412c6 Author: Noel Grandin AuthorDate: Tue Sep 5 15:59:43 2023 +0200 Commit: Noel Grandin CommitDate: Tue Sep 5 18:36:29 2023 +0200 use more concrete types in AccessibleListBoxEntry which means we only need one field, not two Change-Id: I0229348a797d0f01f3d35c46563efed161676efb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156568 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 6ae837f4de4b..69b1e702bdb3 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -34,6 +34,7 @@ #include #include #include +#include // forward --- @@ -80,8 +81,7 @@ namespace accessibility /// client id in the AccessibleEventNotifier queue sal_uInt32 m_nClientId; -css::uno::WeakReference m_wListBox; -AccessibleListBox & m_rListBox; +unotools::WeakReference m_wListBox; tools::Rectangle GetBoundingBox_Impl() const; tools::Rectangle GetBoundingBoxOnScreen_Impl() const; diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index db994d94fcd1..1f93476daa6a 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -73,7 +73,6 @@ namespace accessibility , m_pSvLBoxEntry(&rEntry) , m_nClientId( 0 ) , m_wListBox(&rListBox) -, m_rListBox(rListBox) { m_pTreeListBox->AddEventListener( LINK( this, AccessibleListBoxEntry, WindowEventListener ) ); _rListBox.FillEntryPath( m_pSvLBoxEntry, m_aEntryPath ); @@ -310,10 +309,10 @@ namespace accessibility if ( !pEntry ) throw IndexOutOfBoundsException(); -uno::Reference xListBox(m_wListBox); +rtl::Reference xListBox(m_wListBox); assert(xListBox.is()); -return m_rListBox.implGetAccessible(*pEntry); +return xListBox->implGetAccessible(*pEntry); } Reference< XAccessible > AccessibleListBoxEntry::implGetParentAccessible( ) const @@ -338,9 +337,9 @@ namespace accessibility assert(pParentEntry && "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!"); if ( pParentEntry ) { -uno::Reference xListBox(m_wListBox); +rtl::Reference xListBox(m_wListBox); assert(xListBox.is()); -return m_rListBox.implGetAccessible(*pParentEntry); +return xListBox->implGetAccessible(*pParentEntry); // the AccessibleListBoxEntry class will create its parent // when needed } @@ -529,9 +528,9 @@ namespace accessibility throw RuntimeException("AccessibleListBoxEntry::getAccessibleAtPoint - pEntry cannot be empty!"); Reference< XAccessible > xAcc; -uno::Reference xListBox(m_wListBox); +rtl::Reference xListBox(m_wListBox); assert(xListBox.is()); -auto pAccEntry = m_rListBox.implGetAccessible(*pEntry); +auto pAccEntry = xListBox->implGetAccessible(*pEntry); tools::Rectangle aRect = pAccEntry->GetBoundingBox_Impl(); if ( aRect.Contains( VCLPoint( _aPoint ) ) ) xAcc = pAccEntry.get(); @@ -932,9 +931,9 @@ namespace accessibility if ( nSelCount == ( nSelectedChildIndex + 1 ) ) { -uno::Reference xListBox(m_wListBox); +rtl::Reference xListBox(m_wListBox); assert(xListBox.is()); -xChild = m_rListBox.implGetAccessible(*pEntry).get(); +xChild = xListBox->implGetAccessible(*pEntry).get(); break; } }
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelist.hxx|7 +- accessibility/source/standard/vclxaccessiblelist.cxx | 53 +-- 2 files changed, 30 insertions(+), 30 deletions(-) New commits: commit 410632ac4b8a280e0993e665ffa9cfede8326b49 Author: Michael Weghorn AuthorDate: Mon Sep 4 19:09:18 2023 +0200 Commit: Michael Weghorn CommitDate: Mon Sep 4 21:43:22 2023 +0200 a11y: Hold list items by rtl::Reference Use a vector of `rtl::Reference` for the children instead of a vector of `css::uno::Reference` and casting in various places. Change-Id: I1d0e72a7c844a685d762069002d747cf5e7d02dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156525 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index eb1cdc6f9d53..f668e75d7cda 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -25,6 +25,8 @@ #include #include +class VCLXAccessibleListItem; + namespace accessibility { class IComboListBoxHelper; @@ -114,7 +116,7 @@ public: private: BoxType m_aBoxType; std::unique_ptr<::accessibility::IComboListBoxHelper> m_pListBoxHelper; -std::vector> m_aAccessibleChildren; +std::vector> m_aAccessibleChildren; sal_Int32 m_nVisibleLineCount; /// Index in parent. This is settable from the outside. sal_Int32 m_nIndexInParent; @@ -144,8 +146,7 @@ private: /** Create the specified child and insert it into the list of children. Sets the child's states. */ -css::uno::Reference< css::accessibility::XAccessible > -CreateChild (sal_Int32 i); +rtl::Reference CreateChild (sal_Int32 i); /** Call this method when the item list has been changed, i.e. items have been deleted or inserted. diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 14f6cddc504b..67061aac3ab0 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -108,8 +108,11 @@ void SAL_CALL VCLXAccessibleList::disposing() VCLXAccessibleComponent::disposing(); // Dispose all items in the list. -for (Reference& rxChild : m_aAccessibleChildren) -comphelper::disposeComponent(rxChild); +for (rtl::Reference& rxChild : m_aAccessibleChildren) +{ +if (rxChild.is()) +rxChild->dispose(); +} m_aAccessibleChildren.clear(); @@ -159,18 +162,17 @@ void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) // adjust the index inside the VCLXAccessibleListItem for ( ; aIter != m_aAccessibleChildren.end(); ) { -Reference xChild = *aIter; +rtl::Reference xChild = *aIter; if (!xChild.is()) { aIter = m_aAccessibleChildren.erase(aIter); } else { -VCLXAccessibleListItem* pItem = static_cast(xChild.get()); const sal_Int32 nTopEntry = m_pListBoxHelper ? m_pListBoxHelper->GetTopEntry() : 0; const sal_Int32 nPos = static_cast(aIter - m_aAccessibleChildren.begin()); bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); -pItem->SetVisible( m_bVisible && bVisible ); +xChild->SetVisible(m_bVisible && bVisible); ++aIter; } @@ -209,25 +211,24 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList) { sal_Int32 i=0; m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND; -for (const Reference& rxChild : m_aAccessibleChildren) +for (const rtl::Reference& rxChild : m_aAccessibleChildren) { if (rxChild.is()) { -VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(rxChild.get() ); // Retrieve the item's index from the list entry. bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); if (bNowSelected) m_nCurSelectedPos = i; -if ( bNowSelected && !pItem->IsSelected() ) +if (bNowSelected && !rxChild->IsSelected()) { xNewAcc = rxChild; aNewValue <<= xNewAcc; } -else if ( pItem->IsSelected() ) +else if (rxChild->IsSelected()) m_nLastSelectedPos = i; -pItem->SetSelected( bNowSelected ); +rxChild->SetSelected(bNowSelected); } else { // it could happen that a child was not created before @@ -332,7 +333,7
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelist.hxx|5 + accessibility/source/standard/vclxaccessiblelist.cxx |2 +- 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 307b9af2420d649b2e50817e38f8cb63687abf8b Author: Michael Weghorn AuthorDate: Mon Sep 4 17:29:57 2023 +0200 Commit: Michael Weghorn CommitDate: Mon Sep 4 21:41:40 2023 +0200 a11y: Drop ListItems typdef Change-Id: Ie8d62b769c44ab74a21fadd9ab395fe0f908ee76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156524 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 57d43d2c11de..eb1cdc6f9d53 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -25,9 +25,6 @@ #include #include -typedef std::vector> -ListItems; - namespace accessibility { class IComboListBoxHelper; @@ -117,7 +114,7 @@ public: private: BoxType m_aBoxType; std::unique_ptr<::accessibility::IComboListBoxHelper> m_pListBoxHelper; -ListItems m_aAccessibleChildren; +std::vector> m_aAccessibleChildren; sal_Int32 m_nVisibleLineCount; /// Index in parent. This is settable from the outside. sal_Int32 m_nIndexInParent; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 101c5815c0ac..14f6cddc504b 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -154,7 +154,7 @@ void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) (_bSetNew ? aNewValue : aOldValue ) <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); -ListItems::iterator aIter = m_aAccessibleChildren.begin(); +auto aIter = m_aAccessibleChildren.begin(); UpdateVisibleLineCount(); // adjust the index inside the VCLXAccessibleListItem for ( ; aIter != m_aAccessibleChildren.end(); )
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelist.hxx|2 - accessibility/source/standard/vclxaccessiblelist.cxx | 25 +-- 2 files changed, 13 insertions(+), 14 deletions(-) New commits: commit bfa9d01920e7e042a83627d7fa4e78c70bc7ece5 Author: Michael Weghorn AuthorDate: Mon Sep 4 17:03:47 2023 +0200 Commit: Michael Weghorn CommitDate: Mon Sep 4 21:41:00 2023 +0200 tdf#157088 a11y: No need to use WeakReference for list children `VCLXAccessibleList` is the owner of the `VCLXAccessibleListItem`s held in that vector, so I see no reason to hold them by weak reference, which according to the doc in `udkapi/com/sun/star/uno/XWeak.idl` is to avoid affecting the lifetime of the objects: > The sense of weak references is to hold a reference to an object > without affecting the lifetime of the object. That means that a weak > reference may become invalid, at any time, if the referenced object dies. > Quite the contrary, it is actually responsible for the lifecycle of the list item a11y objects and should dispose them when itself gets disposed, which will be added in a subsequent commit. Change-Id: I57fe3367f1199cd0c24f006f6e25a1e9c930c154 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156521 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index bab8b649fa07..57d43d2c11de 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -25,7 +25,7 @@ #include #include -typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > > +typedef std::vector> ListItems; namespace accessibility diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index c38240e3b4e7..57f9b1eabcb3 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -107,6 +107,7 @@ void SAL_CALL VCLXAccessibleList::disposing() VCLXAccessibleComponent::disposing(); // Dispose all items in the list. + m_aAccessibleChildren.clear(); m_pListBoxHelper.reset(); @@ -155,14 +156,14 @@ void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) // adjust the index inside the VCLXAccessibleListItem for ( ; aIter != m_aAccessibleChildren.end(); ) { -Reference< XAccessible > xHold = *aIter; -if (!xHold.is()) +Reference xChild = *aIter; +if (!xChild.is()) { aIter = m_aAccessibleChildren.erase(aIter); } else { -VCLXAccessibleListItem* pItem = static_cast(xHold.get()); +VCLXAccessibleListItem* pItem = static_cast(xChild.get()); const sal_Int32 nTopEntry = m_pListBoxHelper ? m_pListBoxHelper->GetTopEntry() : 0; const sal_Int32 nPos = static_cast(aIter - m_aAccessibleChildren.begin()); bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); @@ -205,12 +206,11 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList) { sal_Int32 i=0; m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND; -for ( const auto& rChild : m_aAccessibleChildren ) +for (const Reference& rxChild : m_aAccessibleChildren) { -Reference< XAccessible > xHold = rChild; -if ( xHold.is() ) +if (rxChild.is()) { -VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() ); +VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(rxChild.get() ); // Retrieve the item's index from the list entry. bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); if (bNowSelected) @@ -218,7 +218,7 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList) if ( bNowSelected && !pItem->IsSelected() ) { -xNewAcc = rChild; +xNewAcc = rxChild; aNewValue <<= xNewAcc; } else if ( pItem->IsSelected() ) @@ -663,12 +663,11 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_Int32) { sal_Int32 i=0; m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND; -for ( const auto& rChild : m_aAccessibleChildren ) +for (const Reference& rxChild : m_aAccessibleChildren ) { -Reference< XAccessible > xHold = rChild; -if ( xHold.is() ) +if (rxChild.is()) { -
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibletextcomponent.hxx|3 +++ accessibility/source/standard/vclxaccessibletextcomponent.cxx |8 2 files changed, 11 insertions(+) New commits: commit a5593114bb409c93c7cf79a3abac0c60a8aebb18 Author: Michael Weghorn AuthorDate: Fri Sep 1 13:48:50 2023 +0200 Commit: Michael Weghorn CommitDate: Fri Sep 1 16:13:40 2023 +0200 tdf#104833 a11y Send name changed event for text controls The text is at least often used for the accessible name of text controls (e.g. the MultiLineEdit case in tdf#104833). Therefore, also check whether the a11y name has changed from the previously remembered one in `VCLXAccessibleTextComponent::SetText` and send a NAME_CHANGED event if it has. This e.g. makes sure that the a11y name for the multi line edit in the update dialog is updated on Windows and NVDA properly announces it when it receives focus. (It now correctly announces "LibreOfficeDev 24.2 is up to date." instead of the obsolete cached name "Checking..."). Also see how `VCLXAccessibleTextComponent::ProcessWindowEvent` calls `VCLXAccessibleTextComponent::SetText` when processing `VclEventId::WindowFrameTitleChanged` and this comment in `Window::SetText` mentions that `VclEventId::WindowFrameTitleChanged` is used to notify about a11y name changes: // #107247# needed for accessibility // The VclEventId::WindowFrameTitleChanged is (mis)used to notify accessible name changes. // Therefore a window, which is labeled by this window, must also notify an accessible // name change. Change-Id: I2f15fe78324b14c3bbeae943cb87384007e21618 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156411 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index cb2e20694663..3585dd778574 100644 --- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -34,6 +34,9 @@ class VCLXAccessibleTextComponent : public cppu::ImplInheritanceHelper< { OUStringm_sText; +// accessible name the object had when SetText was called last time +OUString m_sOldName; + protected: voidSetText( const OUString& sText ); diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index ef3cbed4b1ec..f876f0b9ed38 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -61,6 +61,14 @@ void VCLXAccessibleTextComponent::SetText( const OUString& sText ) m_sText = sText; NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED, aOldValue, aNewValue ); } + +// check whether accessible name has also changed, since text is (often) used as name as well +const OUString sName = getAccessibleName(); +if (sName != m_sOldName) +{ +NotifyAccessibleEvent(AccessibleEventId::NAME_CHANGED, Any(m_sOldName), Any(sName)); +m_sOldName = sName; +} }
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblestatusbar.hxx|4 accessibility/source/standard/vclxaccessiblestatusbar.cxx | 62 +- 2 files changed, 25 insertions(+), 41 deletions(-) New commits: commit 5dbc129d49937f643f66eeeb23cbd8952597db15 Author: Noel Grandin AuthorDate: Wed Aug 30 15:01:16 2023 +0200 Commit: Noel Grandin CommitDate: Thu Aug 31 10:33:53 2023 +0200 use concrete type for VCLXAccessibleStatusBar::m_aAccessibleChildren avoid some unnecessary casting Change-Id: Id9e52b0b6dd8dc2cedc8b9cf80c17f1cf4afe502 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156314 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index 16bff48e3856..17f77af4fbb6 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -26,12 +26,12 @@ #include - +class VCLXAccessibleStatusBarItem; class VCLXAccessibleStatusBar final : public VCLXAccessibleComponent { private: -typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; +typedef std::vector< rtl::Reference< VCLXAccessibleStatusBarItem > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VclPtr m_pStatusBar; diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 52d32eb7cc55..5726193715e8 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -43,7 +43,7 @@ VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow ) m_pStatusBar = GetAs(); if ( m_pStatusBar ) -m_aAccessibleChildren.assign( m_pStatusBar->GetItemCount(), Reference< XAccessible >() ); +m_aAccessibleChildren.assign( m_pStatusBar->GetItemCount(), rtl::Reference< VCLXAccessibleStatusBarItem >() ); } @@ -51,13 +51,9 @@ void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing ) { if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() ) { -Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); -if ( xChild.is() ) -{ -VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() ); -if ( pVCLXAccessibleStatusBarItem ) -pVCLXAccessibleStatusBarItem->SetShowing( bShowing ); -} +rtl::Reference< VCLXAccessibleStatusBarItem > pVCLXAccessibleStatusBarItem( m_aAccessibleChildren[i] ); +if ( pVCLXAccessibleStatusBarItem ) +pVCLXAccessibleStatusBarItem->SetShowing( bShowing ); } } @@ -67,15 +63,11 @@ void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() ) return; -Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); -if ( xChild.is() ) +rtl::Reference< VCLXAccessibleStatusBarItem > pVCLXAccessibleStatusBarItem( m_aAccessibleChildren[i] ); +if ( pVCLXAccessibleStatusBarItem.is() ) { -VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() ); -if ( pVCLXAccessibleStatusBarItem ) -{ -OUString sItemName = pVCLXAccessibleStatusBarItem->GetItemName(); -pVCLXAccessibleStatusBarItem->SetItemName( sItemName ); -} +OUString sItemName = pVCLXAccessibleStatusBarItem->GetItemName(); +pVCLXAccessibleStatusBarItem->SetItemName( sItemName ); } } @@ -85,15 +77,11 @@ void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() ) return; -Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); -if ( xChild.is() ) +rtl::Reference< VCLXAccessibleStatusBarItem > pVCLXAccessibleStatusBarItem( m_aAccessibleChildren[i] ); +if ( pVCLXAccessibleStatusBarItem.is() ) { -VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() ); -if ( pVCLXAccessibleStatusBarItem ) -{ -OUString sItemText = pVCLXAccessibleStatusBarItem->GetItemText(); -pVCLXAccessibleStatusBarItem->SetItemText( sItemText ); -} +OUString sItemText = pVCLXAccessibleStatusBarItem->GetItemText(); +pVCLXAccessibleStatusBarItem->SetItemText( sItemText ); } } @@ -104,7 +92,7 @@ void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) return; // insert entry in child list -m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i, Reference< XAccessible >() ); +m_aAccessible
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessiblelistbox.hxx|2 - accessibility/source/extended/accessiblelistbox.cxx | 22 2 files changed, 10 insertions(+), 14 deletions(-) New commits: commit efd357d70438b905c5349c304a43347fd293ee6a Author: Michael Weghorn AuthorDate: Wed Aug 30 11:48:58 2023 +0200 Commit: Michael Weghorn CommitDate: Wed Aug 30 13:31:09 2023 +0200 a11y: Hold focused list box entry by rtl::Reference Use an `rtl::Reference` for the currently focused entry instead of using a `css::uno::Reference` and casting almost every time that it's used. Change-Id: Ia3aeca18e61d82b127bf19dd0902d781168b93d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156281 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 5eeaf92d672c..55112facacbc 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -105,7 +105,7 @@ namespace accessibility typedef std::unordered_map> MAP_ENTRY; MAP_ENTRY m_mapEntry; -css::uno::Reference< css::accessibility::XAccessible > m_xFocusedChild; +rtl::Reference m_xFocusedEntry; accessibility::AccessibleListBoxEntry* GetCurEventEntry( const VclWindowEvent& rVclWindowEvent ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index f0651f05354f..31330c845448 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -102,10 +102,9 @@ namespace accessibility { if ( getListBox() && getListBox()->HasFocus() ) { -AccessibleListBoxEntry* pEntry =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get()); -if (pEntry) +if (m_xFocusedEntry.is()) { -pEntry->NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); + m_xFocusedEntry->NotifyAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, Any(), Any()); } } } @@ -119,20 +118,18 @@ namespace accessibility SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) { -AccessibleListBoxEntry* pEntryFocus =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get()); -if (pEntryFocus && pEntryFocus->GetSvLBoxEntry() == pEntry) +if (m_xFocusedEntry.is() && m_xFocusedEntry->GetSvLBoxEntry() == pEntry) { -aNewValue <<= m_xFocusedChild; +aNewValue <<= uno::Reference(m_xFocusedEntry);; NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, uno::Any(), aNewValue ); return ; } - uno::Any aOldValue; -aOldValue <<= m_xFocusedChild; +aOldValue <<= uno::Reference(m_xFocusedEntry);; -m_xFocusedChild.set(implGetAccessible(*pEntry)); +m_xFocusedEntry = implGetAccessible(*pEntry); -aNewValue <<= m_xFocusedChild; +aNewValue <<= uno::Reference(m_xFocusedEntry); NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue ); } else @@ -202,8 +199,7 @@ namespace accessibility if ( !pEntry ) pEntry = getListBox()->GetCurEntry(); -AccessibleListBoxEntry* pEntryFocus =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get()); -if (pEntryFocus && pEntry && pEntry != pEntryFocus->GetSvLBoxEntry()) +if (m_xFocusedEntry.is() && pEntry && pEntry != m_xFocusedEntry->GetSvLBoxEntry()) { AccessibleListBoxEntry *const pAccCurOptionEntry = implGetAccessible(*pEntry).get(); uno::Any aNewValue; @@ -214,7 +210,7 @@ namespace accessibility } else { -return pEntryFocus; +return m_xFocusedEntry.get(); } }
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControlTableBase.hxx |4 +- accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |6 ++- accessibility/source/extended/AccessibleGridControlTableBase.cxx | 18 ++--- accessibility/source/extended/AccessibleGridControlTableCell.cxx | 19 ++ 4 files changed, 24 insertions(+), 23 deletions(-) New commits: commit 18aed6fc4ff5b981ae7deb6584197b661721e7df Author: Michael Weghorn AuthorDate: Wed Aug 2 13:00:21 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Aug 3 16:53:58 2023 +0200 tdf#156473 a11y: Use actual row/col index/count in grid control header The row header bar of a grid control is a table with just one column, containing a row header cell for each of the rows in the table holding the actual data. Likewise, a column header bar just has one row. This was previously incorrectly reported on the a11y layer, as could e.g. be seen in Accerciser with the sample macro from tdf#156473. Also make the `AccessibleGridControlCell` ctor pass the `_nColumnRowId` as what it actually is (a row index in case of a row header cell, a column index in case of a column header cell) instead of always as a row index, and then having special handling for that elsewhere again (s. `AccessibleGridControlCell::getAccessibleName`). Also move an assert from `AccessibleGridControlCell::getAccessibleName` to the ctor and check the indices there. With this in place, the row and column header bars for the example from tdf#156473 now report the correct amount of rows and columns, and the row/column header cells report the correct row and column indices. Change-Id: I29f71ac46b6d841e26d68ca01bd05ba9412aed13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155224 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index e8cf6bfe9b92..39de903ec855 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -139,10 +139,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The row index of the specified cell index. */ -sal_Int32 implGetRow( sal_Int64 nChildIndex ) const; +sal_Int32 implGetRow( sal_Int64 nChildIndex ); /** @attention This method requires locked mutex's and a living object. @return The column index of the specified cell index. */ -sal_Int32 implGetColumn( sal_Int64 nChildIndex ) const; +sal_Int32 implGetColumn( sal_Int64 nChildIndex ); /** Fills a sequence with sorted indexes of completely selected rows. @attention This method requires locked mutex's and a living object. diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index a174afd00556..00b3e60d7d92 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -35,9 +35,13 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol const Reference< XAccessible >& rxParent, IAccessibleTable& rTable, AccessibleTableControlObjType eObjType) -: AccessibleGridControlCell( rxParent, rTable, _nColumnRowId, 0, eObjType) +: AccessibleGridControlCell(rxParent, rTable, +(eObjType == AccessibleTableControlObjType::ROWHEADERCELL) ? _nColumnRowId : 0, +(eObjType == AccessibleTableControlObjType::ROWHEADERCELL) ? 0 : _nColumnRowId, +eObjType) , m_nColumnRowId(_nColumnRowId) { +assert(eObjType == AccessibleTableControlObjType::ROWHEADERCELL || eObjType == AccessibleTableControlObjType::COLUMNHEADERCELL); } /** Return a bitset of states of the current object. */ diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 691568a6341a..499a3cec23cb 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -77,6 +77,9 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() SolarMutexGuard aSolarGuard; ensureIsAlive(); + +if (m_eObjType == AccessibleTableControlObjType::COLUMNHEADERBAR) +return 1; return m_aTable.GetRowCount(); } @@ -85,6 +88,9 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount() SolarMutexGuard aSolarGuard; ensureIsAlive(); + +
[Libreoffice-commits] core.git: accessibility/inc accessibility/source include/vcl toolkit/source
accessibility/inc/extended/AccessibleGridControlHeader.hxx|8 - accessibility/source/extended/AccessibleGridControl.cxx | 16 ++- accessibility/source/extended/AccessibleGridControlBase.cxx | 14 +-- accessibility/source/extended/AccessibleGridControlHeader.cxx | 22 ++--- accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |4 accessibility/source/extended/AccessibleGridControlTable.cxx |2 accessibility/source/extended/AccessibleGridControlTableBase.cxx |6 - accessibility/source/extended/AccessibleGridControlTableCell.cxx | 17 ++- include/vcl/accessibletable.hxx | 16 +-- toolkit/source/controls/table/tablecontrol.cxx| 44 +- 10 files changed, 79 insertions(+), 70 deletions(-) New commits: commit e4ec702df16e04e66af42e2e35a607cb67d7d2c1 Author: Michael Weghorn AuthorDate: Tue Aug 1 21:11:57 2023 +0200 Commit: Michael Weghorn CommitDate: Wed Aug 2 05:09:54 2023 +0200 a11y: Convert AccessibleTableControlObjType to enum class Change-Id: I227ca242ae8fa22940b1bf302541f8d9b7b40eb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155199 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index 680b1ceced6a..419ec28233cd 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -33,8 +33,8 @@ class AccessibleGridControlHeader final : public AccessibleGridControlTableBase public: /** @param rxParent accessible parent control @param rTableaccessible table - @param eObjType One of the two allowed types TCTYPE_ROWHEADERBAR or - TCTYPE_COLUMNHEADERBAR. */ + @param eObjType One of the two allowed types AccessibleTableControlObjType::ROWHEADERBAR or + AccessibleTableControlObjType::COLUMNHEADERBAR. */ AccessibleGridControlHeader( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, @@ -139,12 +139,12 @@ private: inline bool AccessibleGridControlHeader::isRowBar() const { -return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR; +return getType() == ::vcl::table::AccessibleTableControlObjType::ROWHEADERBAR; } inline bool AccessibleGridControlHeader::isColumnBar() const { -return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR; +return getType() == ::vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR; } diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 37d5013c8fa6..a9d946c9eea7 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -41,7 +41,7 @@ using namespace ::vcl::table; AccessibleGridControl::AccessibleGridControl( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, ::vcl::table::IAccessibleTable& _rTable ) -: AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL ), +: AccessibleGridControlBase(_rxParent, _rTable, AccessibleTableControlObjType::GRIDCONTROL), m_aCreator(_rxCreator) { } @@ -102,7 +102,8 @@ AccessibleGridControl::getAccessibleChild( sal_Int64 nChildIndex ) { if(!m_xColumnHeaderBar.is()) { -m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, vcl::table::TCTYPE_COLUMNHEADERBAR); +m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, + vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR); } xChild = m_xColumnHeaderBar.get(); } @@ -110,7 +111,8 @@ AccessibleGridControl::getAccessibleChild( sal_Int64 nChildIndex ) { if(!m_xRowHeaderBar.is()) { -m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, vcl::table::TCTYPE_ROWHEADERBAR); +m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, + vcl::table::AccessibleTableControlObjType::ROWHEADERBAR); } xChild = m_xRowHeaderBar.get(); } @@ -215,9 +217,9 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType css::uno::Reference< css::accessibility::XAccessible > xRet; rtl::Reference< AccessibleGridControlHeader >* pxMember = nullptr; -if( eObjType == TCTYPE_ROWHEADERBAR ) +if (eObjType == AccessibleTableControlObjT
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/svtaccessiblenumericfield.hxx|4 accessibility/source/standard/svtaccessiblenumericfield.cxx | 12 2 files changed, 16 insertions(+) New commits: commit 07f4fa7119d28ce943405ee6e7cbdf260c730357 Author: Michael Weghorn AuthorDate: Fri Apr 14 18:25:34 2023 +0300 Commit: Michael Weghorn CommitDate: Sat Apr 15 05:39:03 2023 +0200 a11y: Send VALUE_CHANGED event for FormattedField `VCLXAccessibleEdit::ProcessWindowEvent` takes care of sending a `TEXT_CHANGED` event. In the case of `SVTXAccessibleNumericField`, numeric values are handled, so send a `VALUE_CHANGED` event in addition. This makes Orca with the qt6 VCL plugin announce the new value when e.g. changing the page width using the arrow up key in the "Format" -> "Page Style" dialog. For Accerciser, an additional fix is needed so the value gets updated there in the interface view when the a11y object is selected. Pending MR: [1] [1] https://gitlab.gnome.org/GNOME/accerciser/-/merge_requests/25 Change-Id: Id911f50664df7220bc58204bc3477c5306a1da33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150422 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx b/accessibility/inc/standard/svtaccessiblenumericfield.hxx index 3537b9d6ef1d..29225a5c6072 100644 --- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx +++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx @@ -20,6 +20,8 @@ #pragma once #include +#include + #include #include @@ -30,6 +32,8 @@ class SVTXAccessibleNumericField final public: SVTXAccessibleNumericField(VCLXWindow* pVCLXindow); +virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override; + // XAccessibleContext virtual sal_Int16 SAL_CALL getAccessibleRole() override; diff --git a/accessibility/source/standard/svtaccessiblenumericfield.cxx b/accessibility/source/standard/svtaccessiblenumericfield.cxx index 2862a3a2b670..f3192d4212f0 100644 --- a/accessibility/source/standard/svtaccessiblenumericfield.cxx +++ b/accessibility/source/standard/svtaccessiblenumericfield.cxx @@ -21,6 +21,7 @@ #include #include +#include #include using namespace ::com::sun::star::accessibility; @@ -31,6 +32,17 @@ SVTXAccessibleNumericField::SVTXAccessibleNumericField(VCLXWindow* pVCLWindow) { } +void SVTXAccessibleNumericField::ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) +{ +VCLXAccessibleEdit::ProcessWindowEvent(rVclWindowEvent); + +if (rVclWindowEvent.GetId() == VclEventId::EditModify) +{ +css::uno::Any aNewValue = getCurrentValue(); +NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, css::uno::Any(), aNewValue); +} +} + sal_Int16 SVTXAccessibleNumericField::getAccessibleRole() { return AccessibleRole::SPIN_BOX; } css::uno::Any SAL_CALL SVTXAccessibleNumericField::getCurrentValue()
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx| 17 +--- accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10 --- 2 files changed, 9 insertions(+), 18 deletions(-) New commits: commit 4499db6b901a0c4eaad652a3efb5ad2857523c02 Author: Stephan Bergmann AuthorDate: Thu Jan 26 17:45:51 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 27 11:48:19 2023 + Use ImplInheritanceHelper in VCLXAccessibleToolBoxItem Change-Id: I380d8ae6dd237c0d09209c71dfdcf7b1ad995fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146241 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index 39982db1b7e8..5bff8ef95374 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -24,20 +24,20 @@ #include #include #include -#include +#include #include #include #include typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; -typedef ::cppu::ImplHelper4 < css::accessibility::XAccessible, - css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleValue, - css::lang::XServiceInfo > VCLXAccessibleToolBoxItem_BASE; -class VCLXAccessibleToolBoxItem final : public AccessibleTextHelper_BASE, -public VCLXAccessibleToolBoxItem_BASE +class VCLXAccessibleToolBoxItem final : public cppu::ImplInheritanceHelper< +AccessibleTextHelper_BASE, +css::accessibility::XAccessible, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue, +css::lang::XServiceInfo> { private: OUStringm_sOldName; @@ -86,8 +86,7 @@ public: voidToggleEnableState(); // XInterface -DECLARE_XINTERFACE( ) -DECLARE_XTYPEPROVIDER( ) +css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index ed88660333f5..808f2fe642d4 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -258,7 +258,6 @@ void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_In // XInterface -IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE ) Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) { // #i33611# - toolbox buttons without text don't support XAccessibleText @@ -266,16 +265,9 @@ Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) && ( !m_pToolBox || m_pToolBox->GetButtonType() == ButtonType::SYMBOLONLY ) ) return Any(); -css::uno::Any aReturn = AccessibleTextHelper_BASE::queryInterface( _rType ); -if ( !aReturn.hasValue() ) -aReturn = VCLXAccessibleToolBoxItem_BASE::queryInterface( _rType ); -return aReturn; +return ImplInheritanceHelper::queryInterface( _rType ); } -// XTypeProvider - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE, VCLXAccessibleToolBoxItem_BASE ) - // XComponent void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibletoolbox.hxx| 12 ++-- accessibility/source/standard/vclxaccessibletoolbox.cxx |8 +--- 2 files changed, 3 insertions(+), 17 deletions(-) New commits: commit 3f39e4b674089a9243064e1204e1d9c67f7b2bd8 Author: Stephan Bergmann AuthorDate: Thu Jan 26 17:42:55 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 27 11:47:59 2023 + Use ImplInheritanceHelper in VCLXAccessibleToolBox Change-Id: I3b37cd67d6d32001ae6ac72f01ce156aeb93ca7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146240 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index 352c3c07edfa..2fba09d80e79 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -22,19 +22,17 @@ #include #include #include -#include +#include -typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleSelection > VCLXAccessibleToolBox_BASE; - typedef std::map< sal_Int32, css::uno::Reference< css::accessibility::XAccessible > > ToolBoxItemsMap; class VCLXAccessibleToolBoxItem; class ToolBox; -class VCLXAccessibleToolBox final : public VCLXAccessibleComponent, public VCLXAccessibleToolBox_BASE +class VCLXAccessibleToolBox final : public cppu::ImplInheritanceHelper { private: ToolBoxItemsMap m_aAccessibleChildren; @@ -69,12 +67,6 @@ private: public: VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ); -// XInterface -DECLARE_XINTERFACE( ) - -// XTypeProvider -DECLARE_XTYPEPROVIDER( ) - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 4722db1a0de9..a1a2d5b03d54 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -119,7 +119,7 @@ namespace VCLXAccessibleToolBox::VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ) : -VCLXAccessibleComponent( pVCLXWindow ) +ImplInheritanceHelper( pVCLXWindow ) { } @@ -596,12 +596,6 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW } } -// XInterface -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE ) - -// XTypeProvider -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE ) - // XComponent void SAL_CALL VCLXAccessibleToolBox::disposing() {
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibletextfield.hxx| 14 ++ accessibility/source/standard/vclxaccessibletextfield.cxx |5 + 2 files changed, 3 insertions(+), 16 deletions(-) New commits: commit 148caa36121ddc37b18226308cec0e7f535477de Author: Stephan Bergmann AuthorDate: Thu Jan 26 17:40:18 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 27 11:47:42 2023 + Use ImplInheritanceHelper in VCLXAccessibleTextField Change-Id: Ie6b9fd7d825940d090f76b23597c40d8cbbca7c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index f99b6c0296f6..b730bd107ea2 100644 --- a/accessibility/inc/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -21,10 +21,7 @@ #include -#include - -typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BASE; - +#include /** This class represents non editable text fields. The object passed to the constructor is expected to be a list (a ListBox to be @@ -33,19 +30,12 @@ typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BA exported text changes. */ class VCLXAccessibleTextField final : -public VCLXAccessibleTextComponent, -public VCLXAccessible_BASE +public cppu::ImplInheritanceHelper { public: VCLXAccessibleTextField (VCLXWindow* pVCLXindow, const css::uno::Reference< css::accessibility::XAccessible >& _xParent); -// XInterface -DECLARE_XINTERFACE() - -// XTypeProvider -DECLARE_XTYPEPROVIDER() - // XAccessible css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() override; diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index dd5f542f2fc7..e5121affd7ce 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::accessibility; VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const Reference< XAccessible >& _xParent) : -VCLXAccessibleTextComponent (pVCLWindow), +ImplInheritanceHelper (pVCLWindow), m_xParent( _xParent ) { @@ -48,9 +48,6 @@ OUString VCLXAccessibleTextField::implGetText() return aText; } -IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleTextField, VCLXAccessibleTextComponent, VCLXAccessible_BASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComponent, VCLXAccessible_BASE) - // XAccessible
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibletabpage.hxx| 18 accessibility/source/standard/vclxaccessibletabpage.cxx | 12 -- 2 files changed, 5 insertions(+), 25 deletions(-) New commits: commit cf38f560d0e5a46edd79f28db5284e32a3679dbc Author: Stephan Bergmann AuthorDate: Thu Jan 26 17:38:12 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 27 11:47:21 2023 + Use ImplInheritanceHelper in VCLXAccessibleTabPage Change-Id: Ia1b4df33d426265d5eb6f0b77c531ab3b53ea3d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146238 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 0548ef344634..bb3d720055a0 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include @@ -33,12 +33,10 @@ class TabControl; typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; -typedef ::cppu::ImplHelper2< -css::accessibility::XAccessible, -css::lang::XServiceInfo > VCLXAccessibleTabPage_BASE; - -class VCLXAccessibleTabPage final : public AccessibleTextHelper_BASE, -public VCLXAccessibleTabPage_BASE +class VCLXAccessibleTabPage final : public cppu::ImplInheritanceHelper< +AccessibleTextHelper_BASE, +css::accessibility::XAccessible, +css::lang::XServiceInfo> { friend class VCLXAccessibleTabControl; @@ -80,12 +78,6 @@ public: VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId ); virtual ~VCLXAccessibleTabPage() override; -// XInterface -DECLARE_XINTERFACE() - -// XTypeProvider -DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 5175ab68e160..0dae45ca840c 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -219,18 +219,6 @@ void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE ) - - // XComponent
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblescrollbar.hxx| 20 -- accessibility/source/standard/vclxaccessiblescrollbar.cxx | 12 2 files changed, 6 insertions(+), 26 deletions(-) New commits: commit c1b17b0e9191901e8110ef14acce86c810a11491 Author: Stephan Bergmann AuthorDate: Thu Jan 26 17:29:14 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 27 11:45:27 2023 + Use ImplInheritanceHelper in VCLXAccessibleScrollBar Change-Id: I8702abb22d14eb88655a1a133ecce8140b0cd4e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146235 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index 4476ed7c89a1..ffaa7f689a78 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -24,17 +24,15 @@ #include #include -#include +#include -typedef ::cppu::ImplHelper2< -css::accessibility::XAccessibleAction, -css::accessibility::XAccessibleValue > VCLXAccessibleScrollBar_BASE; - -class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, -public VCLXAccessibleScrollBar_BASE +class VCLXAccessibleScrollBar final : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleScrollBar() override = default; @@ -42,13 +40,7 @@ class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: -using VCLXAccessibleComponent::VCLXAccessibleComponent; - -// XInterface -DECLARE_XINTERFACE() - -// XTypeProvider -DECLARE_XTYPEPROVIDER() +VCLXAccessibleScrollBar( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 8b001ea0f232..4ea6f788bb3c 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -76,18 +76,6 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE ) - - // XServiceInfo
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibleradiobutton.hxx| 20 +++- accessibility/source/standard/vclxaccessibleradiobutton.cxx | 12 --- 2 files changed, 6 insertions(+), 26 deletions(-) New commits: commit d3080dc586b2cdaaf56d9fa1172488b4901fb7db Author: Stephan Bergmann AuthorDate: Thu Jan 26 17:27:16 2023 +0100 Commit: Stephan Bergmann CommitDate: Fri Jan 27 10:29:25 2023 + Use ImplInheritanceHelper in VCLXAccessibleRadioButton Change-Id: If07a07cf4e6fa465d1d6d3e52abe550922edeb6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146234 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx index 4bffbf267c62..4e93579fa9c1 100644 --- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx @@ -24,17 +24,15 @@ #include #include -#include +#include -typedef ::cppu::ImplHelper2< -css::accessibility::XAccessibleAction, -css::accessibility::XAccessibleValue > VCLXAccessibleRadioButton_BASE; - -class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, - public VCLXAccessibleRadioButton_BASE +class VCLXAccessibleRadioButton final : public cppu::ImplInheritanceHelper< +VCLXAccessibleTextComponent, + css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleValue> { virtual ~VCLXAccessibleRadioButton() override = default; @@ -43,13 +41,7 @@ class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; public: -using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; - -// XInterface -DECLARE_XINTERFACE() - -// XTypeProvider -DECLARE_XTYPEPROVIDER() +VCLXAccessibleRadioButton( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index c9ba225eb4ab..b6937b38c27e 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -105,18 +105,6 @@ void VCLXAccessibleRadioButton::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE ) - - // XServiceInfo
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblebox.hxx| 22 +--- accessibility/source/standard/vclxaccessiblebox.cxx |5 2 files changed, 7 insertions(+), 20 deletions(-) New commits: commit 1bc2be265c528cebc0f3bf33b217edc46af56ff0 Author: Stephan Bergmann AuthorDate: Thu Jan 26 12:18:14 2023 +0100 Commit: Stephan Bergmann CommitDate: Thu Jan 26 19:02:37 2023 + Use ImplInheritanceHelper in VCLXAccessibleBox Change-Id: I8763463a2fd85a528870d140051dd9fb49aea608 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146186 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 9abebf6f3b19..6c86491a5422 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -24,14 +24,7 @@ #include #include #include -#include - - -typedef ::cppu::ImplHelper3< -css::accessibility::XAccessible, -css::accessibility::XAccessibleValue, -css::accessibility::XAccessibleAction -> VCLXAccessibleBox_BASE; +#include /** Base class for list- and combo boxes. This class manages the box' @@ -39,8 +32,11 @@ typedef ::cppu::ImplHelper3< IsValid method and return the correct implementation name. */ class VCLXAccessibleBox -: public VCLXAccessibleComponent, - public VCLXAccessibleBox_BASE +: public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessible, + css::accessibility::XAccessibleValue, + css::accessibility::XAccessibleAction> { public: enum BoxType {COMBOBOX, LISTBOX}; @@ -51,12 +47,6 @@ public: */ VCLXAccessibleBox (VCLXWindow* pVCLXindow, BoxType aType, bool bIsDropDownBox); -// XTypeProvider -DECLARE_XTYPEPROVIDER() - -// XInterface -DECLARE_XINTERFACE() - // XAccessible diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 9df75a914751..9f7d4e505ba8 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; VCLXAccessibleBox::VCLXAccessibleBox (VCLXWindow* pVCLWindow, BoxType aType, bool bIsDropDownBox) -: VCLXAccessibleComponent (pVCLWindow), +: ImplInheritanceHelper (pVCLWindow), m_aBoxType (aType), m_bIsDropDownBox (bIsDropDownBox) { @@ -246,9 +246,6 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } } -IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleBox, VCLXAccessibleComponent, VCLXAccessibleBox_BASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleBox, VCLXAccessibleComponent, VCLXAccessibleBox_BASE) - //= XAccessible = Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext( )
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/svtaccessiblenumericfield.hxx| 14 ++-- accessibility/source/standard/svtaccessiblenumericfield.cxx | 10 2 files changed, 4 insertions(+), 20 deletions(-) New commits: commit e547fb841d242ed3bd33623c4a1dc4cdb0e239a8 Author: Stephan Bergmann AuthorDate: Thu Jan 26 12:15:18 2023 +0100 Commit: Stephan Bergmann CommitDate: Thu Jan 26 19:02:16 2023 + Use ImplInheritanceHelper in SVTXAccessibleNumericField Change-Id: I9d9b6a6d7cbd89983cbe803511b59226330ae9e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146185 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx b/accessibility/inc/standard/svtaccessiblenumericfield.hxx index fb3b30e594fb..3537b9d6ef1d 100644 --- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx +++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx @@ -19,25 +19,17 @@ #pragma once -#include +#include #include #include -typedef ::cppu::ImplHelper1 SVTXAccessibleNumericField_BASE; - -class SVTXAccessibleNumericField final : public VCLXAccessibleEdit, - public SVTXAccessibleNumericField_BASE +class SVTXAccessibleNumericField final +: public cppu::ImplInheritanceHelper { public: SVTXAccessibleNumericField(VCLXWindow* pVCLXindow); -// XInterface -DECLARE_XINTERFACE() - -// XTypeProvider -DECLARE_XTYPEPROVIDER() - // XAccessibleContext virtual sal_Int16 SAL_CALL getAccessibleRole() override; diff --git a/accessibility/source/standard/svtaccessiblenumericfield.cxx b/accessibility/source/standard/svtaccessiblenumericfield.cxx index 4f696f71a9f3..2862a3a2b670 100644 --- a/accessibility/source/standard/svtaccessiblenumericfield.cxx +++ b/accessibility/source/standard/svtaccessiblenumericfield.cxx @@ -27,18 +27,10 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; SVTXAccessibleNumericField::SVTXAccessibleNumericField(VCLXWindow* pVCLWindow) -: VCLXAccessibleEdit(pVCLWindow) +: ImplInheritanceHelper(pVCLWindow) { } -// XInterface -IMPLEMENT_FORWARD_XINTERFACE2(SVTXAccessibleNumericField, VCLXAccessibleTextComponent, - SVTXAccessibleNumericField_BASE) - -// XTypeProvider -IMPLEMENT_FORWARD_XTYPEPROVIDER2(SVTXAccessibleNumericField, VCLXAccessibleTextComponent, - SVTXAccessibleNumericField_BASE) - sal_Int16 SVTXAccessibleNumericField::getAccessibleRole() { return AccessibleRole::SPIN_BOX; } css::uno::Any SAL_CALL SVTXAccessibleNumericField::getCurrentValue()
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessibletabbar.hxx| 18 +- accessibility/source/extended/accessibletabbar.cxx | 14 +- 2 files changed, 6 insertions(+), 26 deletions(-) New commits: commit 5db518df93aa5ed8c87bdd20cf911d584c06ddeb Author: Stephan Bergmann AuthorDate: Mon Jan 23 16:00:27 2023 +0100 Commit: Stephan Bergmann CommitDate: Wed Jan 25 18:55:47 2023 + Use ImplInheritanceHelper in AccessibleTabBar Change-Id: I709b18500f417f3f7019118bc2a298e73bbedcea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146113 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index f2795b59106e..b921fdb16719 100644 --- a/accessibility/inc/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -33,12 +33,10 @@ namespace accessibility -typedef ::cppu::ImplHelper2< -css::accessibility::XAccessible, -css::lang::XServiceInfo > AccessibleTabBar_BASE; - -class AccessibleTabBar final : public AccessibleTabBarBase, -public AccessibleTabBar_BASE +class AccessibleTabBar final : public cppu::ImplInheritanceHelper< + AccessibleTabBarBase, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; @@ -56,12 +54,6 @@ namespace accessibility public: AccessibleTabBar( TabBar* pTabBar ); -// XInterface -DECLARE_XINTERFACE() - -// XTypeProvider -DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 0a9747a3e708..cb7568946ae3 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -51,7 +51,7 @@ namespace accessibility AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar ) -:AccessibleTabBarBase( pTabBar ) +:ImplInheritanceHelper( pTabBar ) { if ( m_pTabBar ) m_aAccessibleChildren.assign( m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() ); @@ -152,18 +152,6 @@ namespace accessibility } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE ) - - // XComponent
[Libreoffice-commits] core.git: accessibility/inc accessibility/source include/toolkit toolkit/source
accessibility/inc/standard/vclxaccessibletabcontrol.hxx|1 accessibility/inc/standard/vclxaccessibletoolbox.hxx |1 accessibility/source/extended/accessibleiconchoicectrl.cxx |2 - include/toolkit/awt/vclxaccessiblecomponent.hxx| 14 ++--- toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 - 5 files changed, 6 insertions(+), 22 deletions(-) New commits: commit 5c312c986eac570af1c8c3210bdcbde213aae6dc Author: Stephan Bergmann AuthorDate: Mon Jan 23 16:31:25 2023 +0100 Commit: Stephan Bergmann CommitDate: Wed Jan 25 06:44:18 2023 + Use ImplInheritanceHelper in VCLXAccessibleComponent Change-Id: I300f033054bddc2c0ee1973dbafc108c477bf09a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146103 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 233e7277cb27..9827f9ba6b67 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index 0b2908d1dc32..352c3c07edfa 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -22,6 +22,7 @@ #include #include #include +#include diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index f9f3599bb4b4..18835b50b95d 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -168,7 +168,7 @@ namespace accessibility throw RuntimeException("getAccessibleChild: Entry " + OUString::number(i) + " not found", static_cast( -static_cast(this))); +static_cast(this))); return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this ); } diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 24003d5500f5..d3aaa30f5646 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include @@ -41,12 +41,9 @@ class AccessibleRelationSetHelper; -typedef ::cppu::ImplHelper1< -css::lang::XServiceInfo > VCLXAccessibleComponent_BASE; - class TOOLKIT_DLLPUBLIC SAL_LOPLUGIN_ANNOTATE("crosscast") VCLXAccessibleComponent -:public comphelper::OAccessibleExtendedComponentHelper -,public VCLXAccessibleComponent_BASE +:public cppu::ImplInheritanceHelper< + comphelper::OAccessibleExtendedComponentHelper, css::lang::XServiceInfo> { private: rtl::Reference m_xVCLXWindow; @@ -77,11 +74,6 @@ public: virtual void SAL_CALL disposing() override; -// css::uno::XInterface -DECLARE_XINTERFACE() -// css::lang::XTypeProvider -DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 26dcde5e1b01..2c9565fec9a7 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -79,16 +79,6 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent() DisconnectEvents(); } -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, VCLXAccessibleComponent_BASE ) -css::uno::Sequence< css::uno::Type > SAL_CALL VCLXAccessibleComponent::getTypes() -{ -return ::comphelper::concatSequences( -OAccessibleExtendedComponentHelper::getTypes(), -VCLXAccessibleComponent_BASE::getTypes() -); -} -IMPLEMENT_GET_IMPLEMENTATION_ID( VCLXAccessibleComponent ) - OUString VCLXAccessibleComponent::getImplementationName() { return "com.sun.star.comp.toolkit.AccessibleWindow";
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/AccessibleGridControlBase.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c83ec45d7d36d8371ec3fab843fdace6b23ac153 Author: Stephan Bergmann AuthorDate: Thu Jan 19 14:58:40 2023 +0100 Commit: Stephan Bergmann CommitDate: Thu Jan 19 18:40:14 2023 + Base AccessibleGridControlBase on WeakComponentImplHelper ...rather than on the deprecated WeakAggComponentImplHelper4. It was found that e.g. GridControlAccessibleElement, deriving from AccessibleGridControlBase, was implementing queryInterface in a way that is incompatible with the XAggregation protocol inherited via WeakAggComponentImplHelper4. It looks like no code actually made use of the XAggregation offered by this class hierarchy, so the easiest fix for that queryInterface implementation appears to switch from WeakAggComponentImplHelper4 to WeakComponentImplHelper (thereby dropping XAggregation, and thus rendering the existing queryInterface implementation OK). Change-Id: Ia7f033d0a93e78a48573cb489dc5542603c35b8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145793 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index ca706c977fcd..75bfa96ce87e 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ namespace vcl { class Window; } namespace accessibility { -typedef ::cppu::WeakAggComponentImplHelper4< +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleEventBroadcaster,
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 192b0ab41e87f3c4aaf78f22b96b030243c991d5 Author: Stephan Bergmann AuthorDate: Fri Jan 13 14:32:20 2023 +0100 Commit: Stephan Bergmann CommitDate: Sat Jan 14 11:51:00 2023 + AccessibleBrowseBoxBase's XAggregation is apparently unused It had been using WeakAggComponentImplHelper5 ever since at least f5d6acb1aa368ce50045b949bc12deb4d4bc0c41 "INTEGRATION: CWS a11ysep (1.1.2); FILE ADDED", but e.g. AccessibleTabListBoxTable deriving from it implements queryInterface in a way that is incompatible with XAggregation (it should only have forwarded to AccessibleBrowseBoxTable::queryInterface, and rather implemented its logic in an AccessibleTabListBoxTable::queryAggregation override). Also, without this commit but instead with a local > diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx > index d8bcd169ac2e..45797b838167 100644 > --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx > +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx > @@ -63,6 +63,7 @@ class AccessibleBrowseBoxBase : > public ::cppu::BaseMutex, > public AccessibleBrowseBoxImplHelper > { > +void SAL_CALL setDelegator(css::uno::Reference const &) final { assert(false); } > public: > /** Constructor sets specified name and description. If the constant of a > text is BBTEXT_NONE, the derived class has to set the text via on all of Linux, macOS, and Windows `make check` still succeeded, and running the resulting LibreOffice on macOS with the system's VoiceOver enabled, and doing "LibreOffice - Preferences... - LibreOffice - Advanced" and clicking around in the "Java runtime environments (JRE) already installed:" table (which actually uses AccessibleBrowseBoxBase via SvHeaderTabListBox::CreateAccessible in vcl/source/treelist/svtabbx.cxx) also still succeeded and produced audio, all without hitting that injected assert that should have fired if the XAggregation mechanism had been used after all. Change-Id: Ic213a03adf31bb1754443c1951b9b267f805115b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145477 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index d8bcd169ac2e..c91d39efab0d 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ namespace vcl { namespace accessibility { -typedef ::cppu::WeakAggComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleEventBroadcaster,
[Libreoffice-commits] core.git: accessibility/inc comphelper/Library_comphelper.mk comphelper/source include/comphelper include/IwyuFilter_include.yaml include/toolkit solenv/clang-format toolkit/inc
accessibility/inc/pch/precompiled_acc.hxx|1 comphelper/Library_comphelper.mk |1 comphelper/source/misc/accimplaccess.cxx | 54 -- include/IwyuFilter_include.yaml |3 include/comphelper/accimplaccess.hxx | 73 --- include/toolkit/awt/vclxaccessiblecomponent.hxx |2 solenv/clang-format/excludelist |2 toolkit/inc/controls/accessiblecontrolcontext.hxx|4 - toolkit/source/awt/vclxaccessiblecomponent.cxx |3 toolkit/source/controls/accessiblecontrolcontext.cxx |3 10 files changed, 3 insertions(+), 143 deletions(-) New commits: commit f1d00da1bb16330bef9316a3e4f04506f9bb862f Author: Stephan Bergmann AuthorDate: Mon Jan 9 11:53:17 2023 +0100 Commit: Stephan Bergmann CommitDate: Tue Jan 10 10:21:16 2023 + OAccessibleImplementationAccess was apparently effectively unused by now ...as there were no calls to its OAccessibleImplementationAccess::getUnoTunnelId so no code apparently made use of that XUnoTunnel Change-Id: I35d392999f1c28e81f7ff4bf395f63642eb17bce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145250 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 806c944ac6dd..fcbbd9f1f0c1 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -261,7 +261,6 @@ #include #include #include -#include #include #include #include diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index be60c4dc886c..b6d1d7e39ccf 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/accessibleselectionhelper \ comphelper/source/misc/accessibletexthelper \ comphelper/source/misc/accessiblewrapper \ -comphelper/source/misc/accimplaccess \ comphelper/source/misc/AccessibleImplementationHelper \ comphelper/source/misc/anycompare \ comphelper/source/misc/anytohash \ diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx deleted file mode 100644 index bcf05c926810.. --- a/comphelper/source/misc/accimplaccess.cxx +++ /dev/null @@ -1,54 +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 . - */ - -#include -#include - - -namespace comphelper -{ - - -using ::com::sun::star::uno::Sequence; - -OAccessibleImplementationAccess::OAccessibleImplementationAccess( ) -{ -} - - -OAccessibleImplementationAccess::~OAccessibleImplementationAccess( ) -{ -} - -const Sequence & OAccessibleImplementationAccess::getUnoTunnelId() -{ -static const comphelper::UnoIdInit implID; -return implID.getSeq(); -} - - -sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) -{ -return comphelper::getSomethingImpl(_rIdentifier, this); -} - -} // namespace comphelper - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index cbb76417739a..9fce4b214568 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -132,9 +132,6 @@ excludelist: - com/sun/star/accessibility/XAccessibleContext.hpp - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp - com/sun/star/accessibility/XAccessibleEventListener.hpp -include/comphelper/accimplaccess.hxx: -# base class has to be a complete type -- com/sun/star/lang/XUnoTunnel.hpp include/comphelper/attributelist.hxx: # base class has to be a complete type - com/sun/star/util/XCloneable.hpp diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx deleted file mode 100644 index e716d4d18905.. --- a/include/comp
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basegfx/source basic/source canvas/inc canvas/source chart2/source embeddedobj/source extensions/source forms/source framework/in
accessibility/inc/extended/accessiblelistbox.hxx |8 accessibility/source/extended/accessiblelistbox.cxx |6 basegfx/source/tools/canvastools.cxx |3 basegfx/source/tools/unopolypolygon.cxx | 12 - basic/source/basmgr/basicmanagerrepository.cxx|3 basic/source/inc/scriptcont.hxx |8 basic/source/uno/scriptcont.cxx | 11 - canvas/inc/parametricpolypolygon.hxx |7 canvas/source/cairo/cairo_cachedbitmap.cxx|3 canvas/source/cairo/cairo_canvas.cxx |7 canvas/source/cairo/cairo_canvas.hxx |6 canvas/source/cairo/cairo_canvasbitmap.cxx| 11 - canvas/source/cairo/cairo_canvasbitmap.hxx|7 canvas/source/cairo/cairo_canvascustomsprite.cxx |6 canvas/source/cairo/cairo_canvascustomsprite.hxx |7 canvas/source/cairo/cairo_canvasfont.cxx | 10 - canvas/source/cairo/cairo_canvasfont.hxx |7 canvas/source/cairo/cairo_canvashelper.cxx| 26 -- canvas/source/cairo/cairo_canvashelper_text.cxx |7 canvas/source/cairo/cairo_repainttarget.hxx | 14 - canvas/source/cairo/cairo_spritecanvas.cxx|6 canvas/source/cairo/cairo_spritecanvas.hxx|7 canvas/source/cairo/cairo_surfaceprovider.hxx | 14 - canvas/source/cairo/cairo_textlayout.cxx | 10 - canvas/source/cairo/cairo_textlayout.hxx |7 canvas/source/opengl/ogl_canvashelper.cxx |3 canvas/source/tools/canvastools.cxx | 36 canvas/source/tools/parametricpolypolygon.cxx | 11 - canvas/source/vcl/cachedbitmap.cxx|3 canvas/source/vcl/canvas.cxx |4 canvas/source/vcl/canvas.hxx |7 canvas/source/vcl/canvasbitmap.cxx|6 canvas/source/vcl/canvasbitmap.hxx|7 canvas/source/vcl/canvascustomsprite.cxx |4 canvas/source/vcl/canvascustomsprite.hxx |7 canvas/source/vcl/canvasfont.cxx | 10 - canvas/source/vcl/canvasfont.hxx |7 canvas/source/vcl/canvashelper.cxx|5 canvas/source/vcl/canvashelper_texturefill.cxx|3 canvas/source/vcl/impltools.cxx |3 canvas/source/vcl/repainttarget.hxx | 15 - canvas/source/vcl/spritecanvas.cxx|4 canvas/source/vcl/spritecanvas.hxx|7 canvas/source/vcl/textlayout.cxx | 10 - canvas/source/vcl/textlayout.hxx |7 chart2/source/controller/main/ChartController.cxx |4 chart2/source/controller/sidebar/Chart2PanelFactory.cxx |3 chart2/source/controller/sidebar/ChartLinePanel.cxx |3 embeddedobj/source/commonembedding/miscobj.cxx|7 embeddedobj/source/inc/commonembobj.hxx |7 extensions/source/propctrlr/browserline.cxx |3 extensions/source/propctrlr/commoncontrol.hxx | 14 - extensions/source/propctrlr/eformshelper.cxx |3 extensions/source/propctrlr/formcomponenthandler.cxx |5 extensions/source/propctrlr/handlerhelper.cxx |7 extensions/source/propctrlr/propcontroller.cxx|5 extensions/source/propctrlr/propeventtranslation.cxx | 13 - extensions/source/propctrlr/propeventtranslation.hxx |6 extensions/source/propctrlr/standardcontrol.hxx | 20 +- extensions/source/propctrlr/usercontrol.cxx | 12 - extensions/source/propctrlr/usercontrol.hxx | 10 - forms/source/inc/InterfaceContainer.hxx |9 - forms/source/misc/InterfaceContainer.cxx | 13 - framework/inc/uielement/addonstoolbarwrapper.hxx |8 framework/source/layoutmanager/toolbarlayoutmanager.cxx |3 framework/source/services/desktop.cxx | 10 - framework/source/servi
[Libreoffice-commits] core.git: accessibility/inc accessibility/source include/toolkit toolkit/source winaccessibility/source
accessibility/inc/extended/accessiblelistbox.hxx |8 +--- accessibility/source/extended/accessiblelistbox.cxx |6 -- include/toolkit/awt/vclxaccessiblecomponent.hxx | 10 +++--- toolkit/source/awt/vclxaccessiblecomponent.cxx | 14 -- winaccessibility/source/service/AccTopWindowListener.cxx |4 +++- 5 files changed, 31 insertions(+), 11 deletions(-) New commits: commit c0c4519e0d5b555f59bbc04cc616454edfd1f4ce Author: Stephan Bergmann AuthorDate: Thu Dec 1 10:30:16 2022 +0100 Commit: Stephan Bergmann CommitDate: Fri Dec 23 14:19:32 2022 + loplugin:unocast (VCLXAccessibleComponent) (See the upcoming commit introducing that loplugin:unocast on why such dynamic_casts from UNO types are dangerous.) Change-Id: I11496cc1d37e89ce8f11991f86c7b60bb1b93106 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144748 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 339e32f3b0b7..7138820123ad 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -35,12 +35,14 @@ namespace accessibility { class AccessibleListBoxEntry; +using AccessibleListBox_Base = cppu::ImplHelper2< +css::accessibility::XAccessible, +css::accessibility::XAccessibleSelection>; + /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ class AccessibleListBox : -public cppu::ImplHelper2< -css::accessibility::XAccessible, -css::accessibility::XAccessibleSelection>, +public AccessibleListBox_Base, public VCLXAccessibleComponent { diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index df4a9a759c0f..bb1131d0ab4f 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -58,8 +58,10 @@ namespace accessibility dispose(); } } -IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, ImplHelper2) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, ImplHelper2) +IMPLEMENT_FORWARD_XINTERFACE2( +AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_Base); +IMPLEMENT_FORWARD_XTYPEPROVIDER2( +AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_Base); void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 7c299edf6d65..dd25c76c2c2d 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -22,7 +22,8 @@ #include #include -#include +#include +#include #include #include @@ -42,8 +43,8 @@ class AccessibleRelationSetHelper; -typedef ::cppu::ImplHelper1< -css::lang::XServiceInfo > VCLXAccessibleComponent_BASE; +typedef ::cppu::ImplHelper2< +css::lang::XServiceInfo, css::lang::XUnoTunnel > VCLXAccessibleComponent_BASE; class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent :public comphelper::OAccessibleExtendedComponentHelper @@ -89,6 +90,9 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; +sal_Int64 SAL_CALL getSomething(css::uno::Sequence const & aIdentifier) override; +static css::uno::Sequence const & getUnoTunnelId(); + // css::accessibility::XAccessibleContext sal_Int64 SAL_CALL getAccessibleChildCount( ) override; css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 7fbb1ea1ccd6..6d0798bda590 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -105,6 +106,15 @@ uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() return aNames; } +sal_Int64 VCLXAccessibleComponent::getSomething(css::uno::Sequence const & aIdentifier) { +return comphelper::getSomethingImpl(aIdentifier, this); +} + +css::uno::Sequence const & VCLXAccessibleComponent::getUnoTunnelId() { +static comphelper::UnoIdInit const id; +return id.getSeq(); +} + IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclWindowEvent&, rEvent, void ) { /* Ignore VclEventId::WindowEndPopupMode,
[Libreoffice-commits] core.git: accessibility/inc chart2/source cui/source dbaccess/source drawinglayer/source extensions/source forms/source i18npool/inc include/comphelper include/filter
accessibility/inc/standard/vclxaccessiblebox.hxx| 28 +- chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx | 2 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx| 2 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx| 1 chart2/source/inc/BaseCoordinateSystem.hxx | 4 - chart2/source/inc/WrappedPropertySet.hxx| 2 cui/source/inc/QrCodeGenDialog.hxx | 2 cui/source/inc/scriptdlg.hxx| 1 dbaccess/source/core/inc/TableDeco.hxx | 2 dbaccess/source/core/inc/column.hxx | 2 dbaccess/source/core/inc/databasecontext.hxx| 1 dbaccess/source/core/inc/table.hxx | 2 dbaccess/source/ui/dlg/dbfindex.hxx | 2 dbaccess/source/ui/inc/TableWindowData.hxx | 2 dbaccess/source/ui/inc/indexcollection.hxx | 1 drawinglayer/source/tools/emfpbrush.hxx | 2 drawinglayer/source/tools/emfppath.hxx | 3 - extensions/source/dbpilots/commonpagesdbp.hxx | 1 extensions/source/propctrlr/propcontroller.hxx | 3 - forms/source/inc/limitedformats.hxx | 1 i18npool/inc/indexentrysupplier_default.hxx | 3 - include/comphelper/MasterPropertySet.hxx| 2 include/comphelper/accessiblewrapper.hxx| 2 include/comphelper/containermultiplexer.hxx | 1 include/comphelper/logging.hxx | 1 include/comphelper/stl_types.hxx| 1 include/filter/msfilter/escherex.hxx| 6 +- include/filter/msfilter/svdfppt.hxx | 5 + 28 files changed, 39 insertions(+), 46 deletions(-) New commits: commit 9c2e77152c3b824153ef5451ababe58dc5ce981c Author: Noel Grandin AuthorDate: Wed Nov 23 16:02:12 2022 +0200 Commit: Noel Grandin CommitDate: Wed Nov 23 20:49:03 2022 +0100 loplugin:unusedfields make some fields private this is one of the secondary analyses this plugin performs Change-Id: Iaa4424c2396470c6f1df85b0290fbffdda35fa08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143177 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 9b1c5aadbc45..9abebf6f3b19 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -110,7 +110,22 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) override; virtual css::uno::Any SAL_CALL getMinimumIncrement( ) override; + protected: +virtual ~VCLXAccessibleBox() override = default; + +/** Returns true when the object is valid. +*/ +virtual bool IsValid() const = 0; + +virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) override; +virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; + +virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; + +sal_Int64 implGetAccessibleChildCount(); + +private: /** Specifies whether the box is a combo box or a list box. List boxes have multi selection. */ @@ -140,19 +155,6 @@ protected: same life time. */ bool m_bHasListChild; - -virtual ~VCLXAccessibleBox() override = default; - -/** Returns true when the object is valid. -*/ -virtual bool IsValid() const = 0; - -virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) override; -virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; - -virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - -sal_Int64 implGetAccessibleChildCount(); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 7eee90a2c209..be9457d0ffd7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -45,7 +45,7 @@ protected: virtual css::uno::
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc basic/source chart2/inc chart2/source comphelper/Library_comphelper.mk comphelper/source connectivity/inc cui/inc desktop/inc des
accessibility/inc/pch/precompiled_acc.hxx |2 basctl/inc/pch/precompiled_basctl.hxx |2 basic/inc/basic.hrc |2 basic/inc/pch/precompiled_sb.hxx|2 basic/inc/sbxbase.hxx |2 basic/source/classes/sbunoobj.cxx |2 basic/source/inc/buffer.hxx |2 basic/source/inc/sbintern.hxx |2 basic/source/inc/scanner.hxx|2 basic/source/runtime/ddectrl.cxx|2 basic/source/runtime/ddectrl.hxx|2 basic/source/runtime/dllmgr.hxx |2 basic/source/sbx/sbxbool.cxx|2 basic/source/sbx/sbxbyte.cxx|2 basic/source/sbx/sbxchar.cxx|2 basic/source/sbx/sbxdbl.cxx |2 basic/source/sbx/sbxint.cxx |2 basic/source/sbx/sbxlng.cxx |2 basic/source/sbx/sbxscan.cxx|2 basic/source/sbx/sbxsng.cxx |2 basic/source/sbx/sbxuint.cxx|2 basic/source/sbx/sbxulng.cxx|2 chart2/inc/pch/precompiled_chartcontroller.hxx |2 chart2/inc/pch/precompiled_chartcore.hxx|2 chart2/source/model/inc/XMLFilter.hxx |2 comphelper/Library_comphelper.mk|1 comphelper/source/misc/errcode.cxx | 108 +++- connectivity/inc/pch/precompiled_dbase.hxx |2 connectivity/inc/pch/precompiled_file.hxx |2 cui/inc/pch/precompiled_cui.hxx |2 desktop/inc/pch/precompiled_sofficeapp.hxx |2 desktop/source/lib/lokinteractionhandler.hxx|2 editeng/inc/pch/precompiled_editeng.hxx |2 forms/inc/pch/precompiled_frm.hxx |2 framework/source/interaction/quietinteraction.cxx |2 framework/source/loadenv/loadenv.cxx|2 framework/source/services/desktop.cxx |2 include/IwyuFilter_include.yaml |2 include/basic/basmgr.hxx|2 include/basic/sberrors.hxx |2 include/basic/sbmeth.hxx|2 include/comphelper/errcode.hxx | 13 +- include/editeng/editeng.hxx |2 include/editeng/editerr.hxx |2 include/editeng/editview.hxx|2 include/editeng/outliner.hxx|2 include/filter/msfilter/msdffimp.hxx|2 include/filter/msfilter/svxmsbas.hxx|2 include/sfx2/app.hxx|2 include/sfx2/docinf.hxx |2 include/sfx2/docinsert.hxx |2 include/sfx2/filedlghelper.hxx |2 include/sfx2/ipclient.hxx |2 include/sfx2/objsh.hxx |2 include/sfx2/opengrf.hxx|2 include/sfx2/viewsh.hxx |2 include/sot/storage.hxx |2 include/svx/svxerr.hxx |2 include/svx/xoutbmp.hxx |2 include/tools/stream.hxx|2 include/vbahelper/vbahelper.hxx |2 include/vcl/cvtgrf.hxx |2 include/vcl/errinf.hxx |2 include/vcl/graphicfilter.hxx |2 include/vcl/print.hxx |2 include/xmloff/xmlexp.hxx |2 linguistic/source/dicimp.hxx|2 reportdesign/inc/pch/precompiled_rpt.hxx|2 reportdesign/inc/pch/precompiled_rptui.hxx |2 sc/IwyuFilter_sc.yaml |2 sc/inc/document.hxx |2 sc/inc/filter.hxx |2 sc/inc/pch/precompiled_sc.hxx |2 sc/inc/pch/precompiled_scfilt.hxx |2 sc/inc/scerrors.hxx |2 sc/inc/xmlwrap.hxx |2 sc/source/filter/inc/eeparser.hxx |2 sc/source/filter/inc/qpro.hxx |2 sd/IwyuFilter_sd.yaml |2 sd/inc/errhdl.hrc |2 sd/inc/pch/precompiled_sd.hxx |2 sd/inc/pch/precompiled_sdui.hxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source chart2/source comphelper/source dbaccess/qa dbaccess/source editeng/source include/comphelper include/editeng inclu
accessibility/inc/extended/AccessibleBrowseBox.hxx |6 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx |2 accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx |6 accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx | 17 +- accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx|6 accessibility/inc/extended/AccessibleBrowseBoxTable.hxx |4 accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx | 16 +- accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx |6 accessibility/inc/extended/AccessibleGridControl.hxx|8 - accessibility/inc/extended/AccessibleGridControlBase.hxx|2 accessibility/inc/extended/AccessibleGridControlHeader.hxx |4 accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx |6 accessibility/inc/extended/AccessibleGridControlTable.hxx | 14 - accessibility/inc/extended/AccessibleGridControlTableBase.hxx | 14 - accessibility/inc/extended/AccessibleGridControlTableCell.hxx |6 accessibility/inc/extended/accessibleeditbrowseboxcell.hxx |4 accessibility/inc/extended/accessibleiconchoicectrl.hxx | 14 - accessibility/inc/extended/accessibleiconchoicectrlentry.hxx|6 accessibility/inc/extended/accessiblelistbox.hxx| 14 - accessibility/inc/extended/accessiblelistboxentry.hxx | 16 +- accessibility/inc/extended/accessibletabbar.hxx |6 accessibility/inc/extended/accessibletabbarpage.hxx |6 accessibility/inc/extended/accessibletabbarpagelist.hxx | 16 +- accessibility/inc/extended/accessibletablistbox.hxx |4 accessibility/inc/extended/accessibletablistboxtable.hxx| 14 - accessibility/inc/extended/textwindowaccessibility.hxx | 10 - accessibility/inc/standard/accessiblemenubasecomponent.hxx |4 accessibility/inc/standard/accessiblemenucomponent.hxx | 14 - accessibility/inc/standard/accessiblemenuitemcomponent.hxx |6 accessibility/inc/standard/vclxaccessiblebox.hxx|6 accessibility/inc/standard/vclxaccessibleedit.hxx |4 accessibility/inc/standard/vclxaccessibleheaderbar.hxx |4 accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx |6 accessibility/inc/standard/vclxaccessiblelist.hxx | 18 +- accessibility/inc/standard/vclxaccessiblelistitem.hxx |6 accessibility/inc/standard/vclxaccessiblemenu.hxx | 16 +- accessibility/inc/standard/vclxaccessiblemenubar.hxx|2 accessibility/inc/standard/vclxaccessiblepopupmenu.hxx |2 accessibility/inc/standard/vclxaccessiblestatusbar.hxx |4 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |6 accessibility/inc/standard/vclxaccessibletabcontrol.hxx | 16 +- accessibility/inc/standard/vclxaccessibletabpage.hxx|8 - accessibility/inc/standard/vclxaccessibletabpagewindow.hxx |2 accessibility/inc/standard/vclxaccessibletextfield.hxx |4 accessibility/inc/standard/vclxaccessibletoolbox.hxx| 16 +- accessibility/inc/standard/vclxaccessibletoolboxitem.hxx|6 accessibility/source/extended/AccessibleBrowseBox.cxx |9 - accessibility/source/extended/AccessibleBrowseBoxBase.cxx |8 - accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |8 - accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 21 +- accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |8 - accessibility/source/extended/AccessibleBrowseBoxTable.cxx |4 accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 20 +- accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |8 - accessibility/source/extended/AccessibleGridControl.cxx | 12 - accessibility/source/extended/AccessibleGridControlBase.cxx |8 - accessibility/source/extended/AccessibleGridControlHeader.cxx |4 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |9 - accessibility/source/extended/AccessibleGridControlTable.cxx| 21 +- accessibility/source/extended/AccessibleGridControlTableBase.cxx| 22 +- accessibility/source/extended/AccessibleGridControlTableCell.cxx| 12 - accessibility/source/extended/accessibleeditbrowseboxcell.cxx |4 accessibility/source/extended/accessibleiconchoicectrl.cxx | 25 ++- accessibility/source/extended/accessibleiconchoicectrlentry.cxx |6 accessibility/source/exte
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc basic/source chart2/inc cui/inc dbaccess/inc forms/source framework/source include/dbaccess include/svtools include/svx include/t
accessibility/inc/helper/IComboListBoxHelper.hxx |2 accessibility/inc/pch/precompiled_acc.hxx| 13 ++- basctl/inc/pch/precompiled_basctl.hxx|9 ++ basic/inc/pch/precompiled_sb.hxx | 51 +++--- basic/source/runtime/methods.cxx |2 chart2/inc/pch/precompiled_chartcontroller.hxx | 25 +++ cui/inc/pch/precompiled_cui.hxx | 33 - dbaccess/inc/pch/precompiled_dbu.hxx | 11 +-- forms/source/richtext/richtextcontrol.hxx|2 framework/source/helper/tagwindowasmodified.cxx |2 include/dbaccess/dataview.hxx|2 include/svtools/valueset.hxx |2 include/svx/fmgridif.hxx |2 include/vcl/builder.hxx |2 include/vcl/stdtext.hxx |2 include/vcl/toolkit/vclmedit.hxx |2 include/vcl/window.hxx |2 include/vcl/wintypes.hxx |6 - reportdesign/inc/pch/precompiled_rptui.hxx | 21 -- sc/inc/pch/precompiled_sc.hxx| 17 +++- sd/inc/pch/precompiled_sd.hxx| 57 +++- sd/inc/pch/precompiled_sdui.hxx | 28 sfx2/source/control/listview.cxx |2 solenv/clang-format/excludelist |2 svx/inc/pch/precompiled_svxcore.hxx | 16 +++- sw/inc/pch/precompiled_swui.hxx | 53 +++ sw/inc/pch/precompiled_vbaswobj.hxx | 79 +++ toolkit/inc/helper/imagealign.hxx|2 toolkit/source/awt/vclxtoolkit.cxx |2 vcl/source/treelist/svimpbox.cxx |2 30 files changed, 247 insertions(+), 204 deletions(-) New commits: commit 845393b9aa9057c5ace3c41ad5ac629b895d7f7f Author: Chris Sherlock AuthorDate: Mon Jun 27 19:04:24 2022 +1000 Commit: Tomaž Vajngerl CommitDate: Wed Jul 20 12:20:59 2022 +0200 move wintypes.hxx from tools to vcl Change-Id: Ief9949fd4252de9e33df172af07aa7ed097b5520 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136560 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index e786311fd0df..eed2a757c1e4 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace com::sun::star::datatransfer::clipboard { diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 33dcf9125def..07f6fa2c8e8d 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-11-29 09:45:37 using: + Generated on 2022-06-27 18:57:49 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #endif // PCH_LEVEL >= 1 @@ -69,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -92,6 +94,7 @@ #include #include #include +#include #include #include #include @@ -142,7 +145,7 @@ #include #include #include -#include +#include #include #include #include @@ -157,6 +160,7 @@ #include #include #include +#include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include @@ -166,6 +170,7 @@ #include #include #include +#include #include #include #include @@ -238,7 +243,6 @@ #include #include #include -#include #include #include #include @@ -291,7 +295,6 @@ #include #include #include -#include #include #include #include @@ -316,7 +319,6 @@ #include #include #include -#include #include #include #include @@ -336,7 +338,6 @@ #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 30f9f2560029..9728e1df71b2 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2022-01-26 09:11:03 using: + Generated on 2022-06-27 18:59:37 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source chart2/source comphelper/source dbaccess/source editeng/source include/comphelper include/editeng include/IwyuFilte
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx | 13 accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 2 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx | 7 accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx| 7 accessibility/inc/extended/AccessibleGridControlBase.hxx | 14 accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx | 7 accessibility/inc/extended/AccessibleGridControlTableCell.hxx | 7 accessibility/inc/extended/accessibleeditbrowseboxcell.hxx | 2 accessibility/inc/extended/accessibleiconchoicectrl.hxx| 2 accessibility/inc/extended/accessibleiconchoicectrlentry.hxx | 3 accessibility/inc/extended/accessiblelistbox.hxx | 2 accessibility/inc/extended/accessiblelistboxentry.hxx | 3 accessibility/inc/extended/accessibletabbar.hxx| 8 accessibility/inc/extended/accessibletabbarpage.hxx| 8 accessibility/inc/extended/accessibletabbarpagelist.hxx| 8 accessibility/inc/extended/textwindowaccessibility.hxx | 6 accessibility/inc/pch/precompiled_acc.hxx | 2 accessibility/inc/standard/accessiblemenubasecomponent.hxx | 9 accessibility/inc/standard/accessiblemenucomponent.hxx | 2 accessibility/inc/standard/accessiblemenuitemcomponent.hxx | 2 accessibility/inc/standard/vclxaccessiblebox.hxx | 2 accessibility/inc/standard/vclxaccessiblebutton.hxx| 2 accessibility/inc/standard/vclxaccessiblecheckbox.hxx | 2 accessibility/inc/standard/vclxaccessibleedit.hxx | 2 accessibility/inc/standard/vclxaccessiblefixedtext.hxx | 2 accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx | 8 accessibility/inc/standard/vclxaccessiblelist.hxx | 2 accessibility/inc/standard/vclxaccessiblelistitem.hxx | 3 accessibility/inc/standard/vclxaccessiblemenuitem.hxx | 2 accessibility/inc/standard/vclxaccessibleradiobutton.hxx | 2 accessibility/inc/standard/vclxaccessiblescrollbar.hxx | 2 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx | 8 accessibility/inc/standard/vclxaccessibletabcontrol.hxx| 2 accessibility/inc/standard/vclxaccessibletabpage.hxx | 9 accessibility/inc/standard/vclxaccessibletoolbox.hxx | 2 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx | 3 accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 17 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx | 11 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx| 28 - accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 18 accessibility/source/extended/AccessibleGridControlBase.cxx| 17 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 26 - accessibility/source/extended/AccessibleGridControlTableCell.cxx | 18 accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 2 accessibility/source/extended/accessibleiconchoicectrl.cxx | 9 accessibility/source/extended/accessibleiconchoicectrlentry.cxx| 23 - accessibility/source/extended/accessiblelistbox.cxx| 9 accessibility/source/extended/accessiblelistboxentry.cxx | 29 - accessibility/source/extended/accessibletabbar.cxx | 27 - accessibility/source/extended/accessibletabbarpage.cxx | 25 - accessibility/source/extended/accessibletabbarpagelist.cxx | 21 accessibility/source/extended/textwindowaccessibility.cxx | 35 - accessibility/source/standard/accessiblemenubasecomponent.cxx | 13 accessibility/source/standard/accessiblemenucomponent.cxx | 17 accessibility/source/standard/accessiblemenuitemcomponent.cxx | 13 accessibility/source/standard/vclxaccessiblebox.cxx| 7 accessibility/source/standard/vclxaccessiblebutton.cxx | 13 accessibility/source/standard/vclxaccessiblecheckbox.cxx | 9 accessibility/source/standard/vclxaccessibleedit.cxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/Library_acc.mk accessibility/source include/vcl starmath/source vcl/inc vcl/source
accessibility/Library_acc.mk |1 accessibility/inc/extended/AccessibleIconView.hxx| 30 accessibility/inc/extended/accessiblelistbox.hxx |9 +- accessibility/source/extended/AccessibleIconView.cxx | 53 +++ accessibility/source/extended/accessiblelistboxentry.cxx | 25 --- accessibility/source/helper/acc_factory.cxx | 13 +++ include/vcl/accessiblefactory.hxx|5 + include/vcl/toolkit/treelistbox.hxx |2 include/vcl/weld.hxx |5 + starmath/source/accessibility.cxx|6 - vcl/inc/iconview.hxx | 11 +++ vcl/inc/salvtables.hxx |1 vcl/source/app/salvtables.cxx| 12 +++ vcl/source/helper/svtaccessiblefactory.cxx |9 ++ vcl/source/treelist/iconview.cxx | 25 +++ vcl/source/treelist/treelistbox.cxx | 27 +++ 16 files changed, 202 insertions(+), 32 deletions(-) New commits: commit 2a28ebeef5ea3e2b01d836a7233d2316b765bf38 Author: Mike Kaganski AuthorDate: Wed Jun 1 11:18:26 2022 +0300 Commit: Mike Kaganski CommitDate: Thu Jun 9 17:49:16 2022 +0200 Accessibility for IconView Change-Id: I65ca9d43f70a50e2e95aabfc3b8ba1b15f9ff8be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135226 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 0926fee97e5d..34c4dc7eb0c5 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/extended/accessibleeditbrowseboxcell \ accessibility/source/extended/accessibleiconchoicectrl \ accessibility/source/extended/accessibleiconchoicectrlentry \ +accessibility/source/extended/AccessibleIconView \ accessibility/source/extended/accessiblelistbox \ accessibility/source/extended/accessiblelistboxentry \ accessibility/source/extended/accessibletablistbox \ diff --git a/accessibility/inc/extended/AccessibleIconView.hxx b/accessibility/inc/extended/AccessibleIconView.hxx new file mode 100644 index ..d5ab5eafb198 --- /dev/null +++ b/accessibility/inc/extended/AccessibleIconView.hxx @@ -0,0 +1,30 @@ +/* -*- 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/. + */ + +#pragma once + +#include + +#include "accessiblelistbox.hxx" + +namespace accessibility +{ +class AccessibleIconView final : public AccessibleListBox +{ +public: +AccessibleIconView(SvTreeListBox const& _rListBox, + const css::uno::Reference& _xParent); + +protected: +// VCLXAccessibleComponent +virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override; +}; +} // namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 4f4104701709..40b01ea180a5 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -37,7 +37,7 @@ namespace accessibility /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ -class AccessibleListBox final : +class AccessibleListBox : public cppu::ImplHelper2< css::accessibility::XAccessible, css::accessibility::XAccessibleSelection>, @@ -45,18 +45,17 @@ namespace accessibility { css::uno::Reference< css::accessibility::XAccessible > m_xParent; - -virtual ~AccessibleListBox() override; - // OComponentHelper overridables /** this function is called upon disposing the component */ virtual void SAL_CALL disposing() override; +protected: // VCLXAccessibleComponent virtual voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual voidProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual voidFillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; +private: VclPtr< SvTreeListBox > getListBox() const; voidRemoveChildEntries(SvTreeListEntry*); @@ -73,6 +72,8 @@ namespace accessibility AccessibleListBox( SvTreeListBox const & _rList
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBox.hxx|2 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx| 12 ++-- accessibility/inc/extended/AccessibleGridControl.hxx |2 accessibility/inc/extended/AccessibleGridControlBase.hxx |2 accessibility/inc/extended/accessibleeditbrowseboxcell.hxx|6 +- accessibility/inc/extended/textwindowaccessibility.hxx|2 accessibility/inc/standard/vclxaccessiblelistitem.hxx |2 accessibility/source/extended/AccessibleBrowseBox.cxx |5 +- accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 25 +- accessibility/source/extended/AccessibleGridControl.cxx |5 +- accessibility/source/extended/AccessibleGridControlBase.cxx |5 +- accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 11 ++-- accessibility/source/extended/textwindowaccessibility.cxx |5 +- accessibility/source/standard/vclxaccessiblelistitem.cxx |5 +- 14 files changed, 48 insertions(+), 41 deletions(-) New commits: commit af36f2c269e4e04cdde426b5f149c87190d766ea Author: Noel Grandin AuthorDate: Mon Jun 6 11:15:05 2022 +0200 Commit: Noel Grandin CommitDate: Mon Jun 6 13:15:50 2022 +0200 clang-tidy modernize-pass-by-value in accessibility Change-Id: Ib0658b5a0bb33e5f990b8ce4bf25b2d9cef32505 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135445 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index e2d5de3f2600..ba00e00d6c91 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -206,7 +206,7 @@ private: public: AccessibleBrowseBoxAccess( -const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, +css::uno::Reference< css::accessibility::XAccessible > _xParent, ::vcl::IAccessibleTableProvider& _rBrowseBox ); diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index 71cde0280ad2..7e9ada30ab86 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -80,9 +80,9 @@ public: @param _xFocusWindowThe window that gets all the focus events. @param eObjType Object type */ AccessibleBrowseBoxBase( -const css::uno::Reference< css::accessibility::XAccessible >& rxParent, +css::uno::Reference< css::accessibility::XAccessible > xParent, ::vcl::IAccessibleTableProvider& rBrowseBox, -const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, +css::uno::Reference< css::awt::XWindow > _xFocusWindow, AccessibleBrowseBoxObjType eObjType ); /** Constructor sets specified name and description. @@ -93,12 +93,12 @@ public: @param rNameThe name of this object. @param rDescription The description text of this object. */ AccessibleBrowseBoxBase( -const css::uno::Reference< css::accessibility::XAccessible >& rxParent, +css::uno::Reference< css::accessibility::XAccessible > xParent, ::vcl::IAccessibleTableProvider& rBrowseBox, -const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, +css::uno::Reference< css::awt::XWindow > _xFocusWindow, AccessibleBrowseBoxObjType eObjType, -const OUString& rName, -const OUString& rDescription ); +OUString rName, +OUString rDescription ); protected: virtual ~AccessibleBrowseBoxBase() override; diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 79b4e19e47b1..302f240ee65f 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -171,7 +171,7 @@ private: public: AccessibleGridControlAccess( -const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, +css::uno::Reference< css::accessibility::XAccessible > _xParent, ::vcl::table::IAccessibleTable& _rTable ); diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index f1b2d4b1c85f..8523b78926d6 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -66,7 +66,7 @@ public: @param rTableThe Table control. @param eObjType Type of accessible table control. */ AccessibleGridControlBase( -const css::uno::Reference< css::accessibility::XAccessible >& rxParent, +css::uno::Reference< css::accessibility::XAccessible > xParent, ::vcl::table::IAccessible
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControlTable.hxx |3 --- accessibility/source/extended/AccessibleGridControl.cxx | 13 - 2 files changed, 4 insertions(+), 12 deletions(-) New commits: commit f56b932487509de1ecde46a42c40df76c6ecebcf Author: Michael Weghorn AuthorDate: Wed Mar 9 13:53:09 2022 +0100 Commit: Michael Weghorn CommitDate: Wed Mar 9 17:47:24 2022 +0100 a11y: Leave cell vector handling to AccessibleGridControlTable Use `AccessibleGridControlTable::getAccessibleCellAt` and cast to `AccessibleGridControlTableCell*` instead of directly accessing the cell vector in `AccessibleGridControl::commitCellEvent`. `AccessibleGridControlTable::getAccessibleCellAt` just needs row and column index as parameters, and already takes care of everything else that's needed. This includes creating an accessible object for the given indices on demand. Therefore, limiting this to only already existing a11y objects, which was done to avoid crashes in commit 4fc7deb7b0528010ebf644654bf4a36594e03f8c Date: Thu Oct 3 23:16:34 2013 +0200 fix STL assert in accessibility::AccessibleGridControl::commitTableEvent is no longer needed. With this change in place, details of how cells are organized in the vector only need to be known inside of the `AccessibleGridControlTable` class itself, so drop the now unused method `AccessibleGridControlTable::getCellVector`. (This code path is e.g. used when using the macro from tdf#147742.) Change-Id: I21027f0edc2904475ad6cc5fb136316f387499dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131248 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index 602365468505..69e3d9229694 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -142,9 +142,6 @@ public: // XComponent virtual void SAL_CALL dispose() override; -/**@return m_pCellVector*/ -std::vector< rtl::Reference >& getCellVector() { return m_aCellVector;} - virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue) override; diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 81f3d121ab0f..474945817603 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -270,15 +270,10 @@ void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNew css::uno::Reference< css::accessibility::XAccessible > xAccessible = getAccessibleChild(i); if(css::uno::Reference< css::accessibility::XAccessible >(m_xTable) == xAccessible) { -std::vector< rtl::Reference >& rCells = -m_xTable->getCellVector(); -size_t nIndex = m_aTable.GetCurrentRow() * m_aTable.GetColumnCount() - + m_aTable.GetCurrentColumn(); -if (nIndex < rCells.size() && rCells[nIndex]) -{ -rtl::Reference xCell = rCells[nIndex]; -xCell->commitEvent( _nEventId, _rNewValue, _rOldValue ); -} +Reference xCell = m_xTable->getAccessibleCellAt( +m_aTable.GetCurrentRow(), m_aTable.GetCurrentColumn()); +AccessibleGridControlTableCell* pCell = static_cast(xCell.get()); +pCell->commitEvent(_nEventId, _rNewValue, _rOldValue); } } }
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControlBase.hxx|2 -- accessibility/source/extended/AccessibleGridControlBase.cxx |3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit fbe4d77d961975bafe8ea3e419651df4d418f92b Author: Michael Weghorn AuthorDate: Thu Mar 3 15:34:06 2022 +0100 Commit: Michael Weghorn CommitDate: Fri Mar 4 08:05:33 2022 +0100 tdf#147742 a11y: AccessibleGridControlBase: get accessible desc on demand Previously, the accessible description was retrieved in the `AccessibleGridControlBase` ctor and stored in a class member. Change that to fetch the description on demand. `TableControl::GetAccessibleObjectDescription` is used to get the description, which currently uses the row and column index of the currently active cell. When using the macro from the sample document in tdf#147742 with the Orca screen reader active, no cell was active at the point that the ctor was called, so `ROW_INVALID`/`COL_INVALID` were used, resulting in a crash later (s. backtrace in tdf#147742). If necessary, `TableControl::GetAccessibleObjectDescription` could be extended to allow passing an explicit row/column index, as is the case for `TableControl::GetAccessibleName`, then override `AccessibleGridControlBase::getAccessibleDescription` in `AccessibleGridControlCell`, similar to how it is done for the accessible name in Change-Id I87eabb2ce3c99d4a622d919ab0fb8d7fb3beed6b ("tdf#147742 a11y: AccessibleGridControl...: get accessible name on demand"). Change-Id: I58f3a2b0c83e2cdbae103811505d7d0a4f8bfc52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130934 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 4075b7f7964f..7da777d8dac2 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -253,8 +253,6 @@ protected: ::vcl::table::AccessibleTableControlObjType m_eObjType; private: -/** Localized description text. */ -OUString m_aDescription; ::comphelper::AccessibleEventNotifier::TClientIdm_aClientId; }; diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index c02d921fa1a1..915aeb7e373e 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -54,7 +54,6 @@ AccessibleGridControlBase::AccessibleGridControlBase( m_xParent( rxParent ), m_aTable( rTable), m_eObjType( eObjType ), -m_aDescription( rTable.GetAccessibleObjectDescription( eObjType ) ), m_aClientId(0) { } @@ -134,7 +133,7 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription() SolarMutexGuard g; ensureIsAlive(); -return m_aDescription; +return m_aTable.GetAccessibleObjectDescription(m_eObjType); } OUString SAL_CALL AccessibleGridControlBase::getAccessibleName()
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControlBase.hxx | 14 - accessibility/inc/extended/AccessibleGridControlTableCell.hxx|4 + accessibility/source/extended/AccessibleGridControlBase.cxx |3 - accessibility/source/extended/AccessibleGridControlTableCell.cxx | 28 ++ 4 files changed, 24 insertions(+), 25 deletions(-) New commits: commit 83419f869c33d550a61d260b1b3aef6a00cefc45 Author: Michael Weghorn AuthorDate: Thu Mar 3 14:49:57 2022 +0100 Commit: Michael Weghorn CommitDate: Fri Mar 4 08:05:16 2022 +0100 tdf#147742 a11y: AccessibleGridControl...: get accessible name on demand Base class `AccessibleGridControlBase` was retrieving an accessible name and storing it in class member 'm_aName'. For the classes representing cells, derived from `AccessibleGridControlCell`, the index is needed to get a meaningful name, so the name retrieved in the `AccessibleGridControlBase` ctor with hard-coded row/column indices of 0 was replaced again in the `AccessibleGridControlCell` ctor. Replace that logic to just retrieve the name on demand, and override 'getAccessibleName' in `AccessibleGridControlCell` using the logic used in its ctor previously. (No functional change intended here, but a somewhat similar handling for the accessible description was causing a crash when the Orca screen reader was active. This will be handled in a following commit.) Change-Id: I87eabb2ce3c99d4a622d919ab0fb8d7fb3beed6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130933 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 361c8d4d59f6..4075b7f7964f 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -61,7 +61,7 @@ class AccessibleGridControlBase : public AccessibleGridControlImplHelper { public: -/** Constructor sets specified name and description. +/** Constructor. @param rxParent XAccessible interface of the parent object. @param rTableThe Table control. @param eObjType Type of accessible table control. */ @@ -227,10 +227,6 @@ protected: /** @throws DisposedException If the object is not alive. */ void ensureIsAlive() const; -/** Changes the name of the object (flat assignment, no notify). -@attention This method requires a locked mutex. */ -inline void implSetName( const OUString& rName ); - /** Locks all mutex's and calculates the bounding box relative to the parent window. @return The bounding box (VCL rect.) relative to the parent object. @@ -257,8 +253,6 @@ protected: ::vcl::table::AccessibleTableControlObjType m_eObjType; private: -/** Localized name. */ -OUString m_aName; /** Localized description text. */ OUString m_aDescription; ::comphelper::AccessibleEventNotifier::TClientIdm_aClientId; @@ -315,12 +309,6 @@ inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::ge return m_eObjType; } -inline void AccessibleGridControlBase::implSetName( -const OUString& rName ) -{ -m_aName = rName; -} - } // namespace accessibility diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index 77077183b54b..6e3ee3367ae8 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -40,6 +40,10 @@ namespace accessibility // XAccessibleComponent virtual void SAL_CALL grabFocus() override; +public: +// XAccessibleContext +virtual OUString SAL_CALL getAccessibleName() override; + protected: AccessibleGridControlCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index c118c70f7a32..c02d921fa1a1 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -54,7 +54,6 @@ AccessibleGridControlBase::AccessibleGridControlBase( m_xParent( rxParent ), m_aTable( rTable), m_eObjType( eObjType ), -m_aName( rTable.GetAccessibleObjectName( eObjType, 0, 0 ) ), m_aDescription( rTable.GetAccessibleObjectDescription( eObjType ) ), m_aClientId(0) { @@ -143,7 +142,7 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleName() SolarMutexGuard g; ensureIsAlive(); -return m_aName; +return m_aTable.GetAccessibleObjectName(m_eObjType, 0, 0); } css::uno::Reference< css
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/inc avmedia/source basctl/inc basctl/IwyuFilter_basctl.yaml basctl/source basegfx/source basic/inc basic/IwyuFilter_basic
accessibility/inc/extended/textwindowaccessibility.hxx |1 accessibility/inc/strings.hxx|2 + accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |1 accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |1 accessibility/source/standard/vclxaccessiblelistbox.cxx |1 avmedia/inc/helpids.h|2 + avmedia/source/viewer/mediawindow_impl.cxx |1 basctl/IwyuFilter_basctl.yaml|5 ++ basctl/inc/strings.hxx |2 + basctl/source/basicide/baside2.cxx |2 - basctl/source/basicide/baside3.cxx |2 - basctl/source/basicide/moduldl2.cxx |3 - basctl/source/basicide/moduldlg.hxx |1 basctl/source/inc/dlgeddef.hxx |2 - basctl/source/inc/docsignature.hxx |1 basegfx/source/range/b2drangeclipper.cxx |1 basic/IwyuFilter_basic.yaml |6 +++ basic/inc/basic.hrc |6 +++ basic/inc/sbxfac.hxx |4 -- basic/qa/cppunit/test_global_array.cxx |3 - basic/qa/cppunit/test_global_as_new.cxx |3 - basic/source/classes/sbunoobj.cxx|1 basic/source/comp/buffer.cxx |1 basic/source/comp/codegen.cxx|1 basic/source/inc/buffer.hxx |2 - basic/source/inc/namecont.hxx|1 basic/source/runtime/inputbox.cxx|2 - basic/source/runtime/iosys.cxx |1 basic/source/runtime/methods.cxx |4 -- basic/source/runtime/methods1.cxx|1 basic/source/runtime/props.cxx |1 basic/source/sbx/sbxdbl.cxx |1 basic/source/sbx/sbxint.cxx |1 basic/source/sbx/sbxlng.cxx |1 basic/source/sbx/sbxsng.cxx |1 basic/source/sbx/sbxuint.cxx |1 basic/source/sbx/sbxulng.cxx |1 basic/source/sbx/sbxvar.cxx |1 canvas/IwyuFilter_canvas.yaml|3 + canvas/qa/cppunit/canvastest.cxx |2 - canvas/source/cairo/cairo_canvas.cxx |1 canvas/source/cairo/cairo_textlayout.cxx |1 canvas/source/directx/dx_textlayout_drawhelper.cxx |1 canvas/source/directx/dx_textlayout_drawhelper.hxx |3 + canvas/source/directx/dx_vcltools.hxx|3 + canvas/source/factory/cf_service.cxx |1 canvas/source/vcl/canvas.cxx |1 canvas/source/vcl/outdevholder.hxx |1 canvas/source/vcl/spritehelper.cxx |4 -- canvas/source/vcl/textlayout.cxx |1 chart2/IwyuFilter_chart2.yaml|3 + chart2/inc/chart.hrc |2 + chart2/inc/unonames.hxx |2 + chart2/qa/extras/chart2dump/chart2dump.cxx |1 chart2/qa/extras/chart2export.cxx|7 --- chart2/qa/extras/chart2export2.cxx | 12 -- chart2/qa/extras/chart2geometry.cxx |5 -- chart2/qa/extras/chart2import.cxx|3 - chart2/qa/extras/chart2import2.cxx | 19 -- chart2/source/controller/chartapiwrapper/TitleWrapper.cxx|1 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |1 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx|1 chart2/source/controller/dialogs/res_Trendline.cxx |1 chart2/source/controller/dia
[Libreoffice-commits] core.git: accessibility/inc accessibility/source canvas/inc canvas/source comphelper/source include/comphelper svx/source
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx|2 +- accessibility/source/extended/accessibleeditbrowseboxcell.cxx |2 +- canvas/inc/parametricpolypolygon.hxx |2 +- canvas/source/tools/parametricpolypolygon.cxx |2 +- comphelper/source/misc/compbase.cxx |6 -- include/comphelper/compbase.hxx |7 +-- svx/source/accessibility/ChildrenManagerImpl.cxx |2 +- svx/source/accessibility/ChildrenManagerImpl.hxx |2 +- svx/source/table/tabledesign.cxx |2 +- svx/source/xml/xmlgrhlp.cxx |4 ++-- 10 files changed, 18 insertions(+), 13 deletions(-) New commits: commit c68c744b68fd50adb6ce725bf9de377a5f915dab Author: Noel Grandin AuthorDate: Fri Dec 24 15:58:17 2021 +0200 Commit: Noel Grandin CommitDate: Sat Dec 25 13:56:27 2021 +0100 pass unique_lock as param in WeakComponentImplHelperBase::disposing so that subclasses can drop the lock while calling listeners Change-Id: I6105438110af08f10b0ed50057b28172c3442b95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127434 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index ab45db70af77..ea42155fd0eb 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -120,7 +120,7 @@ namespace accessibility virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XComponent/WeakComponentImplHelper -virtual void disposing() override; +virtual void disposing(std::unique_lock&) override; EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete; EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete; diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index f9985e48a268..a582defcadd6 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -212,7 +212,7 @@ namespace accessibility return xMyContext; } -void EditBrowseBoxTableCellAccess::disposing() +void EditBrowseBoxTableCellAccess::disposing(std::unique_lock&) { // dispose our context, if it still alive css::uno::Reference< XComponent > xMyContext( m_aContext.get(), UNO_QUERY ); diff --git a/canvas/inc/parametricpolypolygon.hxx b/canvas/inc/parametricpolypolygon.hxx index 0d39700ff488..303dc5af05fa 100644 --- a/canvas/inc/parametricpolypolygon.hxx +++ b/canvas/inc/parametricpolypolygon.hxx @@ -90,7 +90,7 @@ namespace canvas const css::uno::Sequence< css::uno::Any >& rArgs ); /// Dispose all internal references -virtual void disposing() override; +virtual void disposing(std::unique_lock&) override; // XParametricPolyPolygon2D virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) override; diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 870f25f2ddbf..96d8fc7f07da 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -147,7 +147,7 @@ namespace canvas colors, stops, fAspectRatio ); } -void ParametricPolyPolygon::disposing() +void ParametricPolyPolygon::disposing(std::unique_lock&) { mxDevice.clear(); } diff --git a/comphelper/source/misc/compbase.cxx b/comphelper/source/misc/compbase.cxx index ecae7108ff90..b8a207ceedb1 100644 --- a/comphelper/source/misc/compbase.cxx +++ b/comphelper/source/misc/compbase.cxx @@ -25,12 +25,14 @@ void SAL_CALL WeakComponentImplHelperBase::dispose() if (m_bDisposed) return; m_bDisposed = true; -disposing(); +disposing(aGuard); +if (!aGuard.owns_lock()) +aGuard.lock(); css::lang::EventObject aEvt(static_cast(this)); maEventListeners.disposeAndClear(aGuard, aEvt); } -void WeakComponentImplHelperBase::disposing() {} +void WeakComponentImplHelperBase::disposing(std::unique_lock&) {} void SAL_CALL WeakComponentImplHelperBase::addEventListener( css::uno::Reference const& rxListener) diff --git a/include/comphelper/compbase.hxx b/include/comphelper/compbase.hxx index 9a8ea3bb6a24..ce3e44b3732e 100644 --- a/include/comphelper/compbase.hxx +++ b/include/comphelper/compbase.hxx @@ -41,8 +41,11 @@ public: virtual void SAL_CALL removeEventListener(css::uno::Reference const& rxListene
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx|9 - accessibility/source/extended/accessibleeditbrowseboxcell.cxx |5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) New commits: commit c5a0bcf94403a29490d707ae1878fba3e0423d13 Author: Noel Grandin AuthorDate: Fri Dec 24 09:44:18 2021 +0200 Commit: Noel Grandin CommitDate: Fri Dec 24 14:44:52 2021 +0100 use comphelper::WeakComponentImplHelper in EditBrowseBoxTableCellAccess Change-Id: I36a1dd4fa488517a1e69d3a1c4b03c850d1a933e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127404 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index 6d827ac13a05..ab45db70af77 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace accessibility @@ -89,8 +89,7 @@ namespace accessibility // XAccessible providing an EditBrowseBoxTableCell class EditBrowseBoxTableCellAccess final : -public cppu::BaseMutex, -public cppu::WeakComponentImplHelper +public comphelper::WeakComponentImplHelper { css::uno::WeakReference< css::accessibility::XAccessibleContext > m_aContext; @@ -120,8 +119,8 @@ namespace accessibility // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; -// XComponent/OComponentHelper -virtual void SAL_CALL disposing() override; +// XComponent/WeakComponentImplHelper +virtual void disposing() override; EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete; EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete; diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 06165071b621..f9985e48a268 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -183,8 +183,7 @@ namespace accessibility const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible, const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow, ::vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) -:WeakComponentImplHelper( m_aMutex ) -,m_xParent( _rxParent ) +:m_xParent( _rxParent ) ,m_xControlAccessible( _rxControlAccessible ) ,m_xFocusWindow( _rxFocusWindow ) ,m_pBrowseBox( &_rBrowseBox ) @@ -213,7 +212,7 @@ namespace accessibility return xMyContext; } -void SAL_CALL EditBrowseBoxTableCellAccess::disposing() +void EditBrowseBoxTableCellAccess::disposing() { // dispose our context, if it still alive css::uno::Reference< XComponent > xMyContext( m_aContext.get(), UNO_QUERY );
[Libreoffice-commits] core.git: accessibility/inc framework/inc include/vcl sc/source sd/source sfx2/inc sfx2/source sw/source toolkit/source vcl/inc vcl/source
accessibility/inc/pch/precompiled_acc.hxx |3 +- framework/inc/pch/precompiled_fwk.hxx |6 - include/vcl/dialoghelper.hxx |6 - include/vcl/menu.hxx |1 sc/source/ui/view/gridwin.cxx |4 +-- sd/source/ui/view/drviews4.cxx|4 +-- sfx2/inc/pch/precompiled_sfx.hxx | 31 +++--- sfx2/source/dialog/StyleList.cxx |1 sfx2/source/dialog/splitwin.cxx |4 +-- sw/source/uibase/docvw/edtwin.cxx |3 +- toolkit/source/awt/vclxmenu.cxx |3 +- vcl/inc/pch/precompiled_vcl.hxx |7 +- vcl/source/window/menu.cxx| 10 ++--- 13 files changed, 51 insertions(+), 32 deletions(-) New commits: commit 3e8bfde1e1dd859d4c09337605f92db24a142e44 Author: Caolán McNamara AuthorDate: Mon Nov 29 09:40:25 2021 + Commit: Caolán McNamara CommitDate: Mon Nov 29 17:24:40 2021 +0100 move PopupMenu::IsInExecute out of vcl/include/menu.hxx Change-Id: I01af38dd57a645ea0afeaff033ce6d07dfe09535 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126026 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 661e6e4149ef..80dd38d70c30 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-09-12 11:50:46 using: + Generated on 2021-11-29 09:45:37 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -300,6 +300,7 @@ #include #include #include +#include #include #include #include diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 4b14a600b18a..0011dcb8add1 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.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 2021-09-28 05:36:23 using: + Generated on 2021-11-29 09:45:56 using: ./bin/update_pch framework fwk --cutoff=7 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -190,6 +191,7 @@ #include #include #include +#include #include #include #include @@ -226,6 +228,7 @@ #include #include #include +#include #include #include #include @@ -247,6 +250,7 @@ #include #include #include +#include #include #include #include diff --git a/include/vcl/dialoghelper.hxx b/include/vcl/dialoghelper.hxx index 549188e00214..eedc6d37a5cf 100644 --- a/include/vcl/dialoghelper.hxx +++ b/include/vcl/dialoghelper.hxx @@ -18,9 +18,13 @@ class Window; extensions/source/activex/SOActiveX.cxx see extensions/source/activex/README.txt possibly dubious if this actually works as expected */ - VCL_DLLPUBLIC void EndAllDialogs(vcl::Window const* pParent); +/* returns true if a vcl PopupMenu is executing. Uses of this outside of vcl/toolkit + are possibly dubious. +*/ +VCL_DLLPUBLIC bool IsInPopupMenuExecute(); + /* for LibreOffice kit */ VCL_DLLPUBLIC void EnableDialogInput(vcl::Window* pDialog); VCL_DLLPUBLIC void CloseTopLevel(vcl::Window* pDialog); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index b0d7245cf72c..7fd2e34492bd 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -526,7 +526,6 @@ public: css::uno::Reference CreateMenuInterface(); -static bool IsInExecute(); static PopupMenu* GetActivePopupMenu(); PopupMenu& operator=( const PopupMenu& rMenu ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 337e269e6d13..81be2264 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -40,8 +40,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -1617,7 +1617,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta SfxInPlaceClient* pClient = pViewSh->GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() && - PopupMenu::IsInExecute() ) + vcl::IsInPopupMenuExecute() ) return; aCurMousePos = rMEvt.GetPosPixel(); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index f4114361ccb0..71915d6a1914 100644 --- a/sd/source/ui/view/
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/strings.hxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 10d172747ba44b405e4bf4cfe7142a23a51bb94e Author: Noel Grandin AuthorDate: Fri Nov 19 08:37:07 2021 +0200 Commit: Noel Grandin CommitDate: Fri Nov 19 10:05:10 2021 +0100 loplugin:stringliteraldefine in accessibility Change-Id: Ie27c32ea51ebcc9ad0d0d5a1d160d55c23727cd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125274 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/strings.hxx b/accessibility/inc/strings.hxx index a563cf9b5bf6..baa6f9ec0d1c 100644 --- a/accessibility/inc/strings.hxx +++ b/accessibility/inc/strings.hxx @@ -9,13 +9,13 @@ #pragma once -#define RID_STR_ACC_ACTION_CLICK"press" -#define RID_STR_ACC_ACTION_TOGGLEPOPUP "togglePopup" -#define RID_STR_ACC_ACTION_SELECT "select" -#define RID_STR_ACC_ACTION_INCLINE "incrementLine" -#define RID_STR_ACC_ACTION_DECLINE "decrementLine" -#define RID_STR_ACC_ACTION_INCBLOCK "incrementBlock" -#define RID_STR_ACC_ACTION_DECBLOCK "decrementBlock" +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_CLICK = u"press"; +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_TOGGLEPOPUP = u"togglePopup"; +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_SELECT = u"select"; +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_INCLINE = u"incrementLine"; +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_DECLINE = u"decrementLine"; +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_INCBLOCK = u"incrementBlock"; +inline constexpr OUStringLiteral RID_STR_ACC_ACTION_DECBLOCK = u"decrementBlock"; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc basic/source canvas/source chart2/inc cppcanvas/source cui/inc cui/source dbaccess/inc dbaccess/source desktop/source drawinglaye
accessibility/inc/pch/precompiled_acc.hxx | 10 + basctl/inc/pch/precompiled_basctl.hxx | 12 + basic/inc/pch/precompiled_sb.hxx | 10 + basic/source/runtime/inputbox.cxx |2 canvas/source/cairo/cairo_canvashelper_text.cxx| 12 - canvas/source/cairo/cairo_textlayout.cxx | 10 - canvas/source/vcl/canvashelper.cxx | 12 - canvas/source/vcl/canvashelper_texturefill.cxx |8 - canvas/source/vcl/spritecanvashelper.cxx |2 canvas/source/vcl/spritehelper.cxx |2 canvas/source/vcl/textlayout.cxx | 10 - chart2/inc/pch/precompiled_chartcontroller.hxx | 21 ++- chart2/inc/pch/precompiled_chartcore.hxx |9 - cppcanvas/source/inc/implrenderer.hxx |2 cppcanvas/source/inc/outdevstate.hxx |7 - cppcanvas/source/mtfrenderer/implrenderer.cxx | 54 cui/inc/pch/precompiled_cui.hxx| 33 - cui/source/dialogs/hangulhanjadlg.cxx |2 cui/source/tabpages/grfpage.cxx|2 cui/source/tabpages/numfmt.cxx |2 dbaccess/inc/pch/precompiled_dbu.hxx | 11 - dbaccess/source/ui/browser/dataview.cxx|2 dbaccess/source/ui/tabledesign/TEditControl.cxx|2 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|2 drawinglayer/inc/wmfemfhelper.hxx | 16 +- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |8 - drawinglayer/source/processor2d/vclpixelprocessor2d.cxx|6 drawinglayer/source/processor2d/vclprocessor2d.cxx | 12 - drawinglayer/source/tools/wmfemfhelper.cxx | 48 +++ editeng/source/editeng/impedit.cxx |4 editeng/source/editeng/impedit2.cxx|2 editeng/source/editeng/impedit3.cxx| 20 +-- editeng/source/outliner/outliner.cxx |6 emfio/inc/mtftools.hxx | 10 - emfio/source/reader/emfreader.cxx |4 emfio/source/reader/mtftools.cxx | 12 - emfio/source/reader/wmfreader.cxx |4 filter/source/svg/svgwriter.cxx| 22 +-- filter/source/svg/svgwriter.hxx| 10 - forms/source/richtext/richtextimplcontrol.cxx |4 framework/inc/pch/precompiled_fwk.hxx | 14 +- include/sfx2/LokControlHandler.hxx |2 include/vcl/metaact.hxx| 20 +-- include/vcl/outdev.hxx | 12 - include/vcl/pdfwriter.hxx |2 include/vcl/rendercontext/State.hxx| 83 - oox/inc/pch/precompiled_oox.hxx| 19 ++ reportdesign/inc/pch/precompiled_rpt.hxx | 25 +++ reportdesign/inc/pch/precompiled_rptui.hxx | 22 ++- reportdesign/source/ui/inc/ColorChanger.hxx|2 reportdesign/source/ui/report/StartMarker.cxx |4 sc/source/ui/cctrl/dpcontrol.cxx |2 sc/source/ui/dbgui/csvcontrol.cxx |2 sc/source/ui/docshell/docsh4.cxx |4 sc/source/ui/miscdlgs/autofmt.cxx |4 sc/source/ui/view/tabsplit.cxx |2 sd/inc/pch/precompiled_sdui.hxx| 22 ++- sd/source/ui/animations/CustomAnimationList.cxx|2 sd/source/ui/dlg/animobjs.cxx |2 sd/source/ui/view/drviewsh.cxx |2 sfx2/source/appl/newhelp.cxx |2 sfx2/source/control/recentdocsview.cxx |2 sfx2/source/control/thumbnailview.cxx |2 sfx2/source/dialog/StyleList.cxx |4 sfx2/source/dialog/titledockwin.cxx|2 sfx2/source/view/lokcharthelper.cxx|4 slideshow/inc/pch/precompiled_slideshow.hxx| 26 ++-- solenv/clang-format/excludelist|1 starmath/inc/pch/precompiled_sm.hxx| 24 ++- starmath/source/ElementsDockingWindow.cxx |6 starmath/source/dialog.cxx |2 starmath/source/document.cxx | 12 - starmath/source/n
[Libreoffice-commits] core.git: accessibility/inc include/formula include/oox package/inc sfx2/source starmath/inc svl/source svtools/inc sw/source vcl/inc
accessibility/inc/standard/svtaccessiblenumericfield.hxx |3 +- include/formula/token.hxx|2 - include/oox/shape/ShapeContextHandler.hxx|4 +-- package/inc/ZipPackageFolder.hxx |2 - sfx2/source/inc/StyleList.hxx|2 - starmath/inc/document.hxx|2 - starmath/inc/smediteng.hxx |2 - starmath/inc/view.hxx|8 +- svl/source/inc/fsfactory.hxx |2 - svtools/inc/mousefunction.hxx|6 ++--- sw/source/core/inc/UndoOverwrite.hxx |4 +-- vcl/inc/pdf/pdfwriter_impl.hxx |5 +--- vcl/inc/unx/saldisp.hxx | 18 +++ 13 files changed, 28 insertions(+), 32 deletions(-) New commits: commit afea504ad44f017f7020ed6dcc0191f7756acc93 Author: Noel Grandin AuthorDate: Wed Sep 15 14:28:08 2021 +0200 Commit: Noel Grandin CommitDate: Wed Sep 15 18:58:17 2021 +0200 loplugin:finalclasses Change-Id: I88831f290e1923db6fb5a733746bfa3bc7fbc7e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122148 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx b/accessibility/inc/standard/svtaccessiblenumericfield.hxx index 30688979c8a9..fb3b30e594fb 100644 --- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx +++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx @@ -26,7 +26,8 @@ typedef ::cppu::ImplHelper1 SVTXAccessibleNumericField_BASE; -class SVTXAccessibleNumericField : public VCLXAccessibleEdit, public SVTXAccessibleNumericField_BASE +class SVTXAccessibleNumericField final : public VCLXAccessibleEdit, + public SVTXAccessibleNumericField_BASE { public: SVTXAccessibleNumericField(VCLXWindow* pVCLXindow); diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 77bf3eeb90ea..ebb08e6d7c17 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -226,7 +226,7 @@ inline void intrusive_ptr_release(const FormulaToken* p) p->DecRef(); } -class FORMULA_DLLPUBLIC FormulaSpaceToken : public FormulaToken +class FORMULA_DLLPUBLIC FormulaSpaceToken final : public FormulaToken { private: sal_uInt8 nByte; diff --git a/include/oox/shape/ShapeContextHandler.hxx b/include/oox/shape/ShapeContextHandler.hxx index 3b5e50955ceb..dadaf7f64cb3 100644 --- a/include/oox/shape/ShapeContextHandler.hxx +++ b/include/oox/shape/ShapeContextHandler.hxx @@ -34,7 +34,7 @@ namespace oox::shape { class ShapeFilterBase; -class ShapeFragmentHandler : public core::FragmentHandler2 +class ShapeFragmentHandler final : public core::FragmentHandler2 { public: typedef rtl::Reference Pointer_t; @@ -46,7 +46,7 @@ public: } }; -class OOX_DLLPUBLIC ShapeContextHandler: +class OOX_DLLPUBLIC ShapeContextHandler final : public ::cppu::WeakImplHelper< css::xml::sax::XFastContextHandler > { public: diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 75889a6b14f4..21ff8343c252 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -58,7 +58,7 @@ struct ZipContentInfo typedef std::unordered_map < OUString, ZipContentInfo > ContentHash; -class ZipPackageFolder : public cppu::ImplInheritanceHelper +class ZipPackageFolder final : public cppu::ImplInheritanceHelper < ZipPackageEntry, css::container::XNameContainer, diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx index 238655da889a..3b46371c6813 100644 --- a/sfx2/source/inc/StyleList.hxx +++ b/sfx2/source/inc/StyleList.hxx @@ -45,7 +45,7 @@ class TreeViewDropTarget; constexpr int MAX_FAMILIES = 6; constexpr int COUNT_BOUND_FUNC = 14; -class StyleList : public SfxListener +class StyleList final : public SfxListener { friend class TreeViewDropTarget; friend class SfxTemplateControllerItem; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 77d13aa77d08..772b66748fb4 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -73,7 +73,7 @@ public: }; -class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener +class SM_DLLPUBLIC SmDocShell final : public SfxObjectShell, public SfxListener { friend class SmPrinterAccess; friend class SmCursor; diff --git a/starmath/inc/smediteng.hxx b/starmath/inc/smediteng.hxx index 29902361b585..4e0b3162a811 100644 --- a/starmath/inc/smediteng.hxx +++ b/starmath/inc/smediteng.hxx @@ -11,7 +11,7 @@ #include #include -class SmEditEngine : public EditEngine +class SmEditEngine final : public EditEngine { public: SmEditEngine(SfxItemPool*
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/accessiblelistbox.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ddc3e75845613a84b236229222e3a9b092a78861 Author: Noel Grandin AuthorDate: Sun Aug 1 11:08:41 2021 +0200 Commit: Noel Grandin CommitDate: Sun Aug 1 20:07:18 2021 +0200 unordered_map is better for pointer keys Change-Id: I0cb9e65efdeedafe87b4e32d01738943cc14d265 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119818 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index e2fc0c3022b4..4f4104701709 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -24,7 +24,7 @@ #include #include -#include +#include // class AccessibleListBox --- @@ -108,7 +108,7 @@ namespace accessibility private: -typedef std::map> MAP_ENTRY; +typedef std::unordered_map> MAP_ENTRY; MAP_ENTRY m_mapEntry; css::uno::Reference< css::accessibility::XAccessible > m_xFocusedChild;
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 202bdf0673964bb405a9677ea6c0b4cfec9479cd Author: Stephan Bergmann AuthorDate: Thu Jul 29 10:05:07 2021 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 29 11:05:20 2021 +0200 Adapt again to C++20 char8_t ...after 53840ffd9755bbf2965676136c9772089891bfe8 "Pass context and resource string down to boost::locale separately" Change-Id: I3c010a00d66b9831e3f29581c56390b312dbe04c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119651 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/strings.hrc b/accessibility/inc/strings.hrc index 7e51ade2d46d..c9949dd4357d 100644 --- a/accessibility/inc/strings.hrc +++ b/accessibility/inc/strings.hrc @@ -19,7 +19,7 @@ #pragma once -#define NC_(Context, String) TranslateId(Context, u8##String) +#define NC_(Context, String) TranslateId(Context, reinterpret_cast(u8##String)) #define RID_STR_ACC_NAME_BROWSEBUTTON NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse") #define STR_SVT_ACC_ACTION_EXPAND NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc accessibility/source include/unotools unotools/source
accessibility/inc/helper/accresmgr.hxx|4 +-- accessibility/inc/strings.hrc |2 - accessibility/source/helper/accresmgr.cxx |3 -- include/unotools/resmgr.hxx | 16 +++ unotools/source/i18n/resmgr.cxx | 31 ++ 5 files changed, 51 insertions(+), 5 deletions(-) New commits: commit 53840ffd9755bbf2965676136c9772089891bfe8 Author: Noel Grandin AuthorDate: Wed Jul 28 15:21:26 2021 +0200 Commit: Noel Grandin CommitDate: Thu Jul 29 09:22:30 2021 +0200 Pass context and resource string down to boost::locale separately because this is often on a hot path, and we can avoid the splitting and joining of strings like this. Create a new small index type TranslateId for some type-safety. This change only updates accessibility to use the new API, other modules will follow in stages. Change-Id: I289245ad34fda775812302ca7ac1588710167b34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119632 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx index c0926f190ac1..75ccc2df63fb 100644 --- a/accessibility/inc/helper/accresmgr.hxx +++ b/accessibility/inc/helper/accresmgr.hxx @@ -20,8 +20,8 @@ #pragma once #include -#include +#include -OUString AccResId(std::string_view aId); +OUString AccResId(TranslateId aId); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/strings.hrc b/accessibility/inc/strings.hrc index 4a79f3306033..7e51ade2d46d 100644 --- a/accessibility/inc/strings.hrc +++ b/accessibility/inc/strings.hrc @@ -19,7 +19,7 @@ #pragma once -#define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) +#define NC_(Context, String) TranslateId(Context, u8##String) #define RID_STR_ACC_NAME_BROWSEBUTTON NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse") #define STR_SVT_ACC_ACTION_EXPAND NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" ) diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index b335f8ac185b..f120dcb2600d 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -18,8 +18,7 @@ */ #include -#include -OUString AccResId(std::string_view aId) { return Translate::get(aId, Translate::Create("acc")); } +OUString AccResId(TranslateId aId) { return Translate::get(aId, Translate::Create("acc")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/resmgr.hxx b/include/unotools/resmgr.hxx index 4fce82b82294..244963f598b1 100644 --- a/include/unotools/resmgr.hxx +++ b/include/unotools/resmgr.hxx @@ -28,11 +28,27 @@ class LanguageTag; typedef OUString (*ResHookProc)(const OUString& rStr); +struct UNOTOOLS_DLLPUBLIC TranslateId +{ +const char* mpContext; +const char* mpId; + +TranslateId() {} +TranslateId(const char* pContext, const char* pId) +: mpContext(pContext), mpId(pId) {} + +operator bool() const { return mpId != nullptr; } + +bool operator==(const TranslateId& other) const; +bool operator!=(const TranslateId& other) const { return !operator==(other); } +}; + namespace Translate { UNOTOOLS_DLLPUBLIC std::locale Create(std::string_view aPrefixName, const LanguageTag& rLocale = SvtSysLocale().GetUILanguageTag()); UNOTOOLS_DLLPUBLIC OUString get(std::string_view aId, const std::locale &loc); UNOTOOLS_DLLPUBLIC OUString nget(std::string_view aId, int n, const std::locale &loc); +UNOTOOLS_DLLPUBLIC OUString get(TranslateId sContextAndId, const std::locale &loc); UNOTOOLS_DLLPUBLIC void SetReadStringHook( ResHookProc pProc ); UNOTOOLS_DLLPUBLIC ResHookProc GetReadStringHook(); UNOTOOLS_DLLPUBLIC OUString ExpandVariables(const OUString& rString); diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index d35282025c4e..9d3aec3a607c 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -255,6 +255,31 @@ namespace Translate return result; } +OUString get(TranslateId sContextAndId, const std::locale &loc) +{ +assert(!strchr(sContextAndId.mpId, '\004') && "should be using nget, not get"); + +//if it's a key id locale, generate it here +if (std::use_facet(loc).language() == "qtz") +{ +OString sKeyId(genKeyId(OString::Concat(sContextAndId.mpContext) + "|" + std::string_view(sContextAndId.mpId))); +return OUString::fromUtf8(sKeyId) + u"\u2016" + createFromUtf8(sContextAndId.mpId, strlen(sContextAndId.mpId)); +} + +//otherwise translate it +const std::string ret = boost::locale::pgettext(sContextAndId.mpContext, sContextAndId.mpId, loc); +OUString result(ExpandVariables(createFromUtf8(ret.data(), ret.size()))
[Libreoffice-commits] core.git: accessibility/inc accessibility/source offapi/com sc/source svx/source sw/source
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx|1 accessibility/inc/extended/accessiblelistboxentry.hxx |3 + accessibility/inc/standard/svtaccessiblenumericfield.hxx |1 accessibility/inc/standard/vclxaccessiblebox.hxx |2 + accessibility/inc/standard/vclxaccessiblebutton.hxx |1 accessibility/inc/standard/vclxaccessiblecheckbox.hxx |1 accessibility/inc/standard/vclxaccessiblemenuitem.hxx |1 accessibility/inc/standard/vclxaccessibleradiobutton.hxx |1 accessibility/inc/standard/vclxaccessiblescrollbar.hxx|1 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |1 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |8 accessibility/source/extended/accessiblelistboxentry.cxx | 17 ++ accessibility/source/standard/svtaccessiblenumericfield.cxx | 12 +++ accessibility/source/standard/vclxaccessiblebox.cxx |5 ++ accessibility/source/standard/vclxaccessiblebutton.cxx| 10 + accessibility/source/standard/vclxaccessiblecheckbox.cxx | 10 + accessibility/source/standard/vclxaccessiblemenuitem.cxx |8 accessibility/source/standard/vclxaccessibleradiobutton.cxx | 10 + accessibility/source/standard/vclxaccessiblescrollbar.cxx |7 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |5 ++ offapi/com/sun/star/accessibility/XAccessibleValue.idl| 14 sc/source/ui/Accessibility/AccessibleCellBase.cxx |6 +++ sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx|6 +++ sc/source/ui/inc/AccessibleCellBase.hxx |3 + sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx |1 svx/source/accessibility/svxrectctaccessiblecontext.cxx |7 svx/source/inc/svxrectctaccessiblecontext.hxx |3 + sw/source/core/access/acccell.cxx |5 ++ sw/source/core/access/acccell.hxx |8 +--- 29 files changed, 153 insertions(+), 5 deletions(-) New commits: commit b5ada12ffd0b6b8677430fce117c4c1e38cc9159 Author: Michael Weghorn AuthorDate: Wed Jul 28 11:26:16 2021 +0200 Commit: Michael Weghorn CommitDate: Wed Jul 28 15:45:28 2021 +0200 a11y: Add XAccessibleValue::getMinimumIncrement method Add a method 'getMinimumIncrement' to the XAccessibleValue interface. The method returns the minimal increment by which the value represented by the object can be adjusted. The main motivation is to expose this to AT-SPI, so it can be retrieved e.g. by libatspi's 'atspi_value_get_minimum_increment' function [1], s. the note in Change-Id: I8af326c2d24c1801147a56ea2e2a886ab42ac634 "a11y: Expose FormattedField as spinbox" for more details. The implementation relevant for the 'FormattedField' class is in 'SVTXAccessibleNumericField::getMinimumIncrement', which returns the spin size. While at it, also move the comment in sw/source/core/access/acccell.hxx mentioning what methods are overriden for the 'XAccessibleValue' interface to the right place. [1] https://developer.gnome.org/libatspi/stable/libatspi-atspi-value.html#atspi-value-get-minimum-increment Change-Id: Ie148a4e1cedbdbb5964f8565c81611d3480465cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119596 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index a550eed5e220..76c70344096c 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -70,6 +70,7 @@ namespace accessibility virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; virtual css::uno::Any SAL_CALL getMaximumValue( ) override; virtual css::uno::Any SAL_CALL getMinimumValue( ) override; +virtual css::uno::Any SAL_CALL getMinimumIncrement( ) override; // internal voidSetChecked( bool _bChecked ); diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 279978a34ccf..449803bc35b5 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -202,10 +202,13 @@ namespace accessibility sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
[Libreoffice-commits] core.git: accessibility/inc accessibility/Library_acc.mk accessibility/source include/toolkit toolkit/source
accessibility/Library_acc.mk|1 accessibility/inc/standard/svtaccessiblenumericfield.hxx| 50 ++ accessibility/inc/standard/vclxaccessibleedit.hxx |5 accessibility/source/helper/acc_factory.cxx |8 + accessibility/source/standard/svtaccessiblenumericfield.cxx | 93 include/toolkit/awt/vclxwindows.hxx |4 include/toolkit/helper/accessiblefactory.hxx|6 toolkit/source/awt/vclxwindows.cxx |7 toolkit/source/helper/accessibilityclient.cxx |5 toolkit/source/helper/unowrapper.cxx|2 10 files changed, 177 insertions(+), 4 deletions(-) New commits: commit 349a8801b9ee98f4f9ee1d35f7d28e17baedf7cc Author: Michael Weghorn AuthorDate: Wed Jul 28 09:39:07 2021 +0200 Commit: Michael Weghorn CommitDate: Wed Jul 28 15:44:58 2021 +0200 a11y: Expose FormattedField as spinbox This adds a new accessibility class 'SVTXAccessibleNumericField' that implements 'XAccessibleValue' and reports having an a11y role of 'AccessibleRole::SPIN_BOX'. An object of that class is returned by 'SVTXNumericField::CreateAccessibleContext'. Create an 'SVTXNumericField' XWindow peer for windows of type 'WindowType::FORMATTEDFIELD' (instead of a 'VCLXNumericField' one), so the newly introduced accessibility class gets used for 'FormattedField'. This way, FormattedFields are now exposed to a11y tools as spinboxes. Previously, since no specific accessibility class had been implemented for VCLXNumericField (then used as XWindow peer class for FormattedField), the one for VCLXEdit, i.e. VCLXAccessibleEdit, was used. While VCLXNumericField implements XNumericField and thus in general offers the relevant methods to implement an accessible class that implements XAccessibleValue as well, it uses the Formatter from the VCLXFormattedSpinField base class to get/set values. However, that doesn't work for the FormattedField case, since FormattedField has its own formatter of a different type and the 'mpFormatter' member in the VCLXFormattedSpinField base class is a nullptr, resulting in the corresponding getter methods always returning 0 and the setters doing nothing. With this commit in place, Accerciser now reports role "spin box" instead of just "text" for FormattedFields and displays the current value as well as allows to change it via the "Value" interface when using the qt5/kf5 VCL plugin. Note: For non-integer values, Accerciser doesn't show the actual decimal value, but an integer, e.g. when the value for "Height" spinbox in Writer's "Page Style" -> "Page" dialog (section "Paper format") is set to "29.70cm", Accerciser shows "30" instead of "29.70", despite 'Qt5AccessibleWidget::currentValue' returning the exact value. This is because Accerciser appears to rely on the value for the minimum increment being reported (as a corresponding decimal value) by a call to 'atspi_value_get_minimum_increment', s.[1]. However, there is currently no corresponding method in the 'XAccesibleValue' interface for that at-spi method which 'Qt5AccessibleWidget::currentValue' could call to retrieve the value. The NVDA screen reader on Windows now also says e.g. "Width: (Type = 344) spin button editable Alt+W selected 8.50″" instead of "Width: (Type = 344) edit Alt+W selected 8.50″". [1] https://developer.gnome.org/libatspi/stable/libatspi-atspi-value.html#atspi-value-get-minimum-increment Change-Id: I8af326c2d24c1801147a56ea2e2a886ab42ac634 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119590 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index caf3d612330b..fe88dafe10da 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/standard/accessiblemenucomponent \ accessibility/source/standard/accessiblemenuitemcomponent \ accessibility/source/standard/floatingwindowaccessible \ +accessibility/source/standard/svtaccessiblenumericfield \ accessibility/source/standard/vclxaccessiblebox \ accessibility/source/standard/vclxaccessiblebutton \ accessibility/source/standard/vclxaccessiblecheckbox \ diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx b/accessibility/inc/standard/svtaccessiblenumericfield.hxx new file mode 100644 index ..940f72fa03f2 --- /dev/null +++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is pa
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source basic/source chart2/source cui/source desktop/inc editeng/source extensions/source filter/source for
accessibility/inc/helper/accresmgr.hxx |3 + accessibility/source/helper/accresmgr.cxx|2 - avmedia/source/inc/mediamisc.hxx |4 +- basctl/source/basicide/iderdll.cxx |4 +- basctl/source/inc/iderid.hxx |3 + basic/source/sbx/sbxscan.cxx |4 +- chart2/source/inc/ResId.hxx |3 + chart2/source/tools/ResId.cxx|4 +- cui/source/factory/cuiresmgr.cxx |2 - cui/source/inc/dialmgr.hxx |2 - desktop/inc/dp_shared.hxx|4 +- editeng/source/editeng/eerdll.cxx|4 +- extensions/source/bibliography/bibmod.cxx|4 +- extensions/source/bibliography/bibresid.hxx |3 + extensions/source/propctrlr/modulepcr.cxx|2 - extensions/source/propctrlr/modulepcr.hxx|3 + extensions/source/scanner/sanedlg.cxx|4 +- filter/source/pdf/impdialog.cxx |4 +- filter/source/xsltdialog/xmlfiltercommon.hxx |2 - filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |4 +- forms/source/inc/frm_resource.hxx|3 + forms/source/resource/frm_resource.cxx |4 +- formula/inc/core_resource.hxx|3 + formula/source/core/resource/core_resource.cxx |2 - fpicker/inc/fpsofficeResMgr.hxx |5 ++ framework/inc/classes/fwkresid.hxx |3 + framework/source/fwe/classes/fwkresid.cxx|2 - include/basic/sbdef.hxx |2 - include/editeng/eerdll.hxx |2 - include/sfx2/sfxresid.hxx|3 + include/svl/svlresid.hxx |3 + include/svtools/svtresid.hxx |2 - include/svx/dialmgr.hxx |2 - include/unotools/resmgr.hxx |7 ++- oox/inc/ooxresid.hxx |3 + oox/source/helper/ooxresid.cxx |2 - reportdesign/inc/core_resource.hxx |3 + reportdesign/source/core/resource/core_resource.cxx |2 - sc/inc/scresid.hxx |4 +- sc/source/ui/app/scdll.cxx |8 ++-- scaddins/source/analysis/analysis.cxx|4 +- scaddins/source/analysis/analysis.hxx|2 - scaddins/source/datefunc/datefunc.cxx|4 +- scaddins/source/datefunc/datefunc.hxx|2 - scaddins/source/pricing/pricing.cxx |4 +- scaddins/source/pricing/pricing.hxx |2 - sccomp/source/solver/SolverComponent.cxx |4 +- sccomp/source/solver/SolverComponent.hxx |2 - sccomp/source/solver/SwarmSolver.cxx |8 ++-- sd/inc/sdresid.hxx |4 +- sd/source/ui/app/sdmod.cxx |8 ++-- sfx2/source/appl/module.cxx |2 - sfx2/source/bastyp/sfxresid.cxx |2 - starmath/inc/smmod.hxx |2 - starmath/source/smmod.cxx|4 +- svl/source/misc/getstringresource.cxx|2 - svtools/source/misc/svtresid.cxx |2 - svx/source/dialog/dialmgr.cxx|2 - sw/inc/swtypes.hxx |4 +- sw/source/uibase/app/swmodule.cxx|8 ++-- unotools/source/i18n/resmgr.cxx | 37 +-- vcl/inc/svdata.hxx |2 - vcl/source/app/svapp.cxx |6 +-- vcl/source/app/svdata.cxx|4 +- vcl/source/window/builder.cxx|2 - writerperfect/inc/WPFTResMgr.hxx |5 ++ xmlsecurity/inc/resourcemanager.hxx |5 ++ 67 files changed, 143 insertions(+), 120 deletions(-) New commits: commit 0771ac00acc8730f77db76b901724f1513a32723 Author: Noel Grandin AuthorDate: Tue Jun 15 21:12:25 2021 +0200 Commit: Noel Grandin CommitDate: Thu Jun 17 14:32:11 2021 +0200 use string_view in the Translate API Change-Id: I0bb0ea9d39ed623928060ffd3f2e2bc36ba33209 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117272 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx index 5b16c47e8166..c0926f190ac1 100644 --- a/accessibility/inc/helper/accresmgr.hxx +++ b/accessibility/inc/helper/accresmgr.hxx @@ -20,7 +20,8 @@
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc cui/inc dbaccess/inc framework/inc include/vcl oox/inc reportdesign/inc sd/inc slideshow/inc solenv/clang-format starm
accessibility/inc/pch/precompiled_acc.hxx | 17 +++- basctl/inc/pch/precompiled_basctl.hxx | 18 - basic/inc/pch/precompiled_sb.hxx | 15 +-- chart2/inc/pch/precompiled_chartcontroller.hxx | 21 ++- cui/inc/pch/precompiled_cui.hxx| 19 -- dbaccess/inc/pch/precompiled_dbu.hxx | 24 +++--- framework/inc/pch/precompiled_fwk.hxx | 18 - include/vcl/outdev.hxx |2 - include/vcl/rendercontext/ImplMapRes.hxx | 31 +++ oox/inc/pch/precompiled_oox.hxx| 13 - reportdesign/inc/pch/precompiled_rpt.hxx | 20 +-- reportdesign/inc/pch/precompiled_rptui.hxx | 22 sd/inc/pch/precompiled_sdui.hxx| 21 --- slideshow/inc/pch/precompiled_slideshow.hxx| 32 solenv/clang-format/excludelist|1 starmath/inc/pch/precompiled_sm.hxx| 23 + sw/inc/pch/precompiled_msword.hxx | 15 +-- sw/inc/pch/precompiled_swui.hxx| 33 + sw/inc/pch/precompiled_vbaswobj.hxx| 26 ++- vbahelper/inc/pch/precompiled_msforms.hxx | 20 +-- vcl/Library_vcl.mk |1 vcl/source/rendercontext/ImplMapRes.cxx| 33 + 22 files changed, 341 insertions(+), 84 deletions(-) New commits: commit 21405a65c3056fe8c827f3999e5c79f6083d8229 Author: Chris Sherlock AuthorDate: Wed May 5 04:06:41 2021 +1000 Commit: Tomaž Vajngerl CommitDate: Tue Jun 15 09:25:10 2021 +0200 vcl: outdevmap.hxx -> rendercontext/ImplMapRes.hxx Change-Id: I96e191999e43e1a4203d548eeacd386ed883cd8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115368 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 50e9f0059f7d..00b8a7fd98a0 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-04-08 13:55:33 using: + Generated on 2021-05-14 22:14:17 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -23,6 +23,7 @@ #include #if PCH_LEVEL >= 1 #include +#include #include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -106,6 +108,7 @@ #include #include #include +#include #include #include #include @@ -114,10 +117,19 @@ #include #include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -285,6 +297,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 8644323b3bf1..4e41b97239d7 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2021-04-11 19:47:41 using: + Generated on 2021-05-14 22:14:43 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -23,6 +23,7 @@ #include #if PCH_LEVEL >= 1 #include +#include #include #include #include @@ -44,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -123,6 +125,7 @@ #include #include #include +#include #include #include #include @@ -133,10 +136,19 @@ #include #include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -369,10 +381,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx index 711267924512..450e386e5f19 100644 --- a/basic/inc/pch/precompiled_sb.hxx +++ b/basic/inc/pch/precompiled_sb.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of up
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basic/source embeddedobj/source framework/source include/basic include/framework include/sfx2 include/vcl include/xmloff sc/inc s
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx|2 +- accessibility/source/standard/vclxaccessibletoolboxitem.cxx |2 +- basic/source/sbx/sbxvar.cxx |2 +- embeddedobj/source/msole/olecomponent.hxx |2 +- framework/source/fwe/dispatch/interaction.cxx |2 +- include/basic/sbxvar.hxx|2 +- include/framework/interaction.hxx |2 +- include/sfx2/brokenpackageint.hxx |4 ++-- include/sfx2/listview.hxx |8 include/sfx2/templatedlg.hxx|4 ++-- include/sfx2/templatedlglocalview.hxx |2 +- include/vcl/filter/pdfdocument.hxx |2 +- include/vcl/gfxlink.hxx |2 +- include/vcl/toolkit/treelistbox.hxx |2 +- include/xmloff/xmlexp.hxx |2 +- sc/inc/scmatrix.hxx |2 +- sc/qa/unit/parallelism.cxx |4 ++-- sc/source/core/tool/interpr1.cxx|2 +- sd/inc/Annotation.hxx |2 +- sfx2/inc/sidebar/DeckTitleBar.hxx |2 +- sfx2/source/appl/appuno.cxx |4 ++-- sfx2/source/control/templatedlglocalview.cxx|2 +- sfx2/source/control/templatesearchview.cxx |2 +- sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |2 +- sfx2/source/doc/templatedlg.cxx |2 +- sfx2/source/inc/templatesearchview.hxx |4 ++-- sfx2/source/sidebar/DeckTitleBar.cxx|2 +- svx/source/form/fmvwimp.cxx |2 +- svx/source/inc/fmvwimp.hxx |2 +- sw/inc/viewopt.hxx |2 +- sw/source/uibase/config/viewopt.cxx |2 +- unotools/source/misc/syslocale.cxx |4 ++-- vcl/inc/impgraph.hxx|2 +- vcl/inc/jsdialog/jsdialogbuilder.hxx|2 +- vcl/jsdialog/jsdialogbuilder.cxx|2 +- vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx |2 +- vcl/source/gdi/impgraph.cxx |2 +- writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +- 38 files changed, 47 insertions(+), 47 deletions(-) New commits: commit e859bf8c4da78698b820d13af1a2fdee3602f5b4 Author: Noel Grandin AuthorDate: Wed May 5 14:20:11 2021 +0200 Commit: Noel Grandin CommitDate: Wed May 5 18:50:51 2021 +0200 loplugin:constmethod Change-Id: I7913fd8144d521b8293ac43036d0fad82e457cd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115145 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index cbfb8162f677..a8de1b43231c 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -51,7 +51,7 @@ private: boolm_bIndeterminate; css::uno::Reference< css::accessibility::XAccessible >m_xChild; -OUString GetText(); +OUString GetText() const; public: sal_Int32getIndexInParent() const{ return m_nIndexInParent; } diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 211547a7e206..d290430975ba 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -114,7 +114,7 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem() { } -OUString VCLXAccessibleToolBoxItem::GetText() +OUString VCLXAccessibleToolBoxItem::GetText() const { OUString sRet; // no text for separators and spaces diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 77da97900f6c..b3a0e6db1ce8 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -355,7 +355,7 @@ void SbxVariable::SetParent( SbxObject* p ) pParent = p; } -const OUString& SbxVariable::GetDeclareClassName() +const OUString& SbxVariable::GetDeclareClassName() const { return m_aDeclareClassName; } diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx index 63547c321adc..08f1cbed696f 100644 --- a/embeddedobj/source/msole/olecomponent.hxx +++ b/embeddedobj/source/msole/olecomponent.hxx @@ -123,7 +12
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc comphelper/inc configmgr/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglay
accessibility/inc/pch/precompiled_acc.hxx |4 ++- basctl/inc/pch/precompiled_basctl.hxx |5 ++- basic/inc/pch/precompiled_sb.hxx|3 +- chart2/inc/pch/precompiled_chartcontroller.hxx |4 +-- chart2/inc/pch/precompiled_chartcore.hxx|4 --- comphelper/inc/pch/precompiled_comphelper.hxx |3 +- configmgr/inc/pch/precompiled_configmgr.hxx |3 +- connectivity/inc/pch/precompiled_ado.hxx|2 - connectivity/inc/pch/precompiled_dbase.hxx |3 +- connectivity/inc/pch/precompiled_dbtools.hxx|3 +- connectivity/inc/pch/precompiled_file.hxx |4 +-- connectivity/inc/pch/precompiled_flat.hxx |3 -- cppcanvas/inc/pch/precompiled_cppcanvas.hxx |5 +-- cppuhelper/inc/pch/precompiled_cppuhelper.hxx |2 - cui/inc/pch/precompiled_cui.hxx |6 +++- dbaccess/inc/pch/precompiled_dba.hxx|7 +++-- dbaccess/inc/pch/precompiled_dbu.hxx|6 +++- desktop/inc/pch/precompiled_deploymentmisc.hxx |3 +- desktop/inc/pch/precompiled_sofficeapp.hxx |4 ++- drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 +- editeng/inc/pch/precompiled_editeng.hxx |4 ++- forms/inc/pch/precompiled_frm.hxx |4 ++- framework/inc/pch/precompiled_fwk.hxx |4 ++- lotuswordpro/inc/pch/precompiled_lwpft.hxx |7 +++-- oox/inc/pch/precompiled_oox.hxx |3 +- package/inc/pch/precompiled_package2.hxx|3 +- reportdesign/inc/pch/precompiled_rpt.hxx| 11 +--- reportdesign/inc/pch/precompiled_rptui.hxx |8 ++ sc/inc/pch/precompiled_sc.hxx | 26 ++-- sd/inc/pch/precompiled_sd.hxx |3 +- sd/inc/pch/precompiled_sdui.hxx | 10 +-- sdext/inc/pch/precompiled_PresentationMinimizer.hxx |3 +- sdext/inc/pch/precompiled_PresenterScreen.hxx |3 +- sfx2/inc/pch/precompiled_sfx.hxx|4 ++- slideshow/inc/pch/precompiled_slideshow.hxx | 10 --- sot/inc/pch/precompiled_sot.hxx |3 +- svl/inc/pch/precompiled_svl.hxx |4 +-- svtools/inc/pch/precompiled_svt.hxx |4 ++- svx/inc/pch/precompiled_svxcore.hxx |4 ++- sw/inc/pch/precompiled_msword.hxx | 16 +++- sw/inc/pch/precompiled_sw.hxx |5 +++ sw/inc/pch/precompiled_swui.hxx | 14 +++--- sw/inc/pch/precompiled_vbaswobj.hxx | 10 +++ uui/inc/pch/precompiled_uui.hxx |2 - vbahelper/inc/pch/precompiled_msforms.hxx |3 +- vcl/inc/pch/precompiled_vcl.hxx |4 ++- xmloff/inc/pch/precompiled_xo.hxx |3 +- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |3 +- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |3 +- 49 files changed, 160 insertions(+), 98 deletions(-) New commits: commit e76a4d62fa6583a0084a5259ea436d7bb7672eb9 Author: Luboš Luňák AuthorDate: Thu Apr 8 13:58:18 2021 +0200 Commit: Luboš Luňák CommitDate: Thu Apr 8 17:23:08 2021 +0200 update PCHs Change-Id: Ia9d04447f927e270a55500e7f35723a729bc01dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113801 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index cf9cb3957681..50e9f0059f7d 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-03-20 10:37:29 using: + Generated on 2021-04-08 13:55:33 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -77,6 +78,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 9ee0402a30a4..881318eb3f1a 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2021-04-06 09:15:44 using: + Generated on 2021-04-08 13:55:34 using: ./bin/update_pch
[Libreoffice-commits] core.git: accessibility/inc basctl/inc chart2/inc comphelper/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglayer/inc editeng/inc frame
accessibility/inc/pch/precompiled_acc.hxx |3 + basctl/inc/pch/precompiled_basctl.hxx |3 + chart2/inc/pch/precompiled_chartcontroller.hxx|5 +- chart2/inc/pch/precompiled_chartcore.hxx | 10 + comphelper/inc/pch/precompiled_comphelper.hxx |3 + connectivity/inc/pch/precompiled_ado.hxx |2 - connectivity/inc/pch/precompiled_dbtools.hxx |3 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |6 +-- cppuhelper/inc/pch/precompiled_cppuhelper.hxx |2 - cui/inc/pch/precompiled_cui.hxx |3 + dbaccess/inc/pch/precompiled_dba.hxx | 42 +++--- dbaccess/inc/pch/precompiled_dbu.hxx |5 +- desktop/inc/pch/precompiled_deploymentmisc.hxx|3 + desktop/inc/pch/precompiled_sofficeapp.hxx|5 ++ drawinglayer/inc/pch/precompiled_drawinglayer.hxx |2 - editeng/inc/pch/precompiled_editeng.hxx |3 + framework/inc/pch/precompiled_fwk.hxx |3 + reportdesign/inc/pch/precompiled_rpt.hxx |3 + reportdesign/inc/pch/precompiled_rptui.hxx|6 ++- sc/inc/pch/precompiled_sc.hxx | 15 ++- sd/inc/pch/precompiled_sdui.hxx |3 + slideshow/inc/pch/precompiled_slideshow.hxx |8 ++-- sot/inc/pch/precompiled_sot.hxx |3 - svgio/inc/pch/precompiled_svgio.hxx |8 svl/inc/pch/precompiled_svl.hxx |4 +- svtools/inc/pch/precompiled_svt.hxx |3 + svx/inc/pch/precompiled_svxcore.hxx |4 +- sw/inc/pch/precompiled_msword.hxx |8 ++-- sw/inc/pch/precompiled_swui.hxx | 25 ++--- sw/inc/pch/precompiled_vbaswobj.hxx | 15 +-- uui/inc/pch/precompiled_uui.hxx |3 + vbahelper/inc/pch/precompiled_msforms.hxx |3 + vcl/inc/pch/precompiled_vcl.hxx |5 +- writerfilter/inc/pch/precompiled_writerfilter.hxx |2 - xmloff/inc/pch/precompiled_xo.hxx |3 + xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |3 + xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 - 37 files changed, 102 insertions(+), 127 deletions(-) New commits: commit e3e7bc65ed9126010ebc08543e32b9efb9c2b501 Author: Caolán McNamara AuthorDate: Sat Mar 20 10:43:15 2021 + Commit: Caolán McNamara CommitDate: Sun Mar 21 15:31:46 2021 +0100 update pches Change-Id: I60e61133c305673bb305e41957f5414820c7c358 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112790 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 0a9ea020dbde..cf9cb3957681 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-03-08 13:11:30 using: + Generated on 2021-03-20 10:37:29 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -91,6 +91,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 9570e61d2f44..a5295c5ccb3d 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2021-03-13 10:17:42 using: + Generated on 2021-03-20 10:37:30 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -105,6 +105,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 8da32fb378e5..ec9f0b75636e 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.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 2021-03-13 10:17:45 using: + Generated on 2021-03-20 10:37:36 using: ./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate co
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basegfx/inc basic/inc bin/update_pch canvas/inc chart2/inc comphelper/inc configmgr/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/i
accessibility/inc/pch/precompiled_acc.hxx |4 - basctl/inc/pch/precompiled_basctl.hxx |4 - basegfx/inc/pch/precompiled_basegfx.hxx |4 - basic/inc/pch/precompiled_sb.hxx |4 - bin/update_pch|4 + canvas/inc/pch/precompiled_cairocanvas.hxx|4 - canvas/inc/pch/precompiled_canvastools.hxx|4 - canvas/inc/pch/precompiled_oglcanvas.hxx |4 - canvas/inc/pch/precompiled_vclcanvas.hxx |4 - chart2/inc/pch/precompiled_chartcontroller.hxx|4 - chart2/inc/pch/precompiled_chartcore.hxx |6 - comphelper/inc/pch/precompiled_comphelper.hxx |4 - configmgr/inc/pch/precompiled_configmgr.hxx |4 - connectivity/inc/pch/precompiled_ado.hxx |4 - connectivity/inc/pch/precompiled_calc.hxx |4 - connectivity/inc/pch/precompiled_dbase.hxx|4 - connectivity/inc/pch/precompiled_dbpool2.hxx |4 - connectivity/inc/pch/precompiled_dbtools.hxx |5 - connectivity/inc/pch/precompiled_file.hxx |4 - connectivity/inc/pch/precompiled_firebird_sdbc.hxx|4 - connectivity/inc/pch/precompiled_flat.hxx |4 - connectivity/inc/pch/precompiled_mysql_jdbc.hxx |3 connectivity/inc/pch/precompiled_odbc.hxx |4 - connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |4 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |4 - cppuhelper/inc/pch/precompiled_cppuhelper.hxx |4 - cui/inc/pch/precompiled_cui.hxx |4 - dbaccess/inc/pch/precompiled_dba.hxx | 44 +- dbaccess/inc/pch/precompiled_dbahsql.hxx |4 - dbaccess/inc/pch/precompiled_dbaxml.hxx |4 - dbaccess/inc/pch/precompiled_dbu.hxx |4 - dbaccess/inc/pch/precompiled_sdbt.hxx |3 desktop/inc/pch/precompiled_deployment.hxx|4 - desktop/inc/pch/precompiled_deploymentgui.hxx |4 - desktop/inc/pch/precompiled_deploymentmisc.hxx|5 - desktop/inc/pch/precompiled_sofficeapp.hxx|6 + drawinglayer/inc/pch/precompiled_drawinglayer.hxx |4 - editeng/inc/pch/precompiled_editeng.hxx |4 - emfio/inc/pch/precompiled_emfio.hxx |4 - forms/inc/pch/precompiled_frm.hxx |4 - framework/inc/pch/precompiled_fwk.hxx |4 - hwpfilter/inc/pch/precompiled_hwp.hxx |4 - lotuswordpro/inc/pch/precompiled_lwpft.hxx|4 - oox/inc/pch/precompiled_oox.hxx |4 - package/inc/pch/precompiled_package2.hxx |4 - package/inc/pch/precompiled_xstor.hxx |4 - reportdesign/inc/pch/precompiled_rpt.hxx | 11 ++- reportdesign/inc/pch/precompiled_rptui.hxx|4 - reportdesign/inc/pch/precompiled_rptxml.hxx |4 - sal/inc/pch/precompiled_sal.hxx |4 - sc/inc/pch/precompiled_sc.hxx | 26 +++- sc/inc/pch/precompiled_scfilt.hxx |4 - sc/inc/pch/precompiled_scui.hxx |4 - sc/inc/pch/precompiled_vbaobj.hxx |4 - sd/inc/pch/precompiled_sd.hxx |4 - sd/inc/pch/precompiled_sdui.hxx |4 - sdext/inc/pch/precompiled_PresentationMinimizer.hxx |4 - sdext/inc/pch/precompiled_PresenterScreen.hxx |4 - sfx2/inc/pch/precompiled_sfx.hxx |4 - slideshow/inc/pch/precompiled_slideshow.hxx |8 -- sot/inc/pch/precompiled_sot.hxx |5 - starmath/inc/pch/precompiled_sm.hxx |4 - svgio/inc/pch/precompiled_svgio.hxx |4 - svl/inc/pch/precompiled_svl.hxx |6 - svtools/inc/pch/precompiled_svt.hxx |4 - svx/inc/pch/precompiled_svx.hxx |4 - svx/inc/pch/precompiled_svxcore.hxx |4 - sw/inc/pch/precompiled_msword.hxx | 17 + sw/inc/pch/precompiled_sw.hxx |4 - sw/inc/pch/precompiled_swui.hxx | 31 +++-- sw/inc/pch/precompiled_vbaswobj.hxx | 15 ++-- unotools/inc/pch/precompiled_utl.hxx |4 - unoxml/inc/pch/precompiled_unoxml.hxx |3
[Libreoffice-commits] core.git: accessibility/inc accessibility/source comphelper/source include/comphelper
accessibility/inc/extended/AccessibleBrowseBox.hxx |2 +- accessibility/inc/extended/AccessibleGridControl.hxx|2 +- accessibility/inc/extended/accessibletablistbox.hxx |2 +- accessibility/source/extended/AccessibleBrowseBox.cxx |2 +- accessibility/source/extended/AccessibleGridControl.cxx |2 +- accessibility/source/extended/accessibletablistbox.cxx |2 +- accessibility/source/standard/vclxaccessibletoolbox.cxx |4 ++-- comphelper/source/misc/accessiblewrapper.cxx|2 +- include/comphelper/accessiblewrapper.hxx|2 +- 9 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 26d56470e6af28b9f537690e1f97ec827b1a4737 Author: Noel AuthorDate: Fri Feb 26 15:22:28 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 27 17:19:15 2021 +0100 loplugin:refcounting in accessibility Change-Id: I0a17e149487cf05fb5e6d004a6402a2a5215a79b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111632 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index ebaf71991992..5b676ecf5bd3 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -169,7 +169,7 @@ protected: /** This method creates and returns an accessible table. @return An AccessibleBrowseBoxTable. */ -virtual AccessibleBrowseBoxTable* createAccessibleTable(); +virtual rtl::Reference createAccessibleTable(); private: /// the css::accessibility::XAccessible which created the AccessibleBrowseBox diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 5584fe5ed01b..34d0d0ffaf1c 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -135,7 +135,7 @@ private: /** This method creates and returns an accessible table. @return An AccessibleGridControlTable. */ -AccessibleGridControlTable* createAccessibleTable(); +rtl::Reference createAccessibleTable(); /// the css::accessibility::XAccessible which created the AccessibleGridControl css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx index c7ae77b03c77..02704ea872c2 100644 --- a/accessibility/inc/extended/accessibletablistbox.hxx +++ b/accessibility/inc/extended/accessibletablistbox.hxx @@ -86,7 +86,7 @@ private: /** This method creates and returns an accessible table. @return An AccessibleBrowseBoxTable. */ -virtual AccessibleBrowseBoxTable* createAccessibleTable() override; +virtual rtl::Reference createAccessibleTable() override; }; diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index c6fb251b849e..5500397b70c6 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -240,7 +240,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) return xRet; } -AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable() +rtl::Reference AccessibleBrowseBox::createAccessibleTable() { css::uno::Reference< css::accessibility::XAccessible > xCreator(m_aCreator); OSL_ENSURE( xCreator.is(), "extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" ); diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 124ef5d4f69f..22e6539b8afd 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -260,7 +260,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) return xRet; } -AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() +rtl::Reference AccessibleGridControl::createAccessibleTable() { css::uno::Reference< css::accessibility::XAccessible > xCreator(m_aCreator); OSL_ENSURE( xCreator.is(), "extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" ); diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index 4bcfa92f7378..f5cdfc75837b 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -58,7 +58,7 @@ namespace accessibility } } -AccessibleBrowseBoxTable* AccessibleTabListBox::createAccessibleTable() +rtl::Reference AccessibleTabListBox::createAccessibleTable() { return new AccessibleTabLis
[Libreoffice-commits] core.git: accessibility/inc basctl/inc chart2/inc cui/inc framework/source include/vcl sc/inc sc/source sd/inc svtools/inc svtools/source svx/inc sw/inc vcl/source
accessibility/inc/pch/precompiled_acc.hxx |3 +-- basctl/inc/pch/precompiled_basctl.hxx |3 +-- chart2/inc/pch/precompiled_chartcontroller.hxx |3 +-- cui/inc/pch/precompiled_cui.hxx|4 +--- framework/source/uielement/toolbarmanager.cxx |1 - include/vcl/floatwin.hxx | 22 -- include/vcl/vclenum.hxx| 21 + sc/inc/pch/precompiled_sc.hxx |4 ++-- sc/source/ui/cctrl/checklistmenu.cxx |1 - sd/inc/pch/precompiled_sdui.hxx|3 +-- svtools/inc/pch/precompiled_svt.hxx|3 +-- svtools/source/uno/popupwindowcontroller.cxx |1 - svx/inc/pch/precompiled_svxcore.hxx|4 +--- sw/inc/pch/precompiled_swui.hxx|3 +-- vcl/source/app/salvtables.cxx |1 - vcl/source/control/calendar.cxx|1 - 16 files changed, 31 insertions(+), 47 deletions(-) New commits: commit 9ad76a23eb25daddeec5f2586a10487c8a7bdc36 Author: Caolán McNamara AuthorDate: Thu Feb 25 10:53:34 2021 + Commit: Caolán McNamara CommitDate: Thu Feb 25 21:12:33 2021 +0100 allow use of FloatWinPopupFlags without including complete floatwin.hxx Change-Id: Ica412938ead6f213668b3aa876bff81d8f512f1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111526 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index ce849da0fb6e..75a1b90727ef 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-02-19 15:34:31 using: + Generated on 2021-02-25 10:08:05 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -101,7 +101,6 @@ #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 579f24d0583d..1bcbf15f062d 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2021-02-19 15:34:32 using: + Generated on 2021-02-25 10:08:21 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -115,7 +115,6 @@ #include #include #include -#include #include #include #include diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 3791367acd6b..99b2d0e76252 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.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 2021-02-19 15:34:34 using: + Generated on 2021-02-25 10:08:39 using: ./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -105,7 +105,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 9371309652f6..169f3ff5d30b 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.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 2021-02-19 15:34:39 using: + Generated on 2021-02-25 10:08:53 using: ./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -113,7 +113,6 @@ #include #include #include -#include #include #include #include @@ -228,7 +227,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 6a52ba57b578..6902bcf49e00 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -64,7 +64,6 @@ #include #include #inc
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx|2 accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx|2 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx |2 accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx |2 accessibility/inc/extended/AccessibleGridControlBase.hxx |3 - accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx|2 accessibility/inc/extended/AccessibleGridControlTable.hxx |7 -- accessibility/inc/extended/AccessibleGridControlTableCell.hxx |2 accessibility/source/extended/AccessibleBrowseBox.cxx |2 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |4 - accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |4 - accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |4 - accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx|4 - accessibility/source/extended/AccessibleGridControl.cxx | 12 accessibility/source/extended/AccessibleGridControlBase.cxx |4 - accessibility/source/extended/AccessibleGridControlHeader.cxx |8 +- accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |4 - accessibility/source/extended/AccessibleGridControlTable.cxx | 28 -- accessibility/source/extended/AccessibleGridControlTableCell.cxx |4 - accessibility/source/extended/accessibleiconchoicectrlentry.cxx |5 - accessibility/source/extended/accessiblelistbox.cxx |4 - accessibility/source/extended/accessiblelistboxentry.cxx |7 +- accessibility/source/extended/accessibletabbar.cxx| 11 +-- accessibility/source/extended/accessibletabbarpage.cxx|9 +-- accessibility/source/extended/accessibletabbarpagelist.cxx|9 +-- accessibility/source/extended/textwindowaccessibility.cxx |5 - accessibility/source/helper/acc_factory.cxx |2 accessibility/source/standard/accessiblemenubasecomponent.cxx |7 +- accessibility/source/standard/accessiblemenucomponent.cxx |6 -- accessibility/source/standard/accessiblemenuitemcomponent.cxx |4 - accessibility/source/standard/vclxaccessiblebox.cxx |2 accessibility/source/standard/vclxaccessiblebutton.cxx|5 - accessibility/source/standard/vclxaccessiblecheckbox.cxx |5 - accessibility/source/standard/vclxaccessibleheaderbaritem.cxx |9 +-- accessibility/source/standard/vclxaccessiblelistitem.cxx | 11 +-- accessibility/source/standard/vclxaccessiblemenuitem.cxx |7 +- accessibility/source/standard/vclxaccessibleradiobutton.cxx |5 - accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 11 +-- accessibility/source/standard/vclxaccessibletabpage.cxx | 11 +-- accessibility/source/standard/vclxaccessibletextcomponent.cxx |2 accessibility/source/standard/vclxaccessibletoolbox.cxx |2 accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 11 +-- 42 files changed, 99 insertions(+), 151 deletions(-) New commits: commit 18aafdd0f936ab6bb4225447a328f5471d143b0d Author: Noel AuthorDate: Mon Feb 22 10:46:47 2021 +0200 Commit: Noel Grandin CommitDate: Mon Feb 22 13:39:58 2021 +0100 loplugin:refcounting in accessibility Change-Id: Ic9e780dc3f834e2e8b5d3a8d8445419a4bd050dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111300 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index ea2a011723f3..7f7788fe3d35 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -254,7 +254,7 @@ protected: may overwrite this method and add more states. @attention This method requires locked mutex's. @return A filled AccessibleStateSetHelper. */ -virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper(); +virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper(); // internal helper methods diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 0ad34ba18ede..a550eed5e220 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -39,7 +39,7 @@ namespace accessibility virtual ~AccessibleCheckBoxCell() override {} -virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; +virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override; publi
[Libreoffice-commits] core.git: accessibility/inc basctl/inc chart2/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglayer/inc editeng/inc emfio/inc framework/
accessibility/inc/pch/precompiled_acc.hxx |9 + basctl/inc/pch/precompiled_basctl.hxx |6 +- chart2/inc/pch/precompiled_chartcontroller.hxx|6 +- chart2/inc/pch/precompiled_chartcore.hxx |3 ++- connectivity/inc/pch/precompiled_ado.hxx |2 +- cppcanvas/inc/pch/precompiled_cppcanvas.hxx |3 +-- cppuhelper/inc/pch/precompiled_cppuhelper.hxx |3 +-- cui/inc/pch/precompiled_cui.hxx |7 +-- dbaccess/inc/pch/precompiled_dba.hxx |3 ++- dbaccess/inc/pch/precompiled_dbaxml.hxx |3 ++- desktop/inc/pch/precompiled_deploymentmisc.hxx|3 ++- drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 +-- editeng/inc/pch/precompiled_editeng.hxx |3 ++- emfio/inc/pch/precompiled_emfio.hxx |3 ++- framework/inc/pch/precompiled_fwk.hxx |4 +--- oox/inc/pch/precompiled_oox.hxx |4 +++- reportdesign/inc/pch/precompiled_rptui.hxx|6 +- sc/inc/pch/precompiled_sc.hxx |8 +--- sc/inc/pch/precompiled_scfilt.hxx |3 ++- sc/inc/pch/precompiled_vbaobj.hxx |3 ++- sd/inc/pch/precompiled_sdui.hxx |9 ++--- sfx2/inc/pch/precompiled_sfx.hxx |4 +++- sot/inc/pch/precompiled_sot.hxx |3 +-- svl/inc/pch/precompiled_svl.hxx |4 ++-- svtools/inc/pch/precompiled_svt.hxx |8 +--- svx/inc/pch/precompiled_svx.hxx |6 +- svx/inc/pch/precompiled_svxcore.hxx |8 ++-- sw/inc/pch/precompiled_msword.hxx |3 ++- sw/inc/pch/precompiled_sw.hxx |3 ++- sw/inc/pch/precompiled_swui.hxx |8 +--- sw/inc/pch/precompiled_vbaswobj.hxx | 10 +- uui/inc/pch/precompiled_uui.hxx |3 +-- vcl/inc/pch/precompiled_vcl.hxx |5 - xmloff/inc/pch/precompiled_xof.hxx|3 ++- xmlscript/inc/pch/precompiled_xmlscript.hxx |3 +-- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |3 +-- 36 files changed, 61 insertions(+), 107 deletions(-) New commits: commit 860b2d0123cc44437d4882d7d5f204a32ed21a62 Author: Caolán McNamara AuthorDate: Fri Feb 19 15:36:13 2021 + Commit: Caolán McNamara CommitDate: Fri Feb 19 20:42:34 2021 +0100 update pches Change-Id: Ic4586057346b6de700c1bb6ff4cd759a11bb3e4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111231 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index c32079da9d3c..ce849da0fb6e 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2021-02-05 16:09:23 using: + Generated on 2021-02-19 15:34:31 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #endif // PCH_LEVEL >= 1 @@ -93,7 +92,6 @@ #include #include #include -#include #include #include #include @@ -113,7 +111,6 @@ #include #include #include -#include #include #include #include @@ -196,7 +193,6 @@ #include #include #include -#include #include #include #include @@ -308,7 +304,6 @@ #include #include #include -#include #include #include #include @@ -330,8 +325,6 @@ #include #include #include -#include -#include #include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index abb70b467f37..579f24d0583d 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2021-02-05 16:09:23 using: + Generated on 2021-02-19 15:34:32 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -106,7 +106,6 @@ #include #include #include -#include #include #include #include @@ -123,14 +122,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #includ
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basegfx/inc basic/inc chart2/inc comphelper/inc configmgr/inc connectivity/inc cui/inc dbaccess/inc desktop/inc editeng/inc framework/inc o
accessibility/inc/pch/precompiled_acc.hxx |3 ++- basctl/inc/pch/precompiled_basctl.hxx |5 - basegfx/inc/pch/precompiled_basegfx.hxx |3 ++- basic/inc/pch/precompiled_sb.hxx|4 +++- chart2/inc/pch/precompiled_chartcontroller.hxx |6 +- comphelper/inc/pch/precompiled_comphelper.hxx |3 ++- configmgr/inc/pch/precompiled_configmgr.hxx |3 ++- connectivity/inc/pch/precompiled_ado.hxx|2 +- cui/inc/pch/precompiled_cui.hxx |6 +- dbaccess/inc/pch/precompiled_dba.hxx|4 ++-- dbaccess/inc/pch/precompiled_dbu.hxx|7 ++- desktop/inc/pch/precompiled_deploymentgui.hxx |3 ++- desktop/inc/pch/precompiled_deploymentmisc.hxx |4 ++-- desktop/inc/pch/precompiled_sofficeapp.hxx |5 ++--- editeng/inc/pch/precompiled_editeng.hxx |6 ++ framework/inc/pch/precompiled_fwk.hxx |4 +++- oox/inc/pch/precompiled_oox.hxx |4 +++- reportdesign/inc/pch/precompiled_rpt.hxx|4 +++- reportdesign/inc/pch/precompiled_rptui.hxx |4 +++- sc/inc/pch/precompiled_sc.hxx |3 ++- sc/inc/pch/precompiled_scfilt.hxx |5 - sd/inc/pch/precompiled_sd.hxx |5 - sd/inc/pch/precompiled_sdui.hxx |6 +- sdext/inc/pch/precompiled_PresentationMinimizer.hxx |3 ++- sdext/inc/pch/precompiled_PresenterScreen.hxx |3 ++- sfx2/inc/pch/precompiled_sfx.hxx|4 +++- slideshow/inc/pch/precompiled_slideshow.hxx |6 +- sot/inc/pch/precompiled_sot.hxx |3 ++- starmath/inc/pch/precompiled_sm.hxx |5 - svgio/inc/pch/precompiled_svgio.hxx |3 ++- svl/inc/pch/precompiled_svl.hxx |4 ++-- svtools/inc/pch/precompiled_svt.hxx |4 +++- svx/inc/pch/precompiled_svx.hxx | 20 +++- svx/inc/pch/precompiled_svxcore.hxx |4 ++-- sw/inc/pch/precompiled_msword.hxx |6 +- sw/inc/pch/precompiled_sw.hxx |4 +++- sw/inc/pch/precompiled_swui.hxx |6 +- sw/inc/pch/precompiled_vbaswobj.hxx |4 +++- vbahelper/inc/pch/precompiled_msforms.hxx |3 ++- vcl/inc/pch/precompiled_vcl.hxx |6 -- xmloff/inc/pch/precompiled_xo.hxx |4 +++- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |3 ++- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 +- 43 files changed, 135 insertions(+), 61 deletions(-) New commits: commit c950dedc9b6a9306e83491c6e895c0ceee11ba8a Author: Caolán McNamara AuthorDate: Fri Feb 5 16:14:52 2021 + Commit: Caolán McNamara CommitDate: Mon Feb 8 12:11:17 2021 +0100 update pches Change-Id: Icf55ddda055d11b649e7607c2cdd8b6d6ddfefbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110483 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 12380b639d04..c32079da9d3c 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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-12-07 11:30:23 using: + Generated on 2021-02-05 16:09:23 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -180,6 +180,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 7d31e61a4d8b..abb70b467f37 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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-12-15 11:15:22 using: + Generated on 2021-02-05 16:09:23 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +92,7 @@ #include #include #include +#include #include #include #include @@ -192,6 +194,7 @@ #include #include #include +#include #include
[Libreoffice-commits] core.git: accessibility/inc accessibility/source desktop/source editeng/source include/vcl lotuswordpro/source sc/source sd/source starmath/source svtools/source svx/source sw/so
accessibility/inc/helper/listboxhelper.hxx |2 accessibility/source/standard/vclxaccessiblelistitem.cxx |2 desktop/source/lib/init.cxx |4 - editeng/source/editeng/editdbg.cxx |4 - include/vcl/outdev.hxx |2 lotuswordpro/source/filter/lwpdrawobj.cxx|4 - sc/source/ui/app/inputwin.cxx|4 - sc/source/ui/cctrl/tbzoomsliderctrl.cxx |2 sd/source/ui/dlg/headerfooterdlg.cxx |2 starmath/source/rect.cxx |2 svtools/source/brwbox/brwbox1.cxx|2 svtools/source/brwbox/brwbox2.cxx|2 svtools/source/hatchwindow/ipwin.cxx |2 svx/source/dialog/connctrl.cxx |2 svx/source/dialog/svxbmpnumvalueset.cxx |4 - svx/source/stbctrls/zoomsliderctrl.cxx |2 svx/source/unodraw/UnoGraphicExporter.cxx|2 sw/source/uibase/docvw/AnnotationWin2.cxx|2 vcl/source/control/combobox.cxx |2 vcl/source/control/listbox.cxx |2 vcl/source/gdi/pdfwriter_impl.cxx| 32 +++ vcl/source/window/menu.cxx |2 vcl/unx/generic/print/common_gfx.cxx | 16 +++ 23 files changed, 50 insertions(+), 50 deletions(-) New commits: commit ddf8a2f91bb14be1b1cca2d2ea0ebd7fda5dd0fe Author: Caolán McNamara AuthorDate: Wed Jan 27 15:03:17 2021 + Commit: Caolán McNamara CommitDate: Thu Jan 28 11:55:30 2021 +0100 TopLeft().Y() -> Top() etc. TopLeft().X() -> Left() BottomLeft().X() -> Left() TopRight().X() -> Right() BottomRight().X() -> Right() TopLeft().Y() -> Top() TopRight().Y() -> Top() BottomLeft().Y() -> Bottom() BottomRight().Y() -> Bottom() Change-Id: I5050f619bf92cfc59b6f8dfe7c9f98ef1453c294 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110022 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index b5e09034d01c..dfadf37aa015 100644 --- a/accessibility/inc/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -51,7 +51,7 @@ public: { tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr); tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel(); -aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y()); +aRet.Move(aTemp.Left(), aTemp.Top()); return aRet; } diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 7f807c5e7240..872f75b40581 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -295,7 +295,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi if (pListBoxHelper) { tools::Rectangle aRect(pListBoxHelper->GetBoundingRectangle(static_cast(m_nIndexInParent))); -aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y()); +aRect.Move(-aRect.Left(), -aRect.Top()); bInside = aRect.IsInside( VCLPoint( _aPoint ) ); } return bInside; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index fbbf450b6530..0931ffda08ac 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -5303,8 +5303,8 @@ unsigned char* doc_renderFontOrientation(SAL_UNUSED_PARAMETER LibreOfficeKitDocu if (aRect.IsEmpty()) break; -int nFontWidth = aRect.BottomRight().X() + 1; -int nFontHeight = aRect.BottomRight().Y() + 1; +int nFontWidth = aRect.Right() + 1; +int nFontHeight = aRect.Bottom() + 1; if (nFontWidth <= 0 || nFontHeight <= 0) break; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 3598036e2240..639e936a9558 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -465,10 +465,10 @@ void EditEngine::DumpData(const EditEngine* pEE, bool bInfoBox) fprintf( fp, "\nView %zu: Focus=%i", nView, pV->GetWindow()->HasFocus() ); tools::Rectangle aR( pV->GetOutputArea() ); fprintf( fp, "\n OutputArea: nX=%" SAL_PRIdINT64 ", nY=%" SAL_PRIdINT64 ", dX=%" SAL_PRIdINT64 ", dY=%" SAL_PRIdINT64 ", MapMode = %i", -sal_Int64(aR.TopLeft().X()), sal_Int64(aR.TopLeft().Y()), sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) , int( pV->GetWindow()->GetMapMode().GetMapUnit() ) ); +
[Libreoffice-commits] core.git: accessibility/inc sc/source sd/source svx/source
accessibility/inc/standard/vclxaccessiblelist.hxx |2 +- sc/source/ui/inc/impex.hxx|2 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx |4 ++-- svx/source/accessibility/ChildrenManagerImpl.hxx |2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 251cfcdc8db951cfddeb960bb55da61117693d67 Author: Andrea Gelmini AuthorDate: Sat Jan 9 14:33:54 2021 +0100 Commit: Julien Nabet CommitDate: Sat Jan 9 18:26:20 2021 +0100 Fix typos Following: https: //gerrit.libreoffice.org/c/core/+/108936 Change-Id: I57fcdd1485f32ed4bcbfc9a91028eb9cd6b01f16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109034 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 49f48d9b8b56..619fe23aada8 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -67,7 +67,7 @@ public: /** Called on reception of selection events this method checks all known list items for a possible change in their selection state and -updates that accordingly. No accessibility events are send because +updates that accordingly. No accessibility events are sent because the XAccessibleSelection interface is not supported and the items are transient. @param sTextOfSelectedItem diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 090b17911578..3918ba86afb6 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -121,7 +121,7 @@ public: static sal_Int32 CountVisualWidth(const OUString& rStr, sal_Int32& nIdx, sal_Int32 nMaxWidth); /** ScImportExport::CountVisualWidth -@return the sum of the viusal width of the whole string. +@return the sum of the visual width of the whole string. **/ static sal_Int32 CountVisualWidth(const OUString& rStr); diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 2194dee2f290..3a48c0a70790 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -273,7 +273,7 @@ protected: virtual void SAL_CALL disposing() override; /** Create a name string. The current name is not modified and, -therefore, no events are send. This method is usually called once +therefore, no events are sent. This method is usually called once by the getAccessibleName method of the base class. @return A name string. @@ -304,7 +304,7 @@ protected: If this is a valid reference then a child event is send that informs the listeners of a new child. If there has already been an active accessible OLE object then this is removed first and -appropriate events are send. +appropriate events are sent. If this is an empty reference then the currently active accessible OLE object (if there is one) is removed. diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index ecff9d0b6bf8..4cad0efcbf8c 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -58,7 +58,7 @@ typedef ::std::vector ChildDescriptorListType; Each call of the Update method leads to a re-calculation of the visible shapes which then can be queried with the GetChildCount and GetChild methods. -Events are send informing all listeners about the removed shapes which are +Events are sent informing all listeners about the removed shapes which are not visible anymore and about the added shapes. The visible area which is used to determine the visibility of the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc forms/source sfx2/source
accessibility/inc/standard/vclxaccessiblebox.hxx |2 +- forms/source/richtext/richtextcontrol.cxx|2 +- forms/source/solar/component/navbarcontrol.cxx |2 +- sfx2/source/view/userinputinterception.cxx |4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 86707f3595c282f80b5e09558a23b539446daca2 Author: Julien Nabet AuthorDate: Fri Dec 25 13:01:36 2020 +0100 Commit: Julien Nabet CommitDate: Fri Dec 25 15:56:44 2020 +0100 Typos in code (vlc->vcl/vclx) Change-Id: I3c0f0f7a2129ca49c18d3a65aef74061e895853c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108284 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index f475e4f042b3..4971078fcbc0 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -72,7 +72,7 @@ public: sal_Int32 SAL_CALL getAccessibleChildCount() final override; /** For drop down list boxes the text field is a not editable VCLXAccessibleTextField, for combo boxes it is an -editable VLCAccessibleEdit. +editable VCLXAccessibleEdit. */ css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) override; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index a22d36d52424..256c257b2f2c 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -173,7 +173,7 @@ namespace frm mbCreatingPeer = true; -// determine the VLC window for the parent +// determine the VCL window for the parent vcl::Window* pParentWin = nullptr; if ( _rParentPeer.is() ) { diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index f39464fc8987..ecaa9ba142a4 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -119,7 +119,7 @@ namespace frm mbCreatingPeer = true; -// determine the VLC window for the parent +// determine the VCL window for the parent vcl::Window* pParentWin = nullptr; if ( _rParentPeer.is() ) { diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index ad605627f63f..b1cb6e8544ed 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -73,8 +73,8 @@ namespace sfx2 namespace { -template< class VLCEVENT > -void lcl_initModifiers( InputEvent& _rEvent, const VLCEVENT& _rVclEvent ) +template< class VCLEVENT > +void lcl_initModifiers( InputEvent& _rEvent, const VCLEVENT& _rVclEvent ) { _rEvent.Modifiers = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc basctl/inc chart2/inc connectivity/inc cui/inc drawinglayer/inc include/vcl reportdesign/inc sc/inc sc/source sd/inc sfx2/inc sfx2/Library_sfx.mk sfx2
accessibility/inc/pch/precompiled_acc.hxx |4 basctl/inc/pch/precompiled_basctl.hxx |4 chart2/inc/pch/precompiled_chartcontroller.hxx|4 connectivity/inc/pch/precompiled_ado.hxx |2 cui/inc/pch/precompiled_cui.hxx |4 drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 include/vcl/notebookbar/NotebookbarPopup.hxx |2 include/vcl/notebookbar/notebookbar.hxx |7 include/vcl/syswin.hxx|2 reportdesign/inc/pch/precompiled_rptui.hxx|4 sc/inc/pch/precompiled_sc.hxx |4 sc/source/ui/view/prevwsh.cxx |2 sd/inc/pch/precompiled_sd.hxx | 11 - sd/inc/pch/precompiled_sdui.hxx |5 sfx2/Library_sfx.mk |5 sfx2/inc/pch/precompiled_sfx.hxx |4 sfx2/source/notebookbar/ContextVBox.cxx | 76 --- sfx2/source/notebookbar/NotebookbarTabControl.cxx |2 sfx2/source/notebookbar/PriorityMergedHBox.cxx| 213 -- sfx2/source/notebookbar/SfxNotebookBar.cxx|4 solenv/bin/native-code.py |4 solenv/clang-format/excludelist |6 svl/inc/pch/precompiled_svl.hxx |5 svtools/inc/pch/precompiled_svt.hxx |5 svx/inc/pch/precompiled_svxcore.hxx |4 sw/inc/pch/precompiled_swui.hxx |4 sw/source/uibase/uiview/pview.cxx |2 vcl/Library_vcl.mk|5 vcl/inc/ContextVBox.hxx | 38 +++ vcl/inc/DropdownBox.hxx |4 vcl/inc/OptionalBox.hxx |2 vcl/inc/PriorityHBox.hxx |2 vcl/inc/PriorityMergedHBox.hxx| 49 + vcl/inc/brdwin.hxx|4 vcl/source/control/ContextVBox.cxx| 62 ++ vcl/source/control/DropdownBox.cxx|5 vcl/source/control/NotebookbarPopup.cxx |4 vcl/source/control/PriorityHBox.cxx |5 vcl/source/control/PriorityMergedHBox.cxx | 194 vcl/source/control/notebookbar.cxx|2 vcl/source/control/tabctrl.cxx|2 vcl/source/window/NotebookBarAddonsMerger.cxx |4 vcl/source/window/builder.cxx | 26 ++ xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 44 files changed, 431 insertions(+), 371 deletions(-) New commits: commit 35b5f03e41e21085b67b56e29c52dcddc9a36c30 Author: Caolán McNamara AuthorDate: Mon Dec 7 11:18:33 2020 + Commit: Caolán McNamara CommitDate: Mon Dec 7 21:05:06 2020 +0100 move various notebookbar widgets into vcl and we can drop their factories then Change-Id: I1e261886dd7700710ba628da4bbeeba65efa1531 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107134 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index fe8854898eae..12380b639d04 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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-12-04 09:59:03 using: + Generated on 2020-12-07 11:30:23 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -86,7 +86,6 @@ #include #include #include -#include #include #include #include @@ -114,6 +113,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 56231839e9bc..f113bc8d1bcd 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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-12-04 09:59:03 using: + Generated on 2020-12-07 11:30:23 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -98,7 +98,6 @@ #include #include #include -#include #include #include #include @@ -131,6 +130,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/inc/pch/precompiled_chartcontroller.h
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc comphelper/inc configmgr/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglay
accessibility/inc/pch/precompiled_acc.hxx |4 - basctl/inc/pch/precompiled_basctl.hxx |7 + basic/inc/pch/precompiled_sb.hxx |3 chart2/inc/pch/precompiled_chartcontroller.hxx|8 +- chart2/inc/pch/precompiled_chartcore.hxx |4 - comphelper/inc/pch/precompiled_comphelper.hxx |7 + configmgr/inc/pch/precompiled_configmgr.hxx |3 connectivity/inc/pch/precompiled_ado.hxx |2 connectivity/inc/pch/precompiled_dbase.hxx|4 - connectivity/inc/pch/precompiled_dbpool2.hxx |3 connectivity/inc/pch/precompiled_dbtools.hxx |8 -- connectivity/inc/pch/precompiled_file.hxx |6 + connectivity/inc/pch/precompiled_flat.hxx |3 connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |7 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |5 + cppuhelper/inc/pch/precompiled_cppuhelper.hxx |3 cui/inc/pch/precompiled_cui.hxx |8 +- dbaccess/inc/pch/precompiled_dba.hxx |5 + dbaccess/inc/pch/precompiled_dbaxml.hxx |4 - dbaccess/inc/pch/precompiled_dbu.hxx |9 +- desktop/inc/pch/precompiled_deploymentgui.hxx |4 - desktop/inc/pch/precompiled_deploymentmisc.hxx|3 desktop/inc/pch/precompiled_sofficeapp.hxx|6 + drawinglayer/inc/pch/precompiled_drawinglayer.hxx | 13 +-- editeng/inc/pch/precompiled_editeng.hxx |7 + forms/inc/pch/precompiled_frm.hxx |9 +- framework/inc/pch/precompiled_fwk.hxx |9 +- hwpfilter/inc/pch/precompiled_hwp.hxx |3 lotuswordpro/inc/pch/precompiled_lwpft.hxx|4 - oox/inc/pch/precompiled_oox.hxx |8 +- package/inc/pch/precompiled_package2.hxx |3 package/inc/pch/precompiled_xstor.hxx |4 - reportdesign/inc/pch/precompiled_rpt.hxx |7 + reportdesign/inc/pch/precompiled_rptui.hxx|7 + sc/inc/pch/precompiled_sc.hxx | 17 +++- sc/inc/pch/precompiled_scfilt.hxx | 13 +-- sc/inc/pch/precompiled_scui.hxx | 10 +- sc/inc/pch/precompiled_vbaobj.hxx |3 sd/inc/pch/precompiled_sd.hxx | 15 +++ sd/inc/pch/precompiled_sdui.hxx |8 +- sdext/inc/pch/precompiled_PresentationMinimizer.hxx |5 + sdext/inc/pch/precompiled_PresenterScreen.hxx |5 + sfx2/inc/pch/precompiled_sfx.hxx | 21 + slideshow/inc/pch/precompiled_slideshow.hxx | 10 +- sot/inc/pch/precompiled_sot.hxx |4 - starmath/inc/pch/precompiled_sm.hxx | 12 +-- svgio/inc/pch/precompiled_svgio.hxx |4 - svl/inc/pch/precompiled_svl.hxx |7 + svtools/inc/pch/precompiled_svt.hxx | 53 +- svx/inc/pch/precompiled_svx.hxx | 12 +-- svx/inc/pch/precompiled_svxcore.hxx |9 -- sw/inc/pch/precompiled_msword.hxx |8 +- sw/inc/pch/precompiled_sw.hxx | 20 +++-- sw/inc/pch/precompiled_swui.hxx | 21 - sw/inc/pch/precompiled_vbaswobj.hxx | 27 ++- tools/inc/pch/precompiled_tl.hxx |5 + unotools/inc/pch/precompiled_utl.hxx |3 uui/inc/pch/precompiled_uui.hxx |3 vbahelper/inc/pch/precompiled_msforms.hxx |7 + vbahelper/inc/pch/precompiled_vbahelper.hxx |3 vcl/inc/pch/precompiled_vcl.hxx | 10 ++ writerfilter/inc/pch/precompiled_writerfilter.hxx |3 xmloff/inc/pch/precompiled_xo.hxx |4 - xmloff/inc/pch/precompiled_xof.hxx|3 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |5 + xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |4 - 66 files changed, 320 insertions(+), 204 deletions(-) New commits: commit 1ac449874c0e93ee7e7a9765053d392fde0067f4 Author: Caolán McNamara AuthorDate: Fri Dec 4 10:01:04 2020 + Commit: Caolán McNamara CommitDate: Fri Dec 4 12:05:13 2020 +0100 update pches Change-Id: I3e22c2000da03f6f3345353846213203993aa865 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107192 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --g
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControl.hxx|3 +++ accessibility/source/extended/AccessibleGridControl.cxx | 11 --- 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit 613c55115a57dc2dcdf4212e79259d4d1be2979c Author: Arnaud Versini AuthorDate: Sat Nov 28 14:24:41 2020 +0100 Commit: Noel Grandin CommitDate: Sun Nov 29 10:59:57 2020 +0100 a11y : avoid double locking Change-Id: I1348fb33b9c93d54cd128bf6ac56a3c4c57eec3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106806 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 3140db59e395..5584fe5ed01b 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -151,6 +151,9 @@ private: /** The table cell child. */ rtl::Referencem_xCell; + +/** @return The count of visible children. */ +inline sal_Int32 implGetAccessibleChildCount(); }; diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 5738c6f3fd98..2c41881fb4f3 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -77,14 +77,19 @@ void SAL_CALL AccessibleGridControl::disposing() AccessibleGridControlBase::disposing(); } +sal_Int32 AccessibleGridControl::implGetAccessibleChildCount() +{ +return m_aTable.GetAccessibleControlCount(); +} // css::accessibility::XAccessibleContext - + sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ensureIsAlive(); -return m_aTable.GetAccessibleControlCount(); +return implGetAccessibleChildCount(); } @@ -93,7 +98,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; -if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount()) +if (nChildIndex<0 || nChildIndex>=implGetAccessibleChildCount()) throw IndexOutOfBoundsException(); css::uno::Reference< css::accessibility::XAccessible > xChild; @@ -264,7 +269,7 @@ AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue) { -sal_Int32 nChildCount = getAccessibleChildCount(); +sal_Int32 nChildCount = implGetAccessibleChildCount(); if(nChildCount != 0) { for(sal_Int32 i=0;ihttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source binaryurp/source chart2/qa chart2/source comphelper/source compilerplugins/clang connectivity/source cppu/source cu
UnoControls/source/controls/progressmonitor.cxx |2 UnoControls/source/inc/progressmonitor.hxx|2 accessibility/inc/standard/vclxaccessiblelist.hxx |2 accessibility/source/standard/vclxaccessiblelist.cxx |2 basctl/source/basicide/basides1.cxx |4 basctl/source/basicide/basidesh.cxx |2 basctl/source/basicide/bastype2.cxx |4 basctl/source/basicide/bastypes.cxx |4 basctl/source/basicide/scriptdocument.cxx |4 basctl/source/inc/basidesh.hxx|4 basctl/source/inc/bastype2.hxx|4 basctl/source/inc/bastypes.hxx|2 basctl/source/inc/scriptdocument.hxx |2 binaryurp/source/bridge.cxx |2 binaryurp/source/bridge.hxx |2 chart2/qa/extras/PivotChartTest.cxx | 126 +- chart2/qa/extras/chart2dump/chart2dump.cxx|6 chart2/qa/extras/chart2import.cxx |4 chart2/qa/extras/charttest.hxx|2 chart2/source/model/template/DataInterpreter.cxx |6 chart2/source/model/template/DataInterpreter.hxx |2 chart2/source/view/axes/VCartesianAxis.cxx|4 chart2/source/view/axes/VPolarAngleAxis.cxx |2 chart2/source/view/inc/PropertyMapper.hxx |2 chart2/source/view/main/LabelPositionHelper.cxx | 10 chart2/source/view/main/PropertyMapper.cxx|2 chart2/source/view/main/VLegend.cxx |2 chart2/source/view/main/VLegendSymbolFactory.cxx |2 comphelper/source/misc/mimeconfighelper.cxx |8 compilerplugins/clang/stringviewparam.cxx | 42 ++- compilerplugins/clang/test/stringviewparam.cxx|5 connectivity/source/cpool/ZPoolCollection.cxx |2 connectivity/source/cpool/ZPoolCollection.hxx |2 connectivity/source/drivers/dbase/DTable.cxx |2 connectivity/source/drivers/mysqlc/mysqlc_services.cxx|2 connectivity/source/inc/dbase/DTable.hxx |2 connectivity/source/parse/sqliterator.cxx |2 cppu/source/uno/lbenv.cxx |8 cui/source/customize/SvxNotebookbarConfigPage.cxx |6 cui/source/customize/cfgutil.cxx |2 cui/source/dialogs/hlinettp.cxx |2 cui/source/dialogs/hlmailtp.cxx |4 cui/source/dialogs/hlmarkwn.cxx |4 cui/source/dialogs/scriptdlg.cxx |6 cui/source/inc/cfgutil.hxx|2 cui/source/inc/cuitabarea.hxx | 10 cui/source/inc/hlinettp.hxx |2 cui/source/inc/hlmailtp.hxx |4 cui/source/inc/hlmarkwn.hxx |4 cui/source/inc/optdict.hxx|2 cui/source/inc/scriptdlg.hxx |6 cui/source/inc/treeopt.hxx|8 cui/source/options/fontsubs.cxx |4 cui/source/options/optdict.cxx|2 cui/source/options/optjava.cxx|2 cui/source/options/optjava.hxx|2 cui/source/options/optlingu.cxx | 14 - cui/source/options/treeopt.cxx| 50 +-- cui/source/tabpages/autocdlg.cxx |2 cui/source/tabpages/tpbitmap.cxx |2 cui/source/tabpages/tpcolor.cxx |2 cui/source/tabpages/tpgradnt.cxx |2 cui/source/tabpages/tphatch.cxx |2 c
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basic/inc basic/source compilerplugins/clang cui/source dbaccess/inc dbaccess/source desktop/source editeng/source filter/source
UnoControls/source/controls/progressmonitor.cxx | 12 +- UnoControls/source/inc/progressmonitor.hxx|4 accessibility/inc/standard/vclxaccessiblelist.hxx |2 accessibility/source/standard/vclxaccessiblelist.cxx |2 basic/inc/sbxform.hxx |2 basic/source/basmgr/basmgr.cxx| 12 +- basic/source/classes/codecompletecache.cxx|4 basic/source/classes/sb.cxx |2 basic/source/sbx/sbxform.cxx |2 compilerplugins/clang/stringviewparam.cxx | 53 ++ cui/source/customize/SvxConfigPageHelper.cxx |2 cui/source/inc/SvxConfigPageHelper.hxx|2 dbaccess/inc/core_resource.hxx|6 - dbaccess/source/core/dataaccess/databasedocument.cxx |2 dbaccess/source/core/dataaccess/databasedocument.hxx |2 dbaccess/source/core/dataaccess/databaseregistrations.cxx |6 - dbaccess/source/core/resource/core_resource.cxx |6 - dbaccess/source/ui/dlg/generalpage.cxx|4 dbaccess/source/ui/dlg/generalpage.hxx|2 dbaccess/source/ui/inc/WCopyTable.hxx |2 dbaccess/source/ui/misc/WCopyTable.cxx|2 desktop/source/deployment/gui/dp_gui_dialog2.cxx |4 desktop/source/deployment/gui/dp_gui_dialog2.hxx |4 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |2 desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx |2 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx|4 editeng/source/editeng/impedit.hxx|2 editeng/source/editeng/impedit4.cxx |2 filter/source/msfilter/escherex.cxx |4 filter/source/msfilter/msdffimp.cxx |2 fpicker/source/office/autocmpledit.cxx|2 fpicker/source/office/autocmpledit.hxx|2 fpicker/source/office/fileview.cxx|4 framework/inc/addonmenu.hxx |2 framework/inc/uielement/toolbarmerger.hxx | 10 - framework/inc/uifactory/menubarfactory.hxx|2 framework/source/fwe/classes/addonmenu.cxx|4 framework/source/uielement/popuptoolbarcontroller.cxx |6 - framework/source/uielement/toolbarmerger.cxx | 10 - framework/source/uifactory/menubarfactory.cxx |4 framework/source/uifactory/statusbarfactory.cxx |2 framework/source/uifactory/toolbarfactory.cxx |2 i18nutil/source/utility/scripttypedetector.cxx|4 idl/inc/database.hxx |2 idl/source/prj/database.cxx |2 include/basic/basmgr.hxx |8 - include/basic/codecompletecache.hxx |4 include/basic/sbstar.hxx |2 include/i18nutil/scripttypedetector.hxx |4 include/oox/core/contexthandler.hxx |2 include/oox/core/relations.hxx|8 - include/sfx2/frmdescr.hxx |2 include/sfx2/sfxhelp.hxx |2 include/sfx2/templatelocalview.hxx|2 include/svx/ActionDescriptionProvider.hxx |2 include/svx/svdograf.hxx |2 include/test/sheet/xspreadsheets2.hxx |2 include/unotools/localedatawrapper.hxx|2 include/unotools/textsearch.hxx |2 include/vbahelper/vbahelper.hxx |6 - include/vcl/GraphicNativeTransform.hxx|2 include/vcl/GraphicObject.hxx |2 include/vcl/graphicfilter.hxx | 38 +++ include/xmloff/formlayerimport.hxx|4 oox/source/core/contexthandler.cxx|2 oox/source/core/relations.cxx |4 reportdesign/sou
[Libreoffice-commits] core.git: accessibility/inc accessibility/source solenv/clang-format
accessibility/inc/helper/characterattributeshelper.hxx | 17 +-- accessibility/inc/standard/vclxaccessiblecombobox.hxx | 10 -- accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx |8 - accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx |7 - accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx|6 - accessibility/inc/standard/vclxaccessiblefixedtext.hxx |8 - accessibility/inc/standard/vclxaccessibleheaderbar.hxx | 21 ++-- accessibility/inc/standard/vclxaccessiblelistbox.hxx |7 - accessibility/inc/standard/vclxaccessiblemenuseparator.hxx | 11 -- accessibility/inc/standard/vclxaccessiblepopupmenu.hxx | 14 +-- accessibility/source/helper/IComboListBoxHelper.cxx|6 - accessibility/source/helper/accresmgr.cxx |5 - accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx |7 - accessibility/source/standard/vclxaccessiblefixedtext.cxx | 16 +-- accessibility/source/standard/vclxaccessibleheaderbar.cxx | 45 -- accessibility/source/standard/vclxaccessiblemenuseparator.cxx | 21 solenv/clang-format/excludelist| 16 --- 17 files changed, 68 insertions(+), 157 deletions(-) New commits: commit b53fa6344d033f8b8f03b9274dbdd811251c2c1a Author: Philipp Hofer AuthorDate: Fri Nov 6 16:22:34 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Tue Nov 10 12:44:40 2020 +0100 tdf#123936 Formatting file in module accessibility with clang Change-Id: I9ac4df1ecc3ea1d48f3961fa95f34207dab8976e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105411 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx index d6bfffc12375..a73ee76c09f2 100644 --- a/accessibility/inc/helper/characterattributeshelper.hxx +++ b/accessibility/inc/helper/characterattributeshelper.hxx @@ -26,24 +26,19 @@ #include #include - - - class CharacterAttributesHelper { private: +typedef std::map AttributeMap; -typedef std::map< OUString, css::uno::Any > AttributeMap; - -AttributeMapm_aAttributeMap; +AttributeMap m_aAttributeMap; public: +CharacterAttributesHelper(const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor); -CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ); - -std::vector< css::beans::PropertyValue > GetCharacterAttributes(); -css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ); +std::vector GetCharacterAttributes(); +css::uno::Sequence +GetCharacterAttributes(const css::uno::Sequence& aRequestedAttributes); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index af38cdcbae42..67c2ef93b139 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -21,24 +21,21 @@ #include - /** The accessible combobox has two children. The first is the text field represented by an object of the VCLXAccessibleEdit class. The second is the list containing all items and is represented by an object of the VCLXAccessibleList class which does not support selection at the moment. */ -class VCLXAccessibleComboBox final -: public VCLXAccessibleBox +class VCLXAccessibleComboBox final : public VCLXAccessibleBox { public: -VCLXAccessibleComboBox (VCLXWindow* pVCLXindow); +VCLXAccessibleComboBox(VCLXWindow* pVCLXindow); // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; // Return combo box specific services. -virtual css::uno::Sequence< OUString > SAL_CALL -getSupportedServiceNames() override; +virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; private: virtual ~VCLXAccessibleComboBox() override = default; @@ -46,5 +43,4 @@ private: virtual bool IsValid() const override; }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index 627cc0888d10..76c1c14594e9 100644 --- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -31,20 +31,18 @@ class VCLXAccessibleDropDownComboBox final : public VCLXAccessibleBox { public: -VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow); +VCLXAccessibleDropDownComboBox(VCLXWindow* pVCLXindow); // XServiceInfo virtual OUString SAL_CALL getImplementationName() override;
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source
accessibility/inc/helper/IComboListBoxHelper.hxx |3 accessibility/inc/helper/listboxhelper.hxx |4 accessibility/source/extended/AccessibleGridControlTable.cxx | 18 +-- accessibility/source/extended/AccessibleGridControlTableCell.cxx |8 - accessibility/source/extended/accessibleiconchoicectrlentry.cxx |4 accessibility/source/extended/textwindowaccessibility.cxx|4 avmedia/source/gstreamer/gstplayer.hxx |2 avmedia/source/viewer/mediawindow_impl.cxx |4 basctl/source/basicide/baside2.cxx | 34 +++ basctl/source/basicide/baside2.hxx | 10 +- basctl/source/basicide/baside2b.cxx | 46 +- basctl/source/basicide/baside3.cxx |2 basctl/source/basicide/basides1.cxx | 10 +- basctl/source/basicide/basobj3.cxx |8 - basctl/source/basicide/layout.cxx| 34 +++ basctl/source/basicide/linenumberwindow.cxx |4 basctl/source/basicide/linenumberwindow.hxx |6 - basctl/source/dlged/dlged.cxx| 34 +++ basctl/source/dlged/dlgedfunc.cxx| 14 +-- basctl/source/dlged/propbrw.cxx | 10 +- basctl/source/inc/baside3.hxx|2 basctl/source/inc/basobj.hxx |3 basctl/source/inc/dlged.hxx |2 basctl/source/inc/layout.hxx | 12 +- 24 files changed, 140 insertions(+), 138 deletions(-) New commits: commit 915c7529e9b041879e8c63f15306028a6f649f48 Author: Noel AuthorDate: Wed Oct 21 09:28:47 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 21 14:34:01 2020 +0200 use tools::Long in accessibility..basctl Change-Id: I67087c7a281e5bdecbaf227bd3147e7c12828791 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104587 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index 52e796f1e673..e786311fd0df 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -22,6 +22,7 @@ #include #include +#include namespace com::sun::star::datatransfer::clipboard { class XClipboard; @@ -57,7 +58,7 @@ namespace accessibility virtual sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex ) const = 0; virtual boolIsInDropDown() const = 0; virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0; -virtual longGetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0; +virtual tools::LongGetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0; virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetClipboard() = 0; }; diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index 919cbbdce5b3..b5e09034d01c 100644 --- a/accessibility/inc/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -163,13 +163,13 @@ public: Pair aEntryCharacterRange = m_aComboListBox.GetLineStartEnd( _nEntryPos ); if ( aEntryCharacterRange.A() + _nCharacterIndex <= aEntryCharacterRange.B() ) { -long nIndex = aEntryCharacterRange.A() + _nCharacterIndex; +tools::Long nIndex = aEntryCharacterRange.A() + _nCharacterIndex; aRect = m_aComboListBox.GetCharacterBounds( nIndex ); } return aRect; } -long GetIndexForPoint( const Point& rPoint, sal_Int32& nPos ) const override +tools::Long GetIndexForPoint( const Point& rPoint, sal_Int32& nPos ) const override { return m_aComboListBox.GetIndexForPoint( rPoint, nPos ); } diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index cf9aa221a5a1..75b96f4a825d 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -243,7 +243,7 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() ensureIsAlive(); Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows(); -for(long i=0; i(pParagraph->getNumber()); // XXX numeric overflow -::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoin
[Libreoffice-commits] core.git: accessibility/inc accessibility/source connectivity/inc cppcanvas/inc cppuhelper/inc dbaccess/inc desktop/inc drawinglayer/inc include/vcl sd/inc solenv/clang-format st
accessibility/inc/pch/precompiled_acc.hxx|2 +- accessibility/source/standard/vclxaccessibleedit.cxx |2 +- connectivity/inc/pch/precompiled_ado.hxx |2 +- cppcanvas/inc/pch/precompiled_cppcanvas.hxx |3 ++- cppuhelper/inc/pch/precompiled_cppuhelper.hxx|3 ++- dbaccess/inc/pch/precompiled_dba.hxx |3 +-- desktop/inc/pch/precompiled_deploymentmisc.hxx |3 ++- desktop/inc/pch/precompiled_sofficeapp.hxx |4 +--- drawinglayer/inc/pch/precompiled_drawinglayer.hxx|3 +-- include/vcl/toolkit/combobox.hxx |2 +- include/vcl/toolkit/edit.hxx |9 + include/vcl/toolkit/fixed.hxx|2 +- include/vcl/toolkit/spinfld.hxx |2 +- include/vcl/toolkit/vclmedit.hxx |2 +- sd/inc/pch/precompiled_sd.hxx|3 ++- solenv/clang-format/excludelist |2 +- starmath/inc/pch/precompiled_sm.hxx |3 ++- sw/inc/pch/precompiled_sw.hxx|5 +++-- toolkit/source/awt/vclxaccessiblecomponent.cxx |2 +- toolkit/source/awt/vclxtoolkit.cxx |2 +- toolkit/source/controls/filectrl.cxx |2 +- vcl/inc/pch/precompiled_vcl.hxx |4 ++-- vcl/inc/salvtables.hxx |2 +- vcl/qa/cppunit/lifecycle.cxx |2 +- vcl/source/control/button.cxx|2 +- vcl/source/control/edit.cxx |2 +- vcl/source/edit/texteng.cxx |2 +- vcl/source/edit/textview.cxx |2 +- vcl/source/treelist/treelistbox.cxx |2 +- vcl/source/uitest/uiobject.cxx |2 +- vcl/source/window/brdwin.cxx |2 +- vcl/source/window/builder.cxx|2 +- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 +- 33 files changed, 45 insertions(+), 42 deletions(-) New commits: commit cef50b52668a229689ddc796caf8e3818beb3935 Author: Caolán McNamara AuthorDate: Tue Sep 1 15:29:54 2020 +0100 Commit: Caolán McNamara CommitDate: Wed Sep 2 12:52:26 2020 +0200 move Edit into toolkit only headers Change-Id: If51bf7143116721e8f16272cf8aff797651d5ed1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101880 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index fd794b6b9894..8fc3e989a5cd 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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:04:15 using: + Generated on 2020-09-01 15:29:27 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 10a28afc626c..56fe32010939 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 821b53a60b24..fc58921859a0 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.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-27 17:03:22 using: + Generated on 2020-09-01 15:29:31 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index 4093507423f1..1f2059c2dd20 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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-27 17:03:27 using: + Generated on 2020-09-01 15:29:33 using: ./bin/update_pch cppcanvas cppcanvas --cutoff=11 --exclude:system --include:module --include:local If after up
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/inc chart2/inc comphelper/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglayer/
accessibility/inc/extended/accessiblelistboxentry.hxx|2 - accessibility/inc/pch/precompiled_acc.hxx| 23 ++- accessibility/source/extended/accessiblelistbox.cxx |4 +- accessibility/source/extended/accessiblelistboxentry.cxx |2 - basctl/inc/pch/precompiled_basctl.hxx| 15 +++-- chart2/inc/pch/precompiled_chartcontroller.hxx |5 --- chart2/inc/pch/precompiled_chartcore.hxx |3 + comphelper/inc/pch/precompiled_comphelper.hxx|4 -- connectivity/inc/pch/precompiled_ado.hxx |5 --- connectivity/inc/pch/precompiled_calc.hxx|3 - connectivity/inc/pch/precompiled_dbase.hxx |3 - connectivity/inc/pch/precompiled_dbpool2.hxx |3 - connectivity/inc/pch/precompiled_dbtools.hxx |3 + connectivity/inc/pch/precompiled_firebird_sdbc.hxx |9 - connectivity/inc/pch/precompiled_flat.hxx|4 -- connectivity/inc/pch/precompiled_mysql_jdbc.hxx |5 --- connectivity/inc/pch/precompiled_odbc.hxx|3 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |4 -- cppuhelper/inc/pch/precompiled_cppuhelper.hxx|3 + cui/inc/pch/precompiled_cui.hxx | 15 + dbaccess/inc/pch/precompiled_dba.hxx |3 + dbaccess/inc/pch/precompiled_dbu.hxx |5 +-- desktop/inc/pch/precompiled_deployment.hxx |5 +-- desktop/inc/pch/precompiled_deploymentgui.hxx|3 + desktop/inc/pch/precompiled_sofficeapp.hxx |5 +-- drawinglayer/inc/pch/precompiled_drawinglayer.hxx|4 +- emfio/inc/pch/precompiled_emfio.hxx |3 - external/skia/inc/pch/precompiled_skia.hxx |3 + framework/inc/pch/precompiled_fwk.hxx|5 --- include/vcl/toolkit/svlbitm.hxx |2 - include/vcl/toolkit/svtabbx.hxx |2 - include/vcl/toolkit/treelist.hxx | 11 +++ include/vcl/toolkit/treelistbox.hxx | 11 +++ include/vcl/toolkit/treelistentries.hxx | 10 +++--- include/vcl/toolkit/treelistentry.hxx| 13 include/vcl/toolkit/viewdataentry.hxx|9 +++-- include/vcl/uitest/uiobject.hxx |1 lotuswordpro/inc/pch/precompiled_lwpft.hxx |4 -- oox/inc/pch/precompiled_oox.hxx |3 - package/inc/pch/precompiled_package2.hxx | 10 +- package/inc/pch/precompiled_xstor.hxx|4 -- reportdesign/inc/pch/precompiled_rpt.hxx |7 reportdesign/inc/pch/precompiled_rptui.hxx | 12 --- reportdesign/inc/pch/precompiled_rptxml.hxx |8 - sc/inc/pch/precompiled_sc.hxx|5 --- sc/inc/pch/precompiled_scfilt.hxx|4 +- sc/inc/pch/precompiled_vbaobj.hxx|3 - sd/inc/pch/precompiled_sd.hxx|7 ++-- sd/inc/pch/precompiled_sdui.hxx |7 +--- sdext/inc/pch/precompiled_PresentationMinimizer.hxx |8 - sdext/inc/pch/precompiled_PresenterScreen.hxx|8 + sfx2/inc/pch/precompiled_sfx.hxx |6 +-- slideshow/inc/pch/precompiled_slideshow.hxx |4 -- solenv/clang-format/excludelist |8 ++--- starmath/inc/pch/precompiled_sm.hxx |4 -- svl/inc/pch/precompiled_svl.hxx |4 +- svtools/inc/pch/precompiled_svt.hxx |3 - svx/inc/pch/precompiled_svx.hxx |5 +-- svx/inc/pch/precompiled_svxcore.hxx |7 ++-- sw/inc/pch/precompiled_msword.hxx|9 - sw/inc/pch/precompiled_sw.hxx| 11 +++ sw/inc/pch/precompiled_swui.hxx |5 --- sw/inc/pch/precompiled_vbaswobj.hxx |4 +- toolkit/source/controls/tree/treecontrolpeer.cxx |6 +-- unotools/inc/pch/precompiled_utl.hxx |6 ++- uui/inc/pch/precompiled_uui.hxx |3 - vbahelper/inc/pch/precompiled_msforms.hxx|6 --- vcl/inc/iconview.hxx |2 - vcl/inc/pch/precompiled_vcl.hxx | 10 +++--- vcl/inc/svimpbox.hxx |2 - vcl/source/app/salvtables.cxx|4 +- vcl/source/treelist/iconview.cxx |4 +- vcl/source/treeli
[Libreoffice-commits] core.git: accessibility/inc compilerplugins/clang dbaccess/source include/vcl solenv/clang-format svx/source vcl/inc vcl/Library_vcl.mk vcl/source
accessibility/inc/pch/precompiled_acc.hxx |1 compilerplugins/clang/unusedmethods.results | 80 +--- dbaccess/source/ui/inc/JoinExchange.hxx |2 dbaccess/source/ui/inc/TableWindow.hxx |8 - dbaccess/source/ui/querydesign/JoinExchange.cxx |6 dbaccess/source/ui/querydesign/TableWindow.cxx | 17 -- include/vcl/mnemonicengine.hxx | 153 solenv/clang-format/excludelist |1 svx/source/form/fmexch.cxx |6 svx/source/inc/fmexch.hxx |1 vcl/Library_vcl.mk |1 vcl/inc/pch/precompiled_vcl.hxx |1 vcl/source/window/mnemonicengine.cxx| 108 13 files changed, 59 insertions(+), 326 deletions(-) New commits: commit c8b7a833c8f195facf225d062adc762a07ea55b9 Author: Noel Grandin AuthorDate: Sat Aug 8 10:39:44 2020 +0200 Commit: Noel Grandin CommitDate: Sat Aug 8 18:57:02 2020 +0200 loplugin:unusedmethods Change-Id: I58819edd0965ff52c3fc6c20d84bc5951a79bbe2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100381 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index a4b20c1ad963..a79bfdc5884f 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -124,7 +124,6 @@ #include #include #include -#include #include #include #include diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 6a24160930b2..57dcd588b95f 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -20,9 +20,9 @@ basic/source/inc/buffer.hxx:42 void SbiBuffer::operator+=(short) basic/source/inc/buffer.hxx:46 void SbiBuffer::operator+=(int) -bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:171 +bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:185 void CPPU_CURRENT_NAMESPACE::raiseException(struct _uno_Any *,struct _uno_Mapping *) -bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:174 +bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:188 void CPPU_CURRENT_NAMESPACE::fillUnoException(struct _uno_Any *,struct _uno_Mapping *) canvas/inc/rendering/icolorbuffer.hxx:48 unsigned char * canvas::IColorBuffer::lock() const @@ -104,7 +104,7 @@ connectivity/source/inc/OTypeInfo.hxx:47 _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const cui/source/dialogs/SpellAttrib.hxx:72 _Bool svx::SpellErrorDescription::operator==(const struct svx::SpellErrorDescription &) const -cui/source/inc/AdditionsDialog.hxx:141 +cui/source/inc/AdditionsDialog.hxx:150 void SearchAndParseThread::AppendAllExtensions() cui/source/inc/cfg.hxx:336 class rtl::OUString SvxMenuEntriesListBox::get_text(int) @@ -154,6 +154,8 @@ dbaccess/source/ui/inc/indexcollection.hxx:62 class __gnu_debug::_Safe_iterator > >, class std::__debug::vector >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::find(const class rtl::OUString &) const dbaccess/source/ui/inc/indexcollection.hxx:64 class __gnu_debug::_Safe_iterator > >, class std::__debug::vector >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::findOriginal(const class rtl::OUString &) const +dbaccess/source/ui/inc/JoinExchange.hxx:55 +void dbaui::OJoinExchObj::StartDrag(class vcl::Window *,signed char,class dbaui::IDragTransferableListener *) dbaccess/source/ui/inc/opendoccontrols.hxx:45 _Bool dbaui::OpenDocumentButton::get_sensitive() const dbaccess/source/ui/inc/opendoccontrols.hxx:68 @@ -164,6 +166,8 @@ dbaccess/source/ui/inc/sbamultiplex.hxx:385 class cppu::OInterfaceContainerHelper * dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &) dbaccess/source/ui/inc/SqlNameEdit.hxx:113 void dbaui::OSQLNameEntry::set_sensitive(_Bool) +dbaccess/source/ui/inc/TableWindow.hxx:102 +_Bool dbaui::OTableWindow::HandleKeyInput(const class KeyEvent &) dbaccess/source/ui/inc/WTypeSelect.hxx:76 void dbaui::OWizTypeSelectList::show() desktop/source/lib/lokclipboard.hxx:96 @@ -686,7 +690,7 @@ include/svx/dlgctrl.hxx:245 _Bool SvxLineLB::get_sensitive() const include/svx/dlgctrl.hxx:267 void SvxLineEndLB::set_active_text(const class rtl::OUString &) -include/svx/framelink.hxx:198 +include/svx/framelink.hxx:170 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) include/svx/gallery1.hxx:58 const class std::unique_ptr > & GalleryThemeEntry::getGalleryBinaryEngineEntry() const @@ -866,8 +870,18 @@ include/vcl/ITiledRenderable.hxx:214 enum PointerStyle vcl::ITiledRenderable::getPointer() include/vcl/lok.hxx:22 void vcl::lok::unregisterPollCallbacks(
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc comphelper/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglayer/inc emfio/i
accessibility/inc/pch/precompiled_acc.hxx | 13 +++ basctl/inc/pch/precompiled_basctl.hxx | 17 ++-- basic/inc/pch/precompiled_sb.hxx|3 chart2/inc/pch/precompiled_chartcontroller.hxx |7 + chart2/inc/pch/precompiled_chartcore.hxx|4 - comphelper/inc/pch/precompiled_comphelper.hxx |3 connectivity/inc/pch/precompiled_ado.hxx|2 connectivity/inc/pch/precompiled_dbase.hxx |3 connectivity/inc/pch/precompiled_dbtools.hxx|4 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |4 - cppuhelper/inc/pch/precompiled_cppuhelper.hxx |3 cui/inc/pch/precompiled_cui.hxx |9 +- dbaccess/inc/pch/precompiled_dba.hxx|7 - dbaccess/inc/pch/precompiled_dbaxml.hxx |5 - dbaccess/inc/pch/precompiled_dbu.hxx| 27 +++ dbaccess/inc/pch/precompiled_sdbt.hxx |3 desktop/inc/pch/precompiled_deploymentmisc.hxx |3 desktop/inc/pch/precompiled_sofficeapp.hxx | 14 ++- drawinglayer/inc/pch/precompiled_drawinglayer.hxx | 11 +- emfio/inc/pch/precompiled_emfio.hxx |6 - external/skia/inc/pch/precompiled_skia.hxx |9 +- forms/inc/pch/precompiled_frm.hxx |4 - framework/inc/pch/precompiled_fwk.hxx | 43 --- lotuswordpro/inc/pch/precompiled_lwpft.hxx | 12 +-- oox/inc/pch/precompiled_oox.hxx |9 +- package/inc/pch/precompiled_package2.hxx|5 + reportdesign/inc/pch/precompiled_rpt.hxx| 76 +--- reportdesign/inc/pch/precompiled_rptui.hxx |4 - reportdesign/inc/pch/precompiled_rptxml.hxx | 23 ++ sc/inc/pch/precompiled_sc.hxx | 10 ++ sc/inc/pch/precompiled_scfilt.hxx |4 - sd/inc/pch/precompiled_sd.hxx |5 + sd/inc/pch/precompiled_sdui.hxx |5 + sdext/inc/pch/precompiled_PresentationMinimizer.hxx |9 -- slideshow/inc/pch/precompiled_slideshow.hxx |3 sot/inc/pch/precompiled_sot.hxx |3 starmath/inc/pch/precompiled_sm.hxx |7 - svgio/inc/pch/precompiled_svgio.hxx |6 - svl/inc/pch/precompiled_svl.hxx |4 - svtools/inc/pch/precompiled_svt.hxx |4 - svx/inc/pch/precompiled_svx.hxx | 15 ++- sw/inc/pch/precompiled_msword.hxx | 13 ++- sw/inc/pch/precompiled_sw.hxx | 10 ++ sw/inc/pch/precompiled_swui.hxx |6 + sw/inc/pch/precompiled_vbaswobj.hxx |5 + unotools/inc/pch/precompiled_utl.hxx|8 -- unoxml/inc/pch/precompiled_unoxml.hxx |7 - uui/inc/pch/precompiled_uui.hxx | 12 --- vbahelper/inc/pch/precompiled_msforms.hxx |3 vbahelper/inc/pch/precompiled_vbahelper.hxx |3 vcl/inc/pch/precompiled_vcl.hxx |4 - vcl/source/filter/GraphicNativeTransform.cxx|8 -- vcl/source/filter/jpeg/Exif.cxx | 36 - writerfilter/inc/pch/precompiled_writerfilter.hxx |5 - xmloff/inc/pch/precompiled_xo.hxx |6 + xmloff/inc/pch/precompiled_xof.hxx |5 - xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 13 --- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |3 58 files changed, 295 insertions(+), 260 deletions(-) New commits: commit b050b7eeff089ead4dd121967cf323d683f171bc Author: Caolán McNamara AuthorDate: Thu Jul 9 17:10:02 2020 +0100 Commit: Caolán McNamara CommitDate: Sun Jul 12 12:20:05 2020 +0200 update pches Change-Id: I75602277a5a26b012a12f2c4f4b7ff5bb663b0b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98474 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 108cdf397c28..a4b20c1ad963 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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-06-19 17:39:54 using: + Generated on 2020-07-09 17:06:12 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ #include #include #include +#include #include #include #include
[Libreoffice-commits] core.git: accessibility/inc accessibility/source include/vcl solenv/clang-format toolkit/source vcl/inc vcl/qa vcl/source vcl/workben
accessibility/inc/pch/precompiled_acc.hxx |7 +-- accessibility/source/helper/acc_factory.cxx |2 +- accessibility/source/standard/vclxaccessiblebox.cxx |2 +- accessibility/source/standard/vclxaccessiblelist.cxx |2 +- accessibility/source/standard/vclxaccessiblelistitem.cxx |2 +- accessibility/source/standard/vclxaccessibletextfield.cxx |2 +- include/vcl/toolkit/combobox.hxx |2 +- include/vcl/toolkit/lstbox.hxx|4 solenv/clang-format/blacklist |2 +- toolkit/source/awt/vclxtoolkit.cxx|2 +- toolkit/source/awt/vclxwindows.cxx|2 +- vcl/inc/pch/precompiled_vcl.hxx |2 +- vcl/inc/salvtables.hxx|2 +- vcl/qa/cppunit/dndtest.cxx|2 +- vcl/source/control/combobox.cxx |2 +- vcl/source/control/imp_listbox.cxx|2 +- vcl/source/control/listbox.cxx|2 +- vcl/source/control/tabctrl.cxx|2 +- vcl/source/uitest/uiobject.cxx|2 +- vcl/source/window/builder.cxx |2 +- vcl/workben/svpclient.cxx |2 +- 21 files changed, 28 insertions(+), 21 deletions(-) New commits: commit 501c8d64b5831ccbf943db9342f337ed89ff0652 Author: Caolán McNamara AuthorDate: Fri Jun 19 17:40:35 2020 +0100 Commit: Caolán McNamara CommitDate: Tue Jun 23 12:50:52 2020 +0200 move ListBox to toolkit-only headers Change-Id: I6266dedb17cd7c3b730fc69804695536fef37cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96751 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 839b881744c0..108cdf397c28 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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-04-25 20:54:48 using: + Generated on 2020-06-19 17:39:54 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -49,6 +49,7 @@ #include #include #include +#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -113,7 +114,6 @@ #include #include #include -#include #include #include #include @@ -133,6 +133,7 @@ #include #include #include +#include #include #include #include @@ -167,6 +168,7 @@ #include #include #include +#include #include #include #include @@ -306,6 +308,7 @@ #include #include #include +#include #include #include #include diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 3ede3d7157df..a4648485c2dc 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index fd382ff5b06b..d8edd7e206bf 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index e405b30fb4c3..b64b10bb8cb9 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 9615c43eff54..7f807c5e7240 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index b0527d049bb2..c94e46e3d5ed 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -18,7 +18
[Libreoffice-commits] core.git: accessibility/inc accessibility/source editeng/source include/editeng include/svx offapi/com offapi/UnoApi_offapi.mk sc/source sdext/source starmath/source svx/source s
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx |2 accessibility/inc/extended/AccessibleGridControlTableCell.hxx|2 accessibility/inc/extended/accessibleiconchoicectrlentry.hxx |2 accessibility/inc/extended/accessiblelistboxentry.hxx|2 accessibility/inc/extended/textwindowaccessibility.hxx |3 accessibility/inc/standard/vclxaccessibleedit.hxx|2 accessibility/inc/standard/vclxaccessiblelistitem.hxx|2 accessibility/inc/standard/vclxaccessiblemenuitem.hxx|2 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |2 accessibility/inc/standard/vclxaccessibletabpage.hxx |2 accessibility/inc/standard/vclxaccessibletextcomponent.hxx |2 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |2 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |4 accessibility/source/extended/AccessibleGridControlTableCell.cxx |4 accessibility/source/extended/accessibleiconchoicectrlentry.cxx |5 accessibility/source/extended/accessiblelistboxentry.cxx |5 accessibility/source/extended/textwindowaccessibility.cxx|6 accessibility/source/standard/vclxaccessibleedit.cxx |4 accessibility/source/standard/vclxaccessiblelistitem.cxx |5 accessibility/source/standard/vclxaccessiblemenuitem.cxx |5 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx|5 accessibility/source/standard/vclxaccessibletabpage.cxx |5 accessibility/source/standard/vclxaccessibletextcomponent.cxx|4 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |5 editeng/source/accessibility/AccessibleEditableTextPara.cxx |5 editeng/source/accessibility/AccessibleStaticTextBase.cxx|5 include/editeng/AccessibleEditableTextPara.hxx |2 include/editeng/AccessibleStaticTextBase.hxx |2 include/svx/AccessibleShape.hxx |2 offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/accessibility/AccessibleScrollType.idl | 81 ++ offapi/com/sun/star/accessibility/XAccessibleText.idl| 27 +++ sc/source/ui/Accessibility/AccessibleCsvControl.cxx |5 sc/source/ui/inc/AccessibleCsvControl.hxx|3 sdext/source/presenter/PresenterAccessibility.cxx| 14 + starmath/source/accessibility.cxx|5 starmath/source/accessibility.hxx|2 svx/source/accessibility/AccessibleShape.cxx |1 sw/source/core/access/accnotextframe.cxx |1 sw/source/core/access/accnotextframe.hxx |2 sw/source/core/access/accpara.cxx| 67 sw/source/core/access/accpara.hxx|2 vcl/unx/gtk3/a11y/gtk3atktext.cxx| 56 ++ 43 files changed, 365 insertions(+) New commits: commit b46a0a7f9f88a0213b0a5ca2712b6eb93b74d088 Author: Colomban Wendling AuthorDate: Thu Apr 30 10:49:37 2020 +0200 Commit: Stephan Bergmann CommitDate: Thu May 7 12:11:33 2020 +0200 tdf#118418 implement scrollSubstringTo() for gtk Define & use new accessibility scroll type compatible with IAccessible2 and extend the XAccessibleText interface to require scrollSubstringTo(). Co-authored-by: Martin Pieuchot Change-Id: Id3b2e8616892d7dcbfb41a14b72a8a457fd1dbf6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89851 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 6823fa67eb7a..89569914c516 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -21,6 +21,7 @@ #include #include #include +#include namespace accessibility { @@ -114,6 +115,7 @@ namespace accessibility virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; +virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override; }; } diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTab
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc comphelper/inc connectivity/inc cppcanvas/inc cui/inc dbaccess/inc desktop/inc drawinglayer/inc editeng/inc external/l
accessibility/inc/pch/precompiled_acc.hxx |6 +--- basctl/inc/pch/precompiled_basctl.hxx |7 + basic/inc/pch/precompiled_sb.hxx|3 +- chart2/inc/pch/precompiled_chartcontroller.hxx |5 ++- comphelper/inc/pch/precompiled_comphelper.hxx |4 +- connectivity/inc/pch/precompiled_ado.hxx|2 - connectivity/inc/pch/precompiled_dbase.hxx |4 +- cppcanvas/inc/pch/precompiled_cppcanvas.hxx |7 + cui/inc/pch/precompiled_cui.hxx |8 + dbaccess/inc/pch/precompiled_dba.hxx|6 +--- dbaccess/inc/pch/precompiled_dbaxml.hxx | 10 ++- dbaccess/inc/pch/precompiled_dbu.hxx|4 ++ desktop/inc/pch/precompiled_sofficeapp.hxx |6 +--- drawinglayer/inc/pch/precompiled_drawinglayer.hxx |7 ++--- editeng/inc/pch/precompiled_editeng.hxx |7 ++--- external/libmwaw/inc/pch/precompiled_mwaw.hxx |5 ++- forms/inc/pch/precompiled_frm.hxx |3 +- framework/inc/pch/precompiled_fwe.hxx |9 +- framework/inc/pch/precompiled_fwi.hxx |7 ++--- framework/inc/pch/precompiled_fwk.hxx | 13 +++-- framework/inc/pch/precompiled_fwl.hxx |9 +- oox/inc/pch/precompiled_oox.hxx |5 ++- package/inc/pch/precompiled_package2.hxx|5 +-- reportdesign/inc/pch/precompiled_rpt.hxx| 27 ++-- reportdesign/inc/pch/precompiled_rptui.hxx |9 ++ reportdesign/inc/pch/precompiled_rptxml.hxx |8 ++--- sc/inc/pch/precompiled_sc.hxx |4 ++ sc/inc/pch/precompiled_scfilt.hxx |3 +- sd/inc/pch/precompiled_sd.hxx |6 +++- sd/inc/pch/precompiled_sdui.hxx |7 + sdext/inc/pch/precompiled_PresentationMinimizer.hxx |8 + sfx2/inc/pch/precompiled_sfx.hxx|4 -- starmath/inc/pch/precompiled_sm.hxx |3 +- svgio/inc/pch/precompiled_svgio.hxx |7 ++--- svtools/inc/pch/precompiled_svt.hxx |4 +- svx/inc/pch/precompiled_svx.hxx | 19 +- svx/inc/pch/precompiled_svxcore.hxx |8 ++--- sw/inc/pch/precompiled_msword.hxx |3 +- sw/inc/pch/precompiled_sw.hxx |5 ++- sw/inc/pch/precompiled_swui.hxx |6 +--- sw/inc/pch/precompiled_vbaswobj.hxx | 10 +-- vbahelper/inc/pch/precompiled_msforms.hxx | 10 +-- vbahelper/inc/pch/precompiled_vbahelper.hxx |3 +- vcl/inc/pch/precompiled_vcl.hxx |6 +--- writerfilter/inc/pch/precompiled_writerfilter.hxx |6 +++- xmloff/inc/pch/precompiled_xo.hxx |4 ++ xmloff/inc/pch/precompiled_xof.hxx |3 +- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |7 + xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 - 49 files changed, 147 insertions(+), 177 deletions(-) New commits: commit 9f07fb6d15de5682cc2e09f0261ba59341ceb8ef Author: Caolán McNamara AuthorDate: Sat Apr 25 20:58:01 2020 +0100 Commit: Caolán McNamara CommitDate: Sun Apr 26 15:34:06 2020 +0200 update pches Change-Id: I83a61da7dda6c72552eecd377f1c3744c92a797e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92909 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 64aa57dbfd1f..839b881744c0 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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-04-21 11:13:02 using: + Generated on 2020-04-25 20:54:48 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -62,9 +63,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -81,7 +80,6 @@ #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 0f8dbc95596b..4eefcdfdf3be 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixe
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc comphelper/inc connectivity/inc cppcanvas/inc cui/inc dbaccess/inc desktop/inc drawinglayer/inc editeng/inc forms/inc
accessibility/inc/pch/precompiled_acc.hxx |6 - basctl/inc/pch/precompiled_basctl.hxx |6 + basic/inc/pch/precompiled_sb.hxx|8 +- chart2/inc/pch/precompiled_chartcontroller.hxx | 10 -- chart2/inc/pch/precompiled_chartcore.hxx|4 - comphelper/inc/pch/precompiled_comphelper.hxx |5 - connectivity/inc/pch/precompiled_ado.hxx|2 connectivity/inc/pch/precompiled_dbtools.hxx| 19 ++--- connectivity/inc/pch/precompiled_file.hxx |4 - connectivity/inc/pch/precompiled_flat.hxx |4 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |7 + cui/inc/pch/precompiled_cui.hxx |9 +- dbaccess/inc/pch/precompiled_dba.hxx| 26 ++- dbaccess/inc/pch/precompiled_dbahsql.hxx|7 - dbaccess/inc/pch/precompiled_dbaxml.hxx | 24 -- dbaccess/inc/pch/precompiled_dbu.hxx| 30 +--- dbaccess/inc/pch/precompiled_sdbt.hxx |6 - desktop/inc/pch/precompiled_deployment.hxx |4 - desktop/inc/pch/precompiled_deploymentgui.hxx |4 - desktop/inc/pch/precompiled_sofficeapp.hxx | 11 +- drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 editeng/inc/pch/precompiled_editeng.hxx | 10 ++ forms/inc/pch/precompiled_frm.hxx | 54 +- framework/inc/pch/precompiled_fwe.hxx |5 - framework/inc/pch/precompiled_fwi.hxx |3 framework/inc/pch/precompiled_fwk.hxx |6 + framework/inc/pch/precompiled_fwl.hxx |5 - include/vcl/uitest/uiobject.hxx | 17 ++-- oox/inc/pch/precompiled_oox.hxx | 74 ++-- oox/source/drawingml/shapepropertymap.cxx |4 - oox/source/helper/modelobjecthelper.cxx |2 reportdesign/inc/pch/precompiled_rpt.hxx| 19 + sc/inc/pch/precompiled_sc.hxx |6 + sc/source/ui/view/gridwin.cxx |1 sd/inc/pch/precompiled_sd.hxx |3 sd/inc/pch/precompiled_sdui.hxx |5 - sdext/inc/pch/precompiled_PresentationMinimizer.hxx |3 sfx2/inc/pch/precompiled_sfx.hxx|4 - slideshow/inc/pch/precompiled_slideshow.hxx |9 +- sot/inc/pch/precompiled_sot.hxx |3 starmath/inc/pch/precompiled_sm.hxx |4 - svl/inc/pch/precompiled_svl.hxx |3 svx/inc/pch/precompiled_svx.hxx |3 svx/inc/pch/precompiled_svxcore.hxx | 15 sw/inc/pch/precompiled_msword.hxx |3 sw/inc/pch/precompiled_sw.hxx |6 - sw/inc/pch/precompiled_vbaswobj.hxx |4 - uui/inc/pch/precompiled_uui.hxx |8 -- vbahelper/inc/pch/precompiled_msforms.hxx | 19 + vbahelper/inc/pch/precompiled_vbahelper.hxx | 30 vcl/inc/pch/precompiled_vcl.hxx |7 + vcl/source/control/edit.cxx |1 vcl/source/treelist/treelistbox.cxx |2 vcl/source/uitest/logger.cxx|1 vcl/source/uitest/uiobject.cxx |4 - vcl/source/uitest/uitest.cxx|1 vcl/source/window/dialog.cxx|1 vcl/source/window/window.cxx|1 writerfilter/inc/pch/precompiled_writerfilter.hxx | 12 --- xmloff/inc/pch/precompiled_xo.hxx |6 - xmlscript/inc/pch/precompiled_xmlscript.hxx |3 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |4 - xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 63 files changed, 234 insertions(+), 338 deletions(-) New commits: commit dfb24c3d9f3bdbdace593bbd85307a2467c0c7ec Author: Caolán McNamara AuthorDate: Tue Apr 21 11:20:17 2020 +0100 Commit: Caolán McNamara CommitDate: Wed Apr 22 09:39:07 2020 +0200 uiobject.hxx only needs forward declares and update pches accordingly Change-Id: I411712532fd85961bffe6678416fcdc1d9c7f53d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92617 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index deb1105fb30d..64aa57dbfd1f 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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-02-01 10:57:24 using: + Generated on 2020-04-21 11:13:02 using:
[Libreoffice-commits] core.git: accessibility/inc fpicker/source include/svtools include/vcl svtools/inc svtools/source toolkit/inc vcl/source
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx |2 - fpicker/source/office/fileview.hxx |2 - include/svtools/brwbox.hxx | 14 +++ include/svtools/ctrlbox.hxx| 10 ++--- include/svtools/editbrowsebox.hxx |2 - include/svtools/editsyntaxhighlighter.hxx |4 +- include/svtools/ehdl.hxx | 12 +++--- include/svtools/embedtransfer.hxx |2 - include/svtools/filechangedchecker.hxx |4 +- include/svtools/framestatuslistener.hxx|2 - include/svtools/htmlout.hxx|2 - include/svtools/parhtml.hxx| 12 +++--- include/svtools/place.hxx |2 - include/svtools/ruler.hxx | 14 +++ include/svtools/statusbarcontroller.hxx|2 - include/svtools/stringtransfer.hxx |2 - include/svtools/toolboxcontroller.hxx |2 - include/svtools/unoevent.hxx |2 - include/vcl/imap.hxx |2 - include/vcl/ivctrl.hxx |2 - include/vcl/treelistbox.hxx|2 - svtools/inc/FltCallDialogParameter.hxx |2 - svtools/inc/table/tablecontrolinterface.hxx|4 +- svtools/source/brwbox/datwin.hxx | 10 ++--- svtools/source/control/accessibleruler.hxx |2 - svtools/source/control/ctrlbox.cxx |2 - svtools/source/control/ctrltool.cxx|4 +- svtools/source/control/inettbc.cxx |6 +-- svtools/source/control/scriptedtext.cxx|2 - svtools/source/control/tabbar.cxx |4 +- svtools/source/control/valueimp.hxx|4 +- svtools/source/dialogs/ServerDetailsControls.hxx |2 - svtools/source/dialogs/addresstemplate.cxx |6 +-- svtools/source/dialogs/insdlg.cxx | 14 +++ svtools/source/filter/exportdialog.hxx | 26 ++--- svtools/source/misc/acceleratorexecute.cxx |2 - svtools/source/misc/imagemgr.cxx |4 +- svtools/source/misc/langhelp.cxx |2 - svtools/source/misc/templatefoldercache.cxx|4 +- svtools/source/table/defaultinputhandler.cxx |6 +-- svtools/source/table/tablegeometry.hxx |4 +- svtools/source/uno/unoimap.cxx |2 - toolkit/inc/controls/filectrl.hxx |2 - vcl/source/control/imivctl.hxx |2 - vcl/source/treelist/headbar.cxx|4 +- vcl/source/treelist/treelistentry.cxx |2 - 46 files changed, 110 insertions(+), 110 deletions(-) New commits: commit d077cd6189da55cab0bdea3a265446f362160ae0 Author: Noel Grandin AuthorDate: Fri Mar 13 16:49:06 2020 +0200 Commit: Noel Grandin CommitDate: Fri Mar 13 19:20:38 2020 +0100 Revert "loplugin:constfields in svtools" This reverts commit 07c4aa4298f062cee1894b80ef82e76d5ffcf4c7. Change-Id: Ic3f639581b9aca373f82c011f15be60d117b1943 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90476 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx index 9edb5e2f3616..c7a460770b98 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx @@ -47,7 +47,7 @@ class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtended { private: VclPtrm_pHeadBar; -sal_Int32 const m_nIndexInParent; +sal_Int32m_nIndexInParent; voidFillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index dfd669d9f396..9bf4dca06e0f 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -175,7 +175,7 @@ public: struct SvtContentEntry { -bool const mbIsFolder; +bool mbIsFolder; OUString maURL; SvtContentEntry( const OUString& rURL, bool bIsFolder ) : diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index f7c4919a1c3f..49486aae972a 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtool
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basctl/source basic/source bin/find-unneeded-includes canvas/source chart2/inc chart2/source comphelper/inc comphelper/qa comphelper/source
accessibility/inc/pch/precompiled_acc.hxx |2 basctl/inc/pch/precompiled_basctl.hxx |2 basctl/source/inc/dlgedobj.hxx |4 basic/source/sbx/sbxarray.cxx |4 bin/find-unneeded-includes |3 canvas/source/directx/dx_config.hxx |4 chart2/inc/pch/precompiled_chartcontroller.hxx |2 chart2/source/controller/inc/CharacterPropertyItemConverter.hxx |4 chart2/source/view/axes/VAxisProperties.hxx |6 - comphelper/inc/pch/precompiled_comphelper.hxx |2 comphelper/qa/unit/variadictemplates.cxx | 12 +- comphelper/source/officeinstdir/officeinstallationdirectories.hxx |6 - compilerplugins/clang/store/stylepolice.cxx |2 compilerplugins/clang/unusedfields.writeonly.results |2 connectivity/inc/pch/precompiled_file.hxx |2 connectivity/source/commontools/dbmetadata.cxx |8 - connectivity/source/commontools/sqlerror.cxx | 36 +++ connectivity/source/inc/java/io/Reader.hxx |4 cppcanvas/inc/pch/precompiled_cppcanvas.hxx |2 cppcanvas/source/inc/canvasgraphichelper.hxx |4 cppcanvas/source/wrapper/implcanvas.hxx |4 cui/inc/pch/precompiled_cui.hxx |2 cui/source/options/fontsubs.cxx |2 cui/source/options/tsaurls.cxx |2 dbaccess/inc/pch/precompiled_dba.hxx |2 dbaccess/inc/pch/precompiled_dbu.hxx |2 dbaccess/source/core/api/FilteredContainer.cxx |4 dbaccess/source/core/api/resultcolumn.cxx |2 dbaccess/source/core/api/resultcolumn.hxx | 30 +++--- dbaccess/source/core/dataaccess/documentdefinition.cxx |4 dbaccess/source/core/inc/ContentHelper.hxx |2 dbaccess/source/core/inc/ModelImpl.hxx |2 dbaccess/source/filter/xml/xmlExport.cxx |4 dbaccess/source/ui/app/AppController.cxx |2 dbaccess/source/ui/app/AppController.hxx |2 dbaccess/source/ui/app/AppControllerGen.cxx |4 dbaccess/source/ui/browser/unodatbr.cxx |4 dbaccess/source/ui/dlg/advancedsettings.cxx |2 dbaccess/source/ui/dlg/optionalboolitem.hxx |6 - dbaccess/source/ui/inc/unodatbr.hxx |2 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx |4 desktop/IwyuFilter_desktop.yaml |3 desktop/inc/app.hxx |4 desktop/inc/pch/precompiled_deployment.hxx |2 desktop/inc/pch/precompiled_deploymentgui.hxx |2 desktop/inc/pch/precompiled_sofficeapp.hxx |2 desktop/qa/desktop_app/test_desktop_app.cxx |2 desktop/source/app/app.cxx |2 desktop/source/app/cmdlineargs.cxx |4 desktop/source/app/cmdlineargs.hxx |8 - desktop/source/app/dispatchwatcher.hxx |4 desktop/source/app/officeipcthread.cxx | 10 +- desktop/source/app/officeipcthread.hxx |6 - desktop/source/deployment/gui/dp_gui_service.cxx | 10 +- desktop/source/deployment/gui/dp_gui_updatedialog.cxx |6 - desktop/source/deployment/inc/dp_descriptioninfoset.hxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/qa basctl/source basic/source solenv/clang-format
accessibility/inc/helper/accresmgr.hxx|1 - accessibility/source/inc/floatingwindowaccessible.hxx |2 +- basctl/qa/unit/basctl-dialogs-test.cxx|4 +--- basctl/source/basicide/breakpoint.hxx |7 +++ basic/source/classes/sbintern.cxx |6 +++--- basic/source/inc/eventatt.hxx |2 +- basic/source/inc/sbxmod.hxx |2 +- solenv/clang-format/blacklist |7 --- 8 files changed, 10 insertions(+), 21 deletions(-) New commits: commit a8487acabd5d3896e3b5ae6a0afd9da500f35edb Author: Muhammet Kara AuthorDate: Sun Feb 16 10:27:48 2020 +0300 Commit: Muhammet Kara CommitDate: Sun Feb 16 11:04:43 2020 +0100 clang-format accessibility & basctl with under 5-percent lines of change Files which could become clang-format conformant with under 5-percent lines of change relative to the total count of lines in the file are found by using bin/find-clang-format.py, and fixed with /opt/lo/bin/clang-format -i There will be follow-up patches to fix all 'under-5-percent' files. Change-Id: Idc890cac4bb6aed4e36c3556a2abc0744fd086df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88770 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx index e60caddfc5a7..5b16c47e8166 100644 --- a/accessibility/inc/helper/accresmgr.hxx +++ b/accessibility/inc/helper/accresmgr.hxx @@ -23,5 +23,4 @@ OUString AccResId(const char* pId); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index 1a7cb4008458..c36e862360c7 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.hxx @@ -26,7 +26,7 @@ class FloatingWindowAccessible final : public VCLXAccessibleComponent public: using VCLXAccessibleComponent::VCLXAccessibleComponent; -virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override; +virtual void FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx index a719e5c1ae22..b907681f629d 100644 --- a/basctl/qa/unit/basctl-dialogs-test.cxx +++ b/basctl/qa/unit/basctl-dialogs-test.cxx @@ -36,9 +36,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -BasctlDialogsTest::BasctlDialogsTest() -{ -} +BasctlDialogsTest::BasctlDialogsTest() {} void BasctlDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 4b5ab232535e..324564aaa72e 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -28,7 +28,6 @@ class SbModule; namespace basctl { - struct BreakPoint { bool bEnabled; @@ -48,19 +47,19 @@ struct BreakPoint class BreakPointList { private: -BreakPointList& operator =(BreakPointList const &) = delete; +BreakPointList& operator=(BreakPointList const&) = delete; std::vector maBreakPoints; public: BreakPointList(); -BreakPointList(BreakPointList const & rList); +BreakPointList(BreakPointList const& rList); ~BreakPointList(); void reset(); -void transfer(BreakPointList & rList); +void transfer(BreakPointList& rList); void InsertSorted(BreakPoint pBrk); BreakPoint* FindBreakPoint(sal_uInt16 nLine); diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx index 77bfc64e030b..aaf26ee2a34c 100644 --- a/basic/source/classes/sbintern.cxx +++ b/basic/source/classes/sbintern.cxx @@ -25,7 +25,7 @@ SbiGlobals* SbiGlobals::pGlobals = nullptr; SbiGlobals* GetSbData() { -if( !SbiGlobals::pGlobals ) +if (!SbiGlobals::pGlobals) SbiGlobals::pGlobals = new SbiGlobals; return SbiGlobals::pGlobals; } @@ -33,13 +33,13 @@ SbiGlobals* GetSbData() SbiGlobals::SbiGlobals() { pInst = nullptr; -pSbFac= nullptr; +pSbFac = nullptr; pUnoFac = nullptr; pTypeFac = nullptr; pClassFac = nullptr; pOLEFac = nullptr; pFormFac = nullptr; -pMod = nullptr; +pMod = nullptr; pCompMod = nullptr; // JSM nInst = 0; nCode = ERRCODE_NONE; diff --git a/basic/source/inc/eventatt.hxx b/basic/source/inc/eventatt.hxx index fbe0104db00f..b38c83c597ce 100644 --- a/basic/source/inc/eventatt.hxx +++ b/basic/source/inc/eventatt.hxx @@ -27,7 +27,7 @@ class SbxArray; // Instantiate "com.sun.star.awt.UnoControlDialog" on basis // of a DialogLibrary entry: Convert from XML-ByteSequence // and attach events. -voi
[Libreoffice-commits] core.git: accessibility/inc basctl/inc basegfx/inc basic/inc basic/source bin/update_pch chart2/inc chart2/source comphelper/inc configmgr/inc connectivity/inc connectivity/sourc
accessibility/inc/pch/precompiled_acc.hxx |3 basctl/inc/pch/precompiled_basctl.hxx | 117 - basegfx/inc/pch/precompiled_basegfx.hxx |6 basic/inc/pch/precompiled_sb.hxx | 45 +++ basic/source/classes/sb.cxx |7 bin/update_pch| 25 + chart2/inc/pch/precompiled_chartcontroller.hxx| 65 + chart2/inc/pch/precompiled_chartcore.hxx | 86 ++ chart2/source/controller/dialogs/DataBrowser.cxx |4 comphelper/inc/pch/precompiled_comphelper.hxx |4 configmgr/inc/pch/precompiled_configmgr.hxx |3 connectivity/inc/pch/precompiled_ado.hxx | 26 +- connectivity/inc/pch/precompiled_calc.hxx | 30 +- connectivity/inc/pch/precompiled_dbase.hxx| 92 --- connectivity/inc/pch/precompiled_dbpool2.hxx |8 connectivity/inc/pch/precompiled_dbtools.hxx | 31 +- connectivity/inc/pch/precompiled_file.hxx | 84 +++--- connectivity/inc/pch/precompiled_firebird_sdbc.hxx| 18 - connectivity/inc/pch/precompiled_flat.hxx | 64 ++--- connectivity/inc/pch/precompiled_mysql_jdbc.hxx | 176 ++ connectivity/inc/pch/precompiled_odbc.hxx | 48 ++- connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |9 connectivity/source/drivers/dbase/DTable.cxx |4 cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 12 cppuhelper/inc/pch/precompiled_cppuhelper.hxx |5 cui/inc/pch/precompiled_cui.hxx | 56 dbaccess/inc/pch/precompiled_dba.hxx | 70 + dbaccess/inc/pch/precompiled_dbaxml.hxx |8 dbaccess/inc/pch/precompiled_dbu.hxx | 91 +++ dbaccess/inc/pch/precompiled_sdbt.hxx |4 desktop/inc/pch/precompiled_deployment.hxx| 27 -- desktop/inc/pch/precompiled_deploymentgui.hxx | 20 - desktop/inc/pch/precompiled_deploymentmisc.hxx| 14 - desktop/inc/pch/precompiled_sofficeapp.hxx| 42 --- drawinglayer/inc/pch/precompiled_drawinglayer.hxx | 23 - editeng/inc/pch/precompiled_editeng.hxx | 38 +-- emfio/inc/pch/precompiled_emfio.hxx |6 external/liborcus/inc/pch/precompiled_orcus.hxx |3 external/pdfium/inc/pch/precompiled_pdfium.hxx|7 forms/inc/pch/precompiled_frm.hxx | 28 ++ framework/inc/pch/precompiled_fwe.hxx | 15 - framework/inc/pch/precompiled_fwk.hxx | 62 framework/inc/pch/precompiled_fwl.hxx | 61 lotuswordpro/inc/pch/precompiled_lwpft.hxx|4 oox/inc/pch/precompiled_oox.hxx |6 package/inc/pch/precompiled_package2.hxx |3 reportdesign/inc/pch/precompiled_rpt.hxx | 32 ++ reportdesign/inc/pch/precompiled_rptui.hxx| 31 ++ reportdesign/inc/pch/precompiled_rptxml.hxx |5 sal/inc/pch/precompiled_sal.hxx |3 sc/inc/pch/precompiled_sc.hxx | 101 +++- sc/inc/pch/precompiled_scfilt.hxx | 111 sc/inc/pch/precompiled_scui.hxx | 66 + sc/inc/pch/precompiled_vbaobj.hxx | 13 - sd/inc/pch/precompiled_sd.hxx | 119 + sd/inc/pch/precompiled_sdui.hxx | 138 ++ sd/source/core/sdpage.cxx |2 sd/source/ui/dlg/animobjs.cxx | 16 - sd/source/ui/inc/OutlinerIteratorImpl.hxx |4 sdext/inc/pch/precompiled_PresentationMinimizer.hxx | 13 - sdext/inc/pch/precompiled_PresenterScreen.hxx | 49 +-- sfx2/inc/pch/precompiled_sfx.hxx | 134 +++--- slideshow/inc/pch/precompiled_slideshow.hxx | 81 +++--- slideshow/source/engine/shapes/gdimtftools.cxx|2 starmath/inc/pch/precompiled_sm.hxx | 13 - svgio/inc/pch/precompiled_svgio.hxx |6 svl/inc/pch/precompiled_svl.hxx |6 svtools/inc/pch/precompiled_svt.hxx | 47 +++ svx/inc/pch/precompiled_svx.hxx | 23 + svx/inc/pch/precompiled_svxcore.hxx | 37 ++ svx/source/xml/xmlgrhlp.cxx |6 sw/inc/pch/precompiled_msword.hxx | 86
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx |3 +-- accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx |4 ++-- accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx|3 +-- accessibility/inc/extended/accessibleeditbrowseboxcell.hxx |8 +++- accessibility/inc/helper/listboxhelper.hxx |2 +- accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx|3 +-- accessibility/inc/standard/vclxaccessibleheaderbar.hxx |2 +- accessibility/inc/standard/vclxaccessiblemenuseparator.hxx |2 +- accessibility/inc/standard/vclxaccessiblepopupmenu.hxx |3 +-- accessibility/inc/standard/vclxaccessibleradiobutton.hxx |3 +-- accessibility/inc/standard/vclxaccessiblescrollbar.hxx |3 +-- accessibility/inc/standard/vclxaccessibletabpagewindow.hxx |3 +-- accessibility/inc/standard/vclxaccessibletextfield.hxx |5 ++--- 13 files changed, 17 insertions(+), 27 deletions(-) New commits: commit a41fe32ba989cad3b6e2e20793b3fff469230eb6 Author: Noel Grandin AuthorDate: Tue Jan 14 10:27:30 2020 +0200 Commit: Noel Grandin CommitDate: Tue Jan 14 14:06:10 2020 +0100 loplugin:finalclasses in accessibility Change-Id: If9314712090bc2494f86afa8f0c25038f8307278 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86742 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 800d3957b48a..0ad34ba18ede 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -30,14 +30,13 @@ namespace accessibility css::accessibility::XAccessibleValue > AccessibleCheckBoxCell_BASE; -class AccessibleCheckBoxCell : public AccessibleBrowseBoxCell +class AccessibleCheckBoxCell final : public AccessibleBrowseBoxCell ,public AccessibleCheckBoxCell_BASE { private: TriState m_eState; bool m_bIsTriState; -protected: virtual ~AccessibleCheckBoxCell() override {} virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index 0a2d10686598..2987483ff65c 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -22,7 +22,7 @@ namespace accessibility { -class AccessibleBrowseBoxHeaderCell : public BrowseBoxAccessibleElement +class AccessibleBrowseBoxHeaderCell final : public BrowseBoxAccessibleElement { sal_Int32 m_nColumnRowId; public: @@ -61,7 +61,7 @@ namespace accessibility */ ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; -protected: +private: virtual tools::Rectangle implGetBoundingBox() override; virtual tools::Rectangle implGetBoundingBoxOnScreen() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index d6029b54531d..6823fa67eb7a 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -29,14 +29,13 @@ namespace accessibility > AccessibleTextHelper_BASE; // implementation of a table cell of BrowseBox -class AccessibleBrowseBoxTableCell :public AccessibleBrowseBoxCell +class AccessibleBrowseBoxTableCell final : public AccessibleBrowseBoxCell ,public AccessibleTextHelper_BASE ,public ::comphelper::OCommonAccessibleText { private: sal_Int32 m_nOffset; -protected: // OCommonAccessibleText virtual OUStringimplGetText() final override; virtual css::lang::Locale implGetLocale() override; diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index fb3c2036904a..6d827ac13a05 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -28,7 +28,7 @@ namespace accessibility // = EditBrowseBoxTableCell -class EditBrowseBoxTableCell:public AccessibleBrowseBoxCell +class EditBrowseBoxTableCell final : public AccessibleBrowseBoxCell ,public ::comphelper::OAccessibleContextWrapperHelper { public: @@ -42,10 +42,9 @@
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/AccessibleBrowseBox.hxx |4 +--- accessibility/inc/extended/AccessibleBrowseBoxBase.hxx |4 +--- accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx |4 +--- accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx|4 +--- accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx |4 +--- accessibility/inc/extended/AccessibleBrowseBoxTable.hxx|4 +--- accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx|4 +--- accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx|4 +--- accessibility/inc/extended/AccessibleGridControl.hxx |4 +--- accessibility/inc/extended/AccessibleGridControlBase.hxx |4 +--- accessibility/inc/extended/AccessibleGridControlHeader.hxx |4 +--- accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx |4 +--- accessibility/inc/extended/AccessibleGridControlTable.hxx |4 +--- accessibility/inc/extended/AccessibleGridControlTableBase.hxx |4 +--- accessibility/inc/extended/AccessibleGridControlTableCell.hxx |4 +--- accessibility/inc/extended/accessiblebrowseboxcell.hxx |4 +--- accessibility/inc/extended/accessibleeditbrowseboxcell.hxx |4 +--- accessibility/inc/extended/accessibleiconchoicectrl.hxx|4 +--- accessibility/inc/extended/accessibleiconchoicectrlentry.hxx |4 +--- accessibility/inc/extended/accessiblelistbox.hxx |4 +--- accessibility/inc/extended/accessiblelistboxentry.hxx |4 +--- accessibility/inc/extended/accessibletabbar.hxx|4 +--- accessibility/inc/extended/accessibletabbarbase.hxx|4 +--- accessibility/inc/extended/accessibletabbarpage.hxx|4 +--- accessibility/inc/extended/accessibletabbarpagelist.hxx|4 +--- accessibility/inc/extended/accessibletablistbox.hxx|4 +--- accessibility/inc/extended/accessibletablistboxtable.hxx |4 +--- accessibility/inc/extended/textwindowaccessibility.hxx |4 +--- accessibility/inc/helper/IComboListBoxHelper.hxx |4 +--- accessibility/inc/helper/accresmgr.hxx |4 +--- accessibility/inc/helper/characterattributeshelper.hxx |4 +--- accessibility/inc/helper/listboxhelper.hxx |4 +--- accessibility/inc/standard/accessiblemenubasecomponent.hxx |4 +--- accessibility/inc/standard/accessiblemenucomponent.hxx |4 +--- accessibility/inc/standard/accessiblemenuitemcomponent.hxx |4 +--- accessibility/inc/standard/vclxaccessiblebox.hxx |4 +--- accessibility/inc/standard/vclxaccessiblebutton.hxx|4 +--- accessibility/inc/standard/vclxaccessiblecheckbox.hxx |4 +--- accessibility/inc/standard/vclxaccessiblecombobox.hxx |4 +--- accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx |4 +--- accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx |4 +--- accessibility/inc/standard/vclxaccessibleedit.hxx |4 +--- accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx|4 +--- accessibility/inc/standard/vclxaccessiblefixedtext.hxx |4 +--- accessibility/inc/standard/vclxaccessibleheaderbar.hxx |4 +--- accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx |4 +--- accessibility/inc/standard/vclxaccessiblelist.hxx |4 +--- accessibility/inc/standard/vclxaccessiblelistbox.hxx |4 +--- accessibility/inc/standard/vclxaccessiblelistitem.hxx |4 +--- accessibility/inc/standard/vclxaccessiblemenu.hxx |4 +--- accessibility/inc/standard/vclxaccessiblemenubar.hxx |4 +--- accessibility/inc/standard/vclxaccessiblemenuitem.hxx |4 +--- accessibility/inc/standard/vclxaccessiblemenuseparator.hxx |4 +--- accessibility/inc/standard/vclxaccessiblepopupmenu.hxx |4 +--- accessibility/inc/standard/vclxaccessibleradiobutton.hxx |4 +--- accessibility/inc/standard/vclxaccessiblescrollbar.hxx |4 +--- accessibility/inc/standard/vclxaccessiblestatusbar.hxx |4 +--- accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |4 +--- accessibility/inc/standard/vclxaccessibletabcontrol.hxx|4 +--- accessibility/inc/standard/vclxaccessibletabpage.hxx |4 +--- accessibility/inc/standard/vclxaccessibletabpagewindow.hxx |4 +--- accessibility/inc/standard/vclxaccessibletextcomponent.hxx |4 +--- accessibility/inc/standard/vclxaccessibletextfield.hxx |4 +--- accessibility/inc/standard/vclxaccessibletoolbox.hxx |4 +--- accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |4 +--- accessibility/inc/strings.hrc
[Libreoffice-commits] core.git: accessibility/inc basctl/inc chart2/inc cui/inc include/vcl reportdesign/inc sc/inc sd/inc sfx2/inc svtools/inc svx/inc sw/inc
accessibility/inc/pch/precompiled_acc.hxx | 35 - basctl/inc/pch/precompiled_basctl.hxx | 12 +--- chart2/inc/pch/precompiled_chartcontroller.hxx |9 +- cui/inc/pch/precompiled_cui.hxx|9 -- include/vcl/OptionalBox.hxx|3 -- reportdesign/inc/pch/precompiled_rptui.hxx | 11 +-- sc/inc/pch/precompiled_sc.hxx |7 ++--- sd/inc/pch/precompiled_sdui.hxx|8 +++-- sfx2/inc/pch/precompiled_sfx.hxx | 10 ++- svtools/inc/pch/precompiled_svt.hxx|6 ++-- svx/inc/pch/precompiled_svx.hxx|3 +- svx/inc/pch/precompiled_svxcore.hxx|4 +- sw/inc/pch/precompiled_sw.hxx | 26 +- sw/inc/pch/precompiled_swui.hxx|8 ++--- 14 files changed, 79 insertions(+), 72 deletions(-) New commits: commit bd60ca2f354de4080d6ea6ffe65738f7a0e551d6 Author: Caolán McNamara AuthorDate: Tue Dec 3 09:26:26 2019 + Commit: Caolán McNamara CommitDate: Wed Dec 4 09:58:27 2019 +0100 remove some unnecessary includes and update pches Change-Id: Ieee11f2ea3c5c18a84316a8b7c39a261afd720ed Reviewed-on: https://gerrit.libreoffice.org/84308 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index fe3ceebf5770..2a37c386e4cf 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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 2019-10-17 15:13:07 using: + Generated on 2019-12-03 09:18:05 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -48,7 +47,6 @@ #include #include #include -#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -91,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -102,20 +101,16 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -130,15 +125,16 @@ #include #include #include +#include #include #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -148,8 +144,10 @@ #include #include #include +#include #include #include +#include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include @@ -177,7 +175,6 @@ #include #include #include -#include #include #include #include @@ -191,10 +188,18 @@ #include #include #include -#include +#include +#include #include +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include @@ -242,6 +247,7 @@ #include #include #include +#include #include #include #include @@ -263,7 +269,6 @@ #include #include #include -#include #include #include #include @@ -276,11 +281,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -292,22 +297,18 @@ #include #include #include -#include -#include #include #include #include #include -#include #include #include -#include +#include #include #include #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index f6db030492d1..daedc7b9e12f 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2019-10-17 15:13:51 using: + Generated on 2019-12-03 09:17:43 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -49,11 +49,11 @@ #include #include #include +#include #include #include #include -#include -#include +#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -104,7 +104,6 @@ #include #include #include -#include #include #include #include @@ -158,6 +157,7 @@ #include #include #include +#include #include #endif // PCH_LEVEL >= 2 #if PC