Kaydet (Commit) 02b91a83 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: add InteropGrabBag for paragraph styles

Change-Id: I44087a5119a538a3892d7f44a33a00bc601a6d44
üst 8dfd8245
...@@ -654,6 +654,7 @@ included in c-context files, so c++ style stuff will cause problems. ...@@ -654,6 +654,7 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_UNO_REPLACEMENT_GRAPHIC_U_R_L (FN_EXTRA2 + 121) #define FN_UNO_REPLACEMENT_GRAPHIC_U_R_L (FN_EXTRA2 + 121)
#define FN_UNO_HIDDEN (FN_EXTRA2 + 122) #define FN_UNO_HIDDEN (FN_EXTRA2 + 122)
#define FN_UNO_STYLE_INTEROP_GRAB_BAG (FN_EXTRA2 + 123)
/*------------------------------------------------ -------------------- /*------------------------------------------------ --------------------
Area: Help Area: Help
......
...@@ -841,6 +841,7 @@ enum SwPropNameIds ...@@ -841,6 +841,7 @@ enum SwPropNameIds
/* 0774 */ UNO_NAME_DOC_INTEROP_GRAB_BAG, /* 0774 */ UNO_NAME_DOC_INTEROP_GRAB_BAG,
/* 0775 */ UNO_NAME_FRAME_INTEROP_GRAB_BAG, /* 0775 */ UNO_NAME_FRAME_INTEROP_GRAB_BAG,
/* 0776 */ UNO_NAME_CHAR_HIGHLIGHT, /* 0776 */ UNO_NAME_CHAR_HIGHLIGHT,
/* 0777 */ UNO_NAME_STYLE_INTEROP_GRAB_BAG,
SW_PROPNAME_END SW_PROPNAME_END
......
...@@ -490,7 +490,8 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() ...@@ -490,7 +490,8 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ 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_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_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, \ { SW_PROP_NMID(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, \
{ SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, { SW_PROP_NMID(UNO_NAME_HIDDEN), FN_UNO_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
{ SW_PROP_NMID(UNO_NAME_STYLE_INTEROP_GRAB_BAG), FN_UNO_STYLE_INTEROP_GRAB_BAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0},
#define COMMON_FLDTYP_PROPERTIES \ #define COMMON_FLDTYP_PROPERTIES \
......
...@@ -806,6 +806,7 @@ const SwPropNameTab aPropNameTab = { ...@@ -806,6 +806,7 @@ const SwPropNameTab aPropNameTab = {
/* 0774 UNO_NAME_DOC_INTEROP_GRAB_BAG */ {MAP_CHAR_LEN("InteropGrabBag")}, /* 0774 UNO_NAME_DOC_INTEROP_GRAB_BAG */ {MAP_CHAR_LEN("InteropGrabBag")},
/* 0775 UNO_NAME_FRAME_INTEROP_GRAB_BAG */ {MAP_CHAR_LEN("FrameInteropGrabBag")}, /* 0775 UNO_NAME_FRAME_INTEROP_GRAB_BAG */ {MAP_CHAR_LEN("FrameInteropGrabBag")},
/* 0776 UNO_NAME_CHAR_HIGHLIGHT */ {MAP_CHAR_LEN("CharHighlight")}, /* 0776 UNO_NAME_CHAR_HIGHLIGHT */ {MAP_CHAR_LEN("CharHighlight")},
/* 0777 UNO_NAME_STYLE_INTEROP_GRAB_BAG */ {MAP_CHAR_LEN("StyleInteropGrabBag")},
// new items in this array must match enum SwPropNameIds // new items in this array must match enum SwPropNameIds
}; };
......
...@@ -1678,6 +1678,13 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, ...@@ -1678,6 +1678,13 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
} }
break; break;
case FN_UNO_STYLE_INTEROP_GRAB_BAG:
{
rBase.mxNewBase->GetItemSet();
rBase.mxNewBase->SetGrabBagItem(rValue);
}
break;
case RES_PAPER_BIN: case RES_PAPER_BIN:
{ {
SfxPrinter *pPrinter = pDoc->getPrinter( true ); SfxPrinter *pPrinter = pDoc->getPrinter( true );
...@@ -2177,6 +2184,14 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, ...@@ -2177,6 +2184,14 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
} }
aRet.setValue(&bHidden, ::getBooleanCppuType()); aRet.setValue(&bHidden, ::getBooleanCppuType());
} }
else if (FN_UNO_STYLE_INTEROP_GRAB_BAG == rEntry.nWID)
{
if (pBase)
{
rtl::Reference<SwDocStyleSheet> xBase(new SwDocStyleSheet(*(SwDocStyleSheet*)pBase));
xBase->GetGrabBagItem(aRet);
}
}
else if(pBase) else if(pBase)
{ {
if(!rBase.mxNewBase.is()) if(!rBase.mxNewBase.is())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment