sd html export: "single document" publish mode & support tables

Change-Id: I0c9f45011091f962d5304c9efcaebbed7e6c3d9d

sd/source/filter/html/htmlex.hxx

@@ -83,6 +83,7 @@ class HtmlExport
     std::vector< SdPage* > maNotesPages;
 
     OUString maPath;
+    OUString maFilterOptions;
 
     SdDrawDocument* mpDoc;
     ::sd::DrawDocShell* mpDocSh;
@@ -205,12 +206,18 @@ class HtmlExport
     void ExportHtml();
     void ExportKiosk();
     void ExportWebCast();
+    void ExportSingleDocument();
 
     bool WriteHtml( const OUString& rFileName, bool bAddExtension, const OUString& rHtmlData );
     OUString GetButtonName( int nButton ) const;
 
  public:
-     HtmlExport( const OUString& aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell );
+    HtmlExport(const OUString& aPath,
+               const css::uno::Sequence<css::beans::PropertyValue>& rParams,
+               const OUString& rFilterOptions,
+               SdDrawDocument* pExpDoc,
+               sd::DrawDocShell* pDocShell);
+
     virtual ~HtmlExport();
 
     static OUString ColorToHTMLString( Color aColor );

sd/source/filter/html/htmlpublishmode.hxx

@@ -20,8 +20,14 @@
 #ifndef INCLUDED_SD_SOURCE_FILTER_HTML_HTMLPUBLISHMODE_HXX
 #define INCLUDED_SD_SOURCE_FILTER_HTML_HTMLPUBLISHMODE_HXX
 
-enum HtmlPublishMode {
-    PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK };
+enum HtmlPublishMode
+{
+    PUBLISH_HTML,
+    PUBLISH_FRAMES,
+    PUBLISH_WEBCAST,
+    PUBLISH_KIOSK,
+    PUBLISH_SINGLE_DOCUMENT
+};
 
 #endif
 

sd/source/filter/html/sdhtmlfilter.cxx

@@ -64,12 +64,17 @@ sal_Bool SdHTMLFilter::Export()
     SfxItemSet *pSet = mrMedium.GetItemSet();
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aParams;
+    OUString sFilterOptions;
 
     const SfxPoolItem* pItem;
+
     if ( pSet->GetItemState( SID_FILTER_DATA, false, &pItem ) == SFX_ITEM_SET )
         ((SfxUnoAnyItem*)pItem)->GetValue() >>= aParams;
 
-    delete( new HtmlExport( mrMedium.GetName(), aParams, &mrDocument, &mrDocShell ) );
+    if (pSet->GetItemState(SID_FILE_FILTEROPTIONS, true, &pItem) == SFX_ITEM_SET)
+        sFilterOptions = ((SfxStringItem*)pItem)->GetValue();
+
+    HtmlExport aExport(mrMedium.GetName(), aParams, sFilterOptions, &mrDocument, &mrDocShell);
 
     return true;
 }