Related: #i122111# Adapted pState usages in NotifyItemUpdate methods

adapted control positioning in PosSizePanel

(cherry picked from commit 76e55d0f6effee49090d1e931c372671ec184123)

Conflicts:
svx/source/sidebar/area/AreaPropertyPanel.cxx
svx/source/sidebar/area/AreaPropertyPanel.hxx

Change-Id: I5762c5208259ca071decebcc937bfaab8e0464b2

1 files changed, 184 insertions, 160 deletions

diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index f55a408b4fdb..14433b794b5d 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -139,10 +139,9 @@ void GraphicPropertyPanel::Initialize()
 
 IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG )
 {
-    sal_Int16 nBright = mpMtrBrightness->GetValue();
-    SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_LUMINANCE, SFX_CALLMODE_RECORD, &aBrightItem, 0L);
+    const sal_Int16 nBright = mpMtrBrightness->GetValue();
+    const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_LUMINANCE, SFX_CALLMODE_RECORD, &aBrightItem, 0L);
     return 0L;
 }
 
@@ -150,10 +149,9 @@ IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG )
 
 IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG )
 {
-    sal_Int16 nContrast = mpMtrContrast->GetValue();
-    SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_CONTRAST, SFX_CALLMODE_RECORD, &aContrastItem, 0L);
+    const sal_Int16 nContrast = mpMtrContrast->GetValue();
+    const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_CONTRAST, SFX_CALLMODE_RECORD, &aContrastItem, 0L);
     return 0L;
 }
 
@@ -161,10 +159,9 @@ IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG )
 
 IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG )
 {
-    sal_Int16 nTrans = mpMtrTrans->GetValue();
-    SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_TRANSPARENCE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
+    const sal_Int16 nTrans = mpMtrTrans->GetValue();
+    const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_TRANSPARENCE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
     return 0L;
 }
 
@@ -172,10 +169,9 @@ IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG )
 
 IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl )
 {
-    sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos();
-    SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_MODE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
+    const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos();
+    const SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_MODE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
     return 0L;
 }
 
@@ -183,10 +179,9 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl )
 
 IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG )
 {
-    sal_Int16 nRed = mpMtrRed->GetValue();
-    SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_RED, SFX_CALLMODE_RECORD, &aRedItem, 0L);
+    const sal_Int16 nRed = mpMtrRed->GetValue();
+    const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_RED, SFX_CALLMODE_RECORD, &aRedItem, 0L);
     return 0L;
 }
 
@@ -194,10 +189,9 @@ IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG )
 
 IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG )
 {
-    sal_Int16 nGreen = mpMtrGreen->GetValue();
-    SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_GREEN, SFX_CALLMODE_RECORD, &aGreenItem, 0L);
+    const sal_Int16 nGreen = mpMtrGreen->GetValue();
+    const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GREEN, SFX_CALLMODE_RECORD, &aGreenItem, 0L);
     return 0L;
 }
 
@@ -205,10 +199,9 @@ IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG )
 
 IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG)
 {
-    sal_Int16 nBlue = mpMtrBlue->GetValue();
-    SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_BLUE, SFX_CALLMODE_RECORD, &aBlueItem, 0L);
+    const sal_Int16 nBlue = mpMtrBlue->GetValue();
+    const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_BLUE, SFX_CALLMODE_RECORD, &aBlueItem, 0L);
     return 0L;
 }
 
@@ -216,10 +209,9 @@ IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG)
 
 IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG)
 {
-    sal_Int32 nGamma = mpMtrGamma->GetValue();
-    SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
-    GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_GRAF_GAMMA, SFX_CALLMODE_RECORD, &nGammaItem, 0L);
+    const sal_Int32 nGamma = mpMtrGamma->GetValue();
+    const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GAMMA, SFX_CALLMODE_RECORD, &nGammaItem, 0L);
     return 0L;
 }
 
