commit f09596c9dfa627f51c431dd32ae5953d55b867ee
author Xisco Fauli <xiscofauli@libreoffice.org> Mon Sep 13 19:06:30 2021 +0200
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Sep 14 13:25:56 2021 +0200
tree 3779338e04c0c80ac9cb4969125acdd2f2c9fcba
parent f481c2c8e74bded11fac754e493560391229dbcd

tdf#143854: Revert "tdf#57585 Add new bullet behaviour to impress"

This reverts commit 070a5b039b181c380b1b9724a015314ff78c30ed.

Reason for revert: Many PPT files are affected when saved to ODP.
I waited a while before reverting it but not reaction from the
developer

Change-Id: Ibfd2f508930e1a3ef56961536454ea1eda55f8c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122061
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

editeng/source/editeng/editdoc.cxx

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index b6269bb..5f6505b 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2259,9 +2259,6 @@
    // for a new paragraph we like to have the bullet/numbering visible by default
    aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE, true) );

    if(aPaM.GetNode()->Len() == 0)
        aPaM.GetNode()->GetContentAttribs().GetItems().Put( SfxBoolItem(EE_PARA_BULLETSTATE, false));

    // ContentNode constructor copies also the paragraph attributes
    ContentNode* pNode = new ContentNode( aStr, aContentAttribs );

@@ -2311,11 +2308,6 @@
EditPaM EditDoc::ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight )
{
    const EditPaM aPaM( pLeft, pLeft->Len() );
    if(pLeft->Len()==0)
    {
        EditPaM aCopyPaM(aPaM);
        aCopyPaM.GetNode()->GetContentAttribs().GetItems().Put( SfxBoolItem(EE_PARA_BULLETSTATE, true));
    }

    // First the attributes, otherwise nLen will not be correct!
    pLeft->AppendAttribs( pRight );

editeng/source/outliner/outliner.cxx

diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d23d598..937d1d7 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -858,8 +858,6 @@
    aBulletFont.SetOrientation( Degree10(bVertical ? (IsTopToBottom() ? 2700 : 900) : 0) );

    Color aColor( COL_AUTO );
    OUString sText = GetText(GetParagraph(nPara));

    if( !pEditEngine->IsFlatMode() && !( pEditEngine->GetControlWord() & EEControlBits::NOCOLORS ) )
    {
        aColor = pFmt->GetBulletColor();
@@ -868,12 +866,6 @@
    if ( ( aColor == COL_AUTO ) || ( IsForceAutoColor() ) )
        aColor = pEditEngine->GetAutoColor();

    if( sText.getLength()>0)
        aColor.SetAlpha(255);

    else
        aColor.SetAlpha(95);

    aBulletFont.SetColor( aColor );
    return aBulletFont;
}