summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r--sw/source/core/unocore/unoobj.cxx9
-rw-r--r--sw/source/core/unocore/unoprnms.cxx7
2 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 9fbbb640c453..444bceed347a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoobj.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: os $ $Date: 2000-10-26 10:02:20 $
+ * last change: $Author: os $ $Date: 2000-10-27 14:27:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2569,6 +2569,7 @@ Any SwXTextCursor::GetPropertyValue(
SfxItemSet aSet(rPaM.GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_PARATR_NUMRULE,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
+ RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
RES_FILL_ORDER, RES_FRMATR_END -1,
0L);
SwXTextCursor::GetCrsrAttr(rPaM, aSet);
@@ -2636,6 +2637,8 @@ PropertyState lcl_SwXTextCursor_GetPropertyState( SfxItemSet** ppSet,
*ppSet = new SfxItemSet( rPaM.GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_PARATR_NUMRULE,
RES_FILL_ORDER, RES_FRMATR_END -1,
+ RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
+ RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
0L );
SwXTextCursor::GetCrsrAttr( rPaM, **ppSet, FALSE );
}
@@ -4711,6 +4714,8 @@ beans::PropertyState lcl_SwXParagraph_getPropertyState(
*ppSet = new SfxItemSet( rUnoCrsr.GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_PARATR_NUMRULE,
RES_FILL_ORDER, RES_FRMATR_END -1,
+ RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
+ RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
0L);
SwXTextCursor::GetCrsrAttr( rUnoCrsr, **ppSet, TRUE );
}
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 0d1d20fcda54..1e8781a85656 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoprnms.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: os $ $Date: 2000-10-26 10:02:20 $
+ * last change: $Author: os $ $Date: 2000-10-27 14:25:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -505,8 +505,7 @@ const SwPropNameLen __FAR_DATA UNO_LINK_DISPLAY_BITMAP
const SwPropNameLen __FAR_DATA UNO_NAME_HEADING_STYLE_NAME (MAP_CHAR_LEN("HeadingStyleName"));
const SwPropNameLen __FAR_DATA UNO_NAME_SHOW_ONLINE_LAYOUT (MAP_CHAR_LEN("ShowOnlineLayout"));
const SwPropNameLen __FAR_DATA UNO_NAME_USER_DEFINED_ATTRIBUTES (MAP_CHAR_LEN("UserDefinedAttributes"));
-const SwPropNameLen __FAR_DATA UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES (MAP_CHAR_LEN("ParaUserDefinedAttributes"));
-const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_USER_DEFINED_ATTRIBUTES (MAP_CHAR_LEN("CharUserDefinedAttributes"));
+const SwPropNameLen __FAR_DATA UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES (MAP_CHAR_LEN("TextUserDefinedAttributes"));
const SwPropNameLen __FAR_DATA UNO_NAME_FILE_PATH (MAP_CHAR_LEN("FilePath"));
const SwPropNameLen __FAR_DATA UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL (MAP_CHAR_LEN("ParaChapterNumberingLevel"));
const SwPropNameLen __FAR_DATA UNO_NAME_PARA_CONDITIONAL_STYLE_NAME (MAP_CHAR_LEN("ParaConditionalStyleName"));