[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source filter/uiconfig

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx          |    6 +++---
 filter/uiconfig/ui/pdfgeneralpage.ui |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 75db2b08856ddc522a949a07145b33b0fae4801e
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Fri Oct 11 09:42:52 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Fri Oct 11 10:13:59 2019 +0200

    Rename 'Single-page sheets' to 'Full-Sheet Previews' to avoid confusion
    
    Because this option creates a pdf output which simply contains
    full-sheet preview, disregarding most of the other options.
    
    The created output is meant for preview, to see all content
    of all shaeets at once, and not meant for usual printing.
    
    And also put in some explicit casts, to avoid compiler warnings.
    
    Change-Id: I62936337e26f04878ecb7291335a5da952d8dced
    Reviewed-on: https://gerrit.libreoffice.org/80638
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a648918b750c..a9c7fd897808 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2194,7 +2194,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
             aFilterOptions = temp + aFilterOptions.copy(bIndex+16);
         }
 
-        bool bFullSheetPreview = sFullSheetPreview == "true" ? true : false;
+        bool bFullSheetPreview = sFullSheetPreview == "true";
 
         // 'TakeOwnership' == this is a 'real' SaveAs (that is, the document
         // gets a new name).  When this is not provided, the meaning of
@@ -2224,7 +2224,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
 
         if(!watermarkText.isEmpty() || bFullSheetPreview)
         {
-            uno::Sequence< beans::PropertyValue > aFilterData( bFullSheetPreview + !watermarkText.isEmpty() );
+            uno::Sequence< beans::PropertyValue > aFilterData( static_cast<int>(bFullSheetPreview) + static_cast<int>(!watermarkText.isEmpty()) );
 
             if (!watermarkText.isEmpty())
             {
@@ -2234,7 +2234,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
 
             if (bFullSheetPreview)
             {
-                int nOptIndex = !watermarkText.isEmpty();
+                int nOptIndex = static_cast<int>(!watermarkText.isEmpty());
 
                 aFilterData[ nOptIndex ].Name = "SinglePageSheets";
                 aFilterData[ nOptIndex ].Value <<= true;
diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui
index aee2993b5f6a..0a40383e2aaf 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -718,7 +718,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="singlepagesheets">
-                    <property name="label" translatable="yes" context="pdfgeneralpage|singlepagesheets">Single-page sheets</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|singlepagesheets">Full-Sheet Previews</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>