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

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Fri May 7 05:29:29 PDT 2010


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

New commits:
commit c3e643dc5be4470a76738282abe55d87cdf84f31
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri May 7 14:28:26 2010 +0200

    Fix for n#603588: toolbar decorations
    
    * patches/dev300/toolbar-decorations-fix.diff:

diff --git a/patches/dev300/toolbar-decorations-fix.diff b/patches/dev300/toolbar-decorations-fix.diff
index 4fe0412..7466ef4 100644
--- a/patches/dev300/toolbar-decorations-fix.diff
+++ b/patches/dev300/toolbar-decorations-fix.diff
@@ -1,4 +1,4 @@
-Toolbar decorations enhancements
+Toolbar graphical enhancements
 
 From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
 
@@ -15,10 +15,10 @@ From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
  svx/source/tbxctrls/fontworkgallery.cxx   |  163 ++++----
  svx/source/tbxctrls/fontworkgallery.src   |   16 -
  svx/source/tbxctrls/linectrl.cxx          |  138 ++-----
- svx/source/tbxctrls/tbcontrl.cxx          |  136 +++++--
+ svx/source/tbxctrls/tbcontrl.cxx          |  147 ++++++-
  vcl/inc/vcl/dockwin.hxx                   |    2 
  vcl/source/window/dockmgr.cxx             |   65 ++-
- 13 files changed, 644 insertions(+), 590 deletions(-)
+ 13 files changed, 652 insertions(+), 593 deletions(-)
 
 
 diff --git svtools/source/control/valueset.cxx svtools/source/control/valueset.cxx
@@ -1890,7 +1890,7 @@ index 2a69a5f..20b73e9 100644
  }
  
 diff --git svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/tbcontrl.cxx
-index be75081..6b15a3c 100644
+index be75081..eb6cbbf 100644
 --- svx/source/tbxctrls/tbcontrl.cxx
 +++ svx/source/tbxctrls/tbcontrl.cxx
 @@ -252,6 +252,7 @@ class SvxFrameWindow_Impl : public SfxPopupWindow
@@ -2047,7 +2047,20 @@ index be75081..6b15a3c 100644
  Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow()
  {
      return &aFrameSet;
-@@ -1238,8 +1286,11 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1151,6 +1199,12 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
+ //
+ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
+ {
++    if ( GetDockingManager()->IsInPopupMode( this ) )
++    {
++        GetDockingManager()->EndPopupMode( this );
++        doLazyDelete();
++    }
++
+     ::Color				aColBlack( COL_BLACK );
+     SvxBoxItem			aBorderOuter( SID_ATTR_BORDER_OUTER );
+     SvxBoxInfoItem		aBorderInner( SID_ATTR_BORDER_INNER );
+@@ -1238,8 +1292,11 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
      aBorderInner.SetValid( VALID_DISTANCE, TRUE );
      aBorderInner.SetValid( VALID_DISABLE, FALSE );
  
@@ -2061,7 +2074,7 @@ index be75081..6b15a3c 100644
  
      Any a;
      Sequence< PropertyValue > aArgs( 2 );
-@@ -1331,10 +1382,14 @@ BOOL SvxFrameWindow_Impl::Close()
+@@ -1331,10 +1388,14 @@ BOOL SvxFrameWindow_Impl::Close()
  
  SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
  
@@ -2078,7 +2091,7 @@ index be75081..6b15a3c 100644
      try
      {
          Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW );
-@@ -1343,6 +1398,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
+@@ -1343,6 +1404,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
      catch(const uno::Exception& )
      {
      }
@@ -2086,7 +2099,7 @@ index be75081..6b15a3c 100644
      Size	aBmpSize( 55, 12 );
      CreateBitmaps();
  
-@@ -1351,10 +1407,22 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
+@@ -1351,10 +1413,22 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
      aLineSet.SetText( SVX_RESSTR(STR_NONE) );
  
      lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize );
@@ -2109,7 +2122,7 @@ index be75081..6b15a3c 100644
  }
  
  SfxPopupWindow* SvxLineWindow_Impl::Clone() const
