summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-01-03 13:46:38 +0000
committerNoel Power <noel.power@suse.com>2013-01-03 13:58:38 +0000
commit446ac227bf3477ac3041d87bd0d880c3d61f4208 (patch)
treee470dc1838e8ea2ef2360aecfaacc92696af7747
parent95fc4bdb8ee6cefa3514895ba2f12789e2879956 (diff)
fix fdo#58779 fdo#58403 re. raise print dialog
adds another tweak that had been removed with some print related rewrite Change-Id: If63072c9b2c6158d46f26933fd54766fd808569c
-rw-r--r--sfx2/source/view/viewprn.cxx11
1 files changed, 7 insertions, 4 deletions
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 );
}