sw/source/core/layout/layact.cxx | 7 +------ vcl/source/app/settings.cxx | 2 +- vcl/source/window/menu.cxx | 7 +------ 3 files changed, 3 insertions(+), 13 deletions(-)
New commits: commit 6a55792cdd39f95c28a929cd0c1c1a3e89e00cfd Author: Caolán McNamara <[email protected]> Date: Tue Jun 9 13:44:56 2015 +0100 Revert "restore "crash on layout of novell622972-2.html" temporarily" This reverts commit 46a76be3a13ad501e4d09da652f551b2c621e685. CppunitTest_sw_uiwriter failure was unrelated to this Change-Id: I2fb9d3cbf4730e4337a438db5ca66c77a87a133f diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 5289d58..9046788 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1239,12 +1239,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect ) aOldRect = static_cast<SwPageFrm*>(pLay)->GetBoundRect(); } - { - //JoinLock pParent for the lifetime of the Calc call to avoid - //SwSectionFrm::MergeNext removing the pLay we're trying to Format - FlowFrmJoinLockGuard aJoinGuard(pLay); - pLay->Calc(); - } + pLay->Calc(); if ( aOldFrame != pLay->Frm() ) bChanged = true; commit 753fa7ca2fbeb6dfc3f014a68c7d48c6e227be34 Author: Caolán McNamara <[email protected]> Date: Tue Jun 9 14:06:10 2015 +0100 tdf#91462 MenuBarHighlightTextColor should default to MenuHighlightTextColor Change-Id: I17607b0040f8adc2f0cbbe98a1d3a9af7b19c816 diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0d32446..b8572e3 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -738,7 +738,7 @@ void ImplStyleData::SetStandardStyles() maMenuTextColor = Color( COL_BLACK ); maMenuBarTextColor = Color( COL_BLACK ); maMenuBarRolloverTextColor = Color( COL_WHITE ); - maMenuBarHighlightTextColor = Color( COL_BLUE ); + maMenuBarHighlightTextColor = Color( COL_WHITE ); maMenuHighlightColor = Color( COL_BLUE ); maMenuHighlightTextColor = Color( COL_WHITE ); maHighlightColor = Color( COL_BLUE ); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 703c7a1..34c485d 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1843,12 +1843,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, if (bRollover) rRenderContext.SetTextColor(rSettings.GetMenuBarRolloverTextColor()); else if (bHighlighted) - { - if ( rSettings.GetMenuHighlightColor().AsRGBHexString() != rSettings.GetMenuBarHighlightTextColor().AsRGBHexString() ) - rRenderContext.SetTextColor(rSettings.GetMenuBarHighlightTextColor()); - else - rRenderContext.SetTextColor(rSettings.GetMenuBarRolloverTextColor()); - } + rRenderContext.SetTextColor(rSettings.GetMenuBarHighlightTextColor()); } else {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
