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

[Andras Timar]

 patches/dev300/sw-caption-separator.diff |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

New commits:
commit 09393f6a582c8e706d481bec2279ff6c0f3bb0e0
Author: Andras Timar <timar at fsf.hu>
Date:   Tue Mar 30 00:04:21 2010 +0200

    Fixed caption text preview, too.
    
    * patches/dev300/sw-caption-separator.diff:

diff --git a/patches/dev300/sw-caption-separator.diff b/patches/dev300/sw-caption-separator.diff
index 70b6a19..50857f4 100644
--- a/patches/dev300/sw-caption-separator.diff
+++ b/patches/dev300/sw-caption-separator.diff
@@ -12,3 +12,28 @@
          xub_StrLen nSepIdx = aTxt.Len();
          aTxt += rTxt;
  
+--- sw/source/ui/frmdlg/cption.cxx.orig	2010-03-11 22:05:24.000000000 +0100
++++ sw/source/ui/frmdlg/cption.cxx	2010-03-29 22:33:03.494932817 +0200
+@@ -385,6 +385,7 @@
+ void SwCaptionDialog::DrawSample()
+ {
+     String aStr;
++    String sCaption = aTextEdit.GetText();
+ 
+     // Nummer
+     String sFldTypeName = aCategoryBox.GetText();
+@@ -439,9 +440,12 @@
+             }
+ 
+         }
+-        aStr += aSepEdit.GetText();
++        if( sCaption.Len() > 0 )
++        {
++            aStr += aSepEdit.GetText();
++        }
+     }
+-    aStr += aTextEdit.GetText();
++    aStr += sCaption;
+     // do preview!
+     aPrevWin.SetPreviewText( aStr );
+ }