diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-03 11:12:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-03 11:12:31 +0200 |
| commit | dfc81188d50472dde2aa50752b415feab12350b4 (patch) | |
| tree | 1147befa4679cb931985bb2ff997fab0a5d9ff72 /vcl/source/app/settings.cxx | |
| parent | 0ea54aed15ee17a02c9dff861c16d06505f35741 (diff) | |
tdf#92788 - Middle Button on Mouse Paste Option Broken for X11
caused by commit 5333782d090a9e147c0c431f0f741863d1d8cf8e
"convert SETTINGS_ #defines to 'enum class'"
Change-Id: Id0c2738a61f73223f6c8716f04a619c8cb84c0a9
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 66b515e6e085..33674f8371a3 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2701,7 +2701,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; @@ -2763,6 +2764,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 ) |