diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-11 15:43:48 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-11 15:44:26 -0500 |
| commit | 58fae0f715433a72d814584d97a1368f8a1b62d2 (patch) | |
| tree | 27a7505bda8238d6d0e4067e23969b61aba01932 /sw | |
| parent | 4dbb04e5701efe084fbfd3f06128dd33a7d8965b (diff) | |
remove osolete ifdef
now that the ScaleDPI is forced to 1 on mac there is no need
for these ifdef
Change-Id: I0ca3bc301b63f5f4c7d1eb36f27bc9b6ab41af29
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/uibase/utlui/content.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/uibase/utlui/viewlayoutctrl.cxx | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index 9ffcf86c15f9..2204074ce791 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -1563,7 +1563,6 @@ 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++) @@ -1575,7 +1574,6 @@ 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/core/uibase/utlui/viewlayoutctrl.cxx b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx index 18a92123d1d0..798213d5471f 100644 --- a/sw/source/core/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx @@ -52,7 +52,6 @@ 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, @@ -76,7 +75,7 @@ SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, mpImpl->maImageBookMode = arr[4]; mpImpl->maImageBookMode_Active = arr[5]; } -#endif + } SwViewLayoutControl::~SwViewLayoutControl() |