[Libreoffice-commits] core.git: 3 commits - sw/source

[Caolán McNamara]

 sw/source/uibase/uiview/viewtab.cxx |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 64f2c78605a1bab8c7caeb14cf387e1aa4dda51b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 18 12:07:29 2017 +0000

    this SfxItemSet is unused
    
    Change-Id: I18b587aaef066c9558933d6d557219c1bad24656

diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 707bff8..6096468 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1510,9 +1510,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     }
                     else
                     {
-                        SfxItemSet aCoreSet2( GetPool(),
-                                                RES_BOX, RES_BOX,
-                                                SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
                         SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
                         aCoreSet.Put( aBoxInfo );
                         rSh.GetFlyFrameAttr( aCoreSet );
commit 44848147bb145546c89dae0a7d822c0af7ea5b49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 18 12:05:43 2017 +0000

    don't need to use the va_args version
    
    Change-Id: I56e4a6817edac93dee9866b9ae009f0651a29b56

diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 43fd2eb..707bff8 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1521,9 +1521,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         aDistLR.SetRight(rBox.GetDistance(SvxBoxItemLine::RIGHT));
 
                         //add the paragraph border distance
-                        SfxItemSet aCoreSet1( GetPool(),
-                                                RES_BOX, RES_BOX,
-                                                0 );
+                        SfxItemSet aCoreSet1( GetPool(), RES_BOX, RES_BOX );
                         rSh.GetCurAttr( aCoreSet1 );
                         const SvxBoxItem& rParaBox = static_cast<const SvxBoxItem&>(aCoreSet1.Get(RES_BOX));
                         aDistLR.SetLeft(aDistLR.GetLeft() + rParaBox.GetDistance(SvxBoxItemLine::LEFT));
commit f879b301f7192b21832e8a2d3642768869e0d568
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 18 12:03:51 2017 +0000

    writer, type a, return, b return, ctrl+a, del, crash
    
     #2  0x00007ffff7429da7 in __assert_fail_base () at /lib64/libc.so.6
     #3  0x00007ffff7429e52 in  () at /lib64/libc.so.6
     #4  0x00007ffff1ce2dc9 in SfxItemPool::GetDefaultItem(unsigned short) const (this=0x1b147a0, nWhich=nWhich at entry=10023)
         at /home/caolan/LibreOffice/core/svl/source/items/itempool.cxx:817
     #5  0x00007ffff1ce2da5 in SfxItemPool::GetDefaultItem(unsigned short) const (this=0x1b0eb30, nWhich=nWhich at entry=10023)
         at /home/caolan/LibreOffice/core/svl/source/items/itempool.cxx:816
     #6  0x00007ffff1ce2da5 in SfxItemPool::GetDefaultItem(unsigned short) const (this=0x1b0dbe0, nWhich=nWhich at entry=10023)
         at /home/caolan/LibreOffice/core/svl/source/items/itempool.cxx:816
     #7  0x00007ffff1d00ba8 in SfxItemSet::MergeValues(SfxItemSet const&) (this=this at entry=0x7fffffffd4d0, rSet=SfxItemSet of pool 0x1b0dbe0 with parent 0x0 and Which ranges: [(105, 105), (10023, 10023)] = {...}) at /home/caolan/LibreOffice/core/svl/source/items/itemset.cxx:1100
     #8  0x00007fffa9118372 in SwEditShell::GetPaMAttr(SwPaM*, SfxItemSet&, bool) const (this=this at entry=
         0x1be06c0, pPaM=<optimized out>, rSet=SfxItemSet of pool 0x1b0dbe0 with parent 0x0 and Which ranges: [(105, 105), (10023, 10023)] = {...}, bMergeIndentValuesOfNumRule=bMergeIndentValuesOfNumRule at entry=false) at /home/caolan/LibreOffice/core/sw/source/core/edit/edattr.cxx:158
     #9  0x00007fffa911846f in SwEditShell::GetCurAttr(SfxItemSet&, bool) const (this=this at entry=0x1be06c0, rSet=SfxItemSet of pool 0x1b0dbe0 with parent 0x0 and Which ranges: [(105, 105), (10023, 10023)] = {...}, bMergeIndentValuesOfNumRule=bMergeIndentValuesOfNumRule at entry=false) at /home/caolan/LibreOffice/core/sw/source/core/edit/edattr.cxx:174
     #10 0x00007fffa986caa5 in SwView::StateTabWin(SfxItemSet&) (this=0x1bd4120,
         this at entry=<error reading variable: value has been optimized out>, rSet=SfxItemSet of pool 0x1b0dbe0 with parent 0x0 and Which ranges: [(68, 68), (10042, 10042), (10080, 10080), (10082, 10082), (10084, 10084), (10284, 10285), (10415, 10415), (10935, 10935), (10946, 10948), (10952, 10952), (10992, 10993), (11145, 11146)] = {...},
         rSet at entry=<error reading variable: value has been optimized out>) at /home/caolan/LibreOffice/core/sw/source/uibase/uiview/viewtab.cxx:1596
    
    Change-Id: I460e004e6dfa8fa6460c167c6483f2b24502b775

diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 7647baa..43fd2eb 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1590,9 +1590,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     }
 
                     //add the border distance of the paragraph
-                    SfxItemSet aCoreSetTmp( GetPool(),
-                                            RES_BOX, RES_BOX,
-                                            SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
+                    SfxItemSet aCoreSetTmp( GetPool(), RES_BOX, RES_BOX );
                     rSh.GetCurAttr( aCoreSetTmp );
                     const SvxBoxItem& rParaBox = static_cast<const SvxBoxItem&>(aCoreSetTmp.Get(RES_BOX));
                     aDistLR.SetLeft(aDistLR.GetLeft() + rParaBox.GetDistance(SvxBoxItemLine::LEFT));