[Libreoffice-commits] core.git: 2 commits - svtools/source vcl/unx

[Caolán McNamara (via logerrit)]

 svtools/source/control/ctrlbox.cxx    |    2 +-
 vcl/unx/generic/printer/ppdparser.cxx |    9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit f93d4062c92e0508dc6a5272350ad98b9f0bfd72
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 18 10:07:27 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 18 20:35:49 2023 +0000

    tdf#152770 move warning about ppd with no resolution to use of resolution
    
    so bizarro ppds with no resolutions don't trigger a warning unless it
    gets queried about the resolution
    
    Change-Id: I4828ddf80d011265aefb271d964f6362842b3014
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145734
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index 07ce7005b2ca..8f5c43b16e91 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -678,10 +678,6 @@ PPDParser::PPDParser(OUString aFile, const 
std::vector<PPDKey*>& keys)
     auto pResolutions = getKey( "Resolution" );
     if( pResolutions )
         m_pDefaultResolution = pResolutions->getDefaultValue();
-    if (pResolutions == nullptr) {
-        SAL_WARN( "vcl.unx.print", "no Resolution in " << m_aFile);
-    }
-    SAL_INFO_IF(!m_pDefaultResolution, "vcl.unx.print", "no DefaultResolution 
in " + m_aFile);
 
     auto pInputSlots = getKey( "InputSlot" );
     if( pInputSlots )
@@ -836,10 +832,6 @@ PPDParser::PPDParser( OUString aFile ) :
     auto pResolutions = getKey( "Resolution" );
     if( pResolutions )
         m_pDefaultResolution = pResolutions->getDefaultValue();
-    if (pResolutions == nullptr) {
-        SAL_WARN( "vcl.unx.print", "no Resolution in " << m_aFile);
-    }
-    SAL_INFO_IF(!m_pDefaultResolution, "vcl.unx.print", "no DefaultResolution 
in " + m_aFile);
 
     auto pInputSlots = getKey( "InputSlot" );
     if( pInputSlots )
@@ -1551,6 +1543,7 @@ void PPDParser::getDefaultResolution( int& rXRes, int& 
rYRes ) const
         return;
     }
 
+    SAL_WARN("vcl.unx.print", "no DefaultResolution in " << m_aFile << " 
assuming 300x300");
     rXRes = 300;
     rYRes = 300;
 }
commit aff603e10b412740d7a1bcbffb533e7675103f6f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 18 16:10:57 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 18 20:35:36 2023 +0000

    thaw before set_active
    
    Change-Id: Ib588bb9df147b5db4e0cb526e5a20ef1a3636686
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145748
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 89029444b292..32f82f6884c8 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1154,9 +1154,9 @@ void FontSizeBox::Fill( const FontList* pList )
         ++pTempAry;
     }
 
+    m_xComboBox->thaw();
     set_active_or_entry_text(aStr);
     m_xComboBox->select_entry_region(nSelectionStart, nSelectionEnd);
-    m_xComboBox->thaw();
 }
 
 void FontSizeBox::EnableRelativeMode( sal_uInt16 nNewMin, sal_uInt16 nNewMax, 
sal_uInt16 nStep )