diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 439844a2caf8..c79bb4383928 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -400,6 +400,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) pPage2_Standard_FB->SetBorderStyle(WINDOW_BORDER_MONO); pPage2_Frames->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); pPage2_Frames_FB->SetBorderStyle(WINDOW_BORDER_MONO); + pPage2_SingleDocument->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); pPage2_Kiosk->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); pPage2_Kiosk_FB->SetBorderStyle(WINDOW_BORDER_MONO); pPage2_WebCast->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); @@ -490,6 +491,8 @@ void SdPublishingDlg::CreatePages() pPage2_Standard = new RadioButton(this,SdResId(PAGE2_STANDARD))); aAssistentFunc.InsertControl(2, pPage2_Frames = new RadioButton(this,SdResId(PAGE2_FRAMES))); + aAssistentFunc.InsertControl(2, + pPage2_SingleDocument = new RadioButton(this,SdResId(PAGE2_SINGLE_DOCUMENT))); aAssistentFunc.InsertControl(2, pPage2_Kiosk = new RadioButton(this,SdResId(PAGE2_KIOSK))); aAssistentFunc.InsertControl(2, @@ -646,6 +649,7 @@ void SdPublishingDlg::RemovePages() delete pPage2_Titel; delete pPage2_Standard; delete pPage2_Frames; + delete pPage2_SingleDocument; delete pPage2_Kiosk; delete pPage2_WebCast; delete pPage2_Standard_FB; @@ -740,9 +744,20 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) // Page 2 aValue.Name = "PublishMode"; - aValue.Value <<= (sal_Int32)(pPage2_Standard->IsChecked()?PUBLISH_HTML: - pPage2_Frames->IsChecked()?PUBLISH_FRAMES: - pPage2_Kiosk->IsChecked()?PUBLISH_KIOSK:PUBLISH_WEBCAST); + + HtmlPublishMode ePublishMode; + if (pPage2_Frames->IsChecked()) + ePublishMode = PUBLISH_FRAMES; + if (pPage2_SingleDocument->IsChecked()) + ePublishMode = PUBLISH_SINGLE_DOCUMENT; + else if (pPage2_Kiosk->IsChecked()) + ePublishMode = PUBLISH_KIOSK; + else if (pPage2_WebCast->IsChecked()) + ePublishMode = PUBLISH_WEBCAST; + else + ePublishMode = PUBLISH_HTML; + + aValue.Value <<= (sal_Int32) ePublishMode; aProps.push_back( aValue ); aValue.Name = "IsExportContentsPage"; diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index fe85a23e8610..ddc01e7b8d41 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -105,10 +105,18 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "Standard HTML with ~frames"; }; + RadioButton PAGE2_SINGLE_DOCUMENT + { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_SINGLE_DOCUMENT"; + Pos = MAP_APPFONT( 12, 47 ); + Size = MAP_APPFONT( 116, 10 ); + Text [ en-US ] = "~Single document html"; + }; + RadioButton PAGE2_KIOSK { HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK"; - Pos = MAP_APPFONT( 12, 47 ); + Pos = MAP_APPFONT( 12, 60 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~Automatic"; }; @@ -116,14 +124,14 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_WEBCAST { HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST"; - Pos = MAP_APPFONT( 12, 60 ); + Pos = MAP_APPFONT( 12, 73 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~WebCast"; }; FixedBitmap PAGE2_NOFRAMES_FB { - Pos = MAP_APPFONT( 21, 73 ); + Pos = MAP_APPFONT( 61, 60 ); Scale = TRUE; Size = MAP_APPFONT( 60, 50 ); Fixed = Bitmap { File = "pubdes.bmp"; }; @@ -133,7 +141,7 @@ ModalDialog DLG_PUBLISHING FixedBitmap PAGE2_FRAMES_FB { - Pos = MAP_APPFONT( 21, 73 ); + Pos = MAP_APPFONT( 61, 60 ); Scale = TRUE; Size = MAP_APPFONT( 60, 50 ); Fixed = Bitmap { File = "pubdes2.bmp"; }; @@ -143,7 +151,7 @@ ModalDialog DLG_PUBLISHING FixedBitmap PAGE2_KIOSK_FB { - Pos = MAP_APPFONT( 21, 73 ); + Pos = MAP_APPFONT( 61, 60 ); Scale = TRUE; Size = MAP_APPFONT( 60, 50 ); Fixed = Bitmap { File = "pubdes3.bmp"; }; @@ -153,7 +161,7 @@ ModalDialog DLG_PUBLISHING FixedBitmap PAGE2_WEBCAST_FB { - Pos = MAP_APPFONT( 21, 73 ); + Pos = MAP_APPFONT( 61, 60 ); Scale = TRUE; Size = MAP_APPFONT( 60, 50 ); Fixed = Bitmap { File = "pubdes4.bmp"; }; diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index 1648902e8ced..83f393396f04 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -32,22 +32,23 @@ #define PAGE2_FRAMES 23 #define PAGE2_KIOSK 24 #define PAGE2_WEBCAST 25 +#define PAGE2_SINGLE_DOCUMENT 26 -#define PAGE2_NOFRAMES_FB 26 -#define PAGE2_FRAMES_FB 27 -#define PAGE2_KIOSK_FB 28 -#define PAGE2_WEBCAST_FB 29 +#define PAGE2_NOFRAMES_FB 27 +#define PAGE2_FRAMES_FB 28 +#define PAGE2_KIOSK_FB 29 +#define PAGE2_WEBCAST_FB 30 -#define PAGE2_TITEL_HTML 30 -#define PAGE2_CONTENT 31 -#define PAGE2_NOTES 32 +#define PAGE2_TITEL_HTML 31 +#define PAGE2_CONTENT 32 +#define PAGE2_NOTES 33 -#define PAGE2_TITEL_KIOSK 33 -#define PAGE2_CHG_DEFAULT 34 -#define PAGE2_CHG_AUTO 35 -#define PAGE2_DURATION_TXT 36 -#define PAGE2_DURATION_TMF 37 -#define PAGE2_ENDLESS 38 +#define PAGE2_TITEL_KIOSK 34 +#define PAGE2_CHG_DEFAULT 35 +#define PAGE2_CHG_AUTO 36 +#define PAGE2_DURATION_TXT 37 +#define PAGE2_DURATION_TMF 38 +#define PAGE2_ENDLESS 39 #define PAGE2_TITEL_WEBCAST 40 #define PAGE2_ASP 41 diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 574a6ff0f04b..36bc3ed748fb 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -63,6 +63,7 @@ private: FixedLine* pPage2_Titel; RadioButton* pPage2_Standard; RadioButton* pPage2_Frames; + RadioButton* pPage2_SingleDocument; RadioButton* pPage2_Kiosk; RadioButton* pPage2_WebCast; FixedBitmap* pPage2_Standard_FB;