Kaydet (Commit) 612e8f05 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

Qt5 actually return the selection

This broke my Windows build with interesting error messages:

Qt5AccessibleWidget.cxx(772): error C2440: "=": "sal_Int32 *"
kann nicht in "int *" konvertiert werden

Qt5AccessibleWidget.cxx(772): note: Die Typen, auf die verwiesen
wird, sind nicht verknuepft; die Konvertierung erfordert einen
reinterpret_cast-Operator oder eine Typumwandlung im C- oder
Funktionsformat.

Same for line 774.

So actually return the selection parts depending on the provided
int pointers.

Change-Id: Iffbe4481883450b9dacefa867ba7035861d62cdf
Reviewed-on: https://gerrit.libreoffice.org/62635Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Jenkins
Reviewed-by: 's avatarJan-Marek Glogowski <glogow@fbihome.de>
üst 996d7f36
...@@ -761,18 +761,22 @@ void Qt5AccessibleWidget::scrollToSubstring(int /* startIndex */, int /* endInde ...@@ -761,18 +761,22 @@ void Qt5AccessibleWidget::scrollToSubstring(int /* startIndex */, int /* endInde
{ {
SAL_INFO("vcl.qt5", "Unsupported QAccessibleTextInterface::scrollToSubstring"); SAL_INFO("vcl.qt5", "Unsupported QAccessibleTextInterface::scrollToSubstring");
} }
void Qt5AccessibleWidget::selection(int /* selectionIndex */, int* startOffset,
int* endOffset) const void Qt5AccessibleWidget::selection(int selectionIndex, int* startOffset, int* endOffset) const
{ {
Reference<XAccessibleText> xText(m_xAccessible, UNO_QUERY); if (!startOffset && !endOffset)
if (!xText.is())
return; return;
sal_Int32 nStart = xText->getSelectionStart(); Reference<XAccessibleText> xText;
startOffset = &nStart; if (selectionIndex == 0)
sal_Int32 nEnd = xText->getSelectionEnd(); xText = Reference<XAccessibleText>(m_xAccessible, UNO_QUERY);
endOffset = &nEnd;
if (startOffset)
*startOffset = xText.is() ? xText->getSelectionStart() : 0;
if (endOffset)
*endOffset = xText.is() ? xText->getSelectionEnd() : 0;
} }
int Qt5AccessibleWidget::selectionCount() const int Qt5AccessibleWidget::selectionCount() const
{ {
Reference<XAccessibleText> xText(m_xAccessible, UNO_QUERY); Reference<XAccessibleText> xText(m_xAccessible, UNO_QUERY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment