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

[Mike Kaganski (via logerrit)]

 cui/source/tabpages/tparea.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 99971d009e9c96d1d47aec14ecfbfeaa06dc140d
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Jun 18 05:03:01 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Jun 18 05:55:46 2019 +0200

    Avoid needless copy of item
    
    Change-Id: Ifdf4f3559065dca5eeff61fffa9de223778691f4
    Reviewed-on: https://gerrit.libreoffice.org/74238
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1ec685daaafe..cb83563920b2 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -216,10 +216,11 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
         }
         case drawing::FillStyle_BITMAP:
         {
-            XFillBitmapItem aItem(static_cast<const XFillBitmapItem&>( rSet.Get( GetWhich( XATTR_FILLBITMAP ) ) ));
+            const bool bPattern
+                = rSet.Get(TypedWhichId<XFillBitmapItem>(GetWhich(XATTR_FILLBITMAP))).isPattern();
             // pass full item set here, bitmap fill has many attributes (tiling, size, offset etc.)
             m_rXFSet.Put( rSet );
-            if(!aItem.isPattern())
+            if (!bPattern)
                 SelectFillType(*m_xBtnBitmap);
             else
                 SelectFillType(*m_xBtnPattern);