From e2f9bbbad460037ed6b00f05311da95512a0208b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 29 Jun 2015 09:42:16 +0100 Subject: Resolves: tdf#92047 fix wrong merge conflict resolution since commit e8b97a52c96df9c8e8055407b1e40ed7cb9cfc67 Merge: 2b0be6c 0cde74f Date: Tue Apr 28 11:41:31 2015 +0100 - bWaterDisabled = !(pTreeBox || aFmtLb.GetSelectionCount() <= 1); - bWaterDisabled = (pTreeBox || aFmtLb->GetSelectionCount() <= 1) ? sal_False : sal_True; ++ bWaterDisabled = pTreeBox || aFmtLb->GetSelectionCount() <= 1; Change-Id: I14d848b4527adf05eb05110b93369791134cbe6c (cherry picked from commit 76837070c7c3eae1da50ff0de5e508be285e22c7) --- sfx2/source/dialog/templdlg.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/source') diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 8747856c9ec4..722b6c808df2 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1274,7 +1274,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) if(!bWaterDisabled) //make sure the watercan is only activated when there is (only) one selection - bWaterDisabled = pTreeBox || aFmtLb->GetSelectionCount() <= 1; + bWaterDisabled = !(pTreeBox || aFmtLb->GetSelectionCount() <= 1); if(pItem && !bWaterDisabled) { -- cgit v1.2.3