- rely annotations on text ranges on new annotation marks - support arbitrary text ranges for annotations - fix undo/redo regarding annotations an text ranges - support annotations on overlapping text ranges - fix *.docx import for annotations on overlapping text ranges - fix ODF import of annotations on text ranges cherry-picked from branch ooxml-osba (cherry picked from commit ebd2922ebd3cf2d3899fb80780d38f367197aadf) Conflicts: sw/Library_sw.mk sw/inc/IDocumentMarkAccess.hxx sw/inc/SidebarWin.hxx sw/inc/doc.hxx sw/inc/docufld.hxx sw/inc/hintids.hxx sw/inc/ndhints.hxx sw/inc/txatbase.hxx sw/inc/unobookmark.hxx sw/inc/unofield.hxx sw/inc/unoport.hxx sw/source/core/access/accpara.cxx sw/source/core/bastyp/init.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/crsr/findtxt.cxx sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/docbm.cxx sw/source/core/doc/doccorr.cxx sw/source/core/doc/docdde.cxx sw/source/core/doc/docedt.cxx sw/source/core/doc/docfld.cxx sw/source/core/doc/doclay.cxx sw/source/core/doc/tblrwcl.cxx sw/source/core/docnode/ndcopy.cxx sw/source/core/docnode/nodes.cxx sw/source/core/docnode/section.cxx sw/source/core/edit/edfld.cxx sw/source/core/fields/docufld.cxx sw/source/core/fields/postithelper.cxx sw/source/core/fields/reffld.cxx sw/source/core/inc/MarkManager.hxx sw/source/core/inc/crossrefbookmark.hxx sw/source/core/text/inftxt.cxx sw/source/core/text/itratr.cxx sw/source/core/text/txtfrm.cxx sw/source/core/txtnode/atrfld.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/undo/undel.cxx sw/source/core/undo/undobj.cxx sw/source/core/unocore/unofield.cxx sw/source/core/unocore/unoport.cxx sw/source/core/unocore/unoportenum.cxx sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlgrin.cxx sw/source/filter/html/wrthtml.cxx sw/source/filter/writer/writer.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/ww8par.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/dochdl/swdtflvr.cxx sw/source/ui/docvw/PostItMgr.cxx sw/source/ui/docvw/SidebarWin.cxx sw/source/ui/fldui/fldmgr.cxx sw/source/ui/fldui/fldref.cxx sw/source/ui/inc/fldmgr.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textfld.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/navipi.cxx sw/source/ui/wrtsh/wrtsh2.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx xmloff/inc/txtfldi.hxx xmloff/source/text/txtfldi.cxx xmloff/source/text/txtparae.cxx Change-Id: Ie4cc467dbb837054c73742262ee20f35c151ff3f
108 lines
3.8 KiB
C++
108 lines
3.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
|
|
#define INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
|
|
|
|
#include <undobj.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <tools/mempool.hxx>
|
|
|
|
class SwRedlineSaveDatas;
|
|
class SwTxtNode;
|
|
|
|
namespace sfx2 {
|
|
class MetadatableUndo;
|
|
}
|
|
|
|
class SwUndoDelete
|
|
: public SwUndo
|
|
, private SwUndRng
|
|
, private SwUndoSaveCntnt
|
|
{
|
|
SwNodeIndex* pMvStt; // Position of Nodes in UndoNodes-Array
|
|
OUString *pSttStr, *pEndStr;
|
|
SwRedlineData* pRedlData;
|
|
SwRedlineSaveDatas* pRedlSaveData;
|
|
::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
|
|
::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
|
|
|
|
OUString sTableName;
|
|
|
|
sal_uLong nNode;
|
|
sal_uLong nNdDiff; // difference of Nodes before/after Delete
|
|
sal_uLong nSectDiff; // diff. of Nodes before/after Move w/ SectionNodes
|
|
sal_uLong nReplaceDummy; // diff. to a temporary dummy object
|
|
sal_uInt16 nSetPos;
|
|
|
|
sal_Bool bGroup : 1; // TRUE: is already Grouped; see CanGrouping()
|
|
sal_Bool bBackSp : 1; // TRUE: if Grouped and preceding content deleted
|
|
sal_Bool bJoinNext: 1; // TRUE: if range is selected forwards
|
|
sal_Bool bTblDelLastNd : 1; // TRUE: TextNode following Table inserted/deleted
|
|
sal_Bool bDelFullPara : 1; // TRUE: entire Nodes were deleted
|
|
sal_Bool bResetPgDesc : 1; // TRUE: reset PgDsc on following node
|
|
sal_Bool bResetPgBrk : 1; // TRUE: reset PgBreak on following node
|
|
sal_Bool bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
|
|
|
|
sal_Bool SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
|
|
SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd );
|
|
|
|
public:
|
|
SwUndoDelete(
|
|
SwPaM&,
|
|
sal_Bool bFullPara = sal_False,
|
|
sal_Bool bCalledByTblCpy = sal_False );
|
|
virtual ~SwUndoDelete();
|
|
|
|
virtual void UndoImpl( ::sw::UndoRedoContext & );
|
|
virtual void RedoImpl( ::sw::UndoRedoContext & );
|
|
virtual void RepeatImpl( ::sw::RepeatContext & );
|
|
/**
|
|
Returns rewriter for this undo object.
|
|
|
|
The rewriter consists of the following rule:
|
|
|
|
$1 -> '<deleted text>'
|
|
|
|
<deleted text> is shortened to nUndoStringLength characters.
|
|
|
|
@return rewriter for this undo object
|
|
*/
|
|
virtual SwRewriter GetRewriter() const;
|
|
|
|
sal_Bool CanGrouping( SwDoc*, const SwPaM& );
|
|
|
|
void SetTblDelLastNd() { bTblDelLastNd = sal_True; }
|
|
|
|
// for PageDesc/PageBreak Attributes of a table
|
|
void SetPgBrkFlags( sal_Bool bPageBreak, sal_Bool bPageDesc )
|
|
{ bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
|
|
|
|
void SetTableName(const OUString & rName);
|
|
|
|
// SwUndoTblCpyTbl needs this information:
|
|
sal_Bool IsDelFullPara() const { return bDelFullPara; }
|
|
|
|
DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
|
|
};
|
|
|
|
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|