Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts: filter/source/graphicfilter/epict/epict.cxx filter/source/svg/svgexport.cxx filter/source/svg/svgfontexport.cxx filter/source/svg/svgwriter.cxx lotuswordpro/source/filter/lwpchartstreamtools.cxx lotuswordpro/source/filter/lwpfrib.cxx lotuswordpro/source/filter/lwpgrfobj.cxx lotuswordpro/source/filter/lwpidxmgr.cxx lotuswordpro/source/filter/lwpobjid.cxx lotuswordpro/source/filter/lwpparaproperty.cxx lotuswordpro/util/makefile.mk oox/prj/d.lst oox/source/drawingml/chart/chartdrawingfragment.cxx oox/source/drawingml/makefile.mk oox/source/drawingml/shape.cxx oox/source/ppt/slidepersist.cxx oox/source/token/namespaces.hxx.tail oox/source/xls/drawingfragment.cxx oox/source/xls/excelfilter.cxx oox/source/xls/makefile.mk oox/source/xls/workbookhelper.cxx writerfilter/source/ooxml/makefile.mk writerfilter/source/resourcemodel/makefile.mk
author: Jan Holesovsky <kendy@suse.cz> 2011-05-27 20:45:30 +0200
committer: Jan Holesovsky <kendy@suse.cz> 2011-05-27 20:45:30 +0200
commit: fa83bdc06fc281233597c55b6790181045777947 (patch)
tree: 9d44e9919571d40ca78a9453ba8eb9dbd0367efc
parent: dbc0ea9bb40379b5d4581a669d3d4e7bdb2c657d (diff)
parent: 001e51648e071c1475921c37c34f06a293a5bf5b (diff)
189 files changed, 11051 insertions, 6386 deletions
diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
index 522454dc7..9012eb5a6 100644
--- a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
+++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk
@@ -33,7 +33,7 @@ TARGET=jpeg
 # --- Settings -----------------------------------------------------------
 
 .INCLUDE :  settings.mk
-INC+= -I$(PRJ)$/inc$/bf_svtools
+INC+= -I$(OUTDIR)/inc/external/jpeg -I$(PRJ)$/inc$/bf_svtools
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
index efb5b0189..0138741d2 100644
--- a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
@@ -117,7 +117,7 @@ extern "C" void init_destination (j_compress_ptr cinfo)
   dest->pub.free_in_buffer = BUF_SIZE;
 }
 
-extern "C" int empty_output_buffer (j_compress_ptr cinfo)
+extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
 {
   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
@@ -222,7 +222,7 @@ long StreamRead( SvStream* pSvStm, void* pBuffer, long nBufferSize )
         return nRead;
 }
 
-extern "C" int fill_input_buffer (j_decompress_ptr cinfo)
+extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;
   size_t nbytes;
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx
index a0e897965..e194fdc70 100644
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ b/filter/inc/filter/msfilter/msvbahelper.hxx
@@ -51,6 +51,8 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo
 
 MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
 MSFILTER_DLLPUBLIC ::rtl::OUString extractMacroName( const ::rtl::OUString& rMacroUrl );
+MSFILTER_DLLPUBLIC ::rtl::OUString getDefaultProjectName( SfxObjectShell* pShell );
+MSFILTER_DLLPUBLIC ::rtl::OUString resolveVBAMacro( SfxObjectShell* pShell, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModuleName, const ::rtl::OUString& rMacroName );
 MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const ::rtl::OUString& rMacroName, bool bSearchGlobalTemplates = false );
 MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
 
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 0c8d77bed..95cfeb906 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -9,12 +9,12 @@ fl	filter\source\msfilter\powerpoint		nmake	-	all	fl_powerpoint		fl_inc NULL
 fl	filter\source\pdf						nmake	-	all	fl_pdf fl_svg		fl_inc NULL
 fl	filter\source\svg						nmake	-	all	fl_svg				fl_inc NULL
 fl	filter\source\placeware					nmake	-	all	fl_placeware		fl_inc NULL
-fl	filter\source\flash						nmake	-	all	fl_flash fl_pdf			fl_inc NULL
+fl	filter\source\flash						nmake	-	all	fl_flash fl_pdf		fl_inc NULL
 fl	filter\source\filtertracer				nmake	-	all fl_filtertracer		fl_inc NULL
 fl  filter\source\odfflatxml                nmake   -   all fl_odfflatxml       fl_inc NULL
 fl	filter\source\xsltfilter				nmake	-	all fl_xsltfilter		fl_inc NULL
-fl	filter\source\xsltvalidate				nmake	-	all fl_xsltvalidate fl_xsltfilter	fl_inc NULL
-fl	filter\source\xsltdialog				nmake	-	all fl_xsltdialog fl_flash		fl_inc NULL
+fl	filter\source\xsltvalidate				nmake	-	all fl_xsltvalidate fl_xsltfilter   fl_inc NULL
+fl	filter\source\xsltdialog				nmake	-	all fl_xsltdialog fl_flash  fl_inc NULL
 fl  filter\source\docbook                   nmake   -   all fl_docbook          fl_inc NULL
 fl  filter\source\t602                      nmake   -   all fl_t602             fl_inc NULL
 fl	filter\source\graphicfilter\eos2met		nmake	-	all	g_vfeom fl_inc NULL
diff --git a/filter/source/config/fragments/fcfg_drawgraphics.mk b/filter/source/config/fragments/fcfg_drawgraphics.mk
index 41a46254b..40e6f3fde 100644
--- a/filter/source/config/fragments/fcfg_drawgraphics.mk
+++ b/filter/source/config/fragments/fcfg_drawgraphics.mk
@@ -53,6 +53,7 @@ F4_DRAWGRAPHICS = \
     RAS___Sun_Rasterfile \
     SGF___StarOffice_Writer_SGF \
     SGV___StarDraw_2_0 \
+    SVG___Scalable_Vector_Graphics \
     SVM___StarView_Metafile \
     SVG___Scalable_Vector_Graphics \
     TGA___Truevision_TARGA \
diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
index 339323757..5e21c0339 100644
--- a/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
+++ b/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
@@ -1,7 +1,7 @@
     <node oor:name="svg_Import" oor:op="replace"  >
         <prop oor:name="Type"><value>svg_Scalable_Vector_Graphics</value></prop>
-        <prop oor:name="FormatName"><value>svgfilter</value></prop>
-        <prop oor:name="RealFilterName"/>
+        <prop oor:name="FormatName"><value>SVISVG</value></prop>
+        <prop oor:name="RealFilterName"><value>SVG - Scalable Vector Graphics</value></prop>
         <prop oor:name="UIComponent"/>
         <prop oor:name="UIName">
             <value xml:lang="en-US">SVG - Scalable Vector Graphics</value>
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index eefc24f42..f88123449 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -41,6 +41,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svtools/filter.hxx>
 #include <vcl/graphictools.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 
 #ifndef _ZLIB_H
 #ifdef SYSTEM_ZLIB
@@ -1863,6 +1864,19 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
             }
             break;
 
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                const MetaRenderGraphicAction*	        pA = (const MetaRenderGraphicAction*) pAction;
+                const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                const Point                             aPointPixel;
+                const Size                              aSizePixel( mpVDev->LogicToPixel( pA->GetSize() ) );
+                const BitmapEx                          aBmpEx( aRasterizer.Rasterize( aSizePixel ) );
+
+                Impl_writeImage( aBmpEx, pA->GetPoint(), pA->GetSize(),
+                                 aPointPixel, aBmpEx.GetSizePixel(), clipRect, 1 == bMap );
+            }
+            break;
+
             case( META_MAPMODE_ACTION ):
             {
                 bMap++;
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 3d6070ba4..aeebfa9e6 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -45,8 +45,10 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 #include <svl/solar.hrc>
 
+
 // -----------------------------Feld-Typen-------------------------------
 
 #define BegDocumnMagic 0xA8A8 /* Begin Document */
@@ -165,6 +167,9 @@ private:
     sal_uLong				nWrittenBitmaps;  // Anzahl der bereits geschriebenen Bitmaps
     sal_uLong				nActBitmapPercent; // Wieviel Prozent die naechste Bitmap schon geschrieben ist.
 
+    ::std::auto_ptr< VirtualDevice >    apDummyVDev;
+    OutputDevice*                       pCompDev;
+
     com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
 
     void MayCallback();
@@ -204,7 +209,7 @@ private:
 
     void METSetAndPushLineInfo( const LineInfo& rLineInfo );
     void METPopLineInfo( const LineInfo& rLineInfo );
-    void METBitBlt(Point aPt, Size aSize, const Bitmap & rBitmap);
+    void METBitBlt(Point aPt, Size aSize, const Size& rSizePixel);
     void METBeginArea(sal_Bool bBoundaryLine);
     void METEndArea();
     void METBeginPath(sal_uInt32 nPathId);
@@ -243,7 +248,18 @@ private:
 
 public:
 
-    METWriter() {}
+    METWriter() :
+        pCompDev( NULL )
+    {
+#ifndef NO_GETAPPWINDOW
+        pCompDev = reinterpret_cast< OutputDevice* >( Application::GetAppWindow() );
+#endif
+        if( !pCompDev )
+        {
+            apDummyVDev.reset( new VirtualDevice );
+            pCompDev = apDummyVDev.get();
+        }
+    }
 
     sal_Bool WriteMET( const GDIMetaFile & rMTF, SvStream & rTargetStream,
                         FilterConfigItem* pConfigItem );
@@ -312,6 +328,7 @@ void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
             case META_BMPEX_ACTION:
             case META_BMPEXSCALE_ACTION:
             case META_BMPEXSCALEPART_ACTION:
+            case META_RENDERGRAPHIC_ACTION:
                 nNumberOfBitmaps++;
             break;
         }
@@ -335,7 +352,7 @@ void METWriter::WriteBigEndianLong(sal_uLong nLong)
 
 void METWriter::WritePoint(Point aPt)
 {
-    Point aNewPt = OutputDevice::LogicToLogic( aPt, aPictureMapMode, aTargetMapMode );
+    Point aNewPt = pCompDev->LogicToLogic( aPt, aPictureMapMode, aTargetMapMode );
 
     *pMET << (long) ( aNewPt.X() - aPictureRect.Left() )
           << (long) ( aPictureRect.Bottom() - aNewPt.Y() );
@@ -784,6 +801,17 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
                 }
             }
             break;
+
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                const MetaRenderGraphicAction*	        pA = (const MetaRenderGraphicAction*) pMA;
+                const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                const BitmapEx                          aBmpEx( aRasterizer.Rasterize( pCompDev->LogicToPixel( pA->GetSize() ) ) );
+
+                METSetMix( eGDIRasterOp );
+                WriteImageObject( Graphic( aBmpEx ).GetBitmap() );
+            }
+            break;
         }
 
         if (bStatus==sal_False)
@@ -1128,7 +1156,7 @@ void METWriter::WillWriteOrder(sal_uLong nNextOrderMaximumLength)
 
 
 
-void METWriter::METBitBlt(Point aPt, Size aSize, const Bitmap & rBitmap)
+void METWriter::METBitBlt(Point aPt, Size aSize, const Size& rBmpSizePixel)
 {
     WillWriteOrder(46);
     *pMET << (sal_uInt8)0xd6 << (sal_uInt8)44 << (sal_uInt16)0 << (sal_uInt16) 0x00cc;
@@ -1137,13 +1165,13 @@ void METWriter::METBitBlt(Point aPt, Size aSize, const Bitmap & rBitmap)
     WritePoint(Point(aPt.X(),aPt.Y()+aSize.Height()));
     WritePoint(Point(aPt.X()+aSize.Width(),aPt.Y()));
     *pMET << (sal_uInt32)0 << (sal_uInt32)0
-          << (sal_uInt32)(rBitmap.GetSizePixel().Width())
-          << (sal_uInt32)(rBitmap.GetSizePixel().Height());
+          << (sal_uInt32)(rBmpSizePixel.Width())
+          << (sal_uInt32)(rBmpSizePixel.Height());
 }
 
 void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo )
 {
-    sal_Int32 nWidth = OutputDevice::LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width();
+    sal_Int32 nWidth = pCompDev->LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width();
 
     WillWriteOrder( 8 );			// set stroke linewidth
     *pMET	<< (sal_uInt8)0x15
@@ -1969,10 +1997,11 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
 
             case META_BMP_ACTION:
             {
-                const MetaBmpAction* pA = (const MetaBmpAction*) pMA;
+                const MetaBmpAction*    pA = (const MetaBmpAction*) pMA;
+                const Size              aSizePixel( pA->GetBitmap().GetSizePixel() );
 
                 METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), pA->GetBitmap().GetSizePixel(), pA->GetBitmap() );
+                METBitBlt( pA->GetPoint(), pCompDev->PixelToLogic( aSizePixel, aPictureMapMode ), aSizePixel );
             }
             break;
 
@@ -1981,7 +2010,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*) pMA;
 
                 METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), pA->GetSize(), pA->GetBitmap() );
+                METBitBlt( pA->GetPoint(), pA->GetSize(), pA->GetBitmap().GetSizePixel() );
             }
             break;
 
@@ -1992,27 +2021,27 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
 
                 aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
                 METSetMix( eGDIRasterOp );
-                METBitBlt( pA->GetDestPoint(), pA->GetDestSize(), aTmp );
+                METBitBlt( pA->GetDestPoint(), pA->GetDestSize(), pA->GetBitmap().GetSizePixel() );
             }
             break;
 
             case META_BMPEX_ACTION:
             {
                 const MetaBmpExAction*	pA = (const MetaBmpExAction*) pMA;
-                Bitmap					aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
+                const Size              aSizePixel( pA->GetBitmapEx().GetSizePixel() );
 
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), aTmp.GetSizePixel(), aTmp );
+                METSetMix( eGDIRasterOp );
+                METBitBlt( pA->GetPoint(), pCompDev->PixelToLogic( aSizePixel, aPictureMapMode ), aSizePixel );
             }
             break;
 
             case META_BMPEXSCALE_ACTION:
             {
                 const MetaBmpExScaleAction*	pA = (const MetaBmpExScaleAction*) pMA;
-                Bitmap						aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
+                const Size                  aSizePixel( pA->GetBitmapEx().GetSizePixel() );
 
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), pA->GetSize(), aTmp );
+                METSetMix( eGDIRasterOp );
+                METBitBlt( pA->GetPoint(), pA->GetSize(), aSizePixel );
             }
             break;
 
@@ -2022,8 +2051,8 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 Bitmap							aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
 
                 aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetDestPoint(), pA->GetDestSize(), aTmp );
+                METSetMix( eGDIRasterOp );
+                METBitBlt( pA->GetDestPoint(), pA->GetDestSize(), aTmp.GetSizePixel() );
             }
             break;
 
@@ -2040,7 +2069,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                     {
                         const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*)pMetaAct;
                         METSetMix(eGDIRasterOp);
-                        METBitBlt( pA->GetPoint(), pA->GetSize(), pBmpScaleAction->GetBitmap() );
+                        METBitBlt( pA->GetPoint(), pA->GetSize(), pBmpScaleAction->GetBitmap().GetSizePixel() );
                         break;
                     }
                 }
@@ -2306,6 +2335,15 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 WriteOrders( &aTmpMtf );
             }
             break;
+
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                const MetaRenderGraphicAction*	pA = (const MetaRenderGraphicAction*) pMA;
+
+                METSetMix( eGDIRasterOp );
+                METBitBlt( pA->GetPoint(), pA->GetSize(), pCompDev->LogicToPixel( pA->GetSize(), pMTF->GetPrefMapMode() ) );
+            }
+            break;
       }
 
       nWrittenActions++;
@@ -2569,5 +2607,4 @@ extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic &
     }
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index aad2e967b..dfdceb332 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -47,6 +47,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 
 #include <tools/bigint.hxx>
 
@@ -227,6 +228,7 @@ void PictWriter::CountActionsAndBitmaps(const GDIMetaFile & rMTF)
             case META_BMPEX_ACTION:
             case META_BMPEXSCALE_ACTION:
             case META_BMPEXSCALEPART_ACTION:
+            case META_RENDERGRAPHIC_ACTION:
                 nNumberOfBitmaps++;
             break;
         }
@@ -1808,8 +1810,11 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_BMP_ACTION:
             {
-                const MetaBmpAction* pA = (const MetaBmpAction*) pMA;
-                WriteOpcode_BitsRect( pA->GetPoint(),pA->GetBitmap().GetSizePixel(), pA->GetBitmap() );
+                const MetaBmpAction*    pA = (const MetaBmpAction*) pMA;
+                const Bitmap            aBmp( pA->GetBitmap() );
+                VirtualDevice           aVirDev;
+
+                WriteOpcode_BitsRect( pA->GetPoint(), aVirDev.PixelToLogic( aBmp.GetSizePixel(), aSrcMapMode ), aBmp );
             }
             break;
 
@@ -1834,8 +1839,9 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             {
                 const MetaBmpExAction*  pA = (const MetaBmpExAction*) pMA;
                 const Bitmap            aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
+                VirtualDevice           aVirDev;
 
-                WriteOpcode_BitsRect( pA->GetPoint(), aBmp.GetSizePixel(), aBmp );
+                WriteOpcode_BitsRect( pA->GetPoint(), aVirDev.PixelToLogic( aBmp.GetSizePixel(), aSrcMapMode ), aBmp );
             }
             break;
 
@@ -2151,6 +2157,18 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
                 WriteOpcodes( aTmpMtf );
             }
             break;
+
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                const MetaRenderGraphicAction*	        pA = (const MetaRenderGraphicAction*) pMA;
+                const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                VirtualDevice                           aVirDev;
+                const Bitmap                            aBmp( Graphic( aRasterizer.Rasterize(
+                                                            aVirDev.LogicToPixel( pA->GetSize() ) ) ).GetBitmap() );
+
+                WriteOpcode_BitsRect( pA->GetPoint(), pA->GetSize(), aBmp );
+            }
+            break;
         }
 
         nWrittenActions++;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 93b1c3401..4370a56f7 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -49,6 +49,7 @@
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <vcl/graphictools.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 #include "strings.hrc"
 
 #include <math.h>
@@ -815,7 +816,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                 if ( mbGrayScale )
                     aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
                 Point aPoint = ( (const MetaBmpAction*) pMA )->GetPoint();
-                Size aSize = aBitmap.GetSizePixel();
+                Size aSize( rVDev.PixelToLogic( aBitmap.GetSizePixel() ) );
                 ImplBmp( &aBitmap, NULL, aPoint, aSize.Width(), aSize.Height() );
             }
             break;
@@ -851,8 +852,8 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                 if ( mbGrayScale )
                     aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
                 Bitmap aMask( aBitmapEx.GetMask() );
-                Point aPoint = ( (const MetaBmpExAction*) pMA)->GetPoint();
-                Size aSize = ( aBitmap.GetSizePixel() );
+                Point aPoint( ( (const MetaBmpExAction*) pMA )->GetPoint() );
+                Size aSize( rVDev.PixelToLogic( aBitmap.GetSizePixel() ) );
                 ImplBmp( &aBitmap, &aMask, aPoint, aSize.Width(), aSize.Height() );
             }
             break;
@@ -1365,6 +1366,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                                             case META_BMPSCALEPART_ACTION :
                                             case META_BMPEXSCALE_ACTION :
                                             case META_BMPEXSCALEPART_ACTION :
+                                            case META_RENDERGRAPHIC_ACTION :
                                             {
                                                 nBitmapCount++;
                                                 nBitmapAction = nCurAction;
@@ -1423,6 +1425,23 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                 }
             }
             break;
+
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                const MetaRenderGraphicAction*	        pA = (const MetaRenderGraphicAction*) pMA;
+                const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                const BitmapEx                          aBmpEx( aRasterizer.Rasterize( rVDev.LogicToPixel( pA->GetSize() ) ) );
+                Bitmap                                  aBmp( aBmpEx.GetBitmap() );
+
+                if ( mbGrayScale )
+                    aBmp.Convert( BMP_CONVERSION_8BIT_GREYS );
+
+                Bitmap  aMask( aBmpEx.GetMask() );
+                Size    aSize( pA->GetSize() );
+
+                ImplBmp( &aBmp, &aMask, pA->GetPoint(), aSize.Width(), aSize.Height() );
+            }
+            break;
         }
     }
 }
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index efede62ef..0b2b1bef0 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/script/ModuleType.hpp>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <unotools/pathoptions.hxx>
@@ -172,6 +173,7 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
 
 // sMod can be empty ( but we really need the library to search in )
 // if sMod is empty and a macro is found then sMod is updated
+// if sMod is empty, only standard modules will be searched (no class, document, form modules)
 bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, const String& sMacro )
 {
     bool bFound = false;
@@ -211,8 +213,12 @@ bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, con
                 {
                     if( SbModule* pModule = pMethod->GetModule() )
                     {
-                        sMod = pModule->GetName();
-                        bFound = true;
+                        // when searching for a macro without module name, do not search in class/document/form modules
+                        if( pModule->GetModuleType() == script::ModuleType::NORMAL )
+                        {
+                            sMod = pModule->GetName();
+                            bFound = true;
+                        }
                     }
                 }
             }
@@ -220,6 +226,19 @@ bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, con
     }
     return bFound;
 }
+
+::rtl::OUString getDefaultProjectName( SfxObjectShell* pShell )
+{
+    ::rtl::OUString aPrjName;
+    if( BasicManager* pBasicMgr = pShell ? pShell->GetBasicManager() : 0 )
+    {
+        aPrjName = pBasicMgr->GetName();
+        if( aPrjName.getLength() == 0 )
+            aPrjName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+    }
+    return aPrjName;
+}
+
 void parseMacro( const rtl::OUString& sMacro, String& sContainer, String& sModule, String& sProcedure )
 {
     sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' );
@@ -241,6 +260,18 @@ void parseMacro( const rtl::OUString& sMacro, String& sContainer, String& sModul
        sProcedure = sMacro;
 }
 
+::rtl::OUString resolveVBAMacro( SfxObjectShell* pShell, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModuleName, const ::rtl::OUString& rMacroName )
+{
+    if( pShell )
+    {
+        ::rtl::OUString aLibName = (rLibName.getLength() > 0) ? rLibName : getDefaultProjectName( pShell );
+        String aModuleName = rModuleName;
+        if( hasMacro( pShell, aLibName, aModuleName, rMacroName ) )
+            return ::rtl::OUStringBuffer( aLibName ).append( sal_Unicode( '.' ) ).append( aModuleName ).append( sal_Unicode( '.' ) ).append( rMacroName ).makeStringAndClear();
+    }
+    return ::rtl::OUString();
+}
+
 MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& MacroName, bool bSearchGlobalTemplates )
 {
     if( !pShell )
@@ -284,18 +315,27 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString&
     // macro format = Container.Module.Procedure
     String sContainer, sModule, sProcedure;
     parseMacro( aMacroName, sContainer, sModule, sProcedure );
-    uno::Reference< container::XNameContainer > xPrjNameCache;
 
+#if 0
     // As long as service VBAProjectNameProvider isn't supported in the model, disable the createInstance call
     // (the ServiceNotRegisteredException is wrongly caught in ScModelObj::createInstance)
-    //uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
-    //if ( xSF.is() )
-    //    xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
+    uno::Reference< container::XNameContainer > xPrjNameCache;
+    uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
+    if ( xSF.is() ) try
+    {
+        xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
+    }
+    catch( uno::Exception& )    // createInstance may throw
+    {
+    }
+#endif
 
     std::vector< rtl::OUString > sSearchList;
 
     if ( sContainer.Len() > 0 )
     {
+// service VBAProjectNameProvider not implemented
+#if 0
         // get the Project associated with the Container
         if ( xPrjNameCache.is() )
         {
@@ -306,6 +346,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString&
                 sContainer = sProject;
             }
         }
+#endif
         sSearchList.push_back( sContainer ); // First Lib to search
     }
     else
@@ -322,6 +363,9 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString&
             catch( uno::Exception& /*e*/) {}
 
         sSearchList.push_back( sThisProject ); // First Lib to search
+
+// service VBAProjectNameProvider not implemented
+#if 0
         if ( xPrjNameCache.is() )
         {
             // is this document created from a template?
@@ -378,7 +422,9 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString&
 
             }
         }
+#endif
     }
+
     std::vector< rtl::OUString >::iterator it_end = sSearchList.end();
     for ( std::vector< rtl::OUString >::iterator it = sSearchList.begin(); !aRes.mbFound && (it != it_end); ++it )
     {
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 5e6d6bf2b..531d728cf 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -615,7 +615,7 @@ TabPage  RID_PDF_TAB_SECURITY
     
     String STR_USER_PWD_PDFA
     {
-        Text [en-US] = "PDF doument will not be encrypted due to PDF/A export.";
+        Text [en-US] = "PDF document will not be encrypted due to PDF/A export.";
     };
 
     FixedText FT_OWNER_PWD
@@ -646,7 +646,7 @@ TabPage  RID_PDF_TAB_SECURITY
 
     String STR_OWNER_PWD_PDFA
     {
-        Text [en-US] = "PDF doument will not be restricted due to PDF/A export.";
+        Text [en-US] = "PDF document will not be restricted due to PDF/A export.";
     };
 
 //////////////////////////////
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
new file mode 100644
index 000000000..b465752da
--- /dev/null
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -0,0 +1,150 @@
+ /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: impsvgdialog.cxx,v $
+ *
+ *  $Revision: 1.1.2.3 $
+ *
+ *  last change: $Author: ka $ $Date: 2007/06/15 14:36:19 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_filter.hxx"
+
+#include "impsvgdialog.hxx"
+#include <cstdio>
+
+using namespace rtl;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+
+inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal )
+{
+    //return( rWnd.LogicToLogic( Size( nVal, nVal ) ).Height(), MAP_APPFONT, MAP_APPFONT );
+    return( nVal << 1 );
+}
+
+// ----------------
+// - ImpSVGDialog -
+// ----------------
+
+ImpSVGDialog::ImpSVGDialog( Window* pParent/*, ResMgr& rResMgr*/, Sequence< PropertyValue >& rFilterData ) :
+    ModalDialog( pParent/*KA, ResId( DLG_OPTIONS, &rResMgr*/ ),
+    maFI( this ),
+    maCBTinyProfile( this ),
+    maCBEmbedFonts( this ),
+    maCBUseNativeDecoration( this ),
+    maBTOK( this, WB_DEF_OK ),
+    maBTCancel( this ),
+    maBTHelp( this ),
+    maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM( SVG_EXPORTFILTER_CONFIGPATH ) ), &rFilterData ),
+    mbOldNativeDecoration( sal_False )
+{
+    SetText( String( RTL_CONSTASCII_USTRINGPARAM( "SVG Export Options" ) ) );
+    SetOutputSizePixel( Size( implMap( *this, 177 ), implMap( *this, 77 ) ) );
+    
+    maFI.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Export" ) ) );
+    maFI.SetPosSizePixel( Point( implMap( *this, 6 ), implMap( *this, 3 ) ),
+                                 Size( implMap( *this, 165 ), implMap( *this, 8 ) ) );
+    
+    maCBTinyProfile.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Use SVG Tiny profile" ) ) );
+    maCBTinyProfile.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 14 ) ),
+                                     Size( implMap( *this, 142 ), implMap( *this, 10 ) ) );
+    
+    maCBEmbedFonts.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Embed fonts" ) ) );
+    maCBEmbedFonts.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 27 ) ),
+                                    Size( implMap( *this, 142 ), implMap( *this, 10 ) ) );
+    
+    maCBUseNativeDecoration.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Use SVG native text decoration" ) ) );
+    maCBUseNativeDecoration.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 41 ) ),
+                                             Size( implMap( *this, 142 ), implMap( *this, 10 ) ) );
+    
+    maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), sal_False ) );
+    maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), sal_True ) );
+    maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), sal_True ) );
+    
+    maBTOK.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 57 ) ),
+                            Size( implMap( *this, 50 ), implMap( *this, 14 ) ) );
+    maBTCancel.SetPosSizePixel( Point( implMap( *this, 65 ), implMap( *this, 57 ) ),
+                                Size( implMap( *this, 50 ), implMap( *this, 14 ) ) );
+    maBTHelp.SetPosSizePixel( Point( implMap( *this, 121 ), implMap( *this, 57 ) ),
+                              Size( implMap( *this, 50 ), implMap( *this, 14 ) ) );
+    
+    maCBTinyProfile.SetToggleHdl( LINK( this, ImpSVGDialog, OnToggleCheckbox ) );
+    OnToggleCheckbox( &maCBTinyProfile );
+    
+    maFI.Show();
+    
+    maCBTinyProfile.Show();
+    maCBEmbedFonts.Show();
+    maCBUseNativeDecoration.Show();
+    
+    maBTOK.Show();
+    maBTCancel.Show();
+    maBTHelp.Show();
+}
+
+// -----------------------------------------------------------------------------
+
+ImpSVGDialog::~ImpSVGDialog()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
+{
+    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), maCBTinyProfile.IsChecked() );
+    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), maCBEmbedFonts.IsChecked() );
+    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), maCBUseNativeDecoration.IsChecked() );
+
+    return( maConfigItem.GetFilterData() );
+}
+
+// -----------------------------------------------------------------------------
+
+IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox*, pBox )
+{
+    if( pBox == &maCBTinyProfile )
+    {
+        if( pBox->IsChecked() )
+        {
+            mbOldNativeDecoration = maCBUseNativeDecoration.IsChecked();
+            
+            maCBUseNativeDecoration.Check( sal_False );
+            maCBUseNativeDecoration.Disable();
+        }
+        else
+        {
+            maCBUseNativeDecoration.Enable();
+            maCBUseNativeDecoration.Check( mbOldNativeDecoration );
+        }
+    }
+    
+    return 0;
+}
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
new file mode 100644
index 000000000..c5eb0ff79
--- /dev/null
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: impsvgdialog.hxx,v $
+ *
+ *  $Revision: 1.1.2.5 $
+ *
+ *  last change: $Author: ka $ $Date: 2006/03/24 10:57:24 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef IMPSVGDIALOG_HXX
+#define IMPSVGDIALOG_HXX
+
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
+#include <com/sun/star/uno/Sequence.h>
+#endif
+
+#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
+#include <com/sun/star/beans/PropertyValue.hpp>
+#endif
+
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/field.hxx>
+#include <svtools/stdctrl.hxx>
+#include <svtools/FilterConfigItem.hxx>
+
+#define SVG_EXPORTFILTER_CONFIGPATH         "Office.Common/Filter/SVG/Export/"
+#define SVG_PROP_TINYPROFILE                "TinyMode"
+#define SVG_PROP_EMBEDFONTS                 "EmbedFonts"
+#define SVG_PROP_NATIVEDECORATION           "UseNativeTextDecoration"
+#define SVG_PROP_GLYPHPLACEMENT             "GlyphPlacement"
+#define SVG_PROP_OPACITY                    "Opacity"
+#define SVG_PROP_GRADIENT                   "Gradient"
+
+// ----------------
+// - ImpSVGDialog -
+// ----------------
+
+class ResMgr;
+class Window;
+
+class ImpSVGDialog : public ModalDialog
+{
+private:
+    
+    FixedLine			maFI;
+    CheckBox            maCBTinyProfile;
+    CheckBox            maCBEmbedFonts;
+    CheckBox            maCBUseNativeDecoration;
+
+    OKButton			maBTOK;
+    CancelButton		maBTCancel;
+    HelpButton          maBTHelp;
+ 
+    FilterConfigItem	maConfigItem;
+    sal_Bool            mbOldNativeDecoration;
+
+    DECL_LINK( OnToggleCheckbox, CheckBox* );
+
+public:
+    
+    ImpSVGDialog( Window* pParent, /*ResMgr& rResMgr,*/ 
+                  com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData );
+    ~ImpSVGDialog();
+
+    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetFilterData();
+};
+
+#endif // IMPSVGDIALOG_HXX
diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index 6b30190d5..4c9145392 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -2,10 +2,14 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.10.110.6 $
+#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,6 +46,8 @@ VISIBILITY_HIDDEN=TRUE
 SLOFILES= \
             $(SLO)$/b2dellipse.obj	\
             $(SLO)$/parserfragments.obj \
+            $(SLO)$/svgdialog.obj		\
+            $(SLO)$/impsvgdialog.obj	\
             $(SLO)$/svgexport.obj		\
             $(SLO)$/svgfilter.obj		\
             $(SLO)$/svgfontexport.obj	\
@@ -65,11 +71,11 @@ CFLAGS+=-DUSE_MODERN_SPIRIT
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 
 SHL1STDLIBS=\
-    $(EDITENGLIB)			\
     $(SVXCORELIB)			\
     $(BASEGFXLIB)		\
     $(XMLOFFLIB)		\
     $(SVTOOLLIB)	    \
+    $(EDITENGLIB)			\
     $(VCLLIB)			\
     $(UNOTOOLSLIB)		\
     $(TOOLSLIB)			\
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
new file mode 100644
index 000000000..eda20bdea
--- /dev/null
+++ b/filter/source/svg/svgdialog.cxx
@@ -0,0 +1,275 @@
+ /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: svgdialog.cxx,v $
+ *
+ *  $Revision: 1.1.2.3 $
+ *
+ *  last change: $Author: ka $ $Date: 2008/05/19 10:12:43 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_filter.hxx"
+
+#include "svgdialog.hxx" 
+#include "impsvgdialog.hxx" 
+
+#include <vcl/svapp.hxx>
+#include <vcl/dialog.hxx>
+
+#ifndef _COM_SUN_STAR_VIEW_XRENDERABLE_HPP_
+#include <com/sun/star/view/XRenderable.hpp>
+#endif
+#ifndef	_COM_SUN_STAR_FRAME_XCONTROLLER_HPP_
+#include <com/sun/star/frame/XController.hpp>
+#endif
+#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#endif
+
+#define SVG_DIALOG_SERVICE_NAME         "com.sun.star.comp.Draw.SVGFilterDialog"
+#define SVG_DIALOG_IMPLEMENTATION_NAME  SVG_DIALOG_SERVICE_NAME
+#define SVG_FILTER_DATA_NAME            "FilterData"
+
+using namespace ::rtl;
+using namespace ::vcl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::view;
+using namespace ::com::sun::star::document;
+
+// -----------------------
+// - SVGDialog functions -
+// -----------------------
+
+OUString SVGDialog_getImplementationName ()
+    throw (RuntimeException)
+{
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_IMPLEMENTATION_NAME ) );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< sal_Int8 > SAL_CALL SVGDialog_getImplementationId() 
+    throw(RuntimeException)
+{
+    static const ::cppu::OImplementationId aId;
+    
+    return( aId.getImplementationId() );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() 
+    throw (RuntimeException)
+{
+    Sequence< OUString > aRet( 1 );
+    
+    aRet.getArray()[ 0 ] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_SERVICE_NAME ) );
+    
+    return aRet;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
+    throw( Exception )
+{
+    return( static_cast< cppu::OWeakObject* >( new SVGDialog( rSMgr ) ) );
+}
+
+// -------------
+// - SVGDialog -
+// -------------
+
+SVGDialog::SVGDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
+    OGenericUnoDialog( rxMSF )
+{
+    ByteString aResMgrName( "svgfilter" );
+
+    aResMgrName.Append( ByteString::CreateFromInt32( 0/*SOLARUPD*/ ) );
+    
+    // !!! KA: enable ResMgr
+    // mapResMgr.reset( ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ) );
+}
+
+// -----------------------------------------------------------------------------
+
+SVGDialog::~SVGDialog()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+Any SAL_CALL SVGDialog::queryInterface( const Type& rType ) 
+    throw (RuntimeException)
+{
+    Any aReturn( OGenericUnoDialog::queryInterface( rType ) );
+
+    if( !aReturn.hasValue() )
+    {   
+        aReturn = ::cppu::queryInterface( rType, static_cast< XPropertyAccess* >( this ),
+                                                 static_cast< XExporter* >( this ) );
+    }
+
+    return( aReturn );
+}
+
+// -----------------------------------------------------------------------------
+
+void SAL_CALL SVGDialog::acquire() 
+    throw ()
+{
+    OWeakObject::acquire();
+}
+
+// -----------------------------------------------------------------------------
+
+void SAL_CALL SVGDialog::release() 
+    throw ()
+{
+    OWeakObject::release();
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId() 
+    throw(RuntimeException)
+{
+    return SVGDialog_getImplementationId();
+}
+
+// -----------------------------------------------------------------------------
+
+OUString SAL_CALL SVGDialog::getImplementationName() 
+    throw (RuntimeException)
+{
+    return SVGDialog_getImplementationName();
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
+    throw (RuntimeException)
+{
+    return SVGDialog_getSupportedServiceNames();
+}
+
+// -----------------------------------------------------------------------------
+
+Dialog*	SVGDialog::createDialog( Window* pParent )
+{
+    return( ( /*KA: *mapResMgr.get() &&*/ mxSrcDoc.is() ) ? 
+            new ImpSVGDialog( pParent/*KA: , *mapResMgr*/, maFilterData ) : 
+            NULL );
+}
+
+// -----------------------------------------------------------------------------
+
+void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
+{
+    if( nExecutionResult && m_pDialog )
+        maFilterData = static_cast< ImpSVGDialog* >( m_pDialog )->GetFilterData();
+
+    destroyDialog();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() 
+    throw(RuntimeException)
+{
+    return( Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ) );
+}
+
+//-------------------------------------------------------------------------
+::cppu::IPropertyArrayHelper& SVGDialog::getInfoHelper()
+{
+    return( *const_cast< SVGDialog *>(this)->getArrayHelper() );
+}
+
+//------------------------------------------------------------------------------
+::cppu::IPropertyArrayHelper* SVGDialog::createArrayHelper() const
+{
+    Sequence< Property > aProps;
+    
+    describeProperties(aProps);
+    
+    return new ::cppu::OPropertyArrayHelper( aProps );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
+    throw ( RuntimeException )
+{
+    sal_Int32 i, nCount;
+
+    for( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; ++i )
+    {
+        if( maMediaDescriptor[ i ].Name.equalsAscii( SVG_FILTER_DATA_NAME ) ) 
+            break;
+    }
+
+    if( i == nCount )
+    {        
+        maMediaDescriptor.realloc( ++nCount );
+        maMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( SVG_FILTER_DATA_NAME ) );
+    }
+    
+    maMediaDescriptor[ i ].Value <<= maFilterData;
+    
+    return( maMediaDescriptor );
+}
+
+// -----------------------------------------------------------------------------
+
+void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) 
+    throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
+{
+    maMediaDescriptor = rProps;
+
+    for( sal_Int32 i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
+    {
+        if( maMediaDescriptor[ i ].Name.equalsAscii( SVG_FILTER_DATA_NAME ) ) 
+        {
+            maMediaDescriptor[ i ].Value >>= maFilterData;
+            break;
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc ) 
+    throw(IllegalArgumentException, RuntimeException)
+{
+    mxSrcDoc = xDoc;
+}
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
new file mode 100644
index 000000000..49993390f
--- /dev/null
+++ b/filter/source/svg/svgdialog.hxx
@@ -0,0 +1,120 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: svgdialog.hxx,v $
+ *
+ *  $Revision: 1.1.2.1 $
+ *
+ *  last change: $Author: ka $ $Date: 2006/03/08 08:18:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef SVGDIALOG_HXX
+#define SVGDIALOG_HXX
+
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYACCESS_HPP_
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
+#include <com/sun/star/document/XExporter.hpp>
+#endif
+
+#include <svtools/genericunodialog.hxx>
+#include <memory>
+
+// -------------
+// - SVGDialog -
+// -------------
+
+class ResMgr;
+
+class SVGDialog : public ::svt::OGenericUnoDialog,
+                  public ::comphelper::OPropertyArrayUsageHelper< SVGDialog >,
+                  public ::com::sun::star::beans::XPropertyAccess,
+                  public ::com::sun::star::document::XExporter
+{
+private:
+
+    ::std::auto_ptr< ResMgr >                                               mapResMgr;
+    com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor;
+    com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData;
+    com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >    mxSrcDoc;
+
+protected:
+
+    // XInterface
+    virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // OGenericUnoDialog
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException);
+    virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+    virtual Dialog*	createDialog( Window* pParent );
+    virtual void executedDialog( sal_Int16 nExecutionResult );
+    virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException);
+    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
+    virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+
+    // XPropertyAccess
+    using cppu::OPropertySetHelper::getPropertyValues;
+    virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (com::sun::star::uno::RuntimeException);
+    using cppu::OPropertySetHelper::setPropertyValues;
+    virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+
+       // XExporter
+    virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException);
+
+public:
+    
+                SVGDialog( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    virtual		~SVGDialog();
+};
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString SVGDialog_getImplementationName ()
+    throw ( ::com::sun::star::uno::RuntimeException );
+
+// -----------------------------------------------------------------------------
+
+sal_Bool SAL_CALL SVGDialog_supportsService( const ::rtl::OUString& ServiceName ) 
+    throw ( ::com::sun::star::uno::RuntimeException );
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SVGDialog_getSupportedServiceNames(  ) 
+    throw ( ::com::sun::star::uno::RuntimeException );
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+    SAL_CALL SVGDialog_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
+        throw ( ::com::sun::star::uno::Exception );
+
+#endif // SVGDialog_HXX
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 8c2f21f36..e21165e30 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -3,10 +3,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: svgexport.cxx,v $
+ * $Revision: 1.12.62.15 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +37,11 @@
 #include "svgwriter.hxx"
 #include "svgfontexport.hxx"
 #include "svgfilter.hxx"
+#include "impsvgdialog.hxx"
 
+#include <svtools/FilterConfigItem.hxx>
 #include <svx/unopage.hxx>
+#include <svx/unoshape.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/outliner.hxx>
@@ -48,12 +54,14 @@ using ::rtl::OUString;
 // - SVGExport -
 // -------------
 
-// #110680#
 SVGExport::SVGExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
-    const Reference< XDocumentHandler >& rxHandler )
-:	SvXMLExport( xServiceFactory, OUString(), rxHandler )
+    const Reference< XDocumentHandler >& rxHandler,
+    const Sequence< PropertyValue >& rFilterData ) :
+        SvXMLExport( xServiceFactory, MAP_100TH_MM ),
+        mrFilterData( rFilterData )
 {
+    SetDocHandler( rxHandler );
     GetDocHandler()->startDocument();
 }
 
@@ -64,6 +72,109 @@ SVGExport::~SVGExport()
     GetDocHandler()->endDocument();
 }
 
+// -----------------------------------------------------------------------------
+
+sal_Bool SVGExport::IsUseTinyProfile() const
+{
+    sal_Bool bRet = sal_False;
+    
+    if( mrFilterData.getLength() > 0 )
+        mrFilterData[ 0 ].Value >>= bRet;
+    
+    return bRet;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool SVGExport::IsEmbedFonts() const
+{
+    sal_Bool bRet = sal_False;
+    
+    if( mrFilterData.getLength() > 1 )
+        mrFilterData[ 1 ].Value >>= bRet;
+    
+    return bRet;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool SVGExport::IsUseNativeTextDecoration() const
+{
+    sal_Bool bRet = !IsUseTinyProfile();
+    
+    if( bRet && ( mrFilterData.getLength() > 2 ) )
+        mrFilterData[ 2 ].Value >>= bRet;
+    
+    return bRet;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString SVGExport::GetGlyphPlacement() const
+{
+    ::rtl::OUString aRet;
+    
+    if( mrFilterData.getLength() > 3 )
+        mrFilterData[ 3 ].Value >>= aRet;
+    else
+        aRet = B2UCONST( "abs" );
+        
+    return aRet;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool SVGExport::IsUseOpacity() const
+{
+    sal_Bool bRet = !IsUseTinyProfile();
+    
+    if( !bRet && ( mrFilterData.getLength() > 4 ) )
+        mrFilterData[ 4 ].Value >>= bRet;
+    
+    return bRet;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool SVGExport::IsUseGradient() const
+{
+    sal_Bool bRet = !IsUseTinyProfile();
+    
+    if( !bRet && ( mrFilterData.getLength() > 5 ) )
+        mrFilterData[ 5 ].Value >>= bRet;
+    
+    return bRet;
+}
+
+// -----------------------------------------------------------------------------
+
+void SVGExport::pushClip( const ::basegfx::B2DPolyPolygon& rPolyPoly )
+{
+    maClipList.push_front( ::basegfx::tools::correctOrientations( rPolyPoly ) );
+}
+    
+// -----------------------------------------------------------------------------
+
+void SVGExport::popClip()
+{
+    if( !maClipList.empty() )
+        maClipList.pop_front();
+}
+    
+// -----------------------------------------------------------------------------
+
+sal_Bool SVGExport::hasClip() const
+{
+    return( !maClipList.empty() );
+}
+    
+// -----------------------------------------------------------------------------
+    
+const ::basegfx::B2DPolyPolygon* SVGExport::getCurClip() const
+{
+    return( maClipList.empty() ? NULL : &( *maClipList.begin() ) );
+}
+
 // ------------------------
 // - ObjectRepresentation -
 // ------------------------
@@ -109,7 +220,7 @@ ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentatio
 
 // -----------------------------------------------------------------------------
 
-bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const
+sal_Bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const
 {
     return( ( mxObject == rPresentation.mxObject ) &&
             ( *mpMtf == *rPresentation.mpMtf ) );
@@ -129,7 +240,10 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
     sal_Int32                           nPageToExport = SVG_EXPORT_ALLPAGES;
     const PropertyValue*				pValue = rDescriptor.getConstArray();
     sal_Bool							bRet = sal_False;
-
+ 
+    mnMasterSlideId = mnSlideId = mnDrawingGroupId = mnDrawingId = 0;
+    maFilterData.realloc( 0 );
+ 
     for ( sal_Int32 i = 0 ; i < nLength; ++i)
     {
         if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
@@ -146,8 +260,62 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
         }
         else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PagePos" ) ) )
             pValue[ i ].Value >>= nPageToExport;
-   }
+        else if( pValue[ i ].Name.equalsAscii( "FilterData" ) )
+        {
+            pValue[ i ].Value >>= maFilterData;
+        }
+    }
+    
+    // if no filter data is given use stored/prepared ones
+    if( !maFilterData.getLength() )
+    {
+#ifdef _SVG_USE_CONFIG
+        FilterConfigItem aCfgItem( String( RTL_CONSTASCII_USTRINGPARAM( SVG_EXPORTFILTER_CONFIGPATH ) ) );
+        
+        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), sal_True );
+        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), sal_True );
+        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), sal_False );
+        aCfgItem.ReadString( String( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), B2UCONST( "xlist" ) );
+        aCfgItem.ReadString( String( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_OPACITY ) ), sal_True );
+        aCfgItem.ReadString( String( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_GRADIENT ) ), sal_True );
+        
+        maFilterData = aCfgItem.GetFilterData();
+#else
+        maFilterData.realloc( 6 );
+        
+        maFilterData[ 0 ].Name = B2UCONST( SVG_PROP_TINYPROFILE );
+        maFilterData[ 0 ].Value <<= (sal_Bool) sal_True;
+        
+        // font embedding
+        const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" );
+        
+        maFilterData[ 1 ].Name = B2UCONST( SVG_PROP_EMBEDFONTS );
+        maFilterData[ 1 ].Value <<= (sal_Bool) ( pSVGDisableFontEmbedding ? sal_False : sal_True );
+        
+        // Native decoration
+        maFilterData[ 2 ].Name = B2UCONST( SVG_PROP_NATIVEDECORATION );
+        maFilterData[ 2 ].Value <<= (sal_Bool) sal_False;
+
+        // glyph placement
+        const char* pSVGGlyphPlacement = getenv( "SVG_GLYPH_PLACEMENT" );
+        
+        maFilterData[ 3 ].Name = B2UCONST( SVG_PROP_GLYPHPLACEMENT );
+
+        if( pSVGGlyphPlacement )
+            maFilterData[ 3 ].Value <<= ::rtl::OUString::createFromAscii( pSVGGlyphPlacement );
+        else
+            maFilterData[ 3 ].Value <<= B2UCONST( "xlist" );
+
+        // Tiny Opacity
+        maFilterData[ 4 ].Name = B2UCONST( SVG_PROP_OPACITY );
+        maFilterData[ 4 ].Value <<= (sal_Bool) sal_True;
 
+        // Tiny Gradient
+        maFilterData[ 5 ].Name = B2UCONST( SVG_PROP_GRADIENT );
+        maFilterData[ 5 ].Value <<= (sal_Bool) sal_False;
+#endif
+    }
+   
     if( xOStm.is() && xServiceFactory.is() )
     {
         Reference< XMasterPagesSupplier >	xMasterPagesSupplier( mxSrcDoc, UNO_QUERY );
@@ -158,8 +326,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
             Reference< XDrawPages >   xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY );
             Reference< XDrawPages >   xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY );
 
-            if( xMasterPages.is() && xDrawPages->getCount() &&
-                xDrawPages.is() && xDrawPages->getCount() )
+            if( xMasterPages.is() && xMasterPages->getCount() && xDrawPages.is() && xDrawPages->getCount() )
             {
                 Reference< XDocumentHandler > xDocHandler( implCreateExportDocumentHandler( xOStm ) );
 
@@ -170,7 +337,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
 
                     // #110680#
                     // mpSVGExport = new SVGExport( xDocHandler );
-                    mpSVGExport = new SVGExport( xServiceFactory, xDocHandler );
+                    mpSVGExport = new SVGExport( xServiceFactory, xDocHandler, maFilterData );
 
                     if( nPageToExport < 0 || nPageToExport >= xDrawPages->getCount() )
                         nPageToExport = SVG_EXPORT_ALLPAGES;
@@ -284,7 +451,7 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
     const sal_Int32 nFirstPage = ( ( SVG_EXPORT_ALLPAGES == nPageToExport ) ? 0 : nPageToExport );
     sal_Int32       nCurPage = nFirstPage, nLastPage = ( bSinglePage ? nFirstPage : ( rxDrawPages->getCount() - 1 ) );
 
-    const Reference< XPropertySet > 			xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY );
+    const Reference< XPropertySet >             xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY );
     const Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY );
 
     if( xDefaultPagePropertySet.is() )
@@ -292,9 +459,16 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
         xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Width" ) ) >>= nDocWidth;
         xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Height" ) ) >>= nDocHeight;
     }
-
-    if( xExtDocHandler.is() )
+      
+    if( xExtDocHandler.is() && !mpSVGExport->IsUseTinyProfile() )
+    {
         xExtDocHandler->unknown( SVG_DTD_STRING );
+    }
+
+    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "version", B2UCONST( "1.2" ) );
+    
+    if( mpSVGExport->IsUseTinyProfile() )
+         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "baseProfile", B2UCONST( "tiny" ) );
 
 #ifdef _SVG_WRITE_EXTENTS
     aAttr = OUString::valueOf( nDocWidth * 0.01 );
@@ -311,11 +485,14 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
     aAttr += B2UCONST( " " );
     aAttr += OUString::valueOf( nDocHeight );
 
-    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "version", B2UCONST( "1.1" ) );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", B2UCONST( "xMidYMid" ) );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", B2UCONST( "evenodd" ) );
 
+    // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
+    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::valueOf( 28.222 ) );
+    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", B2UCONST( "round" ) );
+
     if( !bSinglePage )
     {
         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", B2UCONST( "http://xml.openoffice.org/svg/export" ) );
@@ -326,6 +503,8 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
 
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", B2UCONST( "http://www.w3.org/2000/svg" ) );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", B2UCONST( "http://www.w3.org/1999/xlink" ) );
+ 
+    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", B2UCONST( "preserve" ) );
 
     mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, "svg", sal_True, sal_True );
 
@@ -372,10 +551,11 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP
 
         ++nCurPage;
     }
-
-#ifdef _SVG_EMBED_FONTS
-    mpSVGFontExport->EmbedFonts();
-#endif
+ 
+    if( mpSVGExport->IsEmbedFonts() )
+    {
+        mpSVGFontExport->EmbedFonts();
+    }
 
     if( -1 != nVisible )
     {
@@ -499,15 +679,26 @@ sal_Bool SVGFilter::implExportPages( const Reference< XDrawPages >& rxPages,
 
             if( xShapes.is() )
             {
-                OUString aAttr;
+                OUString aVisibility, aId, aSlideName( implGetValidIDFromInterface( xShapes, sal_True ) );
 
+                // add visibility attribute			
                 if( i == nVisiblePage )
-                    aAttr = B2UCONST( "visible" );
+                    aVisibility = B2UCONST( "visible" );
                 else
-                    aAttr = B2UCONST( "hidden" );
+                    aVisibility = B2UCONST( "hidden" );
 
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", aAttr );
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", implGetValidIDFromInterface( xShapes ) );
+                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", aVisibility );
+                
+                // add id attribute         
+                if( bMaster )
+                    aId = ( B2UCONST( "MasterSlide_" ) ) += ::rtl::OUString::valueOf( ++mnMasterSlideId );
+                else
+                    aId = ( B2UCONST( "Slide_" ) ) += ::rtl::OUString::valueOf( ++mnSlideId );
+
+                if( aSlideName.getLength() )
+                    ( ( aId += B2UCONST( "(" ) ) += aSlideName ) += B2UCONST( ")" );
+                
+                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aId );
 
                 {
                     {
@@ -572,7 +763,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
     if( xShapePropSet.is() )
     {
         const ::rtl::OUString   aShapeType( rxShape->getShapeType() );
-        bool                    bHideObj = false;
+        sal_Bool                    bHideObj = sal_False;
 
         if( mbPresentation )
         {
@@ -585,41 +776,41 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
 
                 if( xPagePropSetInfo.is() )
                 {
-                    static const ::rtl::OUString aHeaderString( B2UCONST( "IsHeaderVisible" ) );
-                    static const ::rtl::OUString aFooterString( B2UCONST( "IsFooterVisible" ) );
-                    static const ::rtl::OUString aDateTimeString( B2UCONST( "IsDateTimeVisible" ) );
-                    static const ::rtl::OUString aPageNumberString( B2UCONST( "IsPageNumberVisible" ) );
+                    const ::rtl::OUString aHeaderString( B2UCONST( "IsHeaderVisible" ) );
+                    const ::rtl::OUString aFooterString( B2UCONST( "IsFooterVisible" ) );
+                    const ::rtl::OUString aDateTimeString( B2UCONST( "IsDateTimeVisible" ) );
+                    const ::rtl::OUString aPageNumberString( B2UCONST( "IsPageNumberVisible" ) );
 
                     Any     aProperty;
-                    bool    bValue = sal_False;
+                    sal_Bool    bValue = sal_False;
 
                     if( ( aShapeType.lastIndexOf( B2UCONST( "presentation.HeaderShape" ) ) != -1 ) &&
                         xPagePropSetInfo->hasPropertyByName( aHeaderString ) &&
                         ( ( aProperty = xDefaultPagePropertySet->getPropertyValue( aHeaderString ) ) >>= bValue ) &&
                         !bValue )
                     {
-                        bHideObj = true;
+                        bHideObj = sal_True;
                     }
                     else if( ( aShapeType.lastIndexOf( B2UCONST( "presentation.FooterShape" ) ) != -1 ) &&
                                 xPagePropSetInfo->hasPropertyByName( aFooterString ) &&
                                 ( ( aProperty = xDefaultPagePropertySet->getPropertyValue( aFooterString ) ) >>= bValue ) &&
                             !bValue )
                     {
-                        bHideObj = true;
+                        bHideObj = sal_True;
                     }
                     else if( ( aShapeType.lastIndexOf( B2UCONST( "presentation.DateTimeShape" ) ) != -1 ) &&
                                 xPagePropSetInfo->hasPropertyByName( aDateTimeString ) &&
                                 ( ( aProperty = xDefaultPagePropertySet->getPropertyValue( aDateTimeString ) ) >>= bValue ) &&
                             !bValue )
                     {
-                        bHideObj = true;
+                        bHideObj = sal_True;
                     }
                     else if( ( aShapeType.lastIndexOf( B2UCONST( "presentation.SlideNumberShape" ) ) != -1 ) &&
                                 xPagePropSetInfo->hasPropertyByName( aPageNumberString ) &&
                                 ( ( aProperty = xDefaultPagePropertySet->getPropertyValue( aPageNumberString ) ) >>= bValue ) &&
                             !bValue )
                     {
-                        bHideObj = true;
+                        bHideObj = sal_True;
                     }
                 }
             }
@@ -627,11 +818,6 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
 
         if( !bHideObj )
         {
-            OUString aObjName( implGetValidIDFromInterface( rxShape ) ), aObjDesc;
-
-            if( aObjName.getLength() )
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aObjName );
-
             if( aShapeType.lastIndexOf( B2UCONST( "drawing.GroupShape" ) ) != -1 )
             {
                 Reference< XShapes > xShapes( rxShape, UNO_QUERY );
@@ -645,19 +831,23 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
                 }
             }
 
-            if( !bRet )
+            if( !bRet && mpObjects->find( rxShape ) !=  mpObjects->end() )
             {
                  Reference< XText >                  xText( rxShape, UNO_QUERY );
                 ::com::sun::star::awt::Rectangle    aBoundRect;
                 const GDIMetaFile&					rMtf = (*mpObjects)[ rxShape ].GetRepresentation();
 
                 xShapePropSet->getPropertyValue( B2UCONST( "BoundRect" ) ) >>= aBoundRect;
+                
                 const Point aTopLeft( aBoundRect.X, aBoundRect.Y );
                 const Size  aSize( aBoundRect.Width, aBoundRect.Height );
 
+                if( rMtf.GetActionSize() )
                 {
                     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", implGetClassFromShape( rxShape ) );
                     SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True );
+                    OUString    aId( B2UCONST( "DrawingGroup_" ) );
+                    OUString    aObjName( implGetValidIDFromInterface( rxShape, true ) ), aObjDesc;
 
                     Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY );
 
@@ -677,7 +867,9 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
                         xExtDocHandler->characters( aDescription );
                     }
 
-                    if( rMtf.GetActionSize() )
+                    if( aObjName.getLength() )
+                        ( ( aId += B2UCONST( "(" ) ) += aObjName ) += B2UCONST( ")" );
+                
                     {
                         SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True );
                         mpSVGWriter->WriteMetaFile( aTopLeft, aSize, rMtf, SVGWRITER_WRITE_ALL);
@@ -900,13 +1092,31 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape )
 
 // -----------------------------------------------------------------------------
 
-OUString SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf )
+OUString SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf, sal_Bool bUnique )
 {
     Reference< XNamed > xNamed( rxIf, UNO_QUERY );
     OUString			aRet;
 
     if( xNamed.is() )
-        aRet = xNamed->getName().replace( ' ', '_' );
+    {
+        aRet = xNamed->getName().replace( ' ', '_' ).
+               replace( ':', '_' ).
+               replace( ',', '_' ).
+               replace( ';', '_' ).
+               replace( '&', '_' ).
+               replace( '!', '_' ).
+               replace( '|', '_' );
+    }
+ 
+    if( ( aRet.getLength() > 0 ) && bUnique )
+    {
+        while( ::std::find( maUniqueIdVector.begin(), maUniqueIdVector.end(), aRet ) != maUniqueIdVector.end() )
+        {
+            aRet += B2UCONST( "_" );
+        }
+        
+        maUniqueIdVector.push_back( aRet );
+    }
 
     return aRet;
 }
@@ -916,14 +1126,14 @@ OUString SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >&
 IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
 {
     OUString   aRepresentation;
-    bool       bFieldProcessed = false;
+    sal_Bool       bFieldProcessed = sal_False;
 
     if( pInfo )
     {
-        static const ::rtl::OUString aHeaderText( B2UCONST( "HeaderText" ) );
-        static const ::rtl::OUString aFooterText( B2UCONST( "FooterText" ) );
-        static const ::rtl::OUString aDateTimeText( B2UCONST( "DateTimeText" ) );
-        static const ::rtl::OUString aPageNumberText( B2UCONST( "Number" ) );
+        const ::rtl::OUString aHeaderText( B2UCONST( "HeaderText" ) );
+        const ::rtl::OUString aFooterText( B2UCONST( "FooterText" ) );
+        const ::rtl::OUString aDateTimeText( B2UCONST( "DateTimeText" ) );
+        const ::rtl::OUString aPageNumberText( B2UCONST( "Number" ) );
 
         const Reference< XPropertySet >	xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY );
         Reference< XPropertySetInfo > 	xDefaultPagePropSetInfo( xDefaultPagePropertySet->getPropertySetInfo() );
@@ -937,19 +1147,19 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
                 xDefaultPagePropSetInfo->hasPropertyByName( aHeaderText ) )
             {
                 xDefaultPagePropertySet->getPropertyValue( aHeaderText ) >>= aRepresentation;
-                bFieldProcessed = true;
+                bFieldProcessed = sal_True;
             }
             else if( pField->ISA( SvxFooterField ) &&
                      xDefaultPagePropSetInfo->hasPropertyByName( aFooterText ) )
             {
                 xDefaultPagePropertySet->getPropertyValue( aFooterText ) >>= aRepresentation;
-                bFieldProcessed = true;
+                bFieldProcessed = sal_True;
             }
             else if( pField->ISA( SvxDateTimeField ) &&
                      xDefaultPagePropSetInfo->hasPropertyByName( aDateTimeText ) )
             {
                 xDefaultPagePropertySet->getPropertyValue( aDateTimeText ) >>= aRepresentation;
-                bFieldProcessed = true;
+                bFieldProcessed = sal_True;
             }
             else if( pField->ISA( SvxPageField ) &&
                      xDefaultPagePropSetInfo->hasPropertyByName( aPageNumberText ) )
@@ -961,7 +1171,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
 
                 if( mpSdrModel )
                 {
-                    bool bUpper = false;
+                    sal_Bool bUpper = sal_False;
 
                     switch( mpSdrModel->GetPageNumType() )
                     {
@@ -972,7 +1182,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
                             aPageNumValue += (sal_Unicode)(char)( ( nPageNumber- 1 ) % 26 + 'a' );
                             break;
                         case SVX_ROMAN_UPPER:
-                            bUpper = true;
+                            bUpper = sal_True;
                         case SVX_ROMAN_LOWER:
                             aPageNumValue += SvxNumberFormat::CreateRomanString( nPageNumber, bUpper );
                             break;
@@ -988,7 +1198,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
                     aPageNumValue += String::CreateFromInt32( nPageNumber );
 
                 aRepresentation = aPageNumValue;
-                bFieldProcessed = true;
+                bFieldProcessed = sal_True;
             }
         }
 
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 77f4271d3..12f619005 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -86,7 +86,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
         pFocusWindow->EnterWait();
 
     if( mxDstDoc.is() )
-        bRet = implImport( rDescriptor );
+        bRet = sal_False;//implImport( rDescriptor );
     else
     if( mxSrcDoc.is() )
     {
@@ -117,19 +117,19 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
                 }
             }
         }
-
-        Sequence< PropertyValue > aNewDescritor( rDescriptor );
-
+        
+        Sequence< PropertyValue > aNewDescriptor( rDescriptor );
+        
         if( nCurrentPageNumber > 0 )
         {
             const sal_uInt32	nOldLength = rDescriptor.getLength();
-
-            aNewDescritor.realloc( nOldLength + 1 );
-            aNewDescritor[ nOldLength ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PagePos" ) );
-            aNewDescritor[ nOldLength ].Value <<= static_cast< sal_Int16 >( nCurrentPageNumber - 1 );
+            
+            aNewDescriptor.realloc( nOldLength + 1 );
+            aNewDescriptor[ nOldLength ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PagePos" ) );
+            aNewDescriptor[ nOldLength ].Value <<= static_cast< sal_Int16 >( nCurrentPageNumber - 1 );
         }
-
-        bRet = implExport( aNewDescritor );
+        
+        bRet = implExport( aNewDescriptor );
     }
     else
         bRet = sal_False;
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 7b4606ae0..340ece3b3 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -3,10 +3,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: svgfilter.hxx,v $
+ * $Revision: 1.10.110.11 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,6 +62,9 @@
 #include <boost/unordered_map.hpp>
 #include <osl/diagnose.h>
 #include <rtl/process.h>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/tempfile.hxx>
@@ -79,6 +85,8 @@
 #include "svgfilter.hxx"
 #include "svgscript.hxx"
 
+#include <cstdio>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -105,25 +113,42 @@ using namespace ::std;
 // #110680#
 class SVGExport : public SvXMLExport
 {
-private:
-
-                            SVGExport();
+    typedef ::std::list< ::basegfx::B2DPolyPolygon > B2DPolyPolygonList;
 
+public:						
+                        
+    SVGExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
+                const Reference< XDocumentHandler >& rxHandler,
+                const Sequence< PropertyValue >& rFilterData );
+
+    virtual ~SVGExport();
+
+    sal_Bool IsUseTinyProfile() const;
+    sal_Bool IsEmbedFonts() const;
+    sal_Bool IsUseNativeTextDecoration() const;
+    ::rtl::OUString GetGlyphPlacement() const;
+    sal_Bool IsUseOpacity() const;
+    sal_Bool IsUseGradient() const;
+    
+    void  pushClip( const ::basegfx::B2DPolyPolygon& rPolyPoly );
+    void  popClip();
+    sal_Bool  hasClip() const;
+    const ::basegfx::B2DPolyPolygon* getCurClip() const;
+    
 protected:
 
-    virtual void			_ExportMeta() {}
-    virtual void			_ExportStyles( sal_Bool /* bUsed */ ) {}
-    virtual void			_ExportAutoStyles() {}
-    virtual void			_ExportContent() {}
-    virtual void			_ExportMasterStyles() {}
-    virtual sal_uInt32		exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) { return 0; }
-                            
-public:						
-                            
-    SVGExport( 
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
-        const Reference< XDocumentHandler >& rxHandler );
-    virtual					~SVGExport();
+virtual void			_ExportStyles( sal_Bool /* bUsed */ ) {}
+virtual void            _ExportAutoStyles() {}
+virtual void            _ExportContent() {}
+virtual void            _ExportMasterStyles() {}
+virtual sal_uInt32		exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) { return 0; }
+
+private:
+    
+    const Sequence< PropertyValue >&    mrFilterData;
+    B2DPolyPolygonList                  maClipList;
+        
+    SVGExport();
 };
 
 // ------------------------
@@ -146,7 +171,7 @@ public:
                                     ~ObjectRepresentation();
                                     
     ObjectRepresentation&			operator=( const ObjectRepresentation& rPresentation );
-    bool							operator==( const ObjectRepresentation& rPresentation ) const;
+    sal_Bool							operator==( const ObjectRepresentation& rPresentation ) const;
 
     const Reference< XInterface >&	GetObject() const { return mxObject; }	
     sal_Bool						HasRepresentation() const { return mpMtf != NULL; }
@@ -159,7 +184,10 @@ public:
 
 struct HashReferenceXInterface
 {
-    size_t operator()( const Reference< XInterface >& rxIf ) const { return reinterpret_cast< size_t >( rxIf.get() ); }
+    size_t operator()( const Reference< XInterface >& rxIf ) const
+    {
+        return reinterpret_cast< size_t >( rxIf.get() );
+    }
 };
 
 // -------------
@@ -176,6 +204,7 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
                                                  XExtendedFilterDetection >
 {
     typedef ::boost::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
+    typedef ::std::vector< ::rtl::OUString > UniqueIdVector;
 
 private:
 
@@ -192,6 +221,12 @@ private:
     Reference< XComponent >				mxSrcDoc;
     Reference< XComponent >				mxDstDoc;
     Reference< XDrawPage > 				mxDefaultPage;
+    Sequence< PropertyValue >           maFilterData;
+    UniqueIdVector                      maUniqueIdVector;
+    sal_Int32                           mnMasterSlideId;
+    sal_Int32                           mnSlideId;
+    sal_Int32                           mnDrawingGroupId;
+    sal_Int32                           mnDrawingId;
     Link								maOldFieldHdl;
 
     sal_Bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
@@ -223,7 +258,7 @@ private:
     sal_Bool							implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
     
     ::rtl::OUString						implGetClassFromShape( const Reference< XShape >& rxShape );
-    ::rtl::OUString						implGetValidIDFromInterface( const Reference< XInterface >& rxIf );
+    ::rtl::OUString						implGetValidIDFromInterface( const Reference< XInterface >& rxIf, sal_Bool bUnique = sal_False );
     
                                         DECL_LINK( CalcFieldHdl, EditFieldInfo* );
     
@@ -250,27 +285,6 @@ public:
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString SVGFilter_getImplementationName ()
-    throw ( ::com::sun::star::uno::RuntimeException );
-
-// -----------------------------------------------------------------------------
-
-sal_Bool SAL_CALL SVGFilter_supportsService( const ::rtl::OUString& ServiceName ) 
-    throw ( ::com::sun::star::uno::RuntimeException );
-
-// -----------------------------------------------------------------------------
-
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SVGFilter_getSupportedServiceNames(  ) 
-    throw ( ::com::sun::star::uno::RuntimeException );
-
-// -----------------------------------------------------------------------------
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL SVGFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
-    throw ( ::com::sun::star::uno::Exception );
-
-// -----------------------------------------------------------------------------
-
 class SvStream;
 class Graphic;
 
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 777cbbfe2..84db3faec 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -3,10 +3,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: svgfontexport.cxx,v $
+ * $Revision: 1.6.64.10 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,16 +32,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_filter.hxx"
 
-
 #include "svgfontexport.hxx"
+#include <vcl/unohelp.hxx>
 
-static const sal_Int32	nFontEM = 2048;
+static const sal_Int32 nFontEM = 2048;
 
 // -----------------
 // - SVGFontExport -
 // -----------------
 
-SVGFontExport::SVGFontExport( SvXMLExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ) :
+SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ) :
     mrExport( rExport ),
     maObjects( rObjects ),
     mnCurFontId( 0 )
@@ -53,6 +56,33 @@ SVGFontExport::~SVGFontExport()
 
 // -----------------------------------------------------------------------------
 
+SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont )
+{
+    FontWeight      eWeight( WEIGHT_NORMAL );
+    FontItalic      eItalic( ITALIC_NONE );
+    ::rtl::OUString aFontName( rFont.GetName() );
+    sal_Int32       nNextTokenPos( 0 );
+    
+    switch( rFont.GetWeight() )
+    {
+        case WEIGHT_BOLD:
+        case WEIGHT_ULTRABOLD:
+        case WEIGHT_BLACK:
+            eWeight = WEIGHT_BOLD;
+        break;
+        
+        default:
+        break;
+    }
+    
+    if( rFont.GetItalic() != ITALIC_NONE )
+        eItalic = ITALIC_NORMAL;
+    
+    return( maGlyphTree[ aFontName.getToken( 0, ';', nNextTokenPos ) ][ eWeight ][ eItalic ] );
+}
+
+// -----------------------------------------------------------------------------
+
 void SVGFontExport::implCollectGlyphs()
 {
     VirtualDevice					aVDev;
@@ -72,7 +102,7 @@ void SVGFontExport::implCollectGlyphs()
             {
                 ::rtl::OUString		aText;
                 MetaAction*			pAction = rMtf.GetAction( i );
-                const sal_uInt16		nType = pAction->GetType();
+                const sal_uInt16	nType = pAction->GetType();
 
                 switch( nType )
                 {
@@ -111,11 +141,34 @@ void SVGFontExport::implCollectGlyphs()
 
                 if( aText.getLength() )
                 {
-                    const String&		rFontName = aVDev.GetFont().GetName();
-                    const sal_Unicode*	pStr = aText.getStr();
-
-                    for( sal_uInt32 j = 0, nLen = aText.getLength(); j < nLen; ++j )
-                        maGlyphs[ rFontName ].insert( pStr[ j ] );
+                    GlyphSet& rGlyphSet = implGetGlyphSet( aVDev.GetFont() );
+                    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( 
+                        ::vcl::unohelper::CreateBreakIterator() );
+                        
+                    if( xBI.is() )
+                    {
+                        const ::com::sun::star::lang::Locale&   rLocale = Application::GetSettings().GetLocale();
+                        sal_Int32                               nCurPos = 0, nLastPos = -1;
+                        
+                        while( ( nCurPos < aText.getLength() ) && ( nCurPos > nLastPos ) )
+                        {
+                            sal_Int32 nCount2 = 1;
+                        
+                            nLastPos = nCurPos;
+                            nCurPos = xBI->nextCharacters( aText, nCurPos, rLocale, 
+                                                           ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL,
+                                                           nCount2, nCount2 );
+                            
+                            rGlyphSet.insert( aText.copy( nLastPos, nCurPos - nLastPos ) );
+                        }
+                    }
+                    else
+                    {
+                        const sal_Unicode* pStr = aText.getStr();
+    
+                        for( sal_uInt32 k = 0, nLen = aText.getLength(); k < nLen; ++k )
+                            rGlyphSet.insert( rtl::OUString( pStr[ k ] ) );
+                    }
                 }
             }
 
@@ -128,96 +181,117 @@ void SVGFontExport::implCollectGlyphs()
 
 // -----------------------------------------------------------------------------
 
-void SVGFontExport::implEmbedFont( const ::rtl::OUString& rFontName, const ::std::set< sal_Unicode >& rGlyphs )
+void SVGFontExport::implEmbedFont( const Font& rFont )
 {
-#ifdef _SVG_EMBED_FONTS
-    ::std::set< sal_Unicode >::const_iterator	aIter( rGlyphs.begin() );
-    const ::rtl::OUString						aEmbeddedFontStr( B2UCONST( "EmbeddedFont_" ) );
-
+    if( mrExport.IsEmbedFonts() )
     {
-        SvXMLElementExport	aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True );
-        ::rtl::OUString		aCurIdStr( aEmbeddedFontStr );
-        ::rtl::OUString		aUnitsPerEM( SVGActionWriter::GetValueString( nFontEM ) );
-        VirtualDevice		aVDev;
-        Font			    aFont( rFontName, Size( 0, nFontEM ) );
-
-        aVDev.SetMapMode( MAP_100TH_MM );
-        aFont.SetAlign( ALIGN_BASELINE );
-        aVDev.SetFont( aFont );
-
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += SVGActionWriter::GetValueString( ++mnCurFontId ) );
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM );
-
+        GlyphSet& rGlyphSet = implGetGlyphSet( rFont );
+        
+        if( !rGlyphSet.empty() )
         {
-            SvXMLElementExport  aExp2( mrExport, XML_NAMESPACE_NONE, "font", sal_True, sal_True );
-            Point               aPos;
-            Size                aSize( nFontEM, nFontEM );
-            PolyPolygon         aMissingGlyphPolyPoly( Rectangle( aPos, aSize ) );
-
-            aMissingGlyphPolyPoly.Move( 0, -nFontEM );
-            aMissingGlyphPolyPoly.Scale( 1.0, -1.0 );
-
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family", GetMappedFontName( rFontName ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", SVGActionWriter::GetValueString( aVDev.GetFontMetric().GetAscent() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", SVGActionWriter::GetValueString( aVDev.GetFontMetric().GetDescent() ) );
-
-            {
-                SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True );
-            }
-
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", SVGActionWriter::GetValueString( aSize.Width() ) );
-
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "style", B2UCONST( "fill:none;stroke:black;stroke-width:33" ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, sal_False ) );
-
+            GlyphSet::const_iterator    aIter( rGlyphSet.begin() );
+            const ::rtl::OUString       aEmbeddedFontStr( B2UCONST( "EmbeddedFont_" ) );
+        
             {
-                SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "missing-glyph", sal_True, sal_True );
-            }
+                SvXMLElementExport  aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True );
+                ::rtl::OUString     aCurIdStr( aEmbeddedFontStr );
+                ::rtl::OUString     aUnitsPerEM( ::rtl::OUString::valueOf( nFontEM ) );
+                VirtualDevice       aVDev;
+                Font                aFont( rFont );
+    
+                aFont.SetSize( Size( 0, nFontEM ) );
+                aFont.SetAlign( ALIGN_BASELINE );
+            
+                aVDev.SetMapMode( MAP_100TH_MM );
+                aVDev.SetFont( aFont );
+    
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += ::rtl::OUString::valueOf( ++mnCurFontId ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM );
+    
+                {
+                    SvXMLElementExport  aExp2( mrExport, XML_NAMESPACE_NONE, "font", sal_True, sal_True );
+                    ::rtl::OUString     aFontWeight;
+                    ::rtl::OUString     aFontStyle;
+                    const Size         aSize( nFontEM, nFontEM );
+
+                    // Font Weight
+                    if( aFont.GetWeight() != WEIGHT_NORMAL )
+                        aFontWeight = B2UCONST( "bold" );
+                    else
+                        aFontWeight = B2UCONST( "normal" );
+        
+                    // Font Italic
+                    if( aFont.GetItalic() != ITALIC_NONE )
+                        aFontStyle = B2UCONST( "italic" );
+                    else
+                        aFontStyle = B2UCONST( "normal" );
+    
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family", GetMappedFontName( rFont.GetName() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight", aFontWeight );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style", aFontStyle );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetAscent() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) );
+    
+                    {   
+                        SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True );
+                    }
+    
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aSize.Width() ) );
+    
+                    {
+                        const Point         aPos;
+                        const PolyPolygon   aMissingGlyphPolyPoly( Rectangle( aPos, aSize ) );
+    
+                        mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, sal_False ) );
+    
+                        {
+                            SvXMLElementExport  aExp4( mrExport, XML_NAMESPACE_NONE, "missing-glyph", sal_True, sal_True );
+                        }
+                    }
 
-            while( aIter != rGlyphs.end() )
-            {
-                implEmbedGlyph( aVDev, ::rtl::OUString( *aIter ) );
-                ++aIter;
+                    while( aIter != rGlyphSet.end() )
+                    {
+                        implEmbedGlyph( aVDev, *aIter );
+                        ++aIter;
+                    }
+                }
             }
         }
     }
-#endif
 }
 
 // -----------------------------------------------------------------------------
 
-void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rGlyphs )
+void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rCellStr )
 {
     PolyPolygon     	aPolyPoly;
-    ::rtl::OUString 	aStr( rGlyphs );
     const sal_Unicode	nSpace = ' ';
 
-    if( rOut.GetTextOutline( aPolyPoly, aStr ) )
+    if( rOut.GetTextOutline( aPolyPoly, rCellStr ) )
     {
         Rectangle aBoundRect;
 
         aPolyPoly.Scale( 1.0, -1.0 );
 
-        if( !rOut.GetTextBoundRect( aBoundRect, aStr ) )
-            aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( aStr ), 0 ) );
+        if( !rOut.GetTextBoundRect( aBoundRect, rCellStr ) )
+            aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( rCellStr ), 0 ) );
 
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", aStr );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", rCellStr );
 
-        if( rGlyphs[ 0 ] == nSpace )
-            aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( sal_Unicode( 'x' ) ), 0 ) );
+        if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 )
+            aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( sal_Unicode( ' ' ) ), 0 ) );
 
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", SVGActionWriter::GetValueString( aBoundRect.GetWidth() ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aBoundRect.GetWidth() ) );
 
         const ::rtl::OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) );
-
         if( aPathString.getLength() )
         {
             mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", aPathString );
         }
-
+        
         {
-            SvXMLElementExport    aExp( mrExport, XML_NAMESPACE_NONE, "glyph", sal_True, sal_True );
+            SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "glyph", sal_True, sal_True );
         }
     }
 }
@@ -227,13 +301,36 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& r
 void SVGFontExport::EmbedFonts()
 {
     implCollectGlyphs();
-
-    GlyphMap::const_iterator aIter( maGlyphs.begin() );
-
-    while( aIter != maGlyphs.end() )
+    
+    GlyphTree::const_iterator aGlyphTreeIter( maGlyphTree.begin() );
+    
+    while( aGlyphTreeIter != maGlyphTree.end() ) 
     {
-        implEmbedFont( (*aIter).first, (*aIter).second );
-        ++aIter;
+        const FontWeightMap&            rFontWeightMap = (*aGlyphTreeIter).second;   
+        FontWeightMap::const_iterator   aFontWeightIter( rFontWeightMap.begin() );
+        
+        while( aFontWeightIter != rFontWeightMap.end() )
+        {
+            const FontItalicMap&            rFontItalicMap = (*aFontWeightIter).second;   
+            FontItalicMap::const_iterator   aFontItalicIter( rFontItalicMap.begin() );
+            
+            while( aFontItalicIter != rFontItalicMap.end() )
+            {
+                Font aFont;
+                
+                aFont.SetName( (*aGlyphTreeIter).first );
+                aFont.SetWeight( (*aFontWeightIter).first );
+                aFont.SetItalic( (*aFontItalicIter).first );
+                
+                implEmbedFont( aFont );
+            
+                ++aFontItalicIter;
+            }
+        
+            ++aFontWeightIter;
+        }
+        
+        ++aGlyphTreeIter;
     }
 }
 
@@ -241,12 +338,11 @@ void SVGFontExport::EmbedFonts()
 
 ::rtl::OUString SVGFontExport::GetMappedFontName( const ::rtl::OUString& rFontName ) const
 {
-    ::rtl::OUString aRet( String( rFontName ).GetToken( 0, ';' ) );
+    sal_Int32       nNextTokenPos( 0 );
+    ::rtl::OUString aRet( rFontName.getToken( 0, ';', nNextTokenPos ) );
 
-#ifdef _SVG_EMBED_FONTS
     if( mnCurFontId )
         aRet += B2UCONST( " embedded" );
-#endif
 
     return aRet;
 }
diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx
index de96b0b76..bcb360333 100644
--- a/filter/source/svg/svgfontexport.hxx
+++ b/filter/source/svg/svgfontexport.hxx
@@ -3,10 +3,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: svgfontexport.hxx,v $
+ * $Revision: 1.2.110.3 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,23 +42,28 @@
 
 class SVGFontExport
 {
-    typedef ::boost::unordered_map< ::rtl::OUString, ::std::set< sal_Unicode >, ::comphelper::UStringHash > GlyphMap;
-    typedef ::std::vector< ObjectRepresentation > ObjectVector;
-
+    typedef ::std::vector< ObjectRepresentation >                               ObjectVector;
+    typedef ::std::set< ::rtl::OUString, ::std::greater< ::rtl::OUString > >    GlyphSet;
+    typedef ::std::map< FontItalic, GlyphSet >                                  FontItalicMap;
+    typedef ::std::map< FontWeight, FontItalicMap >                             FontWeightMap;
+    typedef ::std::map< ::rtl::OUString, FontWeightMap >                        FontNameMap;
+    typedef FontNameMap                                                         GlyphTree;
+    
 private:
 
-    SvXMLExport&		mrExport; 
-    GlyphMap			maGlyphs;
+    SVGExport&		    mrExport;
+    GlyphTree      		maGlyphTree;
     ObjectVector		maObjects;
-    sal_uInt32			mnCurFontId;
+    sal_Int32			mnCurFontId;
                         
+    GlyphSet&           implGetGlyphSet( const Font& rFont );
     void				implCollectGlyphs();
-    void				implEmbedFont( const ::rtl::OUString& rFontName, const ::std::set< sal_Unicode >& rGlyphs );
-    void				implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rGlyphs );
+    void                implEmbedFont( const Font& rFont );
+    void				implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rCellStr );
                         
 public:					
                         
-                        SVGFontExport( SvXMLExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects );
+                        SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects );
                         ~SVGFontExport();
                         
     void				EmbedFonts();
diff --git a/filter/source/svg/svguno.cxx b/filter/source/svg/svguno.cxx
deleted file mode 100644
index b4f202eb0..000000000
--- a/filter/source/svg/svguno.cxx
+++ /dev/null
@@ -1,79 +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.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_filter.hxx"
-
-#include <stdio.h>
-#include <osl/mutex.hxx>
-#include <osl/thread.h>
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include <svgfilter.hxx>
-
-using ::rtl::OUString;
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C"
-{
-    //==================================================================================================
-    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-        const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-    {
-        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-    //==================================================================================================
-    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
-        const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
-    {
-        void * pRet = 0;
-        
-        OUString implName = OUString::createFromAscii( pImplName );
-        if ( pServiceManager && implName.equals(SVGFilter_getImplementationName()) )
-        {
-            Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-                OUString::createFromAscii( pImplName ),
-                SVGFilter_createInstance, SVGFilter_getSupportedServiceNames() ) );
-            
-            if (xFactory.is())
-            {
-                xFactory->acquire();
-                pRet = xFactory.get();
-            }
-        }
-        
-        return pRet;
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index b29f886cb..7669d91f7 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3,10 +3,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: svgwriter.cxx,v $
+ * $Revision: 1.7.64.23 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,6 +34,9 @@
 
 #include "svgfontexport.hxx"
 #include "svgwriter.hxx"
+#include <vcl/unohelp.hxx>
+
+using ::rtl::OUString;
 
 // -----------
 // - statics -
@@ -38,11 +44,6 @@
 
 static const char	aXMLElemG[] = "g";
 static const char	aXMLElemDefs[] = "defs";
-static const char	aXMLElemClipPath[] = "clipPath";
-static const char	aXMLElemMask[] = "mask";
-static const char	aXMLElemPattern[] = "pattern";
-static const char	aXMLElemLinearGradient[] = "linearGradient";
-static const char	aXMLElemStop[] = "stop";
 static const char	aXMLElemLine[] = "line";
 static const char	aXMLElemRect[] = "rect";
 static const char	aXMLElemEllipse[] = "ellipse";
@@ -52,6 +53,13 @@ static const char	aXMLElemPolyLine[] = "polyline";
 static const char	aXMLElemText[] = "text";
 static const char	aXMLElemTSpan[] = "tspan";
 static const char	aXMLElemImage[] = "image";
+static const char	aXMLElemMask[] = "mask";
+static const char	aXMLElemPattern[] = "pattern";
+static const char   aXMLElemLinearGradient[] = "linearGradient";
+static const char   aXMLElemRadialGradient[] = "radialGradient";
+static const char   aXMLElemStop[] = "stop";
+
+// -----------------------------------------------------------------------------
 
 static const char	aXMLAttrTransform[] = "transform";
 static const char	aXMLAttrStyle[] = "style";
@@ -65,80 +73,36 @@ static const char	aXMLAttrX2[] = "x2";
 static const char	aXMLAttrY2[] = "y2";
 static const char	aXMLAttrCX[] = "cx";
 static const char	aXMLAttrCY[] = "cy";
+static const char   aXMLAttrR[] = "r";
 static const char	aXMLAttrRX[] = "rx";
 static const char	aXMLAttrRY[] = "ry";
 static const char	aXMLAttrWidth[] = "width";
 static const char	aXMLAttrHeight[] = "height";
 static const char	aXMLAttrPoints[] = "points";
-static const char	aXMLAttrPatternUnits[] = "patternUnits";
-static const char	aXMLAttrGradientUnits[] = "gradientUnits";
-static const char	aXMLAttrOffset[] = "offset";
+static const char   aXMLAttrStroke[] = "stroke";
+static const char   aXMLAttrStrokeOpacity[] = "stroke-opacity";
+static const char   aXMLAttrStrokeWidth[] = "stroke-width";
+static const char   aXMLAttrStrokeDashArray[] = "stroke-dasharray";
+static const char   aXMLAttrFill[] = "fill";
+static const char   aXMLAttrFillOpacity[] = "fill-opacity";
+static const char   aXMLAttrFontFamily[] = "font-family";
+static const char   aXMLAttrFontSize[] = "font-size";
+static const char   aXMLAttrFontStyle[] = "font-style";
+static const char   aXMLAttrFontWeight[] = "font-weight";
+static const char   aXMLAttrTextDecoration[] = "text-decoration";
 static const char	aXMLAttrXLinkHRef[] = "xlink:href";
-
-// --------------
-// - FastString -
-// --------------
-
-FastString::FastString( sal_uInt32 nInitLen, sal_uInt32 nIncrement ) :
-    mnBufLen( nInitLen ),
-    mnCurLen( 0 ),
-    mnBufInc( nIncrement ),
-    mpBuffer( new sal_Unicode[ nInitLen * sizeof( sal_Unicode ) ] ),
-    mnPartPos( 0 )
-{
-    DBG_ASSERT( nInitLen, "invalid initial length" );
-    DBG_ASSERT( nIncrement, "invalid increment" );
-}
-
-// -----------------------------------------------------------------------------
-
-FastString::~FastString()
-{
-    delete[] mpBuffer;
-}
-
-// -----------------------------------------------------------------------------
-
-FastString& FastString::operator+=( const NMSP_RTL::OUString& rStr )
-{
-    if( rStr.getLength() )
-    {
-        if( ( mnCurLen + rStr.getLength() ) > mnBufLen )
-        {
-            const sal_uInt32	nNewBufLen = ( mnBufLen + ( ( ( mnCurLen + rStr.getLength() ) - mnBufLen ) / mnBufInc + 1 ) * mnBufInc );
-            sal_Unicode*		pNewBuffer = new sal_Unicode[ nNewBufLen * sizeof( sal_Unicode ) ];
-
-            memcpy( pNewBuffer, mpBuffer, mnBufLen * sizeof( sal_Unicode )  );
-            delete[] mpBuffer;
-            mpBuffer = pNewBuffer;
-            mnBufLen = nNewBufLen;
-        }
-
-        memcpy( mpBuffer + mnCurLen, rStr.getStr(), rStr.getLength() * sizeof( sal_Unicode ) );
-        mnCurLen += rStr.getLength();
-
-        if( maString.getLength() )
-            maString = NMSP_RTL::OUString();
-    }
-
-    return *this;
-}
+static const char   aXMLAttrGradientUnits[] = "gradientUnits";
+static const char	aXMLAttrPatternUnits[] = "patternUnits";
+static const char   aXMLAttrOffset[] = "offset";
+static const char   aXMLAttrStopColor[] = "stop-color";
 
 // -----------------------------------------------------------------------------
 
-const NMSP_RTL::OUString& FastString::GetString() const
-{
-    if( !maString.getLength() && mnCurLen )
-        ( (FastString*) this )->maString = NMSP_RTL::OUString( mpBuffer, mnCurLen );
-
-    return maString;
-}
-
 // ----------------------
 // - SVGAttributeWriter -
 // ----------------------
 
-SVGAttributeWriter::SVGAttributeWriter( SvXMLExport& rExport, SVGFontExport& rFontExport ) :
+SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFontExport ) :
     mrExport( rExport ),
     mrFontExport( rFontExport ),
     mpElemFont( NULL ),
@@ -156,203 +120,196 @@ SVGAttributeWriter::~SVGAttributeWriter()
 
 // -----------------------------------------------------------------------------
 
-NMSP_RTL::OUString SVGAttributeWriter::GetFontStyle( const Font& rFont )
+double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs )
 {
-    FastString aStyle;
-
-    // font family
-    aStyle += B2UCONST( "font-family:" );
-    aStyle += mrFontExport.GetMappedFontName( rFont.GetName() );
-
-    // font size
-    aStyle += B2UCONST( ";" );
-    aStyle += B2UCONST( "font-size:" );
-    aStyle += SVGActionWriter::GetValueString( rFont.GetHeight() );
-    aStyle += B2UCONST( "px" );
-
-    // font style
-/*
-    if( rFont.GetItalic() != ITALIC_NONE )
-    {
-        aStyle += B2UCONST( ";" );
-        aStyle += B2UCONST( "font-style:" );
-
-        if( rFont.GetItalic() == ITALIC_OBLIQUE )
-            aStyle += B2UCONST( "oblique" );
-        else
-            aStyle += B2UCONST( "italic" );
-    }
-*/
+      return( floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ) );
+}
 
-    // font weight
-    sal_Int32 nFontWeight;
+// -----------------------------------------------------------------------------
 
-    switch( rFont.GetWeight() )
+void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr )
+{
+    if( rColor.GetTransparency() == 255 )
+        rColorStr = B2UCONST( "none" );
+    else
     {
-        case WEIGHT_THIN:			nFontWeight = 100; break;
-        case WEIGHT_ULTRALIGHT:		nFontWeight = 200; break;
-        case WEIGHT_LIGHT:			nFontWeight = 300; break;
-        case WEIGHT_SEMILIGHT:		nFontWeight = 400; break;
-        case WEIGHT_NORMAL:			nFontWeight = 400; break;
-        case WEIGHT_MEDIUM:			nFontWeight = 500; break;
-        case WEIGHT_SEMIBOLD:		nFontWeight = 600; break;
-        case WEIGHT_BOLD:			nFontWeight = 700; break;
-        case WEIGHT_ULTRABOLD:		nFontWeight = 800; break;
-        case WEIGHT_BLACK:			nFontWeight = 900; break;
-        default:					nFontWeight = 400; break;
+        ::rtl::OUStringBuffer aStyle;
+        aStyle.appendAscii( "rgb(" );
+        aStyle.append( (sal_Int32) rColor.GetRed() );
+        aStyle.appendAscii( "," );
+        aStyle.append( (sal_Int32) rColor.GetGreen() );
+        aStyle.appendAscii( "," );
+        aStyle.append( (sal_Int32) rColor.GetBlue() );
+        aStyle.appendAscii( ")" );
+        rColorStr = aStyle.makeStringAndClear();
     }
+}
 
-    aStyle += B2UCONST( ";" );
-    aStyle += B2UCONST( "font-weight:" );
-    aStyle += NMSP_RTL::OUString::valueOf( nFontWeight );
-
-    // !!!
-    // font-variant
-    // font-stretch
-    // font-size-adjust
-
-#ifdef _SVG_USE_NATIVE_TEXTDECORATION
-
-    if( rFont.GetUnderline() != UNDERLINE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE )
-    {
-        aStyle += B2UCONST( ";" );
-        aStyle += B2UCONST( "text-decoration:" );
-
-        if( rFont.GetUnderline() != UNDERLINE_NONE )
-            aStyle += B2UCONST( " underline" );
+// -----------------------------------------------------------------------------
 
-        if( rFont.GetStrikeout() != STRIKEOUT_NONE )
-             aStyle += B2UCONST( " line-through" );
-    }
+void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName, 
+                                       const char* pColorOpacityAttrName,
+                                       const Color& rColor )
+{
+    ::rtl::OUString aColor, aColorOpacity;
+    
+    ImplGetColorStr( rColor, aColor );
 
-#endif // _SVG_USE_NATIVE_TEXTDECORATION
+    if( rColor.GetTransparency() > 0 && rColor.GetTransparency() < 255 )
+        aColorOpacity = ::rtl::OUString::valueOf( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) );
 
-    return aStyle.GetString();
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorAttrName, aColor );
+    
+    if( aColorOpacity.getLength() && mrExport.IsUseOpacity() )
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorOpacityAttrName, aColorOpacity );
 }
 
 // -----------------------------------------------------------------------------
 
-NMSP_RTL::OUString SVGAttributeWriter::GetColorStyle( const Color& rColor )
+void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFillColor, 
+                                       const Rectangle* pObjBoundRect, const Gradient* pFillGradient )
 {
-    FastString aStyle;
-    aStyle += B2UCONST( "rgb(" );
-    aStyle += NMSP_RTL::OUString::valueOf( (sal_Int32) rColor.GetRed() );
-    aStyle += B2UCONST( "," );
-    aStyle += NMSP_RTL::OUString::valueOf( (sal_Int32) rColor.GetGreen() );
-    aStyle += B2UCONST( "," );
-    aStyle += NMSP_RTL::OUString::valueOf( (sal_Int32) rColor.GetBlue() );
-    aStyle += B2UCONST( ")" );
-    return aStyle.GetString();
+    // Fill
+    if( pObjBoundRect && pFillGradient )
+    {
+        ::rtl::OUString aGradientId;
+        
+        AddGradientDef( *pObjBoundRect, *pFillGradient, aGradientId );
+        
+        if( aGradientId.getLength() )
+        {
+            ::rtl::OUString aGradientURL( B2UCONST( "url(#" ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFill, ( aGradientURL += aGradientId ) += B2UCONST( ")" ) );
+        }
+    }
+    else
+        AddColorAttr( aXMLAttrFill, aXMLAttrFillOpacity, rFillColor );
+
+    // Stroke
+    AddColorAttr( aXMLAttrStroke, aXMLAttrStrokeOpacity, rLineColor );
 }
 
 // -----------------------------------------------------------------------------
 
-NMSP_RTL::OUString SVGAttributeWriter::GetPaintStyle( const Color& rLineColor, const Color& rFillColor, const LineInfo* pLineInfo )
+void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, ::rtl::OUString& rGradientId )
 {
-    FastString aStyle;
-
-    // line color
-    aStyle += B2UCONST( "stroke:" );
-
-    if( rLineColor.GetTransparency() == 255 )
-        aStyle += B2UCONST( "none" );
-    else
+    if( rObjRect.GetWidth() && rObjRect.GetHeight() &&
+        ( rGradient.GetStyle() == GRADIENT_LINEAR || rGradient.GetStyle() == GRADIENT_AXIAL ||
+          rGradient.GetStyle() == GRADIENT_RADIAL || rGradient.GetStyle() == GRADIENT_ELLIPTICAL ) )
     {
-        // line color value in rgb
-        aStyle += GetColorStyle( rLineColor );
-
-        // line color opacity in percent if neccessary
-        if( rLineColor.GetTransparency() )
+        SvXMLElementExport  aDesc( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
+        Color               aStartColor( rGradient.GetStartColor() ), aEndColor( rGradient.GetEndColor() );
+        sal_uInt16          nAngle = rGradient.GetAngle() % 3600;
+        Point               aObjRectCenter( rObjRect.Center() );
+        Polygon             aPoly( rObjRect );
+        static sal_Int32    nCurGradientId = 1;
+        
+        aPoly.Rotate( aObjRectCenter, nAngle );
+        Rectangle aRect( aPoly.GetBoundRect() );
+        
+        // adjust start/end colors with intensities
+        aStartColor.SetRed( (sal_uInt8)( (long) aStartColor.GetRed() * rGradient.GetStartIntensity() ) / 100 );
+        aStartColor.SetGreen( (sal_uInt8)( (long) aStartColor.GetGreen() * rGradient.GetStartIntensity() ) / 100 );
+        aStartColor.SetBlue( (sal_uInt8)( (long) aStartColor.GetBlue() * rGradient.GetStartIntensity() ) / 100 );
+        
+        aEndColor.SetRed( (sal_uInt8)( (long) aEndColor.GetRed() * rGradient.GetEndIntensity() ) / 100 );
+        aEndColor.SetGreen( (sal_uInt8)( (long) aEndColor.GetGreen() * rGradient.GetEndIntensity() ) / 100 );
+        aEndColor.SetBlue( (sal_uInt8)( (long) aEndColor.GetBlue() * rGradient.GetEndIntensity() ) / 100 );
+
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId,
+                            ( rGradientId = B2UCONST( "Gradient_" ) ) += ::rtl::OUString::valueOf( nCurGradientId++ ) );
+        
         {
-            aStyle += B2UCONST( ";" );
-            aStyle += B2UCONST( "stroke-opacity:" );
-            aStyle += NMSP_RTL::OUString::valueOf( ( 255 - (double) rLineColor.GetTransparency() ) / 255.0 );
-        }
-
-        if(pLineInfo)
-        {
-            // more infos for line needed
-            if(pLineInfo->GetWidth() > 1)
-            {
-                aStyle += B2UCONST( ";" );
-                aStyle += B2UCONST( "stroke-width:" );
-                aStyle += NMSP_RTL::OUString::valueOf(pLineInfo->GetWidth());
-            }
-
-            if(LINE_DASH == pLineInfo->GetStyle())
+            ::std::auto_ptr< SvXMLElementExport >   apGradient;
+            ::rtl::OUString                         aColorStr;
+            
+            if( rGradient.GetStyle() == GRADIENT_LINEAR || rGradient.GetStyle() == GRADIENT_AXIAL )
             {
-                aStyle += B2UCONST( ";" );
-                aStyle += B2UCONST( "stroke-dasharray:" );
-                const long nDashLen(pLineInfo->GetDashLen());
-                const long nDotLen(pLineInfo->GetDotLen());
-                const long nDistance(pLineInfo->GetDistance());
-                bool bIsFirst(true);
-
-                for(sal_uInt16 a(0); a < pLineInfo->GetDashCount(); a++)
+                Polygon aLinePoly( 2 );
+            
+                aLinePoly[ 0 ] = Point( aObjRectCenter.X(), aRect.Top() );
+                aLinePoly[ 1 ] = Point( aObjRectCenter.X(), aRect.Bottom() );
+        
+                aLinePoly.Rotate( aObjRectCenter, nAngle );
+                
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, B2UCONST( "userSpaceOnUse" ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].Y() ) );
+            
+                apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, sal_True, sal_True ) );
+            
+                // write stop values
+                double fBorder = static_cast< double >( rGradient.GetBorder() ) * 
+                                ( ( rGradient.GetStyle() == GRADIENT_AXIAL ) ? 0.005 : 0.01 );
+                
+                ImplGetColorStr( ( rGradient.GetStyle() == GRADIENT_AXIAL ) ? aEndColor : aStartColor, aColorStr );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( fBorder ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
+                
                 {
-                    if(bIsFirst)
-                        aStyle += B2UCONST(" "), bIsFirst = false;
-                    else
-                        aStyle += B2UCONST(",");
-                    aStyle += NMSP_RTL::OUString::valueOf(nDashLen);
-                    aStyle += B2UCONST(",");
-                    aStyle += NMSP_RTL::OUString::valueOf(nDistance);
+                    SvXMLElementExport aDesc2( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
                 }
-
-                for(sal_uInt16 b(0); b < pLineInfo->GetDotCount(); b++)
+                
+                if( rGradient.GetStyle() == GRADIENT_AXIAL )
                 {
-                    if(bIsFirst)
-                        aStyle += B2UCONST(" "), bIsFirst = false;
-                    else
-                        aStyle += B2UCONST(",");
-                    aStyle += NMSP_RTL::OUString::valueOf(nDotLen);
-                    aStyle += B2UCONST(",");
-                    aStyle += NMSP_RTL::OUString::valueOf(nDistance);
+                    ImplGetColorStr( aStartColor, aColorStr );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( 0.5 ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
+                
+                    {
+                        SvXMLElementExport aDesc3( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
+                    }
+                }
+                
+                if( rGradient.GetStyle() != GRADIENT_AXIAL )
+                    fBorder = 0.0;
+                
+                ImplGetColorStr( aEndColor, aColorStr );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( ImplRound( 1.0 - fBorder ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
+            
+                {
+                    SvXMLElementExport aDesc4( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
                 }
             }
-
-            if(basegfx::B2DLINEJOIN_MITER != pLineInfo->GetLineJoin())
+            else
             {
-                aStyle += B2UCONST( ";" );
-                aStyle += B2UCONST( "stroke-linejoin:" );
+                const double    fCenterX = rObjRect.Left() + rObjRect.GetWidth() * rGradient.GetOfsX() * 0.01;
+                const double    fCenterY = rObjRect.Top() + rObjRect.GetHeight() * rGradient.GetOfsY() * 0.01;
+                const double    fRadius = sqrt( static_cast< double >( rObjRect.GetWidth() ) * rObjRect.GetWidth() + 
+                                                rObjRect.GetHeight() * rObjRect.GetHeight() ) * 0.5;
+
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, B2UCONST( "userSpaceOnUse" ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( ImplRound( fCenterX ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( ImplRound( fCenterY ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, ::rtl::OUString::valueOf( ImplRound( fRadius ) ) );
+
+                apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemRadialGradient, sal_True, sal_True ) );
+                
+                // write stop values
+                ImplGetColorStr( aEndColor, aColorStr );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( 0.0 ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
 
-                switch(pLineInfo->GetLineJoin())
                 {
-                    default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE, B2DLINEJOIN_MITER
-                        aStyle += B2UCONST( "miter" );
-                        break;
-                    case basegfx::B2DLINEJOIN_ROUND:
-                        aStyle += B2UCONST( "round" );
-                        break;
-                    case basegfx::B2DLINEJOIN_BEVEL:
-                        aStyle += B2UCONST( "bevel" );
-                        break;
+                    SvXMLElementExport aDesc5( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
+                }
+                
+                ImplGetColorStr( aStartColor, aColorStr );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, 
+                                       ::rtl::OUString::valueOf( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
+            
+                {
+                    SvXMLElementExport aDesc6( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
                 }
             }
         }
     }
-
-    // fill color
-    aStyle += B2UCONST( ";" );
-    aStyle += B2UCONST( "fill:" );
-
-    if( rFillColor.GetTransparency() == 255 )
-        aStyle += B2UCONST( "none" );
     else
-    {
-        // fill color value in rgb
-        aStyle += GetColorStyle( rFillColor );
-
-        // fill color opacity in percent if neccessary
-        if( rFillColor.GetTransparency() )
-        {
-            aStyle += B2UCONST( ";" );
-            aStyle += B2UCONST( "fill-opacity:" );
-            aStyle += NMSP_RTL::OUString::valueOf( ( 255 - (double) rFillColor.GetTransparency() ) / 255.0 );
-        }
-    }
-
-    return aStyle.GetString();
+        rGradientId = ::rtl::OUString();
 }
 
 // -----------------------------------------------------------------------------
@@ -361,22 +318,68 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont )
 {
     if( !mpElemFont || ( rFont != maCurFont ) )
     {
+        ::rtl::OUString  aFontStyle, aFontWeight, aTextDecoration;
+        sal_Int32        nFontWeight;
+    
         delete mpElemPaint, mpElemPaint = NULL;
         delete mpElemFont;
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, GetFontStyle( maCurFont = rFont ) );
-        mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
-    }
-}
+        maCurFont = rFont;
+        
+        // Font Family
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, mrFontExport.GetMappedFontName( rFont.GetName() ) );
+        
+        // Font Size
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontSize, 
+                               ::rtl::OUString::valueOf( rFont.GetHeight() ) +  B2UCONST( "px" ) );
+
+        // Font Style
+        if( rFont.GetItalic() != ITALIC_NONE )
+        {
+            if( rFont.GetItalic() == ITALIC_OBLIQUE )
+                aFontStyle = B2UCONST( "oblique" );
+            else
+                aFontStyle = B2UCONST( "italic" );
+        }
+        else
+            aFontStyle = B2UCONST( "normal" );
 
-// -----------------------------------------------------------------------------
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontStyle, aFontStyle );
 
-void SVGAttributeWriter::SetPaintAttr( const Color& rLineColor, const Color& rFillColor, const LineInfo* pLineInfo )
-{
-    if( !mpElemPaint || ( rLineColor != maCurLineColor ) || ( rFillColor != maCurFillColor ) )
-    {
-        delete mpElemPaint;
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, GetPaintStyle( maCurLineColor = rLineColor, maCurFillColor = rFillColor, pLineInfo ) );
-        mpElemPaint = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
+        // Font Weight
+        switch( rFont.GetWeight() )
+        {
+            case WEIGHT_THIN:           nFontWeight = 100; break;
+            case WEIGHT_ULTRALIGHT:     nFontWeight = 200; break;
+            case WEIGHT_LIGHT:          nFontWeight = 300; break;
+            case WEIGHT_SEMILIGHT:      nFontWeight = 400; break;
+            case WEIGHT_NORMAL:         nFontWeight = 400; break;
+            case WEIGHT_MEDIUM:         nFontWeight = 500; break;
+            case WEIGHT_SEMIBOLD:       nFontWeight = 600; break;
+            case WEIGHT_BOLD:           nFontWeight = 700; break;
+            case WEIGHT_ULTRABOLD:      nFontWeight = 800; break;
+            case WEIGHT_BLACK:          nFontWeight = 900; break;
+            default:                    nFontWeight = 400; break;
+        }
+        
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, ::rtl::OUString::valueOf( nFontWeight ) );
+        
+        if( mrExport.IsUseNativeTextDecoration() )
+        {
+            if( rFont.GetUnderline() != UNDERLINE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE )
+            {
+                if( rFont.GetUnderline() != UNDERLINE_NONE )
+                    aTextDecoration = B2UCONST( "underline " );
+    
+                if( rFont.GetStrikeout() != STRIKEOUT_NONE )
+                    aTextDecoration += B2UCONST( "line-through " );
+            }
+            else
+                aTextDecoration = B2UCONST( "none" );
+    
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTextDecoration, aTextDecoration );
+        }
+
+        mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
     }
 }
 
@@ -384,15 +387,15 @@ void SVGAttributeWriter::SetPaintAttr( const Color& rLineColor, const Color& rFi
 // - SVGActionWriter -
 // -------------------
 
-SVGActionWriter::SVGActionWriter( SvXMLExport& rExport, SVGFontExport& rFontExport ) :
+SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport ) :
+    mnCurGradientId( 1 ),
+    mnCurMaskId( 1 ),
+    mnCurPatternId( 1 ),
     mrExport( rExport ),
     mrFontExport( rFontExport ),
     mpContext( NULL ),
-    mbClipAttrChanged( sal_False ),
-    mnCurClipId( 1 ),
-    mnCurPatternId( 1 ),
-    mnCurGradientId( 1 ),
-    mnCurMaskId( 1 )
+    mnInnerMtfCount( 0 ),
+    mbClipAttrChanged( sal_False )
 {
     mpVDev = new VirtualDevice;
     mpVDev->EnableOutput( sal_False );
@@ -411,80 +414,75 @@ SVGActionWriter::~SVGActionWriter()
 
 long SVGActionWriter::ImplMap( sal_Int32 nVal ) const
 {
-    return ImplMap( Size( nVal, nVal ) ).Width();
+    Size aSz( nVal, nVal );
+
+    return( ImplMap( aSz, aSz ).Width() );
 }
 
 // -----------------------------------------------------------------------------
 
-Point SVGActionWriter::ImplMap( const Point& rPt ) const
+Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const
 {
-    return mpVDev->LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode );
+    return( rDstPt = mpVDev->LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode ) );
 }
 
 // -----------------------------------------------------------------------------
 
-Size SVGActionWriter::ImplMap( const Size& rSz ) const
+Size& SVGActionWriter::ImplMap( const Size& rSz, Size& rDstSz ) const
 {
-    return mpVDev->LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode );
+    return( rDstSz = mpVDev->LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode ) );
 }
 
 // -----------------------------------------------------------------------------
 
-LineInfo SVGActionWriter::ImplMap( const LineInfo& rLineInfo ) const
+Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const
 {
-    LineInfo aInfo(rLineInfo);
-    long aTemp(0);
+    Point   aTL( rRect.TopLeft() );
+    Size    aSz( rRect.GetSize() );
 
-    if(aInfo.GetStyle() == LINE_DASH)
-    {
-        if(aInfo.GetDotCount() && aInfo.GetDotLen())
-        {
-            aTemp = aInfo.GetDotLen();
-            mpVDev->LogicToLogic(&aTemp, 1, &mpVDev->GetMapMode(), &maTargetMapMode);
-            aInfo.SetDotLen(Max(aTemp, 1L));
-        }
-        else
-            aInfo.SetDotCount(0);
+    return( rDstRect = Rectangle( ImplMap( aTL, aTL ), ImplMap( aSz, aSz ) ) ); 
+}
 
-        if(aInfo.GetDashCount() && aInfo.GetDashLen())
-        {
-            aTemp = aInfo.GetDashLen();
-            mpVDev->LogicToLogic(&aTemp, 1, &mpVDev->GetMapMode(), &maTargetMapMode);
-            aInfo.SetDashLen(Max(aTemp, 1L));
-        }
-        else
-            aInfo.SetDashCount(0);
 
-        aTemp = aInfo.GetDistance();
-        mpVDev->LogicToLogic(&aTemp, 1, &mpVDev->GetMapMode(), &maTargetMapMode);
-        aInfo.SetDistance(aTemp);
+// -----------------------------------------------------------------------------
 
-        if((!aInfo.GetDashCount() && !aInfo.GetDotCount()) || !aInfo.GetDistance())
-            aInfo.SetStyle(LINE_SOLID);
+Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) const
+{
+    rDstPoly = Polygon( rPoly.GetSize() );
+    
+    for( sal_uInt16 i = 0, nSize = rPoly.GetSize(); i < nSize; ++i )
+    {
+        ImplMap( rPoly[ i ], rDstPoly[ i ] ); 
+        rDstPoly.SetFlags( i, rPoly.GetFlags( i ) );
     }
-
-    aTemp = aInfo.GetWidth();
-    mpVDev->LogicToLogic(&aTemp, 1, &mpVDev->GetMapMode(), &maTargetMapMode);
-    aInfo.SetWidth(aTemp);
-
-    return aInfo;
+    
+    return( rDstPoly );
 }
 
 // -----------------------------------------------------------------------------
 
-NMSP_RTL::OUString SVGActionWriter::GetValueString( sal_Int32 nVal )
+PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const
 {
-    return ::rtl::OUString::valueOf( nVal );
+    Polygon aPoly;
+    
+    rDstPolyPoly = PolyPolygon();
+
+    for( sal_uInt16 i = 0, nCount = rPolyPoly.Count(); i < nCount; ++i )
+    {
+        rDstPolyPoly.Insert( ImplMap( rPolyPoly[ i ], aPoly ) );
+    }
+    
+    return( rDstPolyPoly );
 }
 
 // -----------------------------------------------------------------------------
 
-NMSP_RTL::OUString	SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine )
+::rtl::OUString	SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine )
 {
-    FastString					aPathData;
-    const NMSP_RTL::OUString	aBlank( B2UCONST( " " ) );
-    const NMSP_RTL::OUString	aComma( B2UCONST( "," ) );
-    Point						aPolyPoint;
+    ::rtl::OUString         aPathData;
+    const ::rtl::OUString   aBlank( B2UCONST( " " ) );
+    const ::rtl::OUString   aComma( B2UCONST( "," ) );
+    Point                      aPolyPoint;
 
     for( long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
     {
@@ -494,15 +492,17 @@ NMSP_RTL::OUString	SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly,
         if( nSize > 1 )
         {
             aPathData += B2UCONST( "M " );
-            aPathData += GetValueString( ( aPolyPoint = rPoly[ 0 ] ).X() );
+            aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() );
             aPathData += aComma;
-            aPathData += GetValueString( aPolyPoint.Y() );
+            aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() );
+            
             sal_Char nCurrentMode = 0;
             sal_uInt16 n = 1;
 
             while( n < nSize )
             {
                 aPathData += aBlank;
+                
                 if ( ( rPoly.GetFlags( n ) == POLY_CONTROL ) && ( ( n + 2 ) < nSize ) )
                 {
                     if ( nCurrentMode != 'C' )
@@ -514,9 +514,9 @@ NMSP_RTL::OUString	SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly,
                     {
                         if ( j )
                             aPathData += aBlank;
-                        aPathData += GetValueString( ( aPolyPoint = rPoly[ n++ ] ).X() );
+                        aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() );
                         aPathData += aComma;
-                        aPathData += GetValueString( aPolyPoint.Y() );
+                        aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() );
                     }
                 }
                 else
@@ -526,9 +526,9 @@ NMSP_RTL::OUString	SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly,
                         nCurrentMode = 'L';
                         aPathData += B2UCONST( "L " );
                     }
-                    aPathData += GetValueString( ( aPolyPoint = rPoly[ n++ ] ).X() );
+                    aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() );
                     aPathData += aComma;
-                    aPathData += GetValueString( aPolyPoint.Y() );
+                    aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() );
                 }
             }
 
@@ -540,25 +540,31 @@ NMSP_RTL::OUString	SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly,
         }
     }
 
-    return aPathData.GetString();
+     return aPathData;
 }
 
 // -----------------------------------------------------------------------------
 
-void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor,
-                                     const NMSP_RTL::OUString* pStyle )
+void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, 
+                                     const Color* pLineColor, sal_Bool bApplyMapping )
 {
-    const Point aPt1( ImplMap( rPt1 ) );
-    const Point aPt2( ImplMap( rPt2 ) );
-
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, GetValueString( aPt1.X() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, GetValueString( aPt1.Y() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, GetValueString( aPt2.X() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, GetValueString( aPt2.Y() ) );
+    Point aPt1, aPt2;
+    
+    if( bApplyMapping )
+    {
+        ImplMap( rPt1, aPt1 );
+        ImplMap( rPt2, aPt2 );
+    }
+    else
+    {
+        aPt1 = rPt1;
+        aPt2 = rPt2;
+    }
 
-    // add additional style if requested
-    if( pStyle )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aPt1.X() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aPt1.Y() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aPt2.X() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, ::rtl::OUString::valueOf( aPt2.Y() ) );
 
     if( pLineColor )
     {
@@ -574,24 +580,25 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const
 // -----------------------------------------------------------------------------
 
 void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY,
-                                     const NMSP_RTL::OUString* pStyle )
+                                     sal_Bool bApplyMapping )
 {
-    const Rectangle aRect( ImplMap( rRect ) );
+    Rectangle aRect;
+    
+    if( bApplyMapping )
+        ImplMap( rRect, aRect );
+    else
+        aRect = rRect; 
 
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, GetValueString( aRect.Left() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, GetValueString( aRect.Top() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, GetValueString( aRect.GetWidth() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, GetValueString( aRect.GetHeight() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aRect.Left() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aRect.Top() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, ::rtl::OUString::valueOf( aRect.GetWidth() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, ::rtl::OUString::valueOf( aRect.GetHeight() ) );
 
     if( nRadX )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, GetValueString( ImplMap( nRadX ) ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
 
     if( nRadY )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, GetValueString( ImplMap( nRadY ) ) );
-
-    // add additional style if requested
-    if( pStyle )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
 
     {
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True );
@@ -601,18 +608,19 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
 // -----------------------------------------------------------------------------
 
 void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY,
-                                        const NMSP_RTL::OUString* pStyle )
+                                        sal_Bool bApplyMapping )
 {
-    const Point aCenter( ImplMap( rCenter ) );
-
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, GetValueString( aCenter.X() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, GetValueString( aCenter.Y() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, GetValueString( ImplMap( nRadX ) ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, GetValueString( ImplMap( nRadY ) ) );
+    Point aCenter;
+    
+    if( bApplyMapping )
+        ImplMap( rCenter, aCenter );
+    else
+        aCenter = rCenter;
 
-    // add additional style if requested
-    if( pStyle )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( aCenter.X() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( aCenter.Y() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
 
     {
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True );
@@ -622,53 +630,78 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
 // -----------------------------------------------------------------------------
 
 void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly,
-                                            const NMSP_RTL::OUString* pStyle )
+                                            sal_Bool bApplyMapping )
 {
-    if( rPolyPoly.Count() )
-    {
-        PolyPolygon	aMappedPolyPoly;
-        FastString	aStyle;
-
-        for( sal_uInt16 i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
-        {
-            const Polygon&	rPoly = rPolyPoly[ i ];
-            const sal_uInt16	nSize = rPoly.GetSize();
-
-            // #i102224# congratulations, this throws away the curve flags
-            // and makes ANY curved polygon look bad. The Flags HAVE to be
-            // copied, too. It's NOT enough to copy the mapped points. Just
-            // copy the original polygon completely and REPLACE the points
-
-            // old: Polygon			aMappedPoly( nSize );
-            // new:
-            Polygon aMappedPoly(rPoly);
-
-            for( sal_uInt16 n = 0; n < nSize; n++ )
-                aMappedPoly[ n ] = ImplMap( rPoly[ n ] );
-
-            aMappedPolyPoly.Insert( aMappedPoly );
-        }
+    PolyPolygon	aPolyPoly;
+    
+    if( bApplyMapping )
+        ImplMap( rPolyPoly, aPolyPoly );
+    else
+        aPolyPoly = rPolyPoly;
 
-        if( bLineOnly )
-        {
-            aStyle += B2UCONST( "fill:none" );
-            if( pStyle )
-                aStyle += B2UCONST( ";" );
-        }
-        if( pStyle )
-            aStyle += *pStyle;
+    if( mrExport.hasClip() )
+    {
+        const ::basegfx::B2DPolyPolygon aB2DPolyPoly( ::basegfx::tools::correctOrientations( aPolyPoly.getB2DPolyPolygon() ) );
+    
+        aPolyPoly = PolyPolygon( ::basegfx::tools::clipPolyPolygonOnPolyPolygon( 
+                        *mrExport.getCurClip(), aB2DPolyPoly, sal_False, sal_False ) );
+    }
+    
+    // add path data attribute
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, GetPathString( aPolyPoly, bLineOnly ) );
+    
+    {
+        // write polyline/polygon element
+        SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, sal_True, sal_True );
+    }
+}
 
-        // add style attribute
-        if( aStyle.GetLength() )
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle.GetString() );
+// -----------------------------------------------------------------------------
 
-        // add path data attribute
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, GetPathString( aMappedPolyPoly, bLineOnly ) );
+void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool bApplyMapping )
+{
+    PolyPolygon aPolyPoly;
+    
+    if( bApplyMapping )
+        ImplMap( rShape.maShapePolyPoly, aPolyPoly );
+    else
+        aPolyPoly = rShape.maShapePolyPoly;
+
+    const sal_Bool  bLineOnly = ( rShape.maShapeFillColor == Color( COL_TRANSPARENT ) ) && ( !rShape.mapShapeGradient.get() );
+    Rectangle   aBoundRect( aPolyPoly.GetBoundRect() );
+    
+    mpContext->AddPaintAttr( rShape.maShapeLineColor, rShape.maShapeFillColor, &aBoundRect, rShape.mapShapeGradient.get() );
+    
+    if( rShape.maId.getLength() )
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, rShape.maId );
+    
+    if( rShape.mnStrokeWidth )
+    {
+        sal_Int32 nStrokeWidth = ( bApplyMapping ? ImplMap( rShape.mnStrokeWidth ) : rShape.mnStrokeWidth );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, ::rtl::OUString::valueOf( nStrokeWidth ) );
+    }
+        
+    if( rShape.maDashArray.size() )
+    {
+        const ::rtl::OUString   aComma( B2UCONST( "," ) );
+        ::rtl::OUString         aDashArrayStr;
+        
+        for( unsigned int k = 0; k < rShape.maDashArray.size(); ++k )
         {
-            // write polyline/polygon element
-            SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, sal_True, sal_True );
+            const sal_Int32 nDash = ( bApplyMapping ? 
+                                        ImplMap( FRound( rShape.maDashArray[ k ] ) ) : 
+                                        FRound( rShape.maDashArray[ k ] ) );
+            
+            if( k )
+                aDashArrayStr += aComma;
+                
+            aDashArrayStr += ::rtl::OUString::valueOf( nDash );
         }
+        
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeDashArray, aDashArrayStr );
     }
+    
+    ImplWritePolyPolygon( aPolyPoly, bLineOnly, sal_False );
 }
 
 // -----------------------------------------------------------------------------
@@ -676,43 +709,44 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
 void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
                                         const Hatch* pHatch,
                                         const Gradient* pGradient,
-                                        const NMSP_RTL::OUString* pStyle,
                                         sal_uInt32 nWriteFlags )
 {
     if( rPolyPoly.Count() )
     {
         SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
 
-        FastString aPatternId;
+        ::rtl::OUString aPatternId;
         aPatternId += B2UCONST( "pattern" );
-        aPatternId += GetValueString( ImplGetNextPatternId() );
+        aPatternId += OUString::valueOf( mnCurPatternId++ );
 
         {
             SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aPatternId.GetString() );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aPatternId );
 
-            Rectangle aRect( ImplMap( rPolyPoly.GetBoundRect() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, GetValueString( aRect.Left() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, GetValueString( aRect.Top() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, GetValueString( aRect.GetWidth() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, GetValueString( aRect.GetHeight() ) );
+            Rectangle aRect;
+            ImplMap( rPolyPoly.GetBoundRect(), aRect );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aRect.Left() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aRect.Top() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) );
+
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
 
             {
                 SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True );
 
                 // The origin of a pattern is positioned at (aRect.Left(), aRect.Top()).
                 // So we need to adjust the pattern coordinate.
-                FastString aTransform;
+                ::rtl::OUString aTransform;
                 aTransform += B2UCONST( "translate" );
                 aTransform += B2UCONST( "(" );
-                aTransform += GetValueString( -aRect.Left() );
+                aTransform += OUString::valueOf( -aRect.Left() );
                 aTransform += B2UCONST( "," );
-                aTransform += GetValueString( -aRect.Top() );
+                aTransform += OUString::valueOf( -aRect.Top() );
                 aTransform += B2UCONST( ")" );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform.GetString() );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
 
                 {
                     SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
@@ -722,38 +756,46 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
                         mpVDev->AddHatchActions( rPolyPoly, *pHatch, aTmpMtf );
                     else if ( pGradient )
                         mpVDev->AddGradientActions( rPolyPoly.GetBoundRect(), *pGradient, aTmpMtf );
-                    ImplWriteActions( aTmpMtf, pStyle, nWriteFlags );
+                    ImplWriteActions( aTmpMtf, nWriteFlags, NULL );
                 }
             }
         }
 
-        FastString aPatternStyle;
+        ::rtl::OUString aPatternStyle;
         aPatternStyle += B2UCONST( "fill:url(#" );
-        aPatternStyle += aPatternId.GetString();
+        aPatternStyle += aPatternId;
         aPatternStyle += B2UCONST( ")" );
 
-        {
-            ImplWritePolyPolygon( rPolyPoly, sal_False, &aPatternStyle.GetString() );
-        }
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aPatternStyle );
+        ImplWritePolyPolygon( rPolyPoly, sal_False );
     }
 }
 
 // -----------------------------------------------------------------------------
 
-void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient,
-                                           const NMSP_RTL::OUString* pStyle, sal_uInt32 nWriteFlags )
+void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, 
+                                           sal_uInt32 nWriteFlags, sal_Bool bApplyMapping )
 {
+    PolyPolygon aPolyPoly;
+    
+    if( bApplyMapping )
+        ImplMap( rPolyPoly, aPolyPoly );
+    else
+        aPolyPoly = rPolyPoly;
+    
     if ( rGradient.GetStyle() == GRADIENT_LINEAR ||
          rGradient.GetStyle() == GRADIENT_AXIAL )
     {
-        ImplWriteGradientLinear( rPolyPoly, rGradient );
+        ImplWriteGradientLinear( aPolyPoly, rGradient );
     }
     else
     {
-        ImplWritePattern( rPolyPoly, NULL, &rGradient, pStyle, nWriteFlags );
+        ImplWritePattern( aPolyPoly, NULL, &rGradient, nWriteFlags );
     }
 }
 
+// -----------------------------------------------------------------------------
+
 void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
                                                const Gradient& rGradient )
 {
@@ -761,20 +803,21 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
     {
         SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
 
-        FastString aGradientId;
+        ::rtl::OUString aGradientId;
         aGradientId += B2UCONST( "gradient" );
-        aGradientId += GetValueString( ImplGetNextGradientId() );
+        aGradientId += OUString::valueOf( mnCurGradientId++ );
 
         {
             SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aGradientId.GetString() );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aGradientId );
             {
-                Rectangle aTmpRect;
-                Point aTmpCenter;
+                Rectangle aTmpRect, aRect;
+                Point aTmpCenter, aCenter;
+
                 rGradient.GetBoundRect( rPolyPoly.GetBoundRect(), aTmpRect, aTmpCenter );
-                const Rectangle aRect( ImplMap( aTmpRect) );
-                const Point aCenter( ImplMap( aTmpCenter) );
+                ImplMap( aTmpRect, aRect );
+                ImplMap( aTmpCenter, aCenter );
                 const sal_uInt16 nAngle = rGradient.GetAngle() % 3600;
 
                 Polygon aPoly( 2 );
@@ -786,13 +829,13 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
                 aPoly[ 1 ].Y() = aRect.Bottom();
                 aPoly.Rotate( aCenter, nAngle );
 
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, GetValueString( aPoly[ 0 ].X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, GetValueString( aPoly[ 0 ].Y() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, GetValueString( aPoly[ 1 ].X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, GetValueString( aPoly[ 1 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aPoly[ 0 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aPoly[ 0 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aPoly[ 1 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) );
 
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits,
-                                       NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) );
+                                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) );
             }
 
             {
@@ -855,27 +898,27 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
             }
         }
 
-        FastString aGradientStyle;
+        ::rtl::OUString aGradientStyle;
         aGradientStyle += B2UCONST( "fill:" );
         aGradientStyle += B2UCONST( "url(#" );
-        aGradientStyle += aGradientId.GetString();
+        aGradientStyle += aGradientId;
         aGradientStyle += B2UCONST( ")" );
 
-        {
-            ImplWritePolyPolygon( rPolyPoly, sal_False, &aGradientStyle.GetString() );
-        }
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aGradientStyle );
+        ImplWritePolyPolygon( rPolyPoly, sal_False );
     }
 }
 
 void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset )
 {
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, NMSP_RTL::OUString::valueOf( fOffset ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, rtl::OUString::valueOf( fOffset ) );
 
-    FastString aStyle;
+    ::rtl::OUString aStyle, aColor;
     aStyle += B2UCONST( "stop-color:" );
-    aStyle += mpContext->GetColorStyle ( rColor );
+    SVGAttributeWriter::ImplGetColorStr ( rColor, aColor );
+    aStyle += aColor;
 
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle.GetString() );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle );
     {
         SvXMLElementExport aElemStartStop( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
     }
@@ -915,7 +958,6 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
                                      const Point& rDestPt,
                                      const Size& rDestSize,
                                      const Gradient& rGradient,
-                                     const NMSP_RTL::OUString* pStyle,
                                      sal_uInt32 nWriteFlags )
 {
     Point          aSrcPt( rMtf.GetPrefMapMode().GetOrigin() );
@@ -935,14 +977,14 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
     if( nMoveX || nMoveY )
         rMtf.Move( nMoveX, nMoveY );
 
-    FastString aMaskId;
+    ::rtl::OUString aMaskId;
     aMaskId += B2UCONST( "mask" );
-    aMaskId += GetValueString( ImplGetNextMaskId() );
+    aMaskId += OUString::valueOf( mnCurMaskId++ );
 
     {
         SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
 
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aMaskId.GetString() );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aMaskId );
         {
             SvXMLElementExport aElemMask( mrExport, XML_NAMESPACE_NONE, aXMLElemMask, sal_True, sal_True );
 
@@ -957,21 +999,21 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
             aGradient.SetEndColor( aTmpColor );
             aGradient.SetEndIntensity( nTmpIntensity );
 
-            ImplWriteGradientEx( aPolyPolygon, aGradient, pStyle, nWriteFlags );
+            ImplWriteGradientEx( aPolyPolygon, aGradient, nWriteFlags );
         }
     }
 
-    FastString aMaskStyle;
+    ::rtl::OUString aMaskStyle;
     aMaskStyle += B2UCONST( "mask:url(#" );
-    aMaskStyle += aMaskId.GetString();
+    aMaskStyle += aMaskId;
     aMaskStyle += B2UCONST( ")" );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aMaskStyle.GetString() );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aMaskStyle );
 
     {
         SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
 
         mpVDev->Push();
-        ImplWriteActions( rMtf, pStyle, nWriteFlags );
+        ImplWriteActions( rMtf, nWriteFlags, NULL );
         mpVDev->Pop();
     }
 }
@@ -980,7 +1022,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
 
 void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
                                      const sal_Int32* pDXArray, long nWidth,
-                                     const NMSP_RTL::OUString* pStyle )
+                                     sal_Bool bApplyMapping )
 {
     const FontMetric aMetric( mpVDev->GetFontMetric() );
 
@@ -988,7 +1030,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 
     if( !bTextSpecial )
     {
-        ImplWriteText( rPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+        ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
     }
     else
     {
@@ -1016,8 +1058,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
                 aPos += aOffset;
             }
 
-            ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, aReliefColor );
-            ImplWriteText( rPos, rText, pDXArray, nWidth, pStyle, aTextColor );
+            ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor, bApplyMapping );
+            ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor, bApplyMapping );
         }
         else
         {
@@ -1035,34 +1077,34 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 
                 Point aPos( rPos );
                 aPos += Point( nOff, nOff );
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, aShadowColor );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor, bApplyMapping );
 
                 if( !aMetric.IsOutline() )
                 {
-                    ImplWriteText( rPos, rText, pDXArray, nWidth, pStyle, aTextColor );
+                    ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor, bApplyMapping );
                 }
             }
 
             if( aMetric.IsOutline() )
             {
                 Point aPos = rPos + Point( -6, -6 );
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( +6, +6);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( -6, +0);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( -6, +6);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( +0, +6);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( +0, -6);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( +6, -1);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
                 aPos = rPos + Point( +6, +0);
-                ImplWriteText( aPos, rText, pDXArray, nWidth, pStyle, mpVDev->GetTextColor() );
+                ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), bApplyMapping );
 
-                ImplWriteText( rPos, rText, pDXArray, nWidth, pStyle, Color( COL_WHITE ) );
+                ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ), bApplyMapping );
             }
         }
     }
@@ -1070,165 +1112,139 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 
 void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
                                      const sal_Int32* pDXArray, long nWidth,
-                                     const NMSP_RTL::OUString* pStyle,
-                                     Color aTextColor )
+                                     Color aTextColor, sal_Bool bApplyMapping )
 {
-    long nLen = rText.Len();
+    sal_Int32                               nLen = rText.Len();
+    Size                                    aNormSize;
+    ::std::auto_ptr< sal_Int32 >            apTmpArray;
+    sal_Int32*                              pDX;
+    Point                                   aPos;
+    Point                                   aBaseLinePos( rPos );
+    const FontMetric                        aMetric( mpVDev->GetFontMetric() );
+    const Font&                             rFont = mpVDev->GetFont();
+    
+    if( rFont.GetAlign() == ALIGN_TOP )
+        aBaseLinePos.Y() += aMetric.GetAscent();
+    else if( rFont.GetAlign() == ALIGN_BOTTOM )
+        aBaseLinePos.Y() -= aMetric.GetDescent();
+
+    if( bApplyMapping )
+        ImplMap( rPos, aPos );
+    else
+        aPos = rPos;
 
-    if( nLen )
+    // get text sizes
+    if( pDXArray )
     {
-        Size	aNormSize;
-        sal_Int32*	pOwnArray;
-        sal_Int32*	pDX;
-
-        // get text sizes
-        if( pDXArray )
-        {
-            pOwnArray = NULL;
-            aNormSize = Size( mpVDev->GetTextWidth( rText ), 0 );
-            pDX = (sal_Int32*) pDXArray;
-        }
-        else
-        {
-            pOwnArray = new sal_Int32[ nLen ];
-            aNormSize = Size( mpVDev->GetTextArray( rText, pOwnArray ), 0 );
-            pDX = pOwnArray;
-        }
-
-        if( nLen > 1 )
-        {
-            aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rText.GetChar( sal::static_int_cast<sal_uInt16>( nLen - 1 ) ) );
+        aNormSize = Size( mpVDev->GetTextWidth( rText ), 0 );
+        pDX = const_cast< sal_Int32* >( pDXArray );
+    }
+    else
+    {
+        apTmpArray.reset( new sal_Int32[ nLen ] );
+        aNormSize = Size( mpVDev->GetTextArray( rText, apTmpArray.get() ), 0 );
+        pDX = apTmpArray.get();
+    }
 
-            if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
-            {
-                const double fFactor = (double) nWidth / aNormSize.Width();
+    // if text is rotated, set transform matrix at new g element
+    if( rFont.GetOrientation() )
+    {
+        Point   aRot( aPos );
+        String  aTransform;
+
+        aTransform = String( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "translate" ) ) );
+        aTransform += '(';
+        aTransform += String( ::rtl::OUString::valueOf( aRot.X() ) );
+        aTransform += ',';
+        aTransform += String( ::rtl::OUString::valueOf( aRot.Y() ) );
+        aTransform += ')';
+
+        aTransform += String( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " rotate" ) ) );
+        aTransform += '(';
+        aTransform += String( ::rtl::OUString::valueOf( rFont.GetOrientation() * -0.1 ) );
+        aTransform += ')';
+
+        aTransform += String( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " translate" ) ) );
+        aTransform += '(';
+        aTransform += String( ::rtl::OUString::valueOf( -aRot.X() ) );
+        aTransform += ',';
+        aTransform += String( ::rtl::OUString::valueOf( -aRot.Y() ) );
+        aTransform += ')';
+
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
+    }
 
-                for(long i = 0; i < ( nLen - 1 ); i++ )
-                    pDX[ i ] = FRound( pDX[ i ] * fFactor );
-            }
-        }
+    mpContext->AddPaintAttr( COL_TRANSPARENT, aTextColor );
 
-        FastString			aStyle;
-        const Font&			rFont = mpVDev->GetFont();
-        const FontMetric	aMetric( mpVDev->GetFontMetric() );
-        Point				aBaseLinePos( rPos );
+    if( nLen > 1 )
+    {
+        aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rText.GetChar(  nLen - 1 ) );
 
-        // always adjust text position to match baseline alignment
-        switch( rFont.GetAlign() )
+        if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
         {
-            case( ALIGN_TOP ):
-                aBaseLinePos.Y() += aMetric.GetAscent();
-            break;
-
-            case( ALIGN_BOTTOM ):
-                aBaseLinePos.Y() -= aMetric.GetDescent();
-            break;
+            const double fFactor = (double) nWidth / aNormSize.Width();
 
-            default:
-            break;
+            for( long i = 0; i < ( nLen - 1 ); i++ )
+                pDX[ i ] = FRound( pDX[ i ] * fFactor );
         }
-
-        mpContext->SetPaintAttr( COL_TRANSPARENT, aTextColor );
-
-        // get mapped text position
-        const Point aPt( ImplMap( aBaseLinePos ) );
-
-        // if text is italic, set transform at new g element
-        if( ( rFont.GetItalic() != ITALIC_NONE ) || rFont.GetOrientation() )
+        else
         {
-            String aTransform;
-
-            aTransform = NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "translate" ));
-            aTransform += '(';
-            aTransform += String( GetValueString( aPt.X() ) );
-            aTransform += ',';
-            aTransform += String( GetValueString( aPt.Y() ) );
-            aTransform += ')';
-
-            if( rFont.GetOrientation() )
-            {
-                aTransform += String( NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( " rotate" )) );
-                aTransform += '(';
-                aTransform += String( NMSP_RTL::OUString::valueOf( rFont.GetOrientation() * -0.1 ) );
-                aTransform += ')';
-            }
+            ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( ::vcl::unohelper::CreateBreakIterator() );
+            const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLocale();
+            sal_Int32 nCurPos = 0, nLastPos = 0, nX = aPos.X();
 
-            if( rFont.GetItalic() != ITALIC_NONE )
+            // write single glyphs at absolute text positions
+            for( sal_Bool bCont = sal_True; bCont; )
             {
-                aTransform += String( NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( " skewX" )) );
-                aTransform += '(';
-                aTransform += String( NMSP_RTL::OUString::valueOf( (sal_Int32) -10 ) );
-                aTransform += ')';
-            }
-
-            aTransform += String( NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( " translate" )) );
-            aTransform += '(';
-            aTransform += String( GetValueString( -aPt.X() ) );
-            aTransform += ',';
-            aTransform += String( GetValueString( -aPt.Y() ) );
-            aTransform += ')';
-
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
-        }
+                sal_Int32 nCount = 1;
 
-        // add additional style if requested
-        if( pStyle && pStyle->getLength() )
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
+                nLastPos = nCurPos;
+                nCurPos = xBI->nextCharacters( rText, nCurPos, rLocale,
+                                            ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL,
+                                            nCount, nCount );
 
-        // write text element
-        {
-#ifdef _SVG_USE_TSPANS
-            SvXMLElementExport			aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_True );
-            FastString					aTSpanX;
-            const NMSP_RTL::OUString	aSpace( ' ' );
-            String 						aOutputText( rText );
-            long						nCurPos = 0;
-            bool						bIgnoreWhitespace = true;
-
-            for( long j = 0, nX = aPt.X(); j < nLen; ++j )
-            {
-                const sal_Unicode cCode = rText.GetChar( sal::static_int_cast<sal_uInt16>( j ) );
+                nCount = nCurPos - nLastPos;
+                bCont = ( nCurPos < rText.Len() ) && nCount;
 
-                // don't take more than one whitespace into account
-                if( !bIgnoreWhitespace || ( ' ' != cCode ) )
+                if( nCount )
                 {
-                    aOutputText.SetChar( sal::static_int_cast<sal_uInt16>( nCurPos++ ), cCode );
-                    ( aTSpanX += GetValueString( nX + ( ( j > 0 ) ? pDX[ j - 1 ] : 0 ) ) ) += aSpace;
-                    bIgnoreWhitespace = ( ' ' == cCode );
-                }
-            }
-
-            if( nCurPos < nLen )
-                aOutputText.Erase( sal::static_int_cast<sal_uInt16>( nCurPos ) );
+                    const ::rtl::OUString aGlyph( rText.Copy( nLastPos, nCount ) );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, aTSpanX.GetString() );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, GetValueString( aPt.Y() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( nX ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) );
 
-            {
-                SvXMLElementExport aElem2( mrExport, XML_NAMESPACE_NONE, aXMLElemTSpan, sal_True, sal_True );
-                mrExport.GetDocHandler()->characters( aOutputText );
-            }
-#else
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, GetValueString( aPt.X() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, GetValueString( aPt.Y() ) );
+                    {
+                        SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False );
+                        mrExport.GetDocHandler()->characters( aGlyph );
+                    }
 
-            {
-                SvXMLElementExport aElem2( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_True );
-                mrExport.GetDocHandler()->characters( rText );
+                    if( bCont )
+                        nX = aPos.X() + pDXArray[ nCurPos - 1 ];
+                }
             }
-#endif
         }
+    }
+    else
+    {
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aPos.X() ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) );
+        
+        {
+            SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False );
+            mrExport.GetDocHandler()->characters( rText );
+        }
+    }
 
-#ifndef _SVG_USE_NATIVE_TEXTDECORATION
-        // write strikeout if neccessary
-        if( rFont.GetStrikeout() || rFont.GetUnderline() )
+    if( !mrExport.IsUseNativeTextDecoration() )
+    {
+        if( rFont.GetStrikeout() != STRIKEOUT_NONE || rFont.GetUnderline() != UNDERLINE_NONE )
         {
-            Polygon		aPoly( 4 );
-            const long	nLineHeight = Max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
+            Polygon     aPoly( 4 );
+            const long  nLineHeight = Max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
 
             if( rFont.GetStrikeout() )
             {
-                const long	nYLinePos = aBaseLinePos.Y() - FRound( aMetric.GetAscent() * 0.26 );
+                const long nYLinePos = aBaseLinePos.Y() - FRound( aMetric.GetAscent() * 0.26 );
 
                 aPoly[ 0 ].X() = aBaseLinePos.X(); aPoly[ 0 ].Y() = nYLinePos - ( nLineHeight >> 1 );
                 aPoly[ 1 ].X() = aBaseLinePos.X() + aNormSize.Width() - 1; aPoly[ 1 ].Y() = aPoly[ 0 ].Y();
@@ -1250,9 +1266,6 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
                 ImplWritePolyPolygon( aPoly, sal_False );
             }
         }
-#endif // _SVG_USE_NATIVE_TEXTDECORATION
-
-        delete[] pOwnArray;
     }
 }
 
@@ -1261,7 +1274,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
                                     const Point& rPt, const Size& rSz,
                                     const Point& rSrcPt, const Size& rSrcSz,
-                                    const NMSP_RTL::OUString* /* pStyle */ )
+                                    sal_Bool bApplyMapping )
 {
     if( !!rBmpEx )
     {
@@ -1279,19 +1292,29 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
 
             if( GraphicConverter::Export( aOStm, rBmpEx, CVT_PNG ) == ERRCODE_NONE )
             {
-                const Point              aPt( ImplMap( rPt ) );
-                const Size               aSz( ImplMap( rSz ) );
+                Point					 aPt;
+                Size					 aSz;
                 Sequence< sal_Int8 >     aSeq( (sal_Int8*) aOStm.GetData(), aOStm.Tell() );
-                NMSP_RTL::OUStringBuffer aBuffer;
+                rtl::OUStringBuffer aBuffer;
                 aBuffer.appendAscii( "data:image/png;base64," );
                 SvXMLUnitConverter::encodeBase64( aBuffer, aSeq );
 
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, GetValueString( aPt.X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, GetValueString( aPt.Y() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, GetValueString( aSz.Width() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, GetValueString( aSz.Height() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, aBuffer.makeStringAndClear() );
+                if( bApplyMapping )
+                {
+                    ImplMap( rPt, aPt );
+                    ImplMap( rSz, aSz );
+                }
+                else
+                {
+                    aPt = rPt;
+                    aSz = rSz;
+                }
 
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPt.X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPt.Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aSz.Width() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aSz.Height() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, aBuffer.makeStringAndClear() );
                 {
                     SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemImage, sal_True, sal_True );
                 }
@@ -1303,14 +1326,15 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
 // -----------------------------------------------------------------------------
 
 void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
-                                        const NMSP_RTL::OUString* pStyle,
-                                        sal_uInt32 nWriteFlags )
+                                        sal_uInt32 nWriteFlags,
+                                        const ::rtl::OUString* pElementId )
 {
-    ImplAcquireContext();
+    if( mnInnerMtfCount )
+        nWriteFlags |= SVGWRITER_NO_SHAPE_COMMENTS;
 
-    for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ )
+    for( sal_uLong nCurAction = 0, nCount = rMtf.GetActionSize(); nCurAction < nCount; nCurAction++ )
     {
-        const MetaAction*	pAction = rMtf.GetAction( i );
+        const MetaAction*	pAction = rMtf.GetAction( nCurAction );
         const sal_uInt16		nType = pAction->GetType();
 
         switch( nType )
@@ -1321,8 +1345,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaPixelAction* pA = (const MetaPixelAction*) pAction;
 
-                    mpContext->SetPaintAttr( pA->GetColor(), pA->GetColor() );
-                    ImplWriteLine( pA->GetPoint(), pA->GetPoint(), &pA->GetColor(), pStyle );
+                    mpContext->AddPaintAttr( pA->GetColor(), pA->GetColor() );
+                    ImplWriteLine( pA->GetPoint(), pA->GetPoint(), &pA->GetColor() );
                 }
             }
             break;
@@ -1333,8 +1357,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaPointAction* pA = (const MetaPointAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetLineColor() );
-                    ImplWriteLine( pA->GetPoint(), pA->GetPoint(), NULL, pStyle );
+                    mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetLineColor() );
+                    ImplWriteLine( pA->GetPoint(), pA->GetPoint(), NULL );
                 }
             }
             break;
@@ -1345,17 +1369,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaLineAction* pA = (const MetaLineAction*) pAction;
 
-                    if(pA->GetLineInfo().IsDefault())
-                    {
-                        mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetLineColor() );
-                    }
-                    else
-                    {
-                        const LineInfo aMappedLineInfo(ImplMap(pA->GetLineInfo()));
-                        mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetLineColor(), &aMappedLineInfo );
-                    }
-
-                    ImplWriteLine( pA->GetStartPoint(), pA->GetEndPoint(), NULL, pStyle );
+                    mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetLineColor() );
+                    ImplWriteLine( pA->GetStartPoint(), pA->GetEndPoint(), NULL );
                 }
             }
             break;
@@ -1364,8 +1379,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
             {
                 if( nWriteFlags & SVGWRITER_WRITE_FILL )
                 {
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                    ImplWriteRect( ( (const MetaRectAction*) pAction )->GetRect(), 0, 0, pStyle );
+                    mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
+                    ImplWriteRect( ( (const MetaRectAction*) pAction )->GetRect(), 0, 0 );
                 }
             }
             break;
@@ -1376,8 +1391,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaRoundRectAction* pA = (const MetaRoundRectAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                    ImplWriteRect( pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound(), pStyle );
+                    mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
+                    ImplWriteRect( pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
                 }
             }
             break;
@@ -1389,8 +1404,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     const MetaEllipseAction*	pA = (const MetaEllipseAction*) pAction;
                     const Rectangle&			rRect = pA->GetRect();
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                    ImplWriteEllipse( rRect.Center(), rRect.GetWidth() >> 1, rRect.GetHeight() >> 1, pStyle );
+                    mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
+                    ImplWriteEllipse( rRect.Center(), rRect.GetWidth() >> 1, rRect.GetHeight() >> 1 );
                 }
             }
             break;
@@ -1434,8 +1449,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                     if( aPoly.GetSize() )
                     {
-                        mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                        ImplWritePolyPolygon( aPoly, sal_False, pStyle );
+                        mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
+                        ImplWritePolyPolygon( aPoly, sal_False );
                     }
                 }
             }
@@ -1450,51 +1465,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                     if( rPoly.GetSize() )
                     {
-                        bool bNoLineJoin(false);
-
-                        if(pA->GetLineInfo().IsDefault())
-                        {
-                            mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                        }
-                        else
-                        {
-                            const LineInfo aMappedLineInfo(ImplMap(pA->GetLineInfo()));
-                            bNoLineJoin = basegfx::B2DLINEJOIN_NONE == aMappedLineInfo.GetLineJoin();
-                            mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor(), &aMappedLineInfo );
-                        }
-
-                        if(bNoLineJoin)
-                        {
-                            // emulate B2DLINEJOIN_NONE by creating single edges
-                            const sal_uInt16 nPoints(rPoly.GetSize());
-                            const bool bCurve(rPoly.HasFlags());
-
-                            for(sal_uInt16 a(0); a + 1 < nPoints; a++)
-                            {
-                                if(bCurve
-                                    && POLY_NORMAL != rPoly.GetFlags(a + 1)
-                                    && a + 2 < nPoints
-                                    && POLY_NORMAL != rPoly.GetFlags(a + 2)
-                                    && a + 3 < nPoints)
-                                {
-                                    const Polygon aSnippet(4,
-                                        rPoly.GetConstPointAry() + a,
-                                        rPoly.GetConstFlagAry() + a);
-                                    ImplWritePolyPolygon( aSnippet, sal_True, pStyle );
-                                    a += 2;
-                                }
-                                else
-                                {
-                                    const Polygon aSnippet(2,
-                                        rPoly.GetConstPointAry() + a);
-                                    ImplWritePolyPolygon( aSnippet, sal_True, pStyle );
-                                }
-                            }
-                        }
-                        else
-                        {
-                            ImplWritePolyPolygon( rPoly, sal_True, pStyle );
-                        }
+                        mpContext->AddPaintAttr( mpVDev->GetLineColor(), Color( COL_TRANSPARENT ) );
+                        ImplWritePolyPolygon( rPoly, sal_True );
                     }
                 }
             }
@@ -1509,8 +1481,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                     if( rPolyPoly.Count() )
                     {
-                        mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                        ImplWritePolyPolygon( rPolyPoly, sal_False, pStyle );
+                        mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
+                        ImplWritePolyPolygon( rPolyPoly, sal_False );
                     }
                 }
             }
@@ -1524,7 +1496,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     const Polygon				aRectPoly( pA->GetRect() );
                     const PolyPolygon			aRectPolyPoly( aRectPoly );
 
-                    ImplWriteGradientEx( aRectPolyPoly, pA->GetGradient(), pStyle, nWriteFlags );
+                    ImplWriteGradientEx( aRectPolyPoly, pA->GetGradient(), nWriteFlags );
                 }
             }
             break;
@@ -1534,7 +1506,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 if( nWriteFlags & SVGWRITER_WRITE_FILL )
                 {
                     const MetaGradientExAction*	pA = (const MetaGradientExAction*) pAction;
-                    ImplWriteGradientEx( pA->GetPolyPolygon(), pA->GetGradient(), pStyle, nWriteFlags );
+                    ImplWriteGradientEx( pA->GetPolyPolygon(), pA->GetGradient(), nWriteFlags );
                 }
             }
             break;
@@ -1544,7 +1516,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 if( nWriteFlags & SVGWRITER_WRITE_FILL )
                 {
                     const MetaHatchAction*	pA = (const MetaHatchAction*) pAction;
-                    ImplWritePattern( pA->GetPolyPolygon(), &pA->GetHatch(), NULL, pStyle, nWriteFlags );
+                    ImplWritePattern( pA->GetPolyPolygon(), &pA->GetHatch(), NULL, nWriteFlags );
                 }
             }
             break;
@@ -1558,15 +1530,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                     if( rPolyPoly.Count() )
                     {
-                        const Color aOldLineColor( mpVDev->GetLineColor() ), aOldFillColor( mpVDev->GetFillColor() );
-                        Color       aNewLineColor( aOldLineColor ), aNewFillColor( aOldFillColor );
+                        Color aNewLineColor( mpVDev->GetLineColor() ), aNewFillColor( mpVDev->GetFillColor() );
 
                         aNewLineColor.SetTransparency( sal::static_int_cast<sal_uInt8>( FRound( pA->GetTransparence() * 2.55 ) ) );
                         aNewFillColor.SetTransparency( sal::static_int_cast<sal_uInt8>( FRound( pA->GetTransparence() * 2.55 ) ) );
 
-                        mpContext->SetPaintAttr( aNewLineColor, aNewFillColor );
-                        ImplWritePolyPolygon( rPolyPoly, sal_False, pStyle );
-                        mpContext->SetPaintAttr( aOldLineColor, aOldFillColor );
+                        mpContext->AddPaintAttr( aNewLineColor, aNewFillColor );
+                        ImplWritePolyPolygon( rPolyPoly, sal_False );
                     }
                 }
             }
@@ -1579,7 +1549,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     const MetaFloatTransparentAction*	pA = (const MetaFloatTransparentAction*) pAction;
                     GDIMetaFile							aTmpMtf( pA->GetGDIMetaFile() );
                     ImplWriteMask( aTmpMtf, pA->GetPoint(), pA->GetSize(),
-                                   pA->GetGradient(), pStyle, nWriteFlags  );
+                                   pA->GetGradient(), nWriteFlags  );
                 }
             }
             break;
@@ -1592,18 +1562,17 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     const GDIMetaFile		aGDIMetaFile( pA->GetSubstitute() );
                     sal_Bool				bFound = sal_False;
 
-                    for( size_t j = 0, nC = aGDIMetaFile.GetActionSize(); ( j < nC ) && !bFound; j++ )
+                    for( sal_uInt32 k = 0, nCount2 = aGDIMetaFile.GetActionSize(); ( k < nCount2 ) && !bFound; ++k )
                     {
-                        const MetaAction* pSubstAct = aGDIMetaFile.GetAction( j );
+                        const MetaAction* pSubstAct = aGDIMetaFile.GetAction( k );
 
                         if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
                         {
                             bFound = sal_True;
                             const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*) pSubstAct;
-                            mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                             ImplWriteBmp( pBmpScaleAction->GetBitmap(),
                                           pA->GetPoint(), pA->GetSize(),
-                                          Point(), pBmpScaleAction->GetBitmap().GetSizePixel(), pStyle );
+                                          Point(), pBmpScaleAction->GetBitmap().GetSizePixel() );
                         }
                     }
                 }
@@ -1621,21 +1590,159 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     const MetaGradientExAction*	pGradAction = NULL;
                     sal_Bool					bDone = sal_False;
 
-                    while( !bDone && ( ++i < nCount ) )
+                    while( !bDone && ( ++nCurAction < nCount ) )
                     {
-                        pAction = rMtf.GetAction( i );
+                        pAction = rMtf.GetAction( nCurAction );
 
                         if( pAction->GetType() == META_GRADIENTEX_ACTION )
                             pGradAction = (const MetaGradientExAction*) pAction;
                         else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
-                                 ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
+                                 ( ( (const MetaCommentAction*) pAction )->GetComment().
+                                        CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
                         {
                             bDone = sal_True;
                         }
                     }
 
                     if( pGradAction )
-                        ImplWriteGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), pStyle, nWriteFlags );
+                        ImplWriteGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), nWriteFlags );
+                }
+                else if( ( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_BEGIN" ) == COMPARE_EQUAL ) &&
+                         ( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
+                         pA->GetDataSize() )
+                {
+                    // write open shape in every case
+                    if( mapCurShape.get() )
+                    {
+                        ImplWriteShape( *mapCurShape );
+                        mapCurShape.reset();
+                    }
+
+                    SvMemoryStream  aMemStm( (void*) pA->GetData(), pA->GetDataSize(), STREAM_READ );
+                    SvtGraphicFill  aFill;
+                    
+                    aMemStm >> aFill;
+                    
+                    sal_Bool bGradient = SvtGraphicFill::fillGradient == aFill.getFillType() &&
+                                     ( SvtGraphicFill::gradientLinear == aFill.getGradientType() ||
+                                       SvtGraphicFill::gradientRadial == aFill.getGradientType() );
+                    sal_Bool bSkip = ( SvtGraphicFill::fillSolid == aFill.getFillType() || bGradient );
+                    
+                    if( bSkip )
+                    {
+                        PolyPolygon aShapePolyPoly;
+                        
+                        aFill.getPath( aShapePolyPoly );
+                    
+                        if( aShapePolyPoly.Count() )
+                        {
+                            mapCurShape.reset( new SVGShapeDescriptor );
+                            
+                            if( pElementId )
+                                mapCurShape->maId = *pElementId;
+                            
+                            mapCurShape->maShapePolyPoly = aShapePolyPoly;
+                            mapCurShape->maShapeFillColor = aFill.getFillColor();
+                            mapCurShape->maShapeFillColor.SetTransparency( (sal_uInt8) FRound( 255.0 * aFill.getTransparency() ) );
+                        
+                            if( bGradient )
+                            {
+                                // step through following actions until the first Gradient/GradientEx action is found
+                                while( !mapCurShape->mapShapeGradient.get() && bSkip && ( ++nCurAction < nCount ) )
+                                {
+                                    pAction = rMtf.GetAction( nCurAction );
+
+                                    if( ( pAction->GetType() == META_COMMENT_ACTION ) && 
+                                        ( ( (const MetaCommentAction*) pAction )->GetComment().
+                                        CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_END" ) == COMPARE_EQUAL ) )
+                                    {
+                                        bSkip = sal_False;
+                                    }
+                                    else if( pAction->GetType() == META_GRADIENTEX_ACTION )
+                                    {
+                                        mapCurShape->mapShapeGradient.reset( new Gradient( 
+                                            static_cast< const MetaGradientExAction* >( pAction )->GetGradient() ) );
+                                    }
+                                    else if( pAction->GetType() == META_GRADIENT_ACTION )
+                                    {
+                                        mapCurShape->mapShapeGradient.reset( new Gradient( 
+                                            static_cast< const MetaGradientAction* >( pAction )->GetGradient() ) );
+                                    }
+                                }
+                            }
+                        }
+                        else
+                            bSkip = sal_False;
+                    }
+                    
+                    // skip rest of comment
+                    while( bSkip && ( ++nCurAction < nCount ) )
+                    {
+                        pAction = rMtf.GetAction( nCurAction );
+
+                        if( ( pAction->GetType() == META_COMMENT_ACTION ) && 
+                                    ( ( (const MetaCommentAction*) pAction )->GetComment().
+                                    CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_END" ) == COMPARE_EQUAL ) )
+                        {
+                            bSkip = sal_False;
+                        }
+                    }
+                }
+                else if( ( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_BEGIN" ) == COMPARE_EQUAL ) &&
+                         ( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
+                         pA->GetDataSize() )
+                {
+                    SvMemoryStream      aMemStm( (void*) pA->GetData(), pA->GetDataSize(), STREAM_READ );
+                    SvtGraphicStroke    aStroke;
+                    PolyPolygon         aStartArrow, aEndArrow;
+                    
+                    aMemStm >> aStroke;
+                    aStroke.getStartArrow( aStartArrow );
+                    aStroke.getEndArrow( aEndArrow );
+                    
+                    // Currently no support for strokes with start/end arrow(s)
+                    sal_Bool bSkip = ( !aStartArrow.Count() && !aEndArrow.Count() );
+                    
+                    if( bSkip )
+                    {
+                        if( !mapCurShape.get() )
+                        {
+                            Polygon aPoly;
+                            
+                            mapCurShape.reset( new SVGShapeDescriptor );
+                            
+                            if( pElementId )
+                                mapCurShape->maId = *pElementId;
+                            
+                            aStroke.getPath( aPoly );
+                            mapCurShape->maShapePolyPoly = aPoly;
+                        }
+                            
+                        mapCurShape->maShapeLineColor = mpVDev->GetLineColor();
+                        mapCurShape->maShapeLineColor.SetTransparency( (sal_uInt8) FRound( aStroke.getTransparency() * 255.0 ) );
+                        mapCurShape->mnStrokeWidth = FRound( aStroke.getStrokeWidth() ); 
+                        aStroke.getDashArray( mapCurShape->maDashArray );
+                    }
+                    
+                    // write open shape in every case
+                    if( mapCurShape.get() )
+                    {
+                        ImplWriteShape( *mapCurShape );
+                        mapCurShape.reset();
+                    }
+                    
+                    // skip rest of comment
+                    while( bSkip && ( ++nCurAction < nCount ) )
+                    {
+                        pAction = rMtf.GetAction( nCurAction );
+
+                        if( ( pAction->GetType() == META_COMMENT_ACTION ) && 
+                                    ( ( (const MetaCommentAction*) pAction )->GetComment().
+                                    CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_END" ) == COMPARE_EQUAL ) )
+                        {
+                            bSkip = sal_False;
+                        }
+                    }
                 }
             }
             break;
@@ -1646,10 +1753,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaBmpAction* pA = (const MetaBmpAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                     ImplWriteBmp( pA->GetBitmap(),
                                   pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel() ),
-                                  Point(), pA->GetBitmap().GetSizePixel(), pStyle );
+                                  Point(), pA->GetBitmap().GetSizePixel() );
                 }
             }
             break;
@@ -1660,10 +1766,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                     ImplWriteBmp( pA->GetBitmap(),
                                   pA->GetPoint(), pA->GetSize(),
-                                  Point(), pA->GetBitmap().GetSizePixel(), pStyle );
+                                  Point(), pA->GetBitmap().GetSizePixel() );
                 }
             }
             break;
@@ -1674,10 +1779,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                     ImplWriteBmp( pA->GetBitmap(),
                                   pA->GetDestPoint(), pA->GetDestSize(),
-                                  pA->GetSrcPoint(), pA->GetSrcSize(), pStyle );
+                                  pA->GetSrcPoint(), pA->GetSrcSize() );
                 }
             }
             break;
@@ -1688,10 +1792,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaBmpExAction*	pA = (const MetaBmpExAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                     ImplWriteBmp( pA->GetBitmapEx(),
                                   pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmapEx().GetSizePixel() ),
-                                  Point(), pA->GetBitmapEx().GetSizePixel(), pStyle );
+                                  Point(), pA->GetBitmapEx().GetSizePixel() );
                 }
             }
             break;
@@ -1702,10 +1805,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                     ImplWriteBmp( pA->GetBitmapEx(),
                                   pA->GetPoint(), pA->GetSize(),
-                                  Point(), pA->GetBitmapEx().GetSizePixel(), pStyle );
+                                  Point(), pA->GetBitmapEx().GetSizePixel() );
                 }
             }
             break;
@@ -1716,10 +1818,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 {
                     const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pAction;
 
-                    mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                     ImplWriteBmp( pA->GetBitmapEx(),
                                   pA->GetDestPoint(), pA->GetDestSize(),
-                                  pA->GetSrcPoint(), pA->GetSrcSize(), pStyle );
+                                  pA->GetSrcPoint(), pA->GetSrcSize() );
                 }
             }
             break;
@@ -1729,11 +1830,20 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 if( nWriteFlags & SVGWRITER_WRITE_TEXT )
                 {
                     const MetaTextAction*   pA = (const MetaTextAction*) pAction;
-                    Font                    aFont( mpVDev->GetFont() );
-
-                    aFont.SetHeight( ImplMap( Size( 0, aFont.GetHeight() ) ).Height() );
-                    mpContext->SetFontAttr( aFont );
-                    ImplWriteText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), NULL, 0, pStyle );
+                    const String            aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
+                    
+                    if( aText.Len() )
+                    {
+                        Font    aFont( mpVDev->GetFont() );
+                        Size    aSz;
+                        
+                        ImplMap( Size( 0, aFont.GetHeight() ), aSz );
+    
+                        aFont.SetHeight( aSz.Height() );
+                        mpContext->AddPaintAttr( COL_TRANSPARENT, mpVDev->GetTextColor() );
+                        mpContext->SetFontAttr( aFont );
+                        ImplWriteText( pA->GetPoint(), aText, NULL, 0 );
+                    }
                 }
             }
             break;
@@ -1742,12 +1852,20 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
             {
                 if( nWriteFlags & SVGWRITER_WRITE_TEXT )
                 {
-                    const MetaTextRectAction*   pA = (const MetaTextRectAction*) pAction;
-                    Font                        aFont( mpVDev->GetFont() );
-
-                    aFont.SetHeight( ImplMap( Size( 0, aFont.GetHeight() ) ).Height() );
-                    mpContext->SetFontAttr( aFont );
-                    ImplWriteText( pA->GetRect().TopLeft(), pA->GetText(), NULL, 0, pStyle );
+                    const MetaTextRectAction* pA = (const MetaTextRectAction*) pAction;
+                    
+                    if( pA->GetText().Len() )
+                    {
+                        Font    aFont( mpVDev->GetFont() );
+                        Size    aSz;
+                        
+                        ImplMap( Size( 0, aFont.GetHeight() ), aSz );
+    
+                        aFont.SetHeight( aSz.Height() );
+                        mpContext->AddPaintAttr( COL_TRANSPARENT, mpVDev->GetTextColor() );
+                        mpContext->SetFontAttr( aFont );
+                        ImplWriteText( pA->GetRect().TopLeft(), pA->GetText(), NULL, 0 );
+                    }
                 }
             }
             break;
@@ -1757,12 +1875,20 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 if( nWriteFlags & SVGWRITER_WRITE_TEXT )
                 {
                     const MetaTextArrayAction*	pA = (const MetaTextArrayAction*) pAction;
-                    const Point					aPos( ImplMap( pA->GetPoint() ) );
-                    Font                        aFont( mpVDev->GetFont() );
-
-                    aFont.SetHeight( ImplMap( Size( 0, aFont.GetHeight() ) ).Height() );
-                    mpContext->SetFontAttr( aFont );
-                    ImplWriteText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), pA->GetDXArray(), 0, pStyle );
+                    const String                aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
+                    
+                    if( aText.Len() )
+                    {
+                        Font    aFont( mpVDev->GetFont() );
+                        Size    aSz;
+                        
+                        ImplMap( Size( 0, aFont.GetHeight() ), aSz );
+    
+                        aFont.SetHeight( aSz.Height() );
+                        mpContext->AddPaintAttr( COL_TRANSPARENT, mpVDev->GetTextColor() );
+                        mpContext->SetFontAttr( aFont );
+                        ImplWriteText( pA->GetPoint(), aText, pA->GetDXArray(), 0 );
+                    }
                 }
             }
             break;
@@ -1772,11 +1898,38 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                 if( nWriteFlags & SVGWRITER_WRITE_TEXT )
                 {
                     const MetaStretchTextAction*    pA = (const MetaStretchTextAction*) pAction;
-                    Font                            aFont( mpVDev->GetFont() );
+                    const String                    aText( pA->GetText(), pA->GetIndex(), pA->GetLen() );
+                    
+                    if( aText.Len() )
+                    {
+                        Font    aFont( mpVDev->GetFont() );
+                        Size    aSz;
+                        
+                        ImplMap( Size( 0, aFont.GetHeight() ), aSz );
+    
+                        aFont.SetHeight( aSz.Height() );
+                        mpContext->AddPaintAttr( COL_TRANSPARENT, mpVDev->GetTextColor() );
+                        mpContext->SetFontAttr( aFont );
+                        ImplWriteText( pA->GetPoint(), aText, NULL, pA->GetWidth() );
+                    }
+                }
+            }
+            break;
 
-                    aFont.SetHeight( ImplMap( Size( 0, aFont.GetHeight() ) ).Height() );
-                    mpContext->SetFontAttr( aFont );
-                    ImplWriteText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), NULL, pA->GetWidth(), pStyle );
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                if( nWriteFlags & SVGWRITER_WRITE_FILL )
+                {
+                    // TODO KA: try to embed the native data in case the RenderGraphic
+                    // contains valid SVG data (MimeType "image/svg+xml")
+                    // => incorporate 'use' or 'image' element (KA 01/2011)
+                    const MetaRenderGraphicAction*          pA = (const MetaRenderGraphicAction*) pAction;
+                    const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                    const Point                             aPointPixel;
+                    const Size                              aSizePixel( mpVDev->LogicToPixel( pA->GetSize() ) );
+                    const BitmapEx                          aBmpEx( aRasterizer.Rasterize( aSizePixel ) );
+                
+                    ImplWriteBmp( aBmpEx, pA->GetPoint(), pA->GetSize(), aPointPixel, aBmpEx.GetSizePixel() );
                 }
             }
             break;
@@ -1824,8 +1977,6 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
             break;
         }
     }
-
-    ImplReleaseContext();
 }
 
 // -----------------------------------------------------------------------------
@@ -1833,13 +1984,14 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
                                      const Size& rSize100thmm,
                                      const GDIMetaFile& rMtf,
-                                     sal_uInt32 nWriteFlags )
+                                     sal_uInt32 nWriteFlags,
+                                     const ::rtl::OUString* pElementId )
 {
     MapMode	    aMapMode( rMtf.GetPrefMapMode() );
     Size        aPrefSize( rMtf.GetPrefSize() );
     Fraction    aFractionX( aMapMode.GetScaleX() );
     Fraction    aFractionY( aMapMode.GetScaleY() );
-
+    
     mpVDev->Push();
 
     Size aSize( OutputDevice::LogicToLogic( rSize100thmm, MAP_100TH_MM, aMapMode ) );
@@ -1850,9 +2002,20 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
     aMapMode.SetOrigin( aOffset += aMapMode.GetOrigin() );
 
     mpVDev->SetMapMode( aMapMode );
+    ImplAcquireContext();
 
-    ImplWriteActions( rMtf, NULL, nWriteFlags );
+    mapCurShape.reset();
+    
+    ImplWriteActions( rMtf, nWriteFlags, pElementId );
 
+    // draw open shape that doesn't have a border
+    if( mapCurShape.get() )
+    {
+        ImplWriteShape( *mapCurShape );
+        mapCurShape.reset();
+    }
+    
+    ImplReleaseContext();
     mpVDev->Pop();
 }
 
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index bb2c1bb89..0d34195d8 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -3,10 +3,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: svgwriter.hxx,v $
+ * $Revision: 1.5.86.14 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,6 +45,8 @@
 #include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/cvtgrf.hxx>
+#include <vcl/graphictools.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -56,18 +61,18 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 
 // -----------------------------------------------------------------------------
 
-#define _SVG_USE_NATIVE_TEXTDECORATION
-#define _SVG_USE_TSPANS 1
-#undef  _SVG_WRITE_EXTENTS
-#define _SVG_EMBED_FONTS 1
+#define _SVG_WRITE_EXTENTS      1
+#undef _SVG_WRITE_TEXT_DESC
+#undef _SVG_USE_CONFIG
 
 // -----------------------------------------------------------------------------
 
 #define NMSP_CPPU				cppu
-#define NMSP_RTL				rtl
 #define NMSP_UNO				com::sun::star::uno
 #define NMSP_LANG				com::sun::star::lang
 #define NMSP_SAX				com::sun::star::xml::sax
@@ -77,47 +82,22 @@
 
 #define REF( _def_Obj )			NMSP_UNO::Reference< _def_Obj >
 #define SEQ( _def_Obj )			NMSP_UNO::Sequence< _def_Obj > 
-#define B2UCONST( _def_pChar )	(NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
+#define B2UCONST( _def_pChar )	(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
 #define SVG_DTD_STRING			B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" )
+#define SVG_TINY_DTD_STRING     B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG Tiny 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd\">" )
 
-#define SVGWRITER_WRITE_NONE	0x00000000
-#define SVGWRITER_WRITE_FILL	0x00000001
-#define SVGWRITER_WRITE_TEXT	0x00000002
-#define SVGWRITER_WRITE_ALL		0xFFFFFFFF
-
-// --------------
-// - FastString -
-// --------------
-
-class FastString
-{
-private:
-
-    sal_uInt32					mnBufLen;
-    sal_uInt32					mnCurLen;
-    sal_uInt32					mnBufInc;
-    sal_Unicode*				mpBuffer;
-    sal_uInt32					mnPartPos;
-    rtl::OUString				maString;
-                                
-public:							
-                                
-                                FastString( sal_uInt32 nInitLen = 2048, sal_uInt32 nIncrement = 2048 );
-                                ~FastString();
-                                
-    FastString&					operator+=( const ::rtl::OUString& rStr );
-                        
-    const ::rtl::OUString&		GetString() const;
-
-    sal_uInt32					GetLength() const { return mnCurLen; }
-    void						Clear() { mnCurLen = 0, maString = ::rtl::OUString(); }
-};
+#define SVGWRITER_WRITE_NONE	    0x00000000
+#define SVGWRITER_WRITE_FILL        0x00000001
+#define SVGWRITER_WRITE_TEXT	    0x00000002
+#define SVGWRITER_NO_SHAPE_COMMENTS 0x01000000
+#define SVGWRITER_WRITE_ALL		    0xFFFFFFFF
 
 // ----------------------
 // - SVGAttributeWriter -
 // ----------------------
 
 class SVGActionWriter;
+class SVGExport;
 class SVGFontExport;
 
 class SVGAttributeWriter
@@ -127,24 +107,50 @@ private:
     Font					maCurFont;
     Color					maCurLineColor;
     Color					maCurFillColor;
-    SvXMLExport&			mrExport;
+    SVGExport&			    mrExport;
     SVGFontExport&          mrFontExport;
     SvXMLElementExport*		mpElemFont;
     SvXMLElementExport*		mpElemPaint;
-
+                            
                             SVGAttributeWriter();
-
+                     
+    double                  ImplRound( double fVal, sal_Int32 nDecs = 3 );
+                   
 public:
 
-                            SVGAttributeWriter( SvXMLExport& rExport, SVGFontExport& rFontExport );
+                            SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFontExport );
     virtual					~SVGAttributeWriter();
 
     ::rtl::OUString			GetFontStyle( const Font& rFont );
-    ::rtl::OUString			GetColorStyle( const Color& rColor );
     ::rtl::OUString			GetPaintStyle( const Color& rLineColor, const Color& rFillColor, const LineInfo* pLineInfo );
+    void                    AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor );
+    void                    AddGradientDef( const Rectangle& rObjRect,const Gradient& rGradient, ::rtl::OUString& rGradientId );
+    void                    AddPaintAttr( const Color& rLineColor, const Color& rFillColor, 
+                                          const Rectangle* pObjBoundRect = NULL, const Gradient* pFillGradient = NULL );
+    
+    void                    SetFontAttr( const Font& rFont );
 
-    void					SetFontAttr( const Font& rFont );
-    void					SetPaintAttr( const Color& rLineColor, const Color& rFillColor, const LineInfo* pLineInfo = 0);
+    static void             ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr );
+};
+
+struct SVGShapeDescriptor
+{
+    PolyPolygon                 maShapePolyPoly;
+    Color                       maShapeFillColor;
+    Color                       maShapeLineColor;
+    sal_Int32                   mnStrokeWidth;
+    SvtGraphicStroke::DashArray maDashArray;
+    ::std::auto_ptr< Gradient > mapShapeGradient;
+    ::rtl::OUString             maId;
+
+    // -------------------------------------------------------------------------
+
+    SVGShapeDescriptor() :
+        maShapeFillColor( Color( COL_TRANSPARENT ) ),
+        maShapeLineColor( Color( COL_TRANSPARENT ) ),
+        mnStrokeWidth( 0 )
+    {
+    }
 };
 
 // -------------------
@@ -159,68 +165,74 @@ class SVGActionWriter
 {
 private:
 
-    SvXMLExport&			mrExport;
-    SVGFontExport&          mrFontExport;
-    SVGAttributeWriter*		mpContext;
-    sal_Bool				mbClipAttrChanged;
-    sal_Int32				mnCurClipId;
-    sal_Int32				mnCurPatternId;
-    sal_Int32				mnCurGradientId;
-    sal_Int32				mnCurMaskId;
-    Stack					maContextStack;
-    VirtualDevice*			mpVDev;
-    MapMode					maTargetMapMode;
-    sal_Bool				mbDestroyVDev;
-    sal_Bool				mbPaintAttrChanged;
-    sal_Bool				mbFontAttrChanged;
+    sal_Int32                               mnCurGradientId;
+    sal_Int32                               mnCurMaskId;
+    sal_Int32                               mnCurPatternId;
+    Stack					                maContextStack;
+    ::std::auto_ptr< SVGShapeDescriptor >   mapCurShape;
+    SVGExport&			                    mrExport;
+    SVGFontExport&                          mrFontExport;
+    SVGAttributeWriter*                     mpContext;
+    VirtualDevice*			                mpVDev;
+    MapMode					                maTargetMapMode;
+    sal_uInt32                              mnInnerMtfCount;
+    sal_Bool				                mbDestroyVDev;
+    sal_Bool				                mbPaintAttrChanged;
+    sal_Bool				                mbFontAttrChanged;
+    sal_Bool				                mbClipAttrChanged;
 
     SVGAttributeWriter*		ImplAcquireContext() { maContextStack.Push( mpContext = new SVGAttributeWriter( mrExport, mrFontExport ) ); return mpContext; }
     void					ImplReleaseContext() { delete (SVGAttributeWriter*)	maContextStack.Pop(); mpContext = (SVGAttributeWriter*) maContextStack.Top(); }
 
     long					ImplMap( sal_Int32 nVal ) const; 
-    Point					ImplMap( const Point& rPt ) const;
-    Size					ImplMap( const Size& rSz ) const;
-    LineInfo				ImplMap( const LineInfo& rLineInfo ) const;
-    inline Rectangle		ImplMap( const Rectangle& rRect ) const { return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) ); }
-
-    void					ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL, const ::rtl::OUString* pStyle = NULL );
-    void					ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0, const ::rtl::OUString* pStyle = NULL );
-    void					ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY, const ::rtl::OUString* pStyle = NULL );
-    void					ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly, const ::rtl::OUString* pStyle = NULL );
-    void					ImplWritePattern( const PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, const ::rtl::OUString* pStyle, sal_uInt32 nWriteFlags );
-    void					ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, const ::rtl::OUString* pStyle, sal_uInt32 nWriteFlags );
-    void					ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
-    void					ImplWriteGradientStop( const Color& rColor, double fOffset );
-    Color					ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
-    Color					ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
-    void					ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, const ::rtl::OUString* pStyle, sal_uInt32 nWriteFlags );
-    void					ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, const ::rtl::OUString* pStyle = NULL );
-    void                ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, const ::rtl::OUString* pStyle, Color aTextColor );
-    void					ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, const ::rtl::OUString* pStyle = NULL );
+    Point&					ImplMap( const Point& rPt, Point& rDstPt ) const;
+    Size&					ImplMap( const Size& rSz, Size& rDstSz ) const;
+    Rectangle&              ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const;
+    Polygon&                ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) const;
+    PolyPolygon&            ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const;
+
+    void					ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL, 
+                                           sal_Bool bApplyMapping = sal_True );
+    void					ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0, 
+                                           sal_Bool bApplyMapping = sal_True );
+    void					ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY, 
+                                              sal_Bool bApplyMapping = sal_True );
+    void                    ImplWritePattern( const PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
+    void					ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly, 
+                                                  sal_Bool bApplyMapping = sal_True );
+    void                    ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool bApplyMapping = sal_True );
+    void					ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags, 
+                                                 sal_Bool bApplyMapping = sal_True );
+    void                    ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
+    void                    ImplWriteGradientStop( const Color& rColor, double fOffset );
+    Color                   ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
+    Color                   ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
+    void                    ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags );
+    void					ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, 
+                                           sal_Bool bApplyMapping = sal_True );
+    void                    ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, sal_Bool bApplyMapping );
+    void					ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, 
+                                          sal_Bool bApplyMapping = sal_True );
 
     void					ImplCheckFontAttributes();
     void					ImplCheckPaintAttributes();
     
-    void					ImplWriteActions( const GDIMetaFile& rMtf, const ::rtl::OUString* pStyle, sal_uInt32 nWriteFlags );
-    sal_Int32				ImplGetNextClipId() { return mnCurClipId++; }
-    sal_Int32				ImplGetNextPatternId() { return mnCurPatternId++; }
-    sal_Int32				ImplGetNextGradientId() { return mnCurGradientId++; }
-    sal_Int32				ImplGetNextMaskId() { return mnCurMaskId++; }
+    void					ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, const ::rtl::OUString* pElementId );
 
 public:
 
-    static ::rtl::OUString	GetValueString( sal_Int32 nVal );
     static ::rtl::OUString	GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine );
 
 public:
 
-                            SVGActionWriter( SvXMLExport& rExport, SVGFontExport& rFontExport );
+                            SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport );
     virtual					~SVGActionWriter();
 
     void					WriteMetaFile( const Point& rPos100thmm, 
                                            const Size& rSize100thmm,
                                            const GDIMetaFile& rMtf, 
-                                           sal_uInt32 nWriteFlags = SVGWRITER_WRITE_ALL );
+                                           sal_uInt32 nWriteFlags,
+                                           const ::rtl::OUString* pElementId = NULL );
 };
 
 #endif
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 6fcbf0089..99bbdc6a3 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -163,6 +163,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/drawingml/shape \
     oox/source/drawingml/shapegroupcontext \
     oox/source/drawingml/shapepropertiescontext \
+    oox/source/drawingml/shapepropertymap \
     oox/source/drawingml/shapestylecontext \
     oox/source/drawingml/spdefcontext \
     oox/source/drawingml/table/tablebackgroundstylecontext \
@@ -298,7 +299,9 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/xls/connectionsbuffer \
     oox/source/xls/connectionsfragment \
     oox/source/xls/defnamesbuffer \
+    oox/source/xls/drawingbase \
     oox/source/xls/drawingfragment \
+    oox/source/xls/drawingmanager \
     oox/source/xls/excelchartconverter \
     oox/source/xls/excelfilter \
     oox/source/xls/excelhandlers \
@@ -320,9 +323,9 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/xls/richstring \
     oox/source/xls/scenariobuffer \
     oox/source/xls/scenariocontext \
-    oox/source/xls/sharedformulabuffer \
     oox/source/xls/sharedstringsbuffer \
     oox/source/xls/sharedstringsfragment \
+    oox/source/xls/sheetdatabuffer \
     oox/source/xls/sheetdatacontext \
     oox/source/xls/stylesbuffer \
     oox/source/xls/stylesfragment \
diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index 30223b8bf..0bcc3d8f6 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -58,9 +58,9 @@ typedef ::rtl::Reference< ContextHandler > ContextHandlerRef;
 struct FragmentBaseData;
 typedef ::boost::shared_ptr< FragmentBaseData > FragmentBaseDataRef;
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandlerImplBase;
+typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
 
-class ContextHandler : public ContextHandlerImplBase
+class ContextHandler : public ContextHandler_BASE
 {
 public:
     explicit            ContextHandler( ContextHandler& rParent );
diff --git a/oox/inc/oox/core/fasttokenhandler.hxx b/oox/inc/oox/core/fasttokenhandler.hxx
index b19915d40..891f69ae8 100644
--- a/oox/inc/oox/core/fasttokenhandler.hxx
+++ b/oox/inc/oox/core/fasttokenhandler.hxx
@@ -40,12 +40,12 @@ namespace core {
 
 // ============================================================================
 
-typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::xml::sax::XFastTokenHandler > FastTokenHandlerBase;
+typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::xml::sax::XFastTokenHandler > FastTokenHandler_BASE;
 
 /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface
     that provides access to the tokens generated from the internal token name list.
  */
-class FastTokenHandler : public FastTokenHandlerBase
+class FastTokenHandler : public FastTokenHandler_BASE
 {
 public:
     explicit            FastTokenHandler();
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 7cdd5bb66..de49389b4 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -94,9 +94,9 @@ typedef ::cppu::WeakImplHelper5<
         ::com::sun::star::document::XImporter,
         ::com::sun::star::document::XExporter,
         ::com::sun::star::document::XFilter >
-    FilterBaseBase;
+    FilterBase_BASE;
 
-class OOX_DLLPUBLIC FilterBase : public FilterBaseBase, public ::cppu::BaseMutex
+class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public ::cppu::BaseMutex
 {
 public:
     explicit            FilterBase(
diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/oox/inc/oox/core/fragmenthandler.hxx
index cc81cb0f0..a5636073b 100644
--- a/oox/inc/oox/core/fragmenthandler.hxx
+++ b/oox/inc/oox/core/fragmenthandler.hxx
@@ -82,9 +82,9 @@ struct RecordInfo
 
 // ============================================================================
 
-typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandlerImplBase;
+typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
 
-class FragmentHandler : public FragmentHandlerImplBase
+class FragmentHandler : public FragmentHandler_BASE
 {
 public:
     explicit            FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath );
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 74d4096d9..49767d3a0 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef OOX_CORE_RELATIONS
-#define OOX_CORE_RELATIONS
+#ifndef OOX_CORE_RELATIONS_HXX
+#define OOX_CORE_RELATIONS_HXX
 
 #include <map>
 #include <boost/shared_ptr.hpp>
diff --git a/oox/inc/oox/core/relationshandler.hxx b/oox/inc/oox/core/relationshandler.hxx
index 525f43549..739ceb42e 100644
--- a/oox/inc/oox/core/relationshandler.hxx
+++ b/oox/inc/oox/core/relationshandler.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef OOX_CORE_RELATIONSHANDLER
-#define OOX_CORE_RELATIONSHANDLER
+#ifndef OOX_CORE_RELATIONSHANDLER_HXX
+#define OOX_CORE_RELATIONSHANDLER_HXX
 
 #include "oox/core/fragmenthandler.hxx"
 
diff --git a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
index 3ca171e7f..502563ed9 100644
--- a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
@@ -73,8 +73,7 @@ public:
     void                setPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue );
 
     /** Calculates the resulting shape anchor in EMUs. */
-    ::com::sun::star::awt::Rectangle
-                        calcEmuLocation( const EmuRectangle& rEmuChartRect ) const;
+    EmuRectangle        calcAnchorRectEmu( const EmuRectangle& rChartRect ) const;
 
 private:
     AnchorPosModel      maFrom;             /// Top-left position relative to chart object.
@@ -110,7 +109,7 @@ private:
                         mxDrawPage;             /// Drawing page of this sheet.
     ::oox::drawingml::ShapePtr mxShape;         /// Current top-level shape.
     ShapeAnchorRef      mxAnchor;               /// Current anchor of top-level shape.
-    EmuRectangle        maEmuChartRect;         /// Position and size of the chart object for embedded shapes (in EMUs).
+    EmuRectangle        maChartRectEmu;         /// Position and size of the chart object for embedded shapes (in EMUs).
     bool                mbOleSupport;           /// True = allow to insert OLE objects into the drawing page.
 };
 
diff --git a/oox/inc/oox/drawingml/chart/converterbase.hxx b/oox/inc/oox/drawingml/chart/converterbase.hxx
index 4a4219312..ade53fe58 100644
--- a/oox/inc/oox/drawingml/chart/converterbase.hxx
+++ b/oox/inc/oox/drawingml/chart/converterbase.hxx
@@ -35,7 +35,6 @@
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
     namespace awt { struct Size; }
-    namespace lang { class XMultiServiceFactory; }
     namespace chart2 { class XChartDocument; }
     namespace chart2 { class XTitle; }
     namespace drawing { class XShape; }
diff --git a/oox/inc/oox/drawingml/color.hxx b/oox/inc/oox/drawingml/color.hxx
index 02f8b7f4e..5aa489637 100644
--- a/oox/inc/oox/drawingml/color.hxx
+++ b/oox/inc/oox/drawingml/color.hxx
@@ -93,10 +93,10 @@ public:
         @param nPhClr  Actual color for the phClr placeholder color used in theme style lists. */
     sal_Int32           getColor( const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
 
-    /** Returns true, if the color has a transparence set. */
-    bool                hasTransparence() const;
-    /** Returns the transparence of the color (0 = opaque, 100 = full transparent). */
-    sal_Int16           getTransparence() const;
+    /** Returns true, if the color is transparent. */
+    bool                hasTransparency() const;
+    /** Returns the transparency of the color (0 = opaque, 100 = full transparent). */
+    sal_Int16           getTransparency() const;
 
 private:
     /** Internal helper for getColor(). */
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/oox/inc/oox/drawingml/drawingmltypes.hxx
index fe6c89839..bc34f8446 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/oox/inc/oox/drawingml/drawingmltypes.hxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
+#include "oox/helper/helper.hxx"
 
 namespace oox {
 namespace drawingml {
@@ -151,6 +152,23 @@ IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::st
 
 // ============================================================================
 
+const sal_Int32 EMU_PER_HMM = 360;      /// 360 EMUs per 1/100 mm.
+
+/** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */
+inline sal_Int64 convertHmmToEmu( sal_Int32 nValue )
+{
+    return static_cast< sal_Int64 >( nValue ) * EMU_PER_HMM;
+}
+
+/** Converts the passed 64-bit integer value from EMUs to 1/100 mm. */
+inline sal_Int32 convertEmuToHmm( sal_Int64 nValue )
+{
+    return getLimitedValue< sal_Int32, sal_Int64 >( (nValue + EMU_PER_HMM / 2) / EMU_PER_HMM, 0, SAL_MAX_INT32 );
+}
+
+// ============================================================================
+
+/** A structure for a point with 64-bit interger components. */
 struct EmuPoint
 {
     sal_Int64           X;
@@ -162,6 +180,7 @@ struct EmuPoint
 
 // ============================================================================
 
+/** A structure for a size with 64-bit interger components. */
 struct EmuSize
 {
     sal_Int64           Width;
@@ -173,11 +192,15 @@ struct EmuSize
 
 // ============================================================================
 
+/** A structure for a rectangle with 64-bit interger components. */
 struct EmuRectangle : public EmuPoint, public EmuSize
 {
     inline explicit     EmuRectangle() {}
     inline explicit     EmuRectangle( const EmuPoint& rPos, const EmuSize& rSize ) : EmuPoint( rPos ), EmuSize( rSize ) {}
     inline explicit     EmuRectangle( sal_Int64 nX, sal_Int64 nY, sal_Int64 nWidth, sal_Int64 nHeight ) : EmuPoint( nX, nY ), EmuSize( nWidth, nHeight ) {}
+
+    inline void         setPos( const EmuPoint& rPos ) { static_cast< EmuPoint& >( *this ) = rPos; }
+    inline void         setSize( const EmuSize& rSize ) { static_cast< EmuSize& >( *this ) = rSize; }
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/oox/inc/oox/drawingml/fillproperties.hxx
index 71c5081ce..4c3bdc3f3 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -37,7 +37,6 @@
 
 namespace oox {
     class GraphicHelper;
-    class ModelObjectHelper;
     class PropertyMap;
     class PropertySet;
 }
@@ -45,38 +44,7 @@ namespace oox {
 namespace oox {
 namespace drawingml {
 
-// ============================================================================
-
-enum FillPropertyId
-{
-    FillStyleId,
-    FillColorId,
-    FillTransparenceId,
-    FillGradientId,
-    FillBitmapUrlId,
-    FillBitmapModeId,
-    FillBitmapSizeXId,
-    FillBitmapSizeYId,
-    FillBitmapOffsetXId,
-    FillBitmapOffsetYId,
-    FillBitmapRectanglePointId,
-    FillId_END
-};
-
-struct FillPropertyIds
-{
-    const sal_Int32*    mpnPropertyIds;
-    bool                mbNamedFillGradient;
-    bool                mbNamedFillBitmap;
-
-    explicit            FillPropertyIds(
-                            const sal_Int32* pnPropertyIds,
-                            bool bNamedFillGradient,
-                            bool bNamedFillBitmap );
-
-    inline bool         has( FillPropertyId ePropId ) const { return mpnPropertyIds[ ePropId ] >= 0; }
-    inline sal_Int32    operator[]( FillPropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; }
-};
+class ShapePropertyMap;
 
 // ============================================================================
 
@@ -148,8 +116,6 @@ struct FillProperties
     PatternFillProperties maPatternProps;       /// Properties for pattern fills.
     BlipFillProperties  maBlipProps;            /// Properties for bitmap fills.
 
-    static FillPropertyIds DEFAULT_IDS;         /// Default fill property identifiers for shape fill.
-
     /** Overwrites all members that are explicitly set in rSourceProps. */
     void                assignUsed( const FillProperties& rSourceProps );
 
@@ -159,19 +125,8 @@ struct FillProperties
 
     /** Writes the properties to the passed property map. */
     void                pushToPropMap(
-                            PropertyMap& rPropMap,
-                            ModelObjectHelper& rModelObjHelper,
+                            ShapePropertyMap& rPropMap,
                             const GraphicHelper& rGraphicHelper,
-                            const FillPropertyIds& rPropIds = DEFAULT_IDS,
-                            sal_Int32 nShapeRotation = 0,
-                            sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
-
-    /** Writes the properties to the passed property set. */
-    void                pushToPropSet(
-                            PropertySet& rPropSet,
-                            ModelObjectHelper& rModelObjHelper,
-                            const GraphicHelper& rGraphicHelper,
-                            const FillPropertyIds& rPropIds = DEFAULT_IDS,
                             sal_Int32 nShapeRotation = 0,
                             sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
 };
@@ -190,12 +145,6 @@ struct GraphicProperties
                             PropertyMap& rPropMap,
                             const GraphicHelper& rGraphicHelper,
                             sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
-
-    /** Writes the properties to the passed property set. */
-    void                pushToPropSet(
-                            PropertySet& rPropSet,
-                            const GraphicHelper& rGraphicHelper,
-                            sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/drawingml/lineproperties.hxx b/oox/inc/oox/drawingml/lineproperties.hxx
index f0e6eb122..421e6eb56 100644
--- a/oox/inc/oox/drawingml/lineproperties.hxx
+++ b/oox/inc/oox/drawingml/lineproperties.hxx
@@ -36,40 +36,6 @@ namespace drawingml {
 
 // ============================================================================
 
-enum LinePropertyId
-{
-    LineStyleId,
-    LineWidthId,
-    LineColorId,
-    LineTransparenceId,
-    LineDashId,
-    LineJointId,
-    LineStartId,
-    LineStartWidthId,
-    LineStartCenterId,
-    LineEndId,
-    LineEndWidthId,
-    LineEndCenterId,
-    LineId_END
-};
-
-struct LinePropertyIds
-{
-    const sal_Int32*    mpnPropertyIds;
-    bool                mbNamedLineDash;
-    bool                mbNamedLineMarker;
-
-    explicit            LinePropertyIds(
-                            const sal_Int32* pnPropertyIds,
-                            bool bNamedLineDash,
-                            bool bNamedLineMarker );
-
-    inline bool         has( LinePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ] >= 0; }
-    inline sal_Int32    operator[]( LinePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; }
-};
-
-// ============================================================================
-
 struct LineArrowProperties
 {
     OptValue< sal_Int32 > moArrowType;
@@ -97,25 +63,13 @@ struct LineProperties
     OptValue< sal_Int32 > moLineCap;        /// Line cap (OOXML token).
     OptValue< sal_Int32 > moLineJoint;      /// Line joint type (OOXML token).
 
-    static LinePropertyIds DEFAULT_IDS;     /// Default line property identifiers.
-
     /** Overwrites all members that are explicitly set in rSourceProps. */
     void                assignUsed( const LineProperties& rSourceProps );
 
     /** Writes the properties to the passed property map. */
     void                pushToPropMap(
-                            PropertyMap& rPropMap,
-                            ModelObjectHelper& rModelObjHelper,
-                            const GraphicHelper& rGraphicHelper,
-                            const LinePropertyIds& rPropIds = DEFAULT_IDS,
-                            sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
-
-    /** Writes the properties to the passed property map. */
-    void                pushToPropSet(
-                            PropertySet& rPropSet,
-                            ModelObjectHelper& rModelObjHelper,
+                            ShapePropertyMap& rPropMap,
                             const GraphicHelper& rGraphicHelper,
-                            const LinePropertyIds& rPropIds = DEFAULT_IDS,
                             sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
 };
 
diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/oox/inc/oox/drawingml/shapepropertymap.hxx
new file mode 100755
index 000000000..096724a67
--- /dev/null
+++ b/oox/inc/oox/drawingml/shapepropertymap.hxx
@@ -0,0 +1,148 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
+#define OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
+
+#include "oox/helper/propertymap.hxx"
+
+namespace oox { class ModelObjectHelper; }
+
+namespace oox {
+namespace drawingml {
+
+// ============================================================================
+
+/** Enumeration for various properties related to drawing shape formatting.
+
+    This is an abstraction for shape formatting properties that have different
+    names in various implementations, e.g. drawing shapes vs. chart objects.
+ */
+enum ShapePropertyId
+{
+    SHAPEPROP_LineStyle,
+    SHAPEPROP_LineWidth,
+    SHAPEPROP_LineColor,
+    SHAPEPROP_LineTransparency,
+    SHAPEPROP_LineDash,                     /// Explicit line dash or name of a line dash stored in a global container.
+    SHAPEPROP_LineJoint,
+    SHAPEPROP_LineStart,                    /// Explicit line start marker or name of a line marker stored in a global container.
+    SHAPEPROP_LineStartWidth,
+    SHAPEPROP_LineStartCenter,
+    SHAPEPROP_LineEnd,                      /// Explicit line end marker or name of a line marker stored in a global container.
+    SHAPEPROP_LineEndWidth,
+    SHAPEPROP_LineEndCenter,
+    SHAPEPROP_FillStyle,
+    SHAPEPROP_FillColor,
+    SHAPEPROP_FillTransparency,
+    SHAPEPROP_FillGradient,                 /// Explicit fill gradient or name of a fill gradient stored in a global container.
+    SHAPEPROP_FillBitmapUrl,                /// Explicit fill bitmap URL or name of a fill bitmap URL stored in a global container.
+    SHAPEPROP_FillBitmapMode,
+    SHAPEPROP_FillBitmapSizeX,
+    SHAPEPROP_FillBitmapSizeY,
+    SHAPEPROP_FillBitmapOffsetX,
+    SHAPEPROP_FillBitmapOffsetY,
+    SHAPEPROP_FillBitmapRectanglePoint,
+    SHAPEPROP_END
+};
+
+// ============================================================================
+
+struct ShapePropertyInfo
+{
+    const sal_Int32*    mpnPropertyIds;         /// Pointer to array of property identifiers for all SHAPEPROP properties.
+    bool                mbNamedLineMarker;      /// True = use named line marker instead of explicit line marker.
+    bool                mbNamedLineDash;        /// True = use named line dash instead of explicit line dash.
+    bool                mbNamedFillGradient;    /// True = use named fill gradient instead of explicit fill gradient.
+    bool                mbNamedFillBitmapUrl;   /// True = use named fill bitmap URL instead of explicit fill bitmap URL.
+
+    static ShapePropertyInfo DEFAULT;           /// Default property info (used as default parameter of other methods).
+
+    explicit            ShapePropertyInfo(
+                            const sal_Int32* pnPropertyIds,
+                            bool bNamedLineMarker,
+                            bool bNamedLineDash,
+                            bool bNamedFillGradient,
+                            bool bNamedFillBitmapUrl );
+
+    inline bool         has( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ] >= 0; }
+    inline sal_Int32    operator[]( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; }
+};
+
+// ============================================================================
+
+class ShapePropertyMap : public PropertyMap
+{
+public:
+    explicit            ShapePropertyMap(
+                            ModelObjectHelper& rModelObjHelper,
+                            const ShapePropertyInfo& rShapePropInfo = ShapePropertyInfo::DEFAULT );
+
+    /** Returns true, if the specified property is supported. */
+    bool                supportsProperty( ShapePropertyId ePropId ) const;
+
+    /** Returns true, if named line markers are supported, and the specified
+        line marker has already been inserted into the marker table. */
+    bool                hasNamedLineMarkerInTable( const ::rtl::OUString& rMarkerName ) const;
+
+    /** Sets the specified shape property to the passed value. */
+    bool                setAnyProperty( ShapePropertyId ePropId, const ::com::sun::star::uno::Any& rValue );
+
+    /** Sets the specified shape property to the passed value. */
+    template< typename Type >
+    inline bool         setProperty( ShapePropertyId ePropId, const Type& rValue )
+                            { return setAnyProperty( ePropId, ::com::sun::star::uno::Any( rValue ) ); }
+
+    using PropertyMap::setAnyProperty;
+    using PropertyMap::setProperty;
+    using PropertyMap::operator[];
+
+private:
+    /** Sets an explicit line marker, or creates a named line marker. */
+    bool                setLineMarker( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    /** Sets an explicit line dash, or creates a named line dash. */
+    bool                setLineDash( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    /** Sets an explicit fill gradient, or creates a named fill gradient. */
+    bool                setFillGradient( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. */
+    bool                setFillBitmapUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+
+    // not implemented, to prevent implicit conversion from enum to int
+    ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId );
+    const ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId ) const;
+
+private:
+    ModelObjectHelper&  mrModelObjHelper;
+    ShapePropertyInfo   maShapePropInfo;
+};
+
+// ============================================================================
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/dump/biffdumper.hxx b/oox/inc/oox/dump/biffdumper.hxx
index 8eec5a17f..149742396 100644
--- a/oox/inc/oox/dump/biffdumper.hxx
+++ b/oox/inc/oox/dump/biffdumper.hxx
@@ -531,7 +531,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -555,7 +555,7 @@ public:
     explicit            Dumper( const ::oox::core::FilterBase& rFilter );
 
     explicit            Dumper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
                             const ::rtl::OUString& rSysFileName );
 
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 071d8f2a8..148f0e19f 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -50,10 +50,9 @@
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
-    namespace io { class XTextInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XTextOutputStream; }
-    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace comphelper {
@@ -125,43 +124,46 @@ public:
     // input streams ----------------------------------------------------------
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
-                        getXInputStream( BinaryInputStream& rStrm );
-
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
                         openInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rFileName );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
-                        openTextInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
-                            const ::rtl::OUString& rEncoding );
-
-    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
-                        openTextInputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
-                            const ::rtl::OUString& rFileName,
-                            const ::rtl::OUString& rEncoding );
-
     // output streams ---------------------------------------------------------
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
                         openOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rFileName );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >
                         openTextOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
-                            const ::rtl::OUString& rEncoding );
+                            rtl_TextEncoding eTextEnc );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >
                         openTextOutputStream(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rFileName,
-                            const ::rtl::OUString& rEncoding );
+                            rtl_TextEncoding eTextEnc );
+};
+
+// ============================================================================
+
+class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef
+{
+public:
+    inline              BinaryInputStreamRef() {}
+
+    inline /*implicit*/ BinaryInputStreamRef( BinaryInputStream* pInStrm ) :
+                            ::oox::BinaryInputStreamRef( pInStrm ) {}
+
+    inline /*implicit*/ BinaryInputStreamRef( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm ) :
+                            ::oox::BinaryInputStreamRef( new BinaryXInputStream( rxInStrm, true ) ) {}
+
+    template< typename StreamType >
+    inline /*implicit*/ BinaryInputStreamRef( const ::boost::shared_ptr< StreamType >& rxInStrm ) :
+                            ::oox::BinaryInputStreamRef( rxInStrm ) {}
 };
 
 // ============================================================================
@@ -551,7 +553,9 @@ typedef ::boost::shared_ptr< Base > BaseRef;
             |               |
             |               +---->  BinaryStreamObject
             |               |
-            |               +---->  TextStreamObject
+            |               +---->  TextStreamObjectBase
+            |               |       |
+            |               |       +---->  TextStreamObject
             |               |       |
             |               |       +---->  XmlStreamObject
             |               |
@@ -891,14 +895,14 @@ class SharedConfigData : public Base, public ConfigItemBase
 public:
     explicit            SharedConfigData(
                             const ::rtl::OUString& rFileName,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const ::rtl::OUString& rSysFileName,
                             ::comphelper::MediaDescriptor& rMediaDesc );
 
     virtual             ~SharedConfigData();
 
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getFactory() const { return mxFactory; }
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; }
     inline const StorageRef& getRootStorage() const { return mxRootStrg; }
     inline const ::rtl::OUString& getSysFileName() const { return maSysFileName; }
 
@@ -933,7 +937,7 @@ private:
     typedef ::std::map< ::rtl::OUString, ::rtl::OUString >  ConfigDataMap;
     typedef ::std::map< ::rtl::OUString, NameListRef >      NameListMap;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     StorageRef          mxRootStrg;
     ::rtl::OUString     maSysFileName;
     ::comphelper::MediaDescriptor& mrMediaDesc;
@@ -978,14 +982,14 @@ public:
                             const ::oox::core::FilterBase& rFilter );
     explicit            Config(
                             const sal_Char* pcEnvVar,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const ::rtl::OUString& rSysFileName,
                             ::comphelper::MediaDescriptor& rMediaDesc );
 
     virtual             ~Config();
 
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getFactory() const { return mxCfgData->getFactory(); }
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
     inline const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); }
     inline const ::rtl::OUString& getSysFileName() const { return mxCfgData->getSysFileName(); }
 
@@ -1023,7 +1027,7 @@ protected:
                             const ::oox::core::FilterBase& rFilter );
     void                construct(
                             const sal_Char* pcEnvVar,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const ::rtl::OUString& rSysFileName,
                             ::comphelper::MediaDescriptor& rMediaDesc );
@@ -1077,10 +1081,7 @@ class Output : public Base
 {
 public:
     explicit            Output(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >& rxStrm );
-
-    explicit            Output(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rFileName );
 
     // ------------------------------------------------------------------------
@@ -1153,8 +1154,6 @@ public:
 
     // ------------------------------------------------------------------------
 protected:
-    void                construct( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream >& rxStrm );
-
     virtual bool        implIsValid() const;
 
 private:
@@ -1280,8 +1279,8 @@ class ObjectBase : public Base
 public:
     virtual             ~ObjectBase();
 
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
-                        getFactory() const { return mxConfig->getFactory(); }
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                        getContext() const { return mxConfig->getContext(); }
 
     void                dump();
 
@@ -1324,7 +1323,7 @@ protected:
     virtual void        implDump();
 
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -1395,7 +1394,6 @@ protected:
 
     using               ObjectBase::construct;
     void                construct( const ObjectBase& rParent, const ::rtl::OUString& rSysFileName );
-    void                construct( const ObjectBase& rParent, const OutputRef& rxOut );
     void                construct( const OutputObjectBase& rParent );
 
     virtual bool        implIsValid() const;
@@ -1454,6 +1452,7 @@ protected:
 
 protected:
     OutputRef           mxOut;
+    ::rtl::OUString     maSysFileName;
 };
 
 typedef ::boost::shared_ptr< OutputObjectBase > OutputObjectRef;
@@ -1579,7 +1578,6 @@ protected:
 
     using               OutputObjectBase::construct;
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
-    void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OutputRef& rxOut );
     void                construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm );
     void                construct( const InputObjectBase& rParent );
 
@@ -1806,46 +1804,76 @@ protected:
 };
 
 // ============================================================================
+// ============================================================================
 
-class TextStreamObject : public InputObjectBase
+class TextStreamObjectBase : public InputObjectBase
 {
-public:
-    explicit            TextStreamObject(
+protected:
+    inline              TextStreamObjectBase() {}
+
+    using               InputObjectBase::construct;
+    void                construct(
                             const ObjectBase& rParent,
                             const BinaryInputStreamRef& rxStrm,
                             rtl_TextEncoding eTextEnc,
                             const ::rtl::OUString& rSysFileName );
-
-    explicit            TextStreamObject(
+    void                construct(
                             const OutputObjectBase& rParent,
                             const BinaryInputStreamRef& rxStrm,
                             rtl_TextEncoding eTextEnc );
+    void                construct(
+                            const InputObjectBase& rParent,
+                            rtl_TextEncoding eTextEnc );
 
-protected:
     virtual bool        implIsValid() const;
     virtual void        implDump();
-    virtual void        implDumpLine( const ::rtl::OUString& rLine, sal_uInt32 nLine );
+
+    virtual void        implDumpText( TextInputStream& rTextStrm ) = 0;
 
 private:
+    void                constructTextStrmObj( rtl_TextEncoding eTextEnc );
+
+protected:
     ::boost::shared_ptr< TextInputStream > mxTextStrm;
 };
 
 // ============================================================================
 
-class XmlStreamObject : public TextStreamObject
+class TextLineStreamObject : public TextStreamObjectBase
 {
 public:
-    explicit            XmlStreamObject(
+    explicit            TextLineStreamObject(
                             const ObjectBase& rParent,
                             const BinaryInputStreamRef& rxStrm,
+                            rtl_TextEncoding eTextEnc,
                             const ::rtl::OUString& rSysFileName );
 
+    explicit            TextLineStreamObject(
+                            const OutputObjectBase& rParent,
+                            const BinaryInputStreamRef& rxStrm,
+                            rtl_TextEncoding eTextEnc );
+
 protected:
-    virtual void        implDump();
+    virtual void        implDumpText( TextInputStream& rTextStrm );
     virtual void        implDumpLine( const ::rtl::OUString& rLine, sal_uInt32 nLine );
+};
 
-private:
-    ::rtl::OUString     maIncompleteLine;
+// ============================================================================
+
+class XmlStreamObject : public TextStreamObjectBase
+{
+public:
+    explicit            XmlStreamObject(
+                            const ObjectBase& rParent,
+                            const BinaryInputStreamRef& rxStrm,
+                            const ::rtl::OUString& rSysFileName );
+
+    explicit            XmlStreamObject(
+                            const OutputObjectBase& rParent,
+                            const BinaryInputStreamRef& rxStrm );
+
+protected:
+    virtual void        implDumpText( TextInputStream& rTextStrm );
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 25858a773..466f32315 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -181,7 +181,7 @@ protected:
     void                construct( const ObjectBase& rParent );
 
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -763,7 +763,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -858,7 +858,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -880,7 +880,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -898,7 +898,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
diff --git a/oox/inc/oox/dump/pptxdumper.hxx b/oox/inc/oox/dump/pptxdumper.hxx
index 35fe47fdc..b24ff06f1 100644
--- a/oox/inc/oox/dump/pptxdumper.hxx
+++ b/oox/inc/oox/dump/pptxdumper.hxx
@@ -46,7 +46,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -60,7 +60,7 @@ public:
     explicit            Dumper( const ::oox::core::FilterBase& rFilter );
 
     explicit            Dumper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
                             const ::rtl::OUString& rSysFileName );
 
diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/oox/inc/oox/dump/xlsbdumper.hxx
index a8750bd50..468b86ca8 100644
--- a/oox/inc/oox/dump/xlsbdumper.hxx
+++ b/oox/inc/oox/dump/xlsbdumper.hxx
@@ -226,7 +226,7 @@ public:
 
 protected:
     virtual void        implDumpStream(
-                            const BinaryInputStreamRef& rxStrm,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
@@ -240,7 +240,7 @@ public:
     explicit            Dumper( const ::oox::core::FilterBase& rFilter );
 
     explicit            Dumper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
                             const ::rtl::OUString& rSysFileName );
 
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index f86c12ef3..e2c4f7dae 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -29,10 +29,14 @@
 #ifndef OOX_HELPER_BINARYINPUTSTREAM_HXX
 #define OOX_HELPER_BINARYINPUTSTREAM_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <vector>
 #include <com/sun/star/io/XInputStream.hpp>
 #include "oox/helper/binarystreambase.hxx"
 
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+} } }
+
 namespace oox {
 
 class BinaryOutputStream;
@@ -47,24 +51,51 @@ class BinaryInputStream : public virtual BinaryStreamBase
 {
 public:
     /** Derived classes implement reading nBytes bytes to the passed sequence.
-        @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes ) = 0;
-    /** Derived classes implement reading nBytes bytes to the (existing) buffer opMem.
-        @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes ) = 0;
+        The sequence will be reallocated internally.
+
+        @param nAtomSize
+            The size of the elements in the memory block, if available. Derived
+            classes may be interested in this information.
+
+        @return
+            Number of bytes really read.
+     */
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) = 0;
+
+    /** Derived classes implement reading nBytes bytes to the (preallocated!)
+        memory buffer opMem.
+
+        @param nAtomSize
+            The size of the elements in the memory block, if available. Derived
+            classes may be interested in this information.
+
+        @return
+            Number of bytes really read.
+     */
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) = 0;
+
     /** Derived classes implement seeking the stream forward by the passed
-        number of bytes. This should work for non-seekable streams too. */
-    virtual void        skip( sal_Int32 nBytes ) = 0;
+        number of bytes. This should work for non-seekable streams too.
+
+        @param nAtomSize
+            The size of the elements in the memory block, if available. Derived
+            classes may be interested in this information.
+     */
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) = 0;
 
     /** Reads a value from the stream and converts it to platform byte order.
-        Supported types: SAL integers (8 to 64 bit), float, double. */
+        All data types supported by the ByteOrderConverter class can be used.
+     */
     template< typename Type >
     void                readValue( Type& ornValue );
+
     /** Reads a value from the stream and converts it to platform byte order.
-        Supported types: SAL integers (8 to 64 bit), float, double. */
+        All data types supported by the ByteOrderConverter class can be used.
+     */
     template< typename Type >
     inline Type         readValue() { Type nValue; readValue( nValue ); return nValue; }
-    /** Stream operator for integral and floating-point types. */
+
+    /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
     inline BinaryInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; }
 
@@ -79,46 +110,135 @@ public:
     inline float        readFloat() { return readValue< float >(); }
     inline double       readDouble() { return readValue< double >(); }
 
-    /** Reads a NUL-terminated byte character array and returns the string. */
+    /** Reads a (preallocated!) C array of values from the stream.
+
+        Converts all values in the array to platform byte order. All data types
+        supported by the ByteOrderConverter class can be used.
+
+        @param nElemCount
+            Number of array elements to read (NOT byte count).
+
+        @return
+            Number of array elements really read (NOT byte count).
+     */
+    template< typename Type >
+    sal_Int32           readArray( Type* opnArray, sal_Int32 nElemCount );
+
+    /** Reads a sequence of values from the stream.
+
+        The sequence will be reallocated internally. Converts all values in the
+        array to platform byte order. All data types supported by the
+        ByteOrderConverter class can be used.
+
+        @param nElemCount
+            Number of elements to put into the sequence (NOT byte count).
+
+        @return
+            Number of sequence elements really read (NOT byte count).
+     */
+    template< typename Type >
+    sal_Int32           readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount );
+
+    /** Reads a vector of values from the stream.
+
+        The vector will be resized internally. Converts all values in the
+        vector to platform byte order. All data types supported by the
+        ByteOrderConverter class can be used.
+
+        @param nElemCount
+            Number of elements to put into the vector (NOT byte count).
+
+        @return
+            Number of vector elements really read (NOT byte count).
+     */
+    template< typename Type >
+    sal_Int32           readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount );
+
+    /** Skips an array of values of a certain type in the stream.
+
+        All data types supported by the ByteOrderConverter class can be used.
+
+        @param nElemCount
+            Number of array elements to skip (NOT byte count).
+     */
+    template< typename Type >
+    void                skipArray( sal_Int32 nElemCount );
+
+    /** Reads a NUL-terminated byte character array and returns the string.
+     */
     ::rtl::OString      readNulCharArray();
 
     /** Reads a NUL-terminated byte character array and returns a Unicode string.
-        @param eTextEnc  The text encoding used to create the Unicode string. */
+
+        @param eTextEnc
+            The text encoding used to create the Unicode string.
+     */
     ::rtl::OUString     readNulCharArrayUC( rtl_TextEncoding eTextEnc );
 
-    /** Reads a NUL-terminated Unicode character array and returns the string. */
+    /** Reads a NUL-terminated Unicode character array and returns the string.
+     */
     ::rtl::OUString     readNulUnicodeArray();
 
-    /** Reads nChar byte characters and returns the string.
-        @param nChars  Number of characters (bytes) to read from the stream.
+    /** Reads a byte character array and returns the string.
+
+        @param nChars
+            Number of characters (bytes) to read from the stream.
+
         @param bAllowNulChars
             True = NUL characters are inserted into the imported string.
-            False = NUL characters are replaced by question marks (default). */
+            False = NUL characters are replaced by question marks (default).
+     */
     ::rtl::OString      readCharArray( sal_Int32 nChars, bool bAllowNulChars = false );
 
-    /** Reads nChar byte characters and returns a Unicode string.
-        @param nChars  Number of characters (bytes) to read from the stream.
-        @param eTextEnc  The text encoding used to create the Unicode string.
+    /** Reads a byte character array and returns a Unicode string.
+
+        @param nChars
+            Number of characters (bytes) to read from the stream.
+
+        @param eTextEnc
+            The text encoding used to create the Unicode string.
+
         @param bAllowNulChars
             True = NUL characters are inserted into the imported string.
-            False = NUL characters are replaced by question marks (default). */
+            False = NUL characters are replaced by question marks (default).
+     */
     ::rtl::OUString     readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
 
-    /** Reads nChars Unicode characters and returns the string.
-        @param nChars  Number of 16-bit characters to read from the stream.
+    /** Reads a Unicode character array and returns the string.
+
+        @param nChars
+            Number of 16-bit characters to read from the stream.
+
         @param bAllowNulChars
             True = NUL characters are inserted into the imported string.
-            False = NUL characters are replaced by question marks (default). */
+            False = NUL characters are replaced by question marks (default).
+     */
     ::rtl::OUString     readUnicodeArray( sal_Int32 nChars, bool bAllowNulChars = false );
 
-    /** Copies nBytes bytes from the current position to the passed output stream. */
-    void                copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes = SAL_MAX_INT64 );
+    /** Reads a Unicode character array (may be compressed) and returns the
+        string.
 
-private:
-    /** Used by the readValue() template functions to read built-in types.
-        @descr  Derived classes may overwrite this default implementation which
-            simply calls readMemory() with something own. */
-    virtual void        readAtom( void* opMem, sal_uInt8 nSize );
+        @param nChars
+            Number of 8-bit or 16-bit characters to read from the stream.
+
+        @param bCompressed
+            True = Character array is compressed (stored as 8-bit characters).
+            False = Character array is not compressed (stored as 16-bit characters).
+
+        @param bAllowNulChars
+            True = NUL characters are inserted into the imported string.
+            False = NUL characters are replaced by question marks (default).
+     */
+    ::rtl::OUString     readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false );
+
+    /** Copies nBytes bytes from the current position to the passed output stream.
+     */
+    void                copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes = SAL_MAX_INT64, sal_Int32 nAtomSize = 1 );
+
+protected:
+    /** This dummy default c'tor will never call the c'tor of the virtual base
+        class BinaryStreamBase as this class cannot be instanciated directly. */
+    inline explicit     BinaryInputStream() : BinaryStreamBase( false ) {}
 };
 
 typedef ::boost::shared_ptr< BinaryInputStream > BinaryInputStreamRef;
@@ -128,14 +248,47 @@ typedef ::boost::shared_ptr< BinaryInputStream > BinaryInputStreamRef;
 template< typename Type >
 void BinaryInputStream::readValue( Type& ornValue )
 {
-    // can be instanciated for all types supported in class ByteOrderConverter
-    readAtom( &ornValue, static_cast< sal_Int32 >( sizeof( Type ) ) );
+    readMemory( &ornValue, static_cast< sal_Int32 >( sizeof( Type ) ), sizeof( Type ) );
     ByteOrderConverter::convertLittleEndian( ornValue );
 }
 
+template< typename Type >
+sal_Int32 BinaryInputStream::readArray( Type* opnArray, sal_Int32 nElemCount )
+{
+    sal_Int32 nRet = 0;
+    if( !mbEof )
+    {
+        sal_Int32 nReadSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
+        nRet = readMemory( opnArray, nReadSize, sizeof( Type ) ) / sizeof( Type );
+        ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nRet ) );
+    }
+    return nRet;
+}
+
+template< typename Type >
+sal_Int32 BinaryInputStream::readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount )
+{
+    orSequence.reallocate( nElemCount );
+    return orSequence.hasElements() ? readArray( orSequence.getArray(), nElemCount ) : 0;
+}
+
+template< typename Type >
+sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount )
+{
+    orVector.resize( static_cast< size_t >( nElemCount ) );
+    return orVector.empty() ? 0 : readArray( &orVector.front(), nElemCount );
+}
+
+template< typename Type >
+void BinaryInputStream::skipArray( sal_Int32 nElemCount )
+{
+    sal_Int32 nSkipSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
+    skip( nSkipSize, sizeof( Type ) );
+}
+
 // ============================================================================
 
-/** Wraps a com.sun.star.io.XInputStream and provides convenient access functions.
+/** Wraps a UNO input stream and provides convenient access functions.
 
     The binary data in the stream is assumed to be in little-endian format.
  */
@@ -144,10 +297,13 @@ class BinaryXInputStream : public BinaryXSeekableStream, public BinaryInputStrea
 public:
     /** Constructs the wrapper object for the passed input stream.
 
-        @param rxInStream  The com.sun.star.io.XInputStream interface of the
-            input stream to be wrapped.
-        @param bAutoClose  True = automatically close the wrapped input stream
-            on destruction of this wrapper.
+        @param rxInStream
+            The com.sun.star.io.XInputStream interface of the UNO input stream
+            to be wrapped.
+
+        @param bAutoClose
+            True = automatically close the wrapped input stream on destruction
+            of this wrapper or when close() is called.
      */
     explicit            BinaryXInputStream(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
@@ -155,26 +311,26 @@ public:
 
     virtual             ~BinaryXInputStream();
 
+    /** Closes the input stream. Does also close the wrapped UNO input stream
+        if bAutoClose has been set to true in the constructor. */
+    virtual void        close();
+
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
     /** Reads nBytes bytes to the (existing) buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
     /** Seeks the stream forward by the passed number of bytes. This works for
         non-seekable streams too. */
-    virtual void        skip( sal_Int32 nBytes );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
 
-    /** Stream operator for integral and floating-point types. */
+    /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
     inline BinaryXInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; }
 
-    /** Returns the XInputStream interface of the wrapped input stream. */
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
-                        getXInputStream() const { return mxInStrm; }
-    /** Closes the wrapped XInputStream. */
-    void                close();
-
 private:
     StreamDataSequence  maBuffer;       /// Data buffer used in readMemory() function.
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
@@ -182,8 +338,6 @@ private:
     bool                mbAutoClose;    /// True = automatically close stream on destruction.
 };
 
-typedef ::boost::shared_ptr< BinaryXInputStream > BinaryXInputStreamRef;
-
 // ============================================================================
 
 /** Wraps a StreamDataSequence and provides convenient access functions.
@@ -204,86 +358,97 @@ public:
 
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
     /** Reads nBytes bytes to the (existing) buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
     /** Seeks the stream forward by the passed number of bytes. This works for
         non-seekable streams too. */
-    virtual void        skip( sal_Int32 nBytes );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
 
-    /** Stream operator for integral and floating-point types. */
+    /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
     inline SequenceInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; }
-};
 
-typedef ::boost::shared_ptr< SequenceInputStream > SequenceInputStreamRef;
+private:
+    /** Returns the number of bytes available in the sequence for the passed byte count. */
+    inline sal_Int32    getMaxBytes( sal_Int32 nBytes ) const
+                            { return getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mpData->getLength() - mnPos ); }
+};
 
 // ============================================================================
 
 /** Wraps a BinaryInputStream and provides access to a specific part of the
     stream data.
 
-    @descr
-        Provides access to the stream data block starting at the current
-        position of the stream, and with a specific length. If the wrapped
-        stream is seekable, this wrapper will treat the position the wrapped
-        has at construction time as position "0" (therefore the class name).
+    Provides access to the stream data block starting at the current position
+    of the stream, and with a specific length. If the wrapped stream is
+    seekable, this wrapper will treat the position of the wrapped stream at
+    construction time as position "0" (therefore the class name).
+
+    The passed input stream MUST live at least as long as this stream wrapper.
+    The stream MUST NOT be changed from outside as long as this stream wrapper
+    is used to read from it.
  */
 class RelativeInputStream : public BinaryInputStream
 {
 public:
     /** Constructs the wrapper object for the passed stream.
 
-        @attention
-            The passed input stream MUST live at least as long as this stream
-            wrapper. The stream MUST NOT be changed from outside as long as
-            this stream wrapper is used to read from it.
-            
-        @param nLength
+        @param nSize
             If specified, restricts the amount of data that can be read from
             the passed input stream.
      */
     explicit            RelativeInputStream(
                             BinaryInputStream& rInStrm,
-                            sal_Int64 nLength = SAL_MAX_INT64 );
+                            sal_Int64 nSize = SAL_MAX_INT64 );
 
-    /** Returns whether the wrapped stream is seekable. */
-    virtual bool        isSeekable() const;
     /** Returns the size of the data block in the wrapped stream offered by
         this wrapper. */
-    virtual sal_Int64   getLength() const;
+    virtual sal_Int64   size() const;
+
     /** Returns the current relative stream position. */
     virtual sal_Int64   tell() const;
+
     /** Seeks the stream to the passed relative position, if the wrapped stream
         is seekable. */
     virtual void        seek( sal_Int64 nPos );
 
+    /** Closes the input stream but not the wrapped stream. */
+    virtual void        close();
+
     /** Reads nBytes bytes to the passed sequence. Does not read out of the
         data block whose size has been specified on construction.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
     /** Reads nBytes bytes to the (existing) buffer opMem. Does not read out of
         the data block whose size has been specified on construction.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
     /** Seeks the stream forward by the passed number of bytes. This works for
         non-seekable streams too. Does not seek out of the data block. */
-    virtual void        skip( sal_Int32 nBytes );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
 
-    /** Stream operator for integral and floating-point types. */
+    /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
     inline RelativeInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; }
 
 private:
-    BinaryInputStream&  mrInStrm;
+    /** Returns the number of bytes available in the sequence for the passed byte count. */
+    inline sal_Int32    getMaxBytes( sal_Int32 nBytes ) const
+                            { return getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnSize - mnRelPos ); }
+
+private:
+    BinaryInputStream*  mpInStrm;
     sal_Int64           mnStartPos;
     sal_Int64           mnRelPos;
-    sal_Int64           mnLength;
+    sal_Int64           mnSize;
 };
 
-typedef ::boost::shared_ptr< RelativeInputStream > RelativeInputStreamRef;
-
 // ============================================================================
 
 } // namespace oox
diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx
index e44a6aa4b..6cc790934 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -29,10 +29,12 @@
 #ifndef OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 #define OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 
-#include <boost/shared_ptr.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
 #include "oox/helper/binarystreambase.hxx"
 
+namespace com { namespace sun { namespace star {
+    namespace io { class XOutputStream; }
+} } }
+
 namespace oox {
 
 // ============================================================================
@@ -44,24 +46,38 @@ namespace oox {
 class BinaryOutputStream : public virtual BinaryStreamBase
 {
 public:
-    /** Derived classes implement writing the passed data sequence. */
-    virtual void        writeData( const StreamDataSequence& rData ) = 0;
-    /** Derived classes implement writing from the (existing) buffer pMem. */
-    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes ) = 0;
+    /** Derived classes implement writing the contents of the passed data
+        sequence.
+
+        @param nAtomSize
+            The size of the elements in the memory block, if available. Derived
+            classes may be interested in this information.
+     */
+    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) = 0;
+
+    /** Derived classes implement writing the contents of the (preallocated!)
+        memory buffer pMem.
+
+        @param nAtomSize
+            The size of the elements in the memory block, if available. Derived
+            classes may be interested in this information.
+     */
+    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) = 0;
 
     /** Writes a value to the stream and converts it to platform byte order.
-        Supported types: SAL integers (8 to 64 bit), float, double. */
+        All data types supported by the ByteOrderConverter class can be used.
+     */
     template< typename Type >
     void                writeValue( Type nValue );
-    /** Stream operator for integral and floating-point types. */
+
+    /** Stream operator for all data types supported by the writeValue() function. */
     template< typename Type >
     inline BinaryOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
 
-private:
-    /** Used by the writeValue() template function to write built-in types.
-        @descr  Derived classes may overwrite this default implementation which
-            simply calls writeMemory() with something own. */
-    virtual void        writeAtom( const void* pMem, sal_uInt8 nSize );
+protected:
+    /** This dummy default c'tor will never call the c'tor of the virtual base
+        class BinaryStreamBase as this class cannot be instanciated directly. */
+    inline explicit     BinaryOutputStream() : BinaryStreamBase( false ) {}
 };
 
 typedef ::boost::shared_ptr< BinaryOutputStream > BinaryOutputStreamRef;
@@ -71,14 +87,13 @@ typedef ::boost::shared_ptr< BinaryOutputStream > BinaryOutputStreamRef;
 template< typename Type >
 void BinaryOutputStream::writeValue( Type nValue )
 {
-    // can be instanciated for all types supported in class ByteOrderConverter
     ByteOrderConverter::convertLittleEndian( nValue );
-    writeMemory( &nValue, static_cast< sal_Int32 >( sizeof( Type ) ) );
+    writeMemory( &nValue, static_cast< sal_Int32 >( sizeof( Type ) ), sizeof( Type ) );
 }
 
 // ============================================================================
 
-/** Wraps a com.sun.star.io.XOutputStream and provides convenient access functions.
+/** Wraps a UNO output stream and provides convenient access functions.
 
     The binary data in the stream is written in little-endian format.
  */
@@ -87,10 +102,13 @@ class BinaryXOutputStream : public BinaryXSeekableStream, public BinaryOutputStr
 public:
     /** Constructs the wrapper object for the passed output stream.
 
-        @param rxOutStream  The com.sun.star.io.XOutputStream interface of the
-            output stream to be wrapped.
-        @param bAutoClose  True = automatically close the wrapped output stream
-            on destruction of this wrapper.
+        @param rxOutStream
+            The com.sun.star.io.XOutputStream interface of the output stream to
+            be wrapped.
+
+        @param bAutoClose
+            True = automatically close the wrapped output stream on destruction
+            of this wrapper or when close() is called.
      */
     explicit            BinaryXOutputStream(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxOutStrm,
@@ -98,20 +116,23 @@ public:
 
     virtual             ~BinaryXOutputStream();
 
+    /** Flushes and closes the output stream. Does also close the wrapped UNO
+        output stream if bAutoClose has been set to true in the constructor. */
+    void                close();
+
     /** Writes the passed data sequence. */
-    virtual void        writeData( const StreamDataSequence& rData );
-    /** Write nBytes bytes from the (existing) buffer pMem. */
-    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes );
+    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 );
+
+    /** Write nBytes bytes from the (preallocated!) buffer pMem. */
+    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
 
-    /** Stream operator for integral and floating-point types. */
+    /** Stream operator for all data types supported by the writeValue() function. */
     template< typename Type >
     inline BinaryXOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
 
     /** Returns the XOutputStream interface of the wrapped output stream. */
     inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
                         getXOutputStream() const { return mxOutStrm; }
-    /** Flushes and closes the wrapped XOutputStream. */
-    void                close();
 
 private:
     StreamDataSequence  maBuffer;       /// Data buffer used in writeMemory() function.
@@ -120,8 +141,6 @@ private:
     bool                mbAutoClose;    /// True = automatically close stream on destruction.
 };
 
-typedef ::boost::shared_ptr< BinaryXOutputStream > BinaryXOutputStreamRef;
-
 // ============================================================================
 
 /** Wraps a StreamDataSequence and provides convenient access functions.
@@ -143,17 +162,16 @@ public:
     explicit            SequenceOutputStream( StreamDataSequence& rData );
 
     /** Writes the passed data sequence. */
-    virtual void        writeData( const StreamDataSequence& rData );
-    /** Write nBytes bytes from the (existing) buffer pMem. */
-    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes );
+    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 );
 
-    /** Stream operator for integral and floating-point types. */
+    /** Write nBytes bytes from the (preallocated!) buffer pMem. */
+    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+
+    /** Stream operator for all data types supported by the writeValue() function. */
     template< typename Type >
     inline SequenceOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
 };
 
-typedef ::boost::shared_ptr< SequenceOutputStream > SequenceOutputStreamRef;
-
 // ============================================================================
 
 } // namespace oox
diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/oox/inc/oox/helper/binarystreambase.hxx
index cedb85cd8..ffa3c0bec 100644
--- a/oox/inc/oox/helper/binarystreambase.hxx
+++ b/oox/inc/oox/helper/binarystreambase.hxx
@@ -30,75 +30,123 @@
 #define OOX_HELPER_BINARYSTREAMBASE_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/io/XSeekable.hpp>
+#include <boost/shared_ptr.hpp>
 #include "oox/helper/helper.hxx"
 
+namespace com { namespace sun { namespace star {
+    namespace io { class XSeekable; }
+} } }
+
 namespace oox {
 
 typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence;
 
 // ============================================================================
 
-/** Base interface for binary stream classes. Implemenetations may or may not
-    support seeking the stream. */
+/** Base class for binary stream classes.
+ */
 class BinaryStreamBase
 {
 public:
     virtual             ~BinaryStreamBase();
+    
+    /** Implementations return the size of the stream, if possible.
 
-    /** Derived classes return whether the stream is seekable. Default: false. */
-    virtual bool        isSeekable() const;
-    /** Derived classes return the size of the stream, if possible,
-        otherwise/default: -1. May return something for unseekable streams. */
-    virtual sal_Int64   getLength() const;
-    /** Derived classes return the current stream position, if possible,
-        otherwise/default: -1. May return something for unseekable streams. */
-    virtual sal_Int64   tell() const;
-    /** Derived classes implement seeking the stream to the passed position, if
-        the stream is seekable. */
-    virtual void        seek( sal_Int64 nPos );
+        This function may be implemented for some types of unseekable streams,
+        and MUST be implemented for all seekable streams.
+
+        @return
+            The size of the stream in bytes, or -1, if not implemented.
+     */
+    virtual sal_Int64   size() const = 0;
+
+    /** Implementations return the current stream position, if possible.
+
+        This function may be implemented for some types of unseekable streams,
+        and MUST be implemented for all seekable streams.
+
+        @return
+            The current position in the stream, or -1, if not implemented.
+     */
+    virtual sal_Int64   tell() const = 0;
+
+    /** Implementations seek the stream to the passed position, if
+        the stream is seekable.
+     */
+    virtual void        seek( sal_Int64 nPos ) = 0;
+
+    /** Implementations close the stream.
+     */
+    virtual void        close() = 0;
+
+    /** Returns true, if the implementation supports the seek() operation.
+
+        Implementations may still implement size() and tell() even if the
+        stream is not seekable.
+     */
+    inline bool         isSeekable() const { return mbSeekable; }
 
     /** Returns true, if the stream position is invalid (EOF). This flag turns
-        true *after* the first attempt to seek/read beyond the stream end. */
+        true *after* the first attempt to seek/read beyond the stream end.
+     */
     inline bool         isEof() const { return mbEof; }
 
-    /** Returns the size of the remaining data, if stream is seekable, otherwise -1. */
+    /** Returns the size of the remaining data available in the stream, if
+        stream supports size() and tell(), otherwise -1.
+     */
     sal_Int64           getRemaining() const;
-    /** Seeks the stream to the beginning, if stream is seekable. */
+
+    /** Seeks the stream to the beginning, if stream is seekable.
+     */
     inline void         seekToStart() { seek( 0 ); }
-    /** Seeks the stream to the end, if stream is seekable. */
-    inline void         seekToEnd() { seek( getLength() ); }
+
+    /** Seeks the stream to the end, if stream is seekable.
+     */
+    inline void         seekToEnd() { seek( size() ); }
+
     /** Seeks the stream forward to a position that is a multiple of the passed
-        block size, relative to the passed stream position, if stream is seekable. */
+        block size, if stream is seekable.
+        
+        @param nBlockSize
+            The size of the data blocks the streams needs to be aligned to.
+            
+        @param nAnchorPos
+            Position in the stream the data blocks are aligned to.
+     */
     void                alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos = 0 );
 
 protected:
-    inline explicit     BinaryStreamBase() : mbEof( false ) {}
+    inline explicit     BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {}
 
 private:
                         BinaryStreamBase( const BinaryStreamBase& );
     BinaryStreamBase&   operator=( const BinaryStreamBase& );
 
 protected:
-    bool                mbEof;
+    bool                mbEof;          /// End of stream flag.
+
+private:
+    const bool          mbSeekable;     /// True = implementation supports seeking.
 };
 
 // ============================================================================
 
-/** Base class for binary input and output streams wrapping an API stream,
+/** Base class for binary input and output streams wrapping a UNO stream,
     seekable via the com.sun.star.io.XSeekable interface.
  */
 class BinaryXSeekableStream : public virtual BinaryStreamBase
 {
 public:
-    /** Returns true, if the wrapped stream is seekable. */
-    virtual bool        isSeekable() const;
-    /** Returns the size of the stream, if stream is seekable, otherwise -1. */
-    virtual sal_Int64   getLength() const;
-    /** Returns the current stream position, if stream is seekable, otherwise -1. */
+    virtual             ~BinaryXSeekableStream();
+
+    /** Returns the size of the stream, if wrapped stream is seekable, otherwise -1. */
+    virtual sal_Int64   size() const;
+    /** Returns the current stream position, if wrapped stream is seekable, otherwise -1. */
     virtual sal_Int64   tell() const;
-    /** Seeks the stream to the passed position, if stream is seekable. */
+    /** Seeks the stream to the passed position, if wrapped stream is seekable. */
     virtual void        seek( sal_Int64 nPos );
+    /** Releases the reference to the UNO XSeekable interface. */
+    virtual void        close();
 
 protected:
     explicit            BinaryXSeekableStream(
@@ -112,31 +160,29 @@ private:
 // ============================================================================
 
 /** Base class for binary input and output streams wrapping a
-    StreamDataSequence, which is always seekable. */
+    StreamDataSequence, which is always seekable.
+
+    The wrapped data sequence MUST live at least as long as this stream
+    wrapper. The data sequence MUST NOT be changed from outside as long as this
+    stream wrapper is used to modify it.
+ */
 class SequenceSeekableStream : public virtual BinaryStreamBase
 {
 public:
-    /** Returns true (data sequence streams are always seekable). */
-    virtual bool        isSeekable() const;
     /** Returns the size of the wrapped data sequence. */
-    virtual sal_Int64   getLength() const;
+    virtual sal_Int64   size() const;
     /** Returns the current stream position. */
     virtual sal_Int64   tell() const;
     /** Seeks the stream to the passed position. */
     virtual void        seek( sal_Int64 nPos );
+    /** Releases the reference to the data sequence. */
+    virtual void        close();
 
 protected:
-    /** Constructs the wrapper object for the passed data sequence.
-
-        @attention
-            The passed data sequence MUST live at least as long as this stream
-            wrapper. The data sequence MUST NOT be changed from outside as long
-            as this stream wrapper is used to modify it.
-     */
-    inline explicit     SequenceSeekableStream( const StreamDataSequence& rData ) : mrData( rData ), mnPos( 0 ) {}
+    explicit            SequenceSeekableStream( const StreamDataSequence& rData );
 
 protected:
-    const StreamDataSequence& mrData;   /// Wrapped data sequence.
+    const StreamDataSequence* mpData;   /// Wrapped data sequence.
     sal_Int32           mnPos;          /// Current position in the sequence.
 };
 
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index 73998b527..6366b8362 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_HELPER_CONTAINERHELPER_HXX
 #define OOX_HELPER_CONTAINERHELPER_HXX
 
-#include <vector>
 #include <map>
+#include <vector>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
@@ -41,11 +41,59 @@ namespace com { namespace sun { namespace star {
     namespace container { class XIndexContainer; }
     namespace container { class XNameAccess; }
     namespace container { class XNameContainer; }
-    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox {
 
+// ============================================================================
+
+/** A range of signed 32-bit integer values. */
+struct ValueRange
+{
+    sal_Int32           mnFirst;
+    sal_Int32           mnLast;
+
+    inline explicit     ValueRange( sal_Int32 nValue = 0 ) : mnFirst( nValue ), mnLast( nValue ) {}
+    inline explicit     ValueRange( sal_Int32 nFirst, sal_Int32 nLast ) : mnFirst( nFirst ), mnLast( nLast ) {}
+
+    inline bool         operator==( const ValueRange& rRange ) const { return (mnFirst == rRange.mnFirst) && (mnLast == rRange.mnLast); }
+    inline bool         operator!=( const ValueRange& rRange ) const { return !(*this == rRange); }
+    inline bool         contains( sal_Int32 nValue ) const { return (mnFirst <= nValue) && (nValue <= mnLast); }
+    inline bool         contains( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnFirst) && (rRange.mnLast <= mnLast); }
+    inline bool         intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); }
+};
+
+// ----------------------------------------------------------------------------
+
+typedef ::std::vector< ValueRange > ValueRangeVector;
+
+// ----------------------------------------------------------------------------
+
+/** An ordered list of value ranges. The insertion operation will merge
+    consecutive value ranges.
+ */
+class ValueRangeSet
+{
+public:
+    inline explicit     ValueRangeSet() {}
+
+    /** Inserts the passed value into the range list. */
+    inline void         insert( sal_Int32 nValue ) { insert( ValueRange( nValue ) ); }
+    /** Inserts the passed value range into the range list. */
+    void                insert( const ValueRange& rRange );
+
+    /** Returns the ordered list of all value ranges. */
+    inline const ValueRangeVector& getRanges() const { return maRanges; }
+    /** Returns an intersection of the range list and the passed range. */
+    ValueRangeVector    getIntersection( const ValueRange& rRange ) const;
+
+private:
+    ValueRangeVector    maRanges;
+};
+
+// ============================================================================
+
 /** Template for a 2-dimensional array of objects.
 
     This class template provides a similar interface to the ::std::vector
@@ -123,7 +171,7 @@ public:
 
     /** Creates a new index container object from scratch. */
     static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
-                        createIndexContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory );
+                        createIndexContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
     /** Inserts an object into an indexed container.
 
@@ -145,7 +193,7 @@ public:
 
     /** Creates a new name container object from scratch. */
     static ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
-                        createNameContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory );
+                        createNameContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
     /** Returns a name that is not used in the passed name container.
 
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index 8e8c6aa97..9e486341c 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -158,7 +158,7 @@ private:
     typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque;
     typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCompContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > mxGraphicProvider;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnitConversion > mxUnitConversion;
     ::com::sun::star::awt::DeviceInfo maDeviceInfo; /// Current output device info.
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index f370d6b3c..28b1c0dc0 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/oox/inc/oox/helper/helper.hxx
@@ -241,9 +241,9 @@ private:
 class ByteOrderConverter
 {
 public:
+#ifdef OSL_BIGENDIAN
     inline static void  convertLittleEndian( sal_Int8& ) {}     // present for usage in templates
     inline static void  convertLittleEndian( sal_uInt8& ) {}    // present for usage in templates
-#ifdef OSL_BIGENDIAN
     inline static void  convertLittleEndian( sal_Int16& rnValue )  { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
     inline static void  convertLittleEndian( sal_uInt16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
     inline static void  convertLittleEndian( sal_Int32& rnValue )  { swap4( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
@@ -252,15 +252,20 @@ public:
     inline static void  convertLittleEndian( sal_uInt64& rnValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
     inline static void  convertLittleEndian( float& rfValue )      { swap4( reinterpret_cast< sal_uInt8* >( &rfValue ) ); }
     inline static void  convertLittleEndian( double& rfValue )     { swap8( reinterpret_cast< sal_uInt8* >( &rfValue ) ); }
+
+    template< typename Type >
+    inline static void  convertLittleEndianArray( Type* pnArray, size_t nElemCount );
+
+    inline static void  convertLittleEndianArray( sal_Int8*, size_t ) {}
+    inline static void  convertLittleEndianArray( sal_uInt8*, size_t ) {}
+
 #else
-    inline static void  convertLittleEndian( sal_Int16& ) {}
-    inline static void  convertLittleEndian( sal_uInt16& ) {}
-    inline static void  convertLittleEndian( sal_Int32& ) {}
-    inline static void  convertLittleEndian( sal_uInt32& ) {}
-    inline static void  convertLittleEndian( sal_Int64& ) {}
-    inline static void  convertLittleEndian( sal_uInt64& ) {}
-    inline static void  convertLittleEndian( float& ) {}
-    inline static void  convertLittleEndian( double& ) {}
+    template< typename Type >
+    inline static void  convertLittleEndian( Type& ) {}
+
+    template< typename Type >
+    inline static void  convertLittleEndianArray( Type*, size_t ) {}
+
 #endif
 
     /** Reads a value from memory, assuming memory buffer in little-endian.
@@ -302,6 +307,13 @@ inline void ByteOrderConverter::writeLittleEndian( void* pDstBuffer, Type nValue
 }
 
 #ifdef OSL_BIGENDIAN
+template< typename Type >
+inline void ByteOrderConverter::convertLittleEndianArray( Type* pnArray, size_t nElemCount )
+{
+    for( Type* pnArrayEnd = pnArray + nElemCount; pnArray != pnArrayEnd; ++pnArray )
+        convertLittleEndian( *pnArray );
+}
+
 inline void ByteOrderConverter::swap2( sal_uInt8* pnData )
 {
     ::std::swap( pnData[ 0 ], pnData[ 1 ] );
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/oox/inc/oox/helper/modelobjecthelper.hxx
index d45725fc2..15bb9bf26 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -49,7 +49,7 @@ class ObjectContainer
 {
 public:
     explicit            ObjectContainer(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
                             const ::rtl::OUString& rServiceName );
                         ~ObjectContainer();
 
@@ -69,8 +69,8 @@ private:
     void                createContainer() const;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        mxFactory;              /// Factory to create the container.
+    mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+                        mxModelFactory;         /// Factory to create the container.
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxContainer;            /// Container for the objects.
     ::rtl::OUString     maServiceName;          /// Service name to create the container.
@@ -82,9 +82,9 @@ private:
 /** Contains tables for named drawing objects for a document model.
 
     Contains tables for named line markers, line dashes, fill gradients, and
-    fill bitmaps. The class is needed to handle different document models in
-    the same filter (e.g. embedded charts) which carry their own drawing object
-    tables.
+    fill bitmap URLs. The class is needed to handle different document models
+    in the same filter (e.g. embedded charts) which carry their own drawing
+    object tables.
  */
 class ModelObjectHelper
 {
@@ -109,18 +109,18 @@ public:
         an internal constant name with a new unused index appended. */
     ::rtl::OUString     insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient );
 
-    /** Inserts a new named fill bitmap, returns the bitmap name, based on an
-        internal constant name with a new unused index appended. */
-    ::rtl::OUString     insertFillBitmap( const ::rtl::OUString& rGraphicUrl );
+    /** Inserts a new named fill bitmap URL, returns the bitmap name, based on
+        an internal constant name with a new unused index appended. */
+    ::rtl::OUString     insertFillBitmapUrl( const ::rtl::OUString& rGraphicUrl );
 
 private:
     ObjectContainer     maMarkerContainer;      /// Contains all named line markers (line end polygons).
     ObjectContainer     maDashContainer;        /// Contains all named line dsahes.
     ObjectContainer     maGradientContainer;    /// Contains all named fill gradients.
-    ObjectContainer     maBitmapContainer;      /// Contains all named fill bitmaps.
+    ObjectContainer     maBitmapUrlContainer;   /// Contains all named fill bitmap URLs.
     const ::rtl::OUString maDashNameBase;       /// Base name for all named line dashes.
     const ::rtl::OUString maGradientNameBase;   /// Base name for all named fill gradients.
-    const ::rtl::OUString maBitmapNameBase;     /// Base name for all named fill bitmaps.
+    const ::rtl::OUString maBitmapUrlNameBase;  /// Base name for all named fill bitmap URLs.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx
index 24b6d07d6..95a938e32 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -60,7 +60,6 @@ class PropertyMap : public PropertyMapBase
 {
 public:
     explicit            PropertyMap();
-                        ~PropertyMap();
 
     /** Returns the name of the passed property identifier. */
     static const ::rtl::OUString& getPropertyName( sal_Int32 nPropId );
@@ -74,9 +73,18 @@ public:
 
     /** Sets the specified property to the passed value. Does nothing, if the
         identifier is invalid. */
+    inline bool         setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue )
+                            { if( nPropId < 0 ) return false; (*this)[ nPropId ] = rValue; return true; }
+
+    /** Sets the specified property to the passed value. Does nothing, if the
+        identifier is invalid. */
     template< typename Type >
-    inline void         setProperty( sal_Int32 nPropId, const Type& rValue )
-                            { if( nPropId >= 0 ) (*this)[ nPropId ] <<= rValue; }
+    inline bool         setProperty( sal_Int32 nPropId, const Type& rValue )
+                            { if( nPropId < 0 ) return false; (*this)[ nPropId ] <<= rValue; return true; }
+
+    /** Inserts all properties contained in the passed property map. */
+    inline void         assignUsed( const PropertyMap& rPropMap )
+                            { insert( rPropMap.begin(), rPropMap.end() ); }
 
     /** Returns a sequence of property values, filled with all contained properties. */
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
@@ -87,7 +95,7 @@ public:
                             ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames,
                             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) const;
 
-    /** Creates and fills a new instance supporting the XPropertySet interface. */
+    /** Creates a property set supporting the XPropertySet interface and inserts all properties. */
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                         makePropertySet() const;
 
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index f03a941dd..f4a8282fa 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -29,8 +29,9 @@
 #ifndef OOX_HELPER_PROPERTYSET_HXX
 #define OOX_HELPER_PROPERTYSET_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include "oox/token/properties.hxx"
 
 namespace oox {
@@ -83,24 +84,25 @@ public:
     inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                         getXPropertySet() const { return mxPropSet; }
 
+    /** Returns true, if the specified property is supported by the property set. */
+    bool                hasProperty( sal_Int32 nPropId ) const;
+
     // Get properties ---------------------------------------------------------
 
     /** Gets the specified property from the property set.
-        @return  true, if the any could be filled with the property value. */
-    bool                getAnyProperty( ::com::sun::star::uno::Any& orValue, sal_Int32 nPropId ) const;
+        @return  the property value, or an empty Any, if the property is missing. */
+    ::com::sun::star::uno::Any getAnyProperty( sal_Int32 nPropId ) const;
 
     /** Gets the specified property from the property set.
         @return  true, if the passed variable could be filled with the property value. */
     template< typename Type >
-    inline bool         getProperty( Type& orValue, sal_Int32 nPropId ) const;
-
-    /** Gets the specified property from the property set.
-        @return  the property value, or an empty Any, if the property is missing. */
-    ::com::sun::star::uno::Any getAnyProperty( sal_Int32 nPropId ) const;
+    inline bool         getProperty( Type& orValue, sal_Int32 nPropId ) const
+                            { return getAnyProperty( nPropId ) >>= orValue; }
 
     /** Gets the specified boolean property from the property set.
         @return  true = property contains true; false = property contains false or error occurred. */
-    bool                getBoolProperty( sal_Int32 nPropId ) const;
+    inline bool         getBoolProperty( sal_Int32 nPropId ) const
+                            { bool bValue = false; return getProperty( bValue, nPropId ) && bValue; }
 
     /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface.
         @param orValues  (out-parameter) The related property values.
@@ -112,11 +114,12 @@ public:
     // Set properties ---------------------------------------------------------
 
     /** Puts the passed any into the property set. */
-    void                setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+    bool                setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
 
     /** Puts the passed value into the property set. */
     template< typename Type >
-    inline void         setProperty( sal_Int32 nPropId, const Type& rValue );
+    inline bool         setProperty( sal_Int32 nPropId, const Type& rValue )
+                            { return setAnyProperty( nPropId, ::com::sun::star::uno::Any( rValue ) ); }
 
     /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface.
         @param rPropNames  The property names. MUST be ordered alphabetically.
@@ -137,33 +140,20 @@ public:
 private:
     /** Gets the specified property from the property set.
         @return  true, if the any could be filled with the property value. */
-    bool                getAnyProperty( ::com::sun::star::uno::Any& orValue, const ::rtl::OUString& rPropName ) const;
+    bool                implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const ::rtl::OUString& rPropName ) const;
 
     /** Puts the passed any into the property set. */
-    void                setAnyProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
+    bool                implSetPropertyValue( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                         mxPropSet;          /// The mandatory property set interface.
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet >
                         mxMultiPropSet;     /// The optional multi property set interface.
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+                        mxPropSetInfo;      /// Property information.
 };
 
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-inline bool PropertySet::getProperty( Type& orValue, sal_Int32 nPropId ) const
-{
-    ::com::sun::star::uno::Any aAny;
-    return getAnyProperty( aAny, nPropId ) && (aAny >>= orValue);
-}
-
-template< typename Type >
-inline void PropertySet::setProperty( sal_Int32 nPropId, const Type& rValue )
-{
-    setAnyProperty( nPropId, ::com::sun::star::uno::Any( rValue ) );
-}
-
 // ============================================================================
 
 } // namespace oox
diff --git a/oox/inc/oox/helper/textinputstream.hxx b/oox/inc/oox/helper/textinputstream.hxx
index 5b1d1424c..545ba5048 100644..100755
--- a/oox/inc/oox/helper/textinputstream.hxx
+++ b/oox/inc/oox/helper/textinputstream.hxx
@@ -26,29 +26,100 @@
  *
  ************************************************************************/
 
-#ifndef OOX_HELPER_RECORDINPUTSTREAM_HXX
-#define OOX_HELPER_RECORDINPUTSTREAM_HXX
+#ifndef OOX_HELPER_TEXTINPUTSTREAM_HXX
+#define OOX_HELPER_TEXTINPUTSTREAM_HXX
 
-#include "oox/helper/binaryinputstream.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+    namespace io { class XTextInputStream; }
+    namespace uno { class XComponentContext; }
+} } }
 
 namespace oox {
 
+class BinaryInputStream;
+
 // ============================================================================
 
 class TextInputStream
 {
 public:
-    explicit            TextInputStream( BinaryInputStream& rInStrm, rtl_TextEncoding eTextEnc );
+    explicit            TextInputStream(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            rtl_TextEncoding eTextEnc );
+
+    explicit            TextInputStream(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            BinaryInputStream& rInStrm,
+                            rtl_TextEncoding eTextEnc );
+
+                        ~TextInputStream();
 
-    /** Returns true, if the wrapped input stream is in EOF state. */
+    /** Returns true, if no more text is available in the stream.
+     */
     bool                isEof() const;
-    /** Reads a text line from the stream. */
+
+    /** Reads a text line from the stream.
+
+        If the last line in the stream is not terminated with line-end
+        character(s), the stream will immediately go into EOF state and return
+        the text line. Otherwise, if the last character in the stream is a
+        line-end character, the next call to this function will turn the stream
+        into EOF state and return an empty string.
+     */
     ::rtl::OUString     readLine();
 
+    /** Reads a text portion from the stream until the specified character is
+        found.
+
+        If the end of the stream is not terminated with the specified
+        character, the stream will immediately go into EOF state and return the
+        remaining text portion. Otherwise, if the last character in the stream
+        is the specified character (and caller specifies to read and return it,
+        see parameter bIncludeChar), the next call to this function will turn
+        the stream into EOF state and return an empty string.
+
+        @param cChar
+            The separator character to be read to.
+
+        @param bIncludeChar
+            True = if found, the specified character will be read from stream
+                and included in the returned string.
+            False = the specified character will neither be read from the
+                stream nor included in the returned string, but will be
+                returned as first character in the next call of this function
+                or readLine().
+     */
+    ::rtl::OUString     readToChar( sal_Unicode cChar, bool bIncludeChar );
+
+    // ------------------------------------------------------------------------
+    
+    /** Creates a UNO text input stream object from the passed UNO input stream.
+     */
+    static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
+                        createXTextInputStream(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            rtl_TextEncoding eTextEnc );
+
+    // ------------------------------------------------------------------------
+private:
+    void                init(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
+                            rtl_TextEncoding eTextEnc );
+
+    /** Adds the pending character in front of the passed string, if existing. */
+    ::rtl::OUString     createFinalString( const ::rtl::OUString& rString );
+    
 private:
-    BinaryInputStream&  mrInStrm;
-    rtl_TextEncoding    meTextEnc;
-    sal_Unicode         mcLastEolChar;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
+                        mxTextStrm;
+    sal_Unicode         mcPendingChar;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/helper/zipstorage.hxx b/oox/inc/oox/helper/zipstorage.hxx
index b31a845ed..33e4c0c6c 100644
--- a/oox/inc/oox/helper/zipstorage.hxx
+++ b/oox/inc/oox/helper/zipstorage.hxx
@@ -32,7 +32,7 @@
 #include "oox/helper/storagebase.hxx"
 
 namespace com { namespace sun { namespace star {
-    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox {
@@ -44,11 +44,11 @@ class ZipStorage : public StorageBase
 {
 public:
     explicit            ZipStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream );
 
     explicit            ZipStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxStream );
 
     virtual             ~ZipStorage();
@@ -84,9 +84,8 @@ private:
     virtual void        implCommit() const;
 
 private:
-    typedef ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > XStorageRef;
-
-    XStorageRef         mxStorage;      /// Storage based on input or output stream.
+    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
+                        mxStorage;      /// Storage based on input or output stream.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx
index 9f9b03cbb..9dcae3a51 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -41,7 +41,7 @@ namespace ole {
 /** A wrapper for a binary input stream that supports aligned read operations.
 
     The implementation does not support seeking back the wrapped stream. All
-    seeking operations (tell, seek, align) are performed relative to the
+    seeking operations (tell, seekTo, align) are performed relative to the
     position of the wrapped stream at construction time of this wrapper. It is
     possible to construct this wrapper with an unseekable input stream without
     loosing any functionality.
@@ -51,21 +51,26 @@ class AxAlignedInputStream : public BinaryInputStream
 public:
     explicit            AxAlignedInputStream( BinaryInputStream& rInStrm );
 
+    /** Returns the size of the data this stream represents, if the wrapped
+        stream supports the size() operation. */
+    virtual sal_Int64   size() const;
     /** Return the current relative stream position (relative to position of
         the wrapped stream at construction time). */
     virtual sal_Int64   tell() const;
     /** Seeks the stream to the passed relative position, if it is behind the
         current position. */
     virtual void        seek( sal_Int64 nPos );
+    /** Closes the input stream but not the wrapped stream. */
+    virtual void        close();
 
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
     /** Reads nBytes bytes to the (existing) buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
     /** Seeks the stream forward by the passed number of bytes. */
-    virtual void        skip( sal_Int32 nBytes );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
 
     /** Aligns the stream to a multiple of the passed size (relative to the
         position of the wrapped stream at construction time). */
@@ -79,8 +84,9 @@ public:
     inline void         skipAligned() { align( sizeof( Type ) ); skip( sizeof( Type ) ); }
 
 private:
-    BinaryInputStream&  mrInStrm;           /// The wrapped input stream.
+    BinaryInputStream*  mpInStrm;           /// The wrapped input stream.
     sal_Int64           mnStrmPos;          /// Tracks relative position in the stream.
+    sal_Int64           mnStrmSize;         /// Size of the wrapped stream data.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/oox/inc/oox/ole/oleobjecthelper.hxx
index c3cabf38d..131eecaff 100644
--- a/oox/inc/oox/ole/oleobjecthelper.hxx
+++ b/oox/inc/oox/ole/oleobjecthelper.hxx
@@ -64,7 +64,7 @@ class OleObjectHelper
 {
 public:
     explicit            OleObjectHelper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory );
                         ~OleObjectHelper();
 
     bool                importOleObject(
diff --git a/oox/inc/oox/ole/olestorage.hxx b/oox/inc/oox/ole/olestorage.hxx
index 315b948a3..6f5756532 100644..100755
--- a/oox/inc/oox/ole/olestorage.hxx
+++ b/oox/inc/oox/ole/olestorage.hxx
@@ -33,7 +33,7 @@
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
-    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox {
@@ -46,12 +46,12 @@ class OOX_DLLPUBLIC OleStorage : public StorageBase
 {
 public:
     explicit            OleStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
                             bool bBaseStreamAccess );
 
     explicit            OleStorage(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
                             bool bBaseStreamAccess );
 
@@ -102,8 +102,8 @@ private:
     virtual void        implCommit() const;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        mxFactory;          /// Factory for storage/stream creation.
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+                        mxContext;          /// Component context with service manager.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxStorage;          /// Access to elements of this sub storage.
     const OleStorage*   mpParentStorage;    /// Parent OLE storage that contains this storage.
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 9f7ef2232..0c7d88007 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -204,7 +204,7 @@ public:
                            rtl_TextEncoding eTextEnc );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCompContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
     ControlConverter    maConverter;
 };
diff --git a/oox/inc/oox/ole/vbainputstream.hxx b/oox/inc/oox/ole/vbainputstream.hxx
index b1754297c..1a696d4af 100644
--- a/oox/inc/oox/ole/vbainputstream.hxx
+++ b/oox/inc/oox/ole/vbainputstream.hxx
@@ -43,14 +43,23 @@ class VbaInputStream : public BinaryInputStream
 public:
     explicit            VbaInputStream( BinaryInputStream& rInStrm );
 
+    /** Returns -1, stream size is not determinable. */
+    virtual sal_Int64   size() const;
+    /** Returns -1, stream position is not tracked. */
+    virtual sal_Int64   tell() const;
+    /** Does nothing, stream is not seekable. */
+    virtual void        seek( sal_Int64 nPos );
+    /** Closes the input stream but not the wrapped stream. */
+    virtual void        close();
+
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
     /** Reads nBytes bytes to the (existing) buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
     /** Seeks the stream forward by the passed number of bytes. */
-    virtual void        skip( sal_Int32 nBytes );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
 
 private:
     /** If no data left in chunk buffer, reads the next chunk from stream. */
@@ -59,7 +68,7 @@ private:
 private:
     typedef ::std::vector< sal_uInt8 > ChunkBuffer;
 
-    BinaryInputStream&  mrInStrm;
+    BinaryInputStream*  mpInStrm;
     ChunkBuffer         maChunk;
     size_t              mnChunkPos;
 };
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index a0fc68a6c..2e83b3e06 100644..100755
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -36,6 +36,7 @@ namespace com { namespace sun { namespace star {
     namespace container { class XNameAccess; }
     namespace container { class XNameContainer; }
     namespace frame { class XModel; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox {
@@ -52,6 +53,7 @@ class VbaModule
 {
 public:
     explicit            VbaModule(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
                             const ::rtl::OUString& rName,
                             rtl_TextEncoding eTextEnc,
@@ -97,6 +99,8 @@ private:
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
 
 private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+                        mxContext;          /// Component context with service manager.
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
                         mxDocModel;         /// Document model used to import/export the VBA project.
     ::rtl::OUString     maName;
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index 6c9166246..ed54963b0 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -191,7 +191,7 @@ private:
     typedef ::std::map< ::rtl::OUString, sal_Int32 >    DummyModuleMap;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-                        mxCompContext;      /// Component context with service manager.
+                        mxContext;          /// Component context with service manager.
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
                         mxDocModel;         /// Document model used to import/export the VBA project.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx
index fd02327e9..32440042a 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/oox/inc/oox/ppt/slidepersist.hxx
@@ -95,7 +95,7 @@ public:
 
     void setBackgroundProperties( const oox::drawingml::FillPropertiesPtr pFillPropertiesPtr ){ mpBackgroundPropertiesPtr = pFillPropertiesPtr; }
     oox::drawingml::FillPropertiesPtr getBackgroundProperties() const { return mpBackgroundPropertiesPtr; }
-    oox::drawingml::Color& getBackgroundColorRef() { return maBackgroundColorRef; }
+    oox::drawingml::Color& getBackgroundColor() { return maBackgroundColor; }
 
     sal_Bool isMasterPage() const { return mbMaster; }
     sal_Bool isNotesPage() const { return mbNotes; }
@@ -135,7 +135,7 @@ private:
     SlidePersistPtr															mpMasterPagePtr;
 
     oox::drawingml::ShapePtr												maShapesPtr;
-    oox::drawingml::Color													maBackgroundColorRef;							
+    oox::drawingml::Color													maBackgroundColor;
     oox::drawingml::FillPropertiesPtr										mpBackgroundPropertiesPtr;
     ::std::list< boost::shared_ptr< TimeNode > >							maTimeNodeList;
 
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index ef8e5ae0f..521d8effb 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -133,7 +133,7 @@ public:
     /** Final processing after import of the fragment. */
     void                finalizeFragmentImport();
 
-    /** Creates and inserts all UNO shapes into the passed container. The virtual
+    /** Creates and inserts all UNO shapes into the draw page. The virtual
         function notifyXShapeInserted() will be called for each new shape. */
     void                convertAndInsert() const;
 
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index e717106f7..0abc86e06 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -33,9 +33,8 @@
 
 namespace oox {
     class GraphicHelper;
-    class ModelObjectHelper;
-    class PropertyMap;
     namespace drawingml { class Color; }
+    namespace drawingml { class ShapePropertyMap; }
 }
 
 namespace oox {
@@ -92,7 +91,7 @@ public:
         @param bDefaultAsPixel  Set to true if omitted measure unit means
             pixel. Set to false if omitted measure unit means EMU.
      */
-    static sal_Int32    decodeMeasureToEmu(
+    static sal_Int64    decodeMeasureToEmu(
                             const GraphicHelper& rGraphicHelper,
                             const ::rtl::OUString& rValue,
                             sal_Int32 nRefValue,
@@ -180,8 +179,7 @@ struct StrokeModel
 
     /** Writes the properties to the passed property map. */
     void                pushToPropMap(
-                            PropertyMap& rPropMap,
-                            ModelObjectHelper& rModelObjectHelper,
+                            ::oox::drawingml::ShapePropertyMap& rPropMap,
                             const GraphicHelper& rGraphicHelper ) const;
 };
 
@@ -207,8 +205,7 @@ struct FillModel
 
     /** Writes the properties to the passed property map. */
     void                pushToPropMap(
-                            PropertyMap& rPropMap,
-                            ModelObjectHelper& rModelObjectHelper,
+                            ::oox::drawingml::ShapePropertyMap& rPropMap,
                             const GraphicHelper& rGraphicHelper ) const;
 };
 
diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/oox/inc/oox/vml/vmlinputstream.hxx
index b0aae18be..177028e82 100644
--- a/oox/inc/oox/vml/vmlinputstream.hxx
+++ b/oox/inc/oox/vml/vmlinputstream.hxx
@@ -29,36 +29,72 @@
 #ifndef OOX_VML_VMLINPUTSTREAM_HXX
 #define OOX_VML_VMLINPUTSTREAM_HXX
 
-#include <comphelper/seqstream.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/string.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace io { class XTextInputStream; }
+    namespace uno { class XComponentContext; }
+} } }
 
 namespace oox {
 namespace vml {
 
 // ============================================================================
 
-struct StreamDataContainer
-{
-    ::comphelper::ByteSequence maDataSeq;
+typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream > InputStream_BASE;
 
-    explicit            StreamDataContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm );
-};
-
-// ============================================================================
+/** An input stream class for VML streams, implementing the UNO interface
+    com.sun.star.io.XInputStream needed by the Expat XML parsers.
 
-/** An input stream class for VML streams.
+    This stream reads the data from the input stream passed to the constructor,
+    and parses all XML elements for features unsupported by the current Expat
+    XML parser:
 
-    This stream reads the entire data from the input stream passed to the
-    constructor, and parses all XML elements for features unsupported by the
-    current Expat parser.
-
-    All elements that have the form '<![inst]>' where 'inst' is any string not
-    containing the characters '<' and '>' are stripped from the input stream.
+    1)  All elements that have the form '<![inst]>' where 'inst' is any string
+        not containing the characters '<' and '>' are stripped from the input
+        stream.
+    
+    2)  Multiple occurences of the same attribute in an element but the last
+        are removed.
+    
+    3)  Line breaks represented by a single <br> element (without matching
+        </br> element) are replaced by a literal LF character.
  */
-class InputStream : private StreamDataContainer, public ::comphelper::SequenceInputStream
+class InputStream : public InputStream_BASE
 {
 public:
-    explicit            InputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm );
+    explicit            InputStream(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm );
     virtual             ~InputStream();
+
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
+                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
+                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL available()
+                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL closeInput()
+                        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+
+private:
+    void                updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    ::rtl::OString      readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    ::rtl::OString      readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream >
+                        mxTextStrm;
+    ::com::sun::star::uno::Sequence< sal_Unicode > maOpeningBracket;
+    ::com::sun::star::uno::Sequence< sal_Unicode > maClosingBracket;
+    const ::rtl::OString maOpeningCData;
+    const ::rtl::OString maClosingCData;
+    ::rtl::OString      maBuffer;
+    sal_Int32           mnBufferPos;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/biffhelper.hxx b/oox/inc/oox/xls/biffhelper.hxx
index a85dbe7ae..46d177572 100644
--- a/oox/inc/oox/xls/biffhelper.hxx
+++ b/oox/inc/oox/xls/biffhelper.hxx
@@ -443,6 +443,7 @@ const sal_uInt16 BIFF_ID_MTHREADSETTINGS    = 0x089A;
 const sal_uInt16 BIFF_ID_MULTBLANK          = 0x00BE;
 const sal_uInt16 BIFF_ID_MULTRK             = 0x00BD;
 const sal_uInt16 BIFF_ID_NOTE               = 0x001C;
+const sal_uInt16 BIFF_ID_NOTESOUND          = 0x0096;
 const sal_uInt16 BIFF2_ID_NUMBER            = 0x0003;
 const sal_uInt16 BIFF3_ID_NUMBER            = 0x0203;
 const sal_uInt16 BIFF_ID_OBJ                = 0x005D;
@@ -621,7 +622,7 @@ public:
     // BIFF12 import ----------------------------------------------------------
     
     /** Reads a BIFF12 string with leading 16-bit or 32-bit length field. */
-    static ::rtl::OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true );
+    static ::rtl::OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false );
 
     // BIFF2-BIFF8 import -----------------------------------------------------
 
diff --git a/oox/inc/oox/xls/biffinputstream.hxx b/oox/inc/oox/xls/biffinputstream.hxx
index 186136d44..1f7ba3fb6 100644
--- a/oox/inc/oox/xls/biffinputstream.hxx
+++ b/oox/inc/oox/xls/biffinputstream.hxx
@@ -243,30 +243,30 @@ public:
 
     // BinaryStreamBase interface (seeking) -----------------------------------
 
-    /** Returns true, as the BIFF input stream is required to be seekable. */
-    virtual bool        isSeekable() const;
+    /** Returns the data size of the whole record without record headers. */
+    virtual sal_Int64   size() const;
     /** Returns the position inside of the whole record content. */
     virtual sal_Int64   tell() const;
-    /** Returns the data size of the whole record without record headers. */
-    virtual sal_Int64   getLength() const;
     /** Seeks in record content to the specified position. */
     virtual void        seek( sal_Int64 nRecPos );
+    /** Closes the input stream but not the wrapped stream. */
+    virtual void        close();
 
     /** Returns the absolute position in the wrapped binary stream. */
     sal_Int64           tellBase() const;
     /** Returns the total size of the wrapped binary stream. */
-    sal_Int64           getBaseLength() const;
+    sal_Int64           sizeBase() const;
 
     // BinaryInputStream interface (stream read access) -----------------------
 
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
     /** Reads nBytes bytes and copies them to the passed buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
     /** Seeks forward inside the current record. */
-    virtual void        skip( sal_Int32 nBytes );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
 
     /** Stream operator for integral and floating-point types. */
     template< typename Type >
@@ -353,9 +353,6 @@ public:
 
     // ------------------------------------------------------------------------
 private:
-    /** Forwards calls of readValue() template functions to the record buffer. */
-    virtual void        readAtom( void* opMem, sal_uInt8 nSize );
-
     /** Initializes all members after base stream has been seeked to new record. */
     void                setupRecord();
     /** Restarts the current record from the beginning. */
@@ -384,16 +381,9 @@ private:
         records, stores the length in mnComplRecSize. */
     void                calcRecordLength();
 
-    /** Ensures that reading nBytes bytes is possible with next stream access.
-        @descr  Stream must be located at the end of a raw record, and handling
-        of CONTINUE records must be enabled.
-        @return  True if nBytes can be read from stream. */
-    bool                ensureRawReadSize( sal_uInt16 nBytes );
     /** Returns the maximum size of raw data possible to read in one block. */
-    sal_uInt16          getMaxRawReadSize( sal_Int32 nBytes ) const;
+    sal_uInt16          getMaxRawReadSize( sal_Int32 nBytes, size_t nAtomSize ) const;
 
-    /** Reads an array of Unicode characters and appends them to the passed buffer. */
-    void                appendUnicodeArray( ::rtl::OUStringBuffer& orBuffer, sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars );
     /** Reads the BIFF8 Unicode string header fields. */
     void                readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAddSize );
 
diff --git a/oox/inc/oox/xls/biffoutputstream.hxx b/oox/inc/oox/xls/biffoutputstream.hxx
index ed3d1791c..eb5d0f619 100644
--- a/oox/inc/oox/xls/biffoutputstream.hxx
+++ b/oox/inc/oox/xls/biffoutputstream.hxx
@@ -95,9 +95,6 @@ private:
     CONTINUE record, use setPortionSize(). Example: To write a sequence of
     16-bit values where 4 values form a unit and cannot be split, call
     setPortionSize(8) first (4*2 bytes == 8).
-
-    To write unicode character arrays, call writeUnicodeBuffer(). It creates
-    CONTINUE records and repeats the unicode string flag byte automatically.
 */
 class BiffOutputStream : public BinaryOutputStream
 {
@@ -114,47 +111,44 @@ public:
     /** Finishes the current record. Must be called for every started record. */
     void                endRecord();
 
-    /** Sets size of data portion in bytes. 0 means no portions are used. */
-    void                setPortionSize( sal_uInt16 nSize );
+    /** Sets size of data portion in bytes. 0 or 1 means no portions are used. */
+    void                setPortionSize( sal_uInt8 nSize );
 
     // BinaryStreamBase interface (seeking) -----------------------------------
 
     /** Returns the absolute position in the wrapped binary stream. */
     sal_Int64           tellBase() const;
     /** Returns the total size of the wrapped binary stream. */
-    sal_Int64           getBaseLength() const;
+    sal_Int64           sizeBase() const;
 
     // BinaryOutputStream interface (stream write access) ---------------------
 
     /** Writes the passed data sequence. */
-    virtual void        writeData( const StreamDataSequence& rData );
+    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 );
     /** Writes nBytes bytes from the passed buffer pMem. */
-    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes );
+    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
 
     /** Writes a sequence of nBytes bytes with the passed value. */
-    void                fill( sal_uInt8 nValue, sal_Int32 nBytes );
-    /** Writes a block of memory, ensures that it is not split to a CONTINUE record. */
-    void                writeBlock( const void* pMem, sal_uInt16 nBytes );
+    void                fill( sal_uInt8 nValue, sal_Int32 nBytes, size_t nAtomSize = 1 );
 
-    /** Stream operator for integral and floating-point types. */
+    /** Stream operator for all data types supported by the writeValue() function. */
     template< typename Type >
     inline BiffOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
 
     // ------------------------------------------------------------------------
 private:
-    /** Forwards calls of writeValue() template functions to the record buffer. */
-    virtual void        writeAtom( const void* pMem, sal_uInt8 nSize );
-
     /** Checks the remaining size in the current record, creates CONTINUE record if needed. */
     void                ensureRawBlock( sal_uInt16 nSize );
-    /** Checks the remaining size in the current record and creates CONTINUE record if needed.
+
+    /** Checks the remaining size in the current record and creates a CONTINUE
+        record if needed.
         @return  Maximum size left for writing to current record. */
-    sal_uInt16          prepareRawBlock( sal_Int32 nTotalSize );
+    sal_uInt16          prepareWriteBlock( sal_Int32 nTotalSize, size_t nAtomSize );
 
 private:
     prv::BiffOutputRecordBuffer maRecBuffer;    /// Raw record data buffer.
-    sal_uInt16          mnPortionSize;          /// Size of data portions.
-    sal_uInt16          mnPortionPos;           /// Position in current portion.
+    sal_uInt8           mnPortionSize;          /// Size of data portions.
+    sal_uInt8           mnPortionPos;           /// Position in current portion.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/chartsheetfragment.hxx b/oox/inc/oox/xls/chartsheetfragment.hxx
index a1b4d106c..e96060a51 100644
--- a/oox/inc/oox/xls/chartsheetfragment.hxx
+++ b/oox/inc/oox/xls/chartsheetfragment.hxx
@@ -40,10 +40,8 @@ class ChartsheetFragment : public WorksheetFragmentBase
 {
 public:
     explicit            ChartsheetFragment(
-                            const WorkbookHelper& rHelper,
-                            const ::rtl::OUString& rFragmentPath,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            sal_Int16 nSheet );
+                            const WorksheetHelper& rHelper,
+                            const ::rtl::OUString& rFragmentPath );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -68,9 +66,8 @@ class BiffChartsheetFragment : public BiffWorksheetFragmentBase
 {
 public:
     explicit            BiffChartsheetFragment(
-                            const BiffWorkbookFragmentBase& rParent,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            sal_Int16 nSheet );
+                            const WorksheetHelper& rHelper,
+                            const BiffWorkbookFragmentBase& rParent );
 
     /** Imports the entire sheet fragment, returns true, if EOF record has been reached. */
     virtual bool        importFragment();
diff --git a/oox/inc/oox/xls/commentsbuffer.hxx b/oox/inc/oox/xls/commentsbuffer.hxx
index d7b500eb1..83f10da95 100644
--- a/oox/inc/oox/xls/commentsbuffer.hxx
+++ b/oox/inc/oox/xls/commentsbuffer.hxx
@@ -43,7 +43,9 @@ struct CommentModel
     ::com::sun::star::table::CellRangeAddress
                         maRange;            /// Position of the comment in the worksheet.
     RichStringRef       mxText;             /// Formatted text of the comment.
+    ::rtl::OUString     maAuthor;           /// Comment author (BIFF8 only).
     sal_Int32           mnAuthorId;         /// Identifier of the comment's author.
+    sal_uInt16          mnObjId;            /// Drawing object identifier (BIFF8 only).
     sal_Bool            mbAutoFill;         /// Auto Selection of comment object's fill style
     sal_Bool            mbAutoScale;        /// Auto Scale comment text
     sal_Bool            mbColHidden;        /// Comment cell's Column is Hidden
@@ -53,6 +55,7 @@ struct CommentModel
     sal_Int32           mnTVA;              /// Vertical Alignment
     ::com::sun::star::awt::Rectangle
                         maAnchor;           /// Anchor parameters
+    bool                mbVisible;          /// True = comment is always shown (BIFF2-BIFF8 only).
 
     explicit            CommentModel();
 };
@@ -72,6 +75,8 @@ public:
     void                importAnchor( bool bFrom, sal_Int32 nWhich, const ::rtl::OUString &rChars );
     /** Imports a cell comment from the passed stream of a COMMENT record. */
     void                importComment( SequenceInputStream& rStrm );
+    /** Imports a cell comment from the passed stream of a NOTE record. */
+    void                importNote( BiffInputStream& rStrm );
 
     /** Creates and returns a new rich-string object for the comment text. */
     RichStringRef       createText();
@@ -80,6 +85,14 @@ public:
     void                finalizeImport();
 
 private:
+    /** Reads a BIFF2-BIFF5 NOTE record. */
+    void                importNoteBiff2( BiffInputStream& rStrm );
+    /** Reads a BIFF8 NOTE record. */
+    void                importNoteBiff8( BiffInputStream& rStrm );
+    /** Reads a NOTESOUND record. */
+    void                importNoteSound( BiffInputStream& rStrm );
+
+private:
     CommentModel        maModel;
 };
 
diff --git a/oox/inc/oox/xls/condformatbuffer.hxx b/oox/inc/oox/xls/condformatbuffer.hxx
index 133f6d565..83f4883b9 100644
--- a/oox/inc/oox/xls/condformatbuffer.hxx
+++ b/oox/inc/oox/xls/condformatbuffer.hxx
@@ -45,9 +45,9 @@ namespace xls {
 /** Model for a single rule in a conditional formatting. */
 struct CondFormatRuleModel
 {
-    typedef ::std::vector< TokensFormulaContext > ContextVector;
+    typedef ::std::vector< ApiTokenSequence > ApiTokenSequenceVector;
 
-    ContextVector       maFormulas;         /// Formulas for rule conditions.
+    ApiTokenSequenceVector maFormulas;      /// Formulas for rule conditions.
     ::rtl::OUString     maText;             /// Text for 'contains' rules.
     sal_Int32           mnPriority;         /// Priority of this rule.
     sal_Int32           mnType;             /// Type of the rule.
diff --git a/oox/inc/oox/xls/defnamesbuffer.hxx b/oox/inc/oox/xls/defnamesbuffer.hxx
index 90aa525f3..3950b195f 100644
--- a/oox/inc/oox/xls/defnamesbuffer.hxx
+++ b/oox/inc/oox/xls/defnamesbuffer.hxx
@@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star {
 namespace oox {
 namespace xls {
 
-class FormulaContext;
 class BiffInputStreamPos;
 
 // ============================================================================
@@ -92,15 +91,15 @@ public:
     /** Returns the original name as imported from or exported to the file. */
     const ::rtl::OUString& getUpcaseModelName() const;
     /** Returns an Any with a SingleReference or ComplexReference, or an empty Any. */
-    ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddress ) const;
+    ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const;
 
 protected:
-    /** Imports the OOXML formula string, using the passed formula context. */
-    void                importOoxFormula( FormulaContext& rContext, sal_Int16 nBaseSheet );
-    /** Imports the BIFF12 formula, using the passed formula context. */
-    void                importBiff12Formula( FormulaContext& rContext, sal_Int16 nBaseSheet, SequenceInputStream& rStrm );
-    /** Imports the BIFF formula, using the passed formula context. */
-    void                importBiffFormula( FormulaContext& rContext, sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 );
+    /** Converts the OOXML formula string stored in the own model. */
+    ApiTokenSequence    importOoxFormula( sal_Int16 nBaseSheet );
+    /** Imports the BIFF12 formula from the passed stream. */
+    ApiTokenSequence    importBiff12Formula( sal_Int16 nBaseSheet, SequenceInputStream& rStrm );
+    /** Imports the BIFF formula from the passed stream. */
+    ApiTokenSequence    importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 );
 
     /** Tries to convert the passed token sequence to a SingleReference or ComplexReference. */
     void                extractReference( const ApiTokenSequence& rTokens );
@@ -152,10 +151,10 @@ public:
     bool                getAbsoluteRange( ::com::sun::star::table::CellRangeAddress& orRange ) const;
 
 private:
-    /** Imports the OOXML or BIFF12 formula, using the passed formula context. */
-    void                implImportOoxFormula( FormulaContext& rContext );
-    /** Imports the BIFF formula, using the passed formula context. */
-    void                implImportBiffFormula( FormulaContext& rContext );
+    /** Imports the OOXML or BIFF12 definition of the name. */
+    void                implImportOoxFormula();
+    /** Imports the BIFF definition of the name. */
+    void                implImportBiffFormula();
 
 private:
     typedef ::std::auto_ptr< StreamDataSequence >   StreamDataSeqPtr;
diff --git a/oox/inc/oox/xls/drawingbase.hxx b/oox/inc/oox/xls/drawingbase.hxx
new file mode 100755
index 000000000..d720d1ac6
--- /dev/null
+++ b/oox/inc/oox/xls/drawingbase.hxx
@@ -0,0 +1,148 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef OOX_XLS_DRAWINGBASE_HXX
+#define OOX_XLS_DRAWINGBASE_HXX
+
+#include "oox/drawingml/drawingmltypes.hxx"
+#include "oox/xls/worksheethelper.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+/** Absolute position in a spreadsheet (in EMUs) independent from cells. */
+struct AnchorPointModel : public ::oox::drawingml::EmuPoint
+{
+    inline explicit     AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {}
+    inline bool         isValid() const { return (X >= 0) && (Y >= 0); }
+};
+
+// ----------------------------------------------------------------------------
+
+/** Absolute size in a spreadsheet (in EMUs). */
+struct AnchorSizeModel : public ::oox::drawingml::EmuSize
+{
+    inline explicit     AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {}
+    inline bool         isValid() const { return (Width >= 0) && (Height >= 0); }
+};
+
+// ----------------------------------------------------------------------------
+
+/** Position in spreadsheet (cell position and offset inside cell). */
+struct CellAnchorModel
+{
+    sal_Int32           mnCol;              /// Column index.
+    sal_Int32           mnRow;              /// Row index.
+    sal_Int64           mnColOffset;        /// X offset inside the column.
+    sal_Int64           mnRowOffset;        /// Y offset inside the row.
+
+    explicit            CellAnchorModel();
+    inline bool         isValid() const { return (mnCol >= 0) && (mnRow >= 0); }
+};
+
+// ----------------------------------------------------------------------------
+
+/** Application-specific client data of a shape. */
+struct AnchorClientDataModel
+{
+    bool                mbLocksWithSheet;
+    bool                mbPrintsWithSheet;
+
+    explicit            AnchorClientDataModel();
+};
+
+// ============================================================================
+
+/** Contains the position of a shape in the spreadsheet. Supports different
+    shape anchor modes (absolute, one-cell, two-cell). */
+class ShapeAnchor : public WorksheetHelper
+{
+public:
+    explicit            ShapeAnchor( const WorksheetHelper& rHelper );
+
+    /** Imports the shape anchor (one of the elements xdr:absoluteAnchor, xdr:oneCellAnchor, xdr:twoCellAnchor). */
+    void                importAnchor( sal_Int32 nElement, const AttributeList& rAttribs );
+    /** Imports the absolute anchor position from the xdr:pos element. */
+    void                importPos( const AttributeList& rAttribs );
+    /** Imports the absolute anchor size from the xdr:ext element. */
+    void                importExt( const AttributeList& rAttribs );
+    /** Imports the shape client data from the xdr:clientData element. */
+    void                importClientData( const AttributeList& rAttribs );
+    /** Sets an attribute of the cell-dependent anchor position from xdr:from and xdr:to elements. */
+    void                setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue );
+    /** Imports the client anchor settings from a VML element. */
+    void                importVmlAnchor( const ::rtl::OUString& rAnchor );
+    /** Imports the client anchor settings from a BIFF or DFF stream. */
+    void                importBiffAnchor( BinaryInputStream& rStrm );
+
+    /** Calculates the resulting shape anchor in EMUs. */
+    ::oox::drawingml::EmuRectangle calcAnchorRectEmu(
+                            const ::com::sun::star::awt::Size& rPageSizeHmm ) const;
+    /** Calculates the resulting shape anchor in 1/100 mm. */
+    ::com::sun::star::awt::Rectangle calcAnchorRectHmm(
+                            const ::com::sun::star::awt::Size& rPageSizeHmm ) const;
+
+private:
+    /** Converts the passed anchor to an absolute position in EMUs. */
+    ::oox::drawingml::EmuPoint calcCellAnchorEmu( const CellAnchorModel& rModel ) const;
+
+private:
+    enum AnchorType
+    {
+        ANCHOR_INVALID,         /// Anchor type is unknown.
+        ANCHOR_ABSOLUTE,        /// Absolute anchor (top-left corner and size in absolute units).
+        ANCHOR_ONECELL,         /// One-cell anchor (top-left corner at cell, size in absolute units).
+        ANCHOR_TWOCELL,         /// Two-cell anchor (top-left and bottom-right corner at cell).
+        ANCHOR_VML
+    };
+    
+    /** Specifies how cell positions from CellAnchorModel have to be processed. */
+    enum CellAnchorType
+    {
+        CELLANCHOR_EMU,             /// Offsets are given in EMUs.
+        CELLANCHOR_PIXEL,           /// Offsets are given in screen pixels.
+        CELLANCHOR_COLROW           /// Offsets are given in fractions of column width or row height.
+    };
+
+    AnchorType          meAnchorType;       /// Type of this shape anchor.
+    CellAnchorType      meCellAnchorType;   /// Type of the cell anchor models.
+    AnchorPointModel    maPos;              /// Top-left position, if anchor is of type absolute.
+    AnchorSizeModel     maSize;             /// Anchor size, if anchor is not of type two-cell.
+    CellAnchorModel     maFrom;             /// Top-left position, if anchor is not of type absolute.
+    CellAnchorModel     maTo;               /// Bottom-right position, if anchor is of type two-cell.
+    AnchorClientDataModel maClientData;     /// Shape client data.
+    sal_Int32           mnEditAs;           /// Anchor mode as shown in the UI.
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/drawingfragment.hxx b/oox/inc/oox/xls/drawingfragment.hxx
index 3eeb6e6f7..9dafa7c34 100644
--- a/oox/inc/oox/xls/drawingfragment.hxx
+++ b/oox/inc/oox/xls/drawingfragment.hxx
@@ -38,6 +38,7 @@
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmldrawingfragment.hxx"
 #include "oox/vml/vmltextbox.hxx"
+#include "oox/xls/drawingbase.hxx"
 #include "oox/xls/excelhandlers.hxx"
 
 namespace oox { namespace ole {
@@ -52,98 +53,6 @@ namespace xls {
 // DrawingML
 // ============================================================================
 
-/** Absolute position in spreadsheet (in EMUs) independent from cells. */
-struct AnchorPosModel : public ::oox::drawingml::EmuPoint
-{
-    inline explicit     AnchorPosModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {}
-    inline bool         isValid() const { return (X >= 0) && (Y >= 0); }
-};
-
-// ----------------------------------------------------------------------------
-
-/** Absolute size in spreadsheet (in EMUs). */
-struct AnchorSizeModel : public ::oox::drawingml::EmuSize
-{
-    inline explicit     AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {}
-    inline bool         isValid() const { return (Width >= 0) && (Height >= 0); }
-};
-
-// ----------------------------------------------------------------------------
-
-/** Position in spreadsheet (cell position and offset inside cell in EMUs). */
-struct AnchorCellModel
-{
-    sal_Int32           mnCol;              /// Column index.
-    sal_Int32           mnRow;              /// Row index.
-    sal_Int64           mnColOffset;        /// X offset in column mnCol (EMUs).
-    sal_Int64           mnRowOffset;        /// Y offset in row mnRow (EMUs).
-
-    explicit            AnchorCellModel();
-    inline bool         isValid() const { return (mnCol >= 0) && (mnRow >= 0); }
-};
-
-// ----------------------------------------------------------------------------
-
-/** Application-specific client data of a shape. */
-struct AnchorClientDataModel
-{
-    bool                mbLocksWithSheet;
-    bool                mbPrintsWithSheet;
-
-    explicit            AnchorClientDataModel();
-};
-
-// ============================================================================
-
-/** Contains the position of a shape in the spreadsheet. Supports different
-    shape anchor modes (absolute, one-cell, two-cell). */
-class ShapeAnchor : public WorksheetHelper
-{
-public:
-    explicit            ShapeAnchor( const WorksheetHelper& rHelper );
-
-    /** Imports the shape anchor (one of the elements xdr:absoluteAnchor, xdr:oneCellAnchor, xdr:twoCellAnchor). */
-    void                importAnchor( sal_Int32 nElement, const AttributeList& rAttribs );
-    /** Imports the absolute anchor position from the xdr:pos element. */
-    void                importPos( const AttributeList& rAttribs );
-    /** Imports the absolute anchor size from the xdr:ext element. */
-    void                importExt( const AttributeList& rAttribs );
-    /** Imports the shape client data from the xdr:clientData element. */
-    void                importClientData( const AttributeList& rAttribs );
-    /** Sets an attribute of the cell-dependent anchor position from xdr:from and xdr:to elements. */
-    void                setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue );
-    /** Imports and converts the VML specific client anchor. */
-    void                importVmlAnchor( const ::rtl::OUString& rAnchor );
-
-    /** Returns true, if the anchor contains valid position and size settings. */
-    bool                isValidAnchor() const;
-
-    /** Calculates the resulting shape anchor in 1/100 mm. */
-    ::com::sun::star::awt::Rectangle
-                        calcApiLocation(
-                            const ::com::sun::star::awt::Size& rApiSheetSize,
-                            const AnchorSizeModel& rEmuSheetSize ) const;
-
-    /** Calculates the resulting shape anchor in EMUs. */
-    ::com::sun::star::awt::Rectangle
-                        calcEmuLocation( const AnchorSizeModel& rEmuSheetSize ) const;
-
-private:
-    enum AnchorType { ANCHOR_ABSOLUTE, ANCHOR_ONECELL, ANCHOR_TWOCELL, ANCHOR_VML, ANCHOR_INVALID };
-
-    AnchorType          meType;             /// Type of this shape anchor.
-    AnchorPosModel      maPos;              /// Top-left position, if anchor is of type absolute.
-    AnchorSizeModel     maSize;             /// Anchor size, if anchor is not of type two-cell.
-    AnchorCellModel     maFrom;             /// Top-left position, if anchor is not of type absolute.
-    AnchorCellModel     maTo;               /// Bottom-right position, if anchor is of type two-cell.
-    AnchorClientDataModel maClientData;     /// Shape client data.
-    sal_Int32           mnEditAs;           /// Anchor mode as shown in the UI.
-};
-
-typedef ::boost::shared_ptr< ShapeAnchor > ShapeAnchorRef;
-
-// ============================================================================
-
 class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase
 {
 public:
@@ -221,10 +130,10 @@ protected:
     virtual void        onEndElement();
 
 private:
+    typedef ::std::auto_ptr< ShapeAnchor > ShapeAnchorRef;
+
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
                         mxDrawPage;             /// Drawing page of this sheet.
-    ::com::sun::star::awt::Size maApiSheetSize; /// Sheet size in 1/100 mm.
-    AnchorSizeModel     maEmuSheetSize;         /// Sheet size in EMU.
     ::oox::drawingml::ShapePtr mxShape;         /// Current top-level shape.
     ShapeAnchorRef      mxAnchor;               /// Current anchor of top-level shape.
 };
diff --git a/oox/inc/oox/xls/drawingmanager.hxx b/oox/inc/oox/xls/drawingmanager.hxx
new file mode 100755
index 000000000..38b1bda38
--- /dev/null
+++ b/oox/inc/oox/xls/drawingmanager.hxx
@@ -0,0 +1,521 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef OOX_XLS_DRAWINGMANAGER_HXX
+#define OOX_XLS_DRAWINGMANAGER_HXX
+
+#include "oox/xls/drawingbase.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace drawing { class XDrawPage; }
+    namespace drawing { class XShape; }
+    namespace drawing { class XShapes; }
+} } }
+
+namespace oox { namespace drawingml { class ShapePropertyMap; } }
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+const sal_uInt16 BIFF_OBJ_INVALID_ID        = 0;
+
+// ============================================================================
+// Model structures for BIFF OBJ record data
+// ============================================================================
+
+/** This structure contains line formatting attributes from an OBJ record. */
+struct BiffObjLineModel
+{
+    sal_uInt8           mnColorIdx;         /// Index into color palette.
+    sal_uInt8           mnStyle;            /// Line dash style.
+    sal_uInt8           mnWidth;            /// Line width.
+    bool                mbAuto;             /// True = automatic line format.
+
+    explicit            BiffObjLineModel();
+
+    /** Returns true, if the line formatting is visible (automatic or explicit). */
+    bool                isVisible() const;
+};
+
+// ============================================================================
+
+/** This structure contains fill formatting attributes from an OBJ record. */
+struct BiffObjFillModel
+{
+    sal_uInt8           mnBackColorIdx;     /// Index to color palette for background color.
+    sal_uInt8           mnPattColorIdx;     /// Index to color palette for pattern foreground color.
+    sal_uInt8           mnPattern;          /// Fill pattern.
+    bool                mbAuto;             /// True = automatic fill format.
+
+    explicit            BiffObjFillModel();
+
+    /** Returns true, if the fill formatting is visible (automatic or explicit). */
+    bool                isFilled() const;
+};
+
+// ============================================================================
+
+/** This structure contains text formatting attributes from an OBJ record. */
+struct BiffObjTextModel
+{
+    sal_uInt16          mnTextLen;          /// Length of the text (characters).
+    sal_uInt16          mnFormatSize;       /// Size of the formatting array (bytes).
+    sal_uInt16          mnLinkSize;         /// Size of the linked text formula (bytes).
+    sal_uInt16          mnDefFontId;        /// Font index for default font formatting.
+    sal_uInt16          mnFlags;            /// Additional flags.
+    sal_uInt16          mnOrientation;      /// Text orientation.
+    sal_uInt16          mnButtonFlags;      /// Additional flags for push buttons.
+    sal_uInt16          mnShortcut;         /// Shortcut character.
+    sal_uInt16          mnShortcutEA;       /// East-asian shortcut character.
+
+    explicit            BiffObjTextModel();
+
+    /** Reads text data from a BIFF3/BIFF4 OBJ record. */
+    void                readObj3( BiffInputStream& rStrm );
+    /** Reads text data from a BIFF5 OBJ record. */
+    void                readObj5( BiffInputStream& rStrm );
+    /** Reads text data from a BIFF8 TXO record. */
+    void                readTxo8( BiffInputStream& rStrm );
+
+    /** Returns the horizontal alignment of the text. */
+    sal_uInt8           getHorAlign() const;
+    /** Returns the vertical alignment of the text. */
+    sal_uInt8           getVerAlign() const;
+};
+
+// ============================================================================
+// BIFF drawing objects
+// ============================================================================
+
+class BiffDrawingBase;
+class BiffDrawingObjectBase;
+typedef ::boost::shared_ptr< BiffDrawingObjectBase > BiffDrawingObjectRef;
+
+// ----------------------------------------------------------------------------
+
+class BiffDrawingObjectContainer
+{
+public:
+    explicit            BiffDrawingObjectContainer();
+
+    /** Returns true, if the object list is empty. */
+    inline bool         empty() const { return maObjects.empty(); }
+
+    /** Appends the passed object to the list of objects. */
+    void                append( const BiffDrawingObjectRef& rxDrawingObj );
+    /** Tries to insert the passed object into the last group or appends it. */
+    void                insertGrouped( const BiffDrawingObjectRef& rxDrawingObj );
+
+    /** Creates and inserts all UNO shapes into the passed shape container. */
+    void                convertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle* pParentRect = 0 ) const;
+
+private:
+    typedef RefVector< BiffDrawingObjectBase > BiffDrawingObjectVector;
+    BiffDrawingObjectVector maObjects;
+};
+
+// ============================================================================
+
+/** Base class for all BIFF drawing objects (OBJ records). */
+class BiffDrawingObjectBase : public WorksheetHelper
+{
+public:
+    explicit            BiffDrawingObjectBase( const WorksheetHelper& rHelper );
+    virtual             ~BiffDrawingObjectBase();
+
+    /** Reads the BIFF3 OBJ record, returns a new drawing object. */
+    static BiffDrawingObjectRef importObjBiff3( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
+    /** Reads the BIFF4 OBJ record, returns a new drawing object. */
+    static BiffDrawingObjectRef importObjBiff4( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
+    /** Reads the BIFF5 OBJ record, returns a new drawing object. */
+    static BiffDrawingObjectRef importObjBiff5( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
+    /** Reads the BIFF8 OBJ record, returns a new drawing object. */
+    static BiffDrawingObjectRef importObjBiff8( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
+
+    /** Sets whether this is an area object (then its width and height must be greater than 0). */
+    inline void         setAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
+    /** If set to true, the object supports a simple on-click macro and/or hyperlink. */
+    inline void         setSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; }
+
+    /** If set to false, the UNO shape will not be created, processed, or inserted into the draw page. */
+    inline void         setProcessShape( bool bProcess ) { mbProcessShape = bProcess; }
+    /** If set to false, the UNO shape will be created or processed, but not be inserted into the draw page. */
+    inline void         setInsertShape( bool bInsert ) { mbInsertShape = bInsert; }
+    /** If set to true, a new custom UNO shape will be created while in DFF import (BIFF8 only). */
+    inline void         setCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; }
+
+    /** Returns the object identifier from the OBJ record. */
+    inline sal_uInt16   getObjId() const { return mnObjId; }
+    /** Returns the object type from the OBJ record. */
+    inline sal_uInt16   getObjType() const { return mnObjType; }
+
+    /** Returns true, if the object is hidden. */
+    inline bool         isHidden() const { return mbHidden; }
+    /** Returns true, if the object is visible. */
+    inline bool         isVisible() const { return mbVisible; }
+    /** Returns true, if the object is printable. */
+    inline bool         isPrintable() const { return mbPrintable; }
+
+    /** Creates the UNO shape and inserts it into the passed shape container. */
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        convertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle* pParentRect = 0 ) const;
+
+protected:
+    /** Reads the object name in a BIFF5 OBJ record. */
+    void                readNameBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen );
+    /** Reads the macro link in a BIFF3 OBJ record. */
+    void                readMacroBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the macro link in a BIFF4 OBJ record. */
+    void                readMacroBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the macro link in a BIFF5 OBJ record. */
+    void                readMacroBiff5( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the ftMacro sub structure in an OBJ record. */
+    void                readMacroBiff8( BiffInputStream& rStrm );
+
+    /** Converts the passed line formatting to the passed property map. */
+    void                convertLineProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows = 0 ) const;
+    /** Converts the passed fill formatting to the passed property map. */
+    void                convertFillProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjFillModel& rFillModel ) const;
+    /** Converts the passed frame flags to the passed property map. */
+    void                convertFrameProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, sal_uInt16 nFrameFlags ) const;
+
+    /** Derived classes read the contents of the a BIFF3 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Derived classes read the contents of the a BIFF4 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Derived classes read the contents of the a BIFF5 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
+    /** Derived classes read the contents of the specified subrecord of a BIFF8 OBJ record from stream. */
+    virtual void        implReadObjBiff8SubRec( BiffInputStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize );
+
+    /** Derived classes create the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const = 0;
+
+private:
+    /** Reads the contents of a BIFF3 OBJ record. */
+    void                importObjBiff3( BiffInputStream& rStrm );
+    /** Reads the contents of a BIFF4 OBJ record. */
+    void                importObjBiff4( BiffInputStream& rStrm );
+    /** Reads the contents of a BIFF5 OBJ record. */
+    void                importObjBiff5( BiffInputStream& rStrm );
+    /** Reads the contents of a BIFF8 OBJ record. */
+    void                importObjBiff8( BiffInputStream& rStrm );
+
+private:
+    ShapeAnchor         maAnchor;       /// Position of the drawing object.
+    ::rtl::OUString     maObjName;      /// Name of the object.
+    ::rtl::OUString     maMacroName;    /// Name of an attached macro.
+    ::rtl::OUString     maHyperlink;    /// On-click hyperlink URL.
+    sal_uInt32          mnDffShapeId;   /// Shape identifier from DFF stream (BIFF8 only).
+    sal_uInt32          mnDffFlags;     /// Shape flags from DFF stream.
+    sal_uInt16          mnObjId;        /// The object identifier (unique per drawing).
+    sal_uInt16          mnObjType;      /// The object type from OBJ record.
+    bool                mbHasAnchor;    /// True = anchor has been initialized.
+    bool                mbHidden;       /// True = object is hidden.
+    bool                mbVisible;      /// True = object is visible (form controls).
+    bool                mbPrintable;    /// True = object is printable.
+    bool                mbAreaObj;      /// True = width and height must be greater than 0.
+    bool                mbAutoMargin;   /// True = set automatic text margin.
+    bool                mbSimpleMacro;  /// True = create simple macro link and hyperlink.
+    bool                mbProcessShape; /// True = object is valid, do processing and insertion.
+    bool                mbInsertShape;  /// True = insert the UNO shape into the draw page.
+    bool                mbCustomDff;    /// True = recreate UNO shape in DFF import (BIFF8 only).
+};
+
+// ============================================================================
+
+/** A placeholder object for unknown/unsupported object types. */
+class BiffPlaceholderObject : public BiffDrawingObjectBase
+{
+public:
+    explicit            BiffPlaceholderObject( const WorksheetHelper& rHelper );
+
+protected:
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+};
+
+// ============================================================================
+
+/** A group object that is able to contain other child objects. */
+class BiffGroupObject : public BiffDrawingObjectBase
+{
+public:
+    explicit            BiffGroupObject( const WorksheetHelper& rHelper );
+
+    /** Tries to insert the passed drawing object into this or a nested group. */
+    bool                tryInsert( const BiffDrawingObjectRef& rxDrawingObj );
+
+protected:
+    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
+
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+protected:
+    BiffDrawingObjectContainer maChildren;     /// All child objects contained in this group object.
+    sal_uInt16          mnFirstUngrouped;   /// Object identfier of first object not grouped into this group.
+};
+
+// ============================================================================
+
+/** A simple line object. */
+class BiffLineObject : public BiffDrawingObjectBase
+{
+public:
+    explicit            BiffLineObject( const WorksheetHelper& rHelper );
+
+protected:
+    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
+
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+protected:
+    BiffObjLineModel    maLineModel;    /// Line formatting.
+    sal_uInt16          mnArrows;       /// Line arrows.
+    sal_uInt8           mnStartPoint;   /// Starting point.
+};
+
+// ============================================================================
+
+/** A simple rectangle object (used as base class for oval objects). */
+class BiffRectObject : public BiffDrawingObjectBase
+{
+public:
+    explicit            BiffRectObject( const WorksheetHelper& rHelper );
+
+protected:
+    /** Reads the fill model, the line model, and frame flags. */
+    void                readFrameData( BiffInputStream& rStrm );
+
+    /** Converts fill formatting, line formatting, and frame style. */
+    void                convertRectProperties( ::oox::drawingml::ShapePropertyMap& rPropMap ) const;
+
+    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
+
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+protected:
+    BiffObjFillModel    maFillModel;    /// Fill formatting.
+    BiffObjLineModel    maLineModel;    /// Line formatting.
+    sal_uInt16          mnFrameFlags;   /// Additional flags.
+};
+
+// ============================================================================
+
+/** A simple oval object. */
+class BiffOvalObject : public BiffRectObject
+{
+public:
+    explicit            BiffOvalObject( const WorksheetHelper& rHelper );
+
+protected:
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+};
+
+// ============================================================================
+
+/** A simple arc object. */
+class BiffArcObject : public BiffDrawingObjectBase
+{
+public:
+    explicit            BiffArcObject( const WorksheetHelper& rHelper );
+
+protected:
+    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
+
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+protected:
+    BiffObjFillModel    maFillModel;    /// Fill formatting.
+    BiffObjLineModel    maLineModel;    /// Line formatting.
+    sal_uInt8           mnQuadrant;     /// Visible quadrant of the circle.
+};
+
+// ============================================================================
+
+/** A simple polygon object. */
+class BiffPolygonObject : public BiffRectObject
+{
+public:
+    explicit            BiffPolygonObject( const WorksheetHelper& rHelper );
+
+protected:
+    /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
+    /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
+    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
+
+    /** Creates the corresponding XShape and insert it into the passed container. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        implConvertAndInsert( BiffDrawingBase& rDrawing,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+private:
+    /** Reads the COORDLIST record following the OBJ record. */
+    void                importCoordList( BiffInputStream& rStrm );
+
+protected:
+    typedef ::std::vector< ::com::sun::star::awt::Point > PointVector;
+    PointVector         maCoords;       /// Coordinates relative to bounding rectangle.
+    sal_uInt16          mnPolyFlags;    /// Additional flags.
+    sal_uInt16          mnPointCount;   /// Polygon point count.
+};
+
+// ============================================================================
+// BIFF drawing page
+// ============================================================================
+
+/** Base class for a container for all objects on a drawing page (in a
+    spreadsheet or in an embedded chart object).
+
+    For BIFF import, it is needed to load all drawing objects before converting
+    them to UNO shapes. There might be some dummy drawing objects (e.g. the
+    dropdown buttons of autofilters) which have to be skipped. The information,
+    that a drawing object is a dummy object, may be located after the drawing
+    objects themselves.
+
+    The BIFF8 format stores drawing objects in the DFF stream (stored
+    fragmented in MSODRAWING records), and in the OBJ records. The DFF stream
+    fragments are collected in a single stream, and the complete stream will be
+    processed afterwards.
+ */
+class BiffDrawingBase : public WorksheetHelper
+{
+public:
+    explicit            BiffDrawingBase( const WorksheetHelper& rHelper,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage );
+
+    /** Imports a plain OBJ record (without leading DFF data). */
+    void                importObj( BiffInputStream& rStrm );
+    /** Sets the object with the passed identifier to be skipped on import. */
+    void                setSkipObj( sal_uInt16 nObjId );
+
+    /** Final processing after import of the all drawing objects. */
+    void                finalizeImport();
+
+    /** Creates a new UNO shape object, inserts it into the passed UNO shape
+        container, and sets the shape position and size. */
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        createAndInsertXShape(
+                            const ::rtl::OUString& rService,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+    /** Derived classes may want to know that a shape has been inserted. Will
+        be called from the convertAndInsert() implementation. */
+    virtual void        notifyShapeInserted(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) = 0;
+
+protected:
+    /** Appends a new drawing object to the list of raw objects (without DFF data). */
+    void                appendRawObject( const BiffDrawingObjectRef& rxDrawingObj );
+
+private:
+    typedef RefMap< sal_uInt16, BiffDrawingObjectBase > BiffDrawingObjectMapById;
+    typedef ::std::vector< sal_uInt16 >                 BiffObjIdVector;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
+                        mxDrawPage;         /// UNO draw page used to insert the shapes.
+    BiffDrawingObjectContainer maRawObjs;   /// Drawing objects without DFF data.
+    BiffDrawingObjectMapById maObjMapId;    /// Maps drawing objects by their object identifiers.
+    BiffObjIdVector     maSkipObjs;         /// Identifiers of all objects to be skipped.
+};
+
+// ----------------------------------------------------------------------------
+
+/** Drawing manager of a single sheet. */
+class BiffSheetDrawing : public BiffDrawingBase
+{
+public:
+    explicit            BiffSheetDrawing( const WorksheetHelper& rHelper );
+
+    /** Called when a new UNO shape has been inserted into the draw page. */
+    virtual void        notifyShapeInserted(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/excelfilter.hxx b/oox/inc/oox/xls/excelfilter.hxx
index 686b36703..5037adf28 100644
--- a/oox/inc/oox/xls/excelfilter.hxx
+++ b/oox/inc/oox/xls/excelfilter.hxx
@@ -36,23 +36,23 @@
 namespace oox {
 namespace xls {
 
-class WorkbookData;
+class WorkbookGlobals;
 
 // ============================================================================
 
 class ExcelFilterBase
 {
 public:
-    void                registerWorkbookData( WorkbookData& rData );
-    WorkbookData&       getWorkbookData() const;
-    void                unregisterWorkbookData();
+    void                registerWorkbookGlobals( WorkbookGlobals& rBookGlob );
+    WorkbookGlobals&    getWorkbookGlobals() const;
+    void                unregisterWorkbookGlobals();
 
 protected:
     explicit            ExcelFilterBase();
     virtual             ~ExcelFilterBase();
 
 private:
-    WorkbookData*       mpData;
+    WorkbookGlobals*    mpBookGlob;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/excelhandlers.hxx b/oox/inc/oox/xls/excelhandlers.hxx
index 172df7708..79b955e6c 100644
--- a/oox/inc/oox/xls/excelhandlers.hxx
+++ b/oox/inc/oox/xls/excelhandlers.hxx
@@ -46,55 +46,24 @@ class WorkbookContextBase : public ::oox::core::ContextHandler2, public Workbook
 {
 public:
     template< typename ParentType >
-    explicit            WorkbookContextBase( ParentType& rParent );
+    inline explicit     WorkbookContextBase( ParentType& rParent ) :
+                            ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {}
 };
 
-// ----------------------------------------------------------------------------
-
-template< typename ParentType >
-WorkbookContextBase::WorkbookContextBase( ParentType& rParent ) :
-    ::oox::core::ContextHandler2( rParent ),
-    WorkbookHelper( rParent )
-{
-}
-
 // ============================================================================
 
 /** Context handler derived from the WorksheetHelper helper class.
 
     Used to import contexts in sheet fragments.
  */
-class WorksheetContextBase : public ::oox::core::ContextHandler2, public WorksheetHelperRoot
+class WorksheetContextBase : public ::oox::core::ContextHandler2, public WorksheetHelper
 {
 public:
     template< typename ParentType >
-    explicit            WorksheetContextBase(
-                            ParentType& rParent,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
-
-    template< typename ParentType >
-    explicit            WorksheetContextBase( ParentType& rParent );
+    inline explicit     WorksheetContextBase( ParentType& rParent ) :
+                            ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {}
 };
 
-// ----------------------------------------------------------------------------
-
-template< typename ParentType >
-WorksheetContextBase::WorksheetContextBase( ParentType& rParent,
-        const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    ::oox::core::ContextHandler2( rParent ),
-    WorksheetHelperRoot( rParent, rxProgressBar, eSheetType, nSheet )
-{
-}
-
-template< typename ParentType >
-WorksheetContextBase::WorksheetContextBase( ParentType& rParent ) :
-    ::oox::core::ContextHandler2( rParent ),
-    WorksheetHelperRoot( rParent )
-{
-}
-
 // ============================================================================
 
 /** Fragment handler derived from the WorkbookHelper helper class.
@@ -115,17 +84,10 @@ public:
 
     Used to import sheet fragments.
  */
-class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public WorksheetHelperRoot
+class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public WorksheetHelper
 {
 public:
     explicit            WorksheetFragmentBase(
-                            const WorkbookHelper& rHelper,
-                            const ::rtl::OUString& rFragmentPath,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
-
-    explicit            WorksheetFragmentBase(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 };
@@ -165,15 +127,9 @@ protected:
 
     Used to import contexts in sheet fragments.
  */
-class BiffWorksheetContextBase : public BiffContextHandler, public WorksheetHelperRoot
+class BiffWorksheetContextBase : public BiffContextHandler, public WorksheetHelper
 {
 protected:
-    explicit            BiffWorksheetContextBase(
-                            const WorkbookHelper& rHelper,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
-
     explicit            BiffWorksheetContextBase( const WorksheetHelper& rHelper );
 };
 
@@ -221,17 +177,6 @@ protected:
      */
     BiffFragmentType    startFragment( BiffType eBiff );
 
-    /** Starts a new fragment at a specific position in the workbbok stream and
-        returns the fragment type.
-
-        The passed record handle must specify the stream position of the BOF
-        record of the fragment substream. The function will try to start the
-        next record and read the contents of the BOF record, if extant.
-
-        @return  Fragment type according to the imported BOF record.
-     */
-    BiffFragmentType    startFragment( BiffType eBiff, sal_Int64 nRecHandle );
-
     /** Skips the current fragment up to its trailing EOF record.
 
         Skips all records until next EOF record. When this function returns,
@@ -274,14 +219,12 @@ protected:
 
     Used to import sheet fragments.
  */
-class BiffWorksheetFragmentBase : public BiffFragmentHandler, public WorksheetHelperRoot
+class BiffWorksheetFragmentBase : public BiffFragmentHandler, public WorksheetHelper
 {
 protected:
     explicit            BiffWorksheetFragmentBase(
-                            const BiffWorkbookFragmentBase& rParent,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
+                            const WorksheetHelper& rHelper,
+                            const BiffWorkbookFragmentBase& rParent );
 };
 
 // ----------------------------------------------------------------------------
@@ -292,9 +235,8 @@ class BiffSkipWorksheetFragment : public BiffWorksheetFragmentBase
 {
 public:
     explicit            BiffSkipWorksheetFragment(
-                            const BiffWorkbookFragmentBase& rParent,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            sal_Int16 nSheet );
+                            const WorksheetHelper& rHelper,
+                            const BiffWorkbookFragmentBase& rParent );
 
     virtual bool        importFragment();
 };
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index 76a34c47f..eef4d8a31 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -29,6 +29,7 @@
 #ifndef OOX_XLS_FORMULABASE_HXX
 #define OOX_XLS_FORMULABASE_HXX
 
+#include <com/sun/star/beans/Pair.hpp>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
@@ -41,7 +42,6 @@
 namespace com { namespace sun { namespace star {
     namespace sheet { class XFormulaOpCodeMapper; }
     namespace sheet { class XFormulaParser; }
-    namespace sheet { class XFormulaTokens; }
 } } }
 
 namespace oox { template< typename Type > class Matrix; }
@@ -217,7 +217,20 @@ const sal_uInt16 BIFF_FUNC_CEILING              = 288;      /// Function identif
 const sal_uInt16 BIFF_FUNC_HYPERLINK            = 359;      /// Function identifier of the HYPERLINK function.
 const sal_uInt16 BIFF_FUNC_WEEKNUM              = 465;      /// Function identifier of the WEEKNUM function.
 
-// reference helpers ==========================================================
+// Formula type ===============================================================
+
+/** Enumerates all possible types of a formula. */
+enum FormulaType
+{
+    FORMULATYPE_CELL,           /// Simple cell formula, or reference to a shared formula name.
+    FORMULATYPE_ARRAY,          /// Array (matrix) formula.
+    FORMULATYPE_SHAREDFORMULA,  /// Shared formula definition.
+    FORMULATYPE_CONDFORMAT,     /// Condition of a conditional format rule.
+    FORMULATYPE_VALIDATION,     /// Condition of a data validation.
+    FORMULATYPE_DEFINEDNAME     /// Definition of a defined name.
+};
+
+// Reference helpers ==========================================================
 
 /** A 2D formula cell reference struct with relative flags. */
 struct BinSingleRef2d
@@ -251,11 +264,15 @@ struct BinComplexRef2d
     void                readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
 };
 
-// token vector, sequence =====================================================
+// Token vector, token sequence ===============================================
 
 typedef ::com::sun::star::sheet::FormulaToken       ApiToken;
 typedef ::com::sun::star::uno::Sequence< ApiToken > ApiTokenSequence;
 
+/** Contains the base address and type of a special token representing an array
+    formula or a shared formula (sal_False), or a table operation (sal_True). */
+typedef ::com::sun::star::beans::Pair< ::com::sun::star::table::CellAddress, sal_Bool > ApiSpecialTokenInfo;
+
 /** A vector of formula tokens with additional convenience functions. */
 class ApiTokenVector : public ::std::vector< ApiToken >
 {
@@ -271,7 +288,7 @@ public:
     inline void         append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; }
 };
 
-// token sequence iterator ====================================================
+// Token sequence iterator ====================================================
 
 /** Token sequence iterator that is able to skip space tokens. */
 class ApiTokenIterator
@@ -298,7 +315,7 @@ private:
     const bool          mbSkipSpaces;       /// true = Skip whitespace tokens.
 };
 
-// list of API op-codes =======================================================
+// List of API op-codes =======================================================
 
 /** Contains all API op-codes needed to build formulas with tokens. */
 struct ApiOpCodes
@@ -457,23 +474,23 @@ struct FunctionParamInfo
     bool                mbValType;      /// Data type (false = REFTYPE, true = VALTYPE).
 };
 
-// function data ==============================================================
+// Function data ==============================================================
 
 /** This enumeration contains constants for all known external libraries
     containing supported sheet functions. */
 enum FunctionLibraryType
 {
-    FUNCLIB_EUROTOOL,           /// EuroTool add-in with EUROCONVERT function.
-    FUNCLIB_UNKNOWN             /// Unknown library.
+    FUNCLIB_UNKNOWN = 0,        /// Unknown library (must be zero).
+    FUNCLIB_EUROTOOL            /// EuroTool add-in with EUROCONVERT function.
 };
 
 // ----------------------------------------------------------------------------
 
 /** Represents information for a spreadsheet function.
 
-    The member mpParamInfos points to an array of type information structures
+    The member mpParamInfos points to a C-array of type information structures
     for all parameters of the function. The last initialized structure
-    describing a regular parameter (member meValid == EXC_PARAMVALID_ALWAYS) in
+    describing a regular parameter (member meValid == FUNC_PARAM_REGULAR) in
     this array is used repeatedly for all following parameters supported by a
     function.
  */
@@ -491,7 +508,7 @@ struct FunctionInfo
     sal_uInt8           mnMaxParamCount;    /// Maximum number of parameters.
     sal_uInt8           mnRetClass;         /// BIFF token class of the return value.
     const FunctionParamInfo* mpParamInfos;  /// Information about all parameters.
-    bool                mbParamPairs;       /// true = optional parameters are expected to appear in pairs.
+    bool                mbParamPairs;       /// True = optional parameters are expected to appear in pairs.
     bool                mbVolatile;         /// True = volatile function.
     bool                mbExternal;         /// True = external function in Calc.
     bool                mbMacroFunc;        /// True = macro sheet function or command.
@@ -500,7 +517,7 @@ struct FunctionInfo
 
 typedef RefVector< FunctionInfo > FunctionInfoVector;
 
-// function info parameter class iterator =====================================
+// Function info parameter class iterator =====================================
 
 /** Iterator working on the mpParamInfos member of the FunctionInfo struct.
 
@@ -526,7 +543,7 @@ private:
     bool                mbParamPairs;
 };
 
-// base function provider =====================================================
+// Base function provider =====================================================
 
 struct FunctionProviderImpl;
 
@@ -567,7 +584,7 @@ private:
     FunctionProviderImplRef mxFuncImpl;     /// Shared implementation between all copies of the provider.
 };
 
-// op-code and function provider ==============================================
+// Op-code and function provider ==============================================
 
 struct OpCodeProviderImpl;
 
@@ -578,7 +595,7 @@ class OpCodeProvider : public FunctionProvider // not derived from WorkbookHelpe
 {
 public:
     explicit            OpCodeProvider(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
                             FilterType eFilter, BiffType eBiff, bool bImportFilter );
     virtual             ~OpCodeProvider();
 
@@ -605,7 +622,7 @@ class ApiParserWrapper : public OpCodeProvider
 {
 public:
     explicit            ApiParserWrapper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
                             const OpCodeProvider& rOpCodeProv );
 
     /** Returns read/write access to the formula parser property set. */
@@ -622,74 +639,7 @@ private:
     PropertySet         maParserProps;
 };
 
-// formula contexts ===========================================================
-
-class FormulaContext
-{
-public:
-    inline void         setBaseAddress( const ::com::sun::star::table::CellAddress& rBaseAddress )
-                            { maBaseAddress = rBaseAddress; }
-
-    inline const ::com::sun::star::table::CellAddress& getBaseAddress() const { return maBaseAddress; }
-    inline bool         isRelativeAsOffset() const { return mbRelativeAsOffset; }
-    inline bool         is2dRefsAs3dRefs() const { return mb2dRefsAs3dRefs; }
-    inline bool         isNulCharsAllowed() const { return mbAllowNulChars; }
-
-    virtual void        setTokens( const ApiTokenSequence& rTokens ) = 0;
-    virtual void        setSharedFormula( const ::com::sun::star::table::CellAddress& rBaseAddr );
-
-protected:
-    explicit            FormulaContext(
-                            bool bRelativeAsOffset,
-                            bool b2dRefsAs3dRefs,
-                            bool bAllowNulChars = false );
-    virtual             ~FormulaContext();
-
-private:
-    ::com::sun::star::table::CellAddress maBaseAddress;
-    bool                mbRelativeAsOffset;
-    bool                mb2dRefsAs3dRefs;
-    bool                mbAllowNulChars;
-};
-
-// ----------------------------------------------------------------------------
-
-/** Stores the converted formula token sequence in a class member. */
-class TokensFormulaContext : public FormulaContext
-{
-public:
-    explicit            TokensFormulaContext(
-                            bool bRelativeAsOffset,
-                            bool b2dRefsAs3dRefs,
-                            bool bAllowNulChars = false );
-
-    inline const ApiTokenSequence& getTokens() const { return maTokens; }
-
-    virtual void        setTokens( const ApiTokenSequence& rTokens );
-
-private:
-    ApiTokenSequence    maTokens;
-};
-
-// ----------------------------------------------------------------------------
-
-/** Uses the com.sun.star.sheet.XFormulaTokens interface to set a token sequence. */
-class SimpleFormulaContext : public FormulaContext
-{
-public:
-    explicit            SimpleFormulaContext(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens >& rxTokens,
-                            bool bRelativeAsOffset,
-                            bool b2dRefsAs3dRefs,
-                            bool bAllowNulChars = false );
-
-    virtual void        setTokens( const ApiTokenSequence& rTokens );
-
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens > mxTokens;
-};
-
-// formula parser/printer base class for filters ==============================
+// Formula parser/printer base class for filters ==============================
 
 /** Base class for import formula parsers and export formula compilers. */
 class FormulaProcessorBase : public OpCodeProvider, protected ApiOpCodes, public WorkbookHelper
@@ -897,6 +847,24 @@ public:
                             ::rtl::OUString& orString,
                             const ApiTokenSequence& rTokens ) const;
 
+    /** Tries to extract information about a special token used for array
+        formulas, shared formulas, or table operations.
+
+        @param orTokenInfo  (output parameter) The extracted information about
+            the token. Contains the base address and the token type (sal_False
+            for array or shared formulas, sal_True for table operations).
+
+        @param rTokens  The token sequence to be parsed. If it contains exactly
+            one OPCODE_BAD token with special token information, this
+            information will be extracted.
+
+        @return  True = token sequence is valid, output parameter orTokenInfo
+            contains the token information extracted from the token sequence.
+     */
+    bool                extractSpecialTokenInfo(
+                            ApiSpecialTokenInfo& orTokenInfo,
+                            const ApiTokenSequence& rTokens ) const;
+
     /** Converts a single string with separators in the passed formula token
         sequence to a list of string tokens.
 
diff --git a/oox/inc/oox/xls/formulaparser.hxx b/oox/inc/oox/xls/formulaparser.hxx
index 7c0b985e3..e8f7fadf4 100644
--- a/oox/inc/oox/xls/formulaparser.hxx
+++ b/oox/inc/oox/xls/formulaparser.hxx
@@ -88,6 +88,7 @@ private:
     const ApiToken*     getSingleToken( const ApiToken* pToken, const ApiToken* pTokenEnd ) const;
     const ApiToken*     skipParentheses( const ApiToken* pToken, const ApiToken* pTokenEnd ) const;
     const ApiToken*     findParameters( ParameterPosVector& rParams, const ApiToken* pToken, const ApiToken* pTokenEnd ) const;
+    void                appendEmptyParameter( const FunctionInfo& rFuncInfo, size_t nParam );
     void                appendCalcOnlyParameter( const FunctionInfo& rFuncInfo, size_t nParam );
     void                appendRequiredParameters( const FunctionInfo& rFuncInfo, size_t nParamCount );
 
@@ -114,38 +115,36 @@ public:
     virtual             ~FormulaParser();
 
     /** Converts an OOXML formula string. */
-    void                importFormula(
-                            FormulaContext& rContext,
+    ApiTokenSequence    importFormula(
+                            const ::com::sun::star::table::CellAddress& rBaseAddr,
                             const ::rtl::OUString& rFormulaString ) const;
 
     /** Imports and converts a BIFF12 token array from the passed stream. */
-    void                importFormula(
-                            FormulaContext& rContext,
+    ApiTokenSequence    importFormula(
+                            const ::com::sun::star::table::CellAddress& rBaseAddr,
+                            FormulaType eType,
                             SequenceInputStream& rStrm ) const;
 
     /** Imports and converts a BIFF2-BIFF8 token array from the passed stream.
         @param pnFmlaSize  Size of the token array. If null is passed, reads
         it from stream (1 byte in BIFF2, 2 bytes otherwise) first. */
-    void                importFormula(
-                            FormulaContext& rContext,
+    ApiTokenSequence    importFormula(
+                            const ::com::sun::star::table::CellAddress& rBaseAddr,
+                            FormulaType eType,
                             BiffInputStream& rStrm,
                             const sal_uInt16* pnFmlaSize = 0 ) const;
 
+    /** Converts the passed Boolean value to a similar formula. */
+    ApiTokenSequence    convertBoolToFormula( bool bValue ) const;
+
     /** Converts the passed BIFF error code to a similar formula. */
-    void                convertErrorToFormula(
-                            FormulaContext& rContext,
-                            sal_uInt8 nErrorCode ) const;
+    ApiTokenSequence    convertErrorToFormula( sal_uInt8 nErrorCode ) const;
 
     /** Converts the passed token index of a defined name to a formula calling that name. */
-    void                convertNameToFormula(
-                            FormulaContext& rContext,
-                            sal_Int32 nTokenIndex ) const;
+    ApiTokenSequence    convertNameToFormula( sal_Int32 nTokenIndex ) const;
 
     /** Converts the passed number into a HYPERLINK formula with the passed URL. */
-    void                convertNumberToHyperlink(
-                            FormulaContext& rContext,
-                            const ::rtl::OUString& rUrl,
-                            double fValue ) const;
+    ApiTokenSequence    convertNumberToHyperlink( const ::rtl::OUString& rUrl, double fValue ) const;
 
     /** Converts the passed XML formula to an OLE link target. */
     ::rtl::OUString     importOleTargetLink( const ::rtl::OUString& rFormulaString );
@@ -154,9 +153,7 @@ public:
     ::rtl::OUString     importOleTargetLink( SequenceInputStream& rStrm );
 
     /** Imports and converts an OLE link target from the passed stream. */
-    ::rtl::OUString     importOleTargetLink(
-                            BiffInputStream& rStrm,
-                            const sal_uInt16* pnFmlaSize = 0 ) const;
+    ::rtl::OUString     importOleTargetLink( BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 ) const;
 
     /** Converts the passed formula to a macro name for a drawing shape. */
     ::rtl::OUString     importMacroName( const ::rtl::OUString& rFormulaString );
diff --git a/oox/inc/oox/xls/ooxformulaparser.hxx b/oox/inc/oox/xls/ooxformulaparser.hxx
index 1548d9cd5..7c2eb2681 100644
--- a/oox/inc/oox/xls/ooxformulaparser.hxx
+++ b/oox/inc/oox/xls/ooxformulaparser.hxx
@@ -47,10 +47,10 @@ class OOXMLFormulaPrinterImpl;
 typedef ::cppu::WeakImplHelper3<
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::lang::XInitialization,
-    ::com::sun::star::sheet::XFilterFormulaParser > OOXMLFormulaParserBase;
+    ::com::sun::star::sheet::XFilterFormulaParser > OOXMLFormulaParser_BASE;
 
 /** OOXML formula parser/compiler service for usage in ODF filters. */
-class OOXMLFormulaParser : public OOXMLFormulaParserBase
+class OOXMLFormulaParser : public OOXMLFormulaParser_BASE
 {
 public:
     explicit            OOXMLFormulaParser();
diff --git a/oox/inc/oox/xls/pivotcachebuffer.hxx b/oox/inc/oox/xls/pivotcachebuffer.hxx
index 9b9150c13..eb7bcdc48 100644
--- a/oox/inc/oox/xls/pivotcachebuffer.hxx
+++ b/oox/inc/oox/xls/pivotcachebuffer.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/refvector.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
@@ -431,15 +432,15 @@ public:
     void                writeSourceHeaderCells( WorksheetHelper& rSheetHelper ) const;
     /** Writes a source field item value into the passed sheet. */
     void                writeSourceDataCell( WorksheetHelper& rSheetHelper,
-                            sal_Int32 nCol, sal_Int32 nRow,
+                            sal_Int32 nColIdx, sal_Int32 nRowIdx,
                             const PivotCacheItem& rItem ) const;
 
     /** Reads a PCRECORD record and writes all item values to the passed sheet. */
     void                importPCRecord( SequenceInputStream& rStrm,
-                            WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const;
+                            WorksheetHelper& rSheetHelper, sal_Int32 nRowIdx ) const;
     /** Reads a PCITEM_INDEXLIST record and writes all item values to the passed sheet. */
     void                importPCItemIndexList( BiffInputStream& rStrm,
-                            WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const;
+                            WorksheetHelper& rSheetHelper, sal_Int32 nRowIdx ) const;
 
 private:
     /** Reads the worksheet source range from the DCONREF record. */
@@ -457,6 +458,8 @@ private:
     void                finalizeExternalSheetSource();
     /** Creates a dummy sheet that will be filled with the pivot cache data. */
     void                prepareSourceDataSheet();
+    /** Checks, if the row index has changed since last call, and initializes the sheet data buffer. */
+    void                updateSourceDataRow( WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const;
 
 private:
     typedef RefVector< PivotCacheField >    PivotCacheFieldVector;
@@ -468,7 +471,9 @@ private:
     PCDefinitionModel   maDefModel;         /// Global pivot cache settings.
     PCSourceModel       maSourceModel;      /// Pivot cache source settings.
     PCWorksheetSourceModel maSheetSrcModel; /// Sheet source data if cache type is sheet.
+    ValueRangeSet       maColSpans;         /// Column spans used by SheetDataBuffer for optimized cell import.
     ::rtl::OUString     maTargetUrl;        /// URL of an external source document.
+    mutable sal_Int32   mnCurrRow;          /// Current row index in dummy sheet.
     bool                mbValidSource;      /// True = pivot cache is based on supported data source.
     bool                mbDummySheet;       /// True = pivot cache is based on a dummy sheet.
 };
diff --git a/oox/inc/oox/xls/pivotcachefragment.hxx b/oox/inc/oox/xls/pivotcachefragment.hxx
index 4ed0a1a33..56a29b80f 100644
--- a/oox/inc/oox/xls/pivotcachefragment.hxx
+++ b/oox/inc/oox/xls/pivotcachefragment.hxx
@@ -82,7 +82,7 @@ class PivotCacheRecordsFragment : public WorksheetFragmentBase
 {
 public:
     explicit            PivotCacheRecordsFragment(
-                            const WorkbookHelper& rHelper,
+                            const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
                             const PivotCache& rPivotCache );
 
@@ -98,8 +98,8 @@ private:
 
 private:
     const PivotCache&   mrPivotCache;
-    sal_Int32           mnCol;
-    sal_Int32           mnRow;
+    sal_Int32           mnColIdx;           /// Relative column index in source data.
+    sal_Int32           mnRowIdx;           /// Relative row index in source data.
     bool                mbInRecord;
 };
 
@@ -127,7 +127,7 @@ class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase
 {
 public:
     explicit            BiffPivotCacheRecordsContext(
-                            const WorkbookHelper& rHelper,
+                            const WorksheetHelper& rHelper,
                             const PivotCache& rPivotCache );
 
     /** Reads the current record from stream and tries to insert a cell into
@@ -143,7 +143,7 @@ private:
     const PivotCache&   mrPivotCache;
     ColumnIndexVector   maUnsharedCols; /// Column indexes of all unshared cache fields.
     size_t              mnColIdx;       /// Current index into maUnsharedCols.
-    sal_Int32           mnRow;          /// Current row in source data (0-based).
+    sal_Int32           mnRowIdx;       /// Current row in source data (0-based).
     bool                mbHasShared;    /// True = pivot cache contains fields with shared items.
     bool                mbInRow;        /// True = a data row has been started.
 };
diff --git a/oox/inc/oox/xls/richstring.hxx b/oox/inc/oox/xls/richstring.hxx
index 93d5cf8c8..15a5ad4ed 100644
--- a/oox/inc/oox/xls/richstring.hxx
+++ b/oox/inc/oox/xls/richstring.hxx
@@ -71,15 +71,17 @@ public:
 
     /** Returns the text data of this portion. */
     inline const ::rtl::OUString& getText() const { return maText; }
+    /** Returns true, if the portion fontains font formatting. */
+    inline bool         hasFont() const { return mxFont.get() != 0; }
 
-    /** Converts the portion and appends it to the passed XText. */
+    /** Converts the portion and replaces or appends to the passed XText. */
     void                convert(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText,
-                            sal_Int32 nXfId );
+                            const Font* pFont, bool bReplace );
 
     void                writeFontProperties(
         const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText,
-        sal_Int32 nXfId ) const;
+        const Font* pFont ) const;
 
 private:
     ::rtl::OUString     maText;         /// Portion text.
@@ -251,21 +253,30 @@ public:
     /** Imports a Unicode rich-string from the passed record stream. */
     void                importString( SequenceInputStream& rStrm, bool bRich );
 
-    /** Imports a byte string from the passed BIFF stream. */
-    void                importByteString( BiffInputStream& rStrm, rtl_TextEncoding eDefaultTextEnc, BiffStringFlags nFlags = BIFF_STR_DEFAULT );
-    /** Imports a Unicode rich-string from the passed BIFF stream. */
+    /** Imports nChars byte characters from the passed BIFF stream and appends a new text portion. */
+    void                importCharArray( BiffInputStream& rStrm, sal_uInt16 nChars, rtl_TextEncoding eTextEnc );
+    /** Imports a byte string from the passed BIFF stream and appends new text portions. */
+    void                importByteString( BiffInputStream& rStrm, rtl_TextEncoding eTextEnc, BiffStringFlags nFlags = BIFF_STR_DEFAULT );
+    /** Imports a Unicode rich-string from the passed BIFF stream and appends new text portions. */
     void                importUniString( BiffInputStream& rStrm, BiffStringFlags nFlags = BIFF_STR_DEFAULT );
 
     /** Final processing after import of all strings. */
     void                finalizeImport();
 
-    /** Returns the plain text concatenated from all string portions. */
-    ::rtl::OUString     getPlainText() const;
-
-    /** Converts the string and writes it into the passed XText. */
+    /** Tries to extract a plain string from this object. Returns the string,
+        if there is only one unformatted portion. */
+    bool                extractPlainString(
+                            ::rtl::OUString& orString,
+                            const Font* pFirstPortionFont = 0 ) const;
+    
+    /** Converts the string and writes it into the passed XText.
+        @param rxText  The XText interface of the target object.
+        @param bReplaceOld  True = replace old contents of the text object.
+        @param pFirstPortionFont  Optional font providing additional rich-text
+            formatting for the first text portion, e.g. font escapement. */
     void                convert(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText,
-                            sal_Int32 nXfId ) const;
+                            const Font* pFirstPortionFont = 0 ) const;
 
 private:
     /** Creates, appends, and returns a new empty string portion. */
@@ -274,19 +285,19 @@ private:
     RichStringPhoneticRef createPhonetic();
 
     /** Create base text portions from the passed string and character formatting. */
-    void                createFontPortions( const ::rtl::OString& rText, rtl_TextEncoding eDefaultTextEnc, FontPortionModelList& rPortions );
+    void                createTextPortions( const ::rtl::OString& rText, rtl_TextEncoding eTextEnc, FontPortionModelList& rPortions );
     /** Create base text portions from the passed string and character formatting. */
-    void                createFontPortions( const ::rtl::OUString& rText, FontPortionModelList& rPortions );
+    void                createTextPortions( const ::rtl::OUString& rText, FontPortionModelList& rPortions );
     /** Create phonetic text portions from the passed string and portion data. */
     void                createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen );
 
 private:
-    typedef RefVector< RichStringPortion >  PortionVec;
-    typedef RefVector< RichStringPhonetic > PhoneticVec;
+    typedef RefVector< RichStringPortion >  PortionVector;
+    typedef RefVector< RichStringPhonetic > PhoneticVector;
 
-    PortionVec          maFontPortions; /// String portions with font data.
+    PortionVector       maTextPortions; /// String portions with font data.
     PhoneticSettings    maPhonSettings; /// Phonetic settings for this string.
-    PhoneticVec         maPhonPortions; /// Phonetic text portions.
+    PhoneticVector      maPhonPortions; /// Phonetic text portions.
 };
 
 typedef ::boost::shared_ptr< RichString > RichStringRef;
diff --git a/oox/inc/oox/xls/sharedformulabuffer.hxx b/oox/inc/oox/xls/sharedformulabuffer.hxx
deleted file mode 100644
index 95e22bf65..000000000
--- a/oox/inc/oox/xls/sharedformulabuffer.hxx
+++ /dev/null
@@ -1,114 +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.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_XLS_SHAREDFORMULABUFFER_HXX
-#define OOX_XLS_SHAREDFORMULABUFFER_HXX
-
-#include <map>
-#include <memory>
-#include "oox/xls/worksheethelper.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace sheet { class XFormulaTokens; }
-    namespace sheet { class XNamedRange; }
-} } }
-
-namespace oox {
-namespace xls {
-
-// ============================================================================
-
-/** Formula context that supports shared formulas. */
-class ExtCellFormulaContext : public SimpleFormulaContext, public WorksheetHelper
-{
-public:
-    explicit            ExtCellFormulaContext(
-                            const WorksheetHelper& rHelper,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens >& rxTokens,
-                            const ::com::sun::star::table::CellAddress& rCellPos );
-
-    virtual void        setSharedFormula( const ::com::sun::star::table::CellAddress& rBaseAddr );
-};
-
-// ============================================================================
-
-class SharedFormulaBuffer : public WorksheetHelper
-{
-public:
-    explicit            SharedFormulaBuffer( const WorksheetHelper& rHelper );
-
-    /** Imports a shared formula from a OOXML formula string. */
-    void                importSharedFmla( const ::rtl::OUString& rFormula,
-                            const ::rtl::OUString& rSharedRange, sal_Int32 nId,
-                            const ::com::sun::star::table::CellAddress& rBaseAddr );
-    /** Imports a shared formula from a SHAREDFORMULA record in the passed stream */
-    void                importSharedFmla( SequenceInputStream& rStrm,
-                            const ::com::sun::star::table::CellAddress& rBaseAddr );
-    /** Imports a shared formula from a SHAREDFMLA record in the passed stream. */
-    void                importSharedFmla( BiffInputStream& rStrm,
-                            const ::com::sun::star::table::CellAddress& rBaseAddr );
-
-    /** Inserts a shared formula with the passed base address into a cell
-        described by the passed formula context. */
-    void                setSharedFormulaCell(
-                            ExtCellFormulaContext& rContext,
-                            const ::com::sun::star::table::CellAddress& rBaseAddr );
-    /** Inserts a shared formula with the passed base address into a cell
-        described by the passed formula context. */
-    void                setSharedFormulaCell(
-                            ExtCellFormulaContext& rContext,
-                            sal_Int32 nSharedId );
-
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
-                        createDefinedName( const BinAddress& rMapKey );
-
-    bool                implSetSharedFormulaCell(
-                            ExtCellFormulaContext& rContext,
-                            const BinAddress& rMapKey );
-
-    void                updateCachedCell(
-                            const ::com::sun::star::table::CellAddress& rBaseAddr,
-                            const BinAddress& rMapKey );
-
-private:
-    typedef ::std::map< BinAddress, sal_Int32 >         TokenIndexMap;
-    typedef ::std::auto_ptr< ExtCellFormulaContext >    ContextPtr;
-
-    TokenIndexMap       maIndexMap;         /// Maps shared formula base address to defined name identifier.
-    ContextPtr          mxLastContext;      /// Cached formula context for leading formula cell.
-};
-
-// ============================================================================
-
-} // namespace xls
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/oox/xls/sharedstringsbuffer.hxx b/oox/inc/oox/xls/sharedstringsbuffer.hxx
index 20c7fd09d..b6e9103be 100644
--- a/oox/inc/oox/xls/sharedstringsbuffer.hxx
+++ b/oox/inc/oox/xls/sharedstringsbuffer.hxx
@@ -50,15 +50,12 @@ public:
     /** Final processing after import of all strings. */
     void                finalizeImport();
 
-    /** Converts the specified string table entry. */
-    void                convertString(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText,
-                            sal_Int32 nStringId,
-                            sal_Int32 nXfId ) const;
+    /** Returns the specified string. */
+    RichStringRef       getString( sal_Int32 nStringId ) const;
 
 private:
-    typedef RefVector< RichString > StringVec;
-    StringVec           maStrings;
+    typedef RefVector< RichString > StringVector;
+    StringVector        maStrings;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/sheetdatabuffer.hxx b/oox/inc/oox/xls/sheetdatabuffer.hxx
new file mode 100755
index 000000000..82ee27ff7
--- /dev/null
+++ b/oox/inc/oox/xls/sheetdatabuffer.hxx
@@ -0,0 +1,354 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef OOX_XLS_SHEETDATABUFFER_HXX
+#define OOX_XLS_SHEETDATABUFFER_HXX
+
+#include <list>
+#include <map>
+#include "oox/xls/richstring.hxx"
+#include "oox/xls/worksheethelper.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace sheet { class XNamedRange; }
+    namespace util { struct DateTime; }
+} } }
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+/** Stores basic data about cell values and formatting. */
+struct CellModel
+{
+    ::com::sun::star::table::CellAddress
+                        maCellAddr;         /// The address of the current cell.
+    sal_Int32           mnCellType;         /// Data type of the cell value.
+    sal_Int32           mnXfId;             /// XF (cell formatting) identifier.
+    bool                mbShowPhonetic;     /// True = show phonetic text.
+
+    explicit            CellModel();
+};
+
+// ----------------------------------------------------------------------------
+
+/** Stores data about cell formulas. */
+struct CellFormulaModel
+{
+    ::com::sun::star::table::CellRangeAddress
+                        maFormulaRef;       /// Formula range for array/shared formulas and data tables.
+    sal_Int32           mnFormulaType;      /// Type of the formula (regular, array, shared, table).
+    sal_Int32           mnSharedId;         /// Identifier of a shared formula (OOXML only).
+
+    explicit            CellFormulaModel();
+
+    /** Returns true, if the passed cell address is valid for an array formula. */
+    bool                isValidArrayRef( const ::com::sun::star::table::CellAddress& rCellAddr );
+    /** Returns true, if the passed cell address is valid for a shared formula. */
+    bool                isValidSharedRef( const ::com::sun::star::table::CellAddress& rCellAddr );
+};
+
+// ----------------------------------------------------------------------------
+
+/** Stores data about table operations. */
+struct DataTableModel
+{
+    ::rtl::OUString     maRef1;             /// First reference cell for table operations.
+    ::rtl::OUString     maRef2;             /// Second reference cell for table operations.
+    bool                mb2dTable;          /// True = 2-dimensional data table.
+    bool                mbRowTable;         /// True = row oriented data table.
+    bool                mbRef1Deleted;      /// True = first reference cell deleted.
+    bool                mbRef2Deleted;      /// True = second reference cell deleted.
+
+    explicit            DataTableModel();
+};
+
+// ============================================================================
+
+/** Stores position and contents of a range of cells for optimized import. */
+class CellBlock : public WorksheetHelper
+{
+public:
+    explicit            CellBlock( const WorksheetHelper& rHelper, const ValueRange& rColSpan, sal_Int32 nRow );
+
+    /** Returns true, if the end index of the passed colspan is greater than
+        the own column end index, or if the passed range has the same end index
+        but the start indexes do not match. */
+    bool                isBefore( const ValueRange& rColSpan ) const;
+    /** Returns true, if the cell block can be expanded with the passed colspan. */
+    bool                isExpandable( const ValueRange& rColSpan ) const;
+    /** Returns true, if the own colspan contains the passed column. */
+    bool                contains( sal_Int32 nCol ) const;
+
+    /** Returns the specified cell from the last row in the cell buffer array. */
+    ::com::sun::star::uno::Any& getCellAny( sal_Int32 nCol );
+    /** Inserts a rich-string into the cell block. */
+    void                insertRichString(
+                            const ::com::sun::star::table::CellAddress& rAddress,
+                            const RichStringRef& rxString,
+                            const Font* pFirstPortionFont );
+
+    /** Appends a new row to the cell buffer array. */
+    void                startNextRow();
+    /** Writes all buffered cells into the Calc sheet. */
+    void                finalizeImport();
+
+private:
+    /** Fills unused cells before passed index with empty strings. */
+    void                fillUnusedCells( sal_Int32 nIndex );
+
+private:
+    /** Stores position and string data of a rich-string cell. */
+    struct RichStringCell
+    {
+        ::com::sun::star::table::CellAddress
+                            maCellAddr;         /// The address of the rich-string cell.
+        RichStringRef       mxString;           /// The string with rich formatting.
+        const Font*         mpFirstPortionFont; /// Font information from cell for first text portion.
+
+        explicit            RichStringCell(
+                                const ::com::sun::star::table::CellAddress& rCellAddr,
+                                const RichStringRef& rxString,
+                                const Font* pFirstPortionFont );
+    };
+    typedef ::std::list< RichStringCell > RichStringCellList;
+
+    ::com::sun::star::table::CellRangeAddress
+                        maRange;            /// Cell range covered by this cell block.
+    RichStringCellList  maRichStrings;      /// Cached rich-string cells.
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+                        maCellArray;        /// The array of cells of this cell block.
+    ::com::sun::star::uno::Any*
+                        mpCurrCellRow;      /// Pointer to first cell of current row (last row in maCellArray).
+    const sal_Int32     mnRowLength;        /// Number of cells covered by row of this cell block.
+    sal_Int32           mnFirstFreeIndex;   /// Relative index of first unused cell in current row.
+};
+
+// ============================================================================
+
+/** Manages all cell blocks currently in use. */
+class CellBlockBuffer : public WorksheetHelper
+{
+public:
+    explicit            CellBlockBuffer( const WorksheetHelper& rHelper );
+
+    /** Sets column span information for a row. */
+    void                setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpans );
+
+    /** Tries to find a cell block. Recalculates the map of cell blocks, if the
+        passed cell address is located in another row than the last cell. */
+    CellBlock*          getCellBlock( const ::com::sun::star::table::CellAddress& rCellAddr );
+
+    /** Inserts all cells of all open cell blocks into the Calc document. */
+    void                finalizeImport();
+
+private:
+    typedef ::std::map< sal_Int32, ValueRangeVector >   ColSpanVectorMap;
+    typedef RefMap< sal_Int32, CellBlock >              CellBlockMap;
+
+    ColSpanVectorMap    maColSpans;             /// Buffereed column spans, mapped by row index.
+    CellBlockMap        maCellBlocks;           /// All open cell blocks, mapped by last (!) column of the block span.
+    CellBlockMap::iterator maCellBlockIt;       /// Pointer to cell block currently in use.
+    sal_Int32           mnCurrRow;              /// Current row index used for buffered cell import.
+};
+
+// ============================================================================
+
+/** Manages the cell contents and cell formatting of a sheet.
+ */
+class SheetDataBuffer : public WorksheetHelper
+{
+public:
+    explicit            SheetDataBuffer( const WorksheetHelper& rHelper );
+
+    /** Sets column span information for a row. */
+    void                setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpans );
+
+    /** Inserts a blank cell (with formatting) into the sheet. */
+    void                setBlankCell( const CellModel& rModel );
+    /** Inserts a value cell into the sheet. */
+    void                setValueCell( const CellModel& rModel, double fValue );
+    /** Inserts a simple string cell into the sheet. */
+    void                setStringCell( const CellModel& rModel, const ::rtl::OUString& rText );
+    /** Inserts a rich-string cell into the sheet. */
+    void                setStringCell( const CellModel& rModel, const RichStringRef& rxString );
+    /** Inserts a shared string cell into the sheet. */
+    void                setStringCell( const CellModel& rModel, sal_Int32 nStringId );
+    /** Inserts a date/time cell into the sheet and adjusts number format. */
+    void                setDateTimeCell( const CellModel& rModel, const ::com::sun::star::util::DateTime& rDateTime );
+    /** Inserts a boolean cell into the sheet and adjusts number format. */
+    void                setBooleanCell( const CellModel& rModel, bool bValue );
+    /** Inserts an error cell from the passed error code into the sheet. */
+    void                setErrorCell( const CellModel& rModel, const ::rtl::OUString& rErrorCode );
+    /** Inserts an error cell from the passed BIFF error code into the sheet. */
+    void                setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode );
+    /** Inserts a formula cell into the sheet. */
+    void                setFormulaCell( const CellModel& rModel, const ApiTokenSequence& rTokens );
+    /** Inserts a shared formula cell into the sheet (OOXML only). */
+    void                setFormulaCell( const CellModel& rModel, sal_Int32 nSharedId );
+
+    /** Inserts the passed token array as array formula. */
+    void                createArrayFormula(
+                            const ::com::sun::star::table::CellRangeAddress& rRange,
+                            const ApiTokenSequence& rTokens );
+    /** Sets a multiple table operation to the passed range. */
+    void                createTableOperation(
+                            const ::com::sun::star::table::CellRangeAddress& rRange,
+                            const DataTableModel& rModel );
+    /** Creates a named range with a special name for a shared formula with the
+        specified identifier and formula definition (OOXML only). */
+    void                createSharedFormula(
+                            sal_Int32 nSharedId,
+                            const ApiTokenSequence& rTokens );
+    /** Creates a named range with a special name for a shared formula with the
+        specified base address and formula definition (BIFF only). */
+    void                createSharedFormula(
+                            const ::com::sun::star::table::CellAddress& rCellAddr,
+                            const ApiTokenSequence& rTokens );
+
+    /** Sets default cell formatting for the specified range of rows. */
+    void                setRowFormat( sal_Int32 nRow, sal_Int32 nXfId, bool bCustomFormat );
+    /** Merges the cells in the passed cell range. */
+    void                setMergedRange( const ::com::sun::star::table::CellRangeAddress& rRange );
+    /** Sets a standard number format (constant from com.sun.star.util.NumberFormat) to the specified cell. */
+    void                setStandardNumFmt(
+                            const ::com::sun::star::table::CellAddress& rCellAddr,
+                            sal_Int16 nStdNumFmt );
+
+    /** Final processing after the sheet has been imported. */
+    void                finalizeImport();
+    
+private:
+    struct XfIdRowRange;
+    struct XfIdRange;
+
+    /** Sets the passed formula token array into a cell. */
+    void                setCellFormula(
+                            const ::com::sun::star::table::CellAddress& rCellAddr,
+                            const ApiTokenSequence& rTokens );
+
+    /** Creates a named range with a special name for a shared formula with the
+        specified base address and formula definition. */
+    void                createSharedFormula( const BinAddress& rMapKey, const ApiTokenSequence& rTokens );
+    /** Creates a formula token array representing the shared formula with the
+        passed identifier. */
+    ApiTokenSequence    resolveSharedFormula( const BinAddress& rMapKey ) const;
+
+    /** Inserts the passed array formula into the sheet. */
+    void                finalizeArrayFormula(
+                            const ::com::sun::star::table::CellRangeAddress& rRange,
+                            const ApiTokenSequence& rTokens ) const;
+    /** Inserts the passed table operation into the sheet. */
+    void                finalizeTableOperation(
+                            const ::com::sun::star::table::CellRangeAddress& rRange,
+                            const DataTableModel& rModel ) const;
+
+    /** Processes the cell formatting data of the passed cell.
+        @param nNumFmtId  If set, overrides number format of the cell XF. */
+    void                setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtId = -1 );
+
+    /** Writes all cell formatting attributes to the passed row range. */
+    void                writeXfIdRowRangeProperties( const XfIdRowRange& rXfIdRowRange ) const;
+    /** Writes all cell formatting attributes to the passed cell range. */
+    void                writeXfIdRangeProperties( const XfIdRange& rXfIdRange ) const;
+    /** Tries to merge the ranges last inserted in maXfIdRanges with existing ranges. */
+    void                mergeXfIdRanges();
+
+    /** Merges the passed merged range and updates right/bottom cell borders. */
+    void                finalizeMergedRange( const ::com::sun::star::table::CellRangeAddress& rRange );
+
+private:
+    /** Stores cell range address and formula token array of an array formula. */
+    typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, ApiTokenSequence > ArrayFormula;
+    typedef ::std::list< ArrayFormula > ArrayFormulaList;
+
+    /** Stores cell range address and settings of a table operation. */
+    typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, DataTableModel > TableOperation;
+    typedef ::std::list< TableOperation > TableOperationList;
+
+    typedef ::std::map< BinAddress, sal_Int32 > SharedFormulaMap;
+
+    /** Stores information about a range of rows with equal cell formatting. */
+    struct XfIdRowRange
+    {
+        ValueRange          maRowRange;         /// Indexes of first and last row.
+        sal_Int32           mnXfId;             /// XF identifier for the row range.
+
+        explicit            XfIdRowRange();
+        bool                intersects( const ::com::sun::star::table::CellRangeAddress& rRange ) const;
+        void                set( sal_Int32 nRow, sal_Int32 nXfId );
+        bool                tryExpand( sal_Int32 nRow, sal_Int32 nXfId );
+    };
+
+    /** Stores information about a range of cells with equal formatting. */
+    struct XfIdRange
+    {
+        ::com::sun::star::table::CellRangeAddress
+                            maRange;            /// The formatted cell range.
+        sal_Int32           mnXfId;             /// XF identifier for the range.
+        sal_Int32           mnNumFmtId;         /// Number format overriding the XF.
+
+        void                set( const ::com::sun::star::table::CellAddress& rCellAddr, sal_Int32 nXfId, sal_Int32 nNumFmtId );
+        bool                tryExpand( const ::com::sun::star::table::CellAddress& rCellAddr, sal_Int32 nXfId, sal_Int32 nNumFmtId );
+        bool                tryMerge( const XfIdRange& rXfIdRange );
+    };
+    typedef ::std::map< BinAddress, XfIdRange > XfIdRangeMap;
+
+    /** Stores information about a merged cell range. */
+    struct MergedRange
+    {
+        ::com::sun::star::table::CellRangeAddress
+                            maRange;            /// The formatted cell range.
+        sal_Int32           mnHorAlign;         /// Horizontal alignment in the range.
+
+        explicit            MergedRange( const ::com::sun::star::table::CellRangeAddress& rRange );
+        explicit            MergedRange( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nHorAlign );
+        bool                tryExpand( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nHorAlign );
+    };
+    typedef ::std::list< MergedRange > MergedRangeList;
+
+    CellBlockBuffer     maCellBlocks;           /// Manages all open cell blocks.
+    ArrayFormulaList    maArrayFormulas;        /// All array formulas in the sheet.
+    TableOperationList  maTableOperations;      /// All table operations in the sheet.
+    SharedFormulaMap    maSharedFormulas;       /// Maps shared formula base address to defined name token index.
+    ::com::sun::star::table::CellAddress
+                        maSharedFmlaAddr;       /// Address of a cell containing a pending shared formula.
+    BinAddress          maSharedBaseAddr;       /// Base address of the pending shared formula.
+    XfIdRowRange        maXfIdRowRange;         /// Cached XF identifier for a range of rows.
+    XfIdRangeMap        maXfIdRanges;           /// Collected XF identifiers for cell ranges.
+    MergedRangeList     maMergedRanges;         /// Merged cell ranges.
+    MergedRangeList     maCenterFillRanges;     /// Merged cell ranges from 'center across' or 'fill' alignment.
+    bool                mbPendingSharedFmla;    /// True = maSharedFmlaAddr and maSharedBaseAddr are valid.
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/sheetdatacontext.hxx b/oox/inc/oox/xls/sheetdatacontext.hxx
index aee66ecd5..87e3f4313 100644
--- a/oox/inc/oox/xls/sheetdatacontext.hxx
+++ b/oox/inc/oox/xls/sheetdatacontext.hxx
@@ -31,22 +31,37 @@
 
 #include "oox/xls/excelhandlers.hxx"
 #include "oox/xls/richstring.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace table { class XCell; }
-} } }
+#include "oox/xls/sheetdatabuffer.hxx"
 
 namespace oox {
 namespace xls {
 
 // ============================================================================
 
+/** Used as base for sheet data context classes. Provides fast access to often
+    used converter objects and sheet index, to improve performance.
+ */
+struct SheetDataContextBase
+{
+    AddressConverter&   mrAddressConv;      /// The address converter.
+    FormulaParser&      mrFormulaParser;    /// The formula parser.
+    SheetDataBuffer&    mrSheetData;        /// The sheet data buffer for cell content and formatting.
+    CellModel           maCellData;         /// Position, contents, formatting of current imported cell.
+    CellFormulaModel    maFmlaData;         /// Settings for a cell formula.
+    sal_Int16           mnSheet;            /// Index of the current sheet.
+
+    explicit            SheetDataContextBase( const WorksheetHelper& rHelper );
+    virtual             ~SheetDataContextBase();
+};
+
+// ============================================================================
+
 /** This class implements importing the sheetData element.
 
     The sheetData element contains all row settings and all cells in a single
     sheet of a spreadsheet document.
  */
-class SheetDataContext : public WorksheetContextBase
+class SheetDataContext : public WorksheetContextBase, private SheetDataContextBase
 {
 public:
     explicit            SheetDataContext( WorksheetFragmentBase& rFragment );
@@ -65,12 +80,20 @@ private:
     /** Imports row settings from a row element. */
     void                importRow( const AttributeList& rAttribs );
     /** Imports cell settings from a c element. */
-    void                importCell( const AttributeList& rAttribs );
+    bool                importCell( const AttributeList& rAttribs );
     /** Imports cell settings from an f element. */
     void                importFormula( const AttributeList& rAttribs );
 
-    /** Imports a cell address and the following XF identifier. */
-    void                importCellHeader( SequenceInputStream& rStrm, CellType eCellType );
+    /** Imports row settings from a ROW record. */
+    void                importRow( SequenceInputStream& rStrm );
+
+    /** Reads a cell address and the following XF identifier. */
+    bool                readCellHeader( SequenceInputStream& rStrm, CellType eCellType );
+    /** Reads a cell formula for the current cell. */
+    ApiTokenSequence    readCellFormula( SequenceInputStream& rStrm );
+    /** Reads the formula range used by shared formulas, arrays, and data tables. */
+    bool                readFormulaRef( SequenceInputStream& rStrm );
+
     /** Imports an empty cell from a CELL_BLANK or MULTCELL_BLANK record. */
     void                importCellBlank( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports a boolean cell from a CELL_BOOL, MULTCELL_BOOL, or FORMULA_BOOL record. */
@@ -88,30 +111,28 @@ private:
     /** Imports a string cell from a CELL_STRING, MULTCELL_STRING, or FORMULA_STRING record. */
     void                importCellString( SequenceInputStream& rStrm, CellType eCellType );
 
-    /** Imports a cell formula for the current cell. */
-    void                importCellFormula( SequenceInputStream& rStrm );
-
-    /** Imports row settings from a ROW record. */
-    void                importRow( SequenceInputStream& rStrm );
     /** Imports an array formula from an ARRAY record. */
     void                importArray( SequenceInputStream& rStrm );
-    /** Imports a shared formula from a SHAREDFORMULA record. */
-    void                importSharedFmla( SequenceInputStream& rStrm );
     /** Imports table operation from a DATATABLE record. */
     void                importDataTable( SequenceInputStream& rStrm );
+    /** Imports a shared formula from a SHAREDFORMULA record. */
+    void                importSharedFmla( SequenceInputStream& rStrm );
 
 private:
-    CellModel           maCurrCell;         /// Position and formatting of current imported cell.
-    DataTableModel      maTableData;        /// Additional data for table operation ranges.
-    BinAddress          maCurrPos;          /// Current position for binary import.
-    RichStringRef       mxInlineStr;        /// Inline rich string from 'is' element.
+    ::rtl::OUString     maCellValue;        /// Cell value string (OOXML only).
+    RichStringRef       mxInlineStr;        /// Inline rich string (OOXML only).
+    ApiTokenSequence    maTokens;           /// Formula token array (OOXML only).
+    DataTableModel      maTableData;        /// Settings for table operations.
+    BinAddress          maCurrPos;          /// Current cell position (BIFF12 only).
+    bool                mbHasFormula;       /// True = current cell has formula data (OOXML only).
+    bool                mbValidRange;       /// True = maFmlaData.maFormulaRef is valid (OOXML only).
 };
 
 // ============================================================================
 
 /** This class implements importing row settings and all cells of a sheet.
  */
-class BiffSheetDataContext : public BiffWorksheetContextBase
+class BiffSheetDataContext : public BiffWorksheetContextBase, private SheetDataContextBase
 {
 public:
     explicit            BiffSheetDataContext( const WorksheetHelper& rHelper );
@@ -120,13 +141,15 @@ public:
     virtual void        importRecord( BiffInputStream& rStrm );
 
 private:
-    /** Sets current cell according to the passed address. */
-    void                setCurrCell( const BinAddress& rAddr );
+    /** Imports row settings from a ROW record. */
+    void                importRow( BiffInputStream& rStrm );
 
-    /** Imports an XF identifier and sets the mnXfId member. */
-    void                importXfId( BiffInputStream& rStrm, bool bBiff2 );
-    /** Imports a BIFF cell address and the following XF identifier. */
-    void                importCellHeader( BiffInputStream& rStrm, bool bBiff2 );
+    /** Reads an XF identifier and initializes a new cell. */
+    bool                readCellXfId( BiffInputStream& rStrm, const BinAddress& rAddr, bool bBiff2 );
+    /** Reads a BIFF cell address and the following XF identifier. */
+    bool                readCellHeader( BiffInputStream& rStrm, bool bBiff2 );
+    /** Reads the formula range used by shared formulas, arrays, and data tables. */
+    bool                readFormulaRef( BiffInputStream& rStrm );
 
     /** Imports a BLANK record describing a blank but formatted cell. */
     void                importBlank( BiffInputStream& rStrm );
@@ -149,20 +172,18 @@ private:
     /** Imports an RK record describing a numeric cell. */
     void                importRk( BiffInputStream& rStrm );
 
-    /** Imports row settings from a ROW record. */
-    void                importRow( BiffInputStream& rStrm );
     /** Imports an ARRAY record describing an array formula of a cell range. */
     void                importArray( BiffInputStream& rStrm );
-    /** Imports a SHAREDFMLA record describing a shared formula in a cell range. */
-    void                importSharedFmla( BiffInputStream& rStrm );
     /** Imports table operation from a DATATABLE or DATATABLE2 record. */
     void                importDataTable( BiffInputStream& rStrm );
+    /** Imports a SHAREDFMLA record describing a shared formula in a cell range. */
+    void                importSharedFmla( BiffInputStream& rStrm );
 
 private:
-    CellModel           maCurrCell;             /// Position and formatting of current imported cell.
-    sal_uInt32          mnFormulaIgnoreSize;    /// Number of bytes to be ignored in FORMULA record.
-    sal_uInt32          mnArrayIgnoreSize;      /// Number of bytes to be ignored in ARRAY record.
-    sal_uInt16          mnBiff2XfId;            /// Current XF identifier from IXFE record.
+    sal_uInt32          mnFormulaSkipSize;  /// Number of bytes to be ignored in FORMULA record.
+    sal_uInt32          mnArraySkipSize;    /// Number of bytes to be ignored in ARRAY record.
+    sal_uInt16          mnBiff2XfId;        /// Current XF identifier from IXFE record.
+    OptValue< bool >    mobBiff2HasXfs;     /// Select XF formatting or direct formatting in BIFF2.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx
index d47af195b..82541c417 100644
--- a/oox/inc/oox/xls/stylesbuffer.hxx
+++ b/oox/inc/oox/xls/stylesbuffer.hxx
@@ -796,6 +796,11 @@ public:
     /** Writes all formatting attributes to the passed property set. */
     void                writeToPropertySet( PropertySet& rPropSet ) const;
 
+    /** Converts formatting information from BIFF2 cell record data directly. */
+    static void         writeBiff2CellFormatToPropertySet(
+                            const WorkbookHelper& rHelper, PropertySet& rPropSet,
+                            sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 );
+
 private:
     /** Sets 'attribute used' flags from the passed BIFF bit field. */
     void                setBiffUsedFlags( sal_uInt8 nUsedFlags );
diff --git a/oox/inc/oox/xls/workbookhelper.hxx b/oox/inc/oox/xls/workbookhelper.hxx
index 3e2ca49c0..4e95613f2 100644
--- a/oox/inc/oox/xls/workbookhelper.hxx
+++ b/oox/inc/oox/xls/workbookhelper.hxx
@@ -109,47 +109,49 @@ class TableBuffer;
 class ThemeBuffer;
 class UnitConverter;
 class ViewSettings;
-class WorkbookData;
 class WorkbookSettings;
 class WorksheetBuffer;
 
+class WorkbookGlobals;
+typedef ::boost::shared_ptr< WorkbookGlobals > WorkbookGlobalsRef;
+
 /** Helper class to provice access to global workbook data.
 
     All classes derived from this helper class will have access to a singleton
-    object of type WorkbookData containing global workbook settings, buffers,
-    converters, etc. Nearly all classes in this filter implementation are
-    derived directly or indirectly from this class.
+    object of type WorkbookGlobals containing global workbook settings,
+    buffers, converters, etc. Nearly all classes in this filter implementation
+    are derived directly or indirectly from this class.
     
-    This class contains just a simple reference to the WorkbookData object to
-    prevent circular references, as the WorkbookData object contains a lot of
-    objects derived from this class.
+    This class contains just a simple reference to the WorkbookGlobals object
+    to prevent circular references, as the WorkbookGlobals object contains a
+    lot of objects derived from this class.
  */
 class WorkbookHelper
 {
 public:
-    inline /*implicit*/ WorkbookHelper( WorkbookData& rBookData ) : mrBookData( rBookData ) {}
+    inline /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {}
     virtual             ~WorkbookHelper();
+    
+    static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter );
+    static WorkbookGlobalsRef constructGlobals( ExcelBiffFilter& rFilter, BiffType eBiff );
 
     // filter -----------------------------------------------------------------
 
     /** Returns the base filter object (base class of all filters). */
     ::oox::core::FilterBase& getBaseFilter() const;
-    /** Returns a reference to the global service factory. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        getGlobalFactory() const;
     /** Returns the file type of the current filter. */
     FilterType          getFilterType() const;
     /** Returns the filter progress bar. */
     SegmentProgressBar& getProgressBar() const;
     /** Returns true, if the file is a multi-sheet document, or false if single-sheet. */
     bool                isWorkbookFile() const;
-    /** Returns the index of the current sheet in the Calc document. */
+    /** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
     sal_Int16           getCurrentSheetIndex() const;
-
-    /** Sets the index of the current sheet in the Calc document. */
-    void                setCurrentSheetIndex( sal_Int16 nSheet );
-    /** Sets the VBA project storage. */
+    
+    /** Sets the VBA project storage used to import VBA source code and forms. */
     void                setVbaProjectStorage( const StorageRef& rxVbaPrjStrg );
+    /** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
+    void                setCurrentSheetIndex( sal_Int16 nSheet );
     /** Final conversion after importing the workbook. */
     void                finalizeWorkbookImport();
 
@@ -158,9 +160,6 @@ public:
     /** Returns a reference to the source/target spreadsheet document model. */
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >
                         getDocument() const;
-    /** Returns a reference to the service factory of the spreadsheet document model. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        getDocumentFactory() const;
 
     /** Returns a reference to the specified spreadsheet in the document model. */
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >
@@ -290,38 +289,7 @@ public:
     BiffCodecHelper&    getCodecHelper() const;
 
 private:
-    WorkbookData&       mrBookData;
-};
-
-// ============================================================================
-
-namespace prv {
-
-typedef ::boost::shared_ptr< WorkbookData > WorkbookDataRef;
-
-struct WorkbookDataOwner
-{
-    explicit            WorkbookDataOwner( WorkbookDataRef xBookData );
-    virtual             ~WorkbookDataOwner();
-    WorkbookDataRef     mxBookData;
-};
-
-} // namespace prv
-
-// ----------------------------------------------------------------------------
-
-class WorkbookHelperRoot : private prv::WorkbookDataOwner, public WorkbookHelper
-{
-public:
-    explicit            WorkbookHelperRoot( ExcelFilter& rFilter );
-    explicit            WorkbookHelperRoot( ExcelBiffFilter& rFilter, BiffType eBiff );
-
-    /** Returns true, if this helper refers to a valid document. */
-    bool                isValid() const;
-
-private:
-                        WorkbookHelperRoot( const WorkbookHelperRoot& );
-    WorkbookHelperRoot& operator=( const WorkbookHelperRoot& );
+    WorkbookGlobals&    mrBookGlob;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/worksheetfragment.hxx b/oox/inc/oox/xls/worksheetfragment.hxx
index 7bfd22b52..a3914d781 100644
--- a/oox/inc/oox/xls/worksheetfragment.hxx
+++ b/oox/inc/oox/xls/worksheetfragment.hxx
@@ -64,11 +64,8 @@ class WorksheetFragment : public WorksheetFragmentBase
 {
 public:
     explicit            WorksheetFragment(
-                            const WorkbookHelper& rHelper,
-                            const ::rtl::OUString& rFragmentPath,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
+                            const WorksheetHelper& rHelper,
+                            const ::rtl::OUString& rFragmentPath );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -135,10 +132,8 @@ class BiffWorksheetFragment : public BiffWorksheetFragmentBase
 {
 public:
     explicit            BiffWorksheetFragment(
-                            const BiffWorkbookFragmentBase& rParent,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
+                            const WorksheetHelper& rHelper,
+                            const BiffWorkbookFragmentBase& rParent );
     virtual             ~BiffWorksheetFragment();
 
     /** Imports the entire worksheet fragment, returns true, if EOF record has been reached. */
@@ -169,6 +164,8 @@ private:
     void                importLabelRanges( BiffInputStream& rStrm );
     /** Imports the MEREDCELLS record and merges all cells in the document. */
     void                importMergedCells( BiffInputStream& rStrm );
+    /** Imports the NOTE record containing a cell note. */
+    void                importNote( BiffInputStream& rStrm );
     /** Imports the HORPAGEBREAKS or VERPAGEBREAKS record and inserts page breaks. */
     void                importPageBreaks( BiffInputStream& rStrm, bool bRowBreak );
     /** Imports a pivot table. */
diff --git a/oox/inc/oox/xls/worksheethelper.hxx b/oox/inc/oox/xls/worksheethelper.hxx
index 1df5c3d98..91f206e78 100644
--- a/oox/inc/oox/xls/worksheethelper.hxx
+++ b/oox/inc/oox/xls/worksheethelper.hxx
@@ -29,6 +29,7 @@
 #ifndef OOX_XLS_WORKSHEETHELPER_HXX
 #define OOX_XLS_WORKSHEETHELPER_HXX
 
+#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/progressbar.hxx"
 #include "oox/ole/olehelper.hxx"
 #include "oox/xls/addressconverter.hxx"
@@ -45,7 +46,6 @@ namespace com { namespace sun { namespace star {
     namespace table { class XCellRange; }
     namespace table { class XTableColumns; }
     namespace table { class XTableRows; }
-    namespace util { struct DateTime; }
 } } }
 
 namespace oox {
@@ -54,12 +54,15 @@ namespace xls {
 class AutoFilterBuffer;
 struct BinAddress;
 struct BinRange;
+class BiffSheetDrawing;
 class BinRangeList;
 class CommentsBuffer;
 class CondFormatBuffer;
+class Font;
 class PageSettings;
 class QueryTableBuffer;
-class SharedFormulaBuffer;
+class RichString;
+class SheetDataBuffer;
 class SheetViewSettings;
 class VmlDrawing;
 class WorksheetSettings;
@@ -80,47 +83,10 @@ enum WorksheetType
 
 // ============================================================================
 
-/** Stores some data about a cell. */
-struct CellModel
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > mxCell;
-    ::com::sun::star::table::CellAddress maAddress;
-    ::rtl::OUString     maValueStr;         /// String containing cell value data.
-    ::rtl::OUString     maFormulaRef;       /// String containing formula range for array/shared formulas.
-    sal_Int32           mnCellType;         /// Data type of the cell.
-    sal_Int32           mnFormulaType;      /// Type of the imported formula.
-    sal_Int32           mnSharedId;         /// Shared formula identifier for current cell.
-    sal_Int32           mnXfId;             /// XF identifier for the cell.
-    sal_Int32           mnNumFmtId;         /// Forced number format for the cell.
-    bool                mbHasValueStr;      /// True = contents of maValueStr are valid.
-    bool                mbShowPhonetic;     /// True = show phonetic text.
-
-    inline explicit     CellModel() { reset(); }
-    void                reset();
-};
-
-// ----------------------------------------------------------------------------
-
-/** Stores data about a data table a.k.a. multiple operation range. */
-struct DataTableModel
-{
-    ::rtl::OUString     maRef1;             /// String containing first reference cell for data table formulas.
-    ::rtl::OUString     maRef2;             /// String containing second reference cell for data table formulas.
-    bool                mb2dTable;          /// True = 2-dimensional data table.
-    bool                mbRowTable;         /// True = row oriented data table.
-    bool                mbRef1Deleted;      /// True = first reference cell deleted.
-    bool                mbRef2Deleted;      /// True = second reference cell deleted.
-
-    explicit            DataTableModel();
-};
-
-// ----------------------------------------------------------------------------
-
-/** Stores formatting data about a range of columns. */
+/** Stores settings and formatting data about a range of sheet columns. */
 struct ColumnModel
 {
-    sal_Int32           mnFirstCol;         /// 1-based (!) index of first column.
-    sal_Int32           mnLastCol;          /// 1-based (!) index of last column.
+    ValueRange          maRange;            /// 1-based (!) range of the described columns.
     double              mfWidth;            /// Column width in number of characters.
     sal_Int32           mnXfId;             /// Column default formatting.
     sal_Int32           mnLevel;            /// Column outline level.
@@ -130,17 +96,17 @@ struct ColumnModel
 
     explicit            ColumnModel();
 
-    /** Expands this entry with the passed column range, if column settings are equal. */
-    bool                tryExpand( const ColumnModel& rModel );
+    /** Returns true, if this entry can be merged with the passed column range (column settings are equal). */
+    bool                isMergeable( const ColumnModel& rModel ) const;
 };
 
 // ----------------------------------------------------------------------------
 
-/** Stores formatting data about a range of rows. */
+/** Stores settings and formatting data about a sheet row. */
 struct RowModel
 {
-    sal_Int32           mnFirstRow;         /// 1-based (!) index of first row.
-    sal_Int32           mnLastRow;          /// 1-based (!) index of last row.
+    sal_Int32           mnRow;              /// 1-based (!) index of the described row.
+    ValueRangeSet       maColSpans;         /// 0-based (!) column ranges of used cells.
     double              mfHeight;           /// Row height in points.
     sal_Int32           mnXfId;             /// Row default formatting (see mbIsFormatted).
     sal_Int32           mnLevel;            /// Row outline level.
@@ -154,8 +120,10 @@ struct RowModel
 
     explicit            RowModel();
 
-    /** Expands this entry with the passed row range, if row settings are equal. */
-    bool                tryExpand( const RowModel& rModel );
+    /** Inserts the passed column span into the row model. */
+    void                insertColSpan( const ValueRange& rColSpan );
+    /** Returns true, if this entry can be merged with the passed row range (row settings are equal). */
+    bool                isMergeable( const RowModel& rModel ) const;
 };
 
 // ----------------------------------------------------------------------------
@@ -216,13 +184,22 @@ struct ValidationModel
 // ============================================================================
 // ============================================================================
 
-class WorksheetData;
+class WorksheetGlobals;
+typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef;
 
 class WorksheetHelper : public WorkbookHelper
 {
 public:
-    /*implicit*/        WorksheetHelper( WorksheetData& rSheetData );
+    /*implicit*/        WorksheetHelper( WorksheetGlobals& rSheetGlob );
 
+    static WorksheetGlobalsRef constructGlobals(
+                            const WorkbookHelper& rHelper,
+                            const ISegmentProgressBarRef& rxProgressBar,
+                            WorksheetType eSheetType,
+                            sal_Int16 nSheet );
+
+    // ------------------------------------------------------------------------
+    
     /** Returns the type of this sheet. */
     WorksheetType       getSheetType() const;
     /** Returns the index of the current sheet. */
@@ -233,47 +210,13 @@ public:
 
     /** Returns the XCell interface for the passed cell address. */
     ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >
-                        getCell(
-                            const ::com::sun::star::table::CellAddress& rAddress ) const;
-    /** Returns the XCell interface for the passed cell address string. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >
-                        getCell(
-                            const ::rtl::OUString& rAddressStr,
-                            ::com::sun::star::table::CellAddress* opAddress = 0 ) const;
-    /** Returns the XCell interface for the passed cell address. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >
-                        getCell(
-                            const BinAddress& rBinAddress,
-                            ::com::sun::star::table::CellAddress* opAddress = 0 ) const;
-
+                        getCell( const ::com::sun::star::table::CellAddress& rAddress ) const;
     /** Returns the XCellRange interface for the passed cell range address. */
     ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >
-                        getCellRange(
-                            const ::com::sun::star::table::CellRangeAddress& rRange ) const;
-    /** Returns the XCellRange interface for the passed range address string. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >
-                        getCellRange(
-                            const ::rtl::OUString& rRangeStr,
-                            ::com::sun::star::table::CellRangeAddress* opRange = 0 ) const;
-    /** Returns the XCellRange interface for the passed range address. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >
-                        getCellRange(
-                            const BinRange& rBinRange,
-                            ::com::sun::star::table::CellRangeAddress* opRange = 0 ) const;
-
+                        getCellRange( const ::com::sun::star::table::CellRangeAddress& rRange ) const;
     /** Returns the XSheetCellRanges interface for the passed cell range addresses. */
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges >
                         getCellRangeList( const ApiCellRangeList& rRanges ) const;
-    /** Returns the XSheetCellRanges interface for the passed space-separated range list. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges >
-                        getCellRangeList(
-                            const ::rtl::OUString& rRangesStr,
-                            ApiCellRangeList* opRanges = 0 ) const;
-    /** Returns the XSheetCellRanges interface for the passed range list. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges >
-                        getCellRangeList(
-                            const BinRangeList& rBinRanges,
-                            ApiCellRangeList* opRanges = 0 ) const;
 
     /** Returns the address of the passed cell. The cell reference must be valid. */
     static ::com::sun::star::table::CellAddress
@@ -293,10 +236,10 @@ public:
 
     /** Returns the XTableColumns interface for a range of columns. */
     ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns >
-                        getColumns( sal_Int32 nFirstCol, sal_Int32 nLastCol ) const;
+                        getColumns( const ValueRange& rColRange ) const;
     /** Returns the XTableRows interface for a range of rows. */
     ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows >
-                        getRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) const;
+                        getRows( const ValueRange& rRowRange ) const;
 
     /** Returns the XDrawPage interface of the draw page of the current sheet. */
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
@@ -309,10 +252,8 @@ public:
     /** Returns the size of the entire drawing page in 1/100 mm. */
     ::com::sun::star::awt::Size getDrawPageSize() const;
 
-    /** Returns the worksheet settings object. */
-    WorksheetSettings&  getWorksheetSettings() const;
-    /** Returns the buffer containing all shared formulas in this sheet. */
-    SharedFormulaBuffer& getSharedFormulas() const;
+    /** Returns the buffer for cell contents and cell formatting. */
+    SheetDataBuffer&    getSheetData() const;
     /** Returns the conditional formattings in this sheet. */
     CondFormatBuffer&   getCondFormats() const;
     /** Returns the buffer for all cell comments in this sheet. */
@@ -321,66 +262,27 @@ public:
     AutoFilterBuffer&   getAutoFilters() const;
     /** Returns the buffer for all web query tables in this sheet. */
     QueryTableBuffer&   getQueryTables() const;
+    /** Returns the worksheet settings object. */
+    WorksheetSettings&  getWorksheetSettings() const;
     /** Returns the page/print settings for this sheet. */
     PageSettings&       getPageSettings() const;
     /** Returns the view settings for this sheet. */
     SheetViewSettings&  getSheetViewSettings() const;
-    /** Returns the VML drawing page for this sheet. */
+    /** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */
     VmlDrawing&         getVmlDrawing() const;
-
-    /** Sets the passed string to the cell. */
-    void                setStringCell(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            const ::rtl::OUString& rText ) const;
-    /** Sets the shared string with the passed identifier to the cell. */
-    void                setSharedStringCell(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            sal_Int32 nStringId,
-                            sal_Int32 nXfId ) const;
-    /** Sets the passed date/time value to the cell and adjusts number format. */
-    void                setDateTimeCell(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            const ::com::sun::star::util::DateTime& rDateTime ) const;
-    /** Sets the passed boolean value to the cell and adjusts number format. */
-    void                setBooleanCell(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            bool bValue ) const;
-    /** Sets the passed BIFF error code to the cell (by converting it to a formula). */
-    void                setErrorCell(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            const ::rtl::OUString& rErrorCode ) const;
-    /** Sets the passed BIFF error code to the cell (by converting it to a formula). */
-    void                setErrorCell(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            sal_uInt8 nErrorCode ) const;
-    /** Sets cell contents to the cell specified in the passed cell model. */
-    void                setCell( CellModel& orModel ) const;
-
-    /** Sets a standard number format (constant from com.sun.star.util.NumberFormat) to the passed cell. */
-    void                setStandardNumFmt(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell,
-                            sal_Int16 nStdNumFmt ) const;
+    /** Returns the BIFF drawing page for this sheet (BIFF2-BIFF8 only). */
+    BiffSheetDrawing&   getBiffDrawing() const;
 
     /** Changes the current sheet type. */
     void                setSheetType( WorksheetType eSheetType );
-    /** Stores the cell formatting data of the current cell. */
-    void                setCellFormat( const CellModel& rModel );
-    /** Merges the cells in the passed cell range. */
-    void                setMergedRange( const ::com::sun::star::table::CellRangeAddress& rRange );
     /** Sets a column or row page break described in the passed struct. */
     void                setPageBreak( const PageBreakModel& rModel, bool bRowBreak );
     /** Inserts the hyperlink URL into the spreadsheet. */
     void                setHyperlink( const HyperlinkModel& rModel );
     /** Inserts the data validation settings into the spreadsheet. */
     void                setValidation( const ValidationModel& rModel );
-    /** Sets a multiple table operation to the passed range. */
-    void                setTableOperation(
-                            const ::com::sun::star::table::CellRangeAddress& rRange,
-                            const DataTableModel& rModel ) const;
     /** Sets the passed label ranges to the current sheet. */
-    void                setLabelRanges(
-                            const ApiCellRangeList& rColRanges,
-                            const ApiCellRangeList& rRowRanges );
+    void                setLabelRanges( const ApiCellRangeList& rColRanges, const ApiCellRangeList& rRowRanges );
     /** Sets the path to the DrawingML fragment of this sheet. */
     void                setDrawingPath( const ::rtl::OUString& rDrawingPath );
     /** Sets the path to the legacy VML drawing fragment of this sheet. */
@@ -414,6 +316,26 @@ public:
         @descr  Row default formatting is converted directly, other settings
         are cached and converted in the finalizeWorksheetImport() call. */
     void                setRowModel( const RowModel& rModel );
+    /** Specifies that the passed row needs to set its height manually. */
+    void                setManualRowHeight( sal_Int32 nRow );
+
+    /** Inserts a value cell directly into the Calc sheet. */
+    void                putValue(
+                            const ::com::sun::star::table::CellAddress& rAddress,
+                            double fValue ) const;
+    /** Inserts a string cell directly into the Calc sheet. */
+    void                putString(
+                            const ::com::sun::star::table::CellAddress& rAddress,
+                            const ::rtl::OUString& rText ) const;
+    /** Inserts a rich-string cell directly into the Calc sheet. */
+    void                putRichString(
+                            const ::com::sun::star::table::CellAddress& rAddress,
+                            const RichString& rString,
+                            const Font* pFirstPortionFont ) const;
+    /** Inserts a formula cell directly into the Calc sheet. */
+    void                putFormulaTokens(
+                            const ::com::sun::star::table::CellAddress& rAddress,
+                            const ApiTokenSequence& rTokens ) const;
 
     /** Initial conversion before importing the worksheet. */
     void                initializeWorksheetImport();
@@ -421,50 +343,7 @@ public:
     void                finalizeWorksheetImport();
 
 private:
-    WorksheetData&      mrSheetData;
-};
-
-// ============================================================================
-
-namespace prv {
-
-typedef ::boost::shared_ptr< WorksheetData > WorksheetDataRef;
-
-struct WorksheetDataOwner
-{
-    explicit            WorksheetDataOwner( WorksheetDataRef xSheetData );
-    virtual             ~WorksheetDataOwner();
-    WorksheetDataRef    mxSheetData;
-};
-
-} // namespace prv
-
-// ----------------------------------------------------------------------------
-
-class WorksheetHelperRoot : private prv::WorksheetDataOwner, public WorksheetHelper
-{
-public:
-    /** Returns true, if this helper refers to an existing Calc sheet. */
-    bool                isValidSheet() const;
-
-protected:
-    /** Constructs from the passed data, creates and owns a new data object. */
-    explicit            WorksheetHelperRoot(
-                            const WorkbookHelper& rHelper,
-                            const ISegmentProgressBarRef& rxProgressBar,
-                            WorksheetType eSheetType,
-                            sal_Int16 nSheet );
-
-    /** Constructs from another sheet helper, does not create a data object. */
-    explicit            WorksheetHelperRoot(
-                            const WorksheetHelper& rHelper );
-
-    /** Constructs from another sheet helper, shares ownership of the passed helper. */
-    explicit            WorksheetHelperRoot(
-                            const WorksheetHelperRoot& rHelper );
-
-private:
-    WorksheetHelperRoot& operator=( const WorksheetHelperRoot& );
+    WorksheetGlobals&   mrSheetGlob;
 };
 
 // ============================================================================
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index e69de29bb..73cf0ba5d 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -0,0 +1,3 @@
+
+
+..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token\tokens.txt
+\ No newline at end of file
diff --git a/oox/source/core/binaryfilterbase.cxx b/oox/source/core/binaryfilterbase.cxx
index 35de88910..60ff0740b 100644
--- a/oox/source/core/binaryfilterbase.cxx
+++ b/oox/source/core/binaryfilterbase.cxx
@@ -56,12 +56,12 @@ BinaryFilterBase::~BinaryFilterBase()
 
 StorageRef BinaryFilterBase::implCreateStorage( const Reference< XInputStream >& rxInStream ) const
 {
-    return StorageRef( new ::oox::ole::OleStorage( getServiceFactory(), rxInStream, true ) );
+    return StorageRef( new ::oox::ole::OleStorage( getComponentContext(), rxInStream, true ) );
 }
 
 StorageRef BinaryFilterBase::implCreateStorage( const Reference< XStream >& rxOutStream ) const
 {
-    return StorageRef( new ::oox::ole::OleStorage( getServiceFactory(), rxOutStream, true ) );
+    return StorageRef( new ::oox::ole::OleStorage( getComponentContext(), rxOutStream, true ) );
 }
 
 // ============================================================================
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index 19b8de9a5..c8aeb8ca5 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -43,7 +43,7 @@ using ::rtl::OUString;
 // ============================================================================
 
 ContextHandler::ContextHandler( ContextHandler& rParent ) :
-    ContextHandlerImplBase(),
+    ContextHandler_BASE(),
     mxBaseData( rParent.mxBaseData )
 {
 }
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 568634fa9..cd75c4cbe 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -274,9 +274,9 @@ const sal_uInt32 ENCRYPT_HASH_SHA1          = 0x00008004;
 
 // ----------------------------------------------------------------------------
 
-bool lclIsZipPackage( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm )
+bool lclIsZipPackage( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm )
 {
-    ZipStorage aZipStorage( rxFactory, rxInStrm );
+    ZipStorage aZipStorage( rxContext, rxInStrm );
     return aZipStorage.isStorage();
 }
 
@@ -504,109 +504,106 @@ PasswordVerifier::PasswordVerifier( const PackageEncryptionInfo& rEncryptInfo )
 
 Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescriptor& rMediaDesc ) const
 {
-    Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY );
-    if( xFactory.is() )
+    // try the plain input stream
+    Reference< XInputStream > xInStrm( rMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY );
+    if( !xInStrm.is() || lclIsZipPackage( mxContext, xInStrm ) )
+        return xInStrm;
+
+    // check if a temporary file is passed in the 'ComponentData' property
+    Reference< XStream > xDecrypted( rMediaDesc.getComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ) ), UNO_QUERY );
+    if( xDecrypted.is() )
     {
-        // try the plain input stream
-        Reference< XInputStream > xInStrm( rMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY );
-        if( !xInStrm.is() || lclIsZipPackage( xFactory, xInStrm ) )
-            return xInStrm;
-
-        // check if a temporary file is passed in the 'ComponentData' property
-        Reference< XStream > xDecrypted( rMediaDesc.getComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ) ), UNO_QUERY );
-        if( xDecrypted.is() )
-        {
-            Reference< XInputStream > xDecrInStrm = xDecrypted->getInputStream();
-            if( lclIsZipPackage( xFactory, xDecrInStrm ) )
-                return xDecrInStrm;
-        }
+        Reference< XInputStream > xDecrInStrm = xDecrypted->getInputStream();
+        if( lclIsZipPackage( mxContext, xDecrInStrm ) )
+            return xDecrInStrm;
+    }
 
-        // try to decrypt an encrypted OLE package
-        ::oox::ole::OleStorage aOleStorage( xFactory, xInStrm, false );
-        if( aOleStorage.isStorage() ) try
+    // try to decrypt an encrypted OLE package
+    ::oox::ole::OleStorage aOleStorage( mxContext, xInStrm, false );
+    if( aOleStorage.isStorage() ) try
+    {
+        // open the required input streams in the encrypted package
+        Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptionInfo" ) ), UNO_SET_THROW );
+        Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptedPackage" ) ), UNO_SET_THROW );
+
+        // read the encryption info stream
+        PackageEncryptionInfo aEncryptInfo;
+        BinaryXInputStream aInfoStrm( xEncryptionInfo, true );
+        bool bValidInfo = lclReadEncryptionInfo( aEncryptInfo, aInfoStrm );
+
+        // check flags and agorithm IDs, requiered are AES128 and SHA-1
+        bool bImplemented = bValidInfo &&
+            getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_CRYPTOAPI ) &&
+            getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_AES ) &&
+            // algorithm ID 0 defaults to AES128 too, if ENCRYPTINFO_AES flag is set
+            ((aEncryptInfo.mnAlgorithmId == 0) || (aEncryptInfo.mnAlgorithmId == ENCRYPT_ALGO_AES128)) &&
+            // hash algorithm ID 0 defaults to SHA-1 too
+            ((aEncryptInfo.mnAlgorithmIdHash == 0) || (aEncryptInfo.mnAlgorithmIdHash == ENCRYPT_HASH_SHA1)) &&
+            (aEncryptInfo.mnVerifierHashSize == 20);
+
+        if( bImplemented )
         {
-            // open the required input streams in the encrypted package
-            Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptionInfo" ) ), UNO_SET_THROW );
-            Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptedPackage" ) ), UNO_SET_THROW );
-
-            // read the encryption info stream
-            PackageEncryptionInfo aEncryptInfo;
-            BinaryXInputStream aInfoStrm( xEncryptionInfo, true );
-            bool bValidInfo = lclReadEncryptionInfo( aEncryptInfo, aInfoStrm );
-
-            // check flags and agorithm IDs, requiered are AES128 and SHA-1
-            bool bImplemented = bValidInfo &&
-                getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_CRYPTOAPI ) &&
-                getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_AES ) &&
-                // algorithm ID 0 defaults to AES128 too, if ENCRYPTINFO_AES flag is set
-                ((aEncryptInfo.mnAlgorithmId == 0) || (aEncryptInfo.mnAlgorithmId == ENCRYPT_ALGO_AES128)) &&
-                // hash algorithm ID 0 defaults to SHA-1 too
-                ((aEncryptInfo.mnAlgorithmIdHash == 0) || (aEncryptInfo.mnAlgorithmIdHash == ENCRYPT_HASH_SHA1)) &&
-                (aEncryptInfo.mnVerifierHashSize == 20);
-
-            if( bImplemented )
+            /*  "VelvetSweatshop" is the built-in default encryption
+                password used by MS Excel for the "workbook protection"
+                feature with password. Try this first before prompting the
+                user for a password. */
+            ::std::vector< OUString > aDefaultPasswords;
+            aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) );
+
+            /*  Use the comphelper password helper to request a password.
+                This helper returns either with the correct password
+                (according to the verifier), or with an empty string if
+                user has cancelled the password input dialog. */
+            PasswordVerifier aVerifier( aEncryptInfo );
+            Sequence< NamedValue > aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+                aVerifier, rMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords );
+
+            if( aEncryptionData.getLength() == 0 )
             {
-                /*  "VelvetSweatshop" is the built-in default encryption
-                    password used by MS Excel for the "workbook protection"
-                    feature with password. Try this first before prompting the
-                    user for a password. */
-                ::std::vector< OUString > aDefaultPasswords;
-                aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) );
-
-                /*  Use the comphelper password helper to request a password.
-                    This helper returns either with the correct password
-                    (according to the verifier), or with an empty string if
-                    user has cancelled the password input dialog. */
-                PasswordVerifier aVerifier( aEncryptInfo );
-                Sequence< NamedValue > aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
-                    aVerifier, rMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords );
-
-                if( aEncryptionData.getLength() == 0 )
-                {
-                    rMediaDesc[ MediaDescriptor::PROP_ABORTED() ] <<= true;
-                }
-                else
+                rMediaDesc[ MediaDescriptor::PROP_ABORTED() ] <<= true;
+            }
+            else
+            {
+                // create temporary file for unencrypted package
+                Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
+                Reference< XStream > xTempFile( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
+                Reference< XOutputStream > xDecryptedPackage( xTempFile->getOutputStream(), UNO_SET_THROW );
+                BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true );
+                BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true );
+
+                EVP_CIPHER_CTX aes_ctx;
+                EVP_CIPHER_CTX_init( &aes_ctx );
+                EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
+                EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+
+                sal_uInt8 pnInBuffer[ 1024 ];
+                sal_uInt8 pnOutBuffer[ 1024 ];
+                sal_Int32 nInLen;
+                int nOutLen;
+                aEncryptedPackage.skip( 8 ); // decrypted size
+                while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 )
                 {
-                    // create temporary file for unencrypted package
-                    Reference< XStream > xTempFile( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
-                    Reference< XOutputStream > xDecryptedPackage( xTempFile->getOutputStream(), UNO_SET_THROW );
-                    BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true );
-                    BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true );
-
-                    EVP_CIPHER_CTX aes_ctx;
-                    EVP_CIPHER_CTX_init( &aes_ctx );
-                    EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
-                    EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
-
-                    sal_uInt8 pnInBuffer[ 1024 ];
-                    sal_uInt8 pnOutBuffer[ 1024 ];
-                    sal_Int32 nInLen;
-                    int nOutLen;
-                    aEncryptedPackage.skip( 8 ); // decrypted size
-                    while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 )
-                    {
-                        EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
-                        aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
-                    }
-                    EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen );
+                    EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
                     aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
+                }
+                EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen );
+                aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
 
-                    EVP_CIPHER_CTX_cleanup( &aes_ctx );
-                    xDecryptedPackage->flush();
-                    aDecryptedPackage.seekToStart();
+                EVP_CIPHER_CTX_cleanup( &aes_ctx );
+                xDecryptedPackage->flush();
+                aDecryptedPackage.seekToStart();
 
-                    // store temp file in media descriptor to keep it alive
-                    rMediaDesc.setComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ), Any( xTempFile ) );
+                // store temp file in media descriptor to keep it alive
+                rMediaDesc.setComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ), Any( xTempFile ) );
 
-                    Reference< XInputStream > xDecrInStrm = xTempFile->getInputStream();
-                    if( lclIsZipPackage( xFactory, xDecrInStrm ) )
-                        return xDecrInStrm;
-                }
+                Reference< XInputStream > xDecrInStrm = xTempFile->getInputStream();
+                if( lclIsZipPackage( mxContext, xDecrInStrm ) )
+                    return xDecrInStrm;
             }
         }
-        catch( Exception& )
-        {
-        }
+    }
+    catch( Exception& )
+    {
     }
 
     return Reference< XInputStream >();
@@ -638,7 +635,6 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq
 {
     OUString aFilterName;
     MediaDescriptor aMediaDesc( rMediaDescSeq );
-    Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
 
     /*  Check that the user has not choosen to abort detection, e.g. by hitting
         'Cancel' in the password input dialog. This may happen because this
@@ -655,7 +651,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq
         Reference< XInputStream > xInStrm( extractUnencryptedPackage( aMediaDesc ), UNO_SET_THROW );
 
         // stream must be a ZIP package
-        ZipStorage aZipStorage( xFactory, xInStrm );
+        ZipStorage aZipStorage( mxContext, xInStrm );
         if( aZipStorage.isStorage() )
         {
             // create the fast parser, register the XML namespaces, set document handler
diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx
index fe5cd808e..34ba4cdf9 100644
--- a/oox/source/core/fragmenthandler.cxx
+++ b/oox/source/core/fragmenthandler.cxx
@@ -53,12 +53,12 @@ FragmentBaseData::FragmentBaseData( XmlFilterBase& rFilter, const OUString& rFra
 // ============================================================================
 
 FragmentHandler::FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath ) :
-    FragmentHandlerImplBase( FragmentBaseDataRef( new FragmentBaseData( rFilter, rFragmentPath, rFilter.importRelations( rFragmentPath ) ) ) )
+    FragmentHandler_BASE( FragmentBaseDataRef( new FragmentBaseData( rFilter, rFragmentPath, rFilter.importRelations( rFragmentPath ) ) ) )
 {
 }
 
 FragmentHandler::FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, RelationsRef xRelations ) :
-    FragmentHandlerImplBase( FragmentBaseDataRef( new FragmentBaseData( rFilter, rFragmentPath, xRelations ) ) )
+    FragmentHandler_BASE( FragmentBaseDataRef( new FragmentBaseData( rFilter, rFragmentPath, xRelations ) ) )
 {
 }
 
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 1a4e3e7c9..6638ffe5d 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -570,12 +570,12 @@ Reference< XInputStream > XmlFilterBase::implGetInputStream( MediaDescriptor& rM
 
 StorageRef XmlFilterBase::implCreateStorage( const Reference< XInputStream >& rxInStream ) const
 {
-    return StorageRef( new ZipStorage( getServiceFactory(), rxInStream ) );
+    return StorageRef( new ZipStorage( getComponentContext(), rxInStream ) );
 }
 
 StorageRef XmlFilterBase::implCreateStorage( const Reference< XStream >& rxOutStream ) const
 {
-    return StorageRef( new ZipStorage( getServiceFactory(), rxOutStream ) );
+    return StorageRef( new ZipStorage( getComponentContext(), rxOutStream ) );
 }
 
 // ============================================================================
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 912f64148..4d0109b1f 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -84,42 +84,41 @@ void ShapeAnchor::setPos( sal_Int32 nElement, sal_Int32 nParentContext, const OU
     }
 }
 
-Rectangle ShapeAnchor::calcEmuLocation( const EmuRectangle& rEmuChartRect ) const
+EmuRectangle ShapeAnchor::calcAnchorRectEmu( const EmuRectangle& rChartRect ) const
 {
-    Rectangle aLoc( -1, -1, -1, -1 );
+    EmuRectangle aAnchorRect( -1, -1, -1, -1 );
 
-    OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::calcEmuLocation - invalid from position" );
-    OSL_ENSURE( mbRelSize ? maTo.isValid() : maSize.isValid(), "ShapeAnchor::calcEmuLocation - invalid to/size" );
+    OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::calcAnchorRectEmu - invalid from position" );
+    OSL_ENSURE( mbRelSize ? maTo.isValid() : maSize.isValid(), "ShapeAnchor::calcAnchorRectEmu - invalid to/size" );
     if( maFrom.isValid() && (mbRelSize ? maTo.isValid() : maSize.isValid()) )
     {
         // calculate shape position
-        aLoc.X = getLimitedValue< sal_Int32, double >( maFrom.mfX * rEmuChartRect.Width, 0, SAL_MAX_INT32 );
-        aLoc.Y = getLimitedValue< sal_Int32, double >( maFrom.mfY * rEmuChartRect.Height, 0, SAL_MAX_INT32 );
+        aAnchorRect.X = static_cast< sal_Int64 >( maFrom.mfX * rChartRect.Width + 0.5 );
+        aAnchorRect.Y = static_cast< sal_Int64 >( maFrom.mfY * rChartRect.Height + 0.5 );
 
         // calculate shape size
         if( mbRelSize )
         {
-            aLoc.Width = getLimitedValue< sal_Int32, double >( maTo.mfX * rEmuChartRect.Width, 0, SAL_MAX_INT32 ) - aLoc.X;
-            if( aLoc.Width < 0 )
+            aAnchorRect.Width = static_cast< sal_Int64 >( maTo.mfX * rChartRect.Width + 0.5 ) - aAnchorRect.X;
+            if( aAnchorRect.Width < 0 )
             {
-                aLoc.X += aLoc.Width;
-                aLoc.Width *= -1;
+                aAnchorRect.X += aAnchorRect.Width;
+                aAnchorRect.Width *= -1;
             }
-            aLoc.Height = getLimitedValue< sal_Int32, double >( maTo.mfY * rEmuChartRect.Height, 0, SAL_MAX_INT32 ) - aLoc.Y;
-            if( aLoc.Height < 0 )
+            aAnchorRect.Height = static_cast< sal_Int64 >( maTo.mfY * rChartRect.Height + 0.5 ) - aAnchorRect.Y;
+            if( aAnchorRect.Height < 0 )
             {
-                aLoc.Y += aLoc.Height;
-                aLoc.Height *= -1;
+                aAnchorRect.Y += aAnchorRect.Height;
+                aAnchorRect.Height *= -1;
             }
         }
         else
         {
-            aLoc.Width = getLimitedValue< sal_Int32, sal_Int64 >( maSize.Width, 0, SAL_MAX_INT32 );
-            aLoc.Height = getLimitedValue< sal_Int32, sal_Int64 >( maSize.Height, 0, SAL_MAX_INT32 );
+            aAnchorRect.setSize( maSize );
         }
     }
 
-    return aLoc;
+    return aAnchorRect;
 }
 // ============================================================================
 
@@ -130,10 +129,10 @@ ChartDrawingFragment::ChartDrawingFragment( XmlFilterBase& rFilter,
     mxDrawPage( rxDrawPage ),
     mbOleSupport( bOleSupport )
 {
-    maEmuChartRect.X = static_cast< sal_Int64 >( rShapesOffset.X ) * 360;
-    maEmuChartRect.Y = static_cast< sal_Int64 >( rShapesOffset.Y ) * 360;
-    maEmuChartRect.Width = static_cast< sal_Int64 >( rChartSize.Width ) * 360;
-    maEmuChartRect.Height = static_cast< sal_Int64 >( rChartSize.Height ) * 360;
+    maChartRectEmu.X = convertHmmToEmu( rShapesOffset.X );
+    maChartRectEmu.Y = convertHmmToEmu( rShapesOffset.Y );
+    maChartRectEmu.Width = convertHmmToEmu( rChartSize.Width );
+    maChartRectEmu.Height = convertHmmToEmu( rChartSize.Height );
 }
 
 ChartDrawingFragment::~ChartDrawingFragment()
@@ -217,10 +216,17 @@ void ChartDrawingFragment::onEndElement()
     {
         if( mxDrawPage.is() && mxShape.get() && mxAnchor.get() )
         {
-            Rectangle aLoc = mxAnchor->calcEmuLocation( maEmuChartRect );
-            if( (aLoc.X >= 0) && (aLoc.Y >= 0) && (aLoc.Width >= 0) && (aLoc.Height >= 0) ) {
+            EmuRectangle aShapeRectEmu = mxAnchor->calcAnchorRectEmu( maChartRectEmu );
+            if( (aShapeRectEmu.X >= 0) && (aShapeRectEmu.Y >= 0) && (aShapeRectEmu.Width >= 0) && (aShapeRectEmu.Height >= 0) )
+            {
+                // TODO: DrawingML implementation expects 32-bit coordinates for EMU rectangles (change that to EmuRectangle)
+                Rectangle aShapeRectEmu32(
+                    getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.X, 0, SAL_MAX_INT32 ),
+                    getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Y, 0, SAL_MAX_INT32 ),
+                    getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Width, 0, SAL_MAX_INT32 ),
+                    getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Height, 0, SAL_MAX_INT32 ) );
                 basegfx::B2DHomMatrix aMatrix;
-                mxShape->addShape( getFilter(), getFilter().getCurrentTheme(), mxDrawPage, aMatrix, &aLoc );
+                mxShape->addShape( getFilter(), getFilter().getCurrentTheme(), mxDrawPage, aMatrix, &aShapeRectEmu32 );
             }
         }
         mxShape.reset();
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 61b3bfe19..56f56c5ed 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -35,6 +35,7 @@
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/drawingml/lineproperties.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/textparagraph.hxx"
 #include "oox/drawingml/theme.hxx"
@@ -490,19 +491,50 @@ const AutoTextEntry* lclGetAutoTextEntry( const AutoTextEntry* pEntries, sal_Int
 
 // ----------------------------------------------------------------------------
 
-/** Enumerates different sets of property names for chart object formatting. */
-enum PropertyType
+/** Property identifiers for common chart objects, to be used in ShapePropertyInfo. */
+static const sal_Int32 spnCommonPropIds[] =
 {
-    PROPERTYTYPE_COMMON,            /// Common objects, no special handling.
-    PROPERTYTYPE_LINEARSERIES,      /// Specific to linear data series.
-    PROPERTYTYPE_FILLEDSERIES       /// Specific to filled data series.
+    PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, PROP_LineDashName,
+    PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+    PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_FillGradientName,
+    PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY,
+    PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint
 };
 
+/** Property identifiers for linear data series, to be used in ShapePropertyInfo. */
+static const sal_Int32 spnLinearPropIds[] =
+{
+    PROP_LineStyle, PROP_LineWidth, PROP_Color, PROP_Transparency, PROP_LineDashName,
+    PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+    PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+    PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+    PROP_INVALID, PROP_INVALID, PROP_INVALID
+};
+
+/** Property identifiers for filled data series, to be used in ShapePropertyInfo. */
+static const sal_Int32 spnFilledPropIds[] =
+{
+    PROP_BorderStyle, PROP_BorderWidth, PROP_BorderColor, PROP_BorderTransparency, PROP_BorderDashName,
+    PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
+    PROP_FillStyle, PROP_Color, PROP_Transparency, PROP_GradientName,
+    PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY,
+    PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint
+};
+
+/** Property info for common chart objects, to be used in ShapePropertyMap. */
+static const ShapePropertyInfo saCommonPropInfo( spnCommonPropIds, false, true, true, true );
+/** Property info for linear data series, to be used in ShapePropertyMap. */
+static const ShapePropertyInfo saLinearPropInfo( spnLinearPropIds, false, true, true, true );
+/** Property info for filled data series, to be used in ShapePropertyMap. */
+static const ShapePropertyInfo saFilledPropInfo( spnFilledPropIds, false, true, true, true );
+
+// ----------------------------------------------------------------------------
+
 /** Contains information about formatting of a specific chart object type. */
 struct ObjectTypeFormatEntry
 {
     ObjectType          meObjType;          /// Object type for automatic format.
-    PropertyType        mePropType;         /// Property type for property names.
+    const ShapePropertyInfo* mpPropInfo;    /// Property info for the ShapePropertyMap class.
     const AutoFormatEntry* mpAutoLines;     /// Automatic line formatting for all chart styles.
     const AutoFormatEntry* mpAutoFills;     /// Automatic fill formatting for all chart styles.
     const AutoFormatEntry* mpAutoEffects;   /// Automatic effect formatting for all chart styles.
@@ -518,37 +550,38 @@ struct ObjectTypeFormatEntry
 
 static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
 {
-    //                object type                property type              auto text          auto line            auto fill              auto effect
-    TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE,     PROPERTYTYPE_COMMON,       0,                 spChartSpaceLines,   spChartSpaceFills,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_CHARTTITLE,     PROPERTYTYPE_COMMON,       spChartTitleTexts, 0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_LEGEND,         PROPERTYTYPE_COMMON,       spOtherTexts,      spNoFormats,         spNoFormats,           0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA2D,     PROPERTYTYPE_COMMON,       0,                 0 /* eq to Ch2 */,   spPlotArea2dFills,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA3D,     PROPERTYTYPE_COMMON,       0,                 0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_WALL,           PROPERTYTYPE_COMMON,       0,                 0 /* eq to Ch2 */,   spWallFloorFills,      0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_FLOOR,          PROPERTYTYPE_COMMON,       0,                 spFloorLines,        spWallFloorFills,      0 /* eq to Ch2 */ ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_AXIS,           PROPERTYTYPE_COMMON,       spOtherTexts,      spAxisLines ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_AXISTITLE,      PROPERTYTYPE_COMMON,       spAxisTitleTexts,  0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_AXISUNIT,       PROPERTYTYPE_COMMON,       spAxisTitleTexts,  0 /* eq in Ch2 */,   0 /* eq in Ch2 */,     0 /* eq in Ch2 */ ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_MAJORGRIDLINE,  PROPERTYTYPE_COMMON,       0,                 spMajorGridLines ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_MINORGRIDLINE,  PROPERTYTYPE_COMMON,       0,                 spMinorGridLines ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_LINEARSERIES2D, PROPERTYTYPE_LINEARSERIES, 0,                 spLinearSeriesLines ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES2D, PROPERTYTYPE_FILLEDSERIES, 0,                 spFilledSeriesLines, spFilledSeries2dFills, spFilledSeriesEffects ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES3D, PROPERTYTYPE_FILLEDSERIES, 0,                 spFilledSeriesLines, spFilledSeries3dFills, spFilledSeriesEffects ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_DATALABEL,      PROPERTYTYPE_COMMON,       spOtherTexts,      0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_TRENDLINE,      PROPERTYTYPE_COMMON,       0,                 spOtherLines ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_TRENDLINELABEL, PROPERTYTYPE_COMMON,       spOtherTexts,      0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_ERRORBAR,       PROPERTYTYPE_COMMON,       0,                 spOtherLines ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_SERLINE,        PROPERTYTYPE_COMMON,       0,                 spOtherLines ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_LEADERLINE,     PROPERTYTYPE_COMMON,       0,                 spOtherLines ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_DROPLINE,       PROPERTYTYPE_COMMON,       0,                 spOtherLines ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_HILOLINE,       PROPERTYTYPE_LINEARSERIES, 0,                 spOtherLines ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_UPBAR,          PROPERTYTYPE_COMMON,       0,                 spUpDownBarLines,    spUpBarFills,          spUpDownBarEffects ),
-    TYPEFORMAT_FRAME( OBJECTTYPE_DOWNBAR,        PROPERTYTYPE_COMMON,       0,                 spUpDownBarLines,    spDownBarFills,        spUpDownBarEffects ),
-    TYPEFORMAT_LINE(  OBJECTTYPE_DATATABLE,      PROPERTYTYPE_COMMON,       spOtherTexts,      spChartSpaceLines )
+    //                object type                property info      auto text          auto line            auto fill              auto effect
+    TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE,     &saCommonPropInfo, 0,                 spChartSpaceLines,   spChartSpaceFills,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_CHARTTITLE,     &saCommonPropInfo, spChartTitleTexts, 0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_LEGEND,         &saCommonPropInfo, spOtherTexts,      spNoFormats,         spNoFormats,           0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA2D,     &saCommonPropInfo, 0,                 0 /* eq to Ch2 */,   spPlotArea2dFills,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA3D,     &saCommonPropInfo, 0,                 0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_WALL,           &saCommonPropInfo, 0,                 0 /* eq to Ch2 */,   spWallFloorFills,      0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_FLOOR,          &saCommonPropInfo, 0,                 spFloorLines,        spWallFloorFills,      0 /* eq to Ch2 */ ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_AXIS,           &saCommonPropInfo, spOtherTexts,      spAxisLines ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_AXISTITLE,      &saCommonPropInfo, spAxisTitleTexts,  0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_AXISUNIT,       &saCommonPropInfo, spAxisTitleTexts,  0 /* eq in Ch2 */,   0 /* eq in Ch2 */,     0 /* eq in Ch2 */ ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_MAJORGRIDLINE,  &saCommonPropInfo, 0,                 spMajorGridLines ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_MINORGRIDLINE,  &saCommonPropInfo, 0,                 spMinorGridLines ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_LINEARSERIES2D, &saLinearPropInfo, 0,                 spLinearSeriesLines ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES2D, &saFilledPropInfo, 0,                 spFilledSeriesLines, spFilledSeries2dFills, spFilledSeriesEffects ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES3D, &saFilledPropInfo, 0,                 spFilledSeriesLines, spFilledSeries3dFills, spFilledSeriesEffects ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_DATALABEL,      &saCommonPropInfo, spOtherTexts,      0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_TRENDLINE,      &saCommonPropInfo, 0,                 spOtherLines ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_TRENDLINELABEL, &saCommonPropInfo, spOtherTexts,      0 /* eq to Ch2 */,   0 /* eq to Ch2 */,     0 /* eq to Ch2 */ ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_ERRORBAR,       &saCommonPropInfo, 0,                 spOtherLines ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_SERLINE,        &saCommonPropInfo, 0,                 spOtherLines ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_LEADERLINE,     &saCommonPropInfo, 0,                 spOtherLines ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_DROPLINE,       &saCommonPropInfo, 0,                 spOtherLines ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_HILOLINE,       &saLinearPropInfo, 0,                 spOtherLines ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_UPBAR,          &saCommonPropInfo, 0,                 spUpDownBarLines,    spUpBarFills,          spUpDownBarEffects ),
+    TYPEFORMAT_FRAME( OBJECTTYPE_DOWNBAR,        &saCommonPropInfo, 0,                 spUpDownBarLines,    spDownBarFills,        spUpDownBarEffects ),
+    TYPEFORMAT_LINE(  OBJECTTYPE_DATATABLE,      &saCommonPropInfo, spOtherTexts,      spChartSpaceLines )
 };
 
 #undef TYPEFORMAT_FRAME
 #undef TYPEFORMAT_LINE
+
 // ----------------------------------------------------------------------------
 
 void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptionsModel& rPicOptions )
@@ -557,15 +590,6 @@ void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptions
     orFillProps.maBlipProps.moBitmapMode = bStacked ? XML_tile : XML_stretch;
 }
 
-// ----------------------------------------------------------------------------
-
-const sal_Int32 spnCommonLineIds[ LineId_END ] = { PROP_LineStyle,   PROP_LineWidth,   PROP_LineColor,   PROP_LineTransparence,   PROP_LineDashName,   PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID };
-const sal_Int32 spnLinearLineIds[ LineId_END ] = { PROP_LineStyle,   PROP_LineWidth,   PROP_Color,       PROP_Transparency,       PROP_LineDashName,   PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID };
-const sal_Int32 spnFilledLineIds[ LineId_END ] = { PROP_BorderStyle, PROP_BorderWidth, PROP_BorderColor, PROP_BorderTransparency, PROP_BorderDashName, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID };
-
-const sal_Int32 spnCommonFillIds[ FillId_END ] = { PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_FillGradientName, PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY, PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint };
-const sal_Int32 spnFilledFillIds[ FillId_END ] = { PROP_FillStyle, PROP_Color,     PROP_Transparency,     PROP_GradientName,     PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY, PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint };
-
 } // namespace
 
 // ============================================================================
@@ -607,18 +631,16 @@ class LineFormatter : public DetailFormatterBase
 public:
     explicit            LineFormatter(
                             ObjectFormatterData& rData,
-                            const AutoFormatEntry* pAutoFormatEntry,
-                            PropertyType ePropType );
+                            const AutoFormatEntry* pAutoFormatEntry );
 
     /** Converts line formatting to the passed property set. */
     void                convertFormatting(
-                            PropertySet& rPropSet,
+                            ShapePropertyMap& rPropMap,
                             const ModelRef< Shape >& rxShapeProp,
                             sal_Int32 nSeriesIdx );
 
 private:
     LinePropertiesPtr   mxAutoLine;         /// Automatic line properties.
-    LinePropertyIds&    mrLinePropIds;      /// Property identifiers for border/line formatting.
 };
 
 // ----------------------------------------------------------------------------
@@ -628,19 +650,17 @@ class FillFormatter : public DetailFormatterBase
 public:
     explicit            FillFormatter(
                             ObjectFormatterData& rData,
-                            const AutoFormatEntry* pAutoFormatEntry,
-                            PropertyType ePropType );
+                            const AutoFormatEntry* pAutoFormatEntry );
 
     /** Converts area formatting to the passed property set. */
     void                convertFormatting(
-                            PropertySet& rPropSet,
+                            ShapePropertyMap& rPropMap,
                             const ModelRef< Shape >& rxShapeProp,
                             const PictureOptionsModel* pPicOptions,
                             sal_Int32 nSeriesIdx );
 
 private:
     FillPropertiesPtr   mxAutoFill;         /// Automatic fill properties.
-    FillPropertyIds&    mrFillPropIds;      /// Property identifiers for fill formatting.
 };
 
 // ----------------------------------------------------------------------------
@@ -650,12 +670,11 @@ class EffectFormatter : public DetailFormatterBase
 public:
     explicit            EffectFormatter(
                             ObjectFormatterData& rData,
-                            const AutoFormatEntry* pAutoFormatEntry,
-                            PropertyType ePropType );
+                            const AutoFormatEntry* pAutoFormatEntry );
 
     /** Converts effect formatting to the passed property set. */
     void                convertFormatting(
-                            PropertySet& rPropSet,
+                            ShapePropertyMap& rPropMap,
                             const ModelRef< Shape >& rxShapeProp,
                             sal_Int32 nSeriesIdx );
 };
@@ -732,6 +751,7 @@ private:
     FillFormatter       maFillFormatter;    /// Converter for fill formatting.
     EffectFormatter     maEffectFormatter;  /// Converter for effect formatting.
     TextFormatter       maTextFormatter;    /// Converter for text formatting.
+    ModelObjectHelper&  mrModelObjHelper;   /// Helper for named drawing formatting.
     const ObjectTypeFormatEntry& mrEntry;   /// Additional settings.
 };
 
@@ -744,11 +764,6 @@ struct ObjectFormatterData
     const XmlFilterBase& mrFilter;              /// Base filter object.
     ObjectTypeFormatterMap maTypeFormatters;    /// Formatters for all types of objects in a chart.
     ModelObjectHelper   maModelObjHelper;       /// Helper for named drawing formatting (dashes, gradients, bitmaps).
-    LinePropertyIds     maCommonLineIds;        /// Property identifiers for common border formatting.
-    LinePropertyIds     maLinearLineIds;        /// Property identifiers for line formatting of linear series.
-    LinePropertyIds     maFilledLineIds;        /// Property identifiers for line formatting of filled series.
-    FillPropertyIds     maCommonFillIds;        /// Property identifiers for common area fill.
-    FillPropertyIds     maFilledFillIds;        /// Property identifiers for area fill of filled series.
     Reference< XNumberFormats > mxNumFmts;      /// Number formats collection of container document.
     Reference< XNumberFormatTypes > mxNumTypes; /// Number format types collection of container document.
     Locale              maEnUsLocale;           /// Locale struct containing en-US.
@@ -761,9 +776,6 @@ struct ObjectFormatterData
                             const ChartSpaceModel& rChartSpace );
 
     ObjectTypeFormatter* getTypeFormatter( ObjectType eObjType );
-
-    LinePropertyIds&    getLinePropertyIds( PropertyType ePropType );
-    FillPropertyIds&    getFillPropertyIds( PropertyType ePropType );
 };
 
 // ============================================================================
@@ -860,9 +872,8 @@ sal_Int32 DetailFormatterBase::getSchemeColor( sal_Int32 nColorToken, sal_Int32
 
 // ============================================================================
 
-LineFormatter::LineFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry, PropertyType ePropType ) :
-    DetailFormatterBase( rData, pAutoFormatEntry ),
-    mrLinePropIds( rData.getLinePropertyIds( ePropType ) )
+LineFormatter::LineFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
+    DetailFormatterBase( rData, pAutoFormatEntry )
 {
     if( pAutoFormatEntry )
     {
@@ -877,21 +888,20 @@ LineFormatter::LineFormatter( ObjectFormatterData& rData, const AutoFormatEntry*
     }
 }
 
-void LineFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Shape >& rxShapeProp, sal_Int32 nSeriesIdx )
+void LineFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRef< Shape >& rxShapeProp, sal_Int32 nSeriesIdx )
 {
     LineProperties aLineProps;
     if( mxAutoLine.get() )
         aLineProps.assignUsed( *mxAutoLine );
     if( rxShapeProp.is() )
         aLineProps.assignUsed( rxShapeProp->getLineProperties() );
-    aLineProps.pushToPropSet( rPropSet, mrData.maModelObjHelper, mrData.mrFilter.getGraphicHelper(), mrLinePropIds, getPhColor( nSeriesIdx ) );
+    aLineProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), getPhColor( nSeriesIdx ) );
 }
 
 // ============================================================================
 
-FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry, PropertyType ePropType ) :
-    DetailFormatterBase( rData, pAutoFormatEntry ),
-    mrFillPropIds( rData.getFillPropertyIds( ePropType ) )
+FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
+    DetailFormatterBase( rData, pAutoFormatEntry )
 {
     if( pAutoFormatEntry )
     {
@@ -903,7 +913,7 @@ FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry*
     }
 }
 
-void FillFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Shape >& rxShapeProp, const PictureOptionsModel* pPicOptions, sal_Int32 nSeriesIdx )
+void FillFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRef< Shape >& rxShapeProp, const PictureOptionsModel* pPicOptions, sal_Int32 nSeriesIdx )
 {
     FillProperties aFillProps;
     if( mxAutoFill.get() )
@@ -912,17 +922,17 @@ void FillFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Sh
         aFillProps.assignUsed( rxShapeProp->getFillProperties() );
     if( pPicOptions )
         lclConvertPictureOptions( aFillProps, *pPicOptions );
-    aFillProps.pushToPropSet( rPropSet, mrData.maModelObjHelper, mrData.mrFilter.getGraphicHelper(), mrFillPropIds, 0, getPhColor( nSeriesIdx ) );
+    aFillProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), 0, getPhColor( nSeriesIdx ) );
 }
 
 // ============================================================================
 
-EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry, PropertyType /*ePropType*/ ) :
+EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
     DetailFormatterBase( rData, pAutoFormatEntry )
 {
 }
 
-void EffectFormatter::convertFormatting( PropertySet& /*rPropSet*/, const ModelRef< Shape >& /*rxShapeProp*/, sal_Int32 /*nSeriesIdx*/ )
+void EffectFormatter::convertFormatting( ShapePropertyMap& /*rPropMap*/, const ModelRef< Shape >& /*rxShapeProp*/, sal_Int32 /*nSeriesIdx*/ )
 {
 }
 
@@ -980,20 +990,23 @@ void TextFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Te
 // ============================================================================
 
 ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace ) :
-    maLineFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoLines,   rChartSpace.mnStyle ), rEntry.mePropType ),
-    maFillFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoFills,   rChartSpace.mnStyle ), rEntry.mePropType ),
-    maEffectFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoEffects, rChartSpace.mnStyle ), rEntry.mePropType ),
+    maLineFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoLines,   rChartSpace.mnStyle ) ),
+    maFillFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoFills,   rChartSpace.mnStyle ) ),
+    maEffectFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoEffects, rChartSpace.mnStyle ) ),
     maTextFormatter(   rData, lclGetAutoTextEntry(   rEntry.mpAutoTexts,   rChartSpace.mnStyle ), rChartSpace.mxTextProp ),
+    mrModelObjHelper( rData.maModelObjHelper ),
     mrEntry( rEntry )
 {
 }
 
 void ObjectTypeFormatter::convertFrameFormatting( PropertySet& rPropSet, const ModelRef< Shape >& rxShapeProp, const PictureOptionsModel* pPicOptions, sal_Int32 nSeriesIdx )
 {
-    maLineFormatter.convertFormatting( rPropSet, rxShapeProp, nSeriesIdx );
+    ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo );
+    maLineFormatter.convertFormatting( aPropMap, rxShapeProp, nSeriesIdx );
     if( mrEntry.mbIsFrame )
-        maFillFormatter.convertFormatting( rPropSet, rxShapeProp, pPicOptions, nSeriesIdx );
-    maEffectFormatter.convertFormatting( rPropSet, rxShapeProp, nSeriesIdx );
+        maFillFormatter.convertFormatting( aPropMap, rxShapeProp, pPicOptions, nSeriesIdx );
+    maEffectFormatter.convertFormatting( aPropMap, rxShapeProp, nSeriesIdx );
+    rPropSet.setProperties( aPropMap );
 }
 
 void ObjectTypeFormatter::convertTextFormatting( PropertySet& rPropSet, const ModelRef< TextBody >& rxTextProp )
@@ -1014,16 +1027,20 @@ void ObjectTypeFormatter::convertTextFormatting( PropertySet& rPropSet, const Te
 
 void ObjectTypeFormatter::convertAutomaticLine( PropertySet& rPropSet, sal_Int32 nSeriesIdx )
 {
+    ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo );
     ModelRef< Shape > xShapeProp;
-    maLineFormatter.convertFormatting( rPropSet, xShapeProp, nSeriesIdx );
-    maEffectFormatter.convertFormatting( rPropSet, xShapeProp, nSeriesIdx );
+    maLineFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx );
+    maEffectFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx );
+    rPropSet.setProperties( aPropMap );
 }
 
 void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32 nSeriesIdx )
 {
+    ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo );
     ModelRef< Shape > xShapeProp;
-    maFillFormatter.convertFormatting( rPropSet, xShapeProp, 0, nSeriesIdx );
-    maEffectFormatter.convertFormatting( rPropSet, xShapeProp, nSeriesIdx );
+    maFillFormatter.convertFormatting( aPropMap, xShapeProp, 0, nSeriesIdx );
+    maEffectFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx );
+    rPropSet.setProperties( aPropMap );
 }
 
 // ============================================================================
@@ -1031,11 +1048,6 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32
 ObjectFormatterData::ObjectFormatterData( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
     mrFilter( rFilter ),
     maModelObjHelper( Reference< XMultiServiceFactory >( rxChartDoc, UNO_QUERY ) ),
-    maCommonLineIds( spnCommonLineIds, true, false ),
-    maLinearLineIds( spnLinearLineIds, true, false ),
-    maFilledLineIds( spnFilledLineIds, true, false ),
-    maCommonFillIds( spnCommonFillIds, true, true ),
-    maFilledFillIds( spnFilledFillIds, true, true ),
     maEnUsLocale( CREATE_OUSTRING( "en" ), CREATE_OUSTRING( "US" ), OUString() ),
     mnMaxSeriesIdx( -1 )
 {
@@ -1061,28 +1073,6 @@ ObjectTypeFormatter* ObjectFormatterData::getTypeFormatter( ObjectType eObjType
     return maTypeFormatters.get( eObjType ).get();
 }
 
-LinePropertyIds& ObjectFormatterData::getLinePropertyIds( PropertyType ePropType )
-{
-    switch( ePropType )
-    {
-        case PROPERTYTYPE_COMMON:       return maCommonLineIds;
-        case PROPERTYTYPE_LINEARSERIES: return maLinearLineIds;
-        case PROPERTYTYPE_FILLEDSERIES: return maFilledLineIds;
-    }
-    return maCommonLineIds;
-}
-
-FillPropertyIds& ObjectFormatterData::getFillPropertyIds( PropertyType ePropType )
-{
-    switch( ePropType )
-    {
-        case PROPERTYTYPE_COMMON:       return maCommonFillIds;
-        case PROPERTYTYPE_LINEARSERIES: return maCommonFillIds;
-        case PROPERTYTYPE_FILLEDSERIES: return maFilledFillIds;
-    }
-    return maCommonFillIds;
-}
-
 // ============================================================================
 
 ObjectFormatter::ObjectFormatter( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
@@ -1161,7 +1151,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
         sal_Int32 nPropId = bPercentFormat ? PROP_PercentageNumberFormat : PROP_NumberFormat;
         if( rNumberFormat.mbSourceLinked || (rNumberFormat.maFormatCode.getLength() == 0) )
         {
-            rPropSet.setProperty( nPropId, Any() );
+            rPropSet.setAnyProperty( nPropId, Any() );
         }
         else try
         {
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index a1705cb5b..fd058a9f6 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -513,12 +513,12 @@ sal_Int32 Color::getColor( const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr
     return mnC1;
 }
 
-bool Color::hasTransparence() const
+bool Color::hasTransparency() const
 {
     return mnAlpha < MAX_PERCENT;
 }
 
-sal_Int16 Color::getTransparence() const
+sal_Int16 Color::getTransparency() const
 {
     return static_cast< sal_Int16 >( (MAX_PERCENT - mnAlpha) / PER_PERCENT );
 }
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 857fcb89c..a0c65a706 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -27,6 +27,7 @@
  ************************************************************************/
 
 #include "oox/drawingml/fillproperties.hxx"
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
@@ -38,10 +39,8 @@
 #include <com/sun/star/drawing/RectanglePoint.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
 #include "oox/helper/graphichelper.hxx"
-#include "oox/helper/modelobjecthelper.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/token/tokens.hxx"
 
 using namespace ::com::sun::star;
@@ -62,21 +61,6 @@ namespace drawingml {
 
 namespace {
 
-static const sal_Int32 spnDefaultFillIds[ FillId_END ] =
-{
-    PROP_FillStyle,
-    PROP_FillColor,
-    PROP_FillTransparence,
-    PROP_FillGradient,
-    PROP_FillBitmapURL,
-    PROP_FillBitmapMode,
-    PROP_FillBitmapSizeX,
-    PROP_FillBitmapSizeY,
-    PROP_FillBitmapPositionOffsetX,
-    PROP_FillBitmapPositionOffsetY,
-    PROP_FillBitmapRectanglePoint
-};
-
 BitmapMode lclGetBitmapMode( sal_Int32 nToken )
 {
     switch( nToken )
@@ -130,16 +114,6 @@ const awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const R
 
 // ============================================================================
 
-FillPropertyIds::FillPropertyIds( const sal_Int32* pnPropertyIds, bool bNamedFillGradient, bool bNamedFillBitmap ) :
-    mpnPropertyIds( pnPropertyIds ),
-    mbNamedFillGradient( bNamedFillGradient ),
-    mbNamedFillBitmap( bNamedFillBitmap )
-{
-    OSL_ENSURE( mpnPropertyIds != 0, "FillPropertyIds::FillPropertyIds - missing property identifiers" );
-}
-
-// ============================================================================
-
 void GradientFillProperties::assignUsed( const GradientFillProperties& rSourceProps )
 {
     if( !rSourceProps.maGradientStops.empty() )
@@ -186,8 +160,6 @@ void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
 
 // ============================================================================
 
-FillPropertyIds FillProperties::DEFAULT_IDS( spnDefaultFillIds, false, false );
-
 void FillProperties::assignUsed( const FillProperties& rSourceProps )
 {
     moFillType.assignIfUsed( rSourceProps.moFillType );
@@ -216,9 +188,8 @@ Color FillProperties::getBestSolidColor() const
     return aSolidColor;
 }
 
-void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rModelObjHelper,
-        const GraphicHelper& rGraphicHelper, const FillPropertyIds& rPropIds,
-        sal_Int32 nShapeRotation, sal_Int32 nPhClr ) const
+void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
+        const GraphicHelper& rGraphicHelper, sal_Int32 nShapeRotation, sal_Int32 nPhClr ) const
 {
     if( moFillType.has() )
     {
@@ -232,16 +203,16 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
             case XML_solidFill:
                 if( maFillColor.isUsed() )
                 {
-                    rPropMap.setProperty( rPropIds[ FillColorId ], maFillColor.getColor( rGraphicHelper, nPhClr ) );
-                    if( maFillColor.hasTransparence() )
-                        rPropMap.setProperty( rPropIds[ FillTransparenceId ], maFillColor.getTransparence() );
+                    rPropMap.setProperty( SHAPEPROP_FillColor, maFillColor.getColor( rGraphicHelper, nPhClr ) );
+                    if( maFillColor.hasTransparency() )
+                        rPropMap.setProperty( SHAPEPROP_FillTransparency, maFillColor.getTransparency() );
                     eFillStyle = FillStyle_SOLID;
                 }
             break;
 
             case XML_gradFill:
                 // do not create gradient struct if property is not supported...
-                if( rPropIds.has( FillGradientId ) )
+                if( rPropMap.supportsProperty( SHAPEPROP_FillGradient ) )
                 {
                     awt::Gradient aGradient;
                     aGradient.Angle = 900;
@@ -291,62 +262,35 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
                     aGradient.Angle = static_cast< sal_Int16 >( (4500 - (nDmlAngle / (PER_DEGREE / 10))) % 3600 );
 
                     // push gradient or named gradient to property map
-                    if( rPropIds.mbNamedFillGradient )
-                    {
-                        OUString aGradientName = rModelObjHelper.insertFillGradient( aGradient );
-                        if( aGradientName.getLength() > 0 )
-                        {
-                            rPropMap.setProperty( rPropIds[ FillGradientId ], aGradientName );
-                            eFillStyle = FillStyle_GRADIENT;
-                        }
-                    }
-                    else
-                    {
-                        rPropMap.setProperty( rPropIds[ FillGradientId ], aGradient );
+                    if( rPropMap.setProperty( SHAPEPROP_FillGradient, aGradient ) )
                         eFillStyle = FillStyle_GRADIENT;
-                    }
                 }
             break;
 
             case XML_blipFill:
                 // do not start complex graphic transformation if property is not supported...
-                if( maBlipProps.mxGraphic.is() && rPropIds.has( FillBitmapUrlId ) )
+                if( maBlipProps.mxGraphic.is() && rPropMap.supportsProperty( SHAPEPROP_FillBitmapUrl ) )
                 {
                     // TODO: "rotate with shape" is not possible with our current core
 
                     OUString aGraphicUrl = rGraphicHelper.createGraphicObject( maBlipProps.mxGraphic );
-                    if( aGraphicUrl.getLength() > 0 )
-                    {
-                        // push bitmap or named bitmap to property map
-                        if( rPropIds.mbNamedFillBitmap )
-                        {
-                            OUString aBitmapName = rModelObjHelper.insertFillBitmap( aGraphicUrl );
-                            if( aBitmapName.getLength() > 0 )
-                            {
-                                rPropMap.setProperty( rPropIds[ FillBitmapUrlId ], aBitmapName );
-                                eFillStyle = FillStyle_BITMAP;
-                            }
-                        }
-                        else
-                        {
-                            rPropMap.setProperty( rPropIds[ FillBitmapUrlId ], aGraphicUrl );
-                            eFillStyle = FillStyle_BITMAP;
-                        }
-                    }
+                    // push bitmap or named bitmap to property map
+                    if( (aGraphicUrl.getLength() > 0) && rPropMap.setProperty( SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
+                        eFillStyle = FillStyle_BITMAP;
 
                     // set other bitmap properties, if bitmap has been inserted into the map
                     if( eFillStyle == FillStyle_BITMAP )
                     {
                         // bitmap mode (single, repeat, stretch)
                         BitmapMode eBitmapMode = lclGetBitmapMode( maBlipProps.moBitmapMode.get( XML_TOKEN_INVALID ) );
-                        rPropMap.setProperty( rPropIds[ FillBitmapModeId ], eBitmapMode );
+                        rPropMap.setProperty( SHAPEPROP_FillBitmapMode, eBitmapMode );
 
                         // additional settings for repeated bitmap
                         if( eBitmapMode == BitmapMode_REPEAT )
                         {
                             // anchor position inside bitmap
                             RectanglePoint eRectPoint = lclGetRectanglePoint( maBlipProps.moTileAlign.get( XML_tl ) );
-                            rPropMap.setProperty( rPropIds[ FillBitmapRectanglePointId ], eRectPoint );
+                            rPropMap.setProperty( SHAPEPROP_FillBitmapRectanglePoint, eRectPoint );
 
                             awt::Size aOriginalSize = lclGetOriginalSize( rGraphicHelper, maBlipProps.mxGraphic );
                             if( (aOriginalSize.Width > 0) && (aOriginalSize.Height > 0) )
@@ -354,16 +298,16 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
                                 // size of one bitmap tile (given as 1/1000 percent of bitmap size), convert to 1/100 mm
                                 double fScaleX = maBlipProps.moTileScaleX.get( MAX_PERCENT ) / static_cast< double >( MAX_PERCENT );
                                 sal_Int32 nFillBmpSizeX = getLimitedValue< sal_Int32, double >( aOriginalSize.Width * fScaleX, 1, SAL_MAX_INT32 );
-                                rPropMap.setProperty( rPropIds[ FillBitmapSizeXId ], nFillBmpSizeX );
+                                rPropMap.setProperty( SHAPEPROP_FillBitmapSizeX, nFillBmpSizeX );
                                 double fScaleY = maBlipProps.moTileScaleY.get( MAX_PERCENT ) / static_cast< double >( MAX_PERCENT );
                                 sal_Int32 nFillBmpSizeY = getLimitedValue< sal_Int32, double >( aOriginalSize.Height * fScaleY, 1, SAL_MAX_INT32 );
-                                rPropMap.setProperty( rPropIds[ FillBitmapSizeYId ], nFillBmpSizeY );
+                                rPropMap.setProperty( SHAPEPROP_FillBitmapSizeY, nFillBmpSizeY );
 
                                 // offset of the first bitmap tile (given as EMUs), convert to percent
                                 sal_Int16 nTileOffsetX = getDoubleIntervalValue< sal_Int16 >( maBlipProps.moTileOffsetX.get( 0 ) / 3.6 / aOriginalSize.Width, 0, 100 );
-                                rPropMap.setProperty( rPropIds[ FillBitmapOffsetXId ], nTileOffsetX );
+                                rPropMap.setProperty( SHAPEPROP_FillBitmapOffsetX, nTileOffsetX );
                                 sal_Int16 nTileOffsetY = getDoubleIntervalValue< sal_Int16 >( maBlipProps.moTileOffsetY.get( 0 ) / 3.6 / aOriginalSize.Height, 0, 100 );
-                                rPropMap.setProperty( rPropIds[ FillBitmapOffsetYId ], nTileOffsetY );
+                                rPropMap.setProperty( SHAPEPROP_FillBitmapOffsetY, nTileOffsetY );
                             }
                         }
                     }
@@ -376,9 +320,9 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
                 Color aColor = getBestSolidColor();
                 if( aColor.isUsed() )
                 {
-                    rPropMap.setProperty( rPropIds[ FillColorId ], aColor.getColor( rGraphicHelper, nPhClr ) );
-                    if( aColor.hasTransparence() )
-                        rPropMap.setProperty( rPropIds[ FillTransparenceId ], aColor.getTransparence() );
+                    rPropMap.setProperty( SHAPEPROP_FillColor, aColor.getColor( rGraphicHelper, nPhClr ) );
+                    if( aColor.hasTransparency() )
+                        rPropMap.setProperty( SHAPEPROP_FillTransparency, aColor.getTransparency() );
                     eFillStyle = FillStyle_SOLID;
                 }
             }
@@ -391,19 +335,10 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
         }
 
         // set final fill style property
-        rPropMap.setProperty( rPropIds[ FillStyleId ], eFillStyle );
+        rPropMap.setProperty( SHAPEPROP_FillStyle, eFillStyle );
     }
 }
 
-void FillProperties::pushToPropSet( PropertySet& rPropSet, ModelObjectHelper& rModelObjHelper,
-        const GraphicHelper& rGraphicHelper, const FillPropertyIds& rPropIds,
-        sal_Int32 nShapeRotation, sal_Int32 nPhClr ) const
-{
-    PropertyMap aPropMap;
-    pushToPropMap( aPropMap, rModelObjHelper, rGraphicHelper, rPropIds, nShapeRotation, nPhClr );
-    rPropSet.setProperties( aPropMap );
-}
-
 // ============================================================================
 
 void GraphicProperties::assignUsed( const GraphicProperties& rSourceProps )
@@ -421,9 +356,9 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe
         {
             sal_Int32 nFromColor = maBlipProps.maColorChangeFrom.getColor( rGraphicHelper, nPhClr );
             sal_Int32 nToColor = maBlipProps.maColorChangeTo.getColor( rGraphicHelper, nPhClr );
-            if ( (nFromColor != nToColor) || maBlipProps.maColorChangeTo.hasTransparence() ) try
+            if ( (nFromColor != nToColor) || maBlipProps.maColorChangeTo.hasTransparency() ) try
             {
-                sal_Int16 nToTransparence = maBlipProps.maColorChangeTo.getTransparence();
+                sal_Int16 nToTransparence = maBlipProps.maColorChangeTo.getTransparency();
                 sal_Int8 nToAlpha = static_cast< sal_Int8 >( (100 - nToTransparence) / 39.062 );   // ?!? correct ?!?
                 Reference< XGraphicTransformer > xTransformer( maBlipProps.mxGraphic, UNO_QUERY_THROW );
                 xGraphic = xTransformer->colorChange( maBlipProps.mxGraphic, nFromColor, 9, nToColor, nToAlpha );
@@ -476,13 +411,6 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe
         rPropMap[ PROP_AdjustContrast ] <<= nContrast;
 }
 
-void GraphicProperties::pushToPropSet( PropertySet& rPropSet, const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
-{
-    PropertyMap aPropMap;
-    pushToPropMap( aPropMap, rGraphicHelper, nPhClr );
-    rPropSet.setProperties( aPropMap );
-}
-
 // ============================================================================
 
 } // namespace drawingml
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 2e69cbad1..3ff15c00b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -29,6 +29,7 @@
 #include "oox/drawingml/lineproperties.hxx"
 #include <vector>
 #include <rtl/ustrbuf.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
@@ -36,14 +37,13 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
+#include "oox/drawingml/drawingmltypes.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/graphichelper.hxx"
-#include "oox/helper/modelobjecthelper.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/token/tokens.hxx"
 
+using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::drawing;
 
 using ::rtl::OUString;
@@ -60,24 +60,6 @@ namespace drawingml {
 
 namespace {
 
-static const sal_Int32 spnDefaultLineIds[ LineId_END ] =
-{
-    PROP_LineStyle,
-    PROP_LineWidth,
-    PROP_LineColor,
-    PROP_LineTransparence,
-    PROP_LineDash,
-    PROP_LineJoint,
-    PROP_LineStartName,
-    PROP_LineStartWidth,
-    PROP_LineStartCenter,
-    PROP_LineEndName,
-    PROP_LineEndWidth,
-    PROP_LineEndCenter
-};
-
-// ----------------------------------------------------------------------------
-
 void lclSetDashData( LineDash& orLineDash, sal_Int16 nDots, sal_Int32 nDotLen,
         sal_Int16 nDashes, sal_Int32 nDashLen, sal_Int32 nDistance )
 {
@@ -196,15 +178,16 @@ sal_Int32 lclGetArrowSize( sal_Int32 nToken )
 
 // ----------------------------------------------------------------------------
 
-void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties& rArrowProps,
-        ModelObjectHelper& rModelObjHelper, const LinePropertyIds& rPropIds, sal_Int32 nLineWidth, bool bLineEnd )
+void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
+        const LineArrowProperties& rArrowProps, sal_Int32 nLineWidth, bool bLineEnd )
 {
-    PolyPolygonBezierCoords aMarker;
-    OUString aMarkerName;
-    sal_Int32 nMarkerWidth = 0;
-    bool bMarkerCenter = false;
+    /*  Store the marker polygon and the marker name in a single value, to be
+        able to pass both to the ShapePropertyMap::setProperty() function. */
+    NamedValue aNamedMarker;
 
     OUStringBuffer aBuffer;
+    sal_Int32 nMarkerWidth = 0;
+    bool bMarkerCenter = false;
     sal_Int32 nArrowType = rArrowProps.moArrowType.get( XML_none );
     switch( nArrowType )
     {
@@ -234,7 +217,7 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties&
 
         sal_Int32 nNameIndex = nWidth * 3 + nLength + 1;
         aBuffer.append( sal_Unicode( ' ' ) ).append( nNameIndex );
-        aMarkerName = aBuffer.makeStringAndClear();
+        OUString aMarkerName = aBuffer.makeStringAndClear();
 
         bool bIsArrow = nArrowType == XML_arrow;
         double fArrowLength = 1.0;
@@ -251,12 +234,15 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties&
             case OOX_ARROWSIZE_MEDIUM:  fArrowWidth = (bIsArrow ? 4.5 : 3.0);  break;
             case OOX_ARROWSIZE_LARGE:   fArrowWidth = (bIsArrow ? 6.0 : 5.0);  break;
         }
-        // set arrow width relative to line width (convert line width from EMUs to 1/100 mm)
-        sal_Int32 nApiLineWidth = ::std::max< sal_Int32 >( GetCoordinate( nLineWidth ), 70 );
-        nMarkerWidth = static_cast< sal_Int32 >( fArrowWidth * nApiLineWidth );
-
-        // test if the arrow already exists, do not create it again in this case
-        if( !rPropIds.mbNamedLineMarker || !rModelObjHelper.hasLineMarker( aMarkerName ) )
+        // set arrow width relative to line width
+        sal_Int32 nBaseLineWidth = ::std::max< sal_Int32 >( nLineWidth, 70 );
+        nMarkerWidth = static_cast< sal_Int32 >( fArrowWidth * nBaseLineWidth );
+
+        /*  Test if the marker already exists in the marker table, do not
+            create it again in this case. If markers are inserted explicitly
+            instead by their name, the polygon will be created always.
+            TODO: this can be optimized by using a map. */
+        if( !rPropMap.hasNamedLineMarkerInTable( aMarkerName ) )
         {
 // pass X and Y as percentage to OOX_ARROW_POINT
 #define OOX_ARROW_POINT( x, y ) Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) )
@@ -311,46 +297,44 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties&
             }
 #undef OOX_ARROW_POINT
 
-            OSL_ENSURE( !aPoints.empty(), "ApiLineMarkerProperties::ApiLineMarkerProperties - missing arrow coordinates" );
+            OSL_ENSURE( !aPoints.empty(), "lclPushMarkerProperties - missing arrow coordinates" );
             if( !aPoints.empty() )
             {
-                aMarker.Coordinates.realloc( 1 );
-                aMarker.Coordinates[ 0 ] = ContainerHelper::vectorToSequence( aPoints );
+                PolyPolygonBezierCoords aMarkerCoords;
+                aMarkerCoords.Coordinates.realloc( 1 );
+                aMarkerCoords.Coordinates[ 0 ] = ContainerHelper::vectorToSequence( aPoints );
 
                 ::std::vector< PolygonFlags > aFlags( aPoints.size(), PolygonFlags_NORMAL );
-                aMarker.Flags.realloc( 1 );
-                aMarker.Flags[ 0 ] = ContainerHelper::vectorToSequence( aFlags );
+                aMarkerCoords.Flags.realloc( 1 );
+                aMarkerCoords.Flags[ 0 ] = ContainerHelper::vectorToSequence( aFlags );
 
-                if( rPropIds.mbNamedLineMarker && !rModelObjHelper.insertLineMarker( aMarkerName, aMarker ) )
-                    aMarkerName = OUString();
-            }
-            else
-            {
-                aMarkerName = OUString();
+                aNamedMarker.Name = aMarkerName;
+                aNamedMarker.Value <<= aMarkerCoords;
             }
         }
+        else
+        {
+            /*  Named marker object exists already in the marker table, pass
+                its name only. This will set the name as property value, but
+                does not create a new object in the marker table. */
+            aNamedMarker.Name = aMarkerName;
+        }
     }
 
-    // push the properties (filled aMarkerName indicates valid marker)
-    if( aMarkerName.getLength() > 0 )
+    // push the properties (filled aNamedMarker.Name indicates valid marker)
+    if( aNamedMarker.Name.getLength() > 0 )
     {
         if( bLineEnd )
         {
-            if( rPropIds.mbNamedLineMarker )
-                rPropMap.setProperty( rPropIds[ LineEndId ], aMarkerName );
-            else
-                rPropMap.setProperty( rPropIds[ LineEndId ], aMarker );
-            rPropMap.setProperty( rPropIds[ LineEndWidthId ], nMarkerWidth );
-            rPropMap.setProperty( rPropIds[ LineEndCenterId ], bMarkerCenter );
+            rPropMap.setProperty( SHAPEPROP_LineEnd, aNamedMarker );
+            rPropMap.setProperty( SHAPEPROP_LineEndWidth, nMarkerWidth );
+            rPropMap.setProperty( SHAPEPROP_LineEndCenter, bMarkerCenter );
         }
         else
         {
-            if( rPropIds.mbNamedLineMarker )
-                rPropMap.setProperty( rPropIds[ LineStartId ], aMarkerName );
-            else
-                rPropMap.setProperty( rPropIds[ LineStartId ], aMarker );
-            rPropMap.setProperty( rPropIds[ LineStartWidthId ], nMarkerWidth );
-            rPropMap.setProperty( rPropIds[ LineStartCenterId ], bMarkerCenter );
+            rPropMap.setProperty( SHAPEPROP_LineStart, aNamedMarker );
+            rPropMap.setProperty( SHAPEPROP_LineStartWidth, nMarkerWidth );
+            rPropMap.setProperty( SHAPEPROP_LineStartCenter, bMarkerCenter );
         }
     }
 }
@@ -359,16 +343,6 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties&
 
 // ============================================================================
 
-LinePropertyIds::LinePropertyIds( const sal_Int32* pnPropertyIds, bool bNamedLineDash, bool bNamedLineMarker ) :
-    mpnPropertyIds( pnPropertyIds ),
-    mbNamedLineDash( bNamedLineDash ),
-    mbNamedLineMarker( bNamedLineMarker )
-{
-    OSL_ENSURE( mpnPropertyIds != 0, "LinePropertyIds::LinePropertyIds - missing property identifiers" );
-}
-
-// ============================================================================
-
 void LineArrowProperties::assignUsed( const LineArrowProperties& rSourceProps )
 {
     moArrowType.assignIfUsed( rSourceProps.moArrowType );
@@ -378,8 +352,6 @@ void LineArrowProperties::assignUsed( const LineArrowProperties& rSourceProps )
 
 // ============================================================================
 
-LinePropertyIds LineProperties::DEFAULT_IDS( spnDefaultLineIds, false, true );
-
 void LineProperties::assignUsed( const LineProperties& rSourceProps )
 {
     maStartArrow.assignUsed( rSourceProps.maStartArrow );
@@ -394,14 +366,17 @@ void LineProperties::assignUsed( const LineProperties& rSourceProps )
     moLineJoint.assignIfUsed( rSourceProps.moLineJoint );
 }
 
-void LineProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rModelObjHelper,
-        const GraphicHelper& rGraphicHelper, const LinePropertyIds& rPropIds, sal_Int32 nPhClr ) const
+void LineProperties::pushToPropMap( ShapePropertyMap& rPropMap,
+        const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
 {
     // line fill type must exist, otherwise ignore other properties
     if( maLineFill.moFillType.has() )
     {
         // line style (our core only supports none and solid)
         LineStyle eLineStyle = (maLineFill.moFillType.get() == XML_noFill) ? LineStyle_NONE : LineStyle_SOLID;
+        
+        // convert line width from EMUs to 1/100mm
+        sal_Int32 nLineWidth = convertEmuToHmm( moLineWidth.get( 0 ) );
 
         // create line dash from preset dash token (not for invisible line)
         if( (eLineStyle != LineStyle_NONE) && (moPresetDash.differsFrom( XML_solid ) || (!moPresetDash && !maCustomDash.empty())) )
@@ -416,61 +391,40 @@ void LineProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
                 lclConvertCustomDash( aLineDash, maCustomDash );
 
             // convert relative dash/dot length to absolute length
-            sal_Int32 nLineWidth = GetCoordinate( moLineWidth.get( 103500 ) );
-            aLineDash.DotLen *= nLineWidth;
-            aLineDash.DashLen *= nLineWidth;
-            aLineDash.Distance *= nLineWidth;
+            sal_Int32 nBaseLineWidth = ::std::max< sal_Int32 >( nLineWidth, 35 );
+            aLineDash.DotLen *= nBaseLineWidth;
+            aLineDash.DashLen *= nBaseLineWidth;
+            aLineDash.Distance *= nBaseLineWidth;
 
-            if( rPropIds.mbNamedLineDash )
-            {
-                OUString aDashName = rModelObjHelper.insertLineDash( aLineDash );
-                if( aDashName.getLength() > 0 )
-                {
-                    rPropMap.setProperty( rPropIds[ LineDashId ], aDashName );
-                    eLineStyle = LineStyle_DASH;
-                }
-            }
-            else
-            {
-                rPropMap.setProperty( rPropIds[ LineDashId ], aLineDash );
+            if( rPropMap.setProperty( SHAPEPROP_LineDash, aLineDash ) )
                 eLineStyle = LineStyle_DASH;
-            }
         }
 
         // set final line style property
-        rPropMap.setProperty( rPropIds[ LineStyleId ], eLineStyle );
+        rPropMap.setProperty( SHAPEPROP_LineStyle, eLineStyle );
 
         // line joint type
         if( moLineJoint.has() )
-            rPropMap.setProperty( rPropIds[ LineJointId ], lclGetLineJoint( moLineJoint.get() ) );
+            rPropMap.setProperty( SHAPEPROP_LineJoint, lclGetLineJoint( moLineJoint.get() ) );
 
-        // convert line width from EMUs to 1/100 mm
-        if( moLineWidth.has() )
-            rPropMap.setProperty( rPropIds[ LineWidthId ], GetCoordinate( moLineWidth.get() ) );
+        // line width in 1/100mm
+        rPropMap.setProperty( SHAPEPROP_LineWidth, nLineWidth );
 
         // line color and transparence
         Color aLineColor = maLineFill.getBestSolidColor();
         if( aLineColor.isUsed() )
         {
-            rPropMap.setProperty( rPropIds[ LineColorId ], aLineColor.getColor( rGraphicHelper, nPhClr ) );
-            if( aLineColor.hasTransparence() )
-                rPropMap.setProperty( rPropIds[ LineTransparenceId ], aLineColor.getTransparence() );
+            rPropMap.setProperty( SHAPEPROP_LineColor, aLineColor.getColor( rGraphicHelper, nPhClr ) );
+            if( aLineColor.hasTransparency() )
+                rPropMap.setProperty( SHAPEPROP_LineTransparency, aLineColor.getTransparency() );
         }
 
         // line markers
-        lclPushMarkerProperties( rPropMap, maStartArrow, rModelObjHelper, rPropIds, moLineWidth.get( 0 ), false );
-        lclPushMarkerProperties( rPropMap, maEndArrow,   rModelObjHelper, rPropIds, moLineWidth.get( 0 ), true );
+        lclPushMarkerProperties( rPropMap, maStartArrow, nLineWidth, false );
+        lclPushMarkerProperties( rPropMap, maEndArrow,   nLineWidth, true );
     }
 }
 
-void LineProperties::pushToPropSet( PropertySet& rPropSet, ModelObjectHelper& rModelObjHelper,
-        const GraphicHelper& rGraphicHelper, const LinePropertyIds& rPropIds, sal_Int32 nPhClr ) const
-{
-    PropertyMap aPropMap;
-    pushToPropMap( aPropMap, rModelObjHelper, rGraphicHelper, rPropIds, nPhClr );
-    rPropSet.setProperties( aPropMap );
-}
-
 // ============================================================================
 
 } // namespace drawingml
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index efece8df5..2f9abd034 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -31,6 +31,7 @@
 #include "oox/drawingml/theme.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/drawingml/lineproperties.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/table/tableproperties.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
@@ -404,7 +405,6 @@ Reference< XShape > Shape::createAndInsert(
             }
         }
 
-        ModelObjectHelper& rModelObjectHelper = rFilterBase.getModelObjectHelper();
         const GraphicHelper& rGraphicHelper = rFilterBase.getGraphicHelper();
 
         LineProperties aLineProperties;
@@ -439,28 +439,21 @@ Reference< XShape > Shape::createAndInsert(
         aLineProperties.assignUsed( getLineProperties() );
         aFillProperties.assignUsed( getFillProperties() );
 
-        PropertyMap aShapeProperties;
-        PropertyMap::const_iterator	aShapePropIter;
+        ShapePropertyMap aShapeProps( rFilterBase.getModelObjectHelper() );
 
         // add properties from textbody to shape properties
         if( mpTextBody.get() )
-        {
-            for ( aShapePropIter = mpTextBody->getTextProperties().maPropertyMap.begin();
-                aShapePropIter != mpTextBody->getTextProperties().maPropertyMap.end(); ++aShapePropIter )
-                aShapeProperties[ (*aShapePropIter).first ] = (*aShapePropIter).second;
-        }
-
-        aShapeProperties.insert( getShapeProperties().begin(), getShapeProperties().end() );
-        aShapeProperties.insert( maDefaultShapeProperties.begin(), maDefaultShapeProperties.end() );
+            aShapeProps.assignUsed( mpTextBody->getTextProperties().maPropertyMap );
 
         // applying properties
-        PropertySet aPropSet( xSet );
-        if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) )
-            mpGraphicPropertiesPtr->pushToPropSet( aPropSet, rGraphicHelper );
-        if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TableShape")) ) )
+        aShapeProps.assignUsed( getShapeProperties() );
+        aShapeProps.assignUsed( maDefaultShapeProperties );
+        if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
+            mpGraphicPropertiesPtr->pushToPropMap( aShapeProps, rGraphicHelper );
+        if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.TableShape" ) ) )
             mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet, mpMasterTextListStyle );
-        aFillProperties.pushToPropSet( aPropSet, rModelObjectHelper, rGraphicHelper, FillProperties::DEFAULT_IDS, mnRotation, nFillPhClr );
-        aLineProperties.pushToPropSet( aPropSet, rModelObjectHelper, rGraphicHelper, LineProperties::DEFAULT_IDS, nLinePhClr );
+        aFillProperties.pushToPropMap( aShapeProps, rGraphicHelper, mnRotation, nFillPhClr );
+        aLineProperties.pushToPropMap( aShapeProps, rGraphicHelper, nLinePhClr );
 
         // applying autogrowheight property before setting shape size, because
         // the shape size might be changed if currently autogrowheight is true
@@ -468,12 +461,12 @@ Reference< XShape > Shape::createAndInsert(
         Reference< XPropertySetInfo > xSetInfo( xSet->getPropertySetInfo() );
         const OUString& rPropName = PropertyMap::getPropertyName( PROP_TextAutoGrowHeight );
         if( xSetInfo.is() && xSetInfo->hasPropertyByName( rPropName ) )
-            if( /*const Any* pAutoGrowHeight =*/ aShapeProperties.getProperty( PROP_TextAutoGrowHeight ) )
+            if( aShapeProps.hasProperty( PROP_TextAutoGrowHeight ) )
                 xSet->setPropertyValue( rPropName, Any( false ) );
 
         // do not set properties at a group shape (this causes assertions from svx)
         if( aServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) )
-            aPropSet.setProperties( aShapeProperties );
+            PropertySet( xSet ).setProperties( aShapeProps );
 
         if( bIsCustomShape )
         {
diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx
new file mode 100755
index 000000000..e19578fd0
--- /dev/null
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "oox/drawingml/shapepropertymap.hxx"
+
+#include <com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/drawing/LineDash.hpp>
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
+#include "oox/helper/modelobjecthelper.hxx"
+
+namespace oox {
+namespace drawingml {
+
+// ============================================================================
+
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+namespace {
+
+static const sal_Int32 spnDefaultShapeIds[ SHAPEPROP_END ] =
+{
+    PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, PROP_LineDash, PROP_LineJoint,
+    PROP_LineStartName, PROP_LineStartWidth, PROP_LineStartCenter, PROP_LineEndName, PROP_LineEndWidth, PROP_LineEndCenter,
+    PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_FillGradient,
+    PROP_FillBitmapURL, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY,
+    PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint
+};
+
+} // namespace
+
+ShapePropertyInfo ShapePropertyInfo::DEFAULT( spnDefaultShapeIds, true, false, false, false );
+
+ShapePropertyInfo::ShapePropertyInfo( const sal_Int32* pnPropertyIds,
+        bool bNamedLineMarker, bool bNamedLineDash, bool bNamedFillGradient, bool bNamedFillBitmapUrl ) :
+    mpnPropertyIds( pnPropertyIds ),
+    mbNamedLineMarker( bNamedLineMarker ),
+    mbNamedLineDash( bNamedLineDash ),
+    mbNamedFillGradient( bNamedFillGradient ),
+    mbNamedFillBitmapUrl( bNamedFillBitmapUrl )
+{
+    OSL_ENSURE( mpnPropertyIds != 0, "ShapePropertyInfo::ShapePropertyInfo - missing property identifiers" );
+}
+
+// ============================================================================
+
+ShapePropertyMap::ShapePropertyMap( ModelObjectHelper& rModelObjHelper, const ShapePropertyInfo& rShapePropInfo ) :
+    mrModelObjHelper( rModelObjHelper ),
+    maShapePropInfo( rShapePropInfo )
+{
+}
+
+bool ShapePropertyMap::supportsProperty( ShapePropertyId ePropId ) const
+{
+    return maShapePropInfo.has( ePropId );
+}
+
+bool ShapePropertyMap::hasNamedLineMarkerInTable( const OUString& rMarkerName ) const
+{
+    return maShapePropInfo.mbNamedLineMarker && mrModelObjHelper.hasLineMarker( rMarkerName );
+}
+
+bool ShapePropertyMap::setAnyProperty( ShapePropertyId ePropId, const Any& rValue )
+{
+    // get current property identifier for the specified property
+    sal_Int32 nPropId = maShapePropInfo[ ePropId ];
+    if( nPropId < 0 ) return false;
+
+    // special handling for properties supporting named objects in tables
+    switch( ePropId )
+    {
+        case SHAPEPROP_LineStart:
+        case SHAPEPROP_LineEnd:
+            return setLineMarker( nPropId, rValue );
+            
+        case SHAPEPROP_LineDash:
+            return setLineDash( nPropId, rValue );
+
+        case SHAPEPROP_FillGradient:
+            return setFillGradient( nPropId, rValue );
+
+        case SHAPEPROP_FillBitmapUrl:
+            return setFillBitmapUrl( nPropId, rValue );
+
+        default:;   // suppress compiler warnings
+    }
+
+    // set plain property value
+    operator[]( nPropId ) = rValue;
+    return true;
+}
+
+// private --------------------------------------------------------------------
+
+bool ShapePropertyMap::setLineMarker( sal_Int32 nPropId, const Any& rValue )
+{
+    NamedValue aNamedMarker;
+    if( (rValue >>= aNamedMarker) && (aNamedMarker.Name.getLength() > 0) )
+    {
+        // push line marker explicitly
+        if( !maShapePropInfo.mbNamedLineMarker )
+            return setAnyProperty( nPropId, aNamedMarker.Value );
+
+        // create named line marker (if coordinates have been passed) and push its name
+        bool bInserted = !aNamedMarker.Value.has< PolyPolygonBezierCoords >() ||
+            mrModelObjHelper.insertLineMarker( aNamedMarker.Name, aNamedMarker.Value.get< PolyPolygonBezierCoords >() );
+        return bInserted && setProperty( nPropId, aNamedMarker.Name );
+    }
+    return false;
+}
+
+bool ShapePropertyMap::setLineDash( sal_Int32 nPropId, const Any& rValue )
+{
+    // push line dash explicitly
+    if( !maShapePropInfo.mbNamedLineDash )
+        return setAnyProperty( nPropId, rValue );
+
+    // create named line dash and push its name
+    if( rValue.has< LineDash >() )
+    {
+        OUString aDashName = mrModelObjHelper.insertLineDash( rValue.get< LineDash >() );
+        return (aDashName.getLength() > 0) && setProperty( nPropId, aDashName );
+    }
+
+    return false;
+}
+
+bool ShapePropertyMap::setFillGradient( sal_Int32 nPropId, const Any& rValue )
+{
+    // push gradient explicitly
+    if( !maShapePropInfo.mbNamedFillGradient )
+        return setAnyProperty( nPropId, rValue );
+
+    // create named gradient and push its name
+    if( rValue.has< Gradient >() )
+    {
+        OUString aGradientName = mrModelObjHelper.insertFillGradient( rValue.get< Gradient >() );
+        return (aGradientName.getLength() > 0) && setProperty( nPropId, aGradientName );
+    }
+
+    return false;
+}
+
+bool ShapePropertyMap::setFillBitmapUrl( sal_Int32 nPropId, const Any& rValue )
+{
+    // push bitmap URL explicitly
+    if( !maShapePropInfo.mbNamedFillBitmapUrl )
+        return setAnyProperty( nPropId, rValue );
+
+    // create named bitmap URL and push its name
+    if( rValue.has< OUString >() )
+    {
+        OUString aBitmapUrlName = mrModelObjHelper.insertFillBitmapUrl( rValue.get< OUString >() );
+        return (aBitmapUrlName.getLength() > 0) && setProperty( nPropId, aBitmapUrlName );
+    }
+
+    return false;
+}
+
+// ============================================================================
+
+} // namespace drawingml
+} // namespace oox
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 3d875a027..fec1805ba 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -28,6 +28,7 @@
 
 #include "oox/drawingml/table/tablecell.hxx"
 #include "oox/drawingml/table/tableproperties.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/drawingml/textbody.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/propertyset.hxx"
@@ -363,9 +364,10 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesBottomLeftToTopRight, PROP_DiagonalBLTR );
 
     aFillProperties.assignUsed( maFillProperties );
-    PropertySet aPropSet( xPropSet );
+    ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
     // TODO: phClr?
-    aFillProperties.pushToPropSet( aPropSet, rFilterBase.getModelObjectHelper(), rFilterBase.getGraphicHelper() );
+    aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
+    PropertySet( xPropSet ).setProperties( aPropMap );
 }
 
 } } }
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index e807fcb76..fad899c1f 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -167,7 +167,7 @@ void BiffCtlsStreamObject::implDump()
         {
             IndentGuard aIndGuard( mxOut );
             mxStrm->seek( mnStartPos );
-            RelativeInputStreamRef xRelStrm( new RelativeInputStream( *mxStrm, mnLength ) );
+            BinaryInputStreamRef xRelStrm( new RelativeInputStream( *mxStrm, mnLength ) );
             FormControlStreamObject( *this, xRelStrm ).dump();
         }
         writeEmptyItem( "CTLS-END" );
@@ -357,7 +357,7 @@ bool BiffObjectBase::implStartRecord( BinaryInputStream&, sal_Int64& ornRecPos,
         break;
     }
 
-    ornRecSize = mxBiffStrm->getLength();
+    ornRecSize = mxBiffStrm->size();
     return bValid;
 }
 
@@ -811,7 +811,7 @@ void FormulaObject::implDump()
     if( mnSize == 0 ) return;
 
     sal_Int64 nStartPos = mxStrm->tell();
-    sal_Int64 nEndPos = ::std::min< sal_Int64 >( nStartPos + mnSize, mxStrm->getLength() );
+    sal_Int64 nEndPos = ::std::min< sal_Int64 >( nStartPos + mnSize, mxStrm->size() );
 
     bool bValid = mxTokens.get();
     mxStack.reset( new FormulaStack );
@@ -1604,7 +1604,7 @@ void WorkbookStreamObject::implDumpRecordBody()
 {
     BiffInputStream& rStrm = getBiffStream();
     sal_uInt16 nRecId = rStrm.getRecId();
-    sal_Int64 nRecSize = rStrm.getLength();
+    sal_Int64 nRecSize = rStrm.size();
     BiffType eBiff = getBiff();
 
     switch( nRecId )
@@ -1930,7 +1930,7 @@ void WorkbookStreamObject::implDumpRecordBody()
 
         case BIFF_ID_CHPICFORMAT:
             dumpDec< sal_uInt16 >( "bitmap-mode", "CHPICFORMAT-BITMAP-MODE" );
-            dumpDec< sal_uInt16 >( "image-format", "CHPICFORMAT-IMAGE-FORMAT" );
+            dumpUnused( 2 );
             dumpHex< sal_uInt16 >( "flags", "CHPICFORMAT-FLAGS" );
             dumpDec< double >( "scaling-factor" );
         break;
@@ -2573,6 +2573,12 @@ void WorkbookStreamObject::implDumpRecordBody()
             dumpDec< sal_Int32 >( "sst-idx" );
         break;
 
+        case BIFF_ID_MERGEDCELLS:
+            mxOut->resetItemIndex();
+            for( sal_uInt16 nIdx = 0, nCount = dumpDec< sal_uInt16 >( "count" ); !rStrm.isEof() && (nIdx < nCount); ++nIdx )
+                dumpRange( "#range" );
+        break;
+        
         case BIFF_ID_MSODRAWING:
         case BIFF_ID_MSODRAWINGGROUP:
         case BIFF_ID_MSODRAWINGSEL:
@@ -2626,14 +2632,32 @@ void WorkbookStreamObject::implDumpRecordBody()
             {
                 dumpHex< sal_uInt16 >( "flags", "NOTE-FLAGS" );
                 dumpDec< sal_uInt16 >( "obj-id" );
+                dumpUniString( "author" );
+                dumpUnused( 1 );
             }
             else
             {
-                sal_uInt16 nTextLen = ::std::min( dumpDec< sal_uInt16 >( "text-len" ), static_cast< sal_uInt16 >( rStrm.getRemaining() ) );
+                sal_uInt16 nTextLen = dumpDec< sal_uInt16 >( "text-len" );
+                nTextLen = ::std::min( nTextLen, static_cast< sal_uInt16 >( rStrm.getRemaining() ) );
                 writeStringItem( "note-text", rStrm.readCharArrayUC( nTextLen, getBiffData().getTextEncoding(), true ) );
             }
         break;
 
+        case BIFF_ID_NOTESOUND:
+            dumpHex< sal_uInt32 >( "identifier" );
+            dumpDec< sal_uInt32 >( "total-data-size" );
+            dumpDec< sal_uInt32 >( "wave-data-size" );
+            if( dumpDec< sal_uInt32 >( "fmt-size" ) >= 16 )
+            {
+                dumpDec< sal_uInt16 >( "format", "NOTESOUND-FORMAT" );
+                dumpDec< sal_uInt16 >( "channels" );
+                dumpDec< sal_uInt32 >( "sampling-rate" );
+                dumpDec< sal_uInt32 >( "data-rate" );
+                dumpDec< sal_uInt16 >( "data-block-size" );
+                dumpDec< sal_uInt16 >( "bits-per-sample" );
+            }
+        break;
+        
         case BIFF2_ID_NUMBER:
         case BIFF3_ID_NUMBER:
             dumpCellHeader( nRecId == BIFF2_ID_NUMBER );
@@ -2672,6 +2696,16 @@ void WorkbookStreamObject::implDumpRecordBody()
             }
         break;
 
+        case BIFF_ID_PALETTE:
+            mxOut->resetItemIndex( 8 );
+            for( sal_uInt16 nIdx = 0, nCount = dumpDec< sal_uInt16 >( "count" ); !rStrm.isEof() && (nIdx < nCount); ++nIdx )
+            {
+                OUStringBuffer aColorName;
+                StringHelper::appendHex( aColorName, dumpColorABGR( "#color" ) );
+                mxColors->setName( nIdx + 8, aColorName.makeStringAndClear() );
+            }
+        break;
+
         case BIFF_ID_PANE:
             dumpDec< sal_uInt16 >( "x-pos", "CONV-TWIP-TO-CM" );
             dumpDec< sal_uInt16 >( "y-pos", "CONV-TWIP-TO-CM" );
@@ -4491,7 +4525,7 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent )
     addPreferredStream( "Workbook" );
 }
 
-void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     if( (rStrgPath.getLength() == 0) && (rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Book" ) ) || rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Workbook" ) )) )
         WorkbookStreamObject( *this, rxStrm, rSysFileName ).dump();
@@ -4529,13 +4563,13 @@ Dumper::Dumper( const FilterBase& rFilter )
     DumperBase::construct( xCfg );
 }
 
-Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
+Dumper::Dumper( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
 {
-    if( rxFactory.is() && rxInStrm.is() )
+    if( rxContext.is() && rxInStrm.is() )
     {
-        StorageRef xStrg( new ::oox::ole::OleStorage( rxFactory, rxInStrm, true ) );
+        StorageRef xStrg( new ::oox::ole::OleStorage( rxContext, rxInStrm, true ) );
         MediaDescriptor aMediaDesc;
-        ConfigRef xCfg( new Config( DUMP_BIFF_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
+        ConfigRef xCfg( new Config( DUMP_BIFF_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini
index 2e25ff81c..02f70261e 100644
--- a/oox/source/dump/biffdumper.ini
+++ b/oox/source/dump/biffdumper.ini
@@ -324,7 +324,7 @@ multilist=RECORD-NAMES-BIFF4
   exclude=0x0206,0x0209,0x001E,0x0243
   0x0085=SHEET
   0x0088=,,,,,,SHEETSOFFSET,SHEETHEADER
-  0x0090=,,,,,SOUND,SYNC
+  0x0090=,,,,,,NOTESOUND,SYNC
   0x0098=LPR,STANDARDWIDTH,FNGROUPNAME,,FNGROUPCOUNT,,,
   0x00A0=SCL,PAGESETUP,FNPROTO,PROJEXTSHEET,,,,
   0x00A8=DRAGDROP,COORDLIST,,GCW,,,,
@@ -358,7 +358,7 @@ multilist=RECORD-NAMES-BIFF5
   # chart records
   exclude=0x1004,0x102D,0x102F,0x1036,0x1037,0x1038,0x103B
   0x1040=CHRADARAREA,CHAXESSET,,CHLEGENDENTRY,CHPROPERTIES,CHSERGROUP,CHUSEDAXESSETS,
-  0x1048=CHPIVOTREF,,CHSERPARENT,CHSERTRENDLINE,,,CHFORMAT,CHFRAMEPOS
+  0x1048=CHPIVOTRANGE,,CHSERPARENT,CHSERTRENDLINE,,,CHFORMAT,CHFRAMEPOS
   0x1050=CHFORMATRUNS,CHSOURCELINK,,,,,,
   0x1058=,,,CHSERERRORBAR,,CHSERIESFORMAT,,
 end
@@ -1049,17 +1049,7 @@ end
 
 shortlist=CHPICFORMAT-BITMAP-MODE,1,stretched,stacked,stacked-scaled
 
-constlist=CHPICFORMAT-IMAGE-FORMAT
-  2=wmf
-  9=bmp
-  19=?emf
-end
-
-shortlist=CHPICFORMAT-ENV,1,windows,apple
-
 combilist=CHPICFORMAT-FLAGS
-  0x00FF=uint16,dec,environment,CHPICFORMAT-ENV
-  0x0100=format-only
   0x0200=top-bottom
   0x0400=front-back
   0x0800=left-right
@@ -1511,6 +1501,18 @@ shortlist=IMGDATA-ENV,1,windows,apple
 
 flagslist=NOTE-FLAGS-BIFF8
   0x0002=visible
+  0x0080=row-hidden
+  0x0100=col-hidden
+end
+
+# NOTESOUND ------------------------------------------------------------------
+
+constlist=NOTESOUND-FORMAT
+  1=pcm
+  3=ieee-float
+  6=a-law
+  7=mu-law
+  0xFFFE=extensible
 end
 
 # OBJ ------------------------------------------------------------------------
@@ -2344,7 +2346,7 @@ combilist=XF-FILLCOLOR-BIFF8
   0x3F80=uint8,dec,bg-color-idx,COLORS
 end
 
-# BIFF2 XF index field -------------------------------------------------------
+# BIFF2 cell records ----------------------------------------------------------
 
 constlist=XFINDEX-BIFF2
   default=
diff --git a/oox/source/dump/dffdumper.ini b/oox/source/dump/dffdumper.ini
index 5526663e0..02bce03b6 100644
--- a/oox/source/dump/dffdumper.ini
+++ b/oox/source/dump/dffdumper.ini
@@ -79,6 +79,9 @@ end
 
 shortlist=DFF-COLORMOD-TYPE,0,none,shade,tint
 
+unitconverter=DFF-OPACITY,/655.36,%
+unitconverter=DFF-DEGREES,/65536,°
+
 # DFFBSE ---------------------------------------------------------------------
 
 combilist=DFFBSE-RECORD-INST
@@ -136,8 +139,8 @@ multilist=DFFOPT-PROPERTY-NAMES
   # 0x0100-0x013F: picture (BLIP)
   0x0100=blip-crop-top,blip-crop-bottom,blip-crop-left,blip-crop-right,blip-id,blip-name,blip-opt,blip-transparency-color
   0x0108=blip-contrast,blip-brightness,blip-gamma,blip-ole-id,blip-double-cr-mod,blip-fill-cr-mod,blip-line-cr-mod,blip-print-id
-  0x0110=blip-print-name,blip-print-opt,blip-movie,,,blip-transparency-color-ext,,blip-transparency-color-ext-mod
-  0x0118,,blip-recolor,blip-recolor,blip-recolor-ext,,blip-recolor-ext-mod
+  0x0110=blip-print-name,blip-print-opt,blip-movie,,,blip-transparency-color-ext,reserved,blip-transparency-color-ext-mod
+  0x0118=reserved,reserved,blip-recolor,blip-recolor-ext,reserved,blip-recolor-ext-mod,reserved,reserved
   0x013F=blip-flags
   # 0x0140-0x017F: shape geometry
   0x0140=geo-left,geo-top,geo-right,geo-bottom,geo-shape-path,geo-vertices,geo-segment-info,geo-adjust-1
@@ -149,20 +152,21 @@ multilist=DFFOPT-PROPERTY-NAMES
   0x0180=fill-type,fill-color,fill-opacity,fill-back-color,fill-back-opacity,fill-cr-mod,fill-blip,fill-blip-name
   0x0188=fill-blip-opt,fill-width,fill-height,fill-angle,fill-focus,fill-to-left,fill-to-top,fill-to-right
   0x0190=fill-to-bottom,fill-rect-left,fill-rect-top,fill-rect-right,fill-rect-bottom,fill-dz-type,fill-shade-preset,fill-shade-colors
-  0x0198=fill-origin-x,fill-origin-y,fill-shape-origin-x,fill-shape-origin-y,fill-shade-type,,fill-color-ext,
-  0x01A0=fill-color-ext-mod,,fill-back-color-ext,,fill-back-color-ext-mod
+  0x0198=fill-origin-x,fill-origin-y,fill-shape-origin-x,fill-shape-origin-y,fill-shade-type,,fill-color-ext,reserved
+  0x01A0=fill-color-ext-mod,reserved,fill-back-color-ext,reserved,fill-back-color-ext-mod,reserved,reserved,reserved
   0x01BF=fill-flags
   # 0x01C0-0x01FF: line style
   0x01C0=line-color,line-opacity,line-back-color,line-cr-mod,line-type,line-fill-blip,line-fill-blip-name,line-fill-blip-opt
   0x01C8=line-fill-width,line-fill-height,line-fill-dz-type,line-width,line-miter-limit,line-style,line-dash,line-dash-style
   0x01D0=line-start-arrow-head,line-end-arrow-head,line-start-arrow-width,line-start-arrow-length,line-end-arrow-width,line-end-arrow-length,line-join-style,line-end-cap-style
-  0x01D8=,line-color-ext,,line-color-ext-mod,,line-back-color-ext,,line-back-color-ext-mod
+  0x01D8=,line-color-ext,reserved,line-color-ext-mod,reserved,line-back-color-ext,reserved,line-back-color-ext-mod
+  0x01E0=reserved,reserved,reserved
   0x01FF=line-flags
   # 0x0200-0x023F: shadow style
   0x0200=shadow-type,shadow-color,shadow-highlight,shadow-cr-mod,shadow-opacity,shadow-offset-x,shadow-offset-y,shadow-2nd-offset-x
   0x0208=shadow-2nd-offset-y,,,,,,,
-  0x0210=shadow-origin-x,shadow-origin-y,shadow-color-ext,,shadow-color-ext-mod,,shadow-highlight-ext,
-  0x0218=shadow-highlight-ext-mod
+  0x0210=shadow-origin-x,shadow-origin-y,shadow-color-ext,reserved,shadow-color-ext-mod,reserved,shadow-highlight-ext,reserved
+  0x0218=shadow-highlight-ext-mod,reserved,reserved,reserved
   0x023F=shadow-flags
   # 0x0240-0x027F: perspective
   0x0240=persp-type,persp-offset-x,persp-offsety,persp-scale-x-to-x,persp-scale-y-to-x,persp-scale-x-to-y,persp-scale-y-to-y,persp-persp-x
@@ -170,7 +174,7 @@ multilist=DFFOPT-PROPERTY-NAMES
   0x027F=persp-flags
   # 0x0280-0x02BF: 3d object
   0x0280=3dobj-specular-amt,3dobj-diffuse-amt,3dobj-shininess,3dobj-edge-thickness,3dobj-extrude-forward,3dobj-extrude-backward,3dobj-extrude-plane,3dobj-extrusion-color
-  0x0288=3dobj-cr-mod,3dobj-extrusion-color-ext,,3dobj-extrusion-color-ext-mod
+  0x0288=3dobj-cr-mod,3dobj-extrusion-color-ext,reserved,3dobj-extrusion-color-ext-mod,reserved,reserved
   0x02BF=3dobj-flags
   # 0x02C0-0x02FF: 3d style
   0x02C0=3dstyle-y-rotation,3dstyle-x-rotation,3dstyle-rotation-axis-x,3dstyle-rotation-axis-y,3dstyle-rotation-axis-z,3dstyle-rotation,3dstyle-rotation-center-x,3dstyle-rotation-center-y
@@ -208,25 +212,29 @@ multilist=DFFOPT-PROPERTY-NAMES
   0x0540=lline-color,lline-opacity,lline-back-color,lline-cr-mod,lline-type,lline-fill-blip,lline-fill-blip-name,lline-fill-blip-opt
   0x0548=lline-fill-width,lline-fill-height,lline-fill-dz-type,lline-width,lline-miter-limit,lline-style,lline-dash,lline-dash-style
   0x0550=lline-start-arrow-head,lline-end-arrow-head,lline-start-arrow-width,lline-start-arrow-length,lline-end-arrow-width,lline-end-arrow-length,lline-join-style,lline-end-cap-style
-  0x0558=,lline-color-ext,,lline-color-ext-mod,,lline-back-color-ext,,lline-back-color-ext-mod
+  0x0558=,lline-color-ext,reserved,lline-color-ext-mod,reserved,lline-back-color-ext,reserved,lline-back-color-ext-mod
+  0x0560=reserved,reserved,reserved
   0x057F=lline-flags
   # 0x0580-0x05BF: top line style
   0x0580=tline-color,tline-opacity,tline-back-color,tline-cr-mod,tline-type,tline-fill-blip,tline-fill-blip-name,tline-fill-blip-opt
   0x0588=tline-fill-width,tline-fill-height,tline-fill-dz-type,tline-width,tline-miter-limit,tline-style,tline-dash,tline-dash-style
   0x0590=tline-start-arrow-head,tline-end-arrow-head,tline-start-arrow-width,tline-start-arrow-length,tline-end-arrow-width,tline-end-arrow-length,tline-join-style,tline-end-cap-style
-  0x0598=,tline-color-ext,,tline-color-ext-mod,,tline-back-color-ext,,tline-back-color-ext-mod
+  0x0598=,tline-color-ext,reserved,tline-color-ext-mod,reserved,tline-back-color-ext,reserved,tline-back-color-ext-mod
+  0x05A0=reserved,reserved,reserved
   0x05BF=tline-flags
   # 0x05C0-0x05FF: right line style
   0x05C0=rline-color,rline-opacity,rline-back-color,rline-cr-mod,rline-type,rline-fill-blip,rline-fill-blip-name,rline-fill-blip-opt
   0x05C8=rline-fill-width,rline-fill-height,rline-fill-dz-type,rline-width,rline-miter-limit,rline-style,rline-dash,rline-dash-style
   0x05D0=rline-start-arrow-head,rline-end-arrow-head,rline-start-arrow-width,rline-start-arrow-length,rline-end-arrow-width,rline-end-arrow-length,rline-join-style,rline-end-cap-style
-  0x05D8=,rline-color-ext,,rline-color-ext-mod,,rline-back-color-ext,,rline-back-color-ext-mod
+  0x05D8=,rline-color-ext,reserved,rline-color-ext-mod,reserved,rline-back-color-ext,reserved,rline-back-color-ext-mod
+  0x05E0=reserved,reserved,reserved
   0x05FF=rline-flags
   # 0x0600-0x063F: bottom line style
   0x0600=bline-color,bline-opacity,bline-back-color,bline-cr-mod,bline-type,bline-fill-blip,bline-fill-blip-name,bline-fill-blip-opt
   0x0608=bline-fill-width,bline-fill-height,bline-fill-dz-type,bline-width,bline-miter-limit,bline-style,bline-dash,bline-dash-style
   0x0610=bline-start-arrow-head,bline-end-arrow-head,bline-start-arrow-width,bline-start-arrow-length,bline-end-arrow-width,bline-end-arrow-length,bline-join-style,bline-end-cap-style
-  0x0618=,bline-color-ext,,bline-color-ext-mod,,bline-back-color-ext,,bline-back-color-ext-mod
+  0x0618=,bline-color-ext,reserved,bline-color-ext-mod,reserved,bline-back-color-ext,reserved,bline-back-color-ext-mod
+  0x0620=reserved,reserved,reserved
   0x063F=bline-flags
   # 0x0680-0x06BF: web component
   0x0680=webcomp-html,webcomp-name,webcomp-url
@@ -258,7 +266,7 @@ constlist=DFFOPT-SIMPLE-PROPERTIES
   # fill style
   0x0180=uint32,dec,type,DFFOPT-FILL-TYPE
   0x0181=uint32,hex,color,DFF-COLOR
-  0x0182=int32,fix,opacity,CONV-FLOAT-TO-PERC
+  0x0182=int32,fix,opacity,DFF-OPACITY
   0x0183=uint32,hex,color,DFF-COLOR
   0x0184=int32,fix,opacity,DFF-OPACITY
   0x0185=uint32,hex,color,DFF-COLOR
@@ -266,22 +274,22 @@ constlist=DFFOPT-SIMPLE-PROPERTIES
   0x0188=uint32,dec,blip-opt,DFFOPT-BLIPOPT
   0x0189=int32,dec,width
   0x018A=int32,dec,height
-  0x018B=int32,fix,angle,CONV-DEG
+  0x018B=int32,fix,angle,DFF-DEGREES
   0x018C=int32,dec,focus,CONV-PERCENT
-  0x018D=int32,fix,size,CONV-FLOAT-TO-PERC
-  0x018E=int32,fix,size,CONV-FLOAT-TO-PERC
-  0x018F=int32,fix,size,CONV-FLOAT-TO-PERC
-  0x0190=int32,fix,size,CONV-FLOAT-TO-PERC
+  0x018D=int32,fix,size,DFF-OPACITY
+  0x018E=int32,fix,size,DFF-OPACITY
+  0x018F=int32,fix,size,DFF-OPACITY
+  0x0190=int32,fix,size,DFF-OPACITY
   0x0191=int32,fix,size,CONV-EMU-TO-CM
   0x0192=int32,fix,size,CONV-EMU-TO-CM
   0x0193=int32,fix,size,CONV-EMU-TO-CM
   0x0194=int32,fix,size,CONV-EMU-TO-CM
   0x0195=uint32,dec,type,DFFOPT-FILL-DZTYPE
   0x0196=int32,dec,preset
-  0x0198=int32,fix,pos,CONV-FLOAT-TO-PERC
-  0x0199=int32,fix,pos,CONV-FLOAT-TO-PERC
-  0x019A=int32,fix,pos,CONV-FLOAT-TO-PERC
-  0x019B=int32,fix,pos,CONV-FLOAT-TO-PERC
+  0x0198=int32,fix,pos,DFF-OPACITY
+  0x0199=int32,fix,pos,DFF-OPACITY
+  0x019A=int32,fix,pos,DFF-OPACITY
+  0x019B=int32,fix,pos,DFF-OPACITY
   0x019C=uint32,hex,type,DFFOPT-FILL-SHADETYPE
   0x019E=uint32,hex,color,DFF-COLOR
   0x01A0=uint32,hex,color-mod,DFF-COLORMOD
@@ -443,6 +451,7 @@ shortlist=DFFOPT-FILL-DZTYPE-UNIT,0,unused,emu,pixel,shape-size-rel
 shortlist=DFFOPT-FILL-DZTYPE-ASPECT,0,none,fixed,prefer-largest
 
 flagslist=DFFOPT-FILL-SHADETYPE
+  ignore=0x40000000
   0x00000001=none
   0x00000002=gamma
   0x00000004=sigma-transfer
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 542accc5d..ed6125501 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -30,14 +30,13 @@
 
 #include <algorithm>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XTextInputStream.hpp>
 #include <com/sun/star/io/XTextOutputStream.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <comphelper/docpasswordhelper.hxx>
 #include <osl/file.hxx>
 #include <rtl/math.hxx>
+#include <rtl/tencinfo.h>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
 #include "oox/helper/textinputstream.hxx"
@@ -113,20 +112,14 @@ OUString InputOutputHelper::getFileNameExtension( const OUString& rFileUrl )
 
 // input streams --------------------------------------------------------------
 
-Reference< XInputStream > InputOutputHelper::getXInputStream( BinaryInputStream& rStrm )
-{
-    if( BinaryXInputStream* pXStrm = dynamic_cast< BinaryXInputStream* >( &rStrm ) )
-        return pXStrm->getXInputStream();
-    return 0;
-}
-
 Reference< XInputStream > InputOutputHelper::openInputStream(
-        const Reference< XMultiServiceFactory >& rxFactory, const OUString& rFileName )
+        const Reference< XComponentContext >& rxContext, const OUString& rFileName )
 {
     Reference< XInputStream > xInStrm;
-    if( rxFactory.is() ) try
+    if( rxContext.is() ) try
     {
-        Reference< XSimpleFileAccess > xFileAccess( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XSimpleFileAccess > xFileAccess( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
         xInStrm = xFileAccess->openFileRead( rFileName );
     }
     catch( Exception& )
@@ -135,38 +128,16 @@ Reference< XInputStream > InputOutputHelper::openInputStream(
     return xInStrm;
 }
 
-Reference< XTextInputStream > InputOutputHelper::openTextInputStream(
-        const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm, const OUString& rEncoding )
-{
-    Reference< XTextInputStream > xTextInStrm;
-    if( rxFactory.is() && rxInStrm.is() ) try
-    {
-        Reference< XActiveDataSink > xDataSink( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextInputStream" ) ), UNO_QUERY_THROW );
-        xDataSink->setInputStream( rxInStrm );
-        xTextInStrm.set( xDataSink, UNO_QUERY_THROW );
-        xTextInStrm->setEncoding( rEncoding );
-    }
-    catch( Exception& )
-    {
-    }
-    return xTextInStrm;
-}
-
-Reference< XTextInputStream > InputOutputHelper::openTextInputStream(
-        const Reference< XMultiServiceFactory >& rxFactory, const OUString& rFileName, const OUString& rEncoding )
-{
-    return openTextInputStream( rxFactory, openInputStream( rxFactory, rFileName ), rEncoding );
-}
-
 // output streams -------------------------------------------------------------
 
 Reference< XOutputStream > InputOutputHelper::openOutputStream(
-        const Reference< XMultiServiceFactory >& rxFactory, const OUString& rFileName )
+        const Reference< XComponentContext >& rxContext, const OUString& rFileName )
 {
     Reference< XOutputStream > xOutStrm;
-    if( rxFactory.is() ) try
+    if( rxContext.is() ) try
     {
-        Reference< XSimpleFileAccess > xFileAccess( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XSimpleFileAccess > xFileAccess( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
         xOutStrm = xFileAccess->openFileWrite( rFileName );
     }
     catch( Exception& )
@@ -176,15 +147,17 @@ Reference< XOutputStream > InputOutputHelper::openOutputStream(
 }
 
 Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
-        const Reference< XMultiServiceFactory >& rxFactory, const Reference< XOutputStream >& rxOutStrm, const OUString& rEncoding )
+        const Reference< XComponentContext >& rxContext, const Reference< XOutputStream >& rxOutStrm, rtl_TextEncoding eTextEnc )
 {
     Reference< XTextOutputStream > xTextOutStrm;
-    if( rxFactory.is() && rxOutStrm.is() ) try
+    const char* pcCharset = rtl_getMimeCharsetFromTextEncoding( eTextEnc );
+    if( rxContext.is() && rxOutStrm.is() && pcCharset ) try
     {
-        Reference< XActiveDataSource > xDataSource( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextOutputStream" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XActiveDataSource > xDataSource( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextOutputStream" ) ), UNO_QUERY_THROW );
         xDataSource->setOutputStream( rxOutStrm );
         xTextOutStrm.set( xDataSource, UNO_QUERY_THROW );
-        xTextOutStrm->setEncoding( rEncoding );
+        xTextOutStrm->setEncoding( OUString::createFromAscii( pcCharset ) );
     }
     catch( Exception& )
     {
@@ -193,9 +166,9 @@ Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
 }
 
 Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream(
-        const Reference< XMultiServiceFactory >& rxFactory, const OUString& rFileName, const OUString& rEncoding )
+        const Reference< XComponentContext >& rxContext, const OUString& rFileName, rtl_TextEncoding eTextEnc )
 {
-    return openTextOutputStream( rxFactory, openOutputStream( rxFactory, rFileName ), rEncoding );
+    return openTextOutputStream( rxContext, openOutputStream( rxContext, rFileName ), eTextEnc );
 }
 
 // ============================================================================
@@ -1532,9 +1505,9 @@ NameListRef NameListWrapper::getNameList( const Config& rCfg ) const
 // ============================================================================
 
 SharedConfigData::SharedConfigData( const OUString& rFileName,
-        const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg,
+        const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg,
         const OUString& rSysFileName, MediaDescriptor& rMediaDesc ) :
-    mxFactory( rxFactory ),
+    mxContext( rxContext ),
     mxRootStrg( rxRootStrg ),
     maSysFileName( rSysFileName ),
     mrMediaDesc( rMediaDesc ),
@@ -1601,7 +1574,7 @@ Sequence< NamedValue > SharedConfigData::requestEncryptionData( ::comphelper::ID
 
 bool SharedConfigData::implIsValid() const
 {
-    return mbLoaded && mxFactory.is() && mxRootStrg.get() && (maSysFileName.getLength() > 0);
+    return mbLoaded && mxContext.is() && mxRootStrg.get() && (maSysFileName.getLength() > 0);
 }
 
 void SharedConfigData::implProcessConfigItemStr(
@@ -1630,9 +1603,8 @@ bool SharedConfigData::readConfigFile( const OUString& rFileUrl )
     bool bLoaded = maConfigFiles.count( rFileUrl ) > 0;
     if( !bLoaded )
     {
-        Reference< XInputStream > xInStrm = InputOutputHelper::openInputStream( mxFactory, rFileUrl );
-        BinaryXInputStream aInStrm( xInStrm, true );
-        TextInputStream aTxtStrm( aInStrm, RTL_TEXTENCODING_UTF8 );
+        Reference< XInputStream > xInStrm = InputOutputHelper::openInputStream( mxContext, rFileUrl );
+        TextInputStream aTxtStrm( mxContext, xInStrm, RTL_TEXTENCODING_UTF8 );
         if( !aTxtStrm.isEof() )
         {
             maConfigFiles.insert( rFileUrl );
@@ -1699,9 +1671,9 @@ Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter )
     construct( pcEnvVar, rFilter );
 }
 
-Config::Config( const sal_Char* pcEnvVar, const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
+Config::Config( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
 {
-    construct( pcEnvVar, rxFactory, rxRootStrg, rSysFileName, rMediaDesc );
+    construct( pcEnvVar, rxContext, rxRootStrg, rSysFileName, rMediaDesc );
 }
 
 Config::~Config()
@@ -1716,14 +1688,14 @@ void Config::construct( const Config& rParent )
 void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter )
 {
     if( rFilter.getFileUrl().getLength() > 0 )
-        construct( pcEnvVar, rFilter.getServiceFactory(), rFilter.getStorage(), rFilter.getFileUrl(), rFilter.getMediaDescriptor() );
+        construct( pcEnvVar, rFilter.getComponentContext(), rFilter.getStorage(), rFilter.getFileUrl(), rFilter.getMediaDescriptor() );
 }
 
-void Config::construct( const sal_Char* pcEnvVar, const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
+void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
 {
     if( pcEnvVar && rxRootStrg.get() && (rSysFileName.getLength() > 0) )
         if( const sal_Char* pcFileName = ::getenv( pcEnvVar ) )
-            mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxFactory, rxRootStrg, rSysFileName, rMediaDesc ) );
+            mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName, rMediaDesc ) );
 }
 
 void Config::setStringOption( const String& rKey, const String& rData )
@@ -1796,14 +1768,16 @@ NameListRef Config::implGetNameList( const OUString& rListName ) const
 // ============================================================================
 // ============================================================================
 
-Output::Output( const Reference< XTextOutputStream >& rxStrm )
-{
-    construct( rxStrm );
-}
-
-Output::Output( const Reference< XMultiServiceFactory >& rxFactory, const OUString& rFileName )
+Output::Output( const Reference< XComponentContext >& rxContext, const OUString& rFileName ) :
+    mxStrm( InputOutputHelper::openTextOutputStream( rxContext, rFileName, RTL_TEXTENCODING_UTF8 ) ),
+    mnCol( 0 ),
+    mnItemLevel( 0 ),
+    mnMultiLevel( 0 ),
+    mnItemIdx( 0 ),
+    mnLastItem( 0 )
 {
-    construct( InputOutputHelper::openTextOutputStream( rxFactory, rFileName, CREATE_OUSTRING( "UTF-8" ) ) );
+    if( mxStrm.is() )
+        mxStrm->writeString( OUString( OOX_DUMP_BOM ) );
 }
 
 // ----------------------------------------------------------------------------
@@ -2085,19 +2059,6 @@ void Output::writeRangeList( const RangeList& rRanges )
 
 // ----------------------------------------------------------------------------
 
-void Output::construct( const Reference< XTextOutputStream >& rxStrm )
-{
-    mxStrm = rxStrm;
-    mnCol = mnItemLevel = mnMultiLevel = 0;
-    mnItemIdx = 0;
-    mnLastItem = 0;
-    if( mxStrm.is() )
-    {
-        writeChar( OOX_DUMP_BOM );
-        newLine();
-    }
-}
-
 bool Output::implIsValid() const
 {
     return mxStrm.is();
@@ -2241,7 +2202,8 @@ void StorageObjectBase::implDump()
     if( bIsRoot ) try
     {
         aSysOutPath += OOX_DUMP_DUMPEXT;
-        Reference< XSimpleFileAccess > xFileAccess( getFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( getContext()->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XSimpleFileAccess > xFileAccess( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
         xFileAccess->kill( aSysOutPath );
     }
     catch( Exception& )
@@ -2260,7 +2222,7 @@ void StorageObjectBase::implDump()
     }
 }
 
-void StorageObjectBase::implDumpStream( const BinaryInputStreamRef&, const OUString&, const OUString&, const OUString& )
+void StorageObjectBase::implDumpStream( const Reference< XInputStream >&, const OUString&, const OUString&, const OUString& )
 {
 }
 
@@ -2306,12 +2268,12 @@ void StorageObjectBase::extractStream( StorageBase& rStrg, const OUString& rStrg
     BinaryXInputStream aInStrm( rStrg.openInputStream( rStrmName ), true );
     if( !aInStrm.isEof() )
     {
-        BinaryXOutputStream aOutStrm( InputOutputHelper::openOutputStream( getFactory(), rSysFileName ), true );
+        BinaryXOutputStream aOutStrm( InputOutputHelper::openOutputStream( getContext(), rSysFileName ), true );
         if( !aOutStrm.isEof() )
             aInStrm.copyToStream( aOutStrm );
     }
-    BinaryXInputStreamRef xDumpStrm( new BinaryXInputStream( InputOutputHelper::openInputStream( getFactory(), rSysFileName ), true ) );
-    if( !xDumpStrm->isEof() )
+    Reference< XInputStream > xDumpStrm = InputOutputHelper::openInputStream( getContext(), rSysFileName );
+    if( xDumpStrm.is() )
         implDumpStream( xDumpStrm, rStrgPath, rStrmName, rSysFileName );
 }
 
@@ -2367,13 +2329,10 @@ void OutputObjectBase::construct( const ObjectBase& rParent, const OUString& rSy
 {
     ObjectBase::construct( rParent );
     if( ObjectBase::implIsValid() )
-        mxOut.reset( new Output( getFactory(), rSysFileName + OOX_DUMP_DUMPEXT ) );
-}
-
-void OutputObjectBase::construct( const ObjectBase& rParent, const OutputRef& rxOut )
-{
-    ObjectBase::construct( rParent );
-    mxOut = rxOut;
+    {
+        maSysFileName = rSysFileName;
+        mxOut.reset( new Output( getContext(), rSysFileName + OOX_DUMP_DUMPEXT ) );
+    }
 }
 
 void OutputObjectBase::construct( const OutputObjectBase& rParent )
@@ -2552,12 +2511,6 @@ void InputObjectBase::construct( const ObjectBase& rParent, const BinaryInputStr
     mxStrm = rxStrm;
 }
 
-void InputObjectBase::construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OutputRef& rxOut )
-{
-    OutputObjectBase::construct( rParent, rxOut );
-    mxStrm = rxStrm;
-}
-
 void InputObjectBase::construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm )
 {
     OutputObjectBase::construct( rParent );
@@ -2576,7 +2529,7 @@ bool InputObjectBase::implIsValid() const
 
 void InputObjectBase::skipBlock( sal_Int64 nBytes, bool bShowSize )
 {
-    sal_Int64 nEndPos = ::std::min< sal_Int64 >( mxStrm->tell() + nBytes, mxStrm->getLength() );
+    sal_Int64 nEndPos = ::std::min< sal_Int64 >( mxStrm->tell() + nBytes, mxStrm->size() );
     if( mxStrm->tell() < nEndPos )
     {
         if( bShowSize )
@@ -2596,8 +2549,8 @@ void InputObjectBase::dumpRawBinary( sal_Int64 nBytes, bool bShowOffset, bool bS
     sal_Int64 nMaxShowSize = cfg().getIntOption< sal_Int64 >(
         bStream ? "max-binary-stream-size" : "max-binary-data-size", SAL_MAX_INT64 );
 
-    bool bSeekable = mxStrm->getLength() >= 0;
-    sal_Int64 nEndPos = bSeekable ? ::std::min< sal_Int64 >( mxStrm->tell() + nBytes, mxStrm->getLength() ) : 0;
+    bool bSeekable = mxStrm->size() >= 0;
+    sal_Int64 nEndPos = bSeekable ? ::std::min< sal_Int64 >( mxStrm->tell() + nBytes, mxStrm->size() ) : 0;
     sal_Int64 nDumpEnd = bSeekable ? ::std::min< sal_Int64 >( mxStrm->tell() + nMaxShowSize, nEndPos ) : nMaxShowSize;
     sal_Int64 nPos = bSeekable ? mxStrm->tell() : 0;
     bool bLoop = true;
@@ -2672,12 +2625,12 @@ void InputObjectBase::dumpRemainingTo( sal_Int64 nPos )
 
 void InputObjectBase::dumpRemainingStream()
 {
-    dumpRemainingTo( mxStrm->getLength() );
+    dumpRemainingTo( mxStrm->size() );
 }
 
 void InputObjectBase::dumpArray( const String& rName, sal_Int32 nBytes, sal_Unicode cSep )
 {
-    sal_Int32 nDumpSize = getLimitedValue< sal_Int32, sal_Int64 >( mxStrm->getLength() - mxStrm->tell(), 0, nBytes );
+    sal_Int32 nDumpSize = getLimitedValue< sal_Int32, sal_Int64 >( mxStrm->size() - mxStrm->tell(), 0, nBytes );
     if( nDumpSize > OOX_DUMP_MAXARRAY )
     {
         dumpBinary( rName, nBytes, false );
@@ -2713,7 +2666,7 @@ sal_Unicode InputObjectBase::dumpUnicode( const String& rName )
 
 OUString InputObjectBase::dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul )
 {
-    sal_Int32 nDumpSize = getLimitedValue< sal_Int32, sal_Int64 >( mxStrm->getLength() - mxStrm->tell(), 0, nLen );
+    sal_Int32 nDumpSize = getLimitedValue< sal_Int32, sal_Int64 >( mxStrm->size() - mxStrm->tell(), 0, nLen );
     OUString aString;
     if( nDumpSize > 0 )
     {
@@ -2893,7 +2846,7 @@ BinaryStreamObject::BinaryStreamObject( const OutputObjectBase& rParent, const B
 void BinaryStreamObject::dumpBinaryStream( bool bShowOffset )
 {
     mxStrm->seekToStart();
-    dumpRawBinary( mxStrm->getLength(), bShowOffset, true );
+    dumpRawBinary( mxStrm->size(), bShowOffset, true );
     mxOut->emptyLine();
 }
 
@@ -2903,42 +2856,70 @@ void BinaryStreamObject::implDump()
 }
 
 // ============================================================================
+// ============================================================================
 
-TextStreamObject::TextStreamObject( const ObjectBase& rParent,
+void TextStreamObjectBase::construct( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc, const OUString& rSysFileName )
 {
     InputObjectBase::construct( rParent, rxStrm, rSysFileName );
-    if( rxStrm.get() )
-        mxTextStrm.reset( new TextInputStream( *rxStrm, eTextEnc ) );
+    constructTextStrmObj( eTextEnc );
 }
 
-TextStreamObject::TextStreamObject( const OutputObjectBase& rParent,
+void TextStreamObjectBase::construct( const OutputObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc )
 {
     InputObjectBase::construct( rParent, rxStrm );
-    if( rxStrm.get() )
-        mxTextStrm.reset( new TextInputStream( *rxStrm, eTextEnc ) );
+    constructTextStrmObj( eTextEnc );
+}
+
+void TextStreamObjectBase::construct( const InputObjectBase& rParent, rtl_TextEncoding eTextEnc )
+{
+    InputObjectBase::construct( rParent );
+    constructTextStrmObj( eTextEnc );
 }
 
-bool TextStreamObject::implIsValid() const
+bool TextStreamObjectBase::implIsValid() const
 {
     return InputObjectBase::implIsValid() && mxTextStrm.get();
 }
 
-void TextStreamObject::implDump()
+void TextStreamObjectBase::implDump()
+{
+    implDumpText( *mxTextStrm );
+}
+
+void TextStreamObjectBase::constructTextStrmObj( rtl_TextEncoding eTextEnc )
+{
+    if( mxStrm.get() )
+        mxTextStrm.reset( new TextInputStream( getContext(), *mxStrm, eTextEnc ) );
+}
+
+// ============================================================================
+
+TextLineStreamObject::TextLineStreamObject( const ObjectBase& rParent,
+        const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc, const OUString& rSysFileName )
+{
+    TextStreamObjectBase::construct( rParent, rxStrm, eTextEnc, rSysFileName );
+}
+
+TextLineStreamObject::TextLineStreamObject( const OutputObjectBase& rParent,
+        const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc )
+{
+    TextStreamObjectBase::construct( rParent, rxStrm, eTextEnc );
+}
+
+void TextLineStreamObject::implDumpText( TextInputStream& rTextStrm )
 {
-    OUString aLine;
     sal_uInt32 nLine = 0;
-    while( !mxTextStrm->isEof() )
+    while( !rTextStrm.isEof() )
     {
-        aLine = mxTextStrm->readLine();
-        if( !mxTextStrm->isEof() )
+        OUString aLine = rTextStrm.readLine();
+        if( !rTextStrm.isEof() || (aLine.getLength() > 0) )
             implDumpLine( aLine, ++nLine );
     }
-    mxOut->emptyLine();
 }
 
-void TextStreamObject::implDumpLine( const OUString& rLine, sal_uInt32 nLine )
+void TextLineStreamObject::implDumpLine( const OUString& rLine, sal_uInt32 nLine )
 {
     TableGuard aTabGuard( mxOut, 8 );
     mxOut->writeDec( nLine, 6 );
@@ -2949,110 +2930,93 @@ void TextStreamObject::implDumpLine( const OUString& rLine, sal_uInt32 nLine )
 
 // ============================================================================
 
-XmlStreamObject::XmlStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ) :
-    TextStreamObject( rParent, rxStrm, RTL_TEXTENCODING_UTF8, rSysFileName )
+XmlStreamObject::XmlStreamObject( const ObjectBase& rParent,
+        const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName )
 {
+    TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8, rSysFileName );
 }
 
-void XmlStreamObject::implDump()
+XmlStreamObject::XmlStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm )
 {
-    maIncompleteLine = OUString();
-    TextStreamObject::implDump();
-    if( maIncompleteLine.getLength() > 0 )
-    {
-        mxOut->resetIndent();
-        mxOut->writeString( maIncompleteLine );
-        mxOut->emptyLine();
-        writeInfoItem( "stream-state", OOX_DUMP_ERR_STREAM );
-    }
+    TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8 );
 }
 
-void XmlStreamObject::implDumpLine( const OUString& rLine, sal_uInt32 )
+void XmlStreamObject::implDumpText( TextInputStream& rTextStrm )
 {
-    // build input line from cached incomplete element and new text data
-    OUStringBuffer aLine;
-    if( maIncompleteLine.getLength() > 0 )
-        aLine.append( maIncompleteLine ).append( sal_Unicode( ' ' ) );
-    aLine.append( rLine );
-    maIncompleteLine = OUString();
+    /*  Buffers a start element and the following element text. Needed to dump
+        matching start/end elements and the element text on the same line. */
+    OUStringBuffer aOldStartElem;
+    // special handling for VML
+    bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName ).equalsIgnoreAsciiCaseAscii( "vml" );
 
-    if( aLine.getLength() == 0 )
+    while( !rTextStrm.isEof() )
     {
-        mxOut->newLine();
-        return;
-    }
+        // get the next element and the following element text from text stream
+        OUString aElem = rTextStrm.readToChar( '>', true ).trim();
+        OUString aText = rTextStrm.readToChar( '<', false );
 
-    const sal_Unicode* pcPos = aLine.getStr();
-    const sal_Unicode* pcEnd = pcPos + aLine.getLength();
-    while( pcPos < pcEnd )
-    {
-        OUStringBuffer aOutLine;
-        bool bIsStartElement = false;
-        bool bIsComplElement = false;
-        bool bIsEndElement = false;
-
-        /*  check for start element at beginning of the line - pcEnd and thus (pcPos+1)
-            are dereferenceable, because OUStringBuffer::getStr is null-terminated. */
-        if( (*pcPos == '<') && (pcPos[ 1 ] != '/') )
+        // remove multiple whitespace from element
+        sal_Int32 nPos = 0;
+        while( nPos < aElem.getLength() )
         {
-            const sal_Unicode* pcElementEnd = ::std::find( pcPos, pcEnd, '>' );
-            if( pcElementEnd == pcEnd )
-            {
-                // incomplete start element
-                maIncompleteLine = OUString( pcPos, static_cast< sal_Int32 >( pcEnd - pcPos ) );
-                pcPos = pcEnd;
-            }
-            else
-            {
-                bIsComplElement = (pcPos[ 1 ] == '?') || (pcPos[ 1 ] == '!') || (pcElementEnd[ -1 ] == '/');
-                bIsStartElement = !bIsComplElement;
-                ++pcElementEnd;
-                aOutLine.append( pcPos, static_cast< sal_Int32 >( pcElementEnd - pcPos ) );
-                pcPos = pcElementEnd;
-            }
+            while( (nPos < aElem.getLength()) && (aElem[ nPos ] >= 32) ) ++nPos;
+            if( nPos < aElem.getLength() )
+                aElem = OUStringBuffer( aElem.copy( 0, nPos ) ).append( sal_Unicode( ' ' ) ).append( aElem.copy( nPos ).trim() ).makeStringAndClear();
+            ++nPos;
         }
 
-        // check for following element text
-        if( !bIsComplElement && (pcPos < pcEnd) )
+        sal_Int32 nElemLen = aElem.getLength();
+        if( (nElemLen >= 2) && (aElem[ 0 ] == '<') && (aElem[ nElemLen - 1 ] == '>') )
         {
-            const sal_Unicode* pcElementStart = ::std::find( pcPos, pcEnd, '<' );
-            // append text between elements
-            if( pcPos < pcElementStart )
+            // determine type of the element
+            bool bSimpleElem = (aElem[ 1 ] == '!') || (aElem[ 1 ] == '?') || (aElem[ nElemLen - 2 ] == '/') ||
+                (bIsVml && (nElemLen == 4) && (aElem[ 1 ] == 'b') && (aElem[ 2 ] == 'r'));
+            bool bStartElem = !bSimpleElem && (aElem[ 1 ] != '/');
+            bool bEndElem = !bSimpleElem && !bStartElem;
+
+            /*  Start element or simple element: flush old start element and
+                its text from previous iteration, and start a new indentation
+                level for the new element. Trim whitespace and line breaks from
+                the text of the old start element. */
+            if( (bSimpleElem || bStartElem) && (aOldStartElem.getLength() > 0) )
             {
-                OUString aText( pcPos, static_cast< sal_Int32 >( pcElementStart - pcPos ) );
-                if( aText.trim().getLength() > 0 )
-                    aOutLine.append( aText );
-                pcPos = pcElementStart;
+                mxOut->writeString( aOldStartElem.makeStringAndClear().trim() );
+                mxOut->newLine();
+                mxOut->incIndent();
             }
-        }
 
-        // check for stand-alone or following end element
-        if( !bIsComplElement && (pcPos < pcEnd) && (pcPos[ 1 ] == '/') )
-        {
-            const sal_Unicode* pcElementEnd = ::std::find( pcPos, pcEnd, '>' );
-            if( pcElementEnd == pcEnd )
+            /*  Start element: remember it and its text, to be able to print the
+                matching end element on the same line in the next iteration. */
+            if( bStartElem )
             {
-                // incomplete end element
-                aOutLine.append( pcPos, static_cast< sal_Int32 >( pcEnd - pcPos ) );
-                maIncompleteLine = aOutLine.makeStringAndClear();
-                pcPos = pcEnd;
+                aOldStartElem.append( aElem ).append( aText );
             }
             else
             {
-                bIsEndElement = true;
-                ++pcElementEnd;
-                aOutLine.append( pcPos, static_cast< sal_Int32 >( pcElementEnd - pcPos ) );
-                pcPos = pcElementEnd;
-            }
-        }
+                /*  End element: if a start element has been remembered in the
+                    previous iteration, write it out here untrimmed, to show
+                    all whitespace in the element text, and without trailing
+                    line break. Code below will add the end element right after
+                    it. Otherwise, return to previous indentation level. */
+                if( bEndElem )
+                {
+                    if( aOldStartElem.getLength() == 0 )
+                        mxOut->decIndent();
+                    else
+                        mxOut->writeString( aOldStartElem.makeStringAndClear() );
+                }
 
-        // flush output line
-        if( maIncompleteLine.getLength() == 0 )
-        {
-            if( !bIsStartElement && bIsEndElement ) mxOut->decIndent();
-            mxOut->writeString( aOutLine.makeStringAndClear() );
-            mxOut->newLine();
-            if( bIsStartElement && !bIsEndElement ) mxOut->incIndent();
+                /*  Write the element. Write following element text in a new
+                    line, but only, if it does not contain of white space
+                    entirely. */
+                mxOut->writeString( aElem );
+                mxOut->newLine();
+                if( aText.trim().getLength() > 0 )
+                {
+                    mxOut->writeString( aText );
+                    mxOut->newLine();
+                }
+            }
         }
     }
 }
@@ -3168,7 +3132,7 @@ bool SequenceRecordObjectBase::implStartRecord( BinaryInputStream& rBaseStrm, sa
     {
         ornRecPos = rBaseStrm.tell();
         // do not try to overread seekable streams, may cause assertions
-        bValid = ornRecPos < rBaseStrm.getLength();
+        bValid = ornRecPos < rBaseStrm.size();
     }
 
     // read the record header
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 3ceee3ace..fb87adeed 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -470,9 +470,9 @@ void OlePropertyStreamObject::dumpCodePageProperty( sal_uInt32 nStartPos )
         if( nType == OLEPROP_TYPE_INT16 )
         {
             sal_uInt16 nCodePage = dumpDec< sal_uInt16 >( "codepage", "CODEPAGES" );
-            rtl_TextEncoding nNewTextEnc = rtl_getTextEncodingFromWindowsCodePage( nCodePage );
-            if( nNewTextEnc != RTL_TEXTENCODING_DONTKNOW )
-                meTextEnc = nNewTextEnc;
+            rtl_TextEncoding eNewTextEnc = rtl_getTextEncodingFromWindowsCodePage( nCodePage );
+            if( eNewTextEnc != RTL_TEXTENCODING_DONTKNOW )
+                meTextEnc = eNewTextEnc;
             mbIsUnicode = nCodePage == CODEPAGE_UNICODE;
         }
         else
@@ -587,15 +587,8 @@ OUString OlePropertyStreamObject::dumpString8( const String& rName )
 
 OUString OlePropertyStreamObject::dumpCharArray8( const String& rName, sal_Int32 nLen )
 {
-    OUString aData;
-    size_t nNewLen = getLimitedValue< size_t, sal_Int32 >( nLen, 0, 1024 );
-    if( nNewLen > 0 )
-    {
-        ::std::vector< sal_Char > aBuffer( nNewLen + 1 );
-        mxStrm->readMemory( &aBuffer.front(), nNewLen );
-        aBuffer[ nNewLen ] = 0;
-        aData = OStringToOUString( OString( &aBuffer.front() ), meTextEnc );
-    }
+    sal_Int32 nNewLen = getLimitedValue< sal_Int32, sal_Int32 >( nLen, 0, 1024 );
+    OUString aData = mxStrm->readCharArrayUC( nNewLen, meTextEnc );
     writeStringItem( rName, aData );
     return aData;
 }
@@ -608,13 +601,8 @@ OUString OlePropertyStreamObject::dumpString16( const String& rName )
 
 OUString OlePropertyStreamObject::dumpCharArray16( const String& rName, sal_Int32 nLen )
 {
-    size_t nNewLen = getLimitedValue< size_t, sal_Int32 >( nLen, 0, 1024 );
-    ::std::vector< sal_Unicode > aBuffer;
-    aBuffer.reserve( nNewLen + 1 );
-    for( size_t nIdx = 0; nIdx < nNewLen; ++nIdx )
-        aBuffer.push_back( static_cast< sal_Unicode >( mxStrm->readuInt16() ) );
-    aBuffer.push_back( 0 );
-    OUString aData( &aBuffer.front() );
+    sal_Int32 nNewLen = getLimitedValue< sal_Int32, sal_Int32 >( nLen, 0, 1024 );
+    OUString aData = mxStrm->readUnicodeArray( nNewLen );
     writeStringItem( rName, aData );
     if( nNewLen & 1 ) dumpUnused( 2 ); // always padding to 32bit
     return aData;
@@ -688,7 +676,7 @@ void OleStorageObject::construct( const ObjectBase& rParent )
     StorageObjectBase::construct( rParent );
 }
 
-void OleStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& /*rStrgPath*/, const OUString& rStrmName, const OUString& rSysFileName )
+void OleStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& /*rStrgPath*/, const OUString& rStrmName, const OUString& rSysFileName )
 {
     if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\001CompObj" ) ) )
         OleCompObjObject( *this, rxStrm, rSysFileName ).dump();
@@ -1927,7 +1915,7 @@ void VbaFStreamObject::dumpSiteData()
         sal_uInt32 nSiteCount = dumpDec< sal_uInt32 >( "site-count" );
         sal_uInt32 nSiteLength = dumpDec< sal_uInt32 >( "site-data-size" );
         sal_Int64 nEndPos = mxStrm->tell() + nSiteLength;
-        if( ensureValid( nEndPos <= mxStrm->getLength() ) )
+        if( ensureValid( nEndPos <= mxStrm->size() ) )
         {
             mxOut->resetItemIndex();
             sal_uInt32 nSiteIdx = 0;
@@ -1985,7 +1973,7 @@ void VbaOStreamObject::implDump()
             writeDecItem( "control-id", aIt->mnId );
             writeInfoItem( "prog-id", aIt->maProgId );
             IndentGuard aIndGuard( mxOut );
-            RelativeInputStreamRef xRelStrm( new RelativeInputStream( *mxStrm, aIt->mnLength ) );
+            BinaryInputStreamRef xRelStrm( new RelativeInputStream( *mxStrm, aIt->mnLength ) );
             FormControlStreamObject( *this, xRelStrm, &aIt->maProgId ).dump();
         }
     }
@@ -2069,7 +2057,7 @@ VbaContainerStorageObject::VbaContainerStorageObject( const ObjectBase& rParent,
     addPreferredStream( "f" );
 }
 
-void VbaContainerStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void VbaContainerStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "f" ) ) )
         VbaFStreamObject( *this, rxStrm, rSysFileName, maFormData ).dump();
@@ -2281,7 +2269,7 @@ void VbaModuleStreamObject::implDump()
     writeEmptyItem( "source-code" );
     IndentGuard aIndGuard( mxOut );
     BinaryInputStreamRef xVbaStrm( new ::oox::ole::VbaInputStream( *mxStrm ) );
-    TextStreamObject( *this, xVbaStrm, mrVbaData.meTextEnc ).dump();
+    TextLineStreamObject( *this, xVbaStrm, mrVbaData.meTextEnc ).dump();
 }
 
 // ============================================================================
@@ -2293,7 +2281,7 @@ VbaStorageObject::VbaStorageObject( const ObjectBase& rParent, const StorageRef&
     addPreferredStream( "dir" );
 }
 
-void VbaStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void VbaStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     if( (rStrgPath.getLength() == 0) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "dir" ) ) )
         VbaDirStreamObject( *this, rxStrm, rSysFileName, mrVbaData ).dump();
@@ -2311,10 +2299,10 @@ VbaFormStorageObject::VbaFormStorageObject( const ObjectBase& rParent, const Sto
 {
 }
 
-void VbaFormStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void VbaFormStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\003VBFrame" ) ) )
-        TextStreamObject( *this, rxStrm, mrVbaData.meTextEnc, rSysFileName ).dump();
+        TextLineStreamObject( *this, rxStrm, mrVbaData.meTextEnc, rSysFileName ).dump();
     else
         VbaContainerStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
 }
@@ -2327,10 +2315,10 @@ VbaProjectStorageObject::VbaProjectStorageObject( const ObjectBase& rParent, con
     addPreferredStorage( "VBA" );
 }
 
-void VbaProjectStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void VbaProjectStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     if( (rStrgPath.getLength() == 0) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PROJECT" ) ) )
-        TextStreamObject( *this, rxStrm, maVbaData.meTextEnc, rSysFileName ).dump();
+        TextLineStreamObject( *this, rxStrm, maVbaData.meTextEnc, rSysFileName ).dump();
     else
         OleStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
 }
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index 647657580..1c2d73c87 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -57,14 +57,13 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent )
     StorageObjectBase::construct( rParent );
 }
 
-void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     OUString aExt = InputOutputHelper::getFileNameExtension( rStrmName );
-    Reference< XInputStream > xInStrm = InputOutputHelper::getXInputStream( *rxStrm );
     if( aExt.equalsIgnoreAsciiCaseAscii( "pptx" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "potx" ) )
     {
-        Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xlsb" ) ||
@@ -73,7 +72,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         aExt.equalsIgnoreAsciiCaseAscii( "xltm" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xltx" ) )
     {
-        ::oox::dump::xlsb::Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        ::oox::dump::xlsb::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xla" ) ||
@@ -83,7 +82,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         aExt.equalsIgnoreAsciiCaseAscii( "xlt" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xlw" ) )
     {
-        ::oox::dump::biff::Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xml" ) ||
@@ -96,17 +95,17 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
     {
         if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt" ) ) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "vbaProject.bin" ) ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, false ) );
             VbaProjectStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt/embeddings" ) ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, false ) );
             OleStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt/activeX" ) ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, true ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, true ) );
             ActiveXStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else
@@ -126,13 +125,13 @@ Dumper::Dumper( const FilterBase& rFilter )
     DumperBase::construct( xCfg );
 }
 
-Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
+Dumper::Dumper( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
 {
-    if( rxFactory.is() && rxInStrm.is() )
+    if( rxContext.is() && rxInStrm.is() )
     {
-        StorageRef xStrg( new ZipStorage( rxFactory, rxInStrm ) );
+        StorageRef xStrg( new ZipStorage( rxContext, rxInStrm ) );
         MediaDescriptor aMediaDesc;
-        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
+        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/dump/xlsbdumper.cxx b/oox/source/dump/xlsbdumper.cxx
index 74eadd1a0..94bb53ce3 100644
--- a/oox/source/dump/xlsbdumper.cxx
+++ b/oox/source/dump/xlsbdumper.cxx
@@ -369,7 +369,7 @@ void FormulaObject::implDump()
     if( mnSize < 0 ) return;
 
     sal_Int64 nStartPos = mxStrm->tell();
-    sal_Int64 nEndPos = ::std::min< sal_Int64 >( nStartPos + mnSize, mxStrm->getLength() );
+    sal_Int64 nEndPos = ::std::min< sal_Int64 >( nStartPos + mnSize, mxStrm->size() );
 
     bool bValid = mxTokens.get();
     mxStack.reset( new FormulaStack );
@@ -890,8 +890,8 @@ bool FormulaObject::dumpAttrToken()
 void FormulaObject::dumpAddTokenData()
 {
     mxOut->resetItemIndex();
-    sal_Int32 nAddDataSize = (mxStrm->getLength() - mxStrm->tell() >= 4) ? dumpDec< sal_Int32 >( "add-data-size" ) : 0;
-    sal_Int64 nEndPos = ::std::min< sal_Int64 >( mxStrm->tell() + nAddDataSize, mxStrm->getLength() );
+    sal_Int32 nAddDataSize = (mxStrm->size() - mxStrm->tell() >= 4) ? dumpDec< sal_Int32 >( "add-data-size" ) : 0;
+    sal_Int64 nEndPos = ::std::min< sal_Int64 >( mxStrm->tell() + nAddDataSize, mxStrm->size() );
     for( AddDataTypeVec::const_iterator aIt = maAddData.begin(), aEnd = maAddData.end(); (aIt != aEnd) && !mxStrm->isEof() && (mxStrm->tell() < nEndPos); ++aIt )
     {
         AddDataType eType = *aIt;
@@ -2232,10 +2232,9 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent )
     StorageObjectBase::construct( rParent );
 }
 
-void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     OUString aExt = InputOutputHelper::getFileNameExtension( rStrmName );
-    Reference< XInputStream > xInStrm = InputOutputHelper::getXInputStream( *rxStrm );
     if(
         aExt.equalsIgnoreAsciiCaseAscii( "xlsb" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xlsm" ) ||
@@ -2243,7 +2242,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         aExt.equalsIgnoreAsciiCaseAscii( "xltm" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xltx" ) )
     {
-        Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xla" ) ||
@@ -2253,13 +2252,13 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         aExt.equalsIgnoreAsciiCaseAscii( "xlt" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xlw" ) )
     {
-        ::oox::dump::biff::Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "pptx" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "potx" ) )
     {
-        ::oox::dump::pptx::Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        ::oox::dump::pptx::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xml" ) ||
@@ -2272,12 +2271,12 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
     {
         if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl" ) ) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "vbaProject.bin" ) ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, false ) );
             VbaProjectStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/embeddings" ) ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, false ) );
             OleStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if(
@@ -2296,7 +2295,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         }
         else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/activeX" ) ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, true ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, true ) );
             ActiveXStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else
@@ -2316,13 +2315,13 @@ Dumper::Dumper( const FilterBase& rFilter )
     DumperBase::construct( xCfg );
 }
 
-Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
+Dumper::Dumper( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
 {
-    if( rxFactory.is() && rxInStrm.is() )
+    if( rxContext.is() && rxInStrm.is() )
     {
-        StorageRef xStrg( new ZipStorage( rxFactory, rxInStrm ) );
+        StorageRef xStrg( new ZipStorage( getContext(), rxInStrm ) );
         MediaDescriptor aMediaDesc;
-        ConfigRef xCfg( new Config( DUMP_XLSB_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
+        ConfigRef xCfg( new Config( DUMP_XLSB_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/dump/xlsbdumper.ini b/oox/source/dump/xlsbdumper.ini
index 3490111c4..16b97172d 100644
--- a/oox/source/dump/xlsbdumper.ini
+++ b/oox/source/dump/xlsbdumper.ini
@@ -278,6 +278,7 @@ end
 # ARRAY ----------------------------------------------------------------------
 
 flagslist=ARRAY-FLAGS
+  ignore=0xFE
   0x01=recalc-always
 end
 
diff --git a/oox/workben/ooxml-export-notes.txt b/oox/source/export/ooxml-export-notes.txt
index 8da4582b7..8da4582b7 100644
--- a/oox/workben/ooxml-export-notes.txt
+++ b/oox/source/export/ooxml-export-notes.txt
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index f5f0bd620..d6e570a8b 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -28,6 +28,8 @@
 
 #include "oox/helper/binaryinputstream.hxx"
 
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
 #include <string.h>
 #include <vector>
 #include <rtl/strbuf.hxx>
@@ -81,11 +83,16 @@ OString BinaryInputStream::readCharArray( sal_Int32 nChars, bool bAllowNulChars
     if( nChars <= 0 )
         return OString();
 
-    ::std::vector< sal_Char > aBuffer( static_cast< size_t >( nChars ) );
-    size_t nCharsRead = static_cast< size_t >( readMemory( &aBuffer.front(), nChars ) );
+    ::std::vector< sal_uInt8 > aBuffer;
+    sal_Int32 nCharsRead = readArray( aBuffer, nChars );
+    if( nCharsRead <= 0 )
+        return OString();
+
+    aBuffer.resize( static_cast< size_t >( nCharsRead ) );
     if( !bAllowNulChars )
-        ::std::replace( aBuffer.begin(), aBuffer.begin() + nCharsRead, '\0', '?' );
-    return OString( &aBuffer.front(), nCharsRead );
+        ::std::replace( aBuffer.begin(), aBuffer.end(), '\0', '?' );
+
+    return OString( reinterpret_cast< sal_Char* >( &aBuffer.front() ), nCharsRead );
 }
 
 OUString BinaryInputStream::readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc, bool bAllowNulChars )
@@ -95,30 +102,44 @@ OUString BinaryInputStream::readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding
 
 OUString BinaryInputStream::readUnicodeArray( sal_Int32 nChars, bool bAllowNulChars )
 {
-    OUStringBuffer aBuffer;
-    if( nChars > 0 )
-    {
-        aBuffer.ensureCapacity( nChars );
-        sal_uInt16 nChar;
-        for( sal_uInt16 nCharIdx = 0; !mbEof && (nCharIdx < nChars); ++nCharIdx )
-        {
-            readValue( nChar );
-            aBuffer.append( static_cast< sal_Unicode >( (!bAllowNulChars && (nChar == 0)) ? '?' : nChar ) );
-        }
-    }
-    return aBuffer.makeStringAndClear();
+    if( nChars <= 0 )
+        return OUString();
+
+    ::std::vector< sal_uInt16 > aBuffer;
+    sal_Int32 nCharsRead = readArray( aBuffer, nChars );
+    if( nCharsRead <= 0 )
+        return OUString();
+        
+    aBuffer.resize( static_cast< size_t >( nCharsRead ) );
+    if( !bAllowNulChars )
+        ::std::replace( aBuffer.begin(), aBuffer.begin() + nCharsRead, '\0', '?' );
+
+    OUStringBuffer aStringBuffer;
+    aStringBuffer.ensureCapacity( nCharsRead );
+    for( ::std::vector< sal_uInt16 >::iterator aIt = aBuffer.begin(), aEnd = aBuffer.end(); aIt != aEnd; ++aIt )
+        aStringBuffer.append( static_cast< sal_Unicode >( *aIt ) );
+    return aStringBuffer.makeStringAndClear();
+}
+
+OUString BinaryInputStream::readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars )
+{
+    return bCompressed ?
+         // ISO-8859-1 maps all byte values 0xHH to the same Unicode code point U+00HH
+        readCharArrayUC( nChars, RTL_TEXTENCODING_ISO_8859_1, bAllowNulChars ) :
+        readUnicodeArray( nChars, bAllowNulChars );
 }
 
-void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes )
+void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes, sal_Int32 nAtomSize )
 {
     if( nBytes > 0 )
     {
-        sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, INPUTSTREAM_BUFFERSIZE );
+        // make buffer size a multiple of the passed atom size
+        sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, (INPUTSTREAM_BUFFERSIZE / nAtomSize) * nAtomSize );
         StreamDataSequence aBuffer( nBufferSize );
         while( nBytes > 0 )
         {
             sal_Int32 nReadSize = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, nBufferSize );
-            sal_Int32 nBytesRead = readData( aBuffer, nReadSize );
+            sal_Int32 nBytesRead = readData( aBuffer, nReadSize, nAtomSize );
             rOutStrm.writeData( aBuffer );
             if( nReadSize == nBytesRead )
                 nBytes -= nReadSize;
@@ -128,34 +149,44 @@ void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nB
     }
 }
 
-void BinaryInputStream::readAtom( void* opMem, sal_uInt8 nSize )
-{
-    readMemory( opMem, nSize );
-}
-
 // ============================================================================
 
 BinaryXInputStream::BinaryXInputStream( const Reference< XInputStream >& rxInStrm, bool bAutoClose ) :
+    BinaryStreamBase( Reference< XSeekable >( rxInStrm, UNO_QUERY ).is() ),
     BinaryXSeekableStream( Reference< XSeekable >( rxInStrm, UNO_QUERY ) ),
     maBuffer( INPUTSTREAM_BUFFERSIZE ),
     mxInStrm( rxInStrm ),
-    mbAutoClose( bAutoClose )
+    mbAutoClose( bAutoClose && rxInStrm.is() )
 {
     mbEof = !mxInStrm.is();
 }
 
 BinaryXInputStream::~BinaryXInputStream()
 {
-    if( mbAutoClose )
-        close();
+    close();
+}
+
+void BinaryXInputStream::close()
+{
+    OSL_ENSURE( !mbAutoClose || mxInStrm.is(), "BinaryXInputStream::close - invalid call" );
+    if( mxInStrm.is() ) try
+    {
+        mxInStrm->closeInput();
+    }
+    catch( Exception& )
+    {
+        OSL_FAIL( "BinaryXInputStream::close - closing input stream failed" );
+    }
+    mxInStrm.clear();
+    mbAutoClose = false;
+    BinaryXSeekableStream::close();
 }
 
-sal_Int32 BinaryXInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+sal_Int32 BinaryXInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     sal_Int32 nRet = 0;
     if( !mbEof && (nBytes > 0) ) try
     {
-        OSL_ENSURE( mxInStrm.is(), "BinaryXInputStream::readData - invalid call" );
         nRet = mxInStrm->readBytes( orData, nBytes );
         mbEof = nRet != nBytes;
     }
@@ -166,7 +197,7 @@ sal_Int32 BinaryXInputStream::readData( StreamDataSequence& orData, sal_Int32 nB
     return nRet;
 }
 
-sal_Int32 BinaryXInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 BinaryXInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nRet = 0;
     if( !mbEof && (nBytes > 0) )
@@ -176,7 +207,7 @@ sal_Int32 BinaryXInputStream::readMemory( void* opMem, sal_Int32 nBytes )
         while( !mbEof && (nBytes > 0) )
         {
             sal_Int32 nReadSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, nBufferSize );
-            sal_Int32 nBytesRead = readData( maBuffer, nReadSize );
+            sal_Int32 nBytesRead = readData( maBuffer, nReadSize, nAtomSize );
             if( nBytesRead > 0 )
                 memcpy( opnMem, maBuffer.getConstArray(), static_cast< size_t >( nBytesRead ) );
             opnMem += nBytesRead;
@@ -187,11 +218,10 @@ sal_Int32 BinaryXInputStream::readMemory( void* opMem, sal_Int32 nBytes )
     return nRet;
 }
 
-void BinaryXInputStream::skip( sal_Int32 nBytes )
+void BinaryXInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     if( !mbEof ) try
     {
-        OSL_ENSURE( mxInStrm.is(), "BinaryXInputStream::skip - invalid call" );
         mxInStrm->skipBytes( nBytes );
     }
     catch( Exception& )
@@ -200,60 +230,48 @@ void BinaryXInputStream::skip( sal_Int32 nBytes )
     }
 }
 
-void BinaryXInputStream::close()
-{
-    if( mxInStrm.is() ) try
-    {
-        mxInStrm->closeInput();
-        mxInStrm.clear();
-    }
-    catch( Exception& )
-    {
-        OSL_FAIL( "BinaryXInputStream::close - closing input stream failed" );
-    }
-}
-
 // ============================================================================
 
 SequenceInputStream::SequenceInputStream( const StreamDataSequence& rData ) :
+    BinaryStreamBase( true ),
     SequenceSeekableStream( rData )
 {
 }
 
-sal_Int32 SequenceInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+sal_Int32 SequenceInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     sal_Int32 nReadBytes = 0;
     if( !mbEof )
     {
-        nReadBytes = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mrData.getLength() - mnPos );
+        nReadBytes = getMaxBytes( nBytes );
         orData.realloc( nReadBytes );
         if( nReadBytes > 0 )
-            memcpy( orData.getArray(), mrData.getConstArray() + mnPos, static_cast< size_t >( nReadBytes ) );
+            memcpy( orData.getArray(), mpData->getConstArray() + mnPos, static_cast< size_t >( nReadBytes ) );
         mnPos += nReadBytes;
         mbEof = nReadBytes < nBytes;
     }
     return nReadBytes;
 }
 
-sal_Int32 SequenceInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 SequenceInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     sal_Int32 nReadBytes = 0;
     if( !mbEof )
     {
-        nReadBytes = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mrData.getLength() - mnPos );
+        nReadBytes = getMaxBytes( nBytes );
         if( nReadBytes > 0 )
-            memcpy( opMem, mrData.getConstArray() + mnPos, static_cast< size_t >( nReadBytes ) );
+            memcpy( opMem, mpData->getConstArray() + mnPos, static_cast< size_t >( nReadBytes ) );
         mnPos += nReadBytes;
         mbEof = nReadBytes < nBytes;
     }
     return nReadBytes;
 }
 
-void SequenceInputStream::skip( sal_Int32 nBytes )
+void SequenceInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     if( !mbEof )
     {
-        sal_Int32 nSkipBytes = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mrData.getLength() - mnPos );
+        sal_Int32 nSkipBytes = getMaxBytes( nBytes );
         mnPos += nSkipBytes;
         mbEof = nSkipBytes < nBytes;
     }
@@ -261,73 +279,75 @@ void SequenceInputStream::skip( sal_Int32 nBytes )
 
 // ============================================================================
 
-RelativeInputStream::RelativeInputStream( BinaryInputStream& rInStrm, sal_Int64 nLength ) :
-    mrInStrm( rInStrm ),
+RelativeInputStream::RelativeInputStream( BinaryInputStream& rInStrm, sal_Int64 nSize ) :
+    BinaryStreamBase( rInStrm.isSeekable() ),
+    mpInStrm( &rInStrm ),
     mnStartPos( rInStrm.tell() ),
     mnRelPos( 0 )
 {
     sal_Int64 nRemaining = rInStrm.getRemaining();
-    mnLength = (nRemaining >= 0) ? ::std::min( nLength, nRemaining ) : nLength;
-    mbEof = mnLength < 0;
+    mnSize = (nRemaining >= 0) ? ::std::min( nSize, nRemaining ) : nSize;
+    mbEof = mbEof || rInStrm.isEof() || (mnSize < 0);
 }
 
-bool RelativeInputStream::isSeekable() const
+sal_Int64 RelativeInputStream::size() const
 {
-    return mrInStrm.isSeekable();
-}
-
-sal_Int64 RelativeInputStream::getLength() const
-{
-    return mnLength;
+    return mpInStrm ? mnSize : -1;
 }
 
 sal_Int64 RelativeInputStream::tell() const
 {
-    return mnRelPos;
+    return mpInStrm ? mnRelPos : -1;
 }
 
 void RelativeInputStream::seek( sal_Int64 nPos )
 {
-    if( mrInStrm.isSeekable() && (mnStartPos >= 0) )
+    if( mpInStrm && isSeekable() && (mnStartPos >= 0) )
     {
-        mnRelPos = getLimitedValue< sal_Int64, sal_Int64 >( nPos, 0, mnLength );
-        mrInStrm.seek( mnStartPos + mnRelPos );
-        mbEof = (mnRelPos != nPos) || mrInStrm.isEof();
+        mnRelPos = getLimitedValue< sal_Int64, sal_Int64 >( nPos, 0, mnSize );
+        mpInStrm->seek( mnStartPos + mnRelPos );
+        mbEof = (mnRelPos != nPos) || mpInStrm->isEof();
     }
 }
 
-sal_Int32 RelativeInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+void RelativeInputStream::close()
+{
+    mpInStrm = 0;
+    mbEof = true;
+}
+
+sal_Int32 RelativeInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nReadBytes = 0;
     if( !mbEof )
     {
-        sal_Int32 nRealBytes = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnLength - mnRelPos );
-        nReadBytes = mrInStrm.readData( orData, nRealBytes );
+        sal_Int32 nMaxBytes = getMaxBytes( nBytes );
+        nReadBytes = mpInStrm->readData( orData, nMaxBytes, nAtomSize );
         mnRelPos += nReadBytes;
-        mbEof = (nRealBytes < nBytes) || mrInStrm.isEof();
+        mbEof = (nMaxBytes < nBytes) || mpInStrm->isEof();
     }
     return nReadBytes;
 }
 
-sal_Int32 RelativeInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 RelativeInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nReadBytes = 0;
     if( !mbEof )
     {
-        sal_Int32 nRealBytes = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnLength - mnRelPos );
-        nReadBytes = mrInStrm.readMemory( opMem, nRealBytes );
+        sal_Int32 nMaxBytes = getMaxBytes( nBytes );
+        nReadBytes = mpInStrm->readMemory( opMem, nMaxBytes, nAtomSize );
         mnRelPos += nReadBytes;
-        mbEof = (nRealBytes < nBytes) || mrInStrm.isEof();
+        mbEof = (nMaxBytes < nBytes) || mpInStrm->isEof();
     }
     return nReadBytes;
 }
 
-void RelativeInputStream::skip( sal_Int32 nBytes )
+void RelativeInputStream::skip( sal_Int32 nBytes, size_t nAtomSize )
 {
     if( !mbEof )
     {
-        sal_Int32 nSkipBytes = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnLength - mnRelPos );
-        mrInStrm.skip( nSkipBytes );
+        sal_Int32 nSkipBytes = getMaxBytes( nBytes );
+        mpInStrm->skip( nSkipBytes, nAtomSize );
         mnRelPos += nSkipBytes;
         mbEof = nSkipBytes < nBytes;
     }
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index 41c1e2af3..6fef843bc 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -28,6 +28,8 @@
 
 #include "oox/helper/binaryoutputstream.hxx"
 
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
 #include <osl/diagnose.h>
 #include <string.h>
 
@@ -46,33 +48,42 @@ const sal_Int32 OUTPUTSTREAM_BUFFERSIZE     = 0x8000;
 
 // ============================================================================
 
-void BinaryOutputStream::writeAtom( const void* pMem, sal_uInt8 nSize )
-{
-    writeMemory( pMem, nSize );
-}
-
-// ============================================================================
-
 BinaryXOutputStream::BinaryXOutputStream( const Reference< XOutputStream >& rxOutStrm, bool bAutoClose ) :
+    BinaryStreamBase( Reference< XSeekable >( rxOutStrm, UNO_QUERY ).is() ),
     BinaryXSeekableStream( Reference< XSeekable >( rxOutStrm, UNO_QUERY ) ),
     maBuffer( OUTPUTSTREAM_BUFFERSIZE ),
     mxOutStrm( rxOutStrm ),
-    mbAutoClose( bAutoClose )
+    mbAutoClose( bAutoClose && rxOutStrm.is() )
 {
     mbEof = !mxOutStrm.is();
 }
 
 BinaryXOutputStream::~BinaryXOutputStream()
 {
-    if( mbAutoClose )
-        close();
+    close();
+}
+
+void BinaryXOutputStream::close()
+{
+    OSL_ENSURE( !mbAutoClose || mxOutStrm.is(), "BinaryXOutputStream::close - invalid call" );
+    if( mxOutStrm.is() ) try
+    {
+        mxOutStrm->flush();
+        mxOutStrm->closeOutput();
+    }
+    catch( Exception& )
+    {
+        OSL_FAIL( "BinaryXOutputStream::close - closing output stream failed" );
+    }
+    mxOutStrm.clear();
+    mbAutoClose = false;
+    BinaryXSeekableStream::close();
 }
 
-void BinaryXOutputStream::writeData( const StreamDataSequence& rData )
+void BinaryXOutputStream::writeData( const StreamDataSequence& rData, size_t /*nAtomSize*/ )
 {
-    try
+    if( mxOutStrm.is() ) try
     {
-        OSL_ENSURE( mxOutStrm.is(), "BinaryXOutputStream::writeData - invalid call" );
         mxOutStrm->writeBytes( rData );
     }
     catch( Exception& )
@@ -81,57 +92,45 @@ void BinaryXOutputStream::writeData( const StreamDataSequence& rData )
     }
 }
 
-void BinaryXOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes )
+void BinaryXOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize )
 {
-    if( nBytes > 0 )
+    if( mxOutStrm.is() && (nBytes > 0) )
     {
-        sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, OUTPUTSTREAM_BUFFERSIZE );
+        sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, (OUTPUTSTREAM_BUFFERSIZE / nAtomSize) * nAtomSize );
         const sal_uInt8* pnMem = reinterpret_cast< const sal_uInt8* >( pMem );
         while( nBytes > 0 )
         {
             sal_Int32 nWriteSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, nBufferSize );
             maBuffer.realloc( nWriteSize );
             memcpy( maBuffer.getArray(), pnMem, static_cast< size_t >( nWriteSize ) );
-            writeData( maBuffer );
+            writeData( maBuffer, nAtomSize );
             pnMem += nWriteSize;
             nBytes -= nWriteSize;
         }
     }
 }
 
-void BinaryXOutputStream::close()
-{
-    if( mxOutStrm.is() ) try
-    {
-        mxOutStrm->flush();
-        mxOutStrm->closeOutput();
-    }
-    catch( Exception& )
-    {
-        OSL_FAIL( "BinaryXOutputStream::close - closing output stream failed" );
-    }
-}
-
 // ============================================================================
 
 SequenceOutputStream::SequenceOutputStream( StreamDataSequence& rData ) :
+    BinaryStreamBase( true ),
     SequenceSeekableStream( rData )
 {
 }
 
-void SequenceOutputStream::writeData( const StreamDataSequence& rData )
+void SequenceOutputStream::writeData( const StreamDataSequence& rData, size_t nAtomSize )
 {
-    if( rData.hasElements() )
-        writeMemory( rData.getConstArray(), rData.getLength() );
+    if( mpData && rData.hasElements() )
+        writeMemory( rData.getConstArray(), rData.getLength(), nAtomSize );
 }
 
-void SequenceOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes )
+void SequenceOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
-    if( nBytes > 0 )
+    if( mpData && (nBytes > 0) )
     {
-        if( mrData.getLength() - mnPos < nBytes )
-            const_cast< StreamDataSequence& >( mrData ).realloc( mnPos + nBytes );
-        memcpy( const_cast< StreamDataSequence& >( mrData ).getArray() + mnPos, pMem, static_cast< size_t >( nBytes ) );
+        if( mpData->getLength() - mnPos < nBytes )
+            const_cast< StreamDataSequence* >( mpData )->realloc( mnPos + nBytes );
+        memcpy( const_cast< StreamDataSequence* >( mpData )->getArray() + mnPos, pMem, static_cast< size_t >( nBytes ) );
         mnPos += nBytes;
     }
 }
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx
index 372138da6..2b25c58cc 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -28,6 +28,7 @@
 
 #include "oox/helper/binarystreambase.hxx"
 
+#include <com/sun/star/io/XSeekable.hpp>
 #include <osl/diagnose.h>
 
 namespace oox {
@@ -43,30 +44,11 @@ BinaryStreamBase::~BinaryStreamBase()
 {
 }
 
-bool BinaryStreamBase::isSeekable() const
-{
-    return false;
-}
-
-sal_Int64 BinaryStreamBase::getLength() const
-{
-    return -1;
-}
-
-sal_Int64 BinaryStreamBase::tell() const
-{
-    return -1;
-}
-
-void BinaryStreamBase::seek( sal_Int64 )
-{
-}
-
 sal_Int64 BinaryStreamBase::getRemaining() const
 {
     // do not use isSeekable(), implementations may provide stream position and size even if not seekable
     sal_Int64 nPos = tell();
-    sal_Int64 nLen = getLength();
+    sal_Int64 nLen = size();
     return ((nPos >= 0) && (nLen >= 0)) ? ::std::max< sal_Int64 >( nLen - nPos, 0 ) : -1;
 }
 
@@ -74,7 +56,7 @@ void BinaryStreamBase::alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos
 {
     sal_Int64 nStrmPos = tell();
     // nothing to do, if stream is at anchor position
-    if( isSeekable() && (0 <= nAnchorPos) && (nAnchorPos != nStrmPos) && (nBlockSize > 1) )
+    if( mbSeekable && (0 <= nAnchorPos) && (nAnchorPos != nStrmPos) && (nBlockSize > 1) )
     {
         // prevent modulo with negative arguments...
         sal_Int64 nSkipSize = (nAnchorPos < nStrmPos) ?
@@ -87,16 +69,16 @@ void BinaryStreamBase::alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos
 // ============================================================================
 
 BinaryXSeekableStream::BinaryXSeekableStream( const Reference< XSeekable >& rxSeekable ) :
+    BinaryStreamBase( mxSeekable.is() ),
     mxSeekable( rxSeekable )
 {
 }
 
-bool BinaryXSeekableStream::isSeekable() const
+BinaryXSeekableStream::~BinaryXSeekableStream()
 {
-    return mxSeekable.is();
 }
 
-sal_Int64 BinaryXSeekableStream::getLength() const
+sal_Int64 BinaryXSeekableStream::size() const
 {
     if( mxSeekable.is() ) try
     {
@@ -104,7 +86,7 @@ sal_Int64 BinaryXSeekableStream::getLength() const
     }
     catch( Exception& )
     {
-        OSL_FAIL( "BinaryXSeekableStream::getLength - exception caught" );
+        OSL_FAIL( "BinaryXSeekableStream::size - exception caught" );
     }
     return -1;
 }
@@ -135,27 +117,44 @@ void BinaryXSeekableStream::seek( sal_Int64 nPos )
     }
 }
 
+void BinaryXSeekableStream::close()
+{
+    mxSeekable.clear();
+    mbEof = true;
+}
+
 // ============================================================================
 
-bool SequenceSeekableStream::isSeekable() const
+SequenceSeekableStream::SequenceSeekableStream( const StreamDataSequence& rData ) :
+    BinaryStreamBase( true ),
+    mpData( &rData ),
+    mnPos( 0 )
 {
-    return true;
 }
 
-sal_Int64 SequenceSeekableStream::getLength() const
+sal_Int64 SequenceSeekableStream::size() const
 {
-    return mrData.getLength();
+    return mpData ? mpData->getLength() : -1;
 }
 
 sal_Int64 SequenceSeekableStream::tell() const
 {
-    return mnPos;
+    return mpData ? mnPos : -1;
 }
 
 void SequenceSeekableStream::seek( sal_Int64 nPos )
 {
-    mnPos = getLimitedValue< sal_Int32, sal_Int64 >( nPos, 0, mrData.getLength() );
-    mbEof = mnPos != nPos;
+    if( mpData )
+    {
+        mnPos = getLimitedValue< sal_Int32, sal_Int64 >( nPos, 0, mpData->getLength() );
+        mbEof = mnPos != nPos;
+    }
+}
+
+void SequenceSeekableStream::close()
+{
+    mpData = 0;
+    mbEof = true;
 }
 
 // ============================================================================
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index 70dfad3cb..d47ea4ee7 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/helper.hxx"
 
@@ -47,12 +48,66 @@ using ::rtl::OUStringBuffer;
 
 // ============================================================================
 
-Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Reference< XMultiServiceFactory >& rxFactory )
+namespace {
+
+struct ValueRangeComp
+{
+    inline bool         operator()( const ValueRange& rRange, sal_Int32 nValue ) const { return rRange.mnLast < nValue; }
+};
+
+} // namespace
+
+// ----------------------------------------------------------------------------
+
+void ValueRangeSet::insert( const ValueRange& rRange )
+{
+    // find the first range that contains or follows the starting point of the passed range
+    ValueRangeVector::iterator aBeg = maRanges.begin();
+    ValueRangeVector::iterator aEnd = maRanges.end();
+    ValueRangeVector::iterator aIt = ::std::lower_bound( aBeg, aEnd, rRange.mnFirst, ValueRangeComp() );
+    // nothing to do if found range contains passed range
+    if( (aIt != aEnd) && aIt->contains( rRange ) ) return;
+    // check if previous range can be used to merge with the passed range
+    if( (aIt != aBeg) && ((aIt - 1)->mnLast + 1 == rRange.mnFirst) ) --aIt;
+    // check if current range (aIt) can be used to merge with passed range
+    if( (aIt != aEnd) && aIt->intersects( rRange ) )
+    {
+        // set new start value to existing range
+        aIt->mnFirst = ::std::min( aIt->mnFirst, rRange.mnFirst );
+        // search first range that cannot be merged anymore (aNext)
+        ValueRangeVector::iterator aNext = aIt + 1;
+        while( (aNext != aEnd) && aNext->intersects( rRange ) ) ++aNext;
+        // set new end value to existing range
+        aIt->mnLast = ::std::max( (aNext - 1)->mnLast, rRange.mnLast );
+        // remove ranges covered by new existing range (aIt)
+        maRanges.erase( aIt + 1, aNext );
+    }
+    else
+    {
+        // merging not possible: insert new range
+        maRanges.insert( aIt, rRange );
+    }
+}
+
+ValueRangeVector ValueRangeSet::getIntersection( const ValueRange& rRange ) const
+{
+    ValueRangeVector aRanges;
+    // find the range that contains nFirst or the first range that follows nFirst
+    ValueRangeVector::const_iterator aIt = ::std::lower_bound( maRanges.begin(), maRanges.end(), rRange.mnFirst, ValueRangeComp() );
+    for( ValueRangeVector::const_iterator aEnd = maRanges.end(); (aIt != aEnd) && (aIt->mnFirst <= rRange.mnLast); ++aIt )
+        aRanges.push_back( ValueRange( ::std::max( aIt->mnFirst, rRange.mnFirst ), ::std::min( aIt->mnLast, rRange.mnLast ) ) );
+    return aRanges;
+}
+
+// ============================================================================
+
+Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Reference< XComponentContext >& rxContext )
 {
     Reference< XIndexContainer > xContainer;
-    if( rxFactory.is() ) try
+    if( rxContext.is() ) try
     {
-        xContainer.set( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.IndexedPropertyValues" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        xContainer.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.IndexedPropertyValues" ) ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
@@ -79,12 +134,13 @@ bool ContainerHelper::insertByIndex(
     return bRet;
 }
 
-Reference< XNameContainer > ContainerHelper::createNameContainer( const Reference< XMultiServiceFactory >& rxFactory )
+Reference< XNameContainer > ContainerHelper::createNameContainer( const Reference< XComponentContext >& rxContext )
 {
     Reference< XNameContainer > xContainer;
-    if( rxFactory.is() ) try
+    if( rxContext.is() ) try
     {
-        xContainer.set( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.NamedPropertyValues" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        xContainer.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.NamedPropertyValues" ) ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index f1bd62b45..4375e6dd5 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -70,14 +70,13 @@ inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm
 // ============================================================================
 
 GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
-    mxCompContext( rxContext ),
+    mxContext( rxContext ),
     mxStorage( rxStorage ),
     maGraphicObjScheme( CREATE_OUSTRING( "vnd.sun.star.GraphicObject:" ) )
 {
-    OSL_ENSURE( mxCompContext.is(), "GraphicHelper::GraphicHelper - missing component context" );
-    Reference< XMultiServiceFactory > xFactory( mxCompContext->getServiceManager(), UNO_QUERY_THROW );
+    OSL_ENSURE( mxContext.is(), "GraphicHelper::GraphicHelper - missing component context" );
+    Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY );
     OSL_ENSURE( xFactory.is(), "GraphicHelper::GraphicHelper - missing service factory" );
-
     if( xFactory.is() )
         mxGraphicProvider.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY );
 
@@ -320,9 +319,9 @@ Reference< XGraphic > GraphicHelper::importEmbeddedGraphic( const OUString& rStr
 OUString GraphicHelper::createGraphicObject( const Reference< XGraphic >& rxGraphic ) const
 {
     OUString aGraphicObjUrl;
-    if( mxCompContext.is() && rxGraphic.is() ) try
+    if( mxContext.is() && rxGraphic.is() ) try
     {
-        Reference< XGraphicObject > xGraphicObj( GraphicObject::create( mxCompContext ), UNO_SET_THROW );
+        Reference< XGraphicObject > xGraphicObj( GraphicObject::create( mxContext ), UNO_SET_THROW );
         xGraphicObj->setGraphic( rxGraphic );
         maGraphicObjects.push_back( xGraphicObj );
         aGraphicObjUrl = maGraphicObjScheme + xGraphicObj->getUniqueID();
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index f1bb3f2aa..a775e7597 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -49,12 +49,12 @@ using ::rtl::OUString;
 
 // ============================================================================
 
-ObjectContainer::ObjectContainer( const Reference< XMultiServiceFactory >& rxFactory, const OUString& rServiceName ) :
-    mxFactory( rxFactory ),
+ObjectContainer::ObjectContainer( const Reference< XMultiServiceFactory >& rxModelFactory, const OUString& rServiceName ) :
+    mxModelFactory( rxModelFactory ),
     maServiceName( rServiceName ),
     mnIndex( 0 )
 {
-    OSL_ENSURE( mxFactory.is(), "ObjectContainer::ObjectContainer - missing service factory" );
+    OSL_ENSURE( mxModelFactory.is(), "ObjectContainer::ObjectContainer - missing service factory" );
 }
 
 ObjectContainer::~ObjectContainer()
@@ -95,9 +95,10 @@ OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& rOb
 
 void ObjectContainer::createContainer() const
 {
-    if( !mxContainer.is() && mxFactory.is() ) try
+    if( !mxContainer.is() && mxModelFactory.is() ) try
     {
-        mxContainer.set( mxFactory->createInstance( maServiceName ), UNO_QUERY_THROW );
+        mxContainer.set( mxModelFactory->createInstance( maServiceName ), UNO_QUERY_THROW );
+        mxModelFactory.clear();
     }
     catch( Exception& )
     {
@@ -108,13 +109,13 @@ void ObjectContainer::createContainer() const
 // ============================================================================
 
 ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
-    maMarkerContainer(   rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.MarkerTable" ) ),
-    maDashContainer(     rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.DashTable" ) ),
-    maGradientContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.GradientTable" ) ),
-    maBitmapContainer(   rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.BitmapTable" ) ),
-    maDashNameBase( CREATE_OUSTRING( "msLineDash " ) ),
-    maGradientNameBase( CREATE_OUSTRING( "msFillGradient " ) ),
-    maBitmapNameBase( CREATE_OUSTRING( "msFillBitmap " ) )
+    maMarkerContainer(    rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.MarkerTable" ) ),
+    maDashContainer(      rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.DashTable" ) ),
+    maGradientContainer(  rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.GradientTable" ) ),
+    maBitmapUrlContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.BitmapTable" ) ),
+    maDashNameBase(      CREATE_OUSTRING( "msLineDash " ) ),
+    maGradientNameBase(  CREATE_OUSTRING( "msFillGradient " ) ),
+    maBitmapUrlNameBase( CREATE_OUSTRING( "msFillBitmap " ) )
 {
 }
 
@@ -141,10 +142,10 @@ OUString ModelObjectHelper::insertFillGradient( const Gradient& rGradient )
     return maGradientContainer.insertObject( maGradientNameBase, Any( rGradient ), true );
 }
 
-OUString ModelObjectHelper::insertFillBitmap( const OUString& rGraphicUrl )
+OUString ModelObjectHelper::insertFillBitmapUrl( const OUString& rGraphicUrl )
 {
     if( rGraphicUrl.getLength() > 0 )
-        return maBitmapContainer.insertObject( maBitmapNameBase, Any( rGraphicUrl ), true );
+        return maBitmapUrlContainer.insertObject( maBitmapUrlNameBase, Any( rGraphicUrl ), true );
     return OUString();
 }
 
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 29992fa82..90afd8c6b 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -220,10 +220,6 @@ PropertyMap::PropertyMap() :
 {
 }
 
-PropertyMap::~PropertyMap()
-{
-}
-
 /*static*/ const OUString& PropertyMap::getPropertyName( sal_Int32 nPropId )
 {
     OSL_ENSURE( (0 <= nPropId) && (nPropId < PROP_COUNT), "PropertyMap::getPropertyName - invalid property identifier" );
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index b80485be1..55ad62137 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -49,26 +49,34 @@ void PropertySet::set( const Reference< XPropertySet >& rxPropSet )
 {
     mxPropSet = rxPropSet;
     mxMultiPropSet.set( mxPropSet, UNO_QUERY );
+    if( mxPropSet.is() ) try
+    {
+        mxPropSetInfo = mxPropSet->getPropertySetInfo();
+    }
+    catch( Exception& )
+    {
+    }
 }
 
-// Get properties -------------------------------------------------------------
-
-bool PropertySet::getAnyProperty( Any& orValue, sal_Int32 nPropId ) const
+bool PropertySet::hasProperty( sal_Int32 nPropId ) const
 {
-    return getAnyProperty( orValue, PropertyMap::getPropertyName( nPropId ) );
+    if( mxPropSetInfo.is() ) try
+    {
+        const OUString& rPropName = PropertyMap::getPropertyName( nPropId );
+        return mxPropSetInfo->hasPropertyByName( rPropName );
+    }
+    catch( Exception& )
+    {
+    }
+    return false;
 }
 
+// Get properties -------------------------------------------------------------
+
 Any PropertySet::getAnyProperty( sal_Int32 nPropId ) const
 {
     Any aValue;
-    return getAnyProperty( aValue, nPropId ) ? aValue : Any();
-}
-
-bool PropertySet::getBoolProperty( sal_Int32 nPropId ) const
-{
-    Any aAny;
-    bool bValue = false;
-    return getAnyProperty( aAny, nPropId ) && (aAny >>= bValue) && bValue;
+    return implGetPropertyValue( aValue, PropertyMap::getPropertyName( nPropId ) ) ? aValue : Any();
 }
 
 void PropertySet::getProperties( Sequence< Any >& orValues, const Sequence< OUString >& rPropNames ) const
@@ -91,15 +99,15 @@ void PropertySet::getProperties( Sequence< Any >& orValues, const Sequence< OUSt
         orValues.realloc( nLen );
         Any* pValue = orValues.getArray();
         for( ; pPropName != pPropNameEnd; ++pPropName, ++pValue )
-            getAnyProperty( *pValue, *pPropName );
+            implGetPropertyValue( *pValue, *pPropName );
     }
 }
 
 // Set properties -------------------------------------------------------------
 
-void PropertySet::setAnyProperty( sal_Int32 nPropId, const Any& rValue )
+bool PropertySet::setAnyProperty( sal_Int32 nPropId, const Any& rValue )
 {
-    setAnyProperty( PropertyMap::getPropertyName( nPropId ), rValue );
+    return implSetPropertyValue( PropertyMap::getPropertyName( nPropId ), rValue );
 }
 
 void PropertySet::setProperties( const Sequence< OUString >& rPropNames, const Sequence< Any >& rValues )
@@ -123,7 +131,7 @@ void PropertySet::setProperties( const Sequence< OUString >& rPropNames, const S
         const OUString* pPropNameEnd = pPropName + rPropNames.getLength();
         const Any* pValue = rValues.getConstArray();
         for( ; pPropName != pPropNameEnd; ++pPropName, ++pValue )
-            setAnyProperty( *pPropName, *pValue );
+            implSetPropertyValue( *pPropName, *pValue );
     }
 }
 
@@ -140,37 +148,34 @@ void PropertySet::setProperties( const PropertyMap& rPropertyMap )
 
 // private --------------------------------------------------------------------
 
-bool PropertySet::getAnyProperty( Any& orValue, const OUString& rPropName ) const
+bool PropertySet::implGetPropertyValue( Any& orValue, const OUString& rPropName ) const
 {
-    bool bHasValue = false;
-    try
+    if( mxPropSet.is() ) try
     {
-        if( mxPropSet.is() )
-        {
-            orValue = mxPropSet->getPropertyValue( rPropName );
-            bHasValue = true;
-        }
+        orValue = mxPropSet->getPropertyValue( rPropName );
+        return true;
     }
     catch( Exception& )
     {
-        OSL_FAIL( OStringBuffer( "PropertySet::getAnyProperty - cannot get property \"" ).
+        OSL_FAIL( OStringBuffer( "PropertySet::implGetPropertyValue - cannot get property \"" ).
             append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() );
     }
-    return bHasValue;
+    return false;
 }
 
-void PropertySet::setAnyProperty( const OUString& rPropName, const Any& rValue )
+bool PropertySet::implSetPropertyValue( const OUString& rPropName, const Any& rValue )
 {
-    try
+    if( mxPropSet.is() ) try
     {
-        if( mxPropSet.is() )
-            mxPropSet->setPropertyValue( rPropName, rValue );
+        mxPropSet->setPropertyValue( rPropName, rValue );
+        return true;
     }
     catch( Exception& )
     {
-        OSL_FAIL( OStringBuffer( "PropertySet::setAnyProperty - cannot set property \"" ).
+        OSL_FAIL( OStringBuffer( "PropertySet::implSetPropertyValue - cannot set property \"" ).
             append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() );
     }
+    return false;
 }
 
 #if OSL_DEBUG_LEVEL > 0
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index bb3adea8e..8e8091d64 100644..100755
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -28,102 +28,209 @@
 
 #include "oox/helper/textinputstream.hxx"
 
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/io/XActiveDataSink.hpp>
+#include <com/sun/star/io/XTextInputStream.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/tencinfo.h>
 #include "oox/helper/binaryinputstream.hxx"
 
 namespace oox {
 
 // ============================================================================
 
-using ::rtl::OStringBuffer;
-using ::rtl::OStringToOUString;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
 using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 // ============================================================================
 
 namespace {
 
-/** Reads a text line from stream. First, tries to skip the second character of
-    a two-character line end sequence. Returns the new line-end character. */
-template< typename BufferType, typename CharType, typename StreamDataType >
-sal_Unicode lclReadLine( BufferType& orBuffer, BinaryInputStream& rInStrm, sal_Unicode cLastEolChar )
+typedef ::cppu::WeakImplHelper1< XInputStream > UnoBinaryInputStream_BASE;
+
+/** Implementation of a UNO input stream wrapping a binary input stream.
+ */
+class UnoBinaryInputStream : public UnoBinaryInputStream_BASE
 {
-    // try to skip LF following CR, or CR following LF
-    if( !rInStrm.isEof() && (cLastEolChar != 0) )
-    {
-        CharType cChar = static_cast< CharType >( rInStrm.readValue< StreamDataType >() );
-        // return on EOF after line-end
-        if( rInStrm.isEof() )
-            return 0;
-        // return on sequence of equal line-end characters
-        bool bIsEolChar = (cChar == 10) || (cChar == 13);
-        if( bIsEolChar && (cChar == cLastEolChar) )
-            return cChar;
-        // append the character, if it is not the other line-end charcter
-        if( !bIsEolChar )
-            orBuffer.append( cChar );
-    }
+public:
+    explicit            UnoBinaryInputStream( BinaryInputStream& rInStrm );
+
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
+                        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
+                        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+                        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+    virtual sal_Int32 SAL_CALL available()
+                        throw (NotConnectedException, IOException, RuntimeException);
+    virtual void SAL_CALL closeInput()
+                        throw (NotConnectedException, IOException, RuntimeException);
+
+private:
+    void                ensureConnected() const throw (NotConnectedException);
+
+private:
+    BinaryInputStream*  mpInStrm;
+};
+
+// ----------------------------------------------------------------------------
+
+UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) :
+    mpInStrm( &rInStrm )
+{
+}
 
-    // read chars until EOF or line end character (LF or CR)
-    while( true )
-    {
-        CharType cChar = static_cast< CharType >( rInStrm.readValue< StreamDataType >() );
-        if( rInStrm.isEof() )
-            return 0;
-        if( (cChar == 10) || (cChar == 13) )
-            return cChar;
-        orBuffer.append( cChar );
-    }
+sal_Int32 SAL_CALL UnoBinaryInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
+        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+{
+    ensureConnected();
+    return mpInStrm->readData( rData, nBytesToRead, 1 );
+}
+
+sal_Int32 SAL_CALL UnoBinaryInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
+        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+{
+    ensureConnected();
+    return mpInStrm->readData( rData, nMaxBytesToRead, 1 );
+}
+
+void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip )
+        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+{
+    ensureConnected();
+    mpInStrm->skip( nBytesToSkip, 1 );
+}
+
+sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException)
+{
+    ensureConnected();
+    throw RuntimeException( CREATE_OUSTRING( "Functionality not supported" ), Reference< XInputStream >() );
+}
+
+void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException)
+{
+    ensureConnected();
+    mpInStrm->close();
+    mpInStrm = 0;
+}
+
+void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException)
+{
+    if( !mpInStrm )
+        throw NotConnectedException( CREATE_OUSTRING( "Stream closed" ), Reference< XInterface >() );
 }
 
 } // namespace
 
 // ============================================================================
 
-TextInputStream::TextInputStream( BinaryInputStream& rInStrm, rtl_TextEncoding eTextEnc ) :
-    mrInStrm( rInStrm ),
-    meTextEnc( eTextEnc ),
-    mcLastEolChar( 0 )
+TextInputStream::TextInputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
+{
+    init( rxContext, rxInStrm, eTextEnc );
+}
+
+TextInputStream::TextInputStream( const Reference< XComponentContext >& rxContext, BinaryInputStream& rInStrm, rtl_TextEncoding eTextEnc )
+{
+    init( rxContext, new UnoBinaryInputStream( rInStrm ), eTextEnc );
+}
+
+TextInputStream::~TextInputStream()
 {
 }
 
 bool TextInputStream::isEof() const
 {
-    // do not return EOF, if last text line missed line-end character (see below)
-    return mrInStrm.isEof() && (mcLastEolChar == 0);
+    if( mxTextStrm.is() ) try
+    {
+        return mxTextStrm->isEOF();
+    }
+    catch( Exception& )
+    {
+    }
+    return true;
 }
 
 OUString TextInputStream::readLine()
 {
-    if( mrInStrm.isEof() )
+    if( mxTextStrm.is() ) try
     {
-        mcLastEolChar = 0;
-        return OUString();
+        /*  The function createFinalString() adds a character that may have
+            been buffered in the previous call of readToChar() (see below). */
+        return createFinalString( mxTextStrm->readLine() );
     }
-        
-    OUString aLine;
-    if( meTextEnc == RTL_TEXTENCODING_UCS2 )
+    catch( Exception& )
+    {
+        mxTextStrm.clear();
+    }
+    return OUString();
+}
+
+OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
+{
+    if( mxTextStrm.is() ) try
     {
-        // read 16-bit characters for UCS2 encoding
-        OUStringBuffer aBuffer;
-        mcLastEolChar = lclReadLine< OUStringBuffer, sal_Unicode, sal_uInt16 >( aBuffer, mrInStrm, mcLastEolChar );
-        aLine = aBuffer.makeStringAndClear();
+        Sequence< sal_Unicode > aDelimiters( 1 );
+        aDelimiters[ 0 ] = cChar;
+        /*  Always get the delimiter character from the UNO text input stream.
+            In difference to this implementation, it will not return it in the
+            next call but silently skip it. If caller specifies to exclude the
+            character in this call, it will be returned in the next call of one
+            of the own member functions. The function createFinalString() adds
+            a character that has been buffered in the previous call. */
+        OUString aString = createFinalString( mxTextStrm->readString( aDelimiters, sal_False ) );
+        // remove last character from string and remember it for next call
+        if( !bIncludeChar && (aString.getLength() > 0) && (aString[ aString.getLength() - 1 ] == cChar) )
+        {
+            mcPendingChar = cChar;
+            aString = aString.copy( 0, aString.getLength() - 1 );
+        }
+        return aString;
     }
-    else
+    catch( Exception& )
     {
-        // otherwise, read 8-bit characters and convert according to text encoding
-        OStringBuffer aBuffer;
-        mcLastEolChar = lclReadLine< OStringBuffer, sal_Char, sal_uInt8 >( aBuffer, mrInStrm, mcLastEolChar );
-        aLine = OStringToOUString( aBuffer.makeStringAndClear(), meTextEnc );
+        mxTextStrm.clear();
     }
+    return OUString();
+}
 
-    // if last line is not empty but line-end character is missing, do not return EOF
-    if( mrInStrm.isEof() && (aLine.getLength() > 0) )
-        mcLastEolChar = 10;
+/*static*/ Reference< XTextInputStream > TextInputStream::createXTextInputStream(
+        const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
+{
+    Reference< XTextInputStream > xTextStrm;
+    const char* pcCharset = rtl_getMimeCharsetFromTextEncoding( eTextEnc );
+    OSL_ENSURE( pcCharset, "TextInputStream::createXTextInputStream - unsupported text encoding" );
+    if( rxContext.is() && rxInStrm.is() && pcCharset ) try
+    {
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XActiveDataSink > xDataSink( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextInputStream" ) ), UNO_QUERY_THROW );
+        xDataSink->setInputStream( rxInStrm );
+        xTextStrm.set( xDataSink, UNO_QUERY_THROW );
+        xTextStrm->setEncoding( OUString::createFromAscii( pcCharset ) );
+    }
+    catch( Exception& )
+    {
+    }
+    return xTextStrm;
+}
+
+// private --------------------------------------------------------------------
+
+OUString TextInputStream::createFinalString( const OUString& rString )
+{
+    if( mcPendingChar == 0 )
+        return rString;
         
-    return aLine;
+    OUString aString = OUString( mcPendingChar ) + rString;
+    mcPendingChar = 0;
+    return aString;
+}
+
+void TextInputStream::init( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
+{
+    mcPendingChar = 0;
+    mxTextStrm = createXTextInputStream( rxContext, rxInStrm, eTextEnc );
 }
 
 // ============================================================================
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index c80099b05..31c7f5a1c 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/storagehelper.hxx>
 #include "oox/helper/helper.hxx"
 
@@ -51,47 +52,46 @@ using ::rtl::OUString;
 
 // ============================================================================
 
-ZipStorage::ZipStorage(
-        const Reference< XMultiServiceFactory >& rxFactory,
-        const Reference< XInputStream >& rxInStream ) :
+ZipStorage::ZipStorage( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStream ) :
     StorageBase( rxInStream, false )
 {
-    OSL_ENSURE( rxFactory.is(), "ZipStorage::ZipStorage - missing service factory" );
+    OSL_ENSURE( rxContext.is(), "ZipStorage::ZipStorage - missing component context" );
     // create base storage object
-    try
+    if( rxContext.is() ) try
     {
         /*  #i105325# ::comphelper::OStorageHelper::GetStorageFromInputStream()
             cannot be used here as it will open a storage with format type
             'PackageFormat' that will not work with OOXML packages.
 
-            #161971# The MS-document storages should always be opened in Repair-Mode to
-            ignore the format errors and get so much info as possible. I hate this
-            solution, but it seems to be the only consistent way to handle the MS-documents.
+            #161971# The MS-document storages should always be opened in repair
+            mode to ignore the format errors and get so much info as possible.
+            I hate this solution, but it seems to be the only consistent way to
+            handle the MS documents.
 
             TODO: #i105410# switch to 'OFOPXMLFormat' and use its
-            implementation of relations handling. */
-
+            implementation of relations handling.
+         */
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
         mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream(
-            ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, 
-            sal_False /* DEV300_m80: Was sal_True, but DOCX and others did not load */ );
+            ZIP_STORAGE_FORMAT_STRING, rxInStream, xFactory,
+            sal_False );    // DEV300_m80: Was sal_True, but DOCX and others did not load
     }
     catch( Exception& )
     {
     }
 }
 
-ZipStorage::ZipStorage(
-        const Reference< XMultiServiceFactory >& rxFactory,
-        const Reference< XStream >& rxStream ) :
+ZipStorage::ZipStorage( const Reference< XComponentContext >& rxContext, const Reference< XStream >& rxStream ) :
     StorageBase( rxStream, false )
 {
-    OSL_ENSURE( rxFactory.is(), "ZipStorage::ZipStorage - missing service factory" );
+    OSL_ENSURE( rxContext.is(), "ZipStorage::ZipStorage - missing component context" );
     // create base storage object
-    try
+    if( rxContext.is() ) try
     {
-        using namespace ::com::sun::star::embed::ElementModes;
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        const sal_Int32 nOpenMode = ElementModes::READWRITE | ElementModes::TRUNCATE;
         mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromStream(
-            OFOPXML_STORAGE_FORMAT_STRING, rxStream, READWRITE | TRUNCATE, rxFactory, sal_True );
+            OFOPXML_STORAGE_FORMAT_STRING, rxStream, nOpenMode, xFactory, sal_True );
     }
     catch( Exception& )
     {
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index 5581f71eb..534ed7090 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -49,14 +49,22 @@ const sal_uInt32 AX_STRING_COMPRESSED       = 0x80000000;
 // ============================================================================
 
 AxAlignedInputStream::AxAlignedInputStream( BinaryInputStream& rInStrm ) :
-    mrInStrm( rInStrm ),
-    mnStrmPos( 0 )
+    BinaryStreamBase( false ),
+    mpInStrm( &rInStrm ),
+    mnStrmPos( 0 ),
+    mnStrmSize( rInStrm.getRemaining() )
 {
+    mbEof = mbEof || rInStrm.isEof();
+}
+
+sal_Int64 AxAlignedInputStream::size() const
+{
+    return mpInStrm ? mnStrmSize : -1;
 }
 
 sal_Int64 AxAlignedInputStream::tell() const
 {
-    return mnStrmPos;
+    return mpInStrm ? mnStrmPos : -1;
 }
 
 void AxAlignedInputStream::seek( sal_Int64 nPos )
@@ -66,24 +74,44 @@ void AxAlignedInputStream::seek( sal_Int64 nPos )
         skip( static_cast< sal_Int32 >( nPos - mnStrmPos ) );
 }
 
-sal_Int32 AxAlignedInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+void AxAlignedInputStream::close()
+{
+    mpInStrm = 0;
+    mbEof = true;
+}
+
+sal_Int32 AxAlignedInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize )
 {
-    sal_Int32 nReadSize = mrInStrm.readData( orData, nBytes );
-    mnStrmPos += nReadSize;
+    sal_Int32 nReadSize = 0;
+    if( !mbEof )
+    {
+        nReadSize = mpInStrm->readData( orData, nBytes, nAtomSize );
+        mnStrmPos += nReadSize;
+        mbEof = mpInStrm->isEof();
+    }
     return nReadSize;
 }
 
-sal_Int32 AxAlignedInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 AxAlignedInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize )
 {
-    sal_Int32 nReadSize = mrInStrm.readMemory( opMem, nBytes );
-    mnStrmPos += nReadSize;
+    sal_Int32 nReadSize = 0;
+    if( !mbEof )
+    {
+        nReadSize = mpInStrm->readMemory( opMem, nBytes, nAtomSize );
+        mnStrmPos += nReadSize;
+        mbEof = mpInStrm->isEof();
+    }
     return nReadSize;
 }
 
-void AxAlignedInputStream::skip( sal_Int32 nBytes )
+void AxAlignedInputStream::skip( sal_Int32 nBytes, size_t nAtomSize )
 {
-    mrInStrm.skip( nBytes );
-    mnStrmPos += nBytes;
+    if( !mbEof )
+    {
+        mpInStrm->skip( nBytes, nAtomSize );
+        mnStrmPos += nBytes;
+        mbEof = mpInStrm->isEof();
+    }
 }
 
 void AxAlignedInputStream::align( size_t nSize )
@@ -175,10 +203,7 @@ bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32
     OSL_ENSURE( bValidChars, "lclReadString - string too long" );
     sal_Int64 nEndPos = rInStrm.tell() + nChars * (bCompressed ? 1 : 2);
     nChars = ::std::min< sal_Int32 >( nChars, 65536 );
-    rValue = bCompressed ?
-        // ISO-8859-1 maps all byte values xx to the same Unicode code point U+00xx
-        rInStrm.readCharArrayUC( nChars, RTL_TEXTENCODING_ISO_8859_1 ) :
-        rInStrm.readUnicodeArray( nChars );
+    rValue = rInStrm.readCompressedUnicodeArray( nChars, bCompressed );
     rInStrm.seek( nEndPos );
     return bValidChars;
 }
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 498296b29..4381fa2a2 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -227,11 +227,11 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx
 {
     if( !rConverter.is() ) try
     {
-        Reference< XMultiServiceFactory > xFactory( rxDocModel, UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xModelFactory( rxDocModel, UNO_QUERY_THROW );
         OUString aServiceName = bRange ?
             CREATE_OUSTRING( "com.sun.star.table.CellRangeAddressConversion" ) :
             CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" );
-        rConverter.set( xFactory->createInstance( aServiceName ) );
+        rConverter.set( xModelFactory->createInstance( aServiceName ) );
     }
     catch( Exception& )
     {
@@ -345,8 +345,8 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
         aArgs[ 0 ] <<= aValue;
 
         // create the CellValueBinding instance and set at the control model
-        Reference< XMultiServiceFactory > xFactory( mxDocModel, UNO_QUERY_THROW );
-        Reference< XValueBinding > xBinding( xFactory->createInstanceWithArguments(
+        Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW );
+        Reference< XValueBinding > xBinding( xModelFactory->createInstanceWithArguments(
             CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW );
         xBindable->setValueBinding( xBinding );
     }
@@ -377,8 +377,8 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
         aArgs[ 0 ] <<= aValue;
 
         // create the EntrySource instance and set at the control model
-        Reference< XMultiServiceFactory > xFactory( mxDocModel, UNO_QUERY_THROW );
-        Reference< XListEntrySource > xEntrySource( xFactory->createInstanceWithArguments(
+        Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW );
+        Reference< XListEntrySource > xEntrySource( xModelFactory->createInstanceWithArguments(
             CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource"  ), aArgs ), UNO_QUERY_THROW );
         xEntrySink->setListEntrySource( xEntrySource );
     }
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx
index c70135905..0abe5c873 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -141,7 +141,7 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const
                     Reference< XInputStream > xStrgStrm = getFilter().openInputStream( aFragmentPath );
                     if( xStrgStrm.is() )
                     {
-                        OleStorage aStorage( getFilter().getServiceFactory(), xStrgStrm, false );
+                        OleStorage aStorage( getFilter().getComponentContext(), xStrgStrm, false );
                         BinaryXInputStream aInStrm( aStorage.openInputStream( CREATE_OUSTRING( "f" ) ), true );
                         if( !aInStrm.isEof() )
                             if( AxContainerModelBase* pModel = dynamic_cast< AxContainerModelBase* >( mrControl.createModelFromGuid( aClassId ) ) )
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index 10cd68d1a..7367776d4 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -45,6 +45,7 @@ namespace ole {
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -62,12 +63,17 @@ OleObjectInfo::OleObjectInfo() :
 
 // ============================================================================
 
-OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxFactory ) :
+OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     maEmbeddedObjScheme( CREATE_OUSTRING( "vnd.sun.star.EmbeddedObject:" ) ),
     mnObjectId( 100 )
 {
-    if( rxFactory.is() )
-        mxResolver.set( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.ImportEmbeddedObjectResolver" ) ), UNO_QUERY );
+    if( rxModelFactory.is() ) try
+    {
+        mxResolver.set( rxModelFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.ImportEmbeddedObjectResolver" ) ), UNO_QUERY );
+    }
+    catch( Exception& )
+    {
+    }
 }
 
 OleObjectHelper::~OleObjectHelper()
@@ -123,11 +129,7 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf
 
     if( bRet )
     {
-        // aspect mode
-        using namespace ::com::sun::star::embed::Aspects;
-        sal_Int64 nAspect = rOleObject.mbShowAsIcon ? MSOLE_ICON : MSOLE_CONTENT;
-        rPropMap[ PROP_Aspect ] <<= nAspect;
-        // visual area
+        rPropMap[ PROP_Aspect ] <<= (rOleObject.mbShowAsIcon ? Aspects::MSOLE_ICON : Aspects::MSOLE_CONTENT);
         rPropMap[ PROP_VisualArea ] <<= Rectangle( 0, 0, rObjSize.Width, rObjSize.Height );
     }
     return bRet;
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 6bea6a770..b04b6b574 100644..100755
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
@@ -69,7 +70,7 @@ class OleOutputStream : public OleOutputStreamBase
 {
 public:
     explicit            OleOutputStream(
-                            const Reference< XMultiServiceFactory >& rxFactory,
+                            const Reference< XComponentContext >& rxContext,
                             const Reference< XNameContainer >& rxStorage,
                             const OUString& rElementName );
     virtual             ~OleOutputStream();
@@ -96,14 +97,15 @@ private:
 
 // ----------------------------------------------------------------------------
 
-OleOutputStream::OleOutputStream( const Reference< XMultiServiceFactory >& rxFactory,
+OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext,
         const Reference< XNameContainer >& rxStorage, const OUString& rElementName ) :
     mxStorage( rxStorage ),
     maElementName( rElementName )
 {
     try
     {
-        mxTempFile.set( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
+        mxTempFile.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
         mxOutStrm = mxTempFile->getOutputStream();
         mxSeekable.set( mxOutStrm, UNO_QUERY );
     }
@@ -180,49 +182,40 @@ void OleOutputStream::ensureConnected() const throw( NotConnectedException )
 
 // ============================================================================
 
-OleStorage::OleStorage(
-        const Reference< XMultiServiceFactory >& rxFactory,
-        const Reference< XInputStream >& rxInStream,
-        bool bBaseStreamAccess ) :
+OleStorage::OleStorage( const Reference< XComponentContext >& rxContext,
+        const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) :
     StorageBase( rxInStream, bBaseStreamAccess ),
-    mxFactory( rxFactory ),
+    mxContext( rxContext ),
     mpParentStorage( 0 )
 {
-    OSL_ENSURE( mxFactory.is(), "OleStorage::OleStorage - missing service factory" );
+    OSL_ENSURE( mxContext.is(), "OleStorage::OleStorage - missing component context" );
     initStorage( rxInStream );
 }
 
-OleStorage::OleStorage(
-        const Reference< XMultiServiceFactory >& rxFactory,
-        const Reference< XStream >& rxOutStream,
-        bool bBaseStreamAccess ) :
+OleStorage::OleStorage( const Reference< XComponentContext >& rxContext,
+        const Reference< XStream >& rxOutStream, bool bBaseStreamAccess ) :
     StorageBase( rxOutStream, bBaseStreamAccess ),
-    mxFactory( rxFactory ),
+    mxContext( rxContext ),
     mpParentStorage( 0 )
 {
-    OSL_ENSURE( mxFactory.is(), "OleStorage::OleStorage - missing service factory" );
+    OSL_ENSURE( mxContext.is(), "OleStorage::OleStorage - missing component context" );
     initStorage( rxOutStream );
 }
 
-OleStorage::OleStorage(
-        const OleStorage& rParentStorage,
-        const Reference< XNameContainer >& rxStorage,
-        const OUString& rElementName,
-        bool bReadOnly ) :
+OleStorage::OleStorage( const OleStorage& rParentStorage,
+        const Reference< XNameContainer >& rxStorage, const OUString& rElementName, bool bReadOnly ) :
     StorageBase( rParentStorage, rElementName, bReadOnly ),
-    mxFactory( rParentStorage.mxFactory ),
+    mxContext( rParentStorage.mxContext ),
     mxStorage( rxStorage ),
     mpParentStorage( &rParentStorage )
 {
     OSL_ENSURE( mxStorage.is(), "OleStorage::OleStorage - missing substorage elements" );
 }
 
-OleStorage::OleStorage(
-        const OleStorage& rParentStorage,
-        const Reference< XStream >& rxOutStream,
-        const OUString& rElementName ) :
+OleStorage::OleStorage( const OleStorage& rParentStorage,
+        const Reference< XStream >& rxOutStream, const OUString& rElementName ) :
     StorageBase( rParentStorage, rElementName, false ),
-    mxFactory( rParentStorage.mxFactory ),
+    mxContext( rParentStorage.mxContext ),
     mpParentStorage( &rParentStorage )
 {
     initStorage( rxOutStream );
@@ -240,7 +233,8 @@ void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
     Reference< XInputStream > xInStrm = rxInStream;
     if( !Reference< XSeekable >( xInStrm, UNO_QUERY ).is() ) try
     {
-        Reference< XStream > xTempFile( mxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XStream > xTempFile( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
         {
             Reference< XOutputStream > xOutStrm( xTempFile->getOutputStream(), UNO_SET_THROW );
             /*  Pass false to both binary stream objects to keep the UNO
@@ -260,10 +254,11 @@ void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
     // create base storage object
     if( xInStrm.is() ) try
     {
+        Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
         Sequence< Any > aArgs( 2 );
         aArgs[ 0 ] <<= xInStrm;
         aArgs[ 1 ] <<= true;        // true = do not create a copy of the input stream
-        mxStorage.set( mxFactory->createInstanceWithArguments(
+        mxStorage.set( xFactory->createInstanceWithArguments(
             CREATE_OUSTRING( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), UNO_QUERY_THROW );
     }
     catch( Exception& )
@@ -276,10 +271,11 @@ void OleStorage::initStorage( const Reference< XStream >& rxOutStream )
     // create base storage object
     if( rxOutStream.is() ) try
     {
+        Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
         Sequence< Any > aArgs( 2 );
         aArgs[ 0 ] <<= rxOutStream;
         aArgs[ 1 ] <<= true;        // true = do not create a copy of the stream
-        mxStorage.set( mxFactory->createInstanceWithArguments(
+        mxStorage.set( xFactory->createInstanceWithArguments(
             CREATE_OUSTRING( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), UNO_QUERY_THROW );
     }
     catch( Exception& )
@@ -348,7 +344,8 @@ StorageRef OleStorage::implOpenSubStorage( const OUString& rElementName, bool bC
         if( !isReadOnly() && (bCreateMissing || xSubStorage.get()) ) try
         {
             // create new storage based on a temp file
-            Reference< XStream > xTempFile( mxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
+            Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
+            Reference< XStream > xTempFile( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
             StorageRef xTempStorage( new OleStorage( *this, xTempFile, rElementName ) );
             // copy existing substorage into temp storage
             if( xSubStorage.get() )
@@ -380,7 +377,7 @@ Reference< XOutputStream > OleStorage::implOpenOutputStream( const OUString& rEl
 {
     Reference< XOutputStream > xOutStream;
     if( mxStorage.is() && (rElementName.getLength() > 0) )
-        xOutStream.set( new OleOutputStream( mxFactory, mxStorage, rElementName ) );
+        xOutStream.set( new OleOutputStream( mxContext, mxStorage, rElementName ) );
     return xOutStream;
 }
 
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 209f646a0..fc750ca53 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -796,11 +796,11 @@ bool lclEatKeyword( OUString& rCodeLine, const OUString& rKeyword )
 
 VbaUserForm::VbaUserForm( const Reference< XComponentContext >& rxContext,
         const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
-    mxCompContext( rxContext ),
+    mxContext( rxContext ),
     mxDocModel( rxDocModel ),
     maConverter( rxDocModel, rGraphicHelper, bDefaultColorBgr )
 {
-    OSL_ENSURE( mxCompContext.is(), "VbaUserForm::VbaUserForm - missing component context" );
+    OSL_ENSURE( mxContext.is(), "VbaUserForm::VbaUserForm - missing component context" );
     OSL_ENSURE( mxDocModel.is(), "VbaUserForm::VbaUserForm - missing document model" );
 }
 
@@ -810,7 +810,7 @@ void VbaUserForm::importForm(
                            StorageBase& rVbaFormStrg, const OUString& rModuleName, rtl_TextEncoding eTextEnc )
 {
     OSL_ENSURE( rxDialogLib.is(), "VbaUserForm::importForm - missing dialog library" );
-    if( !mxCompContext.is() || !mxDocModel.is() || !rxDialogLib.is() )
+    if( !mxContext.is() || !mxDocModel.is() || !rxDialogLib.is() )
         return;
 
     // check that the '03VBFrame' stream exists, this is required for forms
@@ -820,7 +820,7 @@ void VbaUserForm::importForm(
         return;
 
     // scan for the line 'Begin {GUID} <FormName>'
-    TextInputStream aFrameTextStrm( aInStrm, eTextEnc );
+    TextInputStream aFrameTextStrm( mxContext, aInStrm, eTextEnc );
     const OUString aBegin = CREATE_OUSTRING( "Begin" );
     OUString aLine;
     bool bBeginFound = false;
@@ -868,7 +868,7 @@ void VbaUserForm::importForm(
     {
         // create the dialog model
         OUString aServiceName = mxCtrlModel->getServiceName();
-        Reference< XMultiServiceFactory > xFactory( mxCompContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
         Reference< XControlModel > xDialogModel( xFactory->createInstance( aServiceName ), UNO_QUERY_THROW );
         Reference< XNameContainer > xDialogNC( xDialogModel, UNO_QUERY_THROW );
 
@@ -876,7 +876,7 @@ void VbaUserForm::importForm(
         if( convertProperties( xDialogModel, maConverter, 0 ) )
         {
             // export the dialog to XML and insert it into the dialog library
-            Reference< XInputStreamProvider > xDialogSource( ::xmlscript::exportDialogModel( xDialogNC, mxCompContext, rxDocModel ), UNO_SET_THROW );
+            Reference< XInputStreamProvider > xDialogSource( ::xmlscript::exportDialogModel( xDialogNC, mxContext, rxDocModel ), UNO_SET_THROW );
             OSL_ENSURE( !rxDialogLib->hasByName( aFormName ), "VbaUserForm::importForm - multiple dialogs with equal name" );
             ContainerHelper::insertByName( rxDialogLib, aFormName, Any( xDialogSource ) );
         }
diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx
index dd55d99ab..bf4ad01da 100644
--- a/oox/source/ole/vbainputstream.cxx
+++ b/oox/source/ole/vbainputstream.cxx
@@ -48,17 +48,38 @@ const sal_uInt16 VBACHUNK_LENMASK           = 0x0FFF;
 // ============================================================================
 
 VbaInputStream::VbaInputStream( BinaryInputStream& rInStrm ) :
-    mrInStrm( rInStrm ),
+    BinaryStreamBase( false ),
+    mpInStrm( &rInStrm ),
     mnChunkPos( 0 )
 {
     maChunk.reserve( 4096 );
 
-    sal_uInt8 nSig = mrInStrm.readuInt8();
+    sal_uInt8 nSig = rInStrm.readuInt8();
     OSL_ENSURE( nSig == VBASTREAM_SIGNATURE, "VbaInputStream::VbaInputStream - wrong signature" );
-    mbEof = nSig != VBASTREAM_SIGNATURE;
+    mbEof = mbEof || rInStrm.isEof() || (nSig != VBASTREAM_SIGNATURE);
 }
 
-sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+sal_Int64 VbaInputStream::size() const
+{
+    return -1;
+}
+
+sal_Int64 VbaInputStream::tell() const
+{
+    return -1;
+}
+
+void VbaInputStream::seek( sal_Int64 )
+{
+}
+
+void VbaInputStream::close()
+{
+    mpInStrm = 0;
+    mbEof = true;
+}
+
+sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nRet = 0;
     if( !mbEof )
@@ -66,7 +87,7 @@ sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes
         orData.realloc( ::std::max< sal_Int32 >( nBytes, 0 ) );
         if( nBytes > 0 )
         {
-            nRet = readMemory( orData.getArray(), nBytes );
+            nRet = readMemory( orData.getArray(), nBytes, nAtomSize );
             if( nRet < nBytes )
                 orData.realloc( nRet );
         }
@@ -74,7 +95,7 @@ sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes
     return nRet;
 }
 
-sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     sal_Int32 nRet = 0;
     sal_uInt8* opnMem = reinterpret_cast< sal_uInt8* >( opMem );
@@ -91,7 +112,7 @@ sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes )
     return nRet;
 }
 
-void VbaInputStream::skip( sal_Int32 nBytes )
+void VbaInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     while( (nBytes > 0) && updateChunk() )
     {
@@ -109,8 +130,8 @@ bool VbaInputStream::updateChunk()
     if( mbEof || (mnChunkPos < maChunk.size()) ) return !mbEof;
 
     // try to read next chunk header, this may trigger EOF
-    sal_uInt16 nHeader = mrInStrm.readuInt16();
-    mbEof = mrInStrm.isEof();
+    sal_uInt16 nHeader = mpInStrm->readuInt16();
+    mbEof = mpInStrm->isEof();
     if( mbEof ) return false;
 
     // check header signature
@@ -127,15 +148,15 @@ bool VbaInputStream::updateChunk()
         maChunk.clear();
         sal_uInt8 nBitCount = 4;
         sal_uInt16 nChunkPos = 0;
-        while( !mbEof && !mrInStrm.isEof() && (nChunkPos < nChunkLen) )
+        while( !mbEof && !mpInStrm->isEof() && (nChunkPos < nChunkLen) )
         {
-            sal_uInt8 nTokenFlags = mrInStrm.readuInt8();
+            sal_uInt8 nTokenFlags = mpInStrm->readuInt8();
             ++nChunkPos;
-            for( int nBit = 0; !mbEof && !mrInStrm.isEof() && (nBit < 8) && (nChunkPos < nChunkLen); ++nBit, nTokenFlags >>= 1 )
+            for( int nBit = 0; !mbEof && !mpInStrm->isEof() && (nBit < 8) && (nChunkPos < nChunkLen); ++nBit, nTokenFlags >>= 1 )
             {
                 if( nTokenFlags & 1 )
                 {
-                    sal_uInt16 nCopyToken = mrInStrm.readuInt16();
+                    sal_uInt16 nCopyToken = mpInStrm->readuInt16();
                     nChunkPos = nChunkPos + 2;
                     // update bit count used for offset/length in the token
                     while( static_cast< size_t >( 1 << nBitCount ) < maChunk.size() ) ++nBitCount;
@@ -165,7 +186,7 @@ bool VbaInputStream::updateChunk()
                 else
                 {
                     maChunk.resize( maChunk.size() + 1 );
-                    mrInStrm >> maChunk.back();
+                    *mpInStrm >> maChunk.back();
                     ++nChunkPos;
                 }
             }
@@ -174,7 +195,7 @@ bool VbaInputStream::updateChunk()
     else
     {
         maChunk.resize( nChunkLen );
-        mrInStrm.readMemory( &maChunk.front(), nChunkLen );
+        mpInStrm->readMemory( &maChunk.front(), nChunkLen );
     }
 
     mnChunkPos = 0;
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index f5c578a04..da300ea9c 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -123,7 +123,9 @@ public:
 
  // ============================================================================
 
-VbaModule::VbaModule( const Reference< XModel >& rxDocModel, const OUString& rName, rtl_TextEncoding eTextEnc, bool bExecutable ) :
+VbaModule::VbaModule( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxDocModel,
+        const OUString& rName, rtl_TextEncoding eTextEnc, bool bExecutable ) :
+    mxContext( rxContext ),
     mxDocModel( rxDocModel ),
     maName( rName ),
     meTextEnc( eTextEnc ),
@@ -228,7 +230,7 @@ OUString VbaModule::readSourceCode( StorageBase& rVbaStrg, const Reference< XNam
             // decompression starts at current stream position of aInStrm
             VbaInputStream aVbaStrm( aInStrm );
             // load the source code line-by-line, with some more processing
-            TextInputStream aVbaTextStrm( aVbaStrm, meTextEnc );
+            TextInputStream aVbaTextStrm( mxContext, aVbaStrm, meTextEnc );
             while( !aVbaTextStrm.isEof() )
             {
                 OUString aCodeLine = aVbaTextStrm.readLine();
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 430e10b40..cf9af559e 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -156,11 +156,11 @@ void VbaMacroAttacherBase::resolveAndAttachMacro( const Reference< XVBAMacroReso
 VbaProject::VbaProject( const Reference< XComponentContext >& rxContext,
         const Reference< XModel >& rxDocModel, const OUString& rConfigCompName ) :
     VbaFilterConfig( rxContext, rConfigCompName ),
-    mxCompContext( rxContext ),
+    mxContext( rxContext ),
     mxDocModel( rxDocModel ),
     maPrjName( CREATE_OUSTRING( "Standard" ) )
 {
-    OSL_ENSURE( mxCompContext.is(), "VbaProject::VbaProject - missing component context" );
+    OSL_ENSURE( mxContext.is(), "VbaProject::VbaProject - missing component context" );
     OSL_ENSURE( mxDocModel.is(), "VbaProject::VbaProject - missing document model" );
 }
 
@@ -331,7 +331,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
                 OSL_ENSURE( aName.getLength() > 0, "VbaProject::importVba - invalid module name" );
                 OSL_ENSURE( !aModules.has( aName ), "VbaProject::importVba - multiple modules with the same name" );
                 VbaModuleMap::mapped_type& rxModule = aModules[ aName ];
-                rxModule.reset( new VbaModule( mxDocModel, aName, eTextEnc, bExecutable ) );
+                rxModule.reset( new VbaModule( mxContext, mxDocModel, aName, eTextEnc, bExecutable ) );
                 // read all remaining records until the MODULEEND record
                 rxModule->importDirRecords( aDirStrm );
                 OSL_ENSURE( !aModulesByStrm.has( rxModule->getStreamName() ), "VbaProject::importVba - multiple modules with the same stream name" );
@@ -368,7 +368,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
     // do not exit if this stream does not exist, but proceed to load the modules below
     if( !aPrjStrm.isEof() )
     {
-        TextInputStream aPrjTextStrm( aPrjStrm, eTextEnc );
+        TextInputStream aPrjTextStrm( mxContext, aPrjStrm, eTextEnc );
         OUString aKey, aValue;
         bool bExitLoop = false;
         while( !bExitLoop && !aPrjTextStrm.isEof() )
@@ -412,7 +412,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
     {
         OSL_ENSURE( !aModules.has( aIt->first ) && !aDummyModules.has( aIt->first ), "VbaProject::importVba - multiple modules with the same name" );
         VbaModuleMap::mapped_type& rxModule = aDummyModules[ aIt->first ];
-        rxModule.reset( new VbaModule( mxDocModel, aIt->first, eTextEnc, bExecutable ) );
+        rxModule.reset( new VbaModule( mxContext, mxDocModel, aIt->first, eTextEnc, bExecutable ) );
         rxModule->setType( aIt->second );
     }
 
@@ -491,7 +491,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
 
                 // create and import the form
                 Reference< XNameContainer > xDialogLib( createDialogLibrary(), UNO_SET_THROW );
-                VbaUserForm aForm( mxCompContext, mxDocModel, rGraphicHelper, bDefaultColorBgr );
+                VbaUserForm aForm( mxContext, mxDocModel, rGraphicHelper, bDefaultColorBgr );
                 aForm.importForm( mxDocModel, xDialogLib, *xSubStrg, aModuleName, eTextEnc );
             }
             catch( Exception& )
@@ -508,14 +508,14 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
 
 void VbaProject::attachMacros()
 {
-    if( !maMacroAttachers.empty() && mxCompContext.is() ) try
+    if( !maMacroAttachers.empty() && mxContext.is() ) try
     {
-        Reference< XMultiComponentFactory > xFactory( mxCompContext->getServiceManager(), UNO_SET_THROW );
+        Reference< XMultiComponentFactory > xFactory( mxContext->getServiceManager(), UNO_SET_THROW );
         Sequence< Any > aArgs( 2 );
         aArgs[ 0 ] <<= mxDocModel;
         aArgs[ 1 ] <<= maPrjName;
         Reference< XVBAMacroResolver > xResolver( xFactory->createInstanceWithArgumentsAndContext(
-            CREATE_OUSTRING( "com.sun.star.script.vba.VBAMacroResolver" ), aArgs, mxCompContext ), UNO_QUERY_THROW );
+            CREATE_OUSTRING( "com.sun.star.script.vba.VBAMacroResolver" ), aArgs, mxContext ), UNO_QUERY_THROW );
         maMacroAttachers.forEachMem( &VbaMacroAttacherBase::resolveAndAttachMacro, ::boost::cref( xResolver ) );
     }
     catch( Exception& )
@@ -525,15 +525,14 @@ void VbaProject::attachMacros()
 
 void VbaProject::copyStorage( StorageBase& rVbaPrjStrg )
 {
-    if( mxCompContext.is() ) try
+    if( mxContext.is() ) try
     {
-        Reference< XMultiServiceFactory > xFactory( mxCompContext->getServiceManager(), UNO_QUERY_THROW );
         Reference< XStorageBasedDocument > xStorageBasedDoc( mxDocModel, UNO_QUERY_THROW );
         Reference< XStorage > xDocStorage( xStorageBasedDoc->getDocumentStorage(), UNO_QUERY_THROW );
         {
-            using namespace ::com::sun::star::embed::ElementModes;
-            Reference< XStream > xDocStream( xDocStorage->openStreamElement( CREATE_OUSTRING( "_MS_VBA_Macros" ), SEEKABLE | WRITE | TRUNCATE ), UNO_SET_THROW );
-            OleStorage aDestStorage( xFactory, xDocStream, false );
+            const sal_Int32 nOpenMode = ElementModes::SEEKABLE | ElementModes::WRITE | ElementModes::TRUNCATE;
+            Reference< XStream > xDocStream( xDocStorage->openStreamElement( CREATE_OUSTRING( "_MS_VBA_Macros" ), nOpenMode ), UNO_SET_THROW );
+            OleStorage aDestStorage( mxContext, xDocStream, false );
             rVbaPrjStrg.copyStorageToStorage( aDestStorage );
             aDestStorage.commit();
         }
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 19bbcb239..cb185cc9a 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -148,7 +148,7 @@ Reference< XFastContextHandler > SlideFragmentHandler::createFastChildContext( s
         {
             FillPropertiesPtr pFillPropertiesPtr( new FillProperties(
                 *mpSlidePersistPtr->getTheme()->getFillStyle( xAttribs->getOptionalValue( XML_idx ).toInt32() ) ) );
-            xRet.set( new ColorContext( *this, mpSlidePersistPtr->getBackgroundColorRef() ) );
+            xRet.set( new ColorContext( *this, mpSlidePersistPtr->getBackgroundColor() ) );
             mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr );
         }
         break;
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index c436e8948..dcd3fd3c4 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -26,11 +26,12 @@
  *
  ************************************************************************/
 
-#include "oox/helper/propertyset.hxx"
 #include "oox/ppt/timenode.hxx"
 #include "oox/ppt/pptshape.hxx"
 #include "oox/ppt/slidepersist.hxx"
 #include "oox/drawingml/fillproperties.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
+#include "oox/helper/propertyset.hxx"
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 
@@ -178,24 +179,12 @@ void SlidePersist::createBackground( const XmlFilterBase& rFilterBase )
 {
     if ( mpBackgroundPropertiesPtr )
     {
-        try
-        {
-            sal_Int32 nPhClr = API_RGB_TRANSPARENT;
-            if ( maBackgroundColorRef.isUsed() )
-                nPhClr = maBackgroundColorRef.getColor( rFilterBase.getGraphicHelper() );
+        sal_Int32 nPhClr = maBackgroundColor.isUsed() ?
+            maBackgroundColor.getColor( rFilterBase.getGraphicHelper() ) : API_RGB_TRANSPARENT;
 
-            PropertyMap aPropMap;
-            static const rtl::OUString sBackground( RTL_CONSTASCII_USTRINGPARAM( "Background" ) );
-            uno::Reference< beans::XPropertySet > xPagePropSet( mxPage, uno::UNO_QUERY_THROW );
-            uno::Reference< beans::XPropertySet > xPropertySet( aPropMap.makePropertySet() );
-            PropertySet aPropSet( xPropertySet );
-            mpBackgroundPropertiesPtr->pushToPropSet( aPropSet, rFilterBase.getModelObjectHelper(),
-                rFilterBase.getGraphicHelper(), oox::drawingml::FillProperties::DEFAULT_IDS, 0, nPhClr );
-            xPagePropSet->setPropertyValue( sBackground, Any( xPropertySet ) );
-        }
-        catch( const Exception& )
-        {
-        }
+        ::oox::drawingml::ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
+        mpBackgroundPropertiesPtr->pushToPropMap( aPropMap, rFilterBase.getGraphicHelper(), 0, nPhClr );
+        PropertySet( mxPage ).setProperty( PROP_Background, aPropMap.makePropertySet() );
     }
 }
 
diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail
index 67ddce928..47702d9cb 100644
--- a/oox/source/token/namespaces.hxx.tail
+++ b/oox/source/token/namespaces.hxx.tail
@@ -10,24 +10,27 @@ inline sal_Int32 getBaseToken( sal_Int32 nToken ) { return nToken & TOKEN_MASK;
 /** Returns the namespace without token identifier of the passed token. */
 inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; }
 
+
 // defines for tokens with specific namespaces
-#define A_TOKEN( token )            (::oox::NMSP_dml | XML_##token)
-#define AX_TOKEN( token )           (::oox::NMSP_ax | XML_##token)
-#define C_TOKEN( token )            (::oox::NMSP_dmlChart | XML_##token)
-#define CDR_TOKEN( token )          (::oox::NMSP_dmlChartDr | XML_##token)
-#define DGM_TOKEN( token )          (::oox::NMSP_dmlDiagram | XML_##token)
-#define O_TOKEN( token )            (::oox::NMSP_vmlOffice | XML_##token)
-#define PC_TOKEN( token )           (::oox::NMSP_packageContentTypes | XML_##token)
-#define PPT_TOKEN( token )          (::oox::NMSP_ppt | XML_##token)
-#define PR_TOKEN( token )           (::oox::NMSP_packageRel | XML_##token)
-#define R_TOKEN( token )            (::oox::NMSP_officeRel | XML_##token)
-#define VML_TOKEN( token )          (::oox::NMSP_vml | XML_##token)
-#define VMLX_TOKEN( token )         (::oox::NMSP_vmlExcel | XML_##token)
-#define XDR_TOKEN( token )          (::oox::NMSP_dmlSpreadDr | XML_##token)
-#define XLS_TOKEN( token )          (::oox::NMSP_xls | XML_##token)
-#define XM_TOKEN( token )           (::oox::NMSP_xm | XML_##token)
-#define XML_TOKEN( token )          (::oox::NMSP_xml | XML_##token)
-#define MCE_TOKEN( token )          (::oox::NMSP_mce | XML_##token)
+#define OOX_TOKEN( namespace, token ) (::oox::NMSP_##namespace | ::oox::XML_##token)
+
+#define A_TOKEN( token )        OOX_TOKEN( dml, token )
+#define AX_TOKEN( token )       OOX_TOKEN( ax, token )
+#define C_TOKEN( token )        OOX_TOKEN( dmlChart, token )
+#define CDR_TOKEN( token )      OOX_TOKEN( dmlChartDr, token )
+#define DGM_TOKEN( token )      OOX_TOKEN( dmlDiagram, token )
+#define MCE_TOKEN( token )      OOX_TOKEN( mce, token)
+#define O_TOKEN( token )        OOX_TOKEN( vmlOffice, token )
+#define PC_TOKEN( token )       OOX_TOKEN( packageContentTypes, token )
+#define PPT_TOKEN( token )      OOX_TOKEN( ppt, token )
+#define PR_TOKEN( token )       OOX_TOKEN( packageRel, token )
+#define R_TOKEN( token )        OOX_TOKEN( officeRel, token )
+#define VML_TOKEN( token )      OOX_TOKEN( vml, token )
+#define VMLX_TOKEN( token )     OOX_TOKEN( vmlExcel, token )
+#define XDR_TOKEN( token )      OOX_TOKEN( dmlSpreadDr, token )
+#define XLS_TOKEN( token )      OOX_TOKEN( xls, token )
+#define XM_TOKEN( token )       OOX_TOKEN( xm, token )
+#define XML_TOKEN( token )      OOX_TOKEN( xml, token )
 
 // ============================================================================
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 693ccb1be..d3bf0b776 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -20,6 +20,7 @@ AutoShowInfo
 Autocomplete
 BackGraphicLocation
 BackGraphicURL
+Background
 BackgroundColor
 BasicLibraries
 BlackDay
@@ -81,6 +82,9 @@ CharUnderlineHasColor
 CharWeight
 CharWeightAsian
 CharWeightComplex
+CircleEndAngle
+CircleKind
+CircleStartAngle
 CodeName
 Color
 ColumnGrand
@@ -317,6 +321,7 @@ PercentageNumberFormat
 PersistName
 Perspective
 PolyPolygon
+PolygonKind
 Position
 PositionBottom
 PositionLeft
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index dc8a0ba3a..3c3135465 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -215,8 +215,8 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService,
     Reference< XShape > xShape;
     if( (rService.getLength() > 0) && rxShapes.is() ) try
     {
-        Reference< XMultiServiceFactory > xFactory( mrFilter.getModelFactory(), UNO_SET_THROW );
-        xShape.set( xFactory->createInstance( rService ), UNO_QUERY_THROW );
+        Reference< XMultiServiceFactory > xModelFactory( mrFilter.getModelFactory(), UNO_SET_THROW );
+        xShape.set( xModelFactory->createInstance( rService ), UNO_QUERY_THROW );
         // insert shape into passed shape collection (maybe drawpage or group shape)
         rxShapes->add( xShape );
         xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) );
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index 4826d65b3..255b5c032 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -28,6 +28,7 @@
 
 #include "oox/vml/vmldrawingfragment.hxx"
 
+#include "oox/core/xmlfilterbase.hxx"
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmlinputstream.hxx"
 #include "oox/vml/vmlshapecontext.hxx"
@@ -54,7 +55,7 @@ DrawingFragment::DrawingFragment( XmlFilterBase& rFilter, const OUString& rFragm
 Reference< XInputStream > DrawingFragment::openFragmentStream() const
 {
     // #i104719# create an input stream that preprocesses the VML data
-    return new InputStream( FragmentHandler2::openFragmentStream() );
+    return new InputStream( getFilter().getComponentContext(), FragmentHandler2::openFragmentStream() );
 }
 
 ContextHandlerRef DrawingFragment::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index f508f992b..7635bb7d9 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -33,9 +33,9 @@
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/drawingml/lineproperties.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/graphichelper.hxx"
-#include "oox/helper/propertymap.hxx"
 
 namespace oox {
 namespace vml {
@@ -48,6 +48,7 @@ using ::oox::drawingml::Color;
 using ::oox::drawingml::FillProperties;
 using ::oox::drawingml::LineArrowProperties;
 using ::oox::drawingml::LineProperties;
+using ::oox::drawingml::ShapePropertyMap;
 using ::rtl::OStringBuffer;
 using ::rtl::OUString;
 
@@ -110,7 +111,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
     return fDefValue;
 }
 
-/*static*/ sal_Int32 ConversionHelper::decodeMeasureToEmu( const GraphicHelper& rGraphicHelper,
+/*static*/ sal_Int64 ConversionHelper::decodeMeasureToEmu( const GraphicHelper& rGraphicHelper,
         const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel )
 {
     // default for missing values is 0
@@ -153,10 +154,11 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
             fValue *= 12700.0;
         else if( (cChar1 == 'p') && (cChar2 == 'c') )   // 1 pica = 1/6 inch = 152,400 EMU
             fValue *= 152400.0;
-        else if( (cChar1 == 'p') && (cChar2 == 'x') )   // 1 pixel, dependent on output device, factor 360 to convert 1/100mm to EMU
-            fValue = bPixelX ?
-                rGraphicHelper.convertScreenPixelXToHmm( 360.0 * fValue ) :
-                rGraphicHelper.convertScreenPixelYToHmm( 360.0 * fValue );
+        else if( (cChar1 == 'p') && (cChar2 == 'x') )   // 1 pixel, dependent on output device
+            fValue = static_cast< double >( ::oox::drawingml::convertHmmToEmu(
+                bPixelX ?
+                    rGraphicHelper.convertScreenPixelXToHmm( fValue ) :
+                    rGraphicHelper.convertScreenPixelYToHmm( fValue ) ) );
     }
     else if( (aUnit.getLength() == 1) && (aUnit[ 0 ] == '%') )
     {
@@ -167,13 +169,13 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
         OSL_FAIL( "ConversionHelper::decodeMeasureToEmu - unknown measure unit" );
         fValue = nRefValue;
     }
-    return static_cast< sal_Int32 >( fValue + 0.5 );
+    return static_cast< sal_Int64 >( fValue + 0.5 );
 }
 
 /*static*/ sal_Int32 ConversionHelper::decodeMeasureToHmm( const GraphicHelper& rGraphicHelper,
         const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel )
 {
-    return (decodeMeasureToEmu( rGraphicHelper, rValue, nRefValue, bPixelX, bDefaultAsPixel ) + 180) / 360;
+    return ::oox::drawingml::convertEmuToHmm( decodeMeasureToEmu( rGraphicHelper, rValue, nRefValue, bPixelX, bDefaultAsPixel ) );
 }
 
 /*static*/ Color ConversionHelper::decodeColor( const GraphicHelper& rGraphicHelper,
@@ -272,7 +274,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
 
 namespace {
 
-sal_Int32 lclGetEmu( const GraphicHelper& rGraphicHelper, const OptValue< OUString >& roValue, sal_Int32 nDefValue )
+sal_Int64 lclGetEmu( const GraphicHelper& rGraphicHelper, const OptValue< OUString >& roValue, sal_Int64 nDefValue )
 {
     return roValue.has() ? ConversionHelper::decodeMeasureToEmu( rGraphicHelper, roValue.get(), 0, false, false ) : nDefValue;
 }
@@ -416,8 +418,7 @@ void StrokeModel::assignUsed( const StrokeModel& rSource )
     moJoinStyle.assignIfUsed( rSource.moJoinStyle );
 }
 
-void StrokeModel::pushToPropMap( PropertyMap& rPropMap,
-        ModelObjectHelper& rModelObjectHelper, const GraphicHelper& rGraphicHelper ) const
+void StrokeModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper& rGraphicHelper ) const
 {
     /*  Convert VML line formatting to DrawingML line formatting and let the
         DrawingML code do the hard work. */
@@ -429,7 +430,7 @@ void StrokeModel::pushToPropMap( PropertyMap& rPropMap,
         lclConvertArrow( aLineProps.maStartArrow, maStartArrow );
         lclConvertArrow( aLineProps.maEndArrow, maEndArrow );
         aLineProps.maLineFill.maFillColor = ConversionHelper::decodeColor( rGraphicHelper, moColor, moOpacity, API_RGB_BLACK );
-        aLineProps.moLineWidth = lclGetEmu( rGraphicHelper, moWeight, 1 );
+        aLineProps.moLineWidth = getLimitedValue< sal_Int32, sal_Int64 >( lclGetEmu( rGraphicHelper, moWeight, 1 ), 0, SAL_MAX_INT32 );
         lclGetDmlLineDash( aLineProps.moPresetDash, aLineProps.maCustomDash, moDashStyle );
         aLineProps.moLineCompound = lclGetDmlLineCompound( moLineStyle );
         aLineProps.moLineCap = lclGetDmlLineCap( moEndCap );
@@ -440,7 +441,7 @@ void StrokeModel::pushToPropMap( PropertyMap& rPropMap,
         aLineProps.maLineFill.moFillType = XML_noFill;
     }
 
-    aLineProps.pushToPropMap( rPropMap, rModelObjectHelper, rGraphicHelper );
+    aLineProps.pushToPropMap( rPropMap, rGraphicHelper );
 }
 
 // ============================================================================
@@ -461,8 +462,7 @@ void FillModel::assignUsed( const FillModel& rSource )
     moRotate.assignIfUsed( rSource.moRotate );
 }
 
-void FillModel::pushToPropMap( PropertyMap& rPropMap,
-        ModelObjectHelper& rModelObjectHelper, const GraphicHelper& rGraphicHelper ) const
+void FillModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper& rGraphicHelper ) const
 {
     /*  Convert VML fill formatting to DrawingML fill formatting and let the
         DrawingML code do the hard work. */
@@ -579,7 +579,7 @@ void FillModel::pushToPropMap( PropertyMap& rPropMap,
         aFillProps.moFillType = XML_noFill;
     }
 
-    aFillProps.pushToPropMap( rPropMap, rModelObjectHelper, rGraphicHelper );
+    aFillProps.pushToPropMap( rPropMap, rGraphicHelper );
 }
 
 // ============================================================================
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 60ce1163b..05235fe39 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -28,10 +28,12 @@
 
 #include "oox/vml/vmlinputstream.hxx"
 
+#include <com/sun/star/io/XTextInputStream.hpp>
 #include <map>
-#include <rtl/strbuf.hxx>
+#include <string.h>
 #include <rtl/strbuf.hxx>
 #include "oox/helper/helper.hxx"
+#include "oox/helper/textinputstream.hxx"
 
 namespace oox {
 namespace vml {
@@ -56,7 +58,7 @@ inline const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char*
 
 inline bool lclIsWhiteSpace( sal_Char cChar )
 {
-    return (cChar == ' ') || (cChar == '\t') || (cChar == '\n') || (cChar == '\r');
+    return cChar < 32;
 }
 
 const sal_Char* lclFindWhiteSpace( const sal_Char* pcBeg, const sal_Char* pcEnd )
@@ -152,14 +154,78 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal
         lclAppendToBuffer( rBuffer, pcBeg, pcEnd );
 }
 
-void lclProcessContents( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
+void lclProcessElement( OStringBuffer& rBuffer, const OString& rElement )
+{
+    // check that passed string starts and ends with the brackets of an XML element
+    sal_Int32 nElementLen = rElement.getLength();
+    if( nElementLen == 0 )
+        return;
+        
+    const sal_Char* pcOpen = rElement.getStr();
+    const sal_Char* pcClose = pcOpen + nElementLen - 1;
+
+    // no complete element found
+    if( (pcOpen >= pcClose) || (*pcOpen != '<') || (*pcClose != '>') )
+    {
+        // just append all passed characters
+        rBuffer.append( rElement );
+    }
+
+    // skip parser instructions: '<![...]>'
+    else if( (nElementLen >= 5) && (pcOpen[ 1 ] == '!') && (pcOpen[ 2 ] == '[') && (pcClose[ -1 ] == ']') )
+    {
+        // do nothing
+    }
+
+    // replace '<br>' element with newline
+    else if( (nElementLen >= 4) && (pcOpen[ 1 ] == 'b') && (pcOpen[ 2 ] == 'r') && (lclFindNonWhiteSpace( pcOpen + 3, pcClose ) == pcClose) )
+    {
+        rBuffer.append( '\n' );
+    }
+
+    // check start elements and simple elements for repeated attributes
+    else if( pcOpen[ 1 ] != '/' )
+    {
+        // find positions of text content inside brackets, exclude '/' in '<simpleelement/>'
+        const sal_Char* pcContentBeg = pcOpen + 1;
+        bool bIsEmptyElement = pcClose[ -1 ] == '/';
+        const sal_Char* pcContentEnd = bIsEmptyElement ? (pcClose - 1) : pcClose;
+        // append opening bracket and element name to buffer
+        const sal_Char* pcWhiteSpace = lclFindWhiteSpace( pcContentBeg, pcContentEnd );
+        lclAppendToBuffer( rBuffer, pcOpen, pcWhiteSpace );
+        // find begin of attributes, and process all attributes
+        const sal_Char* pcAttribBeg = lclFindNonWhiteSpace( pcWhiteSpace, pcContentEnd );
+        if( pcAttribBeg < pcContentEnd )
+            lclProcessAttribs( rBuffer, pcAttribBeg, pcContentEnd );
+        // close the element
+        if( bIsEmptyElement )
+            rBuffer.append( '/' );
+        rBuffer.append( '>' );
+    }
+
+    // append end elements without further processing
+    else
+    {
+        rBuffer.append( rElement );
+    }
+}
+
+bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars )
 {
     /*  MSO has a very weird way to store and handle whitespaces. The stream
         may contain lots of spaces, tabs, and newlines which have to be handled
         as single space character. This will be done in this function.
 
         If the element text contains a literal line break, it will be stored as
-        <br> tag (without matching closing </br> element).
+        <br> tag (without matching </br> element). This input stream wrapper
+        will replace this element with a literal LF character (see below).
+
+        A single space character for its own is stored as is. Example: The
+        element
+            <font> </font>
+        represents a single space character. The XML parser will ignore this
+        space character completely without issuing a 'characters' event. The
+        VML import filter implementation has to react on this case manually.
 
         A single space character following another character is stored
         literally and must not be stipped away here. Example: The element
@@ -168,20 +234,23 @@ void lclProcessContents( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sa
         
         Consecutive space characters, or a leading single space character, are
         stored in a <span> element. If there are N space characters (N > 1),
-        then the <span> element contains exactly (N-1) NBSP characters
-        (non-breaking space), followed by a regular space character. Example:
+        then the <span> element contains exactly (N-1) NBSP (non-breaking
+        space) characters, followed by a regular space character. Examples:
         The element
             <font><span style='mso-spacerun:yes'>\xA0\xA0\xA0 </span></font>
         represents 4 consecutive space characters. Has to be handled by the
-        implementation.
-        
-        A single space character for its own is stored in an empty element.
-        Example: The element
-            <font></font>
-        represents a single space character. Has to be handled by the
-        implementation.
+        implementation. The element
+            <font><span style='mso-spacerun:yes'> abc</span></font>
+        represents a space characters followed by the letters a, b, c. These
+        strings have to be handled by the VML import filter implementation.
      */
 
+    // passed string ends with the leading opening bracket of an XML element
+    const sal_Char* pcBeg = rChars.getStr();
+    const sal_Char* pcEnd = pcBeg + rChars.getLength();
+    bool bHasBracket = (pcBeg < pcEnd) && (pcEnd[ -1 ] == '<');
+    if( bHasBracket ) --pcEnd;
+
     // skip leading whitespace
     const sal_Char* pcContentsBeg = lclFindNonWhiteSpace( pcBeg, pcEnd );
     while( pcContentsBeg < pcEnd )
@@ -192,136 +261,139 @@ void lclProcessContents( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sa
             rBuffer.append( ' ' );
         pcContentsBeg = lclFindNonWhiteSpace( pcWhitespaceBeg, pcEnd );
     }
+
+    return bHasBracket;
 }
 
 } // namespace
 
 // ============================================================================
 
-StreamDataContainer::StreamDataContainer( const Reference< XInputStream >& rxInStrm )
+InputStream::InputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm ) :
+    // use single-byte ISO-8859-1 encoding which maps all byte characters to the first 256 Unicode characters
+    mxTextStrm( TextInputStream::createXTextInputStream( rxContext, rxInStrm, RTL_TEXTENCODING_ISO_8859_1 ) ),
+    maOpeningBracket( 1 ),
+    maClosingBracket( 1 ),
+    maOpeningCData( CREATE_OSTRING( "<![CDATA[" ) ),
+    maClosingCData( CREATE_OSTRING( "]]>" ) ),
+    mnBufferPos( 0 )
 {
-    if( rxInStrm.is() ) try
+    maOpeningBracket[ 0 ] = '<';
+    maClosingBracket[ 0 ] = '>';
+}
+
+InputStream::~InputStream()
+{
+}
+
+sal_Int32 SAL_CALL InputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
+        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+{
+    if( nBytesToRead < 0 )
+        throw IOException();
+
+    rData.realloc( nBytesToRead );
+    sal_Int8* pcDest = rData.getArray();
+    sal_Int32 nRet = 0;
+    while( (nBytesToRead > 0) && !mxTextStrm->isEOF() )
     {
-        // read all bytes we can read
-        rxInStrm->readBytes( maDataSeq, SAL_MAX_INT32 );
+        updateBuffer();
+        sal_Int32 nReadSize = ::std::min( nBytesToRead, maBuffer.getLength() - mnBufferPos );
+        if( nReadSize > 0 )
+        {
+            memcpy( pcDest + nRet, maBuffer.getStr() + mnBufferPos, static_cast< size_t >( nReadSize ) );
+            mnBufferPos += nReadSize;
+            nBytesToRead -= nReadSize;
+            nRet += nReadSize;
+        }
     }
-    catch( Exception& )
+    if( nRet < rData.getLength() )
+        rData.realloc( nRet );
+    return nRet;
+}
+
+sal_Int32 SAL_CALL InputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
+        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+{
+    return readBytes( rData, nMaxBytesToRead );
+}
+
+void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
+        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+{
+    if( nBytesToSkip < 0 )
+        throw IOException();
+
+    while( (nBytesToSkip > 0) && !mxTextStrm->isEOF() )
     {
+        updateBuffer();
+        sal_Int32 nSkipSize = ::std::min( nBytesToSkip, maBuffer.getLength() - mnBufferPos );
+        mnBufferPos += nSkipSize;
+        nBytesToSkip -= nSkipSize;
     }
+}
 
-    if( maDataSeq.hasElements() )
+sal_Int32 SAL_CALL InputStream::available() throw (NotConnectedException, IOException, RuntimeException)
+{
+    updateBuffer();
+    return maBuffer.getLength() - mnBufferPos;
+}
+
+void SAL_CALL InputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException)
+{
+    mxTextStrm->closeInput();
+}
+
+// private --------------------------------------------------------------------
+
+void InputStream::updateBuffer() throw (IOException, RuntimeException)
+{
+    while( (mnBufferPos >= maBuffer.getLength()) && !mxTextStrm->isEOF() )
     {
-        const OString aCDataOpen = CREATE_OSTRING( "<![CDATA[" );
-        const OString aCDataClose = CREATE_OSTRING( "]]>" );
-        
+        // collect new contents in a string buffer
         OStringBuffer aBuffer;
-        aBuffer.ensureCapacity( maDataSeq.getLength() + 256 );
-        const sal_Char* pcCurr = reinterpret_cast< const sal_Char* >( maDataSeq.getConstArray() );
-        const sal_Char* pcEnd = pcCurr + maDataSeq.getLength();
-        while( pcCurr < pcEnd )
-        {
-            // look for the next opening angle bracket
-            const sal_Char* pcOpen = lclFindCharacter( pcCurr, pcEnd, '<' );
-            
-            // copy all characters from current position to opening bracket
-            lclProcessContents( aBuffer, pcCurr, pcOpen );
-
-            // nothing to do if no opening bracket has been found
-            if( pcOpen < pcEnd )
-            {
-                // string length from opening bracket to end
-                sal_Int32 nLengthToEnd = static_cast< sal_Int32 >( pcEnd - pcOpen );
 
-                // check for CDATA part, starting with '<![CDATA['
-                if( rtl_str_compare_WithLength( pcOpen, nLengthToEnd, aCDataOpen.getStr(), aCDataOpen.getLength() ) == 0 )
-                {
-                    // search the position after the end tag ']]>'
-                    sal_Int32 nClosePos = rtl_str_indexOfStr_WithLength( pcOpen, nLengthToEnd, aCDataClose.getStr(), aCDataClose.getLength() );
-                    pcCurr = (nClosePos < 0) ? pcEnd : (pcOpen + nClosePos + aCDataClose.getLength());
-                    // copy the entire CDATA part
-                    lclAppendToBuffer( aBuffer, pcOpen, pcCurr );
-                }
+        // read and process characters until the opening bracket of the next XML element
+        OString aChars = readToElementBegin();
+        bool bHasOpeningBracket = lclProcessCharacters( aBuffer, aChars );
 
-                // no CDATA part - process the element starting at pcOpen
-                else
-                {
-                    // look for the next closing angle bracket
-                    const sal_Char* pcClose = lclFindCharacter( pcOpen + 1, pcEnd, '>' );
-                    // complete element found?
-                    if( pcClose < pcEnd )
-                    {
-                        // continue after closing bracket
-                        pcCurr = pcClose + 1;
-                        // length of entire element with angle brackets
-                        sal_Int32 nElementLen = static_cast< sal_Int32 >( pcCurr - pcOpen );
-
-                        // skip parser instructions: '<![...]>'
-                        if( (nElementLen >= 5) && (pcOpen[ 1 ] == '!') && (pcOpen[ 2 ] == '[') && (pcClose[ -1 ] == ']') )
-                        {
-                            // do nothing
-                        }
-
-                        // replace '<br>' element with newline
-                        else if( (nElementLen >= 4) && (pcOpen[ 1 ] == 'b') && (pcOpen[ 2 ] == 'r') && (lclFindNonWhiteSpace( pcOpen + 3, pcClose ) == pcClose) )
-                        {
-                            aBuffer.append( '\n' );
-                        }
-
-                        // check start elements and empty elements for repeated attributes
-                        else if( pcOpen[ 1 ] != '/' )
-                        {
-                            // find positions of text content inside brackets, exclude '/' in '<emptyelement/>'
-                            const sal_Char* pcContentBeg = pcOpen + 1;
-                            bool bIsEmptyElement = pcClose[ -1 ] == '/';
-                            const sal_Char* pcContentEnd = bIsEmptyElement ? (pcClose - 1) : pcClose;
-                            // append element name to buffer
-                            const sal_Char* pcWhiteSpace = lclFindWhiteSpace( pcContentBeg, pcContentEnd );
-                            lclAppendToBuffer( aBuffer, pcOpen, pcWhiteSpace );
-                            // find begin of attributes, and process all attributes
-                            const sal_Char* pcAttribBeg = lclFindNonWhiteSpace( pcWhiteSpace, pcContentEnd );
-                            if( pcAttribBeg < pcContentEnd )
-                                lclProcessAttribs( aBuffer, pcAttribBeg, pcContentEnd );
-                            // close the element
-                            if( bIsEmptyElement )
-                                aBuffer.append( '/' );
-                            aBuffer.append( '>' );
-                        }
-
-                        // append end elements without further processing
-                        else
-                        {
-                            lclAppendToBuffer( aBuffer, pcOpen, pcCurr );
-                        }
-                    }
-                    else
-                    {
-                        // no complete element found, copy all from opening bracket to end
-                        lclAppendToBuffer( aBuffer, pcOpen, pcEnd );
-                        pcCurr = pcEnd;
-                    }
-                }
+        // read and process characters until (and including) closing bracket (an XML element)
+        OSL_ENSURE( bHasOpeningBracket || mxTextStrm->isEOF(), "InputStream::updateBuffer - missing opening bracket of XML element" );
+        if( bHasOpeningBracket && !mxTextStrm->isEOF() )
+        {
+            // read the element text (add the leading opening bracket manually)
+            OString aElement = OString( '<' ) + readToElementEnd();
+            // check for CDATA part, starting with '<![CDATA['
+            if( aElement.match( maOpeningCData ) )
+            {
+                // search the end tag ']]>'
+                while( ((aElement.getLength() < maClosingCData.getLength()) || !aElement.match( maClosingCData, aElement.getLength() - maClosingCData.getLength() )) && !mxTextStrm->isEOF() )
+                    aElement += readToElementEnd();
+                // copy the entire CDATA part
+                aBuffer.append( aElement );
             }
             else
             {
-                pcCurr = pcEnd;
+                // no CDATA part - process the contents of the element
+                lclProcessElement( aBuffer, aElement );
             }
         }
 
-        // set the final data sequence
-        maDataSeq = ::comphelper::ByteSequence( reinterpret_cast< const sal_Int8* >( aBuffer.getStr() ), aBuffer.getLength() );
+        maBuffer = aBuffer.makeStringAndClear();
+        mnBufferPos = 0;
     }
 }
 
-// ============================================================================
-
-InputStream::InputStream( const Reference< XInputStream >& rxInStrm ) :
-    StreamDataContainer( rxInStrm ),
-    ::comphelper::SequenceInputStream( maDataSeq )
+OString InputStream::readToElementBegin() throw (IOException, RuntimeException)
 {
+    return OUStringToOString( mxTextStrm->readString( maOpeningBracket, sal_False ), RTL_TEXTENCODING_ISO_8859_1 );
 }
 
-InputStream::~InputStream()
+OString InputStream::readToElementEnd() throw (IOException, RuntimeException)
 {
+    OString aText = OUStringToOString( mxTextStrm->readString( maClosingBracket, sal_False ), RTL_TEXTENCODING_ISO_8859_1 );
+    OSL_ENSURE( (aText.getLength() > 0) && (aText[ aText.getLength() - 1 ] == '>'), "InputStream::readToElementEnd - missing closing bracket of XML element" );
+    return aText;
 }
 
 // ============================================================================
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 32bcea5be..95b7fbb6f 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -42,8 +42,10 @@
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextFrame.hpp>
+#include <rtl/math.hxx>
+#include <rtl/ustrbuf.hxx>
+#include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/graphichelper.hxx"
-#include "oox/helper/propertymap.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/ole/axcontrol.hxx"
 #include "oox/ole/axcontrolfragment.hxx"
@@ -353,9 +355,10 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
             xShape = implConvertAndInsert( rxShapes, aShapeRect );
             if( xShape.is() )
             {
-                // set shape name (imported or generated)
+                // set imported or generated shape name (not supported by form controls)
                 PropertySet aShapeProp( xShape );
-                aShapeProp.setProperty( PROP_Name, getShapeName() );
+                if( aShapeProp.hasProperty( PROP_Name ) )
+                    aShapeProp.setProperty( PROP_Name, getShapeName() );
 
                 /*  Notify the drawing that a new shape has been inserted. For
                     convenience, pass the rectangle that contains position and
@@ -401,15 +404,11 @@ Rectangle ShapeBase::calcShapeRectangle( const ShapeParentAnchor* pParentAnchor
 
 void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) const
 {
-    ModelObjectHelper& rModelObjectHelper = mrDrawing.getFilter().getModelObjectHelper();
+    ::oox::drawingml::ShapePropertyMap aPropMap( mrDrawing.getFilter().getModelObjectHelper() );
     const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper();
-    
-    PropertyMap aPropMap;
-    maTypeModel.maStrokeModel.pushToPropMap( aPropMap, rModelObjectHelper, rGraphicHelper );
-    maTypeModel.maFillModel.pushToPropMap( aPropMap, rModelObjectHelper, rGraphicHelper );
-
-    PropertySet aPropSet( rxShape );
-    aPropSet.setProperties( aPropMap );
+    maTypeModel.maStrokeModel.pushToPropMap( aPropMap, rGraphicHelper );
+    maTypeModel.maFillModel.pushToPropMap( aPropMap, rGraphicHelper );
+    PropertySet( rxShape ).setProperties( aPropMap );
 }
 
 // ============================================================================
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 3d08e085e..4a4149286 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -75,6 +75,8 @@ TextPortionContext::TextPortionContext( ContextHandler2Helper& rParent,
             OSL_ENSURE( !maFont.mobStrikeout, "TextPortionContext::TextPortionContext - nested <s> elements" );
             maFont.mobStrikeout = true;
         break;
+        case XML_span:
+        break;
         default:
             OSL_ENSURE( false, "TextPortionContext::TextPortionContext - unknown element" );
     }
@@ -92,7 +94,7 @@ void TextPortionContext::onCharacters( const OUString& rChars )
     {
         case XML_span:
             // replace all NBSP characters with SP
-            mrTextBox.appendPortion( maFont, rChars.replace( 160, ' ' ) );
+            mrTextBox.appendPortion( maFont, rChars.replace( 0xA0, ' ' ) );
         break;
         default:
             mrTextBox.appendPortion( maFont, rChars );
@@ -101,19 +103,23 @@ void TextPortionContext::onCharacters( const OUString& rChars )
 
 void TextPortionContext::onEndElement()
 {
-    /*  An empty child element without own child elements represents a single
-        space character, for example:
-
-            <font>
-              <i>abc</i>
-              <font></font>
-              <b>def</b>
-            </font>
-            
+    /*  A child element without own child elements may contain a single space
+        character, for example:
+
+          <div>
+            <font><i>abc</i></font>
+            <font> </font>
+            <font><b>def</b></font>
+          </div>
+
         represents the italic text 'abc', an unformatted space character, and
-        the bold text 'def'.
+        the bold text 'def'. Unfortunately, the XML parser skips the space
+        character without issuing a 'characters' event. The class member
+        'mnInitialPortions' contains the number of text portions existing when
+        this context has been constructed. If no text has been added in the
+        meantime, the space character has to be added manually.
      */
-    if( (mnInitialPortions > 0) && (mrTextBox.getPortionCount() == mnInitialPortions) )
+    if( mrTextBox.getPortionCount() == mnInitialPortions )
         mrTextBox.appendPortion( maFont, OUString( sal_Unicode( ' ' ) ) );
 }
 
@@ -143,4 +149,3 @@ ContextHandlerRef TextBoxContext::onCreateContext( sal_Int32 nElement, const Att
 
 } // namespace vml
 } // namespace oox
-
diff --git a/oox/source/xls/addressconverter.cxx b/oox/source/xls/addressconverter.cxx
index d3535dae3..7b89e06f3 100644
--- a/oox/source/xls/addressconverter.cxx
+++ b/oox/source/xls/addressconverter.cxx
@@ -99,12 +99,12 @@ const sal_Unicode BIFF_DCON_ENCODED = '\x01';       /// First character of an en
 const sal_Unicode BIFF_DCON_INTERN  = '\x02';       /// First character of an encoded sheet name from DCON* records.
 
 
-inline sal_uInt16 lclGetBiffAddressSize( bool bCol16Bit, bool bRow32Bit )
+inline sal_uInt8 lclGetBiffAddressSize( bool bCol16Bit, bool bRow32Bit )
 {
     return (bCol16Bit ? 2 : 1) + (bRow32Bit ? 4 : 2);
 }
 
-inline sal_uInt16 lclGetBiffRangeSize( bool bCol16Bit, bool bRow32Bit )
+inline sal_uInt8 lclGetBiffRangeSize( bool bCol16Bit, bool bRow32Bit )
 {
     return 2 * lclGetBiffAddressSize( bCol16Bit, bRow32Bit );
 }
diff --git a/oox/source/xls/autofilterbuffer.cxx b/oox/source/xls/autofilterbuffer.cxx
index 39b69a7b7..d657ced5a 100644
--- a/oox/source/xls/autofilterbuffer.cxx
+++ b/oox/source/xls/autofilterbuffer.cxx
@@ -841,7 +841,7 @@ bool AutoFilterBuffer::finalizeImport( const Reference< XDatabaseRange >& rxData
 AutoFilter* AutoFilterBuffer::getActiveAutoFilter()
 {
     // Excel expects not more than one auto filter per sheet or table
-    OSL_ENSURE( maAutoFilters.size() == 1, "AutoFilterBuffer::getActiveAutoFilter - too many auto filters" );
+    OSL_ENSURE( maAutoFilters.size() <= 1, "AutoFilterBuffer::getActiveAutoFilter - too many auto filters" );
     // stick to the last imported auto filter
     return maAutoFilters.empty() ? 0 : maAutoFilters.back().get();
 }
diff --git a/oox/source/xls/biffdetector.cxx b/oox/source/xls/biffdetector.cxx
index db8764c3e..b528a34ba 100644
--- a/oox/source/xls/biffdetector.cxx
+++ b/oox/source/xls/biffdetector.cxx
@@ -83,14 +83,14 @@ BiffDetector::~BiffDetector()
 /*static*/ BiffType BiffDetector::detectStreamBiffVersion( BinaryInputStream& rInStream )
 {
     BiffType eBiff = BIFF_UNKNOWN;
-    if( !rInStream.isEof() && rInStream.isSeekable() && (rInStream.getLength() > 4) )
+    if( !rInStream.isEof() && rInStream.isSeekable() && (rInStream.size() > 4) )
     {
         sal_Int64 nOldPos = rInStream.tell();
         rInStream.seekToStart();
         sal_uInt16 nBofId, nBofSize;
         rInStream >> nBofId >> nBofSize;
 
-        if( (4 <= nBofSize) && (nBofSize <= 16) && (rInStream.tell() + nBofSize <= rInStream.getLength()) )
+        if( (4 <= nBofSize) && (nBofSize <= 16) && (rInStream.tell() + nBofSize <= rInStream.size()) )
         {
             switch( nBofId )
             {
@@ -207,9 +207,8 @@ OUString SAL_CALL BiffDetector::detect( Sequence< PropertyValue >& rDescriptor )
     MediaDescriptor aDescriptor( rDescriptor );
     aDescriptor.addInputStream();
 
-    Reference< XMultiServiceFactory > xFactory( mxContext->getServiceManager(), UNO_QUERY_THROW );
     Reference< XInputStream > xInStrm( aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY_THROW );
-    StorageRef xStorage( new ::oox::ole::OleStorage( xFactory, xInStrm, true ) );
+    StorageRef xStorage( new ::oox::ole::OleStorage( mxContext, xInStrm, true ) );
 
     OUString aWorkbookName;
     switch( detectStorageBiffVersion( aWorkbookName, xStorage ) )
diff --git a/oox/source/xls/biffhelper.cxx b/oox/source/xls/biffhelper.cxx
index 8510cc83e..4d91402fa 100644
--- a/oox/source/xls/biffhelper.cxx
+++ b/oox/source/xls/biffhelper.cxx
@@ -270,7 +270,7 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm,
 
 // BIFF12 import --------------------------------------------------------------
 
-/*static*/ OUString BiffHelper::readString( SequenceInputStream& rStrm, bool b32BitLen )
+/*static*/ OUString BiffHelper::readString( SequenceInputStream& rStrm, bool b32BitLen, bool bAllowNulChars )
 {
     OUString aString;
     if( !rStrm.isEof() )
@@ -280,16 +280,9 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm,
         OSL_ENSURE( !rStrm.isEof() && (nCharCount >= -1), "BiffHelper::readString - invalid string length" );
         if( !rStrm.isEof() && (nCharCount > 0) )
         {
-            ::std::vector< sal_Unicode > aBuffer;
-            aBuffer.reserve( getLimitedValue< size_t, sal_Int32 >( nCharCount + 1, 0, 0xFFFF ) );
-            for( sal_Int32 nCharIdx = 0; !rStrm.isEof() && (nCharIdx < nCharCount); ++nCharIdx )
-            {
-                sal_uInt16 nChar;
-                rStrm.readValue( nChar );
-                aBuffer.push_back( static_cast< sal_Unicode >( nChar ) );
-            }
-            aBuffer.push_back( 0 );
-            aString = OUString( &aBuffer.front() );
+            // SequenceInputStream always supports getRemaining()
+            nCharCount = ::std::min( nCharCount, static_cast< sal_Int32 >( rStrm.getRemaining() / 2 ) );
+            aString = rStrm.readUnicodeArray( nCharCount, bAllowNulChars );
         }
     }
     return aString;
diff --git a/oox/source/xls/biffinputstream.cxx b/oox/source/xls/biffinputstream.cxx
index aba64c0f7..0b3f2b1d1 100644
--- a/oox/source/xls/biffinputstream.cxx
+++ b/oox/source/xls/biffinputstream.cxx
@@ -88,7 +88,7 @@ void BiffInputRecordBuffer::enableDecoder( bool bEnable )
 
 bool BiffInputRecordBuffer::startRecord( sal_Int64 nHeaderPos )
 {
-    mbValidHeader = (0 <= nHeaderPos) && (nHeaderPos + 4 <= mrInStrm.getLength());
+    mbValidHeader = (0 <= nHeaderPos) && (nHeaderPos + 4 <= mrInStrm.size());
     if( mbValidHeader )
     {
         mnHeaderPos = nHeaderPos;
@@ -96,7 +96,7 @@ bool BiffInputRecordBuffer::startRecord( sal_Int64 nHeaderPos )
         mrInStrm >> mnRecId >> mnRecSize;
         mnBodyPos = mrInStrm.tell();
         mnNextHeaderPos = mnBodyPos + mnRecSize;
-        mbValidHeader = !mrInStrm.isEof() && (mnNextHeaderPos <= mrInStrm.getLength());
+        mbValidHeader = !mrInStrm.isEof() && (mnNextHeaderPos <= mrInStrm.size());
     }
     if( !mbValidHeader )
     {
@@ -117,7 +117,7 @@ bool BiffInputRecordBuffer::startNextRecord()
 sal_uInt16 BiffInputRecordBuffer::getNextRecId()
 {
     sal_uInt16 nRecId = BIFF_ID_UNKNOWN;
-    if( mbValidHeader && (mnNextHeaderPos + 4 <= mrInStrm.getLength()) )
+    if( mbValidHeader && (mnNextHeaderPos + 4 <= mrInStrm.size()) )
     {
         mrInStrm.seek( mnNextHeaderPos );
         mrInStrm >> nRecId;
@@ -170,6 +170,7 @@ void BiffInputRecordBuffer::updateDecoded()
 // ============================================================================
 
 BiffInputStream::BiffInputStream( BinaryInputStream& rInStream, bool bContLookup ) :
+    BinaryStreamBase( true ),
     maRecBuffer( rInStream ),
     mnRecHandle( -1 ),
     mnRecId( BIFF_ID_UNKNOWN ),
@@ -258,9 +259,11 @@ sal_uInt16 BiffInputStream::getNextRecId()
 
 // BinaryStreamBase interface (seeking) ---------------------------------------
 
-bool BiffInputStream::isSeekable() const
+sal_Int64 BiffInputStream::size() const
 {
-    return true;
+    if( !mbHasComplRec )
+        const_cast< BiffInputStream* >( this )->calcRecordLength();
+    return mnComplRecSize;
 }
 
 sal_Int64 BiffInputStream::tell() const
@@ -268,13 +271,6 @@ sal_Int64 BiffInputStream::tell() const
     return mbEof ? -1 : (mnCurrRecSize - maRecBuffer.getRecLeft());
 }
 
-sal_Int64 BiffInputStream::getLength() const
-{
-    if( !mbHasComplRec )
-        const_cast< BiffInputStream* >( this )->calcRecordLength();
-    return mnComplRecSize;
-}
-
 void BiffInputStream::seek( sal_Int64 nRecPos )
 {
     if( isInRecord() )
@@ -286,35 +282,35 @@ void BiffInputStream::seek( sal_Int64 nRecPos )
     }
 }
 
+void BiffInputStream::close()
+{
+}
+
 sal_Int64 BiffInputStream::tellBase() const
 {
     return maRecBuffer.getBaseStream().tell();
 }
 
-sal_Int64 BiffInputStream::getBaseLength() const
+sal_Int64 BiffInputStream::sizeBase() const
 {
-    return maRecBuffer.getBaseStream().getLength();
+    return maRecBuffer.getBaseStream().size();
 }
 
 // BinaryInputStream interface (stream read access) ---------------------------
 
-sal_Int32 BiffInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+sal_Int32 BiffInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nRet = 0;
     if( !mbEof )
     {
         orData.realloc( ::std::max< sal_Int32 >( nBytes, 0 ) );
         if( nBytes > 0 )
-        {
-            nRet = readMemory( orData.getArray(), nBytes );
-            if( nRet < nBytes )
-                orData.realloc( nRet );
-        }
+            nRet = readMemory( orData.getArray(), nBytes, nAtomSize );
     }
     return nRet;
 }
 
-sal_Int32 BiffInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 BiffInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nRet = 0;
     if( !mbEof && opMem && (nBytes > 0) )
@@ -324,7 +320,7 @@ sal_Int32 BiffInputStream::readMemory( void* opMem, sal_Int32 nBytes )
 
         while( !mbEof && (nBytesLeft > 0) )
         {
-            sal_uInt16 nReadSize = getMaxRawReadSize( nBytesLeft );
+            sal_uInt16 nReadSize = getMaxRawReadSize( nBytesLeft, nAtomSize );
             // check nReadSize, stream may already be located at end of a raw record
             if( nReadSize > 0 )
             {
@@ -341,12 +337,12 @@ sal_Int32 BiffInputStream::readMemory( void* opMem, sal_Int32 nBytes )
     return nRet;
 }
 
-void BiffInputStream::skip( sal_Int32 nBytes )
+void BiffInputStream::skip( sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nBytesLeft = nBytes;
     while( !mbEof && (nBytesLeft > 0) )
     {
-        sal_uInt16 nSkipSize = getMaxRawReadSize( nBytesLeft );
+        sal_uInt16 nSkipSize = getMaxRawReadSize( nBytesLeft, nAtomSize );
         // check nSkipSize, stream may already be located at end of a raw record
         if( nSkipSize > 0 )
         {
@@ -384,28 +380,22 @@ OUString BiffInputStream::readUniStringChars( sal_uInt16 nChars, bool b16BitChar
     OUStringBuffer aBuffer;
     aBuffer.ensureCapacity( nChars );
 
-    /*  This function has to react on CONTINUE records to read the repeated
-        flags field, so readUnicodeArray() cannot be used here. */
-    sal_uInt16 nCharsLeft = nChars;
+    /*  This function has to react on CONTINUE records which repeat the flags
+        field in their first byte and may change the 8bit/16bit character mode,
+        thus a plain call to readCompressedUnicodeArray() cannot be used here. */
+    sal_Int32 nCharsLeft = nChars;
     while( !mbEof && (nCharsLeft > 0) )
     {
-        sal_uInt16 nPortionCount = 0;
-        if( b16BitChars )
-        {
-            nPortionCount = ::std::min< sal_uInt16 >( nCharsLeft, maRecBuffer.getRecLeft() / 2 );
-            OSL_ENSURE( (nPortionCount <= nCharsLeft) || ((maRecBuffer.getRecLeft() & 1) == 0),
-                "BiffInputStream::readUniStringChars - missing a byte" );
-        }
-        else
-        {
-            nPortionCount = getMaxRawReadSize( nCharsLeft );
-        }
-
-        // read the character array
-        appendUnicodeArray( aBuffer, nPortionCount, b16BitChars, bAllowNulChars );
-
-        // prepare for next CONTINUE record
-        nCharsLeft = nCharsLeft - nPortionCount;
+        /*  Read the character array from the remaining part of the current raw
+            record. First, calculate the maximum number of characters that can
+            be read without triggering to start a following CONTINUE record. */
+        sal_Int32 nRawChars = b16BitChars ? (getMaxRawReadSize( nCharsLeft * 2, 2 ) / 2) : getMaxRawReadSize( nCharsLeft, 1 );
+        aBuffer.append( readCompressedUnicodeArray( nRawChars, !b16BitChars, bAllowNulChars ) );
+
+        /*  Prepare for next CONTINUE record. Calling jumpToNextStringContinue()
+            reads the leading byte in the following CONTINUE record and updates
+            the b16BitChars flag. */
+        nCharsLeft -= nRawChars;
         if( nCharsLeft > 0 )
             jumpToNextStringContinue( b16BitChars );
     }
@@ -430,25 +420,15 @@ OUString BiffInputStream::readUniString( bool bAllowNulChars )
 
 void BiffInputStream::skipUniStringChars( sal_uInt16 nChars, bool b16BitChars )
 {
-    sal_uInt16 nCharsLeft = nChars;
+    sal_Int32 nCharsLeft = nChars;
     while( !mbEof && (nCharsLeft > 0) )
     {
-        sal_uInt16 nPortionCount;
-        if( b16BitChars )
-        {
-            nPortionCount = ::std::min< sal_uInt16 >( nCharsLeft, maRecBuffer.getRecLeft() / 2 );
-            OSL_ENSURE( (nPortionCount <= nCharsLeft) || ((maRecBuffer.getRecLeft() & 1) == 0),
-                "BiffInputStream::skipUniStringChars - missing a byte" );
-            skip( 2 * nPortionCount );
-        }
-        else
-        {
-            nPortionCount = getMaxRawReadSize( nCharsLeft );
-            skip( nPortionCount );
-        }
+        // skip the character array
+        sal_Int32 nSkipSize = b16BitChars ? getMaxRawReadSize( 2 * nCharsLeft, 2 ) : getMaxRawReadSize( nCharsLeft, 1 );
+        skip( nSkipSize );
 
         // prepare for next CONTINUE record
-        nCharsLeft = nCharsLeft - nPortionCount;
+        nCharsLeft -= (b16BitChars ? (nSkipSize / 2) : nSkipSize);
         if( nCharsLeft > 0 )
             jumpToNextStringContinue( b16BitChars );
     }
@@ -470,13 +450,6 @@ void BiffInputStream::skipUniString()
 
 // private --------------------------------------------------------------------
 
-void BiffInputStream::readAtom( void* opMem, sal_uInt8 nSize )
-{
-    // byte swapping is done in calling BinaryInputStream::readValue() template function
-    if( ensureRawReadSize( nSize ) )
-        maRecBuffer.read( opMem, nSize );
-}
-
 void BiffInputStream::setupRecord()
 {
     // initialize class members
@@ -530,7 +503,7 @@ bool BiffInputStream::jumpToNextContinue()
 
 bool BiffInputStream::jumpToNextStringContinue( bool& rb16BitChars )
 {
-    OSL_ENSURE( maRecBuffer.getRecLeft() == 0, "BiffInputStream::jumpToNextStringContinue - unexpected garbage" );
+    OSL_ENSURE( maRecBuffer.getRecLeft() == 0, "BiffInputStream::jumpToNextStringContinue - alignment error" );
 
     if( mbCont && (getRemaining() > 0) )
     {
@@ -562,31 +535,17 @@ void BiffInputStream::calcRecordLength()
     seek( nCurrPos );                       // restore position, seek() resets old mbValid state
 }
 
-bool BiffInputStream::ensureRawReadSize( sal_uInt16 nBytes )
-{
-    if( !mbEof && (nBytes > 0) )
-    {
-        while( !mbEof && (maRecBuffer.getRecLeft() == 0) ) jumpToNextContinue();
-        mbEof = mbEof || (nBytes > maRecBuffer.getRecLeft());
-        OSL_ENSURE( !mbEof, "BiffInputStream::ensureRawReadSize - record overread" );
-    }
-    return !mbEof;
-}
-
-sal_uInt16 BiffInputStream::getMaxRawReadSize( sal_Int32 nBytes ) const
-{
-    return getLimitedValue< sal_uInt16, sal_Int32 >( nBytes, 0, maRecBuffer.getRecLeft() );
-}
-
-void BiffInputStream::appendUnicodeArray( OUStringBuffer& orBuffer, sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars )
+sal_uInt16 BiffInputStream::getMaxRawReadSize( sal_Int32 nBytes, size_t nAtomSize ) const
 {
-    orBuffer.ensureCapacity( orBuffer.getLength() + nChars );
-    sal_uInt16 nChar;
-    for( sal_uInt16 nCharIdx = 0; !mbEof && (nCharIdx < nChars); ++nCharIdx )
+    sal_uInt16 nMaxSize = getLimitedValue< sal_uInt16, sal_Int32 >( nBytes, 0, maRecBuffer.getRecLeft() );
+    if( (0 < nMaxSize) && (nMaxSize < nBytes) && (nAtomSize > 1) )
     {
-        if( b16BitChars ) readValue( nChar ); else nChar = readuInt8();
-        orBuffer.append( static_cast< sal_Unicode >( (!bAllowNulChars && (nChar == 0)) ? '?' : nChar ) );
+        // check that remaining data in record buffer is a multiple of the passed atom size
+        sal_uInt16 nPadding = static_cast< sal_uInt16 >( nMaxSize % nAtomSize );
+        OSL_ENSURE( nPadding == 0, "BiffInputStream::getMaxRawReadSize - alignment error" );
+        nMaxSize = nMaxSize - nPadding;
     }
+    return nMaxSize;
 }
 
 void BiffInputStream::readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAddSize )
diff --git a/oox/source/xls/biffoutputstream.cxx b/oox/source/xls/biffoutputstream.cxx
index bf07a9190..5adaba34f 100644
--- a/oox/source/xls/biffoutputstream.cxx
+++ b/oox/source/xls/biffoutputstream.cxx
@@ -86,6 +86,7 @@ void BiffOutputRecordBuffer::fill( sal_uInt8 nValue, sal_uInt16 nBytes )
 // ============================================================================
 
 BiffOutputStream::BiffOutputStream( BinaryOutputStream& rOutStream, sal_uInt16 nMaxRecSize ) :
+    BinaryStreamBase( true ),
     maRecBuffer( rOutStream, nMaxRecSize ),
     mnPortionSize( 0 ),
     mnPortionPos( 0 )
@@ -97,19 +98,19 @@ BiffOutputStream::BiffOutputStream( BinaryOutputStream& rOutStream, sal_uInt16 n
 void BiffOutputStream::startRecord( sal_uInt16 nRecId )
 {
     maRecBuffer.startRecord( nRecId );
-    setPortionSize( 0 );
+    setPortionSize( 1 );
 }
 
 void BiffOutputStream::endRecord()
 {
-    setPortionSize( 0 );
+    setPortionSize( 1 );
     maRecBuffer.endRecord();
 }
 
-void BiffOutputStream::setPortionSize( sal_uInt16 nSize )
+void BiffOutputStream::setPortionSize( sal_uInt8 nSize )
 {
     OSL_ENSURE( mnPortionPos == 0, "BiffOutputStream::setPortionSize - block operation inside portion" );
-    mnPortionSize = nSize;
+    mnPortionSize = ::std::max< sal_uInt8 >( nSize, 1 );
     mnPortionPos = 0;
 }
 
@@ -120,20 +121,20 @@ sal_Int64 BiffOutputStream::tellBase() const
     return maRecBuffer.getBaseStream().tell();
 }
 
-sal_Int64 BiffOutputStream::getBaseLength() const
+sal_Int64 BiffOutputStream::sizeBase() const
 {
-    return maRecBuffer.getBaseStream().getLength();
+    return maRecBuffer.getBaseStream().size();
 }
 
 // BinaryOutputStream interface (stream write access) -------------------------
 
-void BiffOutputStream::writeData( const StreamDataSequence& rData )
+void BiffOutputStream::writeData( const StreamDataSequence& rData, size_t nAtomSize )
 {
     if( rData.hasElements() )
-        writeMemory( rData.getConstArray(), rData.getLength() );
+        writeMemory( rData.getConstArray(), rData.getLength(), nAtomSize );
 }
 
-void BiffOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes )
+void BiffOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize )
 {
     if( pMem && (nBytes > 0) )
     {
@@ -141,7 +142,7 @@ void BiffOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes )
         sal_Int32 nBytesLeft = nBytes;
         while( nBytesLeft > 0 )
         {
-            sal_uInt16 nBlockSize = prepareRawBlock( nBytesLeft );
+            sal_uInt16 nBlockSize = prepareWriteBlock( nBytesLeft, nAtomSize );
             maRecBuffer.write( pnBuffer, nBlockSize );
             pnBuffer += nBlockSize;
             nBytesLeft -= nBlockSize;
@@ -149,59 +150,60 @@ void BiffOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes )
     }
 }
 
-void BiffOutputStream::fill( sal_uInt8 nValue, sal_Int32 nBytes )
+void BiffOutputStream::fill( sal_uInt8 nValue, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nBytesLeft = nBytes;
     while( nBytesLeft > 0 )
     {
-        sal_uInt16 nBlockSize = prepareRawBlock( nBytesLeft );
+        sal_uInt16 nBlockSize = prepareWriteBlock( nBytesLeft, nAtomSize );
         maRecBuffer.fill( nValue, nBlockSize );
         nBytesLeft -= nBlockSize;
     }
 }
 
-void BiffOutputStream::writeBlock( const void* pMem, sal_uInt16 nBytes )
-{
-    ensureRawBlock( nBytes );
-    maRecBuffer.write( pMem, nBytes );
-}
-
 // private --------------------------------------------------------------------
 
-void BiffOutputStream::writeAtom( const void* pMem, sal_uInt8 nSize )
-{
-    // byte swapping is done in calling BinaryOutputStream::writeValue() template function
-    writeBlock( pMem, nSize );
-}
-
-void BiffOutputStream::ensureRawBlock( sal_uInt16 nSize )
+sal_uInt16 BiffOutputStream::prepareWriteBlock( sal_Int32 nTotalSize, size_t nAtomSize )
 {
-    if( (maRecBuffer.getRecLeft() < nSize) ||
-        ((mnPortionSize > 0) && (mnPortionPos == 0) && (maRecBuffer.getRecLeft() < mnPortionSize)) )
+    sal_uInt16 nRecLeft = maRecBuffer.getRecLeft();
+    if( mnPortionSize <= 1 )
     {
-        maRecBuffer.endRecord();
-        maRecBuffer.startRecord( BIFF_ID_CONT );
+        // no portions: restrict remaining record size to entire atoms
+        nRecLeft = static_cast< sal_uInt16 >( (nRecLeft / nAtomSize) * nAtomSize );
     }
-    if( mnPortionSize > 0 )
+    else
     {
-        OSL_ENSURE( mnPortionPos + nSize <= mnPortionSize, "BiffOutputStream::ensureRawBlock - portion overflow" );
-        mnPortionPos = (mnPortionPos + nSize) % mnPortionSize;  // prevent compiler warning, do not use operator+=, operator%=
+        sal_Int32 nPortionLeft = mnPortionSize - mnPortionPos;
+        if( nTotalSize <= nPortionLeft )
+        {
+            // block fits into the current portion
+            OSL_ENSURE( nPortionLeft <= nRecLeft, "BiffOutputStream::prepareWriteBlock - portion exceeds record" );
+            mnPortionPos = static_cast< sal_uInt8 >( (mnPortionPos + nTotalSize) % mnPortionSize );
+        }
+        else
+        {
+            // restrict remaining record size to entire portions
+            OSL_ENSURE( mnPortionPos == 0, "BiffOutputStream::prepareWriteBlock - writing over multiple portions starts inside portion" );
+            mnPortionPos = 0;
+            // check that atom size matches portion size
+            OSL_ENSURE( mnPortionSize % nAtomSize == 0, "BiffOutputStream::prepareWriteBlock - atom size does not match portion size" );
+            sal_uInt8 nPortionSize = static_cast< sal_uInt8 >( (mnPortionSize / nAtomSize) * nAtomSize );
+            // restrict remaining record size to entire portions
+            nRecLeft = (nRecLeft / nPortionSize) * nPortionSize;
+        }
     }
-}
 
-sal_uInt16 BiffOutputStream::prepareRawBlock( sal_Int32 nTotalSize )
-{
-    sal_uInt16 nRecLeft = maRecBuffer.getRecLeft();
-    if( mnPortionSize > 0 )
-    {
-        OSL_ENSURE( mnPortionPos == 0, "BiffOutputStream::prepareRawBlock - block operation inside portion" );
-        OSL_ENSURE( nTotalSize % mnPortionSize == 0, "BiffOutputStream::prepareRawBlock - portion size does not match block size" );
-        nRecLeft = (nRecLeft / mnPortionSize) * mnPortionSize;
-    }
-    sal_uInt16 nSize = getLimitedValue< sal_uInt16, sal_Int32 >( nTotalSize, 0, nRecLeft );
-    ensureRawBlock( nSize );
-    return nSize;
+    // current record has space for some data: return size of available space
+    if( nRecLeft > 0 )
+        return getLimitedValue< sal_uInt16, sal_Int32 >( nTotalSize, 0, nRecLeft );
+
+    // finish current record and start a new CONTINUE record
+    maRecBuffer.endRecord();
+    maRecBuffer.startRecord( BIFF_ID_CONT );
+    mnPortionPos = 0;
+    return prepareWriteBlock( nTotalSize, nAtomSize );
 }
+
 // ============================================================================
 
 } // namespace xls
diff --git a/oox/source/xls/chartsheetfragment.cxx b/oox/source/xls/chartsheetfragment.cxx
index e7d78712c..52c33ec62 100644
--- a/oox/source/xls/chartsheetfragment.cxx
+++ b/oox/source/xls/chartsheetfragment.cxx
@@ -46,9 +46,8 @@ using ::rtl::OUString;
 
 // ============================================================================
 
-ChartsheetFragment::ChartsheetFragment( const WorkbookHelper& rHelper,
-        const OUString& rFragmentPath, const ISegmentProgressBarRef& rxProgressBar, sal_Int16 nSheet ) :
-    WorksheetFragmentBase( rHelper, rFragmentPath, rxProgressBar, SHEETTYPE_CHARTSHEET, nSheet )
+ChartsheetFragment::ChartsheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) :
+    WorksheetFragmentBase( rHelper, rFragmentPath )
 {
 }
 
@@ -180,9 +179,8 @@ void ChartsheetFragment::importDrawing( SequenceInputStream& rStrm )
 
 // ============================================================================
 
-BiffChartsheetFragment::BiffChartsheetFragment( const BiffWorkbookFragmentBase& rParent,
-        const ISegmentProgressBarRef& rxProgressBar, sal_Int16 nSheet ) :
-    BiffWorksheetFragmentBase( rParent, rxProgressBar, SHEETTYPE_CHARTSHEET, nSheet )
+BiffChartsheetFragment::BiffChartsheetFragment( const WorksheetHelper& rHelper, const BiffWorkbookFragmentBase& rParent ) :
+    BiffWorksheetFragmentBase( rHelper, rParent )
 {
 }
 
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
index ea102dfac..0287c4e07 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -38,9 +38,11 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/xls/addressconverter.hxx"
+#include "oox/xls/biffinputstream.hxx"
 #include "oox/xls/drawingfragment.hxx"
 #include "svx/sdtaitm.hxx"
 #include "oox/xls/unitconverter.hxx"
+#include "oox/xls/drawingmanager.hxx"
 
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
@@ -58,6 +60,7 @@ namespace xls {
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 
 using ::rtl::OUString;
@@ -96,8 +99,18 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
 
 // ============================================================================
 
+namespace {
+
+const sal_uInt16 BIFF_NOTE_VISIBLE          = 0x0002;
+
+} // namespace
+
+// ============================================================================
+
 CommentModel::CommentModel() :
-    mnAuthorId( -1 )
+    mnAuthorId( -1 ),
+    mnObjId( BIFF_OBJ_INVALID_ID ),
+    mbVisible( false )
 {
 }
 
@@ -178,6 +191,35 @@ void Comment::importComment( SequenceInputStream& rStrm )
     getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() );
 }
 
+void Comment::importNote( BiffInputStream& rStrm )
+{
+    BinAddress aBinAddr;
+    rStrm >> aBinAddr;
+    // cell range will be checked while inserting the comment into the document
+    getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, BinRange( aBinAddr ), getSheetIndex() );
+
+    // remaining record data is BIFF dependent
+    switch( getBiff() )
+    {
+        case BIFF2:
+        case BIFF3:
+            importNoteBiff2( rStrm );
+        break;
+        case BIFF4:
+        case BIFF5:
+            importNoteBiff2( rStrm );
+            // in BIFF4 and BIFF5, comments can have an associated sound
+            if( (rStrm.getNextRecId() == BIFF_ID_NOTESOUND) && rStrm.startNextRecord() )
+                importNoteSound( rStrm );
+        break;
+        case BIFF8:
+            importNoteBiff8( rStrm );
+        break;
+        case BIFF_UNKNOWN:
+        break;
+    }
+}
+
 RichStringRef Comment::createText()
 {
     maModel.mxText.reset( new RichString( *this ) );
@@ -193,53 +235,110 @@ void Comment::finalizeImport()
     CellAddress aNotePos( maModel.maRange.Sheet, maModel.maRange.StartColumn, maModel.maRange.StartRow );
     if( getAddressConverter().checkCellAddress( aNotePos, true ) && maModel.mxText.get() ) try
     {
-        maModel.mxText->finalizeImport();
-        OUString aNoteText = maModel.mxText->getPlainText();
-        // non-empty string required by note implementation
-        if( aNoteText.getLength() > 0 )
+        Reference< XSheetAnnotationsSupplier > xAnnosSupp( getSheet(), UNO_QUERY_THROW );
+        Reference< XSheetAnnotations > xAnnos( xAnnosSupp->getAnnotations(), UNO_SET_THROW );
+        // non-empty string required by note implementation (real text will be added below)
+        xAnnos->insertNew( aNotePos, OUString( sal_Unicode( ' ' ) ) );
+
+        // receive created note from cell (insertNew does not return the note)
+        Reference< XSheetAnnotationAnchor > xAnnoAnchor( getCell( aNotePos ), UNO_QUERY_THROW );
+        Reference< XSheetAnnotation > xAnno( xAnnoAnchor->getAnnotation(), UNO_SET_THROW );
+        Reference< XSheetAnnotationShapeSupplier > xAnnoShapeSupp( xAnno, UNO_QUERY_THROW );
+        Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
+
+        // convert shape formatting and visibility
+        sal_Bool bVisible = sal_True;
+        switch( getFilterType() )
         {
-            Reference< XSheetAnnotationsSupplier > xAnnosSupp( getSheet(), UNO_QUERY_THROW );
-            Reference< XSheetAnnotations > xAnnos( xAnnosSupp->getAnnotations(), UNO_SET_THROW );
-            xAnnos->insertNew( aNotePos, aNoteText );
-            // receive craeted note from cell (insertNew does not return the note)
-            Reference< XSheetAnnotationAnchor > xAnnoAnchor( getCell( aNotePos ), UNO_QUERY_THROW );
-            Reference< XSheetAnnotation > xAnno( xAnnoAnchor->getAnnotation(), UNO_SET_THROW );
-            Reference< XSheetAnnotationShapeSupplier > xAnnoShapeSupp( xAnno, UNO_QUERY_THROW );
-            Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
-            Reference <XText> xText( xAnnoShape, UNO_QUERY_THROW );
-            Reference <XTextRange> xTextRange( xText, UNO_QUERY_THROW );
-            xTextRange->setString( OUString() ); // Clear contents
-            maModel.mxText->convert( xText, -1 );
-
-            // Add shape formatting properties (autoFill, colHidden and rowHidden are dropped)
-            PropertySet aCommentPr( xAnnoShape );
-            aCommentPr.setProperty( PROP_TextFitToSize, maModel.mbAutoScale );
-            aCommentPr.setProperty( PROP_MoveProtect, maModel.mbLocked );
-            aCommentPr.setProperty( PROP_TextHorizontalAdjust, lcl_ToHorizAlign( maModel.mnTHA ) );
-            aCommentPr.setProperty( PROP_TextVerticalAdjust, lcl_ToVertAlign( maModel.mnTVA ) );
-            if( maModel.maAnchor.Width > 0 && maModel.maAnchor.Height > 0 )
-            {
-                xAnnoShape->setPosition( Point( maModel.maAnchor.X, maModel.maAnchor.Y ) );
-                xAnnoShape->setSize( Size( maModel.maAnchor.Width, maModel.maAnchor.Height ) );
-            }
-
-
-            // convert shape formatting
-            if( const ::oox::vml::ShapeBase* pNoteShape = getVmlDrawing().getNoteShape( aNotePos ) )
-            {
-                // position and formatting
-                pNoteShape->convertFormatting( xAnnoShape );
-                // visibility
-                const ::oox::vml::ClientData* pClientData = pNoteShape->getClientData();
-                xAnno->setIsVisible( pClientData && pClientData->mbVisible );
-            }
+            case FILTER_OOXML:
+                {
+                    // Add shape formatting properties (autoFill, colHidden and rowHidden are dropped)
+                    PropertySet aCommentPr( xAnnoShape );
+                    aCommentPr.setProperty( PROP_TextFitToSize, maModel.mbAutoScale );
+                    aCommentPr.setProperty( PROP_MoveProtect, maModel.mbLocked );
+                    aCommentPr.setProperty( PROP_TextHorizontalAdjust, lcl_ToHorizAlign( maModel.mnTHA ) );
+                    aCommentPr.setProperty( PROP_TextVerticalAdjust, lcl_ToVertAlign( maModel.mnTVA ) );
+                    if( maModel.maAnchor.Width > 0 && maModel.maAnchor.Height > 0 )
+                    {
+                        xAnnoShape->setPosition( Point( maModel.maAnchor.X, maModel.maAnchor.Y ) );
+                        xAnnoShape->setSize( Size( maModel.maAnchor.Width, maModel.maAnchor.Height ) );
+                    }
+
+                    // convert shape formatting
+                    if( const ::oox::vml::ShapeBase* pNoteShape = getVmlDrawing().getNoteShape( aNotePos ) )
+                    {
+                        // position and formatting
+                        pNoteShape->convertFormatting( xAnnoShape );
+                        // visibility
+                        const ::oox::vml::ClientData* pClientData = pNoteShape->getClientData();
+                        xAnno->setIsVisible( pClientData && pClientData->mbVisible );
+                    }
+                }
+            break;
+            case FILTER_BIFF:
+                bVisible = maModel.mbVisible;
+            break;
+            case FILTER_UNKNOWN:
+            break;
         }
+        xAnno->setIsVisible( bVisible );
+
+        // insert text and convert text formatting
+        maModel.mxText->finalizeImport();
+        Reference< XText > xAnnoText( xAnnoShape, UNO_QUERY_THROW );
+        maModel.mxText->convert( xAnnoText );
     }
     catch( Exception& )
     {
     }
 }
 
+// private --------------------------------------------------------------------
+
+void Comment::importNoteBiff2( BiffInputStream& rStrm )
+{
+    sal_uInt16 nTotalLen;
+    rStrm >> nTotalLen;
+    sal_uInt16 nPartLen = ::std::min( nTotalLen, static_cast< sal_uInt16 >( rStrm.getRemaining() ) );
+    RichStringRef xNoteText = createText();
+    xNoteText->importCharArray( rStrm, nPartLen, getTextEncoding() );
+
+    nTotalLen = nTotalLen - nPartLen;   // operator-=() gives compiler warning
+    while( (nTotalLen > 0) && (rStrm.getNextRecId() == BIFF_ID_NOTE) && rStrm.startNextRecord() )
+    {
+        sal_uInt16 nMarker;
+        rStrm >> nMarker;
+        rStrm.skip( 2 );
+        rStrm >> nPartLen;
+        OSL_ENSURE( nMarker == 0xFFFF, "Comment::importNoteBiff2 - missing continuation NOTE record" );
+        if( nMarker == 0xFFFF )
+        {
+            OSL_ENSURE( nPartLen <= nTotalLen, "Comment::importNoteBiff2 - string too long" );
+            // call to RichString::importCharArray() appends new text portion
+            xNoteText->importCharArray( rStrm, nPartLen, getTextEncoding() );
+            nTotalLen = nTotalLen - ::std::min( nTotalLen, nPartLen );
+        }
+        else
+        {
+            // seems to be a new note, rewind record, so worksheet fragment loop will find it
+            rStrm.rewindRecord();
+            nTotalLen = 0;
+        }
+    }
+}
+
+void Comment::importNoteBiff8( BiffInputStream& rStrm )
+{
+    sal_uInt16 nFlags;
+    rStrm >> nFlags >> maModel.mnObjId;
+    maModel.maAuthor = rStrm.readUniString();
+    maModel.mbVisible = getFlag( nFlags, BIFF_NOTE_VISIBLE );
+}
+
+void Comment::importNoteSound( BiffInputStream& /*rStrm*/ )
+{
+}
+
 // ============================================================================
 
 CommentsBuffer::CommentsBuffer( const WorksheetHelper& rHelper ) :
diff --git a/oox/source/xls/condformatbuffer.cxx b/oox/source/xls/condformatbuffer.cxx
index c1d0f48a1..5bbe3e1fe 100644
--- a/oox/source/xls/condformatbuffer.cxx
+++ b/oox/source/xls/condformatbuffer.cxx
@@ -194,10 +194,9 @@ void CondFormatRule::importCfRule( const AttributeList& rAttribs )
 
 void CondFormatRule::appendFormula( const OUString& rFormula )
 {
-    TokensFormulaContext aContext( true, false );
-    aContext.setBaseAddress( mrCondFormat.getRanges().getBaseAddress() );
-    getFormulaParser().importFormula( aContext, rFormula );
-    maModel.maFormulas.push_back( aContext );
+    CellAddress aBaseAddr = mrCondFormat.getRanges().getBaseAddress();
+    ApiTokenSequence aTokens = getFormulaParser().importFormula( aBaseAddr, rFormula );
+    maModel.maFormulas.push_back( aTokens );
 }
 
 void CondFormatRule::importCfRule( SequenceInputStream& rStrm )
@@ -217,25 +216,24 @@ void CondFormatRule::importCfRule( SequenceInputStream& rStrm )
     OSL_ENSURE( (nFmla1Size > 0) == (rStrm.getRemaining() >= 8), "CondFormatRule::importCfRule - formula size mismatch" );
     if( rStrm.getRemaining() >= 8 )
     {
-        TokensFormulaContext aContext( true, false );
-        aContext.setBaseAddress( mrCondFormat.getRanges().getBaseAddress() );
-        getFormulaParser().importFormula( aContext, rStrm );
-        maModel.maFormulas.push_back( aContext );
+        CellAddress aBaseAddr = mrCondFormat.getRanges().getBaseAddress();
+        ApiTokenSequence aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm );
+        maModel.maFormulas.push_back( aTokens );
 
         // second formula
         OSL_ENSURE( (nFmla2Size >= 0) || (nFmla3Size == 0), "CondFormatRule::importCfRule - missing second formula" );
         OSL_ENSURE( (nFmla2Size > 0) == (rStrm.getRemaining() >= 8), "CondFormatRule::importCfRule - formula size mismatch" );
         if( rStrm.getRemaining() >= 8 )
         {
-            getFormulaParser().importFormula( aContext, rStrm );
-            maModel.maFormulas.push_back( aContext );
+            aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm );
+            maModel.maFormulas.push_back( aTokens );
 
             // third formula
             OSL_ENSURE( (nFmla3Size > 0) == (rStrm.getRemaining() >= 8), "CondFormatRule::importCfRule - formula size mismatch" );
             if( rStrm.getRemaining() >= 8 )
             {
-                getFormulaParser().importFormula( aContext, rStrm );
-                maModel.maFormulas.push_back( aContext );
+                aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm );
+                maModel.maFormulas.push_back( aTokens );
             }
         }
     }
@@ -420,14 +418,13 @@ void CondFormatRule::importCfRule( BiffInputStream& rStrm, sal_Int32 nPriority )
     OSL_ENSURE( (nFmla1Size > 0) || (nFmla2Size == 0), "CondFormatRule::importCfRule - missing first formula" );
     if( nFmla1Size > 0 )
     {
-        TokensFormulaContext aContext( true, false );
-        aContext.setBaseAddress( mrCondFormat.getRanges().getBaseAddress() );
-        getFormulaParser().importFormula( aContext, rStrm, &nFmla1Size );
-        maModel.maFormulas.push_back( aContext );
+        CellAddress aBaseAddr = mrCondFormat.getRanges().getBaseAddress();
+        ApiTokenSequence aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm, &nFmla1Size );
+        maModel.maFormulas.push_back( aTokens );
         if( nFmla2Size > 0 )
         {
-            getFormulaParser().importFormula( aContext, rStrm, &nFmla2Size );
-            maModel.maFormulas.push_back( aContext );
+            aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm, &nFmla2Size );
+            maModel.maFormulas.push_back( aTokens );
         }
     }
 }
@@ -605,9 +602,9 @@ void CondFormatRule::finalizeImport( const Reference< XSheetConditionalEntries >
         ::std::vector< PropertyValue > aProps;
         // create condition properties
         lclAppendProperty( aProps, CREATE_OUSTRING( "Operator" ), eOperator );
-        lclAppendProperty( aProps, CREATE_OUSTRING( "Formula1" ), maModel.maFormulas[ 0 ].getTokens() );
+        lclAppendProperty( aProps, CREATE_OUSTRING( "Formula1" ), maModel.maFormulas[ 0 ] );
         if( maModel.maFormulas.size() >= 2 )
-            lclAppendProperty( aProps, CREATE_OUSTRING( "Formula2" ), maModel.maFormulas[ 1 ].getTokens() );
+            lclAppendProperty( aProps, CREATE_OUSTRING( "Formula2" ), maModel.maFormulas[ 1 ] );
 
         // style name for the formatting attributes
         OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId );
@@ -750,7 +747,6 @@ void CondFormatBuffer::finalizeImport()
 
 sal_Int32 CondFormatBuffer::convertToApiOperator( sal_Int32 nToken )
 {
-    using namespace ::com::sun::star::sheet;
     switch( nToken )
     {
         case XML_between:               return ConditionOperator2::BETWEEN;
diff --git a/oox/source/xls/defnamesbuffer.cxx b/oox/source/xls/defnamesbuffer.cxx
index 5fca7992d..95f9579ad 100644
--- a/oox/source/xls/defnamesbuffer.cxx
+++ b/oox/source/xls/defnamesbuffer.cxx
@@ -190,32 +190,32 @@ void lclConvertRefFlags( sal_Int32& ornFlags, sal_Int32& ornAbsPos, sal_Int32& o
     }
 }
 
-void lclConvertSingleRefFlags( SingleReference& orApiRef, const CellAddress& rBaseAddress, bool bColRel, bool bRowRel )
+void lclConvertSingleRefFlags( SingleReference& orApiRef, const CellAddress& rBaseAddr, bool bColRel, bool bRowRel )
 {
     using namespace ::com::sun::star::sheet::ReferenceFlags;
     lclConvertRefFlags(
         orApiRef.Flags, orApiRef.Column, orApiRef.RelativeColumn,
-        rBaseAddress.Column, COLUMN_RELATIVE, bColRel );
+        rBaseAddr.Column, COLUMN_RELATIVE, bColRel );
     lclConvertRefFlags(
         orApiRef.Flags, orApiRef.Row, orApiRef.RelativeRow,
-        rBaseAddress.Row, ROW_RELATIVE, bRowRel );
+        rBaseAddr.Row, ROW_RELATIVE, bRowRel );
 }
 
-Any lclConvertReference( const Any& rRefAny, const CellAddress& rBaseAddress, sal_uInt16 nRelFlags )
+Any lclConvertReference( const Any& rRefAny, const CellAddress& rBaseAddr, sal_uInt16 nRelFlags )
 {
     if( rRefAny.has< SingleReference >() && !getFlag( nRelFlags, BIFF_REFFLAG_COL2REL ) && !getFlag( nRelFlags, BIFF_REFFLAG_ROW2REL ) )
     {
         SingleReference aApiRef;
         rRefAny >>= aApiRef;
-        lclConvertSingleRefFlags( aApiRef, rBaseAddress, getFlag( nRelFlags, BIFF_REFFLAG_COL1REL ), getFlag( nRelFlags, BIFF_REFFLAG_ROW1REL ) );
+        lclConvertSingleRefFlags( aApiRef, rBaseAddr, getFlag( nRelFlags, BIFF_REFFLAG_COL1REL ), getFlag( nRelFlags, BIFF_REFFLAG_ROW1REL ) );
         return Any( aApiRef );
     }
     if( rRefAny.has< ComplexReference >() )
     {
         ComplexReference aApiRef;
         rRefAny >>= aApiRef;
-        lclConvertSingleRefFlags( aApiRef.Reference1, rBaseAddress, getFlag( nRelFlags, BIFF_REFFLAG_COL1REL ), getFlag( nRelFlags, BIFF_REFFLAG_ROW1REL ) );
-        lclConvertSingleRefFlags( aApiRef.Reference2, rBaseAddress, getFlag( nRelFlags, BIFF_REFFLAG_COL2REL ), getFlag( nRelFlags, BIFF_REFFLAG_ROW2REL ) );
+        lclConvertSingleRefFlags( aApiRef.Reference1, rBaseAddr, getFlag( nRelFlags, BIFF_REFFLAG_COL1REL ), getFlag( nRelFlags, BIFF_REFFLAG_ROW1REL ) );
+        lclConvertSingleRefFlags( aApiRef.Reference2, rBaseAddr, getFlag( nRelFlags, BIFF_REFFLAG_COL2REL ), getFlag( nRelFlags, BIFF_REFFLAG_ROW2REL ) );
         return Any( aApiRef );
     }
     return Any();
@@ -249,7 +249,7 @@ const OUString& DefinedNameBase::getUpcaseModelName() const
     return maUpModelName;
 }
 
-Any DefinedNameBase::getReference( const CellAddress& rBaseAddress ) const
+Any DefinedNameBase::getReference( const CellAddress& rBaseAddr ) const
 {
     if( maRefAny.hasValue() && (maModel.maName.getLength() >= 2) && (maModel.maName[ 0 ] == '\x01') )
     {
@@ -261,7 +261,7 @@ Any DefinedNameBase::getReference( const CellAddress& rBaseAddress ) const
             {
                 ExternalReference aApiExtRef;
                 maRefAny >>= aApiExtRef;
-                Any aRefAny = lclConvertReference( aApiExtRef.Reference, rBaseAddress, nRelFlags );
+                Any aRefAny = lclConvertReference( aApiExtRef.Reference, rBaseAddr, nRelFlags );
                 if( aRefAny.hasValue() )
                 {
                     aApiExtRef.Reference <<= aRefAny;
@@ -270,37 +270,30 @@ Any DefinedNameBase::getReference( const CellAddress& rBaseAddress ) const
             }
             else
             {
-                return lclConvertReference( maRefAny, rBaseAddress, nRelFlags );
+                return lclConvertReference( maRefAny, rBaseAddr, nRelFlags );
             }
         }
     }
     return Any();
 }
 
-void DefinedNameBase::importOoxFormula( FormulaContext& rContext, sal_Int16 nBaseSheet )
+ApiTokenSequence DefinedNameBase::importOoxFormula( sal_Int16 nBaseSheet )
 {
-    if( maModel.maFormula.getLength() > 0 )
-    {
-        rContext.setBaseAddress( CellAddress( nBaseSheet, 0, 0 ) );
-        getFormulaParser().importFormula( rContext, maModel.maFormula );
-    }
-    else
-        getFormulaParser().convertErrorToFormula( rContext, BIFF_ERR_NAME );
+    return (maModel.maFormula.getLength() > 0) ?
+        getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), maModel.maFormula ) :
+        getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME );
 }
 
-void DefinedNameBase::importBiff12Formula( FormulaContext& rContext, sal_Int16 nBaseSheet, SequenceInputStream& rStrm )
+ApiTokenSequence DefinedNameBase::importBiff12Formula( sal_Int16 nBaseSheet, SequenceInputStream& rStrm )
 {
-    rContext.setBaseAddress( CellAddress( nBaseSheet, 0, 0 ) );
-    getFormulaParser().importFormula( rContext, rStrm );
+    return getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), FORMULATYPE_DEFINEDNAME, rStrm );
 }
 
-void DefinedNameBase::importBiffFormula( FormulaContext& rContext, sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize )
+ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize )
 {
-    rContext.setBaseAddress( CellAddress( nBaseSheet, 0, 0 ) );
-    if( !pnFmlaSize || (*pnFmlaSize > 0) )
-        getFormulaParser().importFormula( rContext, rStrm, pnFmlaSize );
-    else
-        getFormulaParser().convertErrorToFormula( rContext, BIFF_ERR_NAME );
+    return (!pnFmlaSize || (*pnFmlaSize > 0)) ?
+        getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), FORMULATYPE_DEFINEDNAME, rStrm, pnFmlaSize ) :
+        getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME );
 }
 
 void DefinedNameBase::extractReference( const ApiTokenSequence& rTokens )
@@ -468,9 +461,8 @@ void DefinedName::importDefinedName( BiffInputStream& rStrm, sal_Int16 nCalcShee
             these names contain a simple cell reference or range reference.
             Other regular defined names and external names rely on existence of
             this reference. */
-        TokensFormulaContext aContext( true, true );
-        importBiffFormula( aContext, mnCalcSheet, rStrm, &mnFmlaSize );
-        extractReference( aContext.getTokens() );
+        ApiTokenSequence aTokens = importBiffFormula( mnCalcSheet, rStrm, &mnFmlaSize );
+        extractReference( aTokens );
     }
     else
     {
@@ -489,6 +481,10 @@ void DefinedName::createNameObject()
     if( /*maModel.mbHidden ||*/ maModel.mbFunction || maModel.mbVBName )
         return;
 
+    // skip BIFF names without stream position (e.g. BIFF3-BIFF4 internal 3D references)
+    if( (getFilterType() == FILTER_BIFF) && !mxBiffStrm.get() )
+        return;
+
     // convert original name to final Calc name (TODO: filter invalid characters from model name)
     maCalcName = isBuiltinName() ? lclGetPrefixedName( mcBuiltinId ) : maModel.maName;
 
@@ -520,69 +516,83 @@ void DefinedName::createNameObject()
 void DefinedName::convertFormula()
 {
     Reference< XFormulaTokens > xTokens( mxNamedRange, UNO_QUERY );
-    if( xTokens.is() )
+    if( !xTokens.is() )
+        return;
+
+    // convert and set formula of the defined name
+    ApiTokenSequence aTokens;
+    switch( getFilterType() )
     {
-        // convert and set formula of the defined name
-        switch( getFilterType() )
+        case FILTER_OOXML:
         {
-            case FILTER_OOXML:
+            if( mxFormula.get() )
             {
-                SimpleFormulaContext aContext( xTokens, true, false );
-                implImportOoxFormula( aContext );
+                SequenceInputStream aStrm( *mxFormula );
+                aTokens = importBiff12Formula( mnCalcSheet, aStrm );
             }
-            break;
-            case FILTER_BIFF:
+            else
+                aTokens = importOoxFormula( mnCalcSheet );
+        }
+        break;
+        case FILTER_BIFF:
+        {
+            OSL_ENSURE( mxBiffStrm.get(), "DefinedName::convertFormula - missing BIFF stream" );
+            if( mxBiffStrm.get() )
             {
-                SimpleFormulaContext aContext( xTokens, true, getBiff() <= BIFF4 );
-                implImportBiffFormula( aContext );
+                BiffInputStream& rStrm = mxBiffStrm->getStream();
+                BiffInputStreamPosGuard aStrmGuard( rStrm );
+                if( mxBiffStrm->restorePosition() )
+                    aTokens = importBiffFormula( mnCalcSheet, rStrm, &mnFmlaSize );
             }
-            break;
-            case FILTER_UNKNOWN: break;
         }
+        break;
+        case FILTER_UNKNOWN:
+        break;
+    }
+    xTokens->setTokens( aTokens );
 
-        // set built-in names (print ranges, repeated titles, filter ranges)
-        if( !isGlobalName() ) switch( mcBuiltinId )
+    // set built-in names (print ranges, repeated titles, filter ranges)
+    if( !isGlobalName() ) switch( mcBuiltinId )
+    {
+        case BIFF_DEFNAME_PRINTAREA:
         {
-            case BIFF_DEFNAME_PRINTAREA:
-            {
-                Reference< XPrintAreas > xPrintAreas( getSheetFromDoc( mnCalcSheet ), UNO_QUERY );
-                ApiCellRangeList aPrintRanges;
-                getFormulaParser().extractCellRangeList( aPrintRanges, xTokens->getTokens(), false, mnCalcSheet );
-                if( xPrintAreas.is() && !aPrintRanges.empty() )
-                    xPrintAreas->setPrintAreas( ContainerHelper::vectorToSequence( aPrintRanges ) );
-            }
-            break;
-            case BIFF_DEFNAME_PRINTTITLES:
+            Reference< XPrintAreas > xPrintAreas( getSheetFromDoc( mnCalcSheet ), UNO_QUERY );
+            ApiCellRangeList aPrintRanges;
+            getFormulaParser().extractCellRangeList( aPrintRanges, xTokens->getTokens(), false, mnCalcSheet );
+            if( xPrintAreas.is() && !aPrintRanges.empty() )
+                xPrintAreas->setPrintAreas( ContainerHelper::vectorToSequence( aPrintRanges ) );
+        }
+        break;
+        case BIFF_DEFNAME_PRINTTITLES:
+        {
+            Reference< XPrintAreas > xPrintAreas( getSheetFromDoc( mnCalcSheet ), UNO_QUERY );
+            ApiCellRangeList aTitleRanges;
+            getFormulaParser().extractCellRangeList( aTitleRanges, xTokens->getTokens(), false, mnCalcSheet );
+            if( xPrintAreas.is() && !aTitleRanges.empty() )
             {
-                Reference< XPrintAreas > xPrintAreas( getSheetFromDoc( mnCalcSheet ), UNO_QUERY );
-                ApiCellRangeList aTitleRanges;
-                getFormulaParser().extractCellRangeList( aTitleRanges, xTokens->getTokens(), false, mnCalcSheet );
-                if( xPrintAreas.is() && !aTitleRanges.empty() )
+                bool bHasRowTitles = false;
+                bool bHasColTitles = false;
+                const CellAddress& rMaxPos = getAddressConverter().getMaxAddress();
+                for( ApiCellRangeList::const_iterator aIt = aTitleRanges.begin(), aEnd = aTitleRanges.end(); (aIt != aEnd) && (!bHasRowTitles || !bHasColTitles); ++aIt )
                 {
-                    bool bHasRowTitles = false;
-                    bool bHasColTitles = false;
-                    const CellAddress& rMaxPos = getAddressConverter().getMaxAddress();
-                    for( ApiCellRangeList::const_iterator aIt = aTitleRanges.begin(), aEnd = aTitleRanges.end(); (aIt != aEnd) && (!bHasRowTitles || !bHasColTitles); ++aIt )
+                    bool bFullRow = (aIt->StartColumn == 0) && (aIt->EndColumn >= rMaxPos.Column);
+                    bool bFullCol = (aIt->StartRow == 0) && (aIt->EndRow >= rMaxPos.Row);
+                    if( !bHasRowTitles && bFullRow && !bFullCol )
                     {
-                        bool bFullRow = (aIt->StartColumn == 0) && (aIt->EndColumn >= rMaxPos.Column);
-                        bool bFullCol = (aIt->StartRow == 0) && (aIt->EndRow >= rMaxPos.Row);
-                        if( !bHasRowTitles && bFullRow && !bFullCol )
-                        {
-                            xPrintAreas->setTitleRows( *aIt );
-                            xPrintAreas->setPrintTitleRows( sal_True );
-                            bHasRowTitles = true;
-                        }
-                        else if( !bHasColTitles && bFullCol && !bFullRow )
-                        {
-                            xPrintAreas->setTitleColumns( *aIt );
-                            xPrintAreas->setPrintTitleColumns( sal_True );
-                            bHasColTitles = true;
-                        }
+                        xPrintAreas->setTitleRows( *aIt );
+                        xPrintAreas->setPrintTitleRows( sal_True );
+                        bHasRowTitles = true;
+                    }
+                    else if( !bHasColTitles && bFullCol && !bFullRow )
+                    {
+                        xPrintAreas->setTitleColumns( *aIt );
+                        xPrintAreas->setPrintTitleColumns( sal_True );
+                        bHasColTitles = true;
                     }
                 }
             }
-            break;
         }
+        break;
     }
 }
 
@@ -594,26 +604,6 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress& orRange ) const
     return xTokens.is() && getFormulaParser().extractCellRange( orRange, xTokens->getTokens(), false );
 }
 
-void DefinedName::implImportOoxFormula( FormulaContext& rContext )
-{
-    if( mxFormula.get() )
-    {
-        SequenceInputStream aStrm( *mxFormula );
-        importBiff12Formula( rContext, mnCalcSheet, aStrm );
-    }
-    else
-        importOoxFormula( rContext, mnCalcSheet );
-}
-
-void DefinedName::implImportBiffFormula( FormulaContext& rContext )
-{
-    OSL_ENSURE( mxBiffStrm.get(), "DefinedName::implImportBiffFormula - missing BIFF stream" );
-    BiffInputStream& rStrm = mxBiffStrm->getStream();
-    BiffInputStreamPosGuard aStrmGuard( rStrm );
-    if( mxBiffStrm->restorePosition() )
-        importBiffFormula( rContext, mnCalcSheet, rStrm, &mnFmlaSize );
-}
-
 // ============================================================================
 
 DefinedNamesBuffer::DefinedNamesBuffer( const WorkbookHelper& rHelper ) :
diff --git a/oox/source/xls/drawingbase.cxx b/oox/source/xls/drawingbase.cxx
new file mode 100755
index 000000000..15032e410
--- /dev/null
+++ b/oox/source/xls/drawingbase.cxx
@@ -0,0 +1,325 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "oox/xls/drawingbase.hxx"
+
+#include <com/sun/star/awt/Rectangle.hpp>
+#include "oox/helper/attributelist.hxx"
+#include "oox/helper/binaryinputstream.hxx"
+#include "oox/xls/unitconverter.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::table;
+using namespace ::oox::drawingml;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+namespace {
+
+/** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */
+inline sal_Int64 lclHmmToEmu( sal_Int32 nValue )
+{
+    return (nValue < 0) ? -1 : convertHmmToEmu( nValue );
+}
+
+/** Converts the passed 64-bit integer value from EMUs to 1/100 mm. */
+inline sal_Int32 lclEmuToHmm( sal_Int64 nValue )
+{
+    return (nValue < 0) ? -1 : convertEmuToHmm( nValue );
+}
+
+/** Reads the cell anchor model from a BIFF or DFF stream. */
+BinaryInputStream& operator>>( BinaryInputStream& rStrm, CellAnchorModel& rModel )
+{
+    // all members are given as 16-bit unsigned values
+    rModel.mnCol = rStrm.readuInt16();
+    rModel.mnColOffset = rStrm.readuInt16();
+    rModel.mnRow = rStrm.readuInt16();
+    rModel.mnRowOffset = rStrm.readuInt16();
+    return rStrm;
+}
+
+} // namespace
+
+// ============================================================================
+
+CellAnchorModel::CellAnchorModel() :
+    mnCol( -1 ),
+    mnRow( -1 ),
+    mnColOffset( 0 ),
+    mnRowOffset( 0 )
+{
+}
+
+// ----------------------------------------------------------------------------
+
+AnchorClientDataModel::AnchorClientDataModel() :
+    mbLocksWithSheet( true ),
+    mbPrintsWithSheet( true )
+{
+}
+
+// ============================================================================
+
+ShapeAnchor::ShapeAnchor( const WorksheetHelper& rHelper ) :
+    WorksheetHelper( rHelper ),
+    meAnchorType( ANCHOR_INVALID ),
+    meCellAnchorType( CELLANCHOR_EMU ),
+    mnEditAs( XML_twoCell )
+{
+}
+
+void ShapeAnchor::importAnchor( sal_Int32 nElement, const AttributeList& rAttribs )
+{
+    switch( nElement )
+    {
+        case XDR_TOKEN( absoluteAnchor ):
+            meAnchorType = ANCHOR_ABSOLUTE;
+        break;
+        case XDR_TOKEN( oneCellAnchor ):
+            meAnchorType = ANCHOR_ONECELL;
+        break;
+        case XDR_TOKEN( twoCellAnchor ):
+            meAnchorType = ANCHOR_TWOCELL;
+            mnEditAs = rAttribs.getToken( XML_editAs, XML_twoCell );
+        break;
+        default:
+            OSL_ENSURE( false, "ShapeAnchor::importAnchor - unexpected element" );
+    }
+    meCellAnchorType = CELLANCHOR_EMU;
+}
+
+void ShapeAnchor::importPos( const AttributeList& rAttribs )
+{
+    OSL_ENSURE( meAnchorType == ANCHOR_ABSOLUTE, "ShapeAnchor::importPos - unexpected 'xdr:pos' element" );
+    maPos.X = rAttribs.getHyper( XML_x, 0 );
+    maPos.Y = rAttribs.getHyper( XML_y, 0 );
+}
+
+void ShapeAnchor::importExt( const AttributeList& rAttribs )
+{
+    OSL_ENSURE( (meAnchorType == ANCHOR_ABSOLUTE) || (meAnchorType == ANCHOR_ONECELL), "ShapeAnchor::importExt - unexpected 'xdr:ext' element" );
+    maSize.Width = rAttribs.getHyper( XML_cx, 0 );
+    maSize.Height = rAttribs.getHyper( XML_cy, 0 );
+}
+
+void ShapeAnchor::importClientData( const AttributeList& rAttribs )
+{
+    maClientData.mbLocksWithSheet  = rAttribs.getBool( XML_fLocksWithSheet, true );
+    maClientData.mbPrintsWithSheet = rAttribs.getBool( XML_fPrintsWithSheet, true );
+}
+
+void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue )
+{
+    CellAnchorModel* pCellAnchor = 0;
+    switch( nParentContext )
+    {
+        case XDR_TOKEN( from ):
+            OSL_ENSURE( (meAnchorType == ANCHOR_ONECELL) || (meAnchorType == ANCHOR_TWOCELL), "ShapeAnchor::setCellPos - unexpected 'xdr:from' element" );
+            pCellAnchor = &maFrom;
+        break;
+        case XDR_TOKEN( to ):
+            OSL_ENSURE( meAnchorType == ANCHOR_TWOCELL, "ShapeAnchor::setCellPos - unexpected 'xdr:to' element" );
+            pCellAnchor = &maTo;
+        break;
+        default:
+            OSL_ENSURE( false, "ShapeAnchor::setCellPos - unexpected parent element" );
+    }
+    if( pCellAnchor ) switch( nElement )
+    {
+        case XDR_TOKEN( col ):      pCellAnchor->mnCol = rValue.toInt32();          break;
+        case XDR_TOKEN( row ):      pCellAnchor->mnRow = rValue.toInt32();          break;
+        case XDR_TOKEN( colOff ):   pCellAnchor->mnColOffset = rValue.toInt64();    break;
+        case XDR_TOKEN( rowOff ):   pCellAnchor->mnRowOffset = rValue.toInt64();    break;
+        default:    OSL_ENSURE( false, "ShapeAnchor::setCellPos - unexpected element" );
+    }
+}
+
+void ShapeAnchor::importVmlAnchor( const OUString& rAnchor )
+{
+    meAnchorType = ANCHOR_VML;
+
+    ::std::vector< OUString > aTokens;
+    sal_Int32 nIndex = 0;
+    while( nIndex >= 0 )
+        aTokens.push_back( rAnchor.getToken( 0, ',', nIndex ).trim() );
+
+    OSL_ENSURE( aTokens.size() >= 8, "ShapeAnchor::importVmlAnchor - missing anchor tokens" );
+    if( aTokens.size() >= 8 )
+    {
+        maFrom.mnCol       = aTokens[ 0 ].toInt32();
+        maFrom.mnColOffset = aTokens[ 1 ].toInt32();
+        maFrom.mnRow       = aTokens[ 2 ].toInt32();
+        maFrom.mnRowOffset = aTokens[ 3 ].toInt32();
+        maTo.mnCol         = aTokens[ 4 ].toInt32();
+        maTo.mnColOffset   = aTokens[ 5 ].toInt32();
+        maTo.mnRow         = aTokens[ 6 ].toInt32();
+        maTo.mnRowOffset   = aTokens[ 7 ].toInt32();
+    }
+}
+
+void ShapeAnchor::importBiffAnchor( BinaryInputStream& rStrm )
+{
+    meAnchorType = ANCHOR_TWOCELL;          /// BIFF/DFF use two-cell anchors only
+    meCellAnchorType = CELLANCHOR_COLROW;   /// BIFF/DFF use fraction of column/row for offset values
+    rStrm >> maFrom >> maTo;
+}
+
+EmuRectangle ShapeAnchor::calcAnchorRectEmu( const Size& rPageSizeHmm ) const
+{
+    AddressConverter& rAddrConv = getAddressConverter();
+    EmuSize aPageSize( lclHmmToEmu( rPageSizeHmm.Width ), lclHmmToEmu( rPageSizeHmm.Height ) );
+    EmuRectangle aAnchorRect( -1, -1, -1, -1 );
+
+    // calculate shape position
+    switch( meAnchorType )
+    {
+        case ANCHOR_ABSOLUTE:
+            OSL_ENSURE( maPos.isValid(), "ShapeAnchor::calcAnchorRectEmu - invalid position" );
+            if( maPos.isValid() && (maPos.X < aPageSize.Width) && (maPos.Y < aPageSize.Height) )
+                aAnchorRect.setPos( maPos );
+        break;
+        case ANCHOR_ONECELL:
+        case ANCHOR_TWOCELL:
+        case ANCHOR_VML:
+            OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::calcAnchorRectEmu - invalid position" );
+            if( maFrom.isValid() && rAddrConv.checkCol( maFrom.mnCol, true ) && rAddrConv.checkRow( maFrom.mnRow, true ) )
+            {
+                EmuPoint aPoint = calcCellAnchorEmu( maFrom );
+                if( (aPoint.X < aPageSize.Width) && (aPoint.Y < aPageSize.Height) )
+                    aAnchorRect.setPos( aPoint );
+            }
+        break;
+        case ANCHOR_INVALID:
+            OSL_ENSURE( false, "ShapeAnchor::calcAnchorRectEmu - invalid anchor" );
+        break;
+    }
+
+    // calculate shape size
+    if( (aAnchorRect.X >= 0) && (aAnchorRect.Y >= 0) ) switch( meAnchorType )
+    {
+        case ANCHOR_ABSOLUTE:
+        case ANCHOR_ONECELL:
+            OSL_ENSURE( maSize.isValid(), "ShapeAnchor::calcAnchorRectEmu - invalid size" );
+            if( maSize.isValid() )
+            {
+                aAnchorRect.Width = ::std::min< sal_Int64 >( maSize.Width, aPageSize.Width - aAnchorRect.X );
+                aAnchorRect.Height = ::std::min< sal_Int64 >( maSize.Height, aPageSize.Height - aAnchorRect.Y );
+            }
+        break;
+        case ANCHOR_TWOCELL:
+        case ANCHOR_VML:
+            OSL_ENSURE( maTo.isValid(), "ShapeAnchor::calcAnchorRectEmu - invalid position" );
+            if( maTo.isValid() )
+            {
+                /*  Pass a valid cell address to calcCellAnchorEmu(), otherwise
+                    nothing useful is returned, even if either row or column is valid. */
+                CellAddress aToCell = rAddrConv.createValidCellAddress( BinAddress( maTo.mnCol, maTo.mnRow ), getSheetIndex(), true );
+                CellAnchorModel aValidTo = maTo;
+                aValidTo.mnCol = aToCell.Column;
+                aValidTo.mnRow = aToCell.Row;
+                EmuPoint aPoint = calcCellAnchorEmu( aValidTo );
+                // width (if column index is valid, use the calculated offset, otherwise stretch to maximum available X position)
+                aAnchorRect.Width = aPageSize.Width - aAnchorRect.X;
+                if( aToCell.Column == maTo.mnCol )
+                    aAnchorRect.Width = ::std::min< sal_Int64 >( aPoint.X - aAnchorRect.X + 1, aAnchorRect.Width );
+                // height (if row index is valid, use the calculated offset, otherwise stretch to maximum available Y position)
+                aAnchorRect.Height = aPageSize.Height - aAnchorRect.Y;
+                if( aToCell.Row == maTo.mnRow )
+                    aAnchorRect.Height = ::std::min< sal_Int64 >( aPoint.Y - aAnchorRect.Y + 1, aAnchorRect.Height );
+            }
+        break;
+        case ANCHOR_INVALID:
+        break;
+    }
+
+    // add 0.75 mm (27,000 EMUs) in X direction to correct display error
+    if( aAnchorRect.X >= 0 )
+        aAnchorRect.X += 27000;
+    // remove 0.25 mm (9,000 EMUs) in Y direction to correct display error
+    if( aAnchorRect.Y >= 9000 )
+        aAnchorRect.Y -= 9000;
+
+    return aAnchorRect;
+}
+
+Rectangle ShapeAnchor::calcAnchorRectHmm( const Size& rPageSizeHmm ) const
+{
+    EmuRectangle aAnchorRect = calcAnchorRectEmu( rPageSizeHmm );
+    return Rectangle( lclEmuToHmm( aAnchorRect.X ), lclEmuToHmm( aAnchorRect.Y ), lclEmuToHmm( aAnchorRect.Width ), lclEmuToHmm( aAnchorRect.Height ) );
+}
+
+// private --------------------------------------------------------------------
+
+EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const
+{
+    // calculate position of top-left edge of the cell
+    Point aPoint = getCellPosition( rModel.mnCol, rModel.mnRow );
+    EmuPoint aEmuPoint( lclHmmToEmu( aPoint.X ), lclHmmToEmu( aPoint.Y ) );
+
+    // add the offset inside the cell
+    switch( meCellAnchorType )
+    {
+        case CELLANCHOR_EMU:
+            aEmuPoint.X += rModel.mnColOffset;
+            aEmuPoint.Y += rModel.mnRowOffset;
+        break;
+
+        case CELLANCHOR_PIXEL:
+        {
+            const UnitConverter& rUnitConv = getUnitConverter();
+            aEmuPoint.X += static_cast< sal_Int64 >( rUnitConv.scaleValue( static_cast< double >( rModel.mnColOffset ), UNIT_SCREENX, UNIT_EMU ) );
+            aEmuPoint.Y += static_cast< sal_Int64 >( rUnitConv.scaleValue( static_cast< double >( rModel.mnRowOffset ), UNIT_SCREENY, UNIT_EMU ) );
+        }
+        break;
+
+        case CELLANCHOR_COLROW:
+        {
+            Size aCellSize = getCellSize( rModel.mnCol, rModel.mnRow );
+            EmuSize aEmuSize( lclHmmToEmu( aCellSize.Width ), lclHmmToEmu( aCellSize.Height ) );
+            // X offset is given in 1/1024 of column width
+            aEmuPoint.X += static_cast< sal_Int64 >( aEmuSize.Width * getLimitedValue< double >( static_cast< double >( rModel.mnColOffset ) / 1024.0, 0.0, 1.0 ) + 0.5 );
+            // Y offset is given in 1/256 of row height
+            aEmuPoint.Y += static_cast< sal_Int64 >( aEmuSize.Height * getLimitedValue< double >( static_cast< double >( rModel.mnRowOffset ) / 256.0, 0.0, 1.0 ) + 0.5 );
+        }
+        break;
+    }
+
+    return aEmuPoint;
+}
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
diff --git a/oox/source/xls/drawingfragment.cxx b/oox/source/xls/drawingfragment.cxx
index 290d203f9..d46e237c6 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -88,329 +88,6 @@ sal_Int64 lclCalcEmu( const UnitConverter& rUnitConv, sal_Int64 nValue, Unit eFr
 
 // ============================================================================
 
-AnchorCellModel::AnchorCellModel() :
-    mnCol( -1 ),
-    mnRow( -1 ),
-    mnColOffset( 0 ),
-    mnRowOffset( 0 )
-{
-}
-
-// ----------------------------------------------------------------------------
-
-AnchorClientDataModel::AnchorClientDataModel() :
-    mbLocksWithSheet( true ),
-    mbPrintsWithSheet( true )
-{
-}
-
-// ============================================================================
-
-ShapeAnchor::ShapeAnchor( const WorksheetHelper& rHelper ) :
-    WorksheetHelper( rHelper ),
-    meType( ANCHOR_INVALID ),
-    mnEditAs( XML_twoCell )
-{
-}
-
-void ShapeAnchor::importAnchor( sal_Int32 nElement, const AttributeList& rAttribs )
-{
-    switch( nElement )
-    {
-        case XDR_TOKEN( absoluteAnchor ):
-            meType = ANCHOR_ABSOLUTE;
-        break;
-        case XDR_TOKEN( oneCellAnchor ):
-            meType = ANCHOR_ONECELL;
-        break;
-        case XDR_TOKEN( twoCellAnchor ):
-            meType = ANCHOR_TWOCELL;
-            mnEditAs = rAttribs.getToken( XML_editAs, XML_twoCell );
-        break;
-        default:
-            OSL_FAIL( "ShapeAnchor::importAnchor - unexpected element" );
-    }
-}
-
-void ShapeAnchor::importPos( const AttributeList& rAttribs )
-{
-    OSL_ENSURE( meType == ANCHOR_ABSOLUTE, "ShapeAnchor::importPos - unexpected 'xdr:pos' element" );
-    maPos.X = rAttribs.getHyper( XML_x, 0 );
-    maPos.Y = rAttribs.getHyper( XML_y, 0 );
-}
-
-void ShapeAnchor::importExt( const AttributeList& rAttribs )
-{
-    OSL_ENSURE( (meType == ANCHOR_ABSOLUTE) || (meType == ANCHOR_ONECELL), "ShapeAnchor::importExt - unexpected 'xdr:ext' element" );
-    maSize.Width = rAttribs.getHyper( XML_cx, 0 );
-    maSize.Height = rAttribs.getHyper( XML_cy, 0 );
-}
-
-void ShapeAnchor::importClientData( const AttributeList& rAttribs )
-{
-    maClientData.mbLocksWithSheet  = rAttribs.getBool( XML_fLocksWithSheet, true );
-    maClientData.mbPrintsWithSheet = rAttribs.getBool( XML_fPrintsWithSheet, true );
-}
-
-void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue )
-{
-    AnchorCellModel* pAnchorCell = 0;
-    switch( nParentContext )
-    {
-        case XDR_TOKEN( from ):
-            OSL_ENSURE( (meType == ANCHOR_ONECELL) || (meType == ANCHOR_TWOCELL), "ShapeAnchor::setCellPos - unexpected 'xdr:from' element" );
-            pAnchorCell = &maFrom;
-        break;
-        case XDR_TOKEN( to ):
-            OSL_ENSURE( meType == ANCHOR_TWOCELL, "ShapeAnchor::setCellPos - unexpected 'xdr:to' element" );
-            pAnchorCell = &maTo;
-        break;
-        default:
-            OSL_FAIL( "ShapeAnchor::setCellPos - unexpected parent element" );
-    }
-    if( pAnchorCell ) switch( nElement )
-    {
-        case XDR_TOKEN( col ):      pAnchorCell->mnCol = rValue.toInt32();          break;
-        case XDR_TOKEN( row ):      pAnchorCell->mnRow = rValue.toInt32();          break;
-        case XDR_TOKEN( colOff ):   pAnchorCell->mnColOffset = rValue.toInt64();    break;
-        case XDR_TOKEN( rowOff ):   pAnchorCell->mnRowOffset = rValue.toInt64();    break;
-        default:    OSL_FAIL( "ShapeAnchor::setCellPos - unexpected element" );
-    }
-}
-
-void ShapeAnchor::importVmlAnchor( const OUString& rAnchor )
-{
-    meType = ANCHOR_VML;
-
-    ::std::vector< OUString > aTokens;
-    sal_Int32 nIndex = 0;
-    while( nIndex >= 0 )
-        aTokens.push_back( rAnchor.getToken( 0, ',', nIndex ).trim() );
-
-    OSL_ENSURE( aTokens.size() >= 8, "ShapeAnchor::importVmlAnchor - missing anchor tokens" );
-    if( aTokens.size() >= 8 )
-    {
-        maFrom.mnCol       = aTokens[ 0 ].toInt32();
-        maFrom.mnColOffset = aTokens[ 1 ].toInt32();
-        maFrom.mnRow       = aTokens[ 2 ].toInt32();
-        maFrom.mnRowOffset = aTokens[ 3 ].toInt32();
-        maTo.mnCol         = aTokens[ 4 ].toInt32();
-        maTo.mnColOffset   = aTokens[ 5 ].toInt32();
-        maTo.mnRow         = aTokens[ 6 ].toInt32();
-        maTo.mnRowOffset   = aTokens[ 7 ].toInt32();
-    }
-}
-
-bool ShapeAnchor::isValidAnchor() const
-{
-    bool bValid = false;
-    switch( meType )
-    {
-        case ANCHOR_ABSOLUTE:
-            OSL_ENSURE( maPos.isValid(), "ShapeAnchor::isValidAnchor - invalid position" );
-            OSL_ENSURE( maSize.isValid(), "ShapeAnchor::isValidAnchor - invalid size" );
-            bValid = maPos.isValid() && maSize.isValid() && (maSize.Width > 0) && (maSize.Height > 0);
-        break;
-        case ANCHOR_ONECELL:
-            OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::isValidAnchor - invalid from position" );
-            OSL_ENSURE( maSize.isValid(), "ShapeAnchor::isValidAnchor - invalid size" );
-            bValid = maFrom.isValid() && maSize.isValid() && (maSize.Width > 0) && (maSize.Height > 0);
-        break;
-        case ANCHOR_TWOCELL:
-        case ANCHOR_VML:
-            OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::isValidAnchor - invalid from position" );
-            OSL_ENSURE( maTo.isValid(), "ShapeAnchor::isValidAnchor - invalid to position" );
-            bValid = maFrom.isValid() && maTo.isValid() &&
-                ((maFrom.mnCol < maTo.mnCol) || ((maFrom.mnCol == maTo.mnCol) && (maFrom.mnColOffset < maTo.mnColOffset))) &&
-                ((maFrom.mnRow < maTo.mnRow) || ((maFrom.mnRow == maTo.mnRow) && (maFrom.mnRowOffset < maTo.mnRowOffset)));
-        break;
-        case ANCHOR_INVALID:
-            OSL_FAIL( "ShapeAnchor::isValidAnchor - invalid anchor" );
-        break;
-    }
-    return bValid;
-}
-
-Rectangle ShapeAnchor::calcApiLocation( const Size& rApiSheetSize, const AnchorSizeModel& rEmuSheetSize ) const
-{
-    AddressConverter& rAddrConv = getAddressConverter();
-    UnitConverter& rUnitConv = getUnitConverter();
-    Rectangle aApiLoc( -1, -1, -1, -1 );
-    Unit eUnitX = (meType == ANCHOR_VML) ? UNIT_SCREENX : UNIT_EMU;
-    Unit eUnitY = (meType == ANCHOR_VML) ? UNIT_SCREENY : UNIT_EMU;
-
-    // calculate shape position
-    switch( meType )
-    {
-        case ANCHOR_ABSOLUTE:
-            OSL_ENSURE( maPos.isValid(), "ShapeAnchor::calcApiLocation - invalid position" );
-            if( maPos.isValid() && (maPos.X < rEmuSheetSize.Width) && (maPos.Y < rEmuSheetSize.Height) )
-            {
-                aApiLoc.X = rUnitConv.scaleToMm100( static_cast< double >( maPos.X ), UNIT_EMU );
-                aApiLoc.Y = rUnitConv.scaleToMm100( static_cast< double >( maPos.Y ), UNIT_EMU );
-            }
-        break;
-        case ANCHOR_ONECELL:
-        case ANCHOR_TWOCELL:
-        case ANCHOR_VML:
-            OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::calcApiLocation - invalid position" );
-            if( maFrom.isValid() && rAddrConv.checkCol( maFrom.mnCol, true ) && rAddrConv.checkRow( maFrom.mnRow, true ) )
-            {
-                Point aPoint = getCellPosition( maFrom.mnCol, maFrom.mnRow );
-                aApiLoc.X = aPoint.X + rUnitConv.scaleToMm100( static_cast< double >( maFrom.mnColOffset ), eUnitX );
-                aApiLoc.Y = aPoint.Y + rUnitConv.scaleToMm100( static_cast< double >( maFrom.mnRowOffset ), eUnitY );
-            }
-        break;
-        case ANCHOR_INVALID:
-            OSL_FAIL( "ShapeAnchor::calcApiLocation - invalid anchor" );
-        break;
-    }
-
-    // calculate shape size
-    if( (aApiLoc.X >= 0) && (aApiLoc.Y >= 0) ) switch( meType )
-    {
-        case ANCHOR_ABSOLUTE:
-        case ANCHOR_ONECELL:
-            OSL_ENSURE( maSize.isValid(), "ShapeAnchor::calcApiLocation - invalid size" );
-            if( maSize.isValid() )
-            {
-                aApiLoc.Width = ::std::min< sal_Int32 >(
-                    rUnitConv.scaleToMm100( static_cast< double >( maSize.Width ), UNIT_EMU ),
-                    rApiSheetSize.Width - aApiLoc.X );
-                aApiLoc.Height = ::std::min< sal_Int32 >(
-                    rUnitConv.scaleToMm100( static_cast< double >( maSize.Height ), UNIT_EMU ),
-                    rApiSheetSize.Height - aApiLoc.Y );
-            }
-        break;
-        case ANCHOR_TWOCELL:
-        case ANCHOR_VML:
-            OSL_ENSURE( maTo.isValid(), "ShapeAnchor::calcApiLocation - invalid position" );
-            if( maTo.isValid() )
-            {
-                /*  Pass a valid cell address to getCellPosition(), otherwise
-                    nothing is returned, even if either row or column is valid. */
-                CellAddress aToCell = rAddrConv.createValidCellAddress( BinAddress( maTo.mnCol, maTo.mnRow ), getSheetIndex(), true );
-                Point aPoint = getCellPosition( aToCell.Column, aToCell.Row );
-                // width
-                aApiLoc.Width = rApiSheetSize.Width - aApiLoc.X;
-                if( aToCell.Column == maTo.mnCol )
-                {
-                    aPoint.X += rUnitConv.scaleToMm100( static_cast< double >( maTo.mnColOffset ), eUnitX );
-                    aApiLoc.Width = ::std::min< sal_Int32 >( aPoint.X - aApiLoc.X + 1, aApiLoc.Width );
-                }
-                // height
-                aApiLoc.Height = rApiSheetSize.Height - aApiLoc.Y;
-                if( aToCell.Row == maTo.mnRow )
-                {
-                    aPoint.Y += rUnitConv.scaleToMm100( static_cast< double >( maTo.mnRowOffset ), eUnitY );
-                    aApiLoc.Height = ::std::min< sal_Int32 >( aPoint.Y - aApiLoc.Y + 1, aApiLoc.Height );
-                }
-            }
-        break;
-        case ANCHOR_INVALID:
-        break;
-    }
-
-    return aApiLoc;
-}
-
-Rectangle ShapeAnchor::calcEmuLocation( const AnchorSizeModel& rEmuSheetSize ) const
-{
-    AddressConverter& rAddrConv = getAddressConverter();
-    UnitConverter& rUnitConv = getUnitConverter();
-
-    Size aSheetSize(
-        getLimitedValue< sal_Int32, sal_Int64 >( rEmuSheetSize.Width, 0, SAL_MAX_INT32 ),
-        getLimitedValue< sal_Int32, sal_Int64 >( rEmuSheetSize.Height, 0, SAL_MAX_INT32 ) );
-    Rectangle aLoc( -1, -1, -1, -1 );
-    Unit eUnitX = (meType == ANCHOR_VML) ? UNIT_SCREENX : UNIT_EMU;
-    Unit eUnitY = (meType == ANCHOR_VML) ? UNIT_SCREENY : UNIT_EMU;
-
-    // calculate shape position
-    switch( meType )
-    {
-        case ANCHOR_ABSOLUTE:
-            OSL_ENSURE( maPos.isValid(), "ShapeAnchor::calcEmuLocation - invalid position" );
-            if( maPos.isValid() && (maPos.X < aSheetSize.Width) && (maPos.Y < aSheetSize.Height) )
-            {
-                aLoc.X = static_cast< sal_Int32 >( maPos.X );
-                aLoc.Y = static_cast< sal_Int32 >( maPos.Y );
-            }
-        break;
-        case ANCHOR_ONECELL:
-        case ANCHOR_TWOCELL:
-        case ANCHOR_VML:
-            OSL_ENSURE( maFrom.isValid(), "ShapeAnchor::calcEmuLocation - invalid position" );
-            if( maFrom.isValid() && rAddrConv.checkCol( maFrom.mnCol, true ) && rAddrConv.checkRow( maFrom.mnRow, true ) )
-            {
-                Point aPoint = getCellPosition( maFrom.mnCol, maFrom.mnRow );
-                sal_Int64 nX = static_cast< sal_Int64 >( rUnitConv.scaleFromMm100( aPoint.X, UNIT_EMU ) ) + lclCalcEmu( rUnitConv, maFrom.mnColOffset, eUnitX );
-                sal_Int64 nY = static_cast< sal_Int64 >( rUnitConv.scaleFromMm100( aPoint.Y, UNIT_EMU ) ) + lclCalcEmu( rUnitConv, maFrom.mnRowOffset, eUnitY );
-                if( (nX < aSheetSize.Width) && (nY < aSheetSize.Height) )
-                {
-                    aLoc.X = static_cast< sal_Int32 >( nX );
-                    aLoc.Y = static_cast< sal_Int32 >( nY );
-                }
-            }
-        break;
-        case ANCHOR_INVALID:
-            OSL_FAIL( "ShapeAnchor::calcEmuLocation - invalid anchor" );
-        break;
-    }
-
-    // calculate shape size
-    if( (aLoc.X >= 0) && (aLoc.Y >= 0) ) switch( meType )
-    {
-        case ANCHOR_ABSOLUTE:
-        case ANCHOR_ONECELL:
-            OSL_ENSURE( maSize.isValid(), "ShapeAnchor::calcEmuLocation - invalid size" );
-            if( maSize.isValid() )
-            {
-                aLoc.Width = static_cast< sal_Int32 >( ::std::min< sal_Int64 >( maSize.Width, aSheetSize.Width - aLoc.X ) );
-                aLoc.Height = static_cast< sal_Int32 >( ::std::min< sal_Int64 >( maSize.Height, aSheetSize.Height - aLoc.Y ) );
-            }
-        break;
-        case ANCHOR_TWOCELL:
-        case ANCHOR_VML:
-            OSL_ENSURE( maTo.isValid(), "ShapeAnchor::calcEmuLocation - invalid position" );
-            if( maTo.isValid() )
-            {
-                /*  Pass a valid cell address to getCellPosition(), otherwise
-                    nothing is returned, even if either row or column is valid. */
-                CellAddress aToCell = rAddrConv.createValidCellAddress( BinAddress( maTo.mnCol, maTo.mnRow ), getSheetIndex(), true );
-                Point aPoint = getCellPosition( aToCell.Column, aToCell.Row );
-                sal_Int64 nX = static_cast< sal_Int64 >( rUnitConv.scaleFromMm100( aPoint.X, UNIT_EMU ) );
-                sal_Int64 nY = static_cast< sal_Int64 >( rUnitConv.scaleFromMm100( aPoint.Y, UNIT_EMU ) );
-                // width
-                aLoc.Width = aSheetSize.Width - aLoc.X;
-                if( aToCell.Column == maTo.mnCol )
-                {
-                    nX += lclCalcEmu( rUnitConv, maTo.mnColOffset, eUnitX );
-                    aLoc.Width = static_cast< sal_Int32 >( ::std::min< sal_Int64 >( nX - aLoc.X + 1, aLoc.Width ) );
-                }
-                // height
-                aLoc.Height = aSheetSize.Height - aLoc.Y;
-                if( aToCell.Row == maTo.mnRow )
-                {
-                    nY += lclCalcEmu( rUnitConv, maTo.mnRowOffset, eUnitY );
-                    aLoc.Height = static_cast< sal_Int32 >( ::std::min< sal_Int64 >( nY - aLoc.Y + 1, aLoc.Height ) );
-                }
-            }
-        break;
-        case ANCHOR_INVALID:
-        break;
-    }
-
-    // add 0.75 mm (27,000 EMUs) in X direction to correct display error
-    if( aLoc.X >= 0 )
-        aLoc.X += 27000;
-    // remove 0.25 mm (9,000 EMUs) in Y direction to correct display error
-    if( aLoc.Y >= 9000 )
-        aLoc.Y -= 9000;
-
-    return aLoc;
-}
-
 // ============================================================================
 
 ShapeMacroAttacher::ShapeMacroAttacher( const OUString& rMacroName, const Reference< XShape >& rxShape ) :
@@ -521,9 +198,6 @@ DrawingFragment::DrawingFragment( const WorksheetHelper& rHelper, const OUString
     mxDrawPage( rHelper.getDrawPage(), UNO_QUERY )
 {
     OSL_ENSURE( mxDrawPage.is(), "DrawingFragment::DrawingFragment - missing drawing page" );
-    maApiSheetSize = getDrawPageSize();
-    maEmuSheetSize.Width = static_cast< sal_Int64 >( getUnitConverter().scaleFromMm100( maApiSheetSize.Width, UNIT_EMU ) );
-    maEmuSheetSize.Height = static_cast< sal_Int64 >( getUnitConverter().scaleFromMm100( maApiSheetSize.Height, UNIT_EMU ) );
 }
 
 ContextHandlerRef DrawingFragment::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
@@ -598,22 +272,22 @@ void DrawingFragment::onEndElement()
         case XDR_TOKEN( absoluteAnchor ):
         case XDR_TOKEN( oneCellAnchor ):
         case XDR_TOKEN( twoCellAnchor ):
-            if( mxDrawPage.is() && mxShape.get() && mxAnchor.get() && mxAnchor->isValidAnchor() )
+            if( mxDrawPage.is() && mxShape.get() && mxAnchor.get() )
             {
-                Rectangle aShapeRect = mxAnchor->calcEmuLocation( maEmuSheetSize );
-                if( (aShapeRect.X >= 0) && (aShapeRect.Y >= 0) && (aShapeRect.Width >= 0) && (aShapeRect.Height >= 0) )
+                EmuRectangle aShapeRectEmu = mxAnchor->calcAnchorRectEmu( getDrawPageSize() );
+                if( (aShapeRectEmu.X >= 0) && (aShapeRectEmu.Y >= 0) && (aShapeRectEmu.Width >= 0) && (aShapeRectEmu.Height >= 0) )
                 {
+                    // TODO: DrawingML implementation expects 32-bit coordinates for EMU rectangles (change that to EmuRectangle)
+                    Rectangle aShapeRectEmu32(
+                        getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.X, 0, SAL_MAX_INT32 ),
+                        getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Y, 0, SAL_MAX_INT32 ),
+                        getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Width, 0, SAL_MAX_INT32 ),
+                        getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Height, 0, SAL_MAX_INT32 ) );
                     basegfx::B2DHomMatrix aTransformation;
-                    mxShape->addShape( getOoxFilter(), &getTheme(), mxDrawPage, aTransformation, &aShapeRect );
-                    /*  Collect all shape positions in the WorksheetHelper base
-                        class. But first, scale EMUs to 1/100 mm. */
-                    const UnitConverter& rUnitConv = getUnitConverter();
-                    Rectangle aShapeRectHmm(
-                        rUnitConv.scaleToMm100( aShapeRect.X, UNIT_EMU ),
-                        rUnitConv.scaleToMm100( aShapeRect.Y, UNIT_EMU ),
-                        rUnitConv.scaleToMm100( aShapeRect.Width, UNIT_EMU ),
-                        rUnitConv.scaleToMm100( aShapeRect.Height, UNIT_EMU ) );
-                    extendShapeBoundingBox( aShapeRectHmm );
+                    mxShape->addShape( getOoxFilter(), &getTheme(), mxDrawPage, aTransformation, &aShapeRectEmu32 );
+
+                    // collect all shape positions in the WorksheetHelper base class
+                    extendShapeBoundingBox( aShapeRectEmu32 );
                 }
             }
             mxShape.reset();
@@ -774,7 +448,7 @@ bool VmlDrawing::convertClientAnchor( Rectangle& orShapeRect, const OUString& rS
         return false;
     ShapeAnchor aAnchor( *this );
     aAnchor.importVmlAnchor( rShapeAnchor );
-    orShapeRect = aAnchor.calcApiLocation( getDrawPageSize(), AnchorSizeModel() );
+    orShapeRect = aAnchor.calcAnchorRectHmm( getDrawPageSize() );
     return (orShapeRect.Width >= 0) && (orShapeRect.Height >= 0);
 }
 
diff --git a/oox/source/xls/drawingmanager.cxx b/oox/source/xls/drawingmanager.cxx
new file mode 100755
index 000000000..bc0200817
--- /dev/null
+++ b/oox/source/xls/drawingmanager.cxx
@@ -0,0 +1,1414 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "oox/xls/drawingmanager.hxx"
+
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/drawing/CircleKind.hpp>
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
+#include <com/sun/star/drawing/PolygonKind.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
+#include "oox/core/filterbase.hxx"
+#include "oox/drawingml/fillproperties.hxx"
+#include "oox/drawingml/lineproperties.hxx"
+#include "oox/drawingml/shapepropertymap.hxx"
+#include "oox/helper/containerhelper.hxx"
+#include "oox/token/tokens.hxx"
+#include "oox/xls/biffinputstream.hxx"
+#include "oox/xls/unitconverter.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::oox::drawingml;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+namespace {
+
+// OBJ record -----------------------------------------------------------------
+
+const sal_uInt16 BIFF_OBJTYPE_GROUP         = 0;
+const sal_uInt16 BIFF_OBJTYPE_LINE          = 1;
+const sal_uInt16 BIFF_OBJTYPE_RECTANGLE     = 2;
+const sal_uInt16 BIFF_OBJTYPE_OVAL          = 3;
+const sal_uInt16 BIFF_OBJTYPE_ARC           = 4;
+const sal_uInt16 BIFF_OBJTYPE_CHART         = 5;
+const sal_uInt16 BIFF_OBJTYPE_TEXT          = 6;
+const sal_uInt16 BIFF_OBJTYPE_BUTTON        = 7;
+const sal_uInt16 BIFF_OBJTYPE_PICTURE       = 8;
+const sal_uInt16 BIFF_OBJTYPE_POLYGON       = 9;        // new in BIFF4
+const sal_uInt16 BIFF_OBJTYPE_CHECKBOX      = 11;       // new in BIFF5
+const sal_uInt16 BIFF_OBJTYPE_OPTIONBUTTON  = 12;
+const sal_uInt16 BIFF_OBJTYPE_EDIT          = 13;
+const sal_uInt16 BIFF_OBJTYPE_LABEL         = 14;
+const sal_uInt16 BIFF_OBJTYPE_DIALOG        = 15;
+const sal_uInt16 BIFF_OBJTYPE_SPIN          = 16;
+const sal_uInt16 BIFF_OBJTYPE_SCROLLBAR     = 17;
+const sal_uInt16 BIFF_OBJTYPE_LISTBOX       = 18;
+const sal_uInt16 BIFF_OBJTYPE_GROUPBOX      = 19;
+const sal_uInt16 BIFF_OBJTYPE_DROPDOWN      = 20;
+const sal_uInt16 BIFF_OBJTYPE_NOTE          = 25;       // new in BIFF8
+const sal_uInt16 BIFF_OBJTYPE_DRAWING       = 30;
+const sal_uInt16 BIFF_OBJTYPE_UNKNOWN       = 0xFFFF;   // for internal use only
+
+const sal_uInt16 BIFF_OBJ_HIDDEN            = 0x0100;
+const sal_uInt16 BIFF_OBJ_VISIBLE           = 0x0200;
+const sal_uInt16 BIFF_OBJ_PRINTABLE         = 0x0400;
+
+// line formatting ------------------------------------------------------------
+
+const sal_uInt8 BIFF_OBJ_LINE_AUTOCOLOR     = 64;
+
+const sal_uInt8 BIFF_OBJ_LINE_SOLID         = 0;
+const sal_uInt8 BIFF_OBJ_LINE_DASH          = 1;
+const sal_uInt8 BIFF_OBJ_LINE_DOT           = 2;
+const sal_uInt8 BIFF_OBJ_LINE_DASHDOT       = 3;
+const sal_uInt8 BIFF_OBJ_LINE_DASHDOTDOT    = 4;
+const sal_uInt8 BIFF_OBJ_LINE_MEDTRANS      = 5;
+const sal_uInt8 BIFF_OBJ_LINE_DARKTRANS     = 6;
+const sal_uInt8 BIFF_OBJ_LINE_LIGHTTRANS    = 7;
+const sal_uInt8 BIFF_OBJ_LINE_NONE          = 255;
+
+const sal_uInt8 BIFF_OBJ_LINE_HAIR          = 0;
+const sal_uInt8 BIFF_OBJ_LINE_THIN          = 1;
+const sal_uInt8 BIFF_OBJ_LINE_MEDIUM        = 2;
+const sal_uInt8 BIFF_OBJ_LINE_THICK         = 3;
+
+const sal_uInt8 BIFF_OBJ_LINE_AUTO          = 0x01;
+
+const sal_uInt8 BIFF_OBJ_ARROW_NONE         = 0;
+const sal_uInt8 BIFF_OBJ_ARROW_OPEN         = 1;
+const sal_uInt8 BIFF_OBJ_ARROW_FILLED       = 2;
+const sal_uInt8 BIFF_OBJ_ARROW_OPENBOTH     = 3;
+const sal_uInt8 BIFF_OBJ_ARROW_FILLEDBOTH   = 4;
+
+const sal_uInt8 BIFF_OBJ_ARROW_NARROW       = 0;
+const sal_uInt8 BIFF_OBJ_ARROW_MEDIUM       = 1;
+const sal_uInt8 BIFF_OBJ_ARROW_WIDE         = 2;
+
+const sal_uInt8 BIFF_OBJ_LINE_TL            = 0;
+const sal_uInt8 BIFF_OBJ_LINE_TR            = 1;
+const sal_uInt8 BIFF_OBJ_LINE_BR            = 2;
+const sal_uInt8 BIFF_OBJ_LINE_BL            = 3;
+
+const sal_uInt8 BIFF_OBJ_ARC_TR             = 0;
+const sal_uInt8 BIFF_OBJ_ARC_TL             = 1;
+const sal_uInt8 BIFF_OBJ_ARC_BL             = 2;
+const sal_uInt8 BIFF_OBJ_ARC_BR             = 3;
+
+const sal_uInt16 BIFF_OBJ_POLY_CLOSED       = 0x0100;
+
+// fill formatting ------------------------------------------------------------
+
+const sal_uInt8 BIFF_OBJ_FILL_AUTOCOLOR     = 65;
+
+const sal_uInt8 BIFF_OBJ_PATT_NONE          = 0;
+const sal_uInt8 BIFF_OBJ_PATT_SOLID         = 1;
+
+const sal_uInt8 BIFF_OBJ_FILL_AUTO          = 0x01;
+
+// text formatting ------------------------------------------------------------
+
+const sal_uInt8 BIFF_OBJ_HOR_LEFT           = 1;
+const sal_uInt8 BIFF_OBJ_HOR_CENTER         = 2;
+const sal_uInt8 BIFF_OBJ_HOR_RIGHT          = 3;
+const sal_uInt8 BIFF_OBJ_HOR_JUSTIFY        = 4;
+
+const sal_uInt8 BIFF_OBJ_VER_TOP            = 1;
+const sal_uInt8 BIFF_OBJ_VER_CENTER         = 2;
+const sal_uInt8 BIFF_OBJ_VER_BOTTOM         = 3;
+const sal_uInt8 BIFF_OBJ_VER_JUSTIFY        = 4;
+
+const sal_uInt16 BIFF_OBJ_ORIENT_NONE       = 0;
+const sal_uInt16 BIFF_OBJ_ORIENT_STACKED    = 1;        /// Stacked top to bottom.
+const sal_uInt16 BIFF_OBJ_ORIENT_90CCW      = 2;        /// 90 degr. counterclockwise.
+const sal_uInt16 BIFF_OBJ_ORIENT_90CW       = 3;        /// 90 degr. clockwise.
+
+const sal_uInt16 BIFF_OBJ_TEXT_AUTOSIZE     = 0x0080;
+const sal_uInt16 BIFF_OBJ_TEXT_LOCKED       = 0x0200;
+
+const sal_Int32 BIFF_OBJ_TEXT_MARGIN        = 20000;    /// Automatic text margin (EMUs).
+
+// BIFF8 OBJ sub records ------------------------------------------------------
+
+const sal_uInt16 BIFF_OBJCMO_PRINTABLE      = 0x0010;   /// Object printable.
+const sal_uInt16 BIFF_OBJCMO_AUTOLINE       = 0x2000;   /// Automatic line formatting.
+const sal_uInt16 BIFF_OBJCMO_AUTOFILL       = 0x4000;   /// Automatic fill formatting.
+
+// ----------------------------------------------------------------------------
+
+inline BiffInputStream& operator>>( BiffInputStream& rStrm, ShapeAnchor& rAnchor )
+{
+    rAnchor.importBiffAnchor( rStrm );
+    return rStrm;
+}
+
+} // namespace
+
+// ============================================================================
+// Model structures for BIFF OBJ record data
+// ============================================================================
+
+BiffObjLineModel::BiffObjLineModel() :
+    mnColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ),
+    mnStyle( BIFF_OBJ_LINE_SOLID ),
+    mnWidth( BIFF_OBJ_LINE_HAIR ),
+    mbAuto( true )
+{
+}
+
+bool BiffObjLineModel::isVisible() const
+{
+    return mbAuto || (mnStyle != BIFF_OBJ_LINE_NONE);
+}
+
+BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjLineModel& rModel )
+{
+    sal_uInt8 nFlags;
+    rStrm >> rModel.mnColorIdx >> rModel.mnStyle >> rModel.mnWidth >> nFlags;
+    rModel.mbAuto = getFlag( nFlags, BIFF_OBJ_LINE_AUTO );
+    return rStrm;
+}
+
+// ============================================================================
+
+BiffObjFillModel::BiffObjFillModel() :
+    mnBackColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ),
+    mnPattColorIdx( BIFF_OBJ_FILL_AUTOCOLOR ),
+    mnPattern( BIFF_OBJ_PATT_SOLID ),
+    mbAuto( true )
+{
+}
+
+bool BiffObjFillModel::isFilled() const
+{
+    return mbAuto || (mnPattern != BIFF_OBJ_PATT_NONE);
+}
+
+BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjFillModel& rModel )
+{
+    sal_uInt8 nFlags;
+    rStrm >> rModel.mnBackColorIdx >> rModel.mnPattColorIdx >> rModel.mnPattern >> nFlags;
+    rModel.mbAuto = getFlag( nFlags, BIFF_OBJ_FILL_AUTO );
+    return rStrm;
+}
+
+// ============================================================================
+
+BiffObjTextModel::BiffObjTextModel() :
+    mnTextLen( 0 ),
+    mnFormatSize( 0 ),
+    mnLinkSize( 0 ),
+    mnDefFontId( 0 ),
+    mnFlags( 0 ),
+    mnOrientation( BIFF_OBJ_ORIENT_NONE ),
+    mnButtonFlags( 0 ),
+    mnShortcut( 0 ),
+    mnShortcutEA( 0 )
+{
+}
+
+void BiffObjTextModel::readObj3( BiffInputStream& rStrm )
+{
+    rStrm >> mnTextLen;
+    rStrm.skip( 2 );
+    rStrm >> mnFormatSize >> mnDefFontId;
+    rStrm.skip( 2 );
+    rStrm >> mnFlags >> mnOrientation;
+    rStrm.skip( 8 );
+}
+
+void BiffObjTextModel::readObj5( BiffInputStream& rStrm )
+{
+    rStrm >> mnTextLen;
+    rStrm.skip( 2 );
+    rStrm >> mnFormatSize >> mnDefFontId;
+    rStrm.skip( 2 );
+    rStrm >> mnFlags >> mnOrientation;
+    rStrm.skip( 2 );
+    rStrm >> mnLinkSize;
+    rStrm.skip( 2 );
+    rStrm >> mnButtonFlags >> mnShortcut >> mnShortcutEA;
+}
+
+void BiffObjTextModel::readTxo8( BiffInputStream& rStrm )
+{
+    rStrm >> mnFlags >> mnOrientation >> mnButtonFlags >> mnShortcut >> mnShortcutEA >> mnTextLen >> mnFormatSize;
+}
+
+sal_uInt8 BiffObjTextModel::getHorAlign() const
+{
+    return extractValue< sal_uInt8 >( mnFlags, 1, 3 );
+}
+
+sal_uInt8 BiffObjTextModel::getVerAlign() const
+{
+    return extractValue< sal_uInt8 >( mnFlags, 4, 3 );
+}
+
+// ============================================================================
+// BIFF drawing objects
+// ============================================================================
+
+BiffDrawingObjectContainer::BiffDrawingObjectContainer()
+{
+}
+
+void BiffDrawingObjectContainer::append( const BiffDrawingObjectRef& rxDrawingObj )
+{
+    maObjects.push_back( rxDrawingObj );
+}
+
+void BiffDrawingObjectContainer::insertGrouped( const BiffDrawingObjectRef& rxDrawingObj )
+{
+    if( !maObjects.empty() )
+        if( BiffGroupObject* pGroupObj = dynamic_cast< BiffGroupObject* >( maObjects.back().get() ) )
+            if( pGroupObj->tryInsert( rxDrawingObj ) )
+                return;
+    maObjects.push_back( rxDrawingObj );
+}
+
+void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
+{
+    maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect );
+}
+
+// ============================================================================
+
+BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) :
+    WorksheetHelper( rHelper ),
+    maAnchor( rHelper ),
+    mnDffShapeId( 0 ),
+    mnDffFlags( 0 ),
+    mnObjId( BIFF_OBJ_INVALID_ID ),
+    mnObjType( BIFF_OBJTYPE_UNKNOWN ),
+    mbHasAnchor( false ),
+    mbHidden( false ),
+    mbVisible( true ),
+    mbPrintable( true ),
+    mbAreaObj( false ),
+    mbAutoMargin( true ),
+    mbSimpleMacro( true ),
+    mbProcessShape( true ),
+    mbInsertShape( true ),
+    mbCustomDff( false )
+{
+}
+
+BiffDrawingObjectBase::~BiffDrawingObjectBase()
+{
+}
+
+/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff3( const WorksheetHelper& rHelper, BiffInputStream& rStrm )
+{
+    BiffDrawingObjectRef xDrawingObj;
+
+    if( rStrm.getRemaining() >= 30 )
+    {
+        sal_uInt16 nObjType;
+        rStrm.skip( 4 );
+        rStrm >> nObjType;
+        switch( nObjType )
+        {
+            case BIFF_OBJTYPE_GROUP:        xDrawingObj.reset( new BiffGroupObject( rHelper ) );    break;
+            case BIFF_OBJTYPE_LINE:         xDrawingObj.reset( new BiffLineObject( rHelper ) );     break;
+            case BIFF_OBJTYPE_RECTANGLE:    xDrawingObj.reset( new BiffRectObject( rHelper ) );     break;
+            case BIFF_OBJTYPE_OVAL:         xDrawingObj.reset( new BiffOvalObject( rHelper ) );     break;
+            case BIFF_OBJTYPE_ARC:          xDrawingObj.reset( new BiffArcObject( rHelper ) );      break;
+#if 0
+            case BIFF_OBJTYPE_CHART:        xDrawingObj.reset( new XclImpChartObj( rHelper ) );     break;
+            case BIFF_OBJTYPE_TEXT:         xDrawingObj.reset( new XclImpTextObj( rHelper ) );      break;
+            case BIFF_OBJTYPE_BUTTON:       xDrawingObj.reset( new XclImpButtonObj( rHelper ) );    break;
+            case BIFF_OBJTYPE_PICTURE:      xDrawingObj.reset( new XclImpPictureObj( rHelper ) );   break;
+#endif
+            default:
+#if 0
+                OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff3 - unknown object type" );
+#endif
+                xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
+        }
+    }
+
+    xDrawingObj->importObjBiff3( rStrm );
+    return xDrawingObj;
+}
+
+/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff4( const WorksheetHelper& rHelper, BiffInputStream& rStrm )
+{
+    BiffDrawingObjectRef xDrawingObj;
+
+    if( rStrm.getRemaining() >= 30 )
+    {
+        sal_uInt16 nObjType;
+        rStrm.skip( 4 );
+        rStrm >> nObjType;
+        switch( nObjType )
+        {
+            case BIFF_OBJTYPE_GROUP:        xDrawingObj.reset( new BiffGroupObject( rHelper ) );    break;
+            case BIFF_OBJTYPE_LINE:         xDrawingObj.reset( new BiffLineObject( rHelper ) );     break;
+            case BIFF_OBJTYPE_RECTANGLE:    xDrawingObj.reset( new BiffRectObject( rHelper ) );     break;
+            case BIFF_OBJTYPE_OVAL:         xDrawingObj.reset( new BiffOvalObject( rHelper ) );     break;
+            case BIFF_OBJTYPE_ARC:          xDrawingObj.reset( new BiffArcObject( rHelper ) );      break;
+            case BIFF_OBJTYPE_POLYGON:      xDrawingObj.reset( new BiffPolygonObject( rHelper ) );  break;
+#if 0
+            case BIFF_OBJTYPE_CHART:        xDrawingObj.reset( new XclImpChartObj( rHelper ) );     break;
+            case BIFF_OBJTYPE_TEXT:         xDrawingObj.reset( new XclImpTextObj( rHelper ) );      break;
+            case BIFF_OBJTYPE_BUTTON:       xDrawingObj.reset( new XclImpButtonObj( rHelper ) );    break;
+            case BIFF_OBJTYPE_PICTURE:      xDrawingObj.reset( new XclImpPictureObj( rHelper ) );   break;
+#endif
+            default:
+#if 0
+                OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff4 - unknown object type" );
+#endif
+                xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
+        }
+    }
+
+    xDrawingObj->importObjBiff4( rStrm );
+    return xDrawingObj;
+}
+
+/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff5( const WorksheetHelper& rHelper, BiffInputStream& rStrm )
+{
+    BiffDrawingObjectRef xDrawingObj;
+
+    if( rStrm.getRemaining() >= 34 )
+    {
+        sal_uInt16 nObjType;
+        rStrm.skip( 4 );
+        rStrm >> nObjType;
+        switch( nObjType )
+        {
+            case BIFF_OBJTYPE_GROUP:        xDrawingObj.reset( new BiffGroupObject( rHelper ) );        break;
+            case BIFF_OBJTYPE_LINE:         xDrawingObj.reset( new BiffLineObject( rHelper ) );         break;
+            case BIFF_OBJTYPE_RECTANGLE:    xDrawingObj.reset( new BiffRectObject( rHelper ) );         break;
+            case BIFF_OBJTYPE_OVAL:         xDrawingObj.reset( new BiffOvalObject( rHelper ) );         break;
+            case BIFF_OBJTYPE_ARC:          xDrawingObj.reset( new BiffArcObject( rHelper ) );           break;
+            case BIFF_OBJTYPE_POLYGON:      xDrawingObj.reset( new BiffPolygonObject( rHelper ) );      break;
+#if 0
+            case BIFF_OBJTYPE_CHART:        xDrawingObj.reset( new XclImpChartObj( rHelper ) );         break;
+            case BIFF_OBJTYPE_TEXT:         xDrawingObj.reset( new XclImpTextObj( rHelper ) );          break;
+            case BIFF_OBJTYPE_BUTTON:       xDrawingObj.reset( new XclImpButtonObj( rHelper ) );        break;
+            case BIFF_OBJTYPE_PICTURE:      xDrawingObj.reset( new XclImpPictureObj( rHelper ) );       break;
+            case BIFF_OBJTYPE_CHECKBOX:     xDrawingObj.reset( new XclImpCheckBoxObj( rHelper ) );      break;
+            case BIFF_OBJTYPE_OPTIONBUTTON: xDrawingObj.reset( new XclImpOptionButtonObj( rHelper ) );  break;
+            case BIFF_OBJTYPE_EDIT:         xDrawingObj.reset( new XclImpEditObj( rHelper ) );          break;
+            case BIFF_OBJTYPE_LABEL:        xDrawingObj.reset( new XclImpLabelObj( rHelper ) );         break;
+            case BIFF_OBJTYPE_DIALOG:       xDrawingObj.reset( new XclImpDialogObj( rHelper ) );        break;
+            case BIFF_OBJTYPE_SPIN:         xDrawingObj.reset( new XclImpSpinButtonObj( rHelper ) );    break;
+            case BIFF_OBJTYPE_SCROLLBAR:    xDrawingObj.reset( new XclImpScrollBarObj( rHelper ) );     break;
+            case BIFF_OBJTYPE_LISTBOX:      xDrawingObj.reset( new XclImpListBoxObj( rHelper ) );       break;
+            case BIFF_OBJTYPE_GROUPBOX:     xDrawingObj.reset( new XclImpGroupBoxObj( rHelper ) );      break;
+            case BIFF_OBJTYPE_DROPDOWN:     xDrawingObj.reset( new XclImpDropDownObj( rHelper ) );      break;
+#endif
+            default:
+#if 0
+                OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff5 - unknown object type" );
+#endif
+                xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
+        }
+    }
+
+    xDrawingObj->importObjBiff5( rStrm );
+    return xDrawingObj;
+}
+
+/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff8( const WorksheetHelper& rHelper, BiffInputStream& rStrm )
+{
+    BiffDrawingObjectRef xDrawingObj;
+
+    if( rStrm.getRemaining() >= 10 )
+    {
+        sal_uInt16 nSubRecId, nSubRecSize, nObjType;
+        rStrm >> nSubRecId >> nSubRecSize >> nObjType;
+        OSL_ENSURE( nSubRecId == BIFF_ID_OBJCMO, "BiffDrawingObjectBase::importObjBiff8 - OBJCMO subrecord expected" );
+        if( (nSubRecId == BIFF_ID_OBJCMO) && (nSubRecSize >= 6) )
+        {
+            switch( nObjType )
+            {
+#if 0
+                // in BIFF8, all simple objects support text
+                case BIFF_OBJTYPE_LINE:
+                case BIFF_OBJTYPE_ARC:
+                    xDrawingObj.reset( new XclImpTextObj( rHelper ) );
+                    // lines and arcs may be 2-dimensional
+                    xDrawingObj->setAreaObj( false );
+                break;
+
+                // in BIFF8, all simple objects support text
+                case BIFF_OBJTYPE_RECTANGLE:
+                case BIFF_OBJTYPE_OVAL:
+                case BIFF_OBJTYPE_POLYGON:
+                case BIFF_OBJTYPE_DRAWING:
+                case BIFF_OBJTYPE_TEXT:
+                    xDrawingObj.reset( new XclImpTextObj( rHelper ) );
+                break;
+#endif
+
+                case BIFF_OBJTYPE_GROUP:        xDrawingObj.reset( new BiffGroupObject( rHelper ) );        break;
+#if 0
+                case BIFF_OBJTYPE_CHART:        xDrawingObj.reset( new XclImpChartObj( rHelper ) );         break;
+                case BIFF_OBJTYPE_BUTTON:       xDrawingObj.reset( new XclImpButtonObj( rHelper ) );        break;
+                case BIFF_OBJTYPE_PICTURE:      xDrawingObj.reset( new XclImpPictureObj( rHelper ) );       break;
+                case BIFF_OBJTYPE_CHECKBOX:     xDrawingObj.reset( new XclImpCheckBoxObj( rHelper ) );      break;
+                case BIFF_OBJTYPE_OPTIONBUTTON: xDrawingObj.reset( new XclImpOptionButtonObj( rHelper ) );  break;
+                case BIFF_OBJTYPE_EDIT:         xDrawingObj.reset( new XclImpEditObj( rHelper ) );          break;
+                case BIFF_OBJTYPE_LABEL:        xDrawingObj.reset( new XclImpLabelObj( rHelper ) );         break;
+                case BIFF_OBJTYPE_DIALOG:       xDrawingObj.reset( new XclImpDialogObj( rHelper ) );        break;
+                case BIFF_OBJTYPE_SPIN:         xDrawingObj.reset( new XclImpSpinButtonObj( rHelper ) );    break;
+                case BIFF_OBJTYPE_SCROLLBAR:    xDrawingObj.reset( new XclImpScrollBarObj( rHelper ) );     break;
+                case BIFF_OBJTYPE_LISTBOX:      xDrawingObj.reset( new XclImpListBoxObj( rHelper ) );       break;
+                case BIFF_OBJTYPE_GROUPBOX:     xDrawingObj.reset( new XclImpGroupBoxObj( rHelper ) );      break;
+                case BIFF_OBJTYPE_DROPDOWN:     xDrawingObj.reset( new XclImpDropDownObj( rHelper ) );      break;
+                case BIFF_OBJTYPE_NOTE:         xDrawingObj.reset( new XclImpNoteObj( rHelper ) );          break;
+#endif
+
+                default:
+#if 0
+                    OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff8 - unknown object type" );
+#endif
+                    xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
+            }
+        }
+    }
+
+    xDrawingObj->importObjBiff8( rStrm );
+    return xDrawingObj;
+}
+
+Reference< XShape > BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
+{
+    Reference< XShape > xShape;
+    if( rxShapes.is() && mbProcessShape && !mbHidden )  // TODO: support for hidden objects?
+    {
+        // base class 'ShapeAnchor' calculates the shape rectangle in 1/100 mm
+        // in BIFF3-BIFF5, all shapes have absolute anchor (also children of group shapes)
+        Rectangle aShapeRect = maAnchor.calcAnchorRectHmm( getDrawPageSize() );
+
+        // convert the shape, if the calculated rectangle is not empty
+        bool bHasWidth = aShapeRect.Width > 0;
+        bool bHasHeight = aShapeRect.Height > 0;
+        if( mbAreaObj ? (bHasWidth && bHasHeight) : (bHasWidth || bHasHeight) )
+        {
+            xShape = implConvertAndInsert( rDrawing, rxShapes, aShapeRect );
+            /*  Notify the drawing that a new shape has been inserted (but not
+                for children of group shapes). For convenience, pass the
+                rectangle that contains position and size of the shape. */
+            if( !pParentRect && xShape.is() )
+                rDrawing.notifyShapeInserted( xShape, aShapeRect );
+        }
+    }
+    return xShape;
+}
+
+// protected ------------------------------------------------------------------
+
+void BiffDrawingObjectBase::readNameBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen )
+{
+    maObjName = OUString();
+    if( nNameLen > 0 )
+    {
+        // name length field is repeated before the name
+        maObjName = rStrm.readByteStringUC( false, getTextEncoding() );
+        // skip padding byte for word boundaries
+        rStrm.alignToBlock( 2 );
+    }
+}
+
+void BiffDrawingObjectBase::readMacroBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    maMacroName = OUString();
+    rStrm.skip( nMacroSize );
+    // skip padding byte for word boundaries, not contained in nMacroSize
+    rStrm.alignToBlock( 2 );
+}
+
+void BiffDrawingObjectBase::readMacroBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    maMacroName = OUString();
+    rStrm.skip( nMacroSize );
+}
+
+void BiffDrawingObjectBase::readMacroBiff5( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    maMacroName = OUString();
+    rStrm.skip( nMacroSize );
+}
+
+void BiffDrawingObjectBase::readMacroBiff8( BiffInputStream& rStrm )
+{
+    maMacroName = OUString();
+    if( rStrm.getRemaining() > 6 )
+    {
+        // macro is stored in a tNameXR token containing a link to a defined name
+        sal_uInt16 nFmlaSize;
+        rStrm >> nFmlaSize;
+        rStrm.skip( 4 );
+        OSL_ENSURE( nFmlaSize == 7, "BiffDrawingObjectBase::readMacroBiff8 - unexpected formula size" );
+        if( nFmlaSize == 7 )
+        {
+            sal_uInt8 nTokenId;
+            sal_uInt16 nExtLinkId, nExtNameId;
+            rStrm >> nTokenId >> nExtLinkId >> nExtNameId;
+#if 0
+            OSL_ENSURE( nTokenId == XclTokenArrayHelper::GetTokenId( EXC_TOKID_NAMEX, EXC_TOKCLASS_REF ),
+                "BiffDrawingObjectBase::readMacroBiff8 - tNameXR token expected" );
+            if( nTokenId == XclTokenArrayHelper::GetTokenId( EXC_TOKID_NAMEX, EXC_TOKCLASS_REF ) )
+                maMacroName = GetLinkManager().GetMacroName( nExtLinkId, nExtNameId );
+#endif
+        }
+    }
+}
+
+void BiffDrawingObjectBase::convertLineProperties( ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows ) const
+{
+    if( rLineModel.mbAuto )
+    {
+        BiffObjLineModel aAutoModel;
+        aAutoModel.mbAuto = false;
+        convertLineProperties( rPropMap, aAutoModel, nArrows );
+        return;
+    }
+
+    /*  Convert line formatting to DrawingML line formatting and let the
+        DrawingML code do the hard work. */
+    LineProperties aLineProps;
+
+    if( rLineModel.mnStyle == BIFF_OBJ_LINE_NONE )
+    {
+        aLineProps.maLineFill.moFillType = XML_noFill;
+    }
+    else
+    {
+        aLineProps.maLineFill.moFillType = XML_solidFill;
+        aLineProps.maLineFill.maFillColor.setPaletteClr( rLineModel.mnColorIdx );
+        aLineProps.moLineCompound = XML_sng;
+        aLineProps.moLineCap = XML_flat;
+        aLineProps.moLineJoint = XML_round;
+
+        // line width: use 0.35 mm per BIFF line width step
+        sal_Int32 nLineWidth = 0;
+        switch( rLineModel.mnWidth )
+        {
+            default:
+            case BIFF_OBJ_LINE_HAIR:    nLineWidth = 0;     break;
+            case BIFF_OBJ_LINE_THIN:    nLineWidth = 20;    break;
+            case BIFF_OBJ_LINE_MEDIUM:  nLineWidth = 40;    break;
+            case BIFF_OBJ_LINE_THICK:   nLineWidth = 60;    break;
+        }
+        aLineProps.moLineWidth = getLimitedValue< sal_Int32, sal_Int64 >( convertHmmToEmu( nLineWidth ), 0, SAL_MAX_INT32 );
+
+        // dash style and transparency
+        switch( rLineModel.mnStyle )
+        {
+            default:
+            case BIFF_OBJ_LINE_SOLID:
+                aLineProps.moPresetDash = XML_solid;
+            break;
+            case BIFF_OBJ_LINE_DASH:
+                aLineProps.moPresetDash = XML_lgDash;
+            break;
+            case BIFF_OBJ_LINE_DOT:
+                aLineProps.moPresetDash = XML_dot;
+            break;
+            case BIFF_OBJ_LINE_DASHDOT:
+                aLineProps.moPresetDash = XML_lgDashDot;
+            break;
+            case BIFF_OBJ_LINE_DASHDOTDOT:
+                aLineProps.moPresetDash = XML_lgDashDotDot;
+            break;
+            case BIFF_OBJ_LINE_MEDTRANS:
+                aLineProps.moPresetDash = XML_solid;
+                aLineProps.maLineFill.maFillColor.addTransformation( XML_alpha, 50 * PER_PERCENT );
+            break;
+            case BIFF_OBJ_LINE_DARKTRANS:
+                aLineProps.moPresetDash = XML_solid;
+                aLineProps.maLineFill.maFillColor.addTransformation( XML_alpha, 75 * PER_PERCENT );
+            break;
+            case BIFF_OBJ_LINE_LIGHTTRANS:
+                aLineProps.moPresetDash = XML_solid;
+                aLineProps.maLineFill.maFillColor.addTransformation( XML_alpha, 25 * PER_PERCENT );
+            break;
+        }
+
+        // line ends
+        bool bLineStart = false;
+        bool bLineEnd = false;
+        bool bFilled = false;
+        switch( extractValue< sal_uInt8 >( nArrows, 0, 4 ) )
+        {
+            case BIFF_OBJ_ARROW_OPEN:       bLineStart = false; bLineEnd = true;  bFilled = false;  break;
+            case BIFF_OBJ_ARROW_OPENBOTH:   bLineStart = true;  bLineEnd = true;  bFilled = false;  break;
+            case BIFF_OBJ_ARROW_FILLED:     bLineStart = false; bLineEnd = true;  bFilled = true;   break;
+            case BIFF_OBJ_ARROW_FILLEDBOTH: bLineStart = true;  bLineEnd = true;  bFilled = true;   break;
+        }
+        if( bLineStart || bLineEnd )
+        {
+            // arrow type (open or closed)
+            sal_Int32 nArrowType = bFilled ? XML_triangle : XML_arrow;
+            aLineProps.maStartArrow.moArrowType = bLineStart ? nArrowType : XML_none;
+            aLineProps.maEndArrow.moArrowType   = bLineEnd   ? nArrowType : XML_none;
+
+            // arrow width
+            sal_Int32 nArrowWidth = XML_med;
+            switch( extractValue< sal_uInt8 >( nArrows, 4, 4 ) )
+            {
+                case BIFF_OBJ_ARROW_NARROW: nArrowWidth = XML_sm;   break;
+                case BIFF_OBJ_ARROW_MEDIUM: nArrowWidth = XML_med;  break;
+                case BIFF_OBJ_ARROW_WIDE:   nArrowWidth = XML_lg;   break;
+            }
+            aLineProps.maStartArrow.moArrowWidth = aLineProps.maEndArrow.moArrowWidth = nArrowWidth;
+
+            // arrow length
+            sal_Int32 nArrowLength = XML_med;
+            switch( extractValue< sal_uInt8 >( nArrows, 8, 4 ) )
+            {
+                case BIFF_OBJ_ARROW_NARROW: nArrowLength = XML_sm;  break;
+                case BIFF_OBJ_ARROW_MEDIUM: nArrowLength = XML_med; break;
+                case BIFF_OBJ_ARROW_WIDE:   nArrowLength = XML_lg;  break;
+            }
+            aLineProps.maStartArrow.moArrowLength = aLineProps.maEndArrow.moArrowLength = nArrowLength;
+        }
+    }
+
+    aLineProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() );
+}
+
+void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, const BiffObjFillModel& rFillModel ) const
+{
+    if( rFillModel.mbAuto )
+    {
+        BiffObjFillModel aAutoModel;
+        aAutoModel.mbAuto = false;
+        convertFillProperties( rPropMap, aAutoModel );
+        return;
+    }
+
+    /*  Convert fill formatting to DrawingML fill formatting and let the
+        DrawingML code do the hard work. */
+    FillProperties aFillProps;
+
+    if( rFillModel.mnPattern == BIFF_OBJ_PATT_NONE )
+    {
+        aFillProps.moFillType = XML_noFill;
+    }
+    else
+    {
+        const sal_Int32 spnPatternPresets[] = {
+            XML_TOKEN_INVALID, XML_TOKEN_INVALID, XML_pct50, XML_pct50, XML_pct25,
+            XML_dkHorz, XML_dkVert, XML_dkDnDiag, XML_dkUpDiag, XML_smCheck, XML_trellis,
+            XML_ltHorz, XML_ltVert, XML_ltDnDiag, XML_ltUpDiag, XML_smGrid, XML_diagCross,
+            XML_pct20, XML_pct10 };
+        sal_Int32 nPatternPreset = STATIC_ARRAY_SELECT( spnPatternPresets, rFillModel.mnPattern, XML_TOKEN_INVALID );
+        if( nPatternPreset == XML_TOKEN_INVALID )
+        {
+            aFillProps.moFillType = XML_solidFill;
+            aFillProps.maFillColor.setPaletteClr( rFillModel.mnPattColorIdx );
+        }
+        else
+        {
+            aFillProps.moFillType = XML_pattFill;
+            aFillProps.maPatternProps.maPattFgColor.setPaletteClr( rFillModel.mnPattColorIdx );
+            aFillProps.maPatternProps.maPattBgColor.setPaletteClr( rFillModel.mnBackColorIdx );
+            aFillProps.maPatternProps.moPattPreset = nPatternPreset;
+        }
+#if 0
+        static const sal_uInt8 sppnPatterns[][ 8 ] =
+        {
+            { 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55 },
+            { 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD },
+            { 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22 },
+            { 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00 },
+            { 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC },
+            { 0x33, 0x66, 0xCC, 0x99, 0x33, 0x66, 0xCC, 0x99 },
+            { 0xCC, 0x66, 0x33, 0x99, 0xCC, 0x66, 0x33, 0x99 },
+            { 0xCC, 0xCC, 0x33, 0x33, 0xCC, 0xCC, 0x33, 0x33 },
+            { 0xCC, 0xFF, 0x33, 0xFF, 0xCC, 0xFF, 0x33, 0xFF },
+            { 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 },
+            { 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88 },
+            { 0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88 },
+            { 0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11 },
+            { 0xFF, 0x11, 0x11, 0x11, 0xFF, 0x11, 0x11, 0x11 },
+            { 0xAA, 0x44, 0xAA, 0x11, 0xAA, 0x44, 0xAA, 0x11 },
+            { 0x88, 0x00, 0x22, 0x00, 0x88, 0x00, 0x22, 0x00 },
+            { 0x80, 0x00, 0x08, 0x00, 0x80, 0x00, 0x08, 0x00 }
+        };
+        const sal_uInt8* const pnPattern = sppnPatterns[ ::std::min< size_t >( rFillData.mnPattern - 2, STATIC_ARRAY_SIZE( sppnPatterns ) ) ];
+        // create 2-colored 8x8 DIB
+        SvMemoryStream aMemStrm;
+//      { 0x0C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00 }
+        aMemStrm << sal_uInt32( 12 ) << sal_Int16( 8 ) << sal_Int16( 8 ) << sal_uInt16( 1 ) << sal_uInt16( 1 );
+        aMemStrm << sal_uInt8( 0xFF ) << sal_uInt8( 0xFF ) << sal_uInt8( 0xFF );
+        aMemStrm << sal_uInt8( 0x00 ) << sal_uInt8( 0x00 ) << sal_uInt8( 0x00 );
+        for( size_t nIdx = 0; nIdx < 8; ++nIdx )
+            aMemStrm << sal_uInt32( pnPattern[ nIdx ] ); // 32-bit little-endian
+        aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
+        Bitmap aBitmap;
+        aBitmap.Read( aMemStrm, FALSE );
+        XOBitmap aXOBitmap( aBitmap );
+        aXOBitmap.Bitmap2Array();
+        aXOBitmap.SetBitmapType( XBITMAP_8X8 );
+        if( aXOBitmap.GetBackgroundColor().GetColor() == COL_BLACK )
+            ::std::swap( aPattColor, aBackColor );
+        aXOBitmap.SetPixelColor( aPattColor );
+        aXOBitmap.SetBackgroundColor( aBackColor );
+        rSdrObj.SetMergedItem( XFillStyleItem( XFILL_BITMAP ) );
+        rSdrObj.SetMergedItem( XFillBitmapItem( EMPTY_STRING, aXOBitmap ) );
+#endif
+    }
+
+    aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() );
+}
+
+void BiffDrawingObjectBase::convertFrameProperties( ShapePropertyMap& /*rPropMap*/, sal_uInt16 /*nFrameFlags*/ ) const
+{
+}
+
+void BiffDrawingObjectBase::implReadObjBiff3( BiffInputStream& /*rStrm*/, sal_uInt16 /*nMacroSize*/ )
+{
+}
+
+void BiffDrawingObjectBase::implReadObjBiff4( BiffInputStream& /*rStrm*/, sal_uInt16 /*nMacroSize*/ )
+{
+}
+
+void BiffDrawingObjectBase::implReadObjBiff5( BiffInputStream& /*rStrm*/, sal_uInt16 /*nNameLen*/, sal_uInt16 /*nMacroSize*/ )
+{
+}
+
+void BiffDrawingObjectBase::implReadObjBiff8SubRec( BiffInputStream& /*rStrm*/, sal_uInt16 /*nSubRecId*/, sal_uInt16 /*nSubRecSize*/ )
+{
+}
+
+// private --------------------------------------------------------------------
+
+void BiffDrawingObjectBase::importObjBiff3( BiffInputStream& rStrm )
+{
+    // back to offset 4 (ignore object count field)
+    rStrm.seek( 4 );
+
+    sal_uInt16 nObjFlags, nMacroSize;
+    rStrm >> mnObjType >> mnObjId >> nObjFlags >> maAnchor >> nMacroSize;
+    rStrm.skip( 2 );
+
+    mbHasAnchor = true;
+    mbHidden = getFlag( nObjFlags, BIFF_OBJ_HIDDEN );
+    mbVisible = getFlag( nObjFlags, BIFF_OBJ_VISIBLE );
+    implReadObjBiff3( rStrm, nMacroSize );
+}
+
+void BiffDrawingObjectBase::importObjBiff4( BiffInputStream& rStrm )
+{
+    // back to offset 4 (ignore object count field)
+    rStrm.seek( 4 );
+
+    sal_uInt16 nObjFlags, nMacroSize;
+    rStrm >> mnObjType >> mnObjId >> nObjFlags >> maAnchor >> nMacroSize;
+    rStrm.skip( 2 );
+
+    mbHasAnchor = true;
+    mbHidden = getFlag( nObjFlags, BIFF_OBJ_HIDDEN );
+    mbVisible = getFlag( nObjFlags, BIFF_OBJ_VISIBLE );
+    mbPrintable = getFlag( nObjFlags, BIFF_OBJ_PRINTABLE );
+    implReadObjBiff4( rStrm, nMacroSize );
+}
+
+void BiffDrawingObjectBase::importObjBiff5( BiffInputStream& rStrm )
+{
+    // back to offset 4 (ignore object count field)
+    rStrm.seek( 4 );
+
+    sal_uInt16 nObjFlags, nMacroSize, nNameLen;
+    rStrm >> mnObjType >> mnObjId >> nObjFlags >> maAnchor >> nMacroSize;
+    rStrm.skip( 2 );
+    rStrm >> nNameLen;
+    rStrm.skip( 2 );
+
+    mbHasAnchor = true;
+    mbHidden = getFlag( nObjFlags, BIFF_OBJ_HIDDEN );
+    mbVisible = getFlag( nObjFlags, BIFF_OBJ_VISIBLE );
+    mbPrintable = getFlag( nObjFlags, BIFF_OBJ_PRINTABLE );
+    implReadObjBiff5( rStrm, nNameLen, nMacroSize );
+}
+
+void BiffDrawingObjectBase::importObjBiff8( BiffInputStream& rStrm )
+{
+    // back to beginning
+    rStrm.seekToStart();
+
+    bool bLoop = true;
+    while( bLoop && (rStrm.getRemaining() >= 4) )
+    {
+        sal_uInt16 nSubRecId, nSubRecSize;
+        rStrm >> nSubRecId >> nSubRecSize;
+        sal_Int64 nStrmPos = rStrm.tell();
+        // sometimes the last subrecord has an invalid length (OBJLBSDATA) -> min()
+        nSubRecSize = static_cast< sal_uInt16 >( ::std::min< sal_Int64 >( nSubRecSize, rStrm.getRemaining() ) );
+
+        switch( nSubRecId )
+        {
+            case BIFF_ID_OBJCMO:
+                OSL_ENSURE( rStrm.tell() == 4, "BiffDrawingObjectBase::importObjBiff8 - unexpected OBJCMO subrecord" );
+                if( (rStrm.tell() == 4) && (nSubRecSize >= 6) )
+                {
+                    sal_uInt16 nObjFlags;
+                    rStrm >> mnObjType >> mnObjId >> nObjFlags;
+                    mbPrintable = getFlag( nObjFlags, BIFF_OBJCMO_PRINTABLE );
+                }
+            break;
+            case BIFF_ID_OBJMACRO:
+                readMacroBiff8( rStrm );
+            break;
+            case BIFF_ID_OBJEND:
+                bLoop = false;
+            break;
+            default:
+                implReadObjBiff8SubRec( rStrm, nSubRecId, nSubRecSize );
+        }
+
+        // seek to end of subrecord
+        rStrm.seek( nStrmPos + nSubRecSize );
+    }
+
+    /*  Call doReadObj8SubRec() with BIFF_ID_OBJEND for further stream
+        processing (e.g. charts), even if the OBJEND subrecord is missing. */
+    implReadObjBiff8SubRec( rStrm, BIFF_ID_OBJEND, 0 );
+
+    /*  Pictures that Excel reads from BIFF5 and writes to BIFF8 still have the
+        IMGDATA record following the OBJ record (but they use the image data
+        stored in DFF). The IMGDATA record may be continued by several CONTINUE
+        records. But the last CONTINUE record may be in fact an MSODRAWING
+        record that contains the DFF data of the next drawing object! So we
+        have to skip just enough CONTINUE records to look at the next
+        MSODRAWING/CONTINUE record. */
+    if( (rStrm.getNextRecId() == BIFF3_ID_IMGDATA) && rStrm.startNextRecord() )
+    {
+        rStrm.skip( 4 );
+        sal_Int64 nDataSize = rStrm.readuInt32();
+        nDataSize -= rStrm.getRemaining();
+        // skip following CONTINUE records until IMGDATA ends
+        while( (nDataSize > 0) && (rStrm.getNextRecId() == BIFF_ID_CONT) && rStrm.startNextRecord() )
+        {
+            OSL_ENSURE( nDataSize >= rStrm.getRemaining(), "BiffDrawingObjectBase::importObjBiff8 - CONTINUE too long" );
+            nDataSize -= ::std::min( rStrm.getRemaining(), nDataSize );
+        }
+        OSL_ENSURE( nDataSize == 0, "BiffDrawingObjectBase::importObjBiff8 - missing CONTINUE records" );
+        // next record may be MSODRAWING or CONTINUE or anything else
+    }
+}
+
+// ============================================================================
+
+BiffPlaceholderObject::BiffPlaceholderObject( const WorksheetHelper& rHelper ) :
+    BiffDrawingObjectBase( rHelper )
+{
+    setProcessShape( false );
+}
+
+Reference< XShape > BiffPlaceholderObject::implConvertAndInsert( BiffDrawingBase& /*rDrawing*/,
+        const Reference< XShapes >& /*rxShapes*/, const Rectangle& /*rShapeRect*/ ) const
+{
+    return Reference< XShape >();
+}
+
+// ============================================================================
+
+BiffGroupObject::BiffGroupObject( const WorksheetHelper& rHelper ) :
+    BiffDrawingObjectBase( rHelper ),
+    mnFirstUngrouped( BIFF_OBJ_INVALID_ID )
+{
+}
+
+bool BiffGroupObject::tryInsert( const BiffDrawingObjectRef& rxDrawingObj )
+{
+    if( rxDrawingObj->getObjId() == mnFirstUngrouped )
+        return false;
+    // insert into own list or into nested group
+    maChildren.insertGrouped( rxDrawingObj );
+    return true;
+}
+
+void BiffGroupObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    rStrm.skip( 4 );
+    rStrm >> mnFirstUngrouped;
+    rStrm.skip( 16 );
+    readMacroBiff3( rStrm, nMacroSize );
+}
+
+void BiffGroupObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    rStrm.skip( 4 );
+    rStrm >> mnFirstUngrouped;
+    rStrm.skip( 16 );
+    readMacroBiff4( rStrm, nMacroSize );
+}
+
+void BiffGroupObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
+{
+    rStrm.skip( 4 );
+    rStrm >> mnFirstUngrouped;
+    rStrm.skip( 16 );
+    readNameBiff5( rStrm, nNameLen );
+    readMacroBiff5( rStrm, nMacroSize );
+}
+
+Reference< XShape > BiffGroupObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    Reference< XShape > xGroupShape;
+    if( !maChildren.empty() ) try
+    {
+        xGroupShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.GroupShape" ), rxShapes, rShapeRect );
+        Reference< XShapes > xChildShapes( xGroupShape, UNO_QUERY_THROW );
+        maChildren.convertAndInsert( rDrawing, xChildShapes, &rShapeRect );
+        // no child shape has been created - delete the group shape
+        if( !xChildShapes->hasElements() )
+        {
+            rxShapes->remove( xGroupShape );
+            xGroupShape.clear();
+        }
+    }
+    catch( Exception& )
+    {
+    }
+    return xGroupShape;
+}
+
+// ============================================================================
+
+BiffLineObject::BiffLineObject( const WorksheetHelper& rHelper ) :
+    BiffDrawingObjectBase( rHelper ),
+    mnArrows( 0 ),
+    mnStartPoint( BIFF_OBJ_LINE_TL )
+{
+    setAreaObj( false );
+}
+
+void BiffLineObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    rStrm >> maLineModel >> mnArrows >> mnStartPoint;
+    rStrm.skip( 1 );
+    readMacroBiff3( rStrm, nMacroSize );
+}
+
+void BiffLineObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    rStrm >> maLineModel >> mnArrows >> mnStartPoint;
+    rStrm.skip( 1 );
+    readMacroBiff4( rStrm, nMacroSize );
+}
+
+void BiffLineObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
+{
+    rStrm >> maLineModel >> mnArrows >> mnStartPoint;
+    rStrm.skip( 1 );
+    readNameBiff5( rStrm, nNameLen );
+    readMacroBiff5( rStrm, nMacroSize );
+}
+
+Reference< XShape > BiffLineObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
+    convertLineProperties( aPropMap, maLineModel, mnArrows );
+
+    // create the line polygon
+    PointSequenceSequence aPoints( 1 );
+    aPoints[ 0 ].realloc( 2 );
+    Point& rBeg = aPoints[ 0 ][ 0 ];
+    Point& rEnd = aPoints[ 0 ][ 1 ];
+    sal_Int32 nL = rShapeRect.X;
+    sal_Int32 nT = rShapeRect.Y;
+    sal_Int32 nR = rShapeRect.X + ::std::max< sal_Int32 >( rShapeRect.Width - 1, 0 );
+    sal_Int32 nB = rShapeRect.Y + ::std::max< sal_Int32 >( rShapeRect.Height - 1, 0 );
+    switch( mnStartPoint )
+    {
+        default:
+        case BIFF_OBJ_LINE_TL: rBeg.X = nL; rBeg.Y = nT; rEnd.X = nR; rEnd.Y = nB; break;
+        case BIFF_OBJ_LINE_TR: rBeg.X = nR; rBeg.Y = nT; rEnd.X = nL; rEnd.Y = nB; break;
+        case BIFF_OBJ_LINE_BR: rBeg.X = nR; rBeg.Y = nB; rEnd.X = nL; rEnd.Y = nT; break;
+        case BIFF_OBJ_LINE_BL: rBeg.X = nL; rBeg.Y = nB; rEnd.X = nR; rEnd.Y = nT; break;
+    }
+    aPropMap.setProperty( PROP_PolyPolygon, aPoints );
+    aPropMap.setProperty( PROP_PolygonKind, PolygonKind_LINE );
+
+    // create the shape
+    Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.LineShape" ), rxShapes, rShapeRect );
+    PropertySet( xShape ).setProperties( aPropMap );
+    return xShape;
+}
+
+// ============================================================================
+
+BiffRectObject::BiffRectObject( const WorksheetHelper& rHelper ) :
+    BiffDrawingObjectBase( rHelper ),
+    mnFrameFlags( 0 )
+{
+    setAreaObj( true );
+}
+
+void BiffRectObject::readFrameData( BiffInputStream& rStrm )
+{
+    rStrm >> maFillModel >> maLineModel >> mnFrameFlags;
+}
+
+void BiffRectObject::convertRectProperties( ShapePropertyMap& rPropMap ) const
+{
+    convertLineProperties( rPropMap, maLineModel );
+    convertFillProperties( rPropMap, maFillModel );
+    convertFrameProperties( rPropMap, mnFrameFlags );
+}
+
+void BiffRectObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    readFrameData( rStrm );
+    readMacroBiff3( rStrm, nMacroSize );
+}
+
+void BiffRectObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    readFrameData( rStrm );
+    readMacroBiff4( rStrm, nMacroSize );
+}
+
+void BiffRectObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
+{
+    readFrameData( rStrm );
+    readNameBiff5( rStrm, nNameLen );
+    readMacroBiff5( rStrm, nMacroSize );
+}
+
+Reference< XShape > BiffRectObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
+    convertRectProperties( aPropMap );
+
+    Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.RectangleShape" ), rxShapes, rShapeRect );
+    PropertySet( xShape ).setProperties( aPropMap );
+    return xShape;
+}
+
+// ============================================================================
+
+BiffOvalObject::BiffOvalObject( const WorksheetHelper& rHelper ) :
+    BiffRectObject( rHelper )
+{
+}
+
+Reference< XShape > BiffOvalObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
+    convertRectProperties( aPropMap );
+
+    Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.EllipseShape" ), rxShapes, rShapeRect );
+    PropertySet( xShape ).setProperties( aPropMap );
+    return xShape;
+}
+
+// ============================================================================
+
+BiffArcObject::BiffArcObject( const WorksheetHelper& rHelper ) :
+    BiffDrawingObjectBase( rHelper ),
+    mnQuadrant( BIFF_OBJ_ARC_TR )
+{
+    setAreaObj( false );    // arc may be 2-dimensional
+}
+
+void BiffArcObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    rStrm >> maFillModel >> maLineModel >> mnQuadrant;
+    rStrm.skip( 1 );
+    readMacroBiff3( rStrm, nMacroSize );
+}
+
+void BiffArcObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    rStrm >> maFillModel >> maLineModel >> mnQuadrant;
+    rStrm.skip( 1 );
+    readMacroBiff4( rStrm, nMacroSize );
+}
+
+void BiffArcObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
+{
+    rStrm >> maFillModel >> maLineModel >> mnQuadrant;
+    rStrm.skip( 1 );
+    readNameBiff5( rStrm, nNameLen );
+    readMacroBiff5( rStrm, nMacroSize );
+}
+
+Reference< XShape > BiffArcObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
+    convertLineProperties( aPropMap, maLineModel );
+    convertFillProperties( aPropMap, maFillModel );
+
+    /*  Simulate arc objects with ellipse sections. While the original arc
+        object uses the entire object rectangle, only one quarter of the
+        ellipse shape will be visible. Thus, the size of the ellipse shape
+        needs to be extended and its position adjusted according to the visible
+        quadrant. */
+    Rectangle aNewRect( rShapeRect.X, rShapeRect.Y, rShapeRect.Width * 2, rShapeRect.Height * 2 );
+    long nStartAngle = 0;
+    switch( mnQuadrant )
+    {
+        default:
+        case BIFF_OBJ_ARC_TR: nStartAngle =     0; aNewRect.X -= rShapeRect.Width;                                  break;
+        case BIFF_OBJ_ARC_TL: nStartAngle =  9000;                                                                  break;
+        case BIFF_OBJ_ARC_BL: nStartAngle = 18000;                                 aNewRect.Y -= rShapeRect.Height; break;
+        case BIFF_OBJ_ARC_BR: nStartAngle = 27000; aNewRect.X -= rShapeRect.Width; aNewRect.Y -= rShapeRect.Height; break;
+    }
+    long nEndAngle = (nStartAngle + 9000) % 36000;
+    aPropMap.setProperty( PROP_CircleKind, maFillModel.isFilled() ? CircleKind_SECTION : CircleKind_ARC );
+    aPropMap.setProperty( PROP_CircleStartAngle, nStartAngle );
+    aPropMap.setProperty( PROP_CircleEndAngle, nEndAngle );
+
+    // create the shape
+    Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.EllipseShape" ), rxShapes, aNewRect );
+    PropertySet( xShape ).setProperties( aPropMap );
+    return xShape;
+}
+
+// ============================================================================
+
+BiffPolygonObject::BiffPolygonObject( const WorksheetHelper& rHelper ) :
+    BiffRectObject( rHelper ),
+    mnPolyFlags( 0 ),
+    mnPointCount( 0 )
+{
+    setAreaObj( false );    // polygon may be 2-dimensional
+}
+
+void BiffPolygonObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
+{
+    readFrameData( rStrm );
+    rStrm >> mnPolyFlags;
+    rStrm.skip( 10 );
+    rStrm >> mnPointCount;
+    rStrm.skip( 8 );
+    readMacroBiff4( rStrm, nMacroSize );
+    importCoordList( rStrm );
+}
+
+void BiffPolygonObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
+{
+    readFrameData( rStrm );
+    rStrm >> mnPolyFlags;
+    rStrm.skip( 10 );
+    rStrm >> mnPointCount;
+    rStrm.skip( 8 );
+    readNameBiff5( rStrm, nNameLen );
+    readMacroBiff5( rStrm, nMacroSize );
+    importCoordList( rStrm );
+}
+
+namespace {
+
+Point lclGetPolyPoint( const Rectangle& rAnchorRect, const Point& rPoint )
+{
+    // polygon coordinates are given in 1/16384 of shape size
+    return Point(
+        rAnchorRect.X + static_cast< sal_Int32 >( rAnchorRect.Width * getLimitedValue< double >( static_cast< double >( rPoint.X ) / 16384.0, 0.0, 1.0 ) + 0.5 ),
+        rAnchorRect.Y + static_cast< sal_Int32 >( rAnchorRect.Height * getLimitedValue< double >( static_cast< double >( rPoint.Y ) / 16384.0, 0.0, 1.0 ) + 0.5 ) );
+}
+
+} // namespace
+
+Reference< XShape > BiffPolygonObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    Reference< XShape > xShape;
+    if( maCoords.size() >= 2 )
+    {
+        ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
+        convertRectProperties( aPropMap );
+
+        // create the polygon
+        PointVector aPolygon;
+        for( PointVector::const_iterator aIt = maCoords.begin(), aEnd = maCoords.end(); aIt != aEnd; ++aIt )
+            aPolygon.push_back( lclGetPolyPoint( rShapeRect, *aIt ) );
+        // close polygon if specified
+        if( getFlag( mnPolyFlags, BIFF_OBJ_POLY_CLOSED ) && ((maCoords.front().X != maCoords.back().X) || (maCoords.front().Y != maCoords.back().Y)) )
+            aPolygon.push_back( aPolygon.front() );
+        PointSequenceSequence aPoints( 1 );
+        aPoints[ 0 ] = ContainerHelper::vectorToSequence( aPolygon );
+        aPropMap.setProperty( PROP_PolyPolygon, aPoints );
+
+        // create the shape
+        OUString aService = maFillModel.isFilled() ?
+            CREATE_OUSTRING( "com.sun.star.drawing.PolyPolygonShape" ) :
+            CREATE_OUSTRING( "com.sun.star.drawing.PolyLineShape" );
+        xShape = rDrawing.createAndInsertXShape( aService, rxShapes, rShapeRect );
+        PropertySet( xShape ).setProperties( aPropMap );
+    }
+    return xShape;
+}
+
+void BiffPolygonObject::importCoordList( BiffInputStream& rStrm )
+{
+    if( (rStrm.getNextRecId() == BIFF_ID_COORDLIST) && rStrm.startNextRecord() )
+    {
+        OSL_ENSURE( rStrm.getRemaining() / 4 == mnPointCount, "BiffPolygonObject::importCoordList - wrong polygon point count" );
+        while( rStrm.getRemaining() >= 4 )
+        {
+            sal_uInt16 nX, nY;
+            rStrm >> nX >> nY;
+            maCoords.push_back( Point( nX, nY ) );
+        }
+    }
+}
+
+// ============================================================================
+// BIFF drawing page
+// ============================================================================
+
+BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) :
+    WorksheetHelper( rHelper ),
+    mxDrawPage( rxDrawPage )
+{
+}
+
+void BiffDrawingBase::importObj( BiffInputStream& rStrm )
+{
+    BiffDrawingObjectRef xDrawingObj;
+
+#if 0
+    /*  #i61786# In BIFF8 streams, OBJ records may occur without MSODRAWING
+        records. In this case, the OBJ records are in BIFF5 format. Do a sanity
+        check here that there is no DFF data loaded before. */
+    DBG_ASSERT( maDffStrm.Tell() == 0, "BiffDrawingBase::importObj - unexpected DFF stream data, OBJ will be ignored" );
+    if( maDffStrm.Tell() == 0 ) switch( GetBiff() )
+#else
+    switch( getBiff() )
+#endif
+    {
+        case BIFF3:
+            xDrawingObj = BiffDrawingObjectBase::importObjBiff3( *this, rStrm );
+        break;
+        case BIFF4:
+            xDrawingObj = BiffDrawingObjectBase::importObjBiff4( *this, rStrm );
+        break;
+        case BIFF5:
+// TODO: add BIFF8 when DFF is supported
+//        case BIFF8:
+            xDrawingObj = BiffDrawingObjectBase::importObjBiff5( *this, rStrm );
+        break;
+        default:;
+    }
+
+    if( xDrawingObj.get() )
+    {
+        // insert into maRawObjs or into the last open group object
+        maRawObjs.insertGrouped( xDrawingObj );
+        // to be able to find objects by ID
+        maObjMapId[ xDrawingObj->getObjId() ] = xDrawingObj;
+    }
+}
+
+void BiffDrawingBase::setSkipObj( sal_uInt16 nObjId )
+{
+    /*  Store identifiers of objects to be skipped in a separate list (the OBJ
+        record may not be read yet). In the finalization phase, all objects
+        registered here will be skipped. */
+    maSkipObjs.push_back( nObjId );
+}
+
+void BiffDrawingBase::finalizeImport()
+{
+    Reference< XShapes > xShapes( mxDrawPage, UNO_QUERY );
+    OSL_ENSURE( xShapes.is(), "BiffDrawingBase::finalizeImport - no shapes container" );
+    if( !xShapes.is() )
+        return;
+        
+    // process list of objects to be skipped
+    for( BiffObjIdVector::const_iterator aIt = maSkipObjs.begin(), aEnd = maSkipObjs.end(); aIt != aEnd; ++aIt )
+        if( BiffDrawingObjectBase* pDrawingObj = maObjMapId.get( *aIt ).get() )
+            pDrawingObj->setProcessShape( false );
+
+    // process drawing objects without DFF data
+    maRawObjs.convertAndInsert( *this, xShapes );
+}
+
+Reference< XShape > BiffDrawingBase::createAndInsertXShape( const OUString& rService,
+        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
+{
+    OSL_ENSURE( rService.getLength() > 0, "BiffDrawingBase::createAndInsertXShape - missing UNO shape service name" );
+    OSL_ENSURE( rxShapes.is(), "BiffDrawingBase::createAndInsertXShape - missing XShapes container" );
+    Reference< XShape > xShape;
+    if( (rService.getLength() > 0) && rxShapes.is() ) try
+    {
+        xShape.set( getBaseFilter().getModelFactory()->createInstance( rService ), UNO_QUERY_THROW );
+        // insert shape into passed shape collection (maybe drawpage or group shape)
+        rxShapes->add( xShape );
+        xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) );
+        xShape->setSize( Size( rShapeRect.Width, rShapeRect.Height ) );
+    }
+    catch( Exception& )
+    {
+    }
+    OSL_ENSURE( xShape.is(), "BiffDrawingBase::createAndInsertXShape - cannot instanciate shape object" );
+    return xShape;
+}
+
+// protected ------------------------------------------------------------------
+
+void BiffDrawingBase::appendRawObject( const BiffDrawingObjectRef& rxDrawingObj )
+{
+    OSL_ENSURE( rxDrawingObj.get(), "BiffDrawingBase::appendRawObject - unexpected empty object reference" );
+    maRawObjs.append( rxDrawingObj );
+}
+
+// ============================================================================
+
+BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :
+    BiffDrawingBase( rHelper, rHelper.getDrawPage() )
+{
+}
+
+void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >& /*rxShape*/, const Rectangle& rShapeRect )
+{
+    // collect all shape positions in the WorksheetHelper base class
+    extendShapeBoundingBox( rShapeRect );
+}
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
diff --git a/oox/source/xls/excelchartconverter.cxx b/oox/source/xls/excelchartconverter.cxx
index 6527c8f12..acebc5aa8 100644
--- a/oox/source/xls/excelchartconverter.cxx
+++ b/oox/source/xls/excelchartconverter.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
+#include "oox/core/filterbase.hxx"
 #include "oox/drawingml/chart/datasourcemodel.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/xls/formulaparser.hxx"
@@ -65,8 +66,7 @@ void ExcelChartConverter::createDataProvider( const Reference< XChartDocument >&
     try
     {
         Reference< XDataReceiver > xDataRec( rxChartDoc, UNO_QUERY_THROW );
-        Reference< XMultiServiceFactory > xFactory( getDocument(), UNO_QUERY_THROW );
-        Reference< XDataProvider > xDataProv( xFactory->createInstance(
+        Reference< XDataProvider > xDataProv( getBaseFilter().getModelFactory()->createInstance(
             CREATE_OUSTRING( "com.sun.star.chart2.data.DataProvider" ) ), UNO_QUERY_THROW );
         xDataRec->attachDataProvider( xDataProv );
     }
@@ -86,13 +86,12 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence(
         {
             // parse the formula string, create a token sequence
             FormulaParser& rParser = getFormulaParser();
-            TokensFormulaContext aContext( true, true );
-            aContext.setBaseAddress( CellAddress( getCurrentSheetIndex(), 0, 0 ) );
-            rParser.importFormula( aContext, rDataSeq.maFormula );
+            CellAddress aBaseAddr( getCurrentSheetIndex(), 0, 0 );
+            ApiTokenSequence aTokens = rParser.importFormula( aBaseAddr, rDataSeq.maFormula );
 
             // create a range list from the token sequence
             ApiCellRangeList aRanges;
-            rParser.extractCellRangeList( aRanges, aContext.getTokens(), false );
+            rParser.extractCellRangeList( aRanges, aTokens, false );
             aRangeRep = rParser.generateApiRangeListString( aRanges );
         }
         else if( !rDataSeq.maData.empty() )
diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx
index bd2127ce8..4f30982e7 100644
--- a/oox/source/xls/excelfilter.cxx
+++ b/oox/source/xls/excelfilter.cxx
@@ -57,29 +57,29 @@ using ::oox::drawingml::table::TableStyleListPtr;
 // ============================================================================
 
 ExcelFilterBase::ExcelFilterBase() :
-    mpData( 0 )
+    mpBookGlob( 0 )
 {
 }
 
 ExcelFilterBase::~ExcelFilterBase()
 {
-    OSL_ENSURE( !mpData, "ExcelFilterBase::~ExcelFilterBase - workbook data not cleared" );
+    OSL_ENSURE( !mpBookGlob, "ExcelFilterBase::~ExcelFilterBase - workbook data not cleared" );
 }
 
-void ExcelFilterBase::registerWorkbookData( WorkbookData& rData )
+void ExcelFilterBase::registerWorkbookGlobals( WorkbookGlobals& rBookGlob )
 {
-    mpData = &rData;
+    mpBookGlob = &rBookGlob;
 }
 
-WorkbookData& ExcelFilterBase::getWorkbookData() const
+WorkbookGlobals& ExcelFilterBase::getWorkbookGlobals() const
 {
-    OSL_ENSURE( mpData, "ExcelFilterBase::getWorkbookData - missing workbook data" );
-    return *mpData;
+    OSL_ENSURE( mpBookGlob, "ExcelFilterBase::getWorkbookGlobals - missing workbook data" );
+    return *mpBookGlob;
 }
 
-void ExcelFilterBase::unregisterWorkbookData()
+void ExcelFilterBase::unregisterWorkbookGlobals()
 {
-    mpData = 0;
+    mpBookGlob = 0;
 }
 
 // ============================================================================
@@ -125,9 +125,12 @@ bool ExcelFilter::importDocument() throw()
     OUString aWorkbookPath = getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "officeDocument" ) );
     if( aWorkbookPath.getLength() == 0 )
         return false;
-        
-    WorkbookHelperRoot aHelper( *this );
-    if( aHelper.isValid() && importFragment( new WorkbookFragment( aHelper, aWorkbookPath ) ) )
+
+    /*  Construct the WorkbookGlobals object referred to by every instance of
+        the class WorkbookHelper, and execute the import filter by constructing
+        an instance of WorkbookFragment and loading the file. */
+    WorkbookGlobalsRef xBookGlob = WorkbookHelper::constructGlobals( *this );
+    if ( xBookGlob.get() && importFragment( new WorkbookFragment( *xBookGlob, aWorkbookPath ) ) )
     {
         importDocumentProperties();
         return true;
@@ -142,7 +145,7 @@ bool ExcelFilter::exportDocument() throw()
 
 const ::oox::drawingml::Theme* ExcelFilter::getCurrentTheme() const
 {
-    return &WorkbookHelper( getWorkbookData() ).getTheme();
+    return &WorkbookHelper( getWorkbookGlobals() ).getTheme();
 }
 
 ::oox::vml::Drawing* ExcelFilter::getVmlDrawing()
@@ -157,12 +160,12 @@ const TableStyleListPtr ExcelFilter::getTableStyles()
 
 ::oox::drawingml::chart::ChartConverter& ExcelFilter::getChartConverter()
 {
-    return WorkbookHelper( getWorkbookData() ).getChartConverter();
+    return WorkbookHelper( getWorkbookGlobals() ).getChartConverter();
 }
 
 GraphicHelper* ExcelFilter::implCreateGraphicHelper() const
 {
-    return new ExcelGraphicHelper( getWorkbookData() );
+    return new ExcelGraphicHelper( getWorkbookGlobals() );
 }
 
 ::oox::ole::VbaProject* ExcelFilter::implCreateVbaProject() const
@@ -258,8 +261,11 @@ bool ExcelBiffFilter::importDocument() throw()
     if( eBiff == BIFF_UNKNOWN )
         return false;
         
-    WorkbookHelperRoot aHelper( *this, eBiff );
-    return aHelper.isValid() && BiffWorkbookFragment( aHelper, aWorkbookName ).importFragment();
+    /*  Construct the WorkbookGlobals object referred to by every instance of
+        the class WorkbookHelper, and execute the import filter by constructing
+        an instance of BiffWorkbookFragment and loading the file. */
+    WorkbookGlobalsRef xBookGlob = WorkbookHelper::constructGlobals( *this, eBiff );
+    return xBookGlob.get() && BiffWorkbookFragment( *xBookGlob, aWorkbookName ).importFragment();
 }
 
 bool ExcelBiffFilter::exportDocument() throw()
@@ -269,7 +275,7 @@ bool ExcelBiffFilter::exportDocument() throw()
 
 GraphicHelper* ExcelBiffFilter::implCreateGraphicHelper() const
 {
-    return new ExcelGraphicHelper( getWorkbookData() );
+    return new ExcelGraphicHelper( getWorkbookGlobals() );
 }
 
 ::oox::ole::VbaProject* ExcelBiffFilter::implCreateVbaProject() const
@@ -322,11 +328,16 @@ bool ExcelVbaProjectFilter::importDocument() throw()
     if( !xVbaPrjStrg || !xVbaPrjStrg->isStorage() )
         return false;
 
-    WorkbookHelperRoot aHelper( *this, eBiff );
+    /*  Construct the WorkbookGlobals object referred to by every instance of
+        the class WorkbookHelper. */
+    WorkbookGlobalsRef xBookGlob = WorkbookHelper::constructGlobals( *this, eBiff );
+    if( !xBookGlob.get() )
+        return false;
+
     // set palette colors passed in service constructor
     Any aPalette = getArgument( CREATE_OUSTRING( "ColorPalette" ) );
-    aHelper.getStyles().importPalette( aPalette );
-    // import the VBA project
+    WorkbookHelper( *xBookGlob ).getStyles().importPalette( aPalette );
+    // import the VBA project (getVbaProject() implemented in base class)
     getVbaProject().importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
     return true;
 }
diff --git a/oox/source/xls/excelhandlers.cxx b/oox/source/xls/excelhandlers.cxx
index 4fc5f4b25..000347b34 100644
--- a/oox/source/xls/excelhandlers.cxx
+++ b/oox/source/xls/excelhandlers.cxx
@@ -52,17 +52,10 @@ WorkbookFragmentBase::WorkbookFragmentBase(
 
 // ============================================================================
 
-WorksheetFragmentBase::WorksheetFragmentBase( const WorkbookHelper& rHelper,
-        const OUString& rFragmentPath, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ),
-    WorksheetHelperRoot( rHelper, rxProgressBar, eSheetType, nSheet )
-{
-}
-
 WorksheetFragmentBase::WorksheetFragmentBase(
         const WorksheetHelper& rHelper, const OUString& rFragmentPath ) :
     FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ),
-    WorksheetHelperRoot( rHelper )
+    WorksheetHelper( rHelper )
 {
 }
 
@@ -82,14 +75,8 @@ BiffWorkbookContextBase::BiffWorkbookContextBase( const WorkbookHelper& rHelper
 
 // ----------------------------------------------------------------------------
 
-BiffWorksheetContextBase::BiffWorksheetContextBase( const WorkbookHelper& rHelper,
-        const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    WorksheetHelperRoot( rHelper, rxProgressBar, eSheetType, nSheet )
-{
-}
-
 BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) :
-    WorksheetHelperRoot( rHelper )
+    WorksheetHelper( rHelper )
 {
 }
 
@@ -104,17 +91,33 @@ const sal_uInt16 BIFF_BOF_CHART             = 0x0020;   /// BIFF2-BIFF8 chart sh
 const sal_uInt16 BIFF_BOF_MACRO             = 0x0040;   /// BIFF4-BIFF8 macro sheet.
 const sal_uInt16 BIFF_BOF_WORKSPACE         = 0x0100;   /// BIFF3-BIFF8 workspace.
 
-BiffFragmentType lclStartFragment( BiffInputStream& rStrm, BiffType eBiff )
+} // namespace
+
+// ----------------------------------------------------------------------------
+
+BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName )
+{
+    // do not automatically close the root stream (indicated by empty stream name)
+    bool bRootStrm = rStrmName.getLength() == 0;
+    mxXInStrm.reset( new BinaryXInputStream( rFilter.openInputStream( rStrmName ), !bRootStrm ) );
+    mxBiffStrm.reset( new BiffInputStream( *mxXInStrm ) );
+}
+
+BiffFragmentHandler::~BiffFragmentHandler()
+{
+}
+
+BiffFragmentType BiffFragmentHandler::startFragment( BiffType eBiff )
 {
     BiffFragmentType eFragment = BIFF_FRAGMENT_UNKNOWN;
     /*  #i23425# Don't rely on BOF record ID to read BOF contents, but on
         the detected BIFF version. */
-    if( BiffHelper::isBofRecord( rStrm ) )
+    if( mxBiffStrm->startNextRecord() && BiffHelper::isBofRecord( *mxBiffStrm ) )
     {
         // BOF is always written unencrypted
-        rStrm.enableDecoder( false );
-        rStrm.skip( 2 );
-        sal_uInt16 nType = rStrm.readuInt16();
+        mxBiffStrm->enableDecoder( false );
+        mxBiffStrm->skip( 2 );
+        sal_uInt16 nType = mxBiffStrm->readuInt16();
 
         // decide which fragment types are valid for current BIFF version
         switch( eBiff )
@@ -167,32 +170,6 @@ BiffFragmentType lclStartFragment( BiffInputStream& rStrm, BiffType eBiff )
     return eFragment;
 }
 
-} // namespace
-
-// ----------------------------------------------------------------------------
-
-BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName )
-{
-    // do not automatically close the root stream (indicated by empty stream name)
-    bool bRootStrm = rStrmName.getLength() == 0;
-    mxXInStrm.reset( new BinaryXInputStream( rFilter.openInputStream( rStrmName ), !bRootStrm ) );
-    mxBiffStrm.reset( new BiffInputStream( *mxXInStrm ) );
-}
-
-BiffFragmentHandler::~BiffFragmentHandler()
-{
-}
-
-BiffFragmentType BiffFragmentHandler::startFragment( BiffType eBiff )
-{
-    return mxBiffStrm->startNextRecord() ? lclStartFragment( *mxBiffStrm, eBiff ) : BIFF_FRAGMENT_UNKNOWN;
-}
-
-BiffFragmentType BiffFragmentHandler::startFragment( BiffType eBiff, sal_Int64 nRecHandle )
-{
-    return mxBiffStrm->startRecordByHandle( nRecHandle ) ? lclStartFragment( *mxBiffStrm, eBiff ) : BIFF_FRAGMENT_UNKNOWN;
-}
-
 bool BiffFragmentHandler::skipFragment()
 {
     while( mxBiffStrm->startNextRecord() && (mxBiffStrm->getRecId() != BIFF_ID_EOF) )
@@ -201,7 +178,7 @@ bool BiffFragmentHandler::skipFragment()
     return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF);
 }
 
-// ----------------------------------------------------------------------------
+// ============================================================================
 
 BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rStrmName, bool bCloneDecoder ) :
     BiffFragmentHandler( rHelper.getBaseFilter(), rStrmName ),
@@ -213,18 +190,16 @@ BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelpe
 
 // ----------------------------------------------------------------------------
 
-BiffWorksheetFragmentBase::BiffWorksheetFragmentBase( const BiffWorkbookFragmentBase& rParent,
-        const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
+BiffWorksheetFragmentBase::BiffWorksheetFragmentBase( const WorksheetHelper& rHelper, const BiffWorkbookFragmentBase& rParent ) :
     BiffFragmentHandler( rParent ),
-    WorksheetHelperRoot( rParent, rxProgressBar, eSheetType, nSheet )
+    WorksheetHelper( rHelper )
 {
 }
 
 // ----------------------------------------------------------------------------
 
-BiffSkipWorksheetFragment::BiffSkipWorksheetFragment( const BiffWorkbookFragmentBase& rParent,
-        const ISegmentProgressBarRef& rxProgressBar, sal_Int16 nSheet ) :
-    BiffWorksheetFragmentBase( rParent, rxProgressBar, SHEETTYPE_EMPTYSHEET, nSheet )
+BiffSkipWorksheetFragment::BiffSkipWorksheetFragment( const WorksheetHelper& rHelper, const BiffWorkbookFragmentBase& rParent ) :
+    BiffWorksheetFragmentBase( rHelper, rParent )
 {
 }
 
diff --git a/oox/source/xls/externallinkbuffer.cxx b/oox/source/xls/externallinkbuffer.cxx
index 8b7747107..2046f7806 100644
--- a/oox/source/xls/externallinkbuffer.cxx
+++ b/oox/source/xls/externallinkbuffer.cxx
@@ -243,9 +243,8 @@ void ExternalName::importExternalName( BiffInputStream& rStrm )
             // cell references to other internal sheets are stored in hidden external names
             if( bHiddenRef && (getBiff() == BIFF4) && isWorkbookFile() )
             {
-                TokensFormulaContext aContext( true, true );
-                importBiffFormula( aContext, mrParentLink.getCalcSheetIndex(), rStrm );
-                extractReference( aContext.getTokens() );
+                ApiTokenSequence aTokens = importBiffFormula( mrParentLink.getCalcSheetIndex(), rStrm );
+                extractReference( aTokens );
             }
         break;
 
@@ -253,9 +252,8 @@ void ExternalName::importExternalName( BiffInputStream& rStrm )
             // cell references to other documents are stored in hidden external names
             if( bHiddenRef )
             {
-                TokensFormulaContext aContext( true, true );
-                importBiffFormula( aContext, 0, rStrm );
-                extractExternalReference( aContext.getTokens() );
+                ApiTokenSequence aTokens = importBiffFormula( 0, rStrm );
+                extractExternalReference( aTokens );
             }
         break;
 
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index f396d586f..a0b8f16f1 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp>
 #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
-#include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
@@ -228,8 +227,10 @@ const sal_uInt16 FUNCFLAG_MACROCMD          = 0x0080;   /// Function is a macro-
 const sal_uInt16 FUNCFLAG_ALWAYSVAR         = 0x0100;   /// Function is always represented by a tFuncVar token.
 const sal_uInt16 FUNCFLAG_PARAMPAIRS        = 0x0200;   /// Optional parameters are expected to appear in pairs.
 
-const sal_uInt16 FUNCFLAG_FUNCLIBMASK       = 0xF000;   /// Mask for function library bits.
-const sal_uInt16 FUNCFLAG_EUROTOOL          = 0x1000;   /// Function is part of the EuroTool add-in.
+/// Converts a function library index (value of enum FunctionLibraryType) to function flags.
+#define FUNCLIB_TO_FUNCFLAGS( funclib_index ) static_cast< sal_uInt16 >( static_cast< sal_uInt8 >( funclib_index ) << 12 )
+/// Extracts a function library index (value of enum FunctionLibraryType) from function flags.
+#define FUNCFLAGS_TO_FUNCLIB( func_flags ) extractValue< FunctionLibraryType >( func_flags, 12, 4 )
 
 typedef ::boost::shared_ptr< FunctionInfo > FunctionInfoRef;
 
@@ -299,7 +300,9 @@ static const FunctionData saFuncTableBiff2[] =
     { "DOLLAR",                 "DOLLAR",               13,     13,     1,  2,  V, { VR }, 0 },
     { "FIXED",                  "FIXED",                14,     14,     1,  2,  V, { VR, VR, C }, 0 },
     { "SIN",                    "SIN",                  15,     15,     1,  1,  V, { VR }, 0 },
+    { "CSC",                    "SIN",                  15,     15,     1,  1,  V, { VR }, FUNCFLAG_EXPORTONLY },
     { "COS",                    "COS",                  16,     16,     1,  1,  V, { VR }, 0 },
+    { "SEC",                    "COS",                  16,     16,     1,  1,  V, { VR }, FUNCFLAG_EXPORTONLY },
     { "TAN",                    "TAN",                  17,     17,     1,  1,  V, { VR }, 0 },
     { "COT",                    "TAN",                  17,     17,     1,  1,  V, { VR }, FUNCFLAG_EXPORTONLY },
     { "ATAN",                   "ATAN",                 18,     18,     1,  1,  V, { VR }, 0 },
@@ -459,7 +462,9 @@ static const FunctionData saFuncTableBiff3[] =
     { "MEDIAN",                 "MEDIAN",               227,    227,    1,  MX, V, { RX }, 0 },
     { "SUMPRODUCT",             "SUMPRODUCT",           228,    228,    1,  MX, V, { VA }, 0 },
     { "SINH",                   "SINH",                 229,    229,    1,  1,  V, { VR }, 0 },
+    { "CSCH",                   "SINH",                 229,    229,    1,  1,  V, { VR }, FUNCFLAG_EXPORTONLY },
     { "COSH",                   "COSH",                 230,    230,    1,  1,  V, { VR }, 0 },
+    { "SECH",                   "COSH",                 230,    230,    1,  1,  V, { VR }, FUNCFLAG_EXPORTONLY },
     { "TANH",                   "TANH",                 231,    231,    1,  1,  V, { VR }, 0 },
     { "COTH",                   "TANH",                 231,    231,    1,  1,  V, { VR }, FUNCFLAG_EXPORTONLY },
     { "ASINH",                  "ASINH",                232,    232,    1,  1,  V, { VR }, 0 },
@@ -675,7 +680,7 @@ static const FunctionData saFuncTableBiff5[] =
 
     // *** EuroTool add-in ***
 
-    { "EUROCONVERT",            "EUROCONVERT",          NOID,   NOID,   3,  5,  V, { VR }, FUNCFLAG_EUROTOOL },
+    { "EUROCONVERT",            "EUROCONVERT",          NOID,   NOID,   3,  5,  V, { VR }, FUNCLIB_TO_FUNCFLAGS( FUNCLIB_EUROTOOL ) },
 
     // *** macro sheet commands ***
 
@@ -912,12 +917,7 @@ void FunctionProviderImpl::initFunc( const FunctionData& rFuncData, sal_uInt8 nM
         xFuncInfo->maBiffMacroName = CREATE_OUSTRING( "_xlfnodf." ) + xFuncInfo->maOdfFuncName;
     }
 
-    switch( rFuncData.mnFlags & FUNCFLAG_FUNCLIBMASK )
-    {
-        case FUNCFLAG_EUROTOOL: xFuncInfo->meFuncLibType = FUNCLIB_EUROTOOL;    break;
-        default:                xFuncInfo->meFuncLibType = FUNCLIB_UNKNOWN;
-    }
-
+    xFuncInfo->meFuncLibType = FUNCFLAGS_TO_FUNCLIB( rFuncData.mnFlags );
     xFuncInfo->mnApiOpCode = -1;
     xFuncInfo->mnBiff12FuncId = rFuncData.mnBiff12FuncId;
     xFuncInfo->mnBiffFuncId = rFuncData.mnBiffFuncId;
@@ -1025,7 +1025,7 @@ struct OpCodeProviderImpl : public ApiOpCodes
 
     explicit            OpCodeProviderImpl(
                             const FunctionInfoVector& rFuncInfos,
-                            const Reference< XMultiServiceFactory >& rxFactory );
+                            const Reference< XMultiServiceFactory >& rxModelFactory );
 
 private:
     typedef ::std::map< OUString, ApiToken >    ApiTokenMap;
@@ -1047,11 +1047,11 @@ private:
 // ----------------------------------------------------------------------------
 
 OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos,
-        const Reference< XMultiServiceFactory >& rxFactory )
+        const Reference< XMultiServiceFactory >& rxModelFactory )
 {
-    if( rxFactory.is() ) try
+    if( rxModelFactory.is() ) try
     {
-        Reference< XFormulaOpCodeMapper > xMapper( rxFactory->createInstance(
+        Reference< XFormulaOpCodeMapper > xMapper( rxModelFactory->createInstance(
             CREATE_OUSTRING( "com.sun.star.sheet.FormulaOpCodeMapper" ) ), UNO_QUERY_THROW );
 
         // op-codes provided as attributes
@@ -1295,10 +1295,10 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c
 
 // ----------------------------------------------------------------------------
 
-OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxFactory,
+OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxModelFactory,
         FilterType eFilter, BiffType eBiff, bool bImportFilter ) :
     FunctionProvider( eFilter, eBiff, bImportFilter ),
-    mxOpCodeImpl( new OpCodeProviderImpl( getFuncs(), rxFactory ) )
+    mxOpCodeImpl( new OpCodeProviderImpl( getFuncs(), rxModelFactory ) )
 {
 }
 
@@ -1333,12 +1333,12 @@ Sequence< FormulaOpCodeMapEntry > OpCodeProvider::getOoxParserMap() const
 // API formula parser wrapper =================================================
 
 ApiParserWrapper::ApiParserWrapper(
-        const Reference< XMultiServiceFactory >& rxFactory, const OpCodeProvider& rOpCodeProv ) :
+        const Reference< XMultiServiceFactory >& rxModelFactory, const OpCodeProvider& rOpCodeProv ) :
     OpCodeProvider( rOpCodeProv )
 {
-    if( rxFactory.is() ) try
+    if( rxModelFactory.is() ) try
     {
-        mxParser.set( rxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.sheet.FormulaParser" ) ), UNO_QUERY_THROW );
+        mxParser.set( rxModelFactory->createInstance( CREATE_OUSTRING( "com.sun.star.sheet.FormulaParser" ) ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
@@ -1364,51 +1364,6 @@ ApiTokenSequence ApiParserWrapper::parseFormula( const OUString& rFormula, const
     return aTokenSeq;
 }
 
-// formula contexts ===========================================================
-
-FormulaContext::FormulaContext( bool bRelativeAsOffset, bool b2dRefsAs3dRefs, bool bAllowNulChars ) :
-    maBaseAddress( 0, 0, 0 ),
-    mbRelativeAsOffset( bRelativeAsOffset ),
-    mb2dRefsAs3dRefs( b2dRefsAs3dRefs ),
-    mbAllowNulChars( bAllowNulChars )
-{
-}
-
-FormulaContext::~FormulaContext()
-{
-}
-
-void FormulaContext::setSharedFormula( const CellAddress& )
-{
-}
-
-// ----------------------------------------------------------------------------
-
-TokensFormulaContext::TokensFormulaContext( bool bRelativeAsOffset, bool b2dRefsAs3dRefs, bool bAllowNulChars ) :
-    FormulaContext( bRelativeAsOffset, b2dRefsAs3dRefs, bAllowNulChars )
-{
-}
-
-void TokensFormulaContext::setTokens( const ApiTokenSequence& rTokens )
-{
-    maTokens = rTokens;
-}
-
-// ----------------------------------------------------------------------------
-
-SimpleFormulaContext::SimpleFormulaContext( const Reference< XFormulaTokens >& rxTokens,
-        bool bRelativeAsOffset, bool b2dRefsAs3dRefs, bool bAllowNulChars ) :
-    FormulaContext( bRelativeAsOffset, b2dRefsAs3dRefs, bAllowNulChars ),
-    mxTokens( rxTokens )
-{
-    OSL_ENSURE( mxTokens.is(), "SimpleFormulaContext::SimpleFormulaContext - missing XFormulaTokens interface" );
-}
-
-void SimpleFormulaContext::setTokens( const ApiTokenSequence& rTokens )
-{
-    mxTokens->setTokens( rTokens );
-}
-
 // formula parser/printer base class for filters ==============================
 
 namespace {
@@ -1481,7 +1436,7 @@ TokenToRangeListState lclProcessClose( sal_Int32& ornParenLevel )
 // ----------------------------------------------------------------------------
 
 FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) :
-    OpCodeProvider( rHelper.getDocumentFactory(), rHelper.getFilterType(), rHelper.getBiff(), rHelper.getBaseFilter().isImportFilter() ),
+    OpCodeProvider( rHelper.getBaseFilter().getModelFactory(), rHelper.getFilterType(), rHelper.getBiff(), rHelper.getBaseFilter().isImportFilter() ),
     ApiOpCodes( getOpCodes() ),
     WorkbookHelper( rHelper )
 {
@@ -1706,6 +1661,12 @@ bool FormulaProcessorBase::extractString( OUString& orString, const ApiTokenSequ
     return aTokenIt.is() && (aTokenIt->OpCode == OPCODE_PUSH) && (aTokenIt->Data >>= orString) && !(++aTokenIt).is();
 }
 
+bool FormulaProcessorBase::extractSpecialTokenInfo( ApiSpecialTokenInfo& orTokenInfo, const ApiTokenSequence& rTokens ) const
+{
+    ApiTokenIterator aTokenIt( rTokens, OPCODE_SPACES, true );
+    return aTokenIt.is() && (aTokenIt->OpCode == OPCODE_BAD) && (aTokenIt->Data >>= orTokenInfo);
+}
+
 void FormulaProcessorBase::convertStringToStringList(
         ApiTokenSequence& orTokens, sal_Unicode cStringSep, bool bTrimLeadingSpaces ) const
 {
diff --git a/oox/source/xls/formulaparser.cxx b/oox/source/xls/formulaparser.cxx
index 2d919a608..41d507e3d 100644
--- a/oox/source/xls/formulaparser.cxx
+++ b/oox/source/xls/formulaparser.cxx
@@ -120,7 +120,6 @@ const FunctionInfo* FormulaFinalizer::getFunctionInfo( ApiToken& orFuncToken )
 
     // no success - return null
     return 0;
-
 }
 
 const FunctionInfo* FormulaFinalizer::getExternCallInfo( ApiToken& orFuncToken, const ApiToken& rECToken )
@@ -242,17 +241,29 @@ const ApiToken* FormulaFinalizer::processParameters(
 
                 if( !aParamInfoIt.isExcelOnlyParam() )
                 {
-                    // replace empty second and third parameter in IF function with zeros
-                    if( (pRealFuncInfo->mnBiff12FuncId == BIFF_FUNC_IF) && ((nParam == 1) || (nParam == 2)) && bIsEmpty )
+                    // handle empty parameters
+                    if( bIsEmpty )
                     {
-                        maTokens.append< double >( OPCODE_PUSH, 0.0 );
-                        bIsEmpty = false;
+                        // append leading space tokens from original token array
+                        while( (pParamBegin < pParamEnd) && (pParamBegin->OpCode == OPCODE_SPACES) )
+                            maTokens.push_back( *pParamBegin++ );
+                        // add default values for some empty parameters, or the OPCODE_MISSING token
+                        appendEmptyParameter( *pRealFuncInfo, nParam );
+                        // reset bIsEmpty flag, if something has been appended in appendEmptyParameter()
+                        bIsEmpty = maTokens.back().OpCode == OPCODE_MISSING;
+                        // skip OPCODE_MISSING token in the original token array
+                        OSL_ENSURE( (pParamBegin == pParamEnd) || (pParamBegin->OpCode == OPCODE_MISSING), "FormulaFinalizer::processParameters - OPCODE_MISSING expected" );
+                        if( pParamBegin < pParamEnd ) ++pParamBegin;
+                        // append trailing space tokens from original token array
+                        while( (pParamBegin < pParamEnd) && (pParamBegin->OpCode == OPCODE_SPACES) )
+                            maTokens.push_back( *pParamBegin++ );
                     }
                     else
                     {
-                        // process all tokens of the parameter
+                        // if parameter is not empty, process all tokens of the parameter
                         processTokens( pParamBegin, pParamEnd );
                     }
+
                     // append parameter separator token
                     maTokens.append( OPCODE_SEP );
                 }
@@ -359,6 +370,25 @@ const ApiToken* FormulaFinalizer::findParameters( ParameterPosVector& rParams,
     return (pToken < pTokenEnd) ? (pToken + 1) : pTokenEnd;
 }
 
+void FormulaFinalizer::appendEmptyParameter( const FunctionInfo& rFuncInfo, size_t nParam )
+{
+    // remeber old size of the token array
+    size_t nTokenArraySize = maTokens.size();
+    
+    switch( rFuncInfo.mnBiff12FuncId )
+    {
+        case BIFF_FUNC_IF:
+            if( (nParam == 1) || (nParam == 2) )
+                maTokens.append< double >( OPCODE_PUSH, 0.0 );
+        break;
+        default:;
+    }
+
+    // if no token has been added, append a OPCODE_MISSING token
+    if( nTokenArraySize == maTokens.size() )
+        maTokens.append( OPCODE_MISSING );
+}
+
 void FormulaFinalizer::appendCalcOnlyParameter( const FunctionInfo& rFuncInfo, size_t nParam )
 {
     (void)nParam;   // prevent 'unused' warning
@@ -411,27 +441,23 @@ class FormulaParserImpl : public FormulaFinalizer, public WorkbookHelper
 public:
     explicit            FormulaParserImpl( const FormulaParser& rParent );
 
-    /** Converts an XML formula string. */
-    virtual void        importOoxFormula(
-                            FormulaContext& rContext,
+    /** Converts an OOXML formula string. */
+    virtual ApiTokenSequence importOoxFormula(
+                            const CellAddress& rBaseAddress,
                             const OUString& rFormulaString );
 
     /** Imports and converts a BIFF12 token array from the passed stream. */
-    virtual void        importBiff12Formula(
-                            FormulaContext& rContext,
+    virtual ApiTokenSequence importBiff12Formula(
+                            const CellAddress& rBaseAddress,
+                            FormulaType eType,
                             SequenceInputStream& rStrm );
 
     /** Imports and converts a BIFF2-BIFF8 token array from the passed stream. */
-    virtual void        importBiffFormula(
-                            FormulaContext& rContext,
+    virtual ApiTokenSequence importBiffFormula(
+                            const CellAddress& rBaseAddress,
+                            FormulaType eType,
                             BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize );
 
-    /** Finalizes the passed token array after import (e.g. adjusts function
-        parameters) and sets the formula using the passed context. */
-    void                setFormula(
-                            FormulaContext& rContext,
-                            const ApiTokenSequence& rTokens );
-
     /** Tries to resolve the passed ref-id to an OLE target URL. */
     OUString            resolveOleTarget( sal_Int32 nRefId, bool bUseRefSheets ) const;
 
@@ -439,18 +465,10 @@ protected:
     typedef ::std::pair< sal_Int32, bool >  WhiteSpace;
     typedef ::std::vector< WhiteSpace >     WhiteSpaceVec;
 
-    /** Sets the current formula context used for import. */
-    inline FormulaContext& getFormulaContext() const { return *mpContext; }
-
-    /** Sets the current formula context used for import. */
-    void                initializeImport( FormulaContext& rContext );
-    /** Finalizes the passed token array after import. */
-    void                finalizeImport( const ApiTokenSequence& rTokens );
+    /** Initializes the formula parser before importing a formula. */
+    void                initializeImport( const CellAddress& rBaseAddress, FormulaType eType );
     /** Finalizes the internal token storage after import. */
-    void                finalizeImport();
-
-    /** Inserts a shared formula using the current formula context and passed base address. */
-    void                setSharedFormula( const BinAddress& rBaseAddr );
+    ApiTokenSequence    finalizeImport();
 
     // token array ------------------------------------------------------------
 
@@ -513,6 +531,7 @@ protected:
     bool                pushExternalFuncOperand( const FunctionInfo& rFuncInfo );
     bool                pushDdeLinkOperand( const OUString& rDdeServer, const OUString& rDdeTopic, const OUString& rDdeItem );
     bool                pushExternalNameOperand( const ExternalNameRef& rxExtName, const ExternalLink& rExtLink );
+    bool                pushSpecialTokenOperand( const BinAddress& rBaseAddr, bool bTable );
 
     bool                pushUnaryPreOperator( sal_Int32 nOpCode );
     bool                pushUnaryPostOperator( sal_Int32 nOpCode );
@@ -546,6 +565,12 @@ protected:
     const sal_Int32     mnMaxXlsCol;                /// Maximum column index in imported document.
     const sal_Int32     mnMaxXlsRow;                /// Maximum row index in imported document.
 
+    CellAddress         maBaseAddr;                 /// Base address for relative references.
+    bool                mbRelativeAsOffset;         /// True = relative row/column index is (signed) offset, false = explicit index.
+    bool                mb2dRefsAs3dRefs;           /// True = convert all 2D references to 3D references in sheet specified by base address.
+    bool                mbSpecialTokens;            /// True = special handling for tExp and tTbl tokens, false = exit with error.
+    bool                mbAllowNulChars;            /// True = keep NUL characters in string tokens.
+
 private:
     typedef ::std::vector< size_t > SizeTypeVector;
 
@@ -555,7 +580,6 @@ private:
     WhiteSpaceVec       maLeadingSpaces;            /// List of whitespaces before next token.
     WhiteSpaceVec       maOpeningSpaces;            /// List of whitespaces before opening parenthesis.
     WhiteSpaceVec       maClosingSpaces;            /// List of whitespaces before closing parenthesis.
-    FormulaContext*     mpContext;                  /// Current formula context.
 };
 
 // ----------------------------------------------------------------------------
@@ -567,7 +591,9 @@ FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) :
     mnMaxApiRow( rParent.getAddressConverter().getMaxApiAddress().Row ),
     mnMaxXlsCol( rParent.getAddressConverter().getMaxXlsAddress().Column ),
     mnMaxXlsRow( rParent.getAddressConverter().getMaxXlsAddress().Row ),
-    mpContext( 0 )
+    mbRelativeAsOffset( false ),
+    mb2dRefsAs3dRefs( false ),
+    mbAllowNulChars( false )
 {
     // reserve enough space to make resize(), push_back() etc. cheap
     maTokenStorage.reserve( 0x2000 );
@@ -578,25 +604,22 @@ FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) :
     maClosingSpaces.reserve( 256 );
 }
 
-void FormulaParserImpl::importOoxFormula( FormulaContext&, const OUString& )
+ApiTokenSequence FormulaParserImpl::importOoxFormula( const CellAddress&, const OUString& )
 {
     OSL_FAIL( "FormulaParserImpl::importOoxFormula - not implemented" );
+    return ApiTokenSequence();
 }
 
-void FormulaParserImpl::importBiff12Formula( FormulaContext&, SequenceInputStream& )
+ApiTokenSequence FormulaParserImpl::importBiff12Formula( const CellAddress&, FormulaType, SequenceInputStream& )
 {
-    OSL_FAIL( "FormulaParserImpl::importOobFormula - not implemented" );
+    OSL_FAIL( "FormulaParserImpl::importBiff12Formula - not implemented" );
+    return ApiTokenSequence();
 }
 
-void FormulaParserImpl::importBiffFormula( FormulaContext&, BiffInputStream&, const sal_uInt16* )
+ApiTokenSequence FormulaParserImpl::importBiffFormula( const CellAddress&, FormulaType, BiffInputStream&, const sal_uInt16* )
 {
     OSL_FAIL( "FormulaParserImpl::importBiffFormula - not implemented" );
-}
-
-void FormulaParserImpl::setFormula( FormulaContext& rContext, const ApiTokenSequence& rTokens )
-{
-    initializeImport( rContext );
-    finalizeImport( rTokens );
+    return ApiTokenSequence();
 }
 
 OUString FormulaParserImpl::resolveOleTarget( sal_Int32 nRefId, bool bUseRefSheets ) const
@@ -608,22 +631,41 @@ OUString FormulaParserImpl::resolveOleTarget( sal_Int32 nRefId, bool bUseRefShee
     return OUString();
 }
 
-void FormulaParserImpl::initializeImport( FormulaContext& rContext )
+void FormulaParserImpl::initializeImport( const CellAddress& rBaseAddr, FormulaType eType )
 {
+    maBaseAddr = rBaseAddr;
+    mbRelativeAsOffset = mb2dRefsAs3dRefs = mbSpecialTokens = mbAllowNulChars = false;
+    switch( eType )
+    {
+        case FORMULATYPE_CELL:
+            mbSpecialTokens = true;
+        break;
+        case FORMULATYPE_ARRAY:
+        break;
+        case FORMULATYPE_SHAREDFORMULA:
+            mbRelativeAsOffset = true;
+        break;
+        case FORMULATYPE_CONDFORMAT:
+            mbRelativeAsOffset = true;
+        break;
+        case FORMULATYPE_VALIDATION:
+            mbRelativeAsOffset = true;
+            // enable NUL characters in BIFF import, string list is single tStr token with NUL separators
+            mbAllowNulChars = getFilterType() == FILTER_BIFF;
+        break;
+        case FORMULATYPE_DEFINEDNAME:
+            mbRelativeAsOffset = true;
+            // BIFF2-BIFF4: convert 2D referebces to absolute 3D references
+            mb2dRefsAs3dRefs = (getFilterType() == FILTER_BIFF) && (getBiff() <= BIFF4);
+        break;
+    }
+
     maTokenStorage.clear();
     maTokenIndexes.clear();
     maOperandSizeStack.clear();
-    mpContext = &rContext;
-}
-
-void FormulaParserImpl::finalizeImport( const ApiTokenSequence& rTokens )
-{
-    ApiTokenSequence aFinalTokens = finalizeTokenArray( rTokens );
-    if( aFinalTokens.hasElements() )
-        mpContext->setTokens( aFinalTokens );
 }
 
-void FormulaParserImpl::finalizeImport()
+ApiTokenSequence FormulaParserImpl::finalizeImport()
 {
     ApiTokenSequence aTokens( static_cast< sal_Int32 >( maTokenIndexes.size() ) );
     if( aTokens.hasElements() )
@@ -632,14 +674,7 @@ void FormulaParserImpl::finalizeImport()
         for( SizeTypeVector::const_iterator aIt = maTokenIndexes.begin(), aEnd = maTokenIndexes.end(); aIt != aEnd; ++aIt, ++pToken )
             *pToken = maTokenStorage[ *aIt ];
     }
-    finalizeImport( aTokens );
-}
-
-void FormulaParserImpl::setSharedFormula( const BinAddress& rBaseAddr )
-{
-    CellAddress aApiBaseAddr;
-    if( getAddressConverter().convertToCellAddress( aApiBaseAddr, rBaseAddr, mpContext->getBaseAddress().Sheet, false ) )
-        mpContext->setSharedFormula( aApiBaseAddr );
+    return finalizeTokenArray( aTokens );
 }
 
 // token array ----------------------------------------------------------------
@@ -989,7 +1024,7 @@ bool FormulaParserImpl::pushNlrOperand( const BinSingleRef2d& rRef )
 
 bool FormulaParserImpl::pushEmbeddedRefOperand( const DefinedNameBase& rName, bool bPushBadToken )
 {
-    Any aRefAny = rName.getReference( mpContext->getBaseAddress() );
+    Any aRefAny = rName.getReference( maBaseAddr );
     if( aRefAny.hasValue() )
         return pushAnyOperand( aRefAny, OPCODE_PUSH );
     if( bPushBadToken && (rName.getModelName().getLength() > 0) && (rName.getModelName()[ 0 ] >= ' ') )
@@ -1059,6 +1094,13 @@ bool FormulaParserImpl::pushExternalNameOperand( const ExternalNameRef& rxExtNam
     return pushBiffErrorOperand( BIFF_ERR_NAME );
 }
 
+bool FormulaParserImpl::pushSpecialTokenOperand( const BinAddress& rBaseAddr, bool bTable )
+{
+    CellAddress aBaseAddr( maBaseAddr.Sheet, rBaseAddr.mnCol, rBaseAddr.mnRow );
+    ApiSpecialTokenInfo aTokenInfo( aBaseAddr, bTable );
+    return mbSpecialTokens && (getFormulaSize() == 0) && pushValueOperand( aTokenInfo, OPCODE_BAD );
+}
+
 bool FormulaParserImpl::pushUnaryPreOperator( sal_Int32 nOpCode )
 {
     return pushUnaryPreOperatorToken( nOpCode, &maLeadingSpaces ) && resetSpaces();
@@ -1093,15 +1135,15 @@ bool FormulaParserImpl::pushFunctionOperator( const FunctionInfo& rFuncInfo, siz
 
 void FormulaParserImpl::initReference2d( SingleReference& orApiRef ) const
 {
-    if( mpContext->is2dRefsAs3dRefs() )
+    if( mb2dRefsAs3dRefs )
     {
-        initReference3d( orApiRef, mpContext->getBaseAddress().Sheet, false );
+        initReference3d( orApiRef, maBaseAddr.Sheet, false );
     }
     else
     {
         orApiRef.Flags = SHEET_RELATIVE;
         // #i10184# absolute sheet index needed for relative references in shared formulas
-        orApiRef.Sheet = mpContext->getBaseAddress().Sheet;
+        orApiRef.Sheet = maBaseAddr.Sheet;
         orApiRef.RelativeSheet = 0;
     }
 }
@@ -1146,9 +1188,9 @@ void FormulaParserImpl::convertReference( SingleReference& orApiRef, const BinSi
         if( !bRelativeAsOffset )
         {
             if( rRef.mbColRel )
-                orApiRef.RelativeColumn -= mpContext->getBaseAddress().Column;
+                orApiRef.RelativeColumn -= maBaseAddr.Column;
             if( rRef.mbRowRel )
-                orApiRef.RelativeRow -= mpContext->getBaseAddress().Row;
+                orApiRef.RelativeRow -= maBaseAddr.Row;
         }
     }
 }
@@ -1235,12 +1277,13 @@ class OoxFormulaParserImpl : public FormulaParserImpl
 public:
     explicit            OoxFormulaParserImpl( const FormulaParser& rParent );
 
-    virtual void        importOoxFormula(
-                            FormulaContext& rContext,
+    virtual ApiTokenSequence importOoxFormula(
+                            const CellAddress& rBaseAddr,
                             const OUString& rFormulaString );
 
-    virtual void        importBiff12Formula(
-                            FormulaContext& rContext,
+    virtual ApiTokenSequence importBiff12Formula(
+                            const CellAddress& rBaseAddr,
+                            FormulaType eType,
                             SequenceInputStream& rStrm );
 
 private:
@@ -1284,26 +1327,25 @@ private:
 
 OoxFormulaParserImpl::OoxFormulaParserImpl( const FormulaParser& rParent ) :
     FormulaParserImpl( rParent ),
-    maApiParser( rParent.getDocumentFactory(), rParent ),
+    maApiParser( rParent.getBaseFilter().getModelFactory(), rParent ),
     mnAddDataPos( 0 ),
     mbNeedExtRefs( true )
 {
 }
 
-void OoxFormulaParserImpl::importOoxFormula( FormulaContext& rContext, const OUString& rFormulaString )
+ApiTokenSequence OoxFormulaParserImpl::importOoxFormula( const CellAddress& rBaseAddr, const OUString& rFormulaString )
 {
     if( mbNeedExtRefs )
     {
         maApiParser.getParserProperties().setProperty( PROP_ExternalLinks, getExternalLinks().getLinkInfos() );
         mbNeedExtRefs = false;
     }
-    initializeImport( rContext );
-    finalizeImport( maApiParser.parseFormula( rFormulaString, rContext.getBaseAddress() ) );
+    return finalizeTokenArray( maApiParser.parseFormula( rFormulaString, rBaseAddr ) );
 }
 
-void OoxFormulaParserImpl::importBiff12Formula( FormulaContext& rContext, SequenceInputStream& rStrm )
+ApiTokenSequence OoxFormulaParserImpl::importBiff12Formula( const CellAddress& rBaseAddr, FormulaType eType, SequenceInputStream& rStrm )
 {
-    initializeImport( rContext );
+    initializeImport( rBaseAddr, eType );
 
     sal_Int32 nFmlaSize = rStrm.readInt32();
     sal_Int64 nFmlaPos = rStrm.tell();
@@ -1316,7 +1358,7 @@ void OoxFormulaParserImpl::importBiff12Formula( FormulaContext& rContext, Sequen
     rStrm.seek( nFmlaPos );
 
     bool bOk = (nFmlaSize >= 0) && (nAddDataSize >= 0);
-    bool bRelativeAsOffset = getFormulaContext().isRelativeAsOffset();
+    bool bRelativeAsOffset = mbRelativeAsOffset;
 
     while( bOk && !rStrm.isEof() && (rStrm.tell() < nFmlaEndPos) )
     {
@@ -1393,12 +1435,16 @@ void OoxFormulaParserImpl::importBiff12Formula( FormulaContext& rContext, Sequen
     }
 
     // build and finalize the token sequence
+    ApiTokenSequence aFinalTokens;
     if( bOk && (rStrm.tell() == nFmlaEndPos) && (mnAddDataPos == nAddDataEndPos) )
-        finalizeImport();
+        aFinalTokens = finalizeImport();
 
     // seek behind token array
     if( (nFmlaSize >= 0) && (nAddDataSize >= 0) )
         rStrm.seek( nAddDataEndPos );
+
+    // return the final token sequence
+    return aFinalTokens;
 }
 
 // import token contents and create API formula token -------------------------
@@ -1542,7 +1588,7 @@ bool OoxFormulaParserImpl::importTableToken( SequenceInputStream& rStrm )
                 }
                 else if( bThisRow )
                 {
-                    nStartRow = nEndRow = getFormulaContext().getBaseAddress().Row - xTable->getRange().StartRow;
+                    nStartRow = nEndRow = maBaseAddr.Row - xTable->getRange().StartRow;
                     bFixedHeight = true;
                 }
                 else
@@ -1721,9 +1767,7 @@ bool OoxFormulaParserImpl::importExpToken( SequenceInputStream& rStrm )
     swapStreamPosition( rStrm );
     rStrm >> aBaseAddr.mnCol;
     swapStreamPosition( rStrm );
-    setSharedFormula( aBaseAddr );
-    // formula has been set, exit parser by returning false
-    return false;
+    return pushSpecialTokenOperand( aBaseAddr, false );
 }
 
 LinkSheetRange OoxFormulaParserImpl::readSheetRange( SequenceInputStream& rStrm )
@@ -1838,8 +1882,9 @@ class BiffFormulaParserImpl : public FormulaParserImpl
 public:
     explicit            BiffFormulaParserImpl( const FormulaParser& rParent );
 
-    virtual void        importBiffFormula(
-                            FormulaContext& rContext,
+    virtual ApiTokenSequence importBiffFormula(
+                            const CellAddress& rBaseAddr,
+                            FormulaType eType,
                             BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize );
 
 private:
@@ -1875,7 +1920,8 @@ private:
     bool                importFuncVarToken2( BiffInputStream& rStrm );
     bool                importFuncVarToken4( BiffInputStream& rStrm );
     bool                importFuncCEToken( BiffInputStream& rStrm );
-    bool                importExpToken5( BiffInputStream& rStrm );
+    bool                importExpToken( BiffInputStream& rStrm );
+    bool                importTblToken( BiffInputStream& rStrm );
 
     bool                importNlrAddrToken( BiffInputStream& rStrm, bool bRow );
     bool                importNlrRangeToken( BiffInputStream& rStrm );
@@ -1924,7 +1970,6 @@ private:
     ImportTokenFunc     mpImportFuncToken;          /// Pointer to tFunc import function (function with fixed parameter count).
     ImportTokenFunc     mpImportFuncVarToken;       /// Pointer to tFuncVar import function (function with variable parameter count).
     ImportTokenFunc     mpImportFuncCEToken;        /// Pointer to tFuncCE import function (command macro call).
-    ImportTokenFunc     mpImportExpToken;           /// Pointer to tExp import function (array/shared formula).
     sal_Int64           mnAddDataPos;               /// Current stream position for additional data (tArray, tMemArea, tNlr).
     sal_Int32           mnCurrRefId;                /// Current ref-id from tSheet token (BIFF2-BIFF4 only).
     sal_uInt16          mnAttrDataSize;             /// Size of one tAttr data element.
@@ -1958,7 +2003,6 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
             mpImportFuncToken = &BiffFormulaParserImpl::importFuncToken2;
             mpImportFuncVarToken = &BiffFormulaParserImpl::importFuncVarToken2;
             mpImportFuncCEToken = &BiffFormulaParserImpl::importFuncCEToken;
-            mpImportExpToken = &BiffFormulaParserImpl::importTokenNotAvailable;
             mnAttrDataSize = 1;
             mnArraySize = 6;
             mnNameSize = 5;
@@ -1980,7 +2024,6 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
             mpImportFuncToken = &BiffFormulaParserImpl::importFuncToken2;
             mpImportFuncVarToken = &BiffFormulaParserImpl::importFuncVarToken2;
             mpImportFuncCEToken = &BiffFormulaParserImpl::importFuncCEToken;
-            mpImportExpToken = &BiffFormulaParserImpl::importTokenNotAvailable;
             mnAttrDataSize = 2;
             mnArraySize = 7;
             mnNameSize = 8;
@@ -2002,7 +2045,6 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
             mpImportFuncToken = &BiffFormulaParserImpl::importFuncToken4;
             mpImportFuncVarToken = &BiffFormulaParserImpl::importFuncVarToken4;
             mpImportFuncCEToken = &BiffFormulaParserImpl::importTokenNotAvailable;
-            mpImportExpToken = &BiffFormulaParserImpl::importTokenNotAvailable;
             mnAttrDataSize = 2;
             mnArraySize = 7;
             mnNameSize = 8;
@@ -2024,7 +2066,6 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
             mpImportFuncToken = &BiffFormulaParserImpl::importFuncToken4;
             mpImportFuncVarToken = &BiffFormulaParserImpl::importFuncVarToken4;
             mpImportFuncCEToken = &BiffFormulaParserImpl::importTokenNotAvailable;
-            mpImportExpToken = &BiffFormulaParserImpl::importExpToken5;
             mnAttrDataSize = 2;
             mnArraySize = 7;
             mnNameSize = 12;
@@ -2046,7 +2087,6 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
             mpImportFuncToken = &BiffFormulaParserImpl::importFuncToken4;
             mpImportFuncVarToken = &BiffFormulaParserImpl::importFuncVarToken4;
             mpImportFuncCEToken = &BiffFormulaParserImpl::importTokenNotAvailable;
-            mpImportExpToken = &BiffFormulaParserImpl::importExpToken5;
             mnAttrDataSize = 2;
             mnArraySize = 7;
             mnNameSize = 2;
@@ -2058,15 +2098,14 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
     }
 }
 
-void BiffFormulaParserImpl::importBiffFormula( FormulaContext& rContext,
-        BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize )
+ApiTokenSequence BiffFormulaParserImpl::importBiffFormula( const CellAddress& rBaseAddr,
+        FormulaType eType, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize )
 {
-    initializeImport( rContext );
+    initializeImport( rBaseAddr, eType );
     mnCurrRefId = 0;
 
     sal_uInt16 nFmlaSize = lclReadFmlaSize( rStrm, getBiff(), pnFmlaSize );
     sal_Int64 nEndPos = mnAddDataPos = rStrm.tell() + nFmlaSize;
-    bool bRelativeAsOffset = getFormulaContext().isRelativeAsOffset();
 
     bool bOk = true;
     while( bOk && !rStrm.isEof() && (rStrm.tell() < nEndPos) )
@@ -2084,8 +2123,8 @@ void BiffFormulaParserImpl::importBiffFormula( FormulaContext& rContext,
                 // base tokens
                 switch( nBaseId )
                 {
-                    case BIFF_TOKID_EXP:        bOk = (this->*mpImportExpToken)( rStrm );               break;
-                    case BIFF_TOKID_TBL:        bOk = false; /* multiple op. will be set externally */  break;
+                    case BIFF_TOKID_EXP:        bOk = importExpToken( rStrm );                          break;
+                    case BIFF_TOKID_TBL:        bOk = importTblToken( rStrm );                          break;
                     case BIFF_TOKID_ADD:        bOk = pushBinaryOperator( OPCODE_ADD );                 break;
                     case BIFF_TOKID_SUB:        bOk = pushBinaryOperator( OPCODE_SUB );                 break;
                     case BIFF_TOKID_MUL:        bOk = pushBinaryOperator( OPCODE_MULT );                break;
@@ -2141,10 +2180,10 @@ void BiffFormulaParserImpl::importBiffFormula( FormulaContext& rContext,
                     case BIFF_TOKID_MEMNOMEMN:  bOk = importMemFuncToken( rStrm );                                      break;
                     case BIFF_TOKID_FUNCCE:     bOk = (this->*mpImportFuncCEToken)( rStrm );                            break;
                     case BIFF_TOKID_NAMEX:      bOk = (this->*mpImportNameXToken)( rStrm );                             break;
-                    case BIFF_TOKID_REF3D:      bOk = (this->*mpImportRef3dToken)( rStrm, false, bRelativeAsOffset );   break;
-                    case BIFF_TOKID_AREA3D:     bOk = (this->*mpImportArea3dToken)( rStrm, false, bRelativeAsOffset );  break;
-                    case BIFF_TOKID_REFERR3D:   bOk = (this->*mpImportRef3dToken)( rStrm, true, bRelativeAsOffset );    break;
-                    case BIFF_TOKID_AREAERR3D:  bOk = (this->*mpImportArea3dToken)( rStrm, true, bRelativeAsOffset );   break;
+                    case BIFF_TOKID_REF3D:      bOk = (this->*mpImportRef3dToken)( rStrm, false, mbRelativeAsOffset );  break;
+                    case BIFF_TOKID_AREA3D:     bOk = (this->*mpImportArea3dToken)( rStrm, false, mbRelativeAsOffset ); break;
+                    case BIFF_TOKID_REFERR3D:   bOk = (this->*mpImportRef3dToken)( rStrm, true, mbRelativeAsOffset );   break;
+                    case BIFF_TOKID_AREAERR3D:  bOk = (this->*mpImportArea3dToken)( rStrm, true, mbRelativeAsOffset );  break;
                     default:                    bOk = false;
                 }
             }
@@ -2152,11 +2191,15 @@ void BiffFormulaParserImpl::importBiffFormula( FormulaContext& rContext,
     }
 
     // build and finalize the token sequence
+    ApiTokenSequence aFinalTokens;
     if( bOk && (rStrm.tell() == nEndPos) )
-        finalizeImport();
+        aFinalTokens = finalizeImport();
 
     // seek behind additional token data of tArray, tMemArea, tNlr tokens
     rStrm.seek( mnAddDataPos );
+
+    // return the final token sequence
+    return aFinalTokens;
 }
 
 // import token contents and create API formula token -------------------------
@@ -2175,13 +2218,13 @@ bool BiffFormulaParserImpl::importRefTokenNotAvailable( BiffInputStream&, bool,
 
 bool BiffFormulaParserImpl::importStrToken2( BiffInputStream& rStrm )
 {
-    return pushValueOperand( rStrm.readByteStringUC( false, getTextEncoding(), getFormulaContext().isNulCharsAllowed() ) );
+    return pushValueOperand( rStrm.readByteStringUC( false, getTextEncoding(), mbAllowNulChars ) );
 }
 
 bool BiffFormulaParserImpl::importStrToken8( BiffInputStream& rStrm )
 {
     // read flags field for empty strings also
-    return pushValueOperand( rStrm.readUniStringBody( rStrm.readuInt8(), getFormulaContext().isNulCharsAllowed() ) );
+    return pushValueOperand( rStrm.readUniStringBody( rStrm.readuInt8(), mbAllowNulChars ) );
 }
 
 bool BiffFormulaParserImpl::importAttrToken( BiffInputStream& rStrm )
@@ -2311,7 +2354,6 @@ bool BiffFormulaParserImpl::importArrayToken( BiffInputStream& rStrm )
     size_t nOpSize = popOperandSize();
     size_t nOldArraySize = getFormulaSize();
     bool bBiff8 = getBiff() == BIFF8;
-    bool bNulChars = getFormulaContext().isNulCharsAllowed();
 
     // read array size
     swapStreamPosition( rStrm );
@@ -2340,8 +2382,8 @@ bool BiffFormulaParserImpl::importArrayToken( BiffInputStream& rStrm )
                 break;
                 case BIFF_DATATYPE_STRING:
                     appendRawToken( OPCODE_PUSH ) <<= bBiff8 ?
-                        rStrm.readUniString( bNulChars ) :
-                        rStrm.readByteStringUC( false, getTextEncoding(), bNulChars );
+                        rStrm.readUniString( mbAllowNulChars ) :
+                        rStrm.readByteStringUC( false, getTextEncoding(), mbAllowNulChars );
                 break;
                 case BIFF_DATATYPE_BOOL:
                     appendRawToken( OPCODE_PUSH ) <<= static_cast< double >( (rStrm.readuInt8() == BIFF_TOK_BOOL_FALSE) ? 0.0 : 1.0 );
@@ -2490,13 +2532,18 @@ bool BiffFormulaParserImpl::importFuncCEToken( BiffInputStream& rStrm )
     return pushBiffFunction( nCmdId, nParamCount );
 }
 
-bool BiffFormulaParserImpl::importExpToken5( BiffInputStream& rStrm )
+bool BiffFormulaParserImpl::importExpToken( BiffInputStream& rStrm )
 {
     BinAddress aBaseAddr;
     aBaseAddr.read( rStrm );
-    setSharedFormula( aBaseAddr );
-    // formula has been set, exit parser by returning false
-    return false;
+    return pushSpecialTokenOperand( aBaseAddr, false );
+}
+
+bool BiffFormulaParserImpl::importTblToken( BiffInputStream& rStrm )
+{
+    BinAddress aBaseAddr;
+    aBaseAddr.read( rStrm );
+    return pushSpecialTokenOperand( aBaseAddr, true );
 }
 
 bool BiffFormulaParserImpl::importNlrAddrToken( BiffInputStream& rStrm, bool bRow )
@@ -2766,22 +2813,35 @@ FormulaParser::~FormulaParser()
 {
 }
 
-void FormulaParser::importFormula( FormulaContext& rContext, const OUString& rFormulaString ) const
+ApiTokenSequence FormulaParser::importFormula( const CellAddress& rBaseAddress, const OUString& rFormulaString ) const
 {
-    mxImpl->importOoxFormula( rContext, rFormulaString );
+    return mxImpl->importOoxFormula( rBaseAddress, rFormulaString );
 }
 
-void FormulaParser::importFormula( FormulaContext& rContext, SequenceInputStream& rStrm ) const
+ApiTokenSequence FormulaParser::importFormula( const CellAddress& rBaseAddress, FormulaType eType, SequenceInputStream& rStrm ) const
 {
-    mxImpl->importBiff12Formula( rContext, rStrm );
+    return mxImpl->importBiff12Formula( rBaseAddress, eType, rStrm );
 }
 
-void FormulaParser::importFormula( FormulaContext& rContext, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) const
+ApiTokenSequence FormulaParser::importFormula( const CellAddress& rBaseAddress, FormulaType eType, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) const
 {
-    mxImpl->importBiffFormula( rContext, rStrm, pnFmlaSize );
+    return mxImpl->importBiffFormula( rBaseAddress, eType, rStrm, pnFmlaSize );
+}
+
+ApiTokenSequence FormulaParser::convertBoolToFormula( bool bValue ) const
+{
+    if( const FunctionInfo* pFuncInfo = getFuncInfoFromBiffFuncId( bValue ? BIFF_FUNC_TRUE : BIFF_FUNC_FALSE ) )
+    {
+        ApiTokenSequence aTokens( 3 );
+        aTokens[ 0 ].OpCode = pFuncInfo->mnApiOpCode;
+        aTokens[ 1 ].OpCode = OPCODE_OPEN;
+        aTokens[ 2 ].OpCode = OPCODE_CLOSE;
+        return aTokens;
+    }
+    return ApiTokenSequence();
 }
 
-void FormulaParser::convertErrorToFormula( FormulaContext& rContext, sal_uInt8 nErrorCode ) const
+ApiTokenSequence FormulaParser::convertErrorToFormula( sal_uInt8 nErrorCode ) const
 {
     ApiTokenSequence aTokens( 3 );
     // HACK: enclose all error codes into an 1x1 matrix
@@ -2789,26 +2849,24 @@ void FormulaParser::convertErrorToFormula( FormulaContext& rContext, sal_uInt8 n
     aTokens[ 1 ].OpCode = OPCODE_PUSH;
     aTokens[ 1 ].Data <<= BiffHelper::calcDoubleFromError( nErrorCode );
     aTokens[ 2 ].OpCode = OPCODE_ARRAY_CLOSE;
-    mxImpl->setFormula( rContext, aTokens );
+    return aTokens;
 }
 
-void FormulaParser::convertNameToFormula( FormulaContext& rContext, sal_Int32 nTokenIndex ) const
+ApiTokenSequence FormulaParser::convertNameToFormula( sal_Int32 nTokenIndex ) const
 {
-    if( nTokenIndex >= 0 )
-    {
-        ApiTokenSequence aTokens( 1 );
-        aTokens[ 0 ].OpCode = OPCODE_NAME;
-        aTokens[ 0 ].Data <<= nTokenIndex;
-        mxImpl->setFormula( rContext, aTokens );
-    }
-    else
-        convertErrorToFormula( rContext, BIFF_ERR_REF );
+    if( nTokenIndex < 0 )
+        return convertErrorToFormula( BIFF_ERR_REF );
+
+    ApiTokenSequence aTokens( 1 );
+    aTokens[ 0 ].OpCode = OPCODE_NAME;
+    aTokens[ 0 ].Data <<= nTokenIndex;
+    return aTokens;
 }
 
-void FormulaParser::convertNumberToHyperlink( FormulaContext& rContext, const OUString& rUrl, double fValue ) const
+ApiTokenSequence FormulaParser::convertNumberToHyperlink( const OUString& rUrl, double fValue ) const
 {
     OSL_ENSURE( rUrl.getLength() > 0, "FormulaParser::convertNumberToHyperlink - missing URL" );
-    if( const FunctionInfo* pFuncInfo = getFuncInfoFromBiff12FuncId( BIFF_FUNC_HYPERLINK ) )
+    if( const FunctionInfo* pFuncInfo = getFuncInfoFromBiffFuncId( BIFF_FUNC_HYPERLINK ) )
     {
         ApiTokenSequence aTokens( 6 );
         aTokens[ 0 ].OpCode = pFuncInfo->mnApiOpCode;
@@ -2819,8 +2877,9 @@ void FormulaParser::convertNumberToHyperlink( FormulaContext& rContext, const OU
         aTokens[ 4 ].OpCode = OPCODE_PUSH;
         aTokens[ 4 ].Data <<= fValue;
         aTokens[ 5 ].OpCode = OPCODE_CLOSE;
-        mxImpl->setFormula( rContext, aTokens );
+        return aTokens;
     }
+    return ApiTokenSequence();
 }
 
 OUString FormulaParser::importOleTargetLink( const OUString& rFormulaString )
diff --git a/oox/source/xls/numberformatsbuffer.cxx b/oox/source/xls/numberformatsbuffer.cxx
index 1a85f0155..03992fdf7 100644
--- a/oox/source/xls/numberformatsbuffer.cxx
+++ b/oox/source/xls/numberformatsbuffer.cxx
@@ -1949,7 +1949,7 @@ NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) :
     // get the current locale
     try
     {
-        Reference< XMultiServiceFactory > xConfigProv( getGlobalFactory()->createInstance(
+        Reference< XMultiServiceFactory > xConfigProv( getBaseFilter().getServiceFactory()->createInstance(
             CREATE_OUSTRING( "com.sun.star.configuration.ConfigurationProvider" ) ), UNO_QUERY_THROW );
 
         // try user-defined locale setting
diff --git a/oox/source/xls/ooxformulaparser.cxx b/oox/source/xls/ooxformulaparser.cxx
index b2020df71..ea4fefbe8 100644
--- a/oox/source/xls/ooxformulaparser.cxx
+++ b/oox/source/xls/ooxformulaparser.cxx
@@ -48,7 +48,7 @@ using ::rtl::OUString;
 class OOXMLFormulaParserImpl : private FormulaFinalizer
 {
 public:
-    explicit            OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxFactory );
+    explicit            OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory );
 
     Sequence< FormulaToken > parseFormula( const OUString& rFormula, const CellAddress& rReferencePos );
 
@@ -61,9 +61,9 @@ private:
 
 // ----------------------------------------------------------------------------
 
-OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxFactory ) :
-    FormulaFinalizer( OpCodeProvider( rxFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ),
-    maApiParser( rxFactory, *this )
+OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) :
+    FormulaFinalizer( OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ),
+    maApiParser( rxModelFactory, *this )
 {
 }
 
@@ -116,7 +116,7 @@ const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString&
 class OOXMLFormulaPrinterImpl : public OpCodeProvider
 {
 public:
-    explicit            OOXMLFormulaPrinterImpl( const Reference< XMultiServiceFactory >& rxFactory );
+    explicit            OOXMLFormulaPrinterImpl( const Reference< XMultiServiceFactory >& rxModelFactory );
 
 private:
     ApiParserWrapper    maApiParser;
@@ -124,9 +124,9 @@ private:
 
 // ----------------------------------------------------------------------------
 
-OOXMLFormulaPrinterImpl::OOXMLFormulaPrinterImpl( const Reference< XMultiServiceFactory >& rxFactory ) :
-    OpCodeProvider( rxFactory, FILTER_OOXML, BIFF_UNKNOWN, false ),
-    maApiParser( rxFactory, *this )
+OOXMLFormulaPrinterImpl::OOXMLFormulaPrinterImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) :
+    OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, false ),
+    maApiParser( rxModelFactory, *this )
 {
 }
 
@@ -203,8 +203,8 @@ Sequence< FormulaToken > SAL_CALL OOXMLFormulaParser::parseFormula(
 {
     if( !mxParserImpl )
     {
-        Reference< XMultiServiceFactory > xFactory( mxComponent, UNO_QUERY_THROW );
-        mxParserImpl.reset( new OOXMLFormulaParserImpl( xFactory ) );
+        Reference< XMultiServiceFactory > xModelFactory( mxComponent, UNO_QUERY_THROW );
+        mxParserImpl.reset( new OOXMLFormulaParserImpl( xModelFactory ) );
     }
     return mxParserImpl->parseFormula( rFormula, rReferencePos );
 }
diff --git a/oox/source/xls/pagesettings.cxx b/oox/source/xls/pagesettings.cxx
index 76a61f0ab..deb4dd744 100644
--- a/oox/source/xls/pagesettings.cxx
+++ b/oox/source/xls/pagesettings.cxx
@@ -918,8 +918,7 @@ Reference< XTextContent > HeaderFooterParser::createField( const OUString& rServ
     Reference< XTextContent > xContent;
     try
     {
-        Reference< XMultiServiceFactory > xFactory( getDocument(), UNO_QUERY_THROW );
-        xContent.set( xFactory->createInstance( rServiceName ), UNO_QUERY_THROW );
+        xContent.set( getBaseFilter().getModelFactory()->createInstance( rServiceName ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
diff --git a/oox/source/xls/pivotcachebuffer.cxx b/oox/source/xls/pivotcachebuffer.cxx
index dd0833250..c9a7eb38f 100644
--- a/oox/source/xls/pivotcachebuffer.cxx
+++ b/oox/source/xls/pivotcachebuffer.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp>
 #include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
-#include <com/sun/star/table/XCell.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
@@ -45,6 +44,7 @@
 #include "oox/xls/defnamesbuffer.hxx"
 #include "oox/xls/excelhandlers.hxx"
 #include "oox/xls/pivotcachefragment.hxx"
+#include "oox/xls/sheetdatabuffer.hxx"
 #include "oox/xls/tablebuffer.hxx"
 #include "oox/xls/unitconverter.hxx"
 #include "oox/xls/worksheetbuffer.hxx"
@@ -738,7 +738,7 @@ void PivotCacheField::importPCDFRangePr( BiffInputStream& rStrm )
 
 void PivotCacheField::importPCDFDiscretePr( BiffInputStream& rStrm )
 {
-    sal_Int32 nCount = static_cast< sal_Int32 >( rStrm.getLength() / 2 );
+    sal_Int32 nCount = static_cast< sal_Int32 >( rStrm.size() / 2 );
     for( sal_Int32 nIndex = 0; !rStrm.isEof() && (nIndex < nCount); ++nIndex )
         maDiscreteItems.push_back( rStrm.readuInt16() );
 }
@@ -937,7 +937,9 @@ OUString PivotCacheField::createParentGroupField( const Reference< XDataPilotFie
 
 void PivotCacheField::writeSourceHeaderCell( WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow ) const
 {
-    rSheetHelper.setStringCell( rSheetHelper.getCell( CellAddress( rSheetHelper.getSheetIndex(), nCol, nRow ) ), maFieldModel.maName );
+    CellModel aModel;
+    aModel.maCellAddr = CellAddress( rSheetHelper.getSheetIndex(), nCol, nRow );
+    rSheetHelper.getSheetData().setStringCell( aModel, maFieldModel.maName );
 }
 
 void PivotCacheField::writeSourceDataCell( WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const
@@ -983,15 +985,17 @@ void PivotCacheField::writeItemToSourceDataCell( WorksheetHelper& rSheetHelper,
 {
     if( rItem.getType() != XML_m )
     {
-        Reference< XCell > xCell = rSheetHelper.getCell( CellAddress( rSheetHelper.getSheetIndex(), nCol, nRow ) );
-        if( xCell.is() ) switch( rItem.getType() )
+        CellModel aModel;
+        aModel.maCellAddr = CellAddress( rSheetHelper.getSheetIndex(), nCol, nRow );
+        SheetDataBuffer& rSheetData = rSheetHelper.getSheetData();
+        switch( rItem.getType() )
         {
-            case XML_s: rSheetHelper.setStringCell( xCell, rItem.getValue().get< OUString >() );                                break;
-            case XML_n: xCell->setValue( rItem.getValue().get< double >() );                                                    break;
-            case XML_i: xCell->setValue( rItem.getValue().get< sal_Int16 >() );                                                 break;
-            case XML_d: rSheetHelper.setDateTimeCell( xCell, rItem.getValue().get< DateTime >() );                              break;
-            case XML_b: rSheetHelper.setBooleanCell( xCell, rItem.getValue().get< bool >() );                                   break;
-            case XML_e: rSheetHelper.setErrorCell( xCell, static_cast< sal_uInt8 >( rItem.getValue().get< sal_Int32 >() ) );    break;
+            case XML_s: rSheetData.setStringCell( aModel, rItem.getValue().get< OUString >() );                             break;
+            case XML_n: rSheetData.setValueCell( aModel, rItem.getValue().get< double >() );                                break;
+            case XML_i: rSheetData.setValueCell( aModel, rItem.getValue().get< sal_Int16 >() );                             break;
+            case XML_d: rSheetData.setDateTimeCell( aModel, rItem.getValue().get< DateTime >() );                           break;
+            case XML_b: rSheetData.setBooleanCell( aModel, rItem.getValue().get< bool >() );                                break;
+            case XML_e: rSheetData.setErrorCell( aModel, static_cast< sal_uInt8 >( rItem.getValue().get< sal_Int32 >() ) ); break;
             default:    OSL_FAIL( "PivotCacheField::writeItemToSourceDataCell - unexpected item data type" );
         }
     }
@@ -1043,6 +1047,7 @@ PCWorksheetSourceModel::PCWorksheetSourceModel()
 
 PivotCache::PivotCache( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
+    mnCurrRow( -1 ),
     mbValidSource( false ),
     mbDummySheet( false )
 {
@@ -1275,34 +1280,39 @@ void PivotCache::writeSourceHeaderCells( WorksheetHelper& rSheetHelper ) const
     sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn;
     sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Column;
     sal_Int32 nRow = maSheetSrcModel.maRange.StartRow;
+    mnCurrRow = -1;
+    updateSourceDataRow( rSheetHelper, nRow );
     for( PivotCacheFieldVector::const_iterator aIt = maDatabaseFields.begin(), aEnd = maDatabaseFields.end(); (aIt != aEnd) && (nCol <= nMaxCol); ++aIt, ++nCol )
         (*aIt)->writeSourceHeaderCell( rSheetHelper, nCol, nRow );
 }
 
-void PivotCache::writeSourceDataCell( WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const
+void PivotCache::writeSourceDataCell( WorksheetHelper& rSheetHelper, sal_Int32 nColIdx, sal_Int32 nRowIdx, const PivotCacheItem& rItem ) const
 {
-    OSL_ENSURE( (0 <= nCol) && (nCol <= maSheetSrcModel.maRange.EndColumn - maSheetSrcModel.maRange.StartColumn), "PivotCache::writeSourceDataCell - invalid column index" );
-    OSL_ENSURE( (0 < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow - maSheetSrcModel.maRange.StartRow), "PivotCache::writeSourceDataCell - invalid row index" );
-    if( const PivotCacheField* pCacheField = maDatabaseFields.get( nCol ).get() )
-        pCacheField->writeSourceDataCell( rSheetHelper, maSheetSrcModel.maRange.StartColumn + nCol, maSheetSrcModel.maRange.StartRow + nRow, rItem );
+    sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn + nColIdx;
+    OSL_ENSURE( (maSheetSrcModel.maRange.StartColumn <= nCol) && (nCol <= maSheetSrcModel.maRange.EndColumn), "PivotCache::writeSourceDataCell - invalid column index" );
+    sal_Int32 nRow = maSheetSrcModel.maRange.StartRow + nRowIdx;
+    OSL_ENSURE( (maSheetSrcModel.maRange.StartRow < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow), "PivotCache::writeSourceDataCell - invalid row index" );
+    updateSourceDataRow( rSheetHelper, nRow );
+    if( const PivotCacheField* pCacheField = maDatabaseFields.get( nColIdx ).get() )
+        pCacheField->writeSourceDataCell( rSheetHelper, nCol, nRow, rItem );
 }
 
-void PivotCache::importPCRecord( SequenceInputStream& rStrm, WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const
+void PivotCache::importPCRecord( SequenceInputStream& rStrm, WorksheetHelper& rSheetHelper, sal_Int32 nRowIdx ) const
 {
-    OSL_ENSURE( (0 < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow - maSheetSrcModel.maRange.StartRow), "PivotCache::importPCRecord - invalid row index" );
+    sal_Int32 nRow = maSheetSrcModel.maRange.StartRow + nRowIdx;
+    OSL_ENSURE( (maSheetSrcModel.maRange.StartRow < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow), "PivotCache::importPCRecord - invalid row index" );
     sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn;
     sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Column;
-    nRow += maSheetSrcModel.maRange.StartRow;
     for( PivotCacheFieldVector::const_iterator aIt = maDatabaseFields.begin(), aEnd = maDatabaseFields.end(); !rStrm.isEof() && (aIt != aEnd) && (nCol <= nMaxCol); ++aIt, ++nCol )
         (*aIt)->importPCRecordItem( rStrm, rSheetHelper, nCol, nRow );
 }
 
-void PivotCache::importPCItemIndexList( BiffInputStream& rStrm, WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const
+void PivotCache::importPCItemIndexList( BiffInputStream& rStrm, WorksheetHelper& rSheetHelper, sal_Int32 nRowIdx ) const
 {
-    OSL_ENSURE( (0 < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow - maSheetSrcModel.maRange.StartRow), "PivotCache::importPCItemIndexList - invalid row index" );
+    sal_Int32 nRow = maSheetSrcModel.maRange.StartRow + nRowIdx;
+    OSL_ENSURE( (maSheetSrcModel.maRange.StartRow < nRow) && (nRow <= maSheetSrcModel.maRange.EndRow), "PivotCache::importPCItemIndexList - invalid row index" );
     sal_Int32 nCol = maSheetSrcModel.maRange.StartColumn;
     sal_Int32 nMaxCol = getAddressConverter().getMaxApiAddress().Column;
-    nRow += maSheetSrcModel.maRange.StartRow;
     for( PivotCacheFieldVector::const_iterator aIt = maDatabaseFields.begin(), aEnd = maDatabaseFields.end(); !rStrm.isEof() && (aIt != aEnd) && (nCol <= nMaxCol); ++aIt, ++nCol )
         if( (*aIt)->hasSharedItems() )
             (*aIt)->importPCItemIndex( rStrm, rSheetHelper, nCol, nRow );
@@ -1416,17 +1426,28 @@ void PivotCache::finalizeExternalSheetSource()
 
 void PivotCache::prepareSourceDataSheet()
 {
+    CellRangeAddress& rRange = maSheetSrcModel.maRange;
     // data will be inserted in top-left cell, sheet index is still set to 0 (will be set below)
-    maSheetSrcModel.maRange.EndColumn -= maSheetSrcModel.maRange.StartColumn;
-    maSheetSrcModel.maRange.StartColumn = 0;
-    maSheetSrcModel.maRange.EndRow -= maSheetSrcModel.maRange.StartRow;
-    maSheetSrcModel.maRange.StartRow = 0;
+    rRange.EndColumn -= rRange.StartColumn;
+    rRange.StartColumn = 0;
+    rRange.EndRow -= rRange.StartRow;
+    rRange.StartRow = 0;
     // check range location, do not allow ranges that overflow the sheet partly
-    if( getAddressConverter().checkCellRange( maSheetSrcModel.maRange, false, true ) )
+    if( getAddressConverter().checkCellRange( rRange, false, true ) )
     {
+        maColSpans.insert( ValueRange( rRange.StartColumn, rRange.EndColumn ) );
         OUString aSheetName = CREATE_OUSTRING( "DPCache_" ) + maSheetSrcModel.maSheet;
-        maSheetSrcModel.maRange.Sheet = getWorksheets().insertEmptySheet( aSheetName, false );
-        mbValidSource = mbDummySheet = maSheetSrcModel.maRange.Sheet >= 0;
+        rRange.Sheet = getWorksheets().insertEmptySheet( aSheetName, false );
+        mbValidSource = mbDummySheet = rRange.Sheet >= 0;
+    }
+}
+
+void PivotCache::updateSourceDataRow( WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const
+{
+    if( mnCurrRow != nRow )
+    {
+        rSheetHelper.getSheetData().setColSpans( nRow, maColSpans );
+        mnCurrRow = nRow;
     }
 }
 
diff --git a/oox/source/xls/pivotcachefragment.cxx b/oox/source/xls/pivotcachefragment.cxx
index e7eacc11d..02f2d8923 100644
--- a/oox/source/xls/pivotcachefragment.cxx
+++ b/oox/source/xls/pivotcachefragment.cxx
@@ -209,18 +209,23 @@ void PivotCacheDefinitionFragment::finalizeImport()
     {
         OUString aRecFragmentPath = getRelations().getFragmentPathFromRelId( mrPivotCache.getRecordsRelId() );
         if( aRecFragmentPath.getLength() > 0 )
-            importOoxFragment( new PivotCacheRecordsFragment( *this, aRecFragmentPath, mrPivotCache ) );
+        {
+            sal_Int16 nSheet = mrPivotCache.getSourceRange().Sheet;
+            WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, ISegmentProgressBarRef(), SHEETTYPE_WORKSHEET, nSheet );
+            if( xSheetGlob.get() )
+                importOoxFragment( new PivotCacheRecordsFragment( *xSheetGlob, aRecFragmentPath, mrPivotCache ) );
+        }
     }
 }
 
 // ============================================================================
 
-PivotCacheRecordsFragment::PivotCacheRecordsFragment( const WorkbookHelper& rHelper,
+PivotCacheRecordsFragment::PivotCacheRecordsFragment( const WorksheetHelper& rHelper,
         const OUString& rFragmentPath, const PivotCache& rPivotCache ) :
-    WorksheetFragmentBase( rHelper, rFragmentPath, ISegmentProgressBarRef(), SHEETTYPE_WORKSHEET, rPivotCache.getSourceRange().Sheet ),
+    WorksheetFragmentBase( rHelper, rFragmentPath ),
     mrPivotCache( rPivotCache ),
-    mnCol( 0 ),
-    mnRow( 0 ),
+    mnColIdx( 0 ),
+    mnRowIdx( 0 ),
     mbInRecord( false )
 {
     // prepare sheet: insert column header names into top row
@@ -253,8 +258,8 @@ ContextHandlerRef PivotCacheRecordsFragment::onCreateContext( sal_Int32 nElement
                 case XLS_TOKEN( x ):    aItem.readIndex( rAttribs );                        break;
                 default:    OSL_FAIL( "OoxPivotCacheRecordsFragment::onCreateContext - unexpected element" );
             }
-            mrPivotCache.writeSourceDataCell( *this, mnCol, mnRow, aItem );
-            ++mnCol;
+            mrPivotCache.writeSourceDataCell( *this, mnColIdx, mnRowIdx, aItem );
+            ++mnColIdx;
         }
         break;
     }
@@ -295,15 +300,15 @@ const RecordInfo* PivotCacheRecordsFragment::getRecordInfos() const
 
 void PivotCacheRecordsFragment::startCacheRecord()
 {
-    mnCol = 0;
-    ++mnRow;
+    mnColIdx = 0;
+    ++mnRowIdx;
     mbInRecord = true;
 }
 
 void PivotCacheRecordsFragment::importPCRecord( SequenceInputStream& rStrm )
 {
     startCacheRecord();
-    mrPivotCache.importPCRecord( rStrm, *this, mnRow );
+    mrPivotCache.importPCRecord( rStrm, *this, mnRowIdx );
     mbInRecord = false;
 }
 
@@ -323,8 +328,8 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn
             case BIFF12_ID_PCITEM_INDEX:    aItem.readIndex( rStrm );   break;
             default:    OSL_FAIL( "OoxPivotCacheRecordsFragment::importPCRecordItem - unexpected record" );
         }
-        mrPivotCache.writeSourceDataCell( *this, mnCol, mnRow, aItem );
-        ++mnCol;
+        mrPivotCache.writeSourceDataCell( *this, mnColIdx, mnRowIdx, aItem );
+        ++mnColIdx;
     }
 }
 
@@ -374,10 +379,14 @@ bool BiffPivotCacheFragment::importFragment()
         {
             /*  Last call of lclSeekToPCDField() failed and kept stream position
                 unchanged. Stream should point to source data table now. */
-            BiffPivotCacheRecordsContext aContext( *this, mrPivotCache );
-            if( aContext.isValidSheet() )
+            sal_Int16 nSheet = mrPivotCache.getSourceRange().Sheet;
+            WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, ISegmentProgressBarRef(), SHEETTYPE_WORKSHEET, nSheet );
+            if( xSheetGlob.get() )
+            {
+                BiffPivotCacheRecordsContext aContext( *xSheetGlob, mrPivotCache );
                 while( rStrm.startNextRecord() && (rStrm.getRecId() != BIFF_ID_EOF) )
                     aContext.importRecord( rStrm );
+            }
         }
     }
 
@@ -386,11 +395,11 @@ bool BiffPivotCacheFragment::importFragment()
 
 // ============================================================================
 
-BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorkbookHelper& rHelper, const PivotCache& rPivotCache ) :
-    BiffWorksheetContextBase( rHelper, ISegmentProgressBarRef(), SHEETTYPE_WORKSHEET, rPivotCache.getSourceRange().Sheet ),
+BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) :
+    BiffWorksheetContextBase( rHelper ),
     mrPivotCache( rPivotCache ),
     mnColIdx( 0 ),
-    mnRow( 0 ),
+    mnRowIdx( 0 ),
     mbHasShared( false ),
     mbInRow( false )
 {
@@ -419,7 +428,7 @@ void BiffPivotCacheRecordsContext::importRecord( BiffInputStream& rStrm )
         OSL_ENSURE( mbHasShared, "BiffPivotCacheRecordsContext::importRecord - unexpected PCITEM_INDEXLIST record" );
         // PCITEM_INDEXLIST record always in front of a new data row
         startNextRow();
-        mrPivotCache.importPCItemIndexList( rStrm, *this, mnRow );
+        mrPivotCache.importPCItemIndexList( rStrm, *this, mnRowIdx );
         mbInRow = !maUnsharedCols.empty();  // mbInRow remains true, if unshared items are expected
         return;
     }
@@ -450,14 +459,14 @@ void BiffPivotCacheRecordsContext::importRecord( BiffInputStream& rStrm )
     // write the item data to the sheet cell
     OSL_ENSURE( mnColIdx < maUnsharedCols.size(), "BiffPivotCacheRecordsContext::importRecord - invalid column index" );
     if( mnColIdx < maUnsharedCols.size() )
-        mrPivotCache.writeSourceDataCell( *this, maUnsharedCols[ mnColIdx ], mnRow, aItem );
+        mrPivotCache.writeSourceDataCell( *this, maUnsharedCols[ mnColIdx ], mnRowIdx, aItem );
     ++mnColIdx;
 }
 
 void BiffPivotCacheRecordsContext::startNextRow()
 {
     mnColIdx = 0;
-    ++mnRow;
+    ++mnRowIdx;
     mbInRow = true;
 }
 
diff --git a/oox/source/xls/richstring.cxx b/oox/source/xls/richstring.cxx
index f49dc637b..584e80dbd 100644
--- a/oox/source/xls/richstring.cxx
+++ b/oox/source/xls/richstring.cxx
@@ -53,6 +53,11 @@ namespace {
 const sal_uInt8 BIFF12_STRINGFLAG_FONTS         = 0x01;
 const sal_uInt8 BIFF12_STRINGFLAG_PHONETICS     = 0x02;
 
+inline bool lclNeedsRichTextFormat( const Font* pFont )
+{
+    return pFont && pFont->needsRichTextFormat();
+}
+
 } // namespace
 
 // ============================================================================
@@ -87,18 +92,27 @@ void RichStringPortion::finalizeImport()
         mxFont = getStyles().getFont( mnFontId );
 }
 
-void RichStringPortion::convert( const Reference< XText >& rxText, sal_Int32 nXfId )
+void RichStringPortion::convert( const Reference< XText >& rxText, const Font* pFont, bool bReplace )
 {
-    Reference< XTextRange > xRange = rxText->getEnd();
-    xRange->setString( maText );
-    if( mxFont.get() )
-    {
-        PropertySet aPropSet( xRange );
-        mxFont->writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT );
-    }
-    if( const Font* pFont = getStyles().getFontFromCellXf( nXfId ).get() )
+    Reference< XTextRange > xRange;
+    if( bReplace )
+        xRange.set( rxText, UNO_QUERY );
+    else
+        xRange = rxText->getEnd();
+    OSL_ENSURE( xRange.is(), "RichStringPortion::convert - cannot get text range interface" );
+
+    if( xRange.is() )
     {
-        if( pFont->needsRichTextFormat() )
+        xRange->setString( maText );
+        if( mxFont.get() )
+        {
+            PropertySet aPropSet( xRange );
+            mxFont->writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT );
+        }
+
+        /*  Some font attributes cannot be set to cell formattiing in Calc but
+            require to use rich formatting, e.g. font escapement. */
+        if( lclNeedsRichTextFormat( pFont ) )
         {
             PropertySet aPropSet( xRange );
             pFont->writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT );
@@ -106,18 +120,15 @@ void RichStringPortion::convert( const Reference< XText >& rxText, sal_Int32 nXf
     }
 }
 
-void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, sal_Int32 nXfId ) const
+void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, const Font* pFont ) const
 {
     PropertySet aPropSet(rxText);
 
     if (mxFont.get())
         mxFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT);
 
-    if (const Font* pFont = getStyles().getFontFromCellXf(nXfId).get())
-    {
-        if (pFont->needsRichTextFormat())
-            pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT);
-    }
+    if (lclNeedsRichTextFormat(pFont))
+        pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT);
 }
 
 // ----------------------------------------------------------------------------
@@ -406,7 +417,7 @@ void RichString::importString( SequenceInputStream& rStrm, bool bRich )
     {
         FontPortionModelList aPortions;
         aPortions.importPortions( rStrm );
-        createFontPortions( aBaseText, aPortions );
+        createTextPortions( aBaseText, aPortions );
     }
     else
     {
@@ -423,7 +434,12 @@ void RichString::importString( SequenceInputStream& rStrm, bool bRich )
     }
 }
 
-void RichString::importByteString( BiffInputStream& rStrm, rtl_TextEncoding eDefaultTextEnc, BiffStringFlags nFlags )
+void RichString::importCharArray( BiffInputStream& rStrm, sal_uInt16 nChars, rtl_TextEncoding eTextEnc )
+{
+    createPortion()->setText( rStrm.readCharArrayUC( nChars, eTextEnc ) );
+}
+
+void RichString::importByteString( BiffInputStream& rStrm, rtl_TextEncoding eTextEnc, BiffStringFlags nFlags )
 {
     OSL_ENSURE( !getFlag( nFlags, BIFF_STR_KEEPFONTS ), "RichString::importString - keep fonts not implemented" );
     OSL_ENSURE( !getFlag( nFlags, static_cast< BiffStringFlags >( ~(BIFF_STR_8BITLENGTH | BIFF_STR_EXTRAFONTS) ) ), "RichString::importByteString - unknown flag" );
@@ -435,11 +451,11 @@ void RichString::importByteString( BiffInputStream& rStrm, rtl_TextEncoding eDef
     {
         FontPortionModelList aPortions;
         aPortions.importPortions( rStrm, false );
-        createFontPortions( aBaseText, eDefaultTextEnc, aPortions );
+        createTextPortions( aBaseText, eTextEnc, aPortions );
     }
     else
     {
-        createPortion()->setText( OStringToOUString( aBaseText, eDefaultTextEnc ) );
+        createPortion()->setText( OStringToOUString( aBaseText, eTextEnc ) );
     }
 }
 
@@ -469,7 +485,7 @@ void RichString::importUniString( BiffInputStream& rStrm, BiffStringFlags nFlags
     {
         FontPortionModelList aPortions;
         aPortions.importPortions( rStrm, nFontCount, BIFF_FONTPORTION_16BIT );
-        createFontPortions( aBaseText, aPortions );
+        createTextPortions( aBaseText, aPortions );
     }
     else
     {
@@ -503,33 +519,44 @@ void RichString::importUniString( BiffInputStream& rStrm, BiffStringFlags nFlags
 
 void RichString::finalizeImport()
 {
-    maFontPortions.forEachMem( &RichStringPortion::finalizeImport );
+    maTextPortions.forEachMem( &RichStringPortion::finalizeImport );
 }
 
-OUString RichString::getPlainText() const
+bool RichString::extractPlainString( OUString& orString, const Font* pFirstPortionFont ) const
 {
-    OUStringBuffer aBuffer;
-    for( PortionVec::const_iterator aIt = maFontPortions.begin(), aEnd = maFontPortions.end(); aIt != aEnd; ++aIt )
-        aBuffer.append( (*aIt)->getText() );
-    return aBuffer.makeStringAndClear();
+    if( !maPhonPortions.empty() )
+        return false;
+    if( maTextPortions.empty() )
+    {
+        orString = OUString();
+        return true;
+    }
+    if( (maTextPortions.size() == 1) && !maTextPortions.front()->hasFont() && !lclNeedsRichTextFormat( pFirstPortionFont ) )
+    {
+        orString = maTextPortions.front()->getText();
+        return true;
+    }
+    return false;
 }
 
-void RichString::convert( const Reference< XText >& rxText, sal_Int32 nXfId ) const
+void RichString::convert( const Reference< XText >& rxText, const Font* pFirstPortionFont ) const
 {
-    if (maFontPortions.size() == 1)
+    if (maTextPortions.size() == 1)
     {
         // Set text directly to the cell when the string has only one portion.
         // It's much faster this way.
-        RichStringPortion& rPtn = *maFontPortions.front();
+        RichStringPortion& rPtn = *maTextPortions.front();
         rxText->setString(rPtn.getText());
-        rPtn.writeFontProperties(rxText, nXfId);
+        rPtn.writeFontProperties(rxText, pFirstPortionFont);
         return;
     }
 
-    for( PortionVec::const_iterator aIt = maFontPortions.begin(), aEnd = maFontPortions.end(); aIt != aEnd; ++aIt )
+    bool bReplace = true;
+    for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt )
     {
-        (*aIt)->convert( rxText, nXfId );
-        nXfId = -1; // use passed XF identifier for first portion only
+        (*aIt)->convert( rxText, pFirstPortionFont, bReplace );
+        pFirstPortionFont = 0;  // use passed font for first portion only
+        bReplace = false;       // do not replace first portion text with following portions
     }
 }
 
@@ -538,7 +565,7 @@ void RichString::convert( const Reference< XText >& rxText, sal_Int32 nXfId ) co
 RichStringPortionRef RichString::createPortion()
 {
     RichStringPortionRef xPortion( new RichStringPortion( *this ) );
-    maFontPortions.push_back( xPortion );
+    maTextPortions.push_back( xPortion );
     return xPortion;
 }
 
@@ -549,9 +576,9 @@ RichStringPhoneticRef RichString::createPhonetic()
     return xPhonetic;
 }
 
-void RichString::createFontPortions( const OString& rText, rtl_TextEncoding eDefaultTextEnc, FontPortionModelList& rPortions )
+void RichString::createTextPortions( const OString& rText, rtl_TextEncoding eTextEnc, FontPortionModelList& rPortions )
 {
-    maFontPortions.clear();
+    maTextPortions.clear();
     sal_Int32 nStrLen = rText.getLength();
     if( nStrLen > 0 )
     {
@@ -569,8 +596,8 @@ void RichString::createFontPortions( const OString& rText, rtl_TextEncoding eDef
             {
                 // convert byte string to unicode string, using current font encoding
                 FontRef xFont = getStyles().getFont( aIt->mnFontId );
-                rtl_TextEncoding eTextEnc = xFont.get() ? xFont->getFontEncoding() : eDefaultTextEnc;
-                OUString aUniStr = OStringToOUString( rText.copy( aIt->mnPos, nPortionLen ), eTextEnc );
+                rtl_TextEncoding eFontEnc = xFont.get() ? xFont->getFontEncoding() : eTextEnc;
+                OUString aUniStr = OStringToOUString( rText.copy( aIt->mnPos, nPortionLen ), eFontEnc );
                 // create string portion
                 RichStringPortionRef xPortion = createPortion();
                 xPortion->setText( aUniStr );
@@ -580,9 +607,9 @@ void RichString::createFontPortions( const OString& rText, rtl_TextEncoding eDef
     }
 }
 
-void RichString::createFontPortions( const OUString& rText, FontPortionModelList& rPortions )
+void RichString::createTextPortions( const OUString& rText, FontPortionModelList& rPortions )
 {
-    maFontPortions.clear();
+    maTextPortions.clear();
     sal_Int32 nStrLen = rText.getLength();
     if( nStrLen > 0 )
     {
diff --git a/oox/source/xls/sharedformulabuffer.cxx b/oox/source/xls/sharedformulabuffer.cxx
index 5ae7ad0bc..7af5c1223 100644
--- a/oox/source/xls/sharedformulabuffer.cxx
+++ b/oox/source/xls/sharedformulabuffer.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include "oox/xls/sharedformulabuffer.hxx"
-
 #include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/propertyset.hxx"
diff --git a/oox/source/xls/sharedstringsbuffer.cxx b/oox/source/xls/sharedstringsbuffer.cxx
index 9e060dab4..f72fca9b1 100644
--- a/oox/source/xls/sharedstringsbuffer.cxx
+++ b/oox/source/xls/sharedstringsbuffer.cxx
@@ -74,11 +74,9 @@ void SharedStringsBuffer::finalizeImport()
     maStrings.forEachMem( &RichString::finalizeImport );
 }
 
-void SharedStringsBuffer::convertString( const Reference< XText >& rxText, sal_Int32 nStringId, sal_Int32 nXfId ) const
+RichStringRef SharedStringsBuffer::getString( sal_Int32 nStringId ) const
 {
-    if( rxText.is() )
-        if( const RichString* pString = maStrings.get( nStringId ).get() )
-            pString->convert( rxText, nXfId );
+    return maStrings.get( nStringId );
 }
 
 // ============================================================================
diff --git a/oox/source/xls/sheetdatabuffer.cxx b/oox/source/xls/sheetdatabuffer.cxx
new file mode 100755
index 000000000..76790d675
--- /dev/null
+++ b/oox/source/xls/sheetdatabuffer.cxx
@@ -0,0 +1,935 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "oox/xls/sheetdatabuffer.hxx"
+
+#include <algorithm>
+#include <com/sun/star/sheet/XArrayFormulaTokens.hpp>
+#include <com/sun/star/sheet/XCellRangeData.hpp>
+#include <com/sun/star/sheet/XFormulaTokens.hpp>
+#include <com/sun/star/sheet/XMultipleOperation.hpp>
+#include <com/sun/star/table/XCell.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XMergeable.hpp>
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <rtl/ustrbuf.hxx>
+#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/propertymap.hxx"
+#include "oox/helper/propertyset.hxx"
+#include "oox/token/tokens.hxx"
+#include "oox/xls/addressconverter.hxx"
+#include "oox/xls/biffinputstream.hxx"
+#include "oox/xls/formulaparser.hxx"
+#include "oox/xls/sharedstringsbuffer.hxx"
+#include "oox/xls/unitconverter.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sheet;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
+// ============================================================================
+
+CellModel::CellModel() :
+    mnCellType( XML_TOKEN_INVALID ),
+    mnXfId( -1 ),
+    mbShowPhonetic( false )
+{
+}
+
+// ----------------------------------------------------------------------------
+
+CellFormulaModel::CellFormulaModel() :
+    mnFormulaType( XML_TOKEN_INVALID ),
+    mnSharedId( -1 )
+{
+}
+
+bool CellFormulaModel::isValidArrayRef( const CellAddress& rCellAddr )
+{
+    return
+        (maFormulaRef.Sheet == rCellAddr.Sheet) &&
+        (maFormulaRef.StartColumn == rCellAddr.Column) &&
+        (maFormulaRef.StartRow == rCellAddr.Row);
+}
+
+bool CellFormulaModel::isValidSharedRef( const CellAddress& rCellAddr )
+{
+    return
+        (maFormulaRef.Sheet == rCellAddr.Sheet) &&
+        (maFormulaRef.StartColumn <= rCellAddr.Column) && (rCellAddr.Column <= maFormulaRef.EndColumn) &&
+        (maFormulaRef.StartRow <= rCellAddr.Row) && (rCellAddr.Row <= maFormulaRef.EndRow);
+}
+
+// ----------------------------------------------------------------------------
+
+DataTableModel::DataTableModel() :
+    mb2dTable( false ),
+    mbRowTable( false ),
+    mbRef1Deleted( false ),
+    mbRef2Deleted( false )
+{
+}
+
+// ============================================================================
+
+namespace {
+
+const sal_Int32 CELLBLOCK_MAXROWS  = 16;    /// Number of rows in a cell block.
+
+} // namespace
+
+CellBlock::CellBlock( const WorksheetHelper& rHelper, const ValueRange& rColSpan, sal_Int32 nRow ) :
+    WorksheetHelper( rHelper ),
+    maRange( rHelper.getSheetIndex(), rColSpan.mnFirst, nRow, rColSpan.mnLast, nRow ),
+    mnRowLength( rColSpan.mnLast - rColSpan.mnFirst + 1 ),
+    mnFirstFreeIndex( 0 )
+{
+    maCellArray.realloc( 1 );
+    maCellArray[ 0 ].realloc( mnRowLength );
+    mpCurrCellRow = maCellArray[ 0 ].getArray();
+}
+
+bool CellBlock::isExpandable( const ValueRange& rColSpan ) const
+{
+    return (maRange.StartColumn == rColSpan.mnFirst) && (maRange.EndColumn == rColSpan.mnLast);
+}
+
+bool CellBlock::isBefore( const ValueRange& rColSpan ) const
+{
+    return (maRange.EndColumn < rColSpan.mnLast) ||
+        ((maRange.EndColumn == rColSpan.mnLast) && (maRange.StartColumn != rColSpan.mnFirst));
+}
+
+bool CellBlock::contains( sal_Int32 nCol ) const
+{
+    return (maRange.StartColumn <= nCol) && (nCol <= maRange.EndColumn);
+}
+
+void CellBlock::insertRichString( const CellAddress& rAddress, const RichStringRef& rxString, const Font* pFirstPortionFont )
+{
+    maRichStrings.push_back( RichStringCell( rAddress, rxString, pFirstPortionFont ) );
+}
+
+void CellBlock::startNextRow()
+{
+    // fill last cells in current row with empty strings (placeholder for empty cells)
+    fillUnusedCells( mnRowLength );
+    // flush if the cell block reaches maximum size
+    if( maCellArray.getLength() == CELLBLOCK_MAXROWS )
+    {
+        finalizeImport();
+        maRange.StartRow = ++maRange.EndRow;
+        maCellArray.realloc( 1 );
+        mpCurrCellRow = maCellArray[ 0 ].getArray();
+    }
+    else
+    {
+        // prepare next row
+        ++maRange.EndRow;
+        sal_Int32 nRowCount = maCellArray.getLength();
+        maCellArray.realloc( nRowCount + 1 );
+        maCellArray[ nRowCount ].realloc( mnRowLength );
+        mpCurrCellRow = maCellArray[ nRowCount ].getArray();
+    }
+    mnFirstFreeIndex = 0;
+}
+
+Any& CellBlock::getCellAny( sal_Int32 nCol )
+{
+    OSL_ENSURE( contains( nCol ), "CellBlock::getCellAny - invalid column" );
+    // fill cells before passed column with empty strings (the placeholder for empty cells)
+    sal_Int32 nIndex = nCol - maRange.StartColumn;
+    fillUnusedCells( nIndex );
+    mnFirstFreeIndex = nIndex + 1;
+    return mpCurrCellRow[ nIndex ];
+}
+
+void CellBlock::finalizeImport()
+{
+    // fill last cells in last row with empty strings (placeholder for empty cells)
+    fillUnusedCells( mnRowLength );
+    // insert all buffered cells into the Calc sheet
+    try
+    {
+        Reference< XCellRangeData > xRangeData( getCellRange( maRange ), UNO_QUERY_THROW );
+        xRangeData->setDataArray( maCellArray );
+    }
+    catch( Exception& )
+    {
+    }
+    // insert uncacheable cells separately
+    for( RichStringCellList::const_iterator aIt = maRichStrings.begin(), aEnd = maRichStrings.end(); aIt != aEnd; ++aIt )
+        putRichString( aIt->maCellAddr, *aIt->mxString, aIt->mpFirstPortionFont );
+}
+
+// private --------------------------------------------------------------------
+
+CellBlock::RichStringCell::RichStringCell( const CellAddress& rCellAddr, const RichStringRef& rxString, const Font* pFirstPortionFont ) :
+    maCellAddr( rCellAddr ),
+    mxString( rxString ),
+    mpFirstPortionFont( pFirstPortionFont )
+{
+}
+
+void CellBlock::fillUnusedCells( sal_Int32 nIndex )
+{
+    if( mnFirstFreeIndex < nIndex )
+    {
+        Any* pCellEnd = mpCurrCellRow + nIndex;
+        for( Any* pCell = mpCurrCellRow + mnFirstFreeIndex; pCell < pCellEnd; ++pCell )
+            *pCell <<= OUString();
+    }
+}
+
+// ============================================================================
+
+CellBlockBuffer::CellBlockBuffer( const WorksheetHelper& rHelper ) :
+    WorksheetHelper( rHelper ),
+    mnCurrRow( -1 )
+{
+    maCellBlockIt = maCellBlocks.end();
+}
+
+void CellBlockBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpans )
+{
+    OSL_ENSURE( maColSpans.count( nRow ) == 0, "CellBlockBuffer::setColSpans - multiple column spans for the same row" );
+    OSL_ENSURE( (mnCurrRow < nRow) && (maColSpans.empty() || (maColSpans.rbegin()->first < nRow)), "CellBlockBuffer::setColSpans - rows are unsorted" );
+    if( (mnCurrRow < nRow) && (maColSpans.count( nRow ) == 0) )
+        maColSpans[ nRow ] = rColSpans.getRanges();
+}
+
+CellBlock* CellBlockBuffer::getCellBlock( const CellAddress& rCellAddr )
+{
+    OSL_ENSURE( rCellAddr.Row >= mnCurrRow, "CellBlockBuffer::getCellBlock - passed row out of order" );
+    // prepare cell blocks, if row changes
+    if( rCellAddr.Row != mnCurrRow )
+    {
+        // find colspans for the new row
+        ColSpanVectorMap::iterator aIt = maColSpans.find( rCellAddr.Row );
+
+        /*  Gap between rows, or rows out of order, or no colspan
+            information for the new row found: flush all open cell blocks. */
+        if( (aIt == maColSpans.end()) || (rCellAddr.Row != mnCurrRow + 1) )
+        {
+            finalizeImport();
+            maCellBlocks.clear();
+            maCellBlockIt = maCellBlocks.end();
+        }
+
+        /*  Prepare matching cell blocks, create new cell blocks, finalize
+            unmatching cell blocks, if colspan information is available. */
+        if( aIt != maColSpans.end() )
+        {
+            /*  The colspan vector aIt points to is sorted by columns, as well
+                as the cell block map. In the folloing, this vector and the
+                list of cell blocks can be iterated simultanously. */
+            CellBlockMap::iterator aMIt = maCellBlocks.begin();
+            const ValueRangeVector& rColRanges = aIt->second;
+            for( ValueRangeVector::const_iterator aVIt = rColRanges.begin(), aVEnd = rColRanges.end(); aVIt != aVEnd; ++aVIt, ++aMIt )
+            {
+                const ValueRange& rColSpan = *aVIt;
+                /*  Finalize and remove all cell blocks up to end of the column
+                    range (cell blocks are keyed by end column index).
+                    CellBlock::isBefore() returns true, if the end index of the
+                    passed colspan is greater than the column end index of the
+                    cell block, or if the passed range has the same end index
+                    but the start indexes do not match. */
+                while( (aMIt != maCellBlocks.end()) && aMIt->second->isBefore( rColSpan ) )
+                {
+                    aMIt->second->finalizeImport();
+                    maCellBlocks.erase( aMIt++ );
+                }
+                /*  If the current cell block (aMIt) fits to the colspan, start
+                    a new row there, otherwise create and insert a new cell block. */
+                if( (aMIt != maCellBlocks.end()) && aMIt->second->isExpandable( rColSpan ) )
+                    aMIt->second->startNextRow();
+                else
+                    aMIt = maCellBlocks.insert( aMIt, CellBlockMap::value_type( rColSpan.mnLast,
+                        CellBlockMap::mapped_type( new CellBlock( *this, rColSpan, rCellAddr.Row ) ) ) );
+            }
+            // finalize and remove all remaining cell blocks
+            CellBlockMap::iterator aMEnd = maCellBlocks.end();
+            for( CellBlockMap::iterator aMIt2 = aMIt; aMIt2 != aMEnd; ++aMIt2 )
+                aMIt2->second->finalizeImport();
+            maCellBlocks.erase( aMIt, aMEnd );
+
+            // remove cached colspan information (including current one aIt points to)
+            maColSpans.erase( maColSpans.begin(), ++aIt );
+        }
+        maCellBlockIt = maCellBlocks.begin();
+        mnCurrRow = rCellAddr.Row;
+    }
+
+    // try to find a valid cell block (update maCellBlockIt)
+    if( ((maCellBlockIt != maCellBlocks.end()) && maCellBlockIt->second->contains( rCellAddr.Column )) ||
+        (((maCellBlockIt = maCellBlocks.lower_bound( rCellAddr.Column )) != maCellBlocks.end()) && maCellBlockIt->second->contains( rCellAddr.Column )) )
+    {
+        // maCellBlockIt points to valid cell block
+        return maCellBlockIt->second.get();
+    }
+
+    // no valid cell block found
+    return 0;
+}
+
+void CellBlockBuffer::finalizeImport()
+{
+    maCellBlocks.forEachMem( &CellBlock::finalizeImport );
+}
+
+// ============================================================================
+
+SheetDataBuffer::SheetDataBuffer( const WorksheetHelper& rHelper ) :
+    WorksheetHelper( rHelper ),
+    maCellBlocks( rHelper ),
+    mbPendingSharedFmla( false )
+{
+}
+
+void SheetDataBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpans )
+{
+    maCellBlocks.setColSpans( nRow, rColSpans );
+}
+
+void SheetDataBuffer::setBlankCell( const CellModel& rModel )
+{
+    setCellFormat( rModel );
+}
+
+void SheetDataBuffer::setValueCell( const CellModel& rModel, double fValue )
+{
+    if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rModel.maCellAddr ) )
+        pCellBlock->getCellAny( rModel.maCellAddr.Column ) <<= fValue;
+    else
+        putValue( rModel.maCellAddr, fValue );
+    setCellFormat( rModel );
+}
+
+void SheetDataBuffer::setStringCell( const CellModel& rModel, const OUString& rText )
+{
+    if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rModel.maCellAddr ) )
+        pCellBlock->getCellAny( rModel.maCellAddr.Column ) <<= rText;
+    else
+        putString( rModel.maCellAddr, rText );
+    setCellFormat( rModel );
+}
+
+void SheetDataBuffer::setStringCell( const CellModel& rModel, const RichStringRef& rxString )
+{
+    OSL_ENSURE( rxString.get(), "SheetDataBuffer::setStringCell - missing rich string object" );
+    const Font* pFirstPortionFont = getStyles().getFontFromCellXf( rModel.mnXfId ).get();
+    OUString aText;
+    if( rxString->extractPlainString( aText, pFirstPortionFont ) )
+    {
+        setStringCell( rModel, aText );
+    }
+    else
+    {
+        if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rModel.maCellAddr ) )
+            pCellBlock->insertRichString( rModel.maCellAddr, rxString, pFirstPortionFont );
+        else
+            putRichString( rModel.maCellAddr, *rxString, pFirstPortionFont );
+        setCellFormat( rModel );
+    }
+}
+
+void SheetDataBuffer::setStringCell( const CellModel& rModel, sal_Int32 nStringId )
+{
+    RichStringRef xString = getSharedStrings().getString( nStringId );
+    if( xString.get() )
+        setStringCell( rModel, xString );
+    else
+        setBlankCell( rModel );
+}
+
+void SheetDataBuffer::setDateTimeCell( const CellModel& rModel, const DateTime& rDateTime )
+{
+    // write serial date/time value into the cell
+    double fSerial = getUnitConverter().calcSerialFromDateTime( rDateTime );
+    setValueCell( rModel, fSerial );
+    // set appropriate number format
+    using namespace ::com::sun::star::util::NumberFormat;
+    sal_Int16 nStdFmt = (fSerial < 1.0) ? TIME : (((rDateTime.Hours > 0) || (rDateTime.Minutes > 0) || (rDateTime.Seconds > 0)) ? DATETIME : DATE);
+    setStandardNumFmt( rModel.maCellAddr, nStdFmt );
+}
+
+void SheetDataBuffer::setBooleanCell( const CellModel& rModel, bool bValue )
+{
+    setCellFormula( rModel.maCellAddr, getFormulaParser().convertBoolToFormula( bValue ) );
+    // #108770# set 'Standard' number format for all Boolean cells
+    setCellFormat( rModel, 0 );
+}
+
+void SheetDataBuffer::setErrorCell( const CellModel& rModel, const OUString& rErrorCode )
+{
+    setErrorCell( rModel, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+}
+
+void SheetDataBuffer::setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode )
+{
+    setCellFormula( rModel.maCellAddr, getFormulaParser().convertErrorToFormula( nErrorCode ) );
+    setCellFormat( rModel );
+}
+
+void SheetDataBuffer::setFormulaCell( const CellModel& rModel, const ApiTokenSequence& rTokens )
+{
+    mbPendingSharedFmla = false;
+    ApiTokenSequence aTokens;
+
+    /*  Detect special token passed as placeholder for array formulas, shared
+        formulas, and table operations. In BIFF, these formulas are represented
+        by a single tExp resp. tTbl token. If the formula parser finds these
+        tokens, it puts a single OPCODE_BAD token with the base address and
+        formula type into the token sequence. This information will be
+        extracted here, and in case of a shared formula, the shared formula
+        buffer will generate the resulting formula token array. */
+    ApiSpecialTokenInfo aTokenInfo;
+    if( rTokens.hasElements() && getFormulaParser().extractSpecialTokenInfo( aTokenInfo, rTokens ) )
+    {
+        /*  The second member of the token info is set to true, if the formula
+            represents a table operation, which will be skipped. In BIFF12 it
+            is not possible to distinguish array and shared formulas
+            (BIFF5/BIFF8 provide this information with a special flag in the
+            FORMULA record). */
+        if( !aTokenInfo.Second )
+        {
+            /*  Construct the token array representing the shared formula. If
+                the returned sequence is empty, the definition of the shared
+                formula has not been loaded yet, or the cell is part of an
+                array formula. In this case, the cell will be remembered. After
+                reading the formula definition it will be retried to insert the
+                formula via retryPendingSharedFormulaCell(). */
+            BinAddress aBaseAddr( aTokenInfo.First );
+            aTokens = resolveSharedFormula( aBaseAddr );
+            if( !aTokens.hasElements() )
+            {
+                maSharedFmlaAddr = rModel.maCellAddr;
+                maSharedBaseAddr = aBaseAddr;
+                mbPendingSharedFmla = true;
+            }
+        }
+    }
+    else
+    {
+        // simple formula, use the passed token array
+        aTokens = rTokens;
+    }
+
+    setCellFormula( rModel.maCellAddr, aTokens );
+    setCellFormat( rModel );
+}
+
+void SheetDataBuffer::setFormulaCell( const CellModel& rModel, sal_Int32 nSharedId )
+{
+    setCellFormula( rModel.maCellAddr, resolveSharedFormula( BinAddress( nSharedId, 0 ) ) );
+    setCellFormat( rModel );
+}
+
+void SheetDataBuffer::createArrayFormula( const CellRangeAddress& rRange, const ApiTokenSequence& rTokens )
+{
+    /*  Array formulas will be inserted later in finalizeImport(). This is
+        needed to not disturb collecting all the cells, which will be put into
+        the sheet in large blocks to increase performance. */
+    maArrayFormulas.push_back( ArrayFormula( rRange, rTokens ) );
+}
+
+void SheetDataBuffer::createTableOperation( const CellRangeAddress& rRange, const DataTableModel& rModel )
+{
+    /*  Table operations will be inserted later in finalizeImport(). This is
+        needed to not disturb collecting all the cells, which will be put into
+        the sheet in large blocks to increase performance. */
+    maTableOperations.push_back( TableOperation( rRange, rModel ) );
+}
+
+void SheetDataBuffer::createSharedFormula( sal_Int32 nSharedId, const ApiTokenSequence& rTokens )
+{
+    createSharedFormula( BinAddress( nSharedId, 0 ), rTokens );
+}
+
+void SheetDataBuffer::createSharedFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens )
+{
+    createSharedFormula( BinAddress( rCellAddr ), rTokens );
+}
+
+void SheetDataBuffer::setRowFormat( sal_Int32 nRow, sal_Int32 nXfId, bool bCustomFormat )
+{
+    // set row formatting
+    if( bCustomFormat )
+    {
+        // try to expand cached row range, if formatting is equal
+        if( (maXfIdRowRange.maRowRange.mnLast < 0) || !maXfIdRowRange.tryExpand( nRow, nXfId ) )
+        {
+            writeXfIdRowRangeProperties( maXfIdRowRange );
+            maXfIdRowRange.set( nRow, nXfId );
+        }
+    }
+    else if( maXfIdRowRange.maRowRange.mnLast >= 0 )
+    {
+        // finish last cached row range
+        writeXfIdRowRangeProperties( maXfIdRowRange );
+        maXfIdRowRange.set( -1, -1 );
+    }
+}
+
+void SheetDataBuffer::setMergedRange( const CellRangeAddress& rRange )
+{
+    maMergedRanges.push_back( MergedRange( rRange ) );
+}
+
+void SheetDataBuffer::setStandardNumFmt( const CellAddress& rCellAddr, sal_Int16 nStdNumFmt )
+{
+    try
+    {
+        Reference< XNumberFormatsSupplier > xNumFmtsSupp( getDocument(), UNO_QUERY_THROW );
+        Reference< XNumberFormatTypes > xNumFmtTypes( xNumFmtsSupp->getNumberFormats(), UNO_QUERY_THROW );
+        sal_Int32 nIndex = xNumFmtTypes->getStandardFormat( nStdNumFmt, Locale() );
+        PropertySet aPropSet( getCell( rCellAddr ) );
+        aPropSet.setProperty( PROP_NumberFormat, nIndex );
+    }
+    catch( Exception& )
+    {
+    }
+}
+
+void SheetDataBuffer::finalizeImport()
+{
+    // insert all cells of all open cell blocks
+    maCellBlocks.finalizeImport();
+
+    // create all array formulas
+    for( ArrayFormulaList::iterator aIt = maArrayFormulas.begin(), aEnd = maArrayFormulas.end(); aIt != aEnd; ++aIt )
+        finalizeArrayFormula( aIt->first, aIt->second );
+
+    // create all table operations
+    for( TableOperationList::iterator aIt = maTableOperations.begin(), aEnd = maTableOperations.end(); aIt != aEnd; ++aIt )
+        finalizeTableOperation( aIt->first, aIt->second );
+
+    // write default formatting of remaining row range
+    writeXfIdRowRangeProperties( maXfIdRowRange );
+
+    // try to merge remaining inserted ranges
+    mergeXfIdRanges();
+    // write all formatting
+    for( XfIdRangeMap::const_iterator aIt = maXfIdRanges.begin(), aEnd = maXfIdRanges.end(); aIt != aEnd; ++aIt )
+        writeXfIdRangeProperties( aIt->second );
+
+    // merge all cached merged ranges and update right/bottom cell borders
+    for( MergedRangeList::iterator aIt = maMergedRanges.begin(), aEnd = maMergedRanges.end(); aIt != aEnd; ++aIt )
+        finalizeMergedRange( aIt->maRange );
+    for( MergedRangeList::iterator aIt = maCenterFillRanges.begin(), aEnd = maCenterFillRanges.end(); aIt != aEnd; ++aIt )
+        finalizeMergedRange( aIt->maRange );
+}
+
+// private --------------------------------------------------------------------
+
+SheetDataBuffer::XfIdRowRange::XfIdRowRange() :
+    maRowRange( -1 ),
+    mnXfId( -1 )
+{
+}
+
+bool SheetDataBuffer::XfIdRowRange::intersects( const CellRangeAddress& rRange ) const
+{
+    return (rRange.StartRow <= maRowRange.mnLast) && (maRowRange.mnFirst <= rRange.EndRow);
+}
+
+void SheetDataBuffer::XfIdRowRange::set( sal_Int32 nRow, sal_Int32 nXfId )
+{
+    maRowRange = ValueRange( nRow );
+    mnXfId = nXfId;
+}
+
+bool SheetDataBuffer::XfIdRowRange::tryExpand( sal_Int32 nRow, sal_Int32 nXfId )
+{
+    if( mnXfId == nXfId )
+    {
+        if( maRowRange.mnLast + 1 == nRow )
+        {
+            ++maRowRange.mnLast;
+            return true;
+        }
+        if( maRowRange.mnFirst == nRow + 1 )
+        {
+            --maRowRange.mnFirst;
+            return true;
+        }
+    }
+    return false;
+}
+
+void SheetDataBuffer::XfIdRange::set( const CellAddress& rCellAddr, sal_Int32 nXfId, sal_Int32 nNumFmtId )
+{
+    maRange.Sheet = rCellAddr.Sheet;
+    maRange.StartColumn = maRange.EndColumn = rCellAddr.Column;
+    maRange.StartRow = maRange.EndRow = rCellAddr.Row;
+    mnXfId = nXfId;
+    mnNumFmtId = nNumFmtId;
+}
+
+bool SheetDataBuffer::XfIdRange::tryExpand( const CellAddress& rCellAddr, sal_Int32 nXfId, sal_Int32 nNumFmtId )
+{
+    if( (mnXfId == nXfId) && (mnNumFmtId == nNumFmtId) &&
+        (maRange.StartRow == rCellAddr.Row) &&
+        (maRange.EndRow == rCellAddr.Row) &&
+        (maRange.EndColumn + 1 == rCellAddr.Column) )
+    {
+        ++maRange.EndColumn;
+        return true;
+    }
+    return false;
+}
+
+bool SheetDataBuffer::XfIdRange::tryMerge( const XfIdRange& rXfIdRange )
+{
+    if( (mnXfId == rXfIdRange.mnXfId) &&
+        (mnNumFmtId == rXfIdRange.mnNumFmtId) &&
+        (maRange.EndRow + 1 == rXfIdRange.maRange.StartRow) &&
+        (maRange.StartColumn == rXfIdRange.maRange.StartColumn) &&
+        (maRange.EndColumn == rXfIdRange.maRange.EndColumn) )
+    {
+        maRange.EndRow = rXfIdRange.maRange.EndRow;
+        return true;
+    }
+    return false;
+}
+
+
+SheetDataBuffer::MergedRange::MergedRange( const CellRangeAddress& rRange ) :
+    maRange( rRange ),
+    mnHorAlign( XML_TOKEN_INVALID )
+{
+}
+
+SheetDataBuffer::MergedRange::MergedRange( const CellAddress& rAddress, sal_Int32 nHorAlign ) :
+    maRange( rAddress.Sheet, rAddress.Column, rAddress.Row, rAddress.Column, rAddress.Row ),
+    mnHorAlign( nHorAlign )
+{
+}
+
+bool SheetDataBuffer::MergedRange::tryExpand( const CellAddress& rAddress, sal_Int32 nHorAlign )
+{
+    if( (mnHorAlign == nHorAlign) && (maRange.StartRow == rAddress.Row) &&
+        (maRange.EndRow == rAddress.Row) && (maRange.EndColumn + 1 == rAddress.Column) )
+    {
+        ++maRange.EndColumn;
+        return true;
+    }
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+
+void SheetDataBuffer::setCellFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens )
+{
+    if( rTokens.hasElements() )
+    {
+        if( CellBlock* pCellBlock = maCellBlocks.getCellBlock( rCellAddr ) )
+            pCellBlock->getCellAny( rCellAddr.Column ) <<= rTokens;
+        else
+            putFormulaTokens( rCellAddr, rTokens );
+    }
+}
+
+void SheetDataBuffer::createSharedFormula( const BinAddress& rMapKey, const ApiTokenSequence& rTokens )
+{
+    // create the defined name that will represent the shared formula
+    OUString aName = OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ).
+        append( static_cast< sal_Int32 >( getSheetIndex() + 1 ) ).
+        append( sal_Unicode( '_' ) ).append( rMapKey.mnRow ).
+        append( sal_Unicode( '_' ) ).append( rMapKey.mnCol ).makeStringAndClear();
+    Reference< XNamedRange > xNamedRange = createNamedRangeObject( aName );
+    OSL_ENSURE( xNamedRange.is(), "SheetDataBuffer::createSharedFormula - cannot create shared formula" );
+    PropertySet aNameProps( xNamedRange );
+    aNameProps.setProperty( PROP_IsSharedFormula, true );
+
+    // get and store the token index of the defined name
+    OSL_ENSURE( maSharedFormulas.count( rMapKey ) == 0, "SheetDataBuffer::createSharedFormula - shared formula exists already" );
+    sal_Int32 nTokenIndex = 0;
+    if( aNameProps.getProperty( nTokenIndex, PROP_TokenIndex ) && (nTokenIndex >= 0) ) try
+    {
+        // store the token index in the map
+        maSharedFormulas[ rMapKey ] = nTokenIndex;
+        // set the formula definition
+        Reference< XFormulaTokens > xTokens( xNamedRange, UNO_QUERY_THROW );
+        xTokens->setTokens( rTokens );
+        // retry to insert a pending shared formula cell
+        if( mbPendingSharedFmla )
+            setCellFormula( maSharedFmlaAddr, resolveSharedFormula( maSharedBaseAddr ) );
+    }
+    catch( Exception& )
+    {
+    }
+    mbPendingSharedFmla = false;
+}
+
+ApiTokenSequence SheetDataBuffer::resolveSharedFormula( const BinAddress& rMapKey ) const
+{
+    sal_Int32 nTokenIndex = ContainerHelper::getMapElement( maSharedFormulas, rMapKey, -1 );
+    return (nTokenIndex >= 0) ? getFormulaParser().convertNameToFormula( nTokenIndex ) : ApiTokenSequence();
+}
+
+void SheetDataBuffer::finalizeArrayFormula( const CellRangeAddress& rRange, const ApiTokenSequence& rTokens ) const
+{
+    Reference< XArrayFormulaTokens > xTokens( getCellRange( rRange ), UNO_QUERY );
+    OSL_ENSURE( xTokens.is(), "SheetDataBuffer::finalizeArrayFormula - missing formula token interface" );
+    if( xTokens.is() )
+        xTokens->setArrayTokens( rTokens );
+}
+
+void SheetDataBuffer::finalizeTableOperation( const CellRangeAddress& rRange, const DataTableModel& rModel ) const
+{
+    sal_Int16 nSheet = getSheetIndex();
+    bool bOk = false;
+    if( !rModel.mbRef1Deleted && (rModel.maRef1.getLength() > 0) && (rRange.StartColumn > 0) && (rRange.StartRow > 0) )
+    {
+        CellRangeAddress aOpRange = rRange;
+        CellAddress aRef1;
+        if( getAddressConverter().convertToCellAddress( aRef1, rModel.maRef1, nSheet, true ) ) try
+        {
+            if( rModel.mb2dTable )
+            {
+                CellAddress aRef2;
+                if( !rModel.mbRef2Deleted && getAddressConverter().convertToCellAddress( aRef2, rModel.maRef2, nSheet, true ) )
+                {
+                    // API call expects input values inside operation range
+                    --aOpRange.StartColumn;
+                    --aOpRange.StartRow;
+                    // formula range is top-left cell of operation range
+                    CellRangeAddress aFormulaRange( nSheet, aOpRange.StartColumn, aOpRange.StartRow, aOpRange.StartColumn, aOpRange.StartRow );
+                    // set multiple operation
+                    Reference< XMultipleOperation > xMultOp( getCellRange( aOpRange ), UNO_QUERY_THROW );
+                    xMultOp->setTableOperation( aFormulaRange, TableOperationMode_BOTH, aRef2, aRef1 );
+                    bOk = true;
+                }
+            }
+            else if( rModel.mbRowTable )
+            {
+                // formula range is column to the left of operation range
+                CellRangeAddress aFormulaRange( nSheet, aOpRange.StartColumn - 1, aOpRange.StartRow, aOpRange.StartColumn - 1, aOpRange.EndRow );
+                // API call expects input values (top row) inside operation range
+                --aOpRange.StartRow;
+                // set multiple operation
+                Reference< XMultipleOperation > xMultOp( getCellRange( aOpRange ), UNO_QUERY_THROW );
+                xMultOp->setTableOperation( aFormulaRange, TableOperationMode_ROW, aRef1, aRef1 );
+                bOk = true;
+            }
+            else
+            {
+                // formula range is row above operation range
+                CellRangeAddress aFormulaRange( nSheet, aOpRange.StartColumn, aOpRange.StartRow - 1, aOpRange.EndColumn, aOpRange.StartRow - 1 );
+                // API call expects input values (left column) inside operation range
+                --aOpRange.StartColumn;
+                // set multiple operation
+                Reference< XMultipleOperation > xMultOp( getCellRange( aOpRange ), UNO_QUERY_THROW );
+                xMultOp->setTableOperation( aFormulaRange, TableOperationMode_COLUMN, aRef1, aRef1 );
+                bOk = true;
+            }
+        }
+        catch( Exception& )
+        {
+        }
+    }
+
+    // on error: fill cell range with #REF! error codes
+    if( !bOk ) try
+    {
+        Reference< XCellRangeData > xCellRangeData( getCellRange( rRange ), UNO_QUERY_THROW );
+        size_t nWidth = static_cast< size_t >( rRange.EndColumn - rRange.StartColumn + 1 );
+        size_t nHeight = static_cast< size_t >( rRange.EndRow - rRange.StartRow + 1 );
+        Matrix< Any > aErrorCells( nWidth, nHeight, Any( getFormulaParser().convertErrorToFormula( BIFF_ERR_REF ) ) );
+        xCellRangeData->setDataArray( ContainerHelper::matrixToSequenceSequence( aErrorCells ) );
+    }
+    catch( Exception& )
+    {
+    }
+}
+
+void SheetDataBuffer::setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtId )
+{
+    if( (rModel.mnXfId >= 0) || (nNumFmtId >= 0) )
+    {
+        // try to merge existing ranges and to write some formatting properties
+        if( !maXfIdRanges.empty() )
+        {
+            // get row index of last inserted cell
+            sal_Int32 nLastRow = maXfIdRanges.rbegin()->second.maRange.StartRow;
+            // row changed - try to merge ranges of last row with existing ranges
+            if( rModel.maCellAddr.Row != nLastRow )
+            {
+                mergeXfIdRanges();
+                // write format properties of all ranges above last row and remove them
+                XfIdRangeMap::iterator aIt = maXfIdRanges.begin(), aEnd = maXfIdRanges.end();
+                while( aIt != aEnd )
+                {
+                    // check that range cannot be merged with current row, and that range is not in cached row range
+                    if( (aIt->second.maRange.EndRow < nLastRow) && !maXfIdRowRange.intersects( aIt->second.maRange ) )
+                    {
+                        writeXfIdRangeProperties( aIt->second );
+                        maXfIdRanges.erase( aIt++ );
+                    }
+                    else
+                        ++aIt;
+                }
+            }
+        }
+
+        // try to expand last existing range, or create new range entry
+        if( maXfIdRanges.empty() || !maXfIdRanges.rbegin()->second.tryExpand( rModel.maCellAddr, rModel.mnXfId, nNumFmtId ) )
+            maXfIdRanges[ BinAddress( rModel.maCellAddr ) ].set( rModel.maCellAddr, rModel.mnXfId, nNumFmtId );
+
+        // update merged ranges for 'center across selection' and 'fill'
+        if( const Xf* pXf = getStyles().getCellXf( rModel.mnXfId ).get() )
+        {
+            sal_Int32 nHorAlign = pXf->getAlignment().getModel().mnHorAlign;
+            if( (nHorAlign == XML_centerContinuous) || (nHorAlign == XML_fill) )
+            {
+                /*  start new merged range, if cell is not empty (#108781#),
+                    or try to expand last range with empty cell */
+                if( rModel.mnCellType != XML_TOKEN_INVALID )
+                    maCenterFillRanges.push_back( MergedRange( rModel.maCellAddr, nHorAlign ) );
+                else if( !maCenterFillRanges.empty() )
+                    maCenterFillRanges.rbegin()->tryExpand( rModel.maCellAddr, nHorAlign );
+            }
+        }
+    }
+}
+
+void SheetDataBuffer::writeXfIdRowRangeProperties( const XfIdRowRange& rXfIdRowRange ) const
+{
+    if( (rXfIdRowRange.maRowRange.mnLast >= 0) && (rXfIdRowRange.mnXfId >= 0) )
+    {
+        AddressConverter& rAddrConv = getAddressConverter();
+        CellRangeAddress aRange( getSheetIndex(), 0, rXfIdRowRange.maRowRange.mnFirst, rAddrConv.getMaxApiAddress().Column, rXfIdRowRange.maRowRange.mnLast );
+        if( rAddrConv.validateCellRange( aRange, true, false ) )
+        {
+            PropertySet aPropSet( getCellRange( aRange ) );
+            getStyles().writeCellXfToPropertySet( aPropSet, rXfIdRowRange.mnXfId );
+        }
+    }
+}
+
+void SheetDataBuffer::writeXfIdRangeProperties( const XfIdRange& rXfIdRange ) const
+{
+    StylesBuffer& rStyles = getStyles();
+    PropertyMap aPropMap;
+    if( rXfIdRange.mnXfId >= 0 )
+        rStyles.writeCellXfToPropertyMap( aPropMap, rXfIdRange.mnXfId );
+    if( rXfIdRange.mnNumFmtId >= 0 )
+        rStyles.writeNumFmtToPropertyMap( aPropMap, rXfIdRange.mnNumFmtId );
+    PropertySet aPropSet( getCellRange( rXfIdRange.maRange ) );
+    aPropSet.setProperties( aPropMap );
+}
+
+void SheetDataBuffer::mergeXfIdRanges()
+{
+    if( !maXfIdRanges.empty() )
+    {
+        // get row index of last range
+        sal_Int32 nLastRow = maXfIdRanges.rbegin()->second.maRange.StartRow;
+        // process all ranges located in the same row of the last range
+        XfIdRangeMap::iterator aMergeIt = maXfIdRanges.end();
+        while( (aMergeIt != maXfIdRanges.begin()) && ((--aMergeIt)->second.maRange.StartRow == nLastRow) )
+        {
+            const XfIdRange& rMergeXfIdRange = aMergeIt->second;
+            // try to find a range that can be merged with rMergeRange
+            bool bFound = false;
+            for( XfIdRangeMap::iterator aIt = maXfIdRanges.begin(); !bFound && (aIt != aMergeIt); ++aIt )
+                if( (bFound = aIt->second.tryMerge( rMergeXfIdRange )) == true )
+                    maXfIdRanges.erase( aMergeIt++ );
+        }
+    }
+}
+
+void SheetDataBuffer::finalizeMergedRange( const CellRangeAddress& rRange )
+{
+    bool bMultiCol = rRange.StartColumn < rRange.EndColumn;
+    bool bMultiRow = rRange.StartRow < rRange.EndRow;
+
+    if( bMultiCol || bMultiRow ) try
+    {
+        // merge the cell range
+        Reference< XMergeable > xMerge( getCellRange( rRange ), UNO_QUERY_THROW );
+        xMerge->merge( sal_True );
+
+        // if merging this range worked (no overlapping merged ranges), update cell borders
+        Reference< XCell > xTopLeft( getCell( CellAddress( getSheetIndex(), rRange.StartColumn, rRange.StartRow ) ), UNO_SET_THROW );
+        PropertySet aTopLeftProp( xTopLeft );
+
+        // copy right border of top-right cell to right border of top-left cell
+        if( bMultiCol )
+        {
+            PropertySet aTopRightProp( getCell( CellAddress( getSheetIndex(), rRange.EndColumn, rRange.StartRow ) ) );
+            BorderLine aLine;
+            if( aTopRightProp.getProperty( aLine, PROP_RightBorder ) )
+                aTopLeftProp.setProperty( PROP_RightBorder, aLine );
+        }
+
+        // copy bottom border of bottom-left cell to bottom border of top-left cell
+        if( bMultiRow )
+        {
+            PropertySet aBottomLeftProp( getCell( CellAddress( getSheetIndex(), rRange.StartColumn, rRange.EndRow ) ) );
+            BorderLine aLine;
+            if( aBottomLeftProp.getProperty( aLine, PROP_BottomBorder ) )
+                aTopLeftProp.setProperty( PROP_BottomBorder, aLine );
+        }
+
+        // #i93609# merged range in a single row: test if manual row height is needed
+        if( !bMultiRow )
+        {
+            bool bTextWrap = aTopLeftProp.getBoolProperty( PROP_IsTextWrapped );
+            if( !bTextWrap && (xTopLeft->getType() == CellContentType_TEXT) )
+            {
+                Reference< XText > xText( xTopLeft, UNO_QUERY );
+                bTextWrap = xText.is() && (xText->getString().indexOf( '\x0A' ) >= 0);
+            }
+            if( bTextWrap )
+                setManualRowHeight( rRange.StartRow );
+        }
+    }
+    catch( Exception& )
+    {
+    }
+}
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
diff --git a/oox/source/xls/sheetdatacontext.cxx b/oox/source/xls/sheetdatacontext.cxx
index 2f0be893c..93fa18edb 100644
--- a/oox/source/xls/sheetdatacontext.cxx
+++ b/oox/source/xls/sheetdatacontext.cxx
@@ -28,8 +28,6 @@
 
 #include "oox/xls/sheetdatacontext.hxx"
 
-#include <com/sun/star/sheet/XArrayFormulaTokens.hpp>
-#include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <com/sun/star/table/CellContentType.hpp>
 #include <com/sun/star/table/XCell.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
@@ -40,7 +38,6 @@
 #include "oox/xls/biffinputstream.hxx"
 #include "oox/xls/formulaparser.hxx"
 #include "oox/xls/richstringcontext.hxx"
-#include "oox/xls/sharedformulabuffer.hxx"
 #include "oox/xls/unitconverter.hxx"
 
 namespace oox {
@@ -99,64 +96,31 @@ const sal_uInt32 BIFF_ROW_THICKTOP          = 0x10000000;
 const sal_uInt32 BIFF_ROW_THICKBOTTOM       = 0x20000000;
 const sal_uInt32 BIFF_ROW_SHOWPHONETIC      = 0x40000000;
 
-const sal_Int32 BIFF2_XF_EXTENDED_IDS       = 63;
-const sal_uInt8 BIFF2_XF_MASK               = 0x3F;
+const sal_Int32 BIFF2_CELL_USEIXFE          = 63;
 
-// ----------------------------------------------------------------------------
-
-/** Formula context for cell formulas. */
-class CellFormulaContext : public SimpleFormulaContext
-{
-public:
-    explicit            CellFormulaContext(
-                            const Reference< XFormulaTokens >& rxTokens,
-                            const CellAddress& rCellPos );
-};
-
-CellFormulaContext::CellFormulaContext( const Reference< XFormulaTokens >& rxTokens, const CellAddress& rCellPos ) :
-    SimpleFormulaContext( rxTokens, false, false )
-{
-    setBaseAddress( rCellPos );
-}
-
-// ----------------------------------------------------------------------------
-
-/** Uses the XArrayFormulaTokens interface to set a token sequence. */
-class ArrayFormulaContext : public FormulaContext
-{
-public:
-    explicit            ArrayFormulaContext(
-                            const Reference< XArrayFormulaTokens >& rxTokens,
-                            const CellRangeAddress& rArrayRange );
-
-    virtual void        setTokens( const ApiTokenSequence& rTokens );
+} // namespace
 
-private:
-    Reference< XArrayFormulaTokens > mxTokens;
-};
+// ============================================================================
 
-ArrayFormulaContext::ArrayFormulaContext(
-        const Reference< XArrayFormulaTokens >& rxTokens, const CellRangeAddress& rArrayRange ) :
-    FormulaContext( false, false ),
-    mxTokens( rxTokens )
+SheetDataContextBase::SheetDataContextBase( const WorksheetHelper& rHelper ) :
+    mrAddressConv( rHelper.getAddressConverter() ),
+    mrFormulaParser( rHelper.getFormulaParser() ),
+    mrSheetData( rHelper.getSheetData() ),
+    mnSheet( rHelper.getSheetIndex() )
 {
-    OSL_ENSURE( mxTokens.is(), "ArrayFormulaContext::ArrayFormulaContext - missing XArrayFormulaTokens interface" );
-    setBaseAddress( CellAddress( rArrayRange.Sheet, rArrayRange.StartColumn, rArrayRange.StartRow ) );
 }
 
-void ArrayFormulaContext::setTokens( const ApiTokenSequence& rTokens )
+SheetDataContextBase::~SheetDataContextBase()
 {
-    mxTokens->setArrayTokens( rTokens );
 }
 
-// ----------------------------------------------------------------------------
-
-} // namespace
-
 // ============================================================================
 
 SheetDataContext::SheetDataContext( WorksheetFragmentBase& rFragment ) :
-    WorksheetContextBase( rFragment )
+    WorksheetContextBase( rFragment ),
+    SheetDataContextBase( rFragment ),
+    mbHasFormula( false ),
+    mbValidRange( false )
 {
 }
 
@@ -169,20 +133,22 @@ ContextHandlerRef SheetDataContext::onCreateContext( sal_Int32 nElement, const A
         break;
 
         case XLS_TOKEN( row ):
-            if( nElement == XLS_TOKEN( c ) ) { importCell( rAttribs ); return this; }
+            // do not process cell elements with invalid (out-of-range) address
+            if( nElement == XLS_TOKEN( c ) && importCell( rAttribs ) )
+                return this;
         break;
 
         case XLS_TOKEN( c ):
-            if( maCurrCell.mxCell.is() ) switch( nElement )
+            switch( nElement )
             {
                 case XLS_TOKEN( is ):
                     mxInlineStr.reset( new RichString( *this ) );
                     return new RichStringContext( *this, mxInlineStr );
                 case XLS_TOKEN( v ):
-                    return this;
+                    return this;    // characters contain cell value
                 case XLS_TOKEN( f ):
                     importFormula( rAttribs );
-                    return this;
+                    return this;    // characters contain formula string
             }
         break;
     }
@@ -194,94 +160,86 @@ void SheetDataContext::onCharacters( const OUString& rChars )
     switch( getCurrentElement() )
     {
         case XLS_TOKEN( v ):
-            maCurrCell.maValueStr = rChars;
-            maCurrCell.mbHasValueStr = true;
+            maCellValue = rChars;
         break;
-
         case XLS_TOKEN( f ):
-            if( maCurrCell.mxCell.is() ) try
-            {
-                switch( maCurrCell.mnFormulaType )
-                {
-                    case XML_normal:
-                        if( rChars.getLength() > 0 )
-                        {
-                            Reference< XFormulaTokens > xTokens( maCurrCell.mxCell, UNO_QUERY_THROW );
-                            CellFormulaContext aContext( xTokens, maCurrCell.maAddress );
-                            getFormulaParser().importFormula( aContext, rChars );
-                        }
-                    break;
-
-                    case XML_array:
-                        if( (maCurrCell.maFormulaRef.getLength() > 0) && (rChars.getLength() > 0) )
-                        {
-                            CellRangeAddress aArrayRange;
-                            Reference< XArrayFormulaTokens > xTokens( getCellRange( maCurrCell.maFormulaRef, &aArrayRange ), UNO_QUERY_THROW );
-                            ArrayFormulaContext aContext( xTokens, aArrayRange );
-                            getFormulaParser().importFormula( aContext, rChars );
-                        }
-                    break;
-
-                    case XML_shared:
-                        if( maCurrCell.mnSharedId >= 0 )
-                        {
-                            if( rChars.getLength() > 0 )
-                                getSharedFormulas().importSharedFmla( rChars, maCurrCell.maFormulaRef, maCurrCell.mnSharedId, maCurrCell.maAddress );
-                            Reference< XFormulaTokens > xTokens( maCurrCell.mxCell, UNO_QUERY_THROW );
-                            ExtCellFormulaContext aContext( *this, xTokens, maCurrCell.maAddress );
-                            getSharedFormulas().setSharedFormulaCell( aContext, maCurrCell.mnSharedId );
-                        }
-                    break;
-
-                    case XML_dataTable:
-                        if( maCurrCell.maFormulaRef.getLength() > 0 )
-                        {
-                            CellRangeAddress aTableRange;
-                            if( getAddressConverter().convertToCellRange( aTableRange, maCurrCell.maFormulaRef, getSheetIndex(), true, true ) )
-                                setTableOperation( aTableRange, maTableData );
-                        }
-                    break;
-
-                    default:
-                        OSL_FAIL( "SheetDataContext::onEndElement - unknown formula type" );
-                }
-            }
-            catch( Exception& )
-            {
-            }
+            if( maFmlaData.mnFormulaType != XML_TOKEN_INVALID )
+                maTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, rChars );
         break;
     }
 }
 
 void SheetDataContext::onEndElement()
 {
-    if( isCurrentElement( XLS_TOKEN( c ) ) && maCurrCell.mxCell.is() )
+    if( getCurrentElement() == XLS_TOKEN( c ) )
     {
-        if( maCurrCell.mxCell->getType() == CellContentType_EMPTY )
+        // try to create a formula cell
+        if( mbHasFormula ) switch( maFmlaData.mnFormulaType )
+        {
+            case XML_normal:
+                mrSheetData.setFormulaCell( maCellData, maTokens );
+            break;
+            case XML_shared:
+                if( maFmlaData.mnSharedId >= 0 )
+                {
+                    if( mbValidRange && maFmlaData.isValidSharedRef( maCellData.maCellAddr ) )
+                        mrSheetData.createSharedFormula( maFmlaData.mnSharedId, maTokens );
+                    mrSheetData.setFormulaCell( maCellData, maFmlaData.mnSharedId );
+                }
+                else
+                    // no success, set plain cell value and formatting below
+                    mbHasFormula = false;
+            break;
+            case XML_array:
+                if( mbValidRange && maFmlaData.isValidArrayRef( maCellData.maCellAddr ) )
+                    mrSheetData.createArrayFormula( maFmlaData.maFormulaRef, maTokens );
+                // set cell formatting, but do not set result as cell value
+                mrSheetData.setBlankCell( maCellData );
+            break;
+            case XML_dataTable:
+                if( mbValidRange )
+                    mrSheetData.createTableOperation( maFmlaData.maFormulaRef, maTableData );
+                // set cell formatting, but do not set result as cell value
+                mrSheetData.setBlankCell( maCellData );
+            break;
+            default:
+                OSL_ENSURE( maFmlaData.mnFormulaType == XML_TOKEN_INVALID, "SheetDataContext::onEndElement - unknown formula type" );
+                mbHasFormula = false;
+        }
+
+        if( !mbHasFormula )
         {
-            if( maCurrCell.mbHasValueStr )
+            // no formula created: try to set the cell value
+            if( maCellValue.getLength() > 0 ) switch( maCellData.mnCellType )
             {
-                // implemented in WorksheetHelper class
-                setCell( maCurrCell );
+                case XML_n:
+                    mrSheetData.setValueCell( maCellData, maCellValue.toDouble() );
+                break;
+                case XML_b:
+                    mrSheetData.setBooleanCell( maCellData, maCellValue.toDouble() != 0.0 );
+                break;
+                case XML_e:
+                    mrSheetData.setErrorCell( maCellData, maCellValue );
+                break;
+                case XML_str:
+                    mrSheetData.setStringCell( maCellData, maCellValue );
+                break;
+                case XML_s:
+                    mrSheetData.setStringCell( maCellData, maCellValue.toInt32() );
+                break;
             }
-            else if( (maCurrCell.mnCellType == XML_inlineStr) && mxInlineStr.get() )
+            else if( (maCellData.mnCellType == XML_inlineStr) && mxInlineStr.get() )
             {
-                // convert font settings
                 mxInlineStr->finalizeImport();
-                // write string to cell
-                Reference< XText > xText( maCurrCell.mxCell, UNO_QUERY );
-                if( xText.is() )
-                    mxInlineStr->convert( xText, maCurrCell.mnXfId );
+                mrSheetData.setStringCell( maCellData, mxInlineStr );
             }
             else
             {
                 // empty cell, update cell type
-                maCurrCell.mnCellType = XML_TOKEN_INVALID;
+                maCellData.mnCellType = XML_TOKEN_INVALID;
+                mrSheetData.setBlankCell( maCellData );
             }
         }
-
-        // store the cell formatting data
-        setCellFormat( maCurrCell );
     }
 }
 
@@ -290,10 +248,7 @@ ContextHandlerRef SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq
     switch( getCurrentElement() )
     {
         case BIFF12_ID_SHEETDATA:
-            switch( nRecId )
-            {
-                case BIFF12_ID_ROW:             importRow( rStrm );                             return this;
-            }
+            if( nRecId == BIFF12_ID_ROW ) { importRow( rStrm ); return this; }
         break;
 
         case BIFF12_ID_ROW:
@@ -333,7 +288,7 @@ ContextHandlerRef SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq
 void SheetDataContext::importRow( const AttributeList& rAttribs )
 {
     RowModel aModel;
-    aModel.mnFirstRow     = aModel.mnLastRow = rAttribs.getInteger( XML_r, -1 );
+    aModel.mnRow          = rAttribs.getInteger( XML_r, -1 );
     aModel.mfHeight       = rAttribs.getDouble( XML_ht, -1.0 );
     aModel.mnXfId         = rAttribs.getInteger( XML_s, -1 );
     aModel.mnLevel        = rAttribs.getInteger( XML_outlineLevel, 0 );
@@ -344,41 +299,106 @@ void SheetDataContext::importRow( const AttributeList& rAttribs )
     aModel.mbCollapsed    = rAttribs.getBool( XML_collapsed, false );
     aModel.mbThickTop     = rAttribs.getBool( XML_thickTop, false );
     aModel.mbThickBottom  = rAttribs.getBool( XML_thickBot, false );
+
+    // decode the column spans (space-separated list of colon-separated integer pairs)
+    OUString aColSpansText = rAttribs.getString( XML_spans, OUString() );
+    sal_Int32 nMaxCol = mrAddressConv.getMaxApiAddress().Column;
+    sal_Int32 nIndex = 0;
+    while( nIndex >= 0 )
+    {
+        OUString aColSpanToken = aColSpansText.getToken( 0, ' ', nIndex );
+        sal_Int32 nSepPos = aColSpanToken.indexOf( ':' );
+        if( (0 < nSepPos) && (nSepPos + 1 < aColSpanToken.getLength()) )
+        {
+            // OOXML uses 1-based integer column indexes, row model expects 0-based colspans
+            sal_Int32 nLastCol = ::std::min( aColSpanToken.copy( nSepPos + 1 ).toInt32() - 1, nMaxCol );
+            aModel.insertColSpan( ValueRange( aColSpanToken.copy( 0, nSepPos ).toInt32() - 1, nLastCol ) );
+        }
+    }
+
     // set row properties in the current sheet
     setRowModel( aModel );
 }
 
-void SheetDataContext::importCell( const AttributeList& rAttribs )
+bool SheetDataContext::importCell( const AttributeList& rAttribs )
 {
-    maCurrCell.reset();
-    maCurrCell.mxCell         = getCell( rAttribs.getString( XML_r, OUString() ), &maCurrCell.maAddress );
-    maCurrCell.mnCellType     = rAttribs.getToken( XML_t, XML_n );
-    maCurrCell.mnXfId         = rAttribs.getInteger( XML_s, -1 );
-    maCurrCell.mbShowPhonetic = rAttribs.getBool( XML_ph, false );
-    mxInlineStr.reset();
+    bool bValidAddr = mrAddressConv.convertToCellAddress( maCellData.maCellAddr, rAttribs.getString( XML_r, OUString() ), mnSheet, true );
+    if( bValidAddr )
+    {
+        maCellData.mnCellType     = rAttribs.getToken( XML_t, XML_n );
+        maCellData.mnXfId         = rAttribs.getInteger( XML_s, -1 );
+        maCellData.mbShowPhonetic = rAttribs.getBool( XML_ph, false );
 
-    // update used area of the sheet
-    if( maCurrCell.mxCell.is() )
-        extendUsedArea( maCurrCell.maAddress );
+        // reset cell value, formula settings, and inline string
+        maCellValue = OUString();
+        mxInlineStr.reset();
+        mbHasFormula = false;
+
+        // update used area of the sheet
+        extendUsedArea( maCellData.maCellAddr );
+    }
+    return bValidAddr;
 }
 
 void SheetDataContext::importFormula( const AttributeList& rAttribs )
 {
-    maCurrCell.maFormulaRef   = rAttribs.getString( XML_ref, OUString() );
-    maCurrCell.mnFormulaType  = rAttribs.getToken( XML_t, XML_normal );
-    maCurrCell.mnSharedId     = rAttribs.getInteger( XML_si, -1 );
-    maTableData.maRef1        = rAttribs.getString( XML_r1, OUString() );
-    maTableData.maRef2        = rAttribs.getString( XML_r2, OUString() );
-    maTableData.mb2dTable     = rAttribs.getBool( XML_dt2D, false );
-    maTableData.mbRowTable    = rAttribs.getBool( XML_dtr, false );
-    maTableData.mbRef1Deleted = rAttribs.getBool( XML_del1, false );
-    maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false );
+    mbHasFormula = true;
+    mbValidRange = mrAddressConv.convertToCellRange( maFmlaData.maFormulaRef, rAttribs.getString( XML_ref, OUString() ), mnSheet, true, true );
+    
+    maFmlaData.mnFormulaType = rAttribs.getToken( XML_t, XML_normal );
+    maFmlaData.mnSharedId    = rAttribs.getInteger( XML_si, -1 );
+
+    if( maFmlaData.mnFormulaType == XML_dataTable )
+    {
+        maTableData.maRef1        = rAttribs.getString( XML_r1, OUString() );
+        maTableData.maRef2        = rAttribs.getString( XML_r2, OUString() );
+        maTableData.mb2dTable     = rAttribs.getBool( XML_dt2D, false );
+        maTableData.mbRowTable    = rAttribs.getBool( XML_dtr, false );
+        maTableData.mbRef1Deleted = rAttribs.getBool( XML_del1, false );
+        maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false );
+    }
+
+    // clear token array, will be regenerated from element text
+    maTokens = ApiTokenSequence();
 }
 
-void SheetDataContext::importCellHeader( SequenceInputStream& rStrm, CellType eCellType )
+void SheetDataContext::importRow( SequenceInputStream& rStrm )
 {
-    maCurrCell.reset();
+    RowModel aModel;
+    sal_Int32 nSpanCount;
+    sal_uInt16 nHeight, nFlags1;
+    sal_uInt8 nFlags2;
+    rStrm >> maCurrPos.mnRow >> aModel.mnXfId >> nHeight >> nFlags1 >> nFlags2 >> nSpanCount;
+    maCurrPos.mnCol = 0;
 
+    // row index is 0-based in BIFF12, but RowModel expects 1-based
+    aModel.mnRow          = maCurrPos.mnRow + 1;
+    // row height is in twips in BIFF12, convert to points
+    aModel.mfHeight       = nHeight / 20.0;
+    aModel.mnLevel        = extractValue< sal_Int32 >( nFlags1, 8, 3 );
+    aModel.mbCustomHeight = getFlag( nFlags1, BIFF12_ROW_CUSTOMHEIGHT );
+    aModel.mbCustomFormat = getFlag( nFlags1, BIFF12_ROW_CUSTOMFORMAT );
+    aModel.mbShowPhonetic = getFlag( nFlags2, BIFF12_ROW_SHOWPHONETIC );
+    aModel.mbHidden       = getFlag( nFlags1, BIFF12_ROW_HIDDEN );
+    aModel.mbCollapsed    = getFlag( nFlags1, BIFF12_ROW_COLLAPSED );
+    aModel.mbThickTop     = getFlag( nFlags1, BIFF12_ROW_THICKTOP );
+    aModel.mbThickBottom  = getFlag( nFlags1, BIFF12_ROW_THICKBOTTOM );
+
+    // read the column spans
+    sal_Int32 nMaxCol = mrAddressConv.getMaxApiAddress().Column;
+    for( sal_Int32 nSpanIdx = 0; (nSpanIdx < nSpanCount) && !rStrm.isEof(); ++nSpanIdx )
+    {
+        sal_Int32 nFirstCol, nLastCol;
+        rStrm >> nFirstCol >> nLastCol;
+        aModel.insertColSpan( ValueRange( nFirstCol, ::std::min( nLastCol, nMaxCol ) ) );
+    }
+
+    // set row properties in the current sheet
+    setRowModel( aModel );
+}
+
+bool SheetDataContext::readCellHeader( SequenceInputStream& rStrm, CellType eCellType )
+{
     switch( eCellType )
     {
         case CELLTYPE_VALUE:
@@ -389,200 +409,157 @@ void SheetDataContext::importCellHeader( SequenceInputStream& rStrm, CellType eC
     sal_uInt32 nXfId;
     rStrm >> nXfId;
 
-    maCurrCell.mxCell         = getCell( maCurrPos, &maCurrCell.maAddress );
-    maCurrCell.mnXfId         = extractValue< sal_Int32 >( nXfId, 0, 24 );
-    maCurrCell.mbShowPhonetic = getFlag( nXfId, BIFF12_CELL_SHOWPHONETIC );
+    bool bValidAddr = mrAddressConv.convertToCellAddress( maCellData.maCellAddr, maCurrPos, mnSheet, true );
+    maCellData.mnXfId = extractValue< sal_Int32 >( nXfId, 0, 24 );
+    maCellData.mbShowPhonetic = getFlag( nXfId, BIFF12_CELL_SHOWPHONETIC );
 
     // update used area of the sheet
-    if( maCurrCell.mxCell.is() )
-        extendUsedArea( maCurrCell.maAddress );
+    if( bValidAddr )
+        extendUsedArea( maCellData.maCellAddr );
+    return bValidAddr;
+}
+
+ApiTokenSequence SheetDataContext::readCellFormula( SequenceInputStream& rStrm )
+{
+    rStrm.skip( 2 );
+    return mrFormulaParser.importFormula( maCellData.maCellAddr, FORMULATYPE_CELL, rStrm );
+}
+
+bool SheetDataContext::readFormulaRef( SequenceInputStream& rStrm )
+{
+    BinRange aRange;
+    rStrm >> aRange;
+    return mrAddressConv.convertToCellRange( maFmlaData.maFormulaRef, aRange, mnSheet, true, true );
 }
 
 void SheetDataContext::importCellBool( SequenceInputStream& rStrm, CellType eCellType )
 {
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_b;
-    if( maCurrCell.mxCell.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
+    if( readCellHeader( rStrm, eCellType ) )
     {
+        maCellData.mnCellType = XML_b;
         bool bValue = rStrm.readuInt8() != 0;
         if( eCellType == CELLTYPE_FORMULA )
-        {
-            importCellFormula( rStrm );
-        }
+            mrSheetData.setFormulaCell( maCellData, readCellFormula( rStrm ) );
         else
-        {
-            setBooleanCell( maCurrCell.mxCell, bValue );
-            // #108770# set 'Standard' number format for all Boolean cells
-            maCurrCell.mnNumFmtId = 0;
-        }
+            mrSheetData.setBooleanCell( maCellData, bValue );
     }
-    setCellFormat( maCurrCell );
 }
 
 void SheetDataContext::importCellBlank( SequenceInputStream& rStrm, CellType eCellType )
 {
     OSL_ENSURE( eCellType != CELLTYPE_FORMULA, "SheetDataContext::importCellBlank - no formula cells supported" );
-    importCellHeader( rStrm, eCellType );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, eCellType ) )
+        mrSheetData.setBlankCell( maCellData );
 }
 
 void SheetDataContext::importCellDouble( SequenceInputStream& rStrm, CellType eCellType )
 {
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_n;
-    if( maCurrCell.mxCell.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
+    if( readCellHeader( rStrm, eCellType ) )
     {
+        maCellData.mnCellType = XML_n;
         double fValue = rStrm.readDouble();
         if( eCellType == CELLTYPE_FORMULA )
-            importCellFormula( rStrm );
+            mrSheetData.setFormulaCell( maCellData, readCellFormula( rStrm ) );
         else
-            maCurrCell.mxCell->setValue( fValue );
+            mrSheetData.setValueCell( maCellData, fValue );
     }
-    setCellFormat( maCurrCell );
 }
 
 void SheetDataContext::importCellError( SequenceInputStream& rStrm, CellType eCellType )
 {
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_e;
-    if( maCurrCell.mxCell.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
+    if( readCellHeader( rStrm, eCellType ) )
     {
+        maCellData.mnCellType = XML_e;
         sal_uInt8 nErrorCode = rStrm.readuInt8();
         if( eCellType == CELLTYPE_FORMULA )
-            importCellFormula( rStrm );
+            mrSheetData.setFormulaCell( maCellData, readCellFormula( rStrm ) );
         else
-            setErrorCell( maCurrCell.mxCell, nErrorCode );
+            mrSheetData.setErrorCell( maCellData, nErrorCode );
     }
-    setCellFormat( maCurrCell );
 }
 
 void SheetDataContext::importCellRk( SequenceInputStream& rStrm, CellType eCellType )
 {
     OSL_ENSURE( eCellType != CELLTYPE_FORMULA, "SheetDataContext::importCellRk - no formula cells supported" );
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_n;
-    if( maCurrCell.mxCell.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
-        maCurrCell.mxCell->setValue( BiffHelper::calcDoubleFromRk( rStrm.readInt32() ) );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, eCellType ) )
+    {
+        maCellData.mnCellType = XML_n;
+        mrSheetData.setValueCell( maCellData, BiffHelper::calcDoubleFromRk( rStrm.readInt32() ) );
+    }
 }
 
 void SheetDataContext::importCellRString( SequenceInputStream& rStrm, CellType eCellType )
 {
     OSL_ENSURE( eCellType != CELLTYPE_FORMULA, "SheetDataContext::importCellRString - no formula cells supported" );
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_inlineStr;
-    Reference< XText > xText( maCurrCell.mxCell, UNO_QUERY );
-    if( xText.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
+    if( readCellHeader( rStrm, eCellType ) )
     {
-        RichString aString( *this );
-        aString.importString( rStrm, true );
-        aString.finalizeImport();
-        aString.convert( xText, maCurrCell.mnXfId );
+        maCellData.mnCellType = XML_inlineStr;
+        RichStringRef xString( new RichString( *this ) );
+        xString->importString( rStrm, true );
+        xString->finalizeImport();
+        mrSheetData.setStringCell( maCellData, xString );
     }
-    setCellFormat( maCurrCell );
 }
 
 void SheetDataContext::importCellSi( SequenceInputStream& rStrm, CellType eCellType )
 {
     OSL_ENSURE( eCellType != CELLTYPE_FORMULA, "SheetDataContext::importCellSi - no formula cells supported" );
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_s;
-    if( maCurrCell.mxCell.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
-        setSharedStringCell( maCurrCell.mxCell, rStrm.readInt32(), maCurrCell.mnXfId );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, eCellType ) )
+    {
+        maCellData.mnCellType = XML_s;
+        mrSheetData.setStringCell( maCellData, rStrm.readInt32() );
+    }
 }
 
 void SheetDataContext::importCellString( SequenceInputStream& rStrm, CellType eCellType )
 {
-    importCellHeader( rStrm, eCellType );
-    maCurrCell.mnCellType = XML_inlineStr;
-    Reference< XText > xText( maCurrCell.mxCell, UNO_QUERY );
-    if( xText.is() && (maCurrCell.mxCell->getType() == CellContentType_EMPTY) )
+    if( readCellHeader( rStrm, eCellType ) )
     {
-        RichString aString( *this );
-        aString.importString( rStrm, false );
-        aString.finalizeImport();
+        maCellData.mnCellType = XML_inlineStr;
+        // always import the string, stream will point to formula afterwards, if existing
+        RichStringRef xString( new RichString( *this ) );
+        xString->importString( rStrm, false );
+        xString->finalizeImport();
         if( eCellType == CELLTYPE_FORMULA )
-            importCellFormula( rStrm );
+            mrSheetData.setFormulaCell( maCellData, readCellFormula( rStrm ) );
         else
-            aString.convert( xText, maCurrCell.mnXfId );
-    }
-    setCellFormat( maCurrCell );
-}
-
-void SheetDataContext::importCellFormula( SequenceInputStream& rStrm )
-{
-    rStrm.skip( 2 );
-    Reference< XFormulaTokens > xTokens( maCurrCell.mxCell, UNO_QUERY );
-    if( xTokens.is() )
-    {
-        ExtCellFormulaContext aContext( *this, xTokens, maCurrCell.maAddress );
-        getFormulaParser().importFormula( aContext, rStrm );
+            mrSheetData.setStringCell( maCellData, xString );
     }
 }
 
-void SheetDataContext::importRow( SequenceInputStream& rStrm )
-{
-    RowModel aModel;
-
-    sal_uInt16 nHeight, nFlags1;
-    sal_uInt8 nFlags2;
-    rStrm >> maCurrPos.mnRow >> aModel.mnXfId >> nHeight >> nFlags1 >> nFlags2;
-
-    // row index is 0-based in BIFF12, but RowModel expects 1-based
-    aModel.mnFirstRow     = aModel.mnLastRow = maCurrPos.mnRow + 1;
-    // row height is in twips in BIFF12, convert to points
-    aModel.mfHeight       = nHeight / 20.0;
-    aModel.mnLevel        = extractValue< sal_Int32 >( nFlags1, 8, 3 );
-    aModel.mbCustomHeight = getFlag( nFlags1, BIFF12_ROW_CUSTOMHEIGHT );
-    aModel.mbCustomFormat = getFlag( nFlags1, BIFF12_ROW_CUSTOMFORMAT );
-    aModel.mbShowPhonetic = getFlag( nFlags2, BIFF12_ROW_SHOWPHONETIC );
-    aModel.mbHidden       = getFlag( nFlags1, BIFF12_ROW_HIDDEN );
-    aModel.mbCollapsed    = getFlag( nFlags1, BIFF12_ROW_COLLAPSED );
-    aModel.mbThickTop     = getFlag( nFlags1, BIFF12_ROW_THICKTOP );
-    aModel.mbThickBottom  = getFlag( nFlags1, BIFF12_ROW_THICKBOTTOM );
-    // set row properties in the current sheet
-    setRowModel( aModel );
-}
-
 void SheetDataContext::importArray( SequenceInputStream& rStrm )
 {
-    BinRange aRange;
-    rStrm >> aRange;
-    CellRangeAddress aArrayRange;
-    Reference< XCellRange > xRange = getCellRange( aRange, &aArrayRange );
-    Reference< XArrayFormulaTokens > xTokens( xRange, UNO_QUERY );
-    if( xRange.is() && xTokens.is() )
+    if( readFormulaRef( rStrm ) && maFmlaData.isValidArrayRef( maCellData.maCellAddr ) )
     {
         rStrm.skip( 1 );
-        ArrayFormulaContext aContext( xTokens, aArrayRange );
-        getFormulaParser().importFormula( aContext, rStrm );
+        ApiTokenSequence aTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, FORMULATYPE_ARRAY, rStrm );
+        mrSheetData.createArrayFormula( maFmlaData.maFormulaRef, aTokens );
     }
 }
 
-void SheetDataContext::importSharedFmla( SequenceInputStream& rStrm )
-{
-    getSharedFormulas().importSharedFmla( rStrm, maCurrCell.maAddress );
-}
-
 void SheetDataContext::importDataTable( SequenceInputStream& rStrm )
 {
-    BinRange aRange;
-    rStrm >> aRange;
-    CellRangeAddress aTableRange;
-    if( getAddressConverter().convertToCellRange( aTableRange, aRange, getSheetIndex(), true, true ) )
+    if( readFormulaRef( rStrm ) )
     {
-        DataTableModel aModel;
         BinAddress aRef1, aRef2;
         sal_uInt8 nFlags;
         rStrm >> aRef1 >> aRef2 >> nFlags;
-        aModel.maRef1        = FormulaProcessorBase::generateAddress2dString( aRef1, false );
-        aModel.maRef2        = FormulaProcessorBase::generateAddress2dString( aRef2, false );
-        aModel.mbRowTable    = getFlag( nFlags, BIFF12_DATATABLE_ROW );
-        aModel.mb2dTable     = getFlag( nFlags, BIFF12_DATATABLE_2D );
-        aModel.mbRef1Deleted = getFlag( nFlags, BIFF12_DATATABLE_REF1DEL );
-        aModel.mbRef2Deleted = getFlag( nFlags, BIFF12_DATATABLE_REF2DEL );
-        setTableOperation( aTableRange, aModel );
+        maTableData.maRef1        = FormulaProcessorBase::generateAddress2dString( aRef1, false );
+        maTableData.maRef2        = FormulaProcessorBase::generateAddress2dString( aRef2, false );
+        maTableData.mbRowTable    = getFlag( nFlags, BIFF12_DATATABLE_ROW );
+        maTableData.mb2dTable     = getFlag( nFlags, BIFF12_DATATABLE_2D );
+        maTableData.mbRef1Deleted = getFlag( nFlags, BIFF12_DATATABLE_REF1DEL );
+        maTableData.mbRef2Deleted = getFlag( nFlags, BIFF12_DATATABLE_REF2DEL );
+        mrSheetData.createTableOperation( maFmlaData.maFormulaRef, maTableData );
+    }
+}
+
+void SheetDataContext::importSharedFmla( SequenceInputStream& rStrm )
+{
+    if( readFormulaRef( rStrm ) && maFmlaData.isValidSharedRef( maCellData.maCellAddr ) )
+    {
+        ApiTokenSequence aTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, FORMULATYPE_SHAREDFORMULA, rStrm );
+        mrSheetData.createSharedFormula( maCellData.maCellAddr, aTokens );
     }
 }
 
@@ -590,26 +567,27 @@ void SheetDataContext::importDataTable( SequenceInputStream& rStrm )
 
 BiffSheetDataContext::BiffSheetDataContext( const WorksheetHelper& rHelper ) :
     BiffWorksheetContextBase( rHelper ),
+    SheetDataContextBase( rHelper ),
     mnBiff2XfId( 0 )
 {
-    mnArrayIgnoreSize = (getBiff() == BIFF2) ? 1 : ((getBiff() <= BIFF4) ? 2 : 6);
     switch( getBiff() )
     {
         case BIFF2:
-            mnFormulaIgnoreSize = 9;    // double formula result, 1 byte flags
-            mnArrayIgnoreSize = 1;      // recalc-always flag
+            mnFormulaSkipSize = 9;  // double formula result, 1 byte flags
+            mnArraySkipSize = 1;    // recalc-always flag
         break;
         case BIFF3:
         case BIFF4:
-            mnFormulaIgnoreSize = 10;   // double formula result, 2 byte flags
-            mnArrayIgnoreSize = 2;      // 2 byte flags
+            mnFormulaSkipSize = 10; // double formula result, 2 byte flags
+            mnArraySkipSize = 2;    // 2 byte flags
         break;
         case BIFF5:
         case BIFF8:
-            mnFormulaIgnoreSize = 14;   // double formula result, 2 byte flags, 4 bytes nothing
-            mnArrayIgnoreSize = 6;      // 2 byte flags, 4 bytes nothing
+            mnFormulaSkipSize = 14; // double formula result, 2 byte flags, 4 bytes nothing
+            mnArraySkipSize = 6;    // 2 byte flags, 4 bytes nothing
+        break;
+        case BIFF_UNKNOWN:
         break;
-        case BIFF_UNKNOWN: break;
     }
 }
 
@@ -690,258 +668,285 @@ void BiffSheetDataContext::importRecord( BiffInputStream& rStrm )
             }
             break;
 
-            case BIFF_UNKNOWN: break;
+            case BIFF_UNKNOWN:
+            break;
         }
     }
 }
 
 // private --------------------------------------------------------------------
 
-void BiffSheetDataContext::setCurrCell( const BinAddress& rAddr )
-{
-    maCurrCell.reset();
-    maCurrCell.mxCell = getCell( rAddr, &maCurrCell.maAddress );
-    // update used area of the sheet
-    if( maCurrCell.mxCell.is() )
-        extendUsedArea( maCurrCell.maAddress );
-}
-
-void BiffSheetDataContext::importXfId( BiffInputStream& rStrm, bool bBiff2 )
+void BiffSheetDataContext::importRow( BiffInputStream& rStrm )
 {
-    if( bBiff2 )
+    RowModel aModel;
+    sal_uInt16 nRow, nFirstUsedCol, nFirstFreeCol, nHeight;
+    rStrm >> nRow >> nFirstUsedCol >> nFirstFreeCol >> nHeight;
+    if( getBiff() == BIFF2 )
     {
-        sal_uInt8 nBiff2XfId;
-        rStrm >> nBiff2XfId;
         rStrm.skip( 2 );
-        maCurrCell.mnXfId = nBiff2XfId & BIFF2_XF_MASK;
-        if( maCurrCell.mnXfId == BIFF2_XF_EXTENDED_IDS )
-            maCurrCell.mnXfId = mnBiff2XfId;
+        aModel.mbCustomFormat = rStrm.readuInt8() == BIFF2_ROW_CUSTOMFORMAT;
+        if( aModel.mbCustomFormat )
+        {
+            rStrm.skip( 5 );
+            aModel.mnXfId = rStrm.readuInt16();
+        }
     }
     else
     {
-        maCurrCell.mnXfId = rStrm.readuInt16();
+        rStrm.skip( 4 );
+        sal_uInt32 nFlags = rStrm.readuInt32();
+        aModel.mnXfId         = extractValue< sal_Int32 >( nFlags, 16, 12 );
+        aModel.mnLevel        = extractValue< sal_Int32 >( nFlags, 0, 3 );
+        aModel.mbCustomFormat = getFlag( nFlags, BIFF_ROW_CUSTOMFORMAT );
+        aModel.mbCustomHeight = getFlag( nFlags, BIFF_ROW_CUSTOMHEIGHT );
+        aModel.mbShowPhonetic = getFlag( nFlags, BIFF_ROW_SHOWPHONETIC );
+        aModel.mbHidden       = getFlag( nFlags, BIFF_ROW_HIDDEN );
+        aModel.mbCollapsed    = getFlag( nFlags, BIFF_ROW_COLLAPSED );
+        aModel.mbThickTop     = getFlag( nFlags, BIFF_ROW_THICKTOP );
+        aModel.mbThickBottom  = getFlag( nFlags, BIFF_ROW_THICKBOTTOM );
     }
+
+    // row index is 0-based in BIFF, but RowModel expects 1-based
+    aModel.mnRow = static_cast< sal_Int32 >( nRow ) + 1;
+    // row height is in twips in BIFF, convert to points
+    aModel.mfHeight = (nHeight & BIFF_ROW_HEIGHTMASK) / 20.0;
+    // set column spans
+    if( nFirstUsedCol < nFirstFreeCol )
+    {
+        sal_Int32 nLastCol = ::std::min< sal_Int32 >( nFirstFreeCol - 1, mrAddressConv.getMaxApiAddress().Column );
+        aModel.insertColSpan( ValueRange( nFirstUsedCol, nLastCol ) );
+    }
+
+    // set row properties in the current sheet
+    setRowModel( aModel );
 }
 
-void BiffSheetDataContext::importCellHeader( BiffInputStream& rStrm, bool bBiff2 )
+bool BiffSheetDataContext::readCellXfId( BiffInputStream& rStrm, const BinAddress& rAddr, bool bBiff2 )
+{
+    bool bValidAddr = mrAddressConv.convertToCellAddress( maCellData.maCellAddr, rAddr, mnSheet, true );
+    if( bValidAddr )
+    {
+        // update used area of the sheet
+        extendUsedArea( maCellData.maCellAddr );
+
+        // load the XF identifier according to current BIFF version
+        if( bBiff2 )
+        {
+            /*  #i71453# On first call, check if the file contains XF records
+                (by trying to access the first XF with index 0). If there are
+                no XFs, the explicit formatting information contained in each
+                cell record will be used instead. */
+            if( !mobBiff2HasXfs )
+                mobBiff2HasXfs = getStyles().getCellXf( 0 ).get() != 0;
+            // read formatting information (includes the XF identifier)
+            sal_uInt8 nFlags1, nFlags2, nFlags3;
+            rStrm >> nFlags1 >> nFlags2 >> nFlags3;
+            /*  If the file contains XFs, extract and set the XF identifier,
+                otherwise get the explicit formatting. */
+            if( mobBiff2HasXfs.get() )
+            {
+                maCellData.mnXfId = extractValue< sal_Int32 >( nFlags1, 0, 6 );
+                /*  If the identifier is equal to 63, then the real identifier
+                    is contained in the preceding IXFE record (stored in the
+                    class member mnBiff2XfId). */
+                if( maCellData.mnXfId == BIFF2_CELL_USEIXFE )
+                    maCellData.mnXfId = mnBiff2XfId;
+            }
+            else
+            {
+                /*  Let the Xf class do the API conversion. Keeping the member
+                    maCellData.mnXfId untouched will prevent to trigger the
+                    usual XF formatting conversion later on. */
+                PropertySet aPropSet( getCell( maCellData.maCellAddr ) );
+                Xf::writeBiff2CellFormatToPropertySet( *this, aPropSet, nFlags1, nFlags2, nFlags3 );
+            }
+        }
+        else
+        {
+            // BIFF3-BIFF8: 16-bit XF identifier
+            maCellData.mnXfId = rStrm.readuInt16();
+        }
+    }
+    return bValidAddr;
+}
+
+bool BiffSheetDataContext::readCellHeader( BiffInputStream& rStrm, bool bBiff2 )
 {
     BinAddress aAddr;
     rStrm >> aAddr;
-    setCurrCell( aAddr );
-    importXfId( rStrm, bBiff2 );
+    return readCellXfId( rStrm, aAddr, bBiff2 );
+}
+
+bool BiffSheetDataContext::readFormulaRef( BiffInputStream& rStrm )
+{
+    BinRange aRange;
+    aRange.read( rStrm, false );    // columns always 8-bit
+    return mrAddressConv.convertToCellRange( maFmlaData.maFormulaRef, aRange, mnSheet, true, true );
 }
 
 void BiffSheetDataContext::importBlank( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, rStrm.getRecId() == BIFF2_ID_BLANK );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, rStrm.getRecId() == BIFF2_ID_BLANK ) )
+        mrSheetData.setBlankCell( maCellData );
 }
 
 void BiffSheetDataContext::importBoolErr( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, rStrm.getRecId() == BIFF2_ID_BOOLERR );
-    if( maCurrCell.mxCell.is() )
+    if( readCellHeader( rStrm, rStrm.getRecId() == BIFF2_ID_BOOLERR ) )
     {
         sal_uInt8 nValue, nType;
         rStrm >> nValue >> nType;
         switch( nType )
         {
             case BIFF_BOOLERR_BOOL:
-                maCurrCell.mnCellType = XML_b;
-                setBooleanCell( maCurrCell.mxCell, nValue != 0 );
-                // #108770# set 'Standard' number format for all Boolean cells
-                maCurrCell.mnNumFmtId = 0;
+                maCellData.mnCellType = XML_b;
+                mrSheetData.setBooleanCell( maCellData, nValue != 0 );
             break;
             case BIFF_BOOLERR_ERROR:
-                maCurrCell.mnCellType = XML_e;
-                setErrorCell( maCurrCell.mxCell, nValue );
+                maCellData.mnCellType = XML_e;
+                mrSheetData.setErrorCell( maCellData, nValue );
             break;
             default:
                 OSL_FAIL( "BiffSheetDataContext::importBoolErr - unknown cell type" );
+                maCellData.mnCellType = XML_TOKEN_INVALID;
+                mrSheetData.setBlankCell( maCellData );
+            break;    
         }
     }
-    setCellFormat( maCurrCell );
 }
 
 void BiffSheetDataContext::importFormula( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, getBiff() == BIFF2 );
-    maCurrCell.mnCellType = XML_n;
-    Reference< XFormulaTokens > xTokens( maCurrCell.mxCell, UNO_QUERY );
-    if( xTokens.is() )
+    if( readCellHeader( rStrm, getBiff() == BIFF2 ) )
     {
-        rStrm.skip( mnFormulaIgnoreSize );
-        ExtCellFormulaContext aContext( *this, xTokens, maCurrCell.maAddress );
-        getFormulaParser().importFormula( aContext, rStrm );
+        maCellData.mnCellType = XML_n;
+        rStrm.skip( mnFormulaSkipSize );
+        ApiTokenSequence aTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, FORMULATYPE_CELL, rStrm );
+        mrSheetData.setFormulaCell( maCellData, aTokens );
     }
-    setCellFormat( maCurrCell );
 }
 
 void BiffSheetDataContext::importInteger( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, true );
-    maCurrCell.mnCellType = XML_n;
-    if( maCurrCell.mxCell.is() )
-        maCurrCell.mxCell->setValue( rStrm.readuInt16() );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, true ) )
+    {
+        maCellData.mnCellType = XML_n;
+        mrSheetData.setValueCell( maCellData, rStrm.readuInt16() );
+    }
 }
 
 void BiffSheetDataContext::importLabel( BiffInputStream& rStrm )
 {
+    /*  the deep secrets of BIFF type and record identifier...
+        record id   BIFF    ->  XF type     String type
+        0x0004      2-7     ->  3 byte      8-bit length, byte string
+        0x0004      8       ->  3 byte      16-bit length, unicode string
+        0x0204      2-7     ->  2 byte      16-bit length, byte string
+        0x0204      8       ->  2 byte      16-bit length, unicode string
+     */
     bool bBiff2Xf = rStrm.getRecId() == BIFF2_ID_LABEL;
-    importCellHeader( rStrm, bBiff2Xf );
-    maCurrCell.mnCellType = XML_inlineStr;
-    Reference< XText > xText( maCurrCell.mxCell, UNO_QUERY );
-    if( xText.is() )
-    {
-        /*  the deep secrets of BIFF type and record identifier...
-            record id   BIFF    ->  XF type     String type
-            0x0004      2-7     ->  3 byte      8-bit length, byte string
-            0x0004      8       ->  3 byte      16-bit length, unicode string
-            0x0204      2-7     ->  2 byte      16-bit length, byte string
-            0x0204      8       ->  2 byte      16-bit length, unicode string */
-
-        RichString aString( *this );
+    if( readCellHeader( rStrm, bBiff2Xf ) )
+    {
+        maCellData.mnCellType = XML_inlineStr;
         if( getBiff() == BIFF8 )
         {
-            aString.importUniString( rStrm );
+            // string may contain rich-text formatting
+            RichStringRef xString( new RichString( *this ) );
+            xString->importUniString( rStrm );
+            xString->finalizeImport();
+            mrSheetData.setStringCell( maCellData, xString );
         }
         else
         {
             // #i63105# use text encoding from FONT record
             rtl_TextEncoding eTextEnc = getTextEncoding();
-            if( const Font* pFont = getStyles().getFontFromCellXf( maCurrCell.mnXfId ).get() )
+            if( const Font* pFont = getStyles().getFontFromCellXf( maCellData.mnXfId ).get() )
                 eTextEnc = pFont->getFontEncoding();
-            BiffStringFlags nFlags = bBiff2Xf ? BIFF_STR_8BITLENGTH : BIFF_STR_DEFAULT;
-            setFlag( nFlags, BIFF_STR_EXTRAFONTS, rStrm.getRecId() == BIFF_ID_RSTRING );
-            aString.importByteString( rStrm, eTextEnc, nFlags );
+            // RSTRING record contains rich-text formatting
+            if( rStrm.getRecId() == BIFF_ID_RSTRING )
+            {
+                BiffStringFlags nFlags = BIFF_STR_EXTRAFONTS;
+                // BIFF2 record identifier: 8-bit string length (see above)
+                setFlag( nFlags, BIFF_STR_8BITLENGTH, bBiff2Xf );
+                RichStringRef xString( new RichString( *this ) );
+                xString->importByteString( rStrm, eTextEnc, nFlags );
+                xString->finalizeImport();
+                mrSheetData.setStringCell( maCellData, xString );
+            }
+            else
+            {
+                // BIFF2 record identifier: 8-bit string length (see above)
+                OUString aText = rStrm.readByteStringUC( !bBiff2Xf, eTextEnc );
+                mrSheetData.setStringCell( maCellData, aText );
+            }
         }
-        aString.finalizeImport();
-        aString.convert( xText, maCurrCell.mnXfId );
     }
-    setCellFormat( maCurrCell );
 }
 
 void BiffSheetDataContext::importLabelSst( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, false );
-    maCurrCell.mnCellType = XML_s;
-    if( maCurrCell.mxCell.is() )
-        setSharedStringCell( maCurrCell.mxCell, rStrm.readInt32(), maCurrCell.mnXfId );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, false ) )
+    {
+        maCellData.mnCellType = XML_s;
+        mrSheetData.setStringCell( maCellData, rStrm.readInt32() );
+    }
 }
 
 void BiffSheetDataContext::importMultBlank( BiffInputStream& rStrm )
 {
     BinAddress aAddr;
-    for( rStrm >> aAddr; rStrm.getRemaining() > 2; ++aAddr.mnCol )
-    {
-        setCurrCell( aAddr );
-        importXfId( rStrm, false );
-        setCellFormat( maCurrCell );
-    }
+    bool bValidAddr = true;
+    for( rStrm >> aAddr; bValidAddr && (rStrm.getRemaining() > 2); ++aAddr.mnCol )
+        if( (bValidAddr = readCellXfId( rStrm, aAddr, false )) == true )
+            mrSheetData.setBlankCell( maCellData );
 }
 
 void BiffSheetDataContext::importMultRk( BiffInputStream& rStrm )
 {
     BinAddress aAddr;
-    for( rStrm >> aAddr; rStrm.getRemaining() > 2; ++aAddr.mnCol )
+    bool bValidAddr = true;
+    for( rStrm >> aAddr; bValidAddr && (rStrm.getRemaining() > 2); ++aAddr.mnCol )
     {
-        setCurrCell( aAddr );
-        maCurrCell.mnCellType = XML_n;
-        importXfId( rStrm, false );
-        sal_Int32 nRkValue = rStrm.readInt32();
-        if( maCurrCell.mxCell.is() )
-            maCurrCell.mxCell->setValue( BiffHelper::calcDoubleFromRk( nRkValue ) );
-        setCellFormat( maCurrCell );
+        if( (bValidAddr = readCellXfId( rStrm, aAddr, false )) == true )
+        {
+            maCellData.mnCellType = XML_n;
+            sal_Int32 nRkValue = rStrm.readInt32();
+            mrSheetData.setValueCell( maCellData, BiffHelper::calcDoubleFromRk( nRkValue ) );
+        }
     }
 }
 
 void BiffSheetDataContext::importNumber( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, rStrm.getRecId() == BIFF2_ID_NUMBER );
-    maCurrCell.mnCellType = XML_n;
-    if( maCurrCell.mxCell.is() )
-        maCurrCell.mxCell->setValue( rStrm.readDouble() );
-    setCellFormat( maCurrCell );
+    if( readCellHeader( rStrm, rStrm.getRecId() == BIFF2_ID_NUMBER ) )
+    {
+        maCellData.mnCellType = XML_n;
+        mrSheetData.setValueCell( maCellData, rStrm.readDouble() );
+    }
 }
 
 void BiffSheetDataContext::importRk( BiffInputStream& rStrm )
 {
-    importCellHeader( rStrm, false );
-    maCurrCell.mnCellType = XML_n;
-    if( maCurrCell.mxCell.is() )
-        maCurrCell.mxCell->setValue( BiffHelper::calcDoubleFromRk( rStrm.readInt32() ) );
-    setCellFormat( maCurrCell );
-}
-
-void BiffSheetDataContext::importRow( BiffInputStream& rStrm )
-{
-    RowModel aModel;
-
-    sal_uInt16 nRow, nHeight;
-    rStrm >> nRow;
-    rStrm.skip( 4 );
-    rStrm >> nHeight;
-    if( getBiff() == BIFF2 )
+    if( readCellHeader( rStrm, false ) )
     {
-        rStrm.skip( 2 );
-        aModel.mbCustomFormat = rStrm.readuInt8() == BIFF2_ROW_CUSTOMFORMAT;
-        if( aModel.mbCustomFormat )
-        {
-            rStrm.skip( 5 );
-            aModel.mnXfId = rStrm.readuInt16();
-        }
+        maCellData.mnCellType = XML_n;
+        mrSheetData.setValueCell( maCellData, BiffHelper::calcDoubleFromRk( rStrm.readInt32() ) );
     }
-    else
-    {
-        rStrm.skip( 4 );
-        sal_uInt32 nFlags = rStrm.readuInt32();
-        aModel.mnXfId         = extractValue< sal_Int32 >( nFlags, 16, 12 );
-        aModel.mnLevel        = extractValue< sal_Int32 >( nFlags, 0, 3 );
-        aModel.mbCustomFormat = getFlag( nFlags, BIFF_ROW_CUSTOMFORMAT );
-        aModel.mbCustomHeight = getFlag( nFlags, BIFF_ROW_CUSTOMHEIGHT );
-        aModel.mbShowPhonetic = getFlag( nFlags, BIFF_ROW_SHOWPHONETIC );
-        aModel.mbHidden       = getFlag( nFlags, BIFF_ROW_HIDDEN );
-        aModel.mbCollapsed    = getFlag( nFlags, BIFF_ROW_COLLAPSED );
-        aModel.mbThickTop     = getFlag( nFlags, BIFF_ROW_THICKTOP );
-        aModel.mbThickBottom  = getFlag( nFlags, BIFF_ROW_THICKBOTTOM );
-    }
-
-    // row index is 0-based in BIFF, but RowModel expects 1-based
-    aModel.mnFirstRow = aModel.mnLastRow = nRow + 1;
-    // row height is in twips in BIFF, convert to points
-    aModel.mfHeight = (nHeight & BIFF_ROW_HEIGHTMASK) / 20.0;
-    // set row properties in the current sheet
-    setRowModel( aModel );
 }
 
 void BiffSheetDataContext::importArray( BiffInputStream& rStrm )
 {
-    BinRange aRange;
-    aRange.read( rStrm, false );    // columns always 8-bit
-    CellRangeAddress aArrayRange;
-    Reference< XCellRange > xRange = getCellRange( aRange, &aArrayRange );
-    Reference< XArrayFormulaTokens > xTokens( xRange, UNO_QUERY );
-    if( xRange.is() && xTokens.is() )
+    if( readFormulaRef( rStrm ) && maFmlaData.isValidArrayRef( maCellData.maCellAddr ) )
     {
-        rStrm.skip( mnArrayIgnoreSize );
-        ArrayFormulaContext aContext( xTokens, aArrayRange );
-        getFormulaParser().importFormula( aContext, rStrm );
+        rStrm.skip( mnArraySkipSize );
+        ApiTokenSequence aTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, FORMULATYPE_ARRAY, rStrm );
+        mrSheetData.createArrayFormula( maFmlaData.maFormulaRef, aTokens );
     }
 }
 
-void BiffSheetDataContext::importSharedFmla( BiffInputStream& rStrm )
-{
-    getSharedFormulas().importSharedFmla( rStrm, maCurrCell.maAddress );
-}
-
 void BiffSheetDataContext::importDataTable( BiffInputStream& rStrm )
 {
-    BinRange aRange;
-    aRange.read( rStrm, false );    // columns always 8-bit
-    CellRangeAddress aTableRange;
-    if( getAddressConverter().convertToCellRange( aTableRange, aRange, getSheetIndex(), true, true ) )
+    if( readFormulaRef( rStrm ) )
     {
         DataTableModel aModel;
         BinAddress aRef1, aRef2;
@@ -973,7 +978,17 @@ void BiffSheetDataContext::importDataTable( BiffInputStream& rStrm )
         }
         aModel.maRef1 = FormulaProcessorBase::generateAddress2dString( aRef1, false );
         aModel.maRef2 = FormulaProcessorBase::generateAddress2dString( aRef2, false );
-        setTableOperation( aTableRange, aModel );
+        mrSheetData.createTableOperation( maFmlaData.maFormulaRef, aModel );
+    }
+}
+
+void BiffSheetDataContext::importSharedFmla( BiffInputStream& rStrm )
+{
+    if( readFormulaRef( rStrm ) && maFmlaData.isValidSharedRef( maCellData.maCellAddr ) )
+    {
+        rStrm.skip( 2 );    // flags
+        ApiTokenSequence aTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, FORMULATYPE_SHAREDFORMULA, rStrm );
+        mrSheetData.createSharedFormula( maCellData.maCellAddr, aTokens );
     }
 }
 
diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx
index 27bc1f2be..5c1f18728 100644
--- a/oox/source/xls/stylesbuffer.cxx
+++ b/oox/source/xls/stylesbuffer.cxx
@@ -2540,6 +2540,41 @@ void Xf::writeToPropertySet( PropertySet& rPropSet ) const
     rPropSet.setProperties( aPropMap );
 }
 
+/*static*/ void Xf::writeBiff2CellFormatToPropertySet( const WorkbookHelper& rHelper,
+        PropertySet& rPropSet, sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 )
+{
+    /*  Create an XF object and let it do the work. We will have access to its
+        private members here. Also, create temporary border and fill objects,
+        this prevents polluting the border and fill buffers with new temporary
+        objects per imported cell. */
+    Xf aXf( rHelper );
+    Border aBorder( rHelper, false );
+    Fill aFill( rHelper, false );
+
+    // no used flags available in BIFF2 (always true)
+    aXf.setAllUsedFlags( true );
+
+    // set the attributes
+    aXf.maModel.mnFontId = extractValue< sal_Int32 >( nFlags2, 6, 2 );
+    aXf.maModel.mnNumFmtId = extractValue< sal_Int32 >( nFlags2, 0, 6 );
+    aXf.maAlignment.setBiff2Data( nFlags3 );
+    aXf.maProtection.setBiff2Data( nFlags1 );
+    aBorder.setBiff2Data( nFlags3 );
+    aFill.setBiff2Data( nFlags3 );
+
+    // finalize the objects (convert model to API attributes)
+    aXf.finalizeImport();
+    aBorder.finalizeImport();
+    aFill.finalizeImport();
+
+    // write the properties to the property set
+    PropertyMap aPropMap;
+    aXf.writeToPropertyMap( aPropMap );
+    aBorder.writeToPropertyMap( aPropMap );
+    aFill.writeToPropertyMap( aPropMap );
+    rPropSet.setProperties( aPropMap );
+}
+
 void Xf::setBiffUsedFlags( sal_uInt8 nUsedFlags )
 {
     /*  Notes about finding the used flags:
diff --git a/oox/source/xls/viewsettings.cxx b/oox/source/xls/viewsettings.cxx
index e3527239f..e2fd71f73 100644
--- a/oox/source/xls/viewsettings.cxx
+++ b/oox/source/xls/viewsettings.cxx
@@ -735,7 +735,7 @@ void ViewSettings::finalizeImport()
     sal_Int16 nShowMode = getWorkbookSettings().getApiShowObjectMode();
 
     // view settings for all sheets
-    Reference< XNameContainer > xSheetsNC = ContainerHelper::createNameContainer( getGlobalFactory() );
+    Reference< XNameContainer > xSheetsNC = ContainerHelper::createNameContainer( getBaseFilter().getComponentContext() );
     if( !xSheetsNC.is() ) return;
     for( SheetPropertiesMap::const_iterator aIt = maSheetProps.begin(), aEnd = maSheetProps.end(); aIt != aEnd; ++aIt )
         ContainerHelper::insertByName( xSheetsNC, rWorksheets.getCalcSheetName( aIt->first ), aIt->second );
@@ -747,7 +747,7 @@ void ViewSettings::finalizeImport()
     if( !rxActiveSheetView )
         rxActiveSheetView.reset( new SheetViewModel );
 
-    Reference< XIndexContainer > xContainer = ContainerHelper::createIndexContainer( getGlobalFactory() );
+    Reference< XIndexContainer > xContainer = ContainerHelper::createIndexContainer( getBaseFilter().getComponentContext() );
     if( xContainer.is() ) try
     {
         PropertyMap aPropMap;
diff --git a/oox/source/xls/workbookfragment.cxx b/oox/source/xls/workbookfragment.cxx
index eb79d3c69..9aef3ba31 100644
--- a/oox/source/xls/workbookfragment.cxx
+++ b/oox/source/xls/workbookfragment.cxx
@@ -223,8 +223,10 @@ void WorkbookFragment::finalizeImport()
     /*  Create fragments for all sheets, before importing them. Needed to do
         some preprocessing in the fragment constructors, e.g. loading the table
         fragments for all sheets that are needed before the cell formulas are
-        loaded. */
-    typedef ::std::vector< FragmentHandlerRef > SheetFragmentVector;
+        loaded. Additionally, the instances of the WorkbookGlobals structures
+        have to be stored for every sheet. */
+    typedef ::std::pair< WorksheetGlobalsRef, FragmentHandlerRef > SheetFragmentHandler;
+    typedef ::std::vector< SheetFragmentHandler > SheetFragmentVector;
     SheetFragmentVector aSheetFragments;
     WorksheetBuffer& rWorksheets = getWorksheets();
     sal_Int32 nWorksheetCount = rWorksheets.getWorksheetCount();
@@ -239,34 +241,49 @@ void WorkbookFragment::finalizeImport()
             OSL_ENSURE( aFragmentPath.getLength() > 0, "WorkbookFragment::finalizeImport - cannot access sheet fragment" );
             if( aFragmentPath.getLength() > 0 )
             {
-                ::rtl::Reference< WorksheetFragmentBase > xFragment;
                 double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
                 ISegmentProgressBarRef xSheetSegment = getProgressBar().createSegment( fSegmentLength );
 
-                // create the fragment according to the sheet type
+                // get the sheet type according to the relations type
+                WorksheetType eSheetType = SHEETTYPE_EMPTYSHEET;
                 if( pRelation->maType == CREATE_OFFICEDOC_RELATION_TYPE( "worksheet" ) )
-                {
-                    xFragment.set( new WorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_WORKSHEET, nCalcSheet ) );
-                }
+                    eSheetType = SHEETTYPE_WORKSHEET;
                 else if( pRelation->maType == CREATE_OFFICEDOC_RELATION_TYPE( "chartsheet" ) )
-                {
-                    xFragment.set( new ChartsheetFragment( *this, aFragmentPath, xSheetSegment, nCalcSheet ) );
-                }
+                    eSheetType = SHEETTYPE_CHARTSHEET;
                 else if( (pRelation->maType == CREATE_MSOFFICE_RELATION_TYPE( "xlMacrosheet" )) ||
                          (pRelation->maType == CREATE_MSOFFICE_RELATION_TYPE( "xlIntlMacrosheet" )) )
-                {
-                    xFragment.set( new WorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_MACROSHEET, nCalcSheet ) );
-                }
+                    eSheetType = SHEETTYPE_MACROSHEET;
                 else if( pRelation->maType == CREATE_OFFICEDOC_RELATION_TYPE( "dialogsheet" ) )
+                    eSheetType = SHEETTYPE_DIALOGSHEET;
+                OSL_ENSURE( eSheetType != SHEETTYPE_EMPTYSHEET, "WorkbookFragment::finalizeImport - unknown sheet type" );
+                if( eSheetType != SHEETTYPE_EMPTYSHEET )
                 {
-                    xFragment.set( new WorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_DIALOGSHEET, nCalcSheet ) );
+                    // create the WorksheetGlobals object
+                    WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, xSheetSegment, eSheetType, nCalcSheet );
+                    OSL_ENSURE( xSheetGlob.get(), "WorkbookFragment::finalizeImport - missing sheet in document" );
+                    if( xSheetGlob.get() )
+                    {
+                        // create the sheet fragment handler
+                        ::rtl::Reference< WorksheetFragmentBase > xFragment;
+                        switch( eSheetType )
+                        {
+                            case SHEETTYPE_WORKSHEET:
+                            case SHEETTYPE_MACROSHEET:
+                            case SHEETTYPE_DIALOGSHEET:
+                                xFragment.set( new WorksheetFragment( *xSheetGlob, aFragmentPath ) );
+                            break;
+                            case SHEETTYPE_CHARTSHEET:
+                                xFragment.set( new ChartsheetFragment( *xSheetGlob, aFragmentPath ) );
+                            break;
+                            default:
+                                OSL_ENSURE( false, "WorkbookFragment::finalizeImport - unexpected sheet type" );
+                        }
+
+                        // insert the fragment into the map
+                        if( xFragment.is() )
+                            aSheetFragments.push_back( SheetFragmentHandler( xSheetGlob, xFragment.get() ) );
+                    }
                 }
-
-                // insert the fragment into the map
-                OSL_ENSURE( xFragment.is(), "WorkbookFragment::finalizeImport - unknown sheet type" );
-                OSL_ENSURE( !xFragment.is() || xFragment->isValidSheet(), "WorkbookFragment::finalizeImport - missing sheet in document" );
-                if( xFragment.is() && xFragment->isValidSheet() )
-                    aSheetFragments.push_back( xFragment.get() );
             }
         }
     }
@@ -279,9 +296,10 @@ void WorkbookFragment::finalizeImport()
     for( SheetFragmentVector::iterator aIt = aSheetFragments.begin(), aEnd = aSheetFragments.end(); aIt != aEnd; ++aIt )
     {
         // import the sheet fragment
-        importOoxFragment( *aIt );
-        // delete fragment object, will free all allocated sheet buffers
-        aIt->clear();
+        importOoxFragment( aIt->second );
+        // delete fragment object and WorkbookGlobals object, will free all allocated sheet buffers
+        aIt->second.clear();
+        aIt->first.reset();
     }
 
     // open the VBA project storage
@@ -290,7 +308,7 @@ void WorkbookFragment::finalizeImport()
     {
         Reference< XInputStream > xInStrm = getBaseFilter().openInputStream( aVbaFragmentPath );
         if( xInStrm.is() )
-            setVbaProjectStorage( StorageRef( new ::oox::ole::OleStorage( getGlobalFactory(), xInStrm, false ) ) );
+            setVbaProjectStorage( StorageRef( new ::oox::ole::OleStorage( getBaseFilter().getComponentContext(), xInStrm, false ) ) );
     }
 
     // final conversions, e.g. calculation settings and view settings
@@ -359,6 +377,7 @@ bool BiffWorkbookFragment::importFragment()
     {
         case BIFF_FRAGMENT_GLOBALS:
         {
+            BiffInputStream& rStrm = getInputStream();
             // import workbook globals fragment and create sheets in document
             ISegmentProgressBarRef xGlobalsProgress = getProgressBar().createSegment( PROGRESS_LENGTH_GLOBALS );
             bRet = importGlobalsFragment( *xGlobalsProgress );
@@ -367,10 +386,25 @@ bool BiffWorkbookFragment::importFragment()
             bool bNextSheet = bRet;
             for( sal_Int32 nWorksheet = 0, nWorksheetCount = rWorksheets.getWorksheetCount(); bNextSheet && (nWorksheet < nWorksheetCount); ++nWorksheet )
             {
-                // try to start a new sheet fragment
+                // calculate progress size for the sheet
                 double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
                 ISegmentProgressBarRef xSheetProgress = getProgressBar().createSegment( fSegmentLength );
-                BiffFragmentType eSheetFragment = startFragment( getBiff(), rWorksheets.getBiffRecordHandle( nWorksheet ) );
+                /*  Try to start a new sheet fragment. The SHEET records point to the
+                    first record of the sheet fragment which is usually a BOF record. */
+                BiffFragmentType eSheetFragment = BIFF_FRAGMENT_UNKNOWN;
+                sal_Int64 nRecHandle = rWorksheets.getBiffRecordHandle( nWorksheet );
+                if( rStrm.startRecordByHandle( nRecHandle ) )
+                {
+                    /*  #i109800# Stream may point to any record of the sheet fragment.
+                        Check the record identifier before calling startFragment(). */
+                    bool bIsBofRec = BiffHelper::isBofRecord( rStrm );
+                    /*  Rewind the record. If it is the BOF record, it will be read in
+                        startFragment(). In every case, stream will point before the
+                        first available non-BOF record. */
+                    rStrm.rewindRecord();
+                    // if the BOF record is missing, a regular worksheet will be assumed
+                    eSheetFragment = bIsBofRec ? startFragment( getBiff() ) : BIFF_FRAGMENT_WORKSHEET;
+                }
                 sal_Int16 nCalcSheet = rWorksheets.getCalcSheetIndex( nWorksheet );
                 bNextSheet = importSheetFragment( *xSheetProgress, eSheetFragment, nCalcSheet );
             }
@@ -700,26 +734,32 @@ bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBa
         break;
     }
 
-    // create the worksheet fragment
+    // create the WorksheetGlobals object
     ISegmentProgressBarRef xSheetProgress = rProgressBar.createSegment( rProgressBar.getFreeLength() );
+    WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, xSheetProgress, eSheetType, nCalcSheet );
+    OSL_ENSURE( xSheetGlob.get(), "BiffWorkbookFragment::importSheetFragment - missing sheet in document" );
+    if( !xSheetGlob.get() )
+        return false;
+        
+    // create the worksheet fragment
     ::boost::shared_ptr< BiffWorksheetFragmentBase > xFragment;
     switch( eSheetType )
     {
         case SHEETTYPE_WORKSHEET:
         case SHEETTYPE_MACROSHEET:
         case SHEETTYPE_DIALOGSHEET:
-            xFragment.reset( new BiffWorksheetFragment( *this, xSheetProgress, eSheetType, nCalcSheet ) );
+            xFragment.reset( new BiffWorksheetFragment( *xSheetGlob, *this ) );
         break;
         case SHEETTYPE_CHARTSHEET:
-            xFragment.reset( new BiffChartsheetFragment( *this, xSheetProgress, nCalcSheet ) );
+            xFragment.reset( new BiffChartsheetFragment( *xSheetGlob, *this ) );
         break;
         case SHEETTYPE_MODULESHEET:
         case SHEETTYPE_EMPTYSHEET:
-            xFragment.reset( new BiffSkipWorksheetFragment( *this, xSheetProgress, nCalcSheet ) );
+            xFragment.reset( new BiffSkipWorksheetFragment( *xSheetGlob, *this ) );
         break;
     }
     // load the sheet fragment records
-    return xFragment->isValidSheet() && xFragment->importFragment();
+    return xFragment.get() && xFragment->importFragment();
 }
 
 // ============================================================================
diff --git a/oox/source/xls/workbookhelper.cxx b/oox/source/xls/workbookhelper.cxx
index c30dce35f..3a5d7076b 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -100,12 +100,12 @@ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rNam
 
 // ============================================================================
 
-class WorkbookData
+class WorkbookGlobals
 {
 public:
-    explicit            WorkbookData( ExcelFilter& rFilter );
-    explicit            WorkbookData( ExcelBiffFilter& rFilter, BiffType eBiff );
-                        ~WorkbookData();
+    explicit            WorkbookGlobals( ExcelFilter& rFilter );
+    explicit            WorkbookGlobals( ExcelBiffFilter& rFilter, BiffType eBiff );
+                        ~WorkbookGlobals();
 
     /** Returns true, if this helper refers to a valid document. */
     inline bool         isValid() const { return mxDoc.is(); }
@@ -120,14 +120,15 @@ public:
     inline FilterType   getFilterType() const { return meFilterType; }
     /** Returns true, if the file is a multi-sheet document, or false if single-sheet. */
     inline bool         isWorkbookFile() const { return mbWorkbook; }
-    /** Returns the index of the current sheet in the Calc document. */
-    inline sal_Int16    getCurrentSheetIndex() const { return mnCurrSheet; }
-    /** Sets the index of the current sheet in the Calc document. */
-    inline void         setCurrentSheetIndex( sal_Int16 nSheet ) { mnCurrSheet = nSheet; }
     /** Returns the VBA project storage. */
     inline StorageRef   getVbaProjectStorage() const { return mxVbaPrjStrg; }
-    /** Sets the VBA project storage. */
+    /** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
+    inline sal_Int16    getCurrentSheetIndex() const { return mnCurrSheet; }
+
+    /** Sets the VBA project storage used to import VBA source code and forms. */
     inline void         setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; }
+    /** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
+    inline void         setCurrentSheetIndex( sal_Int16 nSheet ) { mnCurrSheet = nSheet; }
 
     // document model ---------------------------------------------------------
 
@@ -290,7 +291,7 @@ private:
 
 // ----------------------------------------------------------------------------
 
-WorkbookData::WorkbookData( ExcelFilter& rFilter ) :
+WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :
     mrBaseFilter( rFilter ),
     mrExcelBase( rFilter ),
     meFilterType( FILTER_OOXML ),
@@ -299,11 +300,11 @@ WorkbookData::WorkbookData( ExcelFilter& rFilter ) :
     meBiff( BIFF_UNKNOWN )
 {
     // register at the filter, needed for virtual callbacks (even during construction)
-    mrExcelBase.registerWorkbookData( *this );
+    mrExcelBase.registerWorkbookGlobals( *this );
     initialize( true );
 }
 
-WorkbookData::WorkbookData( ExcelBiffFilter& rFilter, BiffType eBiff ) :
+WorkbookGlobals::WorkbookGlobals( ExcelBiffFilter& rFilter, BiffType eBiff ) :
     mrBaseFilter( rFilter ),
     mrExcelBase( rFilter ),
     meFilterType( FILTER_BIFF ),
@@ -312,19 +313,19 @@ WorkbookData::WorkbookData( ExcelBiffFilter& rFilter, BiffType eBiff ) :
     meBiff( eBiff )
 {
     // register at the filter, needed for virtual callbacks (even during construction)
-    mrExcelBase.registerWorkbookData( *this );
+    mrExcelBase.registerWorkbookGlobals( *this );
     initialize( eBiff >= BIFF5 );
 }
 
-WorkbookData::~WorkbookData()
+WorkbookGlobals::~WorkbookGlobals()
 {
     finalize();
-    mrExcelBase.unregisterWorkbookData();
+    mrExcelBase.unregisterWorkbookGlobals();
 }
 
 // document model -------------------------------------------------------------
 
-Reference< XNameContainer > WorkbookData::getStyleFamily( bool bPageStyles ) const
+Reference< XNameContainer > WorkbookGlobals::getStyleFamily( bool bPageStyles ) const
 {
     Reference< XNameContainer > xStylesNC;
     try
@@ -336,11 +337,11 @@ Reference< XNameContainer > WorkbookData::getStyleFamily( bool bPageStyles ) con
     catch( Exception& )
     {
     }
-    OSL_ENSURE( xStylesNC.is(), "WorkbookData::getStyleFamily - cannot access style family" );
+    OSL_ENSURE( xStylesNC.is(), "WorkbookGlobals::getStyleFamily - cannot access style family" );
     return xStylesNC;
 }
 
-Reference< XStyle > WorkbookData::getStyleObject( const OUString& rStyleName, bool bPageStyle ) const
+Reference< XStyle > WorkbookGlobals::getStyleObject( const OUString& rStyleName, bool bPageStyle ) const
 {
     Reference< XStyle > xStyle;
     try
@@ -351,11 +352,11 @@ Reference< XStyle > WorkbookData::getStyleObject( const OUString& rStyleName, bo
     catch( Exception& )
     {
     }
-    OSL_ENSURE( xStyle.is(), "WorkbookData::getStyleObject - cannot access style object" );
+    OSL_ENSURE( xStyle.is(), "WorkbookGlobals::getStyleObject - cannot access style object" );
     return xStyle;
 }
 
-Reference< XNamedRange > WorkbookData::createNamedRangeObject( OUString& orName, sal_Int32 nNameFlags ) const
+Reference< XNamedRange > WorkbookGlobals::createNamedRangeObject( OUString& orName, sal_Int32 nNameFlags ) const
 {
     // create the name and insert it into the Calc document
     Reference< XNamedRange > xNamedRange;
@@ -373,11 +374,11 @@ Reference< XNamedRange > WorkbookData::createNamedRangeObject( OUString& orName,
     catch( Exception& )
     {
     }
-    OSL_ENSURE( xNamedRange.is(), "WorkbookData::createNamedRangeObject - cannot create defined name" );
+    OSL_ENSURE( xNamedRange.is(), "WorkbookGlobals::createNamedRangeObject - cannot create defined name" );
     return xNamedRange;
 }
 
-Reference< XDatabaseRange > WorkbookData::createDatabaseRangeObject( OUString& orName, const CellRangeAddress& rRangeAddr ) const
+Reference< XDatabaseRange > WorkbookGlobals::createDatabaseRangeObject( OUString& orName, const CellRangeAddress& rRangeAddr ) const
 {
     // validate cell range
     CellRangeAddress aDestRange = rRangeAddr;
@@ -399,11 +400,11 @@ Reference< XDatabaseRange > WorkbookData::createDatabaseRangeObject( OUString& o
     catch( Exception& )
     {
     }
-    OSL_ENSURE( xDatabaseRange.is(), "WorkbookData::createDatabaseRangeObject - cannot create database range" );
+    OSL_ENSURE( xDatabaseRange.is(), "WorkbookGlobals::createDatabaseRangeObject - cannot create database range" );
     return xDatabaseRange;
 }
 
-Reference< XDatabaseRange > WorkbookData::createUnnamedDatabaseRangeObject( const CellRangeAddress& rRangeAddr ) const
+Reference< XDatabaseRange > WorkbookGlobals::createUnnamedDatabaseRangeObject( const CellRangeAddress& rRangeAddr ) const
 {
     // validate cell range
     CellRangeAddress aDestRange = rRangeAddr;
@@ -425,7 +426,7 @@ Reference< XDatabaseRange > WorkbookData::createUnnamedDatabaseRangeObject( cons
     return xDatabaseRange;
 }
 
-Reference< XStyle > WorkbookData::createStyleObject( OUString& orStyleName, bool bPageStyle ) const
+Reference< XStyle > WorkbookGlobals::createStyleObject( OUString& orStyleName, bool bPageStyle ) const
 {
     Reference< XStyle > xStyle;
     try
@@ -437,63 +438,62 @@ Reference< XStyle > WorkbookData::createStyleObject( OUString& orStyleName, bool
     catch( Exception& )
     {
     }
-    OSL_ENSURE( xStyle.is(), "WorkbookData::createStyleObject - cannot create style" );
+    OSL_ENSURE( xStyle.is(), "WorkbookGlobals::createStyleObject - cannot create style" );
     return xStyle;
 }
 
 // BIFF specific --------------------------------------------------------------
 
-void WorkbookData::setTextEncoding( rtl_TextEncoding eTextEnc )
+void WorkbookGlobals::setTextEncoding( rtl_TextEncoding eTextEnc )
 {
     if( eTextEnc != RTL_TEXTENCODING_DONTKNOW )
         meTextEnc = eTextEnc;
 }
 
-void WorkbookData::setCodePage( sal_uInt16 nCodePage )
+void WorkbookGlobals::setCodePage( sal_uInt16 nCodePage )
 {
     setTextEncoding( BiffHelper::calcTextEncodingFromCodePage( nCodePage ) );
     mbHasCodePage = true;
 }
 
-void WorkbookData::setAppFontEncoding( rtl_TextEncoding eAppFontEnc )
+void WorkbookGlobals::setAppFontEncoding( rtl_TextEncoding eAppFontEnc )
 {
     if( !mbHasCodePage )
         setTextEncoding( eAppFontEnc );
 }
 
-void WorkbookData::setIsWorkbookFile()
+void WorkbookGlobals::setIsWorkbookFile()
 {
-    OSL_ENSURE( meBiff == BIFF4, "WorkbookData::setIsWorkbookFile - invalid call" );
+    OSL_ENSURE( meBiff == BIFF4, "WorkbookGlobals::setIsWorkbookFile - invalid call" );
     mbWorkbook = true;
 }
 
-void WorkbookData::createBuffersPerSheet( sal_Int16 nSheet )
+void WorkbookGlobals::createBuffersPerSheet( sal_Int16 nSheet )
 {
-    // set mnCurrSheet to enable usage of WorkbookHelper::getCurrentSheetIndex()
-    mnCurrSheet = nSheet;
     switch( meBiff )
     {
         case BIFF2:
         case BIFF3:
-            OSL_ENSURE( mnCurrSheet == 0, "WorkbookData::createBuffersPerSheet - unexpected sheet index" );
-            mxDefNames->setLocalCalcSheet( mnCurrSheet );
+            OSL_ENSURE( nSheet == 0, "WorkbookGlobals::createBuffersPerSheet - unexpected sheet index" );
+            mxDefNames->setLocalCalcSheet( nSheet );
         break;
 
         case BIFF4:
-            OSL_ENSURE( mbWorkbook || (mnCurrSheet == 0), "WorkbookData::createBuffersPerSheet - unexpected sheet index" );
+            OSL_ENSURE( mbWorkbook || (nSheet == 0), "WorkbookGlobals::createBuffersPerSheet - unexpected sheet index" );
             // #i11183# sheets in BIFF4W files have own styles and names
-            if( mbWorkbook && (mnCurrSheet > 0) )
+            if( nSheet > 0 )
             {
                 mxStyles.reset( new StylesBuffer( *this ) );
                 mxDefNames.reset( new DefinedNamesBuffer( *this ) );
                 mxExtLinks.reset( new ExternalLinkBuffer( *this ) );
             }
-            mxDefNames->setLocalCalcSheet( mnCurrSheet );
+            mxDefNames->setLocalCalcSheet( nSheet );
         break;
 
         case BIFF5:
             // BIFF5 stores external references per sheet
-            mxExtLinks.reset( new ExternalLinkBuffer( *this ) );
+            if( nSheet > 0 )
+                mxExtLinks.reset( new ExternalLinkBuffer( *this ) );
         break;
 
         case BIFF8:
@@ -502,12 +502,11 @@ void WorkbookData::createBuffersPerSheet( sal_Int16 nSheet )
         case BIFF_UNKNOWN:
         break;
     }
-    mnCurrSheet = -1;
 }
 
 // private --------------------------------------------------------------------
 
-void WorkbookData::initialize( bool bWorkbookFile )
+void WorkbookGlobals::initialize( bool bWorkbookFile )
 {
     maCellStyles = CREATE_OUSTRING( "CellStyles" );
     maPageStyles = CREATE_OUSTRING( "PageStyles" );
@@ -520,7 +519,7 @@ void WorkbookData::initialize( bool bWorkbookFile )
 
     // the spreadsheet document
     mxDoc.set( mrBaseFilter.getModel(), UNO_QUERY );
-    OSL_ENSURE( mxDoc.is(), "WorkbookData::initialize - no spreadsheet document" );
+    OSL_ENSURE( mxDoc.is(), "WorkbookGlobals::initialize - no spreadsheet document" );
 
     mxWorkbookSettings.reset( new WorkbookSettings( *this ) );
     mxViewSettings.reset( new ViewSettings( *this ) );
@@ -583,7 +582,7 @@ void WorkbookData::initialize( bool bWorkbookFile )
     }
 }
 
-void WorkbookData::finalize()
+void WorkbookGlobals::finalize()
 {
     // set some document properties needed after import
     if( mrBaseFilter.isImportFilter() )
@@ -614,62 +613,73 @@ WorkbookHelper::~WorkbookHelper()
 {
 }
 
-// filter ---------------------------------------------------------------------
+/*static*/ WorkbookGlobalsRef WorkbookHelper::constructGlobals( ExcelFilter& rFilter )
+{
+    WorkbookGlobalsRef xBookGlob( new WorkbookGlobals( rFilter ) );
+    if( !xBookGlob->isValid() )
+        xBookGlob.reset();
+    return xBookGlob;
+}
 
-FilterBase& WorkbookHelper::getBaseFilter() const
+/*static*/ WorkbookGlobalsRef WorkbookHelper::constructGlobals( ExcelBiffFilter& rFilter, BiffType eBiff )
 {
-    return mrBookData.getBaseFilter();
+    WorkbookGlobalsRef xBookGlob( new WorkbookGlobals( rFilter, eBiff ) );
+    if( !xBookGlob->isValid() )
+        xBookGlob.reset();
+    return xBookGlob;
 }
 
-Reference< XMultiServiceFactory > WorkbookHelper::getGlobalFactory() const
+// filter ---------------------------------------------------------------------
+
+FilterBase& WorkbookHelper::getBaseFilter() const
 {
-    return mrBookData.getBaseFilter().getServiceFactory();
+    return mrBookGlob.getBaseFilter();
 }
 
 FilterType WorkbookHelper::getFilterType() const
 {
-    return mrBookData.getFilterType();
+    return mrBookGlob.getFilterType();
 }
 
 SegmentProgressBar& WorkbookHelper::getProgressBar() const
 {
-    return mrBookData.getProgressBar();
+    return mrBookGlob.getProgressBar();
 }
 
 bool WorkbookHelper::isWorkbookFile() const
 {
-    return mrBookData.isWorkbookFile();
+    return mrBookGlob.isWorkbookFile();
 }
 
 sal_Int16 WorkbookHelper::getCurrentSheetIndex() const
 {
-    return mrBookData.getCurrentSheetIndex();
+    return mrBookGlob.getCurrentSheetIndex();
 }
 
-void WorkbookHelper::setCurrentSheetIndex( sal_Int16 nSheet )
+void WorkbookHelper::setVbaProjectStorage( const StorageRef& rxVbaPrjStrg )
 {
-    mrBookData.setCurrentSheetIndex( nSheet );
+    mrBookGlob.setVbaProjectStorage( rxVbaPrjStrg );
 }
 
-void WorkbookHelper::setVbaProjectStorage( const StorageRef& rxVbaPrjStrg )
+void WorkbookHelper::setCurrentSheetIndex( sal_Int16 nSheet )
 {
-    mrBookData.setVbaProjectStorage( rxVbaPrjStrg );
+    mrBookGlob.setCurrentSheetIndex( nSheet );
 }
 
 void WorkbookHelper::finalizeWorkbookImport()
 {
     // workbook settings, document and sheet view settings
-    mrBookData.getWorkbookSettings().finalizeImport();
-    mrBookData.getViewSettings().finalizeImport();
+    mrBookGlob.getWorkbookSettings().finalizeImport();
+    mrBookGlob.getViewSettings().finalizeImport();
 
     /*  Insert all pivot tables. Must be done after loading all sheets, because
         data pilots expect existing source data on creation. */
-    mrBookData.getPivotTables().finalizeImport();
+    mrBookGlob.getPivotTables().finalizeImport();
 
     /*  Insert scenarios after all sheet processing is done, because new hidden
         sheets are created for scenarios which would confuse code that relies
         on certain sheet indexes. Must be done after pivot tables too. */
-    mrBookData.getScenarios().finalizeImport();
+    mrBookGlob.getScenarios().finalizeImport();
 
     /*  Set 'Default' page style to automatic page numbering (default is manual
         number 1). Otherwise hidden sheets (e.g. for scenarios) which have
@@ -680,7 +690,7 @@ void WorkbookHelper::finalizeWorkbookImport()
 
     /*  Import the VBA project (after finalizing workbook settings which
         contains the workbook code name). */
-    StorageRef xVbaPrjStrg = mrBookData.getVbaProjectStorage();
+    StorageRef xVbaPrjStrg = mrBookGlob.getVbaProjectStorage();
     if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
         getBaseFilter().getVbaProject().importVbaProject( *xVbaPrjStrg, getBaseFilter().getGraphicHelper() );
 }
@@ -689,12 +699,7 @@ void WorkbookHelper::finalizeWorkbookImport()
 
 Reference< XSpreadsheetDocument > WorkbookHelper::getDocument() const
 {
-    return mrBookData.getDocument();
-}
-
-Reference< XMultiServiceFactory > WorkbookHelper::getDocumentFactory() const
-{
-    return mrBookData.getBaseFilter().getModelFactory();
+    return mrBookGlob.getDocument();
 }
 
 Reference< XSpreadsheet > WorkbookHelper::getSheetFromDoc( sal_Int16 nSheet ) const
@@ -755,134 +760,134 @@ Reference< XCellRange > WorkbookHelper::getCellRangeFromDoc( const CellRangeAddr
 
 Reference< XNameContainer > WorkbookHelper::getStyleFamily( bool bPageStyles ) const
 {
-    return mrBookData.getStyleFamily( bPageStyles );
+    return mrBookGlob.getStyleFamily( bPageStyles );
 }
 
 Reference< XStyle > WorkbookHelper::getStyleObject( const OUString& rStyleName, bool bPageStyle ) const
 {
-    return mrBookData.getStyleObject( rStyleName, bPageStyle );
+    return mrBookGlob.getStyleObject( rStyleName, bPageStyle );
 }
 
 Reference< XNamedRange > WorkbookHelper::createNamedRangeObject( OUString& orName, sal_Int32 nNameFlags ) const
 {
-    return mrBookData.createNamedRangeObject( orName, nNameFlags );
+    return mrBookGlob.createNamedRangeObject( orName, nNameFlags );
 }
 
 Reference< XDatabaseRange > WorkbookHelper::createDatabaseRangeObject( OUString& orName, const CellRangeAddress& rRangeAddr ) const
 {
-    return mrBookData.createDatabaseRangeObject( orName, rRangeAddr );
+    return mrBookGlob.createDatabaseRangeObject( orName, rRangeAddr );
 }
 
 Reference< XDatabaseRange > WorkbookHelper::createUnnamedDatabaseRangeObject( const CellRangeAddress& rRangeAddr ) const
 {
-    return mrBookData.createUnnamedDatabaseRangeObject( rRangeAddr );
+    return mrBookGlob.createUnnamedDatabaseRangeObject( rRangeAddr );
 }
 
 Reference< XStyle > WorkbookHelper::createStyleObject( OUString& orStyleName, bool bPageStyle ) const
 {
-    return mrBookData.createStyleObject( orStyleName, bPageStyle );
+    return mrBookGlob.createStyleObject( orStyleName, bPageStyle );
 }
 
 // buffers --------------------------------------------------------------------
 
 WorkbookSettings& WorkbookHelper::getWorkbookSettings() const
 {
-    return mrBookData.getWorkbookSettings();
+    return mrBookGlob.getWorkbookSettings();
 }
 
 ViewSettings& WorkbookHelper::getViewSettings() const
 {
-    return mrBookData.getViewSettings();
+    return mrBookGlob.getViewSettings();
 }
 
 WorksheetBuffer& WorkbookHelper::getWorksheets() const
 {
-    return mrBookData.getWorksheets();
+    return mrBookGlob.getWorksheets();
 }
 
 ThemeBuffer& WorkbookHelper::getTheme() const
 {
-    return mrBookData.getTheme();
+    return mrBookGlob.getTheme();
 }
 
 StylesBuffer& WorkbookHelper::getStyles() const
 {
-    return mrBookData.getStyles();
+    return mrBookGlob.getStyles();
 }
 
 SharedStringsBuffer& WorkbookHelper::getSharedStrings() const
 {
-    return mrBookData.getSharedStrings();
+    return mrBookGlob.getSharedStrings();
 }
 
 ExternalLinkBuffer& WorkbookHelper::getExternalLinks() const
 {
-    return mrBookData.getExternalLinks();
+    return mrBookGlob.getExternalLinks();
 }
 
 DefinedNamesBuffer& WorkbookHelper::getDefinedNames() const
 {
-    return mrBookData.getDefinedNames();
+    return mrBookGlob.getDefinedNames();
 }
 
 TableBuffer& WorkbookHelper::getTables() const
 {
-    return mrBookData.getTables();
+    return mrBookGlob.getTables();
 }
 
 ScenarioBuffer& WorkbookHelper::getScenarios() const
 {
-    return mrBookData.getScenarios();
+    return mrBookGlob.getScenarios();
 }
 
 ConnectionsBuffer& WorkbookHelper::getConnections() const
 {
-    return mrBookData.getConnections();
+    return mrBookGlob.getConnections();
 }
 
 PivotCacheBuffer& WorkbookHelper::getPivotCaches() const
 {
-    return mrBookData.getPivotCaches();
+    return mrBookGlob.getPivotCaches();
 }
 
 PivotTableBuffer& WorkbookHelper::getPivotTables() const
 {
-    return mrBookData.getPivotTables();
+    return mrBookGlob.getPivotTables();
 }
 
 // converters -----------------------------------------------------------------
 
 FormulaParser& WorkbookHelper::getFormulaParser() const
 {
-    return mrBookData.getFormulaParser();
+    return mrBookGlob.getFormulaParser();
 }
 
 UnitConverter& WorkbookHelper::getUnitConverter() const
 {
-    return mrBookData.getUnitConverter();
+    return mrBookGlob.getUnitConverter();
 }
 
 AddressConverter& WorkbookHelper::getAddressConverter() const
 {
-    return mrBookData.getAddressConverter();
+    return mrBookGlob.getAddressConverter();
 }
 
 ExcelChartConverter& WorkbookHelper::getChartConverter() const
 {
-    return mrBookData.getChartConverter();
+    return mrBookGlob.getChartConverter();
 }
 
 PageSettingsConverter& WorkbookHelper::getPageSettingsConverter() const
 {
-    return mrBookData.getPageSettingsConverter();
+    return mrBookGlob.getPageSettingsConverter();
 }
 
 // OOXML/BIFF12 specific ------------------------------------------------------
 
 XmlFilterBase& WorkbookHelper::getOoxFilter() const
 {
-    OSL_ENSURE( mrBookData.getFilterType() == FILTER_OOXML, "WorkbookHelper::getOoxFilter - invalid call" );
-    return mrBookData.getOoxFilter();
+    OSL_ENSURE( mrBookGlob.getFilterType() == FILTER_OOXML, "WorkbookHelper::getOoxFilter - invalid call" );
+    return mrBookGlob.getOoxFilter();
 }
 
 bool WorkbookHelper::importOoxFragment( const ::rtl::Reference< FragmentHandler >& rxHandler )
@@ -894,82 +899,48 @@ bool WorkbookHelper::importOoxFragment( const ::rtl::Reference< FragmentHandler
 
 BinaryFilterBase& WorkbookHelper::getBiffFilter() const
 {
-    OSL_ENSURE( mrBookData.getFilterType() == FILTER_BIFF, "WorkbookHelper::getBiffFilter - invalid call" );
-    return mrBookData.getBiffFilter();
+    OSL_ENSURE( mrBookGlob.getFilterType() == FILTER_BIFF, "WorkbookHelper::getBiffFilter - invalid call" );
+    return mrBookGlob.getBiffFilter();
 }
 
 BiffType WorkbookHelper::getBiff() const
 {
-    return mrBookData.getBiff();
+    return mrBookGlob.getBiff();
 }
 
 rtl_TextEncoding WorkbookHelper::getTextEncoding() const
 {
-    return mrBookData.getTextEncoding();
+    return mrBookGlob.getTextEncoding();
 }
 
 void WorkbookHelper::setTextEncoding( rtl_TextEncoding eTextEnc )
 {
-    mrBookData.setTextEncoding( eTextEnc );
+    mrBookGlob.setTextEncoding( eTextEnc );
 }
 
 void WorkbookHelper::setCodePage( sal_uInt16 nCodePage )
 {
-    mrBookData.setCodePage( nCodePage );
+    mrBookGlob.setCodePage( nCodePage );
 }
 
 void WorkbookHelper::setAppFontEncoding( rtl_TextEncoding eAppFontEnc )
 {
-    mrBookData.setAppFontEncoding( eAppFontEnc );
+    mrBookGlob.setAppFontEncoding( eAppFontEnc );
 }
 
 void WorkbookHelper::setIsWorkbookFile()
 {
-    mrBookData.setIsWorkbookFile();
+    mrBookGlob.setIsWorkbookFile();
 }
 
 void WorkbookHelper::createBuffersPerSheet( sal_Int16 nSheet )
 {
-    mrBookData.createBuffersPerSheet( nSheet );
+    mrBookGlob.createBuffersPerSheet( nSheet );
 }
 
 BiffCodecHelper& WorkbookHelper::getCodecHelper() const
 {
-    return mrBookData.getCodecHelper();
-}
-
-// ============================================================================
-
-namespace prv {
-
-WorkbookDataOwner::WorkbookDataOwner( WorkbookDataRef xBookData ) :
-    mxBookData( xBookData )
-{
-}
-
-WorkbookDataOwner::~WorkbookDataOwner()
-{
-}
-
-} // namespace prv
-
-// ----------------------------------------------------------------------------
-
-WorkbookHelperRoot::WorkbookHelperRoot( ExcelFilter& rFilter ) :
-    prv::WorkbookDataOwner( prv::WorkbookDataRef( new WorkbookData( rFilter ) ) ),
-    WorkbookHelper( *mxBookData )
-{
-}
-
-WorkbookHelperRoot::WorkbookHelperRoot( ExcelBiffFilter& rFilter, BiffType eBiff ) :
-    prv::WorkbookDataOwner( prv::WorkbookDataRef( new WorkbookData( rFilter, eBiff ) ) ),
-    WorkbookHelper( *mxBookData )
-{
-}
-
-bool WorkbookHelperRoot::isValid() const
-{
-    return mxBookData->isValid();
+    return mrBookGlob.getCodecHelper();
 }
 
 // ============================================================================
diff --git a/oox/source/xls/workbooksettings.cxx b/oox/source/xls/workbooksettings.cxx
index 3f7b4e2c9..9a5415a6a 100644
--- a/oox/source/xls/workbooksettings.cxx
+++ b/oox/source/xls/workbooksettings.cxx
@@ -301,7 +301,7 @@ void WorkbookSettings::finalizeImport()
     {
         getBaseFilter().getMediaDescriptor()[ CREATE_OUSTRING( "ReadOnly" ) ] <<= true;
 
-        Reference< XPropertySet > xDocumentSettings( getDocumentFactory()->createInstance(
+        Reference< XPropertySet > xDocumentSettings( getBaseFilter().getModelFactory()->createInstance(
             CREATE_OUSTRING( "com.sun.star.document.Settings" ) ), UNO_QUERY_THROW );
         PropertySet aSettingsProp( xDocumentSettings );
         if( maFileSharing.mbRecommendReadOnly )
diff --git a/oox/source/xls/worksheetfragment.cxx b/oox/source/xls/worksheetfragment.cxx
index 0c4418566..9b31bfa47 100644
--- a/oox/source/xls/worksheetfragment.cxx
+++ b/oox/source/xls/worksheetfragment.cxx
@@ -38,12 +38,14 @@
 #include "oox/xls/commentsfragment.hxx"
 #include "oox/xls/condformatcontext.hxx"
 #include "oox/xls/drawingfragment.hxx"
+#include "oox/xls/drawingmanager.hxx"
 #include "oox/xls/externallinkbuffer.hxx"
 #include "oox/xls/pagesettings.hxx"
 #include "oox/xls/pivottablefragment.hxx"
 #include "oox/xls/querytablefragment.hxx"
 #include "oox/xls/scenariobuffer.hxx"
 #include "oox/xls/scenariocontext.hxx"
+#include "oox/xls/sheetdatabuffer.hxx"
 #include "oox/xls/sheetdatacontext.hxx"
 #include "oox/xls/tablefragment.hxx"
 #include "oox/xls/viewsettings.hxx"
@@ -124,32 +126,18 @@ ContextHandlerRef DataValidationsContext::onCreateContext( sal_Int32 nElement, c
     return 0;
 }
 
-namespace {
-
-ApiTokenSequence lclImportDataValFormula( FormulaParser& rParser, const OUString& rFormula, const CellAddress& rBaseAddress )
-{
-    TokensFormulaContext aContext( true, false );
-    aContext.setBaseAddress( rBaseAddress );
-    rParser.importFormula( aContext, rFormula );
-    return aContext.getTokens();
-}
-
-} // namespace
-
 void DataValidationsContext::onCharacters( const OUString& rChars )
 {
     if( mxValModel.get() ) switch( getCurrentElement() )
     {
         case XLS_TOKEN( formula1 ):
-            mxValModel->maTokens1 = lclImportDataValFormula(
-                getFormulaParser(), rChars, mxValModel->maRanges.getBaseAddress() );
+            mxValModel->maTokens1 = getFormulaParser().importFormula( mxValModel->maRanges.getBaseAddress(), rChars );
             // process string list of a list validation (convert to list of string tokens)
             if( mxValModel->mnType == XML_list )
                 getFormulaParser().convertStringToStringList( mxValModel->maTokens1, ',', true );
         break;
         case XLS_TOKEN( formula2 ):
-            mxValModel->maTokens2 = lclImportDataValFormula(
-                getFormulaParser(), rChars, mxValModel->maRanges.getBaseAddress() );
+            mxValModel->maTokens2 = getFormulaParser().importFormula( mxValModel->maRanges.getBaseAddress(), rChars );
         break;
     }
 }
@@ -213,12 +201,9 @@ void DataValidationsContext::importDataValidation( SequenceInputStream& rStrm )
 
     // condition formula(s)
     FormulaParser& rParser = getFormulaParser();
-    TokensFormulaContext aContext( true, false );
-    aContext.setBaseAddress( aModel.maRanges.getBaseAddress() );
-    rParser.importFormula( aContext, rStrm );
-    aModel.maTokens1 = aContext.getTokens();
-    rParser.importFormula( aContext, rStrm );
-    aModel.maTokens2 = aContext.getTokens();
+    CellAddress aBaseAddr = aModel.maRanges.getBaseAddress();
+    aModel.maTokens1 = rParser.importFormula( aBaseAddr, FORMULATYPE_VALIDATION, rStrm );
+    aModel.maTokens2 = rParser.importFormula( aBaseAddr, FORMULATYPE_VALIDATION, rStrm );
     // process string list of a list validation (convert to list of string tokens)
     if( (aModel.mnType == XML_list) && getFlag( nFlags, BIFF_DATAVAL_STRINGLIST ) )
         rParser.convertStringToStringList( aModel.maTokens1, ',', true );
@@ -229,9 +214,8 @@ void DataValidationsContext::importDataValidation( SequenceInputStream& rStrm )
 
 // ============================================================================
 
-WorksheetFragment::WorksheetFragment( const WorkbookHelper& rHelper,
-        const OUString& rFragmentPath, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    WorksheetFragmentBase( rHelper, rFragmentPath, rxProgressBar, eSheetType, nSheet )
+WorksheetFragment::WorksheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) :
+    WorksheetFragmentBase( rHelper, rFragmentPath )
 {
     // import data tables related to this worksheet
     RelationsRef xTableRels = getRelations().getRelationsFromType( CREATE_OFFICEDOC_RELATION_TYPE( "table" ) );
@@ -542,14 +526,14 @@ void WorksheetFragment::importSheetFormatPr( const AttributeList& rAttribs )
 void WorksheetFragment::importCol( const AttributeList& rAttribs )
 {
     ColumnModel aModel;
-    aModel.mnFirstCol     = rAttribs.getInteger( XML_min, -1 );
-    aModel.mnLastCol      = rAttribs.getInteger( XML_max, -1 );
-    aModel.mfWidth        = rAttribs.getDouble( XML_width, 0.0 );
-    aModel.mnXfId         = rAttribs.getInteger( XML_style, -1 );
-    aModel.mnLevel        = rAttribs.getInteger( XML_outlineLevel, 0 );
-    aModel.mbShowPhonetic = rAttribs.getBool( XML_phonetic, false );
-    aModel.mbHidden       = rAttribs.getBool( XML_hidden, false );
-    aModel.mbCollapsed    = rAttribs.getBool( XML_collapsed, false );
+    aModel.maRange.mnFirst = rAttribs.getInteger( XML_min, -1 );
+    aModel.maRange.mnLast  = rAttribs.getInteger( XML_max, -1 );
+    aModel.mfWidth         = rAttribs.getDouble( XML_width, 0.0 );
+    aModel.mnXfId          = rAttribs.getInteger( XML_style, -1 );
+    aModel.mnLevel         = rAttribs.getInteger( XML_outlineLevel, 0 );
+    aModel.mbShowPhonetic  = rAttribs.getBool( XML_phonetic, false );
+    aModel.mbHidden        = rAttribs.getBool( XML_hidden, false );
+    aModel.mbCollapsed     = rAttribs.getBool( XML_collapsed, false );
     // set column properties in the current sheet
     setColumnModel( aModel );
 }
@@ -558,7 +542,7 @@ void WorksheetFragment::importMergeCell( const AttributeList& rAttribs )
 {
     CellRangeAddress aRange;
     if( getAddressConverter().convertToCellRange( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex(), true, true ) )
-        setMergedRange( aRange );
+        getSheetData().setMergedRange( aRange );
 }
 
 void WorksheetFragment::importHyperlink( const AttributeList& rAttribs )
@@ -660,11 +644,11 @@ void WorksheetFragment::importCol( SequenceInputStream& rStrm )
 
     sal_Int32 nWidth;
     sal_uInt16 nFlags;
-    rStrm >> aModel.mnFirstCol >> aModel.mnLastCol >> nWidth >> aModel.mnXfId >> nFlags;
+    rStrm >> aModel.maRange.mnFirst >> aModel.maRange.mnLast >> nWidth >> aModel.mnXfId >> nFlags;
 
     // column indexes are 0-based in BIFF12, but ColumnModel expects 1-based
-    ++aModel.mnFirstCol;
-    ++aModel.mnLastCol;
+    ++aModel.maRange.mnFirst;
+    ++aModel.maRange.mnLast;
     // width is stored as 1/256th of a character in BIFF12, convert to entire character
     aModel.mfWidth        = static_cast< double >( nWidth ) / 256.0;
     // equal flags in all BIFFs
@@ -682,7 +666,7 @@ void WorksheetFragment::importMergeCell( SequenceInputStream& rStrm )
     rStrm >> aBinRange;
     CellRangeAddress aRange;
     if( getAddressConverter().convertToCellRange( aRange, aBinRange, getSheetIndex(), true, true ) )
-        setMergedRange( aRange );
+        getSheetData().setMergedRange( aRange );
 }
 
 void WorksheetFragment::importHyperlink( SequenceInputStream& rStrm )
@@ -753,9 +737,8 @@ void WorksheetFragment::importEmbeddedOleData( StreamDataSequence& orEmbeddedDat
 
 // ============================================================================
 
-BiffWorksheetFragment::BiffWorksheetFragment( const BiffWorkbookFragmentBase& rParent,
-        const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    BiffWorksheetFragmentBase( rParent, rxProgressBar, eSheetType, nSheet )
+BiffWorksheetFragment::BiffWorksheetFragment( const WorksheetHelper& rHelper, const BiffWorkbookFragmentBase& rParent ) :
+    BiffWorksheetFragmentBase( rHelper, rParent )
 {
 }
 
@@ -776,6 +759,7 @@ bool BiffWorksheetFragment::importFragment()
     SheetViewSettings& rSheetViewSett = getSheetViewSettings();
     CondFormatBuffer& rCondFormats    = getCondFormats();
     PageSettings& rPageSett           = getPageSettings();
+    BiffSheetDrawing& rDrawing        = getBiffDrawing();
 
     // process all record in this sheet fragment
     BiffInputStream& rStrm = getInputStream();
@@ -807,6 +791,7 @@ bool BiffWorksheetFragment::importFragment()
                 case BIFF_ID_HORPAGEBREAKS:     importPageBreaks( rStrm, true );            break;
                 case BIFF_ID_ITERATION:         rWorkbookSett.importIteration( rStrm );     break;
                 case BIFF_ID_LEFTMARGIN:        rPageSett.importLeftMargin( rStrm );        break;
+                case BIFF_ID_NOTE:              importNote( rStrm );                        break;
                 case BIFF_ID_PANE:              rSheetViewSett.importPane( rStrm );         break;
                 case BIFF_ID_PASSWORD:          rWorksheetSett.importPassword( rStrm );     break;
                 case BIFF_ID_PRINTGRIDLINES:    rPageSett.importPrintGridLines( rStrm );    break;
@@ -836,13 +821,13 @@ bool BiffWorksheetFragment::importFragment()
                         case BIFF_ID_DEFCOLWIDTH:   importDefColWidth( rStrm );                     break;
                         case BIFF3_ID_DEFROWHEIGHT: importDefRowHeight( rStrm );                    break;
                         case BIFF_ID_HCENTER:       rPageSett.importHorCenter( rStrm );             break;
+                        case BIFF_ID_OBJ:           rDrawing.importObj( rStrm );                    break;
                         case BIFF_ID_OBJECTPROTECT: rWorksheetSett.importObjectProtect( rStrm );    break;
                         case BIFF_ID_SAVERECALC:    rWorkbookSett.importSaveRecalc( rStrm );        break;
                         case BIFF_ID_SHEETPR:       rWorksheetSett.importSheetPr( rStrm );          break;
                         case BIFF_ID_UNCALCED:      rWorkbookSett.importUncalced( rStrm );          break;
                         case BIFF_ID_VCENTER:       rPageSett.importVerCenter( rStrm );             break;
                         case BIFF3_ID_WINDOW2:      rSheetViewSett.importWindow2( rStrm );          break;
-
                     }
                     break;
 
@@ -851,6 +836,7 @@ bool BiffWorksheetFragment::importFragment()
                         case BIFF_ID_COLINFO:       importColInfo( rStrm );                         break;
                         case BIFF3_ID_DEFROWHEIGHT: importDefRowHeight( rStrm );                    break;
                         case BIFF_ID_HCENTER:       rPageSett.importHorCenter( rStrm );             break;
+                        case BIFF_ID_OBJ:           rDrawing.importObj( rStrm );                    break;
                         case BIFF_ID_OBJECTPROTECT: rWorksheetSett.importObjectProtect( rStrm );    break;
                         case BIFF_ID_PAGESETUP:     rPageSett.importPageSetup( rStrm );             break;
                         case BIFF_ID_SAVERECALC:    rWorkbookSett.importSaveRecalc( rStrm );        break;
@@ -869,6 +855,7 @@ bool BiffWorksheetFragment::importFragment()
                         case BIFF3_ID_DEFROWHEIGHT: importDefRowHeight( rStrm );                    break;
                         case BIFF_ID_HCENTER:       rPageSett.importHorCenter( rStrm );             break;
                         case BIFF_ID_MERGEDCELLS:   importMergedCells( rStrm );                     break;  // #i62300# also in BIFF5
+                        case BIFF_ID_OBJ:           rDrawing.importObj( rStrm );                    break;
                         case BIFF_ID_OBJECTPROTECT: rWorksheetSett.importObjectProtect( rStrm );    break;
                         case BIFF_ID_PAGESETUP:     rPageSett.importPageSetup( rStrm );             break;
                         case BIFF_ID_PTDEFINITION:  importPTDefinition( rStrm );                    break;
@@ -896,6 +883,7 @@ bool BiffWorksheetFragment::importFragment()
                         case BIFF_ID_HYPERLINK:         importHyperlink( rStrm );                       break;
                         case BIFF_ID_LABELRANGES:       importLabelRanges( rStrm );                     break;
                         case BIFF_ID_MERGEDCELLS:       importMergedCells( rStrm );                     break;
+                        case BIFF_ID_OBJ:               rDrawing.importObj( rStrm );                    break;
                         case BIFF_ID_OBJECTPROTECT:     rWorksheetSett.importObjectProtect( rStrm );    break;
                         case BIFF_ID_PAGESETUP:         rPageSett.importPageSetup( rStrm );             break;
                         case BIFF_ID_PHONETICPR:        rWorksheetSett.importPhoneticPr( rStrm );       break;
@@ -958,15 +946,15 @@ void BiffWorksheetFragment::importColInfo( BiffInputStream& rStrm )
 
     ColumnModel aModel;
     // column indexes are 0-based in BIFF, but ColumnModel expects 1-based
-    aModel.mnFirstCol     = static_cast< sal_Int32 >( nFirstCol ) + 1;
-    aModel.mnLastCol      = static_cast< sal_Int32 >( nLastCol ) + 1;
+    aModel.maRange.mnFirst = static_cast< sal_Int32 >( nFirstCol ) + 1;
+    aModel.maRange.mnLast  = static_cast< sal_Int32 >( nLastCol ) + 1;
     // width is stored as 1/256th of a character in BIFF, convert to entire character
-    aModel.mfWidth        = static_cast< double >( nWidth ) / 256.0;
-    aModel.mnXfId         = nXfId;
-    aModel.mnLevel        = extractValue< sal_Int32 >( nFlags, 8, 3 );
-    aModel.mbShowPhonetic = getFlag( nFlags, BIFF_COLINFO_SHOWPHONETIC );
-    aModel.mbHidden       = getFlag( nFlags, BIFF_COLINFO_HIDDEN );
-    aModel.mbCollapsed    = getFlag( nFlags, BIFF_COLINFO_COLLAPSED );
+    aModel.mfWidth         = static_cast< double >( nWidth ) / 256.0;
+    aModel.mnXfId          = nXfId;
+    aModel.mnLevel         = extractValue< sal_Int32 >( nFlags, 8, 3 );
+    aModel.mbShowPhonetic  = getFlag( nFlags, BIFF_COLINFO_SHOWPHONETIC );
+    aModel.mbHidden        = getFlag( nFlags, BIFF_COLINFO_HIDDEN );
+    aModel.mbCollapsed     = getFlag( nFlags, BIFF_COLINFO_COLLAPSED );
     // set column properties in the current sheet
     setColumnModel( aModel );
 }
@@ -986,8 +974,8 @@ void BiffWorksheetFragment::importColWidth( BiffInputStream& rStrm )
 
     ColumnModel aModel;
     // column indexes are 0-based in BIFF, but ColumnModel expects 1-based
-    aModel.mnFirstCol = static_cast< sal_Int32 >( nFirstCol ) + 1;
-    aModel.mnLastCol = static_cast< sal_Int32 >( nLastCol ) + 1;
+    aModel.maRange.mnFirst = static_cast< sal_Int32 >( nFirstCol ) + 1;
+    aModel.maRange.mnLast = static_cast< sal_Int32 >( nLastCol ) + 1;
     // width is stored as 1/256th of a character in BIFF, convert to entire character
     aModel.mfWidth = static_cast< double >( nWidth ) / 256.0;
     // set column properties in the current sheet
@@ -1042,10 +1030,7 @@ ApiTokenSequence lclReadDataValFormula( BiffInputStream& rStrm, FormulaParser& r
 {
     sal_uInt16 nFmlaSize = rStrm.readuInt16();
     rStrm.skip( 2 );
-    // enable NUL characters, string list is single tStr token with NUL separators
-    TokensFormulaContext aContext( true, false, true );
-    rParser.importFormula( aContext, rStrm, &nFmlaSize );
-    return aContext.getTokens();
+    return rParser.importFormula( CellAddress(), FORMULATYPE_VALIDATION, rStrm, &nFmlaSize );
 }
 
 } // namespace
@@ -1164,7 +1149,12 @@ void BiffWorksheetFragment::importMergedCells( BiffInputStream& rStrm )
     ApiCellRangeList aRanges;
     getAddressConverter().convertToCellRangeList( aRanges, aBiffRanges, getSheetIndex(), true );
     for( ApiCellRangeList::const_iterator aIt = aRanges.begin(), aEnd = aRanges.end(); aIt != aEnd; ++aIt )
-        setMergedRange( *aIt );
+        getSheetData().setMergedRange( *aIt );
+}
+
+void BiffWorksheetFragment::importNote( BiffInputStream& rStrm )
+{
+    getComments().createComment()->importNote( rStrm );
 }
 
 void BiffWorksheetFragment::importPageBreaks( BiffInputStream& rStrm, bool bRowBreak )
diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx
index e539e22f5..186a90372 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <com/sun/star/sheet/XLabelRanges.hpp>
 #include <com/sun/star/sheet/XMultiFormulaTokens.hpp>
-#include <com/sun/star/sheet/XMultipleOperation.hpp>
 #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
 #include <com/sun/star/sheet/XSheetCondition2.hpp>
 #include <com/sun/star/sheet/XSheetOutline.hpp>
@@ -51,24 +50,20 @@
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/XMergeable.hpp>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
-#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/xls/addressconverter.hxx"
 #include "oox/xls/autofilterbuffer.hxx"
 #include "oox/xls/commentsbuffer.hxx"
 #include "oox/xls/condformatbuffer.hxx"
 #include "oox/xls/drawingfragment.hxx"
+#include "oox/xls/drawingmanager.hxx"
 #include "oox/xls/formulaparser.hxx"
 #include "oox/xls/pagesettings.hxx"
 #include "oox/xls/querytablebuffer.hxx"
-#include "oox/xls/sharedformulabuffer.hxx"
 #include "oox/xls/sharedstringsbuffer.hxx"
+#include "oox/xls/sheetdatabuffer.hxx"
 #include "oox/xls/stylesbuffer.hxx"
 #include "oox/xls/unitconverter.hxx"
 #include "oox/xls/viewsettings.hxx"
@@ -114,106 +109,13 @@ void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double f
         rxProgressBar->setPosition( fPosition );
 }
 
-// ----------------------------------------------------------------------------
-
-struct ValueRange
-{
-    sal_Int32           mnFirst;
-    sal_Int32           mnLast;
-
-    inline explicit     ValueRange( sal_Int32 nValue ) : mnFirst( nValue ), mnLast( nValue ) {}
-    inline explicit     ValueRange( sal_Int32 nFirst, sal_Int32 nLast ) : mnFirst( nFirst ), mnLast( nLast ) {}
-};
-
-typedef ::std::vector< ValueRange > ValueRangeVector;
-
-// ----------------------------------------------------------------------------
-
-struct ValueRangeComp
-{
-    inline bool         operator()( const ValueRange& rRange, sal_Int32 nValue ) const { return rRange.mnLast < nValue; }
-};
-
-
-// ----------------------------------------------------------------------------
-
-class ValueRangeSet
-{
-public:
-    inline explicit     ValueRangeSet() {}
-
-    void                insert( sal_Int32 nValue );
-    void                intersect( ValueRangeVector& orRanges, sal_Int32 nFirst, sal_Int32 nLast ) const;
-
-private:
-    ValueRangeVector    maData;
-};
-
-void ValueRangeSet::insert( sal_Int32 nValue )
-{
-    // find the first range that contains nValue or that follows nValue
-    ValueRangeVector::iterator aBeg = maData.begin();
-    ValueRangeVector::iterator aEnd = maData.end();
-    ValueRangeVector::iterator aNext = ::std::lower_bound( aBeg, aEnd, nValue, ValueRangeComp() );
-
-    // nothing to do if found range contains nValue
-    if( (aNext == aEnd) || (nValue < aNext->mnFirst) )
-    {
-        ValueRangeVector::iterator aPrev = (aNext == aBeg) ? aEnd : (aNext - 1);
-        bool bJoinPrev = (aPrev != aEnd) && (aPrev->mnLast + 1 == nValue);
-        bool bJoinNext = (aNext != aEnd) && (aNext->mnFirst - 1 == nValue);
-        if( bJoinPrev && bJoinNext )
-        {
-            aPrev->mnLast = aNext->mnLast;
-            maData.erase( aNext );
-        }
-        else if( bJoinPrev )
-            ++aPrev->mnLast;
-        else if( bJoinNext )
-            --aNext->mnFirst;
-        else
-            maData.insert( aNext, ValueRange( nValue ) );
-    }
-}
-
-void ValueRangeSet::intersect( ValueRangeVector& orRanges, sal_Int32 nFirst, sal_Int32 nLast ) const
-{
-    orRanges.clear();
-    // find the range that contains nFirst or the first range that follows nFirst
-    ValueRangeVector::const_iterator aIt = ::std::lower_bound( maData.begin(), maData.end(), nFirst, ValueRangeComp() );
-    for( ValueRangeVector::const_iterator aEnd = maData.end(); (aIt != aEnd) && (aIt->mnFirst <= nLast); ++aIt )
-        orRanges.push_back( ValueRange( ::std::max( aIt->mnFirst, nFirst ), ::std::min( aIt->mnLast, nLast ) ) );
-}
-
 } // namespace
 
 // ============================================================================
 // ============================================================================
 
-void CellModel::reset()
-{
-    mxCell.clear();
-    maValueStr = maFormulaRef = OUString();
-    mnCellType = mnFormulaType = XML_TOKEN_INVALID;
-    mnSharedId = mnXfId = mnNumFmtId = -1;
-    mbHasValueStr = mbShowPhonetic = false;
-}
-
-// ----------------------------------------------------------------------------
-
-DataTableModel::DataTableModel() :
-    mb2dTable( false ),
-    mbRowTable( false ),
-    mbRef1Deleted( false ),
-    mbRef2Deleted( false )
-{
-}
-
-// ----------------------------------------------------------------------------
-
 ColumnModel::ColumnModel() :
-    mnFirstCol( -1 ),
-    mnLastCol( -1 ),
+    maRange( -1 ),
     mfWidth( 0.0 ),
     mnXfId( -1 ),
     mnLevel( 0 ),
@@ -223,27 +125,22 @@ ColumnModel::ColumnModel() :
 {
 }
 
-bool ColumnModel::tryExpand( const ColumnModel& rModel )
+bool ColumnModel::isMergeable( const ColumnModel& rModel ) const
 {
-    bool bExpandable =
-        (mnFirstCol        <= rModel.mnFirstCol) &&
-        (rModel.mnFirstCol <= mnLastCol + 1) &&
-        (mfWidth           == rModel.mfWidth) &&
+    return
+        (maRange.mnFirst        <= rModel.maRange.mnFirst) &&
+        (rModel.maRange.mnFirst <= maRange.mnLast + 1) &&
+        (mfWidth                == rModel.mfWidth) &&
         // ignore mnXfId, cell formatting is always set directly
-        (mnLevel           == rModel.mnLevel) &&
-        (mbHidden          == rModel.mbHidden) &&
-        (mbCollapsed       == rModel.mbCollapsed);
-
-    if( bExpandable )
-        mnLastCol = rModel.mnLastCol;
-    return bExpandable;
+        (mnLevel                == rModel.mnLevel) &&
+        (mbHidden               == rModel.mbHidden) &&
+        (mbCollapsed            == rModel.mbCollapsed);
 }
 
 // ----------------------------------------------------------------------------
 
 RowModel::RowModel() :
-    mnFirstRow( -1 ),
-    mnLastRow( -1 ),
+    mnRow( -1 ),
     mfHeight( 0.0 ),
     mnXfId( -1 ),
     mnLevel( 0 ),
@@ -257,21 +154,22 @@ RowModel::RowModel() :
 {
 }
 
-bool RowModel::tryExpand( const RowModel& rModel )
+void RowModel::insertColSpan( const ValueRange& rColSpan )
 {
-    bool bExpandable =
-        (mnFirstRow        <= rModel.mnFirstRow) &&
-        (rModel.mnFirstRow <= mnLastRow + 1) &&
-        (mfHeight          == rModel.mfHeight) &&
-        // ignore mnXfId, mbCustomFormat, mbShowPhonetic - cell formatting is always set directly
-        (mnLevel           == rModel.mnLevel) &&
-        (mbCustomHeight    == rModel.mbCustomHeight) &&
-        (mbHidden          == rModel.mbHidden) &&
-        (mbCollapsed       == rModel.mbCollapsed);
+    if( (0 <= rColSpan.mnFirst) && (rColSpan.mnFirst <= rColSpan.mnLast) )
+        maColSpans.insert( rColSpan );
+}
 
-    if( bExpandable )
-        mnLastRow = rModel.mnLastRow;
-    return bExpandable;
+bool RowModel::isMergeable( const RowModel& rModel ) const
+{
+    return
+        // ignore maColSpans - is handled separately in SheetDataBuffer class
+        (mfHeight       == rModel.mfHeight) &&
+        // ignore mnXfId, mbCustomFormat, mbShowPhonetic - cell formatting is always set directly
+        (mnLevel        == rModel.mnLevel) &&
+        (mbCustomHeight == rModel.mbCustomHeight) &&
+        (mbHidden       == rModel.mbHidden) &&
+        (mbCollapsed    == rModel.mbCollapsed);
 }
 
 // ----------------------------------------------------------------------------
@@ -325,10 +223,10 @@ void ValidationModel::setBiffErrorStyle( sal_uInt8 nErrorStyle )
 // ============================================================================
 // ============================================================================
 
-class WorksheetData : public WorkbookHelper
+class WorksheetGlobals : public WorkbookHelper
 {
 public:
-    explicit            WorksheetData(
+    explicit            WorksheetGlobals(
                             const WorkbookHelper& rHelper,
                             const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
@@ -337,16 +235,12 @@ public:
     /** Returns true, if this helper refers to an existing Calc sheet. */
     inline bool         isValidSheet() const { return mxSheet.is(); }
 
-    /** Returns a cell formula simulating the passed boolean value. */
-    const OUString&     getBooleanFormula( bool bValue ) const;
-
     /** Returns the type of this sheet. */
     inline WorksheetType getSheetType() const { return meSheetType; }
     /** Returns the index of the current sheet. */
     inline sal_Int16    getSheetIndex() const { return maUsedArea.Sheet; }
     /** Returns the XSpreadsheet interface of the current sheet. */
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >&
-                        getSheet() const { return mxSheet; }
+    inline const Reference< XSpreadsheet >& getSheet() const { return mxSheet; }
 
     /** Returns the XCell interface for the passed cell address. */
     Reference< XCell >  getCell( const CellAddress& rAddress ) const;
@@ -361,14 +255,14 @@ public:
     Reference< XCellRange > getRow( sal_Int32 nRow ) const;
 
     /** Returns the XTableColumns interface for a range of columns. */
-    Reference< XTableColumns > getColumns( sal_Int32 nFirstCol, sal_Int32 nLastCol ) const;
+    Reference< XTableColumns > getColumns( const ValueRange& rColRange ) const;
     /** Returns the XTableRows interface for a range of rows. */
-    Reference< XTableRows > getRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) const;
+    Reference< XTableRows > getRows( const ValueRange& rRowRange ) const;
 
     /** Returns the XDrawPage interface of the draw page of the current sheet. */
     Reference< XDrawPage > getDrawPage() const;
     /** Returns the size of the entire drawing page in 1/100 mm. */
-    Size                getDrawPageSize() const;
+    const Size&         getDrawPageSize() const;
 
     /** Returns the absolute position of the top-left corner of the cell in 1/100 mm. */
     Point               getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const;
@@ -376,14 +270,12 @@ public:
     Size                getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const;
 
     /** Returns the address of the cell that contains the passed point in 1/100 mm. */
-    CellAddress         getCellAddressFromPosition( const Point& rPosition, const Size& rDrawPageSize ) const;
+    CellAddress         getCellAddressFromPosition( const Point& rPosition ) const;
     /** Returns the cell range address that contains the passed rectangle in 1/100 mm. */
     CellRangeAddress    getCellRangeFromRectangle( const Rectangle& rRect ) const;
 
-    /** Returns the worksheet settings object. */
-    inline WorksheetSettings& getWorksheetSettings() { return maSheetSett; }
-    /** Returns the buffer containing all shared formulas in this sheet. */
-    inline SharedFormulaBuffer& getSharedFormulas() { return maSharedFmlas; }
+    /** Returns the buffer for cell contents and cell formatting. */
+    inline SheetDataBuffer& getSheetData() { return maSheetData; }
     /** Returns the conditional formattings in this sheet. */
     inline CondFormatBuffer& getCondFormats() { return maCondFormats; }
     /** Returns the buffer for all cell comments in this sheet. */
@@ -392,19 +284,19 @@ public:
     inline AutoFilterBuffer& getAutoFilters() { return maAutoFilters; }
     /** Returns the buffer for all web query tables in this sheet. */
     inline QueryTableBuffer& getQueryTables() { return maQueryTables; }
+    /** Returns the worksheet settings object. */
+    inline WorksheetSettings& getWorksheetSettings() { return maSheetSett; }
     /** Returns the page/print settings for this sheet. */
     inline PageSettings& getPageSettings() { return maPageSett; }
     /** Returns the view settings for this sheet. */
     inline SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; }
-    /** Returns the VML drawing page for this sheet (OOXML/BIFF12 only!). */
+    /** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */
     inline VmlDrawing&  getVmlDrawing() { return *mxVmlDrawing; }
+    /** Returns the BIFF drawing page for this sheet (BIFF2-BIFF8 only). */
+    inline BiffSheetDrawing& getBiffDrawing() const { return *mxBiffDrawing; }
 
     /** Changes the current sheet type. */
     inline void         setSheetType( WorksheetType eSheetType ) { meSheetType = eSheetType; }
-    /** Stores the cell format at the passed address. */
-    void                setCellFormat( const CellModel& rModel );
-    /** Merges the cells in the passed cell range. */
-    void                setMergedRange( const CellRangeAddress& rRange );
     /** Sets a column or row page break described in the passed struct. */
     void                setPageBreak( const PageBreakModel& rModel, bool bRowBreak );
     /** Inserts the hyperlink URL into the spreadsheet. */
@@ -433,6 +325,8 @@ public:
         @descr  Column default formatting is converted directly, other settings
         are cached and converted in the finalizeImport() call. */
     void                setColumnModel( const ColumnModel& rModel );
+    /** Converts column default cell formatting. */
+    void                convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId ) const;
 
     /** Sets default height and hidden state for all unused rows in the sheet. */
     void                setDefaultRowSettings( double fHeight, bool bCustomHeight, bool bHidden, bool bThickTop, bool bThickBottom );
@@ -440,11 +334,8 @@ public:
         @descr  Row default formatting is converted directly, other settings
         are cached and converted in the finalizeImport() call. */
     void                setRowModel( const RowModel& rModel );
-
-    /** Converts column default cell formatting. */
-    void                convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId ) const;
-    /** Converts row default cell formatting. */
-    void                convertRowFormat( sal_Int32 nFirstRow, sal_Int32 nLastRow, sal_Int32 nXfId ) const;
+    /** Specifies that the passed row needs to set its height manually. */
+    void                setManualRowHeight( sal_Int32 nRow );
 
     /** Initial conversion before importing the worksheet. */
     void                initializeWorksheetImport();
@@ -453,57 +344,13 @@ public:
 
 private:
     typedef ::std::vector< sal_Int32 >                  OutlineLevelVec;
-    typedef ::std::map< sal_Int32, ColumnModel >        ColumnModelMap;
-    typedef ::std::map< sal_Int32, RowModel >           RowModelMap;
+    typedef ::std::pair< ColumnModel, sal_Int32 >       ColumnModelRange;
+    typedef ::std::map< sal_Int32, ColumnModelRange >   ColumnModelRangeMap;
+    typedef ::std::pair< RowModel, sal_Int32 >          RowModelRange;
+    typedef ::std::map< sal_Int32, RowModelRange >      RowModelRangeMap;
     typedef ::std::list< HyperlinkModel >               HyperlinkModelList;
     typedef ::std::list< ValidationModel >              ValidationModelList;
 
-    struct XfIdRowRange
-    {
-        sal_Int32           mnFirstRow;         /// Index of first row.
-        sal_Int32           mnLastRow;          /// Index of last row.
-        sal_Int32           mnXfId;             /// XF identifier for the row range.
-
-        explicit            XfIdRowRange();
-        bool                intersects( const CellRangeAddress& rRange ) const;
-        void                set( sal_Int32 nFirstRow, sal_Int32 nLastRow, sal_Int32 nXfId );
-        bool                tryExpand( sal_Int32 nFirstRow, sal_Int32 nLastRow, sal_Int32 nXfId );
-    };
-
-    struct XfIdRange
-    {
-        CellRangeAddress    maRange;            /// The formatted cell range.
-        sal_Int32           mnXfId;             /// XF identifier for the range.
-        sal_Int32           mnNumFmtId;         /// Number format id overriding the XF.
-
-        void                set( const CellModel& rModel );
-        bool                tryExpand( const CellModel& rModel );
-        bool                tryMerge( const XfIdRange& rXfIdRange );
-    };
-
-    struct MergedRange
-    {
-        CellRangeAddress    maRange;            /// The formatted cell range.
-        sal_Int32           mnHorAlign;         /// Horizontal alignment in the range.
-
-        explicit            MergedRange( const CellRangeAddress& rRange );
-        explicit            MergedRange( const CellAddress& rAddress, sal_Int32 nHorAlign );
-        bool                tryExpand( const CellAddress& rAddress, sal_Int32 nHorAlign );
-    };
-
-    typedef ::std::pair< sal_Int32, sal_Int32 > RowColKey;
-    typedef ::std::map< RowColKey, XfIdRange >  XfIdRangeMap;
-    typedef ::std::list< MergedRange >          MergedRangeList;
-
-    /** Writes all cell formatting attributes to the passed row range. */
-    void                writeXfIdRowRangeProperties( const XfIdRowRange& rXfIdRowRange ) const;
-    /** Writes all cell formatting attributes to the passed cell range. */
-    void                writeXfIdRangeProperties( const XfIdRange& rXfIdRange ) const;
-    /** Tries to merge the ranges last inserted in maXfIdRanges with existing ranges. */
-    void                mergeXfIdRanges();
-    /** Finalizes the remaining ranges in maXfIdRanges. */
-    void                finalizeXfIdRanges();
-
     /** Inserts all imported hyperlinks into their cell ranges. */
     void                finalizeHyperlinkRanges() const;
     /** Generates the final URL for the passed hyperlink. */
@@ -514,60 +361,52 @@ private:
     /** Inserts all imported data validations into their cell ranges. */
     void                finalizeValidationRanges() const;
 
-    /** Merges all cached merged ranges and updates right/bottom cell borders. */
-    void                finalizeMergedRanges();
-    /** Merges the passed merged range and updates right/bottom cell borders. */
-    void                finalizeMergedRange( const CellRangeAddress& rRange );
-
     /** Converts column properties for all columns in the sheet. */
     void                convertColumns();
     /** Converts column properties. */
-    void                convertColumns( OutlineLevelVec& orColLevels, sal_Int32 nFirstCol, sal_Int32 nLastCol, const ColumnModel& rModel );
+    void                convertColumns( OutlineLevelVec& orColLevels, const ValueRange& rColRange, const ColumnModel& rModel );
 
     /** Converts row properties for all rows in the sheet. */
     void                convertRows();
     /** Converts row properties. */
-    void                convertRows( OutlineLevelVec& orRowLevels, sal_Int32 nFirstRow, sal_Int32 nLastRow, const RowModel& rModel, double fDefHeight = -1.0 );
+    void                convertRows( OutlineLevelVec& orRowLevels, const ValueRange& rRowRange, const RowModel& rModel, double fDefHeight = -1.0 );
 
     /** Converts outline grouping for the passed column or row. */
     void                convertOutlines( OutlineLevelVec& orLevels, sal_Int32 nColRow, sal_Int32 nLevel, bool bCollapsed, bool bRows );
     /** Groups columns or rows for the given range. */
     void                groupColumnsOrRows( sal_Int32 nFirstColRow, sal_Int32 nLastColRow, bool bCollapsed, bool bRows );
 
-    /** Imports the drawings of the sheet (DML, VML), and updates the used area. */
+    /** Imports the drawings of the sheet (DML, VML, DFF) and updates the used area. */
     void                finalizeDrawings();
 
 private:
-    typedef ::std::auto_ptr< VmlDrawing > VmlDrawingPtr;
+    typedef ::std::auto_ptr< VmlDrawing >       VmlDrawingPtr;
+    typedef ::std::auto_ptr< BiffSheetDrawing > BiffSheetDrawingPtr;
 
-    const OUString      maTrueFormula;      /// Replacement formula for TRUE boolean cells.
-    const OUString      maFalseFormula;     /// Replacement formula for FALSE boolean cells.
     const OUString      maSheetCellRanges;  /// Service name for a SheetCellRanges object.
     const OUString      maUrlTextField;     /// Service name for a URL text field.
     const CellAddress&  mrMaxApiPos;        /// Reference to maximum Calc cell address from address converter.
     CellRangeAddress    maUsedArea;         /// Used area of the sheet, and sheet index of the sheet.
     ColumnModel         maDefColModel;      /// Default column formatting.
-    ColumnModelMap      maColModels;        /// Columns sorted by first column index.
+    ColumnModelRangeMap maColModels;        /// Ranges of columns sorted by first column index.
     RowModel            maDefRowModel;      /// Default row formatting.
-    RowModelMap         maRowModels;        /// Rows sorted by row index.
+    RowModelRangeMap    maRowModels;        /// Ranges of rows sorted by first row index.
     HyperlinkModelList  maHyperlinks;       /// Cell ranges containing hyperlinks.
     ValidationModelList maValidations;      /// Cell ranges containing data validation settings.
-    XfIdRowRange        maXfIdRowRange;     /// Cached XF identifier for a range of rows.
-    XfIdRangeMap        maXfIdRanges;       /// Collected XF identifiers for cell ranges.
-    MergedRangeList     maMergedRanges;     /// Merged cell ranges.
-    MergedRangeList     maCenterFillRanges; /// Merged cell ranges from 'center across' or 'fill' alignment.
     ValueRangeSet       maManualRowHeights; /// Rows that need manual height independent from own settings.
-    WorksheetSettings   maSheetSett;        /// Global settings for this sheet.
-    SharedFormulaBuffer maSharedFmlas;      /// Buffer for shared formulas in this sheet.
+    SheetDataBuffer     maSheetData;        /// Buffer for cell contents and cell formatting.
     CondFormatBuffer    maCondFormats;      /// Buffer for conditional formattings.
     CommentsBuffer      maComments;         /// Buffer for all cell comments in this sheet.
     AutoFilterBuffer    maAutoFilters;      /// Sheet auto filters (not associated to a table).
     QueryTableBuffer    maQueryTables;      /// Buffer for all web query tables in this sheet.
+    WorksheetSettings   maSheetSett;        /// Global settings for this sheet.
     PageSettings        maPageSett;         /// Page/print settings for this sheet.
     SheetViewSettings   maSheetViewSett;    /// View settings for this sheet.
     VmlDrawingPtr       mxVmlDrawing;       /// Collection of all VML shapes.
+    BiffSheetDrawingPtr mxBiffDrawing;      /// Collection of all BIFF/DFF shapes.
     OUString            maDrawingPath;      /// Path to DrawingML fragment.
     OUString            maVmlDrawingPath;   /// Path to legacy VML drawing fragment.
+    Size                maDrawPageSize;     /// Current size of the drawing page in 1/100 mm.
     Rectangle           maShapeBoundingBox; /// Bounding box for all shapes from all drawings.
     ISegmentProgressBarRef mxProgressBar;   /// Sheet progress bar.
     ISegmentProgressBarRef mxRowProgress;   /// Progress bar for row/cell processing.
@@ -579,20 +418,18 @@ private:
 
 // ----------------------------------------------------------------------------
 
-WorksheetData::WorksheetData( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
+WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
     WorkbookHelper( rHelper ),
-    maTrueFormula( CREATE_OUSTRING( "=TRUE()" ) ),
-    maFalseFormula( CREATE_OUSTRING( "=FALSE()" ) ),
     maSheetCellRanges( CREATE_OUSTRING( "com.sun.star.sheet.SheetCellRanges" ) ),
     maUrlTextField( CREATE_OUSTRING( "com.sun.star.text.TextField.URL" ) ),
     mrMaxApiPos( rHelper.getAddressConverter().getMaxApiAddress() ),
     maUsedArea( nSheet, SAL_MAX_INT32, SAL_MAX_INT32, -1, -1 ),
-    maSheetSett( *this ),
-    maSharedFmlas( *this ),
+    maSheetData( *this ),
     maCondFormats( *this ),
     maComments( *this ),
     maAutoFilters( *this ),
     maQueryTables( *this ),
+    maSheetSett( *this ),
     maPageSett( *this ),
     maSheetViewSett( *this ),
     mxProgressBar( rxProgressBar ),
@@ -621,8 +458,17 @@ WorksheetData::WorksheetData( const WorkbookHelper& rHelper, const ISegmentProgr
     maDefRowModel.mbCollapsed = false;
 
     // buffers
-    if( getFilterType() == FILTER_OOXML )
-        mxVmlDrawing.reset( new VmlDrawing( *this ) );
+    switch( getFilterType() )
+    {
+        case FILTER_OOXML:
+            mxVmlDrawing.reset( new VmlDrawing( *this ) );
+        break;
+        case FILTER_BIFF:
+            mxBiffDrawing.reset( new BiffSheetDrawing( *this ) );
+        break;
+        case FILTER_UNKNOWN:
+        break;
+    }
 
     // prepare progress bars
     if( mxProgressBar.get() )
@@ -632,12 +478,7 @@ WorksheetData::WorksheetData( const WorkbookHelper& rHelper, const ISegmentProgr
     }
 }
 
-const OUString& WorksheetData::getBooleanFormula( bool bValue ) const
-{
-    return bValue ? maTrueFormula : maFalseFormula;
-}
-
-Reference< XCell > WorksheetData::getCell( const CellAddress& rAddress ) const
+Reference< XCell > WorksheetGlobals::getCell( const CellAddress& rAddress ) const
 {
     Reference< XCell > xCell;
     if( mxSheet.is() ) try
@@ -650,7 +491,7 @@ Reference< XCell > WorksheetData::getCell( const CellAddress& rAddress ) const
     return xCell;
 }
 
-Reference< XCellRange > WorksheetData::getCellRange( const CellRangeAddress& rRange ) const
+Reference< XCellRange > WorksheetGlobals::getCellRange( const CellRangeAddress& rRange ) const
 {
     Reference< XCellRange > xRange;
     if( mxSheet.is() ) try
@@ -663,12 +504,12 @@ Reference< XCellRange > WorksheetData::getCellRange( const CellRangeAddress& rRa
     return xRange;
 }
 
-Reference< XSheetCellRanges > WorksheetData::getCellRangeList( const ApiCellRangeList& rRanges ) const
+Reference< XSheetCellRanges > WorksheetGlobals::getCellRangeList( const ApiCellRangeList& rRanges ) const
 {
     Reference< XSheetCellRanges > xRanges;
     if( mxSheet.is() && !rRanges.empty() ) try
     {
-        xRanges.set( getDocumentFactory()->createInstance( maSheetCellRanges ), UNO_QUERY_THROW );
+        xRanges.set( getBaseFilter().getModelFactory()->createInstance( maSheetCellRanges ), UNO_QUERY_THROW );
         Reference< XSheetCellRangeContainer > xRangeCont( xRanges, UNO_QUERY_THROW );
         xRangeCont->addRangeAddresses( ContainerHelper::vectorToSequence( rRanges ), sal_False );
     }
@@ -678,7 +519,7 @@ Reference< XSheetCellRanges > WorksheetData::getCellRangeList( const ApiCellRang
     return xRanges;
 }
 
-Reference< XCellRange > WorksheetData::getColumn( sal_Int32 nCol ) const
+Reference< XCellRange > WorksheetGlobals::getColumn( sal_Int32 nCol ) const
 {
     Reference< XCellRange > xColumn;
     try
@@ -693,7 +534,7 @@ Reference< XCellRange > WorksheetData::getColumn( sal_Int32 nCol ) const
     return xColumn;
 }
 
-Reference< XCellRange > WorksheetData::getRow( sal_Int32 nRow ) const
+Reference< XCellRange > WorksheetGlobals::getRow( sal_Int32 nRow ) const
 {
     Reference< XCellRange > xRow;
     try
@@ -708,33 +549,33 @@ Reference< XCellRange > WorksheetData::getRow( sal_Int32 nRow ) const
     return xRow;
 }
 
-Reference< XTableColumns > WorksheetData::getColumns( sal_Int32 nFirstCol, sal_Int32 nLastCol ) const
+Reference< XTableColumns > WorksheetGlobals::getColumns( const ValueRange& rColRange ) const
 {
     Reference< XTableColumns > xColumns;
-    nLastCol = ::std::min( nLastCol, mrMaxApiPos.Column );
-    if( (0 <= nFirstCol) && (nFirstCol <= nLastCol) )
+    sal_Int32 nLastCol = ::std::min( rColRange.mnLast, mrMaxApiPos.Column );
+    if( (0 <= rColRange.mnFirst) && (rColRange.mnFirst <= nLastCol) )
     {
-        Reference< XColumnRowRange > xRange( getCellRange( CellRangeAddress( getSheetIndex(), nFirstCol, 0, nLastCol, 0 ) ), UNO_QUERY );
+        Reference< XColumnRowRange > xRange( getCellRange( CellRangeAddress( getSheetIndex(), rColRange.mnFirst, 0, nLastCol, 0 ) ), UNO_QUERY );
         if( xRange.is() )
             xColumns = xRange->getColumns();
     }
     return xColumns;
 }
 
-Reference< XTableRows > WorksheetData::getRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) const
+Reference< XTableRows > WorksheetGlobals::getRows( const ValueRange& rRowRange ) const
 {
     Reference< XTableRows > xRows;
-    nLastRow = ::std::min( nLastRow, mrMaxApiPos.Row );
-    if( (0 <= nFirstRow) && (nFirstRow <= nLastRow) )
+    sal_Int32 nLastRow = ::std::min( rRowRange.mnLast, mrMaxApiPos.Row );
+    if( (0 <= rRowRange.mnFirst) && (rRowRange.mnFirst <= nLastRow) )
     {
-        Reference< XColumnRowRange > xRange( getCellRange( CellRangeAddress( getSheetIndex(), 0, nFirstRow, 0, nLastRow ) ), UNO_QUERY );
+        Reference< XColumnRowRange > xRange( getCellRange( CellRangeAddress( getSheetIndex(), 0, rRowRange.mnFirst, 0, nLastRow ) ), UNO_QUERY );
         if( xRange.is() )
             xRows = xRange->getRows();
     }
     return xRows;
 }
 
-Reference< XDrawPage > WorksheetData::getDrawPage() const
+Reference< XDrawPage > WorksheetGlobals::getDrawPage() const
 {
     Reference< XDrawPage > xDrawPage;
     try
@@ -747,15 +588,13 @@ Reference< XDrawPage > WorksheetData::getDrawPage() const
     return xDrawPage;
 }
 
-Size WorksheetData::getDrawPageSize() const
+const Size& WorksheetGlobals::getDrawPageSize() const
 {
-    Size aSize;
-    PropertySet aRangeProp( getCellRange( CellRangeAddress( getSheetIndex(), 0, 0, mrMaxApiPos.Column, mrMaxApiPos.Row ) ) );
-    aRangeProp.getProperty( aSize, PROP_Size );
-    return aSize;
+    OSL_ENSURE( (maDrawPageSize.Width > 0) && (maDrawPageSize.Height > 0), "WorksheetGlobals::getDrawPageSize - called too early, size invalid" );
+    return maDrawPageSize;
 }
 
-Point WorksheetData::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const
+Point WorksheetGlobals::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const
 {
     Point aPoint;
     PropertySet aCellProp( getCell( CellAddress( getSheetIndex(), nCol, nRow ) ) );
@@ -763,7 +602,7 @@ Point WorksheetData::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const
     return aPoint;
 }
 
-Size WorksheetData::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const
+Size WorksheetGlobals::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const
 {
     Size aSize;
     PropertySet aCellProp( getCell( CellAddress( getSheetIndex(), nCol, nRow ) ) );
@@ -840,7 +679,7 @@ bool lclUpdateInterval( sal_Int32& rnBegAddr, sal_Int32& rnMidAddr, sal_Int32& r
 
 } // namespace
 
-CellAddress WorksheetData::getCellAddressFromPosition( const Point& rPosition, const Size& rDrawPageSize ) const
+CellAddress WorksheetGlobals::getCellAddressFromPosition( const Point& rPosition ) const
 {
     // starting cell address and its position in drawing layer (top-left edge)
     sal_Int32 nBegCol = 0;
@@ -850,7 +689,7 @@ CellAddress WorksheetData::getCellAddressFromPosition( const Point& rPosition, c
     // end cell address and its position in drawing layer (bottom-right edge)
     sal_Int32 nEndCol = mrMaxApiPos.Column + 1;
     sal_Int32 nEndRow = mrMaxApiPos.Row + 1;
-    Point aEndPos( rDrawPageSize.Width, rDrawPageSize.Height );
+    Point aEndPos( maDrawPageSize.Width, maDrawPageSize.Height );
 
     // starting point for interval search
     sal_Int32 nMidCol, nMidRow;
@@ -876,12 +715,11 @@ CellAddress WorksheetData::getCellAddressFromPosition( const Point& rPosition, c
     return CellAddress( getSheetIndex(), nMidCol, nMidRow );
 }
 
-CellRangeAddress WorksheetData::getCellRangeFromRectangle( const Rectangle& rRect ) const
+CellRangeAddress WorksheetGlobals::getCellRangeFromRectangle( const Rectangle& rRect ) const
 {
-    Size aPageSize = getDrawPageSize();
-    CellAddress aStartAddr = getCellAddressFromPosition( Point( rRect.X, rRect.Y ), aPageSize );
+    CellAddress aStartAddr = getCellAddressFromPosition( Point( rRect.X, rRect.Y ) );
     Point aBotRight( rRect.X + rRect.Width, rRect.Y + rRect.Height );
-    CellAddress aEndAddr = getCellAddressFromPosition( aBotRight, aPageSize );
+    CellAddress aEndAddr = getCellAddressFromPosition( aBotRight );
     bool bMultiCols = aStartAddr.Column < aEndAddr.Column;
     bool bMultiRows = aStartAddr.Row < aEndAddr.Row;
     if( bMultiCols || bMultiRows )
@@ -897,62 +735,7 @@ CellRangeAddress WorksheetData::getCellRangeFromRectangle( const Rectangle& rRec
     return CellRangeAddress( getSheetIndex(), aStartAddr.Column, aStartAddr.Row, aEndAddr.Column, aEndAddr.Row );
 }
 
-void WorksheetData::setCellFormat( const CellModel& rModel )
-{
-    if( rModel.mxCell.is() && ((rModel.mnXfId >= 0) || (rModel.mnNumFmtId >= 0)) )
-    {
-        // try to merge existing ranges and to write some formatting properties
-        if( !maXfIdRanges.empty() )
-        {
-            // get row index of last inserted cell
-            sal_Int32 nLastRow = maXfIdRanges.rbegin()->second.maRange.StartRow;
-            // row changed - try to merge ranges of last row with existing ranges
-            if( rModel.maAddress.Row != nLastRow )
-            {
-                mergeXfIdRanges();
-                // write format properties of all ranges above last row and remove them
-                XfIdRangeMap::iterator aIt = maXfIdRanges.begin(), aEnd = maXfIdRanges.end();
-                while( aIt != aEnd )
-                {
-                    // check that range cannot be merged with current row, and that range is not in cached row range
-                    if( (aIt->second.maRange.EndRow < nLastRow) && !maXfIdRowRange.intersects( aIt->second.maRange ) )
-                    {
-                        writeXfIdRangeProperties( aIt->second );
-                        maXfIdRanges.erase( aIt++ );
-                    }
-                    else
-                        ++aIt;
-                }
-            }
-        }
-
-        // try to expand last existing range, or create new range entry
-        if( maXfIdRanges.empty() || !maXfIdRanges.rbegin()->second.tryExpand( rModel ) )
-            maXfIdRanges[ RowColKey( rModel.maAddress.Row, rModel.maAddress.Column ) ].set( rModel );
-
-        // update merged ranges for 'center across selection' and 'fill'
-        if( const Xf* pXf = getStyles().getCellXf( rModel.mnXfId ).get() )
-        {
-            sal_Int32 nHorAlign = pXf->getAlignment().getModel().mnHorAlign;
-            if( (nHorAlign == XML_centerContinuous) || (nHorAlign == XML_fill) )
-            {
-                /*  start new merged range, if cell is not empty (#108781#),
-                    or try to expand last range with empty cell */
-                if( rModel.mnCellType != XML_TOKEN_INVALID )
-                    maCenterFillRanges.push_back( MergedRange( rModel.maAddress, nHorAlign ) );
-                else if( !maCenterFillRanges.empty() )
-                    maCenterFillRanges.rbegin()->tryExpand( rModel.maAddress, nHorAlign );
-            }
-        }
-    }
-}
-
-void WorksheetData::setMergedRange( const CellRangeAddress& rRange )
-{
-    maMergedRanges.push_back( MergedRange( rRange ) );
-}
-
-void WorksheetData::setPageBreak( const PageBreakModel& rModel, bool bRowBreak )
+void WorksheetGlobals::setPageBreak( const PageBreakModel& rModel, bool bRowBreak )
 {
     if( rModel.mbManual && (rModel.mnColRow > 0) )
     {
@@ -961,27 +744,27 @@ void WorksheetData::setPageBreak( const PageBreakModel& rModel, bool bRowBreak )
     }
 }
 
-void WorksheetData::setHyperlink( const HyperlinkModel& rModel )
+void WorksheetGlobals::setHyperlink( const HyperlinkModel& rModel )
 {
     maHyperlinks.push_back( rModel );
 }
 
-void WorksheetData::setValidation( const ValidationModel& rModel )
+void WorksheetGlobals::setValidation( const ValidationModel& rModel )
 {
     maValidations.push_back( rModel );
 }
 
-void WorksheetData::setDrawingPath( const OUString& rDrawingPath )
+void WorksheetGlobals::setDrawingPath( const OUString& rDrawingPath )
 {
     maDrawingPath = rDrawingPath;
 }
 
-void WorksheetData::setVmlDrawingPath( const OUString& rVmlDrawingPath )
+void WorksheetGlobals::setVmlDrawingPath( const OUString& rVmlDrawingPath )
 {
     maVmlDrawingPath = rVmlDrawingPath;
 }
 
-void WorksheetData::extendUsedArea( const CellAddress& rAddress )
+void WorksheetGlobals::extendUsedArea( const CellAddress& rAddress )
 {
     maUsedArea.StartColumn = ::std::min( maUsedArea.StartColumn, rAddress.Column );
     maUsedArea.StartRow    = ::std::min( maUsedArea.StartRow,    rAddress.Row );
@@ -989,13 +772,13 @@ void WorksheetData::extendUsedArea( const CellAddress& rAddress )
     maUsedArea.EndRow      = ::std::max( maUsedArea.EndRow,      rAddress.Row );
 }
 
-void WorksheetData::extendUsedArea( const CellRangeAddress& rRange )
+void WorksheetGlobals::extendUsedArea( const CellRangeAddress& rRange )
 {
     extendUsedArea( CellAddress( rRange.Sheet, rRange.StartColumn, rRange.StartRow ) );
     extendUsedArea( CellAddress( rRange.Sheet, rRange.EndColumn, rRange.EndRow ) );
 }
 
-void WorksheetData::extendShapeBoundingBox( const Rectangle& rShapeRect )
+void WorksheetGlobals::extendShapeBoundingBox( const Rectangle& rShapeRect )
 {
     if( (maShapeBoundingBox.Width == 0) && (maShapeBoundingBox.Height == 0) )
     {
@@ -1013,7 +796,7 @@ void WorksheetData::extendShapeBoundingBox( const Rectangle& rShapeRect )
     }
 }
 
-void WorksheetData::setBaseColumnWidth( sal_Int32 nWidth )
+void WorksheetGlobals::setBaseColumnWidth( sal_Int32 nWidth )
 {
     // do not modify width, if setDefaultColumnWidth() has been used
     if( !mbHasDefWidth && (nWidth > 0) )
@@ -1025,7 +808,7 @@ void WorksheetData::setBaseColumnWidth( sal_Int32 nWidth )
     }
 }
 
-void WorksheetData::setDefaultColumnWidth( double fWidth )
+void WorksheetGlobals::setDefaultColumnWidth( double fWidth )
 {
     // overrides a width set with setBaseColumnWidth()
     if( fWidth > 0.0 )
@@ -1035,22 +818,65 @@ void WorksheetData::setDefaultColumnWidth( double fWidth )
     }
 }
 
-void WorksheetData::setColumnModel( const ColumnModel& rModel )
+void WorksheetGlobals::setColumnModel( const ColumnModel& rModel )
 {
     // convert 1-based OOXML column indexes to 0-based API column indexes
-    sal_Int32 nFirstCol = rModel.mnFirstCol - 1;
-    sal_Int32 nLastCol = rModel.mnLastCol - 1;
-    if( (0 <= nFirstCol) && (nFirstCol <= mrMaxApiPos.Column) )
+    sal_Int32 nFirstCol = rModel.maRange.mnFirst - 1;
+    sal_Int32 nLastCol = rModel.maRange.mnLast - 1;
+    if( getAddressConverter().checkCol( nFirstCol, true ) && (nFirstCol <= nLastCol) )
+    {
+        // validate last column index
+        if( !getAddressConverter().checkCol( nLastCol, true ) )
+            nLastCol = mrMaxApiPos.Column;
+        // try to find entry in column model map that is able to merge with the passed model
+        bool bInsertModel = true;
+        if( !maColModels.empty() )
+        {
+            // find first column model range following nFirstCol (nFirstCol < aIt->first), or end of map
+            ColumnModelRangeMap::iterator aIt = maColModels.upper_bound( nFirstCol );
+            OSL_ENSURE( aIt == maColModels.end(), "WorksheetGlobals::setColModel - columns are unsorted" );
+            // if inserting before another column model, get last free column
+            OSL_ENSURE( (aIt == maColModels.end()) || (nLastCol < aIt->first), "WorksheetGlobals::setColModel - multiple models of the same column" );
+            if( aIt != maColModels.end() )
+                nLastCol = ::std::min( nLastCol, aIt->first - 1 );
+            if( aIt != maColModels.begin() )
+            {
+                // go to previous map element (which may be able to merge with the passed model)
+                --aIt;
+                // the usage of upper_bound() above ensures that aIt->first is less than or equal to nFirstCol now
+                sal_Int32& rnLastMapCol = aIt->second.second;
+                OSL_ENSURE( rnLastMapCol < nFirstCol, "WorksheetGlobals::setColModel - multiple models of the same column" );
+                nFirstCol = ::std::max( rnLastMapCol + 1, nFirstCol );
+                if( (rnLastMapCol + 1 == nFirstCol) && (nFirstCol <= nLastCol) && aIt->second.first.isMergeable( rModel ) )
+                {
+                    // can merge with existing model, update last column index
+                    rnLastMapCol = nLastCol;
+                    bInsertModel = false;
+                }
+            }
+        }
+        if( nFirstCol <= nLastCol )
+        {
+            // insert the column model, if it has not been merged with another
+            if( bInsertModel )
+                maColModels[ nFirstCol ] = ColumnModelRange( rModel, nLastCol );
+            // set column formatting directly
+            convertColumnFormat( nFirstCol, nLastCol, rModel.mnXfId );
+        }
+    }
+}
+
+void WorksheetGlobals::convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId ) const
+{
+    CellRangeAddress aRange( getSheetIndex(), nFirstCol, 0, nLastCol, mrMaxApiPos.Row );
+    if( getAddressConverter().validateCellRange( aRange, true, false ) )
     {
-        // set column formatting directly, nLastCol is checked inside the function
-        convertColumnFormat( nFirstCol, nLastCol, rModel.mnXfId );
-        // expand last entry or add new entry
-        if( maColModels.empty() || !maColModels.rbegin()->second.tryExpand( rModel ) )
-            maColModels[ nFirstCol ] = rModel;
+        PropertySet aPropSet( getCellRange( aRange ) );
+        getStyles().writeCellXfToPropertySet( aPropSet, nXfId );
     }
 }
 
-void WorksheetData::setDefaultRowSettings( double fHeight, bool bCustomHeight, bool bHidden, bool bThickTop, bool bThickBottom )
+void WorksheetGlobals::setDefaultRowSettings( double fHeight, bool bCustomHeight, bool bHidden, bool bThickTop, bool bThickBottom )
 {
     maDefRowModel.mfHeight = fHeight;
     maDefRowModel.mbCustomHeight = bCustomHeight;
@@ -1059,83 +885,79 @@ void WorksheetData::setDefaultRowSettings( double fHeight, bool bCustomHeight, b
     maDefRowModel.mbThickBottom = bThickBottom;
 }
 
-void WorksheetData::setRowModel( const RowModel& rModel )
+void WorksheetGlobals::setRowModel( const RowModel& rModel )
 {
-    // convert 1-based OOXML row indexes to 0-based API row indexes
-    sal_Int32 nFirstRow = rModel.mnFirstRow - 1;
-    sal_Int32 nLastRow = rModel.mnLastRow - 1;
-    if( (0 <= nFirstRow) && (nFirstRow <= mrMaxApiPos.Row) )
+    // convert 1-based OOXML row index to 0-based API row index
+    sal_Int32 nRow = rModel.mnRow - 1;
+    if( getAddressConverter().checkRow( nRow, true ) )
     {
-        // set row formatting
-        if( rModel.mbCustomFormat )
+        // try to find entry in row model map that is able to merge with the passed model
+        bool bInsertModel = true;
+        bool bUnusedRow = true;
+        if( !maRowModels.empty() )
         {
-            // try to expand cached row range, if formatting is equal
-            if( (maXfIdRowRange.mnLastRow < 0) || !maXfIdRowRange.tryExpand( nFirstRow, nLastRow, rModel.mnXfId ) )
+            // find first row model range following nRow (nRow < aIt->first), or end of map
+            RowModelRangeMap::iterator aIt = maRowModels.upper_bound( nRow );
+            OSL_ENSURE( aIt == maRowModels.end(), "WorksheetGlobals::setRowModel - rows are unsorted" );
+            if( aIt != maRowModels.begin() )
             {
-                writeXfIdRowRangeProperties( maXfIdRowRange );
-                maXfIdRowRange.set( nFirstRow, nLastRow, rModel.mnXfId );
+                // go to previous map element (which may be able to merge with the passed model)
+                --aIt;
+                // the usage of upper_bound() above ensures that aIt->first is less than or equal to nRow now
+                sal_Int32& rnLastMapRow = aIt->second.second;
+                bUnusedRow = rnLastMapRow < nRow;
+                OSL_ENSURE( bUnusedRow, "WorksheetGlobals::setRowModel - multiple models of the same row" );
+                if( (rnLastMapRow + 1 == nRow) && aIt->second.first.isMergeable( rModel ) )
+                {
+                    // can merge with existing model, update last row index
+                    ++rnLastMapRow;
+                    bInsertModel = false;
+                }
             }
         }
-        else if( maXfIdRowRange.mnLastRow >= 0 )
+        if( bUnusedRow )
         {
-            // finish last cached row range
-            writeXfIdRowRangeProperties( maXfIdRowRange );
-            maXfIdRowRange.set( -1, -1, -1 );
+            // insert the row model, if it has not been merged with another
+            if( bInsertModel )
+                maRowModels[ nRow ] = RowModelRange( rModel, nRow );
+            // set row formatting
+            maSheetData.setRowFormat( nRow, rModel.mnXfId, rModel.mbCustomFormat );
+            // set column spans
+            maSheetData.setColSpans( nRow, rModel.maColSpans );
         }
-
-        // expand last entry or add new entry
-        if( maRowModels.empty() || !maRowModels.rbegin()->second.tryExpand( rModel ) )
-            maRowModels[ nFirstRow ] = rModel;
-    }
-    lclUpdateProgressBar( mxRowProgress, maUsedArea, nLastRow );
-}
-
-void WorksheetData::convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId ) const
-{
-    CellRangeAddress aRange( getSheetIndex(), nFirstCol, 0, nLastCol, mrMaxApiPos.Row );
-    if( getAddressConverter().validateCellRange( aRange, true, false ) )
-    {
-        PropertySet aPropSet( getCellRange( aRange ) );
-        getStyles().writeCellXfToPropertySet( aPropSet, nXfId );
     }
+    lclUpdateProgressBar( mxRowProgress, maUsedArea, nRow );
 }
 
-void WorksheetData::convertRowFormat( sal_Int32 nFirstRow, sal_Int32 nLastRow, sal_Int32 nXfId ) const
+void WorksheetGlobals::setManualRowHeight( sal_Int32 nRow )
 {
-    CellRangeAddress aRange( getSheetIndex(), 0, nFirstRow, mrMaxApiPos.Column, nLastRow );
-    if( getAddressConverter().validateCellRange( aRange, true, false ) )
-    {
-        PropertySet aPropSet( getCellRange( aRange ) );
-        getStyles().writeCellXfToPropertySet( aPropSet, nXfId );
-    }
+    maManualRowHeights.insert( nRow );
 }
 
-void WorksheetData::initializeWorksheetImport()
+void WorksheetGlobals::initializeWorksheetImport()
 {
     // set default cell style for unused cells
     PropertySet aPropSet( mxSheet );
     aPropSet.setProperty( PROP_CellStyle, getStyles().getDefaultStyleName() );
 
-    /*  Remember current sheet index in global data, needed by some global
+    /*  Remember the current sheet index in global data, needed by global
         objects, e.g. the chart converter. */
     setCurrentSheetIndex( getSheetIndex() );
 }
 
-void WorksheetData::finalizeWorksheetImport()
+void WorksheetGlobals::finalizeWorksheetImport()
 {
     lclUpdateProgressBar( mxRowProgress, 1.0 );
-    finalizeXfIdRanges();
+    maSheetData.finalizeImport();
     lclUpdateProgressBar( mxFinalProgress, 0.25 );
     finalizeHyperlinkRanges();
     finalizeValidationRanges();
-    finalizeMergedRanges();
     maAutoFilters.finalizeImport( getSheetIndex() );
-    maSheetSett.finalizeImport();
     maCondFormats.finalizeImport();
     maQueryTables.finalizeImport();
+    maSheetSett.finalizeImport();
     maPageSett.finalizeImport();
     maSheetViewSett.finalizeImport();
-    maSheetSett.finalizeImport();
 
     lclUpdateProgressBar( mxFinalProgress, 0.5 );
     convertColumns();
@@ -1144,159 +966,13 @@ void WorksheetData::finalizeWorksheetImport()
     finalizeDrawings();
     lclUpdateProgressBar( mxFinalProgress, 1.0 );
 
-    // reset current sheet index in global data
+    // forget current sheet index in global data
     setCurrentSheetIndex( -1 );
 }
 
 // private --------------------------------------------------------------------
 
-WorksheetData::XfIdRowRange::XfIdRowRange() :
-    mnFirstRow( -1 ),
-    mnLastRow( -1 ),
-    mnXfId( -1 )
-{
-}
-
-bool WorksheetData::XfIdRowRange::intersects( const CellRangeAddress& rRange ) const
-{
-    return (rRange.StartRow <= mnLastRow) && (mnFirstRow <= rRange.EndRow);
-}
-
-void WorksheetData::XfIdRowRange::set( sal_Int32 nFirstRow, sal_Int32 nLastRow, sal_Int32 nXfId )
-{
-    mnFirstRow = nFirstRow;
-    mnLastRow = nLastRow;
-    mnXfId = nXfId;
-}
-
-bool WorksheetData::XfIdRowRange::tryExpand( sal_Int32 nFirstRow, sal_Int32 nLastRow, sal_Int32 nXfId )
-{
-    if( mnXfId == nXfId )
-    {
-        if( mnLastRow + 1 == nFirstRow )
-        {
-            mnLastRow = nLastRow;
-            return true;
-        }
-        if( mnFirstRow == nLastRow + 1 )
-        {
-            mnFirstRow = nFirstRow;
-            return true;
-        }
-    }
-    return false;
-}
-
-void WorksheetData::XfIdRange::set( const CellModel& rModel )
-{
-    maRange.Sheet = rModel.maAddress.Sheet;
-    maRange.StartColumn = maRange.EndColumn = rModel.maAddress.Column;
-    maRange.StartRow = maRange.EndRow = rModel.maAddress.Row;
-    mnXfId = rModel.mnXfId;
-    mnNumFmtId = rModel.mnNumFmtId;
-}
-
-bool WorksheetData::XfIdRange::tryExpand( const CellModel& rModel )
-{
-    if( (mnXfId == rModel.mnXfId) && (mnNumFmtId == rModel.mnNumFmtId) &&
-        (maRange.StartRow == rModel.maAddress.Row) &&
-        (maRange.EndRow == rModel.maAddress.Row) &&
-        (maRange.EndColumn + 1 == rModel.maAddress.Column) )
-    {
-        ++maRange.EndColumn;
-        return true;
-    }
-    return false;
-}
-
-bool WorksheetData::XfIdRange::tryMerge( const XfIdRange& rXfIdRange )
-{
-    if( (mnXfId == rXfIdRange.mnXfId) &&
-        (mnNumFmtId == rXfIdRange.mnNumFmtId) &&
-        (maRange.EndRow + 1 == rXfIdRange.maRange.StartRow) &&
-        (maRange.StartColumn == rXfIdRange.maRange.StartColumn) &&
-        (maRange.EndColumn == rXfIdRange.maRange.EndColumn) )
-    {
-        maRange.EndRow = rXfIdRange.maRange.EndRow;
-        return true;
-    }
-    return false;
-}
-
-
-WorksheetData::MergedRange::MergedRange( const CellRangeAddress& rRange ) :
-    maRange( rRange ),
-    mnHorAlign( XML_TOKEN_INVALID )
-{
-}
-
-WorksheetData::MergedRange::MergedRange( const CellAddress& rAddress, sal_Int32 nHorAlign ) :
-    maRange( rAddress.Sheet, rAddress.Column, rAddress.Row, rAddress.Column, rAddress.Row ),
-    mnHorAlign( nHorAlign )
-{
-}
-
-bool WorksheetData::MergedRange::tryExpand( const CellAddress& rAddress, sal_Int32 nHorAlign )
-{
-    if( (mnHorAlign == nHorAlign) && (maRange.StartRow == rAddress.Row) &&
-        (maRange.EndRow == rAddress.Row) && (maRange.EndColumn + 1 == rAddress.Column) )
-    {
-        ++maRange.EndColumn;
-        return true;
-    }
-    return false;
-}
-
-void WorksheetData::writeXfIdRowRangeProperties( const XfIdRowRange& rXfIdRowRange ) const
-{
-    if( (rXfIdRowRange.mnLastRow >= 0) && (rXfIdRowRange.mnXfId >= 0) )
-        convertRowFormat( rXfIdRowRange.mnFirstRow, rXfIdRowRange.mnLastRow, rXfIdRowRange.mnXfId );
-}
-
-void WorksheetData::writeXfIdRangeProperties( const XfIdRange& rXfIdRange ) const
-{
-    StylesBuffer& rStyles = getStyles();
-    PropertyMap aPropMap;
-    if( rXfIdRange.mnXfId >= 0 )
-        rStyles.writeCellXfToPropertyMap( aPropMap, rXfIdRange.mnXfId );
-    if( rXfIdRange.mnNumFmtId >= 0 )
-        rStyles.writeNumFmtToPropertyMap( aPropMap, rXfIdRange.mnNumFmtId );
-    PropertySet aPropSet( getCellRange( rXfIdRange.maRange ) );
-    aPropSet.setProperties( aPropMap );
-}
-
-void WorksheetData::mergeXfIdRanges()
-{
-    if( !maXfIdRanges.empty() )
-    {
-        // get row index of last range
-        sal_Int32 nLastRow = maXfIdRanges.rbegin()->second.maRange.StartRow;
-        // process all ranges located in the same row of the last range
-        XfIdRangeMap::iterator aMergeIt = maXfIdRanges.end();
-        while( (aMergeIt != maXfIdRanges.begin()) && ((--aMergeIt)->second.maRange.StartRow == nLastRow) )
-        {
-            const XfIdRange& rMergeXfIdRange = aMergeIt->second;
-            // try to find a range that can be merged with rMergeRange
-            bool bFound = false;
-            for( XfIdRangeMap::iterator aIt = maXfIdRanges.begin(); !bFound && (aIt != aMergeIt); ++aIt )
-                if( (bFound = aIt->second.tryMerge( rMergeXfIdRange )) == true )
-                    maXfIdRanges.erase( aMergeIt++ );
-        }
-    }
-}
-
-void WorksheetData::finalizeXfIdRanges()
-{
-    // write default formatting of remaining row range
-    writeXfIdRowRangeProperties( maXfIdRowRange );
-    // try to merge remaining inserted ranges
-    mergeXfIdRanges();
-    // write all formatting
-    for( XfIdRangeMap::const_iterator aIt = maXfIdRanges.begin(), aEnd = maXfIdRanges.end(); aIt != aEnd; ++aIt )
-        writeXfIdRangeProperties( aIt->second );
-}
-
-void WorksheetData::finalizeHyperlinkRanges() const
+void WorksheetGlobals::finalizeHyperlinkRanges() const
 {
     for( HyperlinkModelList::const_iterator aIt = maHyperlinks.begin(), aEnd = maHyperlinks.end(); aIt != aEnd; ++aIt )
     {
@@ -1309,7 +985,7 @@ void WorksheetData::finalizeHyperlinkRanges() const
     }
 }
 
-OUString WorksheetData::getHyperlinkUrl( const HyperlinkModel& rHyperlink ) const
+OUString WorksheetGlobals::getHyperlinkUrl( const HyperlinkModel& rHyperlink ) const
 {
     OUStringBuffer aUrlBuffer;
     if( rHyperlink.maTarget.getLength() > 0 )
@@ -1337,20 +1013,20 @@ OUString WorksheetData::getHyperlinkUrl( const HyperlinkModel& rHyperlink ) cons
     return aUrl;
 }
 
-void WorksheetData::insertHyperlink( const CellAddress& rAddress, const OUString& rUrl ) const
+void WorksheetGlobals::insertHyperlink( const CellAddress& rAddress, const OUString& rUrl ) const
 {
     Reference< XCell > xCell = getCell( rAddress );
     if( xCell.is() ) switch( xCell->getType() )
     {
         // #i54261# restrict creation of URL field to text cells
-        case ::com::sun::star::table::CellContentType_TEXT:
+        case CellContentType_TEXT:
         {
             Reference< XText > xText( xCell, UNO_QUERY );
             if( xText.is() )
             {
                 // create a URL field object and set its properties
-                Reference< XTextContent > xUrlField( getDocumentFactory()->createInstance( maUrlTextField ), UNO_QUERY );
-                OSL_ENSURE( xUrlField.is(), "WorksheetData::insertHyperlink - cannot create text field" );
+                Reference< XTextContent > xUrlField( getBaseFilter().getModelFactory()->createInstance( maUrlTextField ), UNO_QUERY );
+                OSL_ENSURE( xUrlField.is(), "WorksheetGlobals::insertHyperlink - cannot create text field" );
                 if( xUrlField.is() )
                 {
                     // properties of the URL field
@@ -1376,15 +1052,13 @@ void WorksheetData::insertHyperlink( const CellAddress& rAddress, const OUString
         // fix for #i31050# disabled, HYPERLINK is not able to return numeric value (#i91351#)
 #if 0
         // #i31050# replace number with HYPERLINK function
-        case ::com::sun::star::table::CellContentType_VALUE:
+        case CellContentType_VALUE:
         {
             Reference< XFormulaTokens > xTokens( xCell, UNO_QUERY );
-            OSL_ENSURE( xTokens.is(), "WorksheetHelper::insertHyperlink - missing formula interface" );
-            if( xTokens.is() )
-            {
-                SimpleFormulaContext aContext( xTokens, false, false );
-                getFormulaParser().convertNumberToHyperlink( aContext, rUrl, xCell->getValue() );
-            }
+            ApiTokenSequence aTokens = getFormulaParser().convertNumberToHyperlink( rUrl, xCell->getValue() );
+            OSL_ENSURE( xTokens.is(), "WorksheetHelper::insertHyperlink - missing formula token interface" );
+            if( xTokens.is() && aTokens.hasElements() )
+                xTokens->setTokens( aTokens );
         }
         break;
 #endif
@@ -1393,7 +1067,7 @@ void WorksheetData::insertHyperlink( const CellAddress& rAddress, const OUString
     }
 }
 
-void WorksheetData::finalizeValidationRanges() const
+void WorksheetGlobals::finalizeValidationRanges() const
 {
     for( ValidationModelList::const_iterator aIt = maValidations.begin(), aEnd = maValidations.end(); aIt != aEnd; ++aIt )
     {
@@ -1403,37 +1077,36 @@ void WorksheetData::finalizeValidationRanges() const
         if( xValidation.is() )
         {
             PropertySet aValProps( xValidation );
-            namespace csss = ::com::sun::star::sheet;
 
             // convert validation type to API enum
-            ValidationType eType = csss::ValidationType_ANY;
+            ValidationType eType = ValidationType_ANY;
             switch( aIt->mnType )
             {
-                case XML_custom:        eType = csss::ValidationType_CUSTOM;    break;
-                case XML_date:          eType = csss::ValidationType_DATE;      break;
-                case XML_decimal:       eType = csss::ValidationType_DECIMAL;   break;
-                case XML_list:          eType = csss::ValidationType_LIST;      break;
-                case XML_none:          eType = csss::ValidationType_ANY;       break;
-                case XML_textLength:    eType = csss::ValidationType_TEXT_LEN;  break;
-                case XML_time:          eType = csss::ValidationType_TIME;      break;
-                case XML_whole:         eType = csss::ValidationType_WHOLE;     break;
+                case XML_custom:        eType = ValidationType_CUSTOM;      break;
+                case XML_date:          eType = ValidationType_DATE;        break;
+                case XML_decimal:       eType = ValidationType_DECIMAL;     break;
+                case XML_list:          eType = ValidationType_LIST;        break;
+                case XML_none:          eType = ValidationType_ANY;         break;
+                case XML_textLength:    eType = ValidationType_TEXT_LEN;    break;
+                case XML_time:          eType = ValidationType_TIME;        break;
+                case XML_whole:         eType = ValidationType_WHOLE;       break;
                 default:    OSL_FAIL( "WorksheetData::finalizeValidationRanges - unknown validation type" );
             }
             aValProps.setProperty( PROP_Type, eType );
 
             // convert error alert style to API enum
-            ValidationAlertStyle eAlertStyle = csss::ValidationAlertStyle_STOP;
+            ValidationAlertStyle eAlertStyle = ValidationAlertStyle_STOP;
             switch( aIt->mnErrorStyle )
             {
-                case XML_information:   eAlertStyle = csss::ValidationAlertStyle_INFO;      break;
-                case XML_stop:          eAlertStyle = csss::ValidationAlertStyle_STOP;      break;
-                case XML_warning:       eAlertStyle = csss::ValidationAlertStyle_WARNING;   break;
+                case XML_information:   eAlertStyle = ValidationAlertStyle_INFO;    break;
+                case XML_stop:          eAlertStyle = ValidationAlertStyle_STOP;    break;
+                case XML_warning:       eAlertStyle = ValidationAlertStyle_WARNING; break;
                 default:    OSL_FAIL( "WorksheetData::finalizeValidationRanges - unknown error style" );
             }
             aValProps.setProperty( PROP_ErrorAlertStyle, eAlertStyle );
 
             // convert dropdown style to API visibility constants
-            sal_Int16 nVisibility = aIt->mbNoDropDown ? csss::TableValidationVisibility::INVISIBLE : csss::TableValidationVisibility::UNSORTED;
+            sal_Int16 nVisibility = aIt->mbNoDropDown ? TableValidationVisibility::INVISIBLE : TableValidationVisibility::UNSORTED;
             aValProps.setProperty( PROP_ShowList, nVisibility );
 
             // messages
@@ -1468,99 +1141,36 @@ void WorksheetData::finalizeValidationRanges() const
     }
 }
 
-void WorksheetData::finalizeMergedRanges()
-{
-    MergedRangeList::const_iterator aIt, aEnd;
-    for( aIt = maMergedRanges.begin(), aEnd = maMergedRanges.end(); aIt != aEnd; ++aIt )
-        finalizeMergedRange( aIt->maRange );
-    for( aIt = maCenterFillRanges.begin(), aEnd = maCenterFillRanges.end(); aIt != aEnd; ++aIt )
-        finalizeMergedRange( aIt->maRange );
-}
-
-void WorksheetData::finalizeMergedRange( const CellRangeAddress& rRange )
-{
-    bool bMultiCol = rRange.StartColumn < rRange.EndColumn;
-    bool bMultiRow = rRange.StartRow < rRange.EndRow;
-
-    if( bMultiCol || bMultiRow ) try
-    {
-        // merge the cell range
-        Reference< XMergeable > xMerge( getCellRange( rRange ), UNO_QUERY_THROW );
-        xMerge->merge( sal_True );
-
-        // if merging this range worked (no overlapping merged ranges), update cell borders
-        Reference< XCell > xTopLeft( getCell( CellAddress( getSheetIndex(), rRange.StartColumn, rRange.StartRow ) ), UNO_SET_THROW );
-        PropertySet aTopLeftProp( xTopLeft );
-
-        // copy right border of top-right cell to right border of top-left cell
-        if( bMultiCol )
-        {
-            PropertySet aTopRightProp( getCell( CellAddress( getSheetIndex(), rRange.EndColumn, rRange.StartRow ) ) );
-            BorderLine aLine;
-            if( aTopRightProp.getProperty( aLine, PROP_RightBorder ) )
-                aTopLeftProp.setProperty( PROP_RightBorder, aLine );
-        }
-
-        // copy bottom border of bottom-left cell to bottom border of top-left cell
-        if( bMultiRow )
-        {
-            PropertySet aBottomLeftProp( getCell( CellAddress( getSheetIndex(), rRange.StartColumn, rRange.EndRow ) ) );
-            BorderLine aLine;
-            if( aBottomLeftProp.getProperty( aLine, PROP_BottomBorder ) )
-                aTopLeftProp.setProperty( PROP_BottomBorder, aLine );
-        }
-
-        // #i93609# merged range in a single row: test if manual row height is needed
-        if( !bMultiRow )
-        {
-            bool bTextWrap = aTopLeftProp.getBoolProperty( PROP_IsTextWrapped );
-            if( !bTextWrap && (xTopLeft->getType() == ::com::sun::star::table::CellContentType_TEXT) )
-            {
-                Reference< XText > xText( xTopLeft, UNO_QUERY );
-                bTextWrap = xText.is() && (xText->getString().indexOf( '\x0A' ) >= 0);
-            }
-            if( bTextWrap )
-                maManualRowHeights.insert( rRange.StartRow );
-        }
-    }
-    catch( Exception& )
-    {
-    }
-}
-
-void WorksheetData::convertColumns()
+void WorksheetGlobals::convertColumns()
 {
     sal_Int32 nNextCol = 0;
     sal_Int32 nMaxCol = mrMaxApiPos.Column;
     // stores first grouped column index for each level
     OutlineLevelVec aColLevels;
 
-    for( ColumnModelMap::const_iterator aIt = maColModels.begin(), aEnd = maColModels.end(); aIt != aEnd; ++aIt )
+    for( ColumnModelRangeMap::iterator aIt = maColModels.begin(), aEnd = maColModels.end(); aIt != aEnd; ++aIt )
     {
-        // convert 1-based OOXML column indexes to 0-based API column indexes
-        sal_Int32 nFirstCol = ::std::max( aIt->second.mnFirstCol - 1, nNextCol );
-        sal_Int32 nLastCol = ::std::min( aIt->second.mnLastCol - 1, nMaxCol );
-
+        // column indexes are stored 0-based in maColModels
+        ValueRange aColRange( ::std::max( aIt->first, nNextCol ), ::std::min( aIt->second.second, nMaxCol ) );
         // process gap between two column models, use default column model
-        if( nNextCol < nFirstCol )
-            convertColumns( aColLevels, nNextCol, nFirstCol - 1, maDefColModel );
+        if( nNextCol < aColRange.mnFirst )
+            convertColumns( aColLevels, ValueRange( nNextCol, aColRange.mnFirst - 1 ), maDefColModel );
         // process the column model
-        convertColumns( aColLevels, nFirstCol, nLastCol, aIt->second );
-
+        convertColumns( aColLevels, aColRange, aIt->second.first );
         // cache next column to be processed
-        nNextCol = nLastCol + 1;
+        nNextCol = aColRange.mnLast + 1;
     }
 
     // remaining default columns to end of sheet
-    convertColumns( aColLevels, nNextCol, nMaxCol, maDefColModel );
+    convertColumns( aColLevels, ValueRange( nNextCol, nMaxCol ), maDefColModel );
     // close remaining column outlines spanning to end of sheet
     convertOutlines( aColLevels, nMaxCol + 1, 0, false, false );
 }
 
-void WorksheetData::convertColumns( OutlineLevelVec& orColLevels,
-        sal_Int32 nFirstCol, sal_Int32 nLastCol, const ColumnModel& rModel )
+void WorksheetGlobals::convertColumns( OutlineLevelVec& orColLevels,
+        const ValueRange& rColRange, const ColumnModel& rModel )
 {
-    PropertySet aPropSet( getColumns( nFirstCol, nLastCol ) );
+    PropertySet aPropSet( getColumns( rColRange ) );
 
     // column width: convert 'number of characters' to column width in 1/100 mm
     sal_Int32 nWidth = getUnitConverter().scaleToMm100( rModel.mfWidth, UNIT_DIGIT );
@@ -1575,54 +1185,55 @@ void WorksheetData::convertColumns( OutlineLevelVec& orColLevels,
         aPropSet.setProperty( PROP_IsVisible, false );
 
     // outline settings for this column range
-    convertOutlines( orColLevels, nFirstCol, rModel.mnLevel, rModel.mbCollapsed, false );
+    convertOutlines( orColLevels, rColRange.mnFirst, rModel.mnLevel, rModel.mbCollapsed, false );
 }
 
-void WorksheetData::convertRows()
+void WorksheetGlobals::convertRows()
 {
     sal_Int32 nNextRow = 0;
     sal_Int32 nMaxRow = mrMaxApiPos.Row;
     // stores first grouped row index for each level
     OutlineLevelVec aRowLevels;
 
-    for( RowModelMap::const_iterator aIt = maRowModels.begin(), aEnd = maRowModels.end(); aIt != aEnd; ++aIt )
+    for( RowModelRangeMap::iterator aIt = maRowModels.begin(), aEnd = maRowModels.end(); aIt != aEnd; ++aIt )
     {
-        // convert 1-based OOXML row indexes to 0-based API row indexes
-        sal_Int32 nFirstRow = ::std::max( aIt->second.mnFirstRow - 1, nNextRow );
-        sal_Int32 nLastRow = ::std::min( aIt->second.mnLastRow - 1, nMaxRow );
-
+        // row indexes are stored 0-based in maRowModels
+        ValueRange aRowRange( ::std::max( aIt->first, nNextRow ), ::std::min( aIt->second.second, nMaxRow ) );
         // process gap between two row models, use default row model
-        if( nNextRow < nFirstRow )
-            convertRows( aRowLevels, nNextRow, nFirstRow - 1, maDefRowModel );
+        if( nNextRow < aRowRange.mnFirst )
+            convertRows( aRowLevels, ValueRange( nNextRow, aRowRange.mnFirst - 1 ), maDefRowModel );
         // process the row model
-        convertRows( aRowLevels, nFirstRow, nLastRow, aIt->second, maDefRowModel.mfHeight );
-
+        convertRows( aRowLevels, aRowRange, aIt->second.first, maDefRowModel.mfHeight );
         // cache next row to be processed
-        nNextRow = nLastRow + 1;
+        nNextRow = aRowRange.mnLast + 1;
     }
 
     // remaining default rows to end of sheet
-    convertRows( aRowLevels, nNextRow, nMaxRow, maDefRowModel );
+    convertRows( aRowLevels, ValueRange( nNextRow, nMaxRow ), maDefRowModel );
     // close remaining row outlines spanning to end of sheet
     convertOutlines( aRowLevels, nMaxRow + 1, 0, false, true );
 }
 
-void WorksheetData::convertRows( OutlineLevelVec& orRowLevels,
-        sal_Int32 nFirstRow, sal_Int32 nLastRow, const RowModel& rModel, double fDefHeight )
+void WorksheetGlobals::convertRows( OutlineLevelVec& orRowLevels,
+        const ValueRange& rRowRange, const RowModel& rModel, double fDefHeight )
 {
     // row height: convert points to row height in 1/100 mm
     double fHeight = (rModel.mfHeight >= 0.0) ? rModel.mfHeight : fDefHeight;
     sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT );
     if( nHeight > 0 )
     {
+        /*  Get all rows that have custom height inside the passed row model.
+            If the model has the custom height flag set, all its rows have
+            custom height, otherwise get all rows specified in the class member
+            maManualRowHeights that are inside the passed row model. */
         ValueRangeVector aManualRows;
         if( rModel.mbCustomHeight )
-            aManualRows.push_back( ValueRange( nFirstRow, nLastRow ) );
+            aManualRows.push_back( rRowRange );
         else
-            maManualRowHeights.intersect( aManualRows, nFirstRow, nLastRow );
+            aManualRows = maManualRowHeights.getIntersection( rRowRange );
         for( ValueRangeVector::const_iterator aIt = aManualRows.begin(), aEnd = aManualRows.end(); aIt != aEnd; ++aIt )
         {
-            PropertySet aPropSet( getRows( aIt->mnFirst, aIt->mnLast ) );
+            PropertySet aPropSet( getRows( *aIt ) );
             aPropSet.setProperty( PROP_Height, nHeight );
         }
     }
@@ -1630,21 +1241,21 @@ void WorksheetData::convertRows( OutlineLevelVec& orRowLevels,
     // hidden rows: TODO: #108683# hide rows later?
     if( rModel.mbHidden )
     {
-        PropertySet aPropSet( getRows( nFirstRow, nLastRow ) );
+        PropertySet aPropSet( getRows( rRowRange ) );
         aPropSet.setProperty( PROP_IsVisible, false );
     }
 
     // outline settings for this row range
-    convertOutlines( orRowLevels, nFirstRow, rModel.mnLevel, rModel.mbCollapsed, true );
+    convertOutlines( orRowLevels, rRowRange.mnFirst, rModel.mnLevel, rModel.mbCollapsed, true );
 }
 
-void WorksheetData::convertOutlines( OutlineLevelVec& orLevels,
+void WorksheetGlobals::convertOutlines( OutlineLevelVec& orLevels,
         sal_Int32 nColRow, sal_Int32 nLevel, bool bCollapsed, bool bRows )
 {
     /*  It is ensured from caller functions, that this function is called
         without any gaps between the processed column or row ranges. */
 
-    OSL_ENSURE( nLevel >= 0, "WorksheetData::convertOutlines - negative outline level" );
+    OSL_ENSURE( nLevel >= 0, "WorksheetGlobals::convertOutlines - negative outline level" );
     nLevel = ::std::max< sal_Int32 >( nLevel, 0 );
 
     sal_Int32 nSize = orLevels.size();
@@ -1667,7 +1278,7 @@ void WorksheetData::convertOutlines( OutlineLevelVec& orLevels,
     }
 }
 
-void WorksheetData::groupColumnsOrRows( sal_Int32 nFirstColRow, sal_Int32 nLastColRow, bool bCollapse, bool bRows )
+void WorksheetGlobals::groupColumnsOrRows( sal_Int32 nFirstColRow, sal_Int32 nLastColRow, bool bCollapse, bool bRows )
 {
     try
     {
@@ -1675,14 +1286,14 @@ void WorksheetData::groupColumnsOrRows( sal_Int32 nFirstColRow, sal_Int32 nLastC
         if( bRows )
         {
             CellRangeAddress aRange( getSheetIndex(), 0, nFirstColRow, 0, nLastColRow );
-            xOutline->group( aRange, ::com::sun::star::table::TableOrientation_ROWS );
+            xOutline->group( aRange, TableOrientation_ROWS );
             if( bCollapse )
                 xOutline->hideDetail( aRange );
         }
         else
         {
             CellRangeAddress aRange( getSheetIndex(), nFirstColRow, 0, nLastColRow, 0 );
-            xOutline->group( aRange, ::com::sun::star::table::TableOrientation_COLUMNS );
+            xOutline->group( aRange, TableOrientation_COLUMNS );
             if( bCollapse )
                 xOutline->hideDetail( aRange );
         }
@@ -1692,8 +1303,12 @@ void WorksheetData::groupColumnsOrRows( sal_Int32 nFirstColRow, sal_Int32 nLastC
     }
 }
 
-void WorksheetData::finalizeDrawings()
+void WorksheetGlobals::finalizeDrawings()
 {
+    // calculate the current drawing page size (after rows/columns are imported)
+    PropertySet aRangeProp( getCellRange( CellRangeAddress( getSheetIndex(), 0, 0, mrMaxApiPos.Column, mrMaxApiPos.Row ) ) );
+    aRangeProp.getProperty( maDrawPageSize, PROP_Size );
+
     switch( getFilterType() )
     {
         case FILTER_OOXML:
@@ -1703,11 +1318,12 @@ void WorksheetData::finalizeDrawings()
             if( maVmlDrawingPath.getLength() > 0 )
                 importOoxFragment( new VmlDrawingFragment( *this, maVmlDrawingPath ) );
         break;
-        
+
         case FILTER_BIFF:
-            // TODO: import DFF shapes
+            // convert BIFF3-BIFF5 drawing objects, or import and convert DFF stream
+            getBiffDrawing().finalizeImport();
         break;
-        
+
         case FILTER_UNKNOWN:
         break;
     }
@@ -1737,109 +1353,56 @@ void WorksheetData::finalizeDrawings()
     if( maSheetViewSett.isSheetRightToLeft() )
     {
         PropertySet aPropSet( mxSheet );
-        aPropSet.setProperty( PROP_TableLayout, ::com::sun::star::text::WritingMode2::RL_TB );
+        aPropSet.setProperty( PROP_TableLayout, WritingMode2::RL_TB );
     }
 }
 
 // ============================================================================
 // ============================================================================
 
-WorksheetHelper::WorksheetHelper( WorksheetData& rSheetData ) :
-    WorkbookHelper( rSheetData ),
-    mrSheetData( rSheetData )
+WorksheetHelper::WorksheetHelper( WorksheetGlobals& rSheetGlob ) :
+    WorkbookHelper( rSheetGlob ),
+    mrSheetGlob( rSheetGlob )
 {
 }
 
+/*static*/ WorksheetGlobalsRef WorksheetHelper::constructGlobals( const WorkbookHelper& rHelper,
+        const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet )
+{
+    WorksheetGlobalsRef xSheetGlob( new WorksheetGlobals( rHelper, rxProgressBar, eSheetType, nSheet ) );
+    if( !xSheetGlob->isValidSheet() )
+        xSheetGlob.reset();
+    return xSheetGlob;
+}
+
 WorksheetType WorksheetHelper::getSheetType() const
 {
-    return mrSheetData.getSheetType();
+    return mrSheetGlob.getSheetType();
 }
 
 sal_Int16 WorksheetHelper::getSheetIndex() const
 {
-    return mrSheetData.getSheetIndex();
+    return mrSheetGlob.getSheetIndex();
 }
 
 const Reference< XSpreadsheet >& WorksheetHelper::getSheet() const
 {
-    return mrSheetData.getSheet();
+    return mrSheetGlob.getSheet();
 }
 
 Reference< XCell > WorksheetHelper::getCell( const CellAddress& rAddress ) const
 {
-    return mrSheetData.getCell( rAddress );
-}
-
-Reference< XCell > WorksheetHelper::getCell( const OUString& rAddressStr, CellAddress* opAddress ) const
-{
-    CellAddress aAddress;
-    if( getAddressConverter().convertToCellAddress( aAddress, rAddressStr, mrSheetData.getSheetIndex(), true ) )
-    {
-        if( opAddress ) *opAddress = aAddress;
-        return mrSheetData.getCell( aAddress );
-    }
-    return Reference< XCell >();
-}
-
-Reference< XCell > WorksheetHelper::getCell( const BinAddress& rBinAddress, CellAddress* opAddress ) const
-{
-    CellAddress aAddress;
-    if( getAddressConverter().convertToCellAddress( aAddress, rBinAddress, mrSheetData.getSheetIndex(), true ) )
-    {
-        if( opAddress ) *opAddress = aAddress;
-        return mrSheetData.getCell( aAddress );
-    }
-    return Reference< XCell >();
+    return mrSheetGlob.getCell( rAddress );
 }
 
 Reference< XCellRange > WorksheetHelper::getCellRange( const CellRangeAddress& rRange ) const
 {
-    return mrSheetData.getCellRange( rRange );
-}
-
-Reference< XCellRange > WorksheetHelper::getCellRange( const OUString& rRangeStr, CellRangeAddress* opRange ) const
-{
-    CellRangeAddress aRange;
-    if( getAddressConverter().convertToCellRange( aRange, rRangeStr, mrSheetData.getSheetIndex(), true, true ) )
-    {
-        if( opRange ) *opRange = aRange;
-        return mrSheetData.getCellRange( aRange );
-    }
-    return Reference< XCellRange >();
-}
-
-Reference< XCellRange > WorksheetHelper::getCellRange( const BinRange& rBinRange, CellRangeAddress* opRange ) const
-{
-    CellRangeAddress aRange;
-    if( getAddressConverter().convertToCellRange( aRange, rBinRange, mrSheetData.getSheetIndex(), true, true ) )
-    {
-        if( opRange ) *opRange = aRange;
-        return mrSheetData.getCellRange( aRange );
-    }
-    return Reference< XCellRange >();
+    return mrSheetGlob.getCellRange( rRange );
 }
 
 Reference< XSheetCellRanges > WorksheetHelper::getCellRangeList( const ApiCellRangeList& rRanges ) const
 {
-    return mrSheetData.getCellRangeList( rRanges );
-}
-
-Reference< XSheetCellRanges > WorksheetHelper::getCellRangeList(
-        const OUString& rRangesStr, ApiCellRangeList* opRanges ) const
-{
-    ApiCellRangeList aRanges;
-    getAddressConverter().convertToCellRangeList( aRanges, rRangesStr, mrSheetData.getSheetIndex(), true );
-    if( opRanges ) *opRanges = aRanges;
-    return mrSheetData.getCellRangeList( aRanges );
-}
-
-Reference< XSheetCellRanges > WorksheetHelper::getCellRangeList(
-        const BinRangeList& rBinRanges, ApiCellRangeList* opRanges ) const
-{
-    ApiCellRangeList aRanges;
-    getAddressConverter().convertToCellRangeList( aRanges, rBinRanges, mrSheetData.getSheetIndex(), true );
-    if( opRanges ) *opRanges = aRanges;
-    return mrSheetData.getCellRangeList( aRanges );
+    return mrSheetGlob.getCellRangeList( rRanges );
 }
 
 CellAddress WorksheetHelper::getCellAddress( const Reference< XCell >& rxCell )
@@ -1864,267 +1427,112 @@ CellRangeAddress WorksheetHelper::getRangeAddress( const Reference< XCellRange >
 
 Reference< XCellRange > WorksheetHelper::getColumn( sal_Int32 nCol ) const
 {
-    return mrSheetData.getColumn( nCol );
+    return mrSheetGlob.getColumn( nCol );
 }
 
 Reference< XCellRange > WorksheetHelper::getRow( sal_Int32 nRow ) const
 {
-    return mrSheetData.getRow( nRow );
+    return mrSheetGlob.getRow( nRow );
 }
 
-Reference< XTableColumns > WorksheetHelper::getColumns( sal_Int32 nFirstCol, sal_Int32 nLastCol ) const
+Reference< XTableColumns > WorksheetHelper::getColumns( const ValueRange& rColRange ) const
 {
-    return mrSheetData.getColumns( nFirstCol, nLastCol );
+    return mrSheetGlob.getColumns( rColRange );
 }
 
-Reference< XTableRows > WorksheetHelper::getRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) const
+Reference< XTableRows > WorksheetHelper::getRows( const ValueRange& rRowRange ) const
 {
-    return mrSheetData.getRows( nFirstRow, nLastRow );
+    return mrSheetGlob.getRows( rRowRange );
 }
 
 Reference< XDrawPage > WorksheetHelper::getDrawPage() const
 {
-    return mrSheetData.getDrawPage();
+    return mrSheetGlob.getDrawPage();
 }
 
 Point WorksheetHelper::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const
 {
-    return mrSheetData.getCellPosition( nCol, nRow );
+    return mrSheetGlob.getCellPosition( nCol, nRow );
 }
 
 Size WorksheetHelper::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const
 {
-    return mrSheetData.getCellSize( nCol, nRow );
+    return mrSheetGlob.getCellSize( nCol, nRow );
 }
 
 Size WorksheetHelper::getDrawPageSize() const
 {
-    return mrSheetData.getDrawPageSize();
+    return mrSheetGlob.getDrawPageSize();
 }
 
-WorksheetSettings& WorksheetHelper::getWorksheetSettings() const
-{
-    return mrSheetData.getWorksheetSettings();
-}
-
-SharedFormulaBuffer& WorksheetHelper::getSharedFormulas() const
+SheetDataBuffer& WorksheetHelper::getSheetData() const
 {
-    return mrSheetData.getSharedFormulas();
+    return mrSheetGlob.getSheetData();
 }
 
 CondFormatBuffer& WorksheetHelper::getCondFormats() const
 {
-    return mrSheetData.getCondFormats();
+    return mrSheetGlob.getCondFormats();
 }
 
 CommentsBuffer& WorksheetHelper::getComments() const
 {
-    return mrSheetData.getComments();
+    return mrSheetGlob.getComments();
 }
 
 AutoFilterBuffer& WorksheetHelper::getAutoFilters() const
 {
-    return mrSheetData.getAutoFilters();
+    return mrSheetGlob.getAutoFilters();
 }
 
 QueryTableBuffer& WorksheetHelper::getQueryTables() const
 {
-    return mrSheetData.getQueryTables();
+    return mrSheetGlob.getQueryTables();
 }
 
-PageSettings& WorksheetHelper::getPageSettings() const
-{
-    return mrSheetData.getPageSettings();
-}
-
-SheetViewSettings& WorksheetHelper::getSheetViewSettings() const
-{
-    return mrSheetData.getSheetViewSettings();
-}
-
-VmlDrawing& WorksheetHelper::getVmlDrawing() const
-{
-    return mrSheetData.getVmlDrawing();
-}
-
-void WorksheetHelper::setStringCell( const Reference< XCell >& rxCell, const OUString& rText ) const
-{
-    OSL_ENSURE( rxCell.is(), "WorksheetHelper::setStringCell - missing cell interface" );
-    Reference< XText > xText( rxCell, UNO_QUERY );
-    if( xText.is() )
-        xText->setString( rText );
-}
-
-void WorksheetHelper::setSharedStringCell( const Reference< XCell >& rxCell, sal_Int32 nStringId, sal_Int32 nXfId ) const
-{
-    OSL_ENSURE( rxCell.is(), "WorksheetHelper::setSharedStringCell - missing cell interface" );
-    getSharedStrings().convertString( Reference< XText >( rxCell, UNO_QUERY ), nStringId, nXfId );
-}
-
-void WorksheetHelper::setDateTimeCell( const Reference< XCell >& rxCell, const DateTime& rDateTime ) const
-{
-    OSL_ENSURE( rxCell.is(), "WorksheetHelper::setDateTimeCell - missing cell interface" );
-    // write serial date/time value into the cell
-    double fSerial = getUnitConverter().calcSerialFromDateTime( rDateTime );
-    rxCell->setValue( fSerial );
-    // set appropriate number format
-    using namespace ::com::sun::star::util::NumberFormat;
-    sal_Int16 nStdFmt = (fSerial < 1.0) ? TIME : (((rDateTime.Hours > 0) || (rDateTime.Minutes > 0) || (rDateTime.Seconds > 0)) ? DATETIME : DATE);
-    setStandardNumFmt( rxCell, nStdFmt );
-}
-
-void WorksheetHelper::setBooleanCell( const Reference< XCell >& rxCell, bool bValue ) const
+WorksheetSettings& WorksheetHelper::getWorksheetSettings() const
 {
-    OSL_ENSURE( rxCell.is(), "WorksheetHelper::setBooleanCell - missing cell interface" );
-    rxCell->setFormula( mrSheetData.getBooleanFormula( bValue ) );
+    return mrSheetGlob.getWorksheetSettings();
 }
 
-void WorksheetHelper::setErrorCell( const Reference< XCell >& rxCell, const OUString& rErrorCode ) const
+PageSettings& WorksheetHelper::getPageSettings() const
 {
-    setErrorCell( rxCell, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+    return mrSheetGlob.getPageSettings();
 }
 
-void WorksheetHelper::setErrorCell( const Reference< XCell >& rxCell, sal_uInt8 nErrorCode ) const
+SheetViewSettings& WorksheetHelper::getSheetViewSettings() const
 {
-    Reference< XFormulaTokens > xTokens( rxCell, UNO_QUERY );
-    OSL_ENSURE( xTokens.is(), "WorksheetHelper::setErrorCell - missing formula interface" );
-    if( xTokens.is() )
-    {
-        SimpleFormulaContext aContext( xTokens, false, false );
-        getFormulaParser().convertErrorToFormula( aContext, nErrorCode );
-    }
+    return mrSheetGlob.getSheetViewSettings();
 }
 
-void WorksheetHelper::setCell( CellModel& orModel ) const
+VmlDrawing& WorksheetHelper::getVmlDrawing() const
 {
-    OSL_ENSURE( orModel.mxCell.is(), "WorksheetHelper::setCell - missing cell interface" );
-    if( orModel.mbHasValueStr ) switch( orModel.mnCellType )
-    {
-        case XML_b:
-            setBooleanCell( orModel.mxCell, orModel.maValueStr.toDouble() != 0.0 );
-            // #108770# set 'Standard' number format for all Boolean cells
-            orModel.mnNumFmtId = 0;
-        break;
-        case XML_n:
-            orModel.mxCell->setValue( orModel.maValueStr.toDouble() );
-        break;
-        case XML_e:
-            setErrorCell( orModel.mxCell, orModel.maValueStr );
-        break;
-        case XML_str:
-            setStringCell( orModel.mxCell, orModel.maValueStr );
-        break;
-        case XML_s:
-            setSharedStringCell( orModel.mxCell, orModel.maValueStr.toInt32(), orModel.mnXfId );
-        break;
-    }
+    return mrSheetGlob.getVmlDrawing();
 }
 
-void WorksheetHelper::setStandardNumFmt( const Reference< XCell >& rxCell, sal_Int16 nStdNumFmt ) const
+BiffSheetDrawing& WorksheetHelper::getBiffDrawing() const
 {
-    try
-    {
-        Reference< XNumberFormatsSupplier > xNumFmtsSupp( getDocument(), UNO_QUERY_THROW );
-        Reference< XNumberFormatTypes > xNumFmtTypes( xNumFmtsSupp->getNumberFormats(), UNO_QUERY_THROW );
-        sal_Int32 nIndex = xNumFmtTypes->getStandardFormat( nStdNumFmt, Locale() );
-        PropertySet aPropSet( rxCell );
-        aPropSet.setProperty( PROP_NumberFormat, nIndex );
-    }
-    catch( Exception& )
-    {
-    }
+    return mrSheetGlob.getBiffDrawing();
 }
 
 void WorksheetHelper::setSheetType( WorksheetType eSheetType )
 {
-    mrSheetData.setSheetType( eSheetType );
-}
-
-void WorksheetHelper::setCellFormat( const CellModel& rModel )
-{
-    mrSheetData.setCellFormat( rModel );
-}
-
-void WorksheetHelper::setMergedRange( const CellRangeAddress& rRange )
-{
-    mrSheetData.setMergedRange( rRange );
+    mrSheetGlob.setSheetType( eSheetType );
 }
 
 void WorksheetHelper::setPageBreak( const PageBreakModel& rModel, bool bRowBreak )
 {
-    mrSheetData.setPageBreak( rModel, bRowBreak );
+    mrSheetGlob.setPageBreak( rModel, bRowBreak );
 }
 
 void WorksheetHelper::setHyperlink( const HyperlinkModel& rModel )
 {
-    mrSheetData.setHyperlink( rModel );
+    mrSheetGlob.setHyperlink( rModel );
 }
 
 void WorksheetHelper::setValidation( const ValidationModel& rModel )
 {
-    mrSheetData.setValidation( rModel );
-}
-
-void WorksheetHelper::setTableOperation( const CellRangeAddress& rRange, const DataTableModel& rModel ) const
-{
-    OSL_ENSURE( getAddressConverter().checkCellRange( rRange, true, false ), "WorksheetHelper::setTableOperation - invalid range" );
-    bool bOk = false;
-    if( !rModel.mbRef1Deleted && (rModel.maRef1.getLength() > 0) && (rRange.StartColumn > 0) && (rRange.StartRow > 0) )
-    {
-        CellRangeAddress aOpRange = rRange;
-        CellAddress aRef1, aRef2;
-        if( getAddressConverter().convertToCellAddress( aRef1, rModel.maRef1, mrSheetData.getSheetIndex(), true ) ) try
-        {
-            if( rModel.mb2dTable )
-            {
-                if( !rModel.mbRef2Deleted && getAddressConverter().convertToCellAddress( aRef2, rModel.maRef2, mrSheetData.getSheetIndex(), true ) )
-                {
-                    // API call expects input values inside operation range
-                    --aOpRange.StartColumn;
-                    --aOpRange.StartRow;
-                    // formula range is top-left cell of operation range
-                    CellRangeAddress aFormulaRange( mrSheetData.getSheetIndex(), aOpRange.StartColumn, aOpRange.StartRow, aOpRange.StartColumn, aOpRange.StartRow );
-                    // set multiple operation
-                    Reference< XMultipleOperation > xMultOp( mrSheetData.getCellRange( aOpRange ), UNO_QUERY_THROW );
-                    xMultOp->setTableOperation( aFormulaRange, ::com::sun::star::sheet::TableOperationMode_BOTH, aRef2, aRef1 );
-                    bOk = true;
-                }
-            }
-            else if( rModel.mbRowTable )
-            {
-                // formula range is column to the left of operation range
-                CellRangeAddress aFormulaRange( mrSheetData.getSheetIndex(), aOpRange.StartColumn - 1, aOpRange.StartRow, aOpRange.StartColumn - 1, aOpRange.EndRow );
-                // API call expects input values (top row) inside operation range
-                --aOpRange.StartRow;
-                // set multiple operation
-                Reference< XMultipleOperation > xMultOp( mrSheetData.getCellRange( aOpRange ), UNO_QUERY_THROW );
-                xMultOp->setTableOperation( aFormulaRange, ::com::sun::star::sheet::TableOperationMode_ROW, aRef1, aRef1 );
-                bOk = true;
-            }
-            else
-            {
-                // formula range is row above operation range
-                CellRangeAddress aFormulaRange( mrSheetData.getSheetIndex(), aOpRange.StartColumn, aOpRange.StartRow - 1, aOpRange.EndColumn, aOpRange.StartRow - 1 );
-                // API call expects input values (left column) inside operation range
-                --aOpRange.StartColumn;
-                // set multiple operation
-                Reference< XMultipleOperation > xMultOp( mrSheetData.getCellRange( aOpRange ), UNO_QUERY_THROW );
-                xMultOp->setTableOperation( aFormulaRange, ::com::sun::star::sheet::TableOperationMode_COLUMN, aRef1, aRef1 );
-                bOk = true;
-            }
-        }
-        catch( Exception& )
-        {
-        }
-    }
-
-    // on error: fill cell range with error codes
-    if( !bOk )
-    {
-        for( CellAddress aPos( mrSheetData.getSheetIndex(), rRange.StartColumn, rRange.StartRow ); aPos.Row <= rRange.EndRow; ++aPos.Row )
-            for( aPos.Column = rRange.StartColumn; aPos.Column <= rRange.EndColumn; ++aPos.Column )
-                setErrorCell( mrSheetData.getCell( aPos ), BIFF_ERR_REF );
-    }
+    mrSheetGlob.setValidation( rModel );
 }
 
 void WorksheetHelper::setLabelRanges( const ApiCellRangeList& rColRanges, const ApiCellRangeList& rRowRanges )
@@ -2181,107 +1589,100 @@ void WorksheetHelper::setLabelRanges( const ApiCellRangeList& rColRanges, const
 
 void WorksheetHelper::setDrawingPath( const OUString& rDrawingPath )
 {
-    mrSheetData.setDrawingPath( rDrawingPath );
+    mrSheetGlob.setDrawingPath( rDrawingPath );
 }
 
 void WorksheetHelper::setVmlDrawingPath( const OUString& rVmlDrawingPath )
 {
-    mrSheetData.setVmlDrawingPath( rVmlDrawingPath );
+    mrSheetGlob.setVmlDrawingPath( rVmlDrawingPath );
 }
 
 void WorksheetHelper::extendUsedArea( const CellAddress& rAddress )
 {
-    mrSheetData.extendUsedArea( rAddress );
+    mrSheetGlob.extendUsedArea( rAddress );
 }
 
 void WorksheetHelper::extendUsedArea( const CellRangeAddress& rRange )
 {
-    mrSheetData.extendUsedArea( rRange );
+    mrSheetGlob.extendUsedArea( rRange );
 }
 
 void WorksheetHelper::extendShapeBoundingBox( const Rectangle& rShapeRect )
 {
-    mrSheetData.extendShapeBoundingBox( rShapeRect );
+    mrSheetGlob.extendShapeBoundingBox( rShapeRect );
 }
 
 void WorksheetHelper::setBaseColumnWidth( sal_Int32 nWidth )
 {
-    mrSheetData.setBaseColumnWidth( nWidth );
+    mrSheetGlob.setBaseColumnWidth( nWidth );
 }
 
 void WorksheetHelper::setDefaultColumnWidth( double fWidth )
 {
-    mrSheetData.setDefaultColumnWidth( fWidth );
+    mrSheetGlob.setDefaultColumnWidth( fWidth );
 }
 
 void WorksheetHelper::setDefaultColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId )
 {
-    mrSheetData.convertColumnFormat( nFirstCol, nLastCol, nXfId );
+    mrSheetGlob.convertColumnFormat( nFirstCol, nLastCol, nXfId );
 }
 
 void WorksheetHelper::setColumnModel( const ColumnModel& rModel )
 {
-    mrSheetData.setColumnModel( rModel );
+    mrSheetGlob.setColumnModel( rModel );
 }
 
 void WorksheetHelper::setDefaultRowSettings( double fHeight, bool bCustomHeight, bool bHidden, bool bThickTop, bool bThickBottom )
 {
-    mrSheetData.setDefaultRowSettings( fHeight, bCustomHeight, bHidden, bThickTop, bThickBottom );
+    mrSheetGlob.setDefaultRowSettings( fHeight, bCustomHeight, bHidden, bThickTop, bThickBottom );
 }
 
 void WorksheetHelper::setRowModel( const RowModel& rModel )
 {
-    mrSheetData.setRowModel( rModel );
-}
-
-void WorksheetHelper::initializeWorksheetImport()
-{
-    mrSheetData.initializeWorksheetImport();
+    mrSheetGlob.setRowModel( rModel );
 }
 
-void WorksheetHelper::finalizeWorksheetImport()
+void WorksheetHelper::setManualRowHeight( sal_Int32 nRow )
 {
-    mrSheetData.finalizeWorksheetImport();
+    mrSheetGlob.setManualRowHeight( nRow );
 }
 
-// ============================================================================
-
-namespace prv {
-
-WorksheetDataOwner::WorksheetDataOwner( WorksheetDataRef xSheetData ) :
-    mxSheetData( xSheetData )
+void WorksheetHelper::putValue( const CellAddress& rAddress, double fValue ) const
 {
+    Reference< XCell > xCell = getCell( rAddress );
+    OSL_ENSURE( xCell.is(), "WorksheetHelper::putValue - missing cell interface" );
+    if( xCell.is() ) xCell->setValue( fValue );
 }
 
-WorksheetDataOwner::~WorksheetDataOwner()
+void WorksheetHelper::putString( const CellAddress& rAddress, const OUString& rText ) const
 {
+    Reference< XText > xText( getCell( rAddress ), UNO_QUERY );
+    OSL_ENSURE( xText.is(), "WorksheetHelper::putString - missing text interface" );
+    if( xText.is() ) xText->setString( rText );
 }
 
-} // namespace prv
-
-// ----------------------------------------------------------------------------
-
-WorksheetHelperRoot::WorksheetHelperRoot( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    prv::WorksheetDataOwner( prv::WorksheetDataRef( new WorksheetData( rHelper, rxProgressBar, eSheetType, nSheet ) ) ),
-    WorksheetHelper( *mxSheetData )
+void WorksheetHelper::putRichString( const CellAddress& rAddress, const RichString& rString, const Font* pFirstPortionFont ) const
 {
+    Reference< XText > xText( getCell( rAddress ), UNO_QUERY );
+    OSL_ENSURE( xText.is(), "WorksheetHelper::putRichString - missing text interface" );
+    rString.convert( xText, pFirstPortionFont );
 }
 
-WorksheetHelperRoot::WorksheetHelperRoot( const WorksheetHelper& rHelper ) :
-    prv::WorksheetDataOwner( prv::WorksheetDataRef() ),
-    WorksheetHelper( rHelper )
+void WorksheetHelper::putFormulaTokens( const CellAddress& rAddress, const ApiTokenSequence& rTokens ) const
 {
+    Reference< XFormulaTokens > xTokens( getCell( rAddress ), UNO_QUERY );
+    OSL_ENSURE( xTokens.is(), "WorksheetHelper::putFormulaTokens - missing token interface" );
+    if( xTokens.is() ) xTokens->setTokens( rTokens );
 }
 
-WorksheetHelperRoot::WorksheetHelperRoot( const WorksheetHelperRoot& rHelper ) :
-    prv::WorksheetDataOwner( rHelper.mxSheetData ),
-    WorksheetHelper( rHelper )
+void WorksheetHelper::initializeWorksheetImport()
 {
+    mrSheetGlob.initializeWorksheetImport();
 }
 
-bool WorksheetHelperRoot::isValidSheet() const
+void WorksheetHelper::finalizeWorksheetImport()
 {
-    return mxSheetData->isValidSheet();
+    mrSheetGlob.finalizeWorksheetImport();
 }
 
 // ============================================================================
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index 03b7b3888..d1470a6ba 100644
--- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -172,14 +172,14 @@ public class RDFRepositoryTest
 
             try {
                 xRep.createGraph(foo);
-                assertFalse("creating duplicate graph was allowed", false);
+                fail("creating duplicate graph was allowed");
             } catch (ElementExistException e) {
                 // ignore
             }
 
             try {
                 xRep.createGraph(null);
-                assertFalse("invalid graph name was allowed", false);
+                fail("invalid graph name was allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
@@ -296,7 +296,7 @@ public class RDFRepositoryTest
             xFooIn = new StreamSimulator(tempDir + "foo.rdf", true, param);
             try {
                 xRep.importGraph(FileFormat.RDF_XML, xFooIn, bar, base);
-                assertFalse("importing existing graph did not fail", false);
+                fail("importing existing graph did not fail");
             } catch (ElementExistException e) {
                 // ignore
             }
@@ -328,28 +328,28 @@ public class RDFRepositoryTest
 
             try {
                 xBazGraph.clear();
-                assertFalse("deleted graph not invalid (clear)", false);
+                fail("deleted graph not invalid (clear)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
 
             try {
                 xBazGraph.addStatement(foo, foo, foo);
-                assertFalse("deleted graph not invalid (add)", false);
+                fail("deleted graph not invalid (add)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
 
             try {
                 xBazGraph.removeStatements(null, null, null);
-                assertFalse("deleted graph not invalid (remove)", false);
+                fail("deleted graph not invalid (remove)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
 
             try {
                 xBazGraph.getStatements(null, null, null);
-                assertFalse("deleted graph not invalid (get)", false);
+                fail("deleted graph not invalid (get)");
             } catch (NoSuchElementException e) {
                 // ignore
             }
@@ -474,14 +474,14 @@ public class RDFRepositoryTest
 
             try {
                 xRep.setStatementRDFa(foo, new XURI[] {}, xM, "", null);
-                assertFalse("RDFa: set: no predicate", false);
+                fail("RDFa: set: no predicate");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
 
             try {
                 xRep.setStatementRDFa(foo, new XURI[] {bar}, null, "", null);
-                assertFalse("RDFa: set: null", false);
+                fail("RDFa: set: null");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
diff --git a/writerfilter/Makefile b/writerfilter/Makefile
index a79aff831..a79aff831 100644..100755
--- a/writerfilter/Makefile
+++ b/writerfilter/Makefile
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 602c9eb01..bc2fa9aeb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1643,15 +1643,16 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand,
     lang::Locale aCurrentLocale = aUSLocale;
     GetCurrentLocale( aCurrentLocale );
     ::rtl::OUString sFormat = ConversionHelper::ConvertMSFormatStringToSO( sFormatString, aCurrentLocale, bHijri);
-
     //get the number formatter and convert the string to a format value
     try
     {
         uno::Reference< util::XNumberFormatsSupplier > xNumberSupplier( m_xTextDocument, uno::UNO_QUERY_THROW );
-        long nKey = xNumberSupplier->getNumberFormats()->addNewConverted( sFormat, aUSLocale, aCurrentLocale );
+        sal_Int32 nKey = xNumberSupplier->getNumberFormats()->addNewConverted( sFormat, aUSLocale, aCurrentLocale );
         xPropertySet->setPropertyValue(
             PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT),
             uno::makeAny( nKey ));
+        xPropertySet->getPropertyValue(
+            PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT ) ) >>= nKey;
     }
     catch(const uno::Exception&)
     {
@@ -1845,7 +1846,7 @@ if(!bFilled)
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUM")),       "SetExpression",            "SetExpression", FIELD_AUTONUM   },
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUMLGL")),     "SetExpression",            "SetExpression", FIELD_AUTONUMLGL },
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUMOUT")),     "SetExpression",            "SetExpression", FIELD_AUTONUMOUT },
-            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTHOR")),        "Author",                   "", FIELD_AUTHOR       },
+            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTHOR")),        "DocInfo.CreateAuthor",                   "", FIELD_AUTHOR       },
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")),          "DateTime",                 "", FIELD_DATE         },
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENTS")),      "DocInfo.Description",      "", FIELD_COMMENTS     },
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATEDATE")),    "DocInfo.CreateDateTime",   "", FIELD_CREATEDATE   },
@@ -1887,9 +1888,11 @@ if(!bFilled)
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TEMPLATE")),      "TemplateName",             "", FIELD_TEMPLATE},
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")),          "DateTime",                 "", FIELD_TIME         },
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TITLE")),         "DocInfo.Title",            "", FIELD_TITLE        },
-            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERINITIALS")),  "ExtendedUser",              "", FIELD_USERINITIALS},
+            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERINITIALS")),  "Author",                   "", FIELD_USERINITIALS       },
 //            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERADDRESS")),   "",                         "", FIELD_USERADDRESS  },
-//            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERNAME")),      "ExtendedUser",             "", FIELD_USERNAME     }
+            {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERNAME")), "Author",                   "", FIELD_USERNAME       },
+
+
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TOC")), "com.sun.star.text.ContentIndex", "", FIELD_TOC},
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TC")), "com.sun.star.text.ContentIndexMark", "", FIELD_TC},
             {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMCHARS")), "CharacterCount", "", FIELD_NUMCHARS},
@@ -2007,12 +2010,25 @@ void DomainMapper_Impl::handleAuthor
     (FieldContextPtr pContext,
     PropertyNameSupplier& rPropNameSupplier,
      uno::Reference< uno::XInterface > & /*xFieldInterface*/,
-     uno::Reference< beans::XPropertySet > xFieldProperties)
+     uno::Reference< beans::XPropertySet > xFieldProperties,
+     FieldId  eFieldId )
 {
-    xFieldProperties->setPropertyValue
-        ( rPropNameSupplier.GetName(PROP_FULL_NAME), uno::makeAny( true ));
+    if ( eFieldId != FIELD_USERINITIALS )
+        xFieldProperties->setPropertyValue
+            ( rPropNameSupplier.GetName(PROP_FULL_NAME), uno::makeAny( true ));
+
+    sal_Int32 nLen = sizeof( " AUTHOR" );
+    if ( eFieldId != FIELD_AUTHOR )
+    {
+        if (  eFieldId == FIELD_USERINITIALS )
+            nLen = sizeof( " USERINITIALS" );
+        else if (  eFieldId == FIELD_USERNAME )
+            nLen = sizeof( " USERNAME" );
+    }
+
     ::rtl::OUString sParam =
-        lcl_ExtractParameter(pContext->GetCommand(), sizeof(" AUTHOR") );
+        lcl_ExtractParameter(pContext->GetCommand(), nLen );
+
     if(sParam.getLength())
     {
         xFieldProperties->setPropertyValue(
@@ -2037,6 +2053,7 @@ void DomainMapper_Impl::handleAuthor
     {
         #define SET_ARABIC      0x01
         #define SET_FULL_NAME   0x02
+        #define SET_DATE        0x04
         struct DocPropertyMap
         {
             const sal_Char* pDocPropertyName;
@@ -2045,20 +2062,19 @@ void DomainMapper_Impl::handleAuthor
         };
         static const DocPropertyMap aDocProperties[] =
         {
-            {"Author",           "Author",                  SET_FULL_NAME},
-            {"CreateTime",       "DocInfo.CreateDateTime",  0},
+            {"CreateTime",       "DocInfo.CreateDateTime",  SET_DATE},
             {"Characters",       "CharacterCount",          SET_ARABIC},
             {"Comments",         "DocInfo.Description",     0},
             {"Keywords",         "DocInfo.KeyWords",        0},
             {"LastPrinted",      "DocInfo.PrintDateTime",   0},
             {"LastSavedBy",      "DocInfo.ChangeAuthor",    0},
-            {"LastSavedTime",    "DocInfo.ChangeDateTime",  0},
+            {"LastSavedTime",    "DocInfo.ChangeDateTime",  SET_DATE},
             {"Paragraphs",       "ParagraphCount",          SET_ARABIC},
             {"RevisionNumber",   "DocInfo.Revision",        0},
             {"Subject",          "DocInfo.Subject",         0},
             {"Template",         "TemplateName",            0},
             {"Title",            "DocInfo.Title",           0},
-            {"TotalEditingTime", "DocInfo.EditTime",        9},
+            {"TotalEditingTime", "DocInfo.EditTime",        0},
             {"Words",            "WordCount",               SET_ARABIC}
 
             //other available DocProperties:
@@ -2112,11 +2128,19 @@ void DomainMapper_Impl::handleAuthor
                 xFieldProperties->setPropertyValue(
                     rPropNameSupplier.GetName(PROP_FULL_NAME),
                         uno::makeAny( true ));
+            else if(0 != (aDocProperties[nMap].nFlags & SET_DATE))
+            {
+                xFieldProperties->setPropertyValue(
+                    rPropNameSupplier.GetName(PROP_IS_DATE),
+                        uno::makeAny( true ));
+                SetNumberFormat( pContext->GetCommand(), xFieldProperties );
+            }
         }
     }
 
 #undef SET_ARABIC
 #undef SET_FULL_NAME
+#undef SET_DATE
 }
 
 void DomainMapper_Impl::handleToc
@@ -2433,7 +2457,9 @@ void DomainMapper_Impl::CloseFieldCommand()
                         handleAutoNum(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties);
                     break;
                     case FIELD_AUTHOR       :
-                        handleAuthor(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties);
+                    case FIELD_USERNAME     :
+                    case FIELD_USERINITIALS :
+                        handleAuthor(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties, aIt->second.eFieldId  );
                     break;
                     case FIELD_DATE:
                     {
@@ -2450,16 +2476,23 @@ void DomainMapper_Impl::CloseFieldCommand()
                     case FIELD_COMMENTS     :
                     {
                         ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") );
-                        if(sParam.getLength())
-                        {
-                            xFieldProperties->setPropertyValue(
-                                    rPropNameSupplier.GetName( PROP_IS_FIXED ), uno::makeAny( true ));
+                        // A parameter with COMMENTS shouldn't set fixed
+                        // ( or at least the binary filter doesn't )
+                        // If we set fixed then we wont export a field cmd.
+                        // Additionally the para in COMMENTS is more like an
+                        // instruction to set the document property comments
+                        // with the param ( e.g. each COMMENT with a param will
+                        // overwrite the Comments document property
+                        // #TODO implement the above too
+                        xFieldProperties->setPropertyValue(
+                            rPropNameSupplier.GetName( PROP_IS_FIXED ), uno::makeAny( false ));
                             //PROP_CURRENT_PRESENTATION is set later anyway
-                        }
                     }
                     break;
                     case FIELD_CREATEDATE  :
                     {
+                        xFieldProperties->setPropertyValue(
+                            rPropNameSupplier.GetName( PROP_IS_DATE ), uno::makeAny( true ));
                         SetNumberFormat( pContext->GetCommand(), xFieldProperties );
                     }
                     break;
@@ -2695,24 +2728,8 @@ void DomainMapper_Impl::CloseFieldCommand()
                         }
                     }
                     break;
-                    case FIELD_USERINITIALS:
-                    {
-                        xFieldProperties->setPropertyValue(
-                            rPropNameSupplier.GetName(PROP_USER_DATA_TYPE), uno::makeAny( text::UserDataPart::SHORTCUT ));
-                        //todo: if initials are provided - set them as fixed content
-                        ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" USERINITIALS") );
-                        if(sParam.getLength())
-                        {
-                            xFieldProperties->setPropertyValue(
-                                    rPropNameSupplier.GetName( PROP_IS_FIXED ), uno::makeAny( true ));
-                            //PROP_CURRENT_PRESENTATION is set later anyway
-                        }
-                    }
-                    break;
                     case FIELD_USERADDRESS  : //todo: user address collects street, city ...
                     break;
-                    case FIELD_USERNAME     : //todo: user name is firstname + lastname
-                    break;
                     case FIELD_TOC:
                         handleToc(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties,
                                   ::rtl::OUString::createFromAscii(aIt->second.cFieldServiceName));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 30396fe68..7a035c356 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -510,7 +510,8 @@ public:
         (FieldContextPtr pContext,
         PropertyNameSupplier& rPropNameSupplier,
         uno::Reference< uno::XInterface > & xFieldInterface,
-        uno::Reference< beans::XPropertySet > xFieldProperties);
+        uno::Reference< beans::XPropertySet > xFieldProperties,
+        FieldId eFieldId);
     void handleDocProperty
         (FieldContextPtr pContext,
         PropertyNameSupplier& rPropNameSupplier,
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 799328239..ca6e7b94b 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -127,7 +127,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
 
         pDocument->resolve(*pStream);
         writerfilter::ooxml::OOXMLStream::Pointer_t  pVBAProjectStream(writerfilter::ooxml::OOXMLDocumentFactory::createStream( pDocStream, writerfilter::ooxml::OOXMLStream::VBAPROJECT ));
-        oox::StorageRef xVbaPrjStrg( new ::oox::ole::OleStorage( uno::Reference< lang::XMultiServiceFactory >( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW ), pVBAProjectStream->getDocumentStream(), false ) );
+        oox::StorageRef xVbaPrjStrg( new ::oox::ole::OleStorage( m_xContext, pVBAProjectStream->getDocumentStream(), false ) );
         if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
         {
             ::oox::ole::VbaProject aVbaProject( m_xContext, xModel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Writer" ) ) );
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index ba362b3e2..9c9b8c5c2 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -47,6 +47,7 @@ enum ResourceType_t {
     RT_NoResource,
     RT_Table,
     RT_Stream,
+    RT_StreamProperties,
     RT_List,
     RT_Integer,
     RT_Properties,
diff --git a/writerfilter/source/ooxml/dummyannotate.xsl b/writerfilter/source/ooxml/dummyannotate.xsl
index 0fcc1e0dc..d457d0c07 100644
--- a/writerfilter/source/ooxml/dummyannotate.xsl
+++ b/writerfilter/source/ooxml/dummyannotate.xsl
@@ -838,7 +838,7 @@ sed "s/wml/</xsl:text>
 
   <xsl:template match="/">
     <out>
-      <xsl:apply-templates select="//rng:define[@name='CT_DocGrid']" 
+      <xsl:apply-templates select="//rng:define[@name='CT_SdtContentCell']" 
                            mode='resourcesPropertySetValue'/>
     </out>
   </xsl:template>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 1e1e0d9dc..742d5b363 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -21728,6 +21728,7 @@
       <value name="bestFit" tokenid="ooxml:Value_wordprocessingml_ST_Zoom_bestFit">bestFit</value>
       <value name="textFit" tokenid="ooxml:Value_wordprocessingml_ST_Zoom_textFit">textFit</value>
     </resource>
+    <resource name="ST_Percentage" resource="Integer" generated="yes"/>
     <resource name="CT_Zoom" resource="Properties" tag="settings">
       <attribute name="val" tokenid="ooxml:CT_Zoom_val"/>
       <attribute name="percent" tokenid="ooxml:CT_Zoom_percent"/>
@@ -22638,7 +22639,56 @@
       <attribute name="val" tokenid="ooxml:CT_CalendarType_val" action="setValue"/>
       <action name="start" action="setDefaultStringValue"/>
     </resource>
-    <resource name="CT_SdtContentRun" resource="Properties" tag="content"/>
+    <resource name="CT_SdtPr" resource="Properties" tag="field">
+      <element name="rPr" tokenid="ooxml:CT_SdtPr_rPr"/>
+      <element name="alias" tokenid="ooxml:CT_SdtPr_alias"/>
+      <element name="lock" tokenid="ooxml:CT_SdtPr_lock"/>
+      <element name="placeholder" tokenid="ooxml:CT_SdtPr_placeholder"/>
+      <element name="showingPlcHdr" tokenid="ooxml:CT_SdtPr_showingPlcHdr"/>
+      <element name="dataBinding" tokenid="ooxml:CT_SdtPr_dataBinding"/>
+      <element name="temporary" tokenid="ooxml:CT_SdtPr_temporary"/>
+      <element name="id" tokenid="ooxml:CT_SdtPr_id"/>
+      <element name="tag" tokenid="ooxml:CT_SdtPr_tag"/>
+      <element name="equation" tokenid="ooxml:CT_SdtPr_equation"/>
+      <element name="comboBox" tokenid="ooxml:CT_SdtPr_comboBox"/>
+      <element name="date" tokenid="ooxml:CT_SdtPr_date"/>
+      <element name="docPartObj" tokenid="ooxml:CT_SdtPr_docPartObj"/>
+      <element name="docPartList" tokenid="ooxml:CT_SdtPr_docPartList"/>
+      <element name="dropDownList" tokenid="ooxml:CT_SdtPr_dropDownList"/>
+      <element name="picture" tokenid="ooxml:CT_SdtPr_picture"/>
+      <element name="richText" tokenid="ooxml:CT_SdtPr_richText"/>
+      <element name="text" tokenid="ooxml:CT_SdtPr_text"/>
+      <element name="citation" tokenid="ooxml:CT_SdtPr_citation"/>
+      <element name="group" tokenid="ooxml:CT_SdtPr_group"/>
+      <element name="bibliography" tokenid="ooxml:CT_SdtPr_bibliography"/>
+    </resource>
+    <resource name="CT_SdtEndPr" resource="Properties" tag="field">
+      <element name="rPr" tokenid="ooxml:CT_SdtEndPr_rPr"/>
+    </resource>
+    <resource name="CT_SdtContentRun" resource="Stream" tag="field"/>
+    <resource name="CT_SdtContentBlock" resource="Stream" tag="field"/>
+    <resource name="CT_SdtContentRow" resource="Stream" tag="field"/>
+    <resource name="CT_SdtContentCell" resource="Stream" tag="field"/>
+    <resource name="CT_SdtBlock" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtBlock_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtBlock_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtBlock_sdtContent"/>
+    </resource>
+    <resource name="CT_SdtRun" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtRun_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtRun_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtRun_sdtContent"/>
+    </resource>
+    <resource name="CT_SdtCell" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtCell_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtCell_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtCell_sdtContent"/>
+    </resource>
+    <resource name="CT_SdtRow" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtRow_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtRow_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtRow_sdtContent"/>
+    </resource>
     <resource name="CT_Attr" resource="Properties" tag="content">
       <attribute name="uri" tokenid="ooxml:CT_Attr_uri"/>
       <attribute name="name" tokenid="ooxml:CT_Attr_name"/>
diff --git a/writerfilter/source/ooxml/modelcleanup.xsl b/writerfilter/source/ooxml/modelcleanup.xsl
index d7a9aec40..69e73d868 100644
--- a/writerfilter/source/ooxml/modelcleanup.xsl
+++ b/writerfilter/source/ooxml/modelcleanup.xsl
@@ -40,6 +40,9 @@
   <xsl:key name="resources"
            match="resource[not(@generated)]" use="@name" />
 
+  <xsl:key name="resourcetags"
+           match="resource/@tag" use="ancestor::resource/@name"/>
+
   <xsl:template name="generateresource">
     <xsl:param name="resource"/>
     <xsl:element name="resource">
@@ -52,6 +55,11 @@
       <xsl:attribute name="generated">
         <xsl:text>yes</xsl:text>
       </xsl:attribute>
+      <xsl:for-each select="key('resourcetags', @name)">
+        <xsl:attribute name="tag">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
     </xsl:element>
   </xsl:template>
 
@@ -66,6 +74,11 @@
       </xsl:attribute>
       <xsl:attribute name="resource">List</xsl:attribute>
       <xsl:attribute name="generated">yes</xsl:attribute>
+      <xsl:for-each select="key('resourcetags', @name)">
+        <xsl:attribute name="tag">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
       <xsl:for-each select=".//rng:value">
         <xsl:element name="value">
           <xsl:attribute name="name">
@@ -148,12 +161,18 @@
         
     <xsl:template name="generatevalueresource">
         <xsl:variable name="name" select="@name"/>
+        <xsl:variable name="ns_id" select="generate-id(ancestor::namespace)"/>
         <resource>
             <xsl:attribute name="name">
                 <xsl:value-of select="@name"/>
             </xsl:attribute>
             <xsl:attribute name="resource">Value</xsl:attribute>
             <xsl:attribute name="generated">yes</xsl:attribute>
+            <xsl:for-each select="key('resourcetags', @name)[generate-id(ancestor::namespace) = $ns_id]">
+              <xsl:attribute name="tag">
+                <xsl:value-of select="."/>
+              </xsl:attribute>
+            </xsl:for-each>
             <xsl:for-each select=".//rng:attribute">
                 <xsl:variable name="type">
                     <xsl:choose>
author	Jan Holesovsky <kendy@suse.cz>	2011-05-27 20:45:30 +0200
committer	Jan Holesovsky <kendy@suse.cz>	2011-05-27 20:45:30 +0200
commit	fa83bdc06fc281233597c55b6790181045777947 (patch)
tree	9d44e9919571d40ca78a9453ba8eb9dbd0367efc
parent	dbc0ea9bb40379b5d4581a669d3d4e7bdb2c657d (diff)
parent	001e51648e071c1475921c37c34f06a293a5bf5b (diff)