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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Feb 18 15:32:54 2009
New Revision: 15369
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15369&view=rev

Log:
2009-02-18  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-odf-always-calc-a1.diff:
	* patches/dev300/default-no-registration-menu-sd.diff: reverted to 
	re-add those CR line endings, to make these patches apply on linux.  I
	am aware that this will break the patch apply process on Windows 
	temporarily, but hopefully we can fix it the right way in the upstream 
	build.  See i#99305 for more details.  Meanwhile, please manually run 
	dos2unix on these patches on Windows, to make them apply.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/chart-odf-always-calc-a1.diff
   trunk/patches/dev300/default-no-registration-menu-sd.diff

Modified: trunk/patches/dev300/chart-odf-always-calc-a1.diff
==============================================================================
--- trunk/patches/dev300/chart-odf-always-calc-a1.diff	(original)
+++ trunk/patches/dev300/chart-odf-always-calc-a1.diff	Wed Feb 18 15:32:54 2009
@@ -582,15 +582,15 @@
 index deb1e33..7c23cd4 100644
 --- sc/source/filter/xml/XMLStylesExportHelper.cxx
 +++ sc/source/filter/xml/XMLStylesExportHelper.cxx
-@@ -306,7 +306,7 @@
- rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell)
- {
- 	rtl::OUString sAddress;
--	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
-+	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- 	return sAddress;
- }
- 
+@@ -306,7 +306,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
+ rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell)
+ {
+ 	rtl::OUString sAddress;
+-	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
++	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO );
+ 	return sAddress;
+ }
+ 
 diff --git sc/source/filter/xml/XMLTableShapeImportHelper.cxx sc/source/filter/xml/XMLTableShapeImportHelper.cxx
 index 7f9fb3f..ddb902b 100644
 --- sc/source/filter/xml/XMLTableShapeImportHelper.cxx

Modified: trunk/patches/dev300/default-no-registration-menu-sd.diff
==============================================================================
--- trunk/patches/dev300/default-no-registration-menu-sd.diff	(original)
+++ trunk/patches/dev300/default-no-registration-menu-sd.diff	Wed Feb 18 15:32:54 2009
@@ -3,22 +3,22 @@
 --- sd/uiconfig/sdraw/menubar/menubar.xml
 +++ sd/uiconfig/sdraw/menubar/menubar.xml
 @@ -319,7 +319,6 @@
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
--			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>
 diff --git sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
 index b01d431..8e6fd46 100644
 --- sd/uiconfig/simpress/menubar/menubar.xml
 +++ sd/uiconfig/simpress/menubar/menubar.xml
 @@ -294,7 +294,6 @@
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
--			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>