From 446ac227bf3477ac3041d87bd0d880c3d61f4208 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 3 Jan 2013 13:46:38 +0000 Subject: fix fdo#58779 fdo#58403 re. raise print dialog adds another tweak that had been removed with some print related rewrite Change-Id: If63072c9b2c6158d46f26933fd54766fd808569c --- sfx2/source/view/viewprn.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 2b2f11933212..6a0a9faf4b43 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -682,6 +682,13 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) if ( !bSilent && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES ) return; + // should we print only the selection or the whole document + SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False); + sal_Bool bSelection = ( pSelectItem != NULL && pSelectItem->GetValue() ); + // detect non api call from writer ( that adds SID_SELECTION ) and reset bIsAPI + if ( pSelectItem && rReq.GetArgs()->Count() == 1 ) + bIsAPI = sal_False; + uno::Sequence < beans::PropertyValue > aProps; if ( bIsAPI ) { @@ -739,10 +746,6 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // it would be better if writer handled this internally if( nId == SID_PRINTDOCDIRECT ) { - // should we print only the selection or the whole document - SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False); - sal_Bool bSelection = ( pSelectItem != NULL && pSelectItem->GetValue() ); - aProps[nLen].Name = rtl::OUString( "PrintSelectionOnly" ); aProps[nLen].Value = makeAny( bSelection ); } -- cgit v1.2.3