[ooo-build-commit] .: patches/dev300

[Muthu Subramanian]

 patches/dev300/desktop-cmd-bulk-conversion.diff |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 84a8d51fc9390f7432fe8a8f7ffe3118c42d47b8
Author: Muthu Subramanian K <sumuthu at novell.com>
Date:   Thu Jul 1 20:31:35 2010 +0530

    Updated batch conv patch for windows (':' problem with path)
    
    * patches/dev300/desktop-cmd-bulk-conversion.diff

diff --git a/patches/dev300/desktop-cmd-bulk-conversion.diff b/patches/dev300/desktop-cmd-bulk-conversion.diff
index 293b3c0..3ae5ed4 100644
--- a/patches/dev300/desktop-cmd-bulk-conversion.diff
+++ b/patches/dev300/desktop-cmd-bulk-conversion.diff
@@ -331,7 +331,7 @@ diff -upr desktop/source/app/officeipcthread.hxx desktop/source/app/officeipcthr
          // load the document ... if they are loadable!
          // Otherwise try to dispatch it ...
          Reference < XPrintable > xDoc;
-@@ -361,24 +407,87 @@ sal_Bool DispatchWatcher::executeDispatc
+@@ -361,24 +407,89 @@ sal_Bool DispatchWatcher::executeDispatc
                  OfficeIPCThread::RequestsCompleted( 1 );
              }
              else if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
@@ -349,7 +349,9 @@ diff -upr desktop/source/app/officeipcthread.hxx desktop/source/app/officeipcthr
 +                        if ( xStorable.is() ) {
 +                            rtl::OUString aParam = aDispatchRequest.aPrinterName;
 +                            sal_Int32 nPathIndex =  aParam.lastIndexOfAsciiL( ";", 1 );
-+                            sal_Int32 nFilterIndex = aParam.lastIndexOfAsciiL( ":", 1 );
++                            sal_Int32 nFilterIndex = aParam.indexOfAsciiL( ":", 1 );
++                            if( nPathIndex < nFilterIndex )
++                                nFilterIndex = -1;
 +                            rtl::OUString aFilterOut=aParam.copy( nPathIndex+1 );
 +                            rtl::OUString aFilter;
 +                            rtl::OUString aFilterExt;