[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sfx2/sdi sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/sdi/sfx.sdi             |    2 +-
 sfx2/source/view/viewprn.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a94d3829792414d5decb64474f7178eb27076e5c
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Nov 25 23:09:18 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Nov 30 09:32:46 2020 +0100

    uno:Printersetup: Allow preselecting a printer
    
    When calling "uno:Printersetup" from a macro, allow preselecting a
    printer in the printer setup dialog by passing the printer name
    as an argument "PrinterName"
    
    Change-Id: I6b435f52a4123dc7fd49f6d771052ff1b8e743c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106656
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 235544588174..1b0222e45b60 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3205,7 +3205,7 @@ SfxStringItem Printer SID_PRINTER_NAME
 
 
 SfxVoidItem PrinterSetup SID_SETUPPRINTER
-()
+(SfxStringItem PrinterName SID_PRINTER_NAME)
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 19534cb129e1..7d72f08213bf 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -814,8 +814,8 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 return;
             }
 
-            // if no arguments are given, retrieve them from a dialog
-            if ( !bIsAPI )
+            // Open Printer Setup dialog
+            if ( nId == SID_SETUPPRINTER )
             {
                 // PrinterDialog needs a temporary printer
                 VclPtr<SfxPrinter> pDlgPrinter = pPrinter->Clone();