ooo-build r11692 - in branches/opensuse-10-3: . patches/scsolver

[kyoshida svn gnome org]

Author: kyoshida
Date: Sat Feb 23 00:41:29 2008
New Revision: 11692
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11692&view=rev

Log:
2008-02-22  Kohei Yoshida  <kyoshida novell com>

	* patches/scsolver/scsolver-source-inc-scsolver-hrc.diff:
	* patches/scsolver/scsolver-source-ui-scsolver-src.diff:
	* patches/scsolver/scsolver-source-ui-solvemodel-cxx.diff: removed 
	two new strings introduced since last update, to avoid updating of the
	lang packs.


Modified:
   branches/opensuse-10-3/ChangeLog
   branches/opensuse-10-3/patches/scsolver/scsolver-source-inc-scsolver-hrc.diff
   branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-scsolver-src.diff
   branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-solvemodel-cxx.diff

Modified: branches/opensuse-10-3/patches/scsolver/scsolver-source-inc-scsolver-hrc.diff
==============================================================================
--- branches/opensuse-10-3/patches/scsolver/scsolver-source-inc-scsolver-hrc.diff	(original)
+++ branches/opensuse-10-3/patches/scsolver/scsolver-source-inc-scsolver-hrc.diff	Sat Feb 23 00:41:29 2008
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ scsolver/source/inc/scsolver.hrc	
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,41 @@
 +#ifndef SCSOLVER_HRC
 +#define SCSOLVER_HRC
 +
@@ -40,7 +40,5 @@
 +#define SCSOLVER_STR_OPTION_ASSUME_LINEAR         (SCSOLVER_RES_START+31)
 +#define SCSOLVER_STR_OPTION_VAR_POSITIVE          (SCSOLVER_RES_START+32)
 +#define SCSOLVER_STR_OPTION_VAR_INTEGER           (SCSOLVER_RES_START+33)
-+#define SCSOLVER_STR_TARGET_NOT_SET               (SCSOLVER_RES_START+34)
-+#define SCSOLVER_STR_DECISIONVAR_NOT_SET          (SCSOLVER_RES_START+35)
 +
 +#endif

Modified: branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-scsolver-src.diff
==============================================================================
--- branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-scsolver-src.diff	(original)
+++ branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-scsolver-src.diff	Sat Feb 23 00:41:29 2008
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ scsolver/source/ui/scsolver.src	
-@@ -0,0 +1,319 @@
+@@ -0,0 +1,307 @@
 +#include "scsolver.hrc"
 +
 +String SCSOLVER_STR_MAINDLG_TITLE
@@ -307,16 +307,4 @@
 +	Text [ ru ] = "ÐÐÐÑÐÐ ÑÐÐÑÐ ÐÐÐÑÐÐÐÑ";
 +};
 +
-+String SCSOLVER_STR_TARGET_NOT_SET
-+{
-+    Text [ en-US ] = "Target cell address empty";
-+    Text [ ru ] = "ÐÐ ÐÐÐÐÐÐ ÑÑÐÐÐÐ ÑÐÐÐÐÐÐ ÑÑÐÐÑÐÐ";
-+};
-+
-+String SCSOLVER_STR_DECISIONVAR_NOT_SET
-+{
-+    Text [ en-US ] = "Decision variable cells empty";
-+    Text [ ru ] = "ÐÐ ÐÐÐÐÐÑ ÑÑÐÐÐÐ ÐÐÑÐÐÐÑÑÐÐ";
-+};
-+
 +

Modified: branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-solvemodel-cxx.diff
==============================================================================
--- branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-solvemodel-cxx.diff	(original)
+++ branches/opensuse-10-3/patches/scsolver/scsolver-source-ui-solvemodel-cxx.diff	Sat Feb 23 00:41:29 2008
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ scsolver/source/ui/solvemodel.cxx	
-@@ -0,0 +1,750 @@
+@@ -0,0 +1,749 @@
 +/*************************************************************************
 + *
 + *  The Contents of this file are made available subject to
@@ -514,7 +514,7 @@
 +	{
 +		rtl::OUString sTargetCellAddr = m_pSolverImpl->getMainDialog()->getTargetCellAddress();
 +		if ( !sTargetCellAddr.getLength() )
-+			throw RuntimeError( getSolverImpl()->getResStr(SCSOLVER_STR_TARGET_NOT_SET) );
++			throw RuntimeError( ascii_i18n("Target cell address empty") );
 +
 +		CellAddress aAddr = m_pSolverImpl->getCalcInterface()->getCellAddress(
 +			sTargetCellAddr );
@@ -535,8 +535,7 @@
 +	
 +		rtl::OUString sAddr = m_pSolverImpl->getMainDialog()->getVarCellAddress();
 +		if ( !sAddr.getLength() )
-+			throw RuntimeError( 
-+                getSolverImpl()->getResStr(SCSOLVER_STR_DECISIONVAR_NOT_SET) );
++			throw RuntimeError( ascii_i18n("Decision variable cells empty") );
 +
 +		CellRangeAddress aRangeAddr = m_pSolverImpl->getCalcInterface()->getCellRangeAddress(sAddr);
 +