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

[Radek Doulík]

 patches/dev300/apply                                         |    1 
 patches/dev300/border-types-dotted-dashed.diff               |    8 -
 patches/dev300/oox-pptx-import-fix-text-body-properties.diff |   49 +++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)

New commits:
commit d682b42bc4c45752f740e0ec0a9200a995398548
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Sep 10 18:37:55 2010 +0200

    derive textbody properties from placeholders, fixes title in slide 1 n#621744

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4a982d6..4cd94c5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3575,3 +3575,4 @@ oox-pptx-import-fix-groups-2.diff, n#619678, rodo
 
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#592906, n#479834, rodo
+oox-pptx-import-fix-text-body-properties.diff, n#621744, rodo
diff --git a/patches/dev300/oox-pptx-import-fix-text-body-properties.diff b/patches/dev300/oox-pptx-import-fix-text-body-properties.diff
new file mode 100644
index 0000000..4b69367
--- /dev/null
+++ b/patches/dev300/oox-pptx-import-fix-text-body-properties.diff
@@ -0,0 +1,49 @@
+diff -rup ../../build-orig/ooo-build-3.2.98.0/oox/inc/oox/drawingml/textbody.hxx oox/inc/oox/drawingml/textbody.hxx
+--- ../../build-orig/ooo-build-3.2.98.0/oox/inc/oox/drawingml/textbody.hxx	2010-08-24 17:01:37.000000000 +0200
++++ oox/inc/oox/drawingml/textbody.hxx	2010-09-10 18:01:39.000000000 +0200
+@@ -29,6 +29,7 @@
+ #define OOX_DRAWINGML_TEXTBODY_HXX
+ 
+ #include "oox/helper/containerhelper.hxx"
++#include "oox/drawingml/drawingmltypes.hxx"
+ #include "oox/drawingml/textbodyproperties.hxx"
+ #include "oox/drawingml/textliststyle.hxx"
+ 
+@@ -48,6 +49,7 @@ class TextBody
+ {
+ public:
+     TextBody();
++    TextBody( TextBodyPtr pBody );
+     ~TextBody();
+ 
+     inline const TextParagraphVector&   getParagraphs() const { return maParagraphs; }
+diff -rup ../../build-orig/ooo-build-3.2.98.0/oox/source/drawingml/textbody.cxx oox/source/drawingml/textbody.cxx
+--- ../../build-orig/ooo-build-3.2.98.0/oox/source/drawingml/textbody.cxx	2010-08-24 17:01:37.000000000 +0200
++++ oox/source/drawingml/textbody.cxx	2010-09-10 18:02:46.000000000 +0200
+@@ -42,6 +42,14 @@ TextBody::TextBody()
+ {
+ }
+ 
++TextBody::TextBody( TextBodyPtr pBody )
++{
++    if( pBody.get() ) {
++        maTextProperties = pBody->maTextProperties;
++        maTextListStyle = pBody->maTextListStyle;
++    }
++}
++
+ TextBody::~TextBody()
+ {
+ }
+diff -rup ../../build-orig/ooo-build-3.2.98.0/oox/source/ppt/pptshapecontext.cxx oox/source/ppt/pptshapecontext.cxx
+--- ../../build-orig/ooo-build-3.2.98.0/oox/source/ppt/pptshapecontext.cxx	2010-09-10 18:24:39.000000000 +0200
++++ oox/source/ppt/pptshapecontext.cxx	2010-09-10 18:03:15.000000000 +0200
+@@ -203,7 +203,7 @@ Reference< XFastContextHandler > PPTShap
+ 
+         case NMSP_PPT|XML_txBody:
+         {
+-            oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody );
++            oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody( mpShapePtr->getTextBody() ) );
+             xTextBody->getTextProperties().maPropertyMap[ PROP_FontIndependentLineSpacing ] <<= static_cast< sal_Bool >( sal_True );
+             mpShapePtr->setTextBody( xTextBody );
+             xRet = new oox::drawingml::TextBodyContext( *this, *xTextBody );
commit 8d3658fe8619edc7b1aaded3da6cef7e1cdf5b55
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Sep 7 12:04:29 2010 +0200

    deleted part referring to .swp files, which I think were included by mistake?

diff --git a/patches/dev300/border-types-dotted-dashed.diff b/patches/dev300/border-types-dotted-dashed.diff
index 208d9e9..3dc4ac3 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -919,10 +919,6 @@ index f9e78c0..d623524 100644
          case XML_double:            lclSetBorderLineWidth( rBorderLine, API_LINE_THIN, API_LINE_THIN, API_LINE_THIN ); break;
          case XML_hair:              lclSetBorderLineWidth( rBorderLine, API_LINE_HAIR );    break;
          case XML_medium:            lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM );  break;
-diff --git sc/source/core/data/.document.cxx.swp sc/source/core/data/.document.cxx.swp
-deleted file mode 100644
-index 17a0c4d..0000000
-Binary files sc/source/core/data/.document.cxx.swp and /dev/null differ
 diff --git sc/source/filter/excel/xestyle.cxx sc/source/filter/excel/xestyle.cxx
 index e4b2260..8e498a5 100644
 --- sc/source/filter/excel/xestyle.cxx
@@ -1053,10 +1049,6 @@ index 6216165..0b98a8c 100644
  
  // Background patterns --------------------------------------------------------
  
-diff --git sc/source/filter/xml/.xmlstyli.cxx.swp sc/source/filter/xml/.xmlstyli.cxx.swp
-deleted file mode 100644
-index dd8358c..0000000
-Binary files sc/source/filter/xml/.xmlstyli.cxx.swp and /dev/null differ
 diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
 index e8aee25..c4f552c 100644
 --- sc/source/filter/xml/xmlstyle.cxx