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 /svx/source/sidebar/tools | |
| 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 'svx/source/sidebar/tools')
| -rw-r--r-- | svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 51c157f41f49..5dd6e99495d4 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -101,7 +101,6 @@ void ValueSetWithTextControl::AddItem( ? *pSelectedItemImage : rItemImage; -#ifndef MACOSX if ( GetDPIScaleFactor() > 1 ) { BitmapEx b = aItem.maItemImage.GetBitmapEx(); @@ -115,7 +114,7 @@ void ValueSetWithTextControl::AddItem( aItem.maSelectedItemImage = Image(b); } } -#endif + aItem.maItemText = rItemText; maItems.push_back( aItem ); @@ -169,7 +168,7 @@ void ValueSetWithTextControl::ReplaceItemImages( ? *pSelectedItemImage : rItemImage; -#ifndef MACOSX +//#ifndef MACOSX if ( GetDPIScaleFactor() > 1 ) { BitmapEx b = maItems[nItemId-1].maItemImage.GetBitmapEx(); @@ -183,7 +182,7 @@ void ValueSetWithTextControl::ReplaceItemImages( maItems[nItemId-1].maSelectedItemImage = Image(b); } } -#endif +//#endif } |