sfx2/source/dialog/templdlg.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9e3f0a9d76c0ee4fee2ca1b49328e6eda4b57c0
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 29 09:42:16 2015 +0100
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)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 8747856..722b6c8 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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
