2009-09-11 10:21:51 +00:00
|
|
|
/**************************************************************************
|
|
|
|
*
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* $RCSfile: vprint.cxx,v $
|
2008-06-13 09:33:28 +00:00
|
|
|
* $Revision: 1.46 $
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +00:00
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 15:26:56 +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 21:03:43 +00:00
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
|
|
#include "precompiled_sw.hxx"
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
#include <com/sun/star/uno/Sequence.hxx>
|
|
|
|
#include <com/sun/star/uno/Any.hxx>
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <hintids.hxx>
|
2009-08-19 07:32:06 +00:00
|
|
|
#include <vcl/oldprintadaptor.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <sfx2/printer.hxx>
|
2004-10-04 18:15:13 +00:00
|
|
|
#include <sfx2/objsh.hxx>
|
2009-07-16 14:39:49 +00:00
|
|
|
#include <tools/resary.hxx>
|
|
|
|
#include <tools/debug.hxx>
|
|
|
|
#include <rtl/ustring.hxx>
|
|
|
|
#include <toolkit/awt/vclxdevice.hxx>
|
2009-07-17 08:40:57 +00:00
|
|
|
#include <toolkit/awt/vclxdevice.hxx>
|
2004-10-04 18:15:13 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <sfx2/progress.hxx>
|
|
|
|
#include <sfx2/app.hxx>
|
2002-11-01 14:34:37 +00:00
|
|
|
#include <sfx2/prnmon.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <svx/paperinf.hxx>
|
|
|
|
#include <svx/pbinitem.hxx>
|
|
|
|
#include <svx/svdview.hxx>
|
2001-02-14 08:58:47 +00:00
|
|
|
#include <unotools/localedatawrapper.hxx>
|
2009-07-16 14:39:49 +00:00
|
|
|
|
2009-07-23 17:27:06 +00:00
|
|
|
#include <svtools/moduleoptions.hxx>
|
2009-11-18 20:23:30 +01:00
|
|
|
#include <svtools/languageoptions.hxx>
|
2009-07-23 17:27:06 +00:00
|
|
|
|
2009-08-19 07:32:06 +00:00
|
|
|
#include <com/sun/star/uno/Any.hxx>
|
|
|
|
#include <com/sun/star/view/XRenderable.hpp>
|
|
|
|
|
|
|
|
#include <unotxdoc.hxx>
|
|
|
|
|
|
|
|
#include <docsh.hxx>
|
2009-09-08 04:57:32 +00:00
|
|
|
#include <svtools/syslocale.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <txtfld.hxx>
|
|
|
|
#include <fmtfld.hxx>
|
|
|
|
#include <fmtfsize.hxx>
|
|
|
|
#include <frmatr.hxx>
|
|
|
|
#include <rootfrm.hxx>
|
|
|
|
#include <pagefrm.hxx>
|
|
|
|
#include <cntfrm.hxx>
|
|
|
|
#include <doc.hxx>
|
2009-09-01 15:16:12 +00:00
|
|
|
#include <wdocsh.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <fesh.hxx>
|
|
|
|
#include <pam.hxx>
|
|
|
|
#include <viewimp.hxx> // Imp->SetFirstVisPageInvalid()
|
|
|
|
#include <layact.hxx>
|
|
|
|
#include <ndtxt.hxx>
|
|
|
|
#include <fldbas.hxx>
|
|
|
|
#include <docfld.hxx> // _SetGetExpFld
|
2009-08-21 06:14:34 +00:00
|
|
|
#include <docufld.hxx> // PostItFld /-Type
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <shellres.hxx>
|
|
|
|
#include <viewopt.hxx>
|
|
|
|
#include <swprtopt.hxx> // SwPrtOptions
|
|
|
|
#include <pagedesc.hxx>
|
|
|
|
#include <poolfmt.hxx> // fuer RES_POOLPAGE_JAKET
|
|
|
|
#include <mdiexp.hxx> // Ansteuern der Statusleiste
|
|
|
|
#ifndef _STATSTR_HRC
|
|
|
|
#include <statstr.hrc> // -- " --
|
|
|
|
#endif
|
|
|
|
#include <ptqueue.hxx>
|
|
|
|
#include <tabfrm.hxx>
|
|
|
|
#include <txtfrm.hxx> // MinPrtLine
|
|
|
|
#include <viscrs.hxx> // SwShellCrsr
|
|
|
|
#include <fmtpdsc.hxx> // SwFmtPageDesc
|
2009-07-16 14:39:49 +00:00
|
|
|
#include <globals.hrc>
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
#define JOBSET_ERR_DEFAULT 0
|
|
|
|
#define JOBSET_ERR_ERROR 1
|
|
|
|
#define JOBSET_ERR_ISSTARTET 2
|
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
|
2009-08-21 06:14:34 +00:00
|
|
|
extern void lcl_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds& rSrtLst );
|
|
|
|
|
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
using namespace ::com::sun::star;
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
//--------------------------------------------------------------------
|
|
|
|
//Klasse zum Puffern von Paints
|
|
|
|
class SwQueuedPaint
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
SwQueuedPaint *pNext;
|
|
|
|
ViewShell *pSh;
|
|
|
|
SwRect aRect;
|
|
|
|
|
|
|
|
SwQueuedPaint( ViewShell *pNew, const SwRect &rRect ) :
|
|
|
|
pNext( 0 ),
|
|
|
|
pSh( pNew ),
|
|
|
|
aRect( rRect )
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
SwQueuedPaint *SwPaintQueue::pQueue = 0;
|
|
|
|
|
2002-06-27 10:39:50 +00:00
|
|
|
// saves some settings from the draw view
|
|
|
|
class SwDrawViewSave
|
|
|
|
{
|
|
|
|
String sLayerNm;
|
|
|
|
SdrView* pDV;
|
|
|
|
sal_Bool bPrintControls;
|
|
|
|
public:
|
|
|
|
SwDrawViewSave( SdrView* pSdrView );
|
|
|
|
~SwDrawViewSave();
|
|
|
|
};
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
void SwPaintQueue::Add( ViewShell *pNew, const SwRect &rNew )
|
|
|
|
{
|
|
|
|
SwQueuedPaint *pPt;
|
|
|
|
if ( 0 != (pPt = pQueue) )
|
|
|
|
{
|
|
|
|
while ( pPt->pSh != pNew && pPt->pNext )
|
|
|
|
pPt = pPt->pNext;
|
|
|
|
if ( pPt->pSh == pNew )
|
|
|
|
{
|
|
|
|
pPt->aRect.Union( rNew );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SwQueuedPaint *pNQ = new SwQueuedPaint( pNew, rNew );
|
|
|
|
if ( pPt )
|
|
|
|
pPt->pNext = pNQ;
|
|
|
|
else
|
|
|
|
pQueue = pNQ;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SwPaintQueue::Repaint()
|
|
|
|
{
|
|
|
|
if ( !SwRootFrm::IsInPaint() && pQueue )
|
|
|
|
{
|
|
|
|
SwQueuedPaint *pPt = pQueue;
|
|
|
|
do
|
|
|
|
{ ViewShell *pSh = pPt->pSh;
|
|
|
|
SET_CURR_SHELL( pSh );
|
|
|
|
if ( pSh->IsPreView() )
|
|
|
|
{
|
|
|
|
if ( pSh->GetWin() )
|
|
|
|
{
|
|
|
|
//Fuer PreView aussenherum, weil im PaintHdl (UI) die
|
|
|
|
//Zeilen/Spalten bekannt sind.
|
|
|
|
pSh->GetWin()->Invalidate();
|
|
|
|
pSh->GetWin()->Update();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pSh->Paint( pPt->aRect.SVRect() );
|
|
|
|
pPt = pPt->pNext;
|
|
|
|
} while ( pPt );
|
|
|
|
|
|
|
|
do
|
|
|
|
{ pPt = pQueue;
|
|
|
|
pQueue = pQueue->pNext;
|
|
|
|
delete pPt;
|
|
|
|
} while ( pQueue );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SwPaintQueue::Remove( ViewShell *pSh )
|
|
|
|
{
|
|
|
|
SwQueuedPaint *pPt;
|
|
|
|
if ( 0 != (pPt = pQueue) )
|
|
|
|
{
|
|
|
|
SwQueuedPaint *pPrev = 0;
|
|
|
|
while ( pPt && pPt->pSh != pSh )
|
|
|
|
{
|
|
|
|
pPrev = pPt;
|
|
|
|
pPt = pPt->pNext;
|
|
|
|
}
|
|
|
|
if ( pPt )
|
|
|
|
{
|
|
|
|
if ( pPrev )
|
|
|
|
pPrev->pNext = pPt->pNext;
|
|
|
|
else if ( pPt == pQueue )
|
|
|
|
pQueue = 0;
|
|
|
|
delete pPt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
/*****************************************************************************/
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
const XubString& SwPrtOptions::MakeNextJobName()
|
|
|
|
{
|
|
|
|
static char __READONLY_DATA sDelim[] = " - ";
|
|
|
|
USHORT nDelim = sJobName.SearchAscii( sDelim );
|
|
|
|
if( STRING_NOTFOUND == nDelim )
|
|
|
|
sJobName.AppendAscii(sDelim);
|
|
|
|
else
|
|
|
|
sJobName.Erase( nDelim + 3/*Zeichen!*/ );
|
|
|
|
|
|
|
|
return sJobName += XubString::CreateFromInt32( ++nJobNo );
|
|
|
|
}
|
|
|
|
|
2009-08-27 12:29:52 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
SwRenderData::SwRenderData()
|
|
|
|
{
|
|
|
|
m_pPostItFields = 0;
|
|
|
|
m_pPostItDoc = 0;
|
|
|
|
m_pPostItShell = 0;
|
2009-09-01 15:16:12 +00:00
|
|
|
|
|
|
|
m_pViewOptionAdjust = 0;
|
|
|
|
m_pPrtOptions = 0;
|
2009-08-27 12:29:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SwRenderData::~SwRenderData()
|
|
|
|
{
|
2009-09-01 15:16:12 +00:00
|
|
|
delete m_pViewOptionAdjust; m_pViewOptionAdjust = 0;
|
|
|
|
delete m_pPrtOptions; m_pPrtOptions = 0;
|
|
|
|
DBG_ASSERT( !m_pPostItShell, "m_pPostItShell should already have been deleted" );
|
|
|
|
DBG_ASSERT( !m_pPostItDoc, "m_pPostItDoc should already have been deleted" );
|
|
|
|
DBG_ASSERT( !m_pPostItFields, " should already have been deleted" );
|
2009-08-27 12:29:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev )
|
|
|
|
{
|
2009-09-01 15:16:12 +00:00
|
|
|
DBG_ASSERT( !m_pPostItFields && !m_pPostItDoc && !m_pPostItShell, "some post-it data already exists" );
|
2009-08-27 12:29:52 +00:00
|
|
|
m_pPostItFields = new _SetGetExpFlds;
|
2009-08-28 13:54:50 +00:00
|
|
|
lcl_GetPostIts( pDoc, *m_pPostItFields );
|
|
|
|
m_pPostItDoc = new SwDoc;
|
2009-08-27 12:29:52 +00:00
|
|
|
|
|
|
|
//!! Disable spell and grammar checking in the temporary document.
|
|
|
|
//!! Otherwise the grammar checker might process it and crash if we later on
|
|
|
|
//!! simply delete this document while he is still at it.
|
|
|
|
SwViewOption aViewOpt( *pViewOpt );
|
|
|
|
aViewOpt.SetOnlineSpell( FALSE );
|
|
|
|
|
2009-08-28 13:54:50 +00:00
|
|
|
m_pPostItShell = new ViewShell( *m_pPostItDoc, 0, &aViewOpt, pOutDev );
|
2009-08-27 12:29:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwRenderData::DeletePostItData()
|
|
|
|
{
|
|
|
|
if (HasPostItData())
|
|
|
|
{
|
|
|
|
m_pPostItDoc->setPrinter( 0, false, false ); //damit am echten DOC der Drucker bleibt
|
|
|
|
delete m_pPostItShell; //Nimmt das PostItDoc mit ins Grab.
|
|
|
|
delete m_pPostItFields;
|
|
|
|
m_pPostItDoc = 0;
|
|
|
|
m_pPostItShell = 0;
|
|
|
|
m_pPostItFields = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-03 15:25:10 +01:00
|
|
|
void SwRenderData::ViewOptionAdjustStart( SwWrtShell& rSh, const SwPrtOptions *pPrtOptions )
|
2009-09-01 15:16:12 +00:00
|
|
|
{
|
2009-09-04 10:12:00 +00:00
|
|
|
if (m_pViewOptionAdjust)
|
|
|
|
delete m_pViewOptionAdjust;
|
2009-12-03 15:25:10 +01:00
|
|
|
m_pViewOptionAdjust = new SwViewOptionAdjust_Impl( rSh, pPrtOptions );
|
2009-09-01 15:16:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwRenderData::ViewOptionAdjustStop()
|
|
|
|
{
|
|
|
|
if (IsViewOptionAdjust())
|
|
|
|
{
|
|
|
|
delete m_pViewOptionAdjust;
|
|
|
|
m_pViewOptionAdjust = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwRenderData::MakeSwPrtOptions(
|
|
|
|
SwPrtOptions &rOptions,
|
|
|
|
const SwDocShell *pDocShell,
|
|
|
|
const SwPrintUIOptions *pOpt,
|
|
|
|
const SwRenderData *pData,
|
|
|
|
bool bIsSkipEmptyPages,
|
|
|
|
bool bIsPDFExport )
|
|
|
|
{
|
|
|
|
if (!pDocShell || !pOpt || !pData)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// get default print options
|
|
|
|
const TypeId aSwWebDocShellTypeId = TYPE(SwWebDocShell);
|
|
|
|
BOOL bWeb = pDocShell->IsA( aSwWebDocShellTypeId );
|
2009-09-04 14:41:56 +00:00
|
|
|
rOptions.MakeOptions( bWeb );
|
2009-09-01 15:16:12 +00:00
|
|
|
|
|
|
|
// get print options to use from provided properties
|
|
|
|
rOptions.bPrintGraphic = pOpt->IsPrintGraphics();
|
|
|
|
rOptions.bPrintTable = pOpt->IsPrintTables();
|
|
|
|
rOptions.bPrintDraw = pOpt->IsPrintDrawings();
|
|
|
|
rOptions.bPrintControl = pOpt->getBoolValue( "PrintControls", rOptions.bPrintControl );
|
|
|
|
rOptions.bPrintLeftPages = pOpt->IsPrintLeftPages();
|
|
|
|
rOptions.bPrintRightPages = pOpt->IsPrintRightPages();
|
|
|
|
rOptions.bPrintPageBackground = pOpt->getBoolValue( "PrintPageBackground", rOptions.bPrintPageBackground );
|
|
|
|
rOptions.bPrintEmptyPages = !bIsSkipEmptyPages;
|
2009-09-04 14:41:56 +00:00
|
|
|
// bUpdateFieldsInPrinting <-- not set here; mail merge only
|
2009-09-01 15:16:12 +00:00
|
|
|
rOptions.bPaperFromSetup = pOpt->getBoolValue( "PrintPaperFromSetup", rOptions.bPaperFromSetup );
|
|
|
|
rOptions.bPrintReverse = pOpt->getBoolValue( "PrintReversed", rOptions.bPrintReverse );
|
|
|
|
rOptions.bPrintProspect = pOpt->getBoolValue( "PrintProspect", rOptions.bPrintProspect );
|
|
|
|
rOptions.bPrintProspectRTL = pOpt->getIntValue( "PrintProspectRTL", rOptions.bPrintProspectRTL ) ? true : false;
|
2009-09-04 14:41:56 +00:00
|
|
|
// bPrintSingleJobs <-- not set here; mail merge and or configuration
|
|
|
|
// bModified <-- not set here; mail merge only
|
2009-09-01 15:16:12 +00:00
|
|
|
rOptions.bPrintBlackFont = pOpt->getBoolValue( "PrintBlackFonts", rOptions.bPrintBlackFont );
|
|
|
|
rOptions.bPrintHiddenText = pOpt->getBoolValue( "PrintHiddenText", rOptions.bPrintHiddenText );
|
|
|
|
rOptions.bPrintTextPlaceholder = pOpt->getBoolValue( "PrintTextPlaceholder", rOptions.bPrintTextPlaceholder );
|
|
|
|
rOptions.nPrintPostIts = static_cast< sal_Int16 >(pOpt->getIntValue( "PrintAnnotationMode", rOptions.nPrintPostIts ));
|
|
|
|
|
|
|
|
//! needs to be set after MakeOptions since the assignment operation in that
|
|
|
|
//! function will destroy the pointers
|
|
|
|
rOptions.SetPrintUIOptions( pOpt );
|
|
|
|
rOptions.SetRenderData( pData );
|
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
// rOptions.aMulti is not used anymore in the XRenderable API
|
|
|
|
// Thus we set it to a dummy value here.
|
|
|
|
rOptions.aMulti = MultiSelection( Range( 1, 1 ) );
|
2009-09-01 15:16:12 +00:00
|
|
|
|
|
|
|
//! Note: Since for PDF export of (multi-)selection a temporary
|
|
|
|
//! document is created that contains only the selects parts,
|
|
|
|
//! and thus that document is to printed in whole the,
|
|
|
|
//! rOptions.bPrintSelection parameter will be false.
|
|
|
|
if (bIsPDFExport)
|
|
|
|
rOptions.bPrintSelection = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
2009-09-03 15:12:37 +00:00
|
|
|
SwPrintUIOptions::SwPrintUIOptions( bool bWeb, bool bSwSrcView ) :
|
2009-08-14 13:56:56 +00:00
|
|
|
m_pLast( NULL )
|
2009-07-16 14:39:49 +00:00
|
|
|
{
|
|
|
|
ResStringArray aLocalizedStrings( SW_RES( STR_PRINTOPTUI ) );
|
|
|
|
|
2009-08-10 17:36:31 +00:00
|
|
|
DBG_ASSERT( aLocalizedStrings.Count() >= 44, "resource incomplete" );
|
|
|
|
if( aLocalizedStrings.Count() < 44 ) // bad resource ?
|
2009-07-16 14:39:49 +00:00
|
|
|
return;
|
|
|
|
|
2009-09-03 15:12:37 +00:00
|
|
|
// printing HTML sources does not have any valid UI options.
|
|
|
|
// Its just the source code that gets printed ...
|
|
|
|
if (bSwSrcView)
|
|
|
|
{
|
|
|
|
m_aUIProperties.realloc( 0 );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-11-18 20:23:30 +01:00
|
|
|
// check if CTL is enabled
|
|
|
|
SvtLanguageOptions aLangOpt;
|
|
|
|
bool bCTL = aLangOpt.IsCTLFontEnabled();
|
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
// create sequence of print UI options
|
|
|
|
// (5 options are not available for Writer-Web)
|
2009-11-18 20:23:30 +01:00
|
|
|
const int nCTLOpts = bCTL ? 1 : 0;
|
|
|
|
const int nNumProps = nCTLOpts + (bWeb ? 16 : 20);
|
2009-07-16 14:39:49 +00:00
|
|
|
m_aUIProperties.realloc( nNumProps );
|
|
|
|
int nIdx = 0;
|
|
|
|
|
2009-07-23 17:27:06 +00:00
|
|
|
// create "writer" section (new tab page in dialog)
|
2009-11-18 20:23:30 +01:00
|
|
|
SvtModuleOptions aModOpt;
|
2009-08-10 17:36:31 +00:00
|
|
|
String aAppGroupname( aLocalizedStrings.GetString( 0 ) );
|
2009-08-01 15:16:11 +00:00
|
|
|
aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
|
2009-11-18 20:23:30 +01:00
|
|
|
aModOpt.GetModuleName( SvtModuleOptions::E_SWRITER ) );
|
2009-08-01 15:16:11 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
|
2009-07-23 17:27:06 +00:00
|
|
|
|
|
|
|
// create sub section for Contents
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 1 ), rtl::OUString() );
|
2009-07-23 17:27:06 +00:00
|
|
|
|
|
|
|
// create a bool option for background
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 2 ),
|
|
|
|
aLocalizedStrings.GetString( 3 ),
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPageBackground" ) ),
|
2009-07-23 17:27:06 +00:00
|
|
|
sal_True );
|
2009-07-16 14:39:49 +00:00
|
|
|
|
|
|
|
// create a bool option for graphics
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 4 ),
|
|
|
|
aLocalizedStrings.GetString( 5 ),
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintTablesGraphicsAndDiagrams" ) ),
|
2009-07-16 14:39:49 +00:00
|
|
|
sal_True );
|
|
|
|
if (!bWeb)
|
|
|
|
{
|
2009-07-23 17:27:06 +00:00
|
|
|
// create a bool option for hidden text
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 6 ),
|
|
|
|
aLocalizedStrings.GetString( 7 ),
|
2009-07-23 17:27:06 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintHiddenText" ) ),
|
|
|
|
sal_False );
|
|
|
|
|
|
|
|
// create a bool option for place holder
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 8 ),
|
|
|
|
aLocalizedStrings.GetString( 9 ),
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintTextPlaceholder" ) ),
|
2009-07-23 17:27:06 +00:00
|
|
|
sal_False );
|
2009-07-16 14:39:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// create a bool option for controls
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 10 ),
|
|
|
|
aLocalizedStrings.GetString( 11 ),
|
2009-07-16 14:39:49 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintControls" ) ),
|
|
|
|
sal_True );
|
|
|
|
|
2009-07-23 17:27:06 +00:00
|
|
|
// create sub section for Color
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 12 ), rtl::OUString() );
|
2009-07-16 14:39:49 +00:00
|
|
|
|
|
|
|
// create a bool option for black
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 13 ),
|
|
|
|
aLocalizedStrings.GetString( 14 ),
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintBlackFonts" ) ),
|
2009-07-16 14:39:49 +00:00
|
|
|
sal_False );
|
|
|
|
|
2009-07-23 17:27:06 +00:00
|
|
|
// create subgroup for misc options
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 15 ) ), rtl::OUString() );
|
2009-07-16 14:39:49 +00:00
|
|
|
|
2009-07-23 17:27:06 +00:00
|
|
|
// create a bool option for blank pages
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 16 ),
|
|
|
|
aLocalizedStrings.GetString( 17 ),
|
2009-07-23 17:27:06 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintEmptyPages" ) ),
|
|
|
|
sal_True );
|
|
|
|
|
|
|
|
// create a bool option for paper tray
|
2009-07-28 19:03:24 +00:00
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
|
|
|
|
aPaperTrayOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsPageOptGroup" ) );
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 18 ),
|
|
|
|
aLocalizedStrings.GetString( 19 ),
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPaperFromSetup" ) ),
|
2009-07-28 19:03:24 +00:00
|
|
|
sal_False,
|
|
|
|
aPaperTrayOpt
|
|
|
|
);
|
2009-07-16 14:39:49 +00:00
|
|
|
|
2009-08-17 14:40:01 +00:00
|
|
|
// print range selection
|
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
|
|
|
|
aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) );
|
|
|
|
aPrintRangeOpt.mbInternalOnly = sal_True;
|
|
|
|
m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 37 ) ),
|
|
|
|
rtl::OUString(),
|
|
|
|
aPrintRangeOpt
|
|
|
|
);
|
|
|
|
|
|
|
|
// create a choice for the content to create
|
|
|
|
rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) );
|
|
|
|
uno::Sequence< rtl::OUString > aChoices( 3 );
|
|
|
|
uno::Sequence< rtl::OUString > aHelpText( 3 );
|
|
|
|
aChoices[0] = aLocalizedStrings.GetString( 38 );
|
|
|
|
aHelpText[0] = aLocalizedStrings.GetString( 39 );
|
|
|
|
aChoices[1] = aLocalizedStrings.GetString( 40 );
|
|
|
|
aHelpText[1] = aLocalizedStrings.GetString( 41 );
|
|
|
|
aChoices[2] = aLocalizedStrings.GetString( 42 );
|
|
|
|
aHelpText[2] = aLocalizedStrings.GetString( 43 );
|
|
|
|
m_aUIProperties[nIdx++].Value = getChoiceControlOpt( rtl::OUString(),
|
|
|
|
aHelpText,
|
|
|
|
aPrintRangeName,
|
|
|
|
aChoices,
|
|
|
|
0 );
|
|
|
|
// create a an Edit dependent on "Pages" selected
|
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True );
|
|
|
|
m_aUIProperties[nIdx++].Value = getEditControlOpt( rtl::OUString(),
|
|
|
|
rtl::OUString(),
|
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
|
|
|
|
rtl::OUString(),
|
|
|
|
aPageRangeOpt
|
|
|
|
);
|
2009-07-23 17:27:06 +00:00
|
|
|
// print content selection
|
2009-07-28 19:03:24 +00:00
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
|
|
|
|
aContentsOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobPage" ) );
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 20 ) ),
|
2009-07-23 17:27:06 +00:00
|
|
|
rtl::OUString(),
|
2009-07-28 19:03:24 +00:00
|
|
|
aContentsOpt
|
2009-07-23 17:27:06 +00:00
|
|
|
);
|
2009-07-16 14:39:49 +00:00
|
|
|
// create a list box for notes content
|
2009-08-17 14:40:01 +00:00
|
|
|
aChoices.realloc( 4 );
|
2009-08-10 17:36:31 +00:00
|
|
|
aChoices[0] = aLocalizedStrings.GetString( 21 );
|
|
|
|
aChoices[1] = aLocalizedStrings.GetString( 22 );
|
|
|
|
aChoices[2] = aLocalizedStrings.GetString( 23 );
|
|
|
|
aChoices[3] = aLocalizedStrings.GetString( 24 );
|
2009-08-17 14:40:01 +00:00
|
|
|
aHelpText.realloc( 2 );
|
2009-08-10 17:36:31 +00:00
|
|
|
aHelpText[0] = aLocalizedStrings.GetString( 25 );
|
|
|
|
aHelpText[1] = aLocalizedStrings.GetString( 25 );
|
2009-09-07 14:50:54 +00:00
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), 0, sal_False );
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 26 ),
|
2009-07-16 14:39:49 +00:00
|
|
|
aHelpText,
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintAnnotationMode" ) ),
|
2009-07-16 14:39:49 +00:00
|
|
|
aChoices,
|
|
|
|
0,
|
2009-09-03 15:12:37 +00:00
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
|
|
|
|
aAnnotOpt
|
2009-07-16 14:39:49 +00:00
|
|
|
);
|
|
|
|
|
2009-07-23 17:27:06 +00:00
|
|
|
// create subsection for Page settings
|
2009-07-28 19:03:24 +00:00
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt;
|
|
|
|
aPageSetOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) );
|
2009-07-16 14:39:49 +00:00
|
|
|
|
|
|
|
if (!bWeb)
|
|
|
|
{
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 27 ) ),
|
|
|
|
rtl::OUString(),
|
|
|
|
aPageSetOpt
|
|
|
|
);
|
2009-07-28 19:03:24 +00:00
|
|
|
uno::Sequence< rtl::OUString > aRLChoices( 3 );
|
2009-08-10 17:36:31 +00:00
|
|
|
aRLChoices[0] = aLocalizedStrings.GetString( 28 );
|
|
|
|
aRLChoices[1] = aLocalizedStrings.GetString( 29 );
|
|
|
|
aRLChoices[2] = aLocalizedStrings.GetString( 30 );
|
2009-07-28 19:03:24 +00:00
|
|
|
uno::Sequence< rtl::OUString > aRLHelp( 1 );
|
2009-08-10 17:36:31 +00:00
|
|
|
aRLHelp[0] = aLocalizedStrings.GetString( 31 );
|
2009-07-28 19:03:24 +00:00
|
|
|
// create a choice option for all/left/right pages
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 32 ),
|
2009-07-28 19:03:24 +00:00
|
|
|
aRLHelp,
|
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintLeftRightPages" ) ),
|
2009-08-10 17:36:31 +00:00
|
|
|
aRLChoices, 0, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) )
|
2009-07-28 19:03:24 +00:00
|
|
|
);
|
2009-07-16 14:39:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// create a bool option for brochure
|
2009-08-14 13:56:56 +00:00
|
|
|
rtl::OUString aBrochurePropertyName( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) );
|
2009-08-10 17:36:31 +00:00
|
|
|
m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 33 ),
|
|
|
|
aLocalizedStrings.GetString( 34 ),
|
2009-07-16 14:39:49 +00:00
|
|
|
aBrochurePropertyName,
|
2009-07-28 19:03:24 +00:00
|
|
|
sal_False,
|
|
|
|
aPageSetOpt
|
|
|
|
);
|
2009-07-16 14:39:49 +00:00
|
|
|
|
2009-11-18 20:23:30 +01:00
|
|
|
if( bCTL )
|
|
|
|
{
|
|
|
|
// create a bool option for brochure RTL dependent on brochure
|
|
|
|
uno::Sequence< rtl::OUString > aBRTLChoices( 2 );
|
|
|
|
aBRTLChoices[0] = aLocalizedStrings.GetString( 35 );
|
|
|
|
aBRTLChoices[1] = aLocalizedStrings.GetString( 36 );
|
|
|
|
vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True );
|
|
|
|
aBrochureRTLOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) );
|
|
|
|
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( rtl::OUString(),
|
|
|
|
uno::Sequence< rtl::OUString >(),
|
|
|
|
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectRTL" ) ),
|
|
|
|
aBRTLChoices, 0, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
|
|
|
|
aBrochureRTLOpt
|
|
|
|
);
|
|
|
|
}
|
2009-07-16 14:39:49 +00:00
|
|
|
|
|
|
|
|
|
|
|
DBG_ASSERT( nIdx == nNumProps, "number of added properties is not as expected" );
|
|
|
|
}
|
|
|
|
|
2009-08-14 13:56:56 +00:00
|
|
|
|
|
|
|
SwPrintUIOptions::~SwPrintUIOptions()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2009-08-07 14:42:45 +00:00
|
|
|
bool SwPrintUIOptions::IsPrintLeftPages() const
|
2009-07-28 19:03:24 +00:00
|
|
|
{
|
2009-08-14 13:56:56 +00:00
|
|
|
// take care of different property names for the option.
|
|
|
|
// for compatibility the old name should win
|
|
|
|
|
|
|
|
// 0: left and right pages
|
|
|
|
// 1: left pages only
|
|
|
|
// 2: right pages only
|
|
|
|
sal_Int64 nLRPages = getIntValue( "PrintLeftRightPages", 0 /* default: all */ );
|
|
|
|
bool bRes = nLRPages == 0 || nLRPages == 1;
|
|
|
|
bRes = getBoolValue( "PrintLeftPages", bRes /* <- default value if property is not found */ );
|
|
|
|
return bRes;
|
2009-07-28 19:03:24 +00:00
|
|
|
}
|
|
|
|
|
2009-08-07 14:42:45 +00:00
|
|
|
bool SwPrintUIOptions::IsPrintRightPages() const
|
2009-07-28 19:03:24 +00:00
|
|
|
{
|
2009-08-14 13:56:56 +00:00
|
|
|
// take care of different property names for the option.
|
|
|
|
// for compatibility the old name should win
|
2009-08-17 09:35:25 +00:00
|
|
|
|
2009-08-14 13:56:56 +00:00
|
|
|
sal_Int64 nLRPages = getIntValue( "PrintLeftRightPages", 0 /* default: all */ );
|
|
|
|
bool bRes = nLRPages == 0 || nLRPages == 2;
|
|
|
|
bRes = getBoolValue( "PrintRightPages", bRes /* <- default value if property is not found */ );
|
|
|
|
return bRes;
|
2009-07-28 19:03:24 +00:00
|
|
|
}
|
2009-07-16 14:39:49 +00:00
|
|
|
|
2009-08-17 09:35:25 +00:00
|
|
|
bool SwPrintUIOptions::IsPrintEmptyPages( bool bIsPDFExport ) const
|
|
|
|
{
|
2009-08-14 13:56:56 +00:00
|
|
|
// take care of different property names for the option.
|
2009-08-17 09:35:25 +00:00
|
|
|
|
|
|
|
bool bRes = bIsPDFExport ?
|
|
|
|
!getBoolValue( "IsSkipEmptyPages", sal_True ) :
|
|
|
|
getBoolValue( "PrintEmptyPages", sal_True );
|
|
|
|
return bRes;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SwPrintUIOptions::IsPrintTables() const
|
|
|
|
{
|
2009-08-14 13:56:56 +00:00
|
|
|
// take care of different property names for the option.
|
|
|
|
// for compatibility the old name should win
|
2009-08-17 09:35:25 +00:00
|
|
|
|
|
|
|
bool bRes = getBoolValue( "PrintTablesGraphicsAndDiagrams", sal_True );
|
|
|
|
bRes = getBoolValue( "PrintTables", bRes );
|
|
|
|
return bRes;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SwPrintUIOptions::IsPrintGraphics() const
|
|
|
|
{
|
2009-08-14 13:56:56 +00:00
|
|
|
// take care of different property names for the option.
|
|
|
|
// for compatibility the old name should win
|
2009-08-17 09:35:25 +00:00
|
|
|
|
|
|
|
bool bRes = getBoolValue( "PrintTablesGraphicsAndDiagrams", sal_True );
|
|
|
|
bRes = getBoolValue( "PrintGraphics", bRes );
|
|
|
|
return bRes;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SwPrintUIOptions::IsPrintDrawings() const
|
|
|
|
{
|
2009-08-14 13:56:56 +00:00
|
|
|
// take care of different property names for the option.
|
|
|
|
// for compatibility the old name should win
|
2009-08-17 09:35:25 +00:00
|
|
|
|
|
|
|
bool bRes = getBoolValue( "PrintTablesGraphicsAndDiagrams", sal_True );
|
|
|
|
bRes = getBoolValue( "PrintDrawings", bRes );
|
|
|
|
return bRes;
|
|
|
|
}
|
2009-08-14 13:56:56 +00:00
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
bool SwPrintUIOptions::processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp )
|
|
|
|
{
|
|
|
|
bool bChanged = processProperties( i_rNewProp );
|
|
|
|
|
|
|
|
uno::Reference< awt::XDevice > xRenderDevice;
|
|
|
|
uno::Any aVal( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) );
|
|
|
|
aVal >>= xRenderDevice;
|
|
|
|
|
|
|
|
OutputDevice* pOut = 0;
|
|
|
|
if (xRenderDevice.is())
|
|
|
|
{
|
|
|
|
VCLXDevice* pDevice = VCLXDevice::GetImplementation( xRenderDevice );
|
|
|
|
pOut = pDevice ? pDevice->GetOutputDevice() : 0;
|
|
|
|
}
|
2009-08-14 13:56:56 +00:00
|
|
|
bChanged = bChanged || (pOut != m_pLast);
|
2009-07-16 14:39:49 +00:00
|
|
|
if( pOut )
|
2009-08-14 13:56:56 +00:00
|
|
|
m_pLast = pOut;
|
2009-07-16 14:39:49 +00:00
|
|
|
|
|
|
|
return bChanged;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
/******************************************************************************
|
|
|
|
* Methode : void SetSwVisArea( ViewShell *pSh, Point aPrtOffset, ...
|
|
|
|
* Beschreibung:
|
|
|
|
* Erstellt : OK 04.11.94 16:27
|
|
|
|
* Aenderung :
|
|
|
|
******************************************************************************/
|
|
|
|
|
2009-07-17 08:40:57 +00:00
|
|
|
void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, BOOL /*bPDFExport*/ )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
ASSERT( !pSh->GetWin(), "Drucken mit Window?" );
|
|
|
|
pSh->aVisArea = rRect;
|
|
|
|
pSh->Imp()->SetFirstVisPageInvalid();
|
|
|
|
Point aPt( rRect.Pos() );
|
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
// calculate an offset for the rectangle of the n-th page to
|
|
|
|
// move the start point of the output operation to a position
|
|
|
|
// such that in the output device all pages will be painted
|
|
|
|
// at the same position
|
2000-09-18 23:08:29 +00:00
|
|
|
aPt.X() = -aPt.X(); aPt.Y() = -aPt.Y();
|
|
|
|
|
2009-06-04 08:23:53 +00:00
|
|
|
OutputDevice *pOut = pSh->GetOut();
|
2006-08-14 15:59:42 +00:00
|
|
|
|
2002-09-06 04:56:09 +00:00
|
|
|
MapMode aMapMode( pOut->GetMapMode() );
|
2000-09-18 23:08:29 +00:00
|
|
|
aMapMode.SetOrigin( aPt );
|
2002-09-06 04:56:09 +00:00
|
|
|
pOut->SetMapMode( aMapMode );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
/******************************************************************************/
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
void ViewShell::InitPrt( OutputDevice *pOutDev )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
//Fuer den Printer merken wir uns einen negativen Offset, der
|
|
|
|
//genau dem Offset de OutputSize entspricht. Das ist notwendig,
|
|
|
|
//weil unser Ursprung der linken ober Ecke der physikalischen
|
|
|
|
//Seite ist, die Ausgaben (SV) aber den Outputoffset als Urstprung
|
|
|
|
//betrachten.
|
2009-09-04 14:41:56 +00:00
|
|
|
if ( pOutDev )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-04 08:23:53 +00:00
|
|
|
aPrtOffst = Point();
|
2002-09-06 04:56:09 +00:00
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
aPrtOffst += pOutDev->GetMapMode().GetOrigin();
|
|
|
|
MapMode aMapMode( pOutDev->GetMapMode() );
|
2000-09-18 23:08:29 +00:00
|
|
|
aMapMode.SetMapUnit( MAP_TWIP );
|
2009-09-04 14:41:56 +00:00
|
|
|
pOutDev->SetMapMode( aMapMode );
|
|
|
|
pOutDev->SetLineColor();
|
|
|
|
pOutDev->SetFillColor();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
aPrtOffst.X() = aPrtOffst.Y() = 0;
|
|
|
|
|
|
|
|
if ( !pWin )
|
2009-09-04 14:41:56 +00:00
|
|
|
pOut = pOutDev; //Oder was sonst?
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Methode : void ViewShell::ChgAllPageOrientation
|
|
|
|
* Erstellt : MA 08. Aug. 95
|
|
|
|
* Aenderung :
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
void ViewShell::ChgAllPageOrientation( USHORT eOri )
|
|
|
|
{
|
|
|
|
ASSERT( nStartAction, "missing an Action" );
|
|
|
|
SET_CURR_SHELL( this );
|
|
|
|
|
|
|
|
USHORT nAll = GetDoc()->GetPageDescCnt();
|
|
|
|
BOOL bNewOri = Orientation(eOri) == ORIENTATION_PORTRAIT ? FALSE : TRUE;
|
|
|
|
|
|
|
|
for( USHORT i = 0; i < nAll; ++ i )
|
|
|
|
{
|
2004-05-25 14:07:41 +00:00
|
|
|
const SwPageDesc& rOld =
|
|
|
|
const_cast<const SwDoc *>(GetDoc())->GetPageDesc( i );
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( rOld.GetLandscape() != bNewOri )
|
|
|
|
{
|
|
|
|
SwPageDesc aNew( rOld );
|
2006-09-13 10:35:12 +00:00
|
|
|
const sal_Bool bDoesUndo( GetDoc()->DoesUndo() );
|
|
|
|
GetDoc()->DoUndo( sal_False );
|
|
|
|
GetDoc()->CopyPageDesc(rOld, aNew);
|
|
|
|
GetDoc()->DoUndo( bDoesUndo );
|
2000-09-18 23:08:29 +00:00
|
|
|
aNew.SetLandscape( bNewOri );
|
|
|
|
SwFrmFmt& rFmt = aNew.GetMaster();
|
|
|
|
SwFmtFrmSize aSz( rFmt.GetFrmSize() );
|
|
|
|
// Groesse anpassen.
|
|
|
|
// PORTRAIT -> Hoeher als Breit
|
|
|
|
// LANDSCAPE -> Breiter als Hoch
|
|
|
|
// Hoehe ist die VarSize, Breite ist die FixSize (per Def.)
|
|
|
|
if( bNewOri ? aSz.GetHeight() > aSz.GetWidth()
|
|
|
|
: aSz.GetHeight() < aSz.GetWidth() )
|
|
|
|
{
|
|
|
|
SwTwips aTmp = aSz.GetHeight();
|
|
|
|
aSz.SetHeight( aSz.GetWidth() );
|
|
|
|
aSz.SetWidth( aTmp );
|
2008-06-13 09:33:28 +00:00
|
|
|
rFmt.SetFmtAttr( aSz );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
GetDoc()->ChgPageDesc( i, aNew );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Methode : void ViewShell::ChgAllPageOrientation
|
|
|
|
* Erstellt : MA 08. Aug. 95
|
|
|
|
* Aenderung :
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
void ViewShell::ChgAllPageSize( Size &rSz )
|
|
|
|
{
|
|
|
|
ASSERT( nStartAction, "missing an Action" );
|
|
|
|
SET_CURR_SHELL( this );
|
|
|
|
|
2007-09-27 08:43:36 +00:00
|
|
|
SwDoc* pMyDoc = GetDoc();
|
|
|
|
USHORT nAll = pMyDoc->GetPageDescCnt();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
for( USHORT i = 0; i < nAll; ++i )
|
|
|
|
{
|
2007-09-27 08:43:36 +00:00
|
|
|
const SwPageDesc &rOld = const_cast<const SwDoc *>(pMyDoc)->GetPageDesc( i );
|
2006-09-13 10:35:12 +00:00
|
|
|
SwPageDesc aNew( rOld );
|
|
|
|
const sal_Bool bDoesUndo( GetDoc()->DoesUndo() );
|
|
|
|
GetDoc()->DoUndo( sal_False );
|
|
|
|
GetDoc()->CopyPageDesc( rOld, aNew );
|
|
|
|
GetDoc()->DoUndo( bDoesUndo );
|
|
|
|
SwFrmFmt& rPgFmt = aNew.GetMaster();
|
2000-09-18 23:08:29 +00:00
|
|
|
Size aSz( rSz );
|
2006-09-13 10:35:12 +00:00
|
|
|
const BOOL bOri = aNew.GetLandscape();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( bOri ? aSz.Height() > aSz.Width()
|
|
|
|
: aSz.Height() < aSz.Width() )
|
|
|
|
{
|
|
|
|
SwTwips aTmp = aSz.Height();
|
|
|
|
aSz.Height() = aSz.Width();
|
|
|
|
aSz.Width() = aTmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
SwFmtFrmSize aFrmSz( rPgFmt.GetFrmSize() );
|
|
|
|
aFrmSz.SetSize( aSz );
|
2008-06-13 09:33:28 +00:00
|
|
|
rPgFmt.SetFmtAttr( aFrmSz );
|
2007-09-27 08:43:36 +00:00
|
|
|
pMyDoc->ChgPageDesc( i, aNew );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void lcl_SetState( SfxProgress& rProgress, ULONG nPage, ULONG nMax,
|
|
|
|
const XubString *pStr, ULONG nAct, ULONG nCnt, ULONG nOffs, ULONG nPageNo )
|
|
|
|
{
|
|
|
|
XubString aTmp = XubString::CreateFromInt64( nPageNo );
|
|
|
|
if( pStr )
|
|
|
|
{
|
|
|
|
aTmp += ' ';
|
|
|
|
aTmp += *pStr;
|
|
|
|
if( nCnt )
|
|
|
|
{
|
|
|
|
nMax *= 2;
|
|
|
|
rProgress.SetStateText( (nAct-1)*nMax+nPage+nOffs,
|
|
|
|
aTmp, nCnt*nMax );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rProgress.SetStateText( nPage, aTmp, nMax );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aTmp += ' '; aTmp += '('; aTmp += XubString::CreateFromInt64( nPage );
|
|
|
|
aTmp += '/'; aTmp += XubString::CreateFromInt64( nMax ); aTmp += ')';
|
|
|
|
rProgress.SetStateText( nPage, aTmp, nMax );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-03 15:12:37 +00:00
|
|
|
void ViewShell::CalcPagesForPrint( USHORT nMax, SfxProgress* pProgress )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SET_CURR_SHELL( this );
|
|
|
|
|
|
|
|
//Seitenweise durchformatieren, by the way kann die Statusleiste
|
|
|
|
//angetriggert werden, damit der Anwender sieht worauf er wartet.
|
|
|
|
//Damit der Vorgang moeglichst transparent gestaltet werden kann
|
|
|
|
//Versuchen wir mal eine Schaetzung.
|
2006-08-14 15:59:42 +00:00
|
|
|
SfxPrinter* pPrt = getIDocumentDeviceAccess()->getPrinter( false );
|
2000-09-18 23:08:29 +00:00
|
|
|
BOOL bPrtJob = pPrt ? pPrt->IsJobActive() : FALSE;
|
|
|
|
SwRootFrm* pLayout = GetLayout();
|
2009-08-16 14:49:58 +00:00
|
|
|
// ULONG nStatMax = pLayout->GetPageNum();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
const SwFrm *pPage = pLayout->Lower();
|
|
|
|
SwLayAction aAction( pLayout, Imp() );
|
|
|
|
|
|
|
|
pLayout->StartAllAction();
|
|
|
|
for ( USHORT i = 1; pPage && i <= nMax; pPage = pPage->GetNext(), ++i )
|
|
|
|
{
|
2005-03-23 10:55:32 +00:00
|
|
|
if ( ( bPrtJob && !pPrt->IsJobActive() ) || Imp()->IsStopPrt() )
|
2000-09-18 23:08:29 +00:00
|
|
|
break;
|
|
|
|
|
2005-03-23 10:55:32 +00:00
|
|
|
if ( ( bPrtJob && !pPrt->IsJobActive() ) || Imp()->IsStopPrt() )
|
2000-09-18 23:08:29 +00:00
|
|
|
break;
|
2005-03-23 10:55:32 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
pPage->Calc();
|
|
|
|
SwRect aOldVis( VisArea() );
|
|
|
|
aVisArea = pPage->Frm();
|
|
|
|
Imp()->SetFirstVisPageInvalid();
|
|
|
|
aAction.Reset();
|
|
|
|
aAction.SetPaint( FALSE );
|
|
|
|
aAction.SetWaitAllowed( FALSE );
|
|
|
|
aAction.SetReschedule( TRUE );
|
2002-11-01 14:34:37 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
aAction.Action();
|
2002-11-01 14:34:37 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
aVisArea = aOldVis; //Zuruecksetzen wg. der Paints!
|
|
|
|
Imp()->SetFirstVisPageInvalid();
|
|
|
|
SwPaintQueue::Repaint();
|
|
|
|
}
|
2005-03-23 10:55:32 +00:00
|
|
|
|
2002-11-01 14:34:37 +00:00
|
|
|
if (pProgress)
|
2005-03-23 10:55:32 +00:00
|
|
|
aAction.SetProgress( NULL );
|
2002-11-01 14:34:37 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
pLayout->EndAllAction();
|
|
|
|
}
|
|
|
|
|
2002-11-11 13:14:55 +00:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
SwDoc * ViewShell::CreatePrtDoc( SfxObjectShellRef &rDocShellRef)
|
2002-11-11 13:14:55 +00:00
|
|
|
{
|
|
|
|
ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
|
|
|
|
SwFEShell* pFESh = (SwFEShell*)this;
|
|
|
|
// Wir bauen uns ein neues Dokument
|
|
|
|
SwDoc *pPrtDoc = new SwDoc;
|
2006-08-14 15:59:42 +00:00
|
|
|
pPrtDoc->acquire();
|
2009-08-25 13:10:30 +00:00
|
|
|
pPrtDoc->SetRefForDocShell( (SfxObjectShellRef*)&(long&)rDocShellRef );
|
2002-11-11 13:14:55 +00:00
|
|
|
pPrtDoc->LockExpFlds();
|
|
|
|
|
|
|
|
const SfxPoolItem* pCpyItem;
|
|
|
|
const SfxItemPool& rPool = GetAttrPool();
|
|
|
|
for( USHORT nWh = POOLATTR_BEGIN; nWh < POOLATTR_END; ++nWh )
|
|
|
|
if( 0 != ( pCpyItem = rPool.GetPoolDefaultItem( nWh ) ) )
|
|
|
|
pPrtDoc->GetAttrPool().SetPoolDefaultItem( *pCpyItem );
|
|
|
|
|
|
|
|
// JP 29.07.99 - Bug 67951 - set all Styles from the SourceDoc into
|
|
|
|
// the PrintDoc - will be replaced!
|
|
|
|
pPrtDoc->ReplaceStyles( *GetDoc() );
|
|
|
|
|
|
|
|
SwShellCrsr *pActCrsr = pFESh->_GetCrsr();
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
SwShellCrsr *pFirstCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetNext());
|
2002-11-11 13:14:55 +00:00
|
|
|
if( !pActCrsr->HasMark() ) // bei Multiselektion kann der aktuelle Cursor leer sein
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
{
|
|
|
|
pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
|
|
|
|
}
|
2008-03-07 14:01:02 +00:00
|
|
|
|
2002-11-11 13:14:55 +00:00
|
|
|
// Die Y-Position der ersten Selektion
|
2008-03-07 14:01:02 +00:00
|
|
|
const Point aSelPoint = pFESh->IsTableMode() ?
|
|
|
|
pFESh->GetTableCrsr()->GetSttPos() :
|
|
|
|
pFirstCrsr->GetSttPos();
|
|
|
|
|
|
|
|
const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
|
|
|
|
|
2002-11-11 13:14:55 +00:00
|
|
|
// und ihren Seitendescribtor
|
2008-03-07 14:01:02 +00:00
|
|
|
const SwPageDesc* pPageDesc = pPrtDoc->FindPageDescByName(
|
|
|
|
pPage->GetPageDesc()->GetName() );
|
2002-11-11 13:14:55 +00:00
|
|
|
|
|
|
|
if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
|
|
|
|
{ // Am letzten Absatz die Absatzattribute richten:
|
|
|
|
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
|
|
|
|
SwTxtNode* pTxtNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTxtNode();
|
|
|
|
SwCntntNode *pLastNd =
|
|
|
|
pActCrsr->GetCntntNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
|
|
|
|
// Hier werden die Absatzattribute des ersten Absatzes uebertragen
|
|
|
|
if( pLastNd && pLastNd->IsTxtNode() )
|
|
|
|
((SwTxtNode*)pLastNd)->CopyCollFmt( *pTxtNd );
|
|
|
|
}
|
|
|
|
|
|
|
|
// es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!)
|
|
|
|
// if( aDocShellRef.Is() )
|
|
|
|
// SwDataExchange::InitOle( aDocShellRef, pPrtDoc );
|
|
|
|
// und fuellen es mit dem selektierten Bereich
|
|
|
|
pFESh->Copy( pPrtDoc );
|
|
|
|
|
|
|
|
//Jetzt noch am ersten Absatz die Seitenvorlage setzen
|
|
|
|
{
|
|
|
|
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
|
|
|
|
SwCntntNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // gehe zum 1. ContentNode
|
|
|
|
if( pFESh->IsTableMode() )
|
|
|
|
{
|
|
|
|
SwTableNode* pTNd = pCNd->FindTableNode();
|
|
|
|
if( pTNd )
|
2008-06-13 09:33:28 +00:00
|
|
|
pTNd->GetTable().GetFrmFmt()->SetFmtAttr( SwFmtPageDesc( pPageDesc ) );
|
2002-11-11 13:14:55 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pCNd->SetAttr( SwFmtPageDesc( pPageDesc ) );
|
|
|
|
if( pFirstCrsr->HasMark() )
|
|
|
|
{
|
|
|
|
SwTxtNode *pTxtNd = pCNd->GetTxtNode();
|
|
|
|
if( pTxtNd )
|
|
|
|
{
|
|
|
|
SwCntntNode *pFirstNd =
|
|
|
|
pFirstCrsr->GetCntntNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
|
|
|
|
// Hier werden die Absatzattribute des ersten Absatzes uebertragen
|
|
|
|
if( pFirstNd && pFirstNd->IsTxtNode() )
|
|
|
|
((SwTxtNode*)pFirstNd)->CopyCollFmt( *pTxtNd );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pPrtDoc;
|
|
|
|
}
|
2009-06-04 08:23:53 +00:00
|
|
|
|
2002-11-14 09:34:44 +00:00
|
|
|
SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
|
2002-11-11 13:14:55 +00:00
|
|
|
{
|
|
|
|
ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
|
|
|
|
SwFEShell* pFESh = (SwFEShell*)this;
|
|
|
|
// Wir bauen uns ein neues Dokument
|
|
|
|
// SwDoc *pPrtDoc = new SwDoc;
|
2006-08-14 15:59:42 +00:00
|
|
|
// pPrtDoc->acquire();
|
2009-08-25 13:10:30 +00:00
|
|
|
// pPrtDoc->SetRefForDocShell( (SvEmbeddedObjectRef*)&(long&)rDocShellRef );
|
2002-11-11 13:14:55 +00:00
|
|
|
pPrtDoc->LockExpFlds();
|
|
|
|
|
|
|
|
// Der Drucker wird uebernommen
|
2002-11-14 09:34:44 +00:00
|
|
|
//! Make a copy of it since it gets destroyed with the temporary document
|
|
|
|
//! used for PDF export
|
2002-11-11 13:14:55 +00:00
|
|
|
if (pPrt)
|
2006-08-14 15:59:42 +00:00
|
|
|
pPrtDoc->setPrinter( new SfxPrinter(*pPrt), true, true );
|
2002-11-11 13:14:55 +00:00
|
|
|
|
|
|
|
const SfxPoolItem* pCpyItem;
|
|
|
|
const SfxItemPool& rPool = GetAttrPool();
|
|
|
|
for( USHORT nWh = POOLATTR_BEGIN; nWh < POOLATTR_END; ++nWh )
|
|
|
|
if( 0 != ( pCpyItem = rPool.GetPoolDefaultItem( nWh ) ) )
|
|
|
|
pPrtDoc->GetAttrPool().SetPoolDefaultItem( *pCpyItem );
|
|
|
|
|
|
|
|
// JP 29.07.99 - Bug 67951 - set all Styles from the SourceDoc into
|
|
|
|
// the PrintDoc - will be replaced!
|
|
|
|
pPrtDoc->ReplaceStyles( *GetDoc() );
|
|
|
|
|
|
|
|
SwShellCrsr *pActCrsr = pFESh->_GetCrsr();
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
SwShellCrsr *pFirstCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetNext());
|
2002-11-11 13:14:55 +00:00
|
|
|
if( !pActCrsr->HasMark() ) // bei Multiselektion kann der aktuelle Cursor leer sein
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
{
|
|
|
|
pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
|
|
|
|
}
|
2008-03-07 14:01:02 +00:00
|
|
|
|
|
|
|
// Die Y-Position der ersten Selektion
|
2002-11-11 13:14:55 +00:00
|
|
|
// Die Y-Position der ersten Selektion
|
2008-03-07 14:01:02 +00:00
|
|
|
const Point aSelPoint = pFESh->IsTableMode() ?
|
|
|
|
pFESh->GetTableCrsr()->GetSttPos() :
|
|
|
|
pFirstCrsr->GetSttPos();
|
|
|
|
|
|
|
|
const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
|
|
|
|
|
2002-11-11 13:14:55 +00:00
|
|
|
// und ihren Seitendescribtor
|
2008-03-07 14:01:02 +00:00
|
|
|
const SwPageDesc* pPageDesc = pPrtDoc->FindPageDescByName(
|
2002-11-11 13:14:55 +00:00
|
|
|
pPage->GetPageDesc()->GetName() );
|
|
|
|
|
|
|
|
if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
|
|
|
|
{ // Am letzten Absatz die Absatzattribute richten:
|
|
|
|
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
|
|
|
|
SwTxtNode* pTxtNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTxtNode();
|
|
|
|
SwCntntNode *pLastNd =
|
|
|
|
pActCrsr->GetCntntNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
|
|
|
|
// Hier werden die Absatzattribute des ersten Absatzes uebertragen
|
|
|
|
if( pLastNd && pLastNd->IsTxtNode() )
|
|
|
|
((SwTxtNode*)pLastNd)->CopyCollFmt( *pTxtNd );
|
|
|
|
}
|
|
|
|
|
|
|
|
// es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!)
|
|
|
|
// if( aDocShellRef.Is() )
|
|
|
|
// SwDataExchange::InitOle( aDocShellRef, pPrtDoc );
|
|
|
|
// und fuellen es mit dem selektierten Bereich
|
|
|
|
pFESh->Copy( pPrtDoc );
|
|
|
|
|
|
|
|
//Jetzt noch am ersten Absatz die Seitenvorlage setzen
|
|
|
|
{
|
|
|
|
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
|
|
|
|
SwCntntNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // gehe zum 1. ContentNode
|
|
|
|
if( pFESh->IsTableMode() )
|
|
|
|
{
|
|
|
|
SwTableNode* pTNd = pCNd->FindTableNode();
|
|
|
|
if( pTNd )
|
2008-06-13 09:33:28 +00:00
|
|
|
pTNd->GetTable().GetFrmFmt()->SetFmtAttr( SwFmtPageDesc( pPageDesc ) );
|
2002-11-11 13:14:55 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pCNd->SetAttr( SwFmtPageDesc( pPageDesc ) );
|
|
|
|
if( pFirstCrsr->HasMark() )
|
|
|
|
{
|
|
|
|
SwTxtNode *pTxtNd = pCNd->GetTxtNode();
|
|
|
|
if( pTxtNd )
|
|
|
|
{
|
|
|
|
SwCntntNode *pFirstNd =
|
|
|
|
pFirstCrsr->GetCntntNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
|
|
|
|
// Hier werden die Absatzattribute des ersten Absatzes uebertragen
|
|
|
|
if( pFirstNd && pFirstNd->IsTxtNode() )
|
|
|
|
((SwTxtNode*)pFirstNd)->CopyCollFmt( *pTxtNd );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pPrtDoc;
|
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-07 14:42:45 +00:00
|
|
|
sal_Bool ViewShell::PrintOrPDFExport(
|
2009-08-31 08:59:41 +00:00
|
|
|
OutputDevice *pOutDev,
|
|
|
|
const SwPrtOptions &rPrintData,
|
2009-09-04 14:41:56 +00:00
|
|
|
sal_Int32 nRenderer /* the index in the vector of pages to be printed */ )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-09-04 14:41:56 +00:00
|
|
|
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
|
|
//Immer die Druckroutinen in viewpg.cxx (PrintProspect) mitpflegen!!
|
|
|
|
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
2002-11-01 14:34:37 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
const sal_Int32 nMaxRenderer = rPrintData.GetRenderData().GetPagesToPrint().size() - 1;
|
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
2009-09-04 10:12:00 +00:00
|
|
|
DBG_ASSERT( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out of bounds");
|
2009-08-31 08:59:41 +00:00
|
|
|
#endif
|
2009-09-01 17:48:55 +00:00
|
|
|
if (!pOutDev || nMaxRenderer < 0 || nRenderer < 0 || nRenderer > nMaxRenderer)
|
2009-08-31 08:59:41 +00:00
|
|
|
return sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
// save settings of OutputDevice (should be done always since the
|
2009-07-16 14:39:49 +00:00
|
|
|
// output device is now provided by a call from outside the Writer)
|
|
|
|
pOutDev->Push();
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
// eine neue Shell fuer den Printer erzeugen
|
|
|
|
ViewShell *pShell;
|
2009-06-04 08:23:53 +00:00
|
|
|
SwDoc *pOutDevDoc;
|
2002-11-11 13:14:55 +00:00
|
|
|
|
|
|
|
//!! muss warum auch immer hier in diesem scope existieren !!
|
2006-08-14 15:59:42 +00:00
|
|
|
//!! (h?ngt mit OLE Objekten im Dokument zusammen.)
|
2004-10-04 18:15:13 +00:00
|
|
|
SfxObjectShellRef aDocShellRef;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
//! Note: Since for PDF export of (multi-)selection a temporary
|
|
|
|
//! document is created that contains only the selects parts,
|
|
|
|
//! and thus that document is to printed in whole the,
|
|
|
|
//! rPrintData.bPrintSelection parameter will be false.
|
|
|
|
BOOL bSelection = rPrintData.bPrintSelection;
|
|
|
|
|
2002-11-11 13:14:55 +00:00
|
|
|
// PDF export for (multi-)selection has already generated a temporary document
|
|
|
|
// with the selected text. (see XRenderable implementation in unotxdoc.cxx)
|
|
|
|
// Thus we like to go in the 'else' part here in that case.
|
|
|
|
// Is is implemented this way because PDF export calls this Prt function
|
|
|
|
// once per page and we do not like to always have the temporary document
|
|
|
|
// to be created that often here in the 'then' part.
|
2005-03-23 10:55:32 +00:00
|
|
|
if ( bSelection )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-09-04 14:41:56 +00:00
|
|
|
pOutDevDoc = CreatePrtDoc( aDocShellRef );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
// eine ViewShell darauf
|
2009-06-04 08:23:53 +00:00
|
|
|
pShell = new ViewShell( *pOutDevDoc, 0, pOpt, pOutDev );
|
|
|
|
pOutDevDoc->SetRefForDocShell( 0 );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-06-04 08:23:53 +00:00
|
|
|
pOutDevDoc = GetDoc();
|
|
|
|
pShell = new ViewShell( *this, 0, pOutDev );
|
|
|
|
}
|
2009-08-31 08:59:41 +00:00
|
|
|
|
2009-06-04 08:23:53 +00:00
|
|
|
SdrView *pDrawView = pShell->GetDrawView();
|
|
|
|
if (pDrawView)
|
|
|
|
{
|
2009-09-04 14:41:56 +00:00
|
|
|
pDrawView->SetBufferedOutputAllowed( false );
|
|
|
|
pDrawView->SetBufferedOverlayAllowed( false );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{ //Zusaetzlicher Scope, damit die CurrShell vor dem zerstoeren der
|
|
|
|
//Shell zurueckgesetzt wird.
|
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
SET_CURR_SHELL( pShell );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
//JP 01.02.99: das ReadOnly Flag wird NIE mitkopiert; Bug 61335
|
|
|
|
if( pOpt->IsReadonly() )
|
|
|
|
pShell->pOpt->SetReadonly( TRUE );
|
2002-06-27 10:39:50 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
// save options at draw view:
|
|
|
|
SwDrawViewSave aDrawViewSave( pShell->GetDrawView() );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
pShell->PrepareForPrint( rPrintData );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
const sal_Int32 nPage = rPrintData.GetRenderData().GetPagesToPrint()[ nRenderer ];
|
2009-07-16 14:39:49 +00:00
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
2009-08-31 08:59:41 +00:00
|
|
|
DBG_ASSERT( nPage == 0 || rPrintData.GetRenderData().GetValidPagesSet().count( nPage ) == 1, "nPage not valid" );
|
2009-07-16 14:39:49 +00:00
|
|
|
#endif
|
2009-08-31 08:59:41 +00:00
|
|
|
const SwPageFrm *pStPage = 0;
|
|
|
|
if (nPage > 0) // a 'regular' page, not one from the post-it document
|
|
|
|
{
|
|
|
|
const SwRenderData::ValidStartFramesMap_t &rFrms = rPrintData.GetRenderData().GetValidStartFrames();
|
|
|
|
SwRenderData::ValidStartFramesMap_t::const_iterator aIt( rFrms.find( nPage ) );
|
|
|
|
DBG_ASSERT( aIt != rFrms.end(), "failed to find start frame" );
|
|
|
|
if (aIt == rFrms.end())
|
|
|
|
return sal_False;
|
|
|
|
pStPage = aIt->second;
|
|
|
|
}
|
|
|
|
else // a page from the post-its document ...
|
|
|
|
{
|
|
|
|
DBG_ASSERT( nPage == 0, "unexpected page number. 0 for post-it pages expected" );
|
|
|
|
pStPage = rPrintData.GetRenderData().GetPostItStartFrames()[ nRenderer ];
|
|
|
|
}
|
|
|
|
DBG_ASSERT( pStPage, "failed to get start page" );
|
|
|
|
|
2009-09-04 14:41:56 +00:00
|
|
|
#if 0 // applying view options and formatting the dcoument should now only be done in getRendererCount!
|
2009-08-31 08:59:41 +00:00
|
|
|
// benoetigte Seiten fuers Drucken formatieren
|
2009-09-03 15:12:37 +00:00
|
|
|
pShell->CalcPagesForPrint( (USHORT)nPage, 0 );
|
2009-08-31 08:59:41 +00:00
|
|
|
|
|
|
|
// Some field types, can require a valid layout
|
|
|
|
// (expression fields in tables). For these we do an UpdateFlds
|
|
|
|
// here after calculation of the pages.
|
|
|
|
// --> FME 2004-06-21 #i9684# For performance reasons, we do not update
|
|
|
|
// the fields during pdf export.
|
|
|
|
// #i56195# prevent update of fields (for mail merge)
|
|
|
|
if ( !bIsPDFExport && rPrintData.bUpdateFieldsInPrinting )
|
|
|
|
pShell->UpdateFlds(TRUE);
|
|
|
|
// <--
|
2009-09-04 14:41:56 +00:00
|
|
|
#endif
|
2009-08-31 08:59:41 +00:00
|
|
|
|
|
|
|
ViewShell *pViewSh2 = nPage == 0 ? /* post-it page? */
|
|
|
|
rPrintData.GetRenderData().m_pPostItShell : pShell;
|
2009-09-04 14:41:56 +00:00
|
|
|
::SetSwVisArea( pViewSh2, pStPage->Frm() );
|
2009-08-31 08:59:41 +00:00
|
|
|
|
|
|
|
// wenn wir einen Umschlag drucken wird ein Offset beachtet
|
|
|
|
if( pStPage->GetFmt()->GetPoolFmtId() == RES_POOLPAGE_JAKET )
|
|
|
|
{
|
|
|
|
Point aNewOrigin = pOutDev->GetMapMode().GetOrigin();
|
|
|
|
aNewOrigin += rPrintData.aOffset;
|
|
|
|
MapMode aTmp( pOutDev->GetMapMode() );
|
|
|
|
aTmp.SetOrigin( aNewOrigin );
|
|
|
|
pOutDev->SetMapMode( aTmp );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
pShell->InitPrt( pOutDev );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
pViewSh2 = nPage == 0 ? /* post-it page? */
|
|
|
|
rPrintData.GetRenderData().m_pPostItShell : pShell;
|
2009-09-04 14:41:56 +00:00
|
|
|
::SetSwVisArea( pViewSh2, pStPage->Frm() );
|
2009-07-09 08:21:58 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
pStPage->GetUpper()->Paint( pStPage->Frm() );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
SwPaintQueue::Repaint();
|
2000-09-18 23:08:29 +00:00
|
|
|
} //Zus. Scope wg. CurShell!
|
|
|
|
|
|
|
|
delete pShell;
|
|
|
|
|
2002-11-13 13:35:31 +00:00
|
|
|
if (bSelection )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-04 08:23:53 +00:00
|
|
|
if ( !pOutDevDoc->release() )
|
|
|
|
delete pOutDevDoc;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2002-09-06 04:56:09 +00:00
|
|
|
|
2009-07-16 14:39:49 +00:00
|
|
|
// restore settings of OutputDevice (should be done always now since the
|
|
|
|
// output device is now provided by a call from outside the Writer)
|
|
|
|
pOutDev->Pop();
|
2002-09-06 04:56:09 +00:00
|
|
|
|
2009-08-31 08:59:41 +00:00
|
|
|
return sal_True;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Methode : PrtOle2()
|
|
|
|
* Beschreibung:
|
|
|
|
* Erstellt : PK 07.12.94
|
|
|
|
* Aenderung : MA 16. Feb. 95
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-08-14 13:56:56 +00:00
|
|
|
void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions,
|
2000-09-18 23:08:29 +00:00
|
|
|
OutputDevice* pOleOut, const Rectangle& rRect )
|
|
|
|
{
|
2003-03-27 14:45:43 +00:00
|
|
|
//Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon
|
2000-09-18 23:08:29 +00:00
|
|
|
//eine, dann legen wir uns eine neue Sicht an, oder das Doc hat noch
|
|
|
|
//keine, dann erzeugen wir die erste Sicht.
|
|
|
|
ViewShell *pSh;
|
2000-10-25 11:07:02 +00:00
|
|
|
if( pDoc->GetRootFrm() && pDoc->GetRootFrm()->GetCurrShell() )
|
|
|
|
pSh = new ViewShell( *pDoc->GetRootFrm()->GetCurrShell(), 0, pOleOut );
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
2000-10-25 11:07:02 +00:00
|
|
|
pSh = new ViewShell( *pDoc, 0, pOpt, pOleOut );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
SET_CURR_SHELL( pSh );
|
2003-03-27 14:45:43 +00:00
|
|
|
pSh->PrepareForPrint( rOptions );
|
2000-09-18 23:08:29 +00:00
|
|
|
pSh->SetPrtFormatOption( TRUE );
|
|
|
|
|
|
|
|
SwRect aSwRect( rRect );
|
|
|
|
pSh->aVisArea = aSwRect;
|
|
|
|
|
2006-08-14 15:59:42 +00:00
|
|
|
if ( pSh->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) &&
|
|
|
|
pSh->GetNext() == pSh )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pSh->CheckBrowseView( FALSE );
|
|
|
|
pDoc->GetRootFrm()->Lower()->InvalidateSize();
|
|
|
|
}
|
|
|
|
|
2005-03-08 12:47:51 +00:00
|
|
|
// --> FME 2005-02-10 #119474#
|
|
|
|
// CalcPagesForPrint() should not be necessary here. The pages in the
|
|
|
|
// visible area will be formatted in SwRootFrm::Paint().
|
|
|
|
// Removing this gives us a performance gain during saving the
|
|
|
|
// document because the thumbnail creation will not trigger a complete
|
|
|
|
// formatting of the document.
|
2000-09-18 23:08:29 +00:00
|
|
|
// Seiten fuers Drucken formatieren
|
2005-03-08 12:47:51 +00:00
|
|
|
// pSh->CalcPagesForPrint( SHRT_MAX );
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
//#39275# jetzt will der Meyer doch ein Clipping
|
|
|
|
pOleOut->Push( PUSH_CLIPREGION );
|
|
|
|
pOleOut->IntersectClipRegion( aSwRect.SVRect() );
|
|
|
|
pSh->GetLayout()->Paint( aSwRect );
|
|
|
|
// SFX_APP()->SpoilDemoOutput( *pOleOut, rRect );
|
|
|
|
pOleOut->Pop();
|
|
|
|
|
|
|
|
// erst muss das CurrShell Object zerstoert werden!!
|
|
|
|
}
|
|
|
|
delete pSh;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Methode : IsAnyFieldInDoc()
|
|
|
|
* Beschreibung: Stellt fest, ob im DocNodesArray Felder verankert sind
|
|
|
|
* Erstellt : JP 27.07.95
|
|
|
|
* Aenderung : JP 10.12.97
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BOOL ViewShell::IsAnyFieldInDoc() const
|
|
|
|
{
|
|
|
|
const SfxPoolItem* pItem;
|
|
|
|
USHORT nMaxItems = pDoc->GetAttrPool().GetItemCount( RES_TXTATR_FIELD );
|
|
|
|
for( USHORT n = 0; n < nMaxItems; ++n )
|
|
|
|
if( 0 != (pItem = pDoc->GetAttrPool().GetItem( RES_TXTATR_FIELD, n )))
|
|
|
|
{
|
|
|
|
const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
|
|
|
|
const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
|
2009-09-11 10:21:51 +00:00
|
|
|
//#i101026# mod: do not include postits in field check
|
|
|
|
const SwField* pFld = pFmtFld->GetFld();
|
|
|
|
if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() && (pFld->Which() != RES_POSTITFLD))
|
2000-09-18 23:08:29 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-06-27 10:39:50 +00:00
|
|
|
/******************************************************************************
|
|
|
|
* SwDrawViewSave
|
|
|
|
*
|
|
|
|
* Saves some settings at the draw view
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
SwDrawViewSave::SwDrawViewSave( SdrView* pSdrView )
|
|
|
|
: pDV( pSdrView )
|
|
|
|
{
|
|
|
|
if ( pDV )
|
|
|
|
{
|
|
|
|
sLayerNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM("Controls" ) );
|
|
|
|
bPrintControls = pDV->IsLayerPrintable( sLayerNm );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SwDrawViewSave::~SwDrawViewSave()
|
|
|
|
{
|
|
|
|
if ( pDV )
|
|
|
|
{
|
|
|
|
pDV->SetLayerPrintable( sLayerNm, bPrintControls );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-03-27 14:45:43 +00:00
|
|
|
// OD 09.01.2003 #i6467# - method also called for page preview
|
2009-08-14 13:56:56 +00:00
|
|
|
void ViewShell::PrepareForPrint( const SwPrintData &rOptions )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// Viewoptions fuer den Drucker setzen
|
2001-05-10 07:48:50 +00:00
|
|
|
pOpt->SetGraphic ( TRUE == rOptions.bPrintGraphic );
|
2000-09-18 23:08:29 +00:00
|
|
|
pOpt->SetTable ( TRUE == rOptions.bPrintTable );
|
|
|
|
pOpt->SetDraw ( TRUE == rOptions.bPrintDraw );
|
|
|
|
pOpt->SetControl ( TRUE == rOptions.bPrintControl );
|
|
|
|
pOpt->SetPageBack( TRUE == rOptions.bPrintPageBackground );
|
|
|
|
pOpt->SetBlackFont( TRUE == rOptions.bPrintBlackFont );
|
|
|
|
|
|
|
|
if ( HasDrawView() )
|
|
|
|
{
|
|
|
|
SdrView *pDrawView = GetDrawView();
|
2002-06-27 10:39:50 +00:00
|
|
|
String sLayerNm;
|
|
|
|
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
|
2003-03-27 14:45:43 +00:00
|
|
|
// OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview
|
|
|
|
if ( !IsPreView() )
|
|
|
|
{
|
|
|
|
pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pDrawView->SetLayerVisible( sLayerNm, rOptions.bPrintControl );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|