GNOME.org
 

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

Author: kyoshida
Date: Mon Dec 29 20:38:01 2008
New Revision: 14957
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14957&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sw-accept-reject-redline-m37.diff:
	* patches/dev300/sw-accept-reject-redline.diff:
	* patches/dev300/apply: adjusted for dev300-m38.  This one is also 
	because of addition of new resource IDs in the upstream build.



Added:
   trunk/patches/dev300/sw-accept-reject-redline-m37.diff   (props changed)
      - copied unchanged from r14946, /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	Mon Dec 29 20:38:01 2008
@@ -1918,8 +1918,12 @@
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
 # hack to ignore writerfilter if odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, jholesov
-sw-accept-reject-redline.diff, n#249775, Amelia Wang
 
+[ Features < dev300-m38 ]
+sw-accept-reject-redline-m37.diff, n#249775, Amelia Wang
+
+[ Features >= dev300-m38 ]
+sw-accept-reject-redline.diff, n#249775, Amelia Wang
 
 [ msaccess ]
 SectionOwner => strba

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	Mon Dec 29 20:38:01 2008
@@ -1,20 +1,44 @@
-diff -uNr sw/inc/cmdid.h sw/inc/cmdid.h
---- sw/inc/cmdid.h	2008-07-22 23:00:50.000000000 +0800
-+++ sw/inc/cmdid.h	2008-09-04 23:01:48.000000000 +0800
-@@ -263,6 +263,9 @@
- 
- #define FN_EDIT_HYPERLINK     		 (FN_EDIT2 + 35) 	/* edit hyperlink */
- #define FN_NUM_CONTINUE              (FN_EDIT2 + 36)    /* continue previous numbering */
-+#define FN_REDLINE_ACCEPT_CURRENT                (FN_EDIT2 + 37) /* accept the current selected redline */
-+#define FN_REDLINE_REJECT_CURRENT                (FN_EDIT2 + 38) /* reject the current selected redline */ 
-+
+diff --git sw/inc/cmdid.h sw/inc/cmdid.h
+index 1e4fc68..c8aba8a 100644
+--- sw/inc/cmdid.h
++++ sw/inc/cmdid.h
+@@ -267,6 +267,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
+ #define FN_REDLINE_REJECT_DIRECT     (FN_EDIT2 + 38)    /* reject redline at current position*/
+ #define FN_REMOVE_HYPERLINK          (FN_EDIT2 + 39)    /* remove hyperlink attribute */
+ #define FN_COPY_HYPERLINK_LOCATION   (FN_EDIT2 + 40)    /* copy hyperlink URL to clipboard */
++#define FN_REDLINE_ACCEPT_CURRENT    (FN_EDIT2 + 41)    /* accept the current selected redline */
++#define FN_REDLINE_REJECT_CURRENT    (FN_EDIT2 + 42)    /* reject the current selected redline */ 
+ 
  /*--------------------------------------------------------------------
  	Bereich: Bearbeiten
-  --------------------------------------------------------------------*/
-diff -uNr sw/sdi/swriter.sdi sw/sdi/swriter.sdi
---- sw/sdi/swriter.sdi	2008-07-16 21:24:34.000000000 +0800
-+++ sw/sdi/swriter.sdi	2008-09-04 23:01:47.000000000 +0800
-@@ -77,6 +77,60 @@
+diff --git sw/sdi/_textsh.sdi sw/sdi/_textsh.sdi
+index bd09e7d..bd1d907 100644
+--- sw/sdi/_textsh.sdi
++++ sw/sdi/_textsh.sdi
+@@ -948,6 +948,18 @@ interface BaseText
+ 		StateMethod = StateField ;
+ 		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
+ 	]
++	FN_REDLINE_ACCEPT_CURRENT // status()
++	[
++		ExecMethod = ExecField ;
++		StateMethod = StateField ;
++		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
++	]
++	FN_REDLINE_REJECT_CURRENT // status()
++	[
++		ExecMethod = ExecField ;
++		StateMethod = StateField ;
++		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
++	]
+ 	FN_JAVAEDIT // status(final|play)
+ 	[
+ 		ExecMethod = ExecField ;
+diff --git sw/sdi/swriter.sdi sw/sdi/swriter.sdi
+index b8e632c..331eb58 100644
+--- sw/sdi/swriter.sdi
++++ sw/sdi/swriter.sdi
+@@ -77,6 +77,60 @@ SfxBoolItem TrackChanges FN_REDLINE_ON
  ]
  
  //--------------------------------------------------------------------------
