[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/view/viewprn.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 2e340c01bb84cd215bfe4cc091a73756423f4647
Author: Noel Power <noel.power at suse.com>
Date:   Thu Jan 3 13:46:38 2013 +0000

    fix fdo#58779 fdo#58403 re. raise print dialog
    
    adds another tweak that had been removed with some print related rewrite
    
    Change-Id: If63072c9b2c6158d46f26933fd54766fd808569c

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index d1f3c3c..175cde2 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -690,6 +690,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 )
             {
@@ -747,10 +754,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 );
             }