diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-10-11 09:42:52 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2019-10-11 10:13:59 +0200 |
| commit | 75db2b08856ddc522a949a07145b33b0fae4801e (patch) | |
| tree | c44145dcd371c593a7a235f48c5fed4b044a06fd /desktop | |
| parent | 520dc93ef80e641b7e838122ec7424f030a57859 (diff) | |
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@gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; |