mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw: add ParaInteropGrabBag uno property to paragraphs

Browse Source 
Change-Id: Ic1208f97db31d86bffd71032d6eba1768e929707
This commit is contained in:
Miklos Vajna 2013-07-24 10:52:40 +02:00
parent f841985d9c
commit 288bcd68bd
6 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
offapi/com/sun/star/style/ParagraphProperties.idl
View File

@ -30,6 +30,7 @@
#include <com/sun/star/table/BorderLine.idl> #include <com/sun/star/table/BorderLine.idl>
#include <com/sun/star/style/BreakType.idl> #include <com/sun/star/style/BreakType.idl>
#include <com/sun/star/container/XNameContainer.idl> #include <com/sun/star/container/XNameContainer.idl>
#include <com/sun/star/beans/PropertyValue.idl>
module com { module sun { module star { module style { module com { module sun { module star { module style {
@ -137,6 +138,15 @@ published service ParagraphProperties
*/ */
[optional, property] boolean ParaContextMargin; [optional, property] boolean ParaContextMargin;
/** Grab bag of paragraph properties, used as a string-any map for interim interop purposes.
@since LibreOffice 4.2
<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> ParaInteropGrabBag;
/** determines if the paragraph is included in the /** determines if the paragraph is included in the
line numbering. line numbering.

1
sw/inc/hintids.hxx
View File

@ -160,6 +160,7 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
RES_PARATR_CONNECT_BORDER, // 73 RES_PARATR_CONNECT_BORDER, // 73
RES_PARATR_OUTLINELEVEL, // 74 RES_PARATR_OUTLINELEVEL, // 74
RES_PARATR_RSID, // 75 RES_PARATR_RSID, // 75
RES_PARATR_GRABBAG,
RES_PARATR_END RES_PARATR_END
}; };

2
sw/inc/unoprnms.hxx
View File

@ -824,6 +824,8 @@ enum SwPropNameIds
/* 0761 */ UNO_NAME_CHAR_SHADING_VALUE, /* 0761 */ UNO_NAME_CHAR_SHADING_VALUE,
/* 0762 */ UNO_NAME_PARA_INTEROP_GRAB_BAG,
/* 0762 */ SW_PROPNAME_END /* 0762 */ SW_PROPNAME_END
// new items in this array must match SwPropNameTab aPropNameTab // new items in this array must match SwPropNameTab aPropNameTab

3
sw/source/core/bastyp/init.cxx
View File

@ -59,6 +59,7 @@
#include <editeng/protitem.hxx> #include <editeng/protitem.hxx>
#include <editeng/prszitem.hxx> #include <editeng/prszitem.hxx>
#include <editeng/rsiditem.hxx> #include <editeng/rsiditem.hxx>
#include <svl/grabbagitem.hxx>
#include <editeng/scriptspaceitem.hxx> #include <editeng/scriptspaceitem.hxx>
#include <editeng/shaditem.hxx> #include <editeng/shaditem.hxx>
#include <editeng/spltitem.hxx> #include <editeng/spltitem.hxx>
@ -328,6 +329,7 @@ SfxItemInfo aSlotTab[] =
{ SID_ATTR_PARA_OUTLINE_LEVEL, SFX_ITEM_POOLABLE }, // RES_PARATR_OUTLINELEVEL //#outline level { SID_ATTR_PARA_OUTLINE_LEVEL, SFX_ITEM_POOLABLE }, // RES_PARATR_OUTLINELEVEL //#outline level
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_RSID { 0, SFX_ITEM_POOLABLE }, // RES_PARATR_RSID
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_GRABBAG
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ID { 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ID
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_LEVEL { 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_LEVEL
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISRESTART { 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISRESTART
@ -544,6 +546,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_OUTLINELEVEL - POOLATTR_BEGIN ] = new SfxUInt16Item( RES_PARATR_OUTLINELEVEL, 0 ); aAttrTab[ RES_PARATR_OUTLINELEVEL - POOLATTR_BEGIN ] = new SfxUInt16Item( RES_PARATR_OUTLINELEVEL, 0 );
aAttrTab[ RES_PARATR_RSID - POOLATTR_BEGIN ] = new SvxRsidItem( 0, RES_PARATR_RSID ); aAttrTab[ RES_PARATR_RSID - POOLATTR_BEGIN ] = new SvxRsidItem( 0, RES_PARATR_RSID );
aAttrTab[ RES_PARATR_GRABBAG - POOLATTR_BEGIN ] = new SfxGrabBagItem( RES_PARATR_GRABBAG );
aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] = new SfxStringItem( RES_PARATR_LIST_ID, aEmptyStr ); aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] = new SfxStringItem( RES_PARATR_LIST_ID, aEmptyStr );
aAttrTab[ RES_PARATR_LIST_LEVEL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_LEVEL, 0 ); aAttrTab[ RES_PARATR_LIST_LEVEL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_LEVEL, 0 );

3
sw/source/core/unocore/unomap.cxx
View File

@ -235,7 +235,8 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ SW_PROP_NMID(UNO_NAME_SNAP_TO_GRID), RES_PARATR_SNAPTOGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \ { SW_PROP_NMID(UNO_NAME_SNAP_TO_GRID), RES_PARATR_SNAPTOGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \
{ SW_PROP_NMID(UNO_NAME_PARA_IS_CONNECT_BORDER), RES_PARATR_CONNECT_BORDER, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0}, \ { SW_PROP_NMID(UNO_NAME_PARA_IS_CONNECT_BORDER), RES_PARATR_CONNECT_BORDER, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0}, \
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 }, \ { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 }, \
{ SW_PROP_NMID(UNO_NAME_CHAR_SHADING_VALUE), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_SHADING_VALUE }, { SW_PROP_NMID(UNO_NAME_CHAR_SHADING_VALUE), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_SHADING_VALUE }, \
{ SW_PROP_NMID(UNO_NAME_PARA_INTEROP_GRAB_BAG), RES_PARATR_GRABBAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0 }, \
#define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \ #define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \ COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \

1
sw/source/core/unocore/unoprnms.cxx
View File

@ -791,6 +791,7 @@ const SwPropNameTab aPropNameTab = {
/* 0759 UNO_NAME_FILL_GRADIENT_NAME */ {MAP_CHAR_LEN("FillGradientName")}, /* 0759 UNO_NAME_FILL_GRADIENT_NAME */ {MAP_CHAR_LEN("FillGradientName")},
/* 0760 UNO_NAME_DEFAULT_PAGE_MODE */ {MAP_CHAR_LEN("DefaultPageMode")}, /* 0760 UNO_NAME_DEFAULT_PAGE_MODE */ {MAP_CHAR_LEN("DefaultPageMode")},
/* 0761 UNO_NAME_CHAR_SHADING_VALUE */ {MAP_CHAR_LEN("CharShadingValue")}, /* 0761 UNO_NAME_CHAR_SHADING_VALUE */ {MAP_CHAR_LEN("CharShadingValue")},
/* 0762 UNO_NAME_PARA_INTEROP_GRAB_BAG */ {MAP_CHAR_LEN("ParaInteropGrabBag")},
// new items in this array must match enum SwPropNameIds // new items in this array must match enum SwPropNameIds
}; };