summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-11-26 12:26:51 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-11-26 12:26:51 +0000
commit5d2e09c048425842bd3d4823a7a63e39dbec856d (patch)
tree31d751296146e0f641eaac3ef7e6d76bfd498cf6 /sw/source/core
parent688f96aa061a93774bb4d870250f20e6507315b7 (diff)
INTEGRATION: CWS oasisbf2 (1.58.86); FILE MERGED
2004/10/20 07:01:17 od 1.58.86.1: #i35017# - adjustments for changed com::sun::star::text::WrapInfluenceOnPosition
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/unocore/unodraw.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index fd9aa25550fd..aafaf295c194 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.60 $
+ * $Revision: 1.61 $
*
- * last change: $Author: obo $ $Date: 2004-11-17 10:57:43 $
+ * last change: $Author: rt $ $Date: 2004-11-26 13:26:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -230,8 +230,10 @@ public:
// OD 2004-04-21 #i26791#
mpFollowTextFlow( new SwFmtFollowTextFlow( FALSE ) ),
// OD 2004-05-05 #i28701#
+ // --> OD 2004-10-18 #i35017# - constant name has changed
pWrapInfluenceOnObjPos( new SwFmtWrapInfluenceOnObjPos(
- text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED ) ),
+ text::WrapInfluenceOnPosition::ONCE_CONCURRENT ) ),
+ // <--
// --> OD 2004-08-06 #i28749#
mnPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor )
{}
@@ -359,7 +361,9 @@ public:
if ( _bCreate && !pWrapInfluenceOnObjPos )
{
pWrapInfluenceOnObjPos = new SwFmtWrapInfluenceOnObjPos(
- text::WrapInfluenceOnPosition::NONE_CONCURRENT_POSITIONED );
+ // --> OD 2004-10-18 #i35017# - constant name has changed
+ text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
+ // <--
}
return pWrapInfluenceOnObjPos;
}