2010-10-14 08:30:41 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2000-09-18 23:08:29 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2008-04-10 15:07:05 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2010-02-12 15:01:35 +01:00
|
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:07:05 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:07:05 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:07:05 +00:00
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:07:05 +00:00
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:07:05 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
* for a copy of the LGPLv3 License.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
|
|
|
************************************************************************/
|
2006-09-16 20:51:37 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-15 09:14:15 +01:00
|
|
|
#include <UndoDraw.hxx>
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <rtl/string.h>
|
|
|
|
|
|
|
|
#include <svx/svdogrp.hxx>
|
|
|
|
#include <svx/svdundo.hxx>
|
|
|
|
#include <svx/svdpage.hxx>
|
|
|
|
#include <svx/svdmark.hxx>
|
2010-12-15 09:14:15 +01:00
|
|
|
|
|
|
|
#include <hintids.hxx>
|
2010-12-15 09:14:15 +01:00
|
|
|
#include <hints.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <fmtanchr.hxx>
|
|
|
|
#include <fmtflcnt.hxx>
|
|
|
|
#include <txtflcnt.hxx>
|
|
|
|
#include <frmfmt.hxx>
|
|
|
|
#include <doc.hxx>
|
2010-11-25 14:31:08 +01:00
|
|
|
#include <IDocumentUndoRedo.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <docary.hxx>
|
|
|
|
#include <frame.hxx>
|
|
|
|
#include <swundo.hxx> // fuer die UndoIds
|
|
|
|
#include <pam.hxx>
|
|
|
|
#include <ndtxt.hxx>
|
2010-12-15 09:14:14 +01:00
|
|
|
#include <UndoCore.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <dcontact.hxx>
|
|
|
|
#include <dview.hxx>
|
|
|
|
#include <rootfrm.hxx>
|
|
|
|
#include <viewsh.hxx>
|
|
|
|
|
2010-01-05 16:37:41 +01:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
struct SwUndoGroupObjImpl
|
|
|
|
{
|
|
|
|
SwDrawFrmFmt* pFmt;
|
|
|
|
SdrObject* pObj;
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uLong nNodeIdx;
|
2000-09-18 23:08:29 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
// Draw-Objecte
|
|
|
|
|
|
|
|
IMPL_LINK( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo )
|
|
|
|
{
|
2003-04-15 15:57:56 +00:00
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nId = pUndo->GetId();
|
2007-09-27 08:31:17 +00:00
|
|
|
(void)nId;
|
2000-09-18 23:08:29 +00:00
|
|
|
String sComment( pUndo->GetComment() );
|
|
|
|
#endif
|
|
|
|
|
2010-11-25 14:31:08 +01:00
|
|
|
if (GetIDocumentUndoRedo().DoesUndo() &&
|
2010-11-25 14:31:11 +01:00
|
|
|
GetIDocumentUndoRedo().DoesDrawUndo())
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SdrMarkList* pMarkList = 0;
|
2010-12-17 09:02:23 +01:00
|
|
|
ViewShell* pSh = GetCurrentViewShell();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pSh && pSh->HasDrawView() )
|
2004-07-12 14:48:35 +00:00
|
|
|
pMarkList = &pSh->GetDrawView()->GetMarkedObjectList();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-11-25 14:31:08 +01:00
|
|
|
GetIDocumentUndoRedo().AppendUndo( new SwSdrUndo(pUndo, pMarkList) );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
delete pUndo;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
SwSdrUndo::SwSdrUndo( SdrUndoAction* pUndo, const SdrMarkList* pMrkLst )
|
|
|
|
: SwUndo( UNDO_DRAWUNDO ), pSdrUndo( pUndo )
|
|
|
|
{
|
|
|
|
if( pMrkLst && pMrkLst->GetMarkCount() )
|
|
|
|
pMarkList = new SdrMarkList( *pMrkLst );
|
|
|
|
else
|
|
|
|
pMarkList = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
SwSdrUndo::~SwSdrUndo()
|
|
|
|
{
|
|
|
|
delete pSdrUndo;
|
|
|
|
delete pMarkList;
|
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwSdrUndo::UndoImpl(::sw::UndoRedoContext & rContext)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pSdrUndo->Undo();
|
2010-12-15 09:14:11 +01:00
|
|
|
rContext.SetSelections(0, pMarkList);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwSdrUndo::RedoImpl(::sw::UndoRedoContext & rContext)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pSdrUndo->Redo();
|
2010-12-15 09:14:11 +01:00
|
|
|
rContext.SetSelections(0, pMarkList);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2012-05-14 08:34:58 +01:00
|
|
|
rtl::OUString SwSdrUndo::GetComment() const
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
return pSdrUndo->GetComment();
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------
|
|
|
|
|
2012-10-12 16:49:40 +02:00
|
|
|
static void lcl_SendRemoveToUno( SwFmt& rFmt )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &rFmt );
|
2010-12-17 09:02:23 +01:00
|
|
|
rFmt.ModifyNotification( &aMsgHint, &aMsgHint );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2012-10-12 16:49:40 +02:00
|
|
|
static void lcl_SaveAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
|
2010-01-05 16:37:41 +01:00
|
|
|
if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AT_FLY == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AS_CHAR == rAnchor.GetAnchorId()))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
rNodePos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
|
|
|
|
xub_StrLen nCntntPos = 0;
|
|
|
|
|
2010-01-05 16:37:41 +01:00
|
|
|
if (FLY_AS_CHAR == rAnchor.GetAnchorId())
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// destroy TextAttribute
|
2000-09-18 23:08:29 +00:00
|
|
|
SwTxtNode *pTxtNd = pFmt->GetDoc()->GetNodes()[ rNodePos ]->GetTxtNode();
|
2011-03-23 17:00:12 +01:00
|
|
|
OSL_ENSURE( pTxtNd, "No text node found!" );
|
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
|
|
|
SwTxtFlyCnt* pAttr = static_cast<SwTxtFlyCnt*>(
|
|
|
|
pTxtNd->GetTxtAttrForCharAt( nCntntPos, RES_TXTATR_FLYCNT ));
|
2010-12-17 09:02:23 +01:00
|
|
|
// attribute still in text node, delete
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pAttr && pAttr->GetFlyCnt().GetFrmFmt() == pFmt )
|
|
|
|
{
|
2010-12-17 09:02:23 +01:00
|
|
|
// just set pointer to 0, don't delete
|
2000-09-18 23:08:29 +00:00
|
|
|
((SwFmtFlyCnt&)pAttr->GetFlyCnt()).SetFlyFmt();
|
|
|
|
SwIndex aIdx( pTxtNd, nCntntPos );
|
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
|
|
|
pTxtNd->EraseText( aIdx, 1 );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2010-01-05 16:37:41 +01:00
|
|
|
else if (FLY_AT_CHAR == rAnchor.GetAnchorId())
|
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
|
2010-01-05 16:37:41 +01:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2008-06-13 09:28:29 +00:00
|
|
|
pFmt->SetFmtAttr( SwFmtAnchor( rAnchor.GetAnchorId(), nCntntPos ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-12 16:49:40 +02:00
|
|
|
static void lcl_RestoreAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
|
2010-01-05 16:37:41 +01:00
|
|
|
if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AT_FLY == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AS_CHAR == rAnchor.GetAnchorId()))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
xub_StrLen nCntntPos = rAnchor.GetPageNum();
|
|
|
|
SwNodes& rNds = pFmt->GetDoc()->GetNodes();
|
|
|
|
|
|
|
|
SwNodeIndex aIdx( rNds, rNodePos );
|
|
|
|
SwPosition aPos( aIdx );
|
|
|
|
|
|
|
|
SwFmtAnchor aTmp( rAnchor.GetAnchorId() );
|
2010-01-05 16:37:41 +01:00
|
|
|
if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) ||
|
|
|
|
(FLY_AT_CHAR == rAnchor.GetAnchorId()))
|
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
aPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), nCntntPos );
|
2010-01-05 16:37:41 +01:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
aTmp.SetAnchor( &aPos );
|
2008-06-13 09:28:29 +00:00
|
|
|
pFmt->SetFmtAttr( aTmp );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-01-05 16:37:41 +01:00
|
|
|
if (FLY_AS_CHAR == rAnchor.GetAnchorId())
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pTxtNd, "no Text Node" );
|
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
|
|
|
SwFmtFlyCnt aFmt( pFmt );
|
|
|
|
pTxtNd->InsertItem( aFmt, nCntntPos, nCntntPos );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
SwUndoDrawGroup::SwUndoDrawGroup( sal_uInt16 nCnt )
|
|
|
|
: SwUndo( UNDO_DRAWGROUP ), nSize( nCnt + 1 ), bDelFmt( sal_True )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pObjArr = new SwUndoGroupObjImpl[ nSize ];
|
|
|
|
}
|
|
|
|
|
|
|
|
SwUndoDrawGroup::~SwUndoDrawGroup()
|
|
|
|
{
|
|
|
|
if( bDelFmt )
|
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl* pTmp = pObjArr + 1;
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 1; n < nSize; ++n, ++pTmp )
|
2000-09-18 23:08:29 +00:00
|
|
|
delete pTmp->pFmt;
|
|
|
|
}
|
|
|
|
else
|
2010-12-17 09:02:23 +01:00
|
|
|
delete pObjArr->pFmt;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2004-02-04 13:09:37 +00:00
|
|
|
delete [] pObjArr;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bDelFmt = sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// save group object
|
2000-09-18 23:08:29 +00:00
|
|
|
SwDrawFrmFmt* pFmt = pObjArr->pFmt;
|
2007-09-27 08:31:17 +00:00
|
|
|
SwDrawContact* pDrawContact = (SwDrawContact*)pFmt->FindContactObj();
|
|
|
|
SdrObject* pObj = pDrawContact->GetMaster();
|
2000-09-18 23:08:29 +00:00
|
|
|
pObjArr->pObj = pObj;
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// object will destroy itself
|
2007-09-27 08:31:17 +00:00
|
|
|
pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
|
2000-09-18 23:08:29 +00:00
|
|
|
pObj->SetUserCall( 0 );
|
|
|
|
|
|
|
|
::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *pFmt );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// remove from array
|
2000-09-18 23:08:29 +00:00
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts();
|
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 1; n < nSize; ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + n );
|
|
|
|
|
|
|
|
::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.push_back( rSave.pFmt );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
pObj = rSave.pObj;
|
|
|
|
|
|
|
|
SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
|
|
|
|
pContact->ConnectToLayout();
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45718# - follow-up of #i35635# move object to visible layer
|
2005-03-30 09:53:45 +00:00
|
|
|
pContact->MoveObjToVisibleLayer( pObj );
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45952# - notify that position attributes are already set
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
|
2005-07-08 10:06:20 +00:00
|
|
|
"<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
|
|
|
|
if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
|
|
|
|
{
|
|
|
|
static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwUndoDrawGroup::RedoImpl(::sw::UndoRedoContext &)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bDelFmt = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// remove from array
|
2000-09-18 23:08:29 +00:00
|
|
|
SwDoc* pDoc = pObjArr->pFmt->GetDoc();
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts();
|
2000-09-18 23:08:29 +00:00
|
|
|
SdrObject* pObj;
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 1; n < nSize; ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + n );
|
|
|
|
|
|
|
|
pObj = rSave.pObj;
|
|
|
|
|
|
|
|
SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
|
2010-12-17 09:02:23 +01:00
|
|
|
|
|
|
|
// object will destroy itself
|
2003-11-24 15:10:37 +00:00
|
|
|
pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
|
2000-09-18 23:08:29 +00:00
|
|
|
pObj->SetUserCall( 0 );
|
|
|
|
|
|
|
|
::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *rSave.pFmt );
|
|
|
|
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), rSave.pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// re-insert group object
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_RestoreAnchor( pObjArr->pFmt, pObjArr->nNodeIdx );
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.push_back( pObjArr->pFmt );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
SwDrawContact *pContact = new SwDrawContact( pObjArr->pFmt, pObjArr->pObj );
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i26791# - correction: connect object to layout
|
2004-06-28 12:45:28 +00:00
|
|
|
pContact->ConnectToLayout();
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45718# - follow-up of #i35635# move object to visible layer
|
2005-03-30 09:53:45 +00:00
|
|
|
pContact->MoveObjToVisibleLayer( pObjArr->pObj );
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45952# - notify that position attributes are already set
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pObjArr->pFmt->ISA(SwDrawFrmFmt),
|
2005-07-08 10:06:20 +00:00
|
|
|
"<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
|
|
|
|
if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
|
|
|
|
{
|
|
|
|
static_cast<SwDrawFrmFmt*>(pObjArr->pFmt)->PosAttrSet();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
void SwUndoDrawGroup::AddObj( sal_uInt16 nPos, SwDrawFrmFmt* pFmt, SdrObject* pObj )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + nPos + 1 );
|
|
|
|
rSave.pObj = pObj;
|
|
|
|
rSave.pFmt = pFmt;
|
|
|
|
::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *pFmt );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// remove from array
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pFmt->GetDoc()->GetSpzFrmFmts();
|
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SwUndoDrawGroup::SetGroupFmt( SwDrawFrmFmt* pFmt )
|
|
|
|
{
|
|
|
|
pObjArr->pObj = 0;
|
|
|
|
pObjArr->pFmt = pFmt;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ------------------------------
|
|
|
|
|
|
|
|
SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj )
|
2011-01-17 15:06:54 +01:00
|
|
|
: SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( sal_False )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
nSize = (sal_uInt16)pObj->GetSubList()->GetObjCount() + 1;
|
2000-09-18 23:08:29 +00:00
|
|
|
pObjArr = new SwUndoGroupObjImpl[ nSize ];
|
|
|
|
|
|
|
|
SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
|
|
|
|
SwDrawFrmFmt* pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
|
|
|
|
|
|
|
|
pObjArr->pObj = pObj;
|
|
|
|
pObjArr->pFmt = pFmt;
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// object will destroy itself
|
2003-11-24 15:10:37 +00:00
|
|
|
pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
|
2000-09-18 23:08:29 +00:00
|
|
|
pObj->SetUserCall( 0 );
|
|
|
|
|
|
|
|
::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *pFmt );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// remove from array
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pFmt->GetDoc()->GetSpzFrmFmts();
|
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SwUndoDrawUnGroup::~SwUndoDrawUnGroup()
|
|
|
|
{
|
|
|
|
if( bDelFmt )
|
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl* pTmp = pObjArr + 1;
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 1; n < nSize; ++n, ++pTmp )
|
2000-09-18 23:08:29 +00:00
|
|
|
delete pTmp->pFmt;
|
|
|
|
}
|
|
|
|
else
|
2010-12-17 09:02:23 +01:00
|
|
|
delete pObjArr->pFmt;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2004-02-04 13:09:37 +00:00
|
|
|
delete [] pObjArr;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwUndoDrawUnGroup::UndoImpl(::sw::UndoRedoContext & rContext)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bDelFmt = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
SwDoc *const pDoc = & rContext.GetDoc();
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
// remove from array
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 1; n < nSize; ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + n );
|
|
|
|
|
|
|
|
::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *rSave.pFmt );
|
|
|
|
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), rSave.pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// re-insert group object
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_RestoreAnchor( pObjArr->pFmt, pObjArr->nNodeIdx );
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.push_back( pObjArr->pFmt );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
SwDrawContact *pContact = new SwDrawContact( pObjArr->pFmt, pObjArr->pObj );
|
|
|
|
pContact->ConnectToLayout();
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45718# - follow-up of #i35635# move object to visible layer
|
2005-03-30 09:53:45 +00:00
|
|
|
pContact->MoveObjToVisibleLayer( pObjArr->pObj );
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45952# - notify that position attributes are already set
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pObjArr->pFmt->ISA(SwDrawFrmFmt),
|
2005-07-08 10:06:20 +00:00
|
|
|
"<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
|
|
|
|
if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
|
|
|
|
{
|
|
|
|
static_cast<SwDrawFrmFmt*>(pObjArr->pFmt)->PosAttrSet();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwUndoDrawUnGroup::RedoImpl(::sw::UndoRedoContext &)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bDelFmt = sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// save group object
|
2000-09-18 23:08:29 +00:00
|
|
|
SwDrawFrmFmt* pFmt = pObjArr->pFmt;
|
|
|
|
SwDrawContact* pContact = (SwDrawContact*)pFmt->FindContactObj();
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// object will destroy itself
|
2000-09-18 23:08:29 +00:00
|
|
|
pContact->Changed( *pObjArr->pObj, SDRUSERCALL_DELETE,
|
2003-11-24 15:10:37 +00:00
|
|
|
pObjArr->pObj->GetLastBoundRect() );
|
2000-09-18 23:08:29 +00:00
|
|
|
pObjArr->pObj->SetUserCall( 0 );
|
|
|
|
|
|
|
|
::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *pFmt );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// remove from array
|
2000-09-18 23:08:29 +00:00
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts();
|
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 1; n < nSize; ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + n );
|
|
|
|
|
|
|
|
::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.push_back( rSave.pFmt );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45952# - notify that position attributes are already set
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
|
2005-07-08 10:06:20 +00:00
|
|
|
"<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
|
|
|
|
if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
|
|
|
|
{
|
|
|
|
static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
void SwUndoDrawUnGroup::AddObj( sal_uInt16 nPos, SwDrawFrmFmt* pFmt )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + nPos + 1 );
|
|
|
|
rSave.pFmt = pFmt;
|
|
|
|
rSave.pObj = 0;
|
|
|
|
}
|
|
|
|
|
2006-12-01 13:26:19 +00:00
|
|
|
SwUndoDrawUnGroupConnectToLayout::SwUndoDrawUnGroupConnectToLayout()
|
|
|
|
: SwUndo( UNDO_DRAWUNGROUP )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
SwUndoDrawUnGroupConnectToLayout::~SwUndoDrawUnGroupConnectToLayout()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void
|
|
|
|
SwUndoDrawUnGroupConnectToLayout::UndoImpl(::sw::UndoRedoContext &)
|
2006-12-01 13:26:19 +00:00
|
|
|
{
|
|
|
|
for ( std::vector< SdrObject >::size_type i = 0;
|
|
|
|
i < aDrawFmtsAndObjs.size(); ++i )
|
|
|
|
{
|
|
|
|
SdrObject* pObj( aDrawFmtsAndObjs[i].second );
|
|
|
|
SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(pObj->GetUserCall()) );
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pDrawContact,
|
2006-12-01 13:26:19 +00:00
|
|
|
"<SwUndoDrawUnGroupConnectToLayout::Undo(..)> -- missing SwDrawContact instance" );
|
|
|
|
if ( pDrawContact )
|
|
|
|
{
|
|
|
|
// deletion of instance <pDrawContact> and thus disconnection from
|
|
|
|
// the Writer layout.
|
|
|
|
pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
|
|
|
|
pObj->SetUserCall( 0 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void
|
|
|
|
SwUndoDrawUnGroupConnectToLayout::RedoImpl(::sw::UndoRedoContext &)
|
2006-12-01 13:26:19 +00:00
|
|
|
{
|
|
|
|
for ( std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >::size_type i = 0;
|
|
|
|
i < aDrawFmtsAndObjs.size(); ++i )
|
|
|
|
{
|
|
|
|
SwDrawFrmFmt* pFmt( aDrawFmtsAndObjs[i].first );
|
|
|
|
SdrObject* pObj( aDrawFmtsAndObjs[i].second );
|
|
|
|
SwDrawContact *pContact = new SwDrawContact( pFmt, pObj );
|
|
|
|
pContact->ConnectToLayout();
|
|
|
|
pContact->MoveObjToVisibleLayer( pObj );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SwUndoDrawUnGroupConnectToLayout::AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
|
|
|
|
SdrObject* pDrawObject )
|
|
|
|
{
|
|
|
|
aDrawFmtsAndObjs.push_back(
|
|
|
|
std::pair< SwDrawFrmFmt*, SdrObject* >( pDrawFrmFmt, pDrawObject ) );
|
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
//-------------------------------------
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt )
|
|
|
|
: SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( sal_True )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pObjArr = new SwUndoGroupObjImpl[ nSize ];
|
2001-11-13 12:52:46 +00:00
|
|
|
pMarkLst = new SdrMarkList();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SwUndoDrawDelete::~SwUndoDrawDelete()
|
|
|
|
{
|
2002-03-15 10:43:40 +00:00
|
|
|
if( bDelFmt )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl* pTmp = pObjArr;
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 0; n < pMarkLst->GetMarkCount(); ++n, ++pTmp )
|
2000-09-18 23:08:29 +00:00
|
|
|
delete pTmp->pFmt;
|
|
|
|
}
|
2004-02-04 13:09:37 +00:00
|
|
|
delete [] pObjArr;
|
2001-11-13 12:52:46 +00:00
|
|
|
delete pMarkLst;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bDelFmt = sal_False;
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts & rFlyFmts = *rContext.GetDoc().GetSpzFrmFmts();
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 0; n < pMarkLst->GetMarkCount(); ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + n );
|
|
|
|
::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.push_back( rSave.pFmt );
|
2000-09-18 23:08:29 +00:00
|
|
|
SdrObject *pObj = rSave.pObj;
|
|
|
|
SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
|
|
|
|
pContact->_Changed( *pObj, SDRUSERCALL_INSERTED, NULL );
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45718# - follow-up of #i35635# move object to visible layer
|
2005-03-30 09:53:45 +00:00
|
|
|
pContact->MoveObjToVisibleLayer( pObj );
|
2010-12-17 09:02:23 +01:00
|
|
|
// #i45952# - notify that position attributes are already set
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
|
2005-07-08 10:06:20 +00:00
|
|
|
"<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
|
|
|
|
if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
|
|
|
|
{
|
|
|
|
static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-12-15 09:14:11 +01:00
|
|
|
rContext.SetSelections(0, pMarkLst);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 09:14:11 +01:00
|
|
|
void SwUndoDrawDelete::RedoImpl(::sw::UndoRedoContext & rContext)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bDelFmt = sal_True;
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts & rFlyFmts = *rContext.GetDoc().GetSpzFrmFmts();
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 0; n < pMarkLst->GetMarkCount(); ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + n );
|
|
|
|
SdrObject *pObj = rSave.pObj;
|
|
|
|
SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
|
|
|
|
SwDrawFrmFmt *pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
|
2010-12-17 09:02:23 +01:00
|
|
|
|
|
|
|
// object will destroy itself
|
2003-11-24 15:10:37 +00:00
|
|
|
pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
|
2000-09-18 23:08:29 +00:00
|
|
|
pObj->SetUserCall( 0 );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *pFmt );
|
|
|
|
|
2012-06-20 16:36:51 +02:00
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
void SwUndoDrawDelete::AddObj( sal_uInt16 , SwDrawFrmFmt* pFmt,
|
2001-11-13 12:52:46 +00:00
|
|
|
const SdrMark& rMark )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2002-03-15 10:43:40 +00:00
|
|
|
SwUndoGroupObjImpl& rSave = *( pObjArr + pMarkLst->GetMarkCount() );
|
2006-07-25 11:35:18 +00:00
|
|
|
rSave.pObj = rMark.GetMarkedSdrObj();
|
2000-09-18 23:08:29 +00:00
|
|
|
rSave.pFmt = pFmt;
|
|
|
|
::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// notify UNO objects to decouple
|
2000-09-18 23:08:29 +00:00
|
|
|
::lcl_SendRemoveToUno( *pFmt );
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
// remove from array
|
2001-11-13 12:52:46 +00:00
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
2012-06-20 16:36:51 +02:00
|
|
|
SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts();
|
|
|
|
rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
|
2001-11-13 12:52:46 +00:00
|
|
|
|
|
|
|
pMarkLst->InsertEntry( rMark );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 08:30:41 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|