strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lok: formulabar: fix URL fields selection

Browse source 
field is calculated as 1 character by selection getter
let's unfold fields and send real length

Change-Id: I557f8785a4d2ee6a41c6c95f4551f5e104a58c02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146350
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146574
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos 2023-01-25 14:39:34 +01:00
parent 887b2eb458
commit ec93446f70
5 changed files with 79 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
editeng/source/editeng/editview.cxx
View file

@ -1394,6 +1394,53 @@ const SvxFieldData* EditView::GetFieldAtCursor() const
return pFieldItem ? pFieldItem->GetField() : nullptr;
}
sal_Int32 EditView::countFieldsOffsetSum(sal_Int32 nPara, sal_Int32 nPos, bool bCanOverflow) const
{
if (!pImpEditView || !pImpEditView->pEditEngine)
return 0;
int nOffset = 0;
for (int nCurrentPara = 0; nCurrentPara <= nPara; nCurrentPara++)
{
int nFields = pImpEditView->pEditEngine->GetFieldCount( nCurrentPara );
for (int nField = 0; nField < nFields; nField++)
{
EFieldInfo aFieldInfo
= pImpEditView->pEditEngine->GetFieldInfo( nCurrentPara, nField );
bool bLastPara = nCurrentPara == nPara;
sal_Int32 nFieldPos = aFieldInfo.aPosition.nIndex;
if (bLastPara && nFieldPos >= nPos)
break;
sal_Int32 nFieldLen = aFieldInfo.aCurrentText.getLength();
// position in the middle of a field
if (!bCanOverflow && bLastPara && nFieldPos + nFieldLen > nPos)
nFieldLen = nPos - nFieldPos;
nOffset += nFieldLen - 1;
}
}
return nOffset;
}
sal_Int32 EditView::GetPosNoField(sal_Int32 nPara, sal_Int32 nPos) const
{
sal_Int32 nOffset = countFieldsOffsetSum(nPara, nPos, false);
assert(nPos >= nOffset);
return nPos - nOffset;
}
sal_Int32 EditView::GetPosWithField(sal_Int32 nPara, sal_Int32 nPos) const
{
sal_Int32 nOffset = countFieldsOffsetSum(nPara, nPos, true);
return nPos + nOffset;
}
void EditView::SetInvalidateMore( sal_uInt16 nPixel )
{
pImpEditView->SetInvalidateMore( nPixel );

8
include/editeng/editview.hxx
View file

@ -160,6 +160,10 @@ private:
EditView( const EditView& ) = delete;
EditView& operator=( const EditView& ) = delete;
// counts how many characters take unfolded fields
// bCanOverflow - count field length without trim to the selected pos
sal_Int32 countFieldsOffsetSum(sal_Int32 nPara, sal_Int32 nPo, bool bCanOverflow) const;
public:
EditView( EditEngine* pEng, vcl::Window* pWindow );
~EditView();
@ -316,6 +320,10 @@ public:
/// Select and return the field at the current cursor position
const SvxFieldData* GetFieldAtCursor() const;
void SelectFieldAtCursor();
/// Converts position in paragraph to logical position without unfolding fields
sal_Int32 GetPosNoField(sal_Int32 nPara, sal_Int32 nPos) const;
/// Converts logical position in paragraph to position with unfolded fields
sal_Int32 GetPosWithField(sal_Int32 nPara, sal_Int32 nPos) const;
void SetInvalidateMore( sal_uInt16 nPixel );
sal_uInt16 GetInvalidateMore() const;

24
sc/source/ui/app/inputhdl.cxx
View file

@ -1781,13 +1781,23 @@ void ScInputHandler::LOKPasteFunctionData(const OUString& rFunctionName)
}
}
void ScInputHandler::LOKSendFormulabarUpdate(const SfxViewShell* pActiveViewSh,
void ScInputHandler::LOKSendFormulabarUpdate(EditView* pActiveView,
const SfxViewShell* pActiveViewSh,
const OUString& rText,
const ESelection& rSelection)
{
OUString aSelection =
OUString::number(rSelection.nStartPos) + ";" + OUString::number(rSelection.nEndPos) + ";" +
OUString::number(rSelection.nStartPara) + ";" + OUString::number(rSelection.nEndPara);
OUString aSelection;
if (pActiveView)
{
aSelection = OUString::number(pActiveView->GetPosWithField(0, rSelection.nStartPos)) + ";" +
OUString::number(pActiveView->GetPosWithField(0, rSelection.nEndPos)) + ";" +
OUString::number(rSelection.nStartPara) + ";" + OUString::number(rSelection.nEndPara);
}
else
{
aSelection = OUString::number(rSelection.nStartPos) + ";" + OUString::number(rSelection.nEndPos) + ";" +
OUString::number(rSelection.nStartPara) + ";" + OUString::number(rSelection.nEndPara);
}
std::unique_ptr<jsdialog::ActionDataMap> pData = std::make_unique<jsdialog::ActionDataMap>();
(*pData)["action_type"] = "setText";
@ -2775,7 +2785,7 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, bool bSetModified )
if (pActiveView)
aSel = pActiveView->GetSelection();
ScInputHandler::LOKSendFormulabarUpdate(pActiveViewSh,
ScInputHandler::LOKSendFormulabarUpdate(pActiveView, pActiveViewSh,
ScEditUtil::GetMultilineString(*mpEditEngine),
aSel);
}
@ -4248,7 +4258,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if (aSel.nEndPara == EE_PARA_NOT_FOUND)
aSel.nEndPara = 0;
ScInputHandler::LOKSendFormulabarUpdate(pActiveViewSh, aString, aSel);
ScInputHandler::LOKSendFormulabarUpdate(pActiveView, pActiveViewSh, aString, aSel);
// TODO: deprecated?
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
}
@ -4412,7 +4422,7 @@ void ScInputHandler::InputSelection( const EditView* pView )
{
EditView* pActiveView = pTopView ? pTopView : pTableView;
ESelection aSel = pActiveView ? pActiveView->GetSelection() : ESelection();
ScInputHandler::LOKSendFormulabarUpdate(pActiveViewSh, GetEditString(), aSel);
ScInputHandler::LOKSendFormulabarUpdate(pActiveView, pActiveViewSh, GetEditString(), aSel);
}
}

