strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged rvp exceptionhandling

Browse source
This commit is contained in:
Stephan Schäfer 2001-05-18 08:26:12 +00:00
parent 1808871453
commit e254cf2f60
3 changed files with 94 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vcl/source/app/svapp.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: svapp.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: pl $ $Date: 2001-04-26 14:01:11 $
* last change: $Author: ssa $ $Date: 2001-05-18 09:22:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -174,6 +174,8 @@
#include <osl/module.h>
using namespace ::com::sun::star::uno;
// #include <usr/refl.hxx>
class Reflection;
@ -1478,8 +1480,16 @@ SystemInfoType Application::GetClientSystem()
ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->mxStatus.is() )
{
CHECK_FOR_RVPSYNC_NORMAL()
nImplClientSystemInfo = (SystemInfoType)pSVData->mxStatus->GetSystemType();
CHECK_FOR_RVPSYNC_NORMAL();
try
{
nImplClientSystemInfo = (SystemInfoType)pSVData->mxStatus->GetSystemType();
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
nImplClientSystemInfo = 0;
}
}
}

15
vcl/source/app/svmain.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: svmain.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: jbu $ $Date: 2001-05-11 16:19:19 $
* last change: $Author: ssa $ $Date: 2001-05-18 09:22:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -401,8 +401,15 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
// CHECK_FOR_RVPSYNC_NORMAL()
// pSVData->mxStatus->ShowError(
// OUString( RTL_CONSTASCII_USTRINGPARAM("Wrong Office-Version")), 0 );
CHECK_FOR_RVPSYNC_NORMAL()
pSVData->mxStatus->Quit();
CHECK_FOR_RVPSYNC_NORMAL();
try
{
pSVData->mxStatus->Quit();
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
}
return sal_False;
}
}

