strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#85922# SwXGroupShape created

Browse source
This commit is contained in:
Oliver Specht 2001-05-31 09:13:13 +00:00
parent 4563559757
commit 49d515461d
3 changed files with 231 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sw/inc/unodraw.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unodraw.hxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: os $ $Date: 2001-05-22 13:34:07 $
* last change: $Author: os $ $Date: 2001-05-31 10:13:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -82,6 +82,9 @@
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_
#include <com/sun/star/beans/XPropertyState.hpp>
#endif
#ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_
#include <com/sun/star/drawing/XShapes.hpp>
#endif
#ifndef _CPPUHELPER_IMPLBASE3_HXX_
#include <cppuhelper/implbase3.hxx> // helper for implementations
#endif
@ -177,6 +180,7 @@ public:
*
* --------------------------------------------------*/
class SwShapeDescriptor_Impl;
class SwXGroupShape;
typedef
cppu::WeakAggImplHelper5
<
@ -192,6 +196,7 @@ class SwXShape : public SwXShapeBaseClass,
{
friend class SwHTMLImageWatcher;
friend class SwHTMLParser;
friend class SwXGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xShapeAgg;
SfxItemPropertySet aPropSet;
@ -254,6 +259,33 @@ public:
SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;}
};
/* -----------------------------31.05.01 09:54--------------------------------
---------------------------------------------------------------------------*/
class SwXGroupShape :
public SwXShape,
public ::com::sun::star::drawing::XShapes
{
public:
SwXGroupShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape);
virtual ~SwXGroupShape();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
virtual void SAL_CALL release( ) throw();
//XShapes
virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException);
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
//XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
};
#endif

