svx/source/accessibility/AccessibleTextHelper.cxx | 2526 +++++++++++-----------
1 file changed, 1263 insertions(+), 1263 deletions(-)
New commits:
commit 77ffea4e5cdd3a7f99d4701c0d8fc39e30015b12
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Apr 29 17:07:00 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 29 23:08:01 2025 +0200
svx a11y: Drop extra indentation level
Change-Id: I6be9558d858cc5b44a54e3db895bfd8e5c5bf1dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184784
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 43993b383d09..fe5cddb71b51 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -66,1725 +66,1725 @@ namespace accessibility
// AccessibleTextHelper_Impl declaration
- template < typename first_type, typename second_type >
- static ::std::pair< first_type, second_type > makeSortedPair(
first_type first,
-
second_type second )
- {
- if( first > second )
- return ::std::make_pair( second, first );
- else
- return ::std::make_pair( first, second );
- }
+template < typename first_type, typename second_type >
+ static ::std::pair< first_type, second_type > makeSortedPair( first_type
first,
+
second_type second )
+{
+ if( first > second )
+ return ::std::make_pair( second, first );
+ else
+ return ::std::make_pair( first, second );
+}
- class AccessibleTextHelper_Impl : public SfxListener
- {
- public:
- // receive pointer to our frontend class and view window
- AccessibleTextHelper_Impl();
- virtual ~AccessibleTextHelper_Impl() override;
+class AccessibleTextHelper_Impl : public SfxListener
+{
+public:
+ // receive pointer to our frontend class and view window
+ AccessibleTextHelper_Impl();
+ virtual ~AccessibleTextHelper_Impl() override;
- // XAccessibleContext child handling methods
- sal_Int64 getAccessibleChildCount() const;
- uno::Reference< XAccessible > getAccessibleChild( sal_Int64 i );
+ // XAccessibleContext child handling methods
+ sal_Int64 getAccessibleChildCount() const;
+ uno::Reference< XAccessible > getAccessibleChild( sal_Int64 i );
- // XAccessibleEventBroadcaster child related methods
- void addAccessibleEventListener( const uno::Reference<
XAccessibleEventListener >& xListener );
- void removeAccessibleEventListener( const uno::Reference<
XAccessibleEventListener >& xListener );
+ // XAccessibleEventBroadcaster child related methods
+ void addAccessibleEventListener( const uno::Reference<
XAccessibleEventListener >& xListener );
+ void removeAccessibleEventListener( const uno::Reference<
XAccessibleEventListener >& xListener );
- // XAccessibleComponent child related methods
- uno::Reference< XAccessible > getAccessibleAtPoint( const awt::Point&
aPoint );
+ // XAccessibleComponent child related methods
+ uno::Reference< XAccessible > getAccessibleAtPoint( const awt::Point&
aPoint );
- SvxEditSourceAdapter& GetEditSource() const;
+ SvxEditSourceAdapter& GetEditSource() const;
- void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource
);
+ void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource );
- void SetEventSource( const uno::Reference< XAccessible >& rInterface )
- {
- mxFrontEnd = rInterface;
- }
+ void SetEventSource( const uno::Reference< XAccessible >& rInterface )
+ {
+ mxFrontEnd = rInterface;
+ }
- void SetOffset( const Point& );
- Point GetOffset() const
- {
- std::scoped_lock aGuard( maMutex ); Point aPoint( maOffset );
- return aPoint;
- }
+ void SetOffset( const Point& );
+ Point GetOffset() const
+ {
+ std::scoped_lock aGuard( maMutex ); Point aPoint( maOffset );
+ return aPoint;
+ }
- void SetStartIndex( sal_Int32 nOffset );
- sal_Int32 GetStartIndex() const
- {
- // Strictly correct only with locked solar mutex, // but
- // here we rely on the fact that sal_Int32 access is
- // atomic
- return mnStartIndex;
- }
+ void SetStartIndex( sal_Int32 nOffset );
+ sal_Int32 GetStartIndex() const
+ {
+ // Strictly correct only with locked solar mutex, // but
+ // here we rely on the fact that sal_Int32 access is
+ // atomic
+ return mnStartIndex;
+ }
- void SetAdditionalChildStates( sal_Int64 nChildStates );
+ void SetAdditionalChildStates( sal_Int64 nChildStates );
- void Dispose();
+ void Dispose();
- // do NOT hold object mutex when calling this! Danger of deadlock
- void FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue =
uno::Any(), const uno::Any& rOldValue = uno::Any() ) const;
- void FireEvent( const AccessibleEventObject& rEvent ) const;
+ // do NOT hold object mutex when calling this! Danger of deadlock
+ void FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue =
uno::Any(), const uno::Any& rOldValue = uno::Any() ) const;
+ void FireEvent( const AccessibleEventObject& rEvent ) const;
- void SetFocus( bool bHaveFocus );
- bool HaveFocus() const
- {
- // No locking of solar mutex here, since we rely on the fact
- // that sal_Bool access is atomic
- return mbThisHasFocus;
- }
- void SetChildFocus( sal_Int32 nChild, bool bHaveFocus );
- void SetShapeFocus( bool bHaveFocus );
- void ChangeChildFocus( sal_Int32 nNewChild );
+ void SetFocus( bool bHaveFocus );
+ bool HaveFocus() const
+ {
+ // No locking of solar mutex here, since we rely on the fact
+ // that sal_Bool access is atomic
+ return mbThisHasFocus;
+ }
+ void SetChildFocus( sal_Int32 nChild, bool bHaveFocus );
+ void SetShapeFocus( bool bHaveFocus );
+ void ChangeChildFocus( sal_Int32 nNewChild );
#ifdef DBG_UTIL
- void CheckInvariants() const;
+ void CheckInvariants() const;
#endif
- // checks all children for visibility, throws away invisible ones
- void UpdateVisibleChildren( bool bBroadcastEvents=true );
+ // checks all children for visibility, throws away invisible ones
+ void UpdateVisibleChildren( bool bBroadcastEvents=true );
- // check all children for changes in position and size
- void UpdateBoundRect();
+ // check all children for changes in position and size
+ void UpdateBoundRect();
- // calls SetSelection on the forwarder and updates maLastSelection
- // cache.
- void UpdateSelection();
+ // calls SetSelection on the forwarder and updates maLastSelection
+ // cache.
+ void UpdateSelection();
- private:
+private:
- // Process event queue
- void ProcessQueue();
+ // Process event queue
+ void ProcessQueue();
- // shutdown usage of current edit source on myself and the children.
- void ShutdownEditSource();
+ // shutdown usage of current edit source on myself and the children.
+ void ShutdownEditSource();
- void ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32
nLast );
+ void ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast
);
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
override;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- comphelper::AccessibleEventNotifier::TClientId getNotifierClientId()
const { return mnNotifierClientId; }
+ comphelper::AccessibleEventNotifier::TClientId getNotifierClientId() const
{ return mnNotifierClientId; }
- // lock solar mutex before
- SvxTextForwarder& GetTextForwarder() const;
- // lock solar mutex before
- SvxViewForwarder& GetViewForwarder() const;
- // lock solar mutex before
- SvxEditViewForwarder& GetEditViewForwarder() const;
+ // lock solar mutex before
+ SvxTextForwarder& GetTextForwarder() const;
+ // lock solar mutex before
+ SvxViewForwarder& GetViewForwarder() const;
+ // lock solar mutex before
+ SvxEditViewForwarder& GetEditViewForwarder() const;
- // are we in edit mode?
- bool IsActive() const;
+ // are we in edit mode?
+ bool IsActive() const;
- // our frontend class (the one implementing the actual
- // interface). That's not necessarily the one containing the impl
- // pointer!
- uno::Reference< XAccessible > mxFrontEnd;
+ // our frontend class (the one implementing the actual
+ // interface). That's not necessarily the one containing the impl
+ // pointer!
+ uno::Reference< XAccessible > mxFrontEnd;
- // a wrapper for the text forwarders (guarded by solar mutex)
- mutable SvxEditSourceAdapter maEditSource;
+ // a wrapper for the text forwarders (guarded by solar mutex)
+ mutable SvxEditSourceAdapter maEditSource;
- // store last selection (to correctly report selection changes,
guarded by solar mutex)
- ESelection maLastSelection;
+ // store last selection (to correctly report selection changes, guarded by
solar mutex)
+ ESelection maLastSelection;
- // cache range of visible children (guarded by solar mutex)
- sal_Int32 mnFirstVisibleChild;
- sal_Int32 mnLastVisibleChild;
+ // cache range of visible children (guarded by solar mutex)
+ sal_Int32 mnFirstVisibleChild;
+ sal_Int32 mnLastVisibleChild;
- // offset to add to all our children (unguarded, relying on
- // the fact that sal_Int32 access is atomic)
- sal_Int32 mnStartIndex;
+ // offset to add to all our children (unguarded, relying on
+ // the fact that sal_Int32 access is atomic)
+ sal_Int32 mnStartIndex;
- // the object handling our children (guarded by solar mutex)
- ::accessibility::AccessibleParaManager maParaManager;
+ // the object handling our children (guarded by solar mutex)
+ ::accessibility::AccessibleParaManager maParaManager;
- // Queued events from Notify() (guarded by solar mutex)
- AccessibleTextEventQueue maEventQueue;
+ // Queued events from Notify() (guarded by solar mutex)
+ AccessibleTextEventQueue maEventQueue;
- // spin lock to prevent notify in notify (guarded by solar mutex)
- bool mbInNotify;
+ // spin lock to prevent notify in notify (guarded by solar mutex)
+ bool mbInNotify;
- // whether the object or its children has the focus set (guarded by
solar mutex)
- bool mbGroupHasFocus;
+ // whether the object or its children has the focus set (guarded by solar
mutex)
+ bool mbGroupHasFocus;
- // whether we (this object) has the focus set (guarded by solar mutex)
- bool mbThisHasFocus;
+ // whether we (this object) has the focus set (guarded by solar mutex)
+ bool mbThisHasFocus;
- mutable std::mutex maMutex;
+ mutable std::mutex maMutex;
- /// our current offset to the containing shape/cell (guarded by
maMutex)
- Point maOffset;
+ /// our current offset to the containing shape/cell (guarded by maMutex)
+ Point maOffset;
- /// client Id from AccessibleEventNotifier
- comphelper::AccessibleEventNotifier::TClientId mnNotifierClientId;
- static constexpr comphelper::AccessibleEventNotifier::TClientId
snNotifierClientRevoked
- =
std::numeric_limits<comphelper::AccessibleEventNotifier::TClientId>::max();
- };
-
- AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() :
- maLastSelection( ESelection::AtEnd() ),
- mnFirstVisibleChild( -1 ),
- mnLastVisibleChild( -2 ),
- mnStartIndex( 0 ),
- mbInNotify( false ),
- mbGroupHasFocus( false ),
- mbThisHasFocus( false ),
- maOffset(0,0),
- // well, that's strictly exception safe, though not really
- // robust. We rely on the fact that this member is constructed
- // last, and that the constructor body is empty, thus no
- // chance for exceptions once the Id is fetched. Nevertheless,
- // normally should employ RAII here...
-
mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
- {
- SAL_INFO("svx", "received ID: " << mnNotifierClientId );
- }
+ /// client Id from AccessibleEventNotifier
+ comphelper::AccessibleEventNotifier::TClientId mnNotifierClientId;
+ static constexpr comphelper::AccessibleEventNotifier::TClientId
snNotifierClientRevoked
+ =
std::numeric_limits<comphelper::AccessibleEventNotifier::TClientId>::max();
+};
- AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl()
- {
- SolarMutexGuard aGuard;
+AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() :
+ maLastSelection( ESelection::AtEnd() ),
+ mnFirstVisibleChild( -1 ),
+ mnLastVisibleChild( -2 ),
+ mnStartIndex( 0 ),
+ mbInNotify( false ),
+ mbGroupHasFocus( false ),
+ mbThisHasFocus( false ),
+ maOffset(0,0),
+ // well, that's strictly exception safe, though not really
+ // robust. We rely on the fact that this member is constructed
+ // last, and that the constructor body is empty, thus no
+ // chance for exceptions once the Id is fetched. Nevertheless,
+ // normally should employ RAII here...
+ mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
+{
+ SAL_INFO("svx", "received ID: " << mnNotifierClientId );
+}
- try
- {
- // call Dispose here, too, since we've some resources not
- // automatically freed otherwise
- Dispose();
- }
- catch( const uno::Exception& ) {}
- }
+AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl()
+{
+ SolarMutexGuard aGuard;
- SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const
+ try
{
- if( !maEditSource.IsValid() )
- throw uno::RuntimeException(u"Unknown edit source"_ustr,
mxFrontEnd);
-
- SvxTextForwarder* pTextForwarder = maEditSource.GetTextForwarder();
+ // call Dispose here, too, since we've some resources not
+ // automatically freed otherwise
+ Dispose();
+ }
+ catch( const uno::Exception& ) {}
+}
- if( !pTextForwarder )
- throw uno::RuntimeException(u"Unable to fetch text forwarder,
model might be dead"_ustr, mxFrontEnd);
+SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const
+{
+ if( !maEditSource.IsValid() )
+ throw uno::RuntimeException(u"Unknown edit source"_ustr, mxFrontEnd);
- if( !pTextForwarder->IsValid() )
- throw uno::RuntimeException(u"Text forwarder is invalid, model
might be dead"_ustr, mxFrontEnd);
+ SvxTextForwarder* pTextForwarder = maEditSource.GetTextForwarder();
- return *pTextForwarder;
- }
+ if( !pTextForwarder )
+ throw uno::RuntimeException(u"Unable to fetch text forwarder, model
might be dead"_ustr, mxFrontEnd);
- SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const
- {
- if( !maEditSource.IsValid() )
- throw uno::RuntimeException(u"Unknown edit source"_ustr,
mxFrontEnd);
+ if( !pTextForwarder->IsValid() )
+ throw uno::RuntimeException(u"Text forwarder is invalid, model might
be dead"_ustr, mxFrontEnd);
- SvxViewForwarder* pViewForwarder = maEditSource.GetViewForwarder();
+ return *pTextForwarder;
+}
- if( !pViewForwarder )
- throw uno::RuntimeException(u"Unable to fetch view forwarder,
model might be dead"_ustr, mxFrontEnd);
+SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const
+{
+ if( !maEditSource.IsValid() )
+ throw uno::RuntimeException(u"Unknown edit source"_ustr, mxFrontEnd);
- if( !pViewForwarder->IsValid() )
- throw uno::RuntimeException(u"View forwarder is invalid, model
might be dead"_ustr, mxFrontEnd);
+ SvxViewForwarder* pViewForwarder = maEditSource.GetViewForwarder();
- return *pViewForwarder;
- }
+ if( !pViewForwarder )
+ throw uno::RuntimeException(u"Unable to fetch view forwarder, model
might be dead"_ustr, mxFrontEnd);
- SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder()
const
- {
- if( !maEditSource.IsValid() )
- throw uno::RuntimeException(u"Unknown edit source"_ustr,
mxFrontEnd);
+ if( !pViewForwarder->IsValid() )
+ throw uno::RuntimeException(u"View forwarder is invalid, model might
be dead"_ustr, mxFrontEnd);
- SvxEditViewForwarder* pViewForwarder =
maEditSource.GetEditViewForwarder();
+ return *pViewForwarder;
+}
- if( !pViewForwarder )
- {
- throw uno::RuntimeException(u"No edit view forwarder, object not
in edit mode"_ustr, mxFrontEnd);
- }
+SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder() const
+{
+ if( !maEditSource.IsValid() )
+ throw uno::RuntimeException(u"Unknown edit source"_ustr, mxFrontEnd);
- if( !pViewForwarder->IsValid() )
- {
- throw uno::RuntimeException(u"View forwarder is invalid, object
not in edit mode"_ustr, mxFrontEnd);
- }
+ SvxEditViewForwarder* pViewForwarder = maEditSource.GetEditViewForwarder();
- return *pViewForwarder;
+ if( !pViewForwarder )
+ {
+ throw uno::RuntimeException(u"No edit view forwarder, object not in
edit mode"_ustr, mxFrontEnd);
}
- SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const
+ if( !pViewForwarder->IsValid() )
{
- if( !maEditSource.IsValid() )
- throw
uno::RuntimeException(u"AccessibleTextHelper_Impl::GetEditSource: no edit
source"_ustr, mxFrontEnd );
- return maEditSource;
+ throw uno::RuntimeException(u"View forwarder is invalid, object not in
edit mode"_ustr, mxFrontEnd);
}
- namespace {
+ return *pViewForwarder;
+}
- // functor for sending child events (no stand-alone function, they are
maybe not inlined)
- class AccessibleTextHelper_OffsetChildIndex
- {
- public:
- explicit AccessibleTextHelper_OffsetChildIndex( sal_Int32 nDifference
) : mnDifference(nDifference) {}
- void operator()( ::accessibility::AccessibleEditableTextPara& rPara )
- {
- rPara.SetIndexInParent( rPara.GetIndexInParent() + mnDifference );
- }
+SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const
+{
+ if( !maEditSource.IsValid() )
+ throw
uno::RuntimeException(u"AccessibleTextHelper_Impl::GetEditSource: no edit
source"_ustr, mxFrontEnd );
+ return maEditSource;
+}
- private:
- const sal_Int32 mnDifference;
- };
+namespace {
+// functor for sending child events (no stand-alone function, they are maybe
not inlined)
+class AccessibleTextHelper_OffsetChildIndex
+{
+public:
+ explicit AccessibleTextHelper_OffsetChildIndex( sal_Int32 nDifference ) :
mnDifference(nDifference) {}
+ void operator()( ::accessibility::AccessibleEditableTextPara& rPara )
+ {
+ rPara.SetIndexInParent( rPara.GetIndexInParent() + mnDifference );
}
- void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset )
- {
- sal_Int32 nOldOffset( mnStartIndex );
+private:
+ const sal_Int32 mnDifference;
+};
- mnStartIndex = nOffset;
+}
- if( nOldOffset != nOffset )
- {
- // update children
- AccessibleTextHelper_OffsetChildIndex aFunctor( nOffset -
nOldOffset );
+void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset )
+{
+ sal_Int32 nOldOffset( mnStartIndex );
- ::std::for_each( maParaManager.begin(), maParaManager.end(),
- AccessibleParaManager::WeakChildAdapter<
AccessibleTextHelper_OffsetChildIndex > (aFunctor) );
- }
- }
+ mnStartIndex = nOffset;
- void AccessibleTextHelper_Impl::SetAdditionalChildStates( sal_Int64
nChildStates )
+ if( nOldOffset != nOffset )
{
- maParaManager.SetAdditionalChildStates( nChildStates );
+ // update children
+ AccessibleTextHelper_OffsetChildIndex aFunctor( nOffset - nOldOffset );
+
+ ::std::for_each( maParaManager.begin(), maParaManager.end(),
+ AccessibleParaManager::WeakChildAdapter<
AccessibleTextHelper_OffsetChildIndex > (aFunctor) );
}
+}
+
+void AccessibleTextHelper_Impl::SetAdditionalChildStates( sal_Int64
nChildStates )
+{
+ maParaManager.SetAdditionalChildStates( nChildStates );
+}
- void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, bool
bHaveFocus )
+void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, bool
bHaveFocus )
+{
+ if( bHaveFocus )
{
- if( bHaveFocus )
- {
- if( mbThisHasFocus )
- SetShapeFocus( false );
+ if( mbThisHasFocus )
+ SetShapeFocus( false );
- maParaManager.SetFocus( nChild );
+ maParaManager.SetFocus( nChild );
- // we just received the focus, also send caret event then
- UpdateSelection();
+ // we just received the focus, also send caret event then
+ UpdateSelection();
- SAL_INFO("svx", "Paragraph " << nChild << " received focus");
- }
- else
- {
- maParaManager.SetFocus( -1 );
+ SAL_INFO("svx", "Paragraph " << nChild << " received focus");
+ }
+ else
+ {
+ maParaManager.SetFocus( -1 );
- SAL_INFO("svx", "Paragraph " << nChild << " lost focus");
+ SAL_INFO("svx", "Paragraph " << nChild << " lost focus");
- if( mbGroupHasFocus )
- SetShapeFocus( true );
- }
+ if( mbGroupHasFocus )
+ SetShapeFocus( true );
}
+}
- void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild )
- {
- if( mbThisHasFocus )
- SetShapeFocus( false );
+void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild )
+{
+ if( mbThisHasFocus )
+ SetShapeFocus( false );
- mbGroupHasFocus = true;
- maParaManager.SetFocus( nNewChild );
+ mbGroupHasFocus = true;
+ maParaManager.SetFocus( nNewChild );
- SAL_INFO("svx", "Paragraph " << nNewChild << " received focus");
- }
+ SAL_INFO("svx", "Paragraph " << nNewChild << " received focus");
+}
- void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus )
- {
- bool bOldFocus( mbThisHasFocus );
+void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus )
+{
+ bool bOldFocus( mbThisHasFocus );
- mbThisHasFocus = bHaveFocus;
+ mbThisHasFocus = bHaveFocus;
- if( bOldFocus == bHaveFocus )
- return;
+ if( bOldFocus == bHaveFocus )
+ return;
- if( bHaveFocus )
+ if( bHaveFocus )
+ {
+ if( mxFrontEnd.is() )
{
- if( mxFrontEnd.is() )
+ AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* >
( mxFrontEnd.get() );
+ if ( !pAccessibleCell )
+ FireEvent(AccessibleEventId::STATE_CHANGED,
uno::Any(AccessibleStateType::FOCUSED));
+ else // the focus event on cell should be fired on table
directly
{
- AccessibleCell* pAccessibleCell = dynamic_cast<
AccessibleCell* > ( mxFrontEnd.get() );
- if ( !pAccessibleCell )
- FireEvent(AccessibleEventId::STATE_CHANGED,
uno::Any(AccessibleStateType::FOCUSED));
- else // the focus event on cell should be fired on table
directly
- {
- AccessibleTableShape* pAccTable =
pAccessibleCell->GetParentTable();
- if (pAccTable)
-
pAccTable->SetStateDirectly(AccessibleStateType::FOCUSED);
- }
+ AccessibleTableShape* pAccTable =
pAccessibleCell->GetParentTable();
+ if (pAccTable)
+ pAccTable->SetStateDirectly(AccessibleStateType::FOCUSED);
}
- SAL_INFO("svx", "Parent object received focus" );
}
- else
+ SAL_INFO("svx", "Parent object received focus" );
+ }
+ else
+ {
+ // The focus state should be reset directly on table.
+ //LostPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED),
AccessibleEventId::STATE_CHANGED );
+ if( mxFrontEnd.is() )
{
- // The focus state should be reset directly on table.
- //LostPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED),
AccessibleEventId::STATE_CHANGED );
- if( mxFrontEnd.is() )
+ AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* >
( mxFrontEnd.get() );
+ if ( !pAccessibleCell )
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(),
uno::Any(AccessibleStateType::FOCUSED) );
+ else
{
- AccessibleCell* pAccessibleCell = dynamic_cast<
AccessibleCell* > ( mxFrontEnd.get() );
- if ( !pAccessibleCell )
- FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(),
uno::Any(AccessibleStateType::FOCUSED) );
- else
- {
- AccessibleTableShape* pAccTable =
pAccessibleCell->GetParentTable();
- if (pAccTable)
-
pAccTable->ResetStateDirectly(AccessibleStateType::FOCUSED);
- }
+ AccessibleTableShape* pAccTable =
pAccessibleCell->GetParentTable();
+ if (pAccTable)
+
pAccTable->ResetStateDirectly(AccessibleStateType::FOCUSED);
}
- SAL_INFO("svx", "Parent object lost focus" );
}
+ SAL_INFO("svx", "Parent object lost focus" );
}
+}
- void AccessibleTextHelper_Impl::SetFocus( bool bHaveFocus )
- {
- bool bOldFocus( mbGroupHasFocus );
+void AccessibleTextHelper_Impl::SetFocus( bool bHaveFocus )
+{
+ bool bOldFocus( mbGroupHasFocus );
- mbGroupHasFocus = bHaveFocus;
+ mbGroupHasFocus = bHaveFocus;
- if( IsActive() )
- {
- try
- {
- // find the one with the cursor and get/set focus accordingly
- ESelection aSelection;
- if( GetEditViewForwarder().GetSelection( aSelection ) )
- SetChildFocus(aSelection.end.nPara, bHaveFocus);
- }
- catch( const uno::Exception& ) {}
- }
- else if( bOldFocus != bHaveFocus )
+ if( IsActive() )
+ {
+ try
{
- SetShapeFocus( bHaveFocus );
+ // find the one with the cursor and get/set focus accordingly
+ ESelection aSelection;
+ if( GetEditViewForwarder().GetSelection( aSelection ) )
+ SetChildFocus(aSelection.end.nPara, bHaveFocus);
}
-
- SAL_INFO("svx", "focus changed, Object " << this << ", state: " <<
(bHaveFocus ? "focused" : "not focused") );
+ catch( const uno::Exception& ) {}
+ }
+ else if( bOldFocus != bHaveFocus )
+ {
+ SetShapeFocus( bHaveFocus );
}
- bool AccessibleTextHelper_Impl::IsActive() const
+ SAL_INFO("svx", "focus changed, Object " << this << ", state: " <<
(bHaveFocus ? "focused" : "not focused") );
+}
+
+bool AccessibleTextHelper_Impl::IsActive() const
+{
+ try
{
- try
- {
- SvxEditSource& rEditSource = GetEditSource();
- SvxEditViewForwarder* pViewForwarder =
rEditSource.GetEditViewForwarder();
+ SvxEditSource& rEditSource = GetEditSource();
+ SvxEditViewForwarder* pViewForwarder =
rEditSource.GetEditViewForwarder();
- if( !pViewForwarder )
- return false;
+ if( !pViewForwarder )
+ return false;
- if( mxFrontEnd.is() )
+ if( mxFrontEnd.is() )
+ {
+ AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* >
( mxFrontEnd.get() );
+ if ( pAccessibleCell )
{
- AccessibleCell* pAccessibleCell = dynamic_cast<
AccessibleCell* > ( mxFrontEnd.get() );
- if ( pAccessibleCell )
- {
- sdr::table::CellRef xCell = pAccessibleCell->getCellRef();
- if ( xCell.is() )
- return xCell->IsActiveCell();
- }
+ sdr::table::CellRef xCell = pAccessibleCell->getCellRef();
+ if ( xCell.is() )
+ return xCell->IsActiveCell();
}
- return pViewForwarder->IsValid();
- }
- catch( const uno::RuntimeException& )
- {
- return false;
}
+ return pViewForwarder->IsValid();
}
+ catch( const uno::RuntimeException& )
+ {
+ return false;
+ }
+}
- void AccessibleTextHelper_Impl::UpdateSelection()
+void AccessibleTextHelper_Impl::UpdateSelection()
+{
+ try
{
- try
- {
- if( !maEditSource.IsValid() )
- return;
- SvxEditViewForwarder* pViewForwarder =
maEditSource.GetEditViewForwarder();
- if( !pViewForwarder || !pViewForwarder->IsValid())
- return;
+ if( !maEditSource.IsValid() )
+ return;
+ SvxEditViewForwarder* pViewForwarder =
maEditSource.GetEditViewForwarder();
+ if( !pViewForwarder || !pViewForwarder->IsValid())
+ return;
- ESelection aSelection;
- if( !pViewForwarder->GetSelection( aSelection ) )
- return;
+ ESelection aSelection;
+ if( !pViewForwarder->GetSelection( aSelection ) )
+ return;
- if( maLastSelection == aSelection ||
- aSelection.end.nPara >= maParaManager.GetNum() )
- return;
+ if( maLastSelection == aSelection ||
+ aSelection.end.nPara >= maParaManager.GetNum() )
+ return;
- // #103998# Not that important, changed from assertion to trace
- if( mbThisHasFocus )
- {
- SAL_INFO("svx", "Parent has focus!");
- }
+ // #103998# Not that important, changed from assertion to trace
+ if( mbThisHasFocus )
+ {
+ SAL_INFO("svx", "Parent has focus!");
+ }
- sal_Int32 nMaxValidParaIndex(
GetTextForwarder().GetParagraphCount() - 1 );
+ sal_Int32 nMaxValidParaIndex( GetTextForwarder().GetParagraphCount() -
1 );
- // notify all affected paragraphs (TODO: may be suboptimal,
- // since some paragraphs might stay selected)
- if (maLastSelection.start.nPara != EE_PARA_MAX)
+ // notify all affected paragraphs (TODO: may be suboptimal,
+ // since some paragraphs might stay selected)
+ if (maLastSelection.start.nPara != EE_PARA_MAX)
+ {
+ // Did the caret move from one paragraph to another?
+ // #100530# no caret events if not focused.
+ if( mbGroupHasFocus &&
+ maLastSelection.end.nPara != aSelection.end.nPara )
{
- // Did the caret move from one paragraph to another?
- // #100530# no caret events if not focused.
- if( mbGroupHasFocus &&
- maLastSelection.end.nPara != aSelection.end.nPara )
+ if (maLastSelection.end.nPara < maParaManager.GetNum())
{
- if (maLastSelection.end.nPara < maParaManager.GetNum())
- {
- maParaManager.FireEvent( ::std::min(
maLastSelection.end.nPara, nMaxValidParaIndex ),
- ::std::min(
maLastSelection.end.nPara, nMaxValidParaIndex )+1,
-
AccessibleEventId::CARET_CHANGED,
-
uno::Any(static_cast<sal_Int32>(-1)),
-
uno::Any(maLastSelection.end.nIndex) );
- }
+ maParaManager.FireEvent( ::std::min(
maLastSelection.end.nPara, nMaxValidParaIndex ),
+ ::std::min(
maLastSelection.end.nPara, nMaxValidParaIndex )+1,
+ AccessibleEventId::CARET_CHANGED,
+
uno::Any(static_cast<sal_Int32>(-1)),
+
uno::Any(maLastSelection.end.nIndex) );
+ }
- ChangeChildFocus(aSelection.end.nPara);
+ ChangeChildFocus(aSelection.end.nPara);
- SAL_INFO(
- "svx",
- "focus changed, Object: " << this
- << ", Paragraph: " << aSelection.end.nPara
- << ", Last paragraph: "
- << maLastSelection.end.nPara);
- }
+ SAL_INFO(
+ "svx",
+ "focus changed, Object: " << this
+ << ", Paragraph: " << aSelection.end.nPara
+ << ", Last paragraph: "
+ << maLastSelection.end.nPara);
}
+ }
- // #100530# no caret events if not focused.
- if( mbGroupHasFocus )
+ // #100530# no caret events if not focused.
+ if( mbGroupHasFocus )
+ {
+ uno::Any aOldCursor;
+
+ // #i13705# The old cursor can only contain valid
+ // values if it's the same paragraph!
+ if( maLastSelection.start.nPara != EE_PARA_MAX &&
+ maLastSelection.end.nPara == aSelection.end.nPara )
{
- uno::Any aOldCursor;
+ aOldCursor <<= maLastSelection.end.nIndex;
+ }
+ else
+ {
+ aOldCursor <<= static_cast<sal_Int32>(-1);
+ }
- // #i13705# The old cursor can only contain valid
- // values if it's the same paragraph!
- if( maLastSelection.start.nPara != EE_PARA_MAX &&
- maLastSelection.end.nPara == aSelection.end.nPara )
- {
- aOldCursor <<= maLastSelection.end.nIndex;
- }
- else
- {
- aOldCursor <<= static_cast<sal_Int32>(-1);
- }
+ maParaManager.FireEvent( aSelection.end.nPara,
+ aSelection.end.nPara+1,
+ AccessibleEventId::CARET_CHANGED,
+ uno::Any(aSelection.end.nIndex),
+ aOldCursor );
+ }
- maParaManager.FireEvent( aSelection.end.nPara,
- aSelection.end.nPara+1,
- AccessibleEventId::CARET_CHANGED,
- uno::Any(aSelection.end.nIndex),
- aOldCursor );
+ SAL_INFO(
+ "svx",
+ "caret changed, Object: " << this << ", New pos: "
+ << aSelection.end.nIndex << ", Old pos: "
+ << maLastSelection.end.nIndex << ", New para: "
+ << aSelection.end.nPara << ", Old para: "
+ << maLastSelection.end.nPara);
+
+ // #108947# Sort new range before calling FireEvent
+ ::std::pair<sal_Int32, sal_Int32> sortedSelection(
+ makeSortedPair(::std::min( aSelection.start.nPara,
nMaxValidParaIndex ),
+ ::std::min( aSelection.end.nPara,
nMaxValidParaIndex ) ) );
+
+ // #108947# Sort last range before calling FireEvent
+ ::std::pair<sal_Int32, sal_Int32> sortedLastSelection(
+ makeSortedPair(::std::min( maLastSelection.start.nPara,
nMaxValidParaIndex ),
+ ::std::min( maLastSelection.end.nPara,
nMaxValidParaIndex ) ) );
+
+ // event TEXT_SELECTION_CHANGED has to be submitted. (#i27299#)
+ const sal_Int16 nTextSelChgEventId =
+ AccessibleEventId::TEXT_SELECTION_CHANGED;
+ // #107037# notify selection change
+ if (maLastSelection.start.nPara == EE_PARA_MAX)
+ {
+ // last selection is undefined
+ // use method <ESelection::HasRange()> (#i27299#)
+ if ( aSelection.HasRange() )
+ {
+ // selection was undefined, now is on
+ maParaManager.FireEvent( sortedSelection.first,
+ sortedSelection.second+1,
+ nTextSelChgEventId );
}
-
- SAL_INFO(
- "svx",
- "caret changed, Object: " << this << ", New pos: "
- << aSelection.end.nIndex << ", Old pos: "
- << maLastSelection.end.nIndex << ", New para: "
- << aSelection.end.nPara << ", Old para: "
- << maLastSelection.end.nPara);
-
- // #108947# Sort new range before calling FireEvent
- ::std::pair<sal_Int32, sal_Int32> sortedSelection(
- makeSortedPair(::std::min( aSelection.start.nPara,
nMaxValidParaIndex ),
- ::std::min( aSelection.end.nPara,
nMaxValidParaIndex ) ) );
-
- // #108947# Sort last range before calling FireEvent
- ::std::pair<sal_Int32, sal_Int32> sortedLastSelection(
- makeSortedPair(::std::min( maLastSelection.start.nPara,
nMaxValidParaIndex ),
- ::std::min( maLastSelection.end.nPara,
nMaxValidParaIndex ) ) );
-
- // event TEXT_SELECTION_CHANGED has to be submitted. (#i27299#)
- const sal_Int16 nTextSelChgEventId =
- AccessibleEventId::TEXT_SELECTION_CHANGED;
- // #107037# notify selection change
- if (maLastSelection.start.nPara == EE_PARA_MAX)
+ }
+ else
+ {
+ // last selection is valid
+ // use method <ESelection::HasRange()> (#i27299#)
+ if ( maLastSelection.HasRange() &&
+ !aSelection.HasRange() )
{
- // last selection is undefined
- // use method <ESelection::HasRange()> (#i27299#)
- if ( aSelection.HasRange() )
- {
- // selection was undefined, now is on
- maParaManager.FireEvent( sortedSelection.first,
- sortedSelection.second+1,
- nTextSelChgEventId );
- }
+ // selection was on, now is empty
+ maParaManager.FireEvent( sortedLastSelection.first,
+ sortedLastSelection.second+1,
+ nTextSelChgEventId );
}
- else
+ // use method <ESelection::HasRange()> (#i27299#)
+ else if( !maLastSelection.HasRange() &&
+ aSelection.HasRange() )
{
- // last selection is valid
- // use method <ESelection::HasRange()> (#i27299#)
- if ( maLastSelection.HasRange() &&
- !aSelection.HasRange() )
- {
- // selection was on, now is empty
- maParaManager.FireEvent( sortedLastSelection.first,
- sortedLastSelection.second+1,
- nTextSelChgEventId );
- }
- // use method <ESelection::HasRange()> (#i27299#)
- else if( !maLastSelection.HasRange() &&
- aSelection.HasRange() )
- {
- // selection was empty, now is on
- maParaManager.FireEvent( sortedSelection.first,
- sortedSelection.second+1,
- nTextSelChgEventId );
- }
- // no event TEXT_SELECTION_CHANGED event, if new and
- // last selection are empty. (#i27299#)
- else if ( maLastSelection.HasRange() &&
- aSelection.HasRange() )
+ // selection was empty, now is on
+ maParaManager.FireEvent( sortedSelection.first,
+ sortedSelection.second+1,
+ nTextSelChgEventId );
+ }
+ // no event TEXT_SELECTION_CHANGED event, if new and
+ // last selection are empty. (#i27299#)
+ else if ( maLastSelection.HasRange() &&
+ aSelection.HasRange() )
+ {
+ // use sorted last and new selection
+ ESelection aTmpLastSel( maLastSelection );
+ aTmpLastSel.Adjust();
+ ESelection aTmpSel( aSelection );
+ aTmpSel.Adjust();
+ // first submit event for new and changed selection
+ sal_Int32 nPara = aTmpSel.start.nPara;
+ for ( ; nPara <= aTmpSel.end.nPara; ++nPara )
{
- // use sorted last and new selection
- ESelection aTmpLastSel( maLastSelection );
- aTmpLastSel.Adjust();
- ESelection aTmpSel( aSelection );
- aTmpSel.Adjust();
- // first submit event for new and changed selection
- sal_Int32 nPara = aTmpSel.start.nPara;
- for ( ; nPara <= aTmpSel.end.nPara; ++nPara )
+ if ( nPara < aTmpLastSel.start.nPara ||
+ nPara > aTmpLastSel.end.nPara )
{
- if ( nPara < aTmpLastSel.start.nPara ||
- nPara > aTmpLastSel.end.nPara )
- {
- // new selection on paragraph <nPara>
- maParaManager.FireEvent( nPara,
- nTextSelChgEventId );
- }
- else
- {
- // check for changed selection on paragraph <nPara>
- const sal_Int32 nParaStartPos =
- nPara == aTmpSel.start.nPara
- ? aTmpSel.start.nIndex : 0;
- const sal_Int32 nParaEndPos =
- nPara == aTmpSel.end.nPara
- ? aTmpSel.end.nIndex : -1;
- const sal_Int32 nLastParaStartPos =
- nPara == aTmpLastSel.start.nPara
- ? aTmpLastSel.start.nIndex : 0;
- const sal_Int32 nLastParaEndPos =
- nPara == aTmpLastSel.end.nPara
- ? aTmpLastSel.end.nIndex : -1;
- if ( nParaStartPos != nLastParaStartPos ||
- nParaEndPos != nLastParaEndPos )
- {
- maParaManager.FireEvent(
- nPara, nTextSelChgEventId );
- }
- }
+ // new selection on paragraph <nPara>
+ maParaManager.FireEvent( nPara,
+ nTextSelChgEventId );
}
- // second submit event for 'old' selections
- nPara = aTmpLastSel.start.nPara;
- for ( ; nPara <= aTmpLastSel.end.nPara; ++nPara )
+ else
{
- if ( nPara < aTmpSel.start.nPara ||
- nPara > aTmpSel.end.nPara )
+ // check for changed selection on paragraph <nPara>
+ const sal_Int32 nParaStartPos =
+ nPara == aTmpSel.start.nPara
+ ? aTmpSel.start.nIndex : 0;
+ const sal_Int32 nParaEndPos =
+ nPara == aTmpSel.end.nPara
+ ? aTmpSel.end.nIndex : -1;
+ const sal_Int32 nLastParaStartPos =
+ nPara == aTmpLastSel.start.nPara
+ ? aTmpLastSel.start.nIndex : 0;
+ const sal_Int32 nLastParaEndPos =
+ nPara == aTmpLastSel.end.nPara
+ ? aTmpLastSel.end.nIndex : -1;
+ if ( nParaStartPos != nLastParaStartPos ||
+ nParaEndPos != nLastParaEndPos )
{
- maParaManager.FireEvent( nPara,
- nTextSelChgEventId );
+ maParaManager.FireEvent(
+ nPara, nTextSelChgEventId );
}
}
}
+ // second submit event for 'old' selections
+ nPara = aTmpLastSel.start.nPara;
+ for ( ; nPara <= aTmpLastSel.end.nPara; ++nPara )
+ {
+ if ( nPara < aTmpSel.start.nPara ||
+ nPara > aTmpSel.end.nPara )
+ {
+ maParaManager.FireEvent( nPara,
+ nTextSelChgEventId );
+ }
+ }
}
-
- maLastSelection = aSelection;
}
- // no selection? no update actions
- catch( const uno::RuntimeException& ) {}
+
+ maLastSelection = aSelection;
}
+ // no selection? no update actions
+ catch( const uno::RuntimeException& ) {}
+}
- void AccessibleTextHelper_Impl::ShutdownEditSource()
- {
- // This should only be called with solar mutex locked, i.e. from the
main office thread
+void AccessibleTextHelper_Impl::ShutdownEditSource()
+{
+ // This should only be called with solar mutex locked, i.e. from the main
office thread
- // This here is somewhat clumsy: As soon as our children have
- // a NULL EditSource (maParaManager.SetEditSource()), they
- // enter the disposed state and cannot be reanimated. Thus, it
- // is unavoidable and a hard requirement to let go and create
- // from scratch each and every child.
+ // This here is somewhat clumsy: As soon as our children have
+ // a NULL EditSource (maParaManager.SetEditSource()), they
+ // enter the disposed state and cannot be reanimated. Thus, it
+ // is unavoidable and a hard requirement to let go and create
+ // from scratch each and every child.
- // invalidate children
- maParaManager.Dispose();
- maParaManager.SetNum(0);
+ // invalidate children
+ maParaManager.Dispose();
+ maParaManager.SetNum(0);
- // lost all children
- if( mxFrontEnd.is() )
- FireEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN);
+ // lost all children
+ if( mxFrontEnd.is() )
+ FireEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN);
- // quit listen on stale edit source
- if( maEditSource.IsValid() )
- EndListening( maEditSource.GetBroadcaster() );
+ // quit listen on stale edit source
+ if( maEditSource.IsValid() )
+ EndListening( maEditSource.GetBroadcaster() );
- maEditSource.SetEditSource( ::std::unique_ptr< SvxEditSource >() );
- }
+ maEditSource.SetEditSource( ::std::unique_ptr< SvxEditSource >() );
+}
- void AccessibleTextHelper_Impl::SetEditSource( ::std::unique_ptr<
SvxEditSource > && pEditSource )
- {
- // This should only be called with solar mutex locked, i.e. from the
main office thread
+void AccessibleTextHelper_Impl::SetEditSource( ::std::unique_ptr<
SvxEditSource > && pEditSource )
+{
+ // This should only be called with solar mutex locked, i.e. from the main
office thread
- // shutdown old edit source
- ShutdownEditSource();
+ // shutdown old edit source
+ ShutdownEditSource();
- // set new edit source
- maEditSource.SetEditSource( std::move(pEditSource) );
+ // set new edit source
+ maEditSource.SetEditSource( std::move(pEditSource) );
- // init child vector to the current child count
- if( maEditSource.IsValid() )
- {
- maParaManager.SetNum( GetTextForwarder().GetParagraphCount() );
+ // init child vector to the current child count
+ if( maEditSource.IsValid() )
+ {
+ maParaManager.SetNum( GetTextForwarder().GetParagraphCount() );
- // listen on new edit source
- StartListening( maEditSource.GetBroadcaster() );
+ // listen on new edit source
+ StartListening( maEditSource.GetBroadcaster() );
- UpdateVisibleChildren();
- }
+ UpdateVisibleChildren();
}
+}
- void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
+void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
+{
+ // guard against non-atomic access to maOffset data structure
{
- // guard against non-atomic access to maOffset data structure
- {
- std::scoped_lock aGuard( maMutex );
- maOffset = rPoint;
- }
+ std::scoped_lock aGuard( maMutex );
+ maOffset = rPoint;
+ }
- maParaManager.SetEEOffset( rPoint );
+ maParaManager.SetEEOffset( rPoint );
- // in all cases, check visibility afterwards.
- UpdateVisibleChildren();
- UpdateBoundRect();
- }
+ // in all cases, check visibility afterwards.
+ UpdateVisibleChildren();
+ UpdateBoundRect();
+}
- void AccessibleTextHelper_Impl::UpdateVisibleChildren( bool
bBroadcastEvents )
+void AccessibleTextHelper_Impl::UpdateVisibleChildren( bool bBroadcastEvents )
+{
+ try
{
- try
- {
- SvxTextForwarder& rCacheTF = GetTextForwarder();
- sal_Int32 nParas=rCacheTF.GetParagraphCount();
+ SvxTextForwarder& rCacheTF = GetTextForwarder();
+ sal_Int32 nParas=rCacheTF.GetParagraphCount();
- // GetTextForwarder might have replaced everything, update
- // paragraph count in case it's outdated
- maParaManager.SetNum( nParas );
+ // GetTextForwarder might have replaced everything, update
+ // paragraph count in case it's outdated
+ maParaManager.SetNum( nParas );
- mnFirstVisibleChild = -1;
- mnLastVisibleChild = -2;
+ mnFirstVisibleChild = -1;
+ mnLastVisibleChild = -2;
- for( sal_Int32 nCurrPara=0; nCurrPara<nParas; ++nCurrPara )
+ for( sal_Int32 nCurrPara=0; nCurrPara<nParas; ++nCurrPara )
+ {
+ if (nCurrPara == 0)
+ mnFirstVisibleChild = nCurrPara;
+ mnLastVisibleChild = nCurrPara;
+ if (mxFrontEnd.is() && bBroadcastEvents)
{
- if (nCurrPara == 0)
- mnFirstVisibleChild = nCurrPara;
- mnLastVisibleChild = nCurrPara;
- if (mxFrontEnd.is() && bBroadcastEvents)
+ // child not yet created?
+ if (!maParaManager.HasCreatedChild(nCurrPara))
{
- // child not yet created?
- if (!maParaManager.HasCreatedChild(nCurrPara))
- {
- FireEvent(AccessibleEventId::CHILD,
uno::Any(maParaManager.CreateChild(nCurrPara - mnFirstVisibleChild,
-
mxFrontEnd, GetEditSource(), nCurrPara)));
- }
+ FireEvent(AccessibleEventId::CHILD,
uno::Any(maParaManager.CreateChild(nCurrPara - mnFirstVisibleChild,
+
mxFrontEnd, GetEditSource(), nCurrPara)));
}
}
}
- catch( const uno::Exception& )
- {
- OSL_FAIL("AccessibleTextHelper_Impl::UpdateVisibleChildren error
while determining visible children");
+ }
+ catch( const uno::Exception& )
+ {
+ OSL_FAIL("AccessibleTextHelper_Impl::UpdateVisibleChildren error while
determining visible children");
- // something failed - currently no children
- mnFirstVisibleChild = -1;
- mnLastVisibleChild = -2;
- maParaManager.SetNum(0);
+ // something failed - currently no children
+ mnFirstVisibleChild = -1;
+ mnLastVisibleChild = -2;
+ maParaManager.SetNum(0);
- // lost all children
- if( bBroadcastEvents )
- FireEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN);
- }
+ // lost all children
+ if( bBroadcastEvents )
+ FireEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN);
}
+}
- void AccessibleTextHelper_Impl::UpdateBoundRect()
+void AccessibleTextHelper_Impl::UpdateBoundRect()
+{
+ // send BOUNDRECT_CHANGED to affected children
+ for(auto it = maParaManager.begin(); it != maParaManager.end(); ++it)
{
- // send BOUNDRECT_CHANGED to affected children
- for(auto it = maParaManager.begin(); it != maParaManager.end(); ++it)
+ ::accessibility::AccessibleParaManager::WeakChild& rChild = *it;
+ // retrieve hard reference from weak one
+ auto aHardRef( rChild.first.get() );
+
+ if( aHardRef.is() )
{
- ::accessibility::AccessibleParaManager::WeakChild& rChild = *it;
- // retrieve hard reference from weak one
- auto aHardRef( rChild.first.get() );
+ awt::Rectangle aNewRect = aHardRef->getBounds();
+ const awt::Rectangle& aOldRect = rChild.second;
- if( aHardRef.is() )
+ if( aNewRect.X != aOldRect.X ||
+ aNewRect.Y != aOldRect.Y ||
+ aNewRect.Width != aOldRect.Width ||
+ aNewRect.Height != aOldRect.Height )
{
- awt::Rectangle aNewRect = aHardRef->getBounds();
- const awt::Rectangle& aOldRect = rChild.second;
-
- if( aNewRect.X != aOldRect.X ||
- aNewRect.Y != aOldRect.Y ||
- aNewRect.Width != aOldRect.Width ||
- aNewRect.Height != aOldRect.Height )
- {
- // visible data changed
- aHardRef->FireEvent( AccessibleEventId::BOUNDRECT_CHANGED
);
+ // visible data changed
+ aHardRef->FireEvent( AccessibleEventId::BOUNDRECT_CHANGED );
- // update internal bounds
- rChild =
::accessibility::AccessibleParaManager::WeakChild( rChild.first, aNewRect );
- }
+ // update internal bounds
+ rChild = ::accessibility::AccessibleParaManager::WeakChild(
rChild.first, aNewRect );
}
}
}
+}
#ifdef DBG_UTIL
- void AccessibleTextHelper_Impl::CheckInvariants() const
+void AccessibleTextHelper_Impl::CheckInvariants() const
+{
+ if( mnFirstVisibleChild >= 0 &&
+ mnFirstVisibleChild > mnLastVisibleChild )
{
- if( mnFirstVisibleChild >= 0 &&
- mnFirstVisibleChild > mnLastVisibleChild )
- {
- OSL_FAIL( "AccessibleTextHelper: range invalid" );
- }
+ OSL_FAIL( "AccessibleTextHelper: range invalid" );
}
+}
#endif
- namespace {
+namespace {
- // functor for sending child events (no stand-alone function, they are
maybe not inlined)
- class AccessibleTextHelper_LostChildEvent
+// functor for sending child events (no stand-alone function, they are maybe
not inlined)
+class AccessibleTextHelper_LostChildEvent
+{
+public:
+ explicit AccessibleTextHelper_LostChildEvent( AccessibleTextHelper_Impl&
rImpl ) : mrImpl(rImpl) {}
+ void operator()( const ::accessibility::AccessibleParaManager::WeakChild&
rPara )
{
- public:
- explicit AccessibleTextHelper_LostChildEvent(
AccessibleTextHelper_Impl& rImpl ) : mrImpl(rImpl) {}
- void operator()( const
::accessibility::AccessibleParaManager::WeakChild& rPara )
- {
- // retrieve hard reference from weak one
- auto aHardRef( rPara.first.get() );
+ // retrieve hard reference from weak one
+ auto aHardRef( rPara.first.get() );
- if( aHardRef.is() )
- mrImpl.FireEvent(AccessibleEventId::CHILD, uno::Any(),
uno::Any(css::uno::Reference<css::accessibility::XAccessible>(aHardRef)) );
- }
+ if( aHardRef.is() )
+ mrImpl.FireEvent(AccessibleEventId::CHILD, uno::Any(),
uno::Any(css::uno::Reference<css::accessibility::XAccessible>(aHardRef)) );
+ }
- private:
- AccessibleTextHelper_Impl& mrImpl;
- };
+private:
+ AccessibleTextHelper_Impl& mrImpl;
+};
- }
+}
+
+void AccessibleTextHelper_Impl::ParagraphsMoved( sal_Int32 nFirst, sal_Int32
nMiddle, sal_Int32 nLast )
+{
+ const sal_Int32 nParas = GetTextForwarder().GetParagraphCount();
+
+ /* rotate paragraphs
+ * =================
+ *
+ * Three cases:
+ *
+ * 1.
+ * ... nParagraph ... nParam1 ... nParam2 ...
+ * |______________[xxxxxxxxxxx]
+ * becomes
+ * [xxxxxxxxxxx]|______________
+ *
+ * tail is 0
+ *
+ * 2.
+ * ... nParam1 ... nParagraph ... nParam2 ...
+ * [xxxxxxxxxxx|xxxxxxxxxxxxxx]____________
+ * becomes
+ * ____________[xxxxxxxxxxx|xxxxxxxxxxxxxx]
+ *
+ * tail is nParagraph - nParam1
+ *
+ * 3.
+ * ... nParam1 ... nParam2 ... nParagraph ...
+ * [xxxxxxxxxxx]___________|____________
+ * becomes
+ * ___________|____________[xxxxxxxxxxx]
+ *
+ * tail is nParam2 - nParam1
+ */
- void AccessibleTextHelper_Impl::ParagraphsMoved( sal_Int32 nFirst,
sal_Int32 nMiddle, sal_Int32 nLast )
+ // sort nParagraph, nParam1 and nParam2 in ascending order, calc range
+ if( nMiddle < nFirst )
{
- const sal_Int32 nParas = GetTextForwarder().GetParagraphCount();
-
- /* rotate paragraphs
- * =================
- *
- * Three cases:
- *
- * 1.
- * ... nParagraph ... nParam1 ... nParam2 ...
- * |______________[xxxxxxxxxxx]
- * becomes
- * [xxxxxxxxxxx]|______________
- *
- * tail is 0
- *
- * 2.
- * ... nParam1 ... nParagraph ... nParam2 ...
- * [xxxxxxxxxxx|xxxxxxxxxxxxxx]____________
- * becomes
- * ____________[xxxxxxxxxxx|xxxxxxxxxxxxxx]
- *
- * tail is nParagraph - nParam1
- *
- * 3.
- * ... nParam1 ... nParam2 ... nParagraph ...
- * [xxxxxxxxxxx]___________|____________
- * becomes
- * ___________|____________[xxxxxxxxxxx]
- *
- * tail is nParam2 - nParam1
- */
-
- // sort nParagraph, nParam1 and nParam2 in ascending order, calc range
- if( nMiddle < nFirst )
- {
- ::std::swap(nFirst, nMiddle);
- }
- else if( nMiddle < nLast )
- {
- nLast = nLast + nMiddle - nFirst;
- }
- else
- {
- ::std::swap(nMiddle, nLast);
- nLast = nLast + nMiddle - nFirst;
- }
+ ::std::swap(nFirst, nMiddle);
+ }
+ else if( nMiddle < nLast )
+ {
+ nLast = nLast + nMiddle - nFirst;
+ }
+ else
+ {
+ ::std::swap(nMiddle, nLast);
+ nLast = nLast + nMiddle - nFirst;
+ }
- if( !(nFirst < nParas && nMiddle < nParas && nLast < nParas) )
- return;
+ if( !(nFirst < nParas && nMiddle < nParas && nLast < nParas) )
+ return;
- // since we have no "paragraph index
- // changed" event on UAA, remove
- // [first,last] and insert again later (in
- // UpdateVisibleChildren)
+ // since we have no "paragraph index
+ // changed" event on UAA, remove
+ // [first,last] and insert again later (in
+ // UpdateVisibleChildren)
- // maParaManager.Rotate( nFirst, nMiddle, nLast );
+ // maParaManager.Rotate( nFirst, nMiddle, nLast );
- // send CHILD_EVENT to affected children
-
::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator begin
= maParaManager.begin();
-
::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator end =
begin;
+ // send CHILD_EVENT to affected children
+ ::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator
begin = maParaManager.begin();
+ ::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator
end = begin;
- ::std::advance( begin, nFirst );
- ::std::advance( end, nLast+1 );
+ ::std::advance( begin, nFirst );
+ ::std::advance( end, nLast+1 );
- // TODO: maybe optimize here in the following way. If the
- // number of removed children exceeds a certain threshold,
- // use InvalidateFlags::Children
- AccessibleTextHelper_LostChildEvent aFunctor( *this );
+ // TODO: maybe optimize here in the following way. If the
+ // number of removed children exceeds a certain threshold,
+ // use InvalidateFlags::Children
+ AccessibleTextHelper_LostChildEvent aFunctor( *this );
- ::std::for_each( begin, end, aFunctor );
+ ::std::for_each( begin, end, aFunctor );
- maParaManager.Release(nFirst, nLast+1);
- // should be no need for UpdateBoundRect, since all affected children
are cleared.
- }
+ maParaManager.Release(nFirst, nLast+1);
+ // should be no need for UpdateBoundRect, since all affected children are
cleared.
+}
- namespace {
+namespace {
- // functor for sending child events (no stand-alone function, they are
maybe not inlined)
- class AccessibleTextHelper_ChildrenTextChanged
+// functor for sending child events (no stand-alone function, they are maybe
not inlined)
+class AccessibleTextHelper_ChildrenTextChanged
+{
+public:
+ void operator()( ::accessibility::AccessibleEditableTextPara& rPara )
{
- public:
- void operator()( ::accessibility::AccessibleEditableTextPara& rPara )
- {
- rPara.TextChanged();
- }
- };
+ rPara.TextChanged();
+ }
+};
- /** functor processing queue events
+/** functor processing queue events
- Reacts on SfxHintId::TextParaInserted/REMOVED events and stores
- their content
- */
- class AccessibleTextHelper_QueueFunctor
+ Reacts on SfxHintId::TextParaInserted/REMOVED events and stores
+ their content
+ */
+class AccessibleTextHelper_QueueFunctor
+{
+public:
+ AccessibleTextHelper_QueueFunctor() :
+ mnParasChanged( 0 ),
+ mnParaIndex(-1),
+ mnHintId(SfxHintId::NONE)
+ {}
+ void operator()( const SfxHint* pEvent )
{
- public:
- AccessibleTextHelper_QueueFunctor() :
- mnParasChanged( 0 ),
- mnParaIndex(-1),
- mnHintId(SfxHintId::NONE)
- {}
- void operator()( const SfxHint* pEvent )
- {
- if( !pEvent || mnParasChanged == -1 )
- return;
+ if( !pEvent || mnParasChanged == -1 )
+ return;
- // determine hint type
- const TextHint* pTextHint = dynamic_cast<const TextHint*>( pEvent
);
- const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const
SvxEditSourceHint*>( pEvent );
+ // determine hint type
+ const TextHint* pTextHint = dynamic_cast<const TextHint*>( pEvent );
+ const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const
SvxEditSourceHint*>( pEvent );
- if( !(!pEditSourceHint && pTextHint &&
- (pTextHint->GetId() == SfxHintId::TextParaInserted ||
- pTextHint->GetId() == SfxHintId::TextParaRemoved )) )
- return;
+ if( !(!pEditSourceHint && pTextHint &&
+ (pTextHint->GetId() == SfxHintId::TextParaInserted ||
+ pTextHint->GetId() == SfxHintId::TextParaRemoved )) )
+ return;
- if (pTextHint->GetValue() == EE_PARA_MAX)
- {
- mnParasChanged = -1;
- }
- else
- {
- mnHintId = pTextHint->GetId();
- mnParaIndex = pTextHint->GetValue();
- ++mnParasChanged;
- }
+ if (pTextHint->GetValue() == EE_PARA_MAX)
+ {
+ mnParasChanged = -1;
+ }
+ else
+ {
+ mnHintId = pTextHint->GetId();
+ mnParaIndex = pTextHint->GetValue();
+ ++mnParasChanged;
}
-
- /** Query number of paragraphs changed during queue processing.
-
- @return number of changed paragraphs, -1 for
- "every paragraph changed"
- */
- sal_Int32 GetNumberOfParasChanged() const { return mnParasChanged; }
- /** Query index of last added/removed paragraph
-
- @return index of lastly added paragraphs, -1 for none
- added so far.
- */
- sal_Int32 GetParaIndex() const { return mnParaIndex; }
- /** Query hint id of last interesting event
-
- @return hint id of last interesting event (REMOVED/INSERTED).
- */
- SfxHintId GetHintId() const { return mnHintId; }
-
- private:
- /** number of paragraphs changed during queue processing. -1 for
- "every paragraph changed"
- */
- sal_Int32 mnParasChanged;
- /// index of paragraph added/removed last
- sal_Int32 mnParaIndex;
- /// TextHint ID (removed/inserted) of last interesting event
- SfxHintId mnHintId;
- };
-
}
- void AccessibleTextHelper_Impl::ProcessQueue()
+ /** Query number of paragraphs changed during queue processing.
+
+ @return number of changed paragraphs, -1 for
+ "every paragraph changed"
+ */
+ sal_Int32 GetNumberOfParasChanged() const { return mnParasChanged; }
+ /** Query index of last added/removed paragraph
+
+ @return index of lastly added paragraphs, -1 for none
+ added so far.
+ */
+ sal_Int32 GetParaIndex() const { return mnParaIndex; }
+ /** Query hint id of last interesting event
+
+ @return hint id of last interesting event (REMOVED/INSERTED).
+ */
+ SfxHintId GetHintId() const { return mnHintId; }
+
+private:
+ /** number of paragraphs changed during queue processing. -1 for
+ "every paragraph changed"
+ */
+ sal_Int32 mnParasChanged;
+ /// index of paragraph added/removed last
+ sal_Int32 mnParaIndex;
+ /// TextHint ID (removed/inserted) of last interesting event
+ SfxHintId mnHintId;
+};
+
+}
+
+void AccessibleTextHelper_Impl::ProcessQueue()
+{
+ // inspect queue for paragraph insert/remove events. If there
+ // is exactly _one_ of those in the queue, and the number of
+ // paragraphs has changed by exactly one, use that event to
+ // determine a priori which paragraph was added/removed. This
+ // is necessary, since I must sync right here with the
+ // EditEngine state (number of paragraphs etc.), since I'm
+ // potentially sending listener events right away.
+ AccessibleTextHelper_QueueFunctor aFunctor;
+ maEventQueue.ForEach( aFunctor );
+
+ const sal_Int32 nNewParas( GetTextForwarder().GetParagraphCount() );
+ const sal_Int32 nCurrParas( maParaManager.GetNum() );
+
+ // whether every paragraph already is updated (no need to
+ // repeat that later on, e.g. for PARA_MOVED events)
+ bool bEverythingUpdated( false );
+
+ if( std::abs( nNewParas - nCurrParas ) == 1 &&
+ aFunctor.GetNumberOfParasChanged() == 1 )
{
- // inspect queue for paragraph insert/remove events. If there
- // is exactly _one_ of those in the queue, and the number of
- // paragraphs has changed by exactly one, use that event to
- // determine a priori which paragraph was added/removed. This
- // is necessary, since I must sync right here with the
- // EditEngine state (number of paragraphs etc.), since I'm
- // potentially sending listener events right away.
- AccessibleTextHelper_QueueFunctor aFunctor;
- maEventQueue.ForEach( aFunctor );
-
- const sal_Int32 nNewParas( GetTextForwarder().GetParagraphCount() );
- const sal_Int32 nCurrParas( maParaManager.GetNum() );
-
- // whether every paragraph already is updated (no need to
- // repeat that later on, e.g. for PARA_MOVED events)
- bool bEverythingUpdated( false );
-
- if( std::abs( nNewParas - nCurrParas ) == 1 &&
- aFunctor.GetNumberOfParasChanged() == 1 )
- {
- // #103483# Exactly one paragraph added/removed. This is
- // the normal case, optimize event handling here.
+ // #103483# Exactly one paragraph added/removed. This is
+ // the normal case, optimize event handling here.
- if( aFunctor.GetHintId() == SfxHintId::TextParaInserted )
- {
- // update num of paras
- maParaManager.SetNum( nNewParas );
+ if( aFunctor.GetHintId() == SfxHintId::TextParaInserted )
+ {
+ // update num of paras
+ maParaManager.SetNum( nNewParas );
- // release everything from the insertion position until the end
- maParaManager.Release(aFunctor.GetParaIndex(), nCurrParas);
+ // release everything from the insertion position until the end
+ maParaManager.Release(aFunctor.GetParaIndex(), nCurrParas);
- // TODO: Clarify whether this behaviour _really_ saves
- // anybody anything!
- // update children, _don't_ broadcast
- UpdateVisibleChildren( false );
- UpdateBoundRect();
+ // TODO: Clarify whether this behaviour _really_ saves
+ // anybody anything!
+ // update children, _don't_ broadcast
+ UpdateVisibleChildren( false );
+ UpdateBoundRect();
- // send insert event
- // #109864# Enforce creation of this paragraph
- try
- {
- FireEvent(AccessibleEventId::CHILD,
uno::Any(getAccessibleChild(aFunctor.GetParaIndex() -
-
mnFirstVisibleChild + GetStartIndex())));
- }
- catch( const uno::Exception& )
- {
- OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue: could
not create new paragraph");
- }
+ // send insert event
+ // #109864# Enforce creation of this paragraph
+ try
+ {
+ FireEvent(AccessibleEventId::CHILD,
uno::Any(getAccessibleChild(aFunctor.GetParaIndex() -
+
mnFirstVisibleChild + GetStartIndex())));
}
- else if( aFunctor.GetHintId() == SfxHintId::TextParaRemoved )
+ catch( const uno::Exception& )
{
-
::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator begin
= maParaManager.begin();
- ::std::advance( begin, aFunctor.GetParaIndex() );
-
::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator end =
begin;
- ::std::advance( end, 1 );
-
- // #i61812# remember para to be removed for later notification
- // AFTER the new state is applied (that after the para got
removed)
- rtl::Reference<AccessibleEditableTextPara>
xPara(begin->first.get());
-
- // release everything from the remove position until the end
- maParaManager.Release(aFunctor.GetParaIndex(), nCurrParas);
-
- // update num of paras
- maParaManager.SetNum( nNewParas );
-
- // TODO: Clarify whether this behaviour _really_ saves
- // anybody anything!
- // update children, _don't_ broadcast
- UpdateVisibleChildren( false );
- UpdateBoundRect();
-
- // #i61812# notification for removed para
- if (xPara.is())
- FireEvent(AccessibleEventId::CHILD, uno::Any(), uno::Any(
::uno::Reference< XAccessible >(xPara) ) );
+ OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue: could not
create new paragraph");
}
-#ifdef DBG_UTIL
- else
- OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue() invalid
hint id");
-#endif
}
- else if( nNewParas != nCurrParas )
+ else if( aFunctor.GetHintId() == SfxHintId::TextParaRemoved )
{
- // release all paras
- maParaManager.Release(0, nCurrParas);
+
::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator begin
= maParaManager.begin();
+ ::std::advance( begin, aFunctor.GetParaIndex() );
+
::accessibility::AccessibleParaManager::VectorOfChildren::const_iterator end =
begin;
+ ::std::advance( end, 1 );
+
+ // #i61812# remember para to be removed for later notification
+ // AFTER the new state is applied (that after the para got removed)
+ rtl::Reference<AccessibleEditableTextPara>
xPara(begin->first.get());
+
+ // release everything from the remove position until the end
+ maParaManager.Release(aFunctor.GetParaIndex(), nCurrParas);
// update num of paras
maParaManager.SetNum( nNewParas );
- // #109864# create from scratch, don't broadcast
+ // TODO: Clarify whether this behaviour _really_ saves
+ // anybody anything!
+ // update children, _don't_ broadcast
UpdateVisibleChildren( false );
UpdateBoundRect();
- // number of paragraphs somehow changed - but we have no
- // chance determining how. Thus, throw away everything and
- // create from scratch.
- // (child events should be broadcast after the changes are done...)
- FireEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN);
-
- // no need for further updates later on
- bEverythingUpdated = true;
+ // #i61812# notification for removed para
+ if (xPara.is())
+ FireEvent(AccessibleEventId::CHILD, uno::Any(), uno::Any(
::uno::Reference< XAccessible >(xPara) ) );
}
+#ifdef DBG_UTIL
+ else
+ OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue() invalid hint
id");
+#endif
+ }
+ else if( nNewParas != nCurrParas )
+ {
+ // release all paras
+ maParaManager.Release(0, nCurrParas);
- bool bUpdatedBoundRectAndVisibleChildren(false);
+ // update num of paras
+ maParaManager.SetNum( nNewParas );
- while( !maEventQueue.IsEmpty() )
+ // #109864# create from scratch, don't broadcast
+ UpdateVisibleChildren( false );
+ UpdateBoundRect();
+
+ // number of paragraphs somehow changed - but we have no
+ // chance determining how. Thus, throw away everything and
+ // create from scratch.
+ // (child events should be broadcast after the changes are done...)
+ FireEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN);
+
+ // no need for further updates later on
+ bEverythingUpdated = true;
+ }
+
+ bool bUpdatedBoundRectAndVisibleChildren(false);
+
+ while( !maEventQueue.IsEmpty() )
+ {
+ ::std::unique_ptr< SfxHint > pHint( maEventQueue.PopFront() );
+ if (pHint)
{
- ::std::unique_ptr< SfxHint > pHint( maEventQueue.PopFront() );
- if (pHint)
- {
- const SfxHint& rHint = *pHint;
+ const SfxHint& rHint = *pHint;
- // Note, if you add events here, you need to update the
AccessibleTextEventQueue::Append
- // code, because only the events we process here, are actually
queued there.
+ // Note, if you add events here, you need to update the
AccessibleTextEventQueue::Append
+ // code, because only the events we process here, are actually
queued there.
+
+ try
+ {
- try
+ if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
{
+ const SdrHint* pSdrHint = static_cast< const SdrHint* >(
&rHint );
- if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
+ switch( pSdrHint->GetKind() )
{
- const SdrHint* pSdrHint = static_cast< const SdrHint*
>( &rHint );
-
- switch( pSdrHint->GetKind() )
+ case SdrHintKind::BeginEdit:
{
- case SdrHintKind::BeginEdit:
+ if(!IsActive())
{
- if(!IsActive())
- {
- break;
- }
- // change children state
- maParaManager.SetActive();
-
- // per definition, edit mode text has the focus
- SetFocus( true );
break;
}
+ // change children state
+ maParaManager.SetActive();
- case SdrHintKind::EndEdit:
- {
- // focused child now loses focus
- ESelection aSelection;
- if( GetEditViewForwarder().GetSelection(
aSelection ) )
- SetChildFocus(aSelection.end.nPara, false);
+ // per definition, edit mode text has the focus
+ SetFocus( true );
+ break;
+ }
- // change children state
- maParaManager.SetActive( false );
+ case SdrHintKind::EndEdit:
+ {
+ // focused child now loses focus
+ ESelection aSelection;
+ if( GetEditViewForwarder().GetSelection(
aSelection ) )
+ SetChildFocus(aSelection.end.nPara, false);
- maLastSelection = ESelection::AtEnd();
- break;
- }
- default:
- break;
+ // change children state
+ maParaManager.SetActive( false );
+
+ maLastSelection = ESelection::AtEnd();
+ break;
}
+ default:
+ break;
}
- else if( const SvxEditSourceHint* pEditSourceHint =
dynamic_cast<const SvxEditSourceHint*>( &rHint ) )
+ }
+ else if( const SvxEditSourceHint* pEditSourceHint =
dynamic_cast<const SvxEditSourceHint*>( &rHint ) )
+ {
+ switch( pEditSourceHint->GetId() )
{
- switch( pEditSourceHint->GetId() )
+ case SfxHintId::EditSourceParasMoved:
{
- case SfxHintId::EditSourceParasMoved:
- {
- DBG_ASSERT( pEditSourceHint->GetStartValue() <
GetTextForwarder().GetParagraphCount() &&
- pEditSourceHint->GetEndValue() <
GetTextForwarder().GetParagraphCount(),
-
"AccessibleTextHelper_Impl::NotifyHdl: Invalid notification");
+ DBG_ASSERT( pEditSourceHint->GetStartValue() <
GetTextForwarder().GetParagraphCount() &&
+ pEditSourceHint->GetEndValue() <
GetTextForwarder().GetParagraphCount(),
+ "AccessibleTextHelper_Impl::NotifyHdl:
Invalid notification");
- if( !bEverythingUpdated )
- {
-
ParagraphsMoved(pEditSourceHint->GetStartValue(),
-
pEditSourceHint->GetValue(),
-
pEditSourceHint->GetEndValue());
+ if( !bEverythingUpdated )
+ {
+
ParagraphsMoved(pEditSourceHint->GetStartValue(),
+ pEditSourceHint->GetValue(),
+
pEditSourceHint->GetEndValue());
- // in all cases, check visibility
afterwards.
- UpdateVisibleChildren();
- }
- break;
+ // in all cases, check visibility afterwards.
+ UpdateVisibleChildren();
}
-
- case SfxHintId::EditSourceSelectionChanged:
- // notify listeners
- try
- {
- UpdateSelection();
- }
- // maybe we're not in edit mode (this is not
an error)
- catch( const uno::Exception& ) {}
- break;
- default: break;
+ break;
}
+
+ case SfxHintId::EditSourceSelectionChanged:
+ // notify listeners
+ try
+ {
+ UpdateSelection();
+ }
+ // maybe we're not in edit mode (this is not an
error)
+ catch( const uno::Exception& ) {}
+ break;
+ default: break;
}
- else if( const TextHint* pTextHint = dynamic_cast<const
TextHint*>( &rHint ) )
- {
- const sal_Int32 nParas =
GetTextForwarder().GetParagraphCount();
+ }
+ else if( const TextHint* pTextHint = dynamic_cast<const
TextHint*>( &rHint ) )
+ {
+ const sal_Int32 nParas =
GetTextForwarder().GetParagraphCount();
- switch( pTextHint->GetId() )
+ switch( pTextHint->GetId() )
+ {
+ case SfxHintId::TextModified:
{
- case SfxHintId::TextModified:
- {
- // notify listeners
- sal_Int32 nPara( pTextHint->GetValue() );
+ // notify listeners
+ sal_Int32 nPara( pTextHint->GetValue() );
- // #108900# Delegate change event to children
- AccessibleTextHelper_ChildrenTextChanged
aNotifyChildrenFunctor;
+ // #108900# Delegate change event to children
+ AccessibleTextHelper_ChildrenTextChanged
aNotifyChildrenFunctor;
- if (nPara == EE_PARA_MAX)
+ if (nPara == EE_PARA_MAX)
+ {
+ // #108900# Call every child
+ ::std::for_each( maParaManager.begin(),
maParaManager.end(),
+
AccessibleParaManager::WeakChildAdapter<
AccessibleTextHelper_ChildrenTextChanged > (aNotifyChildrenFunctor) );
+ }
+ else
+ if( nPara < nParas )
{
- // #108900# Call every child
- ::std::for_each( maParaManager.begin(),
maParaManager.end(),
+ // #108900# Call child at index nPara
+ ::std::for_each(
maParaManager.begin()+nPara, maParaManager.begin()+nPara+1,
AccessibleParaManager::WeakChildAdapter<
AccessibleTextHelper_ChildrenTextChanged > (aNotifyChildrenFunctor) );
}
- else
- if( nPara < nParas )
- {
- // #108900# Call child at index nPara
- ::std::for_each(
maParaManager.begin()+nPara, maParaManager.begin()+nPara+1,
-
AccessibleParaManager::WeakChildAdapter<
AccessibleTextHelper_ChildrenTextChanged > (aNotifyChildrenFunctor) );
- }
- break;
- }
-
- case SfxHintId::TextParaInserted:
- // already happened above
- break;
+ break;
+ }
- case SfxHintId::TextParaRemoved:
- // already happened above
- break;
+ case SfxHintId::TextParaInserted:
+ // already happened above
+ break;
- case SfxHintId::TextHeightChanged:
- // visibility changed, done below
- break;
+ case SfxHintId::TextParaRemoved:
+ // already happened above
+ break;
- case SfxHintId::TextViewScrolled:
- // visibility changed, done below
- break;
- default: break;
- }
+ case SfxHintId::TextHeightChanged:
+ // visibility changed, done below
+ break;
- // in all cases, check visibility afterwards.
- if (!bUpdatedBoundRectAndVisibleChildren)
- {
- UpdateVisibleChildren();
- UpdateBoundRect();
- bUpdatedBoundRectAndVisibleChildren = true;
- }
+ case SfxHintId::TextViewScrolled:
+ // visibility changed, done below
+ break;
+ default: break;
}
- else if (rHint.GetId() == SfxHintId::SvxViewChanged)
+
+ // in all cases, check visibility afterwards.
+ if (!bUpdatedBoundRectAndVisibleChildren)
{
- // just check visibility
- if (!bUpdatedBoundRectAndVisibleChildren)
- {
- UpdateVisibleChildren();
- UpdateBoundRect();
- bUpdatedBoundRectAndVisibleChildren = true;
- }
+ UpdateVisibleChildren();
+ UpdateBoundRect();
+ bUpdatedBoundRectAndVisibleChildren = true;
}
- // it's VITAL to keep the SfxSimpleHint last! It's the
base of some classes above!
- else if( rHint.GetId() == SfxHintId::Dying)
+ }
+ else if (rHint.GetId() == SfxHintId::SvxViewChanged)
+ {
+ // just check visibility
+ if (!bUpdatedBoundRectAndVisibleChildren)
{
- // edit source is dying under us, become defunc then
- try
- {
- // make edit source inaccessible
- // Note: cannot destroy it here, since we're
called from there!
- ShutdownEditSource();
- }
- catch( const uno::Exception& ) {}
+ UpdateVisibleChildren();
+ UpdateBoundRect();
+ bUpdatedBoundRectAndVisibleChildren = true;
}
}
- catch( const uno::Exception& )
+ // it's VITAL to keep the SfxSimpleHint last! It's the base of
some classes above!
+ else if( rHint.GetId() == SfxHintId::Dying)
{
- DBG_UNHANDLED_EXCEPTION("svx");
+ // edit source is dying under us, become defunc then
+ try
+ {
+ // make edit source inaccessible
+ // Note: cannot destroy it here, since we're called
from there!
+ ShutdownEditSource();
+ }
+ catch( const uno::Exception& ) {}
}
}
+ catch( const uno::Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION("svx");
+ }
}
}
+}
- void AccessibleTextHelper_Impl::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
- {
- // precondition: solar mutex locked
- DBG_TESTSOLARMUTEX();
+void AccessibleTextHelper_Impl::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
+{
+ // precondition: solar mutex locked
+ DBG_TESTSOLARMUTEX();
- // precondition: not in a recursion
- if( mbInNotify )
- return;
+ // precondition: not in a recursion
+ if( mbInNotify )
+ return;
- mbInNotify = true;
+ mbInNotify = true;
- try
+ try
+ {
+ // Process notification event, arranged in order of likelihood of
+ // occurrence to avoid unnecessary dynamic_cast. Note that
+ // SvxEditSourceHint is derived from TextHint, so has to be checked
+ // before that.
+ if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
{
- // Process notification event, arranged in order of likelihood of
- // occurrence to avoid unnecessary dynamic_cast. Note that
- // SvxEditSourceHint is derived from TextHint, so has to be checked
- // before that.
- if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
- {
- const SdrHint* pSdrHint = static_cast< const SdrHint* >(
&rHint );
- // process drawing layer events right away, if not
- // within an open EE notification frame. Otherwise,
- // event processing would be delayed until next EE
- // notification sequence.
- maEventQueue.Append( *pSdrHint );
- }
- else if (rHint.GetId() == SfxHintId::SvxViewChanged)
- {
- const SvxViewChangedHint* pViewHint = static_cast<const
SvxViewChangedHint*>(&rHint);
- // process visibility right away, if not within an
- // open EE notification frame. Otherwise, event
- // processing would be delayed until next EE
- // notification sequence.
- maEventQueue.Append( *pViewHint );
- }
- else if( const SvxEditSourceHint* pEditSourceHint =
dynamic_cast<const SvxEditSourceHint*>( &rHint ) )
- {
- // EditEngine should emit TEXT_SELECTION_CHANGED events
(#i27299#)
- maEventQueue.Append( *pEditSourceHint );
- }
- else if( const TextHint* pTextHint = dynamic_cast<const
TextHint*>( &rHint ) )
- {
- // EditEngine should emit TEXT_SELECTION_CHANGED events
(#i27299#)
- if(pTextHint->GetId() == SfxHintId::TextProcessNotifications)
- ProcessQueue();
- else
- maEventQueue.Append( *pTextHint );
- }
- // it's VITAL to keep the SfxHint last! It's the base of the
classes above!
- else if( rHint.GetId() == SfxHintId::Dying )
- {
- // handle this event _at once_, because after that, objects
are invalid
- // edit source is dying under us, become defunc then
- maEventQueue.Clear();
- try
- {
- // make edit source inaccessible
- // Note: cannot destroy it here, since we're called from
there!
- ShutdownEditSource();
- }
- catch( const uno::Exception& ) {}
- }
+ const SdrHint* pSdrHint = static_cast< const SdrHint* >( &rHint );
+ // process drawing layer events right away, if not
+ // within an open EE notification frame. Otherwise,
+ // event processing would be delayed until next EE
+ // notification sequence.
+ maEventQueue.Append( *pSdrHint );
}
- catch( const uno::Exception& )
+ else if (rHint.GetId() == SfxHintId::SvxViewChanged)
{
- DBG_UNHANDLED_EXCEPTION("svx");
- mbInNotify = false;
+ const SvxViewChangedHint* pViewHint = static_cast<const
SvxViewChangedHint*>(&rHint);
+ // process visibility right away, if not within an
+ // open EE notification frame. Otherwise, event
+ // processing would be delayed until next EE
+ // notification sequence.
+ maEventQueue.Append( *pViewHint );
}
-
- mbInNotify = false;
- }
-
- void AccessibleTextHelper_Impl::Dispose()
- {
- if( getNotifierClientId() != snNotifierClientRevoked)
+ else if( const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const
SvxEditSourceHint*>( &rHint ) )
+ {
+ // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#)
+ maEventQueue.Append( *pEditSourceHint );
+ }
+ else if( const TextHint* pTextHint = dynamic_cast<const TextHint*>(
&rHint ) )
{
+ // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#)
+ if(pTextHint->GetId() == SfxHintId::TextProcessNotifications)
+ ProcessQueue();
+ else
+ maEventQueue.Append( *pTextHint );
+ }
+ // it's VITAL to keep the SfxHint last! It's the base of the classes
above!
+ else if( rHint.GetId() == SfxHintId::Dying )
+ {
+ // handle this event _at once_, because after that, objects are
invalid
+ // edit source is dying under us, become defunc then
+ maEventQueue.Clear();
try
{
- // #106234# Unregister from EventNotifier
- ::comphelper::AccessibleEventNotifier::revokeClient(
getNotifierClientId() );
- SAL_INFO("svx", "disposed ID: " << mnNotifierClientId );
+ // make edit source inaccessible
+ // Note: cannot destroy it here, since we're called from there!
+ ShutdownEditSource();
}
catch( const uno::Exception& ) {}
-
- mnNotifierClientId = snNotifierClientRevoked;
}
+ }
+ catch( const uno::Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION("svx");
+ mbInNotify = false;
+ }
+ mbInNotify = false;
+}
+
+void AccessibleTextHelper_Impl::Dispose()
+{
+ if( getNotifierClientId() != snNotifierClientRevoked)
+ {
try
{
- // dispose children
- maParaManager.Dispose();
+ // #106234# Unregister from EventNotifier
+ ::comphelper::AccessibleEventNotifier::revokeClient(
getNotifierClientId() );
+ SAL_INFO("svx", "disposed ID: " << mnNotifierClientId );
}
catch( const uno::Exception& ) {}
- // quit listen on stale edit source
- if( maEditSource.IsValid() )
- EndListening( maEditSource.GetBroadcaster() );
-
- // clear references
- maEditSource.SetEditSource( ::std::unique_ptr< SvxEditSource >() );
- mxFrontEnd = nullptr;
+ mnNotifierClientId = snNotifierClientRevoked;
}
- void AccessibleTextHelper_Impl::FireEvent( const sal_Int16 nEventId, const
uno::Any& rNewValue, const uno::Any& rOldValue ) const
+ try
{
- // -- object locked --
- AccessibleEventObject aEvent;
- {
- std::scoped_lock aGuard(maMutex);
+ // dispose children
+ maParaManager.Dispose();
+ }
+ catch( const uno::Exception& ) {}
-e
... etc. - the rest is truncated
