[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/printer/cupsmgr.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit eacbfea0e97be9f0897f102518d97368bb51256c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 17 17:15:40 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Aug 28 18:33:34 2019 +0200

    Related: rhbz#1691287 fill in default domain and username
    
    and grab focus to first entry entry
    
    Change-Id: Icb50766948c77072eaab9faf89436c6ecbb49ecc
    Reviewed-on: https://gerrit.libreoffice.org/77676
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 503ca6c4b224..3c910f3b39df 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -717,7 +717,14 @@ namespace
         OUString aText(m_xText->get_label());
         aText = aText.replaceFirst("%s", OStringToOUString(rServer, osl_getThreadTextEncoding()));
         m_xText->set_label(aText);
-        m_xUserEdit->set_text(OStringToOUString(rUserName, osl_getThreadTextEncoding()));
+        m_xDomainEdit->set_text("WORKGROUP");
+        if (rUserName.isEmpty())
+            m_xUserEdit->grab_focus();
+        else
+        {
+            m_xUserEdit->set_text(OStringToOUString(rUserName, osl_getThreadTextEncoding()));
+            m_xPassEdit->grab_focus();
+        }
     }
 
     bool AuthenticateQuery(const OString& rServer, OString& rUserName, OString& rPassword)
@@ -785,8 +792,9 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
             if (bDomain || bUser || bPass)
             {
                 OString sPrinterName(OUStringToOString(rPrintername, RTL_TEXTENCODING_UTF8));
+                OString sUser = cupsUser();
                 vcl::Window* pWin = Application::GetDefDialogParent();
-                RTSPWDialog aDialog(pWin ? pWin->GetFrameWeld() : nullptr, sPrinterName, "");
+                RTSPWDialog aDialog(pWin ? pWin->GetFrameWeld() : nullptr, sPrinterName, sUser);
                 aDialog.SetDomainVisible(bDomain);
                 aDialog.SetUserVisible(bUser);
                 aDialog.SetPassVisible(bPass);