summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-08-02 13:17:49 +0000
committerKurt Zenker <kz@openoffice.org>2004-08-02 13:17:49 +0000
commit4a686331f90267f1c88acc4b1a61acac43272963 (patch)
tree8d7a2f0296b1165efa69ad3e5848dbce0eaf444e /sw/source/core
parent77e78aa6cd128e2771034e002e1b9e636c708866 (diff)
INTEGRATION: CWS swobjpos04 (1.52.226); FILE MERGED
2004/07/02 14:57:13 od 1.52.226.3: #i28701# - further adjustments for the new object positioning 2004/06/30 14:51:48 od 1.52.226.2: #i28701# - merge changes of cws swdrawpositioning - further adjustments for the new object positioning 2004/05/07 15:34:08 od 1.52.226.1: #i28701# - API implementation for new property <Shape::WrapInfluenceOnPosition>
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/unocore/unodraw.cxx63
1 files changed, 60 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 5547777f12b0..e962cbf9df9a 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unodraw.cxx,v $
*
- * $Revision: 1.54 $
+ * $Revision: 1.55 $
*
- * last change: $Author: rt $ $Date: 2004-07-12 15:48:49 $
+ * last change: $Author: kz $ $Date: 2004-08-02 14:17:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -164,6 +164,10 @@
#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESUPPLIER_HPP_
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#endif
+// OD 2004-05-05 #i28701#
+#ifndef _FMTWRAPINFLUENCEONOBJPOS_HXX
+#include <fmtwrapinfluenceonobjpos.hxx>
+#endif
using namespace ::com::sun::star;
@@ -194,6 +198,8 @@ class SwShapeDescriptor_Impl
uno::Reference< XTextRange > xTextRange;
// OD 2004-04-21 #i26791#
SwFmtFollowTextFlow* mpFollowTextFlow;
+ // OD 2004-05-05 #i28701# - add property 'WrapInfluenceOnObjPos'
+ SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPos;
public:
SwShapeDescriptor_Impl() :
@@ -207,7 +213,10 @@ public:
pLRSpace(0),
bOpaque(sal_False),
// OD 2004-04-21 #i26791#
- mpFollowTextFlow( new SwFmtFollowTextFlow( FALSE ) )
+ mpFollowTextFlow( new SwFmtFollowTextFlow( FALSE ) ),
+ // OD 2004-05-05 #i28701#
+ pWrapInfluenceOnObjPos( new SwFmtWrapInfluenceOnObjPos(
+ text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED ) )
{}
~SwShapeDescriptor_Impl()
@@ -220,6 +229,8 @@ public:
delete pLRSpace;
// OD 2004-04-22 #i26791#
delete mpFollowTextFlow;
+ // OD 2004-05-05 #i28701#
+ delete pWrapInfluenceOnObjPos;
}
SwFmtAnchor* GetAnchor(sal_Bool bCreate = sal_False)
{
@@ -295,6 +306,22 @@ public:
{
DELETEZ(mpFollowTextFlow);
}
+
+ // OD 2004-05-05 #i28701#
+ inline SwFmtWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
+ const sal_Bool _bCreate = sal_False )
+ {
+ if ( _bCreate && !pWrapInfluenceOnObjPos )
+ {
+ pWrapInfluenceOnObjPos = new SwFmtWrapInfluenceOnObjPos(
+ text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED );
+ }
+ return pWrapInfluenceOnObjPos;
+ }
+ inline void RemoveWrapInfluenceOnObjPos()
+ {
+ DELETEZ(pWrapInfluenceOnObjPos);
+ }
};
/****************************************************************************
class SwFmDrawPage
@@ -663,6 +690,12 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
{
aSet.Put( *pDesc->GetFollowTextFlow() );
}
+
+ // OD 2004-05-05 #i28701#
+ if ( pDesc->GetWrapInfluenceOnObjPos() )
+ {
+ aSet.Put( *pDesc->GetWrapInfluenceOnObjPos() );
+ }
}
pSvxShape->setPosition(aMM100Pos);
@@ -1203,6 +1236,12 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
pItem = pImpl->GetFollowTextFlow( sal_True );
}
break;
+ // OD 2004-05-05 #i28701#
+ case RES_WRAP_INFLUENCE_ON_OBJPOS:
+ {
+ pItem = pImpl->GetWrapInfluenceOnObjPos( sal_True );
+ }
+ break;
}
if(pItem)
((SfxPoolItem*)pItem)->PutValue(aValue, pMap->nMemberId);
@@ -1347,6 +1386,12 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
pItem = pImpl->GetFollowTextFlow();
}
break;
+ // OD 2004-05-05 #i28701#
+ case RES_WRAP_INFLUENCE_ON_OBJPOS:
+ {
+ pItem = pImpl->GetWrapInfluenceOnObjPos();
+ }
+ break;
}
if(pItem)
pItem->QueryValue(aRet, pMap->nMemberId);
@@ -1452,6 +1497,12 @@ Sequence< PropertyState > SwXShape::getPropertyStates(
case RES_SURROUND:
pItem = pImpl->GetSurround();
break;
+ // OD 2004-05-05 #i28701#
+ case RES_WRAP_INFLUENCE_ON_OBJPOS:
+ {
+ pItem = pImpl->GetWrapInfluenceOnObjPos();
+ }
+ break;
}
if(pItem)
pRet[nProperty] = PropertyState_DIRECT_VALUE;
@@ -1520,6 +1571,12 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
pImpl->RemoveFollowTextFlow();
}
break;
+ // OD 2004-05-05 #i28701#
+ case RES_WRAP_INFLUENCE_ON_OBJPOS:
+ {
+ pImpl->RemoveWrapInfluenceOnObjPos();
+ }
+ break;
}
}
}