@@ -75,10 +99,11 @@
  SfxVoidItem AddAllUnknownWords FN_ADD_UNKNOWN
  ()
  [
-diff -uNr sw/sdi/swslots.src sw/sdi/swslots.src
---- sw/sdi/swslots.src	2008-04-10 20:24:25.000000000 +0800
-+++ sw/sdi/swslots.src	2008-09-04 23:01:48.000000000 +0800
-@@ -942,6 +942,14 @@
+diff --git sw/sdi/swslots.src sw/sdi/swslots.src
+index ffbec7f..11c26c4 100644
+--- sw/sdi/swslots.src
++++ sw/sdi/swslots.src
+@@ -942,6 +942,14 @@ SfxSlotInfo FN_REDLINE_SHOW
  {
  	Slotname [ en-US ] = "Highlight Changes";
  };
@@ -93,31 +118,10 @@
  SfxSlotInfo FN_REFRESH_VIEW
  {
  	Slotname [ en-US ] = "Restore View";
-diff -uNr sw/sdi/_textsh.sdi sw/sdi/_textsh.sdi
---- sw/sdi/_textsh.sdi	2008-04-11 21:59:45.000000000 +0800
-+++ sw/sdi/_textsh.sdi	2008-09-07 15:22:27.000000000 +0800
-@@ -936,6 +936,18 @@
- 		StateMethod = StateField ;
- 		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
- 	]
-+	FN_REDLINE_ACCEPT_CURRENT // status()
-+	[
-+		ExecMethod = ExecField ;
-+		StateMethod = StateField ;
-+		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
-+	]
-+	FN_REDLINE_REJECT_CURRENT // status()
-+	[
-+		ExecMethod = ExecField ;
-+		StateMethod = StateField ;
-+		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR|SW_DISABLE_ON_MAILBOX_EDITOR";
-+	]
- 	FN_JAVAEDIT // status(final|play)
- 	[
- 		ExecMethod = ExecField ;
-diff -uNr sw/source/ui/inc/popup.hrc sw/source/ui/inc/popup.hrc
---- sw/source/ui/inc/popup.hrc	2008-04-11 04:23:49.000000000 +0800
-+++ sw/source/ui/inc/popup.hrc	2008-09-04 23:01:48.000000000 +0800
+diff --git sw/source/ui/inc/popup.hrc sw/source/ui/inc/popup.hrc
+index 7123cfc..00aa9b5 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)
@@ -126,9 +130,10 @@
  
  #if MN_MEDIA_POPUPMENU > RC_POPUPS_END
  
-diff -uNr sw/source/ui/inc/swmn_tmpl.hrc sw/source/ui/inc/swmn_tmpl.hrc
---- sw/source/ui/inc/swmn_tmpl.hrc	2008-04-11 04:30:37.000000000 +0800
-+++ sw/source/ui/inc/swmn_tmpl.hrc	2008-09-05 00:31:13.000000000 +0800
+diff --git sw/source/ui/inc/swmn_tmpl.hrc sw/source/ui/inc/swmn_tmpl.hrc
+index 5b8b70c..31545c4 100644
+--- sw/source/ui/inc/swmn_tmpl.hrc
++++ sw/source/ui/inc/swmn_tmpl.hrc
 @@ -62,7 +62,29 @@
          Identifier = FN_FORMAT_PAGE_DLG ; \
          HelpID = FN_FORMAT_PAGE_DLG ; \
@@ -160,7 +165,7 @@
  
  
  #define MN_TEXT_ATTR\
-@@ -315,6 +337,7 @@
+@@ -348,6 +370,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
          MN_TXT                                                              \
          MN_NUMBERING                                                        \
          ITEM_TRANSLITERATE_MENU                                             \
@@ -168,10 +173,11 @@
          SEPARATOR ;                                                         
  
  // not in Writer/Web
-diff -uNr sw/source/ui/shells/textfld.cxx sw/source/ui/shells/textfld.cxx
---- sw/source/ui/shells/textfld.cxx	2008-04-11 22:03:59.000000000 +0800
-+++ sw/source/ui/shells/textfld.cxx	2008-09-05 15:21:39.000000000 +0800
-@@ -507,6 +507,22 @@
+diff --git sw/source/ui/shells/textfld.cxx sw/source/ui/shells/textfld.cxx
+index 11e2170..45768ee 100644
+--- sw/source/ui/shells/textfld.cxx
++++ sw/source/ui/shells/textfld.cxx
+@@ -507,6 +507,22 @@ void SwTextShell::ExecField(SfxRequest &rReq)
  			}
  			break;
  
@@ -194,7 +200,7 @@
  			case FN_JAVAEDIT:
  			{
                  String aType, aText;
-@@ -710,6 +726,11 @@
+@@ -710,6 +726,11 @@ void SwTextShell::StateField( SfxItemSet &rSet )
  				if (!rSh.GetCurrRedline())
  					rSet.DisableItem(nWhich);
  				break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]