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

Takeshi Abe tabe at fixedpoint.jp
Tue Dec 13 17:25:52 UTC 2016


 sd/source/ui/func/fuarea.cxx |   26 +++++++++++++-------------
 sd/source/ui/func/fuline.cxx |   30 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 9dba49471f289f68853ee6a5a7301cdc2cdf78a8
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Dec 13 17:22:47 2016 +0900

    sd: Update list items only when necessary
    
    Change-Id: I48568cb535ebb4372b2cc361d839efe233dc1d36
    Reviewed-on: https://gerrit.libreoffice.org/31942
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 1b83544..5dcb9c5 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -67,20 +67,20 @@ void FuArea::DoExecute( SfxRequest& rReq )
         if( pDlg && (pDlg->Execute() == RET_OK) )
         {
             mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
-        }
 
-        // attributes changed, update Listboxes in Objectbars
-        static const sal_uInt16 SidArray[] = {
-                        SID_ATTR_FILL_STYLE,
-                        SID_ATTR_FILL_COLOR,
-                        SID_ATTR_FILL_GRADIENT,
-                        SID_ATTR_FILL_HATCH,
-                        SID_ATTR_FILL_BITMAP,
-                        SID_ATTR_FILL_TRANSPARENCE,
-                        SID_ATTR_FILL_FLOATTRANSPARENCE,
-                        0 };
-
-        mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
+            // attributes changed, update Listboxes in Objectbars
+            static const sal_uInt16 SidArray[] = {
+                SID_ATTR_FILL_STYLE,
+                SID_ATTR_FILL_COLOR,
+                SID_ATTR_FILL_GRADIENT,
+                SID_ATTR_FILL_HATCH,
+                SID_ATTR_FILL_BITMAP,
+                SID_ATTR_FILL_TRANSPARENCE,
+                SID_ATTR_FILL_FLOATTRANSPARENCE,
+                0 };
+
+            mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
+        }
     }
 
     rReq.Ignore ();
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 16a1200..b7dd6f6 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -79,22 +79,22 @@ void FuLine::DoExecute( SfxRequest& rReq )
         if( pDlg && (pDlg->Execute() == RET_OK) )
         {
             mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
-        }
 
-        // some attributes are changed, we have to update the listboxes in the objectbars
-        static const sal_uInt16 SidArray[] = {
-            SID_ATTR_LINE_STYLE,                // ( SID_SVX_START + 169 )
-            SID_ATTR_LINE_DASH,                 // ( SID_SVX_START + 170 )
-            SID_ATTR_LINE_WIDTH,                // ( SID_SVX_START + 171 )
-            SID_ATTR_LINE_COLOR,                // ( SID_SVX_START + 172 )
-            SID_ATTR_LINE_START,                // ( SID_SVX_START + 173 )
-            SID_ATTR_LINE_END,                  // ( SID_SVX_START + 174 )
-            SID_ATTR_LINE_TRANSPARENCE,         // (SID_SVX_START+1107)
-            SID_ATTR_LINE_JOINT,                // (SID_SVX_START+1110)
-            SID_ATTR_LINE_CAP,                  // (SID_SVX_START+1111)
-            0 };
-
-        mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
+            // some attributes are changed, we have to update the listboxes in the objectbars
+            static const sal_uInt16 SidArray[] = {
+                SID_ATTR_LINE_STYLE,                // ( SID_SVX_START + 169 )
+                SID_ATTR_LINE_DASH,                 // ( SID_SVX_START + 170 )
+                SID_ATTR_LINE_WIDTH,                // ( SID_SVX_START + 171 )
+                SID_ATTR_LINE_COLOR,                // ( SID_SVX_START + 172 )
+                SID_ATTR_LINE_START,                // ( SID_SVX_START + 173 )
+                SID_ATTR_LINE_END,                  // ( SID_SVX_START + 174 )
+                SID_ATTR_LINE_TRANSPARENCE,         // (SID_SVX_START+1107)
+                SID_ATTR_LINE_JOINT,                // (SID_SVX_START+1110)
+                SID_ATTR_LINE_CAP,                  // (SID_SVX_START+1111)
+                0 };
+
+            mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
+        }
     }
 
     rReq.Ignore ();


More information about the Libreoffice-commits mailing list