diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:03:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:03:37 +0000 |
| commit | bd66a9806772dce3af93939c8e4d55c2f4b41837 (patch) | |
| tree | 64d83bff26391848982de0e993e64f6a8096352a /sw/source | |
| parent | 69d3c7d14023e7e71c755d1c0d0c210cc849c93e (diff) | |
INTEGRATION: CWS swdrawobjapi (1.163.10); FILE MERGED
2004/08/12 07:16:42 od 1.163.10.3: RESYNC: (1.163-1.165); FILE MERGED
resolve merge conflict.
2004/08/10 09:35:37 od 1.163.10.2: #i28749# - correct property map entry for <TransformationInHoriL2R>
2004/08/06 13:53:02 od 1.163.10.1: #i28749# - adjustments for transform shape position between OpenOffice.org
file format and OASIS Open Office file format
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/unocore/unomap.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index b62a8fb83a40..cfb082b2ccd8 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unomap.cxx,v $ * - * $Revision: 1.165 $ + * $Revision: 1.166 $ * - * last change: $Author: hr $ $Date: 2004-08-02 14:19:51 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:03:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,11 @@ #ifndef _COM_SUN_STAR_SCRIPT_XLIBRARYCONTAINER_HPP_ #include <com/sun/star/script/XLibraryContainer.hpp> #endif +// --> OD 2004-08-06 #i28749# +#ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX3_HPP_ +#include <com/sun/star/drawing/HomogenMatrix3.hpp> +#endif +// <-- #ifndef _SWTYPES_HXX #include <swtypes.hxx> @@ -1182,6 +1187,16 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP { SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, // --> OD 2004-06-29 #i28701# { SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE}, + // --> OD 2004-08-06 #i28749# + { SW_PROP_NMID( UNO_NAME_TRANSFORMATION_IN_HORI_L2R), + FN_SHAPE_TRANSFORMATION_IN_HORI_L2R, + CPPU_E2T(CPPUTYPE_TRANSFORMATIONINHORIL2R), + PropertyAttribute::READONLY, 0}, + { SW_PROP_NMID( UNO_NAME_POSITION_LAYOUT_DIR), + FN_SHAPE_POSITION_LAYOUT_DIR, + CPPU_E2T(CPPUTYPE_INT16), + PROPERTY_NONE, 0}, + // <-- {0,0,0,0,0} }; aMapArr[nPropertyId] = aShapeMap_Impl; |