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

[Caolán McNamara (via logerrit)]

 svtools/source/config/languagetoolcfg.cxx |    5 ++++-
 vcl/unx/generic/printer/ppdparser.cxx     |    9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit da27102aaa488d982164c54f8c7f8f3bc6181481
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 31 11:47:01 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 31 19:57:32 2023 +0000

    add default mode lines
    
    Change-Id: Ie0485f52f81f31f821f8a6ebc4720528da33fa48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146417
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svtools/source/config/languagetoolcfg.cxx 
b/svtools/source/config/languagetoolcfg.cxx
index 56d4a2431056..b7bc2a56bd37 100644
--- a/svtools/source/config/languagetoolcfg.cxx
+++ b/svtools/source/config/languagetoolcfg.cxx
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+
 /*
  * This file is part of the LibreOffice project.
  *
@@ -196,3 +197,5 @@ void SvxLanguageToolOptions::ImplCommit()
     }
     PutProperties(aNames, aValues);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
commit fa7d25625fa327ebc49ec8d0f96c192f4ed0c17b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 31 11:37:17 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 31 19:57:22 2023 +0000

    tdf#152770 undo move warning about ppd with no resolution to use of 
resolution
    
    and downgrade to SAL_INFO
    
    Change-Id: I9a565aa12f83e7ed8dd6b0f903f7b18d62c16c4d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146416
    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 8f5c43b16e91..42a2a2a50cd8 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -678,6 +678,10 @@ PPDParser::PPDParser(OUString aFile, const 
std::vector<PPDKey*>& keys)
     auto pResolutions = getKey( "Resolution" );
     if( pResolutions )
         m_pDefaultResolution = pResolutions->getDefaultValue();
+    if (pResolutions == nullptr) {
+        SAL_INFO( "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 )
@@ -832,6 +836,10 @@ PPDParser::PPDParser( OUString aFile ) :
     auto pResolutions = getKey( "Resolution" );
     if( pResolutions )
         m_pDefaultResolution = pResolutions->getDefaultValue();
+    if (pResolutions == nullptr) {
+        SAL_INFO( "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 )
@@ -1543,7 +1551,6 @@ 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;
 }