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

[Stephan Bergmann]

 sw/source/core/access/accframebase.cxx |   38 +++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

New commits:
commit f88576cb1985ea5abccaadb5624c39a99795d7d8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 14 17:29:37 2015 +0100

    Move var decl to where it gets actually used
    
    Change-Id: I8f9e74f7fbbff055c67cafba5d534db4635e5399

diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index dcd7e57..541ac25 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -215,33 +215,35 @@ SwAccessibleFrameBase::~SwAccessibleFrameBase()
 void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
 {
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
-    const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( GetFrame() );
     switch( nWhich )
     {
     case RES_NAME_CHANGED:
-        if(  pFlyFrame )
         {
-            const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
-            assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
+            const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( GetFrame() );
+            if(  pFlyFrame )
+            {
+                const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
+                assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
 
-            const OUString sOldName( GetName() );
-            assert( !pOld ||
-                    static_cast<const SwStringMsgPoolItem *>(pOld)->GetString() == GetName());
+                const OUString sOldName( GetName() );
+                assert( !pOld ||
+                        static_cast<const SwStringMsgPoolItem *>(pOld)->GetString() == GetName());
 
-            SetName( pFrameFormat->GetName() );
-            assert( !pNew ||
-                    static_cast<const SwStringMsgPoolItem *>(pNew)->GetString() == GetName());
+                SetName( pFrameFormat->GetName() );
+                assert( !pNew ||
+                        static_cast<const SwStringMsgPoolItem *>(pNew)->GetString() == GetName());
 
-            if( sOldName != GetName() )
-            {
-                AccessibleEventObject aEvent;
-                aEvent.EventId = AccessibleEventId::NAME_CHANGED;
-                aEvent.OldValue <<= sOldName;
-                aEvent.NewValue <<= GetName();
-                FireAccessibleEvent( aEvent );
+                if( sOldName != GetName() )
+                {
+                    AccessibleEventObject aEvent;
+                    aEvent.EventId = AccessibleEventId::NAME_CHANGED;
+                    aEvent.OldValue <<= sOldName;
+                    aEvent.NewValue <<= GetName();
+                    FireAccessibleEvent( aEvent );
+                }
             }
+            break;
         }
-        break;
     case RES_OBJECTDYING:
         // mba: it seems that this class intentionally does not call code in base class SwClient
         if( pOld && ( GetRegisteredIn() == static_cast< SwModify *>( static_cast< const SwPtrMsgPoolItem * >( pOld )->pObject ) ) )