2010-10-14 08:30:41 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2011-03-31 10:05:04 +02:00
|
|
|
/*
|
|
|
|
* This file is part of the LibreOffice project.
|
|
|
|
*
|
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
*
|
|
|
|
* This file incorporates work covered by the following license notice:
|
|
|
|
*
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
|
|
* with this work for additional information regarding copyright
|
|
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
|
|
*/
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
#include "hintids.hxx"
|
2009-10-16 00:05:16 +02:00
|
|
|
#include <svl/whiter.hxx>
|
2012-06-21 17:39:01 +01:00
|
|
|
#include <com/sun/star/i18n/ScriptType.hpp>
|
2000-11-20 15:27:07 +00:00
|
|
|
#include <swmodule.hxx>
|
2013-10-22 15:58:57 +03:00
|
|
|
#include <redline.hxx>
|
|
|
|
#include <txtatr.hxx>
|
|
|
|
#include <docary.hxx>
|
|
|
|
#include <itratr.hxx>
|
|
|
|
#include <ndtxt.hxx>
|
|
|
|
#include <doc.hxx>
|
2014-07-16 22:19:33 +02:00
|
|
|
#include <IDocumentRedlineAccess.hxx>
|
2014-08-06 16:21:14 +02:00
|
|
|
#include <IDocumentLayoutAccess.hxx>
|
2000-11-20 15:27:07 +00:00
|
|
|
#include <rootfrm.hxx>
|
|
|
|
#include <breakit.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <vcl/keycodes.hxx>
|
|
|
|
#include <vcl/cmdevt.hxx>
|
|
|
|
#include <vcl/settings.hxx>
|
2013-10-22 15:58:57 +03:00
|
|
|
#include <txtfrm.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <vcl/svapp.hxx>
|
2000-11-20 15:27:07 +00:00
|
|
|
#include <redlnitr.hxx>
|
|
|
|
#include <extinput.hxx>
|
2001-11-20 09:52:16 +00:00
|
|
|
#include <sfx2/printer.hxx>
|
|
|
|
#include <vcl/window.hxx>
|
|
|
|
|
2000-11-30 10:42:24 +00:00
|
|
|
using namespace ::com::sun::star;
|
2000-09-27 10:53:31 +00:00
|
|
|
|
2015-05-20 13:05:49 +02:00
|
|
|
void SwAttrIter::CtorInitAttrIter( SwTextNode& rTextNode, SwScriptInfo& rScrInf, SwTextFrm* pFrm )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2014-02-09 01:04:08 +01:00
|
|
|
// during HTML-Import it can happen, that no layout exists
|
2015-05-20 13:05:49 +02:00
|
|
|
SwRootFrm* pRootFrm = rTextNode.getIDocumentLayoutAccess()->GetCurrentLayout();
|
2013-10-22 15:14:13 +03:00
|
|
|
pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2001-03-05 11:54:15 +00:00
|
|
|
pScriptInfo = &rScrInf;
|
2004-02-26 14:33:24 +00:00
|
|
|
|
|
|
|
// attributes set at the whole paragraph
|
2015-05-20 13:05:49 +02:00
|
|
|
pAttrSet = rTextNode.GetpSwAttrSet();
|
2004-02-26 14:33:24 +00:00
|
|
|
// attribute array
|
2015-05-20 13:05:49 +02:00
|
|
|
pHints = rTextNode.GetpSwpHints();
|
2001-03-05 11:54:15 +00:00
|
|
|
|
2004-02-26 14:33:24 +00:00
|
|
|
// Build a font matching the default paragraph style:
|
2015-05-20 13:05:49 +02:00
|
|
|
SwFontAccess aFontAccess( &rTextNode.GetAnyFormatColl(), pShell );
|
2001-07-12 10:21:31 +00:00
|
|
|
delete pFnt;
|
2014-06-18 12:14:29 +02:00
|
|
|
pFnt = new SwFont( aFontAccess.Get()->GetFont() );
|
2001-07-12 10:21:31 +00:00
|
|
|
|
2001-08-31 05:22:48 +00:00
|
|
|
// set font to vertical if frame layout is vertical
|
2014-02-02 19:13:04 +01:00
|
|
|
bool bVertLayout = false;
|
2014-02-04 11:19:31 +01:00
|
|
|
bool bRTL = false;
|
2003-04-01 08:58:16 +00:00
|
|
|
if ( pFrm )
|
2001-08-31 05:22:48 +00:00
|
|
|
{
|
2003-04-01 08:58:16 +00:00
|
|
|
if ( pFrm->IsVertical() )
|
|
|
|
{
|
2014-02-02 19:13:04 +01:00
|
|
|
bVertLayout = true;
|
2014-02-15 00:58:16 +01:00
|
|
|
pFnt->SetVertical( pFnt->GetOrientation(), true );
|
2003-04-01 08:58:16 +00:00
|
|
|
}
|
|
|
|
bRTL = pFrm->IsRightToLeft();
|
2001-08-31 05:22:48 +00:00
|
|
|
}
|
|
|
|
|
2001-07-12 10:21:31 +00:00
|
|
|
// Initialize the default attribute of the attribute handler
|
|
|
|
// based on the attribute array cached together with the font.
|
|
|
|
// If any further attributes for the paragraph are given in pAttrSet
|
|
|
|
// consider them during construction of the default array, and apply
|
|
|
|
// them to the font
|
2004-02-26 14:33:24 +00:00
|
|
|
aAttrHandler.Init( aFontAccess.Get()->GetDefault(), pAttrSet,
|
2015-05-20 13:05:49 +02:00
|
|
|
*rTextNode.getIDocumentSettingAccess(), pShell, *pFnt, bVertLayout );
|
2000-09-27 10:53:31 +00:00
|
|
|
|
|
|
|
aMagicNo[SW_LATIN] = aMagicNo[SW_CJK] = aMagicNo[SW_CTL] = NULL;
|
|
|
|
|
2001-02-20 09:27:05 +00:00
|
|
|
// determine script changes if not already done for current paragraph
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pScriptInfo, "No script info available");
|
2014-01-14 16:50:42 +00:00
|
|
|
if ( pScriptInfo->GetInvalidityA() != COMPLETE_STRING )
|
2015-05-20 13:05:49 +02:00
|
|
|
pScriptInfo->InitScriptInfo( rTextNode, bRTL );
|
2001-02-20 09:27:05 +00:00
|
|
|
|
2013-04-19 10:34:21 +02:00
|
|
|
if ( g_pBreakIt->GetBreakIter().is() )
|
2000-09-27 10:53:31 +00:00
|
|
|
{
|
2003-10-30 09:20:33 +00:00
|
|
|
pFnt->SetActual( SwScriptInfo::WhichFont( 0, 0, pScriptInfo ) );
|
2001-10-22 12:03:21 +00:00
|
|
|
|
2014-01-14 16:50:42 +00:00
|
|
|
sal_Int32 nChg = 0;
|
2014-08-31 12:55:04 +02:00
|
|
|
size_t nCnt = 0;
|
2001-03-05 11:54:15 +00:00
|
|
|
|
2000-09-27 10:53:31 +00:00
|
|
|
do
|
|
|
|
{
|
2014-03-30 09:34:50 +02:00
|
|
|
if ( nCnt >= pScriptInfo->CountScriptChg() )
|
|
|
|
break;
|
2001-02-20 09:27:05 +00:00
|
|
|
nChg = pScriptInfo->GetScriptChg( nCnt );
|
2014-08-31 12:55:04 +02:00
|
|
|
int nTmp = SW_SCRIPTS;
|
|
|
|
switch ( pScriptInfo->GetScriptType( nCnt++ ) ) {
|
2000-11-30 10:42:24 +00:00
|
|
|
case i18n::ScriptType::ASIAN :
|
2000-09-27 10:53:31 +00:00
|
|
|
if( !aMagicNo[SW_CJK] ) nTmp = SW_CJK; break;
|
2000-11-30 10:42:24 +00:00
|
|
|
case i18n::ScriptType::COMPLEX :
|
2000-09-27 10:53:31 +00:00
|
|
|
if( !aMagicNo[SW_CTL] ) nTmp = SW_CTL; break;
|
|
|
|
default:
|
|
|
|
if( !aMagicNo[SW_LATIN ] ) nTmp = SW_LATIN;
|
|
|
|
}
|
2014-08-31 12:55:04 +02:00
|
|
|
if( nTmp < SW_SCRIPTS )
|
2000-09-27 10:53:31 +00:00
|
|
|
{
|
|
|
|
pFnt->ChkMagic( pShell, nTmp );
|
|
|
|
pFnt->GetMagic( aMagicNo[ nTmp ], aFntIdx[ nTmp ], nTmp );
|
|
|
|
}
|
2015-05-20 13:05:49 +02:00
|
|
|
} while (nChg < rTextNode.GetText().getLength());
|
2000-09-27 10:53:31 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pFnt->ChkMagic( pShell, SW_LATIN );
|
|
|
|
pFnt->GetMagic( aMagicNo[ SW_LATIN ], aFntIdx[ SW_LATIN ], SW_LATIN );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2000-11-24 14:53:36 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
nStartIndex = nEndIndex = nPos = nChgCnt = 0;
|
2000-12-11 10:05:15 +00:00
|
|
|
nPropFont = 0;
|
2015-05-20 13:05:49 +02:00
|
|
|
SwDoc* pDoc = rTextNode.GetDoc();
|
|
|
|
const IDocumentRedlineAccess* pIDRA = rTextNode.getIDocumentRedlineAccess();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2015-05-20 13:05:49 +02:00
|
|
|
const SwExtTextInput* pExtInp = pDoc->GetExtTextInput( rTextNode );
|
2007-09-27 08:19:22 +00:00
|
|
|
const bool bShow = IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() );
|
2001-09-24 08:06:56 +00:00
|
|
|
if( pExtInp || bShow )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2015-05-20 13:05:49 +02:00
|
|
|
const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTextNode, USHRT_MAX );
|
2014-01-14 16:50:42 +00:00
|
|
|
if( pExtInp || USHRT_MAX != nRedlPos )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-07-13 14:22:48 +01:00
|
|
|
const std::vector<sal_uInt16> *pArr = 0;
|
2013-11-12 00:46:22 +01:00
|
|
|
sal_Int32 nInputStt = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pExtInp )
|
|
|
|
{
|
|
|
|
pArr = &pExtInp->GetAttrs();
|
|
|
|
nInputStt = pExtInp->Start()->nContent.GetIndex();
|
2002-04-22 11:35:17 +00:00
|
|
|
Seek( 0 );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2015-05-20 13:05:49 +02:00
|
|
|
pRedln = new SwRedlineItr( rTextNode, *pFnt, aAttrHandler, nRedlPos,
|
2001-03-05 11:54:15 +00:00
|
|
|
bShow, pArr, nInputStt );
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pRedln->IsOn() )
|
|
|
|
++nChgCnt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-18 17:02:13 -04:00
|
|
|
// The Redline-Iterator
|
|
|
|
// The following information/states exist in RedlineIterator:
|
|
|
|
//
|
2015-05-20 13:05:49 +02:00
|
|
|
// nFirst is the first index of RedlineTable, which overlaps with the paragraph.
|
2014-04-18 17:02:13 -04:00
|
|
|
//
|
|
|
|
// nAct is the currently active (if bOn is set) or the next possible index.
|
|
|
|
// nStart and nEnd give you the borders of the object within the paragraph.
|
|
|
|
//
|
|
|
|
// If bOn is set, the font has been manipulated according to it.
|
|
|
|
//
|
|
|
|
// If nAct is set to COMPLETE_STRING (via Reset()), then currently no
|
|
|
|
// Redline is active, nStart and nEnd are invalid.
|
2015-05-20 13:05:49 +02:00
|
|
|
SwRedlineItr::SwRedlineItr( const SwTextNode& rTextNd, SwFont& rFnt,
|
2014-02-15 00:58:16 +01:00
|
|
|
SwAttrHandler& rAH, sal_Int32 nRed, bool bShw,
|
2011-07-13 14:22:48 +01:00
|
|
|
const std::vector<sal_uInt16> *pArr,
|
2014-01-14 16:50:42 +00:00
|
|
|
sal_Int32 nExtStart )
|
2015-05-20 13:05:49 +02:00
|
|
|
: rDoc( *rTextNd.GetDoc() ), rAttrHandler( rAH ), pSet( 0 ),
|
|
|
|
nNdIdx( rTextNd.GetIndex() ), nFirst( nRed ),
|
2014-02-15 00:58:16 +01:00
|
|
|
nAct( COMPLETE_STRING ), bOn( false ), bShow( bShw )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if( pArr )
|
|
|
|
pExt = new SwExtend( *pArr, nExtStart );
|
|
|
|
else
|
|
|
|
pExt = NULL;
|
2014-01-14 16:50:42 +00:00
|
|
|
Seek (rFnt, 0, COMPLETE_STRING);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SwRedlineItr::~SwRedlineItr()
|
|
|
|
{
|
|
|
|
Clear( NULL );
|
|
|
|
delete pSet;
|
|
|
|
delete pExt;
|
|
|
|
}
|
|
|
|
|
2014-02-09 01:04:08 +01:00
|
|
|
// The return value of SwRedlineItr::Seek tells you if the current font
|
|
|
|
// has been manipulated by leaving (-1) or accessing (+1) of a section
|
2014-01-14 16:50:42 +00:00
|
|
|
short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
short nRet = 0;
|
|
|
|
if( ExtOn() )
|
2014-02-09 01:04:08 +01:00
|
|
|
return 0; // Abbreviation: if we're within an ExtendTextInputs
|
|
|
|
// there can't be other changes of attributes (not even by redlining)
|
2000-09-18 23:08:29 +00:00
|
|
|
if( bShow )
|
|
|
|
{
|
|
|
|
if( bOn )
|
|
|
|
{
|
|
|
|
if( nNew >= nEnd )
|
|
|
|
{
|
|
|
|
--nRet;
|
2014-02-09 01:04:08 +01:00
|
|
|
_Clear( &rFnt ); // We go behind the current section
|
|
|
|
++nAct; // and check the next one
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else if( nNew < nStart )
|
|
|
|
{
|
|
|
|
--nRet;
|
2014-02-09 01:04:08 +01:00
|
|
|
_Clear( &rFnt ); // We go in front of the current section
|
2000-09-18 23:08:29 +00:00
|
|
|
if( nAct > nFirst )
|
2014-02-09 01:04:08 +01:00
|
|
|
nAct = nFirst; // the test has to run from the beginning
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
2014-02-09 01:04:08 +01:00
|
|
|
return nRet + EnterExtend( rFnt, nNew ); // There's none prior to us
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
2014-02-09 01:04:08 +01:00
|
|
|
return nRet + EnterExtend( rFnt, nNew ); // We stayed in the same section
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2014-01-14 16:50:42 +00:00
|
|
|
if( COMPLETE_STRING == nAct || nOld > nNew )
|
2000-09-18 23:08:29 +00:00
|
|
|
nAct = nFirst;
|
|
|
|
|
2014-01-14 16:50:42 +00:00
|
|
|
nStart = COMPLETE_STRING;
|
|
|
|
nEnd = COMPLETE_STRING;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2015-05-20 13:05:49 +02:00
|
|
|
for( ; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nAct )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2015-05-20 13:05:49 +02:00
|
|
|
rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
|
2001-04-27 12:33:52 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( nNew < nEnd )
|
|
|
|
{
|
|
|
|
if( nNew >= nStart ) // der einzig moegliche Kandidat
|
|
|
|
{
|
2014-02-15 00:58:16 +01:00
|
|
|
bOn = true;
|
2015-05-20 13:05:49 +02:00
|
|
|
const SwRangeRedline *pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
if (pSet)
|
|
|
|
pSet->ClearItem();
|
|
|
|
else
|
|
|
|
{
|
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
|
|
|
SwAttrPool& rPool =
|
|
|
|
const_cast<SwDoc&>(rDoc).GetAttrPool();
|
2000-09-18 23:08:29 +00:00
|
|
|
pSet = new SfxItemSet(rPool, RES_CHRATR_BEGIN, RES_CHRATR_END-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if( 1 < pRed->GetStackCount() )
|
|
|
|
FillHints( pRed->GetAuthor( 1 ), pRed->GetType( 1 ) );
|
|
|
|
FillHints( pRed->GetAuthor(), pRed->GetType() );
|
|
|
|
|
|
|
|
SfxWhichIter aIter( *pSet );
|
2014-07-22 17:14:17 +02:00
|
|
|
sal_uInt16 nWhich = aIter.FirstWhich();
|
2000-09-18 23:08:29 +00:00
|
|
|
while( nWhich )
|
|
|
|
{
|
|
|
|
const SfxPoolItem* pItem;
|
|
|
|
if( ( nWhich < RES_CHRATR_END ) &&
|
2014-09-10 17:53:41 +02:00
|
|
|
( SfxItemState::SET == pSet->GetItemState( nWhich, true, &pItem ) ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2015-05-20 13:05:49 +02:00
|
|
|
SwTextAttr* pAttr = MakeRedlineTextAttr(
|
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
|
|
|
const_cast<SwDoc&>(rDoc),
|
|
|
|
*const_cast<SfxPoolItem*>(pItem) );
|
2014-01-28 19:59:54 +01:00
|
|
|
pAttr->SetPriorityAttr( true );
|
2012-07-30 22:14:52 +02:00
|
|
|
m_Hints.push_back(pAttr);
|
2001-03-05 11:54:15 +00:00
|
|
|
rAttrHandler.PushAndChg( *pAttr, rFnt );
|
2000-09-18 23:08:29 +00:00
|
|
|
if( RES_CHRATR_COLOR == nWhich )
|
2014-02-15 00:58:16 +01:00
|
|
|
rFnt.SetNoCol( true );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
nWhich = aIter.NextWhich();
|
|
|
|
}
|
|
|
|
|
|
|
|
++nRet;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-01-14 16:50:42 +00:00
|
|
|
nStart = COMPLETE_STRING;
|
|
|
|
nEnd = COMPLETE_STRING;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return nRet + EnterExtend( rFnt, nNew );
|
|
|
|
}
|
|
|
|
|
2014-07-22 17:14:17 +02:00
|
|
|
void SwRedlineItr::FillHints( sal_uInt16 nAuthor, RedlineType_t eType )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
switch ( eType )
|
|
|
|
{
|
2007-09-27 08:19:22 +00:00
|
|
|
case nsRedlineType_t::REDLINE_INSERT:
|
2000-09-18 23:08:29 +00:00
|
|
|
SW_MOD()->GetInsertAuthorAttr(nAuthor, *pSet);
|
|
|
|
break;
|
2007-09-27 08:19:22 +00:00
|
|
|
case nsRedlineType_t::REDLINE_DELETE:
|
2000-09-18 23:08:29 +00:00
|
|
|
SW_MOD()->GetDeletedAuthorAttr(nAuthor, *pSet);
|
|
|
|
break;
|
2007-09-27 08:19:22 +00:00
|
|
|
case nsRedlineType_t::REDLINE_FORMAT:
|
|
|
|
case nsRedlineType_t::REDLINE_FMTCOLL:
|
2000-09-18 23:08:29 +00:00
|
|
|
SW_MOD()->GetFormatAuthorAttr(nAuthor, *pSet);
|
|
|
|
break;
|
2007-09-27 08:19:22 +00:00
|
|
|
default:
|
|
|
|
break;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-20 13:05:49 +02:00
|
|
|
void SwRedlineItr::ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg )
|
2001-03-05 11:54:15 +00:00
|
|
|
{
|
2015-05-20 13:05:49 +02:00
|
|
|
OSL_ENSURE( IsOn(), "SwRedlineItr::ChangeTextAttr: Off?" );
|
2001-03-05 11:54:15 +00:00
|
|
|
|
|
|
|
if( !bShow && !pExt )
|
|
|
|
return;
|
|
|
|
|
|
|
|
if( bChg )
|
2002-02-22 10:01:58 +00:00
|
|
|
{
|
|
|
|
if ( pExt && pExt->IsOn() )
|
|
|
|
rAttrHandler.PushAndChg( rHt, *pExt->GetFont() );
|
|
|
|
else
|
|
|
|
rAttrHandler.PushAndChg( rHt, *pFnt );
|
|
|
|
}
|
2001-03-05 11:54:15 +00:00
|
|
|
else
|
2002-02-22 10:01:58 +00:00
|
|
|
{
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( ! pExt || ! pExt->IsOn(), "Pop of attribute during opened extension" );
|
2001-03-05 11:54:15 +00:00
|
|
|
rAttrHandler.PopAndChg( rHt, *pFnt );
|
2002-02-22 10:01:58 +00:00
|
|
|
}
|
2001-03-05 11:54:15 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
void SwRedlineItr::_Clear( SwFont* pFnt )
|
|
|
|
{
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( bOn, "SwRedlineItr::Clear: Off?" );
|
2014-02-15 00:58:16 +01:00
|
|
|
bOn = false;
|
2012-07-30 22:14:52 +02:00
|
|
|
while (!m_Hints.empty())
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2015-05-20 13:05:49 +02:00
|
|
|
SwTextAttr *pPos = m_Hints.front();
|
2012-07-30 22:14:52 +02:00
|
|
|
m_Hints.pop_front();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pFnt )
|
2001-03-05 11:54:15 +00:00
|
|
|
rAttrHandler.PopAndChg( *pPos, *pFnt );
|
|
|
|
else
|
|
|
|
rAttrHandler.Pop( *pPos );
|
2015-05-20 13:05:49 +02:00
|
|
|
SwTextAttr::Destroy(pPos, const_cast<SwDoc&>(rDoc).GetAttrPool() );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
if( pFnt )
|
2014-02-15 00:58:16 +01:00
|
|
|
pFnt->SetNoCol( false );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2014-01-14 16:50:42 +00:00
|
|
|
sal_Int32 SwRedlineItr::_GetNextRedln( sal_Int32 nNext )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
nNext = NextExtend( nNext );
|
2014-01-14 16:50:42 +00:00
|
|
|
if( !bShow || COMPLETE_STRING == nFirst )
|
2000-09-18 23:08:29 +00:00
|
|
|
return nNext;
|
2014-01-14 16:50:42 +00:00
|
|
|
if( COMPLETE_STRING == nAct )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
nAct = nFirst;
|
2015-05-20 13:05:49 +02:00
|
|
|
rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
if( bOn || !nStart )
|
|
|
|
{
|
|
|
|
if( nEnd < nNext )
|
|
|
|
nNext = nEnd;
|
|
|
|
}
|
|
|
|
else if( nStart < nNext )
|
|
|
|
nNext = nStart;
|
|
|
|
return nNext;
|
|
|
|
}
|
|
|
|
|
2014-02-15 00:58:16 +01:00
|
|
|
bool SwRedlineItr::_ChkSpecialUnderline() const
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2014-02-09 01:04:08 +01:00
|
|
|
// If the underlining or the escapement is caused by redlining,
|
|
|
|
// we always apply the SpecialUnderlining, i.e. the underlining
|
|
|
|
// below the base line
|
2014-01-14 16:50:42 +00:00
|
|
|
for (size_t i = 0; i < m_Hints.size(); ++i)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2014-08-31 12:55:04 +02:00
|
|
|
const sal_uInt16 nWhich = m_Hints[i]->Which();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( RES_CHRATR_UNDERLINE == nWhich ||
|
|
|
|
RES_CHRATR_ESCAPEMENT == nWhich )
|
2014-02-15 00:58:16 +01:00
|
|
|
return true;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2014-02-15 00:58:16 +01:00
|
|
|
return false;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2014-02-15 00:58:16 +01:00
|
|
|
bool SwRedlineItr::CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2014-01-14 16:50:42 +00:00
|
|
|
if( nFirst == COMPLETE_STRING )
|
2014-02-15 00:58:16 +01:00
|
|
|
return false;
|
2014-02-09 01:04:08 +01:00
|
|
|
if( nChkEnd == nChkStart ) // empty lines look one char further
|
2000-09-18 23:08:29 +00:00
|
|
|
++nChkEnd;
|
2014-01-14 16:50:42 +00:00
|
|
|
sal_Int32 nOldStart = nStart;
|
|
|
|
sal_Int32 nOldEnd = nEnd;
|
|
|
|
sal_Int32 nOldAct = nAct;
|
2014-02-15 00:58:16 +01:00
|
|
|
bool bRet = false;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2015-05-20 13:05:49 +02:00
|
|
|
for( nAct = nFirst; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nAct )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2015-05-20 13:05:49 +02:00
|
|
|
rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
|
2000-09-18 23:08:29 +00:00
|
|
|
if( nChkEnd < nStart )
|
|
|
|
break;
|
2014-01-14 16:50:42 +00:00
|
|
|
if( nChkStart <= nEnd && ( nChkEnd > nStart || COMPLETE_STRING == nEnd ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2014-02-15 00:58:16 +01:00
|
|
|
bRet = true;
|
2000-09-18 23:08:29 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
nStart = nOldStart;
|
|
|
|
nEnd = nOldEnd;
|
|
|
|
nAct = nOldAct;
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
2014-01-14 16:50:42 +00:00
|
|
|
void SwExtend::ActualizeFont( SwFont &rFnt, sal_uInt16 nAttr )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if ( nAttr & EXTTEXTINPUT_ATTR_UNDERLINE )
|
|
|
|
rFnt.SetUnderline( UNDERLINE_SINGLE );
|
|
|
|
else if ( nAttr & EXTTEXTINPUT_ATTR_BOLDUNDERLINE )
|
|
|
|
rFnt.SetUnderline( UNDERLINE_BOLD );
|
|
|
|
else if ( nAttr & EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE )
|
|
|
|
rFnt.SetUnderline( UNDERLINE_DOTTED );
|
|
|
|
else if ( nAttr & EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE )
|
|
|
|
rFnt.SetUnderline( UNDERLINE_DOTTED );
|
|
|
|
|
|
|
|
if ( nAttr & EXTTEXTINPUT_ATTR_REDTEXT )
|
|
|
|
rFnt.SetColor( Color( COL_RED ) );
|
|
|
|
|
|
|
|
if ( nAttr & EXTTEXTINPUT_ATTR_HIGHLIGHT )
|
|
|
|
{
|
2014-06-13 17:52:30 +02:00
|
|
|
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
|
2000-09-18 23:08:29 +00:00
|
|
|
rFnt.SetColor( rStyleSettings.GetHighlightTextColor() );
|
2002-10-24 07:51:13 +00:00
|
|
|
rFnt.SetBackColor( new Color( rStyleSettings.GetHighlightColor() ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE )
|
2014-02-15 00:58:16 +01:00
|
|
|
rFnt.SetGreyWave( true );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2014-01-14 16:50:42 +00:00
|
|
|
short SwExtend::Enter(SwFont& rFnt, sal_Int32 nNew)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( !Inside(), "SwExtend: Enter without Leave" );
|
|
|
|
OSL_ENSURE( !pFnt, "SwExtend: Enter with Font" );
|
2000-09-18 23:08:29 +00:00
|
|
|
nPos = nNew;
|
|
|
|
if( Inside() )
|
|
|
|
{
|
|
|
|
pFnt = new SwFont( rFnt );
|
|
|
|
ActualizeFont( rFnt, rArr[ nPos - nStart ] );
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-15 00:58:16 +01:00
|
|
|
bool SwExtend::_Leave(SwFont& rFnt, sal_Int32 nNew)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( Inside(), "SwExtend: Leave without Enter" );
|
2014-08-31 12:55:04 +02:00
|
|
|
const sal_uInt16 nOldAttr = rArr[ nPos - nStart ];
|
2000-09-18 23:08:29 +00:00
|
|
|
nPos = nNew;
|
|
|
|
if( Inside() )
|
2014-02-09 01:04:08 +01:00
|
|
|
{ // We stayed within the ExtendText-section
|
2014-08-31 12:55:04 +02:00
|
|
|
const sal_uInt16 nAttr = rArr[ nPos - nStart ];
|
2014-02-09 01:04:08 +01:00
|
|
|
if( nOldAttr != nAttr ) // Is there an (inner) change of attributes?
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
rFnt = *pFnt;
|
|
|
|
ActualizeFont( rFnt, nAttr );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rFnt = *pFnt;
|
|
|
|
delete pFnt;
|
|
|
|
pFnt = NULL;
|
2014-02-15 00:58:16 +01:00
|
|
|
return true;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2014-02-15 00:58:16 +01:00
|
|
|
return false;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2014-01-14 16:50:42 +00:00
|
|
|
sal_Int32 SwExtend::Next( sal_Int32 nNext )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if( nPos < nStart )
|
|
|
|
{
|
|
|
|
if( nNext > nStart )
|
|
|
|
nNext = nStart;
|
|
|
|
}
|
|
|
|
else if( nPos < nEnd )
|
|
|
|
{
|
2014-01-14 16:50:42 +00:00
|
|
|
sal_Int32 nIdx = nPos - nStart;
|
2014-08-31 12:55:04 +02:00
|
|
|
const sal_uInt16 nAttr = rArr[ nIdx ];
|
|
|
|
while( static_cast<size_t>(++nIdx) < rArr.size() && nAttr == rArr[ nIdx ] )
|
2000-09-18 23:08:29 +00:00
|
|
|
; //nothing
|
2007-09-27 08:19:22 +00:00
|
|
|
nIdx = nIdx + nStart;
|
2000-09-18 23:08:29 +00:00
|
|
|
if( nNext > nIdx )
|
|
|
|
nNext = nIdx;
|
|
|
|
}
|
|
|
|
return nNext;
|
|
|
|
}
|
2010-10-14 08:30:41 +02:00
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|