[Libreoffice-commits] .: patches/dev300

[Radek Doulík]

 patches/dev300/oox-smartart-import.diff                 |    4 ++--
 patches/dev300/oox-xlsx-import-fix-connector-shape.diff |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 710962dcad05cec99c3e305249b7dcc47c035cad
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Oct 8 22:44:17 2010 +0200

    make patches apply after changes in oox in rawbuild

diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index 86d61bc..6f6d755 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -1011,8 +1011,8 @@ index 2780fcd..65380c2 100644
      table::TablePropertiesPtr	mpTablePropertiesPtr;
 +    Shape3DPropertiesPtr        mp3DPropertiesPtr;
      PropertyMap                 maShapeProperties;
+     PropertyMap                 maDefaultShapeProperties;
      TextListStylePtr            mpMasterTextListStyle;
-     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
 @@ -216,7 +228,11 @@ private:
      sal_Bool						mbHidden;
  };
@@ -5553,7 +5553,7 @@ index 60aae15..72d5406 100644
 +#include <com/sun/star/xml/AttributeData.hpp>
  #include <com/sun/star/drawing/HomogenMatrix3.hpp>
  #include <com/sun/star/drawing/ConnectorType.hpp>
- #include <com/sun/star/text/XText.hpp>
+ #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 @@ -102,6 +104,34 @@ Shape::Shape( const sal_Char* pServiceName )
          msServiceName = OUString::createFromAscii( pServiceName );
      setDefaults();
diff --git a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
index d7c5e42..0d80be2 100644
--- a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
+++ b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
@@ -13,9 +13,9 @@ index eed2241..765a559 100644
  #include <com/sun/star/lang/XMultiServiceFactory.hpp>
  #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 +#include <com/sun/star/drawing/ConnectorType.hpp>
+ #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
  #include <com/sun/star/text/XText.hpp>
- #include <basegfx/point/b2dpoint.hxx>
- #include <basegfx/polygon/b2dpolygon.hxx>
+ #include <com/sun/star/style/ParagraphAdjust.hpp>
 @@ -337,6 +338,17 @@ Reference< XShape > Shape::createAndInsert(
  
          maShapeProperties[ PROP_StartPosition ] <<= aAWTStartPosition;