2000-09-18 23:08:29 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2008-04-10 12:04:48 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:04:48 +00:00
|
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:04:48 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:04:48 +00:00
|
|
|
* $RCSfile: trvltbl.cxx,v $
|
|
|
|
* $Revision: 1.24 $
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:04:48 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:04:48 +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 12:04:48 +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 12:04:48 +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 19:48:11 +00:00
|
|
|
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
|
|
#include "precompiled_sw.hxx"
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <hintids.hxx>
|
|
|
|
|
|
|
|
#include <vcl/svapp.hxx>
|
|
|
|
#include <svx/protitem.hxx>
|
|
|
|
#include <crsrsh.hxx>
|
|
|
|
#include <doc.hxx>
|
|
|
|
#include <cntfrm.hxx>
|
|
|
|
#include <editsh.hxx> //EndAllAction gibts nur an der EditShell
|
|
|
|
#include <pam.hxx>
|
|
|
|
#include <swtable.hxx>
|
|
|
|
#include <docary.hxx>
|
|
|
|
#include <frmatr.hxx>
|
|
|
|
#include <frmfmt.hxx>
|
|
|
|
#include <viscrs.hxx>
|
|
|
|
#include <callnk.hxx>
|
|
|
|
#include <tabfrm.hxx>
|
|
|
|
#include <ndtxt.hxx>
|
|
|
|
#include <shellres.hxx>
|
|
|
|
#include <cellatr.hxx>
|
|
|
|
#include <cellfrm.hxx>
|
2004-09-09 08:13:38 +00:00
|
|
|
#include <rowfrm.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
// setze Crsr in die naechsten/vorherigen Celle
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::GoNextCell( BOOL bAppendLine )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bRet = FALSE;
|
2007-02-28 14:39:44 +00:00
|
|
|
const SwTableNode* pTblNd = 0;
|
2007-09-27 07:31:26 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
|
|
|
|
{
|
|
|
|
SwCursor* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
|
|
|
|
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
|
|
|
|
bRet = TRUE;
|
|
|
|
|
2007-02-28 14:39:44 +00:00
|
|
|
// Check if we have to move the cursor to a covered cell before
|
|
|
|
// proceeding:
|
|
|
|
const SwNode* pTableBoxStartNode = pCrsr->GetNode()->FindTableBoxStartNode();
|
|
|
|
const SwTableBox* pTableBox = 0;
|
|
|
|
|
|
|
|
if ( pCrsr->GetCrsrRowSpanOffset() )
|
|
|
|
{
|
|
|
|
pTableBox = pTableBoxStartNode->GetTblBox();
|
|
|
|
if ( pTableBox->getRowSpan() > 1 )
|
|
|
|
{
|
|
|
|
if ( !pTblNd )
|
|
|
|
pTblNd = IsCrsrInTbl();
|
|
|
|
pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
|
|
|
|
(USHORT)(pTableBox->getRowSpan() + pCrsr->GetCrsrRowSpanOffset() ) );
|
|
|
|
pTableBoxStartNode = pTableBox->GetSttNd();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SwNodeIndex aCellStt( *pTableBoxStartNode->EndOfSectionNode(), 1 );
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
// folgt nach dem EndNode der Cell ein weiterer StartNode, dann
|
|
|
|
// gibt es auch eine naechste Celle
|
2007-02-28 14:39:44 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( !aCellStt.GetNode().IsStartNode() )
|
|
|
|
{
|
2007-02-28 14:39:44 +00:00
|
|
|
if( pCrsr->HasMark() || !bAppendLine )
|
2000-09-18 23:08:29 +00:00
|
|
|
bRet = FALSE;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// auf besonderen Wunsch: keine Line mehr vorhanden, dann
|
|
|
|
// mache doch eine neue:
|
2007-02-28 14:39:44 +00:00
|
|
|
if ( !pTableBox )
|
|
|
|
pTableBox = pTblNd->GetTable().GetTblBox(
|
2000-09-18 23:08:29 +00:00
|
|
|
pCrsr->GetPoint()->nNode.GetNode().
|
|
|
|
StartOfSectionIndex() );
|
2007-02-28 14:39:44 +00:00
|
|
|
|
|
|
|
ASSERT( pTableBox, "Box steht nicht in dieser Tabelle" );
|
2000-09-18 23:08:29 +00:00
|
|
|
SwSelBoxes aBoxes;
|
|
|
|
|
|
|
|
//Das Dokument veraendert sich evtl. ohne Action wuerden die Sichten
|
|
|
|
//nichts mitbekommen.
|
|
|
|
((SwEditShell*)this)->StartAllAction();
|
|
|
|
bRet = pDoc->InsertRow( pTblNd->GetTable().
|
2007-02-28 14:39:44 +00:00
|
|
|
SelLineFromBox( pTableBox, aBoxes, FALSE ));
|
2000-09-18 23:08:29 +00:00
|
|
|
((SwEditShell*)this)->EndAllAction();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( bRet && 0 != ( bRet = pCrsr->GoNextCell() ))
|
|
|
|
UpdateCrsr(); // und den akt. Updaten
|
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::GoPrevCell()
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bRet = FALSE;
|
2000-09-18 23:08:29 +00:00
|
|
|
const SwTableNode* pTblNd;
|
|
|
|
if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
|
|
|
|
{
|
|
|
|
SwCursor* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
|
|
|
|
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
|
|
|
|
bRet = pCrsr->GoPrevCell();
|
|
|
|
if( bRet )
|
|
|
|
UpdateCrsr(); // und den akt. Updaten
|
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
2005-01-05 14:59:10 +00:00
|
|
|
const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm )
|
|
|
|
{
|
|
|
|
while ( pFrm &&
|
|
|
|
( !pFrm->IsCellFrm() ||
|
|
|
|
!pFrm->GetUpper()->GetUpper()->IsTabFrm() ||
|
|
|
|
pFrm->GetUpper()->GetUpper()->GetUpper()->IsInTab() ) )
|
|
|
|
{
|
|
|
|
pFrm = pFrm->GetUpper();
|
|
|
|
}
|
|
|
|
return pFrm;
|
|
|
|
}
|
2004-08-16 07:01:52 +00:00
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
|
|
|
|
SwFrm *pFrm = GetCurrFrm();
|
|
|
|
if( !pFrm->IsInTab() )
|
|
|
|
return FALSE;
|
|
|
|
|
2007-02-28 14:39:44 +00:00
|
|
|
const SwTabFrm* pTabFrm = pFrm->FindTabFrm();
|
2008-03-07 13:51:32 +00:00
|
|
|
const SwTabFrm* pMasterTabFrm = pTabFrm->IsFollow() ? pTabFrm->FindMaster( true ) : pTabFrm;
|
2007-02-28 14:39:44 +00:00
|
|
|
const SwTable* pTable = pTabFrm->GetTable();
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SET_CURR_SHELL( this );
|
|
|
|
|
2005-01-05 14:59:10 +00:00
|
|
|
const SwTableBox* pStt = 0;
|
|
|
|
const SwTableBox* pEnd = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2005-01-05 14:59:10 +00:00
|
|
|
// lasse ueber das Layout die Boxen suchen
|
|
|
|
SwSelBoxes aBoxes;
|
2007-09-27 07:31:26 +00:00
|
|
|
SwTblSearchType eType = bRow ? nsSwTblSearchType::TBLSEARCH_ROW : nsSwTblSearchType::TBLSEARCH_COL;
|
2007-02-28 14:39:44 +00:00
|
|
|
const bool bCheckProtected = !IsReadOnlyAvailable();
|
2004-09-09 08:13:38 +00:00
|
|
|
|
2007-02-28 14:39:44 +00:00
|
|
|
if( bCheckProtected )
|
2007-09-27 07:31:26 +00:00
|
|
|
eType = (SwTblSearchType)(eType | nsSwTblSearchType::TBLSEARCH_PROTECT);
|
2004-09-09 08:13:38 +00:00
|
|
|
|
2005-01-05 14:59:10 +00:00
|
|
|
if ( !bRowSimple )
|
|
|
|
{
|
2004-09-09 08:13:38 +00:00
|
|
|
GetTblSel( *this, aBoxes, eType );
|
|
|
|
|
|
|
|
if( !aBoxes.Count() )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
pStt = aBoxes[0];
|
|
|
|
pEnd = aBoxes[aBoxes.Count() - 1];
|
|
|
|
}
|
|
|
|
// --> FME 2004-07-30 #i32329# Enhanced table selection
|
2007-02-28 14:39:44 +00:00
|
|
|
else if ( pTable->IsNewModel() )
|
|
|
|
{
|
|
|
|
const SwShellCrsr *pCrsr = _GetCrsr();
|
|
|
|
SwTable::SearchType eSearchType = bRow ? SwTable::SEARCH_ROW : SwTable::SEARCH_COL;
|
|
|
|
pTable->CreateSelection( *pCrsr, aBoxes, eSearchType, bCheckProtected );
|
|
|
|
if( !aBoxes.Count() )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
pStt = aBoxes[0];
|
|
|
|
pEnd = aBoxes[aBoxes.Count() - 1];
|
|
|
|
}
|
2004-09-09 08:13:38 +00:00
|
|
|
else
|
|
|
|
{
|
2005-01-05 14:59:10 +00:00
|
|
|
const SwShellCrsr *pCrsr = _GetCrsr();
|
|
|
|
const SwFrm* pStartFrm = pFrm;
|
2007-04-26 08:37:41 +00:00
|
|
|
const SwCntntNode *pCNd = pCrsr->GetCntntNode( FALSE );
|
|
|
|
const SwFrm* pEndFrm = pCNd ? pCNd->GetFrm( &pCrsr->GetMkPos() ) : 0;
|
2005-01-05 14:59:10 +00:00
|
|
|
|
|
|
|
if ( bRow )
|
2004-09-09 08:13:38 +00:00
|
|
|
{
|
2005-01-05 14:59:10 +00:00
|
|
|
pStartFrm = lcl_FindMostUpperCellFrm( pStartFrm );
|
|
|
|
pEndFrm = lcl_FindMostUpperCellFrm( pEndFrm );
|
2004-09-09 08:13:38 +00:00
|
|
|
}
|
|
|
|
|
2005-01-05 14:59:10 +00:00
|
|
|
if ( !pStartFrm || !pEndFrm )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
const bool bVert = pFrm->ImplFindTabFrm()->IsVertical();
|
|
|
|
|
|
|
|
// If we select upwards it is sufficient to set pStt and pEnd
|
|
|
|
// to the first resp. last box of the selection obtained from
|
|
|
|
// GetTblSel. However, selecting downwards requires the frames
|
|
|
|
// located at the corners of the selection. This does not work
|
|
|
|
// for column selections in vertical tables:
|
|
|
|
const bool bSelectUp = ( bVert && !bRow ) ||
|
|
|
|
*pCrsr->GetPoint() <= *pCrsr->GetMark();
|
|
|
|
SwCellFrms aCells;
|
|
|
|
GetTblSel( static_cast<const SwCellFrm*>(pStartFrm),
|
|
|
|
static_cast<const SwCellFrm*>(pEndFrm),
|
|
|
|
aBoxes, bSelectUp ? 0 : &aCells, eType );
|
2004-09-09 08:13:38 +00:00
|
|
|
|
2005-01-05 14:59:10 +00:00
|
|
|
if( !aBoxes.Count() || ( !bSelectUp && 4 != aCells.Count() ) )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if ( bSelectUp )
|
|
|
|
{
|
|
|
|
pStt = aBoxes[0];
|
|
|
|
pEnd = aBoxes[aBoxes.Count() - 1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pStt = aCells[ bVert ? (bRow ? 0 : 3) : (bRow ? 2 : 1) ]->GetTabBox(); // will become point of table cursor
|
|
|
|
pEnd = aCells[ bVert ? (bRow ? 3 : 0) : (bRow ? 1 : 2) ]->GetTabBox(); // will become mark of table cursor
|
|
|
|
}
|
2004-09-09 08:13:38 +00:00
|
|
|
}
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
// noch kein Tabellen-Cursor vorhanden, dann erzeuge einen
|
|
|
|
if( !pTblCrsr )
|
|
|
|
{
|
|
|
|
pTblCrsr = new SwShellTableCrsr( *this, *pCurCrsr->GetPoint() );
|
|
|
|
pCurCrsr->DeleteMark();
|
|
|
|
pCurCrsr->SwSelPaintRects::Hide();
|
|
|
|
}
|
|
|
|
|
|
|
|
pTblCrsr->DeleteMark();
|
2005-01-05 14:59:10 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
// dann setze mal Anfang und Ende der Spalte
|
2004-09-09 08:13:38 +00:00
|
|
|
pTblCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
|
2000-09-18 23:08:29 +00:00
|
|
|
pTblCrsr->Move( fnMoveForward, fnGoCntnt );
|
2005-01-05 14:59:10 +00:00
|
|
|
pTblCrsr->SetMark();
|
|
|
|
pTblCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
|
|
|
|
pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
|
|
|
|
|
2008-03-07 13:51:32 +00:00
|
|
|
// set PtPos 'close' to the reference table, otherwise we might get problems with the
|
|
|
|
// repeated headlines check in UpdateCrsr():
|
|
|
|
if ( !bRow )
|
|
|
|
pTblCrsr->GetPtPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
UpdateCrsr(); // und den akt. Updaten
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::SelTbl()
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-09-09 08:13:38 +00:00
|
|
|
// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrm *pFrm = GetCurrFrm();
|
|
|
|
if( !pFrm->IsInTab() )
|
|
|
|
return FALSE;
|
|
|
|
|
2008-03-07 13:51:32 +00:00
|
|
|
const SwTabFrm *pTblFrm = pFrm->ImplFindTabFrm();
|
|
|
|
const SwTabFrm* pMasterTabFrm = pTblFrm->IsFollow() ? pTblFrm->FindMaster( true ) : pTblFrm;
|
|
|
|
const SwTableNode* pTblNd = pTblFrm->GetTable()->GetTableNode();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
SET_CURR_SHELL( this );
|
|
|
|
|
|
|
|
if( !pTblCrsr )
|
|
|
|
{
|
|
|
|
pTblCrsr = new SwShellTableCrsr( *this, *pCurCrsr->GetPoint() );
|
|
|
|
pCurCrsr->DeleteMark();
|
|
|
|
pCurCrsr->SwSelPaintRects::Hide();
|
|
|
|
}
|
|
|
|
|
|
|
|
pTblCrsr->DeleteMark();
|
2004-09-09 08:13:38 +00:00
|
|
|
pTblCrsr->GetPoint()->nNode = *pTblNd;
|
2000-09-18 23:08:29 +00:00
|
|
|
pTblCrsr->Move( fnMoveForward, fnGoCntnt );
|
|
|
|
pTblCrsr->SetMark();
|
2008-03-07 13:51:32 +00:00
|
|
|
// set MkPos 'close' to the master table, otherwise we might get problems with the
|
|
|
|
// repeated headlines check in UpdateCrsr():
|
|
|
|
pTblCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
|
2004-09-09 08:13:38 +00:00
|
|
|
pTblCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
|
|
|
|
pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
|
2000-09-18 23:08:29 +00:00
|
|
|
UpdateCrsr(); // und den akt. Updaten
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2004-08-16 07:01:52 +00:00
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::SelTblBox()
|
2004-08-16 07:01:52 +00:00
|
|
|
{
|
|
|
|
// if we're in a table, create a table cursor, and select the cell
|
|
|
|
// that the current cursor's point resides in
|
|
|
|
|
|
|
|
// search for start node of our table box. If not found, exit realy
|
|
|
|
const SwStartNode* pStartNode =
|
|
|
|
pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
|
|
|
|
|
2009-07-10 14:03:42 +02:00
|
|
|
#ifdef DBG_UTIL
|
2004-08-16 07:01:52 +00:00
|
|
|
// the old code checks whether we're in a table by asking the
|
|
|
|
// frame. This should yield the same result as searching for the
|
|
|
|
// table box start node, right?
|
|
|
|
SwFrm *pFrm = GetCurrFrm();
|
|
|
|
DBG_ASSERT( !pFrm->IsInTab() == !(pStartNode != NULL),
|
2008-11-10 15:06:12 +00:00
|
|
|
"Schroedinger's table: We're in a box, and also we aren't." );
|
2004-08-16 07:01:52 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if( pStartNode == NULL )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
|
|
SET_CURR_SHELL( this );
|
|
|
|
|
|
|
|
// create a table cursor, if there isn't one already
|
|
|
|
if( !pTblCrsr )
|
|
|
|
{
|
|
|
|
pTblCrsr = new SwShellTableCrsr( *this, *pCurCrsr->GetPoint() );
|
|
|
|
pCurCrsr->DeleteMark();
|
|
|
|
pCurCrsr->SwSelPaintRects::Hide();
|
|
|
|
}
|
|
|
|
|
|
|
|
// select the complete box with our shiny new pTblCrsr
|
|
|
|
// 1. delete mark, and move point to first content node in box
|
|
|
|
// 2. set mark, and move point to last content node in box
|
|
|
|
// 3. exchange
|
|
|
|
|
|
|
|
pTblCrsr->DeleteMark();
|
|
|
|
*(pTblCrsr->GetPoint()) = SwPosition( *pStartNode );
|
|
|
|
pTblCrsr->Move( fnMoveForward, fnGoNode );
|
|
|
|
|
|
|
|
pTblCrsr->SetMark();
|
|
|
|
*(pTblCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
|
|
|
|
pTblCrsr->Move( fnMoveBackward, fnGoNode );
|
|
|
|
|
|
|
|
pTblCrsr->Exchange();
|
|
|
|
|
|
|
|
// with some luck, UpdateCrsr() will now update everything that
|
|
|
|
// needs updateing
|
|
|
|
UpdateCrsr();
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
// return the next non-protected cell inside a table
|
|
|
|
// rIdx - is on a table node
|
2000-09-18 23:08:29 +00:00
|
|
|
// return:
|
2007-11-07 11:17:03 +00:00
|
|
|
// true - Idx points to content in a suitable cell
|
|
|
|
// false - could not find a suitable cell
|
|
|
|
bool lcl_FindNextCell( SwNodeIndex& rIdx, BOOL bInReadOnly )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// ueberpruefe geschuetzte Zellen
|
2007-11-07 11:17:03 +00:00
|
|
|
SwNodeIndex aTmp( rIdx, 2 ); // TableNode + StartNode
|
|
|
|
|
|
|
|
// the resulting cell should be in that table:
|
|
|
|
const SwTableNode* pTblNd = rIdx.GetNode().GetTableNode();
|
|
|
|
|
|
|
|
if ( !pTblNd )
|
|
|
|
{
|
|
|
|
ASSERT( false, "lcl_FindNextCell not celled with table start node!" )
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
const SwNode* pTableEndNode = pTblNd->EndOfSectionNode();
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwNodes& rNds = aTmp.GetNode().GetNodes();
|
|
|
|
SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
|
2007-11-07 11:17:03 +00:00
|
|
|
|
|
|
|
// no content node => go to next content node
|
2000-09-18 23:08:29 +00:00
|
|
|
if( !pCNd )
|
|
|
|
pCNd = rNds.GoNext( &aTmp );
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
// robust
|
|
|
|
if ( !pCNd )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
SwCntntFrm* pFrm = pCNd->GetFrm();
|
|
|
|
|
|
|
|
if ( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
|
|
|
|
(!bInReadOnly && pFrm->IsProtected() ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
// we are not located inside a 'valid' cell. We have to continue searching...
|
|
|
|
|
|
|
|
// skip behind current section. This might be the end of the table cell
|
|
|
|
// or behind a inner section or or or...
|
2000-09-18 23:08:29 +00:00
|
|
|
aTmp.Assign( *pCNd->EndOfSectionNode(), 1 );
|
2007-11-07 11:17:03 +00:00
|
|
|
|
|
|
|
// loop to find a suitable cell...
|
2000-09-18 23:08:29 +00:00
|
|
|
for( ;; )
|
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
SwNode* pNd = &aTmp.GetNode();
|
|
|
|
|
|
|
|
// we break this loop if we reached the end of the table.
|
|
|
|
// to make this code even more robust, we also break if we are
|
|
|
|
// already behind the table end node:
|
|
|
|
if( pNd == pTableEndNode || /*robust: */ pNd->GetIndex() > pTableEndNode->GetIndex() )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// ok, get the next content node:
|
|
|
|
pCNd = aTmp.GetNode().GetCntntNode();
|
|
|
|
if( 0 == pCNd )
|
2000-09-18 23:08:29 +00:00
|
|
|
pCNd = rNds.GoNext( &aTmp );
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
// robust:
|
|
|
|
if ( !pCNd )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// check if we have found a suitable table cell:
|
|
|
|
pFrm = pCNd->GetFrm();
|
|
|
|
|
|
|
|
if ( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
|
|
|
|
(bInReadOnly || !pFrm->IsProtected() ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
// finally, we have found a suitable table cell => set index and return
|
|
|
|
rIdx = *pCNd;
|
|
|
|
return true;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2007-11-07 11:17:03 +00:00
|
|
|
|
|
|
|
// continue behind the current section:
|
2000-09-18 23:08:29 +00:00
|
|
|
aTmp.Assign( *pCNd->EndOfSectionNode(), +1 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
rIdx = *pCNd;
|
|
|
|
return true;
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
// comments see lcl_FindNextCell
|
|
|
|
bool lcl_FindPrevCell( SwNodeIndex& rIdx, BOOL bInReadOnly )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwNodeIndex aTmp( rIdx, -2 ); // TableNode + EndNode
|
2007-11-07 11:17:03 +00:00
|
|
|
|
|
|
|
const SwNode* pTableEndNode = &rIdx.GetNode();
|
|
|
|
const SwTableNode* pTblNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
|
|
|
|
|
|
|
|
if ( !pTblNd )
|
|
|
|
{
|
|
|
|
ASSERT( false, "lcl_FindPrevCell not celled with table start node!" )
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwNodes& rNds = aTmp.GetNode().GetNodes();
|
|
|
|
SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
|
2007-11-07 11:17:03 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( !pCNd )
|
2007-01-22 10:52:48 +00:00
|
|
|
pCNd = rNds.GoPrevious( &aTmp );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
if ( !pCNd )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
SwCntntFrm* pFrm = pCNd->GetFrm();
|
|
|
|
|
|
|
|
if( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
|
2000-09-18 23:08:29 +00:00
|
|
|
(!bInReadOnly && pFrm->IsProtected() ))
|
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
// skip before current section
|
2000-09-18 23:08:29 +00:00
|
|
|
aTmp.Assign( *pCNd->StartOfSectionNode(), -1 );
|
|
|
|
for( ;; )
|
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
SwNode* pNd = &aTmp.GetNode();
|
|
|
|
|
|
|
|
if( pNd == pTblNd || pNd->GetIndex() < pTblNd->GetIndex() )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
pCNd = aTmp.GetNode().GetCntntNode();
|
|
|
|
if( 0 == pCNd )
|
2000-09-18 23:08:29 +00:00
|
|
|
pCNd = rNds.GoPrevious( &aTmp );
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
if ( !pCNd )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
pFrm = pCNd->GetFrm();
|
|
|
|
|
|
|
|
if( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
|
|
|
|
(bInReadOnly || !pFrm->IsProtected() ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
rIdx = *pCNd;
|
|
|
|
return true; // Ok, nicht geschuetzt
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
aTmp.Assign( *pCNd->StartOfSectionNode(), - 1 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
rIdx = *pCNd;
|
|
|
|
return true;
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
|
|
|
|
BOOL bInReadOnly )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
|
2004-06-01 06:40:41 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
|
|
|
|
if( pTblNd )
|
2004-06-01 06:40:41 +00:00
|
|
|
{
|
|
|
|
// #i26532#: If we are inside a table, we may not go backward
|
|
|
|
// to the table start node, because we would miss any tables
|
|
|
|
// inside this table.
|
|
|
|
SwTableNode* pInnerTblNd = 0;
|
|
|
|
SwNodeIndex aTmpIdx( aIdx );
|
|
|
|
while( aTmpIdx.GetIndex() &&
|
2006-08-14 14:53:47 +00:00
|
|
|
0 == ( pInnerTblNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
|
2004-06-01 06:40:41 +00:00
|
|
|
aTmpIdx--;
|
|
|
|
|
|
|
|
if( pInnerTblNd == pTblNd )
|
|
|
|
aIdx.Assign( *pTblNd, - 1 );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
while( aIdx.GetIndex() &&
|
2006-08-14 14:53:47 +00:00
|
|
|
0 == ( pTblNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
|
2000-09-18 23:08:29 +00:00
|
|
|
aIdx--;
|
|
|
|
|
|
|
|
if( pTblNd ) // gibt einen weiteren TableNode ?
|
|
|
|
{
|
|
|
|
if( fnPosTbl == fnMoveForward ) // an Anfang ?
|
|
|
|
{
|
|
|
|
aIdx = *aIdx.GetNode().StartOfSectionNode();
|
2007-11-07 11:17:03 +00:00
|
|
|
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// Tabelle ueberspringen
|
|
|
|
aIdx.Assign( *pTblNd, -1 );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// ueberpruefe geschuetzte Zellen
|
2007-11-07 11:17:03 +00:00
|
|
|
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// Tabelle ueberspringen
|
|
|
|
aIdx.Assign( *pTblNd, -1 );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2007-11-07 11:17:03 +00:00
|
|
|
|
|
|
|
SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
|
|
|
|
if ( pTxtNode )
|
|
|
|
{
|
|
|
|
rCurCrsr.GetPoint()->nNode = *pTxtNode;
|
|
|
|
rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
|
|
|
|
pTxtNode->Len() :
|
|
|
|
0 );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
} while( pTblNd );
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
|
|
|
|
BOOL bInReadOnly )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
|
|
|
|
SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
|
2007-11-07 11:17:03 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pTblNd )
|
|
|
|
aIdx.Assign( *pTblNd->EndOfSectionNode(), 1 );
|
|
|
|
|
|
|
|
ULONG nLastNd = rCurCrsr.GetDoc()->GetNodes().Count() - 1;
|
|
|
|
do {
|
|
|
|
while( aIdx.GetIndex() < nLastNd &&
|
|
|
|
0 == ( pTblNd = aIdx.GetNode().GetTableNode()) )
|
|
|
|
aIdx++;
|
|
|
|
if( pTblNd ) // gibt einen weiteren TableNode ?
|
|
|
|
{
|
|
|
|
if( fnPosTbl == fnMoveForward ) // an Anfang ?
|
|
|
|
{
|
2007-11-07 11:17:03 +00:00
|
|
|
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// Tabelle ueberspringen
|
|
|
|
aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aIdx = *aIdx.GetNode().EndOfSectionNode();
|
|
|
|
// ueberpruefe geschuetzte Zellen
|
2007-11-07 11:17:03 +00:00
|
|
|
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// Tabelle ueberspringen
|
|
|
|
aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2007-11-07 11:17:03 +00:00
|
|
|
|
|
|
|
SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
|
|
|
|
if ( pTxtNode )
|
|
|
|
{
|
|
|
|
rCurCrsr.GetPoint()->nNode = *pTxtNode;
|
|
|
|
rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
|
|
|
|
pTxtNode->Len() :
|
|
|
|
0 );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
} while( pTblNd );
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
|
|
|
|
BOOL bInReadOnly )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwTableNode* pTblNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
|
|
|
|
if( !pTblNd )
|
|
|
|
return FALSE;
|
|
|
|
|
2007-11-07 11:17:03 +00:00
|
|
|
SwTxtNode* pTxtNode = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
if( fnPosTbl == fnMoveBackward ) // ans Ende der Tabelle
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
|
2007-11-07 11:17:03 +00:00
|
|
|
if( !lcl_FindPrevCell( aIdx, bInReadOnly ))
|
2000-09-18 23:08:29 +00:00
|
|
|
return FALSE;
|
2007-11-07 11:17:03 +00:00
|
|
|
pTxtNode = aIdx.GetNode().GetTxtNode();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx( *pTblNd );
|
2007-11-07 11:17:03 +00:00
|
|
|
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
|
2000-09-18 23:08:29 +00:00
|
|
|
return FALSE;
|
2007-11-07 11:17:03 +00:00
|
|
|
pTxtNode = aIdx.GetNode().GetTxtNode();
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( pTxtNode )
|
|
|
|
{
|
|
|
|
rCurCrsr.GetPoint()->nNode = *pTxtNode;
|
|
|
|
rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
|
|
|
|
pTxtNode->Len() :
|
|
|
|
0 );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2007-11-07 11:17:03 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bRet = FALSE;
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
SwTableCursor* pTblCrsr = dynamic_cast<SwTableCursor*>(this);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
if( pTblCrsr || !HasMark() ) // nur wenn kein Mark oder ein TblCrsr
|
|
|
|
{
|
|
|
|
SwCrsrSaveState aSaveState( *this );
|
|
|
|
bRet = (*fnWhichTbl)( *this, fnPosTbl, IsReadOnlyAvailable() ) &&
|
2007-09-27 07:31:26 +00:00
|
|
|
!IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
|
|
|
|
nsSwCursorSelOverFlags::SELOVER_TOGGLE );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
|
|
|
|
|
|
|
|
SwShellCrsr* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bCheckPos, bRet;
|
|
|
|
ULONG nPtNd = 0;
|
|
|
|
xub_StrLen nPtCnt = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
if( !pTblCrsr && pCurCrsr->HasMark() ) // wenn Mark und kein TblCrsr,
|
|
|
|
{
|
|
|
|
// dann auf jedenfall in den Tabellen-Modus schalten
|
|
|
|
pTblCrsr = new SwShellTableCrsr( *this, *pCurCrsr->GetPoint() );
|
|
|
|
pCurCrsr->DeleteMark();
|
|
|
|
pCurCrsr->SwSelPaintRects::Hide();
|
|
|
|
pTblCrsr->SetMark();
|
|
|
|
pCrsr = pTblCrsr;
|
|
|
|
bCheckPos = FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bCheckPos = TRUE;
|
|
|
|
nPtNd = pCrsr->GetPoint()->nNode.GetIndex();
|
|
|
|
nPtCnt = pCrsr->GetPoint()->nContent.GetIndex();
|
|
|
|
}
|
|
|
|
|
|
|
|
bRet = pCrsr->MoveTable( fnWhichTbl, fnPosTbl );
|
|
|
|
|
|
|
|
if( bRet )
|
|
|
|
{
|
|
|
|
//JP 28.10.97: Bug 45028 - die "oberste" Position setzen fuer
|
|
|
|
// wiederholte Kopfzeilen
|
|
|
|
pCrsr->GetPtPos() = Point();
|
|
|
|
|
|
|
|
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
|
|
|
|
|
|
|
|
if( bCheckPos &&
|
|
|
|
pCrsr->GetPoint()->nNode.GetIndex() == nPtNd &&
|
|
|
|
pCrsr->GetPoint()->nContent.GetIndex() == nPtCnt )
|
|
|
|
bRet = FALSE;
|
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::IsTblComplex() const
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwFrm *pFrm = GetCurrFrm( FALSE );
|
|
|
|
if ( pFrm && pFrm->IsInTab() )
|
|
|
|
return pFrm->FindTabFrm()->GetTable()->IsTblComplex();
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::IsTblComplexForChart()
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bRet = FALSE;
|
2003-04-17 15:04:28 +00:00
|
|
|
|
|
|
|
StartAction(); // IsTblComplexForChart() may trigger table formatting
|
|
|
|
// we better do that inside an action
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
const SwTableNode* pTNd = pCurCrsr->GetPoint()->nNode.GetNode().FindTableNode();
|
|
|
|
if( pTNd )
|
|
|
|
{
|
|
|
|
// wir stehen in der Tabelle, dann teste mal, ob die Tabelle oder die
|
|
|
|
// Selektion ausgeglichen ist.
|
|
|
|
String sSel;
|
|
|
|
if( pTblCrsr )
|
|
|
|
sSel = GetBoxNms();
|
|
|
|
bRet = pTNd->GetTable().IsTblComplexForChart( sSel );
|
|
|
|
}
|
2003-04-17 15:04:28 +00:00
|
|
|
|
|
|
|
EndAction();
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
String SwCrsrShell::GetBoxNms() const
|
|
|
|
{
|
|
|
|
String sNm;
|
|
|
|
const SwPosition* pPos;
|
|
|
|
SwFrm* pFrm;
|
|
|
|
|
|
|
|
if( IsTableMode() )
|
|
|
|
{
|
2007-04-26 08:37:41 +00:00
|
|
|
SwCntntNode *pCNd = pTblCrsr->Start()->nNode.GetNode().GetCntntNode();
|
|
|
|
pFrm = pCNd ? pCNd->GetFrm() : 0;
|
|
|
|
if( !pFrm )
|
|
|
|
return sNm;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
pFrm = pFrm->GetUpper();
|
|
|
|
} while ( pFrm && !pFrm->IsCellFrm() );
|
|
|
|
|
|
|
|
ASSERT( pFrm, "kein Frame zur Box" );
|
|
|
|
sNm = ((SwCellFrm*)pFrm)->GetTabBox()->GetName();
|
|
|
|
sNm += ':';
|
|
|
|
pPos = pTblCrsr->End();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const SwTableNode* pTblNd = IsCrsrInTbl();
|
|
|
|
if( !pTblNd )
|
|
|
|
return sNm;
|
|
|
|
pPos = GetCrsr()->GetPoint();
|
|
|
|
}
|
|
|
|
|
2007-04-26 08:37:41 +00:00
|
|
|
SwCntntNode* pCNd = pPos->nNode.GetNode().GetCntntNode();
|
|
|
|
pFrm = pCNd ? pCNd->GetFrm() : 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
if( pFrm )
|
2007-04-26 08:37:41 +00:00
|
|
|
{
|
|
|
|
do {
|
|
|
|
pFrm = pFrm->GetUpper();
|
|
|
|
} while ( pFrm && !pFrm->IsCellFrm() );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2007-04-26 08:37:41 +00:00
|
|
|
if( pFrm )
|
|
|
|
sNm += ((SwCellFrm*)pFrm)->GetTabBox()->GetName();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
return sNm;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::GotoTable( const String& rName )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bRet = !pTblCrsr && pCurCrsr->GotoTable( rName );
|
2000-09-18 23:08:29 +00:00
|
|
|
if( bRet )
|
|
|
|
{
|
|
|
|
pCurCrsr->GetPtPos() = Point();
|
|
|
|
UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
|
|
|
|
SwCrsrShell::READONLY ); // und den akt. Updaten
|
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if( !pBoxIdx || !pBoxPtr || IsSelTblCells() || !IsAutoUpdateCells() )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
// ueberpruefe, ob der Box Inhalt mit dem angegebenen Format der Box
|
|
|
|
// ueber einstimmt. Wenn nicht, setze neu
|
|
|
|
SwTableBox* pChkBox = 0;
|
2007-09-27 07:31:26 +00:00
|
|
|
SwStartNode* pSttNd = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
if( !pPos )
|
|
|
|
{
|
|
|
|
// gesicherte Position heraus holen.
|
|
|
|
if( pBoxIdx && pBoxPtr &&
|
|
|
|
0 != ( pSttNd = pBoxIdx->GetNode().GetStartNode() ) &&
|
|
|
|
SwTableBoxStartNode == pSttNd->GetStartNodeType() &&
|
|
|
|
pBoxPtr == pSttNd->FindTableNode()->GetTable().
|
|
|
|
GetTblBox( pBoxIdx->GetIndex() ) )
|
|
|
|
pChkBox = pBoxPtr;
|
|
|
|
}
|
|
|
|
else if( 0 != ( pSttNd = pPos->nNode.GetNode().
|
|
|
|
FindSttNodeByType( SwTableBoxStartNode )) )
|
|
|
|
{
|
|
|
|
pChkBox = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Box mehr als 1 Absatz?
|
|
|
|
if( pChkBox && pSttNd->GetIndex() + 2 != pSttNd->EndOfSectionIndex() )
|
|
|
|
pChkBox = 0;
|
|
|
|
|
|
|
|
// jetzt sollten wir mal die Pointer zerstoeren, bevor eine erneute
|
|
|
|
// Actionklammerung kommt.
|
|
|
|
if( !pPos && !pChkBox )
|
|
|
|
ClearTblBoxCntnt();
|
|
|
|
|
|
|
|
// liegt der Cursor nicht mehr in dem Bereich ?
|
|
|
|
if( pChkBox && !pPos &&
|
|
|
|
( pCurCrsr->HasMark() || pCurCrsr->GetNext() != pCurCrsr ||
|
|
|
|
pSttNd->GetIndex() + 1 == pCurCrsr->GetPoint()->nNode.GetIndex() ))
|
|
|
|
pChkBox = 0;
|
|
|
|
|
|
|
|
//JP 12.01.99: hat sich der Inhalt der Box ueberhaupt veraendert?
|
|
|
|
// Ist wichtig, wenn z.B. Undo nicht den richtigen Inhalt wieder
|
|
|
|
// herstellen konnte.
|
|
|
|
if( pChkBox )
|
|
|
|
{
|
|
|
|
const SwTxtNode* pNd = GetDoc()->GetNodes()[
|
|
|
|
pSttNd->GetIndex() + 1 ]->GetTxtNode();
|
|
|
|
if( !pNd ||
|
|
|
|
( pNd->GetTxt() == ViewShell::GetShellRes()->aCalc_Error &&
|
|
|
|
SFX_ITEM_SET == pChkBox->GetFrmFmt()->
|
|
|
|
GetItemState( RES_BOXATR_FORMULA )) )
|
|
|
|
pChkBox = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( pChkBox )
|
|
|
|
{
|
|
|
|
// jetzt sollten wir mal die Pointer zerstoeren, bevor ein weiterer
|
|
|
|
// aufruf kommt.
|
|
|
|
ClearTblBoxCntnt();
|
|
|
|
StartAction();
|
|
|
|
GetDoc()->ChkBoxNumFmt( *pChkBox, TRUE );
|
|
|
|
EndAction();
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0 != pChkBox;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
|
|
|
|
{
|
|
|
|
if( IsSelTblCells() || !IsAutoUpdateCells() )
|
|
|
|
return ;
|
|
|
|
|
|
|
|
if( !pPos )
|
|
|
|
pPos = pCurCrsr->GetPoint();
|
|
|
|
|
|
|
|
SwStartNode* pSttNd = pPos->nNode.GetNode().FindSttNodeByType( SwTableBoxStartNode );
|
|
|
|
|
|
|
|
BOOL bCheckBox = FALSE;
|
|
|
|
if( pSttNd && pBoxIdx )
|
|
|
|
{
|
|
|
|
if( pSttNd == &pBoxIdx->GetNode() )
|
|
|
|
pSttNd = 0; // die haben wir schon
|
|
|
|
else
|
|
|
|
bCheckBox = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
bCheckBox = 0 != pBoxIdx;
|
|
|
|
|
|
|
|
if( bCheckBox )
|
|
|
|
{
|
|
|
|
// pBoxIdx Checken
|
|
|
|
SwPosition aPos( *pBoxIdx );
|
|
|
|
CheckTblBoxCntnt( &aPos );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( pSttNd )
|
|
|
|
{
|
|
|
|
pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
|
|
|
|
|
|
|
|
if( pBoxIdx )
|
|
|
|
*pBoxIdx = *pSttNd;
|
|
|
|
else
|
|
|
|
pBoxIdx = new SwNodeIndex( *pSttNd );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwCrsrShell::ClearTblBoxCntnt()
|
|
|
|
{
|
|
|
|
delete pBoxIdx, pBoxIdx = 0;
|
|
|
|
pBoxPtr = 0;
|
|
|
|
}
|
|
|
|
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL SwCrsrShell::EndAllTblBoxEdit()
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 07:31:26 +00:00
|
|
|
BOOL bRet = FALSE;
|
2000-09-18 23:08:29 +00:00
|
|
|
ViewShell *pSh = this;
|
|
|
|
do {
|
|
|
|
if( pSh->IsA( TYPE( SwCrsrShell ) ) )
|
|
|
|
bRet |= ((SwCrsrShell*)pSh)->CheckTblBoxCntnt(
|
|
|
|
((SwCrsrShell*)pSh)->pCurCrsr->GetPoint() );
|
|
|
|
|
|
|
|
} while( this != (pSh = (ViewShell *)pSh->GetNext()) );
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|