summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/editundo.cxx2
-rw-r--r--editeng/source/editeng/impedit.hxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx6
-rw-r--r--include/editeng/editeng.hxx2
5 files changed, 10 insertions, 6 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index c3bb938d900c..17152125fb60 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -740,9 +740,9 @@ void EditEngine::SetUndoMode(bool b)
pImpEditEngine->SetUndoMode(b);
}
-void EditEngine::FormatAndUpdate(EditView* pCurView)
+void EditEngine::FormatAndUpdate(EditView* pCurView, bool bCalledFromUndo)
{
- pImpEditEngine->FormatAndUpdate(pCurView);
+ pImpEditEngine->FormatAndUpdate(pCurView, bCalledFromUndo);
}
void EditEngine::Undo(EditView* pView)
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index faea53b4acea..f900867d7f5d 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -77,7 +77,7 @@ bool EditUndoManager::Undo()
aNewSel.Min() = aNewSel.Max();
mpEditEngine->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
- mpEditEngine->FormatAndUpdate( mpEditEngine->GetActiveView() );
+ mpEditEngine->FormatAndUpdate( mpEditEngine->GetActiveView(), true );
return bDone;
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 15a433901933..6cea1073f0a8 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -853,7 +853,7 @@ public:
void SetNotifyHdl( const Link<EENotify&,void>& rLink ) { aNotifyHdl = rLink; }
const Link<EENotify&,void>& GetNotifyHdl() const { return aNotifyHdl; }
- void FormatAndUpdate( EditView* pCurView = nullptr );
+ void FormatAndUpdate( EditView* pCurView = nullptr, bool bCalledFromUndo = false );
inline void IdleFormatAndUpdate( EditView* pCurView = nullptr );
svtools::ColorConfig& GetColorConfig();
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 4d8f67403d95..1e748c4c801d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4026,7 +4026,7 @@ EditSelection* ImpEditEngine::SelectParagraph( sal_Int32 nPara )
return pSel;
}
-void ImpEditEngine::FormatAndUpdate( EditView* pCurView )
+void ImpEditEngine::FormatAndUpdate( EditView* pCurView, bool bCalledFromUndo )
{
if ( bDowning )
return ;
@@ -4035,6 +4035,10 @@ void ImpEditEngine::FormatAndUpdate( EditView* pCurView )
IdleFormatAndUpdate( pCurView );
else
{
+ if (bCalledFromUndo)
+ // in order to make bullet points that have had their styles changed, redraw themselves
+ for ( sal_Int32 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+ GetParaPortions()[nPortion]->MarkInvalid( 0, 0 );
FormatDoc();
UpdateViews( pCurView );
}
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index e5b5e9465b66..382d3d40a080 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -599,7 +599,7 @@ public:
const ViewsType& GetEditViews() const;
void SetUndoMode(bool b);
- void FormatAndUpdate(EditView* pCurView = nullptr);
+ void FormatAndUpdate(EditView* pCurView = nullptr, bool bCalledFromUndo = false);
void Undo(EditView* pView);
void Redo(EditView* pView);