197
sw/source/core/unocore/unodraw.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unodraw.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: os $ $Date: 2001-05-22 13:33:37 $
* last change: $Author: os $ $Date: 2001-05-31 10:13:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -386,7 +386,11 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
xShapeTunnel = 0;
uno::Reference< uno::XInterface > xCreate(xRet, uno::UNO_QUERY);
xRet = 0;
uno::Reference< XPropertySet > xPrSet = new SwXShape( xCreate );
Reference< XPropertySet > xPrSet;
if(pObj->IsGroupObject())
xPrSet = new SwXGroupShape( xCreate );
else
xPrSet = new SwXShape( xCreate );
xRet = uno::Reference< drawing::XShape >(xPrSet, uno::UNO_QUERY);
}
}
@ -538,7 +542,6 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
vos::OGuard aGuard(Application::GetSolarMutex());
if(!pDoc)
throw uno::RuntimeException();
// uno::Reference< uno::XInterface > xInt(xShape, uno::UNO_QUERY);
uno::Reference< XUnoTunnel > xShapeTunnel(xShape, uno::UNO_QUERY);
SwXShape* pShape = 0;
SvxShape* pSvxShape = 0;
@ -601,7 +604,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
pSvxShape->setPosition(aMM100Pos);
SdrObject* pObj = pSvxShape->GetSdrObject();
pObj->SetLayer( bOpaque ? pDoc->GetHellId() : pDoc->GetHeavenId() );
pObj->SetLayer( bOpaque ? pDoc->GetHeavenId() : pDoc->GetHellId() );
SwPaM* pPam = new SwPaM(pDoc->GetNodes().GetEndOfContent());
SwUnoInternalPaM* pInternalPam = 0;
@ -1016,7 +1019,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
{
SdrObject* pObj = pSvxShape->GetSdrObject();
pObj->SetLayer( *(sal_Bool*)aValue.getValue() ?
pDoc->GetHellId() : pDoc->GetHeavenId() );
pDoc->GetHeavenId() : pDoc->GetHellId() );
}
}
@ -1114,7 +1117,6 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
vos::OGuard aGuard(Application::GetSolarMutex());
uno::Any aRet;
SwFrmFmt* pFmt = GetFrmFmt();
//TODO: Descriptor interface
if(xShapeAgg.is())
{
const SfxItemPropertyMap* pMap = SfxItemPropertyMap::GetByName(
@ -1122,10 +1124,24 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
if(pMap)
{
if(pFmt)
{
if(RES_OPAQUE == pMap->nWID)
{
SvxShape* pSvxShape = GetSvxShape();
DBG_ASSERT(pSvxShape, "No SvxShape found!")
if(pSvxShape)
{
SdrObject* pObj = pSvxShape->GetSdrObject();
sal_Bool bOpaque = pObj->GetLayer() == pFmt->GetDoc()->GetHeavenId();
aRet.setValue(&bOpaque, ::getBooleanCppuType());
}
}
else
{
const SwAttrSet& rSet = pFmt->GetAttrSet();
aRet = aPropSet.getPropertyValue(*pMap, rSet);
}
}
else
{
SfxPoolItem* pItem = 0;
@ -1198,6 +1214,10 @@ Sequence< PropertyState > SwXShape::getPropertyStates(
Sequence< PropertyState > aRet(aPropertyNames.getLength());
if(xShapeAgg.is())
{
SvxShape* pSvxShape = GetSvxShape();
sal_Bool bGroupMember = sal_False;
if(pSvxShape->GetSdrObject())
bGroupMember = pSvxShape->GetSdrObject()->GetUpGroup() != 0;
const OUString* pNames = aPropertyNames.getConstArray();
PropertyState* pRet = aRet.getArray();
Reference< XPropertyState > xShapePrState;
@ -1207,7 +1227,11 @@ Sequence< PropertyState > SwXShape::getPropertyStates(
_pMap, pNames[nProperty]);
if(pMap)
{
if(pFmt)
if(RES_OPAQUE == pMap->nWID || FN_TEXT_RANGE == pMap->nWID)
pRet[nProperty] = PropertyState_DIRECT_VALUE;
else if(bGroupMember)
pRet[nProperty] = PropertyState_DEFAULT_VALUE;
else if(pFmt)
{
const SwAttrSet& rSet = pFmt->GetAttrSet();
SfxItemState eItemState = rSet.GetItemState(pMap->nWID, FALSE);
@ -1241,11 +1265,6 @@ Sequence< PropertyState > SwXShape::getPropertyStates(
case RES_SURROUND:
pItem = pImpl->GetSurround();
break;
case FN_TEXT_RANGE :
case RES_OPAQUE :
pRet[nProperty] = PropertyState_DIRECT_VALUE;
continue;
break;
}
if(pItem)
pRet[nProperty] = PropertyState_DIRECT_VALUE;
@ -1527,4 +1546,156 @@ SvxShape* SwXShape::GetSvxShape()
}
return pSvxShape;
}
/*-- 31.05.01 09:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
SwXGroupShape::SwXGroupShape(Reference< XInterface > & xShape) :
SwXShape(xShape)
{
#ifdef DBG_UTIL
Reference<XShapes> xShapes(xShapeAgg, UNO_QUERY);
DBG_ASSERT(xShapes.is(), "no SvxShape found or shape is not a group shape")
#endif
}
/*-- 31.05.01 09:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
SwXGroupShape::~SwXGroupShape()
{
}
/*-- 31.05.01 09:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
Any SwXGroupShape::queryInterface( const uno::Type& rType ) throw(RuntimeException)
{
Any aRet;
if(rType == ::getCppuType((Reference<XShapes>*)0))
aRet <<= Reference<XShapes>(this);
else
aRet = SwXShape::queryInterface(rType);
return aRet;
}
/*-- 31.05.01 09:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
void SwXGroupShape::acquire( ) throw()
{
SwXShape::acquire();
}
/*-- 31.05.01 09:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
void SwXGroupShape::release( ) throw()
{
SwXShape::release();
}
/*-- 31.05.01 09:59:19---------------------------------------------------
-----------------------------------------------------------------------*/
void SwXGroupShape::add( const Reference< XShape >& xShape ) throw (RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
SvxShapeGroup* pSvxShape = (SvxShapeGroup*)GetSvxShape();
SwFrmFmt* pFmt = GetFrmFmt();
if(pSvxShape && pFmt)
{
pSvxShape->add(xShape);
Reference<XUnoTunnel> xTunnel(xShape, UNO_QUERY);
SwXShape* pSwShape = 0;
if(xShape.is())
pSwShape = (SwXShape*)xTunnel->getSomething(SwXShape::getUnoTunnelId());
if(pSwShape && pSwShape->m_bDescriptor)
{
SvxShape* pAddShape = (SvxShape*)xTunnel->getSomething(SvxShape::getUnoTunnelId());
if(pAddShape)
{
SdrObject* pObj = pAddShape->GetSdrObject();
if(pObj)
{
SwDoc* pDoc = pFmt->GetDoc();
pObj->SetLayer( pSwShape->pImpl->GetOpaque() ?
pDoc->GetHeavenId() : pDoc->GetHellId() );
}
}
pSwShape->m_bDescriptor = sal_False;
//add the group member to the format of the group
SwFrmFmt* pFmt = ::FindFrmFmt( pSvxShape->GetSdrObject() );
if(pFmt)
pFmt->Add(pSwShape);
}
}
else
throw RuntimeException();
}
/*-- 31.05.01 09:59:20---------------------------------------------------
-----------------------------------------------------------------------*/
void SwXGroupShape::remove( const Reference< XShape >& xShape ) throw (RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
SvxShapeGroup* pSvxShape = (SvxShapeGroup*)GetSvxShape();
if(pSvxShape)
pSvxShape->remove(xShape);
else
throw RuntimeException();
}
/*-- 31.05.01 09:59:20---------------------------------------------------
-----------------------------------------------------------------------*/
sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException )
{
vos::OGuard aGuard(Application::GetSolarMutex());
SvxShapeGroup* pSvxShape = (SvxShapeGroup*)GetSvxShape();
sal_Int32 nRet = 0;
if(pSvxShape)
nRet = pSvxShape->getCount();
else
throw RuntimeException();
return nRet;
}
/*-- 31.05.01 09:59:20---------------------------------------------------
-----------------------------------------------------------------------*/
Any SwXGroupShape::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
{
vos::OGuard aGuard(Application::GetSolarMutex());
SvxShapeGroup* pSvxShape = (SvxShapeGroup*)GetSvxShape();
Any aRet;
if(pSvxShape)
aRet = pSvxShape->getByIndex(nIndex);
else
throw RuntimeException();
return aRet;
}
/*-- 31.05.01 09:59:20---------------------------------------------------
-----------------------------------------------------------------------*/
uno::Type SwXGroupShape::getElementType( ) throw(RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
SvxShapeGroup* pSvxShape = (SvxShapeGroup*)GetSvxShape();
uno::Type aRet;
if(pSvxShape)
aRet = pSvxShape->getElementType();
else
throw RuntimeException();
return aRet;
}
/*-- 31.05.01 09:59:22---------------------------------------------------
-----------------------------------------------------------------------*/
sal_Bool SwXGroupShape::hasElements( ) throw(RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
SvxShapeGroup* pSvxShape = (SvxShapeGroup*)GetSvxShape();
sal_Bool bRet = sal_False;
if(pSvxShape)
bRet = pSvxShape->hasElements();
else
throw RuntimeException();
return bRet;
}

13
sw/source/ui/uno/unotxdoc.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unotxdoc.cxx,v $
*
* $Revision: 1.40 $
* $Revision: 1.41 $
*
* last change: $Author: mib $ $Date: 2001-05-22 12:40:41 $
* last change: $Author: os $ $Date: 2001-05-31 10:13:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1706,6 +1706,7 @@ void SwXTextDocument::InitNewDoc()
/*-- 11.03.99 11:51:40---------------------------------------------------
-----------------------------------------------------------------------*/
#define COM_SUN_STAR__DRAWING_LENGTH 13
Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServiceName)
throw( Exception, RuntimeException )
{
@ -1722,7 +1723,7 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic
{
if( rServiceName.compareToAscii( "com.sun.star.", 13 ) == 0 )
{
sal_Int32 nIndex = 13;
sal_Int32 nIndex = COM_SUN_STAR__DRAWING_LENGTH;
OUString sCategory = rServiceName.getToken( 0, '.', nIndex );
sal_Bool bShape = sCategory == C2U("drawing");
if( bShape || sCategory == C2U("form"))
@ -1759,7 +1760,13 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic
//hier den Draw - Service suchen
Reference< XInterface > xTmp = SvxFmMSFactory::createInstance(rServiceName);
if(bShape)
{
nIndex = COM_SUN_STAR__DRAWING_LENGTH;
if(!rServiceName.getToken( 1, '.', nIndex ).compareToAscii("GroupShape"))
xRet = *new SwXGroupShape( xTmp );
else
xRet = *new SwXShape( xTmp );
}
else
xRet = xTmp;
}