Kaydet (Commit) dfc81188 authored tarafından Noel Grandin's avatar Noel Grandin

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

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

Change-Id: Id0c2738a61f73223f6c8716f04a619c8cb84c0a9
üst 0ea54aed
...@@ -682,13 +682,14 @@ public: ...@@ -682,13 +682,14 @@ public:
enum class AllSettingsFlags { enum class AllSettingsFlags {
NONE = 0x0000, NONE = 0x0000,
MOUSE = 0x0001,
STYLE = 0x0002, STYLE = 0x0002,
MISC = 0x0004, MISC = 0x0004,
LOCALE = 0x0020, LOCALE = 0x0020,
}; };
namespace o3tl 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 class VCL_DLLPUBLIC AllSettings
......
...@@ -2701,7 +2701,8 @@ ImplAllSettingsData::ImplAllSettingsData() ...@@ -2701,7 +2701,8 @@ ImplAllSettingsData::ImplAllSettingsData()
maLocale( LANGUAGE_SYSTEM ), maLocale( LANGUAGE_SYSTEM ),
maUILocale( LANGUAGE_SYSTEM ) maUILocale( LANGUAGE_SYSTEM )
{ {
mnWindowUpdate = AllSettingsFlags::STYLE | AllSettingsFlags::MISC | AllSettingsFlags::LOCALE; mnWindowUpdate = AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE |
AllSettingsFlags::MISC | AllSettingsFlags::LOCALE;
mpLocaleDataWrapper = NULL; mpLocaleDataWrapper = NULL;
mpUILocaleDataWrapper = NULL; mpUILocaleDataWrapper = NULL;
mpI18nHelper = NULL; mpI18nHelper = NULL;
...@@ -2763,6 +2764,16 @@ AllSettingsFlags AllSettings::Update( AllSettingsFlags nFlags, const AllSettings ...@@ -2763,6 +2764,16 @@ AllSettingsFlags AllSettings::Update( AllSettingsFlags nFlags, const AllSettings
AllSettingsFlags nChangeFlags = AllSettingsFlags::NONE; 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 ( nFlags & AllSettingsFlags::STYLE )
{ {
if ( mxData->maStyleSettings != rSet.mxData->maStyleSettings ) 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