diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-13 20:09:49 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-14 07:58:28 -0600 |
| commit | 2a0a80a1385544cbb8d9f6b3ffc22f1c0afeb4ed (patch) | |
| tree | b802a0844ce7a014cc48201aae955b5400cbc458 /sw | |
| parent | bb39bea2e63ec04e2cde88121d09c88e451b340e (diff) | |
protect macosx against the HiDPI hacks
Change-Id: Ie79abaffef72cbdf3006314c56590ca1e10cf949
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/utlui/content.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/utlui/viewlayoutctrl.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index f810c57b2231..b8e62d7ac6f6 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -1562,6 +1562,7 @@ void SwContentTree::Display( bool bActive ) { aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP)); +#ifndef MACSOX if ( GetDPIScaleFactor() > 1 ) { for (short i = 0; i < aEntryImages.GetImageCount(); i++) @@ -1573,7 +1574,7 @@ void SwContentTree::Display( bool bActive ) aEntryImages.ReplaceImage(rImageName, Image(b)); } } - +#endif bIsImageListInitialized = true; } // First read the selected entry to select it later again if necessary diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index 00d409e6c115..18a92123d1d0 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -52,6 +52,7 @@ SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, mpImpl->maImageBookMode = Image( SW_RES(IMG_VIEWLAYOUT_BOOKMODE) ); mpImpl->maImageBookMode_Active = Image( SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE) ); +#ifndef MACOSX if ( rStb.GetDPIScaleFactor() > 1) { Image arr[6] = {mpImpl->maImageSingleColumn, mpImpl->maImageSingleColumn_Active, @@ -75,6 +76,7 @@ SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, mpImpl->maImageBookMode = arr[4]; mpImpl->maImageBookMode_Active = arr[5]; } +#endif } SwViewLayoutControl::~SwViewLayoutControl() |