diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-21 11:56:30 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-21 22:13:23 +0100 |
| commit | 80cedb5dcb6a7dd6c01349b93fab49ecee5f6594 (patch) | |
| tree | 86f8532d5b3cde18e70d1cd814a842c5a93953e9 /sw/source/ui/index | |
| parent | 3103f9f9461f6eabb61a70be73862ef4be98010e (diff) | |
sw_redlinehide: adapt ToX Update
The ToX exists only once in the model, so it either has to have the
content corresponding to redlines being shown, or hidden.
Adapt Update based on current layout setting.
Change-Id: Ibf5ec092632cf3a5f513965afdb840fd8239a7fd
Reviewed-on: https://gerrit.libreoffice.org/65527
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/source/ui/index')
| -rw-r--r-- | sw/source/ui/index/multmrk.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 735927a58ff5..7cc876e1f004 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -20,6 +20,7 @@ #include <swtypes.hxx> #include <multmrk.hxx> #include <toxmgr.hxx> +#include <wrtsh.hxx> SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr) : GenericDialogController(pParent, "modules/swriter/ui/selectindexdialog.ui", "SelectIndexDialog") @@ -35,7 +36,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr) sal_uInt16 nSize = m_rMgr.GetTOXMarkCount(); for(sal_uInt16 i=0; i < nSize; ++i) - m_xTOXLB->append_text(m_rMgr.GetTOXMark(i)->GetText()); + m_xTOXLB->append_text(m_rMgr.GetTOXMark(i)->GetText(m_rMgr.GetShell()->GetLayout())); m_xTOXLB->select(0); m_xTextFT->set_label(m_rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index db0a9f85e6d7..b30f5769710d 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -397,13 +397,14 @@ void SwIndexMarkPane::InsertUpdate() InsertMark(); if ( m_pTOXMgr->GetCurTOXMark()) - aRewriter.AddRule(UndoArg1, m_pTOXMgr->GetCurTOXMark()->GetText()); + aRewriter.AddRule(UndoArg1, + m_pTOXMgr->GetCurTOXMark()->GetText(m_pSh->GetLayout())); } else if( !m_pSh->HasReadonlySel() ) { if ( m_pTOXMgr->GetCurTOXMark()) aRewriter.AddRule(UndoArg1, - m_pTOXMgr->GetCurTOXMark()->GetText()); + m_pTOXMgr->GetCurTOXMark()->GetText(m_pSh->GetLayout())); if( m_bDel ) m_pTOXMgr->DeleteTOXMark(); @@ -761,7 +762,7 @@ void SwIndexMarkPane::UpdateDialog() SwViewShell::SetCareDialog(m_xDialog); - m_aOrgStr = pMark->GetText(); + m_aOrgStr = pMark->GetText(m_pSh->GetLayout()); m_xEntryED->set_text(m_aOrgStr); // set index type @@ -779,7 +780,7 @@ void SwIndexMarkPane::UpdateDialog() bKeyEnable = true; bKey1HasText = bKey2Enable = !pMark->GetPrimaryKey().isEmpty(); bKey2HasText = !pMark->GetSecondaryKey().isEmpty(); - bEntryHasText = !pMark->GetText().isEmpty(); + bEntryHasText = !pMark->GetText(m_pSh->GetLayout()).isEmpty(); m_xKey1DCB->set_entry_text( pMark->GetPrimaryKey() ); m_xKey2DCB->set_entry_text( pMark->GetSecondaryKey() ); m_xPhoneticED0->set_text( pMark->GetTextReading() ); |