diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-05 14:37:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-05 15:09:31 +0200 |
| commit | e0a2be865f31457b154acf2e0dd1baeae65f7f93 (patch) | |
| tree | 5ce78053abc72736c9b36e63d9201f8ccc7bff62 | |
| parent | a37c6614acea66b20502998edc88eb3c61267106 (diff) | |
sw: add RowInteropGrabBag UNO property for table rows
Change-Id: I59e0d24e04ebabdaa2fdb23fbc47c649d4872853
| -rw-r--r-- | offapi/com/sun/star/text/TextTableRow.idl | 10 | ||||
| -rw-r--r-- | sw/inc/unoprnms.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/bastyp/init.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/unocore/unomap.cxx | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/offapi/com/sun/star/text/TextTableRow.idl b/offapi/com/sun/star/text/TextTableRow.idl index 8bd2f9731991..1755068cdd0e 100644 --- a/offapi/com/sun/star/text/TextTableRow.idl +++ b/offapi/com/sun/star/text/TextTableRow.idl @@ -85,6 +85,16 @@ published service TextTableRow */ [optional, property, maybevoid] boolean IsSplitAllowed; + /** Grab bag of row properties, used as a string-any map for interop purposes. + + @since LibreOffice 4.4 + + <p>This property is intentionally not handled by the ODF filter. Any + member that should be handled there should be first moved out from this grab + bag to a separate property.</p> + */ + [optional, property] sequence<com::sun::star::beans::PropertyValue> RowInteropGrabBag; + }; diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 863b5ce58d53..1a89a01372b9 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -897,6 +897,7 @@ #define UNO_NAME_CHAR_INTEROP_GRAB_BAG "CharInteropGrabBag" #define UNO_NAME_TEXT_VERT_ADJUST "TextVerticalAdjust" #define UNO_NAME_CELL_INTEROP_GRAB_BAG "CellInteropGrabBag" +#define UNO_NAME_ROW_INTEROP_GRAB_BAG "RowInteropGrabBag" #define UNO_NAME_TABLE_INTEROP_GRAB_BAG "TableInteropGrabBag" #endif diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index b2fb6051d64c..8e716bfa5e2a 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -209,6 +209,7 @@ sal_uInt16 aTableLineSetRange[] = { RES_PROTECT, RES_PROTECT, RES_VERT_ORIENT, RES_VERT_ORIENT, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, + RES_FRMATR_GRABBAG, RES_FRMATR_GRABBAG, 0 }; diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 2a3ad60a7619..c70c07577070 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -1697,6 +1697,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { OUString(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get() , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE }, { OUString(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get() , PROPERTY_NONE, MID_FRMSIZE_WIDTH_TYPE }, { OUString(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT, cppu::UnoType<bool>::get() , PropertyAttribute::MAYBEVOID, 0}, + { OUString(UNO_NAME_ROW_INTEROP_GRAB_BAG), RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; |