[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 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() , m_nClientId( 0 ) , m_wListBox() -, 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
[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 >() ); +
[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 ==
[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/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 -
[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 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
[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/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,
[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<
[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
[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&
[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 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 ); UNOTOOLS_DLLPUBLIC OUString nget(std::string_view aId, int n, const std::locale ); +UNOTOOLS_DLLPUBLIC OUString get(TranslateId sContextAndId, const std::locale ); 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 ) +{ +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/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 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
[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
[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;
[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 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
[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
[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
[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
[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 +-
[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
[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
[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.
[Libreoffice-commits] core.git: accessibility/inc accessibility/source chart2/source compilerplugins/clang cui/source dbaccess/source include/formula include/sfx2 include/svtools include/svx include/v
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx |2 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx|9 chart2/source/controller/sidebar/ChartTypePanel.cxx | 13 chart2/source/controller/sidebar/ChartTypePanel.hxx |4 compilerplugins/clang/unusedmethods.cxx | 17 compilerplugins/clang/unusedmethods.py| 25 compilerplugins/clang/unusedmethods.results | 312 +- cui/source/inc/SvxMenuConfigPage.hxx |1 cui/source/inc/SvxToolbarConfigPage.hxx |1 cui/source/inc/chardlg.hxx|3 cui/source/inc/numfmt.hxx |1 cui/source/inc/numpages.hxx |2 cui/source/tabpages/chardlg.cxx | 15 cui/source/tabpages/numpages.cxx |5 dbaccess/source/inc/registrationhelper.hxx|2 dbaccess/source/ui/inc/FieldDescControl.hxx |2 include/formula/formula.hxx |1 include/sfx2/prnmon.hxx |1 include/sfx2/templatedefaultview.hxx |2 include/svtools/ctrlbox.hxx |1 include/svx/ChildrenManager.hxx |8 include/svx/colorwindow.hxx |1 include/svx/dialcontrol.hxx |1 include/svx/imapdlg.hxx |1 include/svx/svdograf.hxx |2 include/vcl/builder.hxx |1 include/vcl/slider.hxx|2 sc/source/ui/inc/condformatdlg.hxx|1 sd/source/ui/inc/BulletAndPositionDlg.hxx |1 sfx2/source/control/templatedefaultview.cxx | 17 sfx2/source/view/printer.cxx |5 svtools/source/control/ctrlbox.cxx|5 svx/source/accessibility/ChildrenManager.cxx |5 svx/source/dialog/dialcontrol.cxx |5 svx/source/sidebar/text/TextCharacterSpacingControl.hxx |1 svx/source/tbxctrls/tbcontrl.cxx |5 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx |2 sw/inc/accmap.hxx |3 sw/inc/ndgrf.hxx |3 sw/source/ui/envelp/envprt.hxx|1 sw/source/uibase/inc/regionsw.hxx |1 vcl/source/control/imivctl.hxx|2 vcl/source/control/slider.cxx |6 xmloff/inc/xmlversion.hxx |2 44 files changed, 336 insertions(+), 164 deletions(-) New commits: commit 98f2bd667c45ad8d041673c99678e2f95a749b55 Author: Noel Grandin AuthorDate: Wed Nov 20 09:21:03 2019 +0200 Commit: Noel Grandin CommitDate: Wed Nov 20 09:59:17 2019 +0100 loplugin:unusedmethods Remove a filtering step in the python script that was hiding some results Change-Id: Id94268f150902405ab197c077f18aaedf98845fc Reviewed-on: https://gerrit.libreoffice.org/83256 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 40acc768917c..3700a3d8c5ce 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -51,8 +51,6 @@ namespace accessibility sal_uInt16 _nColId, sal_Int32 _nOffset ); -voidnameChanged( const OUString& rNewName, const OUString& rOldName ); - // XInterface - /** Queries for a new interface. */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 7cf7d5edc747..c09639850b84 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessiblelistbox.hxx |4 accessibility/inc/extended/accessiblelistboxentry.hxx| 17 ++- accessibility/source/extended/accessiblelistbox.cxx | 66 +++ accessibility/source/extended/accessiblelistboxentry.cxx | 49 ++- 4 files changed, 74 insertions(+), 62 deletions(-) New commits: commit 77ea0535271d3fb3d49c8d916ecf80e0a7f70653 Author: Michael Stahl AuthorDate: Wed Sep 18 15:54:23 2019 +0200 Commit: Michael Stahl CommitDate: Wed Sep 18 18:09:21 2019 +0200 accessibility: fix leak of AccessibleListBoxEntry The problem is that AccessibleListBoxEntry from the Stylist in the sidebar are not deleted until the document is closed, which causes slowdowns because it causes an ever-growing list of window listeners. There are several issues here: * AccessibleListBoxEntry::m_aParent appears of dubious merit because SvTreeList::Move may move entries to a different parent; this member may or may not be initialised depending on where the instance is created; there are confusing comments mentioning a "Solution" but not the corresponding problem; just remove it and let it do a dynamic lookup when needed * AccessibleListBox::m_mapEntry already exists but is used in only half the places where AccessibleListBoxEntry are created; use it everywhere (consistently create entry without a parent, see previous point), and let AccessibleListBoxEntry know the AccessibleListBox instance so it can use the m_mapEntry too * When VclEventId::ListboxItemRemoved event is received, the m_mapEntry is cleared but the AccessibleListBoxEntry survive this happily; better dispose them (seeing as this event is regularly sent because there's some timer clearing the Stylist and recreating it from scratch...) Change-Id: I6c3336e019e873fa7cc8fa03cb8949a1ff2fe8fa Reviewed-on: https://gerrit.libreoffice.org/79100 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index cb075f299bb6..70248208ec0a 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -75,6 +75,8 @@ namespace accessibility AccessibleListBox( SvTreeListBox const & _rListBox, const css::uno::Reference< css::accessibility::XAccessible >& _xParent ); +rtl::Reference implGetAccessible(SvTreeListEntry & rEntry); + // XTypeProvider DECLARE_XTYPEPROVIDER() @@ -108,7 +110,7 @@ namespace accessibility private: -typedef std::map< SvTreeListEntry*, css::uno::Reference< css::accessibility::XAccessible > > MAP_ENTRY; +typedef std::map> MAP_ENTRY; MAP_ENTRY m_mapEntry; css::uno::Reference< css::accessibility::XAccessible > m_xFocusedChild; diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 2d9e4fac97b1..babaf08a52b5 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -54,7 +54,7 @@ class SvTreeListEntry; namespace accessibility { - +class AccessibleListBox; // class AccessibleListBoxEntry -- typedef ::cppu::WeakAggComponentImplHelper9< css::accessibility::XAccessible @@ -84,8 +84,8 @@ namespace accessibility /// client id in the AccessibleEventNotifier queue sal_uInt32 m_nClientId; -css::uno::WeakReference< css::accessibility::XAccessible > -m_aParent; +css::uno::WeakReference m_wListBox; +AccessibleListBox & m_rListBox; tools::Rectangle GetBoundingBox_Impl() const; tools::Rectangle GetBoundingBoxOnScreen_Impl() const; @@ -121,13 +121,14 @@ namespace accessibility /** Ctor() @param _rListBox the view control -@param _pEntry +@param rEntry the entry -@param _xParent -is our parent accessible object +@param rListBox +the a11y object for _rListBox */ -AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvTreeListEntry* _pEntry, -const css::uno::Reference< css::accessibility::XAccessible >& _xParent ); +AccessibleListBoxEntry( SvTreeListBox& _rListBox, +SvTreeListEntry& rEntry, +AccessibleListBox & rListBox); SvTreeListEntry* GetSvLBoxEntry() const { return m_pSvLBoxEntry; } diff --git a/accessibility/source/extended/accessiblelistbox.cxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/textwindowaccessibility.hxx|2 accessibility/source/extended/textwindowaccessibility.cxx | 38 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) New commits: commit bd32bf4deb7a2ae9d790a10b5c8af6ea33b7c127 Author: Omer Fatih Celik AuthorDate: Sun Feb 10 17:04:16 2019 +0300 Commit: Michael Stahl CommitDate: Mon Feb 11 11:51:31 2019 +0100 TDF#114441 - Convert use of sal_uLong to sal_uInt32 Change-Id: I4783cd877925f797af7851670d4ea5d091b1c935 Reviewed-on: https://gerrit.libreoffice.org/67618 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 512344c80ed8..dd211b0883a9 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -531,7 +531,7 @@ private: // Must be called with both the external (Solar) and internal mutex // locked, and after init has been called: -void changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd, +void changeParagraphText(::sal_uInt32 nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd, bool bCut, bool bPaste, OUString const & rText); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 8a1a0b6fe1db..005b597e97ac 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -828,7 +828,7 @@ void Document::retrieveParagraphSelection(Paragraph const * pParagraph, *pBegin = nNumber > aMinPaM.GetPara() ? 0 : aMinPaM.GetIndex(); // XXX numeric overflow *pEnd = nNumber < aMaxPaM.GetPara() -? m_rEngine.GetText(static_cast< ::sal_uLong >(nNumber)).getLength() +? m_rEngine.GetText(static_cast< ::sal_uInt32 >(nNumber)).getLength() : aMaxPaM.GetIndex(); // XXX numeric overflow (3x) @@ -859,7 +859,7 @@ Document::retrieveCharacterBounds(Paragraph const * pParagraph, { SolarMutexGuard aGuard; ::osl::MutexGuard aInternalGuard(GetMutex()); -::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber()); +::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >(pParagraph->getNumber()); sal_Int32 nLength = m_rEngine.GetText(nNumber).getLength(); // XXX numeric overflow if (nIndex < 0 || nIndex > nLength) @@ -905,7 +905,7 @@ Document::retrieveCharacterBounds(Paragraph const * pParagraph, { SolarMutexGuard aGuard; ::osl::MutexGuard aInternalGuard(GetMutex()); -::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber()); +::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >(pParagraph->getNumber()); // XXX numeric overflow ::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoint.X), static_cast< long >(rPoint.Y; @@ -1013,7 +1013,7 @@ Document::retrieveCharacterAttributes( i++; ::osl::MutexGuard aInternalGuard(GetMutex()); -::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber()); +::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >(pParagraph->getNumber()); // XXX numeric overflow // nIndex can be equal to getLength(); if (nIndex < 0 || nIndex > m_rEngine.GetText(nNumber).getLength()) @@ -1058,7 +1058,7 @@ void Document::retrieveRunAttributesImpl( const css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rRunAttrSeq) { -::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); +::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >( pParagraph->getNumber() ); ::TextPaM aPaM( nNumber, Index ); // XXX numeric overflow ::TextAttribFontColor const * pColor @@ -1112,7 +1112,7 @@ Document::retrieveRunAttributes( { SolarMutexGuard aGuard; ::osl::MutexGuard aInternalGuard( GetMutex() ); -::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); +::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >( pParagraph->getNumber() ); // XXX numeric overflow if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).getLength() ) throw css::lang::IndexOutOfBoundsException( @@ -1131,7 +1131,7 @@ void Document::changeParagraphText(Paragraph const * pParagraph, SolarMutexGuard aGuard; { ::osl::MutexGuard aInternalGuard(GetMutex()); -::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber()); +::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >(pParagraph->getNumber()); // XXX numeric overflow changeParagraphText(nNumber, 0, m_rEngine.GetTextLen(nNumber), false,
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/textwindowaccessibility.hxx|1 accessibility/source/extended/textwindowaccessibility.cxx | 257 ++ 2 files changed, 124 insertions(+), 134 deletions(-) New commits: commit ea65a40cdf6ac4dba37f21ad9bf81184b6598b55 Author: Mike Kaganski AuthorDate: Thu Nov 8 11:00:23 2018 +0300 Commit: Mike Kaganski CommitDate: Sat Nov 10 12:22:28 2018 +0100 tdf#120703 PVS: make selection type detection more readable V547 Expression 'Oep <= Osp' is always false. Some of the conditions in the type detection code weren't reachable. Also moved the code from class member to static function. Change-Id: Iaf9dbe8ab15a1970b5cd580cf5d868715a234d02 Reviewed-on: https://gerrit.libreoffice.org/63230 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 59d92208dbea..512344c80ed8 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -540,7 +540,6 @@ private: void handleSelectionChangeNotification(); -::sal_Int32 getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos); void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId); void disposeParagraphs(); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index c430df21e7f3..9823a1853aac 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1951,109 +1951,102 @@ void Document::handleParagraphNotifications() } } -::sal_Int32 Document::getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos) -{ -if (m_nSelectionFirstPara == -1) -return -1; -::sal_Int32 Osp = m_nSelectionFirstPara, Osl = m_nSelectionFirstPos, Oep = m_nSelectionLastPara, Oel = m_nSelectionLastPos; -::sal_Int32 Nsp = nNewFirstPara, Nsl = nNewFirstPos, Nep = nNewLastPara, Nel = nNewLastPos; -TextPaM Ns(Nsp, Nsl); -TextPaM Ne(Nep, Nel); -TextPaM Os(Osp, Osl); -TextPaM Oe(Oep, Oel); - -if (Os == Oe && Ns == Ne) -{ -//only caret moves. -return 1; -} -else if (Os == Oe && Ns != Ne) +namespace +{ + +enum class SelChangeType +{ +None, // no change, or invalid +CaretMove, // neither old nor new have selection, and they are different +NoSelToSel, // old has no selection but new has selection +SelToNoSel, // old has selection but new has no selection +// both old and new have selections +NoParaChange, // only end index changed inside end para +EndParaNoMoreBehind, // end para was behind start, but now is same or ahead +AddedFollowingPara, // selection extended to following paragraph(s) +ExcludedPreviousPara, // selection shrunk excluding previous paragraph(s) +ExcludedFollowingPara, // selection shrunk excluding following paragraph(s) +AddedPreviousPara, // selection extended to previous paragraph(s) +EndParaBecameBehind // end para was ahead of start, but now is behind +}; + +SelChangeType getSelChangeType(const TextPaM& Os, const TextPaM& Oe, + const TextPaM& Ns, const TextPaM& Ne) +{ +if (Os == Oe) // no old selection { -//old has no selection but new has selection -return 2; +if (Ns == Ne) // no new selection: only caret moves +return Os != Ns ? SelChangeType::CaretMove : SelChangeType::None; +else // old has no selection but new has selection +return SelChangeType::NoSelToSel; } -else if (Os != Oe && Ns == Ne) +else if (Ns == Ne) // old has selection; no new selection { -//old has selection but new has no selection. -return 3; +return SelChangeType::SelToNoSel; } -else if (Os != Oe && Ns != Ne && Osp == Nsp && Osl == Nsl) +else if (Os == Ns) // both old and new have selections, and their starts are same { -//both old and new have selections. -if (Oep == Nep ) +const sal_Int32 Osp = Os.GetPara(), Oep = Oe.GetPara(); +const sal_Int32 Nsp = Ns.GetPara(), Nep = Ne.GetPara(); +if (Oep == Nep) // end of selection stays in the same paragraph { //Send text_selection_change event on Nep - -return 4; +return Oe.GetIndex() != Ne.GetIndex() ? SelChangeType::NoParaChange + : SelChangeType::None; } -else if (Oep < Nep) +else if (Oep < Nep) // end of selection moved to a following paragraph { //all the following examples like 1,2->1,3 means that old start
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblecheckbox.hxx |2 accessibility/inc/standard/vclxaccessibleedit.hxx |1 accessibility/inc/standard/vclxaccessiblelist.hxx |4 accessibility/inc/standard/vclxaccessibletabcontrol.hxx |4 accessibility/inc/standard/vclxaccessibletabpage.hxx |2 accessibility/inc/standard/vclxaccessibletoolbox.hxx |2 accessibility/source/standard/vclxaccessiblebutton.cxx|2 accessibility/source/standard/vclxaccessiblecheckbox.cxx | 16 - accessibility/source/standard/vclxaccessibleedit.cxx | 16 - accessibility/source/standard/vclxaccessiblelist.cxx |4 accessibility/source/standard/vclxaccessibletabcontrol.cxx| 28 +- accessibility/source/standard/vclxaccessibletabpage.cxx |6 accessibility/source/standard/vclxaccessibletextcomponent.cxx |4 accessibility/source/standard/vclxaccessibletoolbox.cxx | 99 +- 14 files changed, 112 insertions(+), 78 deletions(-) New commits: commit 0c2beb9ecde1600d4879d2240b6af45ac8477e36 Author: Arnaud VersiniDate: Sun Apr 8 10:21:54 2018 +0200 accessibility : remove useless guards and simplify. Change-Id: I9e0d5967f71b2bd822c64690f8e02a0c95c8b88f Reviewed-on: https://gerrit.libreoffice.org/52581 Tested-by: Jenkins Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx index e57ef74eb503..5c4e21e18898 100644 --- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx @@ -44,6 +44,8 @@ private: virtual ~VCLXAccessibleCheckBox() override = default; +sal_Int32 implGetMaximumValue(); + boolIsChecked(); boolIsIndeterminate(); diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index f41479c0ceef..a6207c202c42 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -46,6 +46,7 @@ private: virtual voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual voidFillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; +sal_Int16 implGetAccessibleRole(); // OCommonAccessibleText virtual OUStringimplGetText() override; diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index f4301ee13950..71c4b0ff4892 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -92,7 +92,7 @@ public: getAccessibleContext() override; // XAccessibleContext -virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; +virtual sal_Int32 SAL_CALL getAccessibleChildCount() override final; css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL @@ -144,6 +144,8 @@ private: virtual ~VCLXAccessibleList() override = default; +sal_Int32 implGetAccessibleChildCount(); + /** This function is called from the implementation helper during a XComponent::dispose call. Free the list of items and the items themselves. */ diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 9e0960d67ea7..8f248466bce9 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -44,6 +44,10 @@ private: AccessibleChildren m_aAccessibleChildren; VclPtr m_pTabControl; +css::uno::Reference< css::accessibility::XAccessible > implGetAccessibleChild( sal_Int32 i ); +bool implIsAccessibleChildSelected( sal_Int32 nChildIndex ); + + voidUpdateFocused(); voidUpdateSelected( sal_Int32 i, bool bSelected ); voidUpdatePageText( sal_Int32 i ); diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 495f4a36412a..9d64e665827a 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -55,6 +55,8 @@ private: boolm_bSelected; OUStringm_sPageText; +sal_Int32 implGetAccessibleChildCount(); + boolIsFocused(); boolIsSelected(); diff
[Libreoffice-commits] core.git: accessibility/inc accessibility/source comphelper/source editeng/source include/comphelper include/editeng
accessibility/inc/extended/textwindowaccessibility.hxx |6 + accessibility/source/extended/textwindowaccessibility.cxx | 14 ++-- comphelper/source/misc/accessibletexthelper.cxx | 37 +--- editeng/source/accessibility/AccessibleEditableTextPara.cxx |9 -- include/comphelper/accessibletexthelper.hxx |4 - include/editeng/AccessibleEditableTextPara.hxx |7 -- 6 files changed, 37 insertions(+), 40 deletions(-) New commits: commit 84958e1a1bd9a3019300f558c66e468f8accf279 Author: Arnaud VersiniDate: Sun Mar 25 13:49:42 2018 +0200 accessibility: more simplifiation in OCommonAccessibleText. Change-Id: If1284f2e50be08372dda08a8250263c9ec435923 Reviewed-on: https://gerrit.libreoffice.org/51825 Tested-by: Jenkins Tested-by: Arnaud Versini Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 8487da9d9da7..7299b3954a9f 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -161,9 +161,11 @@ public: private: // OCommonAccessibleText -virtual void implGetParagraphBoundary( css::i18n::Boundary& rBoundary, +virtual void implGetParagraphBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) override; -virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary, +virtual void implGetLineBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 4c5309795867..50ea92f78238 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -634,10 +634,11 @@ void Paragraph::implGetSelection(::sal_Int32 & rStartIndex, } // virtual -void Paragraph::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, - ::sal_Int32 nIndex ) +void Paragraph::implGetParagraphBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, + ::sal_Int32 nIndex ) { -::sal_Int32 nLength = implGetText().getLength(); +::sal_Int32 nLength = rText.getLength(); if ( implIsValidIndex( nIndex, nLength ) ) { @@ -652,10 +653,11 @@ void Paragraph::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, } // virtual -void Paragraph::implGetLineBoundary( css::i18n::Boundary& rBoundary, - ::sal_Int32 nIndex ) +void Paragraph::implGetLineBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, + ::sal_Int32 nIndex ) { -::sal_Int32 nLength = implGetText().getLength(); +::sal_Int32 nLength = rText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) { diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 202be72977af..35fe769c1700 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -175,20 +175,18 @@ namespace comphelper } -void OCommonAccessibleText::implGetParagraphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) +void OCommonAccessibleText::implGetParagraphBoundary( const OUString& rText, i18n::Boundary& rBoundary, sal_Int32 nIndex ) { -OUString sText( implGetText() ); - -if ( implIsValidIndex( nIndex, sText.getLength() ) ) +if ( implIsValidIndex( nIndex, rText.getLength() ) ) { rBoundary.startPos = 0; -rBoundary.endPos = sText.getLength(); +rBoundary.endPos = rText.getLength(); -sal_Int32 nFound = sText.lastIndexOf( '\n', nIndex ); +sal_Int32 nFound = rText.lastIndexOf( '\n', nIndex ); if ( nFound != -1 ) rBoundary.startPos = nFound + 1; -nFound = sText.indexOf( '\n', nIndex ); +nFound = rText.indexOf( '\n', nIndex ); if ( nFound != -1 ) rBoundary.endPos = nFound + 1; } @@ -200,10 +198,9 @@ namespace comphelper } -void OCommonAccessibleText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) +void
[Libreoffice-commits] core.git: accessibility/inc accessibility/source chart2/source dbaccess/source hwpfilter/source idl/inc idl/source
accessibility/inc/standard/accessiblemenubasecomponent.hxx|2 - accessibility/inc/standard/accessiblemenuitemcomponent.hxx|4 +-- accessibility/source/standard/accessiblemenubasecomponent.cxx | 10 - chart2/source/view/axes/Tickmarks.cxx |4 --- chart2/source/view/axes/Tickmarks.hxx | 10 +++-- dbaccess/source/core/api/CRowSetDataColumn.hxx|2 - dbaccess/source/core/api/CacheSet.cxx | 10 - dbaccess/source/core/api/CacheSet.hxx |6 - dbaccess/source/core/api/KeySet.hxx |4 +-- dbaccess/source/core/api/RowSet.hxx |3 +- dbaccess/source/core/api/RowSetBase.cxx |4 --- dbaccess/source/core/api/RowSetBase.hxx |2 - dbaccess/source/core/api/StaticSet.hxx|4 +-- dbaccess/source/core/api/column.cxx |5 dbaccess/source/core/inc/column.hxx |2 - dbaccess/source/core/recovery/storagestream.cxx | 11 -- dbaccess/source/core/recovery/storagestream.hxx |4 --- dbaccess/source/core/recovery/storagexmlstream.hxx|3 -- dbaccess/source/ui/browser/brwctrlr.cxx |4 --- dbaccess/source/ui/inc/RTableConnectionData.hxx |2 - dbaccess/source/ui/inc/TableConnectionData.hxx|2 - dbaccess/source/ui/inc/brwctrlr.hxx |2 - dbaccess/source/ui/inc/unodatbr.hxx |2 - dbaccess/source/ui/querydesign/QTableConnectionData.hxx |2 - dbaccess/source/ui/querydesign/TableConnectionData.cxx|5 hwpfilter/source/hbox.cxx |8 --- hwpfilter/source/hbox.h |5 +--- idl/inc/basobj.hxx|1 idl/inc/types.hxx |2 - idl/source/objects/basobj.cxx |5 30 files changed, 20 insertions(+), 110 deletions(-) New commits: commit f657ab7bbb36219f6270236ae0e6b8238b7dd9b5 Author: Noel GrandinDate: Thu Mar 29 11:21:02 2018 +0200 loplugin:virtualdown in various Change-Id: I4db71fda953ea1d20712ae8033f6fc09b3b2855d Reviewed-on: https://gerrit.libreoffice.org/52068 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 2447b0d6c1d3..a6c9da485f30 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -101,8 +101,6 @@ protected: voidDeSelectAll(); boolIsChildSelected( sal_Int32 i ); -virtual voidSelect(); -virtual voidDeSelect(); virtual voidClick(); virtual boolIsPopupMenuOpen(); diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx index 0d893dde1c1f..adba565647b4 100644 --- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx @@ -38,8 +38,8 @@ protected: virtual boolIsEnabled() override; virtual boolIsVisible() override; -virtual voidSelect() override; -virtual voidDeSelect() override; +virtual voidSelect(); +virtual voidDeSelect(); virtual voidClick() override; voidSetItemPos( sal_uInt16 nItemPos ); diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 33e67b3bc63a..2534eb40eda7 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -501,16 +501,6 @@ bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) } -void OAccessibleMenuBaseComponent::Select() -{ -} - - -void OAccessibleMenuBaseComponent::DeSelect() -{ -} - - void OAccessibleMenuBaseComponent::Click() { } diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 05dfe08520d0..6d4b302fcf6b 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -132,10 +132,6 @@ void TickFactory::getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const EquidistantTickFactory( m_rScale, m_rIncrement
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControlTableCell.hxx|6 +++--- accessibility/inc/extended/accessibleiconchoicectrlentry.hxx |2 +- accessibility/inc/standard/vclxaccessiblelistitem.hxx|4 ++-- accessibility/inc/standard/vclxaccessiblemenuitem.hxx|8 accessibility/source/extended/AccessibleGridControlTableCell.cxx |6 +++--- accessibility/source/extended/accessibleiconchoicectrlentry.cxx |6 +++--- accessibility/source/extended/accessiblelistboxentry.cxx |6 +++--- accessibility/source/standard/vclxaccessiblelistitem.cxx |6 +++--- accessibility/source/standard/vclxaccessiblemenuitem.cxx |6 +++--- 9 files changed, 25 insertions(+), 25 deletions(-) New commits: commit c409fd2e8829b00f027070f34a5b743019800c6e Author: Arnaud VersiniDate: Sat Mar 3 19:18:05 2018 +0100 accessibility: simplify getSelection when possible Change-Id: I187716bca329da0aeae9fec9f48a45a9df386130 Reviewed-on: https://gerrit.libreoffice.org/50688 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index a250fe18cb6a..6af2e021e5c0 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -60,15 +60,15 @@ namespace accessibility , css::accessibility::XAccessible > AccessibleTextHelper_BASE; // implementation of a table cell of GridControl -class AccessibleGridControlTableCell:public AccessibleGridControlCell +class AccessibleGridControlTableCell final :public AccessibleGridControlCell ,public AccessibleTextHelper_BASE ,public ::comphelper::OCommonAccessibleText { -protected: +private: // OCommonAccessibleText virtual OUStringimplGetText() override; virtual css::lang::Locale implGetLocale() override; -virtual voidimplGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; +virtual voidimplGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override final; virtual tools::Rectangle implGetBoundingBox() override; virtual tools::Rectangle implGetBoundingBoxOnScreen() override; diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index e256034d2952..05258185985a 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -92,7 +92,7 @@ namespace accessibility // OCommonAccessibleText virtual OUStringimplGetText() override; virtual css::lang::Locale implGetLocale() override; -virtual voidimplGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; +virtual voidimplGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override final; public: /** Ctor() diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 289162a1bbf9..02eb11641755 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -53,8 +53,8 @@ typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry */ class VCLXAccessibleListItem final : public ::cppu::BaseMutex, - public ::comphelper::OCommonAccessibleText, - public VCLXAccessibleListItem_BASE + public ::comphelper::OCommonAccessibleText, + public VCLXAccessibleListItem_BASE { private: OUStringm_sEntryText; diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index 806c28728d65..0b73bbcb950c 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -53,7 +53,7 @@ protected: // OCommonAccessibleText virtual OUString implGetText() final override; virtual css::lang::LocaleimplGetLocale() override; -virtual void implGetSelection( sal_Int32&
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx |2 - accessibility/inc/extended/AccessibleGridControl.hxx |2 - accessibility/inc/extended/AccessibleGridControlTable.hxx|2 - accessibility/inc/standard/accessiblemenucomponent.hxx |3 +- accessibility/inc/standard/vclxaccessiblebutton.hxx |5 +--- accessibility/inc/standard/vclxaccessiblecheckbox.hxx|2 - accessibility/inc/standard/vclxaccessiblecombobox.hxx|6 ++--- accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx|6 ++--- accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx |6 ++--- accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx |2 - accessibility/inc/standard/vclxaccessiblefixedtext.hxx |5 +--- accessibility/inc/standard/vclxaccessiblelist.hxx|2 - accessibility/inc/standard/vclxaccessiblelistbox.hxx |4 +-- accessibility/inc/standard/vclxaccessiblelistitem.hxx|2 - accessibility/inc/standard/vclxaccessiblescrollbar.hxx |4 +-- accessibility/inc/standard/vclxaccessiblestatusbar.hxx |1 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |1 accessibility/inc/standard/vclxaccessibletabcontrol.hxx |1 accessibility/inc/standard/vclxaccessibletabpagewindow.hxx |1 accessibility/inc/standard/vclxaccessibletextcomponent.hxx |1 accessibility/inc/standard/vclxaccessibletextfield.hxx |2 - accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx |4 --- accessibility/source/extended/AccessibleGridControl.cxx |5 accessibility/source/extended/AccessibleGridControlTable.cxx |6 - accessibility/source/extended/accessibleiconchoicectrl.cxx |1 accessibility/source/inc/floatingwindowaccessible.hxx|4 +-- accessibility/source/standard/accessiblemenucomponent.cxx|6 - accessibility/source/standard/floatingwindowaccessible.cxx |4 --- accessibility/source/standard/vclxaccessiblebutton.cxx |6 - accessibility/source/standard/vclxaccessiblecheckbox.cxx |5 accessibility/source/standard/vclxaccessiblecombobox.cxx |4 --- accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |4 --- accessibility/source/standard/vclxaccessibledropdownlistbox.cxx |4 --- accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx |6 - accessibility/source/standard/vclxaccessiblefixedtext.cxx|6 - accessibility/source/standard/vclxaccessiblelist.cxx |5 accessibility/source/standard/vclxaccessiblelistitem.cxx |4 --- accessibility/source/standard/vclxaccessiblescrollbar.cxx| 11 -- accessibility/source/standard/vclxaccessiblestatusbar.cxx|5 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx|5 accessibility/source/standard/vclxaccessibletabcontrol.cxx |5 accessibility/source/standard/vclxaccessibletabpagewindow.cxx|5 accessibility/source/standard/vclxaccessibletextcomponent.cxx|5 accessibility/source/standard/vclxaccessibletextfield.cxx|6 - 44 files changed, 29 insertions(+), 147 deletions(-) New commits: commit d176877bc0ccb8432e55eda2e7d620a246bccdde Author: Arnaud VersiniDate: Sun Feb 25 14:45:15 2018 +0100 accessibility: cleanup constructors and destructors Change-Id: Id9d420e633691cf87706088d7415aeb8ed1bdb8d Reviewed-on: https://gerrit.libreoffice.org/50307 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index 32d0fb75d491..ac98a503b9c0 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -54,7 +54,7 @@ public: ::svt::AccessibleBrowseBoxObjType eObjType ); protected: -virtual ~AccessibleBrowseBoxTableBase() override; +virtual ~AccessibleBrowseBoxTableBase() override = default; public: // XAccessibleContext diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 3cd2a4d102fc..3968c3e07e33 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -43,7 +43,7 @@ class AccessibleGridControl final : public AccessibleGridControlBase ::svt::table::IAccessibleTable& _rTable ); -virtual ~AccessibleGridControl() override; +virtual ~AccessibleGridControl() override = default; /** Cleans up
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBox.hxx | 15 +- accessibility/inc/extended/AccessibleGridControl.hxx| 18 ++ accessibility/source/extended/AccessibleBrowseBox.cxx | 67 +++-- accessibility/source/extended/AccessibleGridControl.cxx | 116 ++-- 4 files changed, 98 insertions(+), 118 deletions(-) New commits: commit 6d7c82a57377a6d8c13e3c990466232cbec7e4f9 Author: Arnaud VersiniDate: Sun Feb 25 12:25:18 2018 +0100 accessibility : remove useless Impl pattern Change-Id: I6a3744b742db12ded79d273d49b041c578eccab6 Reviewed-on: https://gerrit.libreoffice.org/50302 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index ea96ca44be00..2f6c60f64f57 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -29,7 +29,7 @@ namespace accessibility { -class AccessibleBrowseBoxImpl; +class AccessibleBrowseBoxHeaderBar; class AccessibleBrowseBoxTable; @@ -174,8 +174,17 @@ protected: virtual AccessibleBrowseBoxTable* createAccessibleTable(); private: -// members -std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl; +/// the css::accessibility::XAccessible which created the AccessibleBrowseBox +css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; + +/** The data table child. */ +rtl::ReferencemxTable; + +/** The header bar for rows ("handle column"). */ +rtl::ReferencemxRowHeaderBar; + +/** The header bar for columns (first row of the table). */ +rtl::Reference mxColumnHeaderBar; }; diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index d4cf435590a8..3cd2a4d102fc 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -29,7 +29,7 @@ namespace accessibility { -class AccessibleGridControl_Impl; +class AccessibleGridControlHeader; /** This class represents the complete accessible Grid Control object. */ @@ -138,8 +138,20 @@ private: @return An AccessibleGridControlTable. */ AccessibleGridControlTable* createAccessibleTable(); -// members -std::unique_ptr< AccessibleGridControl_Impl > m_xImpl; +/// the css::accessibility::XAccessible which created the AccessibleGridControl +css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; + +/** The data table child. */ +rtl::Referencem_xTable; + +/** The header bar for rows. */ +rtl::Reference m_xRowHeaderBar; + +/** The header bar for columns (first row of the table). */ +rtl::Reference m_xColumnHeaderBar; + +/** The table cell child. */ +rtl::Referencem_xCell; }; diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 26cd089226aa..74f9f5903112 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -34,43 +34,24 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; using namespace ::svt; - -class AccessibleBrowseBoxImpl -{ -public: -/// the css::accessibility::XAccessible which created the AccessibleBrowseBox -css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; - -/** The data table child. */ -rtl::ReferencemxTable; - -/** The header bar for rows ("handle column"). */ -rtl::ReferencemxRowHeaderBar; - -/** The header bar for columns (first row of the table). */ -rtl::Reference mxColumnHeaderBar; -}; - // Ctor/Dtor/disposing AccessibleBrowseBox::AccessibleBrowseBox( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, ::svt::IAccessibleTableProvider& _rBrowseBox ) -: AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, BBTYPE_BROWSEBOX ) +: AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, BBTYPE_BROWSEBOX ), + m_aCreator(_rxCreator) { -m_xImpl.reset( new AccessibleBrowseBoxImpl ); -m_xImpl->m_aCreator = _rxCreator; - m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance()); } void AccessibleBrowseBox::setCreator( const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ) { #if OSL_DEBUG_LEVEL > 0 -
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleGridControlHeader.hxx |2 - accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx |4 +-- accessibility/inc/extended/AccessibleGridControlTableBase.hxx|2 - accessibility/inc/extended/AccessibleGridControlTableCell.hxx|2 - accessibility/inc/extended/accessibleiconchoicectrl.hxx |2 - accessibility/inc/extended/accessibletabbar.hxx |1 accessibility/inc/extended/accessibletabbarpage.hxx |1 accessibility/inc/extended/accessibletabbarpagelist.hxx |3 -- accessibility/inc/extended/accessibletablistbox.hxx |5 +--- accessibility/inc/extended/accessibletablistboxtable.hxx |4 +-- accessibility/inc/extended/textwindowaccessibility.hxx |5 +--- accessibility/inc/standard/accessiblemenucomponent.hxx |1 accessibility/inc/standard/vclxaccessiblebox.hxx |2 - accessibility/inc/standard/vclxaccessiblebutton.hxx |2 - accessibility/inc/standard/vclxaccessibleedit.hxx|2 - accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx |2 - accessibility/inc/standard/vclxaccessiblefixedtext.hxx |2 - accessibility/inc/standard/vclxaccessiblelistbox.hxx |2 - accessibility/inc/standard/vclxaccessiblemenu.hxx|3 -- accessibility/inc/standard/vclxaccessiblemenuitem.hxx|1 accessibility/inc/standard/vclxaccessiblemenuseparator.hxx |1 accessibility/inc/standard/vclxaccessiblepopupmenu.hxx |3 -- accessibility/inc/standard/vclxaccessibleradiobutton.hxx |4 +-- accessibility/source/extended/AccessibleGridControlHeader.cxx|4 --- accessibility/source/extended/AccessibleGridControlTableBase.cxx |4 --- accessibility/source/extended/AccessibleGridControlTableCell.cxx |6 - accessibility/source/extended/accessibleiconchoicectrl.cxx |4 --- accessibility/source/extended/accessibletabbar.cxx |5 accessibility/source/extended/accessibletabbarpage.cxx |5 accessibility/source/extended/accessibletabbarpagelist.cxx |4 --- accessibility/source/inc/floatingwindowaccessible.hxx|1 accessibility/source/standard/accessiblemenucomponent.cxx|5 accessibility/source/standard/accessiblemenuitemcomponent.cxx|2 - accessibility/source/standard/floatingwindowaccessible.cxx |3 -- accessibility/source/standard/vclxaccessiblebox.cxx |4 --- accessibility/source/standard/vclxaccessiblebutton.cxx |5 accessibility/source/standard/vclxaccessibleedit.cxx |5 accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx |5 accessibility/source/standard/vclxaccessiblefixedtext.cxx|5 accessibility/source/standard/vclxaccessiblelistbox.cxx |4 --- accessibility/source/standard/vclxaccessiblemenu.cxx | 11 -- accessibility/source/standard/vclxaccessiblemenuitem.cxx |5 accessibility/source/standard/vclxaccessiblemenuseparator.cxx|5 accessibility/source/standard/vclxaccessiblepopupmenu.cxx| 11 -- accessibility/source/standard/vclxaccessibleradiobutton.cxx | 11 -- 45 files changed, 23 insertions(+), 147 deletions(-) New commits: commit 861f819d1b1a1ee4a8a15ec26cdd20121fd03ddf Author: Arnaud VersiniDate: Tue Feb 6 11:18:44 2018 +0100 Accessibility : cleanup constructors and destructors. Change-Id: I63f94f4bb3865d0c2d211567588343e08878342c Reviewed-on: https://gerrit.libreoffice.org/49282 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index dc65cbe199d4..b0046627b528 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -44,7 +44,7 @@ public: ::svt::table::AccessibleTableControlObjType eObjType ); private: -virtual ~AccessibleGridControlHeader() override; +virtual ~AccessibleGridControlHeader() override = default; public: // XAccessibleContext diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index a0ec9e6bb53a..00076df2a484 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -23,7 +23,7 @@ namespace accessibility { -class AccessibleGridControlHeaderCell : public AccessibleGridControlCell, public
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basic/source chart2/source comphelper/source compilerplugins/clang configure.ac connectivity/source cui/source desktop/source dic
accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx|2 - accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx|2 - accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx|2 - accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx |2 - accessibility/inc/extended/AccessibleGridControlTable.hxx |2 - accessibility/inc/extended/AccessibleGridControlTableBase.hxx |2 - accessibility/inc/extended/AccessibleGridControlTableCell.hxx |2 - accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |2 - accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |2 - accessibility/source/extended/AccessibleGridControlTableCell.cxx |2 - basic/source/classes/image.cxx |2 - chart2/source/view/main/GL3DRenderer.cxx |4 +- comphelper/source/container/namecontainer.cxx |2 - comphelper/source/windows/windows_process.cxx |2 - compilerplugins/clang/fragiledestructor.cxx|4 +- configure.ac | 10 ++--- connectivity/source/drivers/dbase/dindexnode.cxx |2 - cui/source/dialogs/hldoctp.cxx |4 +- cui/source/dialogs/hlmailtp.cxx|2 - desktop/source/app/app.cxx |2 - dictionaries |2 - editeng/source/accessibility/AccessibleEditableTextPara.cxx|2 - editeng/source/editeng/eehtml.cxx |2 - editeng/source/editeng/impedit2.cxx|2 - editeng/source/misc/svxacorr.cxx |2 - filter/source/config/cache/basecontainer.hxx |2 - filter/source/config/cache/filtercache.cxx | 20 +- filter/source/config/cache/filtercache.hxx |2 - filter/source/config/cache/filterfactory.cxx |4 +- filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |2 - filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 - framework/inc/dispatch/closedispatcher.hxx |2 - framework/inc/helper/ocomponentaccess.hxx |2 - framework/inc/jobs/job.hxx |2 - framework/inc/jobs/shelljob.hxx|4 +- framework/inc/services/desktop.hxx |6 +-- framework/inc/threadhelp/transactionbase.hxx |2 - framework/source/classes/taskcreator.cxx |2 - framework/source/dispatch/dispatchprovider.cxx |8 ++-- framework/source/inc/accelerators/presethandler.hxx|4 +- framework/source/inc/loadenv/loadenv.hxx |4 +- framework/source/jobs/joburl.cxx |6 +-- framework/source/jobs/shelljob.cxx |2 - framework/source/services/autorecovery.cxx |4 +- framework/source/services/frame.cxx|4 +- include/jvmfwk/framework.hxx |2 - include/ucbhelper/interceptedinteraction.hxx |2 - include/vbahelper/vbafontbase.hxx |6 +-- include/vcl/toolbox.hxx|2 - jvmfwk/plugins/sunmajor/pluginlib/util.cxx |2 - lotuswordpro/source/filter/lwppagelayout.cxx |2 - odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java |6 +-- offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl|2 - oovbaapi/ooo/vba/excel/XPivotTables.idl|2 - qadevOOo/runner/helper/ProcessHandler.java |2 - qadevOOo/tests/java/ifc/table/_TableColumn.java|2 - qadevOOo/tests/java/ifc/util/_PathSettings.java|2 - sal/textenc/tcvtutf7.cxx |4 +- sax/source/fastparser/fastparser.cxx |2 - sc/source/core/data/drwlayer.cxx |4 +- sc/source/ui/unoobj/cursuno.cxx|2 -
[Libreoffice-commits] core.git: accessibility/inc accessibility/source comphelper/source editeng/source include/comphelper
accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |2 accessibility/inc/standard/vclxaccessibletabpage.hxx |3 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |2 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |4 - accessibility/source/extended/AccessibleGridControlTableCell.cxx |4 - accessibility/source/extended/accessibleiconchoicectrlentry.cxx |4 - accessibility/source/extended/accessiblelistboxentry.cxx |4 - accessibility/source/extended/textwindowaccessibility.cxx|4 - accessibility/source/standard/vclxaccessiblelistitem.cxx |4 - accessibility/source/standard/vclxaccessiblemenuitem.cxx |4 - accessibility/source/standard/vclxaccessiblestatusbaritem.cxx| 17 accessibility/source/standard/vclxaccessibletabpage.cxx | 16 accessibility/source/standard/vclxaccessibletextcomponent.cxx|4 - accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 15 comphelper/source/misc/accessibletexthelper.cxx | 35 ++ editeng/source/accessibility/AccessibleEditableTextPara.cxx |4 - include/comphelper/accessibletexthelper.hxx |9 -- 17 files changed, 78 insertions(+), 57 deletions(-) New commits: commit 99872adcfbcee7bb2e6b2f35c05cb34bb8be76ee Author: Arnaud VersiniDate: Sun Nov 12 18:40:19 2017 +0100 Remove OAccessibleTextHelper::getCharacter and getTextRange Change-Id: Ib32e3ca6ba55ab99820a54023041247cea96ab0c Reviewed-on: https://gerrit.libreoffice.org/44652 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 44c63d4c5d39..db008f98897d 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -126,6 +126,8 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; virtual OUString SAL_CALL getText() override; virtual sal_Int32 SAL_CALL getCharacterCount() override; +virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; +virtual OUString SAL_CALL getTextRange(sal_Int32 nStartIndex, sal_Int32 nEndIndex) override; }; diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index a116fab701c5..495f4a36412a 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -123,6 +123,7 @@ public: // XAccessibleText virtual OUString SAL_CALL getText() override; +virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; virtual sal_Int32 SAL_CALL getCharacterCount() override; virtual sal_Int32 SAL_CALL getCaretPosition() override; virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; @@ -131,7 +132,7 @@ public: virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; - +virtual OUString SAL_CALL getTextRange(sal_Int32 nStartIndex, sal_Int32 nEndIndex) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index a7f3e940d3a1..010c32a3a9d3 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -115,6 +115,7 @@ public: // XAccessibleText virtual OUString SAL_CALL getText() override; +virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; virtual sal_Int32 SAL_CALL getCharacterCount() override; virtual sal_Int32 SAL_CALL getCaretPosition() override; virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; @@ -123,6 +124,7 @@ public: virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; +virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleComponent virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; diff --git
[Libreoffice-commits] core.git: accessibility/inc accessibility/source comphelper/source editeng/source include/comphelper
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx |4 - accessibility/inc/standard/vclxaccessiblemenuitem.hxx|8 +-- accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx |3 + accessibility/inc/standard/vclxaccessibletabpage.hxx |3 + accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |2 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |2 accessibility/source/extended/AccessibleGridControlTableCell.cxx |2 accessibility/source/extended/accessibleiconchoicectrlentry.cxx |7 +-- accessibility/source/extended/accessiblelistboxentry.cxx |4 - accessibility/source/extended/textwindowaccessibility.cxx|8 +-- accessibility/source/standard/vclxaccessiblelistitem.cxx | 16 +++ accessibility/source/standard/vclxaccessiblemenuitem.cxx | 14 ++ accessibility/source/standard/vclxaccessiblestatusbaritem.cxx| 15 ++ accessibility/source/standard/vclxaccessibletabpage.cxx | 19 ++-- accessibility/source/standard/vclxaccessibletextcomponent.cxx|2 accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 15 ++ comphelper/source/misc/accessibletexthelper.cxx | 22 -- editeng/source/accessibility/AccessibleEditableTextPara.cxx |2 include/comphelper/accessibletexthelper.hxx |6 -- 19 files changed, 83 insertions(+), 71 deletions(-) New commits: commit 8d4a44d176fc7e80d6c5f13b1e73069967b9593b Author: Arnaud VersiniDate: Sun Nov 12 14:23:52 2017 +0100 Remove OCommonAccessibleText::getText and getCharacterCount. No need to create helper for those methods. Change-Id: I0505fe8141b1bad852b7f30aeb69628fb6a90071 Reviewed-on: https://gerrit.libreoffice.org/44649 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index dcb4c9c5b01a..75cb5e0d739a 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -39,7 +39,7 @@ namespace accessibility protected: // OCommonAccessibleText -virtual OUStringimplGetText() override; +virtual OUStringimplGetText() final override; virtual css::lang::Locale implGetLocale() override; virtual voidimplGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; @@ -112,7 +112,7 @@ namespace accessibility virtual sal_Int32 SAL_CALL getSelectionStart() override; virtual sal_Int32 SAL_CALL getSelectionEnd() override; virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; -virtual OUString SAL_CALL getText() override; +virtual OUString SAL_CALL getText() final override; virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index 5e54ecb595e3..41373b8e00c3 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -51,7 +51,7 @@ protected: virtual voidFillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; // OCommonAccessibleText -virtual OUString implGetText() override; +virtual OUString implGetText() final override; virtual css::lang::LocaleimplGetLocale() override; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; @@ -75,16 +75,16 @@ public: // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() override; virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; -virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; +virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) final override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; -virtual sal_Int32 SAL_CALL getCharacterCount() override;
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx|2 +- accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx |2 +- accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx |2 +- accessibility/inc/extended/AccessibleBrowseBoxTable.hxx |2 +- accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx |2 +- accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx |2 +- accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx|2 +- accessibility/inc/extended/AccessibleGridControlTable.hxx |2 +- accessibility/inc/extended/AccessibleGridControlTableBase.hxx |2 +- accessibility/inc/extended/AccessibleGridControlTableCell.hxx |2 +- accessibility/inc/extended/accessiblebrowseboxcell.hxx|2 +- accessibility/inc/extended/accessibleeditbrowseboxcell.hxx|2 +- accessibility/inc/extended/accessiblelistboxentry.hxx |2 +- accessibility/inc/extended/accessibletabbar.hxx |2 +- accessibility/inc/extended/accessibletabbarpage.hxx |2 +- accessibility/inc/extended/accessibletabbarpagelist.hxx |2 +- accessibility/inc/extended/accessibletablistbox.hxx |2 +- accessibility/inc/extended/accessibletablistboxtable.hxx |2 +- accessibility/source/extended/AccessibleBrowseBox.cxx |6 +++--- accessibility/source/extended/AccessibleBrowseBoxBase.cxx |2 +- accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx|2 +- accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |4 ++-- accessibility/source/extended/AccessibleBrowseBoxTable.cxx|2 +- accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx|2 +- accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx|2 +- accessibility/source/extended/AccessibleGridControl.cxx |6 +++--- accessibility/source/extended/AccessibleGridControlHeader.cxx |6 +++--- accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |4 ++-- accessibility/source/extended/AccessibleGridControlTable.cxx |4 ++-- accessibility/source/extended/AccessibleGridControlTableBase.cxx |2 +- accessibility/source/extended/AccessibleGridControlTableCell.cxx |2 +- accessibility/source/extended/accessibleiconchoicectrl.cxx|4 ++-- accessibility/source/extended/accessiblelistboxentry.cxx |2 +- accessibility/source/extended/accessibletabbarbase.cxx|4 ++-- accessibility/source/extended/accessibletablistbox.cxx|4 ++-- accessibility/source/extended/accessibletablistboxtable.cxx |6 +++--- accessibility/source/helper/acc_factory.cxx |2 +- accessibility/source/standard/vclxaccessiblebox.cxx |2 +- accessibility/source/standard/vclxaccessiblebutton.cxx|2 +- accessibility/source/standard/vclxaccessiblemenuitem.cxx |2 +- accessibility/source/standard/vclxaccessibleradiobutton.cxx |2 +- accessibility/source/standard/vclxaccessiblescrollbar.cxx |2 +- accessibility/source/standard/vclxaccessibletoolboxitem.cxx |2 +- 43 files changed, 57 insertions(+), 57 deletions(-) New commits: commit ecc73fa19e2c48e588b3aec98145172d8be37125 Author: Mike KaganskiDate: Mon Oct 9 08:59:38 2017 +0300 accessibility: consistently use "" and <> in include directives Change-Id: I7b6bd3691c95dff0e80f2fb31fa1ffb10f27b58d Reviewed-on: https://gerrit.libreoffice.org/43268 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 2bb3328a5acb..0a579376649b 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -22,7 +22,7 @@ #include #include #include -#include "extended/accessiblebrowseboxcell.hxx" +#include #include #include diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index 7ad695f235f0..c7bcacaec9a3 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX #define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX -#include "extended/AccessibleBrowseBoxTableBase.hxx" +#include #include #include diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source chart2/source cui/source dbaccess/source extensions/source formula/source fpicker/source include/sfx2 include/vcl s
accessibility/inc/helper/IComboListBoxHelper.hxx |2 - accessibility/inc/helper/listboxhelper.hxx |4 +-- accessibility/source/standard/vclxaccessiblebox.cxx|2 - accessibility/source/standard/vclxaccessiblelist.cxx |4 +-- basctl/source/basicide/basicbox.cxx|2 - basctl/source/dlged/managelang.cxx |4 +-- chart2/source/controller/dialogs/res_BarGeometry.cxx |4 +-- chart2/source/controller/dialogs/res_BarGeometry.hxx |2 - chart2/source/controller/dialogs/res_DataLabel.cxx |2 - chart2/source/controller/dialogs/res_ErrorBar.cxx |2 - chart2/source/controller/dialogs/tp_AxisLabel.cxx |2 - chart2/source/controller/dialogs/tp_AxisPositions.cxx |2 - chart2/source/controller/dialogs/tp_ChartType.cxx |2 - chart2/source/controller/dialogs/tp_LegendPosition.cxx |2 - chart2/source/controller/dialogs/tp_PointGeometry.cxx |2 - cui/source/dialogs/SpellDialog.cxx |4 +-- cui/source/dialogs/cuifmsearch.cxx |4 +-- cui/source/dialogs/cuigaldlg.cxx | 10 +++ cui/source/dialogs/showcols.cxx|2 - cui/source/options/optchart.cxx|2 - cui/source/options/optjava.cxx |4 +-- cui/source/options/tsaurls.cxx |2 - cui/source/tabpages/autocdlg.cxx |4 +-- cui/source/tabpages/numpages.cxx | 12 - cui/source/tabpages/swpossizetabpage.cxx | 10 +++ dbaccess/source/ui/dlg/dbfindex.cxx|4 +-- dbaccess/source/ui/dlg/dsselect.cxx|2 - dbaccess/source/ui/misc/WColumnSelect.cxx |8 +++--- dbaccess/source/ui/misc/WTypeSelect.cxx|4 +-- extensions/source/abpilot/tableselectionpage.cxx |4 +-- extensions/source/dbpilots/commonpagesdbp.cxx |6 ++-- extensions/source/dbpilots/gridwizard.cxx |4 +-- extensions/source/dbpilots/groupboxwiz.cxx |4 +-- extensions/source/dbpilots/listcombowizard.cxx |8 +++--- extensions/source/propctrlr/listselectiondlg.cxx |2 - formula/source/ui/dlg/funcpage.cxx |2 - fpicker/source/office/RemoteFilesDialog.cxx|2 - include/sfx2/controlwrapper.hxx|2 - include/vcl/combobox.hxx |2 - include/vcl/lstbox.hxx |2 - sc/inc/scabstdlg.hxx |2 - sc/source/ui/attrdlg/scdlgfact.cxx |4 +-- sc/source/ui/attrdlg/scdlgfact.hxx |2 - sc/source/ui/dbgui/consdlg.cxx |4 +-- sc/source/ui/dbgui/filtdlg.cxx |6 ++-- sc/source/ui/dbgui/pfiltdlg.cxx|4 +-- sc/source/ui/dbgui/pvfundlg.cxx|4 +-- sc/source/ui/dbgui/scuiasciiopt.cxx|2 - sc/source/ui/inc/shtabdlg.hxx |2 - sc/source/ui/miscdlgs/instbdlg.cxx |6 ++-- sc/source/ui/miscdlgs/linkarea.cxx |4 +-- sc/source/ui/miscdlgs/shtabdlg.cxx |4 +-- sc/source/ui/navipi/scenwnd.cxx|8 +++--- sc/source/ui/pagedlg/tptable.cxx |2 - sc/source/ui/view/tabvwsh3.cxx |2 - sc/source/ui/view/tabvwshf.cxx |2 - sd/source/filter/html/pubdlg.cxx |2 - sd/source/ui/animations/CustomAnimationPane.cxx|4 +-- sd/source/ui/animations/SlideTransitionPane.cxx|6 ++-- sd/source/ui/dlg/PhotoAlbumDialog.cxx |6 ++-- sd/source/ui/dlg/custsdlg.cxx |2 - sd/source/ui/dlg/headerfooterdlg.cxx |2 - sd/source/ui/dlg/navigatr.cxx |2 - sd/source/ui/dlg/tpaction.cxx |2 - sfx2/source/doc/new.cxx|2 - svx/source/dialog/frmdirlbox.cxx |2 - svx/source/engine3d/float3d.cxx|4 +-- svx/source/fmcomp/gridcell.cxx | 12 - svx/source/tbxctrls/lboxctrl.cxx |6 ++-- sw/source/ui/envelp/mailmrge.cxx |4 +-- sw/source/ui/fldui/flddinf.cxx |2 - sw/source/ui/fldui/flddok.cxx |8 +++--- sw/source/ui/fldui/fldfunc.cxx |6 ++-- sw/source/ui/fldui/fldref.cxx | 12 - sw/source/ui/fldui/fldvar.cxx | 10
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/accessibletabbarpage.hxx |5 +--- accessibility/inc/standard/vclxaccessiblebox.hxx |6 +++-- accessibility/inc/standard/vclxaccessiblemenu.hxx |1 accessibility/inc/standard/vclxaccessiblemenuitem.hxx |2 - accessibility/inc/standard/vclxaccessiblestatusbar.hxx|3 -- accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx|7 ++ accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |9 +++- accessibility/source/extended/accessibletabbar.cxx|2 - accessibility/source/extended/accessibletabbarpage.cxx|7 +- accessibility/source/standard/vclxaccessiblebox.cxx | 11 +++--- accessibility/source/standard/vclxaccessiblebutton.cxx|6 ++--- accessibility/source/standard/vclxaccessiblecheckbox.cxx |6 ++--- accessibility/source/standard/vclxaccessiblemenu.cxx |6 - accessibility/source/standard/vclxaccessiblemenuitem.cxx |6 ++--- accessibility/source/standard/vclxaccessibleradiobutton.cxx |6 ++--- accessibility/source/standard/vclxaccessiblescrollbar.cxx |9 accessibility/source/standard/vclxaccessiblestatusbar.cxx |2 - accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |9 +--- accessibility/source/standard/vclxaccessibletoolbox.cxx |2 - accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10 - 20 files changed, 58 insertions(+), 57 deletions(-) New commits: commit 5d060fd07a16c80bd94d27b08fefe1d0aaf418f7 Author: Arnaud VersiniDate: Sun Jul 23 16:25:20 2017 +0200 accessibility: remove useless calls to virtual methods. This also removes a lot of useless recursive locks. Change-Id: Ifee7dbf2095bf0431eb27e8022e7f5299c46388f Reviewed-on: https://gerrit.libreoffice.org/42122 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index d9ee581dd372..a89914aea111 100644 --- a/accessibility/inc/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -43,8 +43,8 @@ namespace accessibility css::accessibility::XAccessible, css::lang::XServiceInfo > AccessibleTabBarPage_BASE; -class AccessibleTabBarPage :public AccessibleTabBarBase, -public AccessibleTabBarPage_BASE +class AccessibleTabBarPage final : public AccessibleTabBarBase, + public AccessibleTabBarPage_BASE { friend class AccessibleTabBarPageList; @@ -56,7 +56,6 @@ namespace accessibility css::uno::Reference< css::accessibility::XAccessible > m_xParent; -protected: boolIsEnabled(); boolIsShowing(); boolIsSelected(); diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index b16a12f7702f..c632e2d99d38 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -70,7 +70,7 @@ public: actual list. The text field is not provided for non drop down list boxes. */ -sal_Int32 SAL_CALL getAccessibleChildCount() override; +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. @@ -87,7 +87,7 @@ public: /** There is one action for drop down boxes and none for others. */ -virtual sal_Int32 SAL_CALL getAccessibleActionCount() override; +virtual sal_Int32 SAL_CALL getAccessibleActionCount() final override; /** The action for drop down boxes lets the user toggle the visibility of the popup menu. */ @@ -153,6 +153,8 @@ protected: virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; +sal_Int32 implGetAccessibleChildCount(); + private: /// Index in parent. This is settable from the outside. sal_Int32 m_nIndexInParent; diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index 58c0b116f662..b44742c43866 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -38,6 +38,7 @@ class VCLXAccessibleMenu : public VCLXAccessibleMenuItem, protected: virtual boolIsFocused() override; virtual boolIsPopupMenuOpen() override; +sal_Int32 implGetSelectedAccessibleChildCount(); public: VCLXAccessibleMenu(
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblemenuitem.hxx |2 +- accessibility/source/standard/vclxaccessiblebutton.cxx |6 +++--- accessibility/source/standard/vclxaccessiblecheckbox.cxx|6 +++--- accessibility/source/standard/vclxaccessiblemenu.cxx|2 +- accessibility/source/standard/vclxaccessiblemenuitem.cxx|6 +++--- accessibility/source/standard/vclxaccessibleradiobutton.cxx |6 +++--- accessibility/source/standard/vclxaccessiblescrollbar.cxx |9 - accessibility/source/standard/vclxaccessibletoolboxitem.cxx |6 +++--- 8 files changed, 21 insertions(+), 22 deletions(-) New commits: commit 88179e3de8865ea07d5017ca0723afd10ad44ba7 Author: Markus MohrhardDate: Mon Aug 7 00:42:57 2017 +0200 Revert "accessibility: remove useless calls to getAccessibleActionCount." This reverts commit e2c14a6caabbb6413ae7b1e631a0a89f7b2ba4c7. Change-Id: I6dc99c8ad9c6f15d6b1273338d96bc7909253ad9 Reviewed-on: https://gerrit.libreoffice.org/40815 Reviewed-by: Markus Mohrhard Tested-by: Jenkins diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index 5e54ecb595e3..ee0ccd5589e8 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -92,7 +92,7 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleAction -virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) final override; +virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index df67584bdccc..c95004327f86 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -187,7 +187,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); -if ( nIndex != 0 ) +if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); VclPtr< PushButton > pButton = GetAs< PushButton >(); @@ -202,7 +202,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex { OExternalLockGuard aGuard( this ); -if ( nIndex != 0 ) +if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); return OUString(RID_STR_ACC_ACTION_CLICK); @@ -213,7 +213,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB { OExternalLockGuard aGuard( this ); -if ( nIndex != 0 ) +if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index d411c8ca54a2..f8243bfc7254 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -184,7 +184,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); -if ( nIndex != 0 ) +if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >(); @@ -214,7 +214,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd { OExternalLockGuard aGuard( this ); -if ( nIndex != 0 ) +if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); if(IsChecked()) @@ -228,7 +228,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe { OExternalLockGuard aGuard( this ); -if ( nIndex != 0 ) +if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index def909c40758..fd709766618c 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -231,7 +231,7 @@
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblemenuitem.hxx |2 +- accessibility/source/standard/vclxaccessiblebutton.cxx |6 +++--- accessibility/source/standard/vclxaccessiblecheckbox.cxx|6 +++--- accessibility/source/standard/vclxaccessiblemenu.cxx|2 +- accessibility/source/standard/vclxaccessiblemenuitem.cxx|6 +++--- accessibility/source/standard/vclxaccessibleradiobutton.cxx |6 +++--- accessibility/source/standard/vclxaccessiblescrollbar.cxx |9 + accessibility/source/standard/vclxaccessibletoolboxitem.cxx |6 +++--- 8 files changed, 22 insertions(+), 21 deletions(-) New commits: commit e2c14a6caabbb6413ae7b1e631a0a89f7b2ba4c7 Author: Arnaud VersiniDate: Sun Jul 23 16:25:20 2017 +0200 accessibility: remove useless calls to getAccessibleActionCount. This also removes a lot of useless recursive locks. Change-Id: Ie7f337683146bb5738f11b8f9194e73437312f03 Reviewed-on: https://gerrit.libreoffice.org/40325 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index ee0ccd5589e8..5e54ecb595e3 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -92,7 +92,7 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleAction -virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; +virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) final override; virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index c95004327f86..df67584bdccc 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -187,7 +187,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); VclPtr< PushButton > pButton = GetAs< PushButton >(); @@ -202,7 +202,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); return OUString(RID_STR_ACC_ACTION_CLICK); @@ -213,7 +213,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index f8243bfc7254..d411c8ca54a2 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -184,7 +184,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >(); @@ -214,7 +214,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); if(IsChecked()) @@ -228,7 +228,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index fd709766618c..def909c40758 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -231,7 +231,7 @@ OUString
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/inc basctl/source basic/source chart2/inc chart2/source compilerplugins/clang connectivity/source cppcanvas
accessibility/inc/pch/precompiled_acc.hxx |2 accessibility/source/helper/accresmgr.cxx |7 avmedia/source/framework/mediamisc.cxx |7 avmedia/source/inc/mediamisc.hxx|2 basctl/inc/pch/precompiled_basctl.hxx |2 basctl/source/basicide/iderdll.cxx |4 basic/source/runtime/basrdll.cxx|4 basic/source/sbx/sbxscan.cxx|4 chart2/inc/pch/precompiled_chartcontroller.hxx |2 chart2/source/tools/ResId.cxx |2 chart2/source/tools/ResourceManager.cxx |6 compilerplugins/clang/unusedenumconstants.writeonly.results |8 - connectivity/source/commontools/sqlerror.cxx|6 connectivity/source/resource/sharedresources.cxx|6 cppcanvas/inc/pch/precompiled_cppcanvas.hxx |2 cui/inc/pch/precompiled_cui.hxx |2 cui/source/factory/cuiresmgr.cxx| 16 -- dbaccess/inc/pch/precompiled_dba.hxx|2 dbaccess/inc/pch/precompiled_dbmm.hxx |2 dbaccess/source/core/resource/core_resource.cxx |6 desktop/inc/app.hxx |2 desktop/inc/dp_shared.hxx |6 desktop/inc/pch/precompiled_sofficeapp.hxx |2 desktop/source/deployment/gui/dp_gui_dialog2.cxx|2 desktop/source/deployment/misc/dp_resource.cxx |2 desktop/source/lib/init.cxx |2 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx |2 desktop/source/pkgchk/unopkg/unopkg_shared.h|2 editeng/inc/pch/precompiled_editeng.hxx |2 editeng/source/editeng/eerdll.cxx |5 embeddedobj/source/general/docholder.cxx|4 extensions/CppunitTest_extensions_test_update.mk|2 extensions/Library_updatecheckui.mk |1 extensions/Library_updchk.mk|2 extensions/source/abpilot/unodialogabp.hxx |7 extensions/source/bibliography/bibmod.cxx |4 extensions/source/dbpilots/unoautopilot.hxx |1 extensions/source/inc/componentmodule.cxx | 75 -- extensions/source/inc/componentmodule.hxx | 37 - extensions/source/propctrlr/modulepcr.cxx |6 extensions/source/propctrlr/modulepcr.hxx |6 extensions/source/scanner/sanedlg.cxx |4 extensions/source/update/check/updatehdl.cxx|4 extensions/source/update/ui/updatecheckui.cxx |4 filter/source/graphicfilter/eps/eps.cxx |4 filter/source/pdf/impdialog.cxx |4 filter/source/pdf/pdfexport.cxx |4 filter/source/t602/t602filter.cxx |2 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx|4 filter/source/xsltdialog/xmlfiltertabdialog.cxx |2 forms/source/resource/frm_resource.cxx |7 formula/source/core/api/FormulaCompiler.cxx |2 formula/source/core/resource/core_resource.cxx |6 formula/source/ui/inc/ModuleHelper.hxx |2 formula/source/ui/resource/ModuleHelper.cxx |2 fpicker/inc/fpsofficeResMgr.hxx |4 fpicker/source/aqua/resourceprovider.mm |2 fpicker/source/office/iodlgimp.cxx |4 fpicker/source/win32/misc/resourceprovider.cxx |2 framework/inc/pch/precompiled_fwe.hxx |2 framework/inc/pch/precompiled_fwi.hxx |2 framework/inc/pch/precompiled_fwk.hxx |2 framework/inc/pch/precompiled_fwl.hxx |2 framework/source/fwe/classes/fwkresid.cxx | 24 --- framework/source/uiconfiguration/ImageList.cxx |1 include/unotools/componentresmodule.hxx | 57 --- include/unotools/resmgr.hxx | 17 +- include/vcl/builder.hxx |2 ios/CustomTarget_Lo_Xcconfig.mk |2 reportdesign/inc/pch/precompiled_rpt.hxx|2 reportdesign/inc/pch/precompiled_rptui.hxx |2 reportdesign/source/core/resource/core_resource.cxx |7
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basic/source comphelper/source compilerplugins/clang connectivity/source cppcanvas/source drawinglayer/source extensions/source f
accessibility/inc/extended/accessibleiconchoicectrl.hxx |2 accessibility/inc/extended/accessiblelistbox.hxx|2 accessibility/source/extended/accessibleiconchoicectrl.cxx |2 accessibility/source/extended/accessiblelistbox.cxx |2 basic/source/basmgr/basmgr.cxx |4 basic/source/runtime/iosys.cxx |8 comphelper/source/misc/backupfilehelper.cxx |4 compilerplugins/clang/constparams.cxx | 248 +- compilerplugins/clang/test/constparams.cxx | 27 + connectivity/source/drivers/file/fcode.cxx |2 connectivity/source/drivers/file/fcomp.cxx |4 connectivity/source/drivers/firebird/Blob.cxx |2 connectivity/source/drivers/firebird/Blob.hxx |2 connectivity/source/drivers/firebird/Clob.cxx |2 connectivity/source/drivers/firebird/Clob.hxx |2 connectivity/source/drivers/firebird/Connection.cxx |4 connectivity/source/drivers/firebird/Connection.hxx |4 connectivity/source/drivers/firebird/Tables.hxx |2 connectivity/source/drivers/firebird/Users.cxx |2 connectivity/source/drivers/firebird/Users.hxx |2 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |2 connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx |2 connectivity/source/inc/file/fcode.hxx |2 connectivity/source/inc/file/fcomp.hxx |4 cppcanvas/source/mtfrenderer/textaction.cxx | 24 drawinglayer/source/primitive2d/sceneprimitive2d.cxx|2 extensions/source/bibliography/datman.cxx |4 extensions/source/bibliography/framectr.cxx |2 extensions/source/config/ldap/ldapuserprofilebe.cxx |2 extensions/source/config/ldap/ldapuserprofilebe.hxx |2 extensions/source/update/ui/updatecheckui.cxx |2 formula/source/core/api/FormulaCompiler.cxx |2 framework/inc/uielement/menubarmanager.hxx |4 framework/inc/xml/saxnamespacefilter.hxx|2 framework/inc/xml/toolboxdocumenthandler.hxx|2 framework/source/fwe/xml/saxnamespacefilter.cxx |2 framework/source/fwe/xml/toolboxdocumenthandler.cxx |2 idl/inc/database.hxx|4 idl/source/prj/database.cxx |4 include/basic/basmgr.hxx|4 include/linguistic/lngprophelp.hxx | 14 include/registry/registry.hxx |4 include/sfx2/app.hxx|2 include/sfx2/frame.hxx |2 include/svl/stylepool.hxx |2 include/svl/zformat.hxx |4 include/vcl/FilterConfigItem.hxx|4 include/vcl/filter/pdfdocument.hxx |2 linguistic/source/convdicxml.hxx|2 linguistic/source/lngprophelp.cxx | 14 sfx2/source/appl/appbas.cxx |2 sfx2/source/appl/helpinterceptor.cxx|2 sfx2/source/appl/helpinterceptor.hxx|2 sfx2/source/appl/impldde.cxx|4 sfx2/source/dialog/recfloat.cxx |2 sfx2/source/doc/sfxbasemodel.cxx|4 sfx2/source/inc/docundomanager.hxx |2 sfx2/source/inc/recfloat.hxx|2 sfx2/source/view/frame.cxx |2 smoketest/libtest.cxx |2 solenv/CompilerTest_compilerplugins_clang.mk|1 store/source/lockbyte.cxx |8 svl/source/items/stylepool.cxx |4 svl/source/numbers/numfmuno.cxx |2 svl/source/numbers/numfmuno.hxx |2 svl/source/numbers/zformat.cxx |4 svtools/source/graphic/grfcache.cxx |8 svtools/source/graphic/grfcache.hxx |4
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/textwindowaccessibility.hxx|8 accessibility/inc/standard/vclxaccessiblelist.hxx |2 +- accessibility/inc/standard/vclxaccessibletoolbox.hxx |2 +- accessibility/source/extended/textwindowaccessibility.cxx |8 accessibility/source/standard/vclxaccessiblelist.cxx |2 +- accessibility/source/standard/vclxaccessibletoolbox.cxx |2 +- 6 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 3b10ec87e383ce6ab14c0cede46ee98c13b11e61 Author: Noel GrandinDate: Wed Jul 19 13:56:36 2017 +0200 loplugin:constparams in accessibility Change-Id: I9c168295dcd6d4400c0f7c0b30ec22bd018cf93b Reviewed-on: https://gerrit.libreoffice.org/40203 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index d30259c2a70d..b77173398a92 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -422,7 +422,7 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "Paragraph const &" instead of a // "::rtl::Reference< Paragraph > const &". -void changeParagraphText(Paragraph * pParagraph, +void changeParagraphText(Paragraph const * pParagraph, OUString const & rText); // Must be called only after init has been called. @@ -431,7 +431,7 @@ public: // still zero), pass a "Paragraph const &" instead of a // "::rtl::Reference< Paragraph > const &". // Throws css::lang::IndexOutOfBoundsException. -void changeParagraphText(Paragraph * pParagraph, ::sal_Int32 nBegin, +void changeParagraphText(Paragraph const * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, bool bCut, bool bPaste, OUString const & rText); @@ -451,7 +451,7 @@ public: // "::rtl::Reference< Paragraph > const &". // Throws css::lang::IndexOutOfBoundsException. void changeParagraphAttributes( -Paragraph * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, +Paragraph const * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet); @@ -461,7 +461,7 @@ public: // still zero), pass a "Paragraph const &" instead of a // "::rtl::Reference< Paragraph > const &". // Throws css::lang::IndexOutOfBoundsException. -void changeParagraphSelection(Paragraph * pParagraph, +void changeParagraphSelection(Paragraph const * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd); css::i18n::Boundary diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 3d3533dcee1a..370ebc3e6be8 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -126,7 +126,7 @@ public: void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList); void UpdateSelection_Impl_Acc (bool b_IsDropDownList); -static void NotifyListItem(css::uno::Any& val); +static void NotifyListItem(css::uno::Any const & val); ::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper.get(); } protected: BoxType m_aBoxType; diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index b84add919884..0088bb16d1fd 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -96,7 +96,7 @@ public: private: void implReleaseToolboxItem( -ToolBoxItemsMap::iterator& _rMapPos, +ToolBoxItemsMap::iterator const & _rMapPos, bool _bNotifyRemoval ); }; diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 306cf797ff21..d74ee64fcc5d 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1121,7 +1121,7 @@ Document::retrieveRunAttributes( return comphelper::mapValuesToSequence( aRunAttrSeq ); } -void Document::changeParagraphText(Paragraph * pParagraph, +void Document::changeParagraphText(Paragraph const * pParagraph, OUString const & rText) { SolarMutexGuard aGuard; @@ -1134,7 +1134,7 @@ void Document::changeParagraphText(Paragraph * pParagraph, } } -void Document::changeParagraphText(Paragraph * pParagraph, +void Document::changeParagraphText(Paragraph const *
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessibleedit.hxx|5 +- accessibility/source/standard/vclxaccessibleedit.cxx | 37 ++- 2 files changed, 6 insertions(+), 36 deletions(-) New commits: commit a758956bb5fce66d1590109f3ce5593ac25967d8 Author: Arnaud VersiniDate: Sun Jul 2 11:55:59 2017 +0200 accessbility: Don't double lock mutexes in VCLXAccessibleEdit. Also simplify this class. Change-Id: I7abccd19287101918a6d9b4636ce2faecf169123 Reviewed-on: https://gerrit.libreoffice.org/39446 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index f0aaf6492de8..8e0c6635d566 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -34,15 +34,14 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleAction, css::accessibility::XAccessibleEditableText > VCLXAccessibleEdit_BASE; -class VCLXAccessibleEdit : public VCLXAccessibleTextComponent, - public VCLXAccessibleEdit_BASE +class VCLXAccessibleEdit final : public VCLXAccessibleTextComponent, + public VCLXAccessibleEdit_BASE { friend class VCLXAccessibleBox; private: sal_Int32 m_nCaretPosition; -protected: virtual ~VCLXAccessibleEdit() override; virtual voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 4bfa8e544636..c508ce434afe 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -246,7 +246,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); bool bDoAction = false; @@ -265,7 +265,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0) throw IndexOutOfBoundsException(); return OUString( "activate" ); @@ -276,7 +276,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin { OExternalLockGuard aGuard( this ); -if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) +if ( nIndex != 0 ) throw IndexOutOfBoundsException(); return Reference< XAccessibleKeyBinding >(); @@ -300,8 +300,6 @@ sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getCharacter( nIndex ); } @@ -396,40 +394,30 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getCharacterCount(); } sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getIndexAtPoint( aPoint ); } OUString VCLXAccessibleEdit::getSelectedText( ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getSelectedText(); } sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getSelectionStart(); } sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getSelectionEnd(); } @@ -458,27 +446,22 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd OUString VCLXAccessibleEdit::getText( ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getText(); } OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { -OExternalLockGuard aGuard( this ); - return VCLXAccessibleTextComponent::getTextRange( nStartIndex, nEndIndex ); } css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { -OExternalLockGuard aGuard( this ); - // Override general text component behavior: MultiLineEdit can have more text portions if ( aTextType == AccessibleTextType::ATTRIBUTE_RUN ) { +OExternalLockGuard aGuard( this ); VclPtr pMulitLineEdit = GetAsDynamic< VclMultiLineEdit >(); if ( pMulitLineEdit )
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/textwindowaccessibility.hxx| 14 accessibility/source/extended/textwindowaccessibility.cxx | 43 +- 2 files changed, 4 insertions(+), 53 deletions(-) New commits: commit 4ab979fce0f92733da568b5ef58b4272738740f5 Author: Stephan BergmannDate: Tue Jun 27 16:07:10 2017 +0200 Document::retrieveDefaultAttributesImpl did nothing ...ever since dac3b388798e78803a5df77894bfd30cddeb77c3 "INTEGRATION: CWS a11ysep" Change-Id: I1bba12e9f6ab69cf561a7eda010cefba91c47a49 diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index c44c028b8459..d30259c2a70d 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -412,15 +412,6 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "Paragraph const &" instead of a // "::rtl::Reference< Paragraph > const &". -css::uno::Sequence< css::beans::PropertyValue > retrieveDefaultAttributes( -Paragraph const * pParagraph, -const css::uno::Sequence< OUString >& RequestedAttributes); - -// Must be called only after init has been called. -// To make it possible for this method to be (indirectly) called from -// within Paragraph's constructor (i.e., when the Paragraph's ref count is -// still zero), pass a "Paragraph const &" instead of a -// "::rtl::Reference< Paragraph > const &". // Throws css::lang::IndexOutOfBoundsException. css::uno::Sequence< css::beans::PropertyValue > retrieveRunAttributes( Paragraph const * pParagraph, ::sal_Int32 Index, @@ -563,11 +554,6 @@ private: static ::FontWeight mapFontWeight(css::uno::Any const & rWeight); -static void retrieveDefaultAttributesImpl( -Paragraph const * pParagraph, -const css::uno::Sequence< OUString >& RequestedAttributes, -tPropValMap& rDefAttrSeq); - void retrieveRunAttributesImpl( Paragraph const * pParagraph, ::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes, diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 322118940159..9d0e19931131 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -489,10 +489,10 @@ sal_Bool SAL_CALL Paragraph::setText(OUString const & rText) // virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL -Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) +Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >&) { checkDisposed(); -return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes ); +return {}; // default attributes are not supported by text engine } // virtual @@ -1017,21 +1017,10 @@ Document::retrieveCharacterAttributes( " Document::retrieveCharacterAttributes", static_cast< css::uno::XWeak * >(this)); -// retrieve default attributes -tPropValMap aCharAttrSeq; -retrieveDefaultAttributesImpl( pParagraph, aRequestedAttributes, aCharAttrSeq ); // retrieve run attributes -tPropValMap aRunAttrSeq; -retrieveRunAttributesImpl( pParagraph, nIndex, aRequestedAttributes, aRunAttrSeq ); - -// merge default and run attributes -for ( tPropValMap::const_iterator aRunIter = aRunAttrSeq.begin(); - aRunIter != aRunAttrSeq.end(); - ++aRunIter ) -{ -aCharAttrSeq[ aRunIter->first ] = aRunIter->second; -} +tPropValMap aCharAttrSeq; +retrieveRunAttributesImpl( pParagraph, nIndex, aRequestedAttributes, aCharAttrSeq ); css::beans::PropertyValue* pValues = aAttribs.getArray(); for (i = 0; i < AttributeCount; i++,pValues++) @@ -1059,30 +1048,6 @@ Document::retrieveCharacterAttributes( return aNewValues; } -void Document::retrieveDefaultAttributesImpl( -Paragraph const * pParagraph, -const css::uno::Sequence< OUString >& RequestedAttributes, -tPropValMap& rDefAttrSeq) -{ -// default attributes are not supported by text engine -(void) pParagraph; -(void) RequestedAttributes; -(void) rDefAttrSeq; -} - -css::uno::Sequence< css::beans::PropertyValue > -Document::retrieveDefaultAttributes( -Paragraph const * pParagraph, -const css::uno::Sequence< OUString >& RequestedAttributes) -{ -SolarMutexGuard aGuard; -::osl::MutexGuard aInternalGuard( GetMutex() ); - -tPropValMap aDefAttrSeq; -retrieveDefaultAttributesImpl( pParagraph, RequestedAttributes, aDefAttrSeq ); -return comphelper::mapValuesToSequence( aDefAttrSeq ); -} - void Document::retrieveRunAttributesImpl( Paragraph const * pParagraph, ::sal_Int32 Index,
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source basic/source chart2/source comphelper/source include/basic include/comphelper
accessibility/inc/extended/accessibletabbarpage.hxx|1 accessibility/inc/standard/vclxaccessibleedit.hxx |1 accessibility/source/extended/accessibletabbarpage.cxx |1 accessibility/source/standard/vclxaccessibleedit.cxx |1 avmedia/source/gstreamer/gstwindow.cxx |6 - avmedia/source/gstreamer/gstwindow.hxx |1 basctl/source/dlged/dlgedfunc.cxx |6 - basctl/source/inc/dlgedfunc.hxx|3 basic/source/basmgr/basmgr.cxx |4 basic/source/classes/sb.cxx|1 basic/source/comp/parser.cxx |3 basic/source/inc/iosys.hxx |3 basic/source/inc/parser.hxx|1 basic/source/runtime/iosys.cxx |9 -- chart2/source/controller/dialogs/DataBrowser.cxx | 17 --- chart2/source/controller/dialogs/DataBrowser.hxx |6 - chart2/source/controller/dialogs/res_ErrorBar.cxx |4 chart2/source/controller/dialogs/tp_ChartType.cxx |4 chart2/source/controller/inc/CommandDispatchContainer.hxx |4 chart2/source/controller/inc/ItemConverter.hxx |1 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx|1 chart2/source/controller/inc/res_ErrorBar.hxx |2 chart2/source/controller/itemsetwrapper/ItemConverter.cxx |9 -- chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |2 chart2/source/controller/main/ChartController.cxx |2 chart2/source/controller/main/CommandDispatchContainer.cxx |4 chart2/source/inc/MediaDescriptorHelper.hxx| 15 --- chart2/source/tools/MediaDescriptorHelper.cxx | 43 ++ comphelper/source/misc/stillreadwriteinteraction.cxx |5 - include/basic/sbstar.hxx |1 include/comphelper/stillreadwriteinteraction.hxx |1 31 files changed, 25 insertions(+), 137 deletions(-) New commits: commit 7b5fac67fd2441778cb9a6d2f529adc270998144 Author: Noel GrandinDate: Thu Jun 22 14:50:10 2017 +0200 loplugin:unusedfields in accessibility..comphelper Change-Id: Ifb68d65fc3e48dd80e3ff2b7a4124468fdda1695 Reviewed-on: https://gerrit.libreoffice.org/39137 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index 3fa3d7a93a54..d9ee581dd372 100644 --- a/accessibility/inc/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -50,7 +50,6 @@ namespace accessibility private: sal_uInt16 m_nPageId; -boolm_bEnabled; boolm_bShowing; boolm_bSelected; OUStringm_sPageText; diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index 61ee87ee1102..f0aaf6492de8 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -40,7 +40,6 @@ class VCLXAccessibleEdit : public VCLXAccessibleTextComponent, friend class VCLXAccessibleBox; private: -sal_Int32 m_nSelectionStart; sal_Int32 m_nCaretPosition; protected: diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 9cfad8b674bd..d090b807a8b3 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -50,7 +50,6 @@ namespace accessibility ,m_nPageId( nPageId ) ,m_xParent( rxParent ) { -m_bEnabled = IsEnabled(); m_bShowing = IsShowing(); m_bSelected = IsSelected(); diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index e0ee6fe3f0a6..4bfa8e544636 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -61,7 +61,6 @@ using namespace ::comphelper; VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent(
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source comphelper/source include/comphelper include/toolkit svtools/inc svtools/source svx/source toolkit/Library_tk.mk to
accessibility/inc/extended/accessibletabbarbase.hxx |5 accessibility/inc/pch/precompiled_acc.hxx |1 accessibility/inc/standard/accessiblemenubasecomponent.hxx|4 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx|4 accessibility/inc/standard/vclxaccessibletabpage.hxx |4 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |4 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |1 accessibility/source/extended/accessibletabbarbase.cxx|1 accessibility/source/extended/textwindowaccessibility.cxx | 36 ++-- accessibility/source/standard/accessiblemenubasecomponent.cxx |3 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |3 accessibility/source/standard/vclxaccessibletabpage.cxx |3 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |2 basctl/source/accessibility/accessibledialogcontrolshape.cxx |3 basctl/source/accessibility/accessibledialogwindow.cxx|3 basctl/source/inc/accessibledialogcontrolshape.hxx|4 basctl/source/inc/accessibledialogwindow.hxx |4 comphelper/source/misc/accessiblecomponenthelper.cxx |9 - comphelper/source/misc/accessiblecontexthelper.cxx| 38 comphelper/source/misc/accessibleselectionhelper.cxx |2 comphelper/source/misc/accessibletexthelper.cxx |3 include/comphelper/accessiblecomponenthelper.hxx |8 - include/comphelper/accessiblecontexthelper.hxx| 80 -- include/comphelper/accessibleselectionhelper.hxx |3 include/comphelper/accessibletexthelper.hxx |3 include/toolkit/awt/vclxaccessiblecomponent.hxx |4 include/toolkit/controls/accessiblecontrolcontext.hxx |4 include/toolkit/helper/externallock.hxx | 44 - svtools/inc/vclxaccessibleheaderbaritem.hxx |7 svtools/source/control/vclxaccessibleheaderbaritem.cxx|4 svx/source/accessibility/charmapacc.cxx |9 - svx/source/inc/charmapacc.hxx | 10 - toolkit/Library_tk.mk |1 toolkit/source/awt/vclxaccessiblecomponent.cxx|2 toolkit/source/controls/accessiblecontrolcontext.cxx |1 toolkit/source/helper/externallock.cxx| 37 36 files changed, 62 insertions(+), 292 deletions(-) New commits: commit a7532d8f061986c2e828df32f47f1fee1a339a14 Author: Arnaud VersiniDate: Mon Jun 5 16:12:27 2017 +0200 Remove VCLExternalSolarLock and IMutex. Next step is to remove OContextEntryGuard. Change-Id: I9460fb67fba6f3bfb3c809b730c33f38d225a64e Reviewed-on: https://gerrit.libreoffice.org/38411 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx index d2d6ab83cc3c..8fd28dc06beb 100644 --- a/accessibility/inc/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/extended/accessibletabbarbase.hxx @@ -23,10 +23,8 @@ #include #include #include -#include class TabBar; -class VCLExternalSolarLock; class VclSimpleEvent; class VclWindowEvent; @@ -34,8 +32,7 @@ class VclWindowEvent; namespace accessibility { -class AccessibleTabBarBase : private BaseVCLExternalSolarLock, - public comphelper::OAccessibleExtendedComponentHelper +class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper { public: explicitAccessibleTabBarBase( TabBar* pTabBar ); diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index a6a92876ada5..bebb30a6b92e 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -303,7 +303,6 @@ #include #include #include -#include #include #include #include diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 96fa054244c2..2447b0d6c1d3 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -27,7 +27,6 @@ #include #include #include -#include #include @@ -46,8 +45,7 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE; -class OAccessibleMenuBaseComponent : private BaseVCLExternalSolarLock, - public comphelper::OAccessibleExtendedComponentHelper, +class OAccessibleMenuBaseComponent :
[Libreoffice-commits] core.git: accessibility/inc accessibility/source include/toolkit
accessibility/inc/extended/accessibletabbarbase.hxx |5 +++-- accessibility/inc/standard/accessiblemenubasecomponent.hxx|5 +++-- accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx|6 +++--- accessibility/inc/standard/vclxaccessibletabpage.hxx |6 +++--- accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |8 accessibility/source/extended/accessibletabbarbase.cxx|4 +--- accessibility/source/standard/accessiblemenubasecomponent.cxx |7 +-- accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |5 + accessibility/source/standard/vclxaccessibletabpage.cxx |5 + accessibility/source/standard/vclxaccessibletoolboxitem.cxx |7 +-- include/toolkit/helper/externallock.hxx |6 ++ 11 files changed, 27 insertions(+), 37 deletions(-) New commits: commit fd26c3199d6e0f537ecad21ac2ef465c80bc8b90 Author: Arnaud VersiniDate: Sun May 21 15:19:26 2017 +0200 accessibility: avoid useless allocation of a VCLExternalLock Change-Id: I4f95d38e0f3d139eded37dac10946084cfd11acd Reviewed-on: https://gerrit.libreoffice.org/37874 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx index 78162bf8f43e..d2d6ab83cc3c 100644 --- a/accessibility/inc/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/extended/accessibletabbarbase.hxx @@ -23,6 +23,7 @@ #include #include #include +#include class TabBar; class VCLExternalSolarLock; @@ -33,7 +34,8 @@ class VclWindowEvent; namespace accessibility { -class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper +class AccessibleTabBarBase : private BaseVCLExternalSolarLock, + public comphelper::OAccessibleExtendedComponentHelper { public: explicitAccessibleTabBarBase( TabBar* pTabBar ); @@ -52,7 +54,6 @@ private: voidClearTabBarPointer(); protected: -VCLExternalSolarLock* m_pExternalLock; VclPtrm_pTabBar; }; diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 43039facbbee..ba401354f810 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -27,13 +27,13 @@ #include #include #include +#include #include class Menu; class VclSimpleEvent; class VclMenuEvent; -class VCLExternalSolarLock; namespace utl { class AccessibleStateSetHelper; @@ -46,7 +46,8 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE; -class OAccessibleMenuBaseComponent : public comphelper::OAccessibleExtendedComponentHelper, +class OAccessibleMenuBaseComponent : private BaseVCLExternalSolarLock, + public comphelper::OAccessibleExtendedComponentHelper, public OAccessibleMenuBaseComponent_BASE { friend class OAccessibleMenuItemComponent; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 5fb0813a44f8..163fd663f5b6 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -25,9 +25,9 @@ #include #include #include +#include class StatusBar; -class VCLExternalSolarLock; namespace utl { class AccessibleStateSetHelper; @@ -43,13 +43,13 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE; -class VCLXAccessibleStatusBarItem : public AccessibleTextHelper_BASE, +class VCLXAccessibleStatusBarItem : private BaseVCLExternalSolarLock, +public AccessibleTextHelper_BASE, public VCLXAccessibleStatusBarItem_BASE { friend class VCLXAccessibleStatusBar; private: -VCLExternalSolarLock* m_pExternalLock; VclPtr m_pStatusBar; sal_uInt16 m_nItemId; OUStringm_sItemName; diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index d5153b11f630..830e45d64808 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -25,10 +25,10 @@ #include #include #include +#include class TabControl; -class VCLExternalSolarLock; namespace utl { class AccessibleStateSetHelper; @@ -44,13 +44,13 @@ typedef ::cppu::ImplHelper2<
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelist.hxx|5 - accessibility/source/standard/vclxaccessiblelist.cxx | 11 ++- 2 files changed, 2 insertions(+), 14 deletions(-) New commits: commit c365ebc7ce8a9852fd33f81b20df35a841f49960 Author: Arnaud VersiniDate: Sun May 7 23:55:53 2017 +0200 accessibility: simplify and inline VCLXAccessibleList::clearItems Change-Id: Ie32311850a0dc013e71e0456d7e6bfd8611e6e95 Reviewed-on: https://gerrit.libreoffice.org/37567 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 2399d5d69603..3d3533dcee1a 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -176,11 +176,6 @@ private: */ css::uno::Reference< css::accessibility::XAccessible > m_xParent; - -/** dispose all items aand clears the container -*/ -void clearItems(); - void UpdateEntryRange_Impl(); protected: void UpdateSelection_Impl(sal_Int32 nPos = 0); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 0da28109..e7014650bf36 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -113,19 +113,12 @@ void SAL_CALL VCLXAccessibleList::disposing() VCLXAccessibleComponent::disposing(); // Dispose all items in the list. -clearItems(); +m_aAccessibleChildren.clear(); m_pListBoxHelper.reset(); } -void VCLXAccessibleList::clearItems() -{ -// Clear the list itself and delete all the rest. -ListItems().swap(m_aAccessibleChildren); // clear and minimize -} - - void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) { SolarMutexGuard aSolarGuard; @@ -512,7 +505,7 @@ Reference VCLXAccessibleList::CreateChild (sal_Int32 nPos) void VCLXAccessibleList::HandleChangedItemList() { -clearItems(); +m_aAccessibleChildren.clear(); NotifyAccessibleEvent ( AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any()); ___ 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 basctl/inc basctl/source desktop/inc desktop/source
accessibility/inc/helper/accessiblestrings.hrc |9 - accessibility/inc/strings.hxx | 23 ++ accessibility/source/helper/accessiblestrings.src | 35 accessibility/source/standard/vclxaccessiblebox.cxx |3 accessibility/source/standard/vclxaccessiblebutton.cxx |3 accessibility/source/standard/vclxaccessiblemenuitem.cxx|3 accessibility/source/standard/vclxaccessibleradiobutton.cxx |6 accessibility/source/standard/vclxaccessiblescrollbar.cxx | 11 - accessibility/source/standard/vclxaccessibletoolboxitem.cxx |3 basctl/inc/strings.hxx | 41 + basctl/source/dlged/dlgedobj.cxx| 55 +++--- basctl/source/dlged/dlgresid.src| 95 basctl/source/dlged/propbrw.cxx | 51 +++--- basctl/source/inc/dlgresid.hrc | 25 --- desktop/inc/strings.hxx | 17 ++ desktop/source/app/app.cxx |5 desktop/source/app/desktop.hrc |1 desktop/source/app/desktop.src |5 18 files changed, 153 insertions(+), 238 deletions(-) New commits: commit 59676b310bc0eba154f323f5d32ed697fcbb227a Author: Caolán McNamaraDate: Sun Apr 30 14:58:50 2017 +0100 untranslated strings are just strings Change-Id: Ic7247a6d0e702572ca304bb048bfabfafcbf7505 diff --git a/accessibility/inc/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc index 780e0b583c8d..2af826891527 100644 --- a/accessibility/inc/helper/accessiblestrings.hrc +++ b/accessibility/inc/helper/accessiblestrings.hrc @@ -22,15 +22,6 @@ #define RID_TK_ACC_START1000 -// Accessible Action Id's -#define RID_STR_ACC_ACTION_CLICK( RID_TK_ACC_START +0 ) -#define RID_STR_ACC_ACTION_TOGGLEPOPUP ( RID_TK_ACC_START +1 ) -#define RID_STR_ACC_ACTION_SELECT ( RID_TK_ACC_START +2 ) -#define RID_STR_ACC_ACTION_INCLINE ( RID_TK_ACC_START +3 ) -#define RID_STR_ACC_ACTION_DECLINE ( RID_TK_ACC_START +4 ) -#define RID_STR_ACC_ACTION_INCBLOCK ( RID_TK_ACC_START +5 ) -#define RID_STR_ACC_ACTION_DECBLOCK ( RID_TK_ACC_START +6 ) - #define STR_SVT_ACC_ACTION_EXPAND ( RID_TK_ACC_START +8 ) #define STR_SVT_ACC_ACTION_COLLAPSE ( RID_TK_ACC_START +9 ) #define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START + 10 ) diff --git a/accessibility/inc/strings.hxx b/accessibility/inc/strings.hxx new file mode 100644 index ..1cee9d65a920 --- /dev/null +++ b/accessibility/inc/strings.hxx @@ -0,0 +1,23 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_ACCESSIBILITY_INC_STRINGS_HRC +#define INCLUDED_ACCESSIBILITY_INC_STRINGS_HRC + +#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" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src index 82806565d8b7..127c336ff1b8 100644 --- a/accessibility/source/helper/accessiblestrings.src +++ b/accessibility/source/helper/accessiblestrings.src @@ -19,41 +19,6 @@ #include -String RID_STR_ACC_ACTION_CLICK -{ -Text = "press"; -}; - -String RID_STR_ACC_ACTION_TOGGLEPOPUP -{ -Text = "togglePopup"; -}; - -String RID_STR_ACC_ACTION_SELECT -{ -Text = "select"; -}; - -String RID_STR_ACC_ACTION_INCLINE -{ -Text = "incrementLine"; -}; - -String RID_STR_ACC_ACTION_DECLINE -{ -Text = "decrementLine"; -}; - -String RID_STR_ACC_ACTION_INCBLOCK -{ -Text = "incrementBlock"; -}; - -String RID_STR_ACC_ACTION_DECBLOCK -{ -Text = "decrementBlock"; -}; - String RID_STR_ACC_NAME_BROWSEBUTTON { Text [ en-US ] = "Browse"; diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 32511a70eb81..f5bc0d5659d4 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -33,6 +33,7 @@ #include
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source include/avmedia sc/source sd/source sw/source
accessibility/inc/standard/vclxaccessiblelist.hxx|7 +-- accessibility/source/standard/vclxaccessiblelist.cxx |9 ++--- avmedia/source/framework/mediacontrol.cxx|3 +-- avmedia/source/viewer/mediawindow.cxx|3 +-- include/avmedia/mediawindow.hxx |3 +-- sc/source/ui/drawfunc/fuins1.cxx |2 +- sd/source/ui/func/fuinsert.cxx |2 +- sw/source/uibase/shells/grfshex.cxx |2 +- 8 files changed, 9 insertions(+), 22 deletions(-) New commits: commit dc735109bf44754b59a6fcdbcb8171d1bbf82ba3 Author: Noel GrandinDate: Fri Apr 28 11:19:09 2017 +0200 loplugin:checkunusedparams in accessibility and avmedia Change-Id: I94df9a65578792fb06f3b3259603f70ca1e0b3db Reviewed-on: https://gerrit.libreoffice.org/37059 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 9d77fe7a526a..2399d5d69603 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -164,13 +164,8 @@ protected: /** Call this method when the item list has been changed, i.e. items have been deleted or inserted. -@param bItemInserted -Indicate whether items have been inserted (TRUE) or removed (FALSE). -@param nIndex -Index of the new or removed item. A value of -1 indicates that -the whole list has been cleared. */ -void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex); +void HandleChangedItemList(); // VCLXAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) override; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index d314879765cf..0da28109 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -389,14 +389,9 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve case VclEventId::ListboxItemRemoved: case VclEventId::ComboboxItemRemoved: -HandleChangedItemList (false, reinterpret_cast( -rVclWindowEvent.GetData())); -break; - case VclEventId::ListboxItemAdded: case VclEventId::ComboboxItemAdded: -HandleChangedItemList (true, reinterpret_cast( -rVclWindowEvent.GetData())); +HandleChangedItemList(); break; case VclEventId::ControlGetFocus: { @@ -515,7 +510,7 @@ Reference VCLXAccessibleList::CreateChild (sal_Int32 nPos) } -void VCLXAccessibleList::HandleChangedItemList (bool /*bItemInserted*/, sal_Int32 /*nIndex*/) +void VCLXAccessibleList::HandleChangedItemList() { clearItems(); NotifyAccessibleEvent ( diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 18d4f5599618..85d3f95dd97b 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -294,8 +294,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void ) { OUString aURL; - if (MediaWindow::executeMediaURLDialog( - GetParent(), aURL, nullptr)) + if (MediaWindow::executeMediaURLDialog(aURL, nullptr)) { if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) ) MediaWindow::executeFormatErrorBox( this ); diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 71227b86265c..54c7308976b8 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -209,8 +209,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) } -bool MediaWindow::executeMediaURLDialog(vcl::Window*, -OUString& rURL, bool *const o_pbLink) +bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink) { ::sfx2::FileDialogHelperaDlg( o_pbLink ? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index c24fcdcfb589..f5dd652f2cd6 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -98,8 +98,7 @@ namespace avmedia static void getMediaFilters( FilterNameVector& rFilterNameVector ); /// @param o_pbLink if not 0, this is an "insert" dialog: display link /// checkbox and store its state in *o_pbLink -static bool executeMediaURLDialog( vcl::Window* pParent, -OUString& rURL,
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/inc basctl/source bin/find-unused-rid.py cui/source dbaccess/source desktop/source editeng/source extensions/source forms/
accessibility/inc/helper/accessiblestrings.hrc |3 accessibility/source/helper/accessiblestrings.src | 14 - basctl/inc/basidesh.hrc | 15 - basctl/source/basicide/basidesh.src | 60 -- bin/find-unused-rid.py | 103 +++ cui/source/customize/cfg.src| 14 - cui/source/customize/macropg.src| 20 -- cui/source/dialogs/hyperdlg.src |5 cui/source/dialogs/passwdomdlg.src |5 cui/source/dialogs/scriptdlg.src| 17 - cui/source/inc/cuires.hrc | 24 -- cui/source/options/optchart.src |5 cui/source/options/personalization.src |5 cui/source/tabpages/strings.src | 24 -- dbaccess/source/core/inc/core_resource.hrc |4 dbaccess/source/core/resource/strings.src | 20 -- dbaccess/source/ui/app/app.src |5 dbaccess/source/ui/app/dbu_app.hrc |1 dbaccess/source/ui/browser/sbabrw.src |5 dbaccess/source/ui/inc/dbu_brw.hrc |1 dbaccess/source/ui/inc/dbu_qry.hrc |2 dbaccess/source/ui/querydesign/query.src| 10 - desktop/source/deployment/registry/script/dp_script.hrc |1 desktop/source/deployment/registry/script/dp_script.src |5 editeng/source/items/svxitems.src | 54 - editeng/source/misc/lingu.src |4 editeng/source/outliner/outliner.src|4 extensions/source/abpilot/abpresid.hrc | 11 - extensions/source/bibliography/bib.hrc |2 extensions/source/bibliography/bib.src |9 extensions/source/dbpilots/dbpresid.hrc | 11 - forms/source/inc/frm_resource.hrc |3 forms/source/resource/xforms.src| 15 - fpicker/source/office/OfficeFilePicker.hrc |1 include/editeng/editrids.hrc| 20 -- include/sfx2/dialogs.hrc|3 include/sfx2/sfx.hrc|3 include/svx/dialogs.hrc | 63 -- include/svx/fmresids.hrc| 10 - include/svx/svxitems.hrc| 45 reportdesign/inc/RptResId.hrc | 13 - reportdesign/source/core/inc/core_resource.hrc |3 reportdesign/source/core/resource/strings.src |5 reportdesign/source/ui/report/report.src| 57 -- sc/inc/sc.hrc |3 sc/inc/scres.hrc|7 sc/source/ui/inc/filter.hrc |4 sc/source/ui/src/filter.src | 16 - sfx2/inc/app.hrc|3 sfx2/inc/doc.hrc|1 sfx2/source/appl/app.src| 13 - sfx2/source/sidebar/Sidebar.hrc |2 starmath/inc/starmath.hrc | 17 - starmath/source/commands.src| 35 --- svx/inc/accessibility.hrc |2 svx/inc/gallery.hrc | 19 -- svx/source/accessibility/accessibility.src |8 svx/source/dialog/sdstring.src | 26 -- svx/source/engine3d/float3d.src |5 svx/source/engine3d/string3d.src| 24 -- svx/source/form/datanavi.src| 20 -- svx/source/form/fmstring.src| 32 --- svx/source/gallery2/gallery.src | 77 svx/source/items/svxitems.src | 147 svx/source/tbxctrls/tbcontrl.src|5 sw/source/uibase/inc/ribbar.hrc |4 66 files changed, 104 insertions(+), 1070 deletions(-) New commits: commit f645294d3959ab204ac0efb6619e74b5ba85efa6 Author: Noel GrandinDate: Mon Mar 13 14:33:47 2017 +0200 remove unused RID constants found with the attached bin/find-unused-rid.py script Change-Id: I1cf79caa6cafedb8bc642f394dc7e7da889d6fdf Reviewed-on: https://gerrit.libreoffice.org/35136 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/helper/accessiblestrings.hrc
[Libreoffice-commits] core.git: accessibility/inc accessibility/source cui/source extensions/source forms/source framework/inc framework/source include/sfx2 include/vcl reportdesign/source sfx2/source
accessibility/inc/standard/vclxaccessibletoolbox.hxx| 15 - accessibility/source/standard/vclxaccessibletoolbox.cxx | 84 +++--- accessibility/source/standard/vclxaccessibletoolboxitem.cxx |6 cui/source/customize/cfg.cxx| 19 - extensions/source/bibliography/toolbar.cxx |4 forms/source/solar/control/navtoolbar.cxx | 16 - framework/inc/uielement/toolbarmerger.hxx | 14 - framework/source/uielement/addonstoolbarmanager.cxx | 10 framework/source/uielement/toolbarmanager.cxx | 19 - framework/source/uielement/toolbarmerger.cxx| 34 +- include/sfx2/sidebar/SidebarToolBox.hxx |2 include/vcl/toolbox.hxx | 56 ++-- reportdesign/source/ui/dlg/AddField.cxx | 10 reportdesign/source/ui/dlg/Condition.cxx|4 reportdesign/source/ui/misc/toolboxcontroller.cxx |4 sfx2/source/sidebar/SidebarToolBox.cxx |2 sfx2/source/view/viewsh.cxx |4 svtools/source/uno/toolboxcontroller.cxx|4 svx/source/dialog/srchdlg.cxx |2 svx/source/tbxctrls/tbunosearchcontrollers.cxx | 12 sw/source/uibase/ribbar/workctrl.cxx|2 vcl/inc/toolbox.h |2 vcl/osx/a11yfocustracker.cxx|5 vcl/source/window/builder.cxx |1 vcl/source/window/menubarwindow.cxx |8 vcl/source/window/toolbox.cxx | 144 +-- vcl/source/window/toolbox2.cxx | 151 ++-- vcl/unx/gtk/a11y/atkutil.cxx|5 28 files changed, 335 insertions(+), 304 deletions(-) New commits: commit 6e4d3bad807a32371fe49f0a4a28ca0e5b0f6e70 Author: Stephan BergmannDate: Mon Mar 13 13:27:46 2017 +0100 Clean up integer types representing positions in ToolBox's item vector (vs. uses of sal_uInt16 representing such items' IDs). APPEND and ITEM_NOTFOUND are members of ToolBox now (and have been bumped to the corresponding type's max). The payload of VclEventIds ToolboxButtonStateChanged ToolboxClick ToolboxHighlightOff ToolboxItemAdded ToolboxItemDisabled ToolboxItemEnabled ToolboxItemRemoved ToolboxItemTextChanged ToolboxItemUpdated ToolboxItemWindowChanged ToolboxSelect has been changed too (note that reading/writing of those payloads isn't very consistent, though: for some of these, values are written that are never read, while for some others no values are ever written but the reading code would like to receive some value if the payload wasn't a nullptr). Change-Id: I4856ffb3637404b8d866621a3503d7922b1b8141 diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index f914075..b84add9 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -21,6 +21,7 @@ #include #include +#include #include @@ -39,16 +40,16 @@ class VCLXAccessibleToolBox : public VCLXAccessibleComponent, public VCLXAccessi private: ToolBoxItemsMap m_aAccessibleChildren; -VCLXAccessibleToolBoxItem* GetItem_Impl( sal_Int32 _nPos ); +VCLXAccessibleToolBoxItem* GetItem_Impl( ToolBox::ImplToolItems::size_type _nPos ); voidUpdateFocus_Impl(); -voidReleaseFocus_Impl( sal_Int32 _nPos ); -voidUpdateChecked_Impl( sal_Int32 _nPos ); -voidUpdateIndeterminate_Impl( sal_Int32 _nPos ); -voidUpdateItem_Impl( sal_Int32 _nPos ); +voidReleaseFocus_Impl( ToolBox::ImplToolItems::size_type _nPos ); +voidUpdateChecked_Impl( ToolBox::ImplToolItems::size_type _nPos ); +voidUpdateIndeterminate_Impl( ToolBox::ImplToolItems::size_type _nPos ); +voidUpdateItem_Impl( ToolBox::ImplToolItems::size_type _nPos ); voidUpdateAllItems_Impl(); -voidUpdateItemName_Impl( sal_Int32 _nPos ); -voidUpdateItemEnabled_Impl( sal_Int32 _nPos ); +voidUpdateItemName_Impl( ToolBox::ImplToolItems::size_type _nPos ); +voidUpdateItemEnabled_Impl( ToolBox::ImplToolItems::size_type _nPos ); voidUpdateCustomPopupItemp_Impl(
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source chart2/inc chart2/source dbaccess/source desktop/source include/dbaccess include/svx include/tools include/unotools
accessibility/inc/standard/vclxaccessiblelist.hxx |1 accessibility/source/standard/vclxaccessiblelist.cxx | 22 - basctl/source/inc/basidesh.hxx |1 chart2/inc/ChartModel.hxx |2 chart2/source/model/main/ChartModel.cxx| 36 -- dbaccess/source/ui/browser/genericcontroller.cxx | 28 -- desktop/source/deployment/gui/dp_gui_extlistbox.cxx|7 desktop/source/deployment/gui/dp_gui_extlistbox.hxx|2 include/dbaccess/IController.hxx | 14 - include/dbaccess/genericcontroller.hxx |1 include/svx/fmpage.hxx |3 include/svx/obj3d.hxx |4 include/svx/postattr.hxx |4 include/svx/svdpage.hxx| 21 - include/tools/poly.hxx |1 include/tools/rc.hxx |1 include/unotools/textsearch.hxx|5 include/vcl/bitmap.hxx |1 include/vcl/bitmapaccess.hxx |2 include/vcl/pdfwriter.hxx | 42 --- include/vcl/salnativewidgets.hxx |1 include/vcl/splitwin.hxx |1 include/vcl/timer.hxx |1 include/vcl/wrkwin.hxx |1 include/xmloff/shapeimport.hxx |5 reportdesign/inc/RptPage.hxx |2 reportdesign/source/core/sdr/RptPage.cxx |4 reportdesign/source/ui/report/ReportSection.cxx|3 rsc/inc/rscdb.hxx |2 sc/source/filter/inc/worksheethelper.hxx |2 sc/source/filter/oox/worksheethelper.cxx | 15 - sc/source/ui/inc/dbfunc.hxx|1 sc/source/ui/inc/gridwin.hxx |4 sc/source/ui/inc/output.hxx|2 sc/source/ui/inc/undodraw.hxx |1 sc/source/ui/view/dbfunc3.cxx | 16 - sc/source/ui/view/gridwin.cxx | 170 - sc/source/ui/view/output.cxx |5 sc/source/ui/view/output3.cxx | 28 -- sc/source/ui/view/tabvwshb.cxx |5 sd/inc/sdpage.hxx |3 sd/source/core/sdpage.cxx |4 sfx2/source/dialog/splitwin.cxx| 31 -- sfx2/source/inc/splitwin.hxx |1 svtools/source/contnr/imivctl.hxx |1 svtools/source/contnr/imivctl1.cxx | 19 - svx/source/engine3d/obj3d.cxx |8 svx/source/form/fmpage.cxx |5 svx/source/items/postattr.cxx |5 svx/source/svdraw/svdedtv.cxx | 11 svx/source/svdraw/svdedtv2.cxx | 26 - svx/source/svdraw/svdfmtf.cxx |4 svx/source/svdraw/svdpage.cxx | 12 svx/source/svdraw/svdpoev.cxx |3 svx/source/svdraw/svdundo.cxx |6 svx/source/svdraw/svdxcgv.cxx |9 svx/source/table/tablecontroller.cxx |3 tools/source/generic/poly.cxx |5 tools/source/rc/rc.cxx |6 vcl/inc/sallayout.hxx |4 vcl/inc/unx/fc_fontoptions.hxx |1 vcl/source/fontsubset/ttcr.cxx | 12 vcl/source/fontsubset/ttcr.hxx |7 vcl/source/gdi/bitmap3.cxx | 104 --- vcl/source/gdi/bmpacc2.cxx | 12 vcl/source/gdi/pdfwriter.cxx | 20 - vcl/source/window/splitwin.cxx |4 xmloff/source/draw/shapeimport.cxx | 29 -- xmlsecurity/Library_xsec_fw.mk |1 xmlsecurity/source/framework/encryptionengine.cxx | 159 xmlsecurity/source/framework/encryptionengine.hxx | 93 --- xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx |4
[Libreoffice-commits] core.git: accessibility/inc accessibility/source animations/source avmedia/source basctl/source basegfx/source basegfx/test basic/source binaryurp/source bridges/source
accessibility/inc/extended/accessiblelistboxentry.hxx |2 accessibility/inc/extended/accessibletabbar.hxx |2 accessibility/inc/extended/accessibletabbarpagelist.hxx |2 accessibility/inc/extended/textwindowaccessibility.hxx |4 accessibility/inc/helper/characterattributeshelper.hxx |2 accessibility/inc/standard/accessiblemenubasecomponent.hxx |2 accessibility/inc/standard/vclxaccessiblestatusbar.hxx |2 accessibility/inc/standard/vclxaccessibletabcontrol.hxx |2 accessibility/source/extended/accessiblelistboxentry.cxx|2 accessibility/source/extended/textwindowaccessibility.cxx | 18 +-- accessibility/source/standard/vclxaccessibleedit.cxx|4 accessibility/source/standard/vclxaccessibleradiobutton.cxx |2 animations/source/animcore/animcore.cxx | 18 +-- avmedia/source/framework/MediaControlBase.cxx |4 avmedia/source/viewer/mediawindow.cxx |2 avmedia/source/viewer/mediawindow_impl.cxx |2 basctl/source/accessibility/accessibledialogwindow.cxx |6 - basctl/source/basicide/basides1.cxx |2 basctl/source/basicide/basobj2.cxx | 14 +- basctl/source/basicide/bastypes.cxx |4 basctl/source/basicide/breakpoint.cxx |4 basctl/source/basicide/breakpoint.hxx |2 basctl/source/basicide/documentenumeration.cxx |2 basctl/source/basicide/documentenumeration.hxx |4 basctl/source/basicide/macrodlg.cxx |2 basctl/source/basicide/moduldl2.cxx |2 basctl/source/basicide/scriptdocument.cxx | 12 +- basctl/source/dlged/dlgedobj.cxx| 18 +-- basctl/source/inc/accessibledialogwindow.hxx|2 basctl/source/inc/dlgedobj.hxx |4 basctl/source/inc/scriptdocument.hxx|2 basegfx/source/color/bcolortools.cxx|4 basegfx/source/curve/b2dbeziertools.cxx |2 basegfx/source/curve/b2dcubicbezier.cxx | 12 +- basegfx/source/polygon/b2dlinegeometry.cxx |4 basegfx/source/polygon/b2dpolygon.cxx | 12 +- basegfx/source/polygon/b2dpolygoncutandtouch.cxx|4 basegfx/source/polygon/b2dpolygontools.cxx |4 basegfx/source/polygon/b2dpolygontriangulator.cxx |6 - basegfx/source/polygon/b2dpolypolygoncutter.cxx | 20 ++-- basegfx/source/polygon/b2dpolypolygontools.cxx |4 basegfx/source/polygon/b2dtrapezoid.cxx |6 - basegfx/source/polygon/b3dpolygon.cxx | 16 +-- basegfx/source/polygon/b3dpolygontools.cxx |4 basegfx/source/polygon/b3dpolypolygon.cxx |2 basegfx/source/polygon/b3dpolypolygontools.cxx |8 - basegfx/source/range/b2xrange.cxx |6 - basegfx/source/raster/rasterconvert3d.cxx | 24 ++-- basegfx/source/tools/keystoplerp.cxx|2 basegfx/source/tools/tools.cxx |8 - basegfx/source/workbench/bezierclip.cxx | 58 ++-- basegfx/source/workbench/bezierclip.hxx |4 basegfx/source/workbench/convexhull.cxx | 12 +- basegfx/test/boxclipper.cxx |2 basegfx/test/boxclipper.hxx |2 basic/source/basmgr/basicmanagerrepository.cxx |6 - basic/source/basmgr/vbahelper.cxx |4 basic/source/classes/sbxmod.cxx |2 basic/source/inc/expr.hxx |4 basic/source/inc/parser.hxx |2 basic/source/inc/propacc.hxx|2 basic/source/inc/sbunoobj.hxx |2 binaryurp/source/cache.hxx |2 bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx |6 - bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx |6 - bridges/source/cpp_uno/gcc3_linux_arm/share.hxx |6 - bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx|6 - bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx|6 - bridges/source/cpp_uno/gcc3_linux_intel/share.hxx |6 - bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx|6 - bridges/source/cpp_uno/gcc3_linux_mips/share.hxx|6 -
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelist.hxx|4 ++-- accessibility/source/standard/vclxaccessiblelist.cxx |8 +++- 2 files changed, 5 insertions(+), 7 deletions(-) New commits: commit 7a507b578910674eeab3062d3dbf893e2d54e9de Author: Noel GrandinDate: Mon Jan 16 08:49:16 2017 +0200 new loplugin: useuniqueptr: accessibility Change-Id: I0994bfcae23a2714c78e16c9baa7e0a018d46513 Reviewed-on: https://gerrit.libreoffice.org/33144 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index a8aa753..cd79888 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -135,10 +135,10 @@ public: void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ; static void NotifyListItem(css::uno::Any& val); -::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper; } +::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper.get(); } protected: BoxType m_aBoxType; -::accessibility::IComboListBoxHelper* m_pListBoxHelper; +std::unique_ptr<::accessibility::IComboListBoxHelper> m_pListBoxHelper; ListItems m_aAccessibleChildren; sal_Int32 m_nVisibleLineCount; /// Index in parent. This is settable from the outside. diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index e369ea3..d0f87d3 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -74,7 +74,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType { VclPtr< ComboBox > pBox = GetAs< ComboBox >(); if ( pBox ) -m_pListBoxHelper = new VCLListBoxHelper (*pBox); +m_pListBoxHelper.reset( new VCLListBoxHelper (*pBox) ); break; } @@ -82,7 +82,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType { VclPtr< ListBox > pBox = GetAs< ListBox >(); if ( pBox ) -m_pListBoxHelper = new VCLListBoxHelper (*pBox); +m_pListBoxHelper.reset( new VCLListBoxHelper (*pBox) ); break; } } @@ -98,7 +98,6 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType VCLXAccessibleList::~VCLXAccessibleList() { -delete m_pListBoxHelper; } @@ -115,8 +114,7 @@ void SAL_CALL VCLXAccessibleList::disposing() // Dispose all items in the list. clearItems(); -delete m_pListBoxHelper; -m_pListBoxHelper = nullptr; +m_pListBoxHelper.reset(); } ___ 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
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx |6 accessibility/source/extended/AccessibleBrowseBox.cxx | 14 -- accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 18 +- accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 60 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |4 accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 39 ++--- accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 24 +-- accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 69 -- accessibility/source/extended/accessiblebrowseboxcell.cxx |4 accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 38 - accessibility/source/extended/accessibletablistbox.cxx |3 11 files changed, 135 insertions(+), 144 deletions(-) New commits: commit 62affdd4bf8ac45dfe6ce5274623e659895fdafa Author: Arnaud VersiniDate: Sun Dec 18 15:18:31 2016 +0100 accessibility: simplify locking Change-Id: I87580eabf87fffd86068b5b2e44672aa1f9ffe84 Reviewed-on: https://gerrit.libreoffice.org/32136 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index 32bc207..dd65a8e 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -406,12 +406,10 @@ protected: class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard { public: -inline SolarMethodGuard( AccessibleBrowseBoxBase& _rOwner, bool _bEnsureAlive = true ) +inline SolarMethodGuard( osl::Mutex& rMutex ) :SolarMutexGuard( ) -,osl::MutexGuard( _rOwner.getMutex( ) ) +,osl::MutexGuard( rMutex ) { -if ( _bEnsureAlive ) -_rOwner.ensureIsAlive( ); } }; diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index fea9965..377dc0a 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -112,9 +112,9 @@ void SAL_CALL AccessibleBrowseBox::disposing() sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() throw ( uno::RuntimeException, std::exception ) { -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getMutex() ); +SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); + return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount(); } @@ -123,8 +123,7 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getMutex() ); +SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); css::uno::Reference< css::accessibility::XAccessible > xRet; @@ -152,8 +151,7 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException, std::exception ) { -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getMutex() ); +SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); css::uno::Reference< css::accessibility::XAccessible > xChild; @@ -183,9 +181,9 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleBrowseBox::grabFocus() throw ( uno::RuntimeException, std::exception ) { -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getMutex() ); +SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); + mpBrowseBox->GrabFocus(); } diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index a13e23f..ccb2c37 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -187,8 +187,7 @@ Reference< css::accessibility::XAccessibleStateSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleStateSet() throw ( uno::RuntimeException, std::exception ) { -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getMutex() ); +SolarMethodGuard aGuard( getMutex() ); // don't check whether alive -> StateSet may contain DEFUNC return implCreateStateSetHelper(); } @@ -404,9 +403,9 @@ void AccessibleBrowseBoxBase::ensureIsAlive() const Rectangle AccessibleBrowseBoxBase::getBoundingBox() throw ( lang::DisposedException ) { -SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getMutex() ); +SolarMethodGuard aGuard(getMutex());
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/helper/characterattributeshelper.hxx|1 accessibility/source/helper/characterattributeshelper.cxx | 36 ++ 2 files changed, 7 insertions(+), 30 deletions(-) New commits: commit c1f4d4ddf27814b1d86b7d35dcf70a28aa217885 Author: Arnaud VersiniDate: Mon Dec 19 11:18:28 2016 +0100 accessibility: simplify CharacterAttributesHelper. Change-Id: I62063745e704c941fdce306228ebbe3522c3b438 Reviewed-on: https://gerrit.libreoffice.org/32738 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx index 6b679a9..bbffd80 100644 --- a/accessibility/inc/helper/characterattributeshelper.hxx +++ b/accessibility/inc/helper/characterattributeshelper.hxx @@ -41,7 +41,6 @@ private: public: CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ); -~CharacterAttributesHelper(); std::vector< css::beans::PropertyValue > GetCharacterAttributes(); css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ); diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index 4e33d1b..e4896fa 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -43,23 +43,14 @@ CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont, sa } -CharacterAttributesHelper::~CharacterAttributesHelper() -{ -m_aAttributeMap.clear(); -} - - std::vector< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes() { -std::vector< PropertyValue > aValues( m_aAttributeMap.size() ); +std::vector< PropertyValue > aValues; +aValues.reserve( m_aAttributeMap.size() ); -int i = 0; -for ( AttributeMap::iterator aIt = m_aAttributeMap.begin(); aIt != m_aAttributeMap.end(); ++aIt, ++i ) +for ( const auto& aIt : m_aAttributeMap) { -aValues[i].Name = aIt->first; -aValues[i].Handle = (sal_Int32) -1; -aValues[i].Value = aIt->second; -aValues[i].State = PropertyState_DIRECT_VALUE; +aValues.emplace_back(aIt.first, (sal_Int32) -1, aIt.second, PropertyState_DIRECT_VALUE); } return aValues; @@ -72,27 +63,14 @@ Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes( con return comphelper::containerToSequence(GetCharacterAttributes()); std::vector< PropertyValue > aValues; -sal_Int32 nLength = aRequestedAttributes.getLength(); -AttributeMap aAttributeMap; - -for ( sal_Int32 i = 0; i < nLength; ++i ) +for ( const auto& aRequestedAttribute: aRequestedAttributes) { -AttributeMap::iterator aFound = m_aAttributeMap.find( aRequestedAttributes[i] ); +AttributeMap::iterator aFound = m_aAttributeMap.find( aRequestedAttribute ); if ( aFound != m_aAttributeMap.end() ) -aAttributeMap.insert( *aFound ); +aValues.emplace_back(aFound->first, (sal_Int32) -1, aFound->second, PropertyState_DIRECT_VALUE); } -aValues.reserve( aAttributeMap.size() ); - -int i = 0; -for ( AttributeMap::iterator aIt = aAttributeMap.begin(); aIt != aAttributeMap.end(); ++aIt, ++i ) -{ -aValues[i].Name = aIt->first; -aValues[i].Handle = (sal_Int32) -1; -aValues[i].Value = aIt->second; -aValues[i].State = PropertyState_DIRECT_VALUE; -} return comphelper::containerToSequence(aValues); } ___ 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
accessibility/inc/helper/accessiblestrings.hrc| 23 +- accessibility/source/extended/accessibleeditbrowseboxcell.cxx |7 ++- accessibility/source/helper/accessiblestrings.src | 10 3 files changed, 28 insertions(+), 12 deletions(-) New commits: commit 92a1ad1f36b6d3cc13135a8c0805508933011577 Author: Muhammet KaraDate: Tue Dec 27 00:04:44 2016 +0200 Localize return value of EditBrowseBoxTableCell::getAccessibleName Change-Id: I040c1b9b8680a366819254e1d44b80115a339bbf Reviewed-on: https://gerrit.libreoffice.org/32441 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/accessibility/inc/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc index 60c4392..f957ab9 100644 --- a/accessibility/inc/helper/accessiblestrings.hrc +++ b/accessibility/inc/helper/accessiblestrings.hrc @@ -30,21 +30,24 @@ #define RID_STR_ACC_ACTION_DECLINE ( RID_TK_ACC_START +4 ) #define RID_STR_ACC_ACTION_INCBLOCK ( RID_TK_ACC_START +5 ) #define RID_STR_ACC_ACTION_DECBLOCK ( RID_TK_ACC_START +6 ) -#define RID_STR_ACC_NAME_PREVIEW( RID_TK_ACC_START +7 ) +#define RID_STR_ACC_NAME_PREVIEW( RID_TK_ACC_START +7 ) #define STR_SVT_ACC_ACTION_EXPAND ( RID_TK_ACC_START +8 ) #define STR_SVT_ACC_ACTION_COLLAPSE ( RID_TK_ACC_START +9 ) -#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START +10 ) +#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START + 10 ) -#define RID_STR_ACC_ACTION_CHECK( RID_TK_ACC_START +11 ) -#define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START +12 ) -#define RID_STR_ACC_ACTION_DOUBLE_CLICK ( RID_TK_ACC_START +13 ) -#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START +14 ) -#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START +15 ) -#define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START +16 ) +#define RID_STR_ACC_ACTION_CHECK( RID_TK_ACC_START + 11 ) +#define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START + 12 ) +#define RID_STR_ACC_ACTION_DOUBLE_CLICK ( RID_TK_ACC_START + 13 ) +#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START + 14 ) +#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START + 15 ) +#define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START + 16 ) -#define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 ) -#define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 ) +#define RID_STR_ACC_COLUMN_NUM ( RID_TK_ACC_START + 17 ) +#define RID_STR_ACC_ROW_NUM ( RID_TK_ACC_START + 18 ) + +#define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 ) +#define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 ) #endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 7344acf..d816176 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include +#include + #include #include #include @@ -103,8 +106,8 @@ namespace accessibility { SolarMethodGuard aGuard( *this ); -// TODO: localize this! -return "Column " + OUString::number(getColumnPos()-1) + ", Row " + OUString::number(getRowPos()); +return TK_RES_STRING(RID_STR_ACC_COLUMN_NUM).replaceAll("%COLUMNNUMBER", OUString::number(getColumnPos()-1)) + ", " + + TK_RES_STRING(RID_STR_ACC_ROW_NUM).replaceAll("%ROWNUMBER", OUString::number(getRowPos())); } css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException, std::exception ) diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src index 63e3067..1a82275 100644 --- a/accessibility/source/helper/accessiblestrings.src +++ b/accessibility/source/helper/accessiblestrings.src @@ -106,6 +106,16 @@ String RID_STR_ACC_PANEL_DESCRIPTION Text [ en-US ] = "Please press enter to go into child control for more operations"; }; +String RID_STR_ACC_COLUMN_NUM +{ +Text [ en-US ] = "Column %COLUMNNUMBER"; +}; + +String RID_STR_ACC_ROW_NUM +{ +Text [ en-US ] = "Row %ROWNUMBER"; +}; + String RID_STR_ACC_DESC_PANELDECL_TABBAR { Text [ en-US ] = "Panel Deck Tab Bar"; ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx| 27 ++- accessibility/source/extended/AccessibleBrowseBox.cxx | 10 +- accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 32 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |6 - accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx| 32 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |6 - accessibility/source/extended/AccessibleBrowseBoxTable.cxx| 26 +++ accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx| 16 ++-- accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx| 36 +- accessibility/source/extended/accessibletablistbox.cxx|2 accessibility/source/extended/accessibletablistboxtable.cxx | 14 +-- 11 files changed, 99 insertions(+), 108 deletions(-) New commits: commit ba6b35fc68a01aff72b39eb7809bacb326068668 Author: Arnaud VersiniDate: Mon Dec 12 18:42:08 2016 +0100 accessibility: cleanup AccessibleBrowseBoxBase implementation Change-Id: I5c9b96e2ebd2ac98dfa610346c1da89fbf56e2d2 Reviewed-on: https://gerrit.libreoffice.org/31916 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index cce60b7..a3f0575 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -283,10 +283,6 @@ protected: // internal helper methods -/** @throws DisposedException If the object is not alive. */ -void ensureIsAlive() const -throw ( css::lang::DisposedException ); - /** @return The osl::Mutex member provided by the class BaseMutex. */ inline ::osl::Mutex& getOslMutex(); @@ -309,11 +305,13 @@ protected: void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } public: -// public versions of internal helper methods, with access control -struct AccessControl { friend class SolarMethodGuard; private: AccessControl() { } }; +/** @return The osl::Mutex member provided by the class BaseMutex. */ +inline ::osl::Mutex&getMutex( ) { return m_aMutex; } + +/** @throws DisposedException If the object is not alive. */ +void ensureIsAlive() const +throw ( css::lang::DisposedException ); -inline ::osl::Mutex&getMutex( const AccessControl& ) { return getOslMutex(); } -inline void ensureIsAlive( const AccessControl& ) { ensureIsAlive(); } protected: // members @@ -408,17 +406,15 @@ protected: // a helper class for protecting methods which need to lock the solar mutex in addition to the own mutex -typedef ::osl::MutexGuard OslMutexGuard; - -class SolarMethodGuard : public SolarMutexGuard, public OslMutexGuard +class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard { public: inline SolarMethodGuard( AccessibleBrowseBoxBase& _rOwner, bool _bEnsureAlive = true ) :SolarMutexGuard( ) -,OslMutexGuard( _rOwner.getMutex( AccessibleBrowseBoxBase::AccessControl() ) ) +,osl::MutexGuard( _rOwner.getMutex( ) ) { if ( _bEnsureAlive ) -_rOwner.ensureIsAlive( AccessibleBrowseBoxBase::AccessControl() ); +_rOwner.ensureIsAlive( ); } }; @@ -429,11 +425,6 @@ inline ::svt::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() cons return meObjType; } -inline ::osl::Mutex& AccessibleBrowseBoxBase::getOslMutex() -{ -return m_aMutex; -} - inline void AccessibleBrowseBoxBase::implSetName( const OUString& rName ) { diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 73e9823..fea9965 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -85,7 +85,7 @@ AccessibleBrowseBox::~AccessibleBrowseBox() void SAL_CALL AccessibleBrowseBox::disposing() { -::osl::MutexGuard aGuard( getOslMutex() ); +::osl::MutexGuard aGuard( getMutex() ); m_xImpl->m_pTable = nullptr; m_xImpl->m_pColumnHeaderBar = nullptr; @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; -::osl::MutexGuard aGuard( getOslMutex() ); +::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount(); } @@ -124,7 +124,7 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException,
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source framework/so
accessibility/inc/extended/listboxaccessible.hxx |2 accessibility/source/extended/accessibleiconchoicectrl.cxx |4 accessibility/source/extended/accessiblelistbox.cxx | 22 accessibility/source/extended/accessibletabbar.cxx | 12 accessibility/source/extended/accessibletabbarbase.cxx |6 accessibility/source/extended/accessibletabbarpagelist.cxx | 22 accessibility/source/extended/accessibletablistboxtable.cxx | 25 accessibility/source/extended/listboxaccessible.cxx |3 accessibility/source/extended/textwindowaccessibility.cxx|7 accessibility/source/standard/accessiblemenubasecomponent.cxx| 32 - accessibility/source/standard/vclxaccessiblebox.cxx | 48 - accessibility/source/standard/vclxaccessiblebutton.cxx |2 accessibility/source/standard/vclxaccessiblecheckbox.cxx |2 accessibility/source/standard/vclxaccessibledropdowncombobox.cxx |4 accessibility/source/standard/vclxaccessibleedit.cxx |6 accessibility/source/standard/vclxaccessiblelist.cxx | 36 - accessibility/source/standard/vclxaccessiblemenubar.cxx | 10 accessibility/source/standard/vclxaccessibleradiobutton.cxx |2 accessibility/source/standard/vclxaccessiblescrollbar.cxx|2 accessibility/source/standard/vclxaccessiblestatusbar.cxx| 22 accessibility/source/standard/vclxaccessibletabcontrol.cxx | 26 accessibility/source/standard/vclxaccessibletextcomponent.cxx|2 accessibility/source/standard/vclxaccessibletoolbox.cxx | 44 - avmedia/source/opengl/oglwindow.cxx | 10 avmedia/source/viewer/mediaevent_impl.cxx| 12 basctl/source/accessibility/accessibledialogwindow.cxx | 22 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |2 cui/source/dialogs/screenshotannotationdlg.cxx |8 cui/source/options/fontsubs.cxx |2 cui/source/options/optfltr.cxx |2 cui/source/tabpages/autocdlg.cxx |2 dbaccess/source/ui/app/AppDetailView.cxx |4 dbaccess/source/ui/control/dbtreelistbox.cxx |2 dbaccess/source/ui/dlg/admincontrols.cxx | 14 dbaccess/source/ui/misc/ToolBoxHelper.cxx|2 dbaccess/source/ui/querydesign/TableWindowAccess.cxx |2 desktop/source/deployment/gui/dp_gui_dialog2.cxx |2 desktop/source/splash/splash.cxx |2 extensions/source/update/ui/updatecheckui.cxx| 19 filter/source/pdf/pdffilter.cxx |2 framework/source/dispatch/windowcommanddispatch.cxx |4 framework/source/layoutmanager/toolbarlayoutmanager.cxx |4 include/svtools/dialogcontrolling.hxx|8 include/svtools/ivctrl.hxx |2 include/svtools/treelistbox.hxx |2 include/vcl/ctrl.hxx |2 include/vcl/menu.hxx |2 include/vcl/svapp.hxx|8 include/vcl/vclevent.hxx | 305 -- include/vcl/window.hxx |3 reportdesign/source/ui/report/ReportController.cxx |2 reportdesign/source/ui/report/ReportControllerObserver.cxx |4 sc/source/ui/Accessibility/AccessibleDocument.cxx|5 sc/source/ui/app/inputhdl.cxx|4 sc/source/ui/cctrl/checklistmenu.cxx |2 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx|8 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |8 sd/source/ui/annotations/annotationtag.cxx |9 sd/source/ui/app/sdmod1.cxx |2 sd/source/ui/dlg/LayerTabBar.cxx |4 sd/source/ui/framework/factories/FullScreenPane.cxx |6 sd/source/ui/sidebar/LayoutMenu.cxx |4 sd/source/ui/slideshow/showwin.cxx |2 sd/source/ui/slideshow/slideshowimpl.cxx |2 sd/source/ui/slidesorter/controller/SlideSorterController.cxx| 12 sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx|2 sd/source/ui/view/FormShellManager.cxx |8
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBox.hxx |5 -- accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx |3 - accessibility/inc/extended/AccessibleGridControl.hxx |5 -- accessibility/inc/extended/AccessibleGridControlTableBase.hxx|7 -- 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/accessibletablistboxtable.hxx |4 - accessibility/inc/extended/listboxaccessible.hxx |4 - accessibility/source/extended/AccessibleBrowseBox.cxx|5 -- accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx |8 --- accessibility/source/extended/AccessibleGridControl.cxx |6 -- accessibility/source/extended/AccessibleGridControlTableBase.cxx | 15 -- accessibility/source/extended/accessibleiconchoicectrl.cxx | 18 +-- accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 18 +-- accessibility/source/extended/accessiblelistbox.cxx | 18 +-- accessibility/source/extended/accessiblelistboxentry.cxx | 18 +-- accessibility/source/extended/accessibletablistboxtable.cxx |9 --- accessibility/source/extended/listboxaccessible.cxx | 24 -- 20 files changed, 29 insertions(+), 154 deletions(-) New commits: commit 49c7bc5af291dbf6b34bcea82c9c0513f65b308b Author: Noel GrandinDate: Tue Nov 1 14:53:41 2016 +0200 loplugin:expandablemethods in accessibility Change-Id: I51d13c12274d99623b97f611e30204bea624cbfc diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 12948bc..bc6f1a5 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -211,9 +211,6 @@ public: ::svt::IAccessibleTableProvider& _rBrowseBox ); -/// checks whether the accessible context is still alive -boolisContextAlive() const; - /// returns the AccessibleContext belonging to this Accessible inline AccessibleBrowseBox*getContext() { return m_pContext; } @@ -233,7 +230,7 @@ protected: void dispose() override; virtual bool isAlive() const override { -return isContextAlive(); +return m_pContext && m_pContext->isAlive(); } virtual css::uno::Reference< css::accessibility::XAccessible > getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) override diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index 70cab0d..6d0ff56 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -198,9 +198,6 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The column index of the specified cell index. */ sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const; -/** @attention This method requires locked mutex's and a living object. -@return The child index of the specified cell address. */ -sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const; /** @attention This method requires locked mutex's and a living object. @return TRUE, if the specified row is selected. */ diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index fed4990..c99ac4e 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -179,9 +179,6 @@ public: ::svt::table::IAccessibleTable& _rTable ); -/// checks whether the accessible context is still alive -boolisContextAlive() const; - /// returns the AccessibleContext belonging to this Accessible inline AccessibleGridControl*getContext() { return m_pContext; } @@ -201,7 +198,7 @@ protected: void DisposeAccessImpl() override; virtual bool isAlive() const override { -return isContextAlive(); +return m_pContext && m_pContext->isAlive(); } virtual void commitCellEvent( sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index 8a4d981..9276247 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/standard/vclxaccessiblelistitem.hxx|4 ++-- accessibility/source/standard/vclxaccessiblelistitem.cxx |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit afd9bf19aec34475c915ba91f8fdc38b5a68f0b1 Author: Stephan BergmannDate: Tue Oct 11 16:17:55 2016 +0200 loplugin:refcounting Change-Id: Ia7ec56c754d6eafcd4c6d981a0d8ca03af23a18e diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index fb5cab4..cbf874e 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -66,7 +66,7 @@ protected: /// client id in the AccessibleEventNotifier queue sal_uInt32 m_nClientId; -css::uno::Reference< VCLXAccessibleList > m_xParent; +rtl::Reference< VCLXAccessibleList > m_xParent; css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext; protected: @@ -88,7 +88,7 @@ public: is our parent accessible object */ VCLXAccessibleListItem(sal_Int32 _nIndexInParent, - const css::uno::Reference< VCLXAccessibleList >& _xParent); + const rtl::Reference< VCLXAccessibleList >& _xParent); voidNotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue ); diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index a7e0795..0ee2bb1 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star; // Ctor() and Dtor() -VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, const Reference< VCLXAccessibleList >& _xParent) +VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, const rtl::Reference< VCLXAccessibleList >& _xParent) : VCLXAccessibleListItem_BASE(m_aMutex) , m_nIndexInParent(_nIndexInParent) , m_bSelected(false) @@ -214,7 +214,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( { ::osl::MutexGuard aGuard( m_aMutex ); -return m_xParent; +return m_xParent.get(); } sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) ___ 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
accessibility/inc/standard/vclxaccessiblelist.hxx|2 accessibility/inc/standard/vclxaccessiblelistitem.hxx| 16 --- accessibility/source/standard/vclxaccessiblelist.cxx |4 accessibility/source/standard/vclxaccessiblelistitem.cxx | 80 --- 4 files changed, 50 insertions(+), 52 deletions(-) New commits: commit 6c220995aa2485a9c5d23f0ec952a64151ab25b6 Author: Caolán McNamaraDate: Tue Oct 11 10:04:13 2016 +0100 Resolves: tdf#103032 a11y crash on listbox dispose in toolbar dropdown Change-Id: I70bce310ba9b46efdbdfdec8d2c6689d0ba2e655 diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 9b20b0b..a8aa753 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -22,7 +22,6 @@ #include #include -#include "standard/vclxaccessiblelistitem.hxx" #include #include #include @@ -136,6 +135,7 @@ public: void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ; static void NotifyListItem(css::uno::Any& val); +::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper; } protected: BoxType m_aBoxType; ::accessibility::IComboListBoxHelper* m_pListBoxHelper; diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 405ecb5..fb5cab4 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -30,6 +30,7 @@ #include #include #include +#include // forward --- @@ -40,11 +41,6 @@ namespace com { namespace sun { namespace star { namespace awt { class XFocusListener; } } } } -namespace accessibility -{ -class IComboListBoxHelper; -} - // class VCLXAccessibleListItem -- typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible @@ -69,9 +65,8 @@ private: protected: /// client id in the AccessibleEventNotifier queue sal_uInt32 m_nClientId; -::accessibility::IComboListBoxHelper* m_pListBoxHelper; -css::uno::Reference< css::accessibility::XAccessible >m_xParent; +css::uno::Reference< VCLXAccessibleList > m_xParent; css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext; protected: @@ -87,16 +82,13 @@ protected: public: /** OAccessibleBase needs a valid view -@param _pListBoxHelper -is the list- or combobox for which we implement an accessible object @param _nIndexInParent is the position of the entry inside the listbox @param _xParent is our parent accessible object */ -VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper, -sal_Int32 _nIndexInParent, -const css::uno::Reference< css::accessibility::XAccessible >& _xParent ); +VCLXAccessibleListItem(sal_Int32 _nIndexInParent, + const css::uno::Reference< VCLXAccessibleList >& _xParent); voidNotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue ); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 42747d74..38f6c39 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -507,7 +507,7 @@ Reference VCLXAccessibleList::CreateChild (sal_Int32 nPos) m_aAccessibleChildren.resize(nPos + 1); // insert into the container -xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this); +xChild = new VCLXAccessibleListItem(nPos, this); m_aAccessibleChildren[nPos] = xChild; } else @@ -516,7 +516,7 @@ Reference VCLXAccessibleList::CreateChild (sal_Int32 nPos) // check if position is empty and can be used else we have to adjust all entries behind this if (!xChild.is()) { -xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this); +xChild = new VCLXAccessibleListItem(nPos, this); m_aAccessibleChildren[nPos] = xChild; } } diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 49b9e8f..53090a7 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -61,23 +61,21 @@ using namespace ::com::sun::star; // Ctor() and Dtor() -VCLXAccessibleListItem::VCLXAccessibleListItem(
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source chart2/source
accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx |3 - accessibility/inc/standard/vclxaccessiblefixedtext.hxx|1 accessibility/inc/standard/vclxaccessiblelistitem.hxx |3 - accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx| 13 accessibility/source/standard/vclxaccessiblefixedtext.cxx |7 accessibility/source/standard/vclxaccessiblelistitem.cxx |7 basctl/source/basicide/moduldlg.cxx |5 --- basctl/source/basicide/moduldlg.hxx |2 - basctl/source/dlged/dlgedobj.cxx |6 --- basctl/source/inc/dlgedobj.hxx|1 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx |6 --- chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx |3 - chart2/source/controller/dialogs/tp_ChartType.cxx | 16 -- chart2/source/controller/dialogs/tp_Scale.cxx |5 --- chart2/source/controller/dialogs/tp_Scale.hxx |2 - chart2/source/view/charttypes/BubbleChart.cxx |5 --- chart2/source/view/charttypes/BubbleChart.hxx |2 - chart2/source/view/charttypes/NetChart.cxx|5 --- chart2/source/view/charttypes/NetChart.hxx|1 19 files changed, 93 deletions(-) New commits: commit 708253a21474cc3797c65d6f053760ab9c3299a3 Author: Noel GrandinDate: Wed Oct 5 13:13:06 2016 +0200 loplugin:unnecessaryoverride in accessibility..chart2 Change-Id: I14ba52fe8352f8bbdfcaa90177f4f3ac9f0e08b1 diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx index 420f7e8..da53411 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx @@ -31,9 +31,6 @@ class VCLXAccessibleFixedHyperlink : public VCLXAccessibleTextComponent protected: virtual ~VCLXAccessibleFixedHyperlink() override; -virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; -virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ) override; - public: VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow ); diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx index d1fc6b9..4f870be 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx @@ -32,7 +32,6 @@ protected: virtual ~VCLXAccessibleFixedText() override; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; -virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ) override; public: VCLXAccessibleFixedText( VCLXWindow* pVCLXindow ); diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index ca74da8..405ecb5 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -104,9 +104,6 @@ public: voidSetSelected( bool _bSelected ); voidSetVisible( bool _bVisible ); -// XInterface -virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; - // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 9ea2234..279c6e7 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -36,19 +36,6 @@ VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink() } -void VCLXAccessibleFixedHyperlink::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) -{ -VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); -} - - -void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) -{ -// TODO -OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex ); -} - - // XServiceInfo diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index f7adece..6ac0adb 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -53,13 +53,6 @@ void
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basic/source include/basic
accessibility/inc/extended/AccessibleGridControlTableCell.hxx|3 +-- accessibility/inc/standard/vclxaccessiblemenuseparator.hxx |2 +- accessibility/source/extended/AccessibleGridControlTable.cxx |6 +++--- accessibility/source/extended/AccessibleGridControlTableCell.cxx |5 ++--- accessibility/source/standard/vclxaccessiblemenuseparator.cxx|4 ++-- basic/source/sbx/sbxbase.cxx | 10 +- include/basic/sbxfac.hxx |4 +--- 7 files changed, 11 insertions(+), 23 deletions(-) New commits: commit 0761f97525b3f3ce2cd73f8db28bf389a3c44f57 Author: Noel GrandinDate: Wed Sep 14 08:53:38 2016 +0200 loplugin:constantparam in accessibility to basic Change-Id: Id77cbcaefebf310a5d99c6ac12d154e182fd0a1c Reviewed-on: https://gerrit.libreoffice.org/28860 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index 7b3bba6..6edf28c 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -76,8 +76,7 @@ namespace accessibility AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::table::IAccessibleTable& _rTable, sal_Int32 _nRowId, -sal_uInt16 _nColId, -svt::table::AccessibleTableControlObjType eObjType); +sal_uInt16 _nColId); // XInterface - diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx index 556e461..c477caa 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx @@ -29,7 +29,7 @@ class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent { public: -VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr ); +VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos ); virtual ~VCLXAccessibleMenuSeparator() override; // XServiceInfo diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 5ac584f..38a0474 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -66,7 +66,7 @@ AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) } if(!m_pAccessCellVector[nChildIndex].is()) { -AccessibleGridControlTableCell* pCell = new AccessibleGridControlTableCell(this, m_aTable, nChildIndex/m_aTable.GetColumnCount(), nChildIndex%m_aTable.GetColumnCount(), TCTYPE_TABLECELL); +AccessibleGridControlTableCell* pCell = new AccessibleGridControlTableCell(this, m_aTable, nChildIndex/m_aTable.GetColumnCount(), nChildIndex%m_aTable.GetColumnCount()); m_pCellVector[nChildIndex] = pCell; m_pAccessCellVector[nChildIndex] = pCell; } @@ -99,7 +99,7 @@ AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) sal_Int32 nRow = 0; sal_Int32 nColumnPos = 0; if( m_aTable.ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) ) ) -xChild = new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumnPos, TCTYPE_TABLECELL); +xChild = new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumnPos); return xChild; } @@ -219,7 +219,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellA } if(!m_pAccessCellVector[nChildIndex].is()) { -AccessibleGridControlTableCell* pCell = new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumn, TCTYPE_TABLECELL); +AccessibleGridControlTableCell* pCell = new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumn); m_pCellVector[nChildIndex] = pCell; m_pAccessCellVector[nChildIndex] = pCell; } diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 85bd002..7703b3f 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -103,9 +103,8 @@ namespace accessibility AccessibleGridControlTableCell::AccessibleGridControlTableCell(const css::uno::Reference& _rxParent,
[Libreoffice-commits] core.git: accessibility/inc accessibility/source compilerplugins/clang cui/source filter/source include/filter include/svx include/vcl sc/source sd/source shell/source svtools/so
accessibility/inc/extended/AccessibleGridControlTable.hxx |3 accessibility/source/extended/AccessibleGridControl.cxx |4 accessibility/source/extended/AccessibleGridControlTable.cxx|5 compilerplugins/clang/constantparam.py |2 cui/source/dialogs/cuifmsearch.cxx | 40 +--- filter/source/msfilter/msdffimp.cxx |5 filter/source/msfilter/svdfppt.cxx |4 include/filter/msfilter/msdffimp.hxx|1 include/svx/fmsrcimp.hxx|8 include/svx/sdr/attribute/sdrtextattribute.hxx |1 include/svx/svdmodel.hxx|2 include/vcl/tabctrl.hxx |2 sc/source/ui/inc/gridwin.hxx|2 sc/source/ui/view/gridwin.cxx |6 sd/source/ui/slidesorter/controller/SlideSorterController.cxx |2 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 94 -- sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx |7 shell/source/unix/sysshell/recently_used_file_handler.cxx |5 svtools/source/control/valueacc.cxx | 18 - svtools/source/control/valueimp.hxx |3 svtools/source/control/valueset.cxx |2 svx/source/form/fmmodel.cxx |2 svx/source/form/fmsrcimp.cxx| 71 ++- svx/source/sdr/attribute/sdrtextattribute.cxx | 11 - svx/source/sdr/primitive2d/sdrattributecreator.cxx |1 svx/source/svdraw/svdmodel.cxx |4 vcl/source/control/tabctrl.cxx |4 vcl/unx/generic/gdi/salbmp.cxx |8 writerfilter/source/dmapper/GraphicImport.cxx | 12 - 29 files changed, 127 insertions(+), 202 deletions(-) New commits: commit 3716b144265dda695d7dd447dbe692a3f84c588e Author: Noel GrandinDate: Mon Aug 8 15:38:59 2016 +0200 loplugin:constantparam Change-Id: Ia06b9b189033b9409d7a59a211866f66a0614886 Reviewed-on: https://gerrit.libreoffice.org/28016 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index e784544..df25559 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -40,8 +40,7 @@ class AccessibleGridControlTable : public AccessibleGridControlTableBase, public: AccessibleGridControlTable( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, -::svt::table::IAccessibleTable& rTable, -::svt::table::AccessibleTableControlObjType _eType); +::svt::table::IAccessibleTable& rTable); protected: virtual ~AccessibleGridControlTable(); diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index f11a35e..9f7acaa 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -155,7 +155,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) { if(!m_xImpl->m_xTable.is()) { -AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_TABLE); +AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_xImpl->m_aCreator, m_aTable); m_xImpl->m_xTable = pTable; m_xImpl->m_pTable = pTable; } @@ -306,7 +306,7 @@ AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() { css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); OSL_ENSURE( xCreator.is(), "extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" ); -return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE ); +return new AccessibleGridControlTable( xCreator, m_aTable ); } void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue) diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index bdf7ea2..5ac584f 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -37,9
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source
accessibility/inc/extended/AccessibleBrowseBox.hxx|2 +- accessibility/inc/extended/textwindowaccessibility.hxx|2 +- accessibility/inc/helper/IComboListBoxHelper.hxx |2 +- accessibility/source/extended/textwindowaccessibility.cxx |2 +- accessibility/source/standard/vclxaccessiblelist.cxx |2 +- accessibility/source/standard/vclxaccessibletoolbox.cxx |2 +- avmedia/source/viewer/mediawindow.cxx |2 +- avmedia/source/viewer/mediawindow_impl.hxx|2 +- 8 files changed, 8 insertions(+), 8 deletions(-) New commits: commit f5e3b7b0e46dad98dc147bc85fa78248f374e2a9 Author: Noel GrandinDate: Tue Aug 2 14:55:18 2016 +0200 loplugin:countusersofdefaultparams in accessibility,avmedia Change-Id: Ic173f43c882384fe594e8ba3e44aedc3796a45f6 Reviewed-on: https://gerrit.libreoffice.org/27792 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 0b1d2fe..fe43d19 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -109,7 +109,7 @@ public: */ void commitHeaderBarEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, -const css::uno::Any& rOldValue,bool _bColumnHeaderBar = true); +const css::uno::Any& rOldValue, bool _bColumnHeaderBar); // helper functions /** commitTableEvent commit the event at all listeners of the table diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 70fa94f..fbb7f9b 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -538,7 +538,7 @@ public: css::i18n::Boundary retrieveParagraphLineBoundary( Paragraph const * pParagraph, - ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = nullptr); + ::sal_Int32 nIndex, ::sal_Int32 *pLineNo); css::i18n::Boundary retrieveParagraphBoundaryOfLine( Paragraph const * pParagraph, diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index 8d528be..bcb195b 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -55,7 +55,7 @@ namespace accessibility virtual voidSelectEntryPos( sal_Int32 nPos, bool bSelect = true ) = 0; virtual sal_Int32 GetSelectEntryCount() const = 0; virtual voidSetNoSelection() = 0; -virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const = 0; +virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex ) const = 0; virtual boolIsInDropDown() const = 0; virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0; virtual longGetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0; diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 5ddf1ca..4a5f0cb 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -725,7 +725,7 @@ void Paragraph::implGetLineBoundary( css::i18n::Boundary& rBoundary, if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) { css::i18n::Boundary aBoundary = -m_xDocument->retrieveParagraphLineBoundary( this, nIndex ); +m_xDocument->retrieveParagraphLineBoundary( this, nIndex, nullptr ); rBoundary.startPos = aBoundary.startPos; rBoundary.endPos = aBoundary.endPos; } diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index b439dd1..42747d74 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -89,7 +89,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType UpdateVisibleLineCount(); if(m_pListBoxHelper) { -m_nCurSelectedPos=m_pListBoxHelper->GetSelectEntryPos(); +m_nCurSelectedPos=m_pListBoxHelper->GetSelectEntryPos(0); } sal_uInt16 nCount = static_cast(getAccessibleChildCount()); m_aAccessibleChildren.reserve(nCount); diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 9efb926..126e4c1 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++
[Libreoffice-commits] core.git: accessibility/inc accessibility/source solenv/inc
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx| 6 accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx | 30 ++-- accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx | 15 -- accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx | 4 accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx | 4 accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx | 4 accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 13 - accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx | 2 accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx| 10 - accessibility/source/extended/AccessibleBrowseBox.cxx | 73 -- accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 68 - accessibility/source/extended/AccessibleGridControl.cxx | 64 accessibility/source/extended/AccessibleGridControlBase.cxx | 64 accessibility/source/extended/AccessibleGridControlTableCell.cxx| 26 +-- accessibility/source/extended/accessiblebrowseboxcell.cxx | 9 - accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 44 +++--- accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 2 solenv/inc/doxygen.cfg | 2 18 files changed, 214 insertions(+), 226 deletions(-) New commits: commit 777ad8f5d5b140af0b6959995b8838bf50a578ec Author: Chris SherlockDate: Thu Feb 4 14:54:41 2016 +1100 accessibility: fix doxygen errors Change-Id: Ib1bed3e4df91ad00ecf2deb5c3d135cc2f5561b5 diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 8951322..66b49a8 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -169,7 +169,7 @@ public: // XAccessibleComponent --- /** @return -, if the point lies within the bounding box of this object. */ +TRUE, if the point lies within the bounding box of this object. */ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) throw ( css::uno::RuntimeException, std::exception ) override; @@ -255,7 +255,7 @@ public: sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ); -/** @return , if the object is not disposed or disposing. */ +/** @return TRUE, if the object is not disposed or disposing. */ bool isAlive() const; protected: @@ -265,7 +265,7 @@ protected: its parent accessible window. Derived classes may implement different behaviour. @attention This method requires locked mutex's and a living object. -@return , if the object is really showing. */ +@return TRUE, if the object is really showing. */ bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index 544ba07..3b1260c 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -54,7 +54,7 @@ protected: virtual ~AccessibleBrowseBoxHeaderBar(); public: -// XAccessibleContext - +// XAccessibleContext /** @return The XAccessible interface of the specified child. @@ -69,7 +69,7 @@ public: getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) override; -// XAccessibleComponent --- +// XAccessibleComponent /** @return The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL @@ -80,7 +80,7 @@ public: virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; -// XAccessibleTable --- +// XAccessibleTable /** @return The description text of the specified row. */ virtual OUString SAL_CALL @@ -113,12 +113,12 @@ public: getSelectedAccessibleColumns() throw ( css::uno::RuntimeException, std::exception ) override; -/** @return , if the specified row is completely
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source include/toolkit svtools/inc svtools/source toolkit/source
accessibility/inc/accessibility/extended/accessibletabbarbase.hxx| 7 +-- accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx | 5 + accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx | 3 --- accessibility/source/extended/accessibletabbar.cxx | 4 ++-- accessibility/source/extended/accessibletabbarbase.cxx | 4 ++-- accessibility/source/extended/accessibletabbarpage.cxx | 4 ++-- accessibility/source/extended/accessibletabbarpagelist.cxx | 4 ++-- accessibility/source/standard/accessiblemenubasecomponent.cxx| 8 basctl/source/accessibility/accessibledialogcontrolshape.cxx | 8 basctl/source/accessibility/accessibledialogwindow.cxx | 8 basctl/source/inc/accessibledialogcontrolshape.hxx | 5 + basctl/source/inc/accessibledialogwindow.hxx | 5 + include/toolkit/awt/vclxaccessiblecomponent.hxx | 5 + svtools/inc/vclxaccessibleheaderbaritem.hxx | 4 +--- svtools/source/control/vclxaccessibleheaderbaritem.cxx | 8 toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 +- 16 files changed, 35 insertions(+), 57 deletions(-) New commits: commit cd5431c07118152d4c14cdd65af0e4dfc16b4473 Author: Stephan BergmannDate: Wed Jan 27 10:23:48 2016 +0100 Unwind trivial AccessibleExtendedComponentHelper_BASE typedefs Change-Id: I74b30cba1359045873a3d7a3f0e72f857ffa0ed0 diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx index 2bf9591..bf69535 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx @@ -33,12 +33,7 @@ class VclWindowEvent; namespace accessibility { - - - -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - -class AccessibleTabBarBase : public AccessibleExtendedComponentHelper_BASE +class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper { public: explicitAccessibleTabBarBase( TabBar* pTabBar ); diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index 80bd7d8..11cbf87 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -41,14 +41,11 @@ class AccessibleStateSetHelper; // class OAccessibleMenuBaseComponent - -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE; -class OAccessibleMenuBaseComponent : public AccessibleExtendedComponentHelper_BASE, +class OAccessibleMenuBaseComponent : public comphelper::OAccessibleExtendedComponentHelper, public OAccessibleMenuBaseComponent_BASE { friend class OAccessibleMenuItemComponent; diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx index c475d9f..308f6fd 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx @@ -28,9 +28,6 @@ // class OAccessibleMenuComponent - -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE; diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index b020513..873a013 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -162,13 +162,13 @@ namespace accessibility // XInterface -IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE ) +IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE ) // XTypeProvider -IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE ) +IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE ) // XComponent diff --git