include/svtools/strings.hrc | 3 ---
svtools/source/filter/exportdialog.cxx | 12 ------------
svtools/source/filter/exportdialog.hxx | 3 ---
3 files changed, 18 deletions(-)
New commits:
commit 515b8d9a810e9c5d26f365e3a3b08d73f5dcc18a
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Mon Nov 7 12:47:41 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 8 20:55:48 2022 +0100
tdf#151944: error colour export in bmp
4 bits bmp support has been dropped in March 2021 with:
a6c6f35ccc78e74cfa76397d649c1b6fc4baad29
"drop 4bpp image formats
on a path to simplifying our internal bitmap stuff, aiming to
support a smaller set of image formats, but support them
in an accelerated fashion.
"
1 bit dithered bmp support last remnant has been dropped in April 2020 with:
e3cc7b94b13d6cc4e044cfd688e0fcc9dca63987
"loplugin:unusedenumconstants BmpConversion"
Change-Id: I958bea6baabb9ef21c5fa71bfc7ff96cba201245
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142375
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit f627ac6a579b56876ba6b2cc2325e6166a25d07d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142437
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index cbad8f4ed18e..d8bcaae7df6c 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -185,9 +185,6 @@
#define STR_SVT_ACC_RULER_VERT_NAME
NC_("STR_SVT_ACC_RULER_VERT_NAME", "Vertical Ruler")
#define STR_SVT_1BIT_THRESHOLD NC_("STR_SVT_1BIT_THRESHOLD",
"1-bit threshold")
-#define STR_SVT_1BIT_DITHERED NC_("STR_SVT_1BIT_DITHERED",
"1-bit dithered")
-#define STR_SVT_4BIT_GRAYSCALE NC_("STR_SVT_4BIT_GRAYSCALE",
"4-bit grayscale")
-#define STR_SVT_4BIT_COLOR_PALETTE
NC_("STR_SVT_4BIT_COLOR_PALETTE", "4-bit color")
#define STR_SVT_8BIT_GRAYSCALE NC_("STR_SVT_8BIT_GRAYSCALE",
"8-bit grayscale")
#define STR_SVT_8BIT_COLOR_PALETTE
NC_("STR_SVT_8BIT_COLOR_PALETTE", "8-bit color")
#define STR_SVT_24BIT_TRUE_COLOR
NC_("STR_SVT_24BIT_TRUE_COLOR", "24-bit true color")
diff --git a/svtools/source/filter/exportdialog.cxx
b/svtools/source/filter/exportdialog.cxx
index d48ec013d175..879c8ec013c1 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -524,12 +524,6 @@ sal_uInt32 ExportDialog::GetRawFileSize() const
OUString aEntry(mxLbColorDepth->get_active_text());
if ( ms1BitThreshold == aEntry )
nBitsPerPixel = 1;
- else if ( ms1BitDithered == aEntry )
- nBitsPerPixel = 1;
- else if ( ms4BitGrayscale == aEntry )
- nBitsPerPixel = 4;
- else if ( ms4BitColorPalette == aEntry )
- nBitsPerPixel = 8;
else if ( ms8BitGrayscale == aEntry )
nBitsPerPixel = 8;
else if ( ms8BitColorPalette == aEntry )
@@ -570,9 +564,6 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
, msEstimatedSizePix2(SvtResId(STR_SVT_ESTIMATED_SIZE_PIX_2))
, msEstimatedSizeVec(SvtResId(STR_SVT_ESTIMATED_SIZE_VEC))
, ms1BitThreshold(SvtResId(STR_SVT_1BIT_THRESHOLD))
- , ms1BitDithered(SvtResId(STR_SVT_1BIT_DITHERED))
- , ms4BitGrayscale(SvtResId(STR_SVT_4BIT_GRAYSCALE))
- , ms4BitColorPalette(SvtResId(STR_SVT_4BIT_COLOR_PALETTE))
, ms8BitGrayscale(SvtResId(STR_SVT_8BIT_GRAYSCALE))
, ms8BitColorPalette(SvtResId(STR_SVT_8BIT_COLOR_PALETTE))
, ms24BitColor(SvtResId(STR_SVT_24BIT_TRUE_COLOR))
@@ -819,9 +810,6 @@ void ExportDialog::createFilterOptions()
else
nColor--;
mxLbColorDepth->append_text( ms1BitThreshold );
- mxLbColorDepth->append_text( ms1BitDithered );
- mxLbColorDepth->append_text( ms4BitGrayscale );
- mxLbColorDepth->append_text( ms4BitColorPalette );
mxLbColorDepth->append_text( ms8BitGrayscale );
mxLbColorDepth->append_text( ms8BitColorPalette );
mxLbColorDepth->append_text( ms24BitColor );
diff --git a/svtools/source/filter/exportdialog.hxx
b/svtools/source/filter/exportdialog.hxx
index 1c7c63953a16..9b10d34115e8 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -56,9 +56,6 @@ private:
OUString msEstimatedSizeVec;
OUString ms1BitThreshold;
- OUString ms1BitDithered;
- OUString ms4BitGrayscale;
- OUString ms4BitColorPalette;
OUString ms8BitGrayscale;
OUString ms8BitColorPalette;
OUString ms24BitColor;
