From 43b84bbba2519686eb6b0463f422bf695d2d74b9 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Mon, 26 Aug 2013 18:33:38 +0300 Subject: 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 Tested-by: Miklos Vajna --- qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv | 1 + qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv | 1 + qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv | 1 + qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv | 1 + qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv | 1 + qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv | 1 + .../objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv | 1 + qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv | 1 + 15 files changed, 15 insertions(+) (limited to 'qadevOOo/objdsc') diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv index 8603486e3636..66f2a890537e 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv @@ -76,6 +76,7 @@ "ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"Style#optional" "ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional" "ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv index e4cb0812dbda..607ebb7eaa8c 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv @@ -11,6 +11,7 @@ "ScShapeObj";"com::sun::star::drawing::Shape";"Style#optional" "ScShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional" "ScShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"ScShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "ScShapeObj";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "ScShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "ScShapeObj";"com::sun::star::sheet::Shape";"Anchor" diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv index 8622acaf25e1..1762649a236d 100644 --- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv +++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv @@ -12,6 +12,7 @@ "ChartLegend";"com::sun::star::drawing::Shape";"Style#optional" "ChartLegend";"com::sun::star::drawing::Shape";"Transformation#optional" "ChartLegend";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"ChartLegend";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "ChartLegend";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "ChartLegend";"com::sun::star::drawing::LineProperties";"LineStyle" "ChartLegend";"com::sun::star::drawing::LineProperties";"LineDash" diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv index 0bdbcc31d9ec..40b531173f34 100644 --- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv +++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv @@ -12,6 +12,7 @@ "ChartTitle";"com::sun::star::drawing::Shape";"Style#optional" "ChartTitle";"com::sun::star::drawing::Shape";"Transformation#optional" "ChartTitle";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"ChartTitle";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "ChartTitle";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "ChartTitle";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "ChartTitle";"com::sun::star::chart::ChartTitle";"TextRotation" diff --git a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv index 06fa7a0bae92..de7cc83d2701 100644 --- a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv +++ b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv @@ -11,6 +11,7 @@ "SdXShape";"com::sun::star::drawing::Shape";"Style#optional" "SdXShape";"com::sun::star::drawing::Shape";"Transformation#optional" "SdXShape";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SdXShape";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SdXShape";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "SdXShape";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "SdXShape";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"setPropertyValuesTolerant()" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv index b7605ee47f0e..9236825ab93b 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv @@ -76,6 +76,7 @@ "SvxGraphicObject";"com::sun::star::drawing::Shape";"Style#optional" "SvxGraphicObject";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxGraphicObject";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxGraphicObject";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxGraphicObject";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxGraphicObject";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "SvxGraphicObject";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv index 701089362ebe..96fa72a3cef7 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv @@ -76,6 +76,7 @@ "SvxShape";"com::sun::star::drawing::Shape";"Style#optional" "SvxShape";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShape";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShape";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShape";"com::sun::star::drawing::TextShape";"CornerRadius" "SvxShape";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxShape";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv index 8e1814d18db1..8624bbb962be 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv @@ -76,6 +76,7 @@ "SvxShapeCircle";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapeCircle";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapeCircle";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapeCircle";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapeCircle";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxShapeCircle";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "SvxShapeCircle";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv index 95b9abe6b6a9..4502a89c8384 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv @@ -76,6 +76,7 @@ "SvxShapeConnector";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapeConnector";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapeConnector";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapeConnector";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapeConnector";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxShapeConnector";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "SvxShapeConnector";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv index 945c4fc24caf..cc05a7c4e88d 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv @@ -11,6 +11,7 @@ "SvxShapeControl";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapeControl";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapeControl";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapeControl";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapeControl";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "SvxShapeControl";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "SvxShapeControl";"com::sun::star::drawing::XControlShape";"getControl()" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv index 1713d9ca9c60..7ae14a3ea05d 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv @@ -94,6 +94,7 @@ "SvxShapeDimensioning";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapeDimensioning";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapeDimensioning";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapeDimensioning";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapeDimensioning";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxShapeDimensioning";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "SvxShapeDimensioning";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv index c20164a3334b..31cf3dfbe41f 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv @@ -13,6 +13,7 @@ "SvxShapeGroup";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapeGroup";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapeGroup";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapeGroup";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapeGroup";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "SvxShapeGroup";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "SvxShapeGroup";"com::sun::star::drawing::XShapeGroup";"enterGroup()" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv index 9fdea2b0aa81..c266cb7f7c5f 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv @@ -76,6 +76,7 @@ "SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapePolyPolygon";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxShapePolyPolygon";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "SvxShapePolyPolygon";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv index ad9eb30b7001..f57e463aace4 100644 --- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv +++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv @@ -79,6 +79,7 @@ "SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"Style#optional" "SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"Transformation#optional" "SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex" "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex" "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex" diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv index ca857ce964df..17acfb96d2ea 100644 --- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv +++ b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv @@ -11,6 +11,7 @@ "SwXShape";"com::sun::star::drawing::Shape";"Style#optional" "SwXShape";"com::sun::star::drawing::Shape";"Transformation#optional" "SwXShape";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional" +"SwXShape";"com::sun::star::drawing::Shape";"InteropGrabBag#optional" "SwXShape";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()" "SwXShape";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "SwXShape";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()" -- cgit