Resolves: tdf#92047 fix wrong merge conflict resolution

since

commit e8b97a52
Merge: 2b0be6c0 0cde74f7
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 76837070)

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)
     {