[ooo-build-commit] patches/vba

[Tor Lillqvist]

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

New commits:
commit 6bdcbf2c8cbca1924ba3b0322e46e603b6394d09
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 13:40:49 2009 +0300

    Adapt vba-templateobject.diff to dev300-m57

diff --git a/patches/vba/vba-templateobject.diff b/patches/vba/vba-templateobject.diff
index 466906e..e907190 100644
--- a/patches/vba/vba-templateobject.diff
+++ b/patches/vba/vba-templateobject.diff
@@ -113,17 +113,15 @@ index 92feb78..1e842ab 100644
  // --> OD 2006-03-21 #b6375613#
  #define WID_APPLY_WORKAROUND_FOR_B6375613       1070
  // <--
-diff --git sw/inc/unoprnms.hxx sw/inc/unoprnms.hxx
-index 2ba5469..2aacb96 100644
 --- sw/inc/unoprnms.hxx
 +++ sw/inc/unoprnms.hxx
 @@ -804,7 +804,8 @@ enum SwPropNameIds
- /* 0734 */  UNO_NAME_CHAR_OVERLINE_COLOR,
- /* 0735 */  UNO_NAME_CHAR_OVERLINE_HAS_COLOR,
- /* 0736 */  UNO_NAME_OUTLINE_LEVEL,  //#outline level,add<-zhaojianwei outlinelevel
--/* 0737 */  SW_PROPNAME_END
-+/* 0737 */  UNO_NAME_IS_TEMPLATE,
-+/* 0738 */  SW_PROPNAME_END
+ // --> OD 2009-07-13 #i73249#
+ /* 0737 */  UNO_NAME_DESCRIPTION,
+ // <--
+-/* 0738 */  SW_PROPNAME_END
++/* 0738 */  UNO_NAME_IS_TEMPLATE,
++/* 0739 */  SW_PROPNAME_END
  };
  
  
@@ -139,17 +137,15 @@ index abc341b..14ff14e 100644
  					{ SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR,		CPPU_E2T(CPPUTYPE_OUSTRING),	PROPERTY_NONE,   0},
  					{ SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, 			CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
  					{ SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, 	CPPU_E2T(CPPUTYPE_INT16),	PROPERTY_NONE,   0},
-diff --git sw/source/core/unocore/unoprnms.cxx sw/source/core/unocore/unoprnms.cxx
-index cbb2d18..35a7192 100644
 --- sw/source/core/unocore/unoprnms.cxx
 +++ sw/source/core/unocore/unoprnms.cxx
 @@ -778,7 +778,8 @@ const SwPropNameTab aPropNameTab = {
- /* 0733 CHAR_OVERLINE */               {MAP_CHAR_LEN("CharOverline")},
  /* 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
-+/* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
-+/* 0737 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")}
+ /* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
+-/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")}
++/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
++/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")}
  };
  
  const SwPropNameLen& SwGetPropName( USHORT nId )