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

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Mon May 3 06:00:53 PDT 2010


 patches/dev300/apply                        |    1 
 patches/dev300/cws-cbosdo01.diff            |  159 --------------
 patches/dev300/field-patch-lock.diff        |   58 +++++
 patches/dev300/toolbar-decorations-fix.diff |  305 ++++++++++++----------------
 4 files changed, 192 insertions(+), 331 deletions(-)

New commits:
commit 00827d282912d19a5fddc508e803ea43d9f6dcc5
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon May 3 14:59:29 2010 +0200

    Fixed n#601634 and merged code from cws-cbosdo01
    
    * patches/dev300/toolbar-decorations-fix.diff:

diff --git a/patches/dev300/toolbar-decorations-fix.diff b/patches/dev300/toolbar-decorations-fix.diff
index 30b6e7e..4f21643 100644
--- a/patches/dev300/toolbar-decorations-fix.diff
+++ b/patches/dev300/toolbar-decorations-fix.diff
@@ -1,31 +1,8 @@
-Use HIG-appropriate dropdown toolbar decorations
-
-From: cbosdonnat at novell.com
-
-
----
-
- svtools/source/control/valueset.cxx       |    2 
- svx/inc/extrusioncontrols.hxx             |   59 +--
- svx/inc/fontworkgallery.hxx               |   22 -
- svx/inc/linectrl.hxx                      |    7 
- svx/source/tbxctrls/colorwindow.hxx       |    1 
- svx/source/tbxctrls/extrusioncontrols.cxx |  591 +++++++++++++++++------------
- svx/source/tbxctrls/extrusioncontrols.src |   32 --
- svx/source/tbxctrls/fontworkgallery.cxx   |  163 ++++----
- svx/source/tbxctrls/fontworkgallery.src   |   16 -
- svx/source/tbxctrls/linectrl.cxx          |  138 ++-----
- svx/source/tbxctrls/tbcontrl.cxx          |  107 ++++-
- vcl/inc/vcl/dockwin.hxx                   |    2 
- vcl/source/window/dockmgr.cxx             |   34 +-
- 13 files changed, 600 insertions(+), 574 deletions(-)
-
-
 diff --git svtools/source/control/valueset.cxx svtools/source/control/valueset.cxx
-index 014df3c..b559dbd 100644
+index 11cf019..ff8b9a4 100644
 --- svtools/source/control/valueset.cxx
 +++ svtools/source/control/valueset.cxx
-@@ -299,8 +299,6 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
+@@ -296,8 +296,6 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
                  maVirDev.SetFillColor( maColor );
              else if ( nStyle & WB_MENUSTYLEVALUESET )
                  maVirDev.SetFillColor( rStyleSettings.GetMenuColor() );
@@ -35,10 +12,10 @@ index 014df3c..b559dbd 100644
                  maVirDev.SetFillColor( rStyleSettings.GetFaceColor() );
              maVirDev.DrawRect( aRect );
 diff --git svx/inc/extrusioncontrols.hxx svx/inc/extrusioncontrols.hxx
-index b2d03ec..dfa40f4 100644
+index 6bae981..20d7070 100644
 --- svx/inc/extrusioncontrols.hxx
 +++ svx/inc/extrusioncontrols.hxx
-@@ -57,8 +57,14 @@ class ExtrusionDirectionWindow : public SfxPopupWindow
+@@ -54,8 +54,14 @@ class ExtrusionDirectionWindow : public SfxPopupWindow
      using FloatingWindow::StateChanged;
  
  private:
@@ -54,7 +31,7 @@ index b2d03ec..dfa40f4 100644
      ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
  
      SfxStatusForwarder* mpDirectionForewarder;
-@@ -72,8 +78,6 @@ private:
+@@ -69,8 +75,6 @@ private:
      Image		maImgParallel;
      Image		maImgParallelH;
  
@@ -63,7 +40,7 @@ index b2d03ec..dfa40f4 100644
      DECL_LINK( SelectHdl, void * );
      void			FillValueSet();
  
-@@ -83,7 +87,6 @@ private:
+@@ -80,7 +84,6 @@ private:
  
  protected:
      virtual BOOL	Close();
