diff options
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/xml/xmltxtimp.cxx | 5 | ||||
| -rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 14 |
3 files changed, 18 insertions, 7 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 } }; diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index cfcf3241e2b9..ff379531338f 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -24,6 +24,7 @@ #include <editeng/editids.hrc> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> +#include <editeng/numitem.hxx> #include <editeng/outliner.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/outlobj.hxx> @@ -1424,8 +1425,9 @@ void SdTiledRenderingTest::testTdf103083() SdrOutliner* pOutliner = pView->GetTextEditOutliner(); CPPUNIT_ASSERT_EQUAL(OUString("No-Logo Content~LT~Gliederung 2"), pOutliner->GetStyleSheet(2)->GetName()); - const SfxItemSet& rParagraphItemSet1 = pTextObject->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(2); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(3), rParagraphItemSet1.Count()); + const EditTextObject& aEdit = pTextObject->GetOutlinerParaObject()->GetTextObject(); + const SvxNumBulletItem* pNumFmt = aEdit.GetParaAttribs(2).GetItem(EE_PARA_NUMBULLET); + SvxNumberFormat aNumFmt(pNumFmt->GetNumRule()->GetLevel(2)); // cut contents of bullet item comphelper::dispatchCommand(".uno:Cut", uno::Sequence<beans::PropertyValue>()); @@ -1452,8 +1454,12 @@ void SdTiledRenderingTest::testTdf103083() CPPUNIT_ASSERT_EQUAL(OUString("No-Logo Content~LT~Gliederung 2"), pOutliner->GetStyleSheet(2)->GetName()); - const SfxItemSet& rParagraphItemSet2 = pTextObject->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(2); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(3), rParagraphItemSet2.Count()); + const EditTextObject& aEdit2 = pTextObject->GetOutlinerParaObject()->GetTextObject(); + const SvxNumBulletItem* pNumFmt2 = aEdit2.GetParaAttribs(2).GetItem(EE_PARA_NUMBULLET); + SvxNumberFormat aNumFmt2(pNumFmt2->GetNumRule()->GetLevel(2)); + + bool bEqual(aNumFmt2 == aNumFmt); + CPPUNIT_ASSERT_MESSAGE("Bullet properties changed after paste", bEqual); } /** |