[Libreoffice-commits] core.git: sc/source

Caolán McNamara caolanm at redhat.com
Fri Jan 19 09:01:15 UTC 2018


 sc/source/ui/view/tabvwsha.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e720e90174cb141531d79c715373fa92f9a9834a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 18 21:33:19 2018 +0000

    SfxReqest::Done takes a SfxItemSet& or a boolean, not a SfxItemSet*
    
    regression from
    
    commit c40dfabd56ade10fe35690dc9810955c2e99e2c0
    Date:   Fri Jan 12 11:57:22 2018 +0000
    
    Change-Id: Ia97ba286a2da0584a2e806ad7396a3633f9d913e
    Reviewed-on: https://gerrit.libreoffice.org/48160
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index e391c28ffeda..67911a29c91d 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -551,8 +551,6 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
             {
                 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
-                assert(pOutSet);
-
                 const SfxPoolItem* pItem=nullptr;
                 if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SfxItemState::SET)
                 {
@@ -561,7 +559,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
 
                 ApplyAttributes(pOutSet, pOldSet.get());
 
-                pRequest->Done(pOutSet);
+                pRequest->Done(*pOutSet);
             }
         }, pDlg);
 }


More information about the Libreoffice-commits mailing list