[ooo-build-commit] patches/vba

[Tor Lillqvist]

 patches/vba/vba-currentcomponent-rework.diff |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 38e2527d0a5e6b9f323890453a015f1b9dddbae2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 13:48:40 2009 +0300

    Adapt vba-currentcomponent-rework.diff to dev300-m57

diff --git a/patches/vba/vba-currentcomponent-rework.diff b/patches/vba/vba-currentcomponent-rework.diff
index 5fc2c1f..ef07d9b 100644
--- a/patches/vba/vba-currentcomponent-rework.diff
+++ b/patches/vba/vba-currentcomponent-rework.diff
@@ -455,17 +455,15 @@ index 1e842ab..9e928cb 100644
  
  
  //AutoText
-diff --git sw/inc/unoprnms.hxx sw/inc/unoprnms.hxx
-index 2aacb96..d3d4d05 100644
 --- sw/inc/unoprnms.hxx
 +++ sw/inc/unoprnms.hxx
 @@ -805,7 +805,8 @@ enum SwPropNameIds
- /* 0735 */  UNO_NAME_CHAR_OVERLINE_HAS_COLOR,
- /* 0736 */  UNO_NAME_OUTLINE_LEVEL,  //#outline level,add<-zhaojianwei outlinelevel
- /* 0737 */  UNO_NAME_IS_TEMPLATE,
--/* 0738 */  SW_PROPNAME_END
-+/* 0738 */  UNO_NAME_VBA_DOCOBJ,
-+/* 0739 */  SW_PROPNAME_END
+ /* 0737 */  UNO_NAME_DESCRIPTION,
+ // <--
+ /* 0738 */  UNO_NAME_IS_TEMPLATE,
+-/* 0739 */  SW_PROPNAME_END
++/* 0739 */  UNO_NAME_VBA_DOCOBJ,
++/* 0740 */  SW_PROPNAME_END
  };
  
  
@@ -481,17 +479,15 @@ index 14ff14e..1430c12 100644
  					{ SW_PROP_NMID(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L), WID_DOC_AUTO_MARK_URL, CPPU_E2T(CPPUTYPE_OUSTRING),	PROPERTY_NONE,   0},
  					{ SW_PROP_NMID(UNO_NAME_PARAGRAPH_COUNT), WID_DOC_PARA_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
  					{ SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD,		CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
-diff --git sw/source/core/unocore/unoprnms.cxx sw/source/core/unocore/unoprnms.cxx
-index 35a7192..4f7e68b 100644
 --- sw/source/core/unocore/unoprnms.cxx
 +++ sw/source/core/unocore/unoprnms.cxx
 @@ -779,7 +779,8 @@ const SwPropNameTab aPropNameTab = {
- /* 0734 CHAR_OVERLINE_COLOR */         {MAP_CHAR_LEN("CharOverlineColor")},
  /* 0735 CHAR_OVERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharOverlineHasColor")},
  /* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
--/* 0737 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")}
-+/* 0737 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
-+/* 0738 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
+ /* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
+-/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")}
++/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
++/* 0739 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
  };
  
  const SwPropNameLen& SwGetPropName( USHORT nId )