10
sc/source/ui/app/inputwin.cxx
View file

@ -1149,7 +1149,7 @@ ScTextWndGroup::ScTextWndGroup(ScInputBarGroup& rParent, ScTabViewShell* pViewSh
{
mxScrollWin->connect_vadjustment_changed(LINK(this, ScTextWndGroup, Impl_ScrollHdl));
if (comphelper::LibreOfficeKit::isActive())
ScInputHandler::LOKSendFormulabarUpdate(SfxViewShell::Current(), "", ESelection());
ScInputHandler::LOKSendFormulabarUpdate(nullptr, SfxViewShell::Current(), "", ESelection());
}
Point ScTextWndGroup::GetCursorScreenPixelPos(bool bBelow)
@ -1816,8 +1816,10 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt )
{
nParaStart = pParaPoint ? pParaPoint->X() : 0;
nParaEnd = pParaPoint ? pParaPoint->Y() : 0;
nPosStart = aSelectionStartEnd.X();
nPosEnd = aSelectionStartEnd.Y();
nPosStart = m_xEditView->GetPosNoField(nParaStart, aSelectionStartEnd.X());
nPosEnd = m_xEditView->GetPosNoField(nParaEnd, aSelectionStartEnd.Y());
}
m_xEditView->SetSelection(ESelection(nParaStart, nPosStart, nParaEnd, nPosEnd));
@ -2059,7 +2061,7 @@ void ScTextWnd::SetTextString( const OUString& rNewString )
if (comphelper::LibreOfficeKit::isActive())
{
ESelection aSel = m_xEditView ? m_xEditView->GetSelection() : ESelection();
ScInputHandler::LOKSendFormulabarUpdate(SfxViewShell::Current(), rNewString, aSel);
ScInputHandler::LOKSendFormulabarUpdate(m_xEditView.get(), SfxViewShell::Current(), rNewString, aSel);
}
SetScrollBarRange();

2
sc/source/ui/inc/inputhdl.hxx
View file

@ -295,7 +295,7 @@ public:
tools::Long nTab, const Color& rColor );
void LOKPasteFunctionData(const OUString& rFunctionName);
static void LOKSendFormulabarUpdate(const SfxViewShell* pActiveViewSh,
static void LOKSendFormulabarUpdate(EditView* pEditView, const SfxViewShell* pActiveViewSh,
const OUString& rText, const ESelection& rSelection);
};