mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

n#685123: Undo corrupting the document.

Browse Source
This commit is contained in:
Muthu Subramanian
2011-10-07 20:15:01 +05:30
parent 90645b9be8
commit ce285da92f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sd/source/ui/func/fuformatpaintbrush.cxx
View File

@@ -256,20 +256,26 @@ bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_
void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphFormats ) void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphFormats )
{ {
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
if(mpItemSet.get() && (rMarkList.GetMarkCount() == 1) ) if( mpItemSet.get() && ( rMarkList.GetMarkCount() == 1 ) )
{ {
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); SdrObject* pObj( NULL );
bool bUndo = mpDoc->IsUndoEnabled();
if( mpDoc->IsUndoEnabled() ) if( bUndo && !mpView->GetTextEditOutlinerView() )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
// n685123: ApplyFormatPaintBrush itself would store undo information
// except in a few cases (?)
if( pObj )
{ {
String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) ); String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) );
mpDoc->BegUndo( sLabel ); mpDoc->BegUndo( sLabel );
mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,sal_True)); mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_False, sal_True ) );
} }
mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats );
if( mpDoc->IsUndoEnabled() ) if( pObj )
{ {
mpDoc->EndUndo(); mpDoc->EndUndo();
} }