@@ -71,7 +48,7 @@ index b2d03ec..dfa40f4 100644
  
      /** This function is called when the window gets the focus.  It grabs
          the focus to the line ends value set so that it can be controlled with
-@@ -129,27 +132,15 @@ class ExtrusionDepthWindow : public SfxPopupWindow
+@@ -126,27 +129,15 @@ class ExtrusionDepthWindow : public SfxPopupWindow
      using FloatingWindow::StateChanged;
  
  private:
@@ -103,7 +80,7 @@ index b2d03ec..dfa40f4 100644
      FieldUnit	meUnit;
      double		mfDepth;
      bool		mbEnabled;
-@@ -162,7 +153,6 @@ private:
+@@ -159,7 +150,6 @@ private:
  
  protected:
      virtual BOOL	Close();
@@ -111,7 +88,7 @@ index b2d03ec..dfa40f4 100644
  
      /** This function is called when the window gets the focus.  It grabs
          the focus to the line ends value set so that it can be controlled with
-@@ -208,8 +198,15 @@ class ExtrusionLightingWindow : public SfxPopupWindow
+@@ -205,8 +195,15 @@ class ExtrusionLightingWindow : public SfxPopupWindow
      using FloatingWindow::StateChanged;
  
  private:
@@ -128,7 +105,7 @@ index b2d03ec..dfa40f4 100644
  
      Image maImgLightingOff[9];
      Image maImgLightingOn[9];
-@@ -230,7 +227,6 @@ private:
+@@ -227,7 +224,6 @@ private:
      SfxStatusForwarder* mpLightingIntensityForewarder;
      ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
  
@@ -136,7 +113,7 @@ index b2d03ec..dfa40f4 100644
      int		mnLevel;
      bool	mbLevelEnabled;
      int		mnDirection;
-@@ -244,7 +240,6 @@ private:
+@@ -241,7 +237,6 @@ private:
  
  protected:
      virtual BOOL	Close();
@@ -144,7 +121,7 @@ index b2d03ec..dfa40f4 100644
  
      /** This function is called when the window gets the focus.  It grabs
          the focus to the line ends value set so that it can be controlled with
-@@ -289,22 +284,13 @@ class ExtrusionSurfaceWindow : public SfxPopupWindow
+@@ -286,22 +281,13 @@ class ExtrusionSurfaceWindow : public SfxPopupWindow
  {
      using FloatingWindow::StateChanged;
  private:
@@ -170,7 +147,7 @@ index b2d03ec..dfa40f4 100644
      DECL_LINK( SelectHdl, void * );
  
      void	implSetSurface( int nSurface, bool bEnabled );
-@@ -312,7 +298,6 @@ private:
+@@ -309,7 +295,6 @@ private:
  
  protected:
      virtual BOOL	Close();
@@ -179,10 +156,10 @@ index b2d03ec..dfa40f4 100644
      /** This function is called when the window gets the focus.  It grabs
          the focus to the line ends value set so that it can be controlled with
 diff --git svx/inc/fontworkgallery.hxx svx/inc/fontworkgallery.hxx
-index 77de26d..30629ec 100644
+index 5becc11..fa97983 100644
 --- svx/inc/fontworkgallery.hxx
 +++ svx/inc/fontworkgallery.hxx
-@@ -65,23 +65,11 @@ class FontWorkAlignmentWindow : public SfxPopupWindow
+@@ -62,23 +62,11 @@ class FontWorkAlignmentWindow : public SfxPopupWindow
  {
      using FloatingWindow::StateChanged;
  private:
@@ -209,7 +186,7 @@ index 77de26d..30629ec 100644
      DECL_LINK( SelectHdl, void * );
  
      void	implSetAlignment( int nAlignmentMode, bool bEnabled );
-@@ -89,7 +77,6 @@ private:
+@@ -86,7 +74,6 @@ private:
  
  protected:
      virtual BOOL	Close();
@@ -217,7 +194,7 @@ index 77de26d..30629ec 100644
  
      /** This function is called when the window gets the focus.  It grabs
          the focus to the line ends value set so that it can be controlled with
-@@ -136,8 +123,6 @@ private:
+@@ -133,8 +120,6 @@ private:
      
      ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
  
@@ -226,7 +203,7 @@ index 77de26d..30629ec 100644
      DECL_LINK( SelectHdl, void * );
  
      void	implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
-@@ -146,7 +131,6 @@ private:
+@@ -143,7 +128,6 @@ private:
  
  protected:
      virtual BOOL	Close();
@@ -235,10 +212,10 @@ index 77de26d..30629ec 100644
      /** This function is called when the window gets the focus.  It grabs
          the focus to the line ends value set so that it can be controlled with
 diff --git svx/inc/linectrl.hxx svx/inc/linectrl.hxx
-index e3d3a5d..bf3107a 100644
+index a73ed6f..dc2941b 100644
 --- svx/inc/linectrl.hxx
 +++ svx/inc/linectrl.hxx
-@@ -110,14 +110,13 @@ class SvxLineEndWindow : public SfxPopupWindow
+@@ -107,14 +107,13 @@ class SvxLineEndWindow : public SfxPopupWindow
      using FloatingWindow::StateChanged;
  
  private:
@@ -254,7 +231,7 @@ index e3d3a5d..bf3107a 100644
      ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
  
  
-@@ -127,16 +126,14 @@ private:
+@@ -124,16 +123,14 @@ private:
      void            implInit();
  
  protected:
@@ -285,10 +262,10 @@ index 50388d6..9db6499 100644
  
  #if _SOLAR__PRIVATE
 diff --git svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/extrusioncontrols.cxx
-index a65f5a1..2d58996 100644
+index 4bd3ff2..bfaf088 100644
 --- svx/source/tbxctrls/extrusioncontrols.cxx
 +++ svx/source/tbxctrls/extrusioncontrols.cxx
-@@ -88,8 +88,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
+@@ -85,8 +85,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
      maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ),
      maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) ),
      maImgParallel( SVX_RES( IMG_PARALLEL ) ),
@@ -298,7 +275,7 @@ index a65f5a1..2d58996 100644
  {
      implInit();
  }
-@@ -106,15 +105,30 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
+@@ -103,15 +102,30 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
      maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ),
      maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) ),
      maImgParallel( SVX_RES( IMG_PARALLEL ) ),
@@ -331,7 +308,7 @@ index a65f5a1..2d58996 100644
  
      USHORT i;
      for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
-@@ -126,16 +140,14 @@ void ExtrusionDirectionWindow::implInit()
+@@ -123,16 +137,14 @@ void ExtrusionDirectionWindow::implInit()
  //	mpDirectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_DIRECTION, *this );
  //	mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this );
  
@@ -350,7 +327,7 @@ index a65f5a1..2d58996 100644
  
      bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
  
-@@ -146,16 +158,45 @@ void ExtrusionDirectionWindow::implInit()
+@@ -143,16 +155,45 @@ void ExtrusionDirectionWindow::implInit()
      }
  
      mpDirectionSet->SetOutputSizePixel( Size( 72, 72 ) );
@@ -406,7 +383,7 @@ index a65f5a1..2d58996 100644
  
      FreeResource();
  
-@@ -182,8 +223,9 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -179,8 +220,9 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
              mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] );
          }
  
@@ -418,7 +395,7 @@ index a65f5a1..2d58996 100644
      }
  }
  
-@@ -191,12 +233,18 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -188,12 +230,18 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
  
  ExtrusionDirectionWindow::~ExtrusionDirectionWindow()
  {
@@ -439,7 +416,7 @@ index a65f5a1..2d58996 100644
  {
      if( mpDirectionSet )
      {
-@@ -216,23 +264,16 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
+@@ -213,23 +261,16 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
              mpDirectionSet->SetNoSelection();
          }
      }
@@ -467,7 +444,7 @@ index a65f5a1..2d58996 100644
  }
  
  // -----------------------------------------------------------------------
-@@ -276,10 +317,11 @@ void ExtrusionDirectionWindow::StateChanged( USHORT nSID, SfxItemState eState, c
+@@ -273,10 +314,11 @@ void ExtrusionDirectionWindow::StateChanged( USHORT nSID, SfxItemState eState, c
  
  IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
  {
@@ -483,7 +460,7 @@ index a65f5a1..2d58996 100644
  
      if( pControl == mpDirectionSet )
      {
-@@ -299,12 +341,15 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
+@@ -296,12 +338,15 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
                                       mxFrame->getController(), UNO_QUERY ), 
                                       aCommand, 
                                       aArgs );
@@ -502,7 +479,7 @@ index a65f5a1..2d58996 100644
          if( (nProjection >= 0) && (nProjection < 2 ) )
          {
              SfxInt32Item    aItem( SID_EXTRUSION_PROJECTION, nProjection );
-@@ -350,17 +395,6 @@ BOOL ExtrusionDirectionWindow::Close()
+@@ -347,17 +392,6 @@ BOOL ExtrusionDirectionWindow::Close()
  
  // -----------------------------------------------------------------------
  
@@ -520,7 +497,7 @@ index a65f5a1..2d58996 100644
  void ExtrusionDirectionWindow::GetFocus (void)
  {
      SfxPopupWindow::GetFocus();
-@@ -401,9 +435,10 @@ SfxPopupWindowType ExtrusionDirectionControl::GetPopupWindowType() const
+@@ -398,9 +432,10 @@ SfxPopupWindowType ExtrusionDirectionControl::GetPopupWindowType() const
  SfxPopupWindow*	ExtrusionDirectionControl::CreatePopupWindow()
  {
      ExtrusionDirectionWindow* pWin = new ExtrusionDirectionWindow( GetId(), m_xFrame, &GetToolBox() );
@@ -533,7 +510,7 @@ index a65f5a1..2d58996 100644
      return pWin;
  }
  
-@@ -455,20 +490,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
+@@ -452,20 +487,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
      SfxPopupWindow( nId,                     
                      rFrame,
                      SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )),
@@ -554,7 +531,7 @@ index a65f5a1..2d58996 100644
      mfDepth( -1.0 ),
      mbEnabled( false )
  {
-@@ -482,20 +504,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(	USHORT nId,
+@@ -479,20 +501,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(	USHORT nId,
                      rFrame,
                      pParentWindow,
                      SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )),
@@ -575,7 +552,7 @@ index a65f5a1..2d58996 100644
      mfDepth( -1.0 ),
      mbEnabled( false )
  {
-@@ -504,31 +513,58 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(	USHORT nId,
+@@ -501,31 +510,58 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(	USHORT nId,
  
  void ExtrusionDepthWindow::implInit()
  {
@@ -647,7 +624,7 @@ index a65f5a1..2d58996 100644
  
      FreeResource();
  
-@@ -547,10 +583,12 @@ SfxPopupWindow* ExtrusionDepthWindow::Clone() const
+@@ -544,10 +580,12 @@ SfxPopupWindow* ExtrusionDepthWindow::Clone() const
  
  ExtrusionDepthWindow::~ExtrusionDepthWindow()
  {
@@ -664,7 +641,7 @@ index a65f5a1..2d58996 100644
  }
  
  // -----------------------------------------------------------------------
-@@ -562,20 +600,16 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth, bool bEnabled )
+@@ -559,20 +597,16 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth, bool bEnabled )
  {
      mbEnabled = bEnabled;
      mfDepth = fDepth;
@@ -693,7 +670,7 @@ index a65f5a1..2d58996 100644
          }
      }
  }
-@@ -590,7 +624,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
+@@ -587,7 +621,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
      for( int i = 0; i < 5; i++ )
      {
          String aStr( SVX_RES( nResource + i ) );
@@ -702,7 +679,7 @@ index a65f5a1..2d58996 100644
      };
  }
  
-@@ -637,29 +671,39 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -634,29 +668,39 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
      {
          bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
  
@@ -752,7 +729,7 @@ index a65f5a1..2d58996 100644
  
              SvxDoubleItem aDepthItem( mfDepth, SID_EXTRUSION_DEPTH );
              SfxUInt16Item aMetricItem(
-@@ -709,8 +753,11 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
+@@ -706,8 +750,11 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
                                           aArgs );
              implSetDepth( fDepth, true );
  
@@ -766,7 +743,7 @@ index a65f5a1..2d58996 100644
          }
      }
      return 0;
-@@ -731,24 +778,16 @@ BOOL ExtrusionDepthWindow::Close()
+@@ -728,24 +775,16 @@ BOOL ExtrusionDepthWindow::Close()
  
  // -----------------------------------------------------------------------
  
@@ -794,7 +771,7 @@ index a65f5a1..2d58996 100644
  }
  
  // ========================================================================
-@@ -778,9 +817,10 @@ SfxPopupWindowType ExtrusionDepthControl::GetPopupWindowType() const
+@@ -775,9 +814,10 @@ SfxPopupWindowType ExtrusionDepthControl::GetPopupWindowType() const
  SfxPopupWindow*	ExtrusionDepthControl::CreatePopupWindow()
  {
      ExtrusionDepthWindow* pWin = new ExtrusionDepthWindow( GetId(), m_xFrame, &GetToolBox() );
@@ -807,7 +784,7 @@ index a65f5a1..2d58996 100644
      return pWin;
  }
  
-@@ -812,7 +852,6 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(
+@@ -809,7 +849,6 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(
      maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) ),
      maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) ),
      mxFrame( rFrame ),
@@ -815,7 +792,7 @@ index a65f5a1..2d58996 100644
      mnLevel( 0 ),
      mbLevelEnabled( false ),
      mnDirection( FROM_FRONT ),
-@@ -838,7 +877,6 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(
+@@ -835,7 +874,6 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(
      maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) ),
      maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) ),
      mxFrame( rFrame ),
@@ -823,7 +800,7 @@ index a65f5a1..2d58996 100644
      mnLevel( 0 ),
      mbLevelEnabled( false ),
      mnDirection( FROM_FRONT ),
-@@ -851,7 +889,23 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(
+@@ -848,7 +886,23 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(
  
  void ExtrusionLightingWindow::implInit()
  {
@@ -847,7 +824,7 @@ index a65f5a1..2d58996 100644
  
      USHORT i;
      for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
-@@ -867,20 +921,14 @@ void ExtrusionLightingWindow::implInit()
+@@ -864,20 +918,14 @@ void ExtrusionLightingWindow::implInit()
          maImgLightingPreviewh[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW_H + i ) );
      }
  
@@ -870,7 +847,7 @@ index a65f5a1..2d58996 100644
  
      bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
  
-@@ -896,17 +944,60 @@ void ExtrusionLightingWindow::implInit()
+@@ -893,17 +941,60 @@ void ExtrusionLightingWindow::implInit()
          }
      }
      mpLightingSet->SetOutputSizePixel( Size( 72, 72 ) );
@@ -942,7 +919,7 @@ index a65f5a1..2d58996 100644
  
      FreeResource();
  
-@@ -925,7 +1016,14 @@ SfxPopupWindow* ExtrusionLightingWindow::Clone() const
+@@ -922,7 +1013,14 @@ SfxPopupWindow* ExtrusionLightingWindow::Clone() const
  
  ExtrusionLightingWindow::~ExtrusionLightingWindow()
  {
@@ -958,7 +935,7 @@ index a65f5a1..2d58996 100644
  }
  
  // -----------------------------------------------------------------------
-@@ -934,11 +1032,11 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
+@@ -931,11 +1029,11 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
  {
      mnLevel = nLevel;
      mbLevelEnabled = bEnabled;
@@ -972,7 +949,7 @@ index a65f5a1..2d58996 100644
      }
  }
  
-@@ -973,8 +1071,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
+@@ -970,8 +1068,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
              }
          }
      }
@@ -981,7 +958,7 @@ index a65f5a1..2d58996 100644
  }
  
  // -----------------------------------------------------------------------
-@@ -1025,9 +1121,9 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -1022,9 +1118,9 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
          bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
  
          implSetDirection( mnDirection, mbDirectionEnabled );
@@ -994,7 +971,7 @@ index a65f5a1..2d58996 100644
      }
  }
  
-@@ -1035,14 +1131,21 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -1032,14 +1128,21 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
  
  IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
  {
@@ -1020,7 +997,7 @@ index a65f5a1..2d58996 100644
          if( nLevel >= 0 )
          {
              if( nLevel != 3 )
-@@ -1114,24 +1217,16 @@ BOOL ExtrusionLightingWindow::Close()
+@@ -1111,24 +1214,16 @@ BOOL ExtrusionLightingWindow::Close()
  
  // -----------------------------------------------------------------------
  
@@ -1048,7 +1025,7 @@ index a65f5a1..2d58996 100644
  }
  
  // ========================================================================
-@@ -1160,9 +1255,9 @@ SfxPopupWindowType ExtrusionLightingControl::GetPopupWindowType() const
+@@ -1157,9 +1252,9 @@ SfxPopupWindowType ExtrusionLightingControl::GetPopupWindowType() const
  SfxPopupWindow*	ExtrusionLightingControl::CreatePopupWindow()
  {
      ExtrusionLightingWindow* pWin = new ExtrusionLightingWindow( GetId(), m_xFrame, &GetToolBox() );
@@ -1060,7 +1037,7 @@ index a65f5a1..2d58996 100644
      return pWin;
  }
  
-@@ -1188,16 +1283,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
+@@ -1185,16 +1280,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
      SfxPopupWindow( nId, 
                      rFrame,
                      SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE )),
@@ -1078,7 +1055,7 @@ index a65f5a1..2d58996 100644
  {
      implInit();
  }
-@@ -1211,16 +1297,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
+@@ -1208,16 +1294,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
                      rFrame,
                      pParentWindow,
                      SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE )),
@@ -1096,7 +1073,7 @@ index a65f5a1..2d58996 100644
  {
      implInit();
  }
-@@ -1229,25 +1306,48 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
+@@ -1226,25 +1303,48 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
  
  void ExtrusionSurfaceWindow::implInit()
  {
@@ -1157,7 +1134,7 @@ index a65f5a1..2d58996 100644
  
      FreeResource();
  
-@@ -1266,22 +1366,22 @@ SfxPopupWindow* ExtrusionSurfaceWindow::Clone() const
+@@ -1263,22 +1363,22 @@ SfxPopupWindow* ExtrusionSurfaceWindow::Clone() const
  
  ExtrusionSurfaceWindow::~ExtrusionSurfaceWindow()
  {
@@ -1189,7 +1166,7 @@ index a65f5a1..2d58996 100644
      }
  }
  
-@@ -1318,23 +1418,37 @@ void ExtrusionSurfaceWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -1315,23 +1415,37 @@ void ExtrusionSurfaceWindow::DataChanged( const DataChangedEvent& rDCEvt )
      {
          bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
  
@@ -1235,7 +1212,7 @@ index a65f5a1..2d58996 100644
      if( nSurface >= 0 )
      {
          SfxInt32Item    aItem( SID_EXTRUSION_SURFACE, nSurface );
-@@ -1374,24 +1488,16 @@ BOOL ExtrusionSurfaceWindow::Close()
+@@ -1371,24 +1485,16 @@ BOOL ExtrusionSurfaceWindow::Close()
  
  // -----------------------------------------------------------------------
  
@@ -1263,7 +1240,7 @@ index a65f5a1..2d58996 100644
  }
  
  // ========================================================================
-@@ -1421,9 +1527,10 @@ SfxPopupWindowType ExtrusionSurfaceControl::GetPopupWindowType() const
+@@ -1418,9 +1524,10 @@ SfxPopupWindowType ExtrusionSurfaceControl::GetPopupWindowType() const
  SfxPopupWindow*	ExtrusionSurfaceControl::CreatePopupWindow()
  {
      ExtrusionSurfaceWindow* pWin = new ExtrusionSurfaceWindow( GetId(), m_xFrame, &GetToolBox() );
@@ -1277,10 +1254,10 @@ index a65f5a1..2d58996 100644
  }
  
 diff --git svx/source/tbxctrls/extrusioncontrols.src svx/source/tbxctrls/extrusioncontrols.src
-index 3e391de..cd56231 100644
+index 96c4439..99c3c95 100644
 --- svx/source/tbxctrls/extrusioncontrols.src
 +++ svx/source/tbxctrls/extrusioncontrols.src
-@@ -35,14 +35,6 @@
+@@ -32,14 +32,6 @@
  
  FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
  {
@@ -1295,7 +1272,7 @@ index 3e391de..cd56231 100644
      Text [ en-US ] = "Extrusion Direction" ;
  
      Image IMG_DIRECTION + DIRECTION_NW
-@@ -205,14 +197,6 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
+@@ -202,14 +194,6 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
  
  FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
  {
@@ -1310,7 +1287,7 @@ index 3e391de..cd56231 100644
      Text [ en-US ] = "Extrusion Depth" ;
      
      String STR_CUSTOM
-@@ -294,14 +278,6 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
+@@ -291,14 +275,6 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
  
  FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
  {
@@ -1325,7 +1302,7 @@ index 3e391de..cd56231 100644
      Text [ en-US ] = "Extrusion Lighting" ;
      
      Image IMG_LIGHT_OFF + FROM_TOP_LEFT
-@@ -610,14 +586,6 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
+@@ -607,14 +583,6 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
  
  FloatingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
  {
@@ -1341,10 +1318,10 @@ index 3e391de..cd56231 100644
      
      String STR_WIREFRAME
 diff --git svx/source/tbxctrls/fontworkgallery.cxx svx/source/tbxctrls/fontworkgallery.cxx
-index 7cb7799..b9ea642 100644
+index 5d4cc29..abeec3b 100644
 --- svx/source/tbxctrls/fontworkgallery.cxx
 +++ svx/source/tbxctrls/fontworkgallery.cxx
-@@ -351,18 +351,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow(
+@@ -348,18 +348,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow(
      SfxPopupWindow( nId, 
                      rFrame,
                      SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )),
@@ -1364,7 +1341,7 @@ index 7cb7799..b9ea642 100644
  {
      SetHelpId( HID_WIN_FONTWORK_ALIGN );
      implInit();
-@@ -376,18 +365,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow(
+@@ -373,18 +362,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow(
      SfxPopupWindow( nId, 
                      rFrame,
                      SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )),
@@ -1384,7 +1361,7 @@ index 7cb7799..b9ea642 100644
  {
      SetHelpId( HID_WIN_FONTWORK_ALIGN );
      implInit();
-@@ -397,22 +375,40 @@ void FontWorkAlignmentWindow::implInit()
+@@ -394,22 +372,40 @@ void FontWorkAlignmentWindow::implInit()
  {
      SetHelpId( HID_POPUP_FONTWORK_ALIGN );
  
@@ -1437,7 +1414,7 @@ index 7cb7799..b9ea642 100644
  
      FreeResource();
  
-@@ -428,21 +424,23 @@ SfxPopupWindow* FontWorkAlignmentWindow::Clone() const
+@@ -425,21 +421,23 @@ SfxPopupWindow* FontWorkAlignmentWindow::Clone() const
  
  FontWorkAlignmentWindow::~FontWorkAlignmentWindow()
  {
@@ -1469,7 +1446,7 @@ index 7cb7799..b9ea642 100644
      }
  }
  
-@@ -479,24 +477,37 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
+@@ -476,24 +474,37 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
      {
          bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
  
@@ -1516,7 +1493,7 @@ index 7cb7799..b9ea642 100644
      if( nAlignment >= 0 )
      {
          SfxInt32Item    aItem( SID_FONTWORK_ALIGNMENT, nAlignment );
-@@ -535,24 +546,16 @@ BOOL FontWorkAlignmentWindow::Close()
+@@ -532,24 +543,16 @@ BOOL FontWorkAlignmentWindow::Close()
  
  // -----------------------------------------------------------------------
  
@@ -1544,7 +1521,7 @@ index 7cb7799..b9ea642 100644
  }
  
  // ========================================================================
-@@ -582,9 +585,9 @@ SfxPopupWindowType FontWorkAlignmentControl::GetPopupWindowType() const
+@@ -579,9 +582,9 @@ SfxPopupWindowType FontWorkAlignmentControl::GetPopupWindowType() const
  SfxPopupWindow*	FontWorkAlignmentControl::CreatePopupWindow()
  {
      FontWorkAlignmentWindow* pWin = new FontWorkAlignmentWindow( GetId(), m_xFrame, &GetToolBox() );
@@ -1556,7 +1533,7 @@ index 7cb7799..b9ea642 100644
      return pWin;
  }
  
-@@ -610,8 +613,7 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow(
+@@ -607,8 +610,7 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow(
      SfxPopupWindow( nId, 
                      rFrame,
                      SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )),
@@ -1566,7 +1543,7 @@ index 7cb7799..b9ea642 100644
  {
      SetHelpId( HID_WIN_FONTWORK_CHARSPACE );
      implInit();
-@@ -626,8 +628,7 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow(
+@@ -623,8 +625,7 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow(
                      rFrame,
                      pParentWindow,
                      SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )),
@@ -1576,7 +1553,7 @@ index 7cb7799..b9ea642 100644
  {
      SetHelpId( HID_WIN_FONTWORK_CHARSPACE );
      implInit();
-@@ -771,8 +772,11 @@ void FontWorkCharacterSpacingWindow::DataChanged( const DataChangedEvent& rDCEvt
+@@ -768,8 +769,11 @@ void FontWorkCharacterSpacingWindow::DataChanged( const DataChangedEvent& rDCEvt
  
  IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
  {
@@ -1590,7 +1567,7 @@ index 7cb7799..b9ea642 100644
  
      sal_Int32 nSelection = mpMenu->getSelectedEntryId();
      sal_Int32 nCharacterSpacing;
-@@ -856,17 +860,6 @@ BOOL FontWorkCharacterSpacingWindow::Close()
+@@ -853,17 +857,6 @@ BOOL FontWorkCharacterSpacingWindow::Close()
  
  // -----------------------------------------------------------------------
  
@@ -1608,7 +1585,7 @@ index 7cb7799..b9ea642 100644
  void FontWorkCharacterSpacingWindow::GetFocus (void)
  {
      SfxPopupWindow::GetFocus();
-@@ -903,9 +896,9 @@ SfxPopupWindowType FontWorkCharacterSpacingControl::GetPopupWindowType() const
+@@ -900,9 +893,9 @@ SfxPopupWindowType FontWorkCharacterSpacingControl::GetPopupWindowType() const
  SfxPopupWindow*	FontWorkCharacterSpacingControl::CreatePopupWindow()
  {
      FontWorkCharacterSpacingWindow* pWin = new FontWorkCharacterSpacingWindow( GetId(), m_xFrame, &GetToolBox() );
@@ -1621,10 +1598,10 @@ index 7cb7799..b9ea642 100644
  }
  
 diff --git svx/source/tbxctrls/fontworkgallery.src svx/source/tbxctrls/fontworkgallery.src
-index 880bb5d..a6a3fec 100644
+index e2e6e47..f37964e 100644
 --- svx/source/tbxctrls/fontworkgallery.src
 +++ svx/source/tbxctrls/fontworkgallery.src
-@@ -97,14 +97,6 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
+@@ -94,14 +94,6 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
  
  FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
  {
@@ -1639,7 +1616,7 @@ index 880bb5d..a6a3fec 100644
      Text [ en-US ] = "Fontwork Alignment" ;
      
      String STR_ALIGN_LEFT
-@@ -232,14 +224,6 @@ FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
+@@ -229,14 +221,6 @@ FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
  
  FloatingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
  {
@@ -1655,10 +1632,10 @@ index 880bb5d..a6a3fec 100644
      
      String STR_CHARS_SPACING_VERY_TIGHT
 diff --git svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/linectrl.cxx
-index dca3dd0..f18d5b5 100644
+index 2a69a5f..20b73e9 100644
 --- svx/source/tbxctrls/linectrl.cxx
 +++ svx/source/tbxctrls/linectrl.cxx
-@@ -385,14 +385,13 @@ SvxLineEndWindow::SvxLineEndWindow(
+@@ -382,14 +382,13 @@ SvxLineEndWindow::SvxLineEndWindow(
      const String& rWndTitle ) :
      SfxPopupWindow( nSlotId,
                      rFrame,
@@ -1675,7 +1652,7 @@ index dca3dd0..f18d5b5 100644
      mxFrame         ( rFrame )
  {
      SetText( rWndTitle );
-@@ -407,14 +406,13 @@ SvxLineEndWindow::SvxLineEndWindow(
+@@ -404,14 +403,13 @@ SvxLineEndWindow::SvxLineEndWindow(
      SfxPopupWindow( nSlotId,
                      rFrame,
                      pParentWindow,
@@ -1692,7 +1669,7 @@ index dca3dd0..f18d5b5 100644
      mxFrame         ( rFrame )
  {
      SetText( rWndTitle );
-@@ -426,6 +424,8 @@ void SvxLineEndWindow::implInit()
+@@ -423,6 +421,8 @@ void SvxLineEndWindow::implInit()
      SfxObjectShell*		pDocSh	= SfxObjectShell::Current();
      const SfxPoolItem*	pItem 	= NULL;
  
@@ -1701,7 +1678,7 @@ index dca3dd0..f18d5b5 100644
      SetHelpId( HID_POPUP_LINEEND );
      aLineEndSet.SetHelpId( HID_POPUP_LINEEND_CTRL );
  
-@@ -447,10 +447,23 @@ void SvxLineEndWindow::implInit()
+@@ -444,10 +444,23 @@ void SvxLineEndWindow::implInit()
      // ValueSet mit Eintraegen der LineEndList fuellen
      FillValueSet();
  
@@ -1725,7 +1702,7 @@ index dca3dd0..f18d5b5 100644
  }
  
  SfxPopupWindow* SvxLineEndWindow::Clone() const
-@@ -491,8 +504,11 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG )
+@@ -488,8 +501,11 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG )
          pLineEndItem	= new XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() );
      }
  
@@ -1739,7 +1716,7 @@ index dca3dd0..f18d5b5 100644
  
      Sequence< PropertyValue > aArgs( 1 );
      Any a;
-@@ -577,79 +593,6 @@ void SvxLineEndWindow::FillValueSet()
+@@ -574,79 +590,6 @@ void SvxLineEndWindow::FillValueSet()
  
  // -----------------------------------------------------------------------
  
@@ -1819,7 +1796,7 @@ index dca3dd0..f18d5b5 100644
  void SvxLineEndWindow::StartSelection()
  {
      aLineEndSet.StartSelection();
-@@ -677,28 +620,12 @@ void SvxLineEndWindow::StateChanged(
+@@ -674,28 +617,12 @@ void SvxLineEndWindow::StateChanged(
  
              aLineEndSet.Clear();
              FillValueSet();
@@ -1848,7 +1825,7 @@ index dca3dd0..f18d5b5 100644
  void SvxLineEndWindow::SetSize()
  {
      //if( !bPopupMode )
-@@ -721,12 +648,12 @@ void SvxLineEndWindow::SetSize()
+@@ -718,12 +645,12 @@ void SvxLineEndWindow::SetSize()
      aSize.Width()  += 6;
      aSize.Height() += 6;
      aSize = aLineEndSet.CalcWindowSizePixel( aSize );
@@ -1865,7 +1842,7 @@ index dca3dd0..f18d5b5 100644
  }
  
  void SvxLineEndWindow::GetFocus (void)
-@@ -737,6 +664,11 @@ void SvxLineEndWindow::GetFocus (void)
+@@ -734,6 +661,11 @@ void SvxLineEndWindow::GetFocus (void)
      aLineEndSet.GrabFocus();
  }
  
@@ -1877,7 +1854,7 @@ index dca3dd0..f18d5b5 100644
  /*************************************************************************
  |*
  |* SvxLineEndToolBoxControl
-@@ -769,9 +701,9 @@ SfxPopupWindow*	SvxLineEndToolBoxControl::CreatePopupWindow()
+@@ -766,9 +698,9 @@ SfxPopupWindow*	SvxLineEndToolBoxControl::CreatePopupWindow()
  {
      SvxLineEndWindow* pLineEndWin =
          new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( RID_SVXSTR_LINEEND ) );
@@ -1890,10 +1867,10 @@ index dca3dd0..f18d5b5 100644
  }
  
 diff --git svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/tbcontrl.cxx
-index feddd99..0ae54c2 100644
+index e39ff96..622e04c 100644
 --- svx/source/tbxctrls/tbcontrl.cxx
 +++ svx/source/tbxctrls/tbcontrl.cxx
-@@ -253,6 +253,7 @@ class SvxFrameWindow_Impl : public SfxPopupWindow
+@@ -250,6 +250,7 @@ class SvxFrameWindow_Impl : public SfxPopupWindow
      using FloatingWindow::StateChanged;
  
  private:
@@ -1901,7 +1878,7 @@ index feddd99..0ae54c2 100644
      SvxFrmValueSet_Impl  aFrameSet;
      ImageList 		aImgList;
      sal_Bool        bParagraphMode;
-@@ -264,6 +265,7 @@ private:
+@@ -261,6 +262,7 @@ private:
  protected:
      virtual void    Resize();
      virtual BOOL	Close();
@@ -1909,7 +1886,7 @@ index feddd99..0ae54c2 100644
      virtual Window*	GetPreferredKeyInputWindow();
      virtual void	GetFocus();
  
-@@ -292,6 +294,7 @@ class SvxLineWindow_Impl : public SfxPopupWindow
+@@ -289,6 +291,7 @@ class SvxLineWindow_Impl : public SfxPopupWindow
  {
  private:
      ValueSet		    aLineSet;
@@ -1917,7 +1894,7 @@ index feddd99..0ae54c2 100644
      bool				m_bIsWriter;
  
  #if _SOLAR__PRIVATE
-@@ -303,6 +306,7 @@ private:
+@@ -300,6 +303,7 @@ private:
  protected:
      virtual void    Resize();
      virtual BOOL	Close();
@@ -1925,7 +1902,7 @@ index feddd99..0ae54c2 100644
      virtual Window*	GetPreferredKeyInputWindow();
      virtual void	GetFocus();
      virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-@@ -836,6 +840,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
+@@ -833,6 +837,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
  
      theSlotId( nSlotId ),
      aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
@@ -1933,7 +1910,7 @@ index feddd99..0ae54c2 100644
      maCommand( rCommand )
  
  {
-@@ -845,6 +850,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
+@@ -842,6 +847,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
      BOOL bKillTable = FALSE;
      const Size aSize12( 13, 13 );
  
@@ -1942,7 +1919,7 @@ index feddd99..0ae54c2 100644
      if ( pDocSh )
          if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) )
              pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
-@@ -907,12 +914,24 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
+@@ -904,12 +911,24 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
      aColorSet.SetLineCount( PALETTE_Y );
  
      lcl_CalcSizeValueSet( *this, aColorSet, aSize12 );
@@ -1967,7 +1944,7 @@ index feddd99..0ae54c2 100644
  
      AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
      if ( bKillTable )
-@@ -948,8 +967,11 @@ IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -942,8 +961,11 @@ IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
          while in Dispatch()), accessing members will crash in this case. */
      aColorSet.SetNoSelection();
  
