diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-09-15 17:42:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-19 08:46:16 +0200 |
| commit | 9fec5ac89d0675d2229b3adf425202fd93f11f8e (patch) | |
| tree | 6ab844350366a322eb0804d0eaf6333a79586575 | |
| parent | 4b4ad80908d8f583a32e5b9aa61a95f01ecdbfda (diff) | |
inline X11_freeBmp
Change-Id: Ia79d2f7a40e9ee7a91a652536a360cb878b44516
Reviewed-on: https://gerrit.libreoffice.org/60700
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/bmp.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/bmp.hxx | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index fd5ed013982a..f7c0b6db6a8e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1156,7 +1156,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ memcpy( rData.getArray(), pBytes, nOutSize ); bSuccess = true; } - X11_freeBmp( pBytes ); + std::free( pBytes ); } } } diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index e6748166e132..7f3f27022099 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -350,11 +350,6 @@ sal_uInt8* x11::X11_getBmpFromPixmap( return pBmp; } -void x11::X11_freeBmp( sal_uInt8* pBmp ) -{ - std::free( pBmp ); -} - /* * PixmapHolder */ diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx index 13797bf29ba0..9547bc2170b6 100644 --- a/vcl/unx/generic/dtrans/bmp.hxx +++ b/vcl/unx/generic/dtrans/bmp.hxx @@ -36,8 +36,6 @@ sal_uInt8* X11_getBmpFromPixmap( Display* pDisplay, Colormap aColormap, sal_Int32& rOutSize ); -void X11_freeBmp( sal_uInt8* pBmp ); - class PixmapHolder { Display* m_pDisplay; |