summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2000-10-27 13:27:08 +0000
committerOliver Specht <os@openoffice.org>2000-10-27 13:27:08 +0000
commit854ce75c79f8d3fcf86f8c3d052acc17bd364476 (patch)
treeb1f512516100025272b33fb6b6da2160b6bdf94b
parent9de1fce6cfa4598ddd3fee0c2c014723bf742b53 (diff)
#79557# alien attributes now correct
-rw-r--r--sw/source/core/unocore/unoobj.cxx9
-rw-r--r--sw/source/core/unocore/unoprnms.cxx7
-rw-r--r--sw/source/ui/app/docstyle.cxx43
3 files changed, 13 insertions, 46 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"));
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 6c0b33bc7e03..d619aad6a38d 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docstyle.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:31 $
+ * last change: $Author: os $ $Date: 2000-10-27 14:26:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -496,6 +496,7 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
RES_PARATR_BEGIN, RES_PARATR_END - 1,
RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
+ RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
SID_ATTR_PAGE, SID_ATTR_PAGE_EXT1,
SID_ATTR_PAGE_HEADERSET,SID_ATTR_PAGE_FOOTERSET,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
@@ -2741,42 +2742,4 @@ void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-/*------------------------------------------------------------------------
- $Log: not supported by cvs2svn $
- Revision 1.157 2000/09/18 16:05:11 willem.vandorp
- OpenOffice header added.
-
- Revision 1.156 2000/06/28 13:04:04 jp
- FillStyleSheet dont create always a new Style
-
- Revision 1.155 2000/06/14 13:01:00 jp
- Bug #71738#: Changes on the templatename must be dispatch
-
- Revision 1.154 2000/04/20 12:49:35 os
- GetName() returns String&
-
- Revision 1.153 2000/04/18 15:23:06 os
- UNICODE
-
- Revision 1.152 2000/04/11 08:01:31 os
- UNICODE
-
- Revision 1.151 2000/03/10 14:10:27 jp
- Bug #74104#: SetItemSet - remove Dialog-Flag from the NumRules
-
- Revision 1.150 2000/02/11 14:42:51 hr
- #70473# changes for unicode ( patched by automated patchtool )
-
- Revision 1.149 2000/01/18 17:15:14 jp
- Bug #72023#: dont create CurrShell-Object with 0-Pointer
-
- Revision 1.148 1999/11/15 14:22:25 jp
- Bug #69833#: GetDescription - ignore hint Para-Bckgrnd-destination
-
- Revision 1.147 1999/02/05 16:43:58 JP
- Task #61467#/#61014#: neu FindPageDescByName
-
-
-------------------------------------------------------------------------*/
-