diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/ipict/ipict.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/bitmapex.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/vcl/source/filter/ipict/ipict.cxx b/vcl/source/filter/ipict/ipict.cxx index fcdef08e3592..2d9be6f8cd9c 100644 --- a/vcl/source/filter/ipict/ipict.cxx +++ b/vcl/source/filter/ipict/ipict.cxx @@ -783,7 +783,7 @@ sal_uInt64 PictReader::ReadPixMapEtc( BitmapEx &rBitmap, bool bBaseAddr, bool bC else { nRowBytes &= 0x3fff; - nPixelSize = nCmpCount = nCmpSize = 1; + nPixelSize = nCmpCount = 1; nDataSize += 10; aPalette.resize(2); aPalette[0] = Color(0xff, 0xff, 0xff); diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx index 57851f943f51..9935a18bdee6 100644 --- a/vcl/source/outdev/bitmapex.cxx +++ b/vcl/source/outdev/bitmapex.cxx @@ -522,8 +522,6 @@ void OutputDevice::DrawTransformedBitmapEx( aAlpha.BlendWith( bitmapEx.GetAlphaMask()); bitmapEx = BitmapEx( bitmapEx.GetBitmap(), aAlpha ); } - if(rtl::math::approxEqual( fAlpha, 1.0 )) - fAlpha = 1.0; // avoid the need for approxEqual in backends // If the backend's implementation is known to not need any optimizations here, pass to it directly. // With most backends it's more performant to try to simplify to DrawBitmapEx() first. diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx index 9afb55f0eb21..36278074c446 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx @@ -1677,7 +1677,7 @@ void SalGtkFilePicker::impl_initialize(GtkWidget* pParentWidget, sal_Int16 templ GtkFileChooserAction eAction = GTK_FILE_CHOOSER_ACTION_OPEN; OString sOpen = getOpenText(); OString sSave = getSaveText(); - const gchar *first_button_text = sOpen.getStr(); + const gchar *first_button_text; SolarMutexGuard g; |