Kaydet (Commit) 96134109 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Andras Timar

tdf#92788 - Middle Button on Mouse Paste Option Broken for X11

cherry-pick from master

caused by commit 5333782d
"convert SETTINGS_ #defines to 'enum class'"

Change-Id: Id0c2738a61f73223f6c8716f04a619c8cb84c0a9
Reviewed-on: https://gerrit.libreoffice.org/17493Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 3281e9b5
......@@ -679,13 +679,14 @@ public:
enum class AllSettingsFlags {
NONE = 0x0000,
MOUSE = 0x0001,
STYLE = 0x0002,
MISC = 0x0004,
LOCALE = 0x0020,
};
namespace o3tl
{
template<> struct typed_flags<AllSettingsFlags> : is_typed_flags<AllSettingsFlags, 0x026> {};
template<> struct typed_flags<AllSettingsFlags> : is_typed_flags<AllSettingsFlags, 0x0027> {};
}
class VCL_DLLPUBLIC AllSettings
......
......@@ -2706,7 +2706,8 @@ ImplAllSettingsData::ImplAllSettingsData()
maLocale( LANGUAGE_SYSTEM ),
maUILocale( LANGUAGE_SYSTEM )
{
mnWindowUpdate = AllSettingsFlags::STYLE | AllSettingsFlags::MISC | AllSettingsFlags::LOCALE;
mnWindowUpdate = AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE |
AllSettingsFlags::MISC | AllSettingsFlags::LOCALE;
mpLocaleDataWrapper = NULL;
mpUILocaleDataWrapper = NULL;
mpI18nHelper = NULL;
......@@ -2768,6 +2769,16 @@ AllSettingsFlags AllSettings::Update( AllSettingsFlags nFlags, const AllSettings
AllSettingsFlags nChangeFlags = AllSettingsFlags::NONE;
if ( nFlags & AllSettingsFlags::MOUSE )
{
if ( mxData->maMouseSettings != rSet.mxData->maMouseSettings )
{
CopyData();
mxData->maMouseSettings = rSet.mxData->maMouseSettings;
nChangeFlags |= AllSettingsFlags::MOUSE;
}
}
if ( nFlags & AllSettingsFlags::STYLE )
{
if ( mxData->maStyleSettings != rSet.mxData->maStyleSettings )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment