[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 10 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Sat Nov 13 02:34:27 PST 2010
patches/dev300/apply | 52 -
patches/dev300/fix-ppt-linespacing-import-export.diff | 14
patches/dev300/oox-smartart-import.diff | 11
patches/dev300/sd-pptx-export-build-fix-2.diff | 44 -
patches/dev300/sd-pptx-export-build-fix.diff | 384 ----------
patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff | 14
patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff | 13
7 files changed, 13 insertions(+), 519 deletions(-)
New commits:
commit ddacd3e5aa9d0a08c3c21949322e741cbc9dbed4
Merge: 6f4d41d... 9f8a40c...
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Nov 12 14:35:53 2010 +0200
Merge branch 'feature/pptx-export-ooxml11' into libreoffice-3-3
commit 9f8a40c02c11f38c67e239fe3c098e8987f64c9c
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 19:40:05 2010 +0200
Change getChartConverter also in epptooxml.hxx
diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index e41bce0..a47144d 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -6327,3 +6327,14 @@ index cf5d5e2..212c6fe 100644
virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() { return ::oox::drawingml::table::TableStyleListPtr(); }
// Actual export of the DOCX document
+--- sd/source/filter/eppt/epptooxml.hxx
++++ sd/source/filter/eppt/epptooxml.hxx
+@@ -85,7 +85,7 @@
+ virtual oox::vml::Drawing* getVmlDrawing() { return NULL; }
+ virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
+ virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); }
+- virtual oox::drawingml::chart::ChartConverter& getChartConverter() { static oox::drawingml::chart::ChartConverter aConverter; return aConverter; }
++ virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; }
+
+ static const char* GetSideDirection( sal_uInt8 nDirection );
+ static const char* GetCornerDirection( sal_uInt8 nDirection );
commit e319d9b72ac65e8752cf5d0c6535d098a38726a6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Nov 1 17:47:23 2010 +0200
Make oox-smartart-import.diff unapply cleanly
When deleting files, delete also the recently added Emacs and Vim mode
lines.
diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index c418157..e41bce0 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -202,7 +202,8 @@ deleted file mode 100644
index 6437482..0000000
--- oox/inc/oox/drawingml/diagram/datamodelcontext.hxx
+++ /dev/null
-@@ -1,54 +0,0 @@
+@@ -1,57 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -257,6 +258,8 @@ index 6437482..0000000
-} }
-
-#endif // OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git oox/inc/oox/drawingml/diagram/diagram.hxx oox/inc/oox/drawingml/diagram/diagram.hxx
index ef60545..e81a216 100644
--- oox/inc/oox/drawingml/diagram/diagram.hxx
@@ -524,7 +527,8 @@ deleted file mode 100644
index 5a42a46..0000000
--- oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx
+++ /dev/null
-@@ -1,100 +0,0 @@
+@@ -1,103 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -625,12 +629,15 @@ index 5a42a46..0000000
-
-
-#endif
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx
deleted file mode 100644
index ae25085..0000000
--- oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx
+++ /dev/null
-@@ -1,209 +0,0 @@
+@@ -1,212 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -840,6 +847,8 @@ index ae25085..0000000
-} }
-
-#endif
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git oox/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
index c513446..b18414f 100644
--- oox/inc/oox/drawingml/drawingmltypes.hxx
commit 1efd863eabc2b33293cba5701c8ba357c17c96c7
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 14:32:58 2010 +0200
sd-pptx-export-build-fix-2.diff is in git
Here in the feature/pptx-export-ooxml11 branch
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1c18859..23b85e4 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2334,9 +2334,6 @@ sled10-splash.diff, i#123456, pmladek
[ Fixes ]
svx-ppt-bullet-offset-fix.diff, n#593609, rodo
-[ OOXMLExport ]
-sd-pptx-export-build-fix-2.diff, rodo
-
[ Fixes ]
svx-fix-layout-build.diff, rodo
sfx2-style-edit-greyentry.diff, i#85003, simonaw
diff --git a/patches/dev300/sd-pptx-export-build-fix-2.diff b/patches/dev300/sd-pptx-export-build-fix-2.diff
deleted file mode 100644
index 57e687e..0000000
--- a/patches/dev300/sd-pptx-export-build-fix-2.diff
+++ /dev/null
@@ -1,44 +0,0 @@
----
- sd/source/filter/pptx/pptx-eppt.cxx | 2 +-
- sd/util/makefile.mk | 1 +
- sd/util/pptx.map | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git sd/source/filter/pptx/pptx-eppt.cxx sd/source/filter/pptx/pptx-eppt.cxx
-index 2ea5d57..061db2c 100644
---- sd/source/filter/pptx/pptx-eppt.cxx
-+++ sd/source/filter/pptx/pptx-eppt.cxx
-@@ -121,7 +121,7 @@ void PPTWriter::exportPPTPre()
- if ( !mpPicStrm )
- mpPicStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ) );
-
-- mpPptEscherEx = new PptEscherEx( *mpStrm, mnDrawings );
-+ mpPptEscherEx = new PptEscherEx( *mpStrm );
- };
-
- void PPTWriter::exportPPTPost()
-diff --git sd/util/makefile.mk sd/util/makefile.mk
-index 4483706..ed1396a 100755
---- sd/util/makefile.mk
-+++ sd/util/makefile.mk
-@@ -283,6 +283,7 @@ SHL6STDLIBS = $(ISDLIB) \
- $(SOTLIB) \
- $(GOODIESLIB) \
- $(VCLLIB) \
-+ $(MSFILTERLIB) \
- $(SVLLIB) \
- $(SOTLIB) \
- $(UNOTOOLSLIB) \
-diff --git sd/util/pptx.map sd/util/pptx.map
-index e72a8e3..f9d5960 100644
---- sd/util/pptx.map
-+++ sd/util/pptx.map
-@@ -1,4 +1,4 @@
--PPTX_1_0 {
-+UDK_3_0_0 {
- global:
- component_getImplementationEnvironment;
- component_writeInfo;
---
-1.7.0.1
-
commit 9df8972aab11c43bb24484f2621366cecf75d146
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 14:29:46 2010 +0200
sd-pptx-export-build-fix.diff is in git here
Here in the feature/pptx-export-ooxml11 branch
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 32eb2cb..1c18859 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2335,7 +2335,6 @@ sled10-splash.diff, i#123456, pmladek
svx-ppt-bullet-offset-fix.diff, n#593609, rodo
[ OOXMLExport ]
-sd-pptx-export-build-fix.diff, rodo
sd-pptx-export-build-fix-2.diff, rodo
[ Fixes ]
diff --git a/patches/dev300/sd-pptx-export-build-fix.diff b/patches/dev300/sd-pptx-export-build-fix.diff
deleted file mode 100644
index f3cfa94..0000000
--- a/patches/dev300/sd-pptx-export-build-fix.diff
+++ /dev/null
@@ -1,384 +0,0 @@
----
- sd/source/filter/pptx/epptooxml.hxx | 3 +-
- sd/source/filter/pptx/escherex.hxx | 12 +---
- sd/source/filter/pptx/pptx-eppt.cxx | 8 +-
- sd/source/filter/pptx/pptx-epptso.cxx | 21 +++---
- sd/source/filter/pptx/pptx-escherex.cxx | 87 +++---------------------
- sd/source/filter/pptx/pptx-pptexanimations.cxx | 4 +-
- sd/source/filter/pptx/pptx-text.cxx | 4 +-
- 7 files changed, 32 insertions(+), 107 deletions(-)
-
-diff --git sd/source/filter/pptx/epptooxml.hxx sd/source/filter/pptx/epptooxml.hxx
-index f6b0a2e..ed4cbba 100644
---- sd/source/filter/pptx/epptooxml.hxx
-+++ sd/source/filter/pptx/epptooxml.hxx
-@@ -57,7 +57,7 @@ public:
- virtual oox::vml::Drawing* getVmlDrawing() { return NULL; }
- virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
- virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); }
-- virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; }
-+ virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return &maChartConverter; }
-
- static const char* GetSideDirection( sal_uInt8 nDirection );
- static const char* GetCornerDirection( sal_uInt8 nDirection );
-@@ -129,6 +129,7 @@ private:
- static sal_Int32 nStyleLevelToken[5];
-
- ::oox::drawingml::ShapeExport::ShapeHashMap maShapeMap;
-+ oox::drawingml::chart::ChartConverter maChartConverter;
- };
-
- }
-diff --git sd/source/filter/pptx/escherex.hxx sd/source/filter/pptx/escherex.hxx
-index 5360e76..1e2222d 100644
---- sd/source/filter/pptx/escherex.hxx
-+++ sd/source/filter/pptx/escherex.hxx
-@@ -2,13 +2,10 @@
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: escherex.hxx,v $
-- * $Revision: 1.12 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
-@@ -51,14 +48,9 @@ enum PPT_TextHeader
-
- class PptEscherEx : public EscherEx
- {
-- SvMemoryStream maFIDCLs;
--
- sal_uInt32 ImplDggContainerSize();
- void ImplWriteDggContainer( SvStream& rSt );
-
-- sal_uInt32 ImplDggAtomSize();
-- void ImplWriteDggAtom( SvStream& rSt );
--
- sal_uInt32 ImplOptAtomSize();
- void ImplWriteOptAtom( SvStream& rSt );
-
-@@ -67,7 +59,7 @@ class PptEscherEx : public EscherEx
-
- public:
-
-- PptEscherEx( SvStream& rOut, UINT32 nDrawings );
-+ PptEscherEx( SvStream& rOut );
- ~PptEscherEx();
-
- void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 );
-diff --git sd/source/filter/pptx/pptx-eppt.cxx sd/source/filter/pptx/pptx-eppt.cxx
-index f47b032..2ea5d57 100644
---- sd/source/filter/pptx/pptx-eppt.cxx
-+++ sd/source/filter/pptx/pptx-eppt.cxx
-@@ -53,11 +53,11 @@
- #include <tools/zcodec.hxx>
- #include <editeng/svxenum.hxx>
- #include <sot/storinfo.hxx>
--#include <svx/msoleexp.hxx>
-+#include <filter/msfilter/msoleexp.hxx>
- #include <vcl/virdev.hxx>
- #include <svtools/wmf.hxx>
--#include <svx/msdffimp.hxx>
--#include <svx/flditem.hxx>
-+#include <filter/msfilter/msdffimp.hxx>
-+#include <editeng/flditem.hxx>
- #include <sfx2/docinf.hxx>
- #include <oox/export/utils.hxx>
-
-@@ -1271,7 +1271,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 ); // Flags: Connector | Background | HasSpt
- Point aEmptyPoint = Point();
- Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) );
-- EscherPropertyContainer aPropOpt( (EscherGraphicProvider&)*mpPptEscherEx, mpPicStrm, aRect );
-+ EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect );
- aPropOpt.AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid );
- ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE );
- if ( ImplGetPropertyValue( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
-diff --git sd/source/filter/pptx/pptx-epptso.cxx sd/source/filter/pptx/pptx-epptso.cxx
-index d78ba17..b011827 100644
---- sd/source/filter/pptx/pptx-epptso.cxx
-+++ sd/source/filter/pptx/pptx-epptso.cxx
-@@ -34,9 +34,6 @@
- #include <eppt.hxx>
- #include "text.hxx"
- #include "epptdef.hxx"
--#ifndef _PptEscherEx_HXX
--#include "escherex.hxx"
--#endif
- #include <tools/poly.hxx>
- #include <vcl/bmpacc.hxx>
- #include <vcl/gradient.hxx>
-@@ -935,7 +932,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
- {
- Point aEmptyPoint = Point();
- Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) );
-- EscherPropertyContainer aPropOpt( (EscherGraphicProvider&)*mpPptEscherEx, mpPicStrm, aRect );
-+ EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect );
- aPropOpt.CreateGradientProperties( mXPropSet );
- aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor );
- }
-@@ -958,7 +955,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
- {
- Point aEmptyPoint = Point();
- Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) );
-- EscherPropertyContainer aPropOpt( (EscherGraphicProvider&)*mpPptEscherEx, mpPicStrm, aRect );
-+ EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect );
- aPropOpt.CreateGradientProperties( mXBackgroundPropSet );
- aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor );
- }
-@@ -2208,7 +2205,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
- if ( bRet && bMasterPage )
- {
- mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
-- sal_uInt32 nPresShapeID = mpPptEscherEx->GetShapeID();
-+ sal_uInt32 nPresShapeID = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xa00, nPresShapeID );// Flags: HaveAnchor | HasSpt
- EscherPropertyContainer aPropOpt;
- aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
-@@ -2264,7 +2261,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
-
- void PPTWriter::ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& rSolver )
- {
-- sal_uInt32 nId = mpPptEscherEx->GetShapeID();
-+ sal_uInt32 nId = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( nType, nFlags, nId );
- rSolver.AddShape( mXShape, nId );
- }
-@@ -2349,7 +2346,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
- const ::com::sun::star::awt::Size aSize100thmm( mXShape->getSize() );
- const ::com::sun::star::awt::Point aPoint100thmm( mXShape->getPosition() );
- Rectangle aRect100thmm( Point( aPoint100thmm.X, aPoint100thmm.Y ), Size( aSize100thmm.Width, aSize100thmm.Height ) );
-- EscherPropertyContainer aPropOpt( (EscherGraphicProvider&)*mpPptEscherEx, mpPicStrm, aRect100thmm );
-+ EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm );
-
- if ( bGroup )
- {
-@@ -2907,7 +2904,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
- sal_uInt16 nChar;
-
- mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
-- mnShapeMasterTitle = mpPptEscherEx->GetShapeID();
-+ mnShapeMasterTitle = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xa00, mnShapeMasterTitle );// Flags: HaveAnchor | HasSpt
- EscherPropertyContainer aPropertyOptions;
- aPropertyOptions.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
-@@ -3001,7 +2998,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
- if ( mnTextSize )
- {
- mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
-- mnShapeMasterBody = mpPptEscherEx->GetShapeID();
-+ mnShapeMasterBody = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xa00, mnShapeMasterBody ); // Flags: HaveAnchor | HasSpt
- EscherPropertyContainer aPropOpt2;
- aPropOpt2.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
-@@ -3578,7 +3575,7 @@ void PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 n
- mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
- EscherPropertyContainer aPropOptSp;
-
-- sal_uInt32 nId = mpPptEscherEx->GetShapeID();
-+ sal_uInt32 nId = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Line, 0xa02, nId );
- aPropOptSp.AddOpt( ESCHER_Prop_shapePath, ESCHER_ShapeComplex );
- aPropOptSp.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0xa0008 );
-@@ -3612,7 +3609,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
- << (INT32)maRect.Right()
- << (INT32)maRect.Bottom();
-
-- sal_uInt32 nShapeId = mpPptEscherEx->GetShapeID();
-+ sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
- mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch
- aSolverContainer.AddShape( rXShape, nShapeId );
- EscherPropertyContainer aPropOpt2;
-diff --git sd/source/filter/pptx/pptx-escherex.cxx sd/source/filter/pptx/pptx-escherex.cxx
-index b29f35b..fbbf178 100644
---- sd/source/filter/pptx/pptx-escherex.cxx
-+++ sd/source/filter/pptx/pptx-escherex.cxx
-@@ -2,13 +2,10 @@
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: escherex.cxx,v $
-- * $Revision: 1.13 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
-@@ -40,14 +37,10 @@
- // ---------------------------------------------------------------------------------------------
- // ---------------------------------------------------------------------------------------------
-
--PptEscherEx::PptEscherEx( SvStream& rOutStrm, UINT32 nDrawings ) :
-- EscherEx ( rOutStrm, nDrawings )
-+PptEscherEx::PptEscherEx( SvStream& rOutStrm ) :
-+ EscherEx( EscherExGlobalRef( new EscherExGlobal ), rOutStrm )
- {
-- mnFIDCLs = nDrawings;
- mnCurrentDg = 0;
-- mnCurrentShapeID = 0;
-- mnTotalShapesDgg = 0;
-- mnCurrentShapeMaximumID = 0;
- }
-
- // ---------------------------------------------------------------------------------------------
-@@ -72,8 +65,8 @@ sal_uInt32 PptEscherEx::ImplDggContainerSize()
- {
- UINT32 nSize;
-
-- nSize = ImplDggAtomSize();
-- nSize += GetBlibStoreContainerSize();
-+ nSize = mxGlobal->GetDggAtomSize();
-+ nSize += mxGlobal->GetBlibStoreContainerSize();
- nSize += ImplOptAtomSize();
- nSize += ImplSplitMenuColorsAtomSize();
-
-@@ -88,8 +81,9 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
- rSt << (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) )
- << (sal_uInt32)( nSize - 8 );
-
-- ImplWriteDggAtom( rSt );
-- WriteBlibStoreContainer( rSt );
-+ mxGlobal->SetDggContainer();
-+ mxGlobal->WriteDggAtom( rSt );
-+ mxGlobal->WriteBlibStoreContainer( rSt );
- ImplWriteOptAtom( rSt );
- ImplWriteSplitMenuColorsAtom( rSt );
- }
-@@ -97,29 +91,6 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
-
- // ---------------------------------------------------------------------------------------------
-
--sal_uInt32 PptEscherEx::ImplDggAtomSize()
--{
-- return maFIDCLs.Tell() + 24;
--}
--
--void PptEscherEx::ImplWriteDggAtom( SvStream& rSt )
--{
-- sal_uInt32 nSize = ImplDggAtomSize();
-- if ( nSize )
-- {
-- rSt << (sal_uInt32)( ESCHER_Dgg << 16 )
-- << (sal_uInt32)( nSize - 8 )
-- << mnCurrentShapeID
-- << (sal_uInt32)( mnFIDCLs + 1 )
-- << mnTotalShapesDgg
-- << mnDrawings;
--
-- rSt.Write( maFIDCLs.GetData(), nSize - 24 );
-- }
--}
--
--// ---------------------------------------------------------------------------------------------
--
- #define ESCHER_OPT_COUNT 6
-
- sal_uInt32 PptEscherEx::ImplOptAtomSize()
-@@ -194,11 +165,7 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
- if ( !mbEscherDg )
- {
- mbEscherDg = TRUE;
-- mnCurrentDg++;
-- mnTotalShapesDg = 0;
-- mnTotalShapeIdUsedDg = 0;
-- mnCurrentShapeID = ( mnCurrentShapeMaximumID &~0x3ff ) + 0x400; // eine neue Seite bekommt immer eine neue ShapeId die ein vielfaches von 1024 ist,
-- // damit ist erste aktuelle Shape ID 0x400
-+ mnCurrentDg = mxGlobal->GenerateDrawingId();
- AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
- PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
- *mpOutStrm << (UINT32)0 // The number of shapes in this drawing
-@@ -249,39 +216,7 @@ void PptEscherEx::CloseContainer()
- {
- mbEscherDg = FALSE;
- if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) )
-- {
-- // shapeanzahl des drawings setzen
-- mnTotalShapesDgg += mnTotalShapesDg;
-- *mpOutStrm << mnTotalShapesDg << mnCurrentShapeMaximumID;
--
-- if ( !mnTotalShapesDg )
-- {
-- maFIDCLs << (UINT32)0
-- << (UINT32)0;
-- }
-- else
-- {
-- if ( mnTotalShapeIdUsedDg )
-- {
-- UINT32 i, nFIDCL = ( ( mnTotalShapeIdUsedDg - 1 ) / 0x400 );
-- if ( nFIDCL )
-- mnFIDCLs += nFIDCL;
-- for ( i = 0; i <= nFIDCL; i++ )
-- {
-- maFIDCLs << mnCurrentDg; // drawing number
-- if ( i < nFIDCL )
-- maFIDCLs << 0x400;
-- else
-- {
-- UINT32 nShapesLeft = mnTotalShapeIdUsedDg % 0x400;
-- if ( !nShapesLeft )
-- nShapesLeft = 0x400; // shape count in this IDCL
-- maFIDCLs << (UINT32)nShapesLeft;
-- }
-- }
-- }
-- }
-- }
-+ *mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg );
- }
- }
- break;
-@@ -329,7 +264,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
- << (INT32)aRect.Right()
- << (INT32)aRect.Bottom();
-
-- nShapeId = GetShapeID();
-+ nShapeId = GenerateShapeId();
- if ( !mnGroupLevel )
- AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch
- else
-diff --git sd/source/filter/pptx/pptx-pptexanimations.cxx sd/source/filter/pptx/pptx-pptexanimations.cxx
-index 1f0ef5d..250feb5 100644
---- sd/source/filter/pptx/pptx-pptexanimations.cxx
-+++ sd/source/filter/pptx/pptx-pptexanimations.cxx
-@@ -74,8 +74,8 @@
-
- #include <vcl/vclenum.hxx>
- #include <svx/svdotext.hxx>
--#include <svx/outlobj.hxx>
--#include <svx/editobj.hxx>
-+#include <editeng/outlobj.hxx>
-+#include <editeng/editobj.hxx>
- #include <pptexanimations.hxx>
- #include <osl/endian.h>
-
-diff --git sd/source/filter/pptx/pptx-text.cxx sd/source/filter/pptx/pptx-text.cxx
-index 6bd1644..09cef65 100644
---- sd/source/filter/pptx/pptx-text.cxx
-+++ sd/source/filter/pptx/pptx-text.cxx
-@@ -18,10 +18,10 @@
- #include <com/sun/star/style/ParagraphAdjust.hpp>
- #include <com/sun/star/style/TabStop.hpp>
-
--#include <svtools/languageoptions.hxx>
-+#include <svl/languageoptions.hxx>
- #include <sfx2/app.hxx>
- #include <editeng/svxenum.hxx>
--#include <svx/frmdir.hxx>
-+#include <editeng/frmdir.hxx>
- #include <unotools/fontcvt.hxx>
- #include <vcl/metric.hxx>
- #include <vcl/outdev.hxx>
---
-1.7.0.1
-
commit 692ac25fd6930f1fe4306c6d9a47e8e9747a8383
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 14:17:56 2010 +0200
xlsx-shared-oox-chart-export-part1-pptx-part.diff is in git
Here in the feature/pptx-export-ooxml11 branch
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4e1736f..32eb2cb 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2116,11 +2116,6 @@ iso-ooxml-sw.diff, cbosdo
# mostly merged into git by now, except for
# xlsx-export-row-limit-fix.diff, n#504623, kohei
-# this used to be xlsx-shared-oox-chart-export-part1.diff, Fong
-# it is now merged into git, except for the hunk patching pptx
-# which follows:
-xlsx-shared-oox-chart-export-part1-pptx-part.diff
-
[ UnstableLibwpd ]
config_office-testing.diff
libwpd-testing.diff
diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff
deleted file mode 100644
index bded31c..0000000
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git sd/source/filter/pptx/pptx-epptooxml.cxx sd/source/filter/pptx/pptx-epptooxml.cxx
-index 0b64cca..0e348c5 100644
---- sd/source/filter/pptx/pptx-epptooxml.cxx
-+++ sd/source/filter/pptx/pptx-epptooxml.cxx
-@@ -1588,7 +1588,7 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x
-
- // visual shape properties
- mpFS->startElementNS( XML_p, XML_spPr, FSEND );
-- WriteShapeTransformation( xShape );
-+ WriteShapeTransformation( xShape, XML_a );
- WritePresetShape( "rect" );
- Reference< XPropertySet > xProps( xShape, UNO_QUERY );
- if( xProps.is() )
-
commit 95a1770cf281ef6c7335ea3c69d2a41246ca7a11
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 14:14:20 2010 +0200
xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff is in git here
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0381e0c..4e1736f 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2012,10 +2012,6 @@ svx-fix-fit-to-frame-crash.diff, n#508621, rodo
# expand path placeholders early in template dialog
normalize-template-paths-fix.diff, n#512146, thorsten
-[ OOXMLExportDevel ]
-# equivalent of ooxml-drawing-fix-shapes-map-crash-xlsx-part for shared filter
-xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
-
[ Experimental ]
experimental_ooapi.diff, flr
diff --git a/patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff b/patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff
deleted file mode 100644
index 671bba7..0000000
--- a/patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rup sc-orig/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx
---- sc-orig/source/filter/xcl97/xcl97rec.cxx 2009-07-14 17:32:13.000000000 +0200
-+++ sc/source/filter/xcl97/xcl97rec.cxx 2009-07-14 17:35:50.000000000 +0200
-@@ -1162,7 +1162,7 @@ void XclObjAny::SaveXml( XclExpXmlStream
-
- sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
-
-- ShapeExport aDML( XML_xdr, pDrawing, &rStrm, DrawingML::DOCUMENT_XLSX );
-+ ShapeExport aDML( XML_xdr, pDrawing, NULL, &rStrm, DrawingML::DOCUMENT_XLSX );
-
- pDrawing->startElement( FSNS( XML_xdr, XML_twoCellAnchor ), // OOXTODO: oneCellAnchor, absoluteAnchor
- XML_editAs, GetEditAs( *this ),
-
commit 323899ebc054b8c7684f8467d06f9801706d9b26
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 14:11:28 2010 +0200
Make fix-ppt-linespacing-import-export.diff apply again
A part of it is in git here in the feature/pptx-export-ooxml11 branch,
another part is to code now in another file.
diff --git a/patches/dev300/fix-ppt-linespacing-import-export.diff b/patches/dev300/fix-ppt-linespacing-import-export.diff
index ed02912..f3a9c18 100644
--- a/patches/dev300/fix-ppt-linespacing-import-export.diff
+++ b/patches/dev300/fix-ppt-linespacing-import-export.diff
@@ -58,18 +58,6 @@ index 355970f..993ca9a 100644
{
sal_uInt8 nPropLineSpace = (BYTE)nVal2;
aItem.SetPropLineSpace( nPropLineSpace );
-diff --git sd/source/filter/eppt/eppt.hxx sd/source/filter/eppt/eppt.hxx
-index 8fadff5..afbf97c 100755
---- sd/source/filter/eppt/eppt.hxx
-+++ sd/source/filter/eppt/eppt.hxx
-@@ -620,6 +620,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
-
- sal_uInt16 mnTextAdjust;
- sal_Int16 mnLineSpacing;
-+ sal_Bool mbFixedLineSpacing;
- sal_Int16 mnLineSpacingTop;
- sal_Int16 mnLineSpacingBottom;
- sal_Bool mbForbiddenRules;
diff --git sd/source/filter/eppt/epptso.cxx sd/source/filter/eppt/epptso.cxx
index d8121b2..d226781 100755
--- sd/source/filter/eppt/epptso.cxx
@@ -83,6 +71,8 @@ index d8121b2..d226781 100755
nLineSpacing = nNormalSpacing;
else
nLineSpacing = (sal_Int16)( (double)nLineSpacing / 4.40972 );
+--- sd/source/filter/eppt/pptx-text.cxx
++++ sd/source/filter/eppt/pptx-text.cxx
@@ -2818,11 +2818,15 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
= *( (::com::sun::star::style::LineSpacing*)mAny.getValue() );
switch ( aLineSpacing.Mode )
commit 60b25e90b10576387cc5003b1847fadfbf9db295
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Nov 8 13:28:10 2010 +0200
Make novell-subscription.diff apply again
diff --git a/patches/dev300/novell-subscription.diff b/patches/dev300/novell-subscription.diff
index fea4843..aa32292 100644
--- a/patches/dev300/novell-subscription.diff
+++ b/patches/dev300/novell-subscription.diff
@@ -19,9 +19,9 @@ index 175867d..2eb3879 100644
+ <value xml:lang="en-US">~Upgrade to Full Version</value>
+ </prop>
+ </node>
- <node oor:name=".uno:StatusBarVisible" oor:op="replace">
+ <node oor:name=".uno:Credits" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Status ~Bar</value>
+ <value xml:lang="en-US">%PRODUCTNAME Credits...</value>
@@ -5219,6 +5224,14 @@
</node>
</node>
@@ -42,7 +42,7 @@ index 9000359..69e8e4b 100644
--- sfx2/inc/sfx2/sfxsids.hrc
+++ sfx2/inc/sfx2/sfxsids.hrc
@@ -127,6 +127,11 @@
- #define SID_SHOW_LICENSE (SID_SFX_START + 1683)
+ #define SID_SHOW_CREDITS (SID_SFX_START + 1684)
#define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
+// default id for subscription
commit cfeff54384de0f6afb5120cf8ce4509b54c92b20
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Nov 5 19:17:09 2010 +0200
Drop patches that are in the feature/pptx-export-ooxml11 branch
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4fbcf14..0381e0c 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1975,35 +1975,9 @@ base64.diff, i#100620, hmth
ooop-langpack-policy.diff
[ OOXMLExport ]
-pptx-filter-as-a-separate-lib.diff
-
-[ OOXMLExport and not OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
-
-[ OOXMLExport and OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
-
-# Snapshot of the pptx export filter at the time of creation of ooxml03
-# This is until 0475--fix-crash-introduced-by-Jonathan-s-changes-in-eppt.patch
-# (including)
-[ OOXMLExport ]
-pptx-snapshot-at-ooxml03-creation.diff
-
-# ...and the rest from the git tree
-# (until 'more qnimations export work', including)
-
-pptx-the-rest-from-git.diff
-pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
-
-# handles case where a connector shape is not connected
-pptx-fix-connector-crash.diff, n#499129, thorsten
-
-[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
-oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
-
[ Fixes ]
external-apm-header.diff, freuter
wmf-mm-text.diff, n#417818, rodo
@@ -2038,22 +2012,10 @@ svx-fix-fit-to-frame-crash.diff, n#508621, rodo
# expand path placeholders early in template dialog
normalize-template-paths-fix.diff, n#512146, thorsten
-[ OOXMLExport ]
-oox-pptx-export-vertical-text.diff, n#498737, rodo
-oox-pptx-export-para-linespacing.diff, n#498737, rodo
-oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
-oox-drawingml-fix-shapes-map-crash.diff, rodo
-
[ OOXMLExportDevel ]
# equivalent of ooxml-drawing-fix-shapes-map-crash-xlsx-part for shared filter
xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
-[ OOXMLExport ]
-oox-pptx-export-animations-filter.diff, n#497570, rodo
-oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
-oox-pptx-export-blip-luminance.diff, n#497570, rodo
-
-
[ Experimental ]
experimental_ooapi.diff, flr
@@ -2151,7 +2113,6 @@ solenv-unpack-oxt.diff, pmladek
system-lpsolve-link-with-colamd.diff, rengelha
[ OOXMLExport ]
-oox-pptx-export-update-to-ooo320.diff, rodo
iso-ooxml-sw.diff, cbosdo
[ OOXMLExportDevel ]
More information about the Libreoffice-commits
mailing list