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

New commits:
commit 9b0824e2b4d2228325d17190c63d8d1641e12798
Author:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Nov 25 23:09:18 2020 +0100
Commit:     Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Thu Dec 3 02:45:17 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/+/106634
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    (cherry picked from commit ccb0b825305a158d9142e1a5316c6ff7905f6ecb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106678
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index a0de55dbfddb..6cdad85a8d53 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3238,7 +3238,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 45341cd1892a..796a505ed8d4 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -820,8 +820,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to