summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vogelheim <dvo@openoffice.org>2000-11-21 11:00:41 +0000
committerDaniel Vogelheim <dvo@openoffice.org>2000-11-21 11:00:41 +0000
commitef9756f5b4b7d3f8fd9b0810c3986542258d8c45 (patch)
tree62f2c582f63394dd159f6d320cc6d7c6fde5f144
parent6bce202a870308fee5ba89cb52acd457dae7b773 (diff)
- added: Property CreateFromParagraphLevelStyles to table of content and User index
- typo fixed
-rw-r--r--sw/inc/unomap.hxx5
-rw-r--r--sw/inc/unoprnms.hxx5
-rw-r--r--sw/source/core/unocore/unoidx.cxx13
-rw-r--r--sw/source/core/unocore/unomap.cxx6
-rw-r--r--sw/source/core/unocore/unoprnms.cxx5
5 files changed, 23 insertions, 11 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index feec89df0c56..1e174771f8aa 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unomap.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 20:28:19 $
+ * last change: $Author: dvo $ $Date: 2000-11-21 12:00:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -192,6 +192,7 @@
#define WID_IS_COMMA_SEPARATED 1049
#define WID_INDEX_MARKS 1050
#define WID_IS_RELATIVE_TABSTOPS 1051
+#define WID_CREATE_FROM_PARAGRAPH_STYLES 1052
//text document
#define WID_DOC_CHAR_COUNT 1000
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index b34d53996524..3bd6345e4423 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoprnms.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 20:28:19 $
+ * last change: $Author: dvo $ $Date: 2000-11-21 12:00:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -525,6 +525,7 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECT
extern const SwPropNameLen __FAR_DATA UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_COMMA_SEPARATED ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_RELATIVE_TABSTOPS ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_SHOW_CHANGES ;
extern const SwPropNameLen __FAR_DATA UNO_NAME_RECORD_CHANGES ;
extern const SwPropNameLen __FAR_DATA UNO_LINK_DISPLAY_NAME ;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 8eec965e93ad..6a333d6abf3a 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoidx.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 20:28:18 $
+ * last change: $Author: dvo $ $Date: 2000-11-21 12:00:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -594,6 +594,10 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName,
aForm.SetTemplate( 1, SwXStyleFamilies::GetUIName(
lcl_AnyToString(aValue), SFX_STYLE_FAMILY_PARA));
break;
+ case WID_CREATE_FROM_PARAGRAPH_STYLES:
+ nCreate = lcl_AnyToBool(aValue) ?
+ (nCreate | TOX_TEMPLATE) : (nCreate & ~TOX_TEMPLATE);
+ break;
case WID_PARA_LEV1 :
case WID_PARA_LEV2 :
@@ -823,7 +827,7 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
bRet = 0 != (nCreate & TOX_GRAPHIC);
break;
case WID_CREATE_FROM_EMBEDDED_OBJECTS :
- bRet = 0 != (nCreate &= TOX_OLE);
+ bRet = 0 != (nCreate & TOX_OLE);
break;
case WID_CREATE_FROM_STAR_MATH:
bRet = 0 != (nOLEOptions & TOO_MATH);
@@ -840,6 +844,9 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
case WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS:
bRet = 0 != (nOLEOptions & TOO_OTHER);
break;
+ case WID_CREATE_FROM_PARAGRAPH_STYLES:
+ bRet = 0 != (nCreate & TOX_TEMPLATE);
+ break;
case WID_PARA_HEAD :
//Header steht an Pos 0
aRet <<= OUString(
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index a44856543722..a67d48f85e05 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.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 20:28:18 $
+ * last change: $Author: dvo $ $Date: 2000-11-21 12:00:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1422,6 +1422,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ SW_PROP_NAME(UNO_NAME_IS_PROTECTED ), WID_PROTECTED , &::getBooleanCppuType() , PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_LEVEL_FORMAT ), WID_LEVEL_FORMAT , &::getCppuType((uno::Reference<container::XIndexReplace>*)0) , PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_LEVEL_PARAGRAPH_STYLES ), WID_LEVEL_PARAGRAPH_STYLES , &::getCppuType((uno::Reference<container::XIndexReplace>*)0) , PropertyAttribute::READONLY, 0},
+ { SW_PROP_NAME(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), WID_CREATE_FROM_PARAGRAPH_STYLES, &::getBooleanCppuType(), PROPERTY_NONE, 0},
// { SW_PROP_NAME(UNO_NAME_RECALC_TAB_STOPS ), WID_RECALC_TAB_STOPS , &::getBooleanCppuType() , PROPERTY_NONE, 0},
// { SW_PROP_NAME(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_TEXT_COLUMNS), RES_COL, &::getCppuType((uno::Reference<text::XTextColumns>*)0), PROPERTY_NONE, MID_COLUMNS},
@@ -1459,6 +1460,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ SW_PROP_NAME(UNO_NAME_USE_LEVEL_FROM_SOURCE ), WID_USE_LEVEL_FROM_SOURCE , &::getBooleanCppuType() , PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_LEVEL_FORMAT ), WID_LEVEL_FORMAT , &::getCppuType((uno::Reference<container::XIndexReplace>*)0) , PROPERTY_NONE,0},
{ SW_PROP_NAME(UNO_NAME_LEVEL_PARAGRAPH_STYLES ), WID_LEVEL_PARAGRAPH_STYLES , &::getCppuType((uno::Reference<container::XIndexReplace>*)0) , PropertyAttribute::READONLY,0},
+ { SW_PROP_NAME(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), WID_CREATE_FROM_PARAGRAPH_STYLES, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_CREATE_FROM_TABLES ), WID_CREATE_FROM_TABLES , &::getBooleanCppuType() , PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_CREATE_FROM_TEXT_FRAMES ), WID_CREATE_FROM_TEXT_FRAMES , &::getBooleanCppuType() , PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS ), WID_CREATE_FROM_GRAPHIC_OBJECTS , &::getBooleanCppuType() , PROPERTY_NONE, 0},
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 576dd10da950..9134049bbd86 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.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 20:28:18 $
+ * last change: $Author: dvo $ $Date: 2000-11-21 12:00:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -521,6 +521,7 @@ const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS
const SwPropNameLen __FAR_DATA UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L (MAP_CHAR_LEN("IndexAutoMarkFileURL"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_COMMA_SEPARATED (MAP_CHAR_LEN("IsCommaSeparated"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_RELATIVE_TABSTOPS (MAP_CHAR_LEN("IsRelativeTabstops"));
+const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES (MAP_CHAR_LEN("CreateFromLevelParagraphStyles"));
const SwPropNameLen __FAR_DATA UNO_NAME_SHOW_CHANGES (MAP_CHAR_LEN("ShowChanges"));
const SwPropNameLen __FAR_DATA UNO_NAME_RECORD_CHANGES (MAP_CHAR_LEN("RecordChanges"));
const SwPropNameLen __FAR_DATA UNO_LINK_DISPLAY_NAME (MAP_CHAR_LEN("LinkDisplayName"));