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

[pmladek svn gnome org]

Author: pmladek
Date: Mon Dec  8 17:16:26 2008
New Revision: 14780
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14780&view=rev

Log:
2008-12-08  Petr Mladek  <pmladek suse cz>

	* patches/dev300/dbaccess-righ-join-description.diff:  
	* patches/dev300/apply: fixes description of the RIGH JOIN selection
	  (bnc#431031, i#97026)

	* patches/dev300/apply: move pyuno-rpath-ooodir.diff,
	  system-python-ure-bootstrap.diff,
	  no-latex-filter-without-writer2latex.diff to a common section



Added:
   trunk/patches/dev300/dbaccess-righ-join-description.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec  8 17:16:26 2008
@@ -440,6 +440,9 @@
 
 mailmerge-ssl-ehlo.diff, i#76655, deb#5074448
 
+# fixes description of the RIGH JOIN selection
+dbaccess-righ-join-description.diff, bnc#431031, i#97026, pmladek
+
 [ Fixes == dev300-m35 ]
 
 connectivity-patch-i96331.diff, i#96331
@@ -1327,11 +1330,14 @@
 link-as-needed-bf.diff, i#89511, pmladek
 
 [ SystemBuildBits ]
+# !!!! applied only when libs_extern_sys source tarball is unpacked !!!!
 SectionOwner => fridrich
 
 # Mozilla build-bits to not break on Solaris 11
 moz-solaris11-makefiles.diff, fridrich
 
+[ BuildBits ]
+
 pyuno-rpath-ooodir.diff
 system-python-ure-bootstrap.diff, deb#501028, i#90701
 

Added: trunk/patches/dev300/dbaccess-righ-join-description.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/dbaccess-righ-join-description.diff	Mon Dec  8 17:16:26 2008
@@ -0,0 +1,19 @@
+--- dbaccess/source/ui/querydesign/querydlg.cxx.old	2008-06-25 14:56:00.000000000 +0200
++++ dbaccess/source/ui/querydesign/querydlg.cxx	2008-12-05 20:53:05.000000000 +0100
+@@ -276,8 +276,16 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, List
+ 	String sHelpText = String( ModuleRes( nResId ) );
+ 	if( nPos )
+ 	{
++	    if ( eJoinType == RIGHT_JOIN )
++	    {
++		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sFirstWinName );
++		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sSecondWinName );
++	    }
++	    else
++	    {
+ 		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sFirstWinName );
+ 		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sSecondWinName );
++	    }
+ 	}
+     if ( bAddHint )
+     {