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 12:52:18 +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 12:52:18 +00:00
|
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 23:08:29 +00:00
|
|
|
|
*
|
2008-04-10 12:52:18 +00:00
|
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 23:08:29 +00:00
|
|
|
|
*
|
2008-04-10 12:52:18 +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:52:18 +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:52:18 +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
|
|
|
|
*
|
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include <float.h>
|
|
|
|
|
#include <hintids.hxx>
|
2008-03-05 16:01:17 +00:00
|
|
|
|
#include <hints.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
|
#include <fmtfld.hxx>
|
|
|
|
|
#include <txtfld.hxx>
|
|
|
|
|
#include <frmfmt.hxx>
|
|
|
|
|
#include <layfrm.hxx>
|
|
|
|
|
#include <cntfrm.hxx>
|
|
|
|
|
#include <tabfrm.hxx>
|
|
|
|
|
#include <doc.hxx>
|
|
|
|
|
#include <docary.hxx>
|
|
|
|
|
#include <ndtxt.hxx>
|
|
|
|
|
#include <swtable.hxx>
|
|
|
|
|
#include <tblsel.hxx>
|
|
|
|
|
#include <cellfml.hxx>
|
|
|
|
|
#include <calc.hxx>
|
|
|
|
|
#include <expfld.hxx>
|
|
|
|
|
#include <usrfld.hxx>
|
|
|
|
|
#include <flddat.hxx>
|
|
|
|
|
#include <cellatr.hxx>
|
|
|
|
|
#include <ndindex.hxx>
|
2012-01-02 10:55:27 +00:00
|
|
|
|
#include <comphelper/string.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
const sal_Unicode cRelTrenner = ',';
|
|
|
|
|
const sal_Unicode cRelKennung = ''; // CTRL-R
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
|
const sal_uInt16 cMAXSTACKSIZE = 50;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
|
|
|
|
|
long lcl_GetLongBoxNum( String& rStr );
|
|
|
|
|
const SwTableBox* lcl_RelToBox( const SwTable&, const SwTableBox*, const String& );
|
|
|
|
|
String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
|
2010-09-30 18:29:08 +02:00
|
|
|
|
const String& , const String& , bool );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|
|*
|
|
|
|
|
|* double SwTableBox::GetValue() const
|
|
|
|
|
|* gebe den Wert dieser Box zurueck. Der Wert ergibt sich aus dem 1.
|
|
|
|
|
|* TextNode. Beginnt dieser mit einer Zahl/Formel, so berechne diese;
|
|
|
|
|
|* oder mit einem Feld, dann hole den Wert.
|
|
|
|
|
|* Alle anderen Bedingungen returnen einen Fehler (oder 0 ?)
|
|
|
|
|
|*
|
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
|
|
|
|
|
{
|
|
|
|
|
double nRet = 0;
|
|
|
|
|
|
|
|
|
|
if( rCalcPara.rCalc.IsCalcError() )
|
|
|
|
|
return nRet; // schon ein Fehler in der Berechnung
|
|
|
|
|
|
|
|
|
|
rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default immer Fehler
|
|
|
|
|
|
|
|
|
|
// keine Content Box ?
|
|
|
|
|
if( !pSttNd )
|
|
|
|
|
return nRet;
|
|
|
|
|
|
|
|
|
|
if( rCalcPara.IncStackCnt() )
|
|
|
|
|
return nRet;
|
|
|
|
|
|
|
|
|
|
rCalcPara.SetLastTblBox( this );
|
|
|
|
|
|
|
|
|
|
// wird eine Rekursion erzeugt ?
|
|
|
|
|
SwTableBox* pBox = (SwTableBox*)this;
|
|
|
|
|
if( rCalcPara.pBoxStk->Seek_Entry( pBox ))
|
|
|
|
|
return nRet; // steht schon auf dem Stack: FEHLER
|
|
|
|
|
|
|
|
|
|
// bei dieser Box nochmal aufsetzen
|
|
|
|
|
rCalcPara.SetLastTblBox( this );
|
|
|
|
|
|
|
|
|
|
rCalcPara.pBoxStk->Insert( pBox ); // eintragen
|
|
|
|
|
do { // Middle-Check-Loop, damit aus dieser gesprungen werden kann
|
|
|
|
|
// hier aufgespannt, damit am Ende der Box-Pointer aus dem
|
|
|
|
|
// Stack ausgetragen wird
|
|
|
|
|
SwDoc* pDoc = GetFrmFmt()->GetDoc();
|
|
|
|
|
|
|
|
|
|
const SfxPoolItem* pItem;
|
|
|
|
|
if( SFX_ITEM_SET == GetFrmFmt()->GetItemState(
|
2011-01-17 15:06:54 +01:00
|
|
|
|
RES_BOXATR_FORMULA, sal_False, &pItem ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
|
|
|
|
|
if( !((SwTblBoxFormula*)pItem)->IsValid() )
|
|
|
|
|
{
|
|
|
|
|
// dann berechnen
|
|
|
|
|
const SwTable* pTmp = rCalcPara.pTbl;
|
|
|
|
|
rCalcPara.pTbl = &pBox->GetSttNd()->FindTableNode()->GetTable();
|
|
|
|
|
((SwTblBoxFormula*)pItem)->Calc( rCalcPara, nRet );
|
|
|
|
|
|
|
|
|
|
if( !rCalcPara.IsStackOverFlow() )
|
|
|
|
|
{
|
|
|
|
|
SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
|
|
|
|
|
SfxItemSet aTmp( pDoc->GetAttrPool(),
|
|
|
|
|
RES_BOXATR_BEGIN,RES_BOXATR_END-1 );
|
|
|
|
|
aTmp.Put( SwTblBoxValue( nRet ) );
|
|
|
|
|
if( SFX_ITEM_SET != pFmt->GetItemState( RES_BOXATR_FORMAT ))
|
|
|
|
|
aTmp.Put( SwTblBoxNumFormat( 0 ));
|
2008-06-13 08:45:38 +00:00
|
|
|
|
pFmt->SetFmtAttr( aTmp );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
rCalcPara.pTbl = pTmp;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
nRet = GetFrmFmt()->GetTblBoxValue().GetValue();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
|
2011-01-17 15:06:54 +01:00
|
|
|
|
RES_BOXATR_VALUE, sal_False, &pItem ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
|
|
|
|
|
nRet = ((SwTblBoxValue*)pItem)->GetValue();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SwTxtNode* pTxtNd = pDoc->GetNodes()[ pSttNd->GetIndex() + 1 ]->GetTxtNode();
|
|
|
|
|
if( !pTxtNd )
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
xub_StrLen nSttPos = 0;
|
|
|
|
|
const String& rTxt = pTxtNd->GetTxt();
|
|
|
|
|
while( nSttPos < rTxt.Len() &&
|
|
|
|
|
( ' ' == rTxt.GetChar( nSttPos ) || '\t' == rTxt.GetChar( nSttPos ) ) )
|
|
|
|
|
++nSttPos;
|
|
|
|
|
|
|
|
|
|
// beginnt an erster Position ein "RechenFeld", dann erfrage den Wert
|
|
|
|
|
// von diesem
|
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
|
|
|
|
sal_Unicode const Char = rTxt.GetChar(nSttPos);
|
|
|
|
|
if ( nSttPos < rTxt.Len() &&
|
|
|
|
|
( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
SwIndex aIdx( pTxtNd, nSttPos );
|
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
|
|
|
|
SwTxtFld * const pTxtFld = static_cast<SwTxtFld*>(
|
|
|
|
|
pTxtNd->GetTxtAttrForCharAt(aIdx.GetIndex(), RES_TXTATR_FIELD));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( !pTxtFld )
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
|
|
|
|
|
|
|
|
|
|
const SwField* pFld = pTxtFld->GetFld().GetFld();
|
|
|
|
|
switch( pFld->GetTyp()->Which() )
|
|
|
|
|
{
|
|
|
|
|
case RES_SETEXPFLD:
|
|
|
|
|
nRet = ((SwSetExpField*)pFld)->GetValue();
|
|
|
|
|
break;
|
|
|
|
|
case RES_USERFLD:
|
|
|
|
|
nRet = ((SwUserFieldType*)pFld)->GetValue();
|
|
|
|
|
break;
|
|
|
|
|
case RES_TABLEFLD:
|
|
|
|
|
{
|
|
|
|
|
SwTblField* pTblFld = (SwTblField*)pFld;
|
|
|
|
|
if( !pTblFld->IsValid() ) // ist der Wert gueltig ??
|
|
|
|
|
{
|
|
|
|
|
// die richtige Tabelle mitgeben!
|
|
|
|
|
const SwTable* pTmp = rCalcPara.pTbl;
|
|
|
|
|
rCalcPara.pTbl = &pTxtNd->FindTableNode()->GetTable();
|
|
|
|
|
pTblFld->CalcField( rCalcPara );
|
|
|
|
|
rCalcPara.pTbl = pTmp;
|
|
|
|
|
}
|
|
|
|
|
nRet = pTblFld->GetValue();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RES_DATETIMEFLD:
|
|
|
|
|
nRet = ((SwDateTimeField*)pFld)->GetValue();
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RES_JUMPEDITFLD:
|
|
|
|
|
//JP 14.09.98: Bug 56112 - der Platzhalter kann nie einen
|
|
|
|
|
// gueltigen Inhalt haben!
|
|
|
|
|
nRet = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2010-10-22 17:53:18 +02:00
|
|
|
|
String const value(pFld->ExpandField(true));
|
2010-05-21 15:21:49 +02:00
|
|
|
|
nRet = rCalcPara.rCalc.Calculate(value).GetDouble();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// Ergebnis ist 0 und kein Fehler!
|
|
|
|
|
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
|
|
|
|
|
|
|
|
|
|
double aNum;
|
|
|
|
|
String sTxt( rTxt.Copy( nSttPos ) );
|
2005-12-14 13:48:32 +00:00
|
|
|
|
sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
|
|
|
|
|
|
|
|
|
|
if( NUMBERFORMAT_TEXT == nFmtIndex )
|
|
|
|
|
nFmtIndex = 0;
|
|
|
|
|
// JP 22.04.98: Bug 49659 - Sonderbehandlung fuer Prozent
|
|
|
|
|
else if( sTxt.Len() &&
|
|
|
|
|
NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex ))
|
|
|
|
|
{
|
2005-12-14 13:48:32 +00:00
|
|
|
|
sal_uInt32 nTmpFmt = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) &&
|
|
|
|
|
NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt ))
|
|
|
|
|
sTxt += '%';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( pNumFmtr->IsNumberFormat( sTxt, nFmtIndex, aNum ))
|
|
|
|
|
nRet = aNum;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ?? sonst ist das ein Fehler
|
2011-01-17 15:06:54 +01:00
|
|
|
|
} while( sal_False );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
if( !rCalcPara.IsStackOverFlow() )
|
|
|
|
|
{
|
|
|
|
|
rCalcPara.pBoxStk->Remove( pBox ); // raus aus dem Stack
|
|
|
|
|
rCalcPara.DecStackCnt();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//JP 12.01.99: mit Fehlererkennung, Bug 60794
|
|
|
|
|
if( DBL_MAX == nRet )
|
|
|
|
|
rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
|
|
|
|
|
|
|
|
|
|
return nRet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Struktur, die zum TabelleRechnen benoetigt wird
|
|
|
|
|
|
|
|
|
|
SwTblCalcPara::SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable )
|
2007-09-27 07:47:50 +00:00
|
|
|
|
: pLastTblBox( 0 ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
|
|
|
|
|
rCalc( rCalculator ), pTbl( &rTable )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
pBoxStk = new SwTableSortBoxes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SwTblCalcPara::~SwTblCalcPara()
|
|
|
|
|
{
|
|
|
|
|
delete pBoxStk;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_Bool SwTblCalcPara::CalcWithStackOverflow()
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
// falls ein StackUeberlauf erkannt wurde, sollte mit
|
|
|
|
|
// der letzten Box noch mal aufgesetzt werden. Irgend
|
|
|
|
|
// ein Weg sollte dann
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nSaveMaxSize = nMaxSize;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
nMaxSize = cMAXSTACKSIZE - 5;
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nCnt = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
SwTableBoxes aStackOverFlows;
|
|
|
|
|
do {
|
|
|
|
|
SwTableBox* pBox = (SwTableBox*)pLastTblBox;
|
|
|
|
|
nStackCnt = 0;
|
|
|
|
|
rCalc.SetCalcError( CALC_NOERR );
|
2012-05-10 17:42:10 +02:00
|
|
|
|
aStackOverFlows.insert( aStackOverFlows.begin() + nCnt++, pBox );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
pBoxStk->Remove( pBox );
|
|
|
|
|
pBox->GetValue( *this );
|
|
|
|
|
} while( IsStackOverFlow() );
|
|
|
|
|
|
|
|
|
|
nMaxSize = cMAXSTACKSIZE - 3; // es muss mind. 1 Stufe tiefer gehen!
|
|
|
|
|
|
|
|
|
|
// falls Rekursionen erkannt wurden
|
|
|
|
|
nStackCnt = 0;
|
|
|
|
|
rCalc.SetCalcError( CALC_NOERR );
|
2011-01-17 15:06:54 +01:00
|
|
|
|
pBoxStk->Remove( sal_uInt16(0), pBoxStk->Count() );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
while( !rCalc.IsCalcError() && nCnt )
|
|
|
|
|
{
|
|
|
|
|
aStackOverFlows[ --nCnt ]->GetValue( *this );
|
|
|
|
|
if( IsStackOverFlow() && !CalcWithStackOverflow() )
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nMaxSize = nSaveMaxSize;
|
2012-05-10 17:42:10 +02:00
|
|
|
|
aStackOverFlows.clear();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
return !rCalc.IsCalcError();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SwTableFormula::SwTableFormula( const String& rFormel )
|
|
|
|
|
: sFormel( rFormel )
|
|
|
|
|
{
|
|
|
|
|
eNmType = EXTRNL_NAME;
|
2010-09-30 18:29:08 +02:00
|
|
|
|
bValidValue = false;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-13 15:35:25 +00:00
|
|
|
|
SwTableFormula::~SwTableFormula()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
SwTblCalcPara* pCalcPara = (SwTblCalcPara*)pPara;
|
|
|
|
|
if( pCalcPara->rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
SwTableBox* pSttBox, *pEndBox = 0;
|
|
|
|
|
|
|
|
|
|
rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
|
|
|
|
|
// ein Bereich in dieser Klammer ?
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
// ist das ueberhaupt ein gueltiger Pointer ??
|
|
|
|
|
if( !rTbl.GetTabSortBoxes().Seek_Entry( pEndBox ))
|
|
|
|
|
pEndBox = 0;
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
// ist das ueberhaupt ein gueltiger Pointer ??
|
|
|
|
|
if( !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ))
|
|
|
|
|
pSttBox = 0;
|
|
|
|
|
|
|
|
|
|
rNewStr += ' ';
|
|
|
|
|
if( pEndBox && pSttBox ) // Bereich ?
|
|
|
|
|
{
|
|
|
|
|
// hole ueber das Layout alle "selectierten" Boxen und berechne
|
|
|
|
|
// deren Werte
|
|
|
|
|
SwSelBoxes aBoxes;
|
|
|
|
|
GetBoxes( *pSttBox, *pEndBox, aBoxes );
|
|
|
|
|
|
|
|
|
|
rNewStr += '(';
|
2007-02-28 14:42:54 +00:00
|
|
|
|
bool bDelim = false;
|
2012-05-05 10:25:52 +01:00
|
|
|
|
for( sal_uInt16 n = 0; n < aBoxes.Count() &&
|
|
|
|
|
!pCalcPara->rCalc.IsCalcError(); ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
2012-05-05 10:25:52 +01:00
|
|
|
|
const SwTableBox* pTblBox = aBoxes[n];
|
2007-02-28 14:42:54 +00:00
|
|
|
|
if ( pTblBox->getRowSpan() >= 1 )
|
|
|
|
|
{
|
|
|
|
|
if( bDelim )
|
|
|
|
|
rNewStr += cListDelim;
|
|
|
|
|
bDelim = true;
|
|
|
|
|
rNewStr += pCalcPara->rCalc.GetStrResult(
|
2011-01-17 15:06:54 +01:00
|
|
|
|
pTblBox->GetValue( *pCalcPara ), sal_False );
|
2007-02-28 14:42:54 +00:00
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
rNewStr += ')';
|
|
|
|
|
}
|
|
|
|
|
else if( pSttBox && !pLastBox ) // nur die StartBox ?
|
2009-07-03 14:04:55 +00:00
|
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
|
//JP 12.01.99: und keine EndBox in der Formel!
|
|
|
|
|
// Berechne den Wert der Box
|
2007-02-28 14:42:54 +00:00
|
|
|
|
if ( pSttBox->getRowSpan() >= 1 )
|
|
|
|
|
{
|
|
|
|
|
rNewStr += pCalcPara->rCalc.GetStrResult(
|
2011-01-17 15:06:54 +01:00
|
|
|
|
pSttBox->GetValue( *pCalcPara ), sal_False );
|
2007-02-28 14:42:54 +00:00
|
|
|
|
}
|
2009-07-03 14:04:55 +00:00
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
else
|
|
|
|
|
pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
|
|
|
|
|
rNewStr += ' ';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
// relativen Namen zu Box-Namen (externe Darstellung)
|
|
|
|
|
SwNode* pNd = (SwNode*)pPara;
|
2010-11-25 17:08:45 +01:00
|
|
|
|
OSL_ENSURE( pNd, "Feld steht in keinem TextNode" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
const SwTableBox *pRelBox, *pBox = (SwTableBox *)rTbl.GetTblBox(
|
|
|
|
|
pNd->FindTableBoxStartNode()->GetIndex() );
|
|
|
|
|
|
|
|
|
|
rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
|
|
|
|
|
rFirstBox.Erase(0,1);
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
|
|
|
|
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) )
|
|
|
|
|
rNewStr += pRelBox->GetName();
|
|
|
|
|
else
|
|
|
|
|
rNewStr.AppendAscii("A1");
|
|
|
|
|
rNewStr += ':';
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) )
|
|
|
|
|
rNewStr += pRelBox->GetName();
|
|
|
|
|
else
|
|
|
|
|
rNewStr.AppendAscii("A1");
|
|
|
|
|
|
|
|
|
|
// Kennung fuer Box erhalten
|
|
|
|
|
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
// relativen Namen zu Box-Pointern (interne Darstellung)
|
|
|
|
|
SwNode* pNd = (SwNode*)pPara;
|
2010-11-25 17:08:45 +01:00
|
|
|
|
OSL_ENSURE( pNd, "Feld steht in keinem Node" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
const SwTableBox *pRelBox, *pBox = (SwTableBox*)rTbl.GetTblBox(
|
|
|
|
|
pNd->FindTableBoxStartNode()->GetIndex() );
|
|
|
|
|
|
|
|
|
|
rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
|
|
|
|
|
rFirstBox.Erase(0,1);
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
|
|
|
|
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) )
|
2012-02-26 20:45:18 +00:00
|
|
|
|
rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
else
|
|
|
|
|
rNewStr += '0';
|
|
|
|
|
rNewStr += ':';
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) )
|
2012-02-26 20:45:18 +00:00
|
|
|
|
rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
else
|
|
|
|
|
rNewStr += '0';
|
|
|
|
|
|
|
|
|
|
// Kennung fuer Box erhalten
|
|
|
|
|
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
// Box-Namen (externe Darstellung) zu relativen Namen
|
|
|
|
|
SwNode* pNd = (SwNode*)pPara;
|
2010-11-25 17:08:45 +01:00
|
|
|
|
OSL_ENSURE( pNd, "Feld steht in keinem Node" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
const SwTableNode* pTblNd = pNd->FindTableNode();
|
|
|
|
|
|
|
|
|
|
String sRefBoxNm;
|
|
|
|
|
if( &pTblNd->GetTable() == &rTbl )
|
|
|
|
|
{
|
|
|
|
|
const SwTableBox *pBox = rTbl.GetTblBox(
|
|
|
|
|
pNd->FindTableBoxStartNode()->GetIndex() );
|
2010-11-25 17:08:45 +01:00
|
|
|
|
OSL_ENSURE( pBox, "Feld steht in keiner Tabelle" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
sRefBoxNm = pBox->GetName();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
|
|
|
|
|
rFirstBox.Erase(0,1);
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
|
|
|
|
rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, *pLastBox,
|
|
|
|
|
eNmType == EXTRNL_NAME );
|
|
|
|
|
rNewStr += ':';
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, rFirstBox,
|
|
|
|
|
eNmType == EXTRNL_NAME );
|
|
|
|
|
|
|
|
|
|
// Kennung fuer Box erhalten
|
|
|
|
|
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* ) const
|
|
|
|
|
{
|
|
|
|
|
// ein Bereich in dieser Klammer ?
|
|
|
|
|
SwTableBox* pBox;
|
|
|
|
|
|
|
|
|
|
rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
|
|
|
|
|
rFirstBox.Erase(0,1);
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
// ist das ueberhaupt ein gueltiger Pointer ??
|
|
|
|
|
if( rTbl.GetTabSortBoxes().Seek_Entry( pBox ))
|
|
|
|
|
rNewStr += pBox->GetName();
|
|
|
|
|
else
|
|
|
|
|
rNewStr += '?';
|
|
|
|
|
rNewStr += ':';
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
// ist das ueberhaupt ein gueltiger Pointer ??
|
|
|
|
|
if( rTbl.GetTabSortBoxes().Seek_Entry( pBox ))
|
|
|
|
|
rNewStr += pBox->GetName();
|
|
|
|
|
else
|
|
|
|
|
rNewStr += '?';
|
|
|
|
|
|
|
|
|
|
// Kennung fuer Box erhalten
|
|
|
|
|
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* ) const
|
|
|
|
|
{
|
|
|
|
|
// ein Bereich in dieser Klammer ?
|
|
|
|
|
const SwTableBox* pBox;
|
|
|
|
|
|
|
|
|
|
rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
|
|
|
|
|
rFirstBox.Erase(0,1);
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
|
|
|
|
pBox = rTbl.GetTblBox( *pLastBox );
|
2012-02-26 20:45:18 +00:00
|
|
|
|
rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
rNewStr += ':';
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pBox = rTbl.GetTblBox( rFirstBox );
|
2012-02-26 20:45:18 +00:00
|
|
|
|
rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
// Kennung fuer Box erhalten
|
|
|
|
|
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// erzeuge die externe (fuer UI) Formel
|
|
|
|
|
void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pNd = 0;
|
|
|
|
|
FnScanFormel fnFormel = 0;
|
|
|
|
|
switch( eNmType)
|
|
|
|
|
{
|
|
|
|
|
case INTRNL_NAME:
|
|
|
|
|
if( pTbl )
|
|
|
|
|
fnFormel = &SwTableFormula::PtrToBoxNms;
|
|
|
|
|
break;
|
|
|
|
|
case REL_NAME:
|
|
|
|
|
if( pTbl )
|
|
|
|
|
{
|
|
|
|
|
fnFormel = &SwTableFormula::RelNmsToBoxNms;
|
|
|
|
|
pNd = GetNodeOfFormula();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case EXTRNL_NAME:
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
sFormel = ScanString( fnFormel, *pTbl, (void*)pNd );
|
|
|
|
|
eNmType = EXTRNL_NAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// erzeuge die interne (in CORE) Formel
|
|
|
|
|
void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pNd = 0;
|
|
|
|
|
FnScanFormel fnFormel = 0;
|
|
|
|
|
switch( eNmType)
|
|
|
|
|
{
|
|
|
|
|
case EXTRNL_NAME:
|
|
|
|
|
if( pTbl )
|
|
|
|
|
fnFormel = &SwTableFormula::BoxNmsToPtr;
|
|
|
|
|
break;
|
|
|
|
|
case REL_NAME:
|
|
|
|
|
if( pTbl )
|
|
|
|
|
{
|
|
|
|
|
fnFormel = &SwTableFormula::RelBoxNmsToPtr;
|
|
|
|
|
pNd = GetNodeOfFormula();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case INTRNL_NAME:
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
sFormel = ScanString( fnFormel, *pTbl, (void*)pNd );
|
|
|
|
|
eNmType = INTRNL_NAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// erzeuge die relative (fuers Kopieren) Formel
|
|
|
|
|
void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pNd = 0;
|
|
|
|
|
FnScanFormel fnFormel = 0;
|
|
|
|
|
switch( eNmType)
|
|
|
|
|
{
|
|
|
|
|
case INTRNL_NAME:
|
|
|
|
|
case EXTRNL_NAME:
|
|
|
|
|
if( pTbl )
|
|
|
|
|
{
|
|
|
|
|
fnFormel = &SwTableFormula::BoxNmsToRelNm;
|
|
|
|
|
pNd = GetNodeOfFormula();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case REL_NAME:
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
sFormel = ScanString( fnFormel, *pTbl, (void*)pNd );
|
|
|
|
|
eNmType = REL_NAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
|
|
|
|
|
void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
String aStr;
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nFml = 0, nStt = 0, nEnd = 0, nTrenner;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
// falls der Formel ein Name vorangestellt ist, diese Tabelle
|
|
|
|
|
// benutzen !!
|
|
|
|
|
const SwTable* pTbl = &rTbl;
|
|
|
|
|
|
|
|
|
|
nStt = sFormel.Search( '<', nFml );
|
|
|
|
|
if( STRING_NOTFOUND != nStt )
|
|
|
|
|
{
|
|
|
|
|
while( STRING_NOTFOUND != nStt &&
|
|
|
|
|
( ' ' == sFormel.GetChar( nStt + 1 ) ||
|
|
|
|
|
'=' == sFormel.GetChar( nStt + 1 ) ) )
|
|
|
|
|
nStt = sFormel.Search( '<', nStt + 1 );
|
|
|
|
|
|
|
|
|
|
if( STRING_NOTFOUND != nStt )
|
|
|
|
|
nEnd = sFormel.Search( '>', nStt+1 );
|
|
|
|
|
}
|
|
|
|
|
if( STRING_NOTFOUND == nStt || STRING_NOTFOUND == nEnd )
|
|
|
|
|
{
|
|
|
|
|
// den Rest setzen und beenden
|
|
|
|
|
aStr.Insert( sFormel, nFml, sFormel.Len() - nFml );
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
aStr.Insert( sFormel, nFml, nStt - nFml ); // Anfang schreiben
|
|
|
|
|
|
2011-10-20 08:33:15 +03:00
|
|
|
|
if( fnFormel != 0 )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
// ist ein TabellenName vorangestellt ??
|
|
|
|
|
// JP 16.02.99: SplitMergeBoxNm behandeln den Namen selbst
|
|
|
|
|
// JP 22.02.99: der CAST muss fuer den Linux-Compiler sein
|
|
|
|
|
// JP 28.06.99: rel. BoxName have no preceding tablename!
|
|
|
|
|
if( fnFormel != (FnScanFormel)&SwTableFormula::_SplitMergeBoxNm &&
|
|
|
|
|
1 < sFormel.Len() && cRelKennung != sFormel.GetChar( 1 ) &&
|
|
|
|
|
STRING_NOTFOUND != ( nTrenner = sFormel.Search( '.', nStt ))
|
|
|
|
|
&& nTrenner < nEnd )
|
|
|
|
|
{
|
|
|
|
|
String sTblNm( sFormel.Copy( nStt, nEnd - nStt ));
|
|
|
|
|
|
|
|
|
|
// falls im Namen schon die Punkte enthalten sind,
|
|
|
|
|
// treten diese immer paarig auf!!! (A1.1.1 !!)
|
2012-01-02 10:55:27 +00:00
|
|
|
|
if( (comphelper::string::getTokenCount(sTblNm, '.') - 1) & 1 )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
sTblNm.Erase( nTrenner - nStt );
|
|
|
|
|
|
|
|
|
|
// beim Bauen der Formel ist der TabellenName unerwuenscht
|
|
|
|
|
//JP 22.02.99: der CAST muss fuer den Linux-Compiler sein
|
|
|
|
|
if( fnFormel != (FnScanFormel)&SwTableFormula::_MakeFormel )
|
|
|
|
|
aStr += sTblNm;
|
|
|
|
|
nStt = nTrenner;
|
|
|
|
|
|
|
|
|
|
sTblNm.Erase( 0, 1 ); // Trenner loeschen
|
|
|
|
|
if( sTblNm != rTbl.GetFrmFmt()->GetName() )
|
|
|
|
|
{
|
|
|
|
|
// dann suchen wir uns mal unsere Tabelle:
|
|
|
|
|
const SwTable* pFnd = FindTable(
|
|
|
|
|
*rTbl.GetFrmFmt()->GetDoc(),
|
|
|
|
|
sTblNm );
|
|
|
|
|
if( pFnd )
|
|
|
|
|
pTbl = pFnd;
|
|
|
|
|
// ??
|
2010-11-25 17:08:45 +01:00
|
|
|
|
OSL_ENSURE( pFnd, "Tabelle nicht gefunden, was nun?" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String sBox( sFormel.Copy( nStt, nEnd - nStt + 1 ));
|
|
|
|
|
// ein Bereich in dieser Klammer ?
|
|
|
|
|
if( STRING_NOTFOUND != ( nTrenner = sFormel.Search( ':', nStt ))
|
|
|
|
|
&& nTrenner < nEnd )
|
|
|
|
|
{
|
|
|
|
|
// ohne die Anfangsklammer
|
|
|
|
|
String aFirstBox( sFormel.Copy( nStt+1, nTrenner - nStt - 1 ));
|
|
|
|
|
(this->*fnFormel)( *pTbl, aStr, sBox, &aFirstBox, pPara );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
(this->*fnFormel)( *pTbl, aStr, sBox, 0, pPara );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nFml = nEnd+1;
|
2011-01-17 15:06:54 +01:00
|
|
|
|
} while( sal_True );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
return aStr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const String& rNm ) const
|
|
|
|
|
{
|
|
|
|
|
const SwFrmFmts& rTblFmts = *rDoc.GetTblFrmFmts();
|
|
|
|
|
const SwTable* pTmpTbl, *pRet = 0;
|
2012-06-20 16:36:51 +02:00
|
|
|
|
for( sal_uInt16 nFmtCnt = rTblFmts.size(); nFmtCnt; )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
SwFrmFmt* pFmt = rTblFmts[ --nFmtCnt ];
|
|
|
|
|
// falls wir von Sw3Writer gerufen werden, dann ist dem
|
|
|
|
|
// FormatNamen eine Nummer anhaengig
|
|
|
|
|
SwTableBox* pFBox;
|
|
|
|
|
if( COMPARE_EQUAL == rNm.CompareTo( pFmt->GetName(),
|
|
|
|
|
pFmt->GetName().Search( 0x0a ) ) &&
|
|
|
|
|
0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
|
|
|
|
|
0 != (pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
|
|
|
|
|
pFBox->GetSttNd() &&
|
|
|
|
|
pFBox->GetSttNd()->GetNodes().IsDocNodes() )
|
|
|
|
|
{
|
|
|
|
|
// eine Tabelle im normalen NodesArr
|
|
|
|
|
pRet = pTmpTbl;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return pRet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
|
|
|
|
|
{
|
|
|
|
|
SwNodeIndex aIdx( *rBox.GetSttNd() );
|
|
|
|
|
SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
|
2010-11-25 17:08:45 +01:00
|
|
|
|
OSL_ENSURE( pCNd, "Box hat keinen TextNode" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
|
2011-02-09 15:55:27 +01:00
|
|
|
|
return pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, NULL, sal_False );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long lcl_GetLongBoxNum( String& rStr )
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nPos;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
long nRet;
|
|
|
|
|
if( STRING_NOTFOUND == ( nPos = rStr.Search( cRelTrenner ) ))
|
|
|
|
|
{
|
|
|
|
|
nRet = rStr.ToInt32();
|
|
|
|
|
rStr.Erase();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nRet = rStr.Copy( 0, nPos ).ToInt32();
|
|
|
|
|
rStr.Erase( 0, nPos+1 );
|
|
|
|
|
}
|
|
|
|
|
return nRet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
|
|
|
|
|
const SwTableBox* pRefBox,
|
|
|
|
|
const String& rGetName )
|
|
|
|
|
{
|
|
|
|
|
// hole die Line
|
|
|
|
|
const SwTableBox* pBox = 0;
|
|
|
|
|
String sGetName( rGetName );
|
|
|
|
|
|
|
|
|
|
// ist es denn wirklich eine relative Angabe??
|
|
|
|
|
if( cRelKennung == sGetName.GetChar(0) ) // ja, ...
|
|
|
|
|
{
|
|
|
|
|
if( !pRefBox )
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
sGetName.Erase( 0, 1 );
|
|
|
|
|
|
|
|
|
|
const SwTableLines* pLines = (SwTableLines*)&rTbl.GetTabLines();
|
|
|
|
|
const SwTableBoxes* pBoxes;
|
|
|
|
|
const SwTableLine* pLine;
|
|
|
|
|
|
|
|
|
|
// bestimme erst mal die Start-Werte der Box:
|
|
|
|
|
pBox = (SwTableBox*)pRefBox;
|
|
|
|
|
pLine = pBox->GetUpper();
|
|
|
|
|
while( pLine->GetUpper() )
|
|
|
|
|
{
|
|
|
|
|
pBox = pLine->GetUpper();
|
|
|
|
|
pLine = pBox->GetUpper();
|
|
|
|
|
}
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nSttBox = pLine->GetTabBoxes().GetPos( pBox );
|
|
|
|
|
sal_uInt16 nSttLine = rTbl.GetTabLines().GetPos( pLine );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
long nBoxOffset = lcl_GetLongBoxNum( sGetName ) + nSttBox;
|
|
|
|
|
long nLineOffset = lcl_GetLongBoxNum( sGetName ) + nSttLine;
|
|
|
|
|
|
|
|
|
|
if( nBoxOffset < 0 || nBoxOffset >= USHRT_MAX ||
|
|
|
|
|
nLineOffset < 0 || nLineOffset >= USHRT_MAX )
|
|
|
|
|
return 0;
|
|
|
|
|
|
2012-06-18 18:04:44 +02:00
|
|
|
|
if( nLineOffset >= long(pLines->size()) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
|
pLine = (*pLines)[ sal_uInt16(nLineOffset) ];
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
// dann suche die Box
|
|
|
|
|
pBoxes = &pLine->GetTabBoxes();
|
2012-05-10 17:42:10 +02:00
|
|
|
|
if( nBoxOffset >= long(pBoxes->size()) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
return 0;
|
2011-01-17 15:06:54 +01:00
|
|
|
|
pBox = (*pBoxes)[ sal_uInt16(nBoxOffset) ];
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
while( sGetName.Len() )
|
|
|
|
|
{
|
|
|
|
|
nSttBox = SwTable::_GetBoxNum( sGetName );
|
|
|
|
|
pLines = &pBox->GetTabLines();
|
|
|
|
|
if( nSttBox )
|
|
|
|
|
--nSttBox;
|
|
|
|
|
|
|
|
|
|
nSttLine = SwTable::_GetBoxNum( sGetName );
|
|
|
|
|
|
|
|
|
|
// bestimme die Line
|
2012-06-18 18:04:44 +02:00
|
|
|
|
if( !nSttLine || nSttLine > pLines->size() )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
break;
|
|
|
|
|
pLine = (*pLines)[ nSttLine-1 ];
|
|
|
|
|
|
|
|
|
|
// bestimme die Box
|
|
|
|
|
pBoxes = &pLine->GetTabBoxes();
|
2012-05-10 17:42:10 +02:00
|
|
|
|
if( nSttBox >= pBoxes->size() )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
break;
|
|
|
|
|
pBox = (*pBoxes)[ nSttBox ];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( pBox )
|
|
|
|
|
{
|
|
|
|
|
if( !pBox->GetSttNd() )
|
|
|
|
|
// "herunterfallen lassen" bis zur ersten Box
|
2012-06-18 18:04:44 +02:00
|
|
|
|
while( !pBox->GetTabLines().empty() )
|
|
|
|
|
pBox = pBox->GetTabLines().front()->GetTabBoxes().front();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// sonst ist es eine absolute externe Darstellung:
|
|
|
|
|
pBox = rTbl.GetTblBox( sGetName );
|
|
|
|
|
}
|
|
|
|
|
return pBox;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
|
|
|
|
|
const String& rRefBoxNm, const String& rGetStr,
|
2010-09-30 18:29:08 +02:00
|
|
|
|
bool bExtrnlNm )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
String sCpy( rRefBoxNm );
|
|
|
|
|
String sTmp( rGetStr );
|
|
|
|
|
if( !bExtrnlNm )
|
|
|
|
|
{
|
|
|
|
|
// in die Externe Darstellung umwandeln.
|
2007-09-27 07:47:50 +00:00
|
|
|
|
SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( !rTbl.GetTabSortBoxes().Seek_Entry( pBox ))
|
|
|
|
|
return '?';
|
|
|
|
|
sTmp = pBox->GetName();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// sollte die es eine Tabellen uebergreifende Formel sein, dann behalte
|
|
|
|
|
// die externe Darstellung bei:
|
|
|
|
|
if( &rTbl == &rTblNd.GetTable() )
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
|
long nBox = SwTable::_GetBoxNum( sTmp, sal_True );
|
|
|
|
|
nBox -= SwTable::_GetBoxNum( sCpy, sal_True );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
long nLine = SwTable::_GetBoxNum( sTmp );
|
|
|
|
|
nLine -= SwTable::_GetBoxNum( sCpy );
|
|
|
|
|
|
|
|
|
|
sCpy = sTmp; //JP 01.11.95: den Rest aus dem BoxNamen anhaengen
|
|
|
|
|
|
|
|
|
|
sTmp = cRelKennung;
|
|
|
|
|
sTmp += String::CreateFromInt32( nBox );
|
|
|
|
|
sTmp += cRelTrenner;
|
|
|
|
|
sTmp += String::CreateFromInt32( nLine );
|
|
|
|
|
|
|
|
|
|
if( sCpy.Len() )
|
|
|
|
|
{
|
|
|
|
|
sTmp += cRelTrenner;
|
|
|
|
|
sTmp += sCpy;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( sTmp.Len() && '>' == sTmp.GetChar( sTmp.Len() - 1 ))
|
|
|
|
|
sTmp.Erase( sTmp.Len()-1 );
|
|
|
|
|
|
|
|
|
|
return sTmp;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 SwTableFormula::GetBoxesOfFormula( const SwTable& rTbl,
|
2000-09-18 23:08:29 +00:00
|
|
|
|
SwSelBoxes& rBoxes )
|
|
|
|
|
{
|
2012-05-05 10:25:52 +01:00
|
|
|
|
if( rBoxes.Count() )
|
|
|
|
|
rBoxes.Remove( sal_uInt16(0), rBoxes.Count() );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
BoxNmToPtr( &rTbl );
|
|
|
|
|
ScanString( &SwTableFormula::_GetFmlBoxes, rTbl, &rBoxes );
|
2012-05-05 10:25:52 +01:00
|
|
|
|
return rBoxes.Count();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-09-27 07:47:50 +00:00
|
|
|
|
void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
|
2000-09-18 23:08:29 +00:00
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
SwSelBoxes* pBoxes = (SwSelBoxes*)pPara;
|
|
|
|
|
SwTableBox* pSttBox, *pEndBox = 0;
|
|
|
|
|
|
|
|
|
|
rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
|
|
|
|
|
// ein Bereich in dieser Klammer ?
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
// ist das ueberhaupt ein gueltiger Pointer ??
|
|
|
|
|
if( !rTbl.GetTabSortBoxes().Seek_Entry( pEndBox ))
|
|
|
|
|
pEndBox = 0;
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
// ist das ueberhaupt ein gueltiger Pointer ??
|
|
|
|
|
if( !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ))
|
|
|
|
|
pSttBox = 0;
|
|
|
|
|
|
|
|
|
|
if( pEndBox && pSttBox ) // Bereich ?
|
|
|
|
|
{
|
|
|
|
|
// ueber das Layout alle "selectierten" Boxen und berechne
|
|
|
|
|
// deren Werte
|
|
|
|
|
SwSelBoxes aBoxes;
|
|
|
|
|
GetBoxes( *pSttBox, *pEndBox, aBoxes );
|
2012-05-05 10:25:52 +01:00
|
|
|
|
pBoxes->Insert( &aBoxes );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
else if( pSttBox ) // nur die StartBox ?
|
2012-05-05 10:25:52 +01:00
|
|
|
|
pBoxes->Insert( pSttBox );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
|
|
|
|
|
const SwTableBox& rEndBox,
|
|
|
|
|
SwSelBoxes& rBoxes ) const
|
|
|
|
|
{
|
|
|
|
|
// hole ueber das Layout alle "selektierten" Boxen
|
|
|
|
|
const SwLayoutFrm *pStt, *pEnd;
|
|
|
|
|
const SwFrm* pFrm = lcl_GetBoxFrm( rSttBox );
|
|
|
|
|
pStt = pFrm ? pFrm->GetUpper() : 0;
|
|
|
|
|
pEnd = ( 0 != (pFrm = lcl_GetBoxFrm( rEndBox ))) ? pFrm->GetUpper() : 0;
|
|
|
|
|
if( !pStt || !pEnd )
|
|
|
|
|
return ; // no valid selection
|
|
|
|
|
|
2005-01-05 14:59:52 +00:00
|
|
|
|
GetTblSel( pStt, pEnd, rBoxes, 0 );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
const SwTable* pTbl = pStt->FindTabFrm()->GetTable();
|
|
|
|
|
|
|
|
|
|
// filter die Kopfzeilen-Boxen heraus:
|
2004-05-03 12:45:20 +00:00
|
|
|
|
if( pTbl->GetRowsToRepeat() > 0 )
|
|
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
|
do { // middle-check loop
|
|
|
|
|
const SwTableLine* pLine = rSttBox.GetUpper();
|
|
|
|
|
while( pLine->GetUpper() )
|
|
|
|
|
pLine = pLine->GetUpper()->GetUpper();
|
|
|
|
|
|
2004-05-03 12:45:20 +00:00
|
|
|
|
if( pTbl->IsHeadline( *pLine ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
break; // Headline mit im Bereich !
|
2004-05-03 12:45:20 +00:00
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
// vielleicht ist ja Start und Ende vertauscht
|
|
|
|
|
pLine = rEndBox.GetUpper();
|
|
|
|
|
while ( pLine->GetUpper() )
|
|
|
|
|
pLine = pLine->GetUpper()->GetUpper();
|
2004-05-03 12:45:20 +00:00
|
|
|
|
|
|
|
|
|
if( pTbl->IsHeadline( *pLine ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
break; // Headline mit im Bereich !
|
|
|
|
|
|
|
|
|
|
const SwTabFrm *pTable = pStt->FindTabFrm();
|
|
|
|
|
const SwTabFrm *pEndTable = pEnd->FindTabFrm();
|
2004-05-03 12:45:20 +00:00
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( pTable == pEndTable ) // keine gespl. Tabelle
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// dann mal die Tabellenkoepfe raus:
|
2012-05-05 10:25:52 +01:00
|
|
|
|
for( sal_uInt16 n = 0; n < rBoxes.Count(); ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
2012-05-05 10:25:52 +01:00
|
|
|
|
pLine = rBoxes[n]->GetUpper();
|
2003-09-04 10:47:02 +00:00
|
|
|
|
while( pLine->GetUpper() )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
pLine = pLine->GetUpper()->GetUpper();
|
|
|
|
|
|
2004-05-03 12:45:20 +00:00
|
|
|
|
if( pTbl->IsHeadline( *pLine ) )
|
2012-05-05 10:25:52 +01:00
|
|
|
|
rBoxes.Remove( n--, 1 );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
2011-01-17 15:06:54 +01:00
|
|
|
|
} while( sal_False );
|
2004-05-03 12:45:20 +00:00
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// sind alle Boxen gueltig, auf die sich die Formel bezieht?
|
2007-09-27 07:47:50 +00:00
|
|
|
|
void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, String& ,
|
2000-09-18 23:08:29 +00:00
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
2010-09-30 18:29:08 +02:00
|
|
|
|
bool* pBValid = (bool*)pPara;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( *pBValid ) // einmal falsch, immer falsch
|
|
|
|
|
{
|
2007-09-27 07:47:50 +00:00
|
|
|
|
SwTableBox* pSttBox = 0, *pEndBox = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
|
|
|
|
|
|
|
|
|
|
// ein Bereich in dieser Klammer ?
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
rFirstBox.Erase( 0, pLastBox->Len()+1 );
|
|
|
|
|
|
|
|
|
|
switch( eNmType)
|
|
|
|
|
{
|
|
|
|
|
case INTRNL_NAME:
|
|
|
|
|
if( pLastBox )
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
|
|
|
|
|
pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case REL_NAME:
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pNd = GetNodeOfFormula();
|
|
|
|
|
const SwTableBox* pBox = !pNd ? 0
|
|
|
|
|
: (SwTableBox *)rTbl.GetTblBox(
|
|
|
|
|
pNd->FindTableBoxStartNode()->GetIndex() );
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
pEndBox = (SwTableBox*)lcl_RelToBox( rTbl, pBox, *pLastBox );
|
|
|
|
|
pSttBox = (SwTableBox*)lcl_RelToBox( rTbl, pBox, rFirstBox );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case EXTRNL_NAME:
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
pEndBox = (SwTableBox*)rTbl.GetTblBox( *pLastBox );
|
|
|
|
|
pSttBox = (SwTableBox*)rTbl.GetTblBox( rFirstBox );
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// sind das gueltige Pointer ?
|
|
|
|
|
if( ( pLastBox &&
|
|
|
|
|
( !pEndBox || !rTbl.GetTabSortBoxes().Seek_Entry( pEndBox ) ) ) ||
|
|
|
|
|
( !pSttBox || !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ) ) )
|
2010-09-30 18:29:08 +02:00
|
|
|
|
*pBValid = false;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-09-30 18:29:08 +02:00
|
|
|
|
bool SwTableFormula::HasValidBoxes() const
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
2010-09-30 18:29:08 +02:00
|
|
|
|
bool bRet = true;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
const SwNode* pNd = GetNodeOfFormula();
|
|
|
|
|
if( pNd && 0 != ( pNd = pNd->FindTableNode() ) )
|
|
|
|
|
ScanString( &SwTableFormula::_HasValidBoxes,
|
|
|
|
|
((SwTableNode*)pNd)->GetTable(), &bRet );
|
|
|
|
|
return bRet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nRet = USHRT_MAX;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( pBox )
|
|
|
|
|
{
|
|
|
|
|
const SwTableLine* pLn = pBox->GetUpper();
|
|
|
|
|
while( pLn->GetUpper() )
|
|
|
|
|
pLn = pLn->GetUpper()->GetUpper();
|
|
|
|
|
nRet = rTbl.GetTabLines().GetPos( pLn );
|
|
|
|
|
}
|
|
|
|
|
return nRet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
|
|
|
|
|
String& rFirstBox, String* pLastBox, void* pPara ) const
|
|
|
|
|
{
|
|
|
|
|
SwTableFmlUpdate& rTblUpd = *(SwTableFmlUpdate*)pPara;
|
|
|
|
|
|
|
|
|
|
rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
|
|
|
|
|
rFirstBox.Erase(0,1);
|
|
|
|
|
|
|
|
|
|
String sTblNm;
|
|
|
|
|
const SwTable* pTbl = &rTbl;
|
|
|
|
|
|
|
|
|
|
String* pTblNmBox = pLastBox ? pLastBox : &rFirstBox;
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nLastBoxLen = pTblNmBox->Len();
|
|
|
|
|
sal_uInt16 nTrenner = pTblNmBox->Search( '.' );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( STRING_NOTFOUND != nTrenner &&
|
|
|
|
|
// falls im Namen schon die Punkte enthalten sind,
|
|
|
|
|
// treten diese immer paarig auf!!! (A1.1.1 !!)
|
2012-01-02 10:55:27 +00:00
|
|
|
|
(comphelper::string::getTokenCount(*pTblNmBox, '.') - 1) & 1 )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
sTblNm = pTblNmBox->Copy( 0, nTrenner );
|
|
|
|
|
pTblNmBox->Erase( 0, nTrenner + 1);// den Punkt entfernen
|
|
|
|
|
const SwTable* pFnd = FindTable( *rTbl.GetFrmFmt()->GetDoc(), sTblNm );
|
|
|
|
|
if( pFnd )
|
|
|
|
|
pTbl = pFnd;
|
|
|
|
|
|
|
|
|
|
if( TBL_MERGETBL == rTblUpd.eFlags )
|
|
|
|
|
{
|
|
|
|
|
if( pFnd )
|
|
|
|
|
{
|
|
|
|
|
if( pFnd == rTblUpd.DATA.pDelTbl )
|
|
|
|
|
{
|
|
|
|
|
if( rTblUpd.pTbl != &rTbl ) // es ist nicht die akt.
|
|
|
|
|
(rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() )
|
|
|
|
|
+= '.'; // den neuen Tabellen Namen setzen
|
2011-01-17 15:06:54 +01:00
|
|
|
|
rTblUpd.bModified = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
else if( pFnd != rTblUpd.pTbl ||
|
|
|
|
|
( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
|
|
|
|
|
(rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
|
|
|
|
|
else
|
2011-01-17 15:06:54 +01:00
|
|
|
|
rTblUpd.bModified = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
(rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if( pTblNmBox == pLastBox )
|
|
|
|
|
rFirstBox.Erase( 0, nLastBoxLen + 1 );
|
|
|
|
|
|
2007-09-27 07:47:50 +00:00
|
|
|
|
SwTableBox* pSttBox = 0, *pEndBox = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
switch( eNmType )
|
|
|
|
|
{
|
|
|
|
|
case INTRNL_NAME:
|
|
|
|
|
if( pLastBox )
|
2007-09-27 07:47:50 +00:00
|
|
|
|
pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
|
|
|
|
|
pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case REL_NAME:
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pNd = GetNodeOfFormula();
|
|
|
|
|
const SwTableBox* pBox = pNd ? pTbl->GetTblBox(
|
|
|
|
|
pNd->FindTableBoxStartNode()->GetIndex() ) : 0;
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
pEndBox = (SwTableBox*)lcl_RelToBox( *pTbl, pBox, *pLastBox );
|
|
|
|
|
pSttBox = (SwTableBox*)lcl_RelToBox( *pTbl, pBox, rFirstBox );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case EXTRNL_NAME:
|
|
|
|
|
if( pLastBox )
|
|
|
|
|
pEndBox = (SwTableBox*)pTbl->GetTblBox( *pLastBox );
|
|
|
|
|
pSttBox = (SwTableBox*)pTbl->GetTblBox( rFirstBox );
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( pLastBox && !pTbl->GetTabSortBoxes().Seek_Entry( pEndBox ))
|
|
|
|
|
pEndBox = 0;
|
|
|
|
|
if( !pTbl->GetTabSortBoxes().Seek_Entry( pSttBox ))
|
|
|
|
|
pSttBox = 0;
|
|
|
|
|
|
|
|
|
|
if( TBL_SPLITTBL == rTblUpd.eFlags )
|
|
|
|
|
{
|
|
|
|
|
// wo liegen die Boxen, in der "alten" oder in der neuen Tabelle?
|
2010-09-30 18:29:08 +02:00
|
|
|
|
bool bInNewTbl = false;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( pLastBox )
|
|
|
|
|
{
|
|
|
|
|
// das ist die "erste" Box in der Selektion. Die bestimmt ob die
|
|
|
|
|
// Formel in der alten oder neuen Tabelle steht.
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nEndLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pEndBox ),
|
2000-09-18 23:08:29 +00:00
|
|
|
|
nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
|
|
|
|
|
|
|
|
|
|
if( USHRT_MAX != nSttLnPos && USHRT_MAX != nEndLnPos &&
|
2009-05-07 06:54:56 +00:00
|
|
|
|
((rTblUpd.nSplitLine <= nSttLnPos) ==
|
|
|
|
|
(rTblUpd.nSplitLine <= nEndLnPos)) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
{
|
|
|
|
|
// bleiben in der gleichen Tabelle
|
|
|
|
|
bInNewTbl = rTblUpd.nSplitLine <= nEndLnPos &&
|
|
|
|
|
pTbl == rTblUpd.pTbl;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// das ist aufjedenfall eine ungueltige Formel, also fuers
|
|
|
|
|
// Undo auf Modified setzen
|
2011-01-17 15:06:54 +01:00
|
|
|
|
rTblUpd.bModified = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
if( pEndBox )
|
|
|
|
|
bInNewTbl = USHRT_MAX != nEndLnPos &&
|
|
|
|
|
rTblUpd.nSplitLine <= nEndLnPos &&
|
|
|
|
|
pTbl == rTblUpd.pTbl;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
|
sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
// dann landet das Teil in der neuen Tabelle?
|
|
|
|
|
bInNewTbl = USHRT_MAX != nSttLnPos &&
|
|
|
|
|
rTblUpd.nSplitLine <= nSttLnPos &&
|
|
|
|
|
pTbl == rTblUpd.pTbl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// wenn die Formel selbst in der neuen Tabellen landet
|
|
|
|
|
if( rTblUpd.bBehindSplitLine )
|
|
|
|
|
{
|
|
|
|
|
if( !bInNewTbl )
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
|
rTblUpd.bModified = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
( rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() ) += '.';
|
|
|
|
|
}
|
|
|
|
|
else if( sTblNm.Len() )
|
|
|
|
|
( rNewStr += sTblNm ) += '.';
|
|
|
|
|
}
|
|
|
|
|
else if( bInNewTbl )
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
|
rTblUpd.bModified = sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
( rNewStr += *rTblUpd.DATA.pNewTblNm ) += '.';
|
|
|
|
|
}
|
|
|
|
|
else if( sTblNm.Len() )
|
|
|
|
|
( rNewStr += sTblNm ) += '.';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( pLastBox )
|
2012-02-26 20:45:18 +00:00
|
|
|
|
( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':';
|
|
|
|
|
( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
+= rFirstBox.GetChar( rFirstBox.Len() - 1 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// erzeuge die externe Formel, beachte aber das die Formel
|
|
|
|
|
// in einer gesplitteten/gemergten Tabelle landet
|
|
|
|
|
void SwTableFormula::ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd )
|
|
|
|
|
{
|
|
|
|
|
const SwTable* pTbl;
|
|
|
|
|
const SwNode* pNd = GetNodeOfFormula();
|
|
|
|
|
if( pNd && 0 != ( pNd = pNd->FindTableNode() ))
|
|
|
|
|
pTbl = &((SwTableNode*)pNd)->GetTable();
|
|
|
|
|
else
|
|
|
|
|
pTbl = rTblUpd.pTbl;
|
|
|
|
|
|
|
|
|
|
sFormel = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTbl, (void*)&rTblUpd );
|
|
|
|
|
eNmType = INTRNL_NAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-10-14 08:30:41 +02:00
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|