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:17:40 +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:17:40 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:17:40 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 12:17:40 +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:17:40 +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:17:40 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
|
* for a copy of the LGPLv3 License.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
|
|
|
|
************************************************************************/
|
|
|
|
|
|
2006-09-16 19:53:04 +00:00
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
|
|
|
#include "precompiled_sw.hxx"
|
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
#include <hintids.hxx>
|
2000-11-06 08:44:32 +00:00
|
|
|
#include <unotools/tempfile.hxx>
|
2009-10-16 00:05:16 +02:00
|
|
|
#include <svl/urihelper.hxx>
|
|
|
|
|
#include <svl/stritem.hxx>
|
|
|
|
|
#include <svl/eitem.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <sfx2/app.hxx>
|
|
|
|
|
#include <sfx2/docfile.hxx>
|
|
|
|
|
#include <sfx2/docfilt.hxx>
|
2001-10-25 16:22:03 +00:00
|
|
|
#include <sfx2/fcontnr.hxx>
|
2001-08-23 15:02:12 +00:00
|
|
|
#include <sfx2/bindings.hxx>
|
|
|
|
|
#include <sfx2/request.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <fmtinfmt.hxx>
|
|
|
|
|
#include <fmtanchr.hxx>
|
|
|
|
|
#include <doc.hxx>
|
2010-11-25 14:31:08 +01:00
|
|
|
#include <IDocumentUndoRedo.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <docary.hxx>
|
|
|
|
|
#include <pam.hxx>
|
|
|
|
|
#include <ndtxt.hxx>
|
|
|
|
|
#include <docsh.hxx>
|
|
|
|
|
#include <globdoc.hxx>
|
|
|
|
|
#include <shellio.hxx>
|
|
|
|
|
#include <swundo.hxx> // fuer die UndoIds
|
|
|
|
|
#include <section.hxx>
|
|
|
|
|
#include <doctxm.hxx>
|
|
|
|
|
#include <poolfmt.hxx>
|
|
|
|
|
|
2008-02-26 13:06:09 +00:00
|
|
|
#include <com/sun/star/uno/Reference.h>
|
|
|
|
|
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
|
|
|
|
|
#include <com/sun/star/document/XDocumentProperties.hpp>
|
|
|
|
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
enum SwSplitDocType
|
|
|
|
|
{
|
|
|
|
|
SPLITDOC_TO_GLOBALDOC,
|
|
|
|
|
SPLITDOC_TO_HTML
|
|
|
|
|
};
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool SwDoc::GenerateGlobalDoc( const String& rPath,
|
2000-09-18 23:08:29 +00:00
|
|
|
const SwTxtFmtColl* pSplitColl )
|
|
|
|
|
{
|
|
|
|
|
return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, pSplitColl );
|
|
|
|
|
}
|
|
|
|
|
|
2009-01-07 11:57:24 +00:00
|
|
|
//#outline level,add by zhaojianwei
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool SwDoc::GenerateGlobalDoc( const String& rPath, int nOutlineLevel )
|
2009-01-07 11:57:24 +00:00
|
|
|
{
|
|
|
|
|
return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, nOutlineLevel );
|
|
|
|
|
}
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool SwDoc::GenerateHTMLDoc( const String& rPath, int nOutlineLevel )
|
2009-01-07 11:57:24 +00:00
|
|
|
{
|
|
|
|
|
return SplitDoc( SPLITDOC_TO_HTML, rPath, nOutlineLevel );
|
|
|
|
|
}
|
|
|
|
|
//<-end,zhaojianwei
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool SwDoc::GenerateHTMLDoc( const String& rPath,
|
2000-09-18 23:08:29 +00:00
|
|
|
const SwTxtFmtColl* pSplitColl )
|
|
|
|
|
{
|
|
|
|
|
return SplitDoc( SPLITDOC_TO_HTML, rPath, pSplitColl );
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath,
|
2000-09-18 23:08:29 +00:00
|
|
|
const SwTxtFmtColl* pSplitColl )
|
|
|
|
|
{
|
|
|
|
|
// ueber alle Node der Vorlage Iterieren und dafuer einzelne
|
|
|
|
|
// Dokumente erzeugen und in diesem gegen
|
|
|
|
|
// - gelinkte Bereiche (GlobalDoc)
|
|
|
|
|
// - Links (HTML)
|
|
|
|
|
// austauschen.
|
|
|
|
|
// Am Ende wird dieses Doc als GlobalDoc/HTML-Doc gespreichert.
|
|
|
|
|
if( !pDocShell || !pDocShell->GetMedium() ||
|
2006-08-14 14:58:11 +00:00
|
|
|
( SPLITDOC_TO_GLOBALDOC == eDocType && get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) )
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nOutl = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwOutlineNodes* pOutlNds = (SwOutlineNodes*)&GetNodes().GetOutLineNds();
|
|
|
|
|
SwNodePtr pSttNd;
|
|
|
|
|
|
|
|
|
|
if( pSplitColl )
|
|
|
|
|
{
|
|
|
|
|
// wenn keine OutlineNumerierung ist, dann benutze eigenes Array
|
|
|
|
|
// und sammel die Nodes zusammen.
|
2009-01-07 11:57:24 +00:00
|
|
|
if( pSplitColl->GetAttrOutlineLevel() == 0 )//<-end,zhaojianwei, 0814
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
pOutlNds = new SwOutlineNodes( 8, 8 );
|
|
|
|
|
SwClientIter aIter( *(SwModify*)pSplitColl );
|
|
|
|
|
for( SwTxtNode* pTNd = (SwTxtNode*)aIter.First( TYPE( SwTxtNode ));
|
|
|
|
|
pTNd; pTNd = (SwTxtNode*)aIter.Next() )
|
|
|
|
|
if( pTNd->GetNodes().IsDocNodes() )
|
|
|
|
|
pOutlNds->Insert( pTNd );
|
|
|
|
|
|
|
|
|
|
if( !pOutlNds->Count() )
|
|
|
|
|
{
|
|
|
|
|
delete pOutlNds;
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// dann suche die Gliederungs - Vorlage, der 1. Ebene
|
|
|
|
|
const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = rFmtColls.Count(); n; )
|
2009-01-07 11:57:24 +00:00
|
|
|
if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
pSplitColl = rFmtColls[ n ];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( !pSplitColl )
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const SfxFilter* pFilter;
|
|
|
|
|
switch( eDocType )
|
|
|
|
|
{
|
|
|
|
|
case SPLITDOC_TO_HTML:
|
|
|
|
|
pFilter = SwIoSystem::GetFilterOfFormat( String::CreateFromAscii(
|
2001-10-25 16:22:03 +00:00
|
|
|
RTL_CONSTASCII_STRINGPARAM( "HTML" )));
|
2000-09-18 23:08:29 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2001-10-25 13:30:57 +00:00
|
|
|
pFilter = SwIoSystem::GetFilterOfFormat(
|
2001-10-25 16:22:03 +00:00
|
|
|
String::CreateFromAscii( FILTER_XML ));
|
2000-09-18 23:08:29 +00:00
|
|
|
eDocType = SPLITDOC_TO_GLOBALDOC;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( !pFilter )
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// Undo/Redline aufjedenfall abschalten
|
2010-11-25 14:31:08 +01:00
|
|
|
GetIDocumentUndoRedo().DoUndo(false);
|
2007-09-27 07:35:38 +00:00
|
|
|
SetRedlineMode_intern( (RedlineMode_t)(GetRedlineMode() & ~nsRedlineMode_t::REDLINE_ON));
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
String sExt( pFilter->GetSuffixes().GetToken(0, ',') );
|
|
|
|
|
if( !sExt.Len() )
|
2001-02-26 07:24:19 +00:00
|
|
|
sExt.AssignAscii( "sxw" );
|
2000-10-19 08:44:23 +00:00
|
|
|
if( '.' != sExt.GetChar( 0 ) )
|
|
|
|
|
sExt.Insert( '.', 0 );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
INetURLObject aEntry(rPath);
|
|
|
|
|
String sLeading(aEntry.GetBase());
|
|
|
|
|
aEntry.removeSegment();
|
2001-08-31 10:13:43 +00:00
|
|
|
String sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE );
|
2000-11-06 08:44:32 +00:00
|
|
|
utl::TempFile aTemp(sLeading,&sExt,&sPath );
|
2000-09-18 23:08:29 +00:00
|
|
|
aTemp.EnableKillingFile();
|
|
|
|
|
|
|
|
|
|
DateTime aTmplDate;
|
|
|
|
|
{
|
|
|
|
|
Time a2Min( 0 ); a2Min.SetMin( 2 );
|
|
|
|
|
aTmplDate += a2Min;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// alle Ungueltigen ueberspringen
|
|
|
|
|
while( nOutl < pOutlNds->Count() &&
|
|
|
|
|
pOutlNds->GetObject( nOutl )->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() )
|
|
|
|
|
++nOutl;
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
pSttNd = 0;
|
|
|
|
|
|
|
|
|
|
SwNodePtr pNd;
|
|
|
|
|
for( ; nOutl < pOutlNds->Count(); ++nOutl )
|
|
|
|
|
if( ( pNd = pOutlNds->GetObject( nOutl ))->GetTxtNode()->
|
|
|
|
|
GetTxtColl() == pSplitColl &&
|
|
|
|
|
!pNd->FindTableNode() )
|
|
|
|
|
{
|
|
|
|
|
pSttNd = pNd;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( pSttNd )
|
|
|
|
|
{
|
|
|
|
|
SwNodePtr pEndNd = 0;
|
|
|
|
|
for( ++nOutl; nOutl < pOutlNds->Count(); ++nOutl )
|
|
|
|
|
{
|
|
|
|
|
pNd = pOutlNds->GetObject( nOutl );
|
|
|
|
|
SwTxtFmtColl* pTColl = pNd->GetTxtNode()->GetTxtColl();
|
|
|
|
|
|
|
|
|
|
if( ( pTColl == pSplitColl ||
|
2009-01-07 11:57:24 +00:00
|
|
|
( pSplitColl->GetAttrOutlineLevel() > 0 &&
|
|
|
|
|
pTColl->GetAttrOutlineLevel() > 0 &&
|
|
|
|
|
pTColl->GetAttrOutlineLevel() <
|
|
|
|
|
pSplitColl->GetAttrOutlineLevel() )) &&
|
|
|
|
|
!pNd->FindTableNode() ) //<-end,zhaojianwei
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
pEndNd = pNd;
|
2004-07-05 13:38:48 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
SwNodeIndex aEndIdx( pEndNd ? *pEndNd
|
|
|
|
|
: GetNodes().GetEndOfContent() );
|
|
|
|
|
|
|
|
|
|
// die Nodes komplett rausschreiben
|
|
|
|
|
String sFileName;
|
|
|
|
|
if( pSttNd->GetIndex() + 1 < aEndIdx.GetIndex() )
|
|
|
|
|
{
|
2011-01-03 13:40:23 +01:00
|
|
|
SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
|
2000-09-18 23:08:29 +00:00
|
|
|
if( xDocSh->DoInitNew( 0 ) )
|
|
|
|
|
{
|
|
|
|
|
SwDoc* pDoc = ((SwDocShell*)(&xDocSh))->GetDoc();
|
|
|
|
|
|
2008-02-26 13:06:09 +00:00
|
|
|
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
|
|
|
|
|
((SwDocShell*)(&xDocSh))->GetModel(),
|
|
|
|
|
uno::UNO_QUERY_THROW);
|
|
|
|
|
uno::Reference<document::XDocumentProperties> xDocProps(
|
|
|
|
|
xDPS->getDocumentProperties());
|
|
|
|
|
DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
|
|
|
|
|
// the GlobalDoc is the template
|
|
|
|
|
xDocProps->setTemplateName(aEmptyStr);
|
|
|
|
|
::util::DateTime uDT(aTmplDate.Get100Sec(),
|
|
|
|
|
aTmplDate.GetSec(), aTmplDate.GetMin(),
|
|
|
|
|
aTmplDate.GetHour(), aTmplDate.GetDay(),
|
|
|
|
|
aTmplDate.GetMonth(), aTmplDate.GetYear());
|
|
|
|
|
xDocProps->setTemplateDate(uDT);
|
|
|
|
|
xDocProps->setTemplateURL(rPath);
|
2000-09-18 23:08:29 +00:00
|
|
|
//JP 14.06.99: Set the text of the "split para" as title
|
|
|
|
|
// from the new doc. Is the current doc has
|
|
|
|
|
// a title, insert it at begin.
|
2008-02-26 13:06:09 +00:00
|
|
|
String sTitle( xDocProps->getTitle() );
|
2000-09-18 23:08:29 +00:00
|
|
|
if( sTitle.Len() )
|
|
|
|
|
sTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ));
|
|
|
|
|
sTitle += ((SwTxtNode*)pSttNd)->GetExpandTxt();
|
2008-02-26 13:06:09 +00:00
|
|
|
xDocProps->setTitle( sTitle );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// Vorlagen ersetzen
|
|
|
|
|
pDoc->ReplaceStyles( *this );
|
|
|
|
|
|
|
|
|
|
// KapitelNumerierung uebernehmen
|
|
|
|
|
if( pOutlineRule )
|
|
|
|
|
pDoc->SetOutlineNumRule( *pOutlineRule );
|
|
|
|
|
|
|
|
|
|
SwNodeRange aRg( *pSttNd, 0, aEndIdx.GetNode() );
|
|
|
|
|
SwNodeIndex aTmpIdx( pDoc->GetNodes().GetEndOfContent() );
|
2011-01-17 15:06:54 +01:00
|
|
|
GetNodes()._Copy( aRg, aTmpIdx, sal_False );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// den initialen TextNode loeschen
|
|
|
|
|
SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
|
|
|
|
|
if( aIdx.GetIndex() + 1 !=
|
|
|
|
|
pDoc->GetNodes().GetEndOfContent().GetIndex() )
|
|
|
|
|
pDoc->GetNodes().Delete( aIdx, 1 );
|
|
|
|
|
|
|
|
|
|
// alle Flys in dem Bereich
|
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
|
|
|
CopyFlyInFlyImpl( aRg, 0, aIdx );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
// und noch alle Bookmarks
|
|
|
|
|
// ?????
|
|
|
|
|
|
2000-11-06 08:44:32 +00:00
|
|
|
utl::TempFile aTempFile2(sLeading,&sExt,&sPath );
|
2001-01-15 17:47:21 +00:00
|
|
|
sFileName = aTempFile2.GetURL();
|
2000-10-19 08:44:23 +00:00
|
|
|
SfxMedium* pTmpMed = new SfxMedium( sFileName,
|
2011-01-17 15:06:54 +01:00
|
|
|
STREAM_STD_READWRITE, sal_True );
|
2000-10-19 08:44:23 +00:00
|
|
|
pTmpMed->SetFilter( pFilter );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// fuer den HTML-Filter mussen wir aber ein Layout
|
|
|
|
|
// haben, damit Textrahmen/Controls/OLE-Objecte korrekt
|
|
|
|
|
// als Grafik exportiert werden koennen.
|
|
|
|
|
if( SPLITDOC_TO_HTML == eDocType &&
|
|
|
|
|
pDoc->GetSpzFrmFmts()->Count() )
|
|
|
|
|
{
|
|
|
|
|
/* SfxViewFrame* pFrame = */
|
2009-12-04 21:29:53 +01:00
|
|
|
SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2000-10-19 08:44:23 +00:00
|
|
|
xDocSh->DoSaveAs( *pTmpMed );
|
|
|
|
|
xDocSh->DoSaveCompleted( pTmpMed );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// beim Fehler wird keine FileLinkSection eingefuegt
|
|
|
|
|
if( xDocSh->GetError() )
|
|
|
|
|
sFileName.Erase();
|
|
|
|
|
}
|
|
|
|
|
xDocSh->DoClose();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// dann koennen ja die Bereiche eingefuegt werden
|
|
|
|
|
if( sFileName.Len() )
|
|
|
|
|
{
|
|
|
|
|
switch( eDocType )
|
|
|
|
|
{
|
|
|
|
|
case SPLITDOC_TO_HTML:
|
|
|
|
|
{
|
|
|
|
|
// loesche alle Nodes im Bereich und setze im "Start-
|
|
|
|
|
// Node" den Link auf das gespeicherte Doc
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uLong nNodeDiff = aEndIdx.GetIndex() -
|
2000-09-18 23:08:29 +00:00
|
|
|
pSttNd->GetIndex() - 1;
|
|
|
|
|
if( nNodeDiff )
|
|
|
|
|
{
|
|
|
|
|
SwPaM aTmp( *pSttNd, aEndIdx.GetNode(), 1, -1 );
|
|
|
|
|
aTmp.GetPoint()->nContent.Assign( 0, 0 );
|
|
|
|
|
aTmp.GetMark()->nContent.Assign( 0, 0 );
|
|
|
|
|
SwNodeIndex aSIdx( aTmp.GetMark()->nNode );
|
|
|
|
|
SwNodeIndex aEIdx( aTmp.GetPoint()->nNode );
|
|
|
|
|
|
|
|
|
|
// versuche hinters Ende zu verschieben
|
|
|
|
|
if( !aTmp.Move( fnMoveForward, fnGoNode ) )
|
|
|
|
|
{
|
|
|
|
|
// na gut, dann an den Anfang
|
|
|
|
|
aTmp.Exchange();
|
|
|
|
|
if( !aTmp.Move( fnMoveBackward, fnGoNode ))
|
|
|
|
|
{
|
2011-03-14 16:51:14 +00:00
|
|
|
OSL_ENSURE( sal_False, "kein Node mehr vorhanden" );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Bookmarks usw. verschieben
|
2011-01-17 15:06:54 +01:00
|
|
|
CorrAbs( aSIdx, aEIdx, *aTmp.GetPoint(), sal_True);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// stehen noch FlyFrames rum, loesche auch diese
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 0; n < GetSpzFrmFmts()->Count(); ++n )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
SwFrmFmt* pFly = (*GetSpzFrmFmts())[n];
|
|
|
|
|
const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
|
2010-01-05 16:37:41 +01:00
|
|
|
SwPosition const*const pAPos =
|
|
|
|
|
pAnchor->GetCntntAnchor();
|
|
|
|
|
if (pAPos &&
|
|
|
|
|
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
|
|
|
|
|
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
|
2000-09-18 23:08:29 +00:00
|
|
|
aSIdx <= pAPos->nNode &&
|
|
|
|
|
pAPos->nNode < aEIdx )
|
|
|
|
|
{
|
|
|
|
|
DelLayoutFmt( pFly );
|
|
|
|
|
--n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GetNodes().Delete( aSIdx, nNodeDiff );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// dann setze im StartNode noch den Link:
|
2005-01-11 11:18:14 +00:00
|
|
|
SwFmtINetFmt aINet( sFileName , aEmptyStr );
|
2000-09-18 23:08:29 +00:00
|
|
|
SwTxtNode* pTNd = (SwTxtNode*)pSttNd;
|
2006-12-01 14:38:32 +00:00
|
|
|
pTNd->InsertItem( aINet, 0, pTNd->GetTxt().Len() );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
// wenn der nicht mehr gefunden wird, kann das nur
|
|
|
|
|
// ein Bug sein!
|
|
|
|
|
if( !pOutlNds->Seek_Entry( pSttNd, &nOutl ))
|
|
|
|
|
pSttNd = 0;
|
|
|
|
|
++nOutl;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
{
|
|
|
|
|
String sNm( INetURLObject( sFileName ).GetName() );
|
2010-03-16 11:28:30 +01:00
|
|
|
SwSectionData aSectData( FILE_LINK_SECTION,
|
2000-09-18 23:08:29 +00:00
|
|
|
GetUniqueSectionName( &sNm ));
|
|
|
|
|
SwSectionFmt* pFmt = MakeSectionFmt( 0 );
|
2010-03-16 11:28:30 +01:00
|
|
|
aSectData.SetLinkFileName(sFileName);
|
|
|
|
|
aSectData.SetProtectFlag(true);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
aEndIdx--; // im InsertSection ist Ende inclusive
|
|
|
|
|
while( aEndIdx.GetNode().IsStartNode() )
|
|
|
|
|
aEndIdx--;
|
|
|
|
|
|
|
|
|
|
// JP 06.07.99 - Bug 67361 - is any Section ends or
|
|
|
|
|
// starts in the new sectionrange, they must end or
|
|
|
|
|
// start before or behind the range!
|
|
|
|
|
SwSectionNode* pSectNd = pSttNd->FindSectionNode();
|
|
|
|
|
while( pSectNd && pSectNd->EndOfSectionIndex()
|
|
|
|
|
<= aEndIdx.GetIndex() )
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pSectEnd = pSectNd->EndOfSectionNode();
|
|
|
|
|
if( pSectNd->GetIndex() + 1 ==
|
|
|
|
|
pSttNd->GetIndex() )
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool bMvIdx = aEndIdx == *pSectEnd;
|
2000-09-18 23:08:29 +00:00
|
|
|
DelSectionFmt( pSectNd->GetSection().GetFmt() );
|
|
|
|
|
if( bMvIdx )
|
|
|
|
|
aEndIdx--;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
SwNodeRange aRg( *pSttNd, *pSectEnd );
|
|
|
|
|
SwNodeIndex aIdx( *pSectEnd, 1 );
|
|
|
|
|
GetNodes()._MoveNodes( aRg, GetNodes(), aIdx );
|
|
|
|
|
}
|
|
|
|
|
pSectNd = pSttNd->FindSectionNode();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pSectNd = aEndIdx.GetNode().FindSectionNode();
|
|
|
|
|
while( pSectNd && pSectNd->GetIndex() >
|
|
|
|
|
pSttNd->GetIndex() )
|
|
|
|
|
{
|
2003-12-01 08:38:06 +00:00
|
|
|
// #i15712# don't attempt to split sections if
|
|
|
|
|
// they are fully enclosed in [pSectNd,aEndIdx].
|
|
|
|
|
if( aEndIdx < pSectNd->EndOfSectionIndex() )
|
|
|
|
|
{
|
|
|
|
|
SwNodeRange aRg( *pSectNd, 1, aEndIdx, 1 );
|
|
|
|
|
SwNodeIndex aIdx( *pSectNd );
|
|
|
|
|
GetNodes()._MoveNodes( aRg, GetNodes(), aIdx );
|
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
pSectNd = pSttNd->FindSectionNode();
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-05 13:38:48 +00:00
|
|
|
// -> #i26762#
|
|
|
|
|
// Ensure order of start and end of section is sane.
|
|
|
|
|
SwNodeIndex aStartIdx(*pSttNd);
|
|
|
|
|
|
|
|
|
|
if (aEndIdx >= aStartIdx)
|
2010-03-16 11:28:29 +01:00
|
|
|
{
|
|
|
|
|
pSectNd = GetNodes().InsertTextSection(aStartIdx,
|
2010-03-16 11:28:30 +01:00
|
|
|
*pFmt, aSectData, 0, &aEndIdx, false);
|
2010-03-16 11:28:29 +01:00
|
|
|
}
|
2004-07-05 13:38:48 +00:00
|
|
|
else
|
2010-03-16 11:28:29 +01:00
|
|
|
{
|
|
|
|
|
pSectNd = GetNodes().InsertTextSection(aEndIdx,
|
2010-03-16 11:28:30 +01:00
|
|
|
*pFmt, aSectData, 0, &aStartIdx, false);
|
2010-03-16 11:28:29 +01:00
|
|
|
}
|
2004-07-05 13:38:48 +00:00
|
|
|
// <- #i26762#
|
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
pSectNd->GetSection().CreateLink( CREATE_CONNECT );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} while( pSttNd );
|
|
|
|
|
|
|
|
|
|
if( pOutlNds != &GetNodes().GetOutLineNds() )
|
|
|
|
|
delete pOutlNds;
|
|
|
|
|
|
2001-10-25 16:22:03 +00:00
|
|
|
switch( eDocType )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-10-25 16:22:03 +00:00
|
|
|
case SPLITDOC_TO_HTML:
|
2006-08-14 14:58:11 +00:00
|
|
|
if( get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
|
2001-10-25 16:22:03 +00:00
|
|
|
{
|
|
|
|
|
// dann alles verbliebenen Bereiche aufheben
|
|
|
|
|
while( GetSections().Count() )
|
|
|
|
|
DelSectionFmt( GetSections()[ 0 ] );
|
|
|
|
|
|
2003-09-19 07:44:12 +00:00
|
|
|
SfxFilterContainer* pFCntnr = pDocShell->GetFactory().GetFilterContainer();
|
|
|
|
|
pFilter = pFCntnr->GetFilter4EA( pFilter->GetTypeName(), SFX_FILTER_EXPORT );
|
2001-10-25 16:22:03 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2000-09-18 23:08:29 +00:00
|
|
|
// dann das Globaldoc speichern
|
2006-08-14 14:58:11 +00:00
|
|
|
set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
|
|
|
|
|
set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
2001-10-25 16:22:03 +00:00
|
|
|
// Medium istn't locked after reopen the document. Bug 91462
|
2001-08-23 15:02:12 +00:00
|
|
|
SfxRequest aReq( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, GetAttrPool() );
|
|
|
|
|
aReq.AppendItem( SfxStringItem( SID_FILE_NAME, rPath ) );
|
|
|
|
|
aReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) );
|
2006-03-29 07:04:42 +00:00
|
|
|
if(pFilter)
|
|
|
|
|
aReq.AppendItem( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) );
|
2001-10-25 16:22:03 +00:00
|
|
|
const SfxBoolItem *pRet = (const SfxBoolItem*)pDocShell->ExecuteSlot( aReq );
|
|
|
|
|
|
2001-08-23 15:02:12 +00:00
|
|
|
return pRet && pRet->GetValue();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
2009-01-07 11:57:24 +00:00
|
|
|
//#outline level,add by zhaojianwei
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel )
|
2009-01-07 11:57:24 +00:00
|
|
|
{
|
|
|
|
|
if( !pDocShell || !pDocShell->GetMedium() ||
|
|
|
|
|
( SPLITDOC_TO_GLOBALDOC == eDocType && get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) )
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2009-01-07 11:57:24 +00:00
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nOutl = 0;
|
2009-01-07 11:57:24 +00:00
|
|
|
SwOutlineNodes* pOutlNds = (SwOutlineNodes*)&GetNodes().GetOutLineNds();
|
|
|
|
|
SwNodePtr pSttNd;
|
|
|
|
|
|
|
|
|
|
const SfxFilter* pFilter;
|
|
|
|
|
switch( eDocType )
|
|
|
|
|
{
|
|
|
|
|
case SPLITDOC_TO_HTML:
|
|
|
|
|
pFilter = SwIoSystem::GetFilterOfFormat( String::CreateFromAscii(
|
|
|
|
|
RTL_CONSTASCII_STRINGPARAM( "HTML" )));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pFilter = SwIoSystem::GetFilterOfFormat(
|
|
|
|
|
String::CreateFromAscii( FILTER_XML ));
|
|
|
|
|
eDocType = SPLITDOC_TO_GLOBALDOC;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( !pFilter )
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2009-01-07 11:57:24 +00:00
|
|
|
|
|
|
|
|
// Undo/Redline aufjedenfall abschalten
|
2010-11-25 14:31:08 +01:00
|
|
|
GetIDocumentUndoRedo().DoUndo(false);
|
2009-01-07 11:57:24 +00:00
|
|
|
SetRedlineMode_intern( (RedlineMode_t)(GetRedlineMode() & ~nsRedlineMode_t::REDLINE_ON));
|
|
|
|
|
|
|
|
|
|
String sExt( pFilter->GetSuffixes().GetToken(0, ',') );
|
|
|
|
|
if( !sExt.Len() )
|
|
|
|
|
sExt.AssignAscii( "sxw" );
|
|
|
|
|
if( '.' != sExt.GetChar( 0 ) )
|
|
|
|
|
sExt.Insert( '.', 0 );
|
|
|
|
|
|
|
|
|
|
INetURLObject aEntry(rPath);
|
|
|
|
|
String sLeading(aEntry.GetBase());
|
|
|
|
|
aEntry.removeSegment();
|
|
|
|
|
String sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE );
|
|
|
|
|
utl::TempFile aTemp(sLeading,&sExt,&sPath );
|
|
|
|
|
aTemp.EnableKillingFile();
|
|
|
|
|
|
|
|
|
|
DateTime aTmplDate;
|
|
|
|
|
{
|
|
|
|
|
Time a2Min( 0 ); a2Min.SetMin( 2 );
|
|
|
|
|
aTmplDate += a2Min;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// alle Ungueltigen ueberspringen
|
|
|
|
|
while( nOutl < pOutlNds->Count() &&
|
|
|
|
|
pOutlNds->GetObject( nOutl )->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() )
|
|
|
|
|
++nOutl;
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
pSttNd = 0;
|
|
|
|
|
|
|
|
|
|
SwNodePtr pNd;
|
|
|
|
|
for( ; nOutl < pOutlNds->Count(); ++nOutl )
|
|
|
|
|
if( ( pNd = pOutlNds->GetObject( nOutl ))->GetTxtNode()->GetAttrOutlineLevel() == nOutlineLevel &&
|
|
|
|
|
!pNd->FindTableNode() )
|
|
|
|
|
{
|
|
|
|
|
pSttNd = pNd;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( pSttNd )
|
|
|
|
|
{
|
|
|
|
|
SwNodePtr pEndNd = 0;
|
|
|
|
|
for( ++nOutl; nOutl < pOutlNds->Count(); ++nOutl )
|
|
|
|
|
{
|
|
|
|
|
pNd = pOutlNds->GetObject( nOutl );
|
|
|
|
|
|
|
|
|
|
const int nLevel = pNd->GetTxtNode()->GetAttrOutlineLevel();
|
|
|
|
|
|
|
|
|
|
if( ( 0 < nLevel && nLevel <= nOutlineLevel ) &&
|
|
|
|
|
!pNd->FindTableNode() )
|
|
|
|
|
{
|
|
|
|
|
pEndNd = pNd;
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
SwNodeIndex aEndIdx( pEndNd ? *pEndNd
|
|
|
|
|
: GetNodes().GetEndOfContent() );
|
|
|
|
|
|
|
|
|
|
String sFileName;
|
|
|
|
|
if( pSttNd->GetIndex() + 1 < aEndIdx.GetIndex() )
|
|
|
|
|
{
|
2011-01-03 13:40:23 +01:00
|
|
|
SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
|
2009-01-07 11:57:24 +00:00
|
|
|
if( xDocSh->DoInitNew( 0 ) )
|
|
|
|
|
{
|
|
|
|
|
SwDoc* pDoc = ((SwDocShell*)(&xDocSh))->GetDoc();
|
|
|
|
|
|
|
|
|
|
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
|
|
|
|
|
((SwDocShell*)(&xDocSh))->GetModel(),
|
|
|
|
|
uno::UNO_QUERY_THROW);
|
|
|
|
|
uno::Reference<document::XDocumentProperties> xDocProps(
|
|
|
|
|
xDPS->getDocumentProperties());
|
|
|
|
|
DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
|
|
|
|
|
// the GlobalDoc is the template
|
|
|
|
|
xDocProps->setTemplateName(aEmptyStr);
|
|
|
|
|
::util::DateTime uDT(aTmplDate.Get100Sec(),
|
|
|
|
|
aTmplDate.GetSec(), aTmplDate.GetMin(),
|
|
|
|
|
aTmplDate.GetHour(), aTmplDate.GetDay(),
|
|
|
|
|
aTmplDate.GetMonth(), aTmplDate.GetYear());
|
|
|
|
|
xDocProps->setTemplateDate(uDT);
|
|
|
|
|
xDocProps->setTemplateURL(rPath);
|
|
|
|
|
//JP 14.06.99: Set the text of the "split para" as title
|
|
|
|
|
// from the new doc. Is the current doc has
|
|
|
|
|
// a title, insert it at begin.
|
|
|
|
|
String sTitle( xDocProps->getTitle() );
|
|
|
|
|
if( sTitle.Len() )
|
|
|
|
|
sTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ));
|
|
|
|
|
sTitle += ((SwTxtNode*)pSttNd)->GetExpandTxt();
|
|
|
|
|
xDocProps->setTitle( sTitle );
|
|
|
|
|
|
|
|
|
|
// Vorlagen ersetzen
|
|
|
|
|
pDoc->ReplaceStyles( *this );
|
|
|
|
|
|
|
|
|
|
// KapitelNumerierung uebernehmen
|
|
|
|
|
if( pOutlineRule )
|
|
|
|
|
pDoc->SetOutlineNumRule( *pOutlineRule );
|
|
|
|
|
|
|
|
|
|
SwNodeRange aRg( *pSttNd, 0, aEndIdx.GetNode() );
|
|
|
|
|
SwNodeIndex aTmpIdx( pDoc->GetNodes().GetEndOfContent() );
|
2011-01-17 15:06:54 +01:00
|
|
|
GetNodes()._Copy( aRg, aTmpIdx, sal_False );
|
2009-01-07 11:57:24 +00:00
|
|
|
|
|
|
|
|
// den initialen TextNode loeschen
|
|
|
|
|
SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
|
|
|
|
|
if( aIdx.GetIndex() + 1 !=
|
|
|
|
|
pDoc->GetNodes().GetEndOfContent().GetIndex() )
|
|
|
|
|
pDoc->GetNodes().Delete( aIdx, 1 );
|
|
|
|
|
|
|
|
|
|
// alle Flys in dem Bereich
|
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
|
|
|
CopyFlyInFlyImpl( aRg, 0, aIdx );
|
2009-01-07 11:57:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
// und noch alle Bookmarks
|
|
|
|
|
// ?????
|
|
|
|
|
|
|
|
|
|
utl::TempFile aTempFile2(sLeading,&sExt,&sPath );
|
|
|
|
|
sFileName = aTempFile2.GetURL();
|
|
|
|
|
SfxMedium* pTmpMed = new SfxMedium( sFileName,
|
2011-01-17 15:06:54 +01:00
|
|
|
STREAM_STD_READWRITE, sal_True );
|
2009-01-07 11:57:24 +00:00
|
|
|
pTmpMed->SetFilter( pFilter );
|
|
|
|
|
|
|
|
|
|
// fuer den HTML-Filter mussen wir aber ein Layout
|
|
|
|
|
// haben, damit Textrahmen/Controls/OLE-Objecte korrekt
|
|
|
|
|
// als Grafik exportiert werden koennen.
|
|
|
|
|
if( SPLITDOC_TO_HTML == eDocType &&
|
|
|
|
|
pDoc->GetSpzFrmFmts()->Count() )
|
|
|
|
|
{
|
2009-12-04 21:29:53 +01:00
|
|
|
SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
|
2009-01-07 11:57:24 +00:00
|
|
|
}
|
|
|
|
|
xDocSh->DoSaveAs( *pTmpMed );
|
|
|
|
|
xDocSh->DoSaveCompleted( pTmpMed );
|
|
|
|
|
|
|
|
|
|
// beim Fehler wird keine FileLinkSection eingefuegt
|
|
|
|
|
if( xDocSh->GetError() )
|
|
|
|
|
sFileName.Erase();
|
|
|
|
|
}
|
|
|
|
|
xDocSh->DoClose();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// dann koennen ja die Bereiche eingefuegt werden
|
|
|
|
|
if( sFileName.Len() )
|
|
|
|
|
{
|
|
|
|
|
switch( eDocType )
|
|
|
|
|
{
|
|
|
|
|
case SPLITDOC_TO_HTML:
|
|
|
|
|
{
|
|
|
|
|
// loesche alle Nodes im Bereich und setze im "Start-
|
|
|
|
|
// Node" den Link auf das gespeicherte Doc
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uLong nNodeDiff = aEndIdx.GetIndex() -
|
2009-01-07 11:57:24 +00:00
|
|
|
pSttNd->GetIndex() - 1;
|
|
|
|
|
if( nNodeDiff )
|
|
|
|
|
{
|
|
|
|
|
SwPaM aTmp( *pSttNd, aEndIdx.GetNode(), 1, -1 );
|
|
|
|
|
aTmp.GetPoint()->nContent.Assign( 0, 0 );
|
|
|
|
|
aTmp.GetMark()->nContent.Assign( 0, 0 );
|
|
|
|
|
SwNodeIndex aSIdx( aTmp.GetMark()->nNode );
|
|
|
|
|
SwNodeIndex aEIdx( aTmp.GetPoint()->nNode );
|
|
|
|
|
|
|
|
|
|
// versuche hinters Ende zu verschieben
|
|
|
|
|
if( !aTmp.Move( fnMoveForward, fnGoNode ) )
|
|
|
|
|
{
|
|
|
|
|
// na gut, dann an den Anfang
|
|
|
|
|
aTmp.Exchange();
|
|
|
|
|
if( !aTmp.Move( fnMoveBackward, fnGoNode ))
|
|
|
|
|
{
|
2011-03-14 16:51:14 +00:00
|
|
|
OSL_ENSURE( sal_False, "kein Node mehr vorhanden" );
|
2009-01-07 11:57:24 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Bookmarks usw. verschieben
|
2011-01-17 15:06:54 +01:00
|
|
|
CorrAbs( aSIdx, aEIdx, *aTmp.GetPoint(), sal_True);
|
2009-01-07 11:57:24 +00:00
|
|
|
|
|
|
|
|
// stehen noch FlyFrames rum, loesche auch diese
|
2011-01-17 15:06:54 +01:00
|
|
|
for( sal_uInt16 n = 0; n < GetSpzFrmFmts()->Count(); ++n )
|
2009-01-07 11:57:24 +00:00
|
|
|
{
|
|
|
|
|
SwFrmFmt* pFly = (*GetSpzFrmFmts())[n];
|
|
|
|
|
const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
|
2010-01-05 16:37:41 +01:00
|
|
|
SwPosition const*const pAPos =
|
|
|
|
|
pAnchor->GetCntntAnchor();
|
|
|
|
|
if (pAPos &&
|
|
|
|
|
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
|
|
|
|
|
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
|
2009-01-07 11:57:24 +00:00
|
|
|
aSIdx <= pAPos->nNode &&
|
|
|
|
|
pAPos->nNode < aEIdx )
|
|
|
|
|
{
|
|
|
|
|
DelLayoutFmt( pFly );
|
|
|
|
|
--n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GetNodes().Delete( aSIdx, nNodeDiff );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// dann setze im StartNode noch den Link:
|
|
|
|
|
SwFmtINetFmt aINet( sFileName , aEmptyStr );
|
|
|
|
|
SwTxtNode* pTNd = (SwTxtNode*)pSttNd;
|
|
|
|
|
pTNd->InsertItem( aINet, 0, pTNd->GetTxt().Len() );
|
|
|
|
|
|
|
|
|
|
// wenn der nicht mehr gefunden wird, kann das nur
|
|
|
|
|
// ein Bug sein!
|
|
|
|
|
if( !pOutlNds->Seek_Entry( pSttNd, &nOutl ))
|
|
|
|
|
pSttNd = 0;
|
|
|
|
|
++nOutl;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
{
|
|
|
|
|
String sNm( INetURLObject( sFileName ).GetName() );
|
2010-03-16 11:28:30 +01:00
|
|
|
SwSectionData aSectData( FILE_LINK_SECTION,
|
2009-01-07 11:57:24 +00:00
|
|
|
GetUniqueSectionName( &sNm ));
|
|
|
|
|
SwSectionFmt* pFmt = MakeSectionFmt( 0 );
|
2010-03-16 11:28:30 +01:00
|
|
|
aSectData.SetLinkFileName(sFileName);
|
|
|
|
|
aSectData.SetProtectFlag(true);
|
2009-01-07 11:57:24 +00:00
|
|
|
|
|
|
|
|
aEndIdx--; // im InsertSection ist Ende inclusive
|
|
|
|
|
while( aEndIdx.GetNode().IsStartNode() )
|
|
|
|
|
aEndIdx--;
|
|
|
|
|
|
|
|
|
|
// JP 06.07.99 - Bug 67361 - is any Section ends or
|
|
|
|
|
// starts in the new sectionrange, they must end or
|
|
|
|
|
// start before or behind the range!
|
|
|
|
|
SwSectionNode* pSectNd = pSttNd->FindSectionNode();
|
|
|
|
|
while( pSectNd && pSectNd->EndOfSectionIndex()
|
|
|
|
|
<= aEndIdx.GetIndex() )
|
|
|
|
|
{
|
|
|
|
|
const SwNode* pSectEnd = pSectNd->EndOfSectionNode();
|
|
|
|
|
if( pSectNd->GetIndex() + 1 ==
|
|
|
|
|
pSttNd->GetIndex() )
|
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_Bool bMvIdx = aEndIdx == *pSectEnd;
|
2009-01-07 11:57:24 +00:00
|
|
|
DelSectionFmt( pSectNd->GetSection().GetFmt() );
|
|
|
|
|
if( bMvIdx )
|
|
|
|
|
aEndIdx--;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
SwNodeRange aRg( *pSttNd, *pSectEnd );
|
|
|
|
|
SwNodeIndex aIdx( *pSectEnd, 1 );
|
|
|
|
|
GetNodes()._MoveNodes( aRg, GetNodes(), aIdx );
|
|
|
|
|
}
|
|
|
|
|
pSectNd = pSttNd->FindSectionNode();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pSectNd = aEndIdx.GetNode().FindSectionNode();
|
|
|
|
|
while( pSectNd && pSectNd->GetIndex() >
|
|
|
|
|
pSttNd->GetIndex() )
|
|
|
|
|
{
|
|
|
|
|
if( aEndIdx < pSectNd->EndOfSectionIndex() )
|
|
|
|
|
{
|
|
|
|
|
SwNodeRange aRg( *pSectNd, 1, aEndIdx, 1 );
|
|
|
|
|
SwNodeIndex aIdx( *pSectNd );
|
|
|
|
|
GetNodes()._MoveNodes( aRg, GetNodes(), aIdx );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pSectNd = pSttNd->FindSectionNode();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SwNodeIndex aStartIdx(*pSttNd);
|
|
|
|
|
|
|
|
|
|
if (aEndIdx >= aStartIdx)
|
2010-03-16 11:28:29 +01:00
|
|
|
{
|
|
|
|
|
pSectNd = GetNodes().InsertTextSection(aStartIdx,
|
2010-03-16 11:28:30 +01:00
|
|
|
*pFmt, aSectData, 0, &aEndIdx, false);
|
2010-03-16 11:28:29 +01:00
|
|
|
}
|
2009-01-07 11:57:24 +00:00
|
|
|
else
|
2010-03-16 11:28:29 +01:00
|
|
|
{
|
|
|
|
|
pSectNd = GetNodes().InsertTextSection(aEndIdx,
|
2010-03-16 11:28:30 +01:00
|
|
|
*pFmt, aSectData, 0, &aStartIdx, false);
|
2010-03-16 11:28:29 +01:00
|
|
|
}
|
2009-01-07 11:57:24 +00:00
|
|
|
|
|
|
|
|
pSectNd->GetSection().CreateLink( CREATE_CONNECT );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} while( pSttNd );
|
|
|
|
|
|
|
|
|
|
if( pOutlNds != &GetNodes().GetOutLineNds() )
|
|
|
|
|
delete pOutlNds;
|
|
|
|
|
|
|
|
|
|
switch( eDocType )
|
|
|
|
|
{
|
|
|
|
|
case SPLITDOC_TO_HTML:
|
|
|
|
|
if( get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
|
|
|
|
|
{
|
|
|
|
|
while( GetSections().Count() )
|
|
|
|
|
DelSectionFmt( GetSections()[ 0 ] );
|
|
|
|
|
|
|
|
|
|
SfxFilterContainer* pFCntnr = pDocShell->GetFactory().GetFilterContainer();
|
|
|
|
|
pFilter = pFCntnr->GetFilter4EA( pFilter->GetTypeName(), SFX_FILTER_EXPORT );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// case SPLITDOC_TO_GLOBALDOC:
|
|
|
|
|
default:
|
|
|
|
|
set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
|
|
|
|
|
set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SfxRequest aReq( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, GetAttrPool() );
|
|
|
|
|
aReq.AppendItem( SfxStringItem( SID_FILE_NAME, rPath ) );
|
|
|
|
|
aReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) );
|
|
|
|
|
if(pFilter)
|
|
|
|
|
aReq.AppendItem( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) );
|
|
|
|
|
const SfxBoolItem *pRet = (const SfxBoolItem*)pDocShell->ExecuteSlot( aReq );
|
|
|
|
|
|
|
|
|
|
return pRet && pRet->GetValue();
|
|
|
|
|
}//<-end,zhaojianwei
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2010-10-14 08:30:41 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|