[Libreoffice-commits] .: svx/source sw/source

[Tor Lillqvist]

 svx/source/tbxctrls/tbcontrl.cxx |   30 ++++++++++++++++++++++++++++++
 sw/source/ui/app/swmodule.cxx    |    2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit df0644161bf9b8e476eb138726f38ba5f11b19b7
Author: Winfried Donkers <osc at dci-electronics.nl>
Date:   Thu Mar 8 12:56:57 2012 +0100

    fdo#45682 split button for writer table line color

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2a20d4a..b434e00 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2261,6 +2261,11 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
             addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )));
             nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
             break;
+
+        case SID_FRAME_LINECOLOR:
+            addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FrameLineColor" )));
+            nMode = 0;
+            break;
     }
 
     pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode );
@@ -2302,6 +2307,10 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
         case SID_BACKGROUND_COLOR :
             pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
             break;
+
+        case SID_FRAME_LINECOLOR:
+            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
+            break;
     }
 
     pColorWin->StartPopupMode( &GetToolBox(),
@@ -2338,6 +2347,22 @@ void SvxColorExtToolBoxControl::StateChanged(
                     mLastColor = pItem->GetValue();
                 }
                 break;
+
+            case SID_FRAME_LINECOLOR :
+                ToolBox& rTbx = GetToolBox();
+                rTbx.EnableItem( nSID, SFX_ITEM_DISABLED != eState );
+                rTbx.SetItemState( nSID, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
+
+                if ( SFX_ITEM_DONTCARE != eState )
+                {
+                    pItem = PTR_CAST( SvxColorItem, pState );
+                    if ( pItem )
+                    {
+                        pBtnUpdater->Update( pItem->GetValue());
+                        mLastColor = pItem->GetValue();
+                    }
+                }
+                break;
         }
     }
 }
@@ -2373,6 +2398,11 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
             aCommand    = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" ));
             aParamName  = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharBackgroundExt" ));
             break;
+
+        case SID_FRAME_LINECOLOR  :
+            aCommand    = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FrameLineColor" ));
+            aParamName  = OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameLineColor" ));
+            break;
     }
 
     Sequence< PropertyValue > aArgs( 1 );
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index ab74737..03bb5a2 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -355,7 +355,7 @@ void SwDLL::RegisterControls()
     SvxColorExtToolBoxControl::RegisterControl( SID_BACKGROUND_COLOR, pMod );
     SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod );
     SvxFrameLineStyleToolBoxControl::RegisterControl(SID_FRAME_LINESTYLE, pMod );
-    SvxFrameLineColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod );
+    SvxColorExtToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod );
 
     SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME_INTERACT, pMod );
     SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME, pMod );