diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-01 18:24:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-01 18:25:25 +0100 |
| commit | f6deda85ef4f28426c09fab7205f274922af3d96 (patch) | |
| tree | cb7def324321c1981bb410d9816e35e202046441 /vcl/win | |
| parent | ec583253c3d761847c93a77fa10c065fc334fab9 (diff) | |
current mingw headers don't have fMergeNeutralItems
Reported upstream by Kendy (r5626), for now do not use the field
if not present, seems to be not that important.
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 1404c2c1244b..63f8a6559241 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -63,6 +63,8 @@ using ::rtl::OUString; using ::rtl::OString; using ::rtl::OUStringToOString; +#include <config_mingw.h> + // ======================================================================= // win32 specific physical font instance @@ -1189,7 +1191,9 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0}; aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection; aScriptControl.fContextDigits = (0 != (rArgs.mnFlags & SAL_LAYOUT_SUBSTITUTE_DIGITS)); +#ifdef HAVE_FMERGENEUTRALITEMS aScriptControl.fMergeNeutralItems = true; +#endif // determine relevant substring and work only on it // when Bidi status is unknown we need to look at the whole string though mnSubStringMin = 0; |