CWS-TOOLING: integrate CWS os132

2009-07-21 15:24:18 +0200 os  r274201 : #i103696# SwXTextPortion/SwXParagraph excluded
2009-07-15 13:19:17 +0200 os  r274007 : #i103564# typo
2009-07-15 13:09:30 +0200 os  r274005 : #i103564# SwFrames::hasElements
2009-07-15 13:02:16 +0200 os  r274003 : #i103564# SwXBookmark::getPropertySetInfo fixed
2009-06-26 10:11:00 +0200 os  r273395 : CWS-TOOLING: rebase CWS os132 to trunk@272827 (milestone: DEV300:m50)
2009-06-23 08:52:24 +0200 os  r273256 : #i102764# patch: attribute ListBoxes correctly handled in ::Reset()
2009-06-23 08:51:31 +0200 os  r273255 : #i102764# ResetColor() added to remove background color 
2009-06-22 14:57:38 +0200 os  r273233 : #i102619# prevent access to already destroyed shell
2009-06-18 13:26:51 +0200 os  r273112 : #i99508# ::insertTextContent: re-route to ::attach()
2009-06-18 10:59:53 +0200 os  r273107 : #i85405# patch to enable 'Print grid' CheckBox correctly
2009-06-18 10:54:02 +0200 os  r273106 : #i85133# dispose connection in GetColumnFmt to prevent connection locking
2009-06-18 10:24:31 +0200 os  r273104 : #99535# ExportGraphic changed
2009-06-18 10:24:03 +0200 os  r273103 : #99535# ExportGraphic changed
2009-06-18 10:23:11 +0200 os  r273102 : #i102841# redlining mode switches to insert mode (cmc)
2009-06-17 14:05:42 +0200 os  r273070 : #i102111# do not save already saved HTML documents before switching to source veiw
2009-06-17 13:18:20 +0200 os  r273063 : #i101825# set rembered start position at the real start not at the initial start
2009-06-17 08:24:10 +0200 os  r273048 : #99535# no dierect access to the file picker interface
2009-06-16 15:00:12 +0200 os  r273020 : #i99937# notification of user options changes re-introduced
2009-06-15 14:36:03 +0200 os  r272987 : #i98032# unreplaced text in protected areas must not be attributed either
2009-06-15 14:20:26 +0200 os  r272985 : #i98032# replace list has to be initialised
2009-06-04 13:29:02 +0200 os  r272624 : #i97810# set focus into column page
2009-06-04 11:01:14 +0200 os  r272617 : #i98164# dialog resize to ease localisation
2009-06-04 10:59:44 +0200 os  r272616 : #i98164# dialog resize to ease localisation
2009-05-28 16:05:03 +0200 os  r272413 : #i98172# ConvertFieldsToText: take care of tabs with attributes
2009-05-28 11:12:45 +0200 os  r272385 : #i59361# dialog controls resized
2009-05-28 11:03:14 +0200 os  r272383 : #i59174# dialog controls moved

10 files changed, 79 insertions, 73 deletions

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b57cdd9ff5..11e9fd3d77 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -765,6 +765,8 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         sal_Bool bFailure = sal_False;
         const SfxPoolItem* pItem = NULL;
         SfxShell* pShell( 0 );
+        // #i102619# Retrieve metric from shell before execution - the shell could be destroyed after execution 
+        SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
         if ( pDispatcher->GetBindings() )
         {
             if ( !pDispatcher->IsLocked( GetId() ) )
@@ -783,6 +785,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                         lNewArgs[nIndex].Value  = makeAny( SfxDispatchController_Impl::getSlaveCommand( aDispatchURL ));
                     }
 
+                    eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
                     SfxAllItemSet aSet( pShell->GetPool() );
                     TransformParameters( GetId(), lNewArgs, aSet, pSlot );
                     if ( aSet.Count() )
