#105871# added support for page numbers on master pages

4 files changed, 31 insertions, 13 deletions

diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index bf44ce8520ae..126c88e3abf7 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swfexporter.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-06 12:12:45 $
+ *  last change: $Author: cl $ $Date: 2002-12-11 16:47:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -179,7 +179,12 @@ void PageInfo::addShape( ShapeInfo* pShapeInfo )
 // -----------------------------------------------------------------------------
 
 FlashExporter::FlashExporter(const Reference< XMultiServiceFactory > &rxMSF, sal_Int32 nJPEGCompressMode, sal_Bool bExportOLEAsJPEG)
-:   mxMSF( rxMSF ), mpWriter( NULL ), mnJPEGcompressMode(nJPEGCompressMode), mbExportOLEAsJPEG(bExportOLEAsJPEG), mbPresentation(true)
+:   mxMSF( rxMSF ),
+    mpWriter( NULL ),
+    mnJPEGcompressMode(nJPEGCompressMode),
+    mbExportOLEAsJPEG(bExportOLEAsJPEG),
+    mbPresentation(true),
+    mnPageNumber( - 1 )
 {
 }
 
@@ -244,6 +249,8 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
     xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Macromedia Flash (SWF)" )), nPageCount);
     for( nPage = 0; nPage < nPageCount; nPage++)
     {
+        mnPageNumber = nPage + 1;
+
         xStatusIndicator->setValue( nPage );
         xDrawPages->getByIndex(nPage) >>= xDrawPage;
 
@@ -727,14 +734,16 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
     utl::TempFile aFile;
     aFile.EnableKillingFile();
 
-    Sequence< PropertyValue > aFilterData(bExportAsJPEG ? 2 : 1);
+    Sequence< PropertyValue > aFilterData(bExportAsJPEG ? 3 : 2);
     aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Version") );
     aFilterData[0].Value <<= (sal_Int32)6000;
+    aFilterData[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("PageNumber") );
+    aFilterData[1].Value <<= mnPageNumber;
 
     if(bExportAsJPEG)
     {
-        aFilterData[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Translucent") );
-        aFilterData[1].Value <<= (sal_Bool)sal_True;
+        aFilterData[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Translucent") );
+        aFilterData[2].Value <<= (sal_Bool)sal_True;
     }
 
     Sequence< PropertyValue > aDescriptor( bOnlyBackground ? 4 : 3 );
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 7404c9dde7ab..c30c53500485 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swfexporter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-03 15:50:15 $
+ *  last change: $Author: cl $ $Date: 2002-12-11 16:47:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -265,6 +265,8 @@ private:
     sal_Bool mbExportOLEAsJPEG;
 
     sal_Bool mbPresentation;
+
+    sal_Int32 mnPageNumber;
 };
 
 }
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 8268eb24c662..701bf3f68bc8 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swfwriter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-05 23:16:52 $
+ *  last change: $Author: cl $ $Date: 2002-12-11 16:47:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -441,7 +441,6 @@ private:
     void Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY );
     bool Impl_writeFilling( SvtGraphicFill& rFilling );
     bool Impl_writeStroke( SvtGraphicStroke& rStroke );
-    bool Impl_writePageField( Rectangle& rTextBounds );
 
     FlashFont& Impl_getFont( const Font& rFont );
 
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 5b5badf101b0..eba2d0fc0058 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swfwriter1.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-05 23:16:53 $
+ *  last change: $Author: cl $ $Date: 2002-12-11 16:47:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1333,6 +1333,11 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
 
 // -----------------------------------------------------------------------------
 
+/* CL: The idea was to export page fields as text fields that get theire
+   string from a variable set with actionscript by each page. This didn't
+   work out since the formating is always wrong when text follows the
+   page number field since pages greater one may require more space than
+   page 1
 bool Writer::Impl_writePageField( Rectangle& rTextBounds )
 {
     startTag( TAG_DEFINEEDITTEXT );
@@ -1371,6 +1376,7 @@ bool Writer::Impl_writePageField( Rectangle& rTextBounds )
 
     return true;
 }
+*/
 
 // -----------------------------------------------------------------------------
 
@@ -1683,6 +1689,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                         }
                     }
                 }
+/*
                 else if( pA->GetComment().CompareIgnoreCaseToAscii( "FIELD_SEQ_BEGIN;PageField" ) == COMPARE_EQUAL )
                 {
 
@@ -1706,6 +1713,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                         }
                     }
                 }
+*/
             }
             break;