summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/unomap.hxx5
-rw-r--r--sw/inc/unoprnms.hxx6
-rw-r--r--sw/source/core/unocore/unoidx.cxx27
-rw-r--r--sw/source/core/unocore/unomap.cxx16
-rw-r--r--sw/source/core/unocore/unoprnms.cxx6
5 files changed, 48 insertions, 12 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 3c42986f7b93..85a682bba9c5 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unomap.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: os $ $Date: 2000-10-31 11:28:03 $
+ * last change: $Author: os $ $Date: 2000-11-02 15:03:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -189,6 +189,7 @@
#define WID_PARA_LEV9 1047
#define WID_PARA_LEV10 1048
#define WID_IS_COMMA_SEPARATED 1049
+#define WID_INDEX_MARKS 1050
//text document
#define WID_DOC_CHAR_COUNT 1000
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index eff1faa35017..6c2eb455e120 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoprnms.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: os $ $Date: 2000-10-27 14:23:08 $
+ * last change: $Author: os $ $Date: 2000-11-02 15:03:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -554,7 +554,7 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT
extern const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_IS_ON;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_SKIP_HIDDEN_TEXT;
extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_SKIP_PROTECTED_TEXT;
-
+extern const SwPropNameLen __FAR_DATA UNO_NAME_DOCUMENT_INDEX_MARKS;
#endif
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 3fcb15c575d7..4f1c7d633c8c 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.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: os $ $Date: 2000-11-01 15:13:25 $
+ * last change: $Author: os $ $Date: 2000-11-02 15:03:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -786,6 +786,29 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
bBOOL = sal_False;
}
break;
+ case WID_INDEX_MARKS:
+ {
+ SwTOXMarks aMarks;
+ const SwTOXType* pType = pTOXBase->GetTOXType();
+ SwClientIter aIter(*(SwTOXType*)pType);
+ SwTOXMark* pMark = (SwTOXMark*)aIter.First(TYPE(SwTOXMark));
+ while( pMark )
+ {
+ if(pMark->GetTxtTOXMark())
+ aMarks.Insert(pMark, aMarks.Count());
+ pMark = (SwTOXMark*)aIter.Next();
+ }
+ Sequence< Reference < XDocumentIndexMark > > aXMarks(aMarks.Count());
+ Reference<XDocumentIndexMark>* pxMarks = aXMarks.getArray();
+ for(USHORT i = 0; i < aMarks.Count(); i++)
+ {
+ SwTOXMark* pMark = aMarks.GetObject(i);
+ pxMarks[i] = SwXDocumentIndexMark::GetObject((SwTOXType*)pType, pMark, m_pDoc);
+ }
+ aRet.setValue(&aXMarks, ::getCppuType((Sequence< Reference< XDocumentIndexMark > >*)0));
+ bBOOL = sal_False;
+ }
+ break;
default:
//this is for items only
bBOOL = sal_False;
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 2d64435de9da..b554ffbaa500 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.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: os $ $Date: 2000-11-01 16:09:10 $
+ * last change: $Author: os $ $Date: 2000-11-02 15:03:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -346,6 +346,8 @@
#endif
using namespace ::com::sun::star;
+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 ::rtl;
@@ -1373,6 +1375,11 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
{ MAP_CHAR_LEN("ParaStyleLevel2"), WID_PARA_LEV2, &::getCppuType((const OUString*)0) , 0, 0},
{ MAP_CHAR_LEN("ParaStyleLevel3"), WID_PARA_LEV3, &::getCppuType((const OUString*)0) , 0, 0},
{ SW_PROP_NAME(UNO_NAME_IS_COMMA_SEPARATED), WID_IS_COMMA_SEPARATED, &::getBooleanCppuType(), PROPERTY_NONE ,0 },
+#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))
+ { SW_PROP_NAME(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, new uno::Type(::getCppuType((Sequence< Reference< XDocumentIndexMark > >*)0)), PropertyAttribute::READONLY ,0 },
+#else
+ { SW_PROP_NAME(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, &::getCppuType((Sequence< Reference< XDocumentIndexMark > >*)0), PropertyAttribute::READONLY ,0 },
+#endif
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXIndexMap_Impl;
@@ -1448,6 +1455,11 @@ 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},
+#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))
+ { SW_PROP_NAME(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, new uno::Type(::getCppuType((Sequence< Reference< XDocumentIndexMark> >*)0)), PropertyAttribute::READONLY ,0 },
+#else
+ { SW_PROP_NAME(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, &::getCppuType((Sequence< Reference< XDocumentIndexMark> >*)0), PropertyAttribute::READONLY ,0 },
+#endif
{0,0,0,0}
};
aMapArr[nPropertyId] = aTOXUserMap_Impl;
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 1e8781a85656..825c50befba3 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.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: os $ $Date: 2000-10-27 14:25:38 $
+ * last change: $Author: os $ $Date: 2000-11-02 15:03:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -552,4 +552,4 @@ const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT
const SwPropNameLen __FAR_DATA UNO_NAME_SEPARATOR_LINE_IS_ON (MAP_CHAR_LEN("SeparatorLineIsOn"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_SKIP_HIDDEN_TEXT (MAP_CHAR_LEN("IsSkipHiddenText"));
const SwPropNameLen __FAR_DATA UNO_NAME_IS_SKIP_PROTECTED_TEXT (MAP_CHAR_LEN("IsSkipProtectedText"));
-
+const SwPropNameLen __FAR_DATA UNO_NAME_DOCUMENT_INDEX_MARKS (MAP_CHAR_LEN("DocumentIndexMarks"));