cui/source/options/optgdlg.cxx | 2 +-
vcl/inc/BitmapScaleConvolutionFilter.hxx | 4 ++--
vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6384e5ec123354744059473c4b347df244195dd8
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 10:22:51 2018 +0100
presumably Kernel is leaking
Change-Id: I3b6815b3ca7ec94021be9229ae320b86e86f5418
Reviewed-on: https://gerrit.libreoffice.org/53020
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx
b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index 16830a08a147..6b4642eb6455 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -30,7 +30,7 @@ class VCL_DLLPUBLIC BitmapScaleConvolutionFilter : public
BitmapFilter
{
protected:
BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY,
Kernel* pKernel)
- : mpKernel(pKernel)
+ : mxKernel(pKernel)
, mrScaleX(rScaleX)
, mrScaleY(rScaleY)
{
@@ -39,7 +39,7 @@ protected:
virtual BitmapEx execute(BitmapEx const& rBitmap) override;
private:
- Kernel* mpKernel;
+ std::unique_ptr<Kernel> mxKernel;
double mrScaleX;
double mrScaleY;
};
diff --git a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
index 4997812a2cb5..e14f9930e47b 100644
--- a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
@@ -377,7 +377,7 @@ BitmapEx BitmapScaleConvolutionFilter::execute(BitmapEx
const& rBitmapEx)
bool bRetval = false;
Bitmap aBitmap(rBitmapEx.GetBitmap());
- bRetval = ImplScaleConvolution(aBitmap, mrScaleX, mrScaleY, *mpKernel);
+ bRetval = ImplScaleConvolution(aBitmap, mrScaleX, mrScaleY, *mxKernel);
if (bRetval)
return BitmapEx(aBitmap);
commit 858817e158ca3eff5815b8fec67d54a8b63676ca
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 13:13:08 2018 +0100
missing dialog parent for restart for language change
Change-Id: I3f04519ad3fe35bcaa040934547d5b206184efbd
Reviewed-on: https://gerrit.libreoffice.org/53039
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index af6c1cbabb19..4dcb91416e8c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1382,7 +1382,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
// display info
SolarMutexGuard aGuard;
svtools::executeRestartDialog(
- comphelper::getProcessComponentContext(), nullptr,
+ comphelper::getProcessComponentContext(), GetFrameWeld(),
svtools::RESTART_REASON_LANGUAGE_CHANGE);
// tell quickstarter to stop being a veto listener
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
