summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2001-01-17 15:21:33 +0000
committerOliver Specht <os@openoffice.org>2001-01-17 15:21:33 +0000
commit870b7f217ef8607d2daccc7771b14b6e6f18273d (patch)
treef72f2fa5f177ec93742540280a5db5935e8d5015
parent197d189d173ec31110e1a90e99f3c65301ced19a (diff)
proeprties added to SwXTextDocument: RedlineDisplayType, ForbiddenCharacters
-rw-r--r--sw/inc/unomap.hxx6
-rw-r--r--sw/inc/unoprnms.hxx7
-rw-r--r--sw/source/core/unocore/unomap.cxx14
-rw-r--r--sw/source/core/unocore/unoprnms.cxx7
4 files changed, 24 insertions, 10 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index ad89928d9dc0..4871219dba06 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unomap.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: os $ $Date: 2001-01-12 16:11:27 $
+ * last change: $Author: os $ $Date: 2001-01-17 16:18:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -208,6 +208,8 @@
#define WID_DOC_CHANGES_RECORD 1005
#define WID_DOC_AUTO_MARK_URL 1006
#define WID_DOC_HIDE_TIPS 1007
+#define WID_DOC_REDLINE_DISPLAY 1008
+#define WID_DOC_FORBIDDEN_CHARS 1009
//AutoText
#define WID_GROUP_PATH 0
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 68f4a134e732..0127b3a19ad7 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoprnms.hxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: mib $ $Date: 2001-01-15 11:00:22 $
+ * last change: $Author: os $ $Date: 2001-01-17 16:19:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -650,6 +650,9 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_END_REDLINE;
extern const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_START;
extern const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_END ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_TEXT;
+
+extern const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_DISPLAY_TYPE;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_FORBIDDEN_CHARACTERS;
#endif
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 7b4dbc0f8ca9..5aabddb04df2 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unomap.cxx,v $
*
- * $Revision: 1.42 $
+ * $Revision: 1.43 $
*
- * last change: $Author: mib $ $Date: 2001-01-17 10:50:53 $
+ * last change: $Author: os $ $Date: 2001-01-17 16:21:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -341,6 +341,9 @@
#ifndef _COM_SUN_STAR_DRAWING_POINTSEQUENCESEQUENCE_HPP_
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#endif
+#ifndef _COM_SUN_STAR_I18N_XFORBIDDENCHARACTERS_HPP_
+#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
+#endif
#ifndef _COM_SUN_STAR_DRAWING_COLORMODE_HPP_
#include <com/sun/star/drawing/ColorMode.hpp>
#endif
@@ -358,6 +361,7 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::i18n;
using namespace ::rtl;
SwUnoPropertyMapProvider aSwMapProvider;
@@ -512,7 +516,8 @@ void SwUnoPropertyMapProvider::Sort(sal_uInt16 nId)
{SW_PROP_NAME(UNO_NAME_REDLINE_COMMENT), 0, &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
{SW_PROP_NAME(UNO_NAME_REDLINE_TYPE), 0, &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
{SW_PROP_NAME(UNO_NAME_REDLINE_SUCCESSOR_DATA), 0, &::getCppuType((Sequence<PropertyValue>*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NAME(UNO_NAME_REDLINE_IDENTIFIER), 0, &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ {SW_PROP_NAME(UNO_NAME_REDLINE_IDENTIFIER), 0, &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NAME(UNO_NAME_REDLINE_TEXT ), 0, &::getCppuType((Reference<XText>*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
/* -----------------24.06.98 18:12-------------------
*
@@ -1789,6 +1794,8 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ SW_PROP_NAME(UNO_NAME_WORD_COUNT), WID_DOC_WORD_COUNT, &::getCppuType((const sal_Int32*)0), PropertyAttribute::READONLY, 0},
{ SW_PROP_NAME(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, &::getCppuType((sal_Int16*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_FORBIDDEN_CHARACTERS), WID_DOC_FORBIDDEN_CHARS, &::getCppuType((Reference<XForbiddenCharacters>*)0), PropertyAttribute::READONLY, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aDocMap_Impl;
@@ -1925,7 +1932,6 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
_REDLINE_PROPERTIES
{SW_PROP_NAME(UNO_NAME_REDLINE_START), 0, &::getCppuType((Reference<XInterface>*)0), PropertyAttribute::READONLY, 0},
{SW_PROP_NAME(UNO_NAME_REDLINE_END ), 0, &::getCppuType((Reference<XInterface>*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- {SW_PROP_NAME(UNO_NAME_REDLINE_TEXT ), 0, &::getCppuType((Reference<XText>*)0), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aRedlineMap_Impl;
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 8689a07990c3..17a6cf781674 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.35 $
+ * $Revision: 1.36 $
*
- * last change: $Author: mib $ $Date: 2001-01-15 11:26:06 $
+ * last change: $Author: os $ $Date: 2001-01-17 16:19:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -646,3 +646,6 @@ const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_START (MAP
const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_END (MAP_CHAR_LEN("RedlineEnd"));
const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_TEXT (MAP_CHAR_LEN("RedlineText"));
+const SwPropNameLen __FAR_DATA UNO_NAME_REDLINE_DISPLAY_TYPE (MAP_CHAR_LEN("RedlineDisplayType"));
+const SwPropNameLen __FAR_DATA UNO_NAME_FORBIDDEN_CHARACTERS (MAP_CHAR_LEN("ForbiddenCharacters"));
+