include/vcl/errcode.hxx | 2 -- svx/source/tbxctrls/tbcontrl.cxx | 5 ----- 2 files changed, 7 deletions(-)
New commits: commit aee0dfee2cbc313b9baf63cdb24af5a676c5eee2 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Aug 18 16:00:39 2017 +0200 comment out of date ever since the great gettext migration Change-Id: I642f2db4cbe10c5f0584a8f9bf793fd32e19a5e5 Reviewed-on: https://gerrit.libreoffice.org/41293 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index 64684d912ada..9dc57efae451 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -58,8 +58,6 @@ Warning || || | #define ERRCODE_DYNAMIC_COUNT 31UL #define ERRCODE_DYNAMIC_MASK (31UL << ERRCODE_DYNAMIC_SHIFT) -/** we get included in contexts that don't have access to config_typesizes.h or C++11 */ - class SAL_WARN_UNUSED ErrCode final { public: commit 20f1b84092b51e9c0327eded14c75ddccb1413aa Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Aug 18 15:20:37 2017 +0200 no need to redefine WB_NO_DIRECTSELECT Change-Id: Id9823a4b10982eb0a7c8f31d253a2d71005fa531 Reviewed-on: https://gerrit.libreoffice.org/41299 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 02ab35acd106..4dd05c8d9c13 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1243,11 +1243,6 @@ void SvxFontNameBox_Impl::Select() } } -#ifndef WB_NO_DIRECTSELECT -#define WB_NO_DIRECTSELECT ((WinBits)0x04000000) -#endif - - SvxColorWindow::SvxColorWindow(const OUString& rCommand, PaletteManager& rPaletteManager, BorderColorStatus& rBorderColorStatus, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits