[ooo-build-commit] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/toolbar-decorations-fix.diff |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit d9096865aef00171a99a38a9875657236f9468bc
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 30 14:55:45 2010 +0200

    Draw frame around Font color and Highlighting toolbar boxes, n#598534.
    
    Fixes also the wrong name of the Font color box.
    
    * patches/dev300/toolbar-decorations-fix.diff: Update.

diff --git a/patches/dev300/toolbar-decorations-fix.diff b/patches/dev300/toolbar-decorations-fix.diff
index f11c59e..30b6e7e 100644
--- a/patches/dev300/toolbar-decorations-fix.diff
+++ b/patches/dev300/toolbar-decorations-fix.diff
@@ -2135,15 +2135,29 @@ index feddd99..0ae54c2 100644
      return pColorWin;
  }
  
-@@ -2513,7 +2575,7 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
+@@ -2598,16 +2598,15 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
                              m_aCommandURL,
                              GetSlotId(),
                              m_xFrame,
 -                            SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
-+                            SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ),
++                            SVX_RESSTR( ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND )?
++                                RID_SVXSTR_EXTRAS_CHARBACKGROUND:
++                                RID_SVXITEMS_EXTRAS_CHARCOLOR ),
                              &GetToolBox() );
  
-     if ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND )
+-    if ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND )
+-        pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ) );
+-
+-    pColorWin->StartPopupMode( &GetToolBox(),
+-        FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
++    pColorWin->EnableDocking(true);
++    pColorWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pColorWin);
+     pColorWin->StartSelection();
+-    SetPopupWindow( pColorWin );
++
+     return pColorWin;
+ }
+ 
 @@ -2724,10 +2786,9 @@ SfxPopupWindow*	SvxFrameLineColorToolBoxControl::CreatePopupWindow()
                                          SVX_RESSTR(RID_SVXSTR_FRAME_COLOR),
                                          &GetToolBox() );