@@ -279,166 +271,198 @@ void GraphicPropertyPanel::NotifyItemUpdate(
 
     switch( nSID )
     {
-    case SID_ATTR_GRAF_LUMINANCE:
-        if( eState >= SFX_ITEM_AVAILABLE)
+        case SID_ATTR_GRAF_LUMINANCE:
         {
-            mpMtrBrightness->Enable();
-            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
-
-            if(pItem)
+            if(eState >= SFX_ITEM_AVAILABLE)
             {
-                sal_Int64 nBright = pItem->GetValue();
-                mpMtrBrightness->SetValue(nBright);
+                mpMtrBrightness->Enable();
+                const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nBright = pItem->GetValue();
+                    mpMtrBrightness->SetValue(nBright);
+                }
             }
-        }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrBrightness->Disable();
-        else
-        {
-            mpMtrBrightness->Enable();
-            mpMtrBrightness->SetText( String());
-        }
-        break;
-    case SID_ATTR_GRAF_CONTRAST:
-        if( eState >= SFX_ITEM_AVAILABLE)
-        {
-            mpMtrContrast->Enable();
-            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
-
-            if(pItem)
+            else if(SFX_ITEM_DISABLED == eState)
             {
-                sal_Int64 nContrast = pItem->GetValue();
-                mpMtrContrast->SetValue(nContrast);
+                mpMtrBrightness->Disable();
             }
-        }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrContrast->Disable();
-        else
-        {
-            mpMtrContrast->Enable();
-            mpMtrContrast->SetText( String());
-        }
-        break;
-    case SID_ATTR_GRAF_TRANSPARENCE:
-        if( eState >= SFX_ITEM_AVAILABLE)
-        {
-            mpMtrTrans->Enable();
-            const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
-
-            if(pItem)
+            else
             {
-                sal_Int64 nTrans = pItem->GetValue();
-                mpMtrTrans->SetValue(nTrans);
+                mpMtrBrightness->Enable();
+                mpMtrBrightness->SetText(String());
             }
+            break;
         }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrTrans->Disable();
-        else
+        case SID_ATTR_GRAF_CONTRAST:
         {
-            mpMtrTrans->Enable();
-            mpMtrTrans->SetText( String());
-        }
-        break;
-    case SID_ATTR_GRAF_MODE:
-        if( eState >= SFX_ITEM_AVAILABLE)
-        {
-            mpLBColorMode->Enable();
-            const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
-
-            if(pItem)
+            if(eState >= SFX_ITEM_AVAILABLE)
             {
-                sal_Int64 nTrans = pItem->GetValue();
-                mpLBColorMode->SelectEntryPos(nTrans);
+                mpMtrContrast->Enable();
+                const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nContrast = pItem->GetValue();
+                    mpMtrContrast->SetValue(nContrast);
+                }
             }
-        }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpLBColorMode->Disable();
-        else
-        {
-            mpLBColorMode->Enable();
-            mpLBColorMode->SetNoSelection();
-        }
-        break;
-    case SID_ATTR_GRAF_RED:
-        if( eState >= SFX_ITEM_AVAILABLE)
-        {
-            mpMtrRed->Enable();
-            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
-
-            if(pItem)
+            else if(SFX_ITEM_DISABLED == eState)
             {
-                sal_Int64 nRed = pItem->GetValue();
-                mpMtrRed->SetValue( nRed );
+                mpMtrContrast->Disable();
             }
+            else
+            {
+                mpMtrContrast->Enable();
+                mpMtrContrast->SetText(String());
+            }
+            break;
         }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrRed->Disable();
-        else
-        {
-            mpMtrRed->Enable();
-            mpMtrRed->SetText( String());
-        }
-        break;
-    case SID_ATTR_GRAF_GREEN:
-        if( eState >= SFX_ITEM_AVAILABLE)
+        case SID_ATTR_GRAF_TRANSPARENCE:
         {
-            mpMtrGreen->Enable();
-            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
-
-            if(pItem)
+            if(eState >= SFX_ITEM_AVAILABLE)
+            {
+                mpMtrTrans->Enable();
+                const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nTrans = pItem->GetValue();
+                    mpMtrTrans->SetValue(nTrans);
+                }
+            }
+            else if(SFX_ITEM_DISABLED == eState)
+            {
+                mpMtrTrans->Disable();
+            }
+            else
             {
-                sal_Int64 nGreen = pItem->GetValue();
-                mpMtrGreen->SetValue( nGreen );
+                mpMtrTrans->Enable();
+                mpMtrTrans->SetText(String());
             }
