#78497# IsMainEntry property at index mark

6 files changed, 38 insertions, 16 deletions

diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx
index 8871aac8a4e0..6343d753f643 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoidx.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dvo $ $Date: 2000-11-30 11:30:49 $
+ *  last change: $Author: os $ $Date: 2000-12-09 14:04:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,7 +196,8 @@ class SwXDocumentIndexMark : public cppu::WeakImplHelper4
     const SwTOXMark*            m_pTOXMark;
     const SfxItemPropertyMap*   _pMap;
 
-    sal_Bool                        bIsDescriptor;
+    sal_Bool                    bIsDescriptor;
+    sal_Bool                    bMainEntry;
     TOXTypes                    eType;
     sal_uInt16                      nLevel;
     String                      sAltText;
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index efdd035a59aa..df0b3bf2d520 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomap.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: dvo $ $Date: 2000-11-30 11:30:49 $
+ *  last change: $Author: os $ $Date: 2000-12-09 14:04:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,7 +147,7 @@
 #define WID_LEVEL                               1004
 #define WID_CREATE_FROM_MARKS                   1005
 #define WID_CREATE_FROM_OUTLINE                 1006
-//#define WID_PARAGRAPH_STYLE_NAMES               1007
+#define WID_MAIN_ENTRY                          1007
 #define WID_CREATE_FROM_CHAPTER                 1008
 #define WID_CREATE_FROM_LABELS                  1009
 #define WID_PROTECTED                           1000
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 4f23620bd1a9..26b0de92d2f9 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoprnms.hxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
+ *  last change: $Author: os $ $Date: 2000-12-09 14:04:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -621,7 +621,7 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_HEADER_SECTION;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_HANGING_PUNCTUATION;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_CHARACTER_DISTANCE;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_FORBIDDEN_RULES;
-
+extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_MAIN_ENTRY;
 #endif
 
 
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 78b40911fe90..092d36fcf45e 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.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: dvo $ $Date: 2000-11-30 11:30:49 $
+ *  last change: $Author: os $ $Date: 2000-12-09 14:04:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1227,6 +1227,7 @@ SwXDocumentIndexMark::SwXDocumentIndexMark(TOXTypes eToxType) :
     m_pTOXMark(0),
     nLevel(USHRT_MAX),
     eType(eToxType),
+    bMainEntry(sal_False),
     bIsDescriptor(sal_True)
 {
     InitMap(eToxType);
@@ -1243,7 +1244,8 @@ SwXDocumentIndexMark::SwXDocumentIndexMark(const SwTOXType* pType,
     m_pTOXMark(pMark),
     nLevel(USHRT_MAX),
     eType(pType->GetType()),
-    bIsDescriptor(sal_False)
+    bIsDescriptor(sal_False),
+    bMainEntry(sal_False)
 {
     m_pDoc->GetUnoCallBack()->Add(this);
     InitMap(eType);
@@ -1579,6 +1581,9 @@ void SwXDocumentIndexMark::setPropertyValue(const OUString& rPropertyName,
                 case WID_SECONDARY_KEY:
                     aMark.SetSecondaryKey(lcl_AnyToString(aValue));
                 break;
+                case WID_MAIN_ENTRY:
+                    aMark.SetMainEntry(*(sal_Bool*)aValue.getValue());
+                break;
             }
 
             SwTxtTOXMark* pTxtMark = pCurMark->GetTxtTOXMark();
@@ -1647,6 +1652,9 @@ void SwXDocumentIndexMark::setPropertyValue(const OUString& rPropertyName,
             case WID_USER_IDX_NAME :
                 sUserIndexName = lcl_AnyToString(aValue);
             break;
+            case WID_MAIN_ENTRY:
+                bMainEntry = *(sal_Bool*)aValue.getValue();
+            break;
         }
     }
     else
@@ -1690,6 +1698,12 @@ uno::Any SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName)
                 case WID_USER_IDX_NAME :
                     aRet <<= OUString(pType->GetTypeName());
                 break;
+                case WID_MAIN_ENTRY:
+                {
+                    sal_Bool bTemp = pCurMark->IsMainEntry();
+                    aRet.setValue(&bTemp, ::getBooleanCppuType());
+                }
+                break;
             }
         }
     }
@@ -1712,6 +1726,11 @@ uno::Any SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName)
             case WID_USER_IDX_NAME :
                 aRet <<= OUString(sUserIndexName);
             break;
+            case WID_MAIN_ENTRY:
+            {
+                aRet.setValue(&bMainEntry, ::getBooleanCppuType());
+            }
+            break;
         }
     }
     else
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 0f79b50dc58b..8bab19ecc23e 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.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: dvo $ $Date: 2000-11-30 11:30:49 $
+ *  last change: $Author: os $ $Date: 2000-12-09 14:04:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1359,6 +1359,7 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_ALTERNATIVE_TEXT),WID_ALT_TEXT,         &::getCppuType((const OUString*)0)  ,       PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_PRIMARY_KEY),       WID_PRIMARY_KEY,    &::getCppuType((const OUString*)0)  ,       PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_SECONDARY_KEY),   WID_SECONDARY_KEY,    &::getCppuType((const OUString*)0)  ,       PROPERTY_NONE,     0},
+                    { SW_PROP_NAME(UNO_NAME_IS_MAIN_ENTRY),   WID_MAIN_ENTRY,       &::getBooleanCppuType()  ,      PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_ANCHOR_TYPE   ),    0,  &::getCppuType((const sal_Int16*)0),                PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},
 #if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))
                     { SW_PROP_NAME(UNO_NAME_ANCHOR_TYPES   ),   FN_UNO_ANCHOR_TYPES, new uno::Type(::getCppuType((uno::Sequence<text::TextContentAnchorType>*)0)),PropertyAttribute::READONLY, 0xff},
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 217fdea8a2b8..a669f98c6974 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.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: os $ $Date: 2000-11-29 17:26:02 $
+ *  last change: $Author: os $ $Date: 2000-12-09 14:04:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -617,4 +617,5 @@ const SwPropNameLen __FAR_DATA UNO_NAME_HEADER_SECTION                      (MAP
 const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_HANGING_PUNCTUATION         (MAP_CHAR_LEN("ParaIsHangingPunctuation"));
 const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_CHARACTER_DISTANCE          (MAP_CHAR_LEN("ParaIsCharacterDistance"));
 const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_FORBIDDEN_RULES             (MAP_CHAR_LEN("ParaIsForbiddenRules"));
+const SwPropNameLen __FAR_DATA UNO_NAME_IS_MAIN_ENTRY                       (MAP_CHAR_LEN("IsMainEntry"));