-@@ -1624,8 +1692,11 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1624,8 +1698,11 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
      else
          aLineItem.SetLine( 0 );
  
@@ -2123,7 +2136,7 @@ index be75081..6b15a3c 100644
  
      Any a;
      Sequence< PropertyValue > aArgs( 1 );
-@@ -1667,6 +1738,13 @@ BOOL SvxLineWindow_Impl::Close()
+@@ -1667,6 +1744,13 @@ BOOL SvxLineWindow_Impl::Close()
  
  // -----------------------------------------------------------------------
  
@@ -2137,7 +2150,7 @@ index be75081..6b15a3c 100644
  Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow()
  {
      return &aLineSet;
-@@ -2374,10 +2452,11 @@ SfxPopupWindow*	SvxFontColorToolBoxControl::CreatePopupWindow()
+@@ -2374,10 +2458,11 @@ SfxPopupWindow*	SvxFontColorToolBoxControl::CreatePopupWindow()
                  SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
                  &GetToolBox() );
  
@@ -2152,7 +2165,7 @@ index be75081..6b15a3c 100644
      return pColorWin;
  }
  
-@@ -2445,10 +2524,10 @@ SfxPopupWindow*	SvxColorToolBoxControl::CreatePopupWindow()
+@@ -2445,10 +2530,10 @@ SfxPopupWindow*	SvxColorToolBoxControl::CreatePopupWindow()
                                      SVX_RESSTR(nResId),
                                      &GetToolBox() );
  
@@ -2166,7 +2179,7 @@ index be75081..6b15a3c 100644
      return pColorWin;
  }
  
-@@ -2519,16 +2598,16 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
+@@ -2519,16 +2604,16 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
                              m_aCommandURL,
                              GetSlotId(),
                              m_xFrame,
@@ -2187,7 +2200,19 @@ index be75081..6b15a3c 100644
      return pColorWin;
  }
  
-@@ -2663,9 +2742,13 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
+@@ -2614,9 +2699,8 @@ SfxPopupWindow*	SvxFrameToolBoxControl::CreatePopupWindow()
+     SvxFrameWindow_Impl* pFrameWin = new SvxFrameWindow_Impl(
+                                         GetSlotId(), m_xFrame, &GetToolBox() );
+ 
+-    pFrameWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+-    pFrameWin->StartSelection();
+-    SetPopupWindow( pFrameWin );
++    pFrameWin->EnableDocking( true );
++    pFrameWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pFrameWin);
+ 
+     return pFrameWin;
+ }
+@@ -2663,9 +2747,13 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
  SfxPopupWindow*	SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
  {
      SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
@@ -2202,7 +2227,7 @@ index be75081..6b15a3c 100644
  
      return pLineWin;
  }
-@@ -2726,10 +2809,9 @@ SfxPopupWindow*	SvxFrameLineColorToolBoxControl::CreatePopupWindow()
+@@ -2726,10 +2814,9 @@ SfxPopupWindow*	SvxFrameLineColorToolBoxControl::CreatePopupWindow()
                                          SVX_RESSTR(RID_SVXSTR_FRAME_COLOR),
                                          &GetToolBox() );
  
@@ -2215,7 +2240,7 @@ index be75081..6b15a3c 100644
      return pColorWin;
  }
  
-@@ -2845,8 +2927,8 @@ void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
+@@ -2845,8 +2932,8 @@ void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
  {
      Size aSize = rWin.GetOutputSizePixel();
      aSize.Width()  -= 4;
@@ -2226,7 +2251,7 @@ index be75081..6b15a3c 100644
  }
  
  // -----------------------------------------------------------------------
-@@ -2855,7 +2937,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
+@@ -2855,7 +2942,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
  {
      Size aSize = rValueSet.CalcWindowSizePixel( aItemSize );
      aSize.Width()  += 4;


More information about the ooo-build-commit mailing list