[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 17 16:46:11 UTC 2018
compilerplugins/clang/unusedenumconstants.writeonly.results | 2 --
include/vcl/treelistbox.hxx | 7 +++----
vcl/source/treelist/treelistbox.cxx | 4 ----
3 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 5197e6582e0658112013bd81b905b24e5c00b5ad
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Nov 17 14:54:23 2018 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 17 17:45:51 2018 +0100
remove unused IS_TRAVELSELECT
Change-Id: I2651b28ec52a001b67cdb3b2d88e8bca0eeb7790
Reviewed-on: https://gerrit.libreoffice.org/63493
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 6ba7ebb40d81..2efcd5310136 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -2726,8 +2726,6 @@ include/svtools/treelistbox.hxx:191
enum SvTreeListBoxFlags IN_EDT
include/svtools/treelistbox.hxx:192
enum SvTreeListBoxFlags EDT_ENABLED
-include/svtools/treelistbox.hxx:194
- enum SvTreeListBoxFlags IS_TRAVELSELECT
include/svtools/treelistbox.hxx:195
enum SvTreeListBoxFlags TARGEMPH_VIS
include/svtools/treelistbox.hxx:196
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 5e7787b9ab88..675d141be53e 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -180,13 +180,12 @@ enum class SvTreeListBoxFlags
NONE = 0x0000,
IN_EDT = 0x0001,
EDT_ENABLED = 0x0002,
- IS_TRAVELSELECT = 0x0004,
- TARGEMPH_VIS = 0x0008,
- EDTEND_CALLED = 0x0010,
+ TARGEMPH_VIS = 0x0004,
+ EDTEND_CALLED = 0x0008,
};
namespace o3tl
{
- template<> struct typed_flags<SvTreeListBoxFlags> : is_typed_flags<SvTreeListBoxFlags, 0x001f> {};
+ template<> struct typed_flags<SvTreeListBoxFlags> : is_typed_flags<SvTreeListBoxFlags, 0x000f> {};
}
struct SvTreeListBoxImpl;
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 65114a2a1936..a581fd5172e6 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -1954,16 +1954,12 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
if( IsEditingActive() )
return;
- nImpFlags |= SvTreeListBoxFlags::IS_TRAVELSELECT;
-
if( !pImpl->KeyInput( rKEvt ) )
{
bool bHandled = HandleKeyInput( rKEvt );
if ( !bHandled )
Control::KeyInput( rKEvt );
}
-
- nImpFlags &= ~SvTreeListBoxFlags::IS_TRAVELSELECT;
}
void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
More information about the Libreoffice-commits
mailing list