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

[Noel Grandin (via logerrit)]

 sw/source/uibase/uiview/viewtab.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4b6ab16fb783d041bfe3f80b1bc943716d441aa3
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Sep 27 15:01:22 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Sep 27 16:43:11 2023 +0200

    no need to copy the itemset in SID_ATTR_PAGE_BITMAP
    
    Change-Id: I659f8a3d691143dfc237d5ab3baa9e9f6906567a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157332
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/uibase/uiview/viewtab.cxx 
b/sw/source/uibase/uiview/viewtab.cxx
index 26bfba7b8b18..52a26eabb672 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -2495,8 +2495,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         case SID_ATTR_PAGE_HATCH:
         case SID_ATTR_PAGE_BITMAP:
         {
-            SfxItemSet aSet = rDesc.GetMaster().GetAttrSet();
-            if (const auto pFillStyleItem = aSet.GetItem(XATTR_FILLSTYLE))
+            const SfxItemSet& rMasterSet = rDesc.GetMaster().GetAttrSet();
+            if (const auto pFillStyleItem = 
rMasterSet.GetItem(XATTR_FILLSTYLE))
             {
                 drawing::FillStyle eXFS = pFillStyleItem->GetValue();
                 XFillStyleItem aFillStyleItem( eXFS );
@@ -2507,7 +2507,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 {
                     case drawing::FillStyle_SOLID:
                     {
-                        if (const auto pItem = 
aSet.GetItem<XFillColorItem>(XATTR_FILLCOLOR, false))
+                        if (const auto pItem = 
rMasterSet.GetItem<XFillColorItem>(XATTR_FILLCOLOR, false))
                         {
                             Color aColor = pItem->GetColorValue();
                             XFillColorItem aFillColorItem( OUString(), aColor 
);
@@ -2519,7 +2519,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                     case drawing::FillStyle_GRADIENT:
                     {
-                        const basegfx::BGradient& aBGradient = 
aSet.GetItem<XFillGradientItem>( XATTR_FILLGRADIENT )->GetGradientValue();
+                        const basegfx::BGradient& aBGradient = 
rMasterSet.GetItem<XFillGradientItem>( XATTR_FILLGRADIENT )->GetGradientValue();
                         XFillGradientItem aFillGradientItem( OUString(), 
aBGradient, SID_ATTR_PAGE_GRADIENT  );
                         rSet.Put( aFillGradientItem );
                     }
@@ -2527,7 +2527,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                     case drawing::FillStyle_HATCH:
                     {
-                        const XFillHatchItem *pFillHatchItem( 
aSet.GetItem<XFillHatchItem>( XATTR_FILLHATCH ) );
+                        const XFillHatchItem *pFillHatchItem( 
rMasterSet.GetItem<XFillHatchItem>( XATTR_FILLHATCH ) );
                         XFillHatchItem aFillHatchItem( 
pFillHatchItem->GetName(), pFillHatchItem->GetHatchValue());
                         aFillHatchItem.SetWhich( SID_ATTR_PAGE_HATCH );
                         rSet.Put( aFillHatchItem );
@@ -2536,7 +2536,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                     case drawing::FillStyle_BITMAP:
                     {
-                        const XFillBitmapItem *pFillBitmapItem = 
aSet.GetItem<XFillBitmapItem>( XATTR_FILLBITMAP );
+                        const XFillBitmapItem *pFillBitmapItem = 
rMasterSet.GetItem<XFillBitmapItem>( XATTR_FILLBITMAP );
                         XFillBitmapItem aFillBitmapItem( 
pFillBitmapItem->GetName(), pFillBitmapItem->GetGraphicObject() );
                         aFillBitmapItem.SetWhich( SID_ATTR_PAGE_BITMAP );
                         rSet.Put( aFillBitmapItem );