summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-11-25 23:09:18 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-11-30 09:32:46 +0100
commita94d3829792414d5decb64474f7178eb27076e5c (patch)
treee22432d42a0547e55143e004209aca3e3ac0ead2 /sfx2
parentc906412f74b719050a2a3ea412c394587e7c73f2 (diff)
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@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/sdi/sfx.sdi2
-rw-r--r--sfx2/source/view/viewprn.cxx4
2 files changed, 3 insertions, 3 deletions
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();