ooo-build r15199 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 05:35:00 2009
New Revision: 15199
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15199&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sw-accept-reject-redline-m39.diff:
	* patches/dev300/sw-accept-reject-redline.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/sw-accept-reject-redline-m39.diff   (props changed)
      - copied unchanged from r15189, /trunk/patches/dev300/sw-accept-reject-redline.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sw-accept-reject-redline.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 05:35:00 2009
@@ -2159,7 +2159,10 @@
 [ Features < dev300-m38 ]
 sw-accept-reject-redline-m37.diff, n#249775, Amelia Wang
 
-[ Features >= dev300-m38 ]
+[ Features >= dev300-m38 <= dev300-m39 ]
+sw-accept-reject-redline-m39.diff, n#249775, Amelia Wang
+
+[ Features > dev300-m39 ]
 sw-accept-reject-redline.diff, n#249775, Amelia Wang
 
 [ msaccess ]

Modified: trunk/patches/dev300/sw-accept-reject-redline.diff
==============================================================================
--- trunk/patches/dev300/sw-accept-reject-redline.diff	(original)
+++ trunk/patches/dev300/sw-accept-reject-redline.diff	Wed Jan 28 05:35:00 2009
@@ -1,5 +1,5 @@
 diff --git sw/inc/cmdid.h sw/inc/cmdid.h
-index 1e4fc68..c8aba8a 100644
+index 5b490ed..0412101 100644
 --- sw/inc/cmdid.h
 +++ sw/inc/cmdid.h
 @@ -267,6 +267,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
@@ -12,10 +12,10 @@
  /*--------------------------------------------------------------------
  	Bereich: Bearbeiten
 diff --git sw/sdi/_textsh.sdi sw/sdi/_textsh.sdi
-index bd09e7d..bd1d907 100644
+index 964b27a..874f687 100644
 --- sw/sdi/_textsh.sdi
 +++ sw/sdi/_textsh.sdi
-@@ -948,6 +948,18 @@ interface BaseText
+@@ -954,6 +954,18 @@ interface BaseText
  		StateMethod = StateField ;
  		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
  	]
@@ -35,7 +35,7 @@
  	[
  		ExecMethod = ExecField ;
 diff --git sw/sdi/swriter.sdi sw/sdi/swriter.sdi
-index b8e632c..331eb58 100644
+index 32e3ebe..91be5d3 100644
 --- sw/sdi/swriter.sdi
 +++ sw/sdi/swriter.sdi
 @@ -77,6 +77,60 @@ SfxBoolItem TrackChanges FN_REDLINE_ON
@@ -119,19 +119,22 @@
  {
  	Slotname [ en-US ] = "Restore View";
 diff --git sw/source/ui/inc/popup.hrc sw/source/ui/inc/popup.hrc
-index 7123cfc..00aa9b5 100644
+index ec3e853..2b5f756 100644
 --- sw/source/ui/inc/popup.hrc
 +++ sw/source/ui/inc/popup.hrc
-@@ -49,6 +49,7 @@
- #define MN_LANGUAGE_FOR_DOCUMENT	(RC_POPUPS_BEGIN + 13)
- #define MN_ANNOTATION_POPUPMENU		(RC_POPUPS_BEGIN + 14)
+@@ -51,8 +51,9 @@
  #define MN_ANNOTATION_BUTTON		(RC_POPUPS_BEGIN + 15)
-+#define MN_REDLINE_POPUPMENU            (RC_POPUPS_BEGIN + 16)
+ #define MN_REDCOMMENT_POPUPMENU		(RC_POPUPS_BEGIN + 16)
+ #define MN_REDCOMMENT_BUTTON		(RC_POPUPS_BEGIN + 17)
++#define MN_REDLINE_POPUPMENU        (RC_POPUPS_BEGIN + 18)
  
- #if MN_MEDIA_POPUPMENU > RC_POPUPS_END
+-#if MN_MEDIA_POPUPMENU > RC_POPUPS_END
++#if MN_REDLINE_POPUPMENU > RC_POPUPS_END
  
+ #error Resource-Id Ueberlauf in #file, #line
+ #endif
 diff --git sw/source/ui/inc/swmn_tmpl.hrc sw/source/ui/inc/swmn_tmpl.hrc
-index 5b8b70c..31545c4 100644
+index d74d264..8ee6f9c 100644
 --- sw/source/ui/inc/swmn_tmpl.hrc
 +++ sw/source/ui/inc/swmn_tmpl.hrc
 @@ -62,7 +62,29 @@
@@ -165,7 +168,7 @@
  
  
  #define MN_TEXT_ATTR\
-@@ -348,6 +370,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
+@@ -352,6 +374,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
          MN_TXT                                                              \
          MN_NUMBERING                                                        \
          ITEM_TRANSLITERATE_MENU                                             \
@@ -174,10 +177,10 @@
  
  // not in Writer/Web
 diff --git sw/source/ui/shells/textfld.cxx sw/source/ui/shells/textfld.cxx
-index 11e2170..45768ee 100644
+index 69fd57e..d8fbdf4 100644
 --- sw/source/ui/shells/textfld.cxx
 +++ sw/source/ui/shells/textfld.cxx
-@@ -507,6 +507,22 @@ void SwTextShell::ExecField(SfxRequest &rReq)
+@@ -504,6 +504,22 @@ void SwTextShell::ExecField(SfxRequest &rReq)
  			}
  			break;
  
@@ -200,7 +203,7 @@
  			case FN_JAVAEDIT:
  			{
                  String aType, aText;
-@@ -710,6 +726,11 @@ void SwTextShell::StateField( SfxItemSet &rSet )
+@@ -707,6 +723,11 @@ void SwTextShell::StateField( SfxItemSet &rSet )
  				if (!rSh.GetCurrRedline())
  					rSet.DisableItem(nWhich);
  				break;