diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-03-28 10:50:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-03-28 11:20:52 +0300 |
| commit | 08df97bbe68efbe31d40cb3fd40fe24103a078f5 (patch) | |
| tree | 2333e8f47a56324b258f75080c7fd34e26f236b6 /sw | |
| parent | e9c911074849c3729a8f5023b9db209801a8c4af (diff) | |
WaE: 'userSpaceScaleFactor' is deprecated: first deprecated in OS X 10.7 ...
... Use -convertRectToBacking: or -backingScaleFactor instead
Change-Id: Ided81790349304172ab911f93475cdc40a676a7b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 28d75f6e02d9..46a43860e3ec 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1855,7 +1855,7 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly, "textbox-wps-only.docx") #ifdef MACOSX // FIXME: The assert below fails wildly on a Retina display NSScreen* nsScreen = [ NSScreen mainScreen ]; - CGFloat scaleFactor = [ nsScreen userSpaceScaleFactor ]; // for instance on the 5K Retina iMac, + CGFloat scaleFactor = [ nsScreen backingScaleFactor ]; // for instance on the 5K Retina iMac, // [NSScreen mainScreen].frame.size is 2560x1440, // while real display size is 5120x2880 if ( nsScreen.frame.size.width * scaleFactor > 4000 ) |