diff options
| author | Andres Gomez <agomez@igalia.com> | 2013-08-26 18:33:38 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-05 08:40:13 +0000 |
| commit | 43b84bbba2519686eb6b0463f422bf695d2d74b9 (patch) | |
| tree | 9beeb9c705ef08a3b45ac6e46176f3ea6c163baa /include | |
| parent | 6f135b0aa231a2543d73f94e39cb472e12ea47d5 (diff) | |
svx: new InteropGrabBag UNO prop in Shape service
Added the new InteropGrabBag property to the Shape
service and modified the JUnit UNO unit tests for
it.
Added specific implementation in the svx module
for the SvxShape class.
This new property is intended by now for its usage
on preserving OOX's Smart-Art but it could also be
used for preserving other attributes for
interoperability among document formats.
Change-Id: Idc7a8e91592399ff05effd4da6eaa2935f8f4d42
Reviewed-on: https://gerrit.libreoffice.org/5769
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/unoprnms.hxx | 1 | ||||
| -rw-r--r-- | include/svl/solar.hrc | 2 | ||||
| -rw-r--r-- | include/svx/svdobj.hxx | 10 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 38ba3bdb4961..3fa0ebd88fd6 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -154,6 +154,7 @@ #define UNO_NAME_POLYPOLYGONBEZIER "PolyPolygonBezier" #define UNO_NAME_POLYGON "Polygon" +#define UNO_NAME_MISC_OBJ_INTEROPGRABBAG "InteropGrabBag" #define UNO_NAME_MISC_OBJ_ZORDER "ZOrder" #define UNO_NAME_MISC_OBJ_MOVEPROTECT "MoveProtect" #define UNO_NAME_MISC_OBJ_SIZEPROTECT "SizeProtect" diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc index a761c7d070b9..c399a1a8a595 100644 --- a/include/svl/solar.hrc +++ b/include/svl/solar.hrc @@ -23,7 +23,7 @@ // defines ------------------------------------------------------------------ #define OWN_ATTR_VALUE_START 3900 -#define OWN_ATTR_VALUE_END 3990 +#define OWN_ATTR_VALUE_END 3991 #define RID_SFX_START 260 // RID_SFX_END 9999 diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 4ec301b89710..b0c623206714 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -26,6 +26,7 @@ #include <vcl/mapmod.hxx> #include <tools/string.hxx> #include <tools/weakbase.hxx> +#include <com/sun/star/uno/Any.hxx> #include <svl/lstner.hxx> #include <vcl/timer.hxx> #include <svx/svdsob.hxx> @@ -61,6 +62,7 @@ class SdrPage; class SdrPageView; class SdrView; class SfxItemSet; +class SfxGrabBagItem; class SfxSetItem; class SfxStyleSheet; class SfxUndoAction; @@ -357,6 +359,9 @@ protected: sal_uInt32 nOrdNum; // Rangnummer des Obj in der Liste + SfxGrabBagItem* pGrabBagItem; // Holds the GrabBagItem property + + /** Position in the navigation order. SAL_MAX_UINT32 when not used. */ sal_uInt32 mnNavigationPosition; @@ -538,6 +543,11 @@ public: // geschehen. void SetOrdNum(sal_uInt32 nNum); + // GrabBagItem for interim interop purposes + void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; + + void SetGrabBagItem(const com::sun::star::uno::Any& rVal); + /** Return the position in the navigation order for the called object. Note that this method may update the navigation position of the called and of other SdrObjects. Therefore this method can not be diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 995eed8dca80..3c35b391481a 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -186,7 +186,8 @@ #define OWN_ATTR_MEDIA_STREAM (OWN_ATTR_VALUE_START+89) #define OWN_ATTR_MEDIA_TEMPFILEURL (OWN_ATTR_VALUE_START+90) -// ATTENTION: maximum is OWN_ATTR_VALUE_START+90, see svl/inc/svl/solar.hrc +#define OWN_ATTR_INTEROPGRABBAG (OWN_ATTR_VALUE_START+91) +// ATTENTION: maximum is OWN_ATTR_VALUE_START+91, see include/svl/solar.hrc // #FontWork# #define FONTWORK_PROPERTIES \ @@ -315,6 +316,7 @@ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, #define MISC_OBJ_PROPERTIES \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0}, \ MISC_OBJ_PROPERTIES_NO_SHEAR \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SHEARANGLE), SDRATTR_SHEARANGLE, &::getCppuType((const sal_Int32*)0), 0, 0}, |