summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vogelheim <dvo@openoffice.org>2000-11-20 19:28:19 +0000
committerDaniel Vogelheim <dvo@openoffice.org>2000-11-20 19:28:19 +0000
commitfa94ca3f35dc8122a81a62250285d7f147fb3a4b (patch)
treee595ec042cfbb5a5ee621586d93b77034ffc03f1
parent03bcb682537cac04954f11a221873632257d7bba (diff)
- added: IsRelativeTabstops property to all indices (except Bibliography)
- fixed: SwXTextIndex: CreateFromLabels property
-rw-r--r--sw/inc/unomap.hxx5
-rw-r--r--sw/inc/unoprnms.hxx5
-rw-r--r--sw/source/core/unocore/unoidx.cxx16
-rw-r--r--sw/source/core/unocore/unomap.cxx11
-rw-r--r--sw/source/core/unocore/unoprnms.cxx5
5 files changed, 30 insertions, 12 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 566de61da4f2..feec89df0c56 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unomap.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 14:00:30 $
+ * last change: $Author: dvo $ $Date: 2000-11-20 20:28:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -191,6 +191,7 @@
#define WID_PARA_LEV10 1048
#define WID_IS_COMMA_SEPARATED 1049
#define WID_INDEX_MARKS 1050
+#define WID_IS_RELATIVE_TABSTOPS 1051
//text document
#define WID_DOC_CHAR_COUNT 1000
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 07d23ad720ba..b34d53996524 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoprnms.hxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: os $ $Date: 2000-11-17 16:24:09 $
+ * last change: $Author: dvo $ $Date: 2000-11-20 20:28:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -524,6 +524,7 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_STAR_DRAW
extern const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS ;
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_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 1e481abf0ae1..8eec965e93ad 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.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: os $ $Date: 2000-11-15 15:00:48 $
+ * last change: $Author: dvo $ $Date: 2000-11-20 20:28:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -480,7 +480,7 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName,
pTOXBase->SetFromChapter(lcl_AnyToBool(aValue));
break;
case WID_CREATE_FROM_LABELS :
- nCreate = lcl_AnyToBool(aValue) ? nCreate | TOX_SEQUENCE : nCreate & ~TOX_SEQUENCE;
+ pTOXBase->SetFromObjectNames(! lcl_AnyToBool(aValue));
break;
case WID_PROTECTED :
pTOXBase->SetProtected(lcl_AnyToBool(aValue));
@@ -514,6 +514,7 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName,
nTOIOptions | TOI_INITIAL_CAPS : nTOIOptions & ~TOI_INITIAL_CAPS;
break;
case WID_IS_COMMA_SEPARATED :
+ bForm = sal_True;
aForm.SetCommaSeparated(lcl_AnyToBool(aValue));
break;
case WID_LABEL_CATEGORY :
@@ -584,6 +585,10 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName,
aForm.SetTemplate( 0, SwXStyleFamilies::GetUIName(
lcl_AnyToString(aValue), SFX_STYLE_FAMILY_PARA));
break;
+ case WID_IS_RELATIVE_TABSTOPS:
+ bForm = sal_True;
+ aForm.SetRelTabPos(lcl_AnyToBool(aValue));
+ break;
case WID_PARA_SEP :
bForm = sal_True;
aForm.SetTemplate( 1, SwXStyleFamilies::GetUIName(
@@ -726,7 +731,7 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
bRet = pTOXBase->IsFromChapter();
break;
case WID_CREATE_FROM_LABELS :
- bRet = 0 != (nCreate & TOX_SEQUENCE);
+ bRet = ! pTOXBase->IsFromObjectNames();
break;
case WID_PROTECTED :
bRet = pTOXBase->IsProtected();
@@ -867,6 +872,9 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
bBOOL = sal_False;
}
break;
+ case WID_IS_RELATIVE_TABSTOPS:
+ bRet = rForm.IsRelTabPos();
+ break;
case WID_INDEX_MARKS:
{
SwTOXMarks aMarks;
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 9122e7b4cfa8..a44856543722 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.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: dvo $ $Date: 2000-11-20 14:00:32 $
+ * last change: $Author: dvo $ $Date: 2000-11-20 20:28:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -489,6 +489,7 @@ void SwUnoPropertyMapProvider::Sort(sal_uInt16 nId)
{ SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT, &::getCppuType((sal_Int16*)0), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
{ SW_PROP_NAME(UNO_NAME_CHAR_POSTURE_COMPLEX), RES_CHRATR_CTL_POSTURE , &::getCppuType((FontSlant*)0), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
{ SW_PROP_NAME(UNO_NAME_CHAR_LOCALE_COMPLEX), RES_CHRATR_CTL_LANGUAGE , &::getCppuType((Locale*)0) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
+
/* -----------------24.06.98 18:12-------------------
*
* --------------------------------------------------*/
@@ -1402,6 +1403,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
#else
{ SW_PROP_NAME(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, &::getCppuType((Sequence< Reference< XDocumentIndexMark > >*)0), PropertyAttribute::READONLY ,0 },
#endif
+ { SW_PROP_NAME(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXIndexMap_Impl;
@@ -1439,6 +1441,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ MAP_CHAR_LEN("ParaStyleLevel8"), WID_PARA_LEV8, &::getCppuType((const OUString*)0) , 0, 0},
{ MAP_CHAR_LEN("ParaStyleLevel9"), WID_PARA_LEV9, &::getCppuType((const OUString*)0) , 0, 0},
{ MAP_CHAR_LEN("ParaStyleLevel10"), WID_PARA_LEV10, &::getCppuType((const OUString*)0) , 0, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXContentMap_Impl;
@@ -1482,6 +1485,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
#else
{ SW_PROP_NAME(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, &::getCppuType((Sequence< Reference< XDocumentIndexMark> >*)0), PropertyAttribute::READONLY ,0 },
#endif
+ { SW_PROP_NAME(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXUserMap_Impl;
@@ -1506,6 +1510,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ SW_PROP_NAME(UNO_NAME_BACK_TRANSPARENT ), RES_BACKGROUND, &::getBooleanCppuType(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
{ MAP_CHAR_LEN("ParaStyleHeading"), WID_PARA_HEAD, &::getCppuType((const OUString*)0) , 0, 0},
{ MAP_CHAR_LEN("ParaStyleLevel1"), WID_PARA_LEV1, &::getCppuType((const OUString*)0) , 0, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXTablesMap_Impl;
@@ -1533,6 +1538,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ SW_PROP_NAME(UNO_NAME_BACK_TRANSPARENT ), RES_BACKGROUND, &::getBooleanCppuType(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
{ MAP_CHAR_LEN("ParaStyleHeading"), WID_PARA_HEAD, &::getCppuType((const OUString*)0) , 0, 0},
{ MAP_CHAR_LEN("ParaStyleLevel1"), WID_PARA_LEV1, &::getCppuType((const OUString*)0) , 0, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXObjectsMap_Impl;
@@ -1558,6 +1564,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ SW_PROP_NAME(UNO_NAME_BACK_TRANSPARENT ), RES_BACKGROUND, &::getBooleanCppuType(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
{ MAP_CHAR_LEN("ParaStyleHeading"), WID_PARA_HEAD, &::getCppuType((const OUString*)0) , 0, 0},
{ MAP_CHAR_LEN("ParaStyleLevel1"), WID_PARA_LEV1, &::getCppuType((const OUString*)0) , 0, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXIllustrationsMap_Impl;
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index c26484688c6b..576dd10da950 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.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: os $ $Date: 2000-11-17 16:23:09 $
+ * last change: $Author: dvo $ $Date: 2000-11-20 20:28:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -520,6 +520,7 @@ const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_STAR_DRAW
const SwPropNameLen __FAR_DATA UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS (MAP_CHAR_LEN("CreateFromOtherEmbeddedObjects"));
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_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"));