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

[Andras Timar]

 patches/dev300/apply                     |    3 -
 patches/dev300/sw-caption-separator.diff |   51 -------------------------------
 2 files changed, 54 deletions(-)

New commits:
commit d550aae11004411bb96a5a2402ad66e88cd259a1
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Oct 2 09:35:24 2010 +0200

    Removed sw-caption-separator.diff; moved to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 10bac0c..c736a84 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2802,9 +2802,6 @@ svtools-wmf-clipperf.diff, n#535304, thorsten
 # Hyphen-2.5 will obsolete this patch, i#109543
 # FIXME dev300-m77 hyphen-2.4.patch.diff, timar
 
-# Omit caption separator, if caption text is empty
-sw-caption-separator.diff, i#110287, timar
-
 # In some cases when exporting a PDF from a presentation, we are asked
 # to export an empty "link annotation", which gets turned into a
 # rather bogus file: link to the directory the presentadion document
diff --git a/patches/dev300/sw-caption-separator.diff b/patches/dev300/sw-caption-separator.diff
deleted file mode 100644
index 73a6ad1..0000000
--- a/patches/dev300/sw-caption-separator.diff
+++ /dev/null
@@ -1,51 +0,0 @@
----
- sw/source/core/doc/doclay.cxx  |    5 ++++-
- sw/source/ui/frmdlg/cption.cxx |    8 ++++++--
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git sw/source/core/doc/doclay.cxx sw/source/core/doc/doclay.cxx
-index b42b5f8..021bb55 100644
---- sw/source/core/doc/doclay.cxx
-+++ sw/source/core/doc/doclay.cxx
-@@ -1474,7 +1474,10 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
-                 aTxt += ' ';
-         }
-         xub_StrLen nIdx = aTxt.Len();
--        aTxt += rSeparator;
-+        if ( rTxt.Len() > 0 )
-+        {
-+            aTxt += rSeparator;
-+        }
-         xub_StrLen nSepIdx = aTxt.Len();
-         aTxt += rTxt;
- 
-diff --git sw/source/ui/frmdlg/cption.cxx sw/source/ui/frmdlg/cption.cxx
-index 5e7167b..158f5e3 100644
---- sw/source/ui/frmdlg/cption.cxx
-+++ sw/source/ui/frmdlg/cption.cxx
-@@ -382,6 +382,7 @@ IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG)
- void SwCaptionDialog::DrawSample()
- {
-     String aStr;
-+    String sCaption = aTextEdit.GetText();
- 
-     // Nummer
-     String sFldTypeName = aCategoryBox.GetText();
-@@ -436,9 +437,12 @@ void SwCaptionDialog::DrawSample()
-             }
- 
-         }
--        aStr += aSepEdit.GetText();
-+        if( sCaption.Len() > 0 )
-+        {
-+            aStr += aSepEdit.GetText();
-+        }
-     }
--    aStr += aTextEdit.GetText();
-+    aStr += sCaption;
-     // do preview!
-     aPrevWin.SetPreviewText( aStr );
- }
--- 
-1.7.0.1
-