diff options
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galctrl.cxx | 20 | ||||
| -rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 17 |
3 files changed, 10 insertions, 29 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c523680d3676..bd6483a18d4a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6410,7 +6410,7 @@ </desc> <label>Shows previews with shining through checkered background to visualize transparency.</label> </info> - <value>true</value> + <value>false</value> </prop> </group> <group oor:name="ExternalApps" oor:extensible="true"> diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index e05b8abd7c15..f79ca3cf3e20 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -257,23 +257,13 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL ) void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize) { - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - if (rStyleSettings.GetPreviewUsesCheckeredBackground()) - { - // draw checkered background - static const sal_uInt32 nLen(8); - static const Color aW(COL_WHITE); - static const Color aG(0xef, 0xef, 0xef); + // draw checkered background + static const sal_uInt32 nLen(8); + static const Color aW(COL_WHITE); + static const Color aG(0xef, 0xef, 0xef); - rOut.DrawCheckered(rPos, rSize, nLen, aW, aG); - } - else - { - rOut.SetLineColor(); - rOut.SetFillColor(rStyleSettings.GetFieldColor()); - rOut.DrawRect(Rectangle(rPos, rSize)); - } + rOut.DrawCheckered(rPos, rSize, nLen, aW, aG); } GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 2cd3fa3ed24e..16fd43e92642 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -116,7 +116,6 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) sal_uInt32 nModelPos; FmFormModel *pModel = NULL; - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ ) { @@ -134,19 +133,11 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) pVDev->SetOutputSizePixel(aSize); - if(rStyleSettings.GetPreviewUsesCheckeredBackground()) - { - static const sal_uInt32 nLen(8); - static const Color aW(COL_WHITE); - static const Color aG(0xef, 0xef, 0xef); + static const sal_uInt32 nLen(8); + static const Color aW(COL_WHITE); + static const Color aG(0xef, 0xef, 0xef); - pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG); - } - else - { - pVDev->SetBackground(rStyleSettings.GetFieldColor()); - pVDev->Erase(); - } + pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG); pVDev->DrawBitmapEx(aNull, aThumb); maFavoritesHorizontal.push_back(pVDev->GetBitmap(aNull, aSize)); |