@@ -1981,24 +1958,21 @@ index feddd99..0ae54c2 100644
  
      if ( !nItemId && ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId  || SID_BACKGROUND_COLOR == theSlotId ) )
      {
-@@ -1062,6 +1084,7 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
+@@ -1056,10 +1078,13 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
  SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
  
-     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
+     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
 +    aLabel( this, WinBits( ) ),
      aFrameSet   ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
      bParagraphMode(sal_False)
  
-@@ -1069,6 +1092,8 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
-     WinBits nBits = GetStyle();
-     SetStyle( nBits & ~WB_MOVEABLE );
- 
+ {
 +    SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor( ) );
-+    
++   
      BindListener();
      String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" ));
      AddStatusListener( sCommand );
-@@ -1098,10 +1123,22 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
+@@ -1089,10 +1114,22 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
      aFrameSet.SetSelectHdl( LINK( this, SvxFrameWindow_Impl, SelectHdl ) );
  
      lcl_CalcSizeValueSet( *this, aFrameSet,Size( 20, 20 ));
@@ -2021,7 +1995,7 @@ index feddd99..0ae54c2 100644
  }
  /*-- 22.09.2004 12:27:50---------------------------------------------------
  
-@@ -1117,6 +1154,11 @@ SfxPopupWindow* SvxFrameWindow_Impl::Clone() const
+@@ -1108,6 +1145,11 @@ SfxPopupWindow* SvxFrameWindow_Impl::Clone() const
      return new SvxFrameWindow_Impl( GetId(), GetFrame(), GetParent() );
  }
  
@@ -2033,7 +2007,7 @@ index feddd99..0ae54c2 100644
  Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow()
  {
      return &aFrameSet;
-@@ -1245,8 +1287,11 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1236,8 +1278,11 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
      aBorderInner.SetValid( VALID_DISTANCE, TRUE );
      aBorderInner.SetValid( VALID_DISABLE, FALSE );
  
@@ -2047,30 +2021,17 @@ index feddd99..0ae54c2 100644
  
      Any a;
      Sequence< PropertyValue > aArgs( 2 );
-@@ -1340,7 +1385,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
+@@ -1331,7 +1376,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
  
-     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
+     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
  
--    aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) )
-+    aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) ),
+-    aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) )
++    aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) ),
 +    aLabel( this, WinBits( ) )
  {
-     WinBits nBits = GetStyle();
-     SetStyle( nBits & ~WB_MOVEABLE );
-@@ -1354,12 +1400,6 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
+     try
      {
-     }
- 
--    FixedText aLabel( this, WinBits( WB_NOMULTILINE ) );
--    aLabel.SetText( SVX_RESSTR( RID_SVXSTR_FRAME_STYLE ) );
--    Size aTxtSize( 100, 15 );
--    aLabel.SetSizePixel( aTxtSize );
--    aLabel.SetPosPixel( Point( 3, 3 ) );
--
-     Size	aBmpSize( 55, 12 );
-     CreateBitmaps();
- 
-@@ -1368,10 +1408,22 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
+@@ -1349,10 +1395,22 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
      aLineSet.SetText( SVX_RESSTR(STR_NONE) );
  
      lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize );
@@ -2093,7 +2054,7 @@ index feddd99..0ae54c2 100644
  }
  
  SfxPopupWindow* SvxLineWindow_Impl::Clone() const
-@@ -1617,8 +1669,11 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1598,8 +1656,11 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
      else
          aLineItem.SetLine( 0 );
  
@@ -2107,7 +2068,7 @@ index feddd99..0ae54c2 100644
  
      Any a;
      Sequence< PropertyValue > aArgs( 1 );
-@@ -1660,6 +1715,13 @@ BOOL SvxLineWindow_Impl::Close()
+@@ -1641,6 +1702,13 @@ BOOL SvxLineWindow_Impl::Close()
  
  // -----------------------------------------------------------------------
  
@@ -2121,7 +2082,7 @@ index feddd99..0ae54c2 100644
  Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow()
  {
      return &aLineSet;
-@@ -2439,10 +2501,10 @@ SfxPopupWindow*	SvxColorToolBoxControl::CreatePopupWindow()
+@@ -2419,10 +2487,10 @@ SfxPopupWindow*	SvxColorToolBoxControl::CreatePopupWindow()
                                      SVX_RESSTR(nResId),
                                      &GetToolBox() );
  
@@ -2135,7 +2096,7 @@ index feddd99..0ae54c2 100644
      return pColorWin;
  }
  
-@@ -2598,16 +2598,15 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
+@@ -2493,16 +2561,15 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
                              m_aCommandURL,
                              GetSlotId(),
                              m_xFrame,
@@ -2158,7 +2119,7 @@ index feddd99..0ae54c2 100644
      return pColorWin;
  }
  
-@@ -2724,10 +2786,9 @@ SfxPopupWindow*	SvxFrameLineColorToolBoxControl::CreatePopupWindow()
+@@ -2700,10 +2767,9 @@ SfxPopupWindow*	SvxFrameLineColorToolBoxControl::CreatePopupWindow()
                                          SVX_RESSTR(RID_SVXSTR_FRAME_COLOR),
                                          &GetToolBox() );
  
@@ -2171,7 +2132,7 @@ index feddd99..0ae54c2 100644
      return pColorWin;
  }
  
-@@ -2843,8 +2904,8 @@ void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
+@@ -2819,8 +2885,8 @@ void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
  {
      Size aSize = rWin.GetOutputSizePixel();
      aSize.Width()  -= 4;
@@ -2182,7 +2143,7 @@ index feddd99..0ae54c2 100644
  }
  
  // -----------------------------------------------------------------------
-@@ -2853,7 +2914,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
+@@ -2829,7 +2895,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
  {
      Size aSize = rValueSet.CalcWindowSizePixel( aItemSize );
      aSize.Width()  += 4;
@@ -2192,10 +2153,10 @@ index feddd99..0ae54c2 100644
  }
  
 diff --git vcl/inc/vcl/dockwin.hxx vcl/inc/vcl/dockwin.hxx
-index 0110960..6c84898 100644
+index b0be215..8b9686a 100644
 --- vcl/inc/vcl/dockwin.hxx
 +++ vcl/inc/vcl/dockwin.hxx
-@@ -156,6 +156,7 @@ public:
+@@ -153,6 +153,7 @@ public:
      BOOL            IsLocked() const;
  
      void            StartPopupMode( ToolBox* pParentToolBox );
@@ -2203,7 +2164,7 @@ index 0110960..6c84898 100644
      BOOL            IsInPopupMode() const;
  
      void	        TitleButtonClick( USHORT nButton );
-@@ -237,6 +238,7 @@ public:
+@@ -234,6 +235,7 @@ public:
      BOOL IsLocked( const Window *pWin );
  
      void    StartPopupMode( ToolBox *pParentToolBox, const Window *pWin );
@@ -2212,10 +2173,10 @@ index 0110960..6c84898 100644
  
      // required because those methods are not virtual in Window (!!!) and must
 diff --git vcl/source/window/dockmgr.cxx vcl/source/window/dockmgr.cxx
-index bec6e08..5c98a3b 100644
+index d3adaf7..837d7af 100644
 --- vcl/source/window/dockmgr.cxx
 +++ vcl/source/window/dockmgr.cxx
-@@ -436,6 +436,13 @@ void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWin
+@@ -433,6 +433,13 @@ void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWin
          pWrapper->StartPopupMode( pParentToolBox );
  }
  
@@ -2229,7 +2190,7 @@ index bec6e08..5c98a3b 100644
  BOOL DockingManager::IsInPopupMode( const Window *pWindow )
  {
      ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow );
-@@ -585,7 +592,10 @@ void ImplPopupFloatWin::ImplSetBorder()
+@@ -582,7 +589,10 @@ void ImplPopupFloatWin::ImplSetBorder()
      //  we're using a special border for the grip
      // by setting those members the method SetOutputSizePixel() can
      //  be used to set the proper window size
@@ -2241,7 +2202,7 @@ index bec6e08..5c98a3b 100644
      mpWindowImpl->mnBottomBorder  = 1;
      mpWindowImpl->mnLeftBorder    = 1;
      mpWindowImpl->mnRightBorder   = 1;
-@@ -599,7 +609,11 @@ void ImplPopupFloatWin::Resize()
+@@ -596,7 +606,11 @@ void ImplPopupFloatWin::Resize()
  
  Rectangle ImplPopupFloatWin::GetDragRect() const
  {
@@ -2254,7 +2215,7 @@ index bec6e08..5c98a3b 100644
  }
  
  Point ImplPopupFloatWin::GetToolboxPosition() const
-@@ -736,8 +750,7 @@ void ImplPopupFloatWin::Paint( const Rectangle& )
+@@ -730,8 +744,7 @@ void ImplPopupFloatWin::Paint( const Rectangle& )
  void ImplPopupFloatWin::MouseMove( const MouseEvent& rMEvt )
  {
      Point aMousePos = rMEvt.GetPosPixel();
@@ -2264,7 +2225,7 @@ index bec6e08..5c98a3b 100644
      {
          if( rMEvt.IsLeft() && GetDragRect().IsInside( aMousePos ) )
          {
-@@ -1241,14 +1254,10 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox )
+@@ -1235,14 +1248,10 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox )
      ULONG nFlags =  FLOATWIN_POPUPMODE_ALLOWTEAROFF         |
                      FLOATWIN_POPUPMODE_NOFOCUSCLOSE 	    |
                      FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE  |
@@ -2281,7 +2242,7 @@ index bec6e08..5c98a3b 100644
      mpFloatWin->StartPopupMode( pParentToolBox, nFlags );
      GetWindow()->Show();
  
-@@ -1260,6 +1269,11 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox )
+@@ -1254,6 +1263,11 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox )
      }
  }
  
commit d76eb0294470310e3d7ea7bcb835d4cde9971e8d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon May 3 13:29:57 2010 +0200

    Removed the toolbar-decoration stuffs
    
    * patches/dev300/cws-cbosdo01.diff:
      removed for later merge in the toolbar-decoration.diff

diff --git a/patches/dev300/cws-cbosdo01.diff b/patches/dev300/cws-cbosdo01.diff
index a190b50..68841a6 100644
--- a/patches/dev300/cws-cbosdo01.diff
+++ b/patches/dev300/cws-cbosdo01.diff
@@ -1464,127 +1464,6 @@ index 0940a4e..9cd98f5 100644
      bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
      bChgToEnEmDash = rAFFlags.bChgToEnEmDash;
      bChgWeightUnderl = rAFFlags.bChgWeightUnderl;
-diff --git svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/extrusioncontrols.cxx
-index 01f6824..a65f5a1 100644
---- svx/source/tbxctrls/extrusioncontrols.cxx
-+++ svx/source/tbxctrls/extrusioncontrols.cxx
-@@ -1474,9 +1474,16 @@ SfxPopupWindow*	ExtrusionColorControl::CreatePopupWindow()
-         m_xFrame, 
-         SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ),
-         &GetToolBox() );
-+
-+    pColorWin->EnableDocking(true);
-+    pColorWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pColorWin);
-+
-+#if 0
-     pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
--    pColorWin->StartSelection();
-     SetPopupWindow( pColorWin );
-+#endif
-+    pColorWin->StartSelection();
-+
-     return pColorWin;
- }
- 
-diff --git svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/tbcontrl.cxx
-index 94494aa..feddd99 100644
---- svx/source/tbxctrls/tbcontrl.cxx
-+++ svx/source/tbxctrls/tbcontrl.cxx
-@@ -832,7 +832,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
-                                           const String&              rWndTitle,
-                                           Window*                    pParentWindow ) :
- 
--    SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL ) ),
-+    SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
- 
-     theSlotId( nSlotId ),
-     aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
-@@ -917,6 +917,9 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
-     AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
-     if ( bKillTable )
-         delete pColorTable;
-+
-+    WinBits nBits = GetStyle();
-+    SetStyle( nBits & ~WB_MOVEABLE );
- }
- 
- SvxColorWindow_Impl::~SvxColorWindow_Impl()
-@@ -1058,11 +1061,14 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
- 
- SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
- 
--    SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
-+    SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
-     aFrameSet   ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
-     bParagraphMode(sal_False)
- 
- {
-+    WinBits nBits = GetStyle();
-+    SetStyle( nBits & ~WB_MOVEABLE );
-+
-     BindListener();
-     String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" ));
-     AddStatusListener( sCommand );
-@@ -1332,10 +1338,13 @@ BOOL SvxFrameWindow_Impl::Close()
- 
- SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
- 
--    SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
-+    SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
- 
--    aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) )
-+    aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) )
- {
-+    WinBits nBits = GetStyle();
-+    SetStyle( nBits & ~WB_MOVEABLE );
-+
-     try
-     {
-         Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW );
-@@ -1344,6 +1353,13 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
-     catch(const uno::Exception& )
-     {
-     }
-+
-+    FixedText aLabel( this, WinBits( WB_NOMULTILINE ) );
-+    aLabel.SetText( SVX_RESSTR( RID_SVXSTR_FRAME_STYLE ) );
-+    Size aTxtSize( 100, 15 );
-+    aLabel.SetSizePixel( aTxtSize );
-+    aLabel.SetPosPixel( Point( 3, 3 ) );
-+
-     Size	aBmpSize( 55, 12 );
-     CreateBitmaps();
- 
-@@ -2351,10 +2367,11 @@ SfxPopupWindow*	SvxFontColorToolBoxControl::CreatePopupWindow()
-                 SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
-                 &GetToolBox() );
- 
--    pColorWin->StartPopupMode( &GetToolBox(),
--        FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
-+    pColorWin->EnableDocking(true);
-+    pColorWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pColorWin);
-+
-     pColorWin->StartSelection();
--    SetPopupWindow( pColorWin );
-+
-     return pColorWin;
- }
- 
-@@ -2640,9 +2657,13 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
- SfxPopupWindow*	SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
- {
-     SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
-+    pLineWin->EnableDocking( true );
-+    pLineWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pLineWin);
-+#if 0
-     pLineWin->StartPopupMode( &GetToolBox(), TRUE );
--    pLineWin->StartSelection();
-     SetPopupWindow( pLineWin );
-+#endif
-+    pLineWin->StartSelection();
- 
-     return pLineWin;
- }
 diff --git svx/util/hidother.src svx/util/hidother.src
 index 5bce7c3..edb459c 100644
 --- svx/util/hidother.src
@@ -1811,41 +1690,3 @@ index e50d1b6..4aa6fff 100644
                              ChgToEnEmDash | SetINetAttr | Autocorrect ))
          pACorr = 0;
      return pACorr;
-diff --git vcl/source/window/dockmgr.cxx vcl/source/window/dockmgr.cxx
-index 6d70c20..bec6e08 100644
---- vcl/source/window/dockmgr.cxx
-+++ vcl/source/window/dockmgr.cxx
-@@ -650,19 +650,22 @@ void ImplPopupFloatWin::DrawGrip()
-     aRect.nLeft+=3;
-     aRect.nRight-=3;
- 
--    if( mbHighlight )
--    {
--        Erase( aRect );
--        DrawSelectionBackground( aRect, 2, FALSE, TRUE, FALSE );
--    }
--    else
--    {
--        SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
--        SetLineColor();
--        DrawRect( aRect );
-+    bool bMoveable = ( mpDockingWin->GetFloatStyle() & WB_MOVEABLE) > 0;
-+    if ( bMoveable ) {
-+        if( mbHighlight )
-+        {
-+            Erase( aRect );
-+            DrawSelectionBackground( aRect, 2, FALSE, TRUE, FALSE );
-+        }
-+        else
-+        {
-+            SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
-+            SetLineColor();
-+            DrawRect( aRect );
-+        }
-     }
- 
--    if( !ToolBox::AlwaysLocked() )  // no grip if toolboxes are locked
-+    if( bMoveable && !ToolBox::AlwaysLocked() )  // no grip if toolboxes are locked
-     {
- #ifdef TEAROFF_DASHED
-         // draw single dashed line
commit 29891af4f095266a2304835f0c72b78a37860086
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon May 3 09:28:51 2010 +0200

    Fix for n#601355
    
    * patches/dev300/apply:
    * patches/dev300/field-patch-lock.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 92167c0..1c94d77 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2941,6 +2941,7 @@ sw-allow-negative-spacing.diff, n#364534, freuter
 
 field-patch.diff, n#248354, freuter
 field-patch-uno-fix.diff, cbosdo
+field-patch-lock.diff, n#601355, cbosdo
 
 sw-import-html-controls.diff, n#485609, freuter
 svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
diff --git a/patches/dev300/field-patch-lock.diff b/patches/dev300/field-patch-lock.diff
new file mode 100644
index 0000000..7281661
--- /dev/null
+++ b/patches/dev300/field-patch-lock.diff
@@ -0,0 +1,58 @@
+Fixes for field-patch document locking
+
+From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+
+
+---
+
+ sw/source/core/crsr/pam.cxx |   36 +++++++++++++++++++++---------------
+ 1 files changed, 21 insertions(+), 15 deletions(-)
+
+
+diff --git sw/source/core/crsr/pam.cxx sw/source/core/crsr/pam.cxx
+index 85a55a8..2e6e709 100644
+--- sw/source/core/crsr/pam.cxx
++++ sw/source/core/crsr/pam.cxx
+@@ -825,21 +825,27 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
+     }
+     //FIXME FieldBk
+     // TODO: Form Protection when Enhanced Fields are enabled
+- 	if (!bRet) {
+- 	    const SwDoc *pDoc = GetDoc();
+-        sw::mark::IMark* pA = NULL;
+-        sw::mark::IMark* pB = NULL;
+-        if ( pDoc )
+-        {
+-            const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( );
+- 	        pA = GetPoint() ? pMarksAccess->getFieldmarkFor( *GetPoint( ) ) : NULL;
+- 	        pB = GetMark( ) ? pMarksAccess->getFieldmarkFor( *GetMark( ) ) : pA;
+-     	    bRet = ( pA != pB );
+-        }
+- 	    bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
+- 	    if ( bProtectForm )
+-     		bRet |= ( pA == NULL || pB == NULL );
+- 	}
++    const SwDoc *pDoc = GetDoc();
++    sw::mark::IMark* pA = NULL;
++    sw::mark::IMark* pB = NULL;
++    if ( pDoc )
++    {
++        const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( );
++        pA = GetPoint() ? pMarksAccess->getFieldmarkFor( *GetPoint( ) ) : NULL;
++        pB = GetMark( ) ? pMarksAccess->getFieldmarkFor( *GetMark( ) ) : pA;
++    }
++    
++    if (!bRet)
++    {
++        bRet = ( pA != pB );
++        bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
++        if ( bProtectForm )
++            bRet |= ( pA == NULL || pB == NULL );
++    }
++    else
++    {
++        bRet = !( pA == pB && pA != NULL );
++    }
+     return bRet;
+ }
+ 


More information about the ooo-build-commit mailing list