@@ -811,6 +814,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         }
         else
         {
+            eMapUnit = GetCoreMetric( SFX_APP()->GetPool(), GetId() );
             // AppDispatcher
             SfxAllItemSet aSet( SFX_APP()->GetPool() );
             TransformParameters( GetId(), lNewArgs, aSet );
@@ -850,13 +854,6 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             aEvent.Source = (::com::sun::star::frame::XDispatch*) pDispatch;
             if ( bSuccess && pItem && !pItem->ISA(SfxVoidItem) )
             {
-                // Retrieve metric from pool to have correct sub ID when calling QueryValue
-                SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
-                if ( pShell )
-                    eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
-                else
-                    eMapUnit = GetCoreMetric( SFX_APP()->GetPool(), GetId() );
-
                 USHORT nSubId( 0 );
                 if ( eMapUnit == SFX_MAPUNIT_TWIP )
                     nSubId |= CONVERT_TWIPS;
diff --git a/svx/inc/optgenrl.hrc b/svx/inc/optgenrl.hrc
index 815649479b..a0d06878a9 100644
--- a/svx/inc/optgenrl.hrc
+++ b/svx/inc/optgenrl.hrc
@@ -74,7 +74,7 @@
 #define LINEH		12
 #define FLINEH		8
 #define	LEFT		12
-#define MID         96
+#define MID         100
 #define RIGHT		248
 #define TOP			10
 #define LINE(y)		(14+y*15)
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 955d871973..31422c88b1 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -71,6 +71,7 @@ public:
     SvxFont&            GetCJKFont();
     SvxFont&			GetCTLFont();
     void  				SetColor( const Color& rColor );
+    void                ResetColor();
     void                SetBackColor( const Color& rColor );
     void                UseResourceText( BOOL bUse = TRUE );
     void  				Paint( const Rectangle& );
diff --git a/svx/source/cui/commonlingui.src b/svx/source/cui/commonlingui.src
index 59fbb6b81f..f3d3c05c1a 100644
--- a/svx/source/cui/commonlingui.src
+++ b/svx/source/cui/commonlingui.src
@@ -47,7 +47,7 @@ Window RID_SVX_WND_COMMON_LINGU
     {
         HelpId=HID_SPELLDLG_SETWORD;
         Pos = MAP_APPFONT( 51, 9 );
-        Size = MAP_APPFONT( 149, 10 );
+        Size = MAP_APPFONT( 164, 10 );
         Border =FALSE;
         TabStop = TRUE;
     };
@@ -62,7 +62,7 @@ Window RID_SVX_WND_COMMON_LINGU
     Edit ED_NEWWORD
     {
         Pos = MAP_APPFONT( 51, 24 );
-        Size = MAP_APPFONT( 122, 12 );
+        Size = MAP_APPFONT( 137, 12 );
         Border = TRUE;
     };
 
@@ -75,21 +75,21 @@ Window RID_SVX_WND_COMMON_LINGU
 
     PushButton BTN_IGNORE
     {
-        Pos = MAP_APPFONT( 209, 6 );
+        Pos = MAP_APPFONT( 224, 6 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Ignore" ;
     };
 
     PushButton BTN_IGNOREALL
     {
-        Pos = MAP_APPFONT( 209, 22 );
+        Pos = MAP_APPFONT( 224, 22 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "Always I~gnore" ;
     };
 
     PushButton BTN_CHANGE
     {
-        Pos = MAP_APPFONT( 209, 40 );
+        Pos = MAP_APPFONT( 224, 40 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Replace" ;
         DefButton = TRUE ;
@@ -97,14 +97,14 @@ Window RID_SVX_WND_COMMON_LINGU
 
     PushButton BTN_CHANGEALL
     {
-        Pos = MAP_APPFONT( 209, 56 );
+        Pos = MAP_APPFONT( 224, 56 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "Always R~eplace" ;
     };
 
     PushButton BTN_OPTIONS
     {
-        Pos = MAP_APPFONT( 209, 129 );
+        Pos = MAP_APPFONT( 224, 129 );
         Size = MAP_APPFONT( 55, 14 );
         Hide = TRUE ;
         Text [ en-US ] = "Options..." ;
@@ -119,19 +119,19 @@ Window RID_SVX_WND_COMMON_LINGU
     GroupBox GB_AUDIT
     {
         Pos = MAP_APPFONT( 1, 1 );
-        Size = MAP_APPFONT( 268, 148 );
+        Size = MAP_APPFONT( 283, 148 );
         Hide=TRUE;
     };
 
     HelpButton BTN_SPL_HELP
     {
-        Pos = MAP_APPFONT( 145, 153 );
+        Pos = MAP_APPFONT( 160, 153 );
         Size = MAP_APPFONT( 55, 14 );
     };
 
     CancelButton BTN_SPL_CANCEL
     {
-        Pos = MAP_APPFONT ( 209 , 153 ) ;
+        Pos = MAP_APPFONT ( 224 , 153 ) ;
         Size = MAP_APPFONT ( 55 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Close" ;
diff --git a/svx/source/cui/hangulhanjadlg.src b/svx/source/cui/hangulhanjadlg.src
index 603a28e798..0d0041b67e 100644
--- a/svx/source/cui/hangulhanjadlg.src
+++ b/svx/source/cui/hangulhanjadlg.src
@@ -37,7 +37,7 @@
 ModalDialog RID_SVX_MDLG_HANGULHANJA
 {
     HelpId = HID_DIALOG_HANGULHANJA;
-    Size = MAP_APPFONT( 287, 175 );
+    Size = MAP_APPFONT( 302, 175 );
     OutputSize = TRUE;
     Closeable = TRUE ;
     Moveable = TRUE ;
@@ -47,7 +47,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     PushButton PB_FIND
     {
-        Pos = MAP_APPFONT( 192, 23 );
+        Pos = MAP_APPFONT( 207, 23 );
         Size = MAP_APPFONT( 30, 14 );
 
         Text [ en-US ] = "~Find";
@@ -56,7 +56,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
     Control CTL_SUGGESTIONS
     {
         Pos = MAP_APPFONT( 51, 46 );
-        Size = MAP_APPFONT( 171, 30 );
+        Size = MAP_APPFONT( 186, 30 );
         TabStop = TRUE ;
     };
 
@@ -71,7 +71,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
     RadioButton RB_SIMPLE_CONVERSION
     {
         Pos = MAP_APPFONT( 51, 81 );
-        Size = MAP_APPFONT( 55, 8 );
+        Size = MAP_APPFONT( 60, 8 );
 
         Group = TRUE;
 
@@ -80,16 +80,16 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_BRACKETED
     {
-        Pos = MAP_APPFONT( 109, 81 );
-        Size = MAP_APPFONT( 55, 8 );
+        Pos = MAP_APPFONT( 114, 81 );
+        Size = MAP_APPFONT( 60, 8 );
 
         Text [ en-US ] = "Hanja (Han~gul)";
     };
 
     RadioButton RB_HANGUL_HANJA_BRACKETED
     {
-        Pos = MAP_APPFONT( 167, 81 );
-        Size = MAP_APPFONT( 55, 8 );
+        Pos = MAP_APPFONT( 177, 81 );
+        Size = MAP_APPFONT( 60, 8 );
 
         Text [ en-US ] = "Hang~ul (Hanja)";
     };
@@ -97,7 +97,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
     RadioButton RB_HANGUL_HANJA_ABOVE
     {
         Pos = MAP_APPFONT( 51, 95 );
-        Size = MAP_APPFONT( 55, 16 );
+        Size = MAP_APPFONT( 60, 16 );
 
         // this is the _primary_ text
         Text [ en-US ] = "Hangu~l";
@@ -105,8 +105,8 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_BELOW
     {
-        Pos = MAP_APPFONT( 109, 95 );
-        Size = MAP_APPFONT( 55, 16 );
+        Pos = MAP_APPFONT( 114, 95 );
+        Size = MAP_APPFONT( 60, 16 );
 
         // this is the _primary_ text
         Text [ en-US ] = "Hang~ul";
@@ -114,8 +114,8 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_ABOVE
     {
-        Pos = MAP_APPFONT( 51, 114 );
-        Size = MAP_APPFONT( 55, 16 );
+        Pos = MAP_APPFONT( 56, 114 );
+        Size = MAP_APPFONT( 60, 16 );
 
         // this is the _primary_ text
         Text [ en-US ] = "Han~ja";
@@ -123,8 +123,8 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_BELOW
     {
-        Pos = MAP_APPFONT( 109, 114 );
-        Size = MAP_APPFONT( 55, 16 );
+        Pos = MAP_APPFONT( 114, 114 );
+        Size = MAP_APPFONT( 60, 16 );
 
         // this is the _primary_ text
         Text [ en-US ] = "Ha~nja";
@@ -141,14 +141,14 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
     CheckBox CB_HANGUL_ONLY
     {
         Pos = MAP_APPFONT( 51, 134 );
-        Size = MAP_APPFONT( 55, 8 );
+        Size = MAP_APPFONT( 60, 8 );
 
         Text [ en-US ] = "Hangul ~only";
     };
 
     CheckBox CB_HANJA_ONLY
     {
-        Pos = MAP_APPFONT( 109, 134 );
+        Pos = MAP_APPFONT( 114, 134 );
         Size = MAP_APPFONT( 55, 8 );
 
         Text [ en-US ] = "Hanja onl~y";
@@ -157,12 +157,12 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
     // this element is only for determining where our radio button group ends (in both directions)
     FixedText FT_RESIZE_ANCHOR
     {
-        Pos = MAP_APPFONT( 226, 133 );
+        Pos = MAP_APPFONT( 241, 133 );
     };
 
     CheckBox CB_REPLACE_BY_CHARACTER
     {
-        Pos = MAP_APPFONT( 226, 81 );
+        Pos = MAP_APPFONT( 241, 81 );
         Size = MAP_APPFONT( 55, 24 );
 
         WordBreak = TRUE;
diff --git a/svx/source/cui/svuidlg.src b/svx/source/cui/svuidlg.src
index 11a0fd9ac8..eeff7e33d0 100644
--- a/svx/source/cui/svuidlg.src
+++ b/svx/source/cui/svuidlg.src
@@ -156,37 +156,37 @@ ModalDialog MD_UPDATE_BASELINKS
     };
     CancelButton 1
     {
-        Pos = MAP_APPFONT ( 275 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 270 , 6 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Close" ;
     };
     HelpButton 1
     {
-        Pos = MAP_APPFONT ( 275 , 26 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 270 , 26 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
     };
     PushButton PB_UPDATE_NOW
     {
-        Pos = MAP_APPFONT ( 275 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 270 , 43 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Update" ;
     };
     PushButton PB_OPEN_SOURCE
     {
-        Pos = MAP_APPFONT ( 275 , 60 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 270 , 60 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Open" ;
     };
     PushButton PB_CHANGE_SOURCE
     {
-        Pos = MAP_APPFONT ( 275 , 77 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 270 , 77 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
     };
     PushButton PB_BREAK_LINK
     {
-        Pos = MAP_APPFONT ( 275 , 94 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 270 , 94 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Break Link" ;
     };
     FixedText FT_FILES2
diff --git a/svx/source/cui/zoom.src b/svx/source/cui/zoom.src
index dca32260ab..197d1e2f29 100644
--- a/svx/source/cui/zoom.src
+++ b/svx/source/cui/zoom.src
@@ -37,48 +37,48 @@ ModalDialog RID_SVXDLG_ZOOM
     HelpId = SID_ATTR_ZOOM ;
     OutputSize = TRUE ;
     SvLook = TRUE ;
-    Size = MAP_APPFONT ( 218 , 112 ) ;
+    Size = MAP_APPFONT ( 242 , 112 ) ;
     Moveable = TRUE ;
     Text [ en-US ] = "Zoom & View Layout";
     FixedLine FL_ZOOM
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
         Text [ en-US ] = "Zoom factor";
     };
     RadioButton BTN_OPTIMAL
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "~Optimal" ;
     };
     RadioButton BTN_WHOLE_PAGE
     {
         Pos = MAP_APPFONT ( 12 , 27 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "~Fit width and height" ;
     };
     RadioButton BTN_PAGE_WIDTH
     {
         Pos = MAP_APPFONT ( 12 , 40 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
+        Size = MAP_APPFONT ( 105, 10 ) ;
         Text [ en-US ] = "Fit ~width" ;
     };
     RadioButton BTN_100
     {
         Pos = MAP_APPFONT ( 12 , 53 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
+        Size = MAP_APPFONT ( 105, 10 ) ;
         Text = "~100 %" ;
     };
     RadioButton BTN_USER
     {
         Pos = MAP_APPFONT ( 12 , 67 ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
+        Size = MAP_APPFONT ( 72 , 10 ) ;
         Text [ en-US ] = "~Variable" ;
     };
     MetricField ED_USER
     {
-        Pos = MAP_APPFONT ( 74 , 66 ) ;
+        Pos = MAP_APPFONT ( 86 , 66 ) ;
         Size = MAP_APPFONT ( 32 , 12 ) ;
         Border = TRUE ;
         Group = TRUE ;
@@ -91,31 +91,31 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     FixedLine FL_VIEWLAYOUT
     {
-        Pos = MAP_APPFONT ( 112 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
+        Pos = MAP_APPFONT ( 124 , 3 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
         Text [ en-US ] = "View layout";
     };
     RadioButton BTN_AUTOMATIC
     {
-        Pos = MAP_APPFONT ( 118 , 14 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
+        Pos = MAP_APPFONT ( 130 , 14 ) ;
+        Size = MAP_APPFONT ( 106 , 10 ) ;
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton BTN_SINGLE
     {
-        Pos = MAP_APPFONT ( 118 , 27 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
+        Pos = MAP_APPFONT ( 130, 27 ) ;
+        Size = MAP_APPFONT ( 106, 10 ) ;
         Text [ en-US ] = "~Single page" ;
     };
     RadioButton BTN_COLUMNS
     {
-        Pos = MAP_APPFONT ( 118 , 41 ) ;
-        Size = MAP_APPFONT ( 64 , 10 ) ;
+        Pos = MAP_APPFONT ( 130, 41 ) ;
+        Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "~Columns" ;
     };
     MetricField ED_COLUMNS
     {
-        Pos = MAP_APPFONT ( 185 , 40 ) ;
+        Pos = MAP_APPFONT ( 209 , 40 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
         Group = TRUE ;
@@ -128,29 +128,29 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     CheckBox CHK_BOOK
     {
-        Pos = MAP_APPFONT ( 124 , 55 ) ;
+        Pos = MAP_APPFONT ( 136 , 55 ) ;
         Size = MAP_APPFONT ( 85 , 10 ) ;
         Text [ en-US ] = "~Book mode" ;
     };
     FixedLine FL_BOTTOM
     {
         Pos = MAP_APPFONT ( 6 , 81 ) ;
-        Size = MAP_APPFONT ( 206 , 8 ) ;
+        Size = MAP_APPFONT ( 230 , 8 ) ;
     };
     OKButton BTN_ZOOM_OK
     {
-        Pos = MAP_APPFONT ( 53 , 92 ) ;
+        Pos = MAP_APPFONT ( 77 , 92 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE ;
     };
     CancelButton BTN_ZOOM_CANCEL
     {
-        Pos = MAP_APPFONT ( 106 , 92 ) ;
+        Pos = MAP_APPFONT ( 130 , 92 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
     HelpButton BTN_ZOOM_HELP
     {
-        Pos = MAP_APPFONT ( 162 , 92 ) ;
+        Pos = MAP_APPFONT ( 186 , 92 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 };
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index ff0c706b71..de3b9df330 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -604,6 +604,14 @@ void SvxFontPrevWindow::SetColor(const Color &rColor)
     pImpl->pColor = new Color( rColor );
     Invalidate();
 }
+// -----------------------------------------------------------------------
+
+void SvxFontPrevWindow::ResetColor()
+{
+    delete pImpl->pColor;
+    pImpl->pColor = 0;
+    Invalidate();
+}
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index fa49e6e960..670264aae4 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -394,7 +394,7 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
     aCalcStr        ( THIS_SVX_RES( STR_WORDCALC ) ),                       \
     pImpl           ( NULL ),                                               \
     pSearchList 	( NULL ),												\
-    pReplaceList	( NULL ),												\
+    pReplaceList	( new SearchAttrItemList ),                             \
     pSearchItem 	( NULL ),												\
     pSearchController		( NULL ),										\
     pOptionsController		( NULL ),										\
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
index 9bd251bcb4..dcc74b99e7 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
@@ -40,7 +40,7 @@
 
 #define FULL_WIDTH (220)
 #define FULL_HEIGHT (120)
-#define EDITBUTTON_WIDTH (70)
+#define EDITBUTTON_WIDTH (75)
 
 #define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
 #define COL_2 (COL_1+RSC_SP_FLGR_SPACE_X)