Kaydet (Commit) e86a6731 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

Resolves: #i121224# Corrected to use the ApplicationDocumentColor...

instead of the ApplicationBackgroundColor

(cherry picked from commit 8d005e90)

Conflicts:
	sd/source/ui/tools/PreviewRenderer.cxx

Change-Id: I5bb3d40724dbcca189fac8c9ba29b684b0b9ec67
üst 6858934f
...@@ -274,16 +274,28 @@ bool PreviewRenderer::Initialize ( ...@@ -274,16 +274,28 @@ bool PreviewRenderer::Initialize (
if (pPageView == NULL) if (pPageView == NULL)
return false; return false;
// Set background color of page view and outliner. // #i121224# No need to set SetApplicationBackgroundColor (which is the color
svtools::ColorConfig aColorConfig; // of the area 'behind' the page (formally called 'Wiese') since the page previews
const Color aPageBackgroundColor(pPage->GetPageBackgroundColor(pPageView)); // produced exactly cover the page's area, so it would never be visible. What
pPageView->SetApplicationBackgroundColor(aPageBackgroundColor); // needs to be set is the ApplicationDocumentColor which is derived from
SdrOutliner& rOutliner (pDocument->GetDrawOutliner(NULL)); // svtools::DOCCOLOR normally
rOutliner.SetBackgroundColor(aPageBackgroundColor); Color aApplicationDocumentColor;
if (pPageView->GetApplicationDocumentColor() == COL_AUTO)
{
svtools::ColorConfig aColorConfig;
aApplicationDocumentColor = aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor;
}
else
{
aApplicationDocumentColor = pPageView->GetApplicationDocumentColor();
}
pPageView->SetApplicationDocumentColor(aApplicationDocumentColor);
SdrOutliner& rOutliner(pDocument->GetDrawOutliner(NULL));
rOutliner.SetBackgroundColor(aApplicationDocumentColor);
rOutliner.SetDefaultLanguage(pDocument->GetLanguage(EE_CHAR_LANGUAGE)); rOutliner.SetDefaultLanguage(pDocument->GetLanguage(EE_CHAR_LANGUAGE));
mpView->SetApplicationBackgroundColor( mpPreviewDevice->SetBackground(Wallpaper(aApplicationDocumentColor));
Color(aColorConfig.GetColorValue(svtools::APPBACKGROUND).nColor));
mpPreviewDevice->SetBackground(Wallpaper(aPageBackgroundColor));
mpPreviewDevice->Erase(); mpPreviewDevice->Erase();
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment