diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2020-01-17 14:30:56 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-01-24 11:02:29 +0100 |
| commit | 9699108e60698355054d68a3da5a3e84913248cf (patch) | |
| tree | 663ee4be3f2a0e94e52b57200fdd5462b33fd033 /editeng | |
| parent | 5053f01bfebebd5a0f00e0f1c27d4868fbe2e6a0 (diff) | |
tdf#128046: preserve list levels on paste
done in two steps:
1) bullet and numbering properties must be included in the property
list of SvxUnoText on import from ODF clipboard (SvxReadXML)
2) in ConnectParagraphs, don't merge para attributes if the paragraph
to be deleted is empty. Paragraph breaks are inserted before paste so
this would make the last list level of the pasted text take the properties
of the empty paragraph and thus lose its indentation
Also updated tdf#103083 unit test to be more specific and test that
bullet properties don't get lost after paste. Previously only count
of SfxItems was tested which is somehow fragile and fails bc paste
adds a paragraph style
Change-Id: Ia162adb7abf145a8217f21c7ebfe06b69731e2a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86983
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 66ed51712bb323bba7d1a0b0d21b256e5f5f9ccf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87284
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/xml/xmltxtimp.cxx | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index c65dc164ea4a..c92cbe85cf98 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2251,7 +2251,9 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR if ( bBackward ) { pLeft->SetStyleSheet( pRight->GetStyleSheet() ); - pLeft->GetContentAttribs().GetItems().Set( pRight->GetContentAttribs().GetItems() ); + // it feels wrong to set pLeft's attribs if pRight is empty, tdf#128046 + if ( pRight->Len() ) + pLeft->GetContentAttribs().GetItems().Set( pRight->GetContentAttribs().GetItems() ); pLeft->GetCharAttribs().GetDefFont() = pRight->GetCharAttribs().GetDefFont(); } @@ -3508,7 +3510,7 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable( std::filebuf afilebuf; afilebuf.open ("gsoc17_clipboard_test.xml",std::ios::out); std::ostream os(&afilebuf); - os.write((const char*)(pDataObj->GetODFStream().GetBuffer()), pDataObj->GetODFStream().remainingSize()); + os.write((const char*)(pDataObj->GetODFStream().GetData()), pDataObj->GetODFStream().remainingSize()); afilebuf.close(); */ //dumping ends diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 51994a323080..7a6b0b494786 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -147,7 +147,10 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, -// SVX_UNOEDIT_OUTLINER_PROPERTIES, +// bullets & numbering props, tdf#128046 + { OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, { OUString(), 0, css::uno::Type(), 0, 0 } }; |