+            break;
         }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrGreen->Disable();
-        else
+        case SID_ATTR_GRAF_MODE:
         {
-            mpMtrGreen->Enable();
-            mpMtrGreen->SetText( String());
+            if(eState >= SFX_ITEM_AVAILABLE)
+            {
+                mpLBColorMode->Enable();
+                const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nTrans = pItem->GetValue();
+                    mpLBColorMode->SelectEntryPos(nTrans);
+                }
+            }
+            else if(SFX_ITEM_DISABLED == eState)
+            {
+                mpLBColorMode->Disable();
+            }
+            else
+            {
+                mpLBColorMode->Enable();
+                mpLBColorMode->SetNoSelection();
+            }
+            break;
         }
-        break;
-    case SID_ATTR_GRAF_BLUE:
-        if( eState >= SFX_ITEM_AVAILABLE)
+        case SID_ATTR_GRAF_RED:
         {
-            mpMtrBlue->Enable();
-            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
-
-            if(pItem)
+            if(eState >= SFX_ITEM_AVAILABLE)
             {
-                sal_Int64 nBlue = pItem->GetValue();
-                mpMtrBlue->SetValue( nBlue );
+                mpMtrRed->Enable();
+                const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nRed = pItem->GetValue();
+                    mpMtrRed->SetValue( nRed );
+                }
             }
+            else if(SFX_ITEM_DISABLED == eState)
+            {
+                mpMtrRed->Disable();
+            }
+            else
+            {
+                mpMtrRed->Enable();
+                mpMtrRed->SetText(String());
+            }
+            break;
         }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrBlue->Disable();
-        else
+        case SID_ATTR_GRAF_GREEN:
         {
-            mpMtrBlue->Enable();
-            mpMtrBlue->SetText( String());
+            if(eState >= SFX_ITEM_AVAILABLE)
+            {
+                mpMtrGreen->Enable();
+                const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nGreen = pItem->GetValue();
+                    mpMtrGreen->SetValue( nGreen );
+                }
+            }
+            else if(SFX_ITEM_DISABLED == eState)
+            {
+                mpMtrGreen->Disable();
+            }
+            else
+            {
+                mpMtrGreen->Enable();
+                mpMtrGreen->SetText(String());
+            }
+            break;
         }
-        break;
-    case SID_ATTR_GRAF_GAMMA:
-        if( eState >= SFX_ITEM_AVAILABLE)
+        case SID_ATTR_GRAF_BLUE:
         {
-            mpMtrGamma->Enable();
-            const SfxUInt32Item* pItem = dynamic_cast< const SfxUInt32Item* >(pState);
-
-            if(pItem)
+            if(eState >= SFX_ITEM_AVAILABLE)
+            {
+                mpMtrBlue->Enable();
+                const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nBlue = pItem->GetValue();
+                    mpMtrBlue->SetValue( nBlue );
+                }
+            }
+            else if(SFX_ITEM_DISABLED == eState)
+            {
+                mpMtrBlue->Disable();
+            }
+            else
             {
-                sal_Int64 nGamma = pItem->GetValue();
-                mpMtrGamma->SetValue( nGamma );
+                mpMtrBlue->Enable();
+                mpMtrBlue->SetText(String());
             }
+            break;
         }
-        else if( eState == SFX_ITEM_DISABLED )
-            mpMtrGamma->Disable();
-        else
+        case SID_ATTR_GRAF_GAMMA:
         {
-            mpMtrGamma->Enable();
-            mpMtrGamma->SetText( String());
+            if(eState >= SFX_ITEM_AVAILABLE)
+            {
+                mpMtrGamma->Enable();
+                const SfxUInt32Item* pItem = dynamic_cast< const SfxUInt32Item* >(pState);
+
+                if(pItem)
+                {
+                    const sal_Int64 nGamma = pItem->GetValue();
+                    mpMtrGamma->SetValue( nGamma );
+                }
+            }
+            else if(SFX_ITEM_DISABLED == eState)
+            {
+                mpMtrGamma->Disable();
+            }
+            else
+            {
+                mpMtrGamma->Enable();
+                mpMtrGamma->SetText(String());
+            }
+            break;
         }
-        break;
     }
 }