2010-10-14 08:30:41 +02:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2000-11-29 13:57:24 +00:00
/*************************************************************************
2000-09-18 23:08:29 +00:00
*
2008-04-10 15:17:47 +00:00
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER .
2000-09-18 23:08:29 +00:00
*
2010-02-12 15:01:35 +01:00
* Copyright 2000 , 2010 Oracle and / or its affiliates .
2000-09-18 23:08:29 +00:00
*
2008-04-10 15:17:47 +00:00
* OpenOffice . org - a multi - platform office productivity suite
2000-09-18 23:08:29 +00:00
*
2008-04-10 15:17:47 +00:00
* This file is part of OpenOffice . org .
2000-09-18 23:08:29 +00:00
*
2008-04-10 15:17:47 +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:17:47 +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:17:47 +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 20:57:12 +00:00
// MARKER(update_precomp.py): autogen include statement, do not remove
# include "precompiled_sw.hxx"
2010-01-05 16:37:49 +01:00
2005-03-15 10:25:26 +00:00
# include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
2005-04-04 07:22:36 +00:00
# include <com/sun/star/container/XChild.hpp>
2004-10-04 18:13:38 +00:00
# include <com/sun/star/embed/XClassifiedObject.hpp>
# include <com/sun/star/embed/XVisualObject.hpp>
# include <com/sun/star/embed/XComponentSupplier.hpp>
# include <com/sun/star/embed/EmbedStates.hpp>
# include <com/sun/star/embed/Aspects.hpp>
2007-07-18 11:57:02 +00:00
# include <com/sun/star/graphic/XGraphicProvider.hpp>
2010-01-08 18:32:51 +01:00
# include <svx/svxids.hrc>
# include <editeng/memberids.hrc>
2004-10-04 18:13:38 +00:00
2000-09-18 23:08:29 +00:00
# include <swtypes.hxx>
# include <cmdid.h>
2005-02-25 08:27:49 +00:00
# include <memory>
2000-09-18 23:08:29 +00:00
# include <hints.hxx>
# include <doc.hxx>
# include <docsh.hxx>
2007-01-30 14:22:59 +00:00
# include <editsh.hxx>
2006-05-05 07:08:29 +00:00
# include <swcli.hxx>
2000-09-18 23:08:29 +00:00
# include <ndindex.hxx>
# include <pam.hxx>
# include <ndnotxt.hxx>
# include <svx/unomid.hxx>
# include <unocrsr.hxx>
2009-06-03 11:26:39 +00:00
# include <unocrsrhelper.hxx>
2000-09-18 23:08:29 +00:00
# include <docstyle.hxx>
2000-11-27 10:13:17 +00:00
# include <dcontact.hxx>
2000-09-18 23:08:29 +00:00
# include <fmtcnct.hxx>
# include <ndole.hxx>
2006-07-14 07:31:03 +00:00
# include <frmfmt.hxx>
# include <frame.hxx>
2010-01-05 16:37:46 +01:00
# include <unotextrange.hxx>
2010-01-05 16:37:45 +01:00
# include <unotextcursor.hxx>
2010-01-05 16:37:44 +01:00
# include <unoparagraph.hxx>
2000-09-18 23:08:29 +00:00
# include <unomap.hxx>
# include <unoprnms.hxx>
2000-12-19 16:28:58 +00:00
# include <unoevent.hxx>
2000-09-18 23:08:29 +00:00
# include <com/sun/star/util/XModifyBroadcaster.hpp>
# include <com/sun/star/table/ShadowFormat.hpp>
# include <com/sun/star/style/GraphicLocation.hpp>
# include <com/sun/star/text/GraphicCrop.hpp>
# include <com/sun/star/text/TextContentAnchorType.hpp>
# include <com/sun/star/text/XTextColumns.hpp>
2001-03-16 13:39:32 +00:00
# include <com/sun/star/text/WrapTextMode.hpp>
2000-09-18 23:08:29 +00:00
# include <com/sun/star/beans/PropertyAttribute.hpp>
2000-10-24 13:26:57 +00:00
# include <com/sun/star/drawing/PointSequenceSequence.hpp>
# include <com/sun/star/drawing/PointSequence.hpp>
2000-12-14 08:48:16 +00:00
# include <com/sun/star/drawing/ColorMode.hpp>
2004-01-06 17:20:22 +00:00
# include <tools/poly.hxx>
2003-04-17 13:43:12 +00:00
# include <swundo.hxx>
2000-09-18 23:08:29 +00:00
# include <unostyle.hxx>
2000-11-27 10:13:17 +00:00
# include <svx/svdmodel.hxx>
# include <svx/svdpage.hxx>
2010-01-08 18:32:51 +01:00
# include <editeng/brshitem.hxx>
# include <editeng/protitem.hxx>
2000-09-18 23:08:29 +00:00
# include <fmtornt.hxx>
# include <fmturl.hxx>
2010-01-08 18:32:51 +01:00
# include <editeng/lrspitem.hxx>
# include <editeng/ulspitem.hxx>
# include <editeng/boxitem.hxx>
# include <editeng/opaqitem.hxx>
# include <editeng/prntitem.hxx>
# include <editeng/shaditem.hxx>
2000-09-18 23:08:29 +00:00
# include <fmtsrnd.hxx>
# include <fmtfsize.hxx>
# include <grfatr.hxx>
# include <unoframe.hxx>
# include <fmtanchr.hxx>
2000-11-20 11:10:03 +00:00
# include <fmtclds.hxx>
2010-01-05 16:37:49 +01:00
# include <fmtcntnt.hxx>
2000-12-06 10:36:14 +00:00
# include <frmatr.hxx>
2000-09-18 23:08:29 +00:00
# include <ndtxt.hxx>
# include <ndgrf.hxx>
# include <vos/mutex.hxx>
# include <vcl/svapp.hxx>
2003-04-17 13:43:12 +00:00
# include <sfx2/printer.hxx>
2001-07-20 09:40:14 +00:00
# include <SwStyleNameMapper.hxx>
2001-07-09 04:50:21 +00:00
# include <xmloff/xmlcnitm.hxx>
2001-10-12 12:57:26 +00:00
# include <poolfmt.hxx>
# include <pagedesc.hxx>
# include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
2001-11-22 16:48:09 +00:00
# include <tools/urlobj.hxx>
2010-01-08 18:32:51 +01:00
# include <editeng/frmdiritem.hxx>
2004-02-02 17:26:06 +00:00
// DVO, OD 01.10.2003 #i18732#
# include <fmtfollowtextflow.hxx>
2004-08-02 13:18:03 +00:00
// OD 2004-05-05 #i28701#
# include <fmtwrapinfluenceonobjpos.hxx>
2002-02-04 17:08:18 +00:00
2004-10-04 18:13:38 +00:00
# include <toolkit/helper/vclunohelper.hxx>
2003-03-27 14:45:43 +00:00
// from fefly1.cxx
extern sal_Bool lcl_ChkAndSetNewAnchor ( const SwFlyFrm & rFly , SfxItemSet & rSet ) ;
2000-09-18 23:08:29 +00:00
using namespace : : com : : sun : : star ;
2008-03-12 11:29:14 +00:00
using : : rtl : : OUString ;
2000-09-18 23:08:29 +00:00
2007-09-27 08:36:43 +00:00
using : : com : : sun : : star : : frame : : XModel ;
using : : com : : sun : : star : : container : : XNameAccess ;
using : : com : : sun : : star : : style : : XStyleFamiliesSupplier ;
2001-10-12 12:57:26 +00:00
2000-11-29 14:57:15 +00:00
const sal_Char __FAR_DATA sPackageProtocol [ ] = " vnd.sun.star.Package: " ;
const sal_Char __FAR_DATA sGraphicObjectProtocol [ ] = " vnd.sun.star.GraphicObject: " ;
2000-09-18 23:08:29 +00:00
/****************************************************************************
Rahmenbeschreibung
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
class BaseFrameProperties_Impl
{
2009-06-03 11:26:39 +00:00
SwUnoCursorHelper : : SwAnyMapHelper aAnyMap ;
2001-06-15 13:27:58 +00:00
2000-09-18 23:08:29 +00:00
public :
2007-09-27 08:36:43 +00:00
virtual ~ BaseFrameProperties_Impl ( ) ;
2000-09-18 23:08:29 +00:00
2009-06-03 11:26:39 +00:00
void SetProperty ( USHORT nWID , BYTE nMemberId , const uno : : Any & rVal ) ;
sal_Bool GetProperty ( USHORT nWID , BYTE nMemberId , const uno : : Any * & pAny ) ;
// void GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny );
2000-09-18 23:08:29 +00:00
2009-06-03 11:26:39 +00:00
// const SfxItemPropertyMap* GetMap() const {return _pMap;}
2001-10-23 16:40:05 +00:00
sal_Bool FillBaseProperties ( SfxItemSet & rToSet , const SfxItemSet & rFromSet , sal_Bool & rSizeFound ) ;
2000-09-18 23:08:29 +00:00
2001-10-23 16:40:05 +00:00
virtual sal_Bool AnyToItemSet ( SwDoc * pDoc , SfxItemSet & rFrmSet , SfxItemSet & rSet , sal_Bool & rSizeFound ) = 0 ;
2000-09-18 23:08:29 +00:00
} ;
2001-06-15 13:27:58 +00:00
BaseFrameProperties_Impl : : ~ BaseFrameProperties_Impl ( )
{
}
2009-06-03 11:26:39 +00:00
void BaseFrameProperties_Impl : : SetProperty ( USHORT nWID , BYTE nMemberId , const uno : : Any & rVal )
2001-06-15 13:27:58 +00:00
{
2009-06-03 11:26:39 +00:00
aAnyMap . SetValue ( nWID , nMemberId , rVal ) ;
2001-06-15 13:27:58 +00:00
}
2009-06-03 11:26:39 +00:00
sal_Bool BaseFrameProperties_Impl : : GetProperty ( USHORT nWID , BYTE nMemberId , const uno : : Any * & rpAny )
2001-10-12 12:57:26 +00:00
{
2009-06-03 11:26:39 +00:00
return aAnyMap . FillValue ( nWID , nMemberId , rpAny ) ;
2001-10-12 12:57:26 +00:00
}
2010-10-13 16:05:00 +05:30
2009-06-03 11:26:39 +00:00
//void BaseFrameProperties_Impl::GetProperty( const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any & rAny )
//{
// rAny = rxPropertySet->getPropertyValue( rPropertyName );
//}
2010-10-13 16:05:00 +05:30
2001-10-23 16:40:05 +00:00
sal_Bool BaseFrameProperties_Impl : : FillBaseProperties ( SfxItemSet & rToSet , const SfxItemSet & rFromSet , sal_Bool & rSizeFound )
2000-09-18 23:08:29 +00:00
{
sal_Bool bRet = sal_True ;
//Anker kommt auf jeden Fall in den Set
2001-10-23 16:40:05 +00:00
SwFmtAnchor aAnchor ( static_cast < const SwFmtAnchor & > ( rFromSet . Get ( RES_ANCHOR ) ) ) ;
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pAnchorPgNo ;
2001-06-15 13:27:58 +00:00
if ( GetProperty ( RES_ANCHOR , MID_ANCHOR_PAGENUM , pAnchorPgNo ) )
2000-09-18 23:08:29 +00:00
bRet & = ( ( SfxPoolItem & ) aAnchor ) . PutValue ( * pAnchorPgNo , MID_ANCHOR_PAGENUM ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pAnchorType ;
2001-06-15 13:27:58 +00:00
if ( GetProperty ( RES_ANCHOR , MID_ANCHOR_ANCHORTYPE , pAnchorType ) )
2000-09-18 23:08:29 +00:00
bRet & = ( ( SfxPoolItem & ) aAnchor ) . PutValue ( * pAnchorType , MID_ANCHOR_ANCHORTYPE ) ;
}
2001-10-23 16:40:05 +00:00
rToSet . Put ( aAnchor ) ;
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pCol = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BACKGROUND , MID_BACK_COLOR , pCol ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pRGBCol = 0 ;
2002-08-16 12:11:48 +00:00
GetProperty ( RES_BACKGROUND , MID_BACK_COLOR_R_G_B , pRGBCol ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pColTrans = 0 ;
2002-08-16 12:11:48 +00:00
GetProperty ( RES_BACKGROUND , MID_BACK_COLOR_TRANSPARENCY , pColTrans ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pTrans = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BACKGROUND , MID_GRAPHIC_TRANSPARENT , pTrans ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pGrLoc = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BACKGROUND , MID_GRAPHIC_POSITION , pGrLoc ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pGrURL = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BACKGROUND , MID_GRAPHIC_URL , pGrURL ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pGrFilter = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BACKGROUND , MID_GRAPHIC_FILTER , pGrFilter ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pGrTranparency = 0 ;
2002-08-16 12:11:48 +00:00
GetProperty ( RES_BACKGROUND , MID_GRAPHIC_TRANSPARENCY , pGrTranparency ) ;
2000-09-18 23:08:29 +00:00
2002-08-16 12:11:48 +00:00
if ( pCol | | pTrans | | pGrURL | | pGrFilter | | pGrLoc | |
pGrTranparency | | pColTrans | | pRGBCol )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
SvxBrushItem aBrush ( static_cast < const : : SvxBrushItem & > ( rFromSet . Get ( RES_BACKGROUND ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pCol )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pCol , MID_BACK_COLOR ) ;
2002-08-16 12:11:48 +00:00
if ( pColTrans )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pColTrans , MID_BACK_COLOR_TRANSPARENCY ) ;
if ( pRGBCol )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pRGBCol , MID_BACK_COLOR_R_G_B ) ;
2000-09-18 23:08:29 +00:00
if ( pTrans )
2002-08-16 12:11:48 +00:00
{
// don't overwrite transparency with a non-transparence flag
if ( ! pColTrans | | Any2Bool ( * pTrans ) )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pTrans , MID_GRAPHIC_TRANSPARENT ) ;
}
2000-09-18 23:08:29 +00:00
if ( pGrURL )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pGrURL , MID_GRAPHIC_URL ) ;
if ( pGrFilter )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pGrFilter , MID_GRAPHIC_FILTER ) ;
if ( pGrLoc )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pGrLoc , MID_GRAPHIC_POSITION ) ;
2002-08-16 12:11:48 +00:00
if ( pGrTranparency )
bRet & = ( ( SfxPoolItem & ) aBrush ) . PutValue ( * pGrTranparency , MID_GRAPHIC_TRANSPARENCY ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aBrush ) ;
2000-09-18 23:08:29 +00:00
}
}
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pCont = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_PROTECT , MID_PROTECT_CONTENT , pCont ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pPos = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_PROTECT , MID_PROTECT_POSITION , pPos ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pName = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_PROTECT , MID_PROTECT_SIZE , pName ) ;
2000-09-18 23:08:29 +00:00
if ( pCont | | pPos | | pName )
{
2009-06-03 11:26:39 +00:00
SvxProtectItem aProt ( static_cast < const : : SvxProtectItem & > ( rFromSet . Get ( RES_PROTECT ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pCont )
bRet & = ( ( SfxPoolItem & ) aProt ) . PutValue ( * pCont , MID_PROTECT_CONTENT ) ;
if ( pPos )
bRet & = ( ( SfxPoolItem & ) aProt ) . PutValue ( * pPos , MID_PROTECT_POSITION ) ;
if ( pName )
bRet & = ( ( SfxPoolItem & ) aProt ) . PutValue ( * pName , MID_PROTECT_SIZE ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aProt ) ;
2000-09-18 23:08:29 +00:00
}
}
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHori = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_HORI_ORIENT , MID_HORIORIENT_ORIENT , pHori ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHoriP = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_HORI_ORIENT , MID_HORIORIENT_POSITION | CONVERT_TWIPS , pHoriP ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHoriR = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_HORI_ORIENT , MID_HORIORIENT_RELATION , pHoriR ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pPageT = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_HORI_ORIENT , MID_HORIORIENT_PAGETOGGLE , pPageT ) ;
2000-09-18 23:08:29 +00:00
if ( pHori | | pHoriP | | pHoriR | | pPageT )
{
2009-06-03 11:26:39 +00:00
SwFmtHoriOrient aOrient ( static_cast < const : : SwFmtHoriOrient & > ( rFromSet . Get ( RES_HORI_ORIENT ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pHori )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pHori , MID_HORIORIENT_ORIENT ) ;
if ( pHoriP )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pHoriP , MID_HORIORIENT_POSITION | CONVERT_TWIPS ) ;
if ( pHoriR )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pHoriR , MID_HORIORIENT_RELATION ) ;
if ( pPageT )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pPageT , MID_HORIORIENT_PAGETOGGLE ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aOrient ) ;
2000-09-18 23:08:29 +00:00
}
}
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pVert = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_VERT_ORIENT , MID_VERTORIENT_ORIENT , pVert ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pVertP = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_VERT_ORIENT , MID_VERTORIENT_POSITION | CONVERT_TWIPS , pVertP ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pVertR = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_VERT_ORIENT , MID_VERTORIENT_RELATION , pVertR ) ;
2000-09-18 23:08:29 +00:00
if ( pVert | | pVertP | | pVertR )
{
2009-06-03 11:26:39 +00:00
SwFmtVertOrient aOrient ( static_cast < const : : SwFmtVertOrient & > ( rFromSet . Get ( RES_VERT_ORIENT ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pVert )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pVert , MID_VERTORIENT_ORIENT ) ;
if ( pVertP )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pVertP , MID_VERTORIENT_POSITION | CONVERT_TWIPS ) ;
if ( pVertR )
bRet & = ( ( SfxPoolItem & ) aOrient ) . PutValue ( * pVertR , MID_VERTORIENT_RELATION ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aOrient ) ;
2000-09-18 23:08:29 +00:00
}
}
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pURL = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_URL , MID_URL_URL , pURL ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pTarget = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_URL , MID_URL_TARGET , pTarget ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHyLNm = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_URL , MID_URL_HYPERLINKNAME , pHyLNm ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHySMp = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_URL , MID_URL_SERVERMAP , pHySMp ) ;
2000-09-18 23:08:29 +00:00
if ( pURL | | pTarget | | pHyLNm | | pHySMp )
{
2009-06-03 11:26:39 +00:00
SwFmtURL aURL ( static_cast < const : : SwFmtURL & > ( rFromSet . Get ( RES_URL ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pURL )
bRet & = ( ( SfxPoolItem & ) aURL ) . PutValue ( * pURL , MID_URL_URL ) ;
if ( pTarget )
bRet & = ( ( SfxPoolItem & ) aURL ) . PutValue ( * pTarget , MID_URL_TARGET ) ;
if ( pHyLNm )
bRet & = ( ( SfxPoolItem & ) aURL ) . PutValue ( * pHyLNm , MID_URL_HYPERLINKNAME ) ;
if ( pHySMp )
bRet & = ( ( SfxPoolItem & ) aURL ) . PutValue ( * pHySMp , MID_URL_SERVERMAP ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aURL ) ;
2000-09-18 23:08:29 +00:00
}
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pL = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_LR_SPACE , MID_L_MARGIN | CONVERT_TWIPS , pL ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pR = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_LR_SPACE , MID_R_MARGIN | CONVERT_TWIPS , pR ) ;
2000-09-18 23:08:29 +00:00
if ( pL | | pR )
{
2009-06-03 11:26:39 +00:00
SvxLRSpaceItem aLR ( static_cast < const : : SvxLRSpaceItem & > ( rFromSet . Get ( RES_LR_SPACE ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pL )
bRet & = ( ( SfxPoolItem & ) aLR ) . PutValue ( * pL , MID_L_MARGIN | CONVERT_TWIPS ) ;
if ( pR )
bRet & = ( ( SfxPoolItem & ) aLR ) . PutValue ( * pR , MID_R_MARGIN | CONVERT_TWIPS ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aLR ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pT = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_UL_SPACE , MID_UP_MARGIN | CONVERT_TWIPS , pT ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pB = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_UL_SPACE , MID_LO_MARGIN | CONVERT_TWIPS , pB ) ;
2000-09-18 23:08:29 +00:00
if ( pT | | pB )
{
2009-06-03 11:26:39 +00:00
SvxULSpaceItem aTB ( static_cast < const : : SvxULSpaceItem & > ( rFromSet . Get ( RES_UL_SPACE ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pT )
bRet & = ( ( SfxPoolItem & ) aTB ) . PutValue ( * pT , MID_UP_MARGIN | CONVERT_TWIPS ) ;
if ( pB )
bRet & = ( ( SfxPoolItem & ) aTB ) . PutValue ( * pB , MID_LO_MARGIN | CONVERT_TWIPS ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aTB ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pOp ;
2001-06-15 13:27:58 +00:00
if ( GetProperty ( RES_OPAQUE , 0 , pOp ) )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
SvxOpaqueItem aOp ( static_cast < const : : SvxOpaqueItem & > ( rFromSet . Get ( RES_OPAQUE ) ) ) ;
2000-09-18 23:08:29 +00:00
bRet & = ( ( SfxPoolItem & ) aOp ) . PutValue ( * pOp , 0 ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aOp ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pPrt ;
2001-06-15 13:27:58 +00:00
if ( GetProperty ( RES_PRINT , 0 , pPrt ) )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
SvxPrintItem aPrt ( static_cast < const : : SvxPrintItem & > ( rFromSet . Get ( RES_PRINT ) ) ) ;
2000-09-18 23:08:29 +00:00
bRet & = ( ( SfxPoolItem & ) aPrt ) . PutValue ( * pPrt , 0 ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aPrt ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSh ;
2001-06-15 13:27:58 +00:00
if ( GetProperty ( RES_SHADOW , CONVERT_TWIPS , pSh ) )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
SvxShadowItem aSh ( static_cast < const : : SvxShadowItem & > ( rFromSet . Get ( RES_SHADOW ) ) ) ;
2000-09-18 23:08:29 +00:00
bRet & = ( ( SfxPoolItem & ) aSh ) . PutValue ( * pSh , CONVERT_TWIPS ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aSh ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSur = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_SURROUND , MID_SURROUND_SURROUNDTYPE , pSur ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSurAnch = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_SURROUND , MID_SURROUND_ANCHORONLY , pSurAnch ) ;
2000-09-18 23:08:29 +00:00
if ( pSur | | pSurAnch )
{
2009-06-03 11:26:39 +00:00
SwFmtSurround aSrnd ( static_cast < const : : SwFmtSurround & > ( rFromSet . Get ( RES_SURROUND ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pSur )
bRet & = ( ( SfxPoolItem & ) aSrnd ) . PutValue ( * pSur , MID_SURROUND_SURROUNDTYPE ) ;
if ( pSurAnch )
bRet & = ( ( SfxPoolItem & ) aSrnd ) . PutValue ( * pSurAnch , MID_SURROUND_ANCHORONLY ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aSrnd ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pLeft = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , LEFT_BORDER | CONVERT_TWIPS , pLeft ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pRight = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | RIGHT_BORDER , pRight ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pTop = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | TOP_BORDER , pTop ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pBottom = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | BOTTOM_BORDER , pBottom ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pDistance = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | BORDER_DISTANCE , pDistance ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pLeftDistance = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | LEFT_BORDER_DISTANCE , pLeftDistance ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pRightDistance = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | RIGHT_BORDER_DISTANCE , pRightDistance ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pTopDistance = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | TOP_BORDER_DISTANCE , pTopDistance ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pBottomDistance = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_BOX , CONVERT_TWIPS | BOTTOM_BORDER_DISTANCE , pBottomDistance ) ;
2000-12-08 07:32:02 +00:00
if ( pLeft | | pRight | | pTop | | pBottom | | pDistance | |
pLeftDistance | | pRightDistance | | pTopDistance | | pBottomDistance )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
SvxBoxItem aBox ( static_cast < const : : SvxBoxItem & > ( rFromSet . Get ( RES_BOX ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pLeft )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pLeft , CONVERT_TWIPS | LEFT_BORDER ) ;
if ( pRight )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pRight , CONVERT_TWIPS | RIGHT_BORDER ) ;
if ( pTop )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pTop , CONVERT_TWIPS | TOP_BORDER ) ;
if ( pBottom )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pBottom , CONVERT_TWIPS | BOTTOM_BORDER ) ;
if ( pDistance )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pDistance , CONVERT_TWIPS | BORDER_DISTANCE ) ;
2000-12-08 07:32:02 +00:00
if ( pLeftDistance )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pLeftDistance , CONVERT_TWIPS | LEFT_BORDER_DISTANCE ) ;
if ( pRightDistance )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pRightDistance , CONVERT_TWIPS | RIGHT_BORDER_DISTANCE ) ;
if ( pTopDistance )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pTopDistance , CONVERT_TWIPS | TOP_BORDER_DISTANCE ) ;
if ( pBottomDistance )
bRet & = ( ( SfxPoolItem & ) aBox ) . PutValue ( * pBottomDistance , CONVERT_TWIPS | BOTTOM_BORDER_DISTANCE ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aBox ) ;
2000-09-18 23:08:29 +00:00
}
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pRelH = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_REL_HEIGHT , pRelH ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pRelW = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_REL_WIDTH , pRelW ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSyncWidth = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT , pSyncWidth ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSyncHeight = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH , pSyncHeight ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pWidth = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_WIDTH | CONVERT_TWIPS , pWidth ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHeight = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_HEIGHT | CONVERT_TWIPS , pHeight ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSize = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_SIZE | CONVERT_TWIPS , pSize ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSizeType = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_SIZE_TYPE , pSizeType ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pWidthType = 0 ;
2004-05-18 13:53:29 +00:00
GetProperty ( RES_FRM_SIZE , MID_FRMSIZE_WIDTH_TYPE , pWidthType ) ;
2001-03-06 14:47:13 +00:00
if ( pWidth | | pHeight | | pRelH | | pRelW | | pSize | | pSizeType | |
2004-05-18 13:53:29 +00:00
pWidthType | | pSyncWidth | | pSyncHeight )
2000-09-18 23:08:29 +00:00
{
2001-05-28 12:29:57 +00:00
rSizeFound = sal_True ;
2009-06-03 11:26:39 +00:00
SwFmtFrmSize aFrmSz ( static_cast < const : : SwFmtFrmSize & > ( rFromSet . Get ( RES_FRM_SIZE ) ) ) ;
2000-09-18 23:08:29 +00:00
if ( pWidth )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pWidth , MID_FRMSIZE_WIDTH | CONVERT_TWIPS ) ;
if ( pHeight )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pHeight , MID_FRMSIZE_HEIGHT | CONVERT_TWIPS ) ;
if ( pRelH )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pRelH , MID_FRMSIZE_REL_HEIGHT ) ;
if ( pRelW )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pRelW , MID_FRMSIZE_REL_WIDTH ) ;
2001-01-15 10:28:36 +00:00
if ( pSyncWidth )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pSyncWidth , MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT ) ;
if ( pSyncHeight )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pSyncHeight , MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH ) ;
2000-09-18 23:08:29 +00:00
if ( pSize )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pSize , MID_FRMSIZE_SIZE | CONVERT_TWIPS ) ;
if ( pSizeType )
2001-06-15 13:27:58 +00:00
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pSizeType , MID_FRMSIZE_SIZE_TYPE ) ;
2004-05-18 13:53:29 +00:00
if ( pWidthType )
bRet & = ( ( SfxPoolItem & ) aFrmSz ) . PutValue ( * pWidthType , MID_FRMSIZE_WIDTH_TYPE ) ;
2000-12-11 07:15:23 +00:00
if ( ! aFrmSz . GetWidth ( ) )
aFrmSz . SetWidth ( MINFLY ) ;
if ( ! aFrmSz . GetHeight ( ) )
aFrmSz . SetHeight ( MINFLY ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aFrmSz ) ;
2000-09-18 23:08:29 +00:00
}
else
{
2001-05-28 12:29:57 +00:00
rSizeFound = sal_False ;
2000-09-18 23:08:29 +00:00
SwFmtFrmSize aFrmSz ;
awt : : Size aSize ;
2001-05-28 12:29:57 +00:00
aSize . Width = 2 * MM50 ;
aSize . Height = 2 * MM50 ;
2009-06-03 11:26:39 +00:00
: : uno : : Any aSizeVal ;
2000-09-18 23:08:29 +00:00
aSizeVal < < = aSize ;
( ( SfxPoolItem & ) aFrmSz ) . PutValue ( aSizeVal , MID_FRMSIZE_SIZE | CONVERT_TWIPS ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aFrmSz ) ;
2000-09-18 23:08:29 +00:00
}
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pFrameDirection = 0 ;
2002-02-04 17:08:18 +00:00
GetProperty ( RES_FRAMEDIR , 0 , pFrameDirection ) ;
if ( pFrameDirection )
{
SvxFrameDirectionItem aAttr ( FRMDIR_HORI_LEFT_TOP , RES_FRAMEDIR ) ;
aAttr . PutValue ( * pFrameDirection , 0 ) ;
rToSet . Put ( aAttr ) ;
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pUnknown = 0 ;
2001-07-09 04:50:21 +00:00
GetProperty ( RES_UNKNOWNATR_CONTAINER , 0 , pUnknown ) ;
if ( pUnknown )
{
SvXMLAttrContainerItem aAttr ( RES_UNKNOWNATR_CONTAINER ) ;
aAttr . PutValue ( * pUnknown , 0 ) ;
2001-10-23 16:40:05 +00:00
rToSet . Put ( aAttr ) ;
2001-07-09 04:50:21 +00:00
}
2004-02-02 17:26:06 +00:00
// DVO, OD 01.10.2003 #i18732#
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pFollowTextFlow = 0 ;
2004-02-02 17:26:06 +00:00
GetProperty ( RES_FOLLOW_TEXT_FLOW , 0 , pFollowTextFlow ) ;
if ( pFollowTextFlow )
{
SwFmtFollowTextFlow aFmtFollowTextFlow ;
aFmtFollowTextFlow . PutValue ( * pFollowTextFlow , 0 ) ;
rToSet . Put ( aFmtFollowTextFlow ) ;
}
2004-08-02 13:18:03 +00:00
// OD 2004-05-04 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pWrapInfluenceOnObjPos = 0 ;
2004-08-02 13:18:03 +00:00
GetProperty ( RES_WRAP_INFLUENCE_ON_OBJPOS , MID_WRAP_INFLUENCE , pWrapInfluenceOnObjPos ) ;
if ( pWrapInfluenceOnObjPos )
{
SwFmtWrapInfluenceOnObjPos aFmtWrapInfluenceOnObjPos ;
aFmtWrapInfluenceOnObjPos . PutValue ( * pWrapInfluenceOnObjPos , MID_WRAP_INFLUENCE ) ;
rToSet . Put ( aFmtWrapInfluenceOnObjPos ) ;
}
2000-09-18 23:08:29 +00:00
return bRet ;
}
2001-06-15 13:27:58 +00:00
2000-09-18 23:08:29 +00:00
class SwFrameProperties_Impl : public BaseFrameProperties_Impl
{
2003-04-17 13:43:12 +00:00
protected :
2009-06-03 11:26:39 +00:00
// SwFrameProperties_Impl(/*const :: SfxItemPropertyMap* pMap*/) :
// BaseFrameProperties_Impl(/*pMap*/){}
2000-09-18 23:08:29 +00:00
public :
SwFrameProperties_Impl ( ) ;
2007-07-18 11:57:02 +00:00
virtual ~ SwFrameProperties_Impl ( ) { }
2000-09-18 23:08:29 +00:00
2001-10-23 16:40:05 +00:00
virtual sal_Bool AnyToItemSet ( SwDoc * pDoc , SfxItemSet & rFrmSet , SfxItemSet & rSet , sal_Bool & rSizeFound ) ;
2000-09-18 23:08:29 +00:00
} ;
2010-10-13 16:05:00 +05:30
2001-10-23 16:40:05 +00:00
SwFrameProperties_Impl : : SwFrameProperties_Impl ( ) :
2009-06-03 11:26:39 +00:00
BaseFrameProperties_Impl ( /*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME)*/ )
2000-09-18 23:08:29 +00:00
{
}
2010-10-13 16:05:00 +05:30
2009-06-03 11:26:39 +00:00
inline void lcl_FillCol ( SfxItemSet & rToSet , const : : SfxItemSet & rFromSet , const : : uno : : Any * pAny )
2001-11-07 13:06:27 +00:00
{
if ( pAny )
{
2009-06-03 11:26:39 +00:00
SwFmtCol aCol ( static_cast < const : : SwFmtCol & > ( rFromSet . Get ( RES_COL ) ) ) ;
2001-11-07 13:06:27 +00:00
( ( SfxPoolItem & ) aCol ) . PutValue ( * pAny , MID_COLUMNS ) ;
rToSet . Put ( aCol ) ;
}
}
2010-10-13 16:05:00 +05:30
2001-10-23 16:40:05 +00:00
sal_Bool SwFrameProperties_Impl : : AnyToItemSet ( SwDoc * pDoc , SfxItemSet & rSet , SfxItemSet & , sal_Bool & rSizeFound )
2000-09-18 23:08:29 +00:00
{
//Properties fuer alle Frames
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pStyleName ;
2001-10-23 16:40:05 +00:00
SwDocStyleSheet * pStyle = NULL ;
sal_Bool bRet ;
if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME , 0 , pStyleName ) )
{
OUString sStyle ;
* pStyleName > > = sStyle ;
pStyle = ( SwDocStyleSheet * ) pDoc - > GetDocShell ( ) - > GetStyleSheetPool ( ) - > Find ( sStyle ,
SFX_STYLE_FAMILY_FRAME ) ;
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pColumns = NULL ;
2001-11-07 13:06:27 +00:00
GetProperty ( RES_COL , MID_COLUMNS , pColumns ) ;
2001-10-23 16:40:05 +00:00
if ( pStyle )
2001-10-31 15:53:40 +00:00
{
2008-03-12 11:29:14 +00:00
rtl : : Reference < SwDocStyleSheet > xStyle ( new SwDocStyleSheet ( * pStyle ) ) ;
2009-06-03 11:26:39 +00:00
const : : SfxItemSet * pItemSet = & xStyle - > GetItemSet ( ) ;
2001-11-07 13:06:27 +00:00
bRet = FillBaseProperties ( rSet , * pItemSet , rSizeFound ) ;
lcl_FillCol ( rSet , * pItemSet , pColumns ) ;
2001-10-31 15:53:40 +00:00
}
2001-10-23 16:40:05 +00:00
else
2001-11-07 13:06:27 +00:00
{
2009-06-03 11:26:39 +00:00
const : : SfxItemSet * pItemSet = & pDoc - > GetFrmFmtFromPool ( RES_POOLFRM_FRAME ) - > GetAttrSet ( ) ;
2001-11-07 13:06:27 +00:00
bRet = FillBaseProperties ( rSet , * pItemSet , rSizeFound ) ;
lcl_FillCol ( rSet , * pItemSet , pColumns ) ;
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pEdit ;
2001-06-15 13:27:58 +00:00
if ( GetProperty ( RES_EDIT_IN_READONLY , 0 , pEdit ) )
2000-09-18 23:08:29 +00:00
{
SfxBoolItem aBool ( RES_EDIT_IN_READONLY ) ;
( ( SfxPoolItem & ) aBool ) . PutValue ( * pEdit , 0 ) ;
rSet . Put ( aBool ) ;
}
return bRet ;
}
2010-10-13 16:05:00 +05:30
2000-09-18 23:08:29 +00:00
/****************************************************************************
Grafik - Descriptor
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
class SwGraphicProperties_Impl : public BaseFrameProperties_Impl
{
public :
SwGraphicProperties_Impl ( ) ;
2007-07-18 11:57:02 +00:00
virtual ~ SwGraphicProperties_Impl ( ) { }
2000-09-18 23:08:29 +00:00
2001-10-23 16:40:05 +00:00
virtual sal_Bool AnyToItemSet ( SwDoc * pDoc , SfxItemSet & rFrmSet , SfxItemSet & rSet , sal_Bool & rSizeFound ) ;
2000-09-18 23:08:29 +00:00
} ;
2010-10-13 16:05:00 +05:30
2001-10-23 16:40:05 +00:00
SwGraphicProperties_Impl : : SwGraphicProperties_Impl ( ) :
2009-06-03 11:26:39 +00:00
BaseFrameProperties_Impl ( /*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_GRAPHIC)*/ )
2000-09-18 23:08:29 +00:00
{
2000-12-14 08:48:16 +00:00
}
2009-06-03 11:26:39 +00:00
inline void lcl_FillMirror ( SfxItemSet & rToSet , const : : SfxItemSet & rFromSet , const : : uno : : Any * pHEvenMirror , const : : uno : : Any * pHOddMirror , const : : uno : : Any * pVMirror , sal_Bool & rRet )
2001-11-07 13:06:27 +00:00
{
if ( pHEvenMirror | | pHOddMirror | | pVMirror )
{
2009-06-03 11:26:39 +00:00
SwMirrorGrf aMirror ( static_cast < const : : SwMirrorGrf & > ( rFromSet . Get ( RES_GRFATR_MIRRORGRF ) ) ) ;
2001-11-07 13:06:27 +00:00
if ( pHEvenMirror )
rRet & = ( ( SfxPoolItem & ) aMirror ) . PutValue ( * pHEvenMirror , MID_MIRROR_HORZ_EVEN_PAGES ) ;
if ( pHOddMirror )
rRet & = ( ( SfxPoolItem & ) aMirror ) . PutValue ( * pHOddMirror , MID_MIRROR_HORZ_ODD_PAGES ) ;
if ( pVMirror )
rRet & = ( ( SfxPoolItem & ) aMirror ) . PutValue ( * pVMirror , MID_MIRROR_VERT ) ;
rToSet . Put ( aMirror ) ;
}
}
2000-09-18 23:08:29 +00:00
sal_Bool SwGraphicProperties_Impl : : AnyToItemSet (
2001-10-23 16:40:05 +00:00
SwDoc * pDoc ,
2000-09-18 23:08:29 +00:00
SfxItemSet & rFrmSet ,
2001-05-28 12:29:57 +00:00
SfxItemSet & rGrSet ,
sal_Bool & rSizeFound )
2000-09-18 23:08:29 +00:00
{
//Properties fuer alle Frames
2001-10-23 16:40:05 +00:00
sal_Bool bRet ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pStyleName ;
2001-10-23 16:40:05 +00:00
SwDocStyleSheet * pStyle = NULL ;
if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME , 0 , pStyleName ) )
{
OUString sStyle ;
* pStyleName > > = sStyle ;
pStyle = ( SwDocStyleSheet * ) pDoc - > GetDocShell ( ) - > GetStyleSheetPool ( ) - > Find ( sStyle ,
SFX_STYLE_FAMILY_FRAME ) ;
}
2000-09-18 23:08:29 +00:00
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pHEvenMirror = 0 ;
const : : uno : : Any * pHOddMirror = 0 ;
const : : uno : : Any * pVMirror = 0 ;
2001-06-15 13:27:58 +00:00
GetProperty ( RES_GRFATR_MIRRORGRF , MID_MIRROR_HORZ_EVEN_PAGES , pHEvenMirror ) ;
GetProperty ( RES_GRFATR_MIRRORGRF , MID_MIRROR_HORZ_ODD_PAGES , pHOddMirror ) ;
GetProperty ( RES_GRFATR_MIRRORGRF , MID_MIRROR_VERT , pVMirror ) ;
2001-11-07 13:06:27 +00:00
if ( pStyle )
2000-09-18 23:08:29 +00:00
{
2008-03-12 11:29:14 +00:00
rtl : : Reference < SwDocStyleSheet > xStyle ( new SwDocStyleSheet ( * pStyle ) ) ;
2009-06-03 11:26:39 +00:00
const : : SfxItemSet * pItemSet = & xStyle - > GetItemSet ( ) ;
2001-11-07 13:06:27 +00:00
bRet = FillBaseProperties ( rFrmSet , * pItemSet , rSizeFound ) ;
lcl_FillMirror ( rGrSet , * pItemSet , pHEvenMirror , pHOddMirror , pVMirror , bRet ) ;
2000-09-18 23:08:29 +00:00
}
2001-11-07 13:06:27 +00:00
else
{
2009-06-03 11:26:39 +00:00
const : : SfxItemSet * pItemSet = & pDoc - > GetFrmFmtFromPool ( RES_POOLFRM_GRAPHIC ) - > GetAttrSet ( ) ;
2001-11-07 13:06:27 +00:00
bRet = FillBaseProperties ( rFrmSet , * pItemSet , rSizeFound ) ;
lcl_FillMirror ( rGrSet , * pItemSet , pHEvenMirror , pHOddMirror , pVMirror , bRet ) ;
}
2000-12-14 08:48:16 +00:00
2009-06-03 11:26:39 +00:00
static const : : USHORT nIDs [ ] =
2000-12-14 08:48:16 +00:00
{
RES_GRFATR_CROPGRF ,
RES_GRFATR_ROTATION ,
RES_GRFATR_LUMINANCE ,
RES_GRFATR_CONTRAST ,
RES_GRFATR_CHANNELR ,
RES_GRFATR_CHANNELG ,
RES_GRFATR_CHANNELB ,
RES_GRFATR_GAMMA ,
RES_GRFATR_INVERT ,
RES_GRFATR_TRANSPARENCY ,
RES_GRFATR_DRAWMODE ,
0
} ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pAny ;
2000-12-14 08:48:16 +00:00
for ( sal_Int16 nIndex = 0 ; nIDs [ nIndex ] ; nIndex + + )
2000-09-18 23:08:29 +00:00
{
2001-06-26 08:56:03 +00:00
BYTE nMId = RES_GRFATR_CROPGRF = = nIDs [ nIndex ] ? CONVERT_TWIPS : 0 ;
if ( GetProperty ( nIDs [ nIndex ] , nMId , pAny ) )
2000-12-14 08:48:16 +00:00
{
SfxPoolItem * pItem = : : GetDfltAttr ( nIDs [ nIndex ] ) - > Clone ( ) ;
2001-06-26 08:56:03 +00:00
bRet & = pItem - > PutValue ( * pAny , nMId ) ;
2000-12-14 08:48:16 +00:00
rGrSet . Put ( * pItem ) ;
delete pItem ;
}
2000-09-18 23:08:29 +00:00
}
2000-12-14 08:48:16 +00:00
2000-09-18 23:08:29 +00:00
return bRet ;
}
2003-04-17 13:43:12 +00:00
class SwOLEProperties_Impl : public SwFrameProperties_Impl
{
public :
SwOLEProperties_Impl ( ) :
2009-06-03 11:26:39 +00:00
SwFrameProperties_Impl ( /*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_EMBEDDED_OBJECT)*/ ) { }
2007-07-18 11:57:02 +00:00
virtual ~ SwOLEProperties_Impl ( ) { }
2003-04-17 13:43:12 +00:00
virtual sal_Bool AnyToItemSet ( SwDoc * pDoc , SfxItemSet & rFrmSet , SfxItemSet & rSet , sal_Bool & rSizeFound ) ;
} ;
sal_Bool SwOLEProperties_Impl : : AnyToItemSet (
SwDoc * pDoc , SfxItemSet & rFrmSet , SfxItemSet & rSet , sal_Bool & rSizeFound )
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pTemp ;
2008-07-01 10:27:33 +00:00
if ( ! GetProperty ( FN_UNO_CLSID , 0 , pTemp ) & & ! GetProperty ( FN_UNO_STREAM_NAME , 0 , pTemp ) )
2003-04-17 13:43:12 +00:00
return FALSE ;
SwFrameProperties_Impl : : AnyToItemSet ( pDoc , rFrmSet , rSet , rSizeFound ) ;
//
return TRUE ;
}
2000-09-18 23:08:29 +00:00
/******************************************************************
* SwXFrame
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2009-06-03 11:26:39 +00:00
const : : uno : : Sequence < sal_Int8 > & SwXFrame : : getUnoTunnelId ( )
2000-09-18 23:08:29 +00:00
{
static uno : : Sequence < sal_Int8 > aSeq = : : CreateUnoTunnelId ( ) ;
return aSeq ;
}
2009-06-03 11:26:39 +00:00
sal_Int64 SAL_CALL SwXFrame : : getSomething ( const : : uno : : Sequence < sal_Int8 > & rId )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
if ( rId . getLength ( ) = = 16
& & 0 = = rtl_compareMemory ( getUnoTunnelId ( ) . getConstArray ( ) ,
rId . getConstArray ( ) , 16 ) )
{
2007-09-27 08:36:43 +00:00
return sal : : static_int_cast < sal_Int64 > ( reinterpret_cast < sal_IntPtr > ( this ) ) ;
2000-09-18 23:08:29 +00:00
}
return 0 ;
}
TYPEINIT1 ( SwXFrame , SwClient ) ;
2007-06-05 16:33:19 +00:00
OUString SwXFrame : : getImplementationName ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return C2U ( " SwXFrame " ) ;
}
2009-06-03 11:26:39 +00:00
BOOL SwXFrame : : supportsService ( const : : OUString & rServiceName ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-02-12 06:14:16 +00:00
return ! rServiceName . compareToAscii ( " com.sun.star.text.BaseFrame " ) | |
! rServiceName . compareToAscii ( " com.sun.star.text.TextContent " ) | |
! rServiceName . compareToAscii ( " com.sun.star.document.LinkTarget " ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < OUString > SwXFrame : : getSupportedServiceNames ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2007-06-05 16:33:19 +00:00
uno : : Sequence < OUString > aRet ( 3 ) ;
2000-09-18 23:08:29 +00:00
OUString * pArray = aRet . getArray ( ) ;
2001-02-12 06:14:16 +00:00
pArray [ 0 ] = C2U ( " com.sun.star.text.BaseFrame " ) ;
pArray [ 1 ] = C2U ( " com.sun.star.text.TextContent " ) ;
pArray [ 2 ] = C2U ( " com.sun.star.document.LinkTarget " ) ;
2000-09-18 23:08:29 +00:00
return aRet ;
}
/*-- 14.01.99 11:31:52---------------------------------------------------
Dieser CTor legt den Frame als Descriptor an
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
2009-06-03 11:26:39 +00:00
SwXFrame : : SwXFrame ( FlyCntType eSet , const : : SfxItemPropertySet * pSet , SwDoc * pDoc ) :
2000-09-18 23:08:29 +00:00
aLstnrCntnr ( ( container : : XNamed * ) this ) ,
2009-06-03 11:26:39 +00:00
m_pPropSet ( pSet ) ,
m_pDoc ( pDoc ) ,
2007-09-27 08:36:43 +00:00
eType ( eSet ) ,
bIsDescriptor ( sal_True ) ,
2007-07-18 11:57:02 +00:00
m_pCopySource ( 0 )
2000-09-18 23:08:29 +00:00
{
2001-10-12 12:57:26 +00:00
// Register ourselves as a listener to the document (via the page descriptor)
pDoc - > GetPageDescFromPool ( RES_POOLPAGE_STANDARD ) - > Add ( this ) ;
// get the property set for the default style data
// First get the model
2007-06-05 16:33:19 +00:00
uno : : Reference < XModel > xModel = pDoc - > GetDocShell ( ) - > GetBaseModel ( ) ;
2001-10-12 12:57:26 +00:00
// Ask the model for it's family supplier interface
2007-06-05 16:33:19 +00:00
uno : : Reference < XStyleFamiliesSupplier > xFamilySupplier ( xModel , uno : : UNO_QUERY ) ;
2001-10-12 12:57:26 +00:00
// Get the style families
2007-06-05 16:33:19 +00:00
uno : : Reference < XNameAccess > xFamilies = xFamilySupplier - > getStyleFamilies ( ) ;
2001-10-12 12:57:26 +00:00
// Get the Frame family (and keep it for later)
2009-06-03 11:26:39 +00:00
const : : uno : : Any aAny = xFamilies - > getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " FrameStyles " ) ) ) ;
2001-10-12 12:57:26 +00:00
aAny > > = mxStyleFamily ;
// In the derived class, we'll ask mxStyleFamily for the relevant default style
2001-10-23 16:40:05 +00:00
// mxStyleFamily is initialised in the SwXFrame constructor
switch ( eType )
{
case FLYCNTTYPE_FRM :
{
2007-09-27 08:36:43 +00:00
uno : : Any aAny2 = mxStyleFamily - > getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Frame " ) ) ) ;
aAny2 > > = mxStyleData ;
2001-10-23 16:40:05 +00:00
pProps = new SwFrameProperties_Impl ( ) ;
}
break ;
case FLYCNTTYPE_GRF :
{
2007-09-27 08:36:43 +00:00
uno : : Any aAny2 = mxStyleFamily - > getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Graphics " ) ) ) ;
aAny2 > > = mxStyleData ;
2001-10-23 16:40:05 +00:00
pProps = new SwGraphicProperties_Impl ( ) ;
}
break ;
case FLYCNTTYPE_OLE :
{
2007-09-27 08:36:43 +00:00
uno : : Any aAny2 = mxStyleFamily - > getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " OLE " ) ) ) ;
aAny2 > > = mxStyleData ;
2003-04-17 13:43:12 +00:00
pProps = new SwOLEProperties_Impl ( ) ;
2001-10-23 16:40:05 +00:00
}
break ;
2007-09-27 08:36:43 +00:00
default :
;
2001-10-23 16:40:05 +00:00
}
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
SwXFrame : : SwXFrame ( SwFrmFmt & rFrmFmt , FlyCntType eSet , const : : SfxItemPropertySet * pSet ) :
2000-09-18 23:08:29 +00:00
SwClient ( & rFrmFmt ) ,
aLstnrCntnr ( ( container : : XNamed * ) this ) ,
2009-06-03 11:26:39 +00:00
m_pPropSet ( pSet ) ,
m_pDoc ( 0 ) ,
2007-09-27 08:36:43 +00:00
eType ( eSet ) ,
2007-07-18 11:57:02 +00:00
pProps ( 0 ) ,
2007-09-27 08:36:43 +00:00
bIsDescriptor ( sal_False ) ,
2007-07-18 11:57:02 +00:00
m_pCopySource ( 0 )
2000-09-18 23:08:29 +00:00
{
}
SwXFrame : : ~ SwXFrame ( )
{
2007-07-18 11:57:02 +00:00
delete m_pCopySource ;
2000-09-18 23:08:29 +00:00
delete pProps ;
}
2007-06-05 16:33:19 +00:00
OUString SwXFrame : : getName ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
String sRet ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
sRet = pFmt - > GetName ( ) ;
else if ( bIsDescriptor )
sRet = sName ;
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return sRet ;
}
2009-06-03 11:26:39 +00:00
void SwXFrame : : setName ( const : : OUString & rName ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
String sTmpName ( rName ) ;
if ( pFmt )
{
pFmt - > GetDoc ( ) - > SetFlyName ( ( SwFlyFrmFmt & ) * pFmt , sTmpName ) ;
if ( pFmt - > GetName ( ) ! = sTmpName )
{
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
}
}
else if ( bIsDescriptor )
sName = sTmpName ;
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
uno : : Reference < beans : : XPropertySetInfo > SwXFrame : : getPropertySetInfo ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2007-06-05 16:33:19 +00:00
uno : : Reference < beans : : XPropertySetInfo > xRef ;
static uno : : Reference < beans : : XPropertySetInfo > xFrmRef ;
static uno : : Reference < beans : : XPropertySetInfo > xGrfRef ;
static uno : : Reference < beans : : XPropertySetInfo > xOLERef ;
2000-09-18 23:08:29 +00:00
switch ( eType )
{
case FLYCNTTYPE_FRM :
if ( ! xFrmRef . is ( ) )
2009-06-03 11:26:39 +00:00
xFrmRef = m_pPropSet - > getPropertySetInfo ( ) ;
2000-09-18 23:08:29 +00:00
xRef = xFrmRef ;
break ;
case FLYCNTTYPE_GRF :
if ( ! xGrfRef . is ( ) )
2009-06-03 11:26:39 +00:00
xGrfRef = m_pPropSet - > getPropertySetInfo ( ) ;
2000-09-18 23:08:29 +00:00
xRef = xGrfRef ;
break ;
case FLYCNTTYPE_OLE :
if ( ! xOLERef . is ( ) )
2009-06-03 11:26:39 +00:00
xOLERef = m_pPropSet - > getPropertySetInfo ( ) ;
2000-09-18 23:08:29 +00:00
xRef = xOLERef ;
break ;
2007-09-27 08:36:43 +00:00
default :
;
2000-09-18 23:08:29 +00:00
}
return xRef ;
}
2007-07-18 11:57:02 +00:00
void SwXFrame : : SetSelection ( SwPaM & rCopySource )
{
if ( m_pCopySource )
delete m_pCopySource ;
m_pCopySource = new SwPaM ( * rCopySource . Start ( ) ) ;
m_pCopySource - > SetMark ( ) ;
* m_pCopySource - > GetMark ( ) = * rCopySource . End ( ) ;
}
2000-12-06 10:36:14 +00:00
2002-11-26 11:35:55 +00:00
SdrObject * SwXFrame : : GetOrCreateSdrObject ( SwFlyFrmFmt * pFmt )
2000-12-06 10:36:14 +00:00
{
SdrObject * pObject = pFmt - > FindSdrObject ( ) ;
if ( ! pObject )
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
2005-09-28 10:22:42 +00:00
// --> OD 2005-08-08 #i52858# - method name changed
SdrModel * pDrawModel = pDoc - > GetOrCreateDrawModel ( ) ;
// <--
2000-12-06 10:36:14 +00:00
SwFlyDrawContact * pContactObject
= new SwFlyDrawContact ( pFmt , pDrawModel ) ;
pObject = pContactObject - > GetMaster ( ) ;
2009-06-03 11:26:39 +00:00
const : : SwFmtSurround & rSurround = pFmt - > GetSurround ( ) ;
2000-12-06 10:36:14 +00:00
pObject - > SetLayer (
( SURROUND_THROUGHT = = rSurround . GetSurround ( ) & &
! pFmt - > GetOpaque ( ) . GetValue ( ) ) ? pDoc - > GetHellId ( )
: pDoc - > GetHeavenId ( ) ) ;
pDrawModel - > GetPage ( 0 ) - > InsertObject ( pObject ) ;
}
return pObject ;
}
2009-06-03 11:26:39 +00:00
SwFrmFmt * lcl_GetFrmFmt ( const : : uno : : Any & rValue , SwDoc * pDoc )
2000-12-20 06:55:54 +00:00
{
SwFrmFmt * pRet = 0 ;
SwDocShell * pDocSh = pDoc - > GetDocShell ( ) ;
if ( pDocSh )
{
OUString uTemp ;
rValue > > = uTemp ;
2001-08-16 11:33:56 +00:00
String sStyle ;
2007-09-27 08:36:43 +00:00
SwStyleNameMapper : : FillUIName ( String ( uTemp ) , sStyle , nsSwGetPoolIdFromName : : GET_POOLID_FRMFMT , sal_True ) ;
2000-12-20 06:55:54 +00:00
SwDocStyleSheet * pStyle =
( SwDocStyleSheet * ) pDocSh - > GetStyleSheetPool ( ) - > Find ( sStyle ,
SFX_STYLE_FAMILY_FRAME ) ;
if ( pStyle )
pRet = pStyle - > GetFrmFmt ( ) ;
}
return pRet ;
}
2009-06-03 11:26:39 +00:00
void SwXFrame : : setPropertyValue ( const : : OUString & rPropertyName , const : : uno : : Any & aValue )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , beans : : PropertyVetoException , lang : : IllegalArgumentException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
2009-06-03 11:26:39 +00:00
const : : SfxItemPropertySimpleEntry * pEntry = m_pPropSet - > getPropertyMap ( ) - > getByName ( rPropertyName ) ;
2001-11-28 19:13:57 +00:00
2009-06-03 11:26:39 +00:00
if ( ! pEntry )
2007-06-05 16:33:19 +00:00
throw beans : : UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Unknown property: " ) ) + rPropertyName , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2001-11-28 19:13:57 +00:00
2000-09-18 23:08:29 +00:00
if ( pFmt )
{
sal_Bool bNextFrame = sal_False ;
2009-06-03 11:26:39 +00:00
if ( pEntry - > nFlags & beans : : PropertyAttribute : : READONLY )
2007-06-05 16:33:19 +00:00
throw beans : : PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Property is read-only: " ) ) + rPropertyName , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2001-04-27 05:42:08 +00:00
2000-09-18 23:08:29 +00:00
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
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
if ( ( eType = = FLYCNTTYPE_GRF ) & & isGRFATR ( pEntry - > nWID ) | |
( FN_PARAM_COUNTOUR_PP = = pEntry - > nWID ) | |
( FN_UNO_IS_AUTOMATIC_CONTOUR = = pEntry - > nWID ) | |
( FN_UNO_IS_PIXEL_CONTOUR = = pEntry - > nWID ) )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
const : : SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
2000-09-18 23:08:29 +00:00
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwNoTxtNode * pNoTxt = aIdx . GetNode ( ) . GetNoTxtNode ( ) ;
2009-06-03 11:26:39 +00:00
if ( pEntry - > nWID = = FN_PARAM_COUNTOUR_PP )
2000-10-24 13:26:57 +00:00
{
2007-06-05 16:33:19 +00:00
drawing : : PointSequenceSequence aParam ;
2000-10-24 13:26:57 +00:00
if ( ! aValue . hasValue ( ) )
pNoTxt - > SetContour ( 0 ) ;
else if ( aValue > > = aParam )
{
2001-05-04 07:41:21 +00:00
PolyPolygon aPoly ( ( USHORT ) aParam . getLength ( ) ) ;
2000-10-24 13:26:57 +00:00
for ( sal_Int32 i = 0 ; i < aParam . getLength ( ) ; i + + )
{
2009-06-03 11:26:39 +00:00
const : : drawing : : PointSequence * pPointSeq = aParam . getConstArray ( ) ;
2001-05-04 07:41:21 +00:00
sal_Int32 nPoints = pPointSeq [ i ] . getLength ( ) ;
2009-06-03 11:26:39 +00:00
const : : awt : : Point * pPoints = pPointSeq [ i ] . getConstArray ( ) ;
2001-05-04 07:41:21 +00:00
Polygon aSet ( ( USHORT ) nPoints ) ;
for ( sal_Int32 j = 0 ; j < nPoints ; j + + )
2000-10-24 13:26:57 +00:00
{
2001-05-04 07:41:21 +00:00
Point aPoint ( pPoints [ j ] . X , pPoints [ j ] . Y ) ;
aSet . SetPoint ( aPoint , ( USHORT ) j ) ;
2000-10-24 13:26:57 +00:00
}
2001-05-04 07:41:21 +00:00
// Close polygon if it isn't closed already.
aSet . Optimize ( POLY_OPTIMIZE_CLOSE ) ;
2000-10-24 13:26:57 +00:00
aPoly . Insert ( aSet ) ;
}
2001-05-04 07:41:21 +00:00
pNoTxt - > SetContourAPI ( & aPoly ) ;
2000-10-24 13:26:57 +00:00
}
else
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2000-10-24 13:26:57 +00:00
}
2009-06-03 11:26:39 +00:00
else if ( pEntry - > nWID = = FN_UNO_IS_AUTOMATIC_CONTOUR )
2001-05-04 07:41:21 +00:00
{
pNoTxt - > SetAutomaticContour ( * ( sal_Bool * ) aValue . getValue ( ) ) ;
}
2009-06-03 11:26:39 +00:00
else if ( pEntry - > nWID = = FN_UNO_IS_PIXEL_CONTOUR )
2001-05-04 07:41:21 +00:00
{
// The IsPixelContour property can only be set if there
// is no contour, or if the contour has been set by the
// API itself (or in other words, if the contour isn't
// used already).
if ( ! pNoTxt - > _HasContour ( ) | |
! pNoTxt - > IsContourMapModeValid ( ) )
pNoTxt - > SetPixelContour ( * ( sal_Bool * ) aValue . getValue ( ) ) ;
else
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2001-05-04 07:41:21 +00:00
}
2000-09-18 23:08:29 +00:00
else
{
SfxItemSet aSet ( pNoTxt - > GetSwAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
m_pPropSet - > setPropertyValue ( * pEntry , aValue , aSet ) ;
2000-09-18 23:08:29 +00:00
pNoTxt - > SetAttr ( aSet ) ;
}
}
}
2009-08-27 11:59:20 +00:00
// --> OD 2009-07-13 #i73249#
// Attribute AlternativeText was never published.
// Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
// else if( FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID && eType != FLYCNTTYPE_FRM )
// {
// const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
// if(pIdx)
// {
// SwNodeIndex aIdx(*pIdx, 1);
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
// OUString uTemp;
// aValue >>= uTemp;
// pNoTxt->SetAlternateText(uTemp);
// }
// }
// New attribute Title
else if ( FN_UNO_TITLE = = pEntry - > nWID )
2008-01-29 08:23:32 +00:00
{
2009-08-27 11:59:20 +00:00
SwFlyFrmFmt * pFlyFmt = dynamic_cast < SwFlyFrmFmt * > ( pFmt ) ;
ASSERT ( pFmt ,
" unexpected type of <pFmt> --> crash " ) ;
OUString uTemp ;
aValue > > = uTemp ;
const String sTitle ( uTemp ) ;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject ( pFlyFmt ) ;
pFlyFmt - > GetDoc ( ) - > SetFlyFrmTitle ( * ( pFlyFmt ) , sTitle ) ;
2008-01-29 08:23:32 +00:00
}
2009-08-27 11:59:20 +00:00
// New attribute Description
else if ( FN_UNO_DESCRIPTION = = pEntry - > nWID )
{
SwFlyFrmFmt * pFlyFmt = dynamic_cast < SwFlyFrmFmt * > ( pFmt ) ;
ASSERT ( pFmt ,
" unexpected type of <pFmt> --> crash " ) ;
OUString uTemp ;
aValue > > = uTemp ;
const String sDescription ( uTemp ) ;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject ( pFlyFmt ) ;
pFlyFmt - > GetDoc ( ) - > SetFlyFrmDescription ( * ( pFlyFmt ) , sDescription ) ;
}
// <--
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_FRAME_STYLE_NAME = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
2000-12-20 06:55:54 +00:00
SwFrmFmt * pFrmFmt = lcl_GetFrmFmt ( aValue , pFmt - > GetDoc ( ) ) ;
if ( pFrmFmt )
2000-09-18 23:08:29 +00:00
{
2000-12-20 06:55:54 +00:00
UnoActionContext aAction ( pFmt - > GetDoc ( ) ) ;
2003-03-27 14:45:43 +00:00
SfxItemSet * pSet = 0 ;
2004-11-09 11:31:53 +00:00
// --> OD 2004-08-13 #i31771#, #i25798# - No adjustment of
// anchor ( no call of method <::lcl_ChkAndSetNewAnchor(..)> ),
// if document is currently in reading mode.
if ( ! pFmt - > GetDoc ( ) - > IsInReading ( ) )
2003-03-27 14:45:43 +00:00
{
2004-11-09 11:31:53 +00:00
// see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocPos )
SwFlyFrm * pFly = 0 ;
2003-03-27 14:45:43 +00:00
{
2009-06-03 11:26:39 +00:00
const : : SwFrmFmt * pFmtXX = pFmt ;
2004-11-09 11:31:53 +00:00
if ( PTR_CAST ( SwFlyFrmFmt , pFmtXX ) )
pFly = ( ( SwFlyFrmFmt * ) pFmtXX ) - > GetFrm ( ) ;
}
if ( pFly )
{
2009-06-03 11:26:39 +00:00
const : : SfxPoolItem * pItem ;
2004-11-09 11:31:53 +00:00
if ( SFX_ITEM_SET = = pFrmFmt - > GetItemState ( RES_ANCHOR , sal_False , & pItem ) )
{
pSet = new SfxItemSet ( pDoc - > GetAttrPool ( ) , aFrmFmtSetRange ) ;
pSet - > Put ( * pItem ) ;
if ( ! : : lcl_ChkAndSetNewAnchor ( * pFly , * pSet ) )
delete pSet , pSet = 0 ;
}
2003-03-27 14:45:43 +00:00
}
}
2004-11-09 11:31:53 +00:00
// <--
2003-03-27 14:45:43 +00:00
pFmt - > GetDoc ( ) - > SetFrmFmtToFly ( * pFmt , * pFrmFmt , pSet , FALSE ) ;
delete pSet ;
2000-09-18 23:08:29 +00:00
}
2000-12-20 06:55:54 +00:00
else
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_GRAPHIC_U_R_L = = pEntry - > nWID | |
FN_UNO_GRAPHIC_FILTER = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
String sGrfName , sFltName ;
2000-11-29 13:57:24 +00:00
GraphicObject * pGrfObj = 0 ;
2000-09-18 23:08:29 +00:00
pFmt - > GetDoc ( ) - > GetGrfNms ( * ( SwFlyFrmFmt * ) pFmt , & sGrfName , & sFltName ) ;
OUString uTemp ;
aValue > > = uTemp ;
String sTmp ( uTemp ) ;
UnoActionContext aAction ( pFmt - > GetDoc ( ) ) ;
2009-06-03 11:26:39 +00:00
if ( FN_UNO_GRAPHIC_U_R_L = = pEntry - > nWID )
2000-11-29 13:57:24 +00:00
{
if ( sTmp . EqualsAscii ( sPackageProtocol ,
0 , sizeof ( sPackageProtocol ) - 1 ) )
{
2001-03-02 13:08:50 +00:00
pGrfObj = new GraphicObject ;
pGrfObj - > SetUserData ( sTmp ) ;
pGrfObj - > SetSwapState ( ) ;
2000-11-29 13:57:24 +00:00
sGrfName . Erase ( ) ;
}
else if ( sTmp . EqualsAscii ( sGraphicObjectProtocol ,
0 , sizeof ( sGraphicObjectProtocol ) - 1 ) )
{
ByteString sId ( sTmp . Copy ( sizeof ( sGraphicObjectProtocol ) - 1 ) ,
RTL_TEXTENCODING_ASCII_US ) ;
pGrfObj = new GraphicObject ( sId ) ;
sGrfName . Erase ( ) ;
}
else
{
2001-11-30 14:00:46 +00:00
sGrfName = sTmp ;
2000-11-29 13:57:24 +00:00
}
}
2000-09-18 23:08:29 +00:00
else
2000-11-29 13:57:24 +00:00
{
2000-09-18 23:08:29 +00:00
sFltName = sTmp ;
2000-11-29 13:57:24 +00:00
}
2000-09-18 23:08:29 +00:00
2009-06-03 11:26:39 +00:00
const : : SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
2000-09-18 23:08:29 +00:00
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
SwGrfNode * pGrfNode = aIdx . GetNode ( ) . GetGrfNode ( ) ;
if ( ! pGrfNode )
2000-11-29 13:57:24 +00:00
{
delete pGrfObj ;
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-11-29 13:57:24 +00:00
}
2000-09-18 23:08:29 +00:00
SwPaM aGrfPaM ( * pGrfNode ) ;
2000-11-29 13:57:24 +00:00
pFmt - > GetDoc ( ) - > ReRead ( aGrfPaM , sGrfName , sFltName , 0 ,
pGrfObj ) ;
2000-09-18 23:08:29 +00:00
}
2000-11-29 13:57:24 +00:00
delete pGrfObj ;
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_GRAPHIC = = pEntry - > nWID )
2007-07-18 11:57:02 +00:00
{
uno : : Reference < graphic : : XGraphic > xGraphic ;
aValue > > = xGraphic ;
if ( xGraphic . is ( ) )
{
2009-06-03 11:26:39 +00:00
const : : SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
2007-07-18 11:57:02 +00:00
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwGrfNode * pGrfNode = aIdx . GetNode ( ) . GetGrfNode ( ) ;
if ( ! pGrfNode )
{
throw uno : : RuntimeException ( ) ;
}
SwPaM aGrfPaM ( * pGrfNode ) ;
Graphic aGraphic ( xGraphic ) ;
pFmt - > GetDoc ( ) - > ReRead ( aGrfPaM , String ( ) , String ( ) , & aGraphic , 0 ) ;
}
}
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_REPLACEMENT_GRAPHIC_URL = = pEntry - > nWID | | FN_UNO_REPLACEMENT_GRAPHIC = = pEntry - > nWID )
2007-01-23 06:36:04 +00:00
{
2009-06-03 11:26:39 +00:00
bool bURL = FN_UNO_REPLACEMENT_GRAPHIC_URL = = pEntry - > nWID ;
2008-07-22 12:01:18 +00:00
bool bApply = false ;
Graphic aGraphic ;
if ( bURL )
{
GraphicObject * pGrfObj = 0 ;
OUString aGrfUrl ;
aValue > > = aGrfUrl ;
// the package URL based graphics are handled in different way currently
// TODO/LATER: actually this is the correct place to handle them
: : rtl : : OUString aGraphicProtocol ( RTL_CONSTASCII_USTRINGPARAM ( sGraphicObjectProtocol ) ) ;
if ( aGrfUrl . compareTo ( aGraphicProtocol , aGraphicProtocol . getLength ( ) ) = = 0 )
{
ByteString sId ( aGrfUrl . copy ( sizeof ( sGraphicObjectProtocol ) - 1 ) . getStr ( ) , RTL_TEXTENCODING_ASCII_US ) ;
pGrfObj = new GraphicObject ( sId ) ;
aGraphic = pGrfObj - > GetGraphic ( ) ;
bApply = true ;
}
}
else
2007-01-23 06:36:04 +00:00
{
2008-07-22 12:01:18 +00:00
uno : : Reference < graphic : : XGraphic > xGraphic ;
aValue > > = xGraphic ;
if ( xGraphic . is ( ) )
{
aGraphic = Graphic ( xGraphic ) ;
bApply = true ;
}
2007-01-23 06:36:04 +00:00
}
2008-07-22 12:01:18 +00:00
if ( bApply )
2007-01-23 06:36:04 +00:00
{
2009-06-03 11:26:39 +00:00
const : : SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
2007-01-23 06:36:04 +00:00
if ( pCnt - > GetCntntIdx ( ) & & pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - > GetIndex ( ) + 1 ] )
{
SwOLENode * pOleNode = pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - > GetIndex ( ) + 1 ] - > GetOLENode ( ) ;
if ( pOleNode )
{
svt : : EmbeddedObjectRef xObj = pOleNode - > GetOLEObj ( ) . GetObject ( ) ;
: : rtl : : OUString aMediaType ;
2008-07-22 12:01:18 +00:00
xObj . SetGraphic ( aGraphic , aMediaType ) ;
2007-01-23 06:36:04 +00:00
}
}
}
}
2001-06-13 11:03:44 +00:00
else if ( 0 ! = ( bNextFrame = ( rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_CHAIN_NEXT_NAME ) ) ) )
| | rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_CHAIN_PREV_NAME ) ) )
2000-09-18 23:08:29 +00:00
{
OUString uTemp ;
aValue > > = uTemp ;
String sChainName ( uTemp ) ;
if ( ! sChainName . Len ( ) )
{
if ( bNextFrame )
pDoc - > Unchain ( * pFmt ) ;
else
{
SwFmtChain aChain ( pFmt - > GetChain ( ) ) ;
SwFrmFmt * pPrev = aChain . GetPrev ( ) ;
if ( pPrev )
pDoc - > Unchain ( * pPrev ) ;
}
}
else
{
2000-12-22 08:54:15 +00:00
sal_uInt16 nCount = pDoc - > GetFlyCount ( FLYCNTTYPE_FRM ) ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pChain = 0 ;
for ( sal_uInt16 i = 0 ; i < nCount ; i + + )
{
2007-09-27 08:36:43 +00:00
SwFrmFmt * pFmt2 = pDoc - > GetFlyNum ( i , FLYCNTTYPE_FRM ) ;
if ( sChainName = = pFmt2 - > GetName ( ) )
2000-09-18 23:08:29 +00:00
{
2007-09-27 08:36:43 +00:00
pChain = pFmt2 ;
2000-09-18 23:08:29 +00:00
break ;
}
}
if ( pChain )
{
SwFrmFmt * pSource = bNextFrame ? pFmt : pChain ;
SwFrmFmt * pDest = bNextFrame ? pChain : pFmt ;
pDoc - > Chain ( * pSource , * pDest ) ;
}
}
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_Z_ORDER = = pEntry - > nWID )
2000-11-27 10:13:17 +00:00
{
sal_Int32 nZOrder = - 1 ;
aValue > > = nZOrder ;
2000-12-06 10:36:14 +00:00
if ( nZOrder > = 0 )
2000-11-27 10:13:17 +00:00
{
2000-12-06 10:36:14 +00:00
SdrObject * pObject =
2002-11-26 11:35:55 +00:00
GetOrCreateSdrObject ( ( SwFlyFrmFmt * ) pFmt ) ;
2000-12-06 10:36:14 +00:00
SdrModel * pDrawModel = pDoc - > GetDrawModel ( ) ;
pDrawModel - > GetPage ( 0 ) - >
SetObjectOrdNum ( pObject - > GetOrdNum ( ) , nZOrder ) ;
2000-11-27 10:13:17 +00:00
}
}
2009-06-03 11:26:39 +00:00
else if ( RES_ANCHOR = = pEntry - > nWID & & MID_ANCHOR_ANCHORFRAME = = pEntry - > nMemberId )
2001-03-12 11:30:40 +00:00
{
2004-11-16 14:55:23 +00:00
sal_Bool bDone = sal_False ;
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextFrame > xFrame ;
2001-03-12 11:30:40 +00:00
if ( aValue > > = xFrame )
{
2007-06-05 16:33:19 +00:00
uno : : Reference < lang : : XUnoTunnel > xTunnel ( xFrame , uno : : UNO_QUERY ) ;
2001-03-12 11:30:40 +00:00
SwXFrame * pFrame = xTunnel . is ( ) ?
2007-09-27 08:36:43 +00:00
reinterpret_cast < SwXFrame * > ( sal : : static_int_cast < sal_IntPtr > ( xTunnel - > getSomething ( SwXFrame : : getUnoTunnelId ( ) ) ) )
: 0 ;
2001-03-12 11:30:40 +00:00
if ( pFrame & & this ! = pFrame & & pFrame - > GetFrmFmt ( ) & & pFrame - > GetFrmFmt ( ) - > GetDoc ( ) = = pDoc )
{
SfxItemSet aSet ( pDoc - > GetAttrPool ( ) ,
RES_FRMATR_BEGIN , RES_FRMATR_END - 1 ) ;
aSet . SetParent ( & pFmt - > GetAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
SwFmtAnchor aAnchor = ( const : : SwFmtAnchor & ) aSet . Get ( pEntry - > nWID ) ;
2001-03-12 11:30:40 +00:00
SwPosition aPos ( * pFrame - > GetFrmFmt ( ) - > GetCntnt ( ) . GetCntntIdx ( ) ) ;
aAnchor . SetAnchor ( & aPos ) ;
aAnchor . SetType ( FLY_AT_FLY ) ;
aSet . Put ( aAnchor ) ;
pDoc - > SetFlyFrmAttr ( * pFmt , aSet ) ;
bDone = sal_True ;
}
}
if ( ! bDone )
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2001-03-12 11:30:40 +00:00
}
2000-09-18 23:08:29 +00:00
else
{
SfxItemSet aSet ( pDoc - > GetAttrPool ( ) ,
2007-01-30 14:22:59 +00:00
RES_FRMATR_BEGIN , RES_FRMATR_END - 1 ,
RES_UNKNOWNATR_CONTAINER , RES_UNKNOWNATR_CONTAINER ,
0L ) ;
2000-09-18 23:08:29 +00:00
aSet . SetParent ( & pFmt - > GetAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
m_pPropSet - > setPropertyValue ( * pEntry , aValue , aSet ) ;
if ( RES_ANCHOR = = pEntry - > nWID & & MID_ANCHOR_ANCHORTYPE = = pEntry - > nMemberId )
2001-03-12 09:00:47 +00:00
{
2009-06-03 11:26:39 +00:00
SwFmtAnchor aAnchor = ( const : : SwFmtAnchor & ) aSet . Get ( pEntry - > nWID ) ;
2001-03-12 09:00:47 +00:00
if ( aAnchor . GetAnchorId ( ) = = FLY_AT_FLY )
{
2009-06-03 11:26:39 +00:00
const : : SwPosition * pPosition = aAnchor . GetCntntAnchor ( ) ;
2007-09-27 08:36:43 +00:00
SwFrmFmt * pFlyFmt = pPosition ? pPosition - > nNode . GetNode ( ) . GetFlyFmt ( ) : 0 ;
if ( ! pFlyFmt | | pFlyFmt - > Which ( ) = = RES_DRAWFRMFMT )
2001-03-12 09:00:47 +00:00
{
lang : : IllegalArgumentException aExcept ;
aExcept . Message = C2U ( " Anchor to frame: no frame found " ) ;
throw aExcept ;
}
else
{
SwPosition aPos = * pPosition ;
2007-09-27 08:36:43 +00:00
aPos . nNode = * pFlyFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
2001-03-12 09:00:47 +00:00
aAnchor . SetAnchor ( & aPos ) ;
aSet . Put ( aAnchor ) ;
}
}
2010-01-05 16:37:41 +01:00
else if ( ( aAnchor . GetAnchorId ( ) ! = FLY_AT_PAGE ) & &
! aAnchor . GetCntntAnchor ( ) )
2001-06-06 12:31:31 +00:00
{
SwNode & rNode = pDoc - > GetNodes ( ) . GetEndOfContent ( ) ;
SwPaM aPam ( rNode ) ;
aPam . Move ( fnMoveBackward , fnGoDoc ) ;
aAnchor . SetAnchor ( aPam . Start ( ) ) ;
aSet . Put ( aAnchor ) ;
}
2003-04-01 14:22:09 +00:00
2004-11-09 11:31:53 +00:00
// --> OD 2004-08-13 #i31771#, #i25798# - No adjustment of
// anchor ( no call of method <::lcl_ChkAndSetNewAnchor(..)> ),
// if document is currently in reading mode.
if ( ! pFmt - > GetDoc ( ) - > IsInReading ( ) )
2003-04-01 14:22:09 +00:00
{
2004-11-09 11:31:53 +00:00
// see SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
SwFlyFrm * pFly = 0 ;
if ( PTR_CAST ( SwFlyFrmFmt , pFmt ) )
pFly = ( ( SwFlyFrmFmt * ) pFmt ) - > GetFrm ( ) ;
if ( pFly )
2003-04-01 14:22:09 +00:00
{
2009-06-03 11:26:39 +00:00
const : : SfxPoolItem * pItem ;
2004-11-09 11:31:53 +00:00
if ( SFX_ITEM_SET = = aSet . GetItemState ( RES_ANCHOR , sal_False , & pItem ) )
{
aSet . Put ( * pItem ) ;
: : lcl_ChkAndSetNewAnchor ( * pFly , aSet ) ;
}
2003-04-01 14:22:09 +00:00
}
}
2004-11-09 11:31:53 +00:00
// <--
2003-04-01 14:22:09 +00:00
2000-09-18 23:08:29 +00:00
pFmt - > GetDoc ( ) - > SetFlyFrmAttr ( * pFmt , aSet ) ;
2001-03-12 09:00:47 +00:00
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_CLSID = = pEntry - > nWID | | FN_UNO_STREAM_NAME = = pEntry - > nWID )
2003-04-17 13:43:12 +00:00
{
throw lang : : IllegalArgumentException ( ) ;
}
2000-09-18 23:08:29 +00:00
else
2008-06-13 09:31:31 +00:00
pFmt - > SetFmtAttr ( aSet ) ;
2000-09-18 23:08:29 +00:00
}
}
else if ( IsDescriptor ( ) )
2001-10-15 09:06:21 +00:00
{
2009-06-03 11:26:39 +00:00
pProps - > SetProperty ( pEntry - > nWID , pEntry - > nMemberId , aValue ) ;
if ( FN_UNO_FRAME_STYLE_NAME = = pEntry - > nWID )
2001-10-15 09:06:21 +00:00
{
2001-10-15 12:54:21 +00:00
OUString sStyleName ;
aValue > > = sStyleName ;
try
{
2007-06-05 16:33:19 +00:00
uno : : Any aAny = mxStyleFamily - > getByName ( sStyleName ) ;
2001-10-15 12:54:21 +00:00
aAny > > = mxStyleData ;
}
2007-06-05 16:33:19 +00:00
catch ( container : : NoSuchElementException const & )
2001-10-15 12:54:21 +00:00
{
}
2009-06-03 11:26:39 +00:00
catch ( lang : : WrappedTargetException const & )
2001-10-15 12:54:21 +00:00
{
}
2007-06-05 16:33:19 +00:00
catch ( uno : : RuntimeException const & )
2001-10-15 12:54:21 +00:00
{
}
2001-10-15 09:06:21 +00:00
}
}
2000-09-18 23:08:29 +00:00
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
}
uno : : Any SwXFrame : : getPropertyValue ( const OUString & rPropertyName )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
uno : : Any aAny ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
2009-06-03 11:26:39 +00:00
const SfxItemPropertySimpleEntry * pEntry = m_pPropSet - > getPropertyMap ( ) - > getByName ( rPropertyName ) ;
if ( ! pEntry )
2007-06-05 16:33:19 +00:00
throw beans : : UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Unknown property: " ) ) + rPropertyName , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2001-11-28 19:13:57 +00:00
2009-06-03 11:26:39 +00:00
if ( FN_UNO_ANCHOR_TYPES = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
2007-06-05 16:33:19 +00:00
uno : : Sequence < text : : TextContentAnchorType > aTypes ( 5 ) ;
text : : TextContentAnchorType * pArray = aTypes . getArray ( ) ;
pArray [ 0 ] = text : : TextContentAnchorType_AT_PARAGRAPH ;
pArray [ 1 ] = text : : TextContentAnchorType_AS_CHARACTER ;
pArray [ 2 ] = text : : TextContentAnchorType_AT_PAGE ;
pArray [ 3 ] = text : : TextContentAnchorType_AT_FRAME ;
pArray [ 4 ] = text : : TextContentAnchorType_AT_CHARACTER ;
aAny . setValue ( & aTypes , : : getCppuType ( static_cast < uno : : Sequence < text : : TextContentAnchorType > * > ( 0 ) ) ) ;
2000-09-18 23:08:29 +00:00
}
else if ( pFmt )
{
2003-03-27 14:45:43 +00:00
if ( ( ( eType = = FLYCNTTYPE_GRF ) | | ( eType = = FLYCNTTYPE_OLE ) ) & &
2009-06-03 11:26:39 +00:00
pEntry & &
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
( isGRFATR ( pEntry - > nWID ) | |
2009-06-03 11:26:39 +00:00
pEntry - > nWID = = FN_PARAM_COUNTOUR_PP | |
pEntry - > nWID = = FN_UNO_IS_AUTOMATIC_CONTOUR | |
pEntry - > nWID = = FN_UNO_IS_PIXEL_CONTOUR ) )
2000-09-18 23:08:29 +00:00
{
const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwNoTxtNode * pNoTxt = aIdx . GetNode ( ) . GetNoTxtNode ( ) ;
2009-06-03 11:26:39 +00:00
if ( pEntry - > nWID = = FN_PARAM_COUNTOUR_PP )
2000-10-24 13:26:57 +00:00
{
2001-05-04 07:41:21 +00:00
PolyPolygon aContour ;
if ( pNoTxt - > GetContourAPI ( aContour ) )
2000-10-24 13:26:57 +00:00
{
2007-06-05 16:33:19 +00:00
drawing : : PointSequenceSequence aPtSeq ( aContour . Count ( ) ) ;
drawing : : PointSequence * pPSeq = aPtSeq . getArray ( ) ;
2001-05-04 07:41:21 +00:00
for ( USHORT i = 0 ; i < aContour . Count ( ) ; i + + )
2000-10-24 13:26:57 +00:00
{
2001-05-04 07:41:21 +00:00
const Polygon & rPoly = aContour . GetObject ( i ) ;
2000-10-24 13:26:57 +00:00
pPSeq [ i ] . realloc ( rPoly . GetSize ( ) ) ;
awt : : Point * pPoints = pPSeq [ i ] . getArray ( ) ;
for ( USHORT j = 0 ; j < rPoly . GetSize ( ) ; j + + )
{
const Point & rPoint = rPoly . GetPoint ( j ) ;
2001-05-04 07:41:21 +00:00
pPoints [ j ] . X = rPoint . X ( ) ;
pPoints [ j ] . Y = rPoint . Y ( ) ;
2000-10-24 13:26:57 +00:00
}
}
aAny < < = aPtSeq ;
}
}
2009-06-03 11:26:39 +00:00
else if ( pEntry - > nWID = = FN_UNO_IS_AUTOMATIC_CONTOUR )
2001-05-04 07:41:21 +00:00
{
BOOL bValue = pNoTxt - > HasAutomaticContour ( ) ;
aAny . setValue ( & bValue , : : getBooleanCppuType ( ) ) ;
}
2009-06-03 11:26:39 +00:00
else if ( pEntry - > nWID = = FN_UNO_IS_PIXEL_CONTOUR )
2001-05-04 07:41:21 +00:00
{
BOOL bValue = pNoTxt - > IsPixelContour ( ) ;
aAny . setValue ( & bValue , : : getBooleanCppuType ( ) ) ;
}
2000-10-24 13:26:57 +00:00
else
{
SfxItemSet aSet ( pNoTxt - > GetSwAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
m_pPropSet - > getPropertyValue ( * pEntry , aSet , aAny ) ;
2000-10-24 13:26:57 +00:00
}
2000-09-18 23:08:29 +00:00
}
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_GRAPHIC_U_R_L = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
2000-11-29 13:57:24 +00:00
String sGrfName ;
const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
SwGrfNode * pGrfNode = aIdx . GetNode ( ) . GetGrfNode ( ) ;
if ( ! pGrfNode )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-11-29 13:57:24 +00:00
if ( pGrfNode - > IsGrfLink ( ) )
{
pFmt - > GetDoc ( ) - > GetGrfNms ( * ( SwFlyFrmFmt * ) pFmt , & sGrfName , 0 ) ;
}
else
{
String sPrefix ( RTL_CONSTASCII_STRINGPARAM ( sGraphicObjectProtocol ) ) ;
String sId ( pGrfNode - > GetGrfObj ( ) . GetUniqueID ( ) ,
RTL_TEXTENCODING_ASCII_US ) ;
( sGrfName = sPrefix ) + = sId ;
}
}
aAny < < = OUString ( sGrfName ) ;
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_GRAPHIC_FILTER = = pEntry - > nWID )
2000-11-29 13:57:24 +00:00
{
String sFltName ;
pFmt - > GetDoc ( ) - > GetGrfNms ( * ( SwFlyFrmFmt * ) pFmt , 0 , & sFltName ) ;
2000-09-18 23:08:29 +00:00
aAny < < = OUString ( sFltName ) ;
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_GRAPHIC = = pEntry - > nWID )
2007-07-18 11:57:02 +00:00
{
const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwGrfNode * pGrfNode = aIdx . GetNode ( ) . GetGrfNode ( ) ;
if ( ! pGrfNode )
throw uno : : RuntimeException ( ) ;
aAny < < = pGrfNode - > GetGrf ( ) . GetXGraphic ( ) ;
}
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_FRAME_STYLE_NAME = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
2007-09-27 08:36:43 +00:00
aAny < < = OUString ( SwStyleNameMapper : : GetProgName ( pFmt - > DerivedFrom ( ) - > GetName ( ) , nsSwGetPoolIdFromName : : GET_POOLID_FRMFMT ) ) ;
2000-09-18 23:08:29 +00:00
}
2009-08-27 11:59:20 +00:00
// --> OD 2009-07-13 #i73249#
// Attribute AlternativeText was never published.
// Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
// else if(eType != FLYCNTTYPE_FRM &&
// FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID)
// {
// const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
// if(pIdx)
// {
// SwNodeIndex aIdx(*pIdx, 1);
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
// aAny <<= OUString(pNoTxt->GetAlternateText());
// }
// }
else if ( FN_UNO_TITLE = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
2009-08-27 11:59:20 +00:00
SwFlyFrmFmt * pFlyFmt = dynamic_cast < SwFlyFrmFmt * > ( pFmt ) ;
ASSERT ( pFmt ,
" unexpected type of <pFmt> --> crash " ) ;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject ( pFlyFmt ) ;
aAny < < = OUString ( pFlyFmt - > GetObjTitle ( ) ) ;
2008-01-30 06:59:10 +00:00
}
2009-08-27 11:59:20 +00:00
// New attribute Description
else if ( FN_UNO_DESCRIPTION = = pEntry - > nWID )
{
SwFlyFrmFmt * pFlyFmt = dynamic_cast < SwFlyFrmFmt * > ( pFmt ) ;
ASSERT ( pFmt ,
" unexpected type of <pFmt> --> crash " ) ;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject ( pFlyFmt ) ;
aAny < < = OUString ( pFlyFmt - > GetObjDescription ( ) ) ;
}
// <--
2008-01-30 06:59:10 +00:00
else if ( eType = = FLYCNTTYPE_GRF & &
( rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_ACTUAL_SIZE ) ) ) )
{
const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwNoTxtNode * pNoTxt = aIdx . GetNode ( ) . GetNoTxtNode ( ) ;
Size aActSize = ( ( SwGrfNode * ) pNoTxt ) - > GetTwipSize ( ) ;
awt : : Size aTmp ;
aTmp . Width = TWIP_TO_MM100 ( aActSize . Width ( ) ) ;
aTmp . Height = TWIP_TO_MM100 ( aActSize . Height ( ) ) ;
aAny . setValue ( & aTmp , : : getCppuType ( static_cast < const awt : : Size * > ( 0 ) ) ) ;
2000-09-18 23:08:29 +00:00
}
}
2009-06-03 11:26:39 +00:00
else if ( FN_PARAM_LINK_DISPLAY_NAME = = pEntry - > nWID )
2000-09-18 23:08:29 +00:00
{
aAny < < = OUString ( pFmt - > GetName ( ) ) ;
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_Z_ORDER = = pEntry - > nWID )
2000-11-27 10:13:17 +00:00
{
2000-12-06 13:25:52 +00:00
const SdrObject * pObj = pFmt - > FindRealSdrObject ( ) ;
if ( pObj )
2000-11-27 10:13:17 +00:00
{
aAny < < = ( sal_Int32 ) pObj - > GetOrdNum ( ) ;
}
}
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_CLSID = = pEntry - > nWID | | FN_UNO_MODEL = = pEntry - > nWID | |
FN_UNO_COMPONENT = = pEntry - > nWID | | FN_UNO_STREAM_NAME = = pEntry - > nWID )
2003-04-17 13:43:12 +00:00
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
const SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
DBG_ASSERT ( pCnt - > GetCntntIdx ( ) & &
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - >
2008-11-10 15:06:12 +00:00
GetIndex ( ) + 1 ] - > GetOLENode ( ) , " kein OLE-Node? " ) ;
2003-04-17 13:43:12 +00:00
SwOLENode * pOleNode = pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( )
- > GetIndex ( ) + 1 ] - > GetOLENode ( ) ;
2004-10-04 18:13:38 +00:00
uno : : Reference < embed : : XEmbeddedObject > xIP = pOleNode - > GetOLEObj ( ) . GetOleRef ( ) ;
2003-04-17 13:43:12 +00:00
OUString aHexCLSID ;
{
2004-11-26 15:27:27 +00:00
SvGlobalName aClassName ( xIP - > getClassID ( ) ) ;
2003-04-17 13:43:12 +00:00
aHexCLSID = aClassName . GetHexName ( ) ;
2009-06-03 11:26:39 +00:00
if ( FN_UNO_CLSID ! = pEntry - > nWID )
2003-04-17 13:43:12 +00:00
{
2004-11-26 15:27:27 +00:00
if ( svt : : EmbeddedObjectRef : : TryRunningState ( xIP ) )
{
uno : : Reference < lang : : XComponent > xComp ( xIP - > getComponent ( ) , uno : : UNO_QUERY ) ;
uno : : Reference < frame : : XModel > xModel ( xComp , uno : : UNO_QUERY ) ;
if ( xModel . is ( ) )
aAny < < = xModel ;
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_COMPONENT = = pEntry - > nWID )
2004-11-26 15:27:27 +00:00
aAny < < = xComp ;
}
2003-04-17 13:43:12 +00:00
}
}
2004-10-04 18:13:38 +00:00
2009-06-03 11:26:39 +00:00
if ( FN_UNO_CLSID = = pEntry - > nWID )
2003-04-17 13:43:12 +00:00
aAny < < = aHexCLSID ;
2009-06-03 11:26:39 +00:00
else if ( FN_UNO_STREAM_NAME = = pEntry - > nWID )
2008-07-01 10:27:33 +00:00
{
aAny < < = : : rtl : : OUString ( pOleNode - > GetOLEObj ( ) . GetCurrentPersistName ( ) ) ;
}
2003-04-17 13:43:12 +00:00
}
2009-06-03 11:26:39 +00:00
else if ( WID_LAYOUT_SIZE = = pEntry - > nWID )
2006-07-14 07:31:03 +00:00
{
2007-01-30 14:22:59 +00:00
// format document completely in order to get correct value
2007-11-01 10:50:20 +00:00
pFmt - > GetDoc ( ) - > GetEditShell ( ) - > CalcLayout ( ) ;
2007-01-30 14:22:59 +00:00
SwClientIter aIter ( * pFmt ) ;
SwClient * pC = aIter . First ( TYPE ( SwFrm ) ) ;
if ( pC )
2006-07-14 07:31:03 +00:00
{
2007-01-30 14:22:59 +00:00
SwFrm * pTmpFrm = static_cast < SwFrm * > ( pC ) ;
DBG_ASSERT ( pTmpFrm - > IsValid ( ) , " frame not valid " ) ;
const SwRect & rRect = pTmpFrm - > Frm ( ) ;
Size aMM100Size = OutputDevice : : LogicToLogic (
Size ( rRect . Width ( ) , rRect . Height ( ) ) ,
MapMode ( MAP_TWIP ) , MapMode ( MAP_100TH_MM ) ) ;
aAny < < = awt : : Size ( aMM100Size . Width ( ) , aMM100Size . Height ( ) ) ;
2006-07-14 07:31:03 +00:00
}
}
2000-09-18 23:08:29 +00:00
else
{
const SwAttrSet & rSet = pFmt - > GetAttrSet ( ) ;
2009-06-03 11:26:39 +00:00
m_pPropSet - > getPropertyValue ( * pEntry , rSet , aAny ) ;
2000-09-18 23:08:29 +00:00
}
}
else if ( IsDescriptor ( ) )
{
2009-06-03 11:26:39 +00:00
if ( ! m_pDoc )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2009-06-03 11:26:39 +00:00
if ( WID_LAYOUT_SIZE ! = pEntry - > nWID ) // there is no LayoutSize in a descriptor
2006-07-14 07:31:03 +00:00
{
2009-06-03 11:26:39 +00:00
const uno : : Any * pAny = 0 ;
if ( ! pProps - > GetProperty ( pEntry - > nWID , pEntry - > nMemberId , pAny ) )
aAny = mxStyleData - > getPropertyValue ( rPropertyName ) ;
2006-07-14 07:31:03 +00:00
else if ( pAny )
aAny = * pAny ;
}
2000-09-18 23:08:29 +00:00
}
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return aAny ;
}
2007-09-27 08:36:43 +00:00
void SwXFrame : : addPropertyChangeListener ( const OUString & /*PropertyName*/ ,
const uno : : Reference < beans : : XPropertyChangeListener > & /*aListener*/ )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2008-11-10 15:06:12 +00:00
DBG_WARNING ( " not implemented " ) ;
2000-09-18 23:08:29 +00:00
}
2007-09-27 08:36:43 +00:00
void SwXFrame : : removePropertyChangeListener ( const OUString & /*PropertyName*/ ,
const uno : : Reference < beans : : XPropertyChangeListener > & /*aListener*/ )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2008-11-10 15:06:12 +00:00
DBG_WARNING ( " not implemented " ) ;
2000-09-18 23:08:29 +00:00
}
2007-09-27 08:36:43 +00:00
void SwXFrame : : addVetoableChangeListener ( const OUString & /*PropertyName*/ ,
const uno : : Reference < beans : : XVetoableChangeListener > & /*aListener*/ )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2008-11-10 15:06:12 +00:00
DBG_WARNING ( " not implemented " ) ;
2000-09-18 23:08:29 +00:00
}
void SwXFrame : : removeVetoableChangeListener (
2007-09-27 08:36:43 +00:00
const OUString & /*PropertyName*/ , const uno : : Reference < beans : : XVetoableChangeListener > & /*aListener*/ )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2008-11-10 15:06:12 +00:00
DBG_WARNING ( " not implemented " ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
beans : : PropertyState SwXFrame : : getPropertyState ( const OUString & rPropertyName )
throw ( beans : : UnknownPropertyException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : Sequence < OUString > aPropertyNames ( 1 ) ;
2000-09-18 23:08:29 +00:00
OUString * pNames = aPropertyNames . getArray ( ) ;
pNames [ 0 ] = rPropertyName ;
2007-06-05 16:33:19 +00:00
uno : : Sequence < beans : : PropertyState > aStates = getPropertyStates ( aPropertyNames ) ;
2000-09-18 23:08:29 +00:00
return aStates . getConstArray ( ) [ 0 ] ;
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < beans : : PropertyState > SwXFrame : : getPropertyStates (
const uno : : Sequence < OUString > & aPropertyNames )
throw ( beans : : UnknownPropertyException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : Sequence < beans : : PropertyState > aStates ( aPropertyNames . getLength ( ) ) ;
beans : : PropertyState * pStates = aStates . getArray ( ) ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
const OUString * pNames = aPropertyNames . getConstArray ( ) ;
const SwAttrSet & rFmtSet = pFmt - > GetAttrSet ( ) ;
for ( int i = 0 ; i < aPropertyNames . getLength ( ) ; i + + )
{
2009-06-03 11:26:39 +00:00
const SfxItemPropertySimpleEntry * pEntry = m_pPropSet - > getPropertyMap ( ) - > getByName ( pNames [ i ] ) ;
if ( ! pEntry )
2007-06-05 16:33:19 +00:00
throw beans : : UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Unknown property: " ) ) + pNames [ i ] , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2001-11-28 19:13:57 +00:00
2009-06-03 11:26:39 +00:00
if ( pEntry - > nWID = = FN_UNO_ANCHOR_TYPES | |
pEntry - > nWID = = FN_PARAM_LINK_DISPLAY_NAME | |
FN_UNO_FRAME_STYLE_NAME = = pEntry - > nWID | |
FN_UNO_GRAPHIC_U_R_L = = pEntry - > nWID | |
FN_UNO_GRAPHIC_FILTER = = pEntry - > nWID | |
FN_UNO_ACTUAL_SIZE = = pEntry - > nWID | |
FN_UNO_ALTERNATIVE_TEXT = = pEntry - > nWID )
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
{
2007-06-05 16:33:19 +00:00
pStates [ i ] = beans : : PropertyState_DIRECT_VALUE ;
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
}
2000-09-18 23:08:29 +00:00
else
{
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
if ( ( eType = = FLYCNTTYPE_GRF ) & &
pEntry & & isGRFATR ( pEntry - > nWID ) )
2000-09-18 23:08:29 +00:00
{
const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwNoTxtNode * pNoTxt = aIdx . GetNode ( ) . GetNoTxtNode ( ) ;
SfxItemSet aSet ( pNoTxt - > GetSwAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
aSet . GetItemState ( pEntry - > nWID ) ;
if ( SFX_ITEM_SET = = aSet . GetItemState ( pEntry - > nWID , FALSE ) )
2000-09-18 23:08:29 +00:00
pStates [ i ] = beans : : PropertyState_DIRECT_VALUE ;
}
}
else
{
2009-06-03 11:26:39 +00:00
if ( SFX_ITEM_SET = = rFmtSet . GetItemState ( pEntry - > nWID , FALSE ) )
2000-09-18 23:08:29 +00:00
pStates [ i ] = beans : : PropertyState_DIRECT_VALUE ;
else
pStates [ i ] = beans : : PropertyState_DEFAULT_VALUE ;
}
}
}
}
else if ( IsDescriptor ( ) )
{
for ( int i = 0 ; i < aPropertyNames . getLength ( ) ; i + + )
2007-06-05 16:33:19 +00:00
pStates [ i ] = beans : : PropertyState_DIRECT_VALUE ;
2000-09-18 23:08:29 +00:00
}
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return aStates ;
}
void SwXFrame : : setPropertyToDefault ( const OUString & rPropertyName )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
2009-06-03 11:26:39 +00:00
const SfxItemPropertySimpleEntry * pEntry = m_pPropSet - > getPropertyMap ( ) - > getByName ( rPropertyName ) ;
if ( ! pEntry )
2007-06-05 16:33:19 +00:00
throw beans : : UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Unknown property: " ) ) + rPropertyName , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2009-06-03 11:26:39 +00:00
if ( pEntry - > nFlags & beans : : PropertyAttribute : : READONLY )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " setPropertyToDefault: property is read-only: " ) ) + rPropertyName , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2001-10-16 10:58:14 +00:00
2000-09-18 23:08:29 +00:00
BOOL bNextFrame ;
2009-06-03 11:26:39 +00:00
if ( pEntry - > nWID & &
pEntry - > nWID ! = FN_UNO_ANCHOR_TYPES & &
pEntry - > nWID ! = FN_PARAM_LINK_DISPLAY_NAME )
2000-09-18 23:08:29 +00:00
{
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
if ( ( eType = = FLYCNTTYPE_GRF ) & & isGRFATR ( pEntry - > nWID ) )
2000-09-18 23:08:29 +00:00
{
const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwNoTxtNode * pNoTxt = aIdx . GetNode ( ) . GetNoTxtNode ( ) ;
{
SfxItemSet aSet ( pNoTxt - > GetSwAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
aSet . ClearItem ( pEntry - > nWID ) ;
2000-09-18 23:08:29 +00:00
pNoTxt - > SetAttr ( aSet ) ;
}
}
}
2009-08-27 11:59:20 +00:00
// --> OD 2009-07-13 #i73249#
// Attribute AlternativeText was never published.
// Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
// else if( eType != FLYCNTTYPE_FRM && FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID )
// {
// const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
// if(pIdx)
// {
// SwNodeIndex aIdx(*pIdx, 1);
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
// pNoTxt->SetAlternateText(aEmptyStr);
// }
// }
// New attribute Title
else if ( FN_UNO_TITLE = = pEntry - > nWID )
2008-01-29 08:23:32 +00:00
{
2009-08-27 11:59:20 +00:00
SwFlyFrmFmt * pFlyFmt = dynamic_cast < SwFlyFrmFmt * > ( pFmt ) ;
ASSERT ( pFmt ,
" unexpected type of <pFmt> --> crash " ) ;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject ( pFlyFmt ) ;
pFlyFmt - > GetDoc ( ) - > SetFlyFrmTitle ( * ( pFlyFmt ) , aEmptyStr ) ;
2008-01-29 08:23:32 +00:00
}
2009-08-27 11:59:20 +00:00
// New attribute Description
else if ( FN_UNO_DESCRIPTION = = pEntry - > nWID )
{
SwFlyFrmFmt * pFlyFmt = dynamic_cast < SwFlyFrmFmt * > ( pFmt ) ;
ASSERT ( pFmt ,
" unexpected type of <pFmt> --> crash " ) ;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject ( pFlyFmt ) ;
pFlyFmt - > GetDoc ( ) - > SetFlyFrmDescription ( * ( pFlyFmt ) , aEmptyStr ) ;
}
// <--
2000-09-18 23:08:29 +00:00
else
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
SfxItemSet aSet ( pDoc - > GetAttrPool ( ) ,
RES_FRMATR_BEGIN , RES_FRMATR_END - 1 ) ;
aSet . SetParent ( & pFmt - > GetAttrSet ( ) ) ;
2009-06-03 11:26:39 +00:00
aSet . ClearItem ( pEntry - > nWID ) ;
2001-06-13 11:03:44 +00:00
if ( ! rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_ANCHOR_TYPE ) ) )
2008-06-13 09:31:31 +00:00
pFmt - > SetFmtAttr ( aSet ) ;
2000-09-18 23:08:29 +00:00
}
}
2001-06-13 11:03:44 +00:00
else if ( 0 ! = ( bNextFrame = ( rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_CHAIN_NEXT_NAME ) ) ) )
| | rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_CHAIN_PREV_NAME ) ) )
2000-09-18 23:08:29 +00:00
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
if ( bNextFrame )
pDoc - > Unchain ( * pFmt ) ;
else
{
SwFmtChain aChain ( pFmt - > GetChain ( ) ) ;
SwFrmFmt * pPrev = aChain . GetPrev ( ) ;
if ( pPrev )
pDoc - > Unchain ( * pPrev ) ;
}
}
}
else if ( ! IsDescriptor ( ) )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
uno : : Any SwXFrame : : getPropertyDefault ( const OUString & rPropertyName )
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : Any aRet ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
2009-06-03 11:26:39 +00:00
const SfxItemPropertySimpleEntry * pEntry = m_pPropSet - > getPropertyMap ( ) - > getByName ( rPropertyName ) ;
if ( pEntry )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
if ( pEntry - > nWID < RES_FRMATR_END )
2000-09-18 23:08:29 +00:00
{
const SfxPoolItem & rDefItem =
2009-06-03 11:26:39 +00:00
pFmt - > GetDoc ( ) - > GetAttrPool ( ) . GetDefaultItem ( pEntry - > nWID ) ;
rDefItem . QueryValue ( aRet , pEntry - > nMemberId ) ;
2000-09-18 23:08:29 +00:00
}
}
else
2007-06-05 16:33:19 +00:00
throw beans : : UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Unknown property: " ) ) + rPropertyName , static_cast < cppu : : OWeakObject * > ( this ) ) ;
2000-09-18 23:08:29 +00:00
}
else if ( ! IsDescriptor ( ) )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return aRet ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
void SwXFrame : : addEventListener ( const uno : : Reference < lang : : XEventListener > & aListener ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
if ( ! GetRegisteredIn ( ) )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
aLstnrCntnr . AddListener ( aListener ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
void SwXFrame : : removeEventListener ( const uno : : Reference < lang : : XEventListener > & aListener ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
if ( ! GetRegisteredIn ( ) | | ! aLstnrCntnr . RemoveListener ( aListener ) )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
}
void SwXFrame : : Modify ( SfxPoolItem * pOld , SfxPoolItem * pNew )
{
ClientModify ( this , pOld , pNew ) ;
if ( ! GetRegisteredIn ( ) )
2001-10-15 09:06:21 +00:00
{
mxStyleData . clear ( ) ;
mxStyleFamily . clear ( ) ;
2009-06-03 11:26:39 +00:00
m_pDoc = 0 ;
2000-09-18 23:08:29 +00:00
aLstnrCntnr . Disposing ( ) ;
2001-10-15 09:06:21 +00:00
}
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
void SwXFrame : : dispose ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
2003-09-29 14:05:47 +00:00
if ( pFmt )
2000-09-18 23:08:29 +00:00
{
2003-05-08 07:50:57 +00:00
SdrObject * pObj = pFmt - > FindSdrObject ( ) ;
2003-09-29 14:05:47 +00:00
// OD 11.09.2003 #112039# - add condition to perform delete of
// format/anchor sign, not only if the object is inserted, but also
// if a contact object is registered, which isn't in the destruction.
if ( pObj & &
( pObj - > IsInserted ( ) | |
( pObj - > GetUserCall ( ) & &
! static_cast < SwContact * > ( pObj - > GetUserCall ( ) ) - > IsInDTOR ( ) ) ) )
2003-05-08 07:50:57 +00:00
{
2010-01-05 16:37:41 +01:00
if ( pFmt - > GetAnchor ( ) . GetAnchorId ( ) = = FLY_AS_CHAR )
2003-05-22 07:44:15 +00:00
{
const SwPosition & rPos = * ( pFmt - > GetAnchor ( ) . GetCntntAnchor ( ) ) ;
SwTxtNode * pTxtNode = rPos . nNode . GetNode ( ) . GetTxtNode ( ) ;
const xub_StrLen nIdx = rPos . nContent . GetIndex ( ) ;
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
pTxtNode - > DeleteAttributes ( RES_TXTATR_FLYCNT , nIdx , nIdx ) ;
2003-05-22 07:44:15 +00:00
}
else
pFmt - > GetDoc ( ) - > DelLayoutFmt ( pFmt ) ;
2003-05-08 07:50:57 +00:00
}
2000-09-18 23:08:29 +00:00
}
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextRange > SwXFrame : : getAnchor ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextRange > aRef ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
2001-08-01 11:51:14 +00:00
const SwFmtAnchor & rAnchor = pFmt - > GetAnchor ( ) ;
// return an anchor for non-page bound frames
// and for page bound frames that have a page no == NULL and a content position
2010-01-05 16:37:41 +01:00
if ( ( rAnchor . GetAnchorId ( ) ! = FLY_AT_PAGE ) | |
2001-08-01 11:51:14 +00:00
( rAnchor . GetCntntAnchor ( ) & & ! rAnchor . GetPageNum ( ) ) )
2000-09-18 23:08:29 +00:00
{
2001-08-01 11:51:14 +00:00
const SwPosition & rPos = * ( rAnchor . GetCntntAnchor ( ) ) ;
2010-01-08 17:13:53 +01:00
aRef = SwXTextRange : : CreateXTextRange ( * pFmt - > GetDoc ( ) , rPos , 0 ) ;
2000-09-18 23:08:29 +00:00
}
}
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return aRef ;
}
2010-10-13 16:05:00 +05:30
2000-09-18 23:08:29 +00:00
void SwXFrame : : ResetDescriptor ( )
{
bIsDescriptor = sal_False ;
2001-10-15 09:06:21 +00:00
mxStyleData . clear ( ) ;
mxStyleFamily . clear ( ) ;
2000-09-18 23:08:29 +00:00
DELETEZ ( pProps ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
void SwXFrame : : attachToRange ( const uno : : Reference < text : : XTextRange > & xTextRange )
throw ( lang : : IllegalArgumentException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2004-06-17 15:04:10 +00:00
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 23:08:29 +00:00
if ( ! IsDescriptor ( ) )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
uno : : Reference < lang : : XUnoTunnel > xRangeTunnel ( xTextRange , uno : : UNO_QUERY ) ;
2000-09-18 23:08:29 +00:00
SwXTextRange * pRange = 0 ;
2003-04-01 14:34:01 +00:00
OTextCursorHelper * pCursor = 0 ;
2000-09-18 23:08:29 +00:00
if ( xRangeTunnel . is ( ) )
{
2007-09-27 08:36:43 +00:00
pRange = reinterpret_cast < SwXTextRange * > (
sal : : static_int_cast < sal_IntPtr > ( xRangeTunnel - > getSomething ( SwXTextRange : : getUnoTunnelId ( ) ) ) ) ;
pCursor = reinterpret_cast < OTextCursorHelper * > (
sal : : static_int_cast < sal_IntPtr > ( xRangeTunnel - > getSomething ( OTextCursorHelper : : getUnoTunnelId ( ) ) ) ) ;
2000-09-18 23:08:29 +00:00
}
SwDoc * pDoc = pRange ? ( SwDoc * ) pRange - > GetDoc ( ) : pCursor ? ( SwDoc * ) pCursor - > GetDoc ( ) : 0 ;
if ( pDoc )
{
SwUnoInternalPaM aIntPam ( * pDoc ) ;
//das muss jetzt sal_True liefern
2010-01-08 17:13:53 +01:00
: : sw : : XTextRangeToSwPaM ( aIntPam , xTextRange ) ;
2000-09-18 23:08:29 +00:00
SwNode & rNode = pDoc - > GetNodes ( ) . GetEndOfContent ( ) ;
SwPaM aPam ( rNode ) ;
aPam . Move ( fnMoveBackward , fnGoDoc ) ;
static sal_uInt16 __READONLY_DATA aFrmAttrRange [ ] =
{
RES_FRMATR_BEGIN , RES_FRMATR_END - 1 ,
SID_ATTR_BORDER_INNER , SID_ATTR_BORDER_INNER ,
2001-07-09 04:50:21 +00:00
RES_UNKNOWNATR_CONTAINER , RES_UNKNOWNATR_CONTAINER ,
2000-09-18 23:08:29 +00:00
0
} ;
static sal_uInt16 __READONLY_DATA aGrAttrRange [ ] =
{
RES_GRFATR_BEGIN , RES_GRFATR_END - 1 ,
0
} ;
SfxItemSet aGrSet ( pDoc - > GetAttrPool ( ) , aGrAttrRange ) ;
SfxItemSet aFrmSet ( pDoc - > GetAttrPool ( ) , aFrmAttrRange ) ;
//jetzt muessen die passenden Items in den Set
2001-05-28 12:29:57 +00:00
sal_Bool bSizeFound ;
2001-10-23 16:40:05 +00:00
if ( ! pProps - > AnyToItemSet ( pDoc , aFrmSet , aGrSet , bSizeFound ) )
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2000-09-18 23:08:29 +00:00
//der TextRange wird einzeln behandelt
* aPam . GetPoint ( ) = * aIntPam . GetPoint ( ) ;
if ( aIntPam . HasMark ( ) )
{
aPam . SetMark ( ) ;
* aPam . GetMark ( ) = * aIntPam . GetMark ( ) ;
}
const SfxPoolItem * pItem ;
2010-01-05 16:37:41 +01:00
RndStdIds eAnchorId = FLY_AT_PARA ;
2001-03-13 14:50:56 +00:00
if ( SFX_ITEM_SET = = aFrmSet . GetItemState ( RES_ANCHOR , sal_False , & pItem ) )
2000-09-18 23:08:29 +00:00
{
2007-07-18 11:57:02 +00:00
eAnchorId = ( ( const SwFmtAnchor * ) pItem ) - > GetAnchorId ( ) ;
if ( FLY_AT_FLY = = eAnchorId & &
2001-03-13 14:50:56 +00:00
! aPam . GetNode ( ) - > FindFlyStartNode ( ) )
{
//rahmengebunden geht nur dort, wo ein Rahmen ist!
2010-01-05 16:37:41 +01:00
SwFmtAnchor aAnchor ( FLY_AT_PARA ) ;
2001-03-13 14:50:56 +00:00
aFrmSet . Put ( aAnchor ) ;
}
2010-01-05 16:37:41 +01:00
else if ( ( FLY_AT_PAGE = = eAnchorId ) & &
2001-03-13 14:50:56 +00:00
0 = = ( ( const SwFmtAnchor * ) pItem ) - > GetPageNum ( ) )
{
SwFmtAnchor aAnchor ( * ( ( const SwFmtAnchor * ) pItem ) ) ;
aAnchor . SetAnchor ( aPam . GetPoint ( ) ) ;
aFrmSet . Put ( aAnchor ) ;
}
2000-09-18 23:08:29 +00:00
}
2001-03-13 14:50:56 +00:00
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pStyle ;
2000-12-20 06:55:54 +00:00
SwFrmFmt * pParentFrmFmt = 0 ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_UNO_FRAME_STYLE_NAME , 0 , pStyle ) )
2000-12-20 06:55:54 +00:00
pParentFrmFmt = lcl_GetFrmFmt ( * pStyle , pDoc ) ;
2000-09-18 23:08:29 +00:00
SwFlyFrmFmt * pFmt = 0 ;
if ( eType = = FLYCNTTYPE_FRM )
{
UnoActionContext aCont ( pDoc ) ;
2007-07-18 11:57:02 +00:00
if ( m_pCopySource )
{
SwFmtAnchor * pAnchorItem = 0 ;
// the frame is inserted bound to page
// to prevent conflicts if the to-be-anchored position is part of the to-be-copied text
2010-01-05 16:37:41 +01:00
if ( eAnchorId ! = FLY_AT_PAGE )
2007-07-18 11:57:02 +00:00
{
pAnchorItem = static_cast < SwFmtAnchor * > ( aFrmSet . Get ( RES_ANCHOR ) . Clone ( ) ) ;
2010-01-05 16:37:41 +01:00
aFrmSet . Put ( SwFmtAnchor ( FLY_AT_PAGE , 1 ) ) ;
2007-07-18 11:57:02 +00:00
}
pFmt = pDoc - > MakeFlyAndMove ( * m_pCopySource , aFrmSet ,
0 ,
pParentFrmFmt ) ;
if ( pAnchorItem & & pFmt )
{
pFmt - > DelFrms ( ) ;
pAnchorItem - > SetAnchor ( m_pCopySource - > Start ( ) ) ;
SfxItemSet aAnchorSet ( pDoc - > GetAttrPool ( ) , RES_ANCHOR , RES_ANCHOR ) ;
aAnchorSet . Put ( * pAnchorItem ) ;
pDoc - > SetFlyFrmAttr ( * pFmt , aAnchorSet ) ;
delete pAnchorItem ;
}
DELETEZ ( m_pCopySource ) ;
}
else
2010-01-05 16:37:41 +01:00
{
pFmt = pDoc - > MakeFlySection ( FLY_AT_PARA , aPam . GetPoint ( ) ,
2000-12-20 06:55:54 +00:00
& aFrmSet , pParentFrmFmt ) ;
2010-01-05 16:37:41 +01:00
}
2000-09-18 23:08:29 +00:00
if ( pFmt )
{
pFmt - > Add ( this ) ;
if ( sName . Len ( ) )
pDoc - > SetFlyName ( ( SwFlyFrmFmt & ) * pFmt , sName ) ;
}
//den SwXText wecken
2009-06-03 11:26:39 +00:00
( ( SwXTextFrame * ) this ) - > SetDoc ( bIsDescriptor ? m_pDoc : GetFrmFmt ( ) - > GetDoc ( ) ) ;
2000-09-18 23:08:29 +00:00
}
else if ( eType = = FLYCNTTYPE_GRF )
{
UnoActionContext aCont ( pDoc ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pGraphicURL ;
2000-09-18 23:08:29 +00:00
String sGraphicURL ;
2000-11-29 13:57:24 +00:00
GraphicObject * pGrfObj = 0 ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_UNO_GRAPHIC_U_R_L , 0 , pGraphicURL ) )
2000-09-18 23:08:29 +00:00
{
OUString uTemp ;
( * pGraphicURL ) > > = uTemp ;
sGraphicURL = String ( uTemp ) ;
2000-11-29 13:57:24 +00:00
if ( sGraphicURL . EqualsAscii ( sPackageProtocol ,
0 , sizeof ( sPackageProtocol ) - 1 ) )
{
2001-03-02 13:08:50 +00:00
pGrfObj = new GraphicObject ;
pGrfObj - > SetUserData ( sGraphicURL ) ;
pGrfObj - > SetSwapState ( ) ;
2000-11-29 13:57:24 +00:00
sGraphicURL . Erase ( ) ;
}
else if ( sGraphicURL . EqualsAscii ( sGraphicObjectProtocol ,
0 , sizeof ( sGraphicObjectProtocol ) - 1 ) )
{
ByteString sId ( sGraphicURL . Copy ( sizeof ( sGraphicObjectProtocol ) - 1 ) ,
RTL_TEXTENCODING_ASCII_US ) ;
pGrfObj = new GraphicObject ( sId ) ;
sGraphicURL . Erase ( ) ;
}
2000-09-18 23:08:29 +00:00
}
2007-07-18 11:57:02 +00:00
Graphic aGraphic ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pGraphic ;
2007-07-18 11:57:02 +00:00
if ( pProps - > GetProperty ( FN_UNO_GRAPHIC , 0 , pGraphic ) )
{
uno : : Reference < graphic : : XGraphic > xGraphic ;
( * pGraphic ) > > = xGraphic ;
aGraphic = Graphic ( xGraphic ) ;
}
2000-09-18 23:08:29 +00:00
String sFltName ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pFilter ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_UNO_GRAPHIC_FILTER , 0 , pFilter ) )
2000-09-18 23:08:29 +00:00
{
OUString uTemp ;
( * pFilter ) > > = uTemp ;
sFltName = String ( uTemp ) ;
}
2000-12-06 10:36:14 +00:00
pFmt =
2000-12-20 06:55:54 +00:00
pGrfObj ? pDoc - > Insert ( aPam , * pGrfObj , & aFrmSet , & aGrSet ,
pParentFrmFmt )
2007-07-18 11:57:02 +00:00
: pDoc - > Insert ( aPam , sGraphicURL , sFltName , & aGraphic ,
2000-12-20 06:55:54 +00:00
& aFrmSet , & aGrSet , pParentFrmFmt ) ;
2000-11-29 13:57:24 +00:00
delete pGrfObj ;
2000-12-06 10:36:14 +00:00
if ( pFmt )
2000-09-18 23:08:29 +00:00
{
2001-05-28 12:29:57 +00:00
SwGrfNode * pGrfNd = pDoc - > GetNodes ( ) [ pFmt - > GetCntnt ( ) . GetCntntIdx ( )
- > GetIndex ( ) + 1 ] - > GetGrfNode ( ) ;
pGrfNd - > SetChgTwipSize ( ! bSizeFound ) ;
2000-12-06 10:36:14 +00:00
pFmt - > Add ( this ) ;
2000-09-18 23:08:29 +00:00
if ( sName . Len ( ) )
2000-12-06 10:36:14 +00:00
pDoc - > SetFlyName ( ( SwFlyFrmFmt & ) * pFmt , sName ) ;
2000-10-24 13:26:57 +00:00
2000-09-18 23:08:29 +00:00
}
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pSurroundContour ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( RES_SURROUND , MID_SURROUND_CONTOUR , pSurroundContour ) )
2001-06-13 11:03:44 +00:00
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_SURROUND_CONTOUR ) ) , * pSurroundContour ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pContourOutside ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( RES_SURROUND , MID_SURROUND_CONTOUROUTSIDE , pContourOutside ) )
2001-06-13 11:03:44 +00:00
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_CONTOUR_OUTSIDE ) ) , * pContourOutside ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pContourPoly ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_PARAM_COUNTOUR_PP , 0 , pContourPoly ) )
2001-06-13 11:03:44 +00:00
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_CONTOUR_POLY_POLYGON ) ) , * pContourPoly ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pPixelContour ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_UNO_IS_PIXEL_CONTOUR , 0 , pPixelContour ) )
2001-06-13 11:03:44 +00:00
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_IS_PIXEL_CONTOUR ) ) , * pPixelContour ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pAutoContour ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_UNO_IS_AUTOMATIC_CONTOUR , 0 , pAutoContour ) )
2001-06-13 11:03:44 +00:00
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_IS_AUTOMATIC_CONTOUR ) ) , * pAutoContour ) ;
2009-08-27 11:59:20 +00:00
// const ::uno::Any* pAltText;
// if(pProps->GetProperty(FN_UNO_ALTERNATIVE_TEXT, 0, pAltText))
// setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_ALTERNATIVE_TEXT)), *pAltText);
2000-09-18 23:08:29 +00:00
}
else
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pCLSID = 0 ;
const : : uno : : Any * pStreamName = 0 ;
2008-07-01 10:27:33 +00:00
if ( ! pProps - > GetProperty ( FN_UNO_CLSID , 0 , pCLSID ) & & ! pProps - > GetProperty ( FN_UNO_STREAM_NAME , 0 , pStreamName ) )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2008-07-01 10:27:33 +00:00
if ( pCLSID )
2003-04-17 13:43:12 +00:00
{
2008-07-01 10:27:33 +00:00
OUString aCLSID ;
SvGlobalName aClassName ;
uno : : Reference < embed : : XEmbeddedObject > xIPObj ;
std : : auto_ptr < comphelper : : EmbeddedObjectContainer > pCnt ;
if ( ( * pCLSID ) > > = aCLSID )
2003-04-17 13:43:12 +00:00
{
2008-07-01 10:27:33 +00:00
if ( ! aClassName . MakeId ( aCLSID ) )
{
lang : : IllegalArgumentException aExcept ;
aExcept . Message = OUString : : createFromAscii ( " CLSID invalid " ) ;
throw aExcept ;
}
pCnt . reset ( new comphelper : : EmbeddedObjectContainer ) ;
: : rtl : : OUString aName ;
xIPObj = pCnt - > CreateEmbeddedObject ( aClassName . GetByteSequence ( ) , aName ) ;
2003-04-17 13:43:12 +00:00
}
2008-07-01 10:27:33 +00:00
if ( xIPObj . is ( ) )
{
//TODO/LATER: MISCSTATUS_RESIZEONPRINTERCHANGE
//if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xIPObj->GetMiscStatus() && pDoc->getPrinter( false ) )
// xIPObj->OnDocumentPrinterChanged( pDoc->getPrinter( false ) );
2004-10-04 18:13:38 +00:00
2008-07-01 10:27:33 +00:00
UnoActionContext aAction ( pDoc ) ;
pDoc - > StartUndo ( UNDO_INSERT , NULL ) ;
if ( ! bSizeFound )
{
//TODO/LATER: from where do I get a ViewAspect? And how do I transport it to the OLENode?
sal_Int64 nAspect = embed : : Aspects : : MSOLE_CONTENT ;
2003-04-17 13:43:12 +00:00
2008-07-01 10:27:33 +00:00
// TODO/LEAN: VisualArea still needs running state
svt : : EmbeddedObjectRef : : TryRunningState ( xIPObj ) ;
2004-10-04 18:13:38 +00:00
2008-07-01 10:27:33 +00:00
// set parent to get correct VisArea(in case of object needing parent printer)
uno : : Reference < container : : XChild > xChild ( xIPObj , uno : : UNO_QUERY ) ;
if ( xChild . is ( ) )
xChild - > setParent ( pDoc - > GetDocShell ( ) - > GetModel ( ) ) ;
2005-04-04 07:22:36 +00:00
2008-07-01 10:27:33 +00:00
//The Size should be suggested by the OLE server if not manually set
MapUnit aRefMap = VCLUnoHelper : : UnoEmbed2VCLMapUnit ( xIPObj - > getMapUnit ( nAspect ) ) ;
awt : : Size aSize ;
try
{
aSize = xIPObj - > getVisualAreaSize ( nAspect ) ;
}
catch ( embed : : NoVisualAreaSizeException & )
{
// the default size will be set later
}
2005-04-04 07:22:36 +00:00
2008-07-01 10:27:33 +00:00
Size aSz ( aSize . Width , aSize . Height ) ;
if ( ! aSz . Width ( ) | | ! aSz . Height ( ) )
{
aSz . Width ( ) = aSz . Height ( ) = 5000 ;
aSz = OutputDevice : : LogicToLogic
( aSz , MapMode ( MAP_100TH_MM ) , aRefMap ) ;
}
MapMode aMyMap ( MAP_TWIP ) ;
aSz = OutputDevice : : LogicToLogic ( aSz , aRefMap , aMyMap ) ;
SwFmtFrmSize aFrmSz ;
aFrmSz . SetSize ( aSz ) ;
aFrmSet . Put ( aFrmSz ) ;
2005-03-15 10:25:26 +00:00
}
2008-07-01 10:27:33 +00:00
SwFlyFrmFmt * pFmt2 = 0 ;
2005-03-15 10:25:26 +00:00
2008-07-01 10:27:33 +00:00
// TODO/LATER: Is it the only possible aspect here?
sal_Int64 nAspect = embed : : Aspects : : MSOLE_CONTENT ;
2008-07-08 07:34:51 +00:00
: : svt : : EmbeddedObjectRef xObjRef ( xIPObj , nAspect ) ;
pFmt2 = pDoc - > Insert ( aPam , xObjRef , & aFrmSet , NULL , NULL ) ;
2008-07-01 10:27:33 +00:00
ASSERT ( pFmt2 , " Doc->Insert(notxt) failed. " ) ;
2003-04-17 13:43:12 +00:00
2008-07-01 10:27:33 +00:00
pDoc - > EndUndo ( UNDO_INSERT , NULL ) ;
pFmt2 - > Add ( this ) ;
if ( sName . Len ( ) )
pDoc - > SetFlyName ( ( SwFlyFrmFmt & ) * pFmt2 , sName ) ;
}
}
else if ( pStreamName )
{
: : rtl : : OUString sStreamName ;
( * pStreamName ) > > = sStreamName ;
pDoc - > StartUndo ( UNDO_INSERT , NULL ) ;
2003-04-17 13:43:12 +00:00
2008-07-01 10:27:33 +00:00
SwFlyFrmFmt * pFrmFmt = 0 ;
pFrmFmt = pDoc - > InsertOLE ( aPam , sStreamName , embed : : Aspects : : MSOLE_CONTENT , & aFrmSet , NULL , NULL ) ;
2006-08-14 15:54:32 +00:00
pDoc - > EndUndo ( UNDO_INSERT , NULL ) ;
2008-07-01 10:27:33 +00:00
pFrmFmt - > Add ( this ) ;
2003-04-17 13:43:12 +00:00
if ( sName . Len ( ) )
2008-07-01 10:27:33 +00:00
pDoc - > SetFlyName ( ( SwFlyFrmFmt & ) * pFrmFmt , sName ) ;
2003-04-17 13:43:12 +00:00
}
2000-09-18 23:08:29 +00:00
}
2000-12-06 10:36:14 +00:00
if ( pFmt & & pDoc - > GetDrawModel ( ) )
2002-11-26 11:35:55 +00:00
GetOrCreateSdrObject ( pFmt ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pOrder ;
2001-06-15 13:27:58 +00:00
if ( pProps - > GetProperty ( FN_UNO_Z_ORDER , 0 , pOrder ) )
2001-06-13 11:03:44 +00:00
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_Z_ORDER ) ) , * pOrder ) ;
2009-06-03 11:26:39 +00:00
const : : uno : : Any * pReplacement ;
2008-07-22 12:01:18 +00:00
if ( pProps - > GetProperty ( FN_UNO_REPLACEMENT_GRAPHIC , 0 , pReplacement ) )
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_GRAPHIC ) ) , * pReplacement ) ;
2009-08-27 11:59:20 +00:00
// --> OD 2009-07-13 #i73249#
// new attribute Title
const : : uno : : Any * pTitle ;
if ( pProps - > GetProperty ( FN_UNO_TITLE , 0 , pTitle ) )
{
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_TITLE ) ) , * pTitle ) ;
}
// new attribute Description
const : : uno : : Any * pDescription ;
if ( pProps - > GetProperty ( FN_UNO_DESCRIPTION , 0 , pDescription ) )
{
setPropertyValue ( C2U ( SW_PROP_NAME_STR ( UNO_NAME_DESCRIPTION ) ) , * pDescription ) ;
}
// <--
2000-09-18 23:08:29 +00:00
}
else
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2000-09-18 23:08:29 +00:00
//setzt das Flag zurueck und loescht den Descriptor-Pointer
ResetDescriptor ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXFrame : : attach ( const uno : : Reference < text : : XTextRange > & xTextRange )
throw ( lang : : IllegalArgumentException , uno : : RuntimeException )
2001-04-05 12:25:40 +00:00
{
SwFrmFmt * pFmt ;
if ( IsDescriptor ( ) )
attachToRange ( xTextRange ) ;
else if ( 0 ! = ( pFmt = GetFrmFmt ( ) ) )
{
2007-06-05 16:33:19 +00:00
uno : : Reference < lang : : XUnoTunnel > xRangeTunnel ( xTextRange , uno : : UNO_QUERY ) ;
2001-04-05 12:25:40 +00:00
SwXTextRange * pRange = 0 ;
2003-04-01 14:34:01 +00:00
OTextCursorHelper * pCursor = 0 ;
2001-04-05 12:25:40 +00:00
if ( xRangeTunnel . is ( ) )
{
2007-09-27 08:36:43 +00:00
pRange = reinterpret_cast < SwXTextRange * > (
sal : : static_int_cast < sal_IntPtr > ( xRangeTunnel - > getSomething ( SwXTextRange : : getUnoTunnelId ( ) ) ) ) ;
pCursor = reinterpret_cast < OTextCursorHelper * > (
sal : : static_int_cast < sal_IntPtr > ( xRangeTunnel - > getSomething ( OTextCursorHelper : : getUnoTunnelId ( ) ) ) ) ;
2001-04-05 12:25:40 +00:00
}
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
SwUnoInternalPaM aIntPam ( * pDoc ) ;
2010-01-08 17:13:53 +01:00
if ( : : sw : : XTextRangeToSwPaM ( aIntPam , xTextRange ) )
2001-04-05 12:25:40 +00:00
{
SfxItemSet aSet ( pDoc - > GetAttrPool ( ) ,
RES_ANCHOR , RES_ANCHOR ) ;
aSet . SetParent ( & pFmt - > GetAttrSet ( ) ) ;
SwFmtAnchor aAnchor = ( const SwFmtAnchor & ) aSet . Get ( RES_ANCHOR ) ;
aAnchor . SetAnchor ( aIntPam . Start ( ) ) ;
aSet . Put ( aAnchor ) ;
pDoc - > SetFlyFrmAttr ( * pFmt , aSet ) ;
}
else
2007-06-05 16:33:19 +00:00
throw lang : : IllegalArgumentException ( ) ;
2001-04-05 12:25:40 +00:00
}
}
2000-09-18 23:08:29 +00:00
2007-06-05 16:33:19 +00:00
awt : : Point SwXFrame : : getPosition ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2000-11-27 10:13:17 +00:00
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : RuntimeException aRuntime ;
2000-11-27 10:13:17 +00:00
aRuntime . Message = C2U ( " position cannot be determined with this method " ) ;
throw aRuntime ;
2000-09-18 23:08:29 +00:00
}
2007-09-27 08:36:43 +00:00
void SwXFrame : : setPosition ( const awt : : Point & /*aPosition*/ ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2000-11-27 10:13:17 +00:00
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : RuntimeException aRuntime ;
2000-11-27 10:13:17 +00:00
aRuntime . Message = C2U ( " position cannot be changed with this method " ) ;
throw aRuntime ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
awt : : Size SwXFrame : : getSize ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any aVal = getPropertyValue ( C2U ( " Size " ) ) ;
2000-09-18 23:08:29 +00:00
awt : : Size * pRet = ( awt : : Size * ) aVal . getValue ( ) ;
return * pRet ;
}
void SwXFrame : : setSize ( const awt : : Size & aSize )
2007-06-05 16:33:19 +00:00
throw ( beans : : PropertyVetoException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
const : : uno : : Any aVal ( & aSize , : : getCppuType ( static_cast < const awt : : Size * > ( 0 ) ) ) ;
2000-09-18 23:08:29 +00:00
setPropertyValue ( C2U ( " Size " ) , aVal ) ;
}
2007-06-05 16:33:19 +00:00
OUString SwXFrame : : getShapeType ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return C2U ( " FrameShape " ) ;
}
/******************************************************************
* SwXTextFrame
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2007-09-27 08:36:43 +00:00
SwXTextFrame : : SwXTextFrame ( SwDoc * _pDoc ) :
SwXText ( 0 , CURSOR_FRAME ) ,
2009-06-03 11:26:39 +00:00
SwXFrame ( FLYCNTTYPE_FRM , aSwMapProvider . GetPropertySet ( PROPERTY_MAP_TEXT_FRAME ) , _pDoc )
2000-09-18 23:08:29 +00:00
{
}
SwXTextFrame : : SwXTextFrame ( SwFrmFmt & rFmt ) :
2007-09-27 08:36:43 +00:00
SwXText ( rFmt . GetDoc ( ) , CURSOR_FRAME ) ,
2009-06-03 11:26:39 +00:00
SwXFrame ( rFmt , FLYCNTTYPE_FRM , aSwMapProvider . GetPropertySet ( PROPERTY_MAP_TEXT_FRAME ) )
2000-09-18 23:08:29 +00:00
{
}
SwXTextFrame : : ~ SwXTextFrame ( )
{
}
void SAL_CALL SwXTextFrame : : acquire ( ) throw ( )
{
SwXFrame : : acquire ( ) ;
}
void SAL_CALL SwXTextFrame : : release ( ) throw ( )
{
SwXFrame : : release ( ) ;
}
2009-06-03 11:26:39 +00:00
: : uno : : Any SAL_CALL SwXTextFrame : : queryInterface ( const uno : : Type & aType )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
: : uno : : Any aRet = SwXFrame : : queryInterface ( aType ) ;
2000-09-18 23:08:29 +00:00
if ( aRet . getValueType ( ) = = : : getCppuVoidType ( ) )
2002-03-19 14:59:14 +00:00
aRet = SwXText : : queryInterface ( aType ) ;
2000-09-18 23:08:29 +00:00
if ( aRet . getValueType ( ) = = : : getCppuVoidType ( ) )
aRet = SwXTextFrameBaseClass : : queryInterface ( aType ) ;
return aRet ;
}
2007-09-27 08:36:43 +00:00
uno : : Sequence < uno : : Type > SAL_CALL SwXTextFrame : : getTypes ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
uno : : Sequence < uno : : Type > aTextFrameTypes = SwXTextFrameBaseClass : : getTypes ( ) ;
uno : : Sequence < uno : : Type > aFrameTypes = SwXFrame : : getTypes ( ) ;
uno : : Sequence < uno : : Type > aTextTypes = SwXText : : getTypes ( ) ;
long nIndex = aTextFrameTypes . getLength ( ) ;
aTextFrameTypes . realloc (
aTextFrameTypes . getLength ( ) +
aFrameTypes . getLength ( ) +
aTextTypes . getLength ( ) ) ;
uno : : Type * pTextFrameTypes = aTextFrameTypes . getArray ( ) ;
const uno : : Type * pFrameTypes = aFrameTypes . getConstArray ( ) ;
long nPos ;
for ( nPos = 0 ; nPos < aFrameTypes . getLength ( ) ; nPos + + )
pTextFrameTypes [ nIndex + + ] = pFrameTypes [ nPos ] ;
const uno : : Type * pTextTypes = aTextTypes . getConstArray ( ) ;
for ( nPos = 0 ; nPos < aTextTypes . getLength ( ) ; nPos + + )
pTextFrameTypes [ nIndex + + ] = pTextTypes [ nPos ] ;
return aTextFrameTypes ;
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < sal_Int8 > SAL_CALL SwXTextFrame : : getImplementationId ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2003-03-27 14:45:43 +00:00
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
static uno : : Sequence < sal_Int8 > aId ( 16 ) ;
2003-03-27 14:45:43 +00:00
static sal_Bool bInit = sal_False ;
2000-09-18 23:08:29 +00:00
if ( ! bInit )
2003-03-27 14:45:43 +00:00
{
rtl_createUuid ( ( sal_uInt8 * ) ( aId . getArray ( ) ) , 0 , sal_True ) ;
bInit = sal_True ;
}
2000-09-18 23:08:29 +00:00
return aId ;
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XText > SwXTextFrame : : getText ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return this ;
}
2001-06-12 06:28:29 +00:00
const SwStartNode * SwXTextFrame : : GetStartNode ( ) const
{
const SwStartNode * pSttNd = 0 ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
const SwFmtCntnt & rFlyCntnt = pFmt - > GetCntnt ( ) ;
if ( rFlyCntnt . GetCntntIdx ( ) )
pSttNd = rFlyCntnt . GetCntntIdx ( ) - > GetNode ( ) . GetStartNode ( ) ;
}
return pSttNd ;
}
2010-01-08 17:13:56 +01:00
uno : : Reference < text : : XTextCursor >
SwXTextFrame : : CreateCursor ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return createTextCursor ( ) ;
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextCursor > SwXTextFrame : : createTextCursor ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextCursor > aRef ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
2001-11-15 14:48:44 +00:00
//save current start node to be able to check if there is content after the table -
//otherwise the cursor would be in the body text!
const SwNode & rNode = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) - > GetNode ( ) ;
const SwStartNode * pOwnStartNode = rNode . FindSttNodeByType ( SwFlyStartNode ) ;
SwPaM aPam ( rNode ) ;
2000-11-08 13:56:39 +00:00
aPam . Move ( fnMoveForward , fnGoNode ) ;
SwTableNode * pTblNode = aPam . GetNode ( ) - > FindTableNode ( ) ;
SwCntntNode * pCont = 0 ;
while ( pTblNode )
{
aPam . GetPoint ( ) - > nNode = * pTblNode - > EndOfSectionNode ( ) ;
pCont = GetDoc ( ) - > GetNodes ( ) . GoNext ( & aPam . GetPoint ( ) - > nNode ) ;
pTblNode = pCont - > FindTableNode ( ) ;
}
if ( pCont )
aPam . GetPoint ( ) - > nContent . Assign ( pCont , 0 ) ;
2001-11-15 14:48:44 +00:00
const SwStartNode * pNewStartNode =
aPam . GetNode ( ) - > FindSttNodeByType ( SwFlyStartNode ) ;
if ( ! pNewStartNode | | pNewStartNode ! = pOwnStartNode )
{
uno : : RuntimeException aExcept ;
aExcept . Message = S2U ( " no text available " ) ;
throw aExcept ;
}
2010-01-08 17:13:55 +01:00
SwXTextCursor * const pXCursor = new SwXTextCursor (
* pFmt - > GetDoc ( ) , this , CURSOR_FRAME , * aPam . GetPoint ( ) ) ;
aRef = static_cast < text : : XWordCursor * > ( pXCursor ) ;
2007-09-27 08:36:43 +00:00
# if OSL_DEBUG_LEVEL > 1
2010-01-08 17:13:55 +01:00
SwUnoCrsr * const pUnoCrsr = pXCursor - > GetCursor ( ) ;
2007-09-27 08:36:43 +00:00
( void ) pUnoCrsr ;
# endif
2000-09-18 23:08:29 +00:00
}
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return aRef ;
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextCursor > SwXTextFrame : : createTextCursorByRange ( const uno : : Reference < text : : XTextRange > & aTextPosition ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextCursor > aRef ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
SwUnoInternalPaM aPam ( * GetDoc ( ) ) ;
2010-01-08 17:13:53 +01:00
if ( pFmt & & : : sw : : XTextRangeToSwPaM ( aPam , aTextPosition ) )
2000-09-18 23:08:29 +00:00
{
SwNode & rNode = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) - > GetNode ( ) ;
2003-04-15 15:58:20 +00:00
# if OSL_DEBUG_LEVEL > 1
2000-09-18 23:08:29 +00:00
const SwStartNode * p1 = aPam . GetNode ( ) - > FindFlyStartNode ( ) ;
const SwStartNode * p2 = rNode . FindFlyStartNode ( ) ;
2007-09-27 08:36:43 +00:00
( void ) p1 ;
( void ) p2 ;
2000-09-18 23:08:29 +00:00
# endif
if ( aPam . GetNode ( ) - > FindFlyStartNode ( ) = = rNode . FindFlyStartNode ( ) )
2010-01-08 17:13:55 +01:00
{
aRef = static_cast < text : : XWordCursor * > (
new SwXTextCursor ( * pFmt - > GetDoc ( ) , this , CURSOR_FRAME ,
* aPam . GetPoint ( ) , aPam . GetMark ( ) ) ) ;
}
2000-09-18 23:08:29 +00:00
}
else
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2000-09-18 23:08:29 +00:00
return aRef ;
}
2007-06-05 16:33:19 +00:00
uno : : Reference < container : : XEnumeration > SwXTextFrame : : createEnumeration ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
uno : : Reference < container : : XEnumeration > aRef ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
SwPosition aPos ( pFmt - > GetCntnt ( ) . GetCntntIdx ( ) - > GetNode ( ) ) ;
2010-01-08 17:13:51 +01:00
: : std : : auto_ptr < SwUnoCrsr > pUnoCursor (
GetDoc ( ) - > CreateUnoCrsr ( aPos , sal_False ) ) ;
pUnoCursor - > Move ( fnMoveForward , fnGoNode ) ;
2000-09-18 23:08:29 +00:00
// // no Cursor in protected sections
// SwCrsrSaveState aSave( *pUnoCrsr );
// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
// pUnoCrsr->IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ))
2007-06-05 16:33:19 +00:00
// throw uno::RuntimeException() );
2010-01-08 17:13:51 +01:00
aRef = new SwXParagraphEnumeration ( this , pUnoCursor , CURSOR_FRAME ) ;
2000-09-18 23:08:29 +00:00
}
return aRef ;
}
2007-06-05 16:33:19 +00:00
uno : : Type SwXTextFrame : : getElementType ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2007-06-05 16:33:19 +00:00
return : : getCppuType ( static_cast < uno : : Reference < text : : XTextRange > * > ( 0 ) ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
sal_Bool SwXTextFrame : : hasElements ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return sal_True ;
}
2007-06-05 16:33:19 +00:00
void SwXTextFrame : : attach ( const uno : : Reference < text : : XTextRange > & xTextRange )
throw ( lang : : IllegalArgumentException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-04-05 12:25:40 +00:00
SwXFrame : : attach ( xTextRange ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextRange > SwXTextFrame : : getAnchor ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
return SwXFrame : : getAnchor ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextFrame : : dispose ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwXFrame : : dispose ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextFrame : : addEventListener ( const uno : : Reference < lang : : XEventListener > & aListener ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
SwXFrame : : addEventListener ( aListener ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextFrame : : removeEventListener ( const uno : : Reference < lang : : XEventListener > & aListener ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
SwXFrame : : removeEventListener ( aListener ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
OUString SwXTextFrame : : getImplementationName ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return C2U ( " SwXTextFrame " ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
sal_Bool SwXTextFrame : : supportsService ( const OUString & rServiceName ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return COMPARE_EQUAL = = rServiceName . compareToAscii ( " com.sun.star.text.Text " ) | |
COMPARE_EQUAL = = rServiceName . compareToAscii ( " com.sun.star.text.TextFrame " ) | |
2001-02-12 06:14:16 +00:00
SwXFrame : : supportsService ( rServiceName ) ;
2000-09-18 23:08:29 +00:00
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
uno : : Sequence < OUString > SwXTextFrame : : getSupportedServiceNames ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-02-12 06:14:16 +00:00
uno : : Sequence < OUString > aRet = SwXFrame : : getSupportedServiceNames ( ) ;
aRet . realloc ( aRet . getLength ( ) + 2 ) ;
2000-09-18 23:08:29 +00:00
OUString * pArray = aRet . getArray ( ) ;
2001-02-12 06:14:16 +00:00
pArray [ aRet . getLength ( ) - 2 ] = C2U ( " com.sun.star.text.TextFrame " ) ;
pArray [ aRet . getLength ( ) - 1 ] = C2U ( " com.sun.star.text.Text " ) ;
2000-09-18 23:08:29 +00:00
return aRet ;
}
void * SAL_CALL SwXTextFrame : : operator new ( size_t t ) throw ( )
{
return SwXTextFrameBaseClass : : operator new ( t ) ;
}
void SAL_CALL SwXTextFrame : : operator delete ( void * p ) throw ( )
{
SwXTextFrameBaseClass : : operator delete ( p ) ;
}
2000-12-19 16:28:58 +00:00
uno : : Reference < container : : XNameReplace > SAL_CALL SwXTextFrame : : getEvents ( )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-12-19 16:28:58 +00:00
{
return new SwFrameEventDescriptor ( * this ) ;
}
2001-01-15 10:28:36 +00:00
sal_Int64 SAL_CALL SwXTextFrame : : getSomething ( const uno : : Sequence < sal_Int8 > & rId )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2001-01-15 10:28:36 +00:00
{
sal_Int64 nRet = SwXFrame : : getSomething ( rId ) ;
if ( ! nRet )
nRet = SwXText : : getSomething ( rId ) ;
return nRet ;
}
2002-03-19 14:59:14 +00:00
2009-06-03 11:26:39 +00:00
: : uno : : Any SwXTextFrame : : getPropertyValue ( const OUString & rPropertyName )
2007-06-05 16:33:19 +00:00
throw ( beans : : UnknownPropertyException , lang : : WrappedTargetException , uno : : RuntimeException )
2002-03-19 14:59:14 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2009-06-03 11:26:39 +00:00
: : uno : : Any aRet ;
2002-03-19 14:59:14 +00:00
if ( rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_START_REDLINE ) ) | |
rPropertyName . equalsAsciiL ( SW_PROP_NAME ( UNO_NAME_END_REDLINE ) ) )
2002-03-20 07:04:08 +00:00
{
//redline can only be returned if it's a living object
if ( ! IsDescriptor ( ) )
aRet = SwXText : : getPropertyValue ( rPropertyName ) ;
}
2002-03-19 14:59:14 +00:00
else
2002-03-20 07:04:08 +00:00
aRet = SwXFrame : : getPropertyValue ( rPropertyName ) ;
return aRet ;
2002-03-19 14:59:14 +00:00
}
2010-10-13 16:05:00 +05:30
2000-09-18 23:08:29 +00:00
/******************************************************************
* SwXTextGraphicObject
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-10-12 12:57:26 +00:00
SwXTextGraphicObject : : SwXTextGraphicObject ( SwDoc * pDoc ) :
2009-06-03 11:26:39 +00:00
SwXFrame ( FLYCNTTYPE_GRF , aSwMapProvider . GetPropertySet ( PROPERTY_MAP_TEXT_GRAPHIC ) , pDoc )
2000-09-18 23:08:29 +00:00
{
}
SwXTextGraphicObject : : SwXTextGraphicObject ( SwFrmFmt & rFmt ) :
2009-06-03 11:26:39 +00:00
SwXFrame ( rFmt , FLYCNTTYPE_GRF , aSwMapProvider . GetPropertySet ( PROPERTY_MAP_TEXT_GRAPHIC ) )
2000-09-18 23:08:29 +00:00
{
}
SwXTextGraphicObject : : ~ SwXTextGraphicObject ( )
{
}
void SAL_CALL SwXTextGraphicObject : : acquire ( ) throw ( )
{
SwXFrame : : acquire ( ) ;
}
void SAL_CALL SwXTextGraphicObject : : release ( ) throw ( )
{
SwXFrame : : release ( ) ;
}
2009-06-03 11:26:39 +00:00
: : uno : : Any SAL_CALL SwXTextGraphicObject : : queryInterface ( const uno : : Type & aType )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
: : uno : : Any aRet = SwXFrame : : queryInterface ( aType ) ;
2000-09-18 23:08:29 +00:00
if ( aRet . getValueType ( ) = = : : getCppuVoidType ( ) )
aRet = SwXTextGraphicObjectBaseClass : : queryInterface ( aType ) ;
return aRet ;
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < uno : : Type > SAL_CALL
SwXTextGraphicObject : : getTypes ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
uno : : Sequence < uno : : Type > aGraphicTypes = SwXTextGraphicObjectBaseClass : : getTypes ( ) ;
uno : : Sequence < uno : : Type > aFrameTypes = SwXFrame : : getTypes ( ) ;
long nIndex = aGraphicTypes . getLength ( ) ;
aGraphicTypes . realloc (
aGraphicTypes . getLength ( ) +
aFrameTypes . getLength ( ) ) ;
uno : : Type * pGraphicTypes = aGraphicTypes . getArray ( ) ;
const uno : : Type * pFrameTypes = aFrameTypes . getConstArray ( ) ;
long nPos ;
for ( nPos = 0 ; nPos < aFrameTypes . getLength ( ) ; nPos + + )
pGraphicTypes [ nIndex + + ] = pFrameTypes [ nPos ] ;
return aGraphicTypes ;
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < sal_Int8 > SAL_CALL SwXTextGraphicObject : : getImplementationId ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2003-03-27 14:45:43 +00:00
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
static uno : : Sequence < sal_Int8 > aId ( 16 ) ;
2003-03-27 14:45:43 +00:00
static sal_Bool bInit = sal_False ;
2000-09-18 23:08:29 +00:00
if ( ! bInit )
2003-03-27 14:45:43 +00:00
{
rtl_createUuid ( ( sal_uInt8 * ) ( aId . getArray ( ) ) , 0 , sal_True ) ;
bInit = sal_True ;
}
2000-09-18 23:08:29 +00:00
return aId ;
}
2007-06-05 16:33:19 +00:00
void SwXTextGraphicObject : : attach ( const uno : : Reference < text : : XTextRange > & xTextRange ) throw ( lang : : IllegalArgumentException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-04-05 12:25:40 +00:00
SwXFrame : : attach ( xTextRange ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextRange > SwXTextGraphicObject : : getAnchor ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
return SwXFrame : : getAnchor ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextGraphicObject : : dispose ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwXFrame : : dispose ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextGraphicObject : : addEventListener ( const uno : : Reference < lang : : XEventListener > & aListener )
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
SwXFrame : : addEventListener ( aListener ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextGraphicObject : : removeEventListener ( const uno : : Reference < lang : : XEventListener > & aListener )
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
SwXFrame : : removeEventListener ( aListener ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
OUString SwXTextGraphicObject : : getImplementationName ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return C2U ( " SwXTextGraphicObject " ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
sal_Bool SwXTextGraphicObject : : supportsService ( const OUString & rServiceName ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return COMPARE_EQUAL = = rServiceName . compareToAscii ( " com.sun.star.text.TextGraphicObject " ) | |
2001-02-12 06:14:16 +00:00
SwXFrame : : supportsService ( rServiceName ) ;
2000-09-18 23:08:29 +00:00
}
2010-10-13 16:05:00 +05:30
2000-09-18 23:08:29 +00:00
uno : : Sequence < OUString > SwXTextGraphicObject : : getSupportedServiceNames ( void )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-02-12 06:14:16 +00:00
uno : : Sequence < OUString > aRet = SwXFrame : : getSupportedServiceNames ( ) ;
aRet . realloc ( aRet . getLength ( ) + 1 ) ;
2000-09-18 23:08:29 +00:00
OUString * pArray = aRet . getArray ( ) ;
2001-02-12 06:14:16 +00:00
pArray [ aRet . getLength ( ) - 1 ] = C2U ( " com.sun.star.text.TextGraphicObject " ) ;
2000-09-18 23:08:29 +00:00
return aRet ;
}
void * SAL_CALL SwXTextGraphicObject : : operator new ( size_t t ) throw ( )
{
return SwXTextGraphicObjectBaseClass : : operator new ( t ) ;
}
void SAL_CALL SwXTextGraphicObject : : operator delete ( void * p ) throw ( )
{
SwXTextGraphicObjectBaseClass : : operator delete ( p ) ;
}
2000-12-19 16:28:58 +00:00
uno : : Reference < container : : XNameReplace > SAL_CALL
SwXTextGraphicObject : : getEvents ( )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-12-19 16:28:58 +00:00
{
return new SwFrameEventDescriptor ( * this ) ;
}
2000-09-18 23:08:29 +00:00
2001-10-12 12:57:26 +00:00
SwXTextEmbeddedObject : : SwXTextEmbeddedObject ( SwDoc * pDoc ) :
2009-06-03 11:26:39 +00:00
SwXFrame ( FLYCNTTYPE_OLE , aSwMapProvider . GetPropertySet ( PROPERTY_MAP_EMBEDDED_OBJECT ) , pDoc )
2000-09-18 23:08:29 +00:00
{
}
SwXTextEmbeddedObject : : SwXTextEmbeddedObject ( SwFrmFmt & rFmt ) :
2009-06-03 11:26:39 +00:00
SwXFrame ( rFmt , FLYCNTTYPE_OLE , aSwMapProvider . GetPropertySet ( PROPERTY_MAP_EMBEDDED_OBJECT ) )
2000-09-18 23:08:29 +00:00
{
}
SwXTextEmbeddedObject : : ~ SwXTextEmbeddedObject ( )
{
}
void SAL_CALL SwXTextEmbeddedObject : : acquire ( ) throw ( )
{
SwXFrame : : acquire ( ) ;
}
void SAL_CALL SwXTextEmbeddedObject : : release ( ) throw ( )
{
SwXFrame : : release ( ) ;
}
2009-06-03 11:26:39 +00:00
: : uno : : Any SAL_CALL SwXTextEmbeddedObject : : queryInterface ( const uno : : Type & aType )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2009-06-03 11:26:39 +00:00
: : uno : : Any aRet = SwXFrame : : queryInterface ( aType ) ; ;
2000-09-18 23:08:29 +00:00
if ( aRet . getValueType ( ) = = : : getCppuVoidType ( ) )
aRet = SwXTextEmbeddedObjectBaseClass : : queryInterface ( aType ) ;
return aRet ;
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < uno : : Type > SAL_CALL SwXTextEmbeddedObject : : getTypes ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
uno : : Sequence < uno : : Type > aTextEmbeddedTypes = SwXTextEmbeddedObjectBaseClass : : getTypes ( ) ;
uno : : Sequence < uno : : Type > aFrameTypes = SwXFrame : : getTypes ( ) ;
long nIndex = aTextEmbeddedTypes . getLength ( ) ;
aTextEmbeddedTypes . realloc (
aTextEmbeddedTypes . getLength ( ) +
aFrameTypes . getLength ( ) ) ;
uno : : Type * pTextEmbeddedTypes = aTextEmbeddedTypes . getArray ( ) ;
const uno : : Type * pFrameTypes = aFrameTypes . getConstArray ( ) ;
long nPos ;
for ( nPos = 0 ; nPos < aFrameTypes . getLength ( ) ; nPos + + )
pTextEmbeddedTypes [ nIndex + + ] = pFrameTypes [ nPos ] ;
return aTextEmbeddedTypes ;
}
2007-06-05 16:33:19 +00:00
uno : : Sequence < sal_Int8 > SAL_CALL SwXTextEmbeddedObject : : getImplementationId ( ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2003-03-27 14:45:43 +00:00
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2007-06-05 16:33:19 +00:00
static uno : : Sequence < sal_Int8 > aId ( 16 ) ;
2003-03-27 14:45:43 +00:00
static sal_Bool bInit = sal_False ;
2000-09-18 23:08:29 +00:00
if ( ! bInit )
2003-03-27 14:45:43 +00:00
{
rtl_createUuid ( ( sal_uInt8 * ) ( aId . getArray ( ) ) , 0 , sal_True ) ;
bInit = sal_True ;
}
2000-09-18 23:08:29 +00:00
return aId ;
}
2007-06-05 16:33:19 +00:00
void SwXTextEmbeddedObject : : attach ( const uno : : Reference < text : : XTextRange > & xTextRange ) throw ( lang : : IllegalArgumentException , uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-04-05 12:25:40 +00:00
SwXFrame : : attach ( xTextRange ) ;
2000-09-18 23:08:29 +00:00
}
2007-06-05 16:33:19 +00:00
uno : : Reference < text : : XTextRange > SwXTextEmbeddedObject : : getAnchor ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
return SwXFrame : : getAnchor ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextEmbeddedObject : : dispose ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
SwXFrame : : dispose ( ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextEmbeddedObject : : addEventListener ( const uno : : Reference < lang : : XEventListener > & aListener ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
SwXFrame : : addEventListener ( aListener ) ;
}
2007-06-05 16:33:19 +00:00
void SwXTextEmbeddedObject : : removeEventListener ( const uno : : Reference < lang : : XEventListener > & aListener ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
SwXFrame : : removeEventListener ( aListener ) ;
}
2007-06-05 16:33:19 +00:00
uno : : Reference < lang : : XComponent > SwXTextEmbeddedObject : : getEmbeddedObject ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2007-06-05 16:33:19 +00:00
uno : : Reference < lang : : XComponent > xRet ;
2000-09-18 23:08:29 +00:00
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
const SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
DBG_ASSERT ( pCnt - > GetCntntIdx ( ) & &
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - >
2008-11-10 15:06:12 +00:00
GetIndex ( ) + 1 ] - > GetOLENode ( ) , " kein OLE-Node? " ) ;
2000-09-18 23:08:29 +00:00
SwOLENode * pOleNode = pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( )
- > GetIndex ( ) + 1 ] - > GetOLENode ( ) ;
2004-10-04 18:13:38 +00:00
uno : : Reference < embed : : XEmbeddedObject > xIP = pOleNode - > GetOLEObj ( ) . GetOleRef ( ) ;
2004-11-26 15:27:27 +00:00
if ( svt : : EmbeddedObjectRef : : TryRunningState ( xIP ) )
2000-09-18 23:08:29 +00:00
{
2008-07-08 07:34:51 +00:00
// TODO/LATER: the listener registered after client creation should be able to handle scaling, after that the client is not necessary here
if ( pDoc - > GetDocShell ( ) )
pDoc - > GetDocShell ( ) - > GetIPClient ( svt : : EmbeddedObjectRef ( xIP , embed : : Aspects : : MSOLE_CONTENT ) ) ;
2004-11-26 15:27:27 +00:00
xRet = uno : : Reference < lang : : XComponent > ( xIP - > getComponent ( ) , uno : : UNO_QUERY ) ;
2004-10-04 18:13:38 +00:00
uno : : Reference < util : : XModifyBroadcaster > xBrdcst ( xRet , uno : : UNO_QUERY ) ;
uno : : Reference < frame : : XModel > xModel ( xRet , uno : : UNO_QUERY ) ;
if ( xBrdcst . is ( ) & & xModel . is ( ) )
2000-09-18 23:08:29 +00:00
{
2004-10-04 18:13:38 +00:00
SwClientIter aIter ( * pFmt ) ;
SwXOLEListener * pListener = ( SwXOLEListener * ) aIter .
First ( TYPE ( SwXOLEListener ) ) ;
//create a new one if the OLE object doesn't have one already
if ( ! pListener )
2000-09-18 23:08:29 +00:00
{
2004-10-04 18:13:38 +00:00
uno : : Reference < util : : XModifyListener > xOLEListener = new SwXOLEListener ( * pFmt , xModel ) ;
xBrdcst - > addModifyListener ( xOLEListener ) ;
2000-09-18 23:08:29 +00:00
}
}
}
}
return xRet ;
}
2006-10-13 10:09:53 +00:00
uno : : Reference < embed : : XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject : : getExtendedControlOverEmbeddedObject ( )
throw ( uno : : RuntimeException )
{
uno : : Reference < embed : : XEmbeddedObject > xResult ;
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
const SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
DBG_ASSERT ( pCnt - > GetCntntIdx ( ) & &
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - >
2008-11-10 15:06:12 +00:00
GetIndex ( ) + 1 ] - > GetOLENode ( ) , " kein OLE-Node? " ) ;
2006-10-13 10:09:53 +00:00
SwOLENode * pOleNode = pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( )
- > GetIndex ( ) + 1 ] - > GetOLENode ( ) ;
xResult = pOleNode - > GetOLEObj ( ) . GetOleRef ( ) ;
if ( svt : : EmbeddedObjectRef : : TryRunningState ( xResult ) )
{
2008-07-08 07:34:51 +00:00
// TODO/LATER: the listener registered after client creation should be able to handle scaling, after that the client is not necessary here
if ( pDoc - > GetDocShell ( ) )
pDoc - > GetDocShell ( ) - > GetIPClient ( svt : : EmbeddedObjectRef ( xResult , embed : : Aspects : : MSOLE_CONTENT ) ) ;
2006-10-13 10:09:53 +00:00
uno : : Reference < lang : : XComponent > xComp ( xResult - > getComponent ( ) , uno : : UNO_QUERY ) ;
uno : : Reference < util : : XModifyBroadcaster > xBrdcst ( xComp , uno : : UNO_QUERY ) ;
uno : : Reference < frame : : XModel > xModel ( xComp , uno : : UNO_QUERY ) ;
if ( xBrdcst . is ( ) & & xModel . is ( ) )
{
SwClientIter aIter ( * pFmt ) ;
SwXOLEListener * pListener = ( SwXOLEListener * ) aIter .
First ( TYPE ( SwXOLEListener ) ) ;
//create a new one if the OLE object doesn't have one already
if ( ! pListener )
{
uno : : Reference < util : : XModifyListener > xOLEListener = new SwXOLEListener ( * pFmt , xModel ) ;
xBrdcst - > addModifyListener ( xOLEListener ) ;
}
}
}
}
return xResult ;
}
2007-06-05 16:33:19 +00:00
sal_Int64 SAL_CALL SwXTextEmbeddedObject : : getAspect ( ) throw ( uno : : RuntimeException )
2006-10-13 10:09:53 +00:00
{
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
const SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
DBG_ASSERT ( pCnt - > GetCntntIdx ( ) & &
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - >
2008-11-10 15:06:12 +00:00
GetIndex ( ) + 1 ] - > GetOLENode ( ) , " kein OLE-Node? " ) ;
2006-10-13 10:09:53 +00:00
return pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - > GetIndex ( ) + 1 ] - > GetOLENode ( ) - > GetAspect ( ) ;
}
return embed : : Aspects : : MSOLE_CONTENT ; // return the default value
}
2007-06-05 16:33:19 +00:00
void SAL_CALL SwXTextEmbeddedObject : : setAspect ( sal_Int64 nAspect ) throw ( uno : : RuntimeException )
2006-10-13 10:09:53 +00:00
{
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
const SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
DBG_ASSERT ( pCnt - > GetCntntIdx ( ) & &
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - >
2008-11-10 15:06:12 +00:00
GetIndex ( ) + 1 ] - > GetOLENode ( ) , " kein OLE-Node? " ) ;
2006-10-13 10:09:53 +00:00
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - > GetIndex ( ) + 1 ] - > GetOLENode ( ) - > SetAspect ( nAspect ) ;
}
}
2007-06-05 16:33:19 +00:00
uno : : Reference < graphic : : XGraphic > SAL_CALL SwXTextEmbeddedObject : : getReplacementGraphic ( ) throw ( uno : : RuntimeException )
2006-10-13 10:09:53 +00:00
{
SwFrmFmt * pFmt = GetFrmFmt ( ) ;
if ( pFmt )
{
SwDoc * pDoc = pFmt - > GetDoc ( ) ;
const SwFmtCntnt * pCnt = & pFmt - > GetCntnt ( ) ;
DBG_ASSERT ( pCnt - > GetCntntIdx ( ) & &
pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - >
2008-11-10 15:06:12 +00:00
GetIndex ( ) + 1 ] - > GetOLENode ( ) , " kein OLE-Node? " ) ;
2006-10-13 10:09:53 +00:00
Graphic * pGraphic = pDoc - > GetNodes ( ) [ pCnt - > GetCntntIdx ( ) - > GetIndex ( ) + 1 ] - > GetOLENode ( ) - > GetGraphic ( ) ;
if ( pGraphic )
return pGraphic - > GetXGraphic ( ) ;
}
return uno : : Reference < graphic : : XGraphic > ( ) ;
}
2007-06-05 16:33:19 +00:00
OUString SwXTextEmbeddedObject : : getImplementationName ( void ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return C2U ( " SwXTextEmbeddedObject " ) ;
}
2010-10-13 16:05:00 +05:30
2007-06-05 16:33:19 +00:00
sal_Bool SwXTextEmbeddedObject : : supportsService ( const OUString & rServiceName ) throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
return COMPARE_EQUAL = = rServiceName . compareToAscii ( " com.sun.star.text.TextEmbeddedObject " ) | |
2001-02-12 06:14:16 +00:00
SwXFrame : : supportsService ( rServiceName ) ;
2000-09-18 23:08:29 +00:00
}
2010-10-13 16:05:00 +05:30
2000-09-18 23:08:29 +00:00
uno : : Sequence < OUString > SwXTextEmbeddedObject : : getSupportedServiceNames ( void )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
2001-02-12 06:14:16 +00:00
uno : : Sequence < OUString > aRet = SwXFrame : : getSupportedServiceNames ( ) ;
aRet . realloc ( aRet . getLength ( ) + 1 ) ;
2000-09-18 23:08:29 +00:00
OUString * pArray = aRet . getArray ( ) ;
2001-02-12 06:14:16 +00:00
pArray [ aRet . getLength ( ) - 1 ] = C2U ( " com.sun.star.text.TextEmbeddedObject " ) ;
2000-09-18 23:08:29 +00:00
return aRet ;
}
void * SAL_CALL SwXTextEmbeddedObject : : operator new ( size_t t ) throw ( )
{
return SwXTextEmbeddedObjectBaseClass : : operator new ( t ) ;
}
void SAL_CALL SwXTextEmbeddedObject : : operator delete ( void * p ) throw ( )
{
SwXTextEmbeddedObjectBaseClass : : operator delete ( p ) ;
}
2000-12-19 16:28:58 +00:00
uno : : Reference < container : : XNameReplace > SAL_CALL
SwXTextEmbeddedObject : : getEvents ( )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-12-19 16:28:58 +00:00
{
return new SwFrameEventDescriptor ( * this ) ;
}
2000-09-18 23:08:29 +00:00
2003-09-11 08:40:41 +00:00
TYPEINIT1 ( SwXOLEListener , SwClient ) ;
SwXOLEListener : : SwXOLEListener ( SwFmt & rOLEFmt , uno : : Reference < XModel > xOLE ) :
SwClient ( & rOLEFmt ) ,
xOLEModel ( xOLE )
{
}
SwXOLEListener : : ~ SwXOLEListener ( )
{ }
2000-09-18 23:08:29 +00:00
2007-09-27 08:36:43 +00:00
void SwXOLEListener : : modified ( const lang : : EventObject & /*rEvent*/ )
2007-06-05 16:33:19 +00:00
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-09-11 08:40:41 +00:00
SwOLENode * pNd = 0 ;
SwFmt * pFmt = GetFmt ( ) ;
if ( pFmt )
{ const SwNodeIndex * pIdx = pFmt - > GetCntnt ( ) . GetCntntIdx ( ) ;
if ( pIdx )
{
SwNodeIndex aIdx ( * pIdx , 1 ) ;
SwNoTxtNode * pNoTxt = aIdx . GetNode ( ) . GetNoTxtNode ( ) ;
pNd = pNoTxt - > GetOLENode ( ) ;
}
}
if ( ! pNd )
2007-06-05 16:33:19 +00:00
throw uno : : RuntimeException ( ) ;
2004-10-04 18:13:38 +00:00
uno : : Reference < embed : : XEmbeddedObject > xIP = pNd - > GetOLEObj ( ) . GetOleRef ( ) ;
if ( xIP . is ( ) )
2000-09-18 23:08:29 +00:00
{
2004-10-04 18:13:38 +00:00
sal_Int32 nState = xIP - > getCurrentState ( ) ;
if ( nState = = embed : : EmbedStates : : INPLACE_ACTIVE | | nState = = embed : : EmbedStates : : UI_ACTIVE )
return ;
2000-09-18 23:08:29 +00:00
}
2004-10-04 18:13:38 +00:00
// if the OLE-Node is UI-Active do nothing
pNd - > SetOLESizeInvalid ( sal_True ) ;
pNd - > GetDoc ( ) - > SetOLEObjModified ( ) ;
2000-09-18 23:08:29 +00:00
}
2004-10-04 18:13:38 +00:00
2007-06-05 16:33:19 +00:00
void SwXOLEListener : : disposing ( const lang : : EventObject & rEvent )
throw ( uno : : RuntimeException )
2000-09-18 23:08:29 +00:00
{
vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
uno : : Reference < util : : XModifyListener > xListener ( this ) ;
2003-09-11 08:40:41 +00:00
uno : : Reference < frame : : XModel > xModel ( rEvent . Source , uno : : UNO_QUERY ) ;
uno : : Reference < util : : XModifyBroadcaster > xBrdcst ( xModel , uno : : UNO_QUERY ) ;
2000-09-18 23:08:29 +00:00
2003-09-11 08:40:41 +00:00
try
{
2000-09-18 23:08:29 +00:00
if ( xBrdcst . is ( ) )
xBrdcst - > removeModifyListener ( xListener ) ;
}
2007-06-05 16:33:19 +00:00
catch ( uno : : Exception const & )
2003-03-27 14:45:43 +00:00
{
2008-11-10 15:06:12 +00:00
DBG_ERROR ( " OLE Listener couldn't be removed " ) ;
2003-03-27 14:45:43 +00:00
}
}
2003-09-11 08:40:41 +00:00
void SwXOLEListener : : Modify ( SfxPoolItem * pOld , SfxPoolItem * pNew )
2003-03-27 14:45:43 +00:00
{
2003-09-11 08:40:41 +00:00
ClientModify ( this , pOld , pNew ) ;
if ( ! GetRegisteredIn ( ) )
xOLEModel = 0 ;
2000-09-18 23:08:29 +00:00
}
2010-10-14 08:30:41 +02:00
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */