diff options
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 21f1425a68ae..fc64f7439d78 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -125,7 +125,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layo OUString aText(SdResId(pInfo->mpStrResId)); Image aImg(StockImage::Yes, OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aImg, aText); - aLayoutItemSize.setWidth( std::max( aLayoutItemSize.Width(), aImg.GetSizePixel().Width() ) ); + aLayoutItemSize.setWidth( std::max( aLayoutItemSize.Width(), aImg.GetSizePixel().Width() ) ); aLayoutItemSize.setHeight( std::max( aLayoutItemSize.Height(), aImg.GetSizePixel().Height() ) ); } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 17f7c2655e60..ab58af558cf1 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -528,12 +528,16 @@ void LayoutMenu::Fill() { if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical) { - BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); + Image aImg("private:graphicrepository/" + OUString::createFromAscii(pInfo->msBmpResId)); if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) - aBmp.Mirror (BmpMirrorFlags::Horizontal); + { // FIXME: avoid interpolating RTL layouts. + BitmapEx aRTL = aImg.GetBitmapEx(); + aRTL.Mirror(BmpMirrorFlags::Horizontal); + aImg = Image(aRTL); + } - InsertItem(i, Image(aBmp), SdResId(pInfo->mpStrResId)); + InsertItem(i, aImg, SdResId(pInfo->mpStrResId)); SetItemData (i, new AutoLayout(pInfo->maAutoLayout)); } } |