[Libreoffice-commits] .: 6 commits - connectivity/source sfx2/source

[Jan Holesovsky]

 connectivity/source/parse/sqlbison.y |    2 +-
 sfx2/source/view/viewprn.cxx         |   32 +++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit a095ff5c29af74e34a912f461f29e1c3d42aa6b4
Merge: a2bef8f... 4b5bc29...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 1 16:08:28 2010 +0100

    Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core

commit a2bef8fea072520115c15b78c4aad283c43b2c3d
Merge: 8fc5187... 49dc64e...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 1 13:49:24 2010 +0100

    Merge commit 'ooo/OOO330_m13'

commit 49dc64ee28dfc4622787feb38ef7fa2381fccfa8
Merge: 8d53828... 55e441c...
Author: obo <obo at openoffice.org>
Date:   Thu Oct 28 10:55:51 2010 +0200

    CWS-TOOLING: integrate CWS calc61

commit 55e441c4249d3158f669cda491f655081a6d698f
Author: Niklas Nebel <nn at openoffice.org>
Date:   Wed Oct 27 17:08:35 2010 +0200

    calc61: #i115266# handle multiple selection for printing, return valid settings for invalid selection, catch exception from getRenderer

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 43c9c8b..fbfdb7e 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -143,18 +143,26 @@ SfxPrinterController::SfxPrinterController( const Any& i_rComplete,
         aRenderOptions[1].Value = i_rViewProp;
         aRenderOptions[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) );
         aRenderOptions[2].Value <<= sal_True;
-        Sequence< beans::PropertyValue > aRenderParms( mxRenderable->getRenderer( 0 , getSelectionObject(), aRenderOptions ) );
-        int nProps = aRenderParms.getLength();
-        for( int i = 0; i < nProps; i++ )
+        try
         {
-            if( aRenderParms[i].Name.equalsAscii( "ExtraPrintUIOptions" ) )
+            Sequence< beans::PropertyValue > aRenderParms( mxRenderable->getRenderer( 0 , getSelectionObject(), aRenderOptions ) );
+            int nProps = aRenderParms.getLength();
+            for( int i = 0; i < nProps; i++ )
             {
-                Sequence< beans::PropertyValue > aUIProps;
-                aRenderParms[i].Value >>= aUIProps;
-                setUIOptions( aUIProps );
-                break;
+                if( aRenderParms[i].Name.equalsAscii( "ExtraPrintUIOptions" ) )
+                {
+                    Sequence< beans::PropertyValue > aUIProps;
+                    aRenderParms[i].Value >>= aUIProps;
+                    setUIOptions( aUIProps );
+                    break;
+                }
             }
         }
+        catch( lang::IllegalArgumentException& )
+        {
+            // the first renderer should always be available for the UI options,
+            // but catch the exception to be safe
+        }
     }
 
     // set some job parameters
@@ -234,7 +242,13 @@ Sequence< beans::PropertyValue > SfxPrinterController::getPageParameters( int i_
     if( mxRenderable.is() && pPrinter )
     {
         Sequence< beans::PropertyValue > aJobOptions( getMergedOptions() );
-        aResult = mxRenderable->getRenderer( i_nPage, getSelectionObject(), aJobOptions );
+        try
+        {
+            aResult = mxRenderable->getRenderer( i_nPage, getSelectionObject(), aJobOptions );
+        }
+        catch( lang::IllegalArgumentException& )
+        {
+        }
     }
     return aResult;
 }
commit 8d53828f76f6e52c7ac9932bc3db93f05796750c
Merge: 84d5075... 95f5ddc9...
Author: obo <obo at openoffice.org>
Date:   Wed Oct 27 15:14:02 2010 +0200

    CWS-TOOLING: integrate CWS dba33l

commit 95f5ddc9bb53cdd7c98946517489721161974414
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date:   Mon Oct 25 08:03:46 2010 +0200

    dba33l: #i115165# allow NULL as parameter value

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 84e9aa2..9709d33 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -2627,7 +2627,7 @@ value_exp_commalist:
 		}
 	;
 function_arg:
-		value_exp 
+		result 
 	|	value_exp comparison value_exp
 		{
 			$$ = SQL_NEW_RULE;