diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 13:01:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 13:01:07 +0000 |
| commit | 64b6a876ce6660cf61b86de22c11194475974b21 (patch) | |
| tree | 815ee843870113eb691604b000adc93721895844 /sw/source/core/txtnode/ndtxt.cxx | |
| parent | 5829300d4fe7d21d312992b9cb25e8db9c9d285b (diff) | |
INTEGRATION: CWS notes3 (1.74.154); FILE MERGED
2008/03/13 10:42:54 mba 1.74.154.2: RESYNC: (1.74-1.78); FILE MERGED
2008/02/22 21:00:46 mod 1.74.154.1: move focus stuff to SetActivePostit, fix for undo related bugs
Diffstat (limited to 'sw/source/core/txtnode/ndtxt.cxx')
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index c963ce9974..d782132249 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ndtxt.cxx,v $ - * $Revision: 1.80 $ + * $Revision: 1.81 $ * * This file is part of OpenOffice.org. * @@ -95,6 +95,7 @@ #include <numrule.hxx> #include <swtable.hxx> +#include <docsh.hxx> SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 ) @@ -2018,6 +2019,9 @@ void SwTxtNode::_Cut( SwTxtNode *pDest, const SwIndex& rDestStart, ( !pOtherDoc && !bUndoNodes && RES_TXTATR_REFMARK == nWhich ) ) { + // do not delete note and later add it -> sidebar flickering + if ( GetDoc()->GetDocShell() ) + GetDoc()->GetDocShell()->Broadcast( SfxSimpleHint(SFX_HINT_USER04)); // Attribut verschieben pSwpHints->Delete( pHt ); // die Start/End Indicies neu setzen @@ -2029,6 +2033,8 @@ void SwTxtNode::_Cut( SwTxtNode *pDest, const SwIndex& rDestStart, ? nLen : *pEndIdx - nTxtStartIdx ); pDest->Insert( pHt, nsSetAttrMode::SETATTR_NOTXTATRCHR | nsSetAttrMode::SETATTR_DONTREPLACE ); + if ( GetDoc()->GetDocShell() ) + GetDoc()->GetDocShell()->Broadcast( SfxSimpleHint(SFX_HINT_USER04)); continue; // while-Schleife weiter, ohne ++ ! } // das Ende liegt dahinter |