100
vcl/source/gdi/print.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: print.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2001-05-17 07:38:57 $
* last change: $Author: ssa $ $Date: 2001-05-18 09:26:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -393,9 +393,17 @@ static void ImplInitPrnQueueList()
REF( NMSP_CLIENT::XRmPrinterEnvironment ) xPrinterEnv( pSVData->mpRemotePrinterList->GetPrinterEnv( pPrinterInfo->aServerName ) );
if ( xPrinterEnv.is() )
{
CHECK_FOR_RVPSYNC_NORMAL()
if ( xPrinterEnv->GetPrinterInfo( pPrinterInfo->aPrinterName.GetBuffer(), pPrinterInfo->aRmQueueInfo ) )
bPrinterInfoOk = TRUE;
CHECK_FOR_RVPSYNC_NORMAL();
try
{
if ( xPrinterEnv->GetPrinterInfo( pPrinterInfo->aPrinterName.GetBuffer(), pPrinterInfo->aRmQueueInfo ) )
bPrinterInfoOk = TRUE;
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
bPrinterInfoOk = FALSE;
}
}
}
else
@ -1739,31 +1747,40 @@ BOOL Printer::StartJob( const XubString& rJobName )
REF( NMSP_CLIENT::XRmSpoolLauncher ) xLauncher( xServerFactory->createInstance( ::rtl::OUString::createFromAscii( "OfficeSpoolLauncher.stardiv.de" ) ), NMSP_UNO::UNO_QUERY );
if( xLauncher.is() )
{
CHECK_FOR_RVPSYNC_NORMAL()
if ( xLauncher->LaunchSpooler( pSVData->mpUserInfo->sName,
pSVData->mpUserInfo->sPassword ) )
CHECK_FOR_RVPSYNC_NORMAL();
try
{
if( xBridgeFactory.is() ) // else this a the client connection
if ( xLauncher->LaunchSpooler( pSVData->mpUserInfo->sName,
pSVData->mpUserInfo->sPassword ) )
{
// get objects from transferred sospool connection
xServerFactory = Reference< ::com::sun::star::lang::XMultiServiceFactory >();
Reference< ::com::sun::star::bridge::XBridge >
xBridge( xBridgeFactory->createBridge( ::rtl::OUString(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) ), xConnection, Reference< ::com::sun::star::bridge::XInstanceProvider >() ) );
xServerFactory = Reference< ::com::sun::star::lang::XMultiServiceFactory >( xBridge->getInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpoolMultiServiceFactory.sprintd.daemons.stardiv.de" ) ) ), UNO_QUERY );
}
if( xBridgeFactory.is() ) // else this a the client connection
{
// get objects from transferred sospool connection
xServerFactory = Reference< ::com::sun::star::lang::XMultiServiceFactory >();
Reference< ::com::sun::star::bridge::XBridge >
xBridge( xBridgeFactory->createBridge( ::rtl::OUString(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) ), xConnection, Reference< ::com::sun::star::bridge::XInstanceProvider >() ) );
xServerFactory = Reference< ::com::sun::star::lang::XMultiServiceFactory >( xBridge->getInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpoolMultiServiceFactory.sprintd.daemons.stardiv.de" ) ) ), UNO_QUERY );
}
mpPrinter = new PrintSpooler();
mpPrinter->mxPrintSpooler = REF( NMSP_CLIENT::XRmPrintSpooler )( xServerFactory->createInstance( ::rtl::OUString::createFromAscii( "OfficePrintSpooler.stardiv.de" ) ), NMSP_UNO::UNO_QUERY );
if( mpPrinter->mxPrintSpooler.is() )
{
NMSP_CLIENT::RmJobSetup aRmJobSetup;
PRNSEQ_SET( aRmJobSetup, maJobSetup );
CHECK_FOR_RVPSYNC_NORMAL()
mpPrinter->mxPrintSpooler->Create( aRmJobSetup );
CHECK_FOR_RVPSYNC_NORMAL()
bResult = mpPrinter->mxPrintSpooler->StartJob( mnCopyCount, mbCollateCopy, rJobName, maPrintFile, mbPrintFile );
mpPrinter = new PrintSpooler();
mpPrinter->mxPrintSpooler = REF( NMSP_CLIENT::XRmPrintSpooler )( xServerFactory->createInstance( ::rtl::OUString::createFromAscii( "OfficePrintSpooler.stardiv.de" ) ), NMSP_UNO::UNO_QUERY );
if( mpPrinter->mxPrintSpooler.is() )
{
NMSP_CLIENT::RmJobSetup aRmJobSetup;
PRNSEQ_SET( aRmJobSetup, maJobSetup );
CHECK_FOR_RVPSYNC_NORMAL()
mpPrinter->mxPrintSpooler->Create( aRmJobSetup );
CHECK_FOR_RVPSYNC_NORMAL()
bResult = mpPrinter->mxPrintSpooler->StartJob( mnCopyCount, mbCollateCopy, rJobName, maPrintFile, mbPrintFile );
}
}
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
bResult = FALSE;
mpPrinter = NULL;
}
}
if ( bResult )
@ -1832,8 +1849,15 @@ BOOL Printer::EndJob()
#else
if ( mpPrinter )
{
CHECK_FOR_RVPSYNC_NORMAL()
mpPrinter->mxPrintSpooler->EndJob( vcl::unohelper::GetMultiServiceFactory() );
CHECK_FOR_RVPSYNC_NORMAL();
try
{
mpPrinter->mxPrintSpooler->EndJob( vcl::unohelper::GetMultiServiceFactory() );
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
}
mbPrinting = FALSE;
mnCurPage = 0;
mnCurPrintPage = 0;
@ -1899,8 +1923,15 @@ BOOL Printer::AbortJob()
#else
if ( mpPrinter )
{
CHECK_FOR_RVPSYNC_NORMAL()
mpPrinter->mxPrintSpooler->AbortJob();
CHECK_FOR_RVPSYNC_NORMAL();
try
{
mpPrinter->mxPrintSpooler->AbortJob();
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
}
if ( mpQMtf )
{
mpQMtf->Clear();
@ -2031,8 +2062,15 @@ BOOL Printer::EndPage()
PrinterPage aPage( mpQMtf, mbNewJobSetup, GetJobSetup() );
NMSP_CLIENT::RmPrinterPage aRmPage;
PRINTERSEQ_SET( aPage, aRmPage, NMSP_CLIENT::RmPrinterPage );
CHECK_FOR_RVPSYNC_NORMAL()
mpPrinter->mxPrintSpooler->SpoolPage( aRmPage );
CHECK_FOR_RVPSYNC_NORMAL();
try
{
mpPrinter->mxPrintSpooler->SpoolPage( aRmPage );
}
catch( RuntimeException &e )
{
rvpExceptionHandler();
}
mpQMtf = NULL;
mbNewJobSetup = FALSE;