rpms/openoffice.org/F-9 openoffice.org.spec, 1.1457, 1.1458 workspace.notes2.patch, 1.5, 1.6
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Apr 1 08:22:25 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27779
Modified Files:
openoffice.org.spec workspace.notes2.patch
Log Message:
rhbz#439727 upgrade to notes3
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1457
retrieving revision 1.1458
diff -u -r1.1457 -r1.1458
--- openoffice.org.spec 28 Mar 2008 09:28:02 -0000 1.1457
+++ openoffice.org.spec 1 Apr 2008 08:21:37 -0000 1.1458
@@ -1,6 +1,6 @@
%define oootag OOH680
%define ooomilestone 12
-%define rh_rpm_release 3
+%define rh_rpm_release 4
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -2890,6 +2890,9 @@
%changelog
+* Tue Apr 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.4
+- Resolves: rhbz#439727 add workspace.notes3.patch4
+
* Fri Mar 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.3
- add openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
- add openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
workspace.notes2.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 workspace.notes2.patch
Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.notes2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.notes2.patch 6 Feb 2008 13:44:01 -0000 1.5
+++ workspace.notes2.patch 1 Apr 2008 08:21:37 -0000 1.6
@@ -1,489 +1,481 @@
-Index: util/tools/inc/tools/color.hxx
-diff -u util/tools/inc/tools/color.hxx:1.2 util/tools/inc/tools/color.hxx:1.2.70.4
---- util/tools/inc/tools/color.hxx:1.2 Wed Apr 11 13:08:56 2007
-+++ util/tools/inc/tools/color.hxx Thu Jan 31 04:24:58 2008
-@@ -88,6 +88,33 @@
- #define COL_WHITE RGB_COLORDATA( 0xFF, 0xFF, 0xFF )
- #define COL_TRANSPARENT TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF )
- #define COL_AUTO (UINT32)0xFFFFFFFF
-+#define COL_AUTHOR1_DARK RGB_COLORDATA(198, 146, 0)
-+#define COL_AUTHOR1_NORMAL RGB_COLORDATA(255, 255, 158)
-+#define COL_AUTHOR1_LIGHT RGB_COLORDATA(255, 255, 195)
-+#define COL_AUTHOR2_DARK RGB_COLORDATA(6, 70, 162)
-+#define COL_AUTHOR2_NORMAL RGB_COLORDATA(216, 232, 255)
-+#define COL_AUTHOR2_LIGHT RGB_COLORDATA(233, 242, 255)
-+#define COL_AUTHOR3_DARK RGB_COLORDATA(87, 157, 28)
-+#define COL_AUTHOR3_NORMAL RGB_COLORDATA(218, 248, 193)
-+#define COL_AUTHOR3_LIGHT RGB_COLORDATA(226, 250, 207)
-+#define COL_AUTHOR4_DARK RGB_COLORDATA(105, 43, 157)
-+#define COL_AUTHOR4_NORMAL RGB_COLORDATA(228, 210, 245)
-+#define COL_AUTHOR4_LIGHT RGB_COLORDATA(239, 228, 248)
-+#define COL_AUTHOR5_DARK RGB_COLORDATA(197, 0, 11)
-+#define COL_AUTHOR5_NORMAL RGB_COLORDATA(254, 205, 208)
-+#define COL_AUTHOR5_LIGHT RGB_COLORDATA(255, 227, 229)
-+#define COL_AUTHOR6_DARK RGB_COLORDATA(0, 128, 128)
-+#define COL_AUTHOR6_NORMAL RGB_COLORDATA(210, 246, 246)
-+#define COL_AUTHOR6_LIGHT RGB_COLORDATA(230, 250, 250)
-+#define COL_AUTHOR7_DARK RGB_COLORDATA(140, 132, 0)
-+#define COL_AUTHOR7_NORMAL RGB_COLORDATA(237, 252, 163)
-+#define COL_AUTHOR7_LIGHT RGB_COLORDATA(242, 254, 181)
-+#define COL_AUTHOR8_DARK RGB_COLORDATA(53, 85, 107)
-+#define COL_AUTHOR8_NORMAL RGB_COLORDATA(211, 222, 232)
-+#define COL_AUTHOR8_LIGHT RGB_COLORDATA(226, 234, 241)
-+#define COL_AUTHOR9_DARK RGB_COLORDATA(209, 118, 0)
-+#define COL_AUTHOR9_NORMAL RGB_COLORDATA(255, 226, 185)
-+#define COL_AUTHOR9_LIGHT RGB_COLORDATA(255, 231, 199)
+Index: framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
+diff -u framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx:1.9 framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx:1.9.28.1
+--- framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx:1.9 Thu Sep 6 06:09:46 2007
++++ framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx Sun Dec 2 15:10:53 2007
+@@ -97,7 +97,6 @@
+ /*N*/ Color SwViewOption::aFieldShadingsColor(COL_LIGHTGRAY);
+ /*N*/ Color SwViewOption::aSectionBoundColor(COL_LIGHTGRAY);
+ /*M*/ Color SwViewOption::aPageBreakColor(COL_BLUE);
+-/*N*/ Color SwViewOption::aNotesIndicatorColor(COL_YELLOW);
+ /*N*/ Color SwViewOption::aScriptIndicatorColor(COL_GREEN);
+ /*N*/
+ /*N*/ sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
+@@ -393,7 +392,6 @@
+ /*N*/ aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS);
+ /*N*/ aPageBreakColor.SetColor(aValue.nColor);
+ /*N*/
+-/*N*/ aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERNOTESINDICATOR).nColor);
+ /*N*/ aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
+ /*N*/ }
+ /* -----------------------------23.04.2002 17:48------------------------------
+Index: util/svtools/inc/svtools/colorcfg.hxx
+diff -u util/svtools/inc/svtools/colorcfg.hxx:1.3 util/svtools/inc/svtools/colorcfg.hxx:1.3.154.1
+--- util/svtools/inc/svtools/colorcfg.hxx:1.3 Wed Jun 27 06:44:14 2007
++++ util/svtools/inc/svtools/colorcfg.hxx Sun Dec 2 12:54:44 2007
+@@ -77,7 +77,6 @@
+ WRITERFIELDSHADINGS ,
+ WRITERIDXSHADINGS ,
+ WRITERDIRECTCURSOR ,
+- WRITERNOTESINDICATOR,
+ WRITERSCRIPTINDICATOR,
+ WRITERSECTIONBOUNDARIES,
+ WRITERPAGEBREAKS,
+Index: util/svtools/source/config/colorcfg.cxx
+diff -u util/svtools/source/config/colorcfg.cxx:1.17 util/svtools/source/config/colorcfg.cxx:1.17.140.1
+--- util/svtools/source/config/colorcfg.cxx:1.17 Fri Jul 6 03:04:05 2007
++++ util/svtools/source/config/colorcfg.cxx Sun Dec 2 12:54:44 2007
+@@ -200,7 +200,6 @@
+ { RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),sal_True },
+ { RTL_CONSTASCII_USTRINGPARAM("/WriterIdxShadings") ,sal_True },
+ { RTL_CONSTASCII_USTRINGPARAM("/WriterDirectCursor") ,sal_True },
+- { RTL_CONSTASCII_USTRINGPARAM("/WriterNotesIndicator") ,sal_False },
+ { RTL_CONSTASCII_USTRINGPARAM("/WriterScriptIndicator") ,sal_False },
+ { RTL_CONSTASCII_USTRINGPARAM("/WriterSectionBoundaries") ,sal_True },
+ { RTL_CONSTASCII_USTRINGPARAM("/WriterPageBreaks") ,sal_False },
+@@ -569,8 +568,7 @@
+ 0xc0c0c0, // WRITERFIELDSHADIN
+ 0xc0c0c0, // WRITERIDXSHADINGS
+ 0, // WRITERDIRECTCURSOR
+- COL_YELLOW, //WRITERNOTESINDICATOR
+- COL_GREEN, //WRITERSCRIPTINDICATOR
++ COL_GREEN, //WRITERSCRIPTINDICATOR
+ 0xc0c0c0, //WRITERSECTIONBOUNDARIES
+ COL_BLUE, //WRITERPAGEBREAKS,
+ COL_LIGHTBLUE, // HTMLSGML
+Index: sw/sw/inc/viewopt.hxx
+diff -u sw/sw/inc/viewopt.hxx:1.28 sw/sw/inc/viewopt.hxx:1.27.6.2
+--- sw/sw/inc/viewopt.hxx:1.28 Tue Feb 19 05:35:32 2008
++++ sw/sw/inc/viewopt.hxx Wed Mar 5 01:26:52 2008
+@@ -156,7 +156,6 @@
+ static Color aFieldShadingsColor;
+ static Color aSectionBoundColor;
+ static Color aPageBreakColor;
+- static Color aNotesIndicatorColor;
+ static Color aScriptIndicatorColor;
- #define COLOR_CHANNEL_MERGE( _def_cDst, _def_cSrc, _def_cSrcTrans ) \
- ((BYTE)((((long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8L)|(_def_cDst)))>>8L))
-Index: util/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
-diff -u util/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu:1.32 util/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu:1.32.62.1
---- util/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu:1.32 Thu Nov 22 07:25:14 2007
-+++ util/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu Sun Jan 27 07:45:10 2008
-@@ -34,6 +34,11 @@
- <value xml:lang="en-US">Run AutoText Entry</value>
- </prop>
- </node>
-+ <node oor:name=".uno:ShowAnnotations" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="en-US">Notes</value>
-+ </prop>
-+ </node>
- <node oor:name=".uno:ShowHiddenParagraphs" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Hidden Paragraphs</value>
-Index: sw/sw/inc/PostItMgr.hxx
-diff -u /dev/null sw/sw/inc/PostItMgr.hxx:1.1.2.56
---- /dev/null Tue Feb 5 02:33:13 2008
-+++ sw/sw/inc/PostItMgr.hxx Thu Jan 31 02:08:57 2008
-@@ -0,0 +1,204 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * last change: $Author$ $Date$
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef _POSTITMGR_HXX
-+#define _POSTITMGR_HXX
-+
-+#ifndef _SFXLSTNER_HXX
-+#include <svtools/lstner.hxx>
-+#endif
-+
-+#include <list>
-+#include <vector>
-+
-+#include <tools/link.hxx>
-+#include <swrect.hxx>
-+
-+class SwWrtShell;
-+class SwDoc;
-+class SwView;
-+class SwPostItField;
-+class SwFmtFld;
-+class SfxBroadcaster;
-+class SfxHint;
-+class SwPostIt;
-+class SwEditWin;
-+class Color;
-+
-+#define SORT_POS 1
-+#define SORT_AUTHOR 2
-+#define SORT_DATE 3
-+
-+#define COL_NOTES_SIDEPANE_ARROW_ENABLED RGB_COLORDATA(0,0,0)
-+#define COL_NOTES_SIDEPANE_ARROW_DISABLED RGB_COLORDATA(172,168,153)
-+
-+
-+struct SwPostItItem
[...31862 lines suppressed...]
- Text [ en-US ] = "Identifier";
- };
-- LB_WN( BASICIDENTIFIER, 37 )
-+ LB_WN( BASICIDENTIFIER, 36 )
+@@ -1297,8 +1295,7 @@
- FixedText FT_BASICCOMMENT
- {
-- FT_POS_SIZE( 38 );
-+ FT_POS_SIZE( 37 );
- Text [ en-US ] = "Comment";
- };
-- LB_WN( BASICCOMMENT, 38 )
-+ LB_WN( BASICCOMMENT, 37 )
+ if ( mpPostItMgr )
+ {
+- if ( pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
+- mpPostItMgr->CalcRects();
++ mpPostItMgr->CalcRects();
+ mpPostItMgr->LayoutPostIts();
+ }
+ }
+Index: sw/sw/source/ui/uiview/viewsrch.cxx
+diff -u sw/sw/source/ui/uiview/viewsrch.cxx:1.29 sw/sw/source/ui/uiview/viewsrch.cxx:1.29.132.1
+--- sw/sw/source/ui/uiview/viewsrch.cxx:1.29 Wed Dec 5 08:44:36 2007
++++ sw/sw/source/ui/uiview/viewsrch.cxx Thu Mar 27 07:53:20 2008
+@@ -133,6 +133,8 @@
+ #include <comcore.hrc>
+ #endif
- FixedText FT_BASICNUMBER
- {
-- FT_POS_SIZE( 39 );
-+ FT_POS_SIZE( 38 );
- Text [ en-US ] = "Number";
- };
-- LB_WN( BASICNUMBER, 39 )
-+ LB_WN( BASICNUMBER, 38)
++#include "PostItMgr.hxx"
++
+ using namespace com::sun::star;
+ using namespace ::com::sun::star::i18n;
+ using namespace ::com::sun::star::lang;
+@@ -209,7 +211,7 @@
+ break;
- FixedText FT_BASICSTRING
- {
-- FT_POS_SIZE( 40 );
-+ FT_POS_SIZE( 39 );
- Text [ en-US ] = "String";
- };
-- LB_WN( BASICSTRING, 40 )
-+ LB_WN( BASICSTRING, 39 )
+ case FID_SEARCH_OFF:
+- if(pArgs)
++ if(pArgs)
+ {
+ // Dialog abmelden
+ delete pSrchItem;
+@@ -403,6 +405,7 @@
+ }
+ break;
+ }
++
+ uno::Reference< frame::XDispatchRecorder > xRecorder =
+ GetViewFrame()->GetBindings().GetRecorder();
+ //prevent additional dialogs in recorded macros
+@@ -692,7 +695,6 @@
+ }
+ }
- FixedText FT_BASICOPERATOR
- {
-- FT_POS_SIZE( 41 );
-+ FT_POS_SIZE( 40 );
- Text [ en-US ] = "Operator";
- };
-- LB_WN( BASICOPERATOR, 41 )
-+ LB_WN( BASICOPERATOR, 40 )
+-
+ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
+ {
+ BOOL bDoReplace = pSrchItem->GetCommand() == SVX_SEARCHCMD_REPLACE ||
+Index: sw/sw/source/ui/wrtsh/wrtsh2.cxx
+diff -u sw/sw/source/ui/wrtsh/wrtsh2.cxx:1.31 sw/sw/source/ui/wrtsh/wrtsh2.cxx:1.30.6.3
+--- sw/sw/source/ui/wrtsh/wrtsh2.cxx:1.31 Tue Feb 26 06:27:49 2008
++++ sw/sw/source/ui/wrtsh/wrtsh2.cxx Fri Mar 14 16:41:52 2008
+@@ -174,8 +174,7 @@
- FixedText FT_BASICKEYWORD
- {
-- FT_POS_SIZE( 42 );
-+ FT_POS_SIZE( 41 );
- Text [ en-US ] = "Reserved expression";
- };
-- LB_WN( BASICKEYWORD, 42 )
-+ LB_WN( BASICKEYWORD, 41 )
+ StartUndo(UNDO_INSERT, &aRewriter);
- FixedText FT_BASICERROR
- {
-- FT_POS_SIZE( 43 );
-+ FT_POS_SIZE( 42 );
- Text [ en-US ] = "Error";
- };
-- LB_WN( BASICERROR, 43 )
-+ LB_WN( BASICERROR, 42 )
+- USHORT nType = rFld.GetTyp()->Which();
+- if( HasSelection() && nType != RES_POSTITFLD)
++ if( HasSelection() )
+ DelRight();
- String ST_EXTENSION
- {
+ SwEditShell::Insert(rFld);
+Index: sw/sw/uiconfig/sglobal/menubar/menubar.xml
+diff -u sw/sw/uiconfig/sglobal/menubar/menubar.xml:1.29 sw/sw/uiconfig/sglobal/menubar/menubar.xml:1.28.6.2
+--- sw/sw/uiconfig/sglobal/menubar/menubar.xml:1.29 Fri Mar 7 04:24:51 2008
++++ sw/sw/uiconfig/sglobal/menubar/menubar.xml Thu Mar 13 04:04:59 2008
+@@ -116,8 +116,8 @@
+ <menu:menuitem menu:id=".uno:Marks"/>
+ <menu:menuitem menu:id=".uno:Fieldnames"/>
+ <menu:menuitem menu:id=".uno:ControlCodes"/>
+- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
++ <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
+ <menu:menuseparator/>
+Index: sw/sw/uiconfig/sweb/menubar/menubar.xml
+diff -u sw/sw/uiconfig/sweb/menubar/menubar.xml:1.28 sw/sw/uiconfig/sweb/menubar/menubar.xml:1.27.6.2
+--- sw/sw/uiconfig/sweb/menubar/menubar.xml:1.28 Fri Mar 7 04:26:10 2008
++++ sw/sw/uiconfig/sweb/menubar/menubar.xml Thu Mar 13 04:05:03 2008
+@@ -89,8 +89,8 @@
+ <menu:menuitem menu:id=".uno:Marks"/>
+ <menu:menuitem menu:id=".uno:Fieldnames"/>
+ <menu:menuitem menu:id=".uno:ControlCodes"/>
+- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
++ <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
+ <menu:menuseparator/>
+Index: sw/sw/uiconfig/swform/menubar/menubar.xml
+diff -u sw/sw/uiconfig/swform/menubar/menubar.xml:1.5 sw/sw/uiconfig/swform/menubar/menubar.xml:1.4.6.2
+--- sw/sw/uiconfig/swform/menubar/menubar.xml:1.5 Fri Mar 7 04:26:28 2008
++++ sw/sw/uiconfig/swform/menubar/menubar.xml Thu Mar 13 04:05:06 2008
+@@ -117,8 +117,8 @@
+ <menu:menuitem menu:id=".uno:Marks"/>
+ <menu:menuitem menu:id=".uno:Fieldnames"/>
+ <menu:menuitem menu:id=".uno:ControlCodes"/>
+- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
++ <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
+ <menu:menuseparator/>
+Index: sw/sw/uiconfig/swreport/menubar/menubar.xml
+diff -u sw/sw/uiconfig/swreport/menubar/menubar.xml:1.5 sw/sw/uiconfig/swreport/menubar/menubar.xml:1.4.6.2
+--- sw/sw/uiconfig/swreport/menubar/menubar.xml:1.5 Fri Mar 7 04:27:03 2008
++++ sw/sw/uiconfig/swreport/menubar/menubar.xml Thu Mar 13 04:05:10 2008
+@@ -117,8 +117,8 @@
+ <menu:menuitem menu:id=".uno:Marks"/>
+ <menu:menuitem menu:id=".uno:Fieldnames"/>
+ <menu:menuitem menu:id=".uno:ControlCodes"/>
+- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
++ <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
+ <menu:menuseparator/>
+Index: sw/sw/uiconfig/swriter/menubar/menubar.xml
+diff -u sw/sw/uiconfig/swriter/menubar/menubar.xml:1.32 sw/sw/uiconfig/swriter/menubar/menubar.xml:1.31.6.2
+--- sw/sw/uiconfig/swriter/menubar/menubar.xml:1.32 Fri Mar 7 04:27:36 2008
++++ sw/sw/uiconfig/swriter/menubar/menubar.xml Thu Mar 13 04:05:13 2008
+@@ -119,8 +119,8 @@
+ <menu:menuitem menu:id=".uno:Marks"/>
+ <menu:menuitem menu:id=".uno:Fieldnames"/>
+ <menu:menuitem menu:id=".uno:ControlCodes"/>
+- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
++ <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
+ <menu:menuseparator/>
+Index: sw/sw/uiconfig/swxform/menubar/menubar.xml
+diff -u sw/sw/uiconfig/swxform/menubar/menubar.xml:1.5 sw/sw/uiconfig/swxform/menubar/menubar.xml:1.4.6.2
+--- sw/sw/uiconfig/swxform/menubar/menubar.xml:1.5 Fri Mar 7 04:28:14 2008
++++ sw/sw/uiconfig/swxform/menubar/menubar.xml Thu Mar 13 04:05:17 2008
+@@ -117,8 +117,8 @@
+ <menu:menuitem menu:id=".uno:Marks"/>
+ <menu:menuitem menu:id=".uno:Fieldnames"/>
+ <menu:menuitem menu:id=".uno:ControlCodes"/>
+- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
++ <menu:menuitem menu:id=".uno:ShowAnnotations"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
+ <menu:menuseparator/>
More information about the fedora-extras-commits
mailing list