Convert DLG_PUBLISHING to .ui

Change-Id: I0e15b6f7610c7b262a037d6a9ea482112a5bb8b4
Reviewed-on: https://gerrit.libreoffice.org/9532
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

8 files changed, 238 insertions, 1115 deletions

diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 7ad4fe411391..63502b499bf7 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -20,15 +20,26 @@
 #include "htmlattr.hxx"
 #include "htmlex.hxx"
 #include <vcl/decoview.hxx>
+#include <vcl/builder.hxx>
 
 
 
 
-SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, const ResId& rResId )
-:Control( pParent, rResId )
+SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, WinBits nStyle )
+:Control( pParent, nStyle )
 {
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdHtmlAttrPreview(Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nWinStyle = 0;
+
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+
+    return new SdHtmlAttrPreview(pParent, nWinStyle);
+}
 
 
 SdHtmlAttrPreview::~SdHtmlAttrPreview()
diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx
index 868175594934..b8dc6e529ef3 100644
--- a/sd/source/filter/html/htmlattr.hxx
+++ b/sd/source/filter/html/htmlattr.hxx
@@ -31,7 +31,7 @@ protected:
     Color   m_aVLinkColor, m_aALinkColor;
 
 public:
-    SdHtmlAttrPreview( Window* pParent, const ResId& rResId );
+    SdHtmlAttrPreview( Window* pParent, WinBits nStyle );
     virtual ~SdHtmlAttrPreview();
 
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 1407699f1b85..270845a1c398 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -45,7 +45,6 @@
 
 #include "sdresid.hxx"
 #include "sdattr.hxx"
-#include "pubdlg.hrc"
 #include "pubdlg.hxx"
 #include "htmlattr.hxx"
 #include "htmlex.hxx"
@@ -60,8 +59,6 @@ using namespace com::sun::star::beans;
 
 #define NOOFPAGES 6
 
-extern void InterpolateFixedBitmap( FixedBitmap * pBitmap );
-
 //ID for the config-data with the HTML-settings
 const sal_uInt16 nMagic = (sal_uInt16)0x1977;
 
@@ -364,32 +361,36 @@ public:
 // SdPublishingDlg Methods
 
 SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
-:   ModalDialog(pWindow, SdResId( DLG_PUBLISHING ))
+:   ModalDialog(pWindow, "PublishingDialog", "modules/simpress/ui/publishingdialog.ui")
 ,   mpButtonSet( new ButtonSet() )
-,   aBottomLine( this, SdResId( BOTTOM_LINE ) )
-,   aHelpButton(this,SdResId(BUT_HELP))
-,   aCancelButton(this,SdResId(BUT_CANCEL))
-,   aLastPageButton(this,SdResId(BUT_LAST))
-,   aNextPageButton(this,SdResId(BUT_NEXT))
-,   aFinishButton(this,SdResId(BUT_FINISH))
 ,   aAssistentFunc(NOOFPAGES)
 ,   m_bButtonsDirty(true)
 ,   m_bDesignListDirty(false)
 ,   m_pDesign(NULL)
 {
+    get(pLastPageButton, "lastPageButton");
+    get(pNextPageButton, "nextPageButton");
+    get(pFinishButton, "finishButton");
+
     m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS;
 
+    //Lock down the preferred size based on the
+    //initial max-size configuration
+    Size aSize(get_preferred_size());
+    set_width_request(aSize.Width());
+    set_height_request(aSize.Height());
+
     CreatePages();
     Load();
 
     // sets the output page
     aAssistentFunc.GotoPage(1);
-    aLastPageButton.Disable();
+    pLastPageButton->Disable();
 
     // button assignment
-    aFinishButton.SetClickHdl(LINK(this,SdPublishingDlg,FinishHdl));
-    aLastPageButton.SetClickHdl(LINK(this,SdPublishingDlg,LastPageHdl));
-    aNextPageButton.SetClickHdl(LINK(this,SdPublishingDlg,NextPageHdl));
+    pFinishButton->SetClickHdl(LINK(this,SdPublishingDlg,FinishHdl));
+    pLastPageButton->SetClickHdl(LINK(this,SdPublishingDlg,LastPageHdl));
+    pNextPageButton->SetClickHdl(LINK(this,SdPublishingDlg,NextPageHdl));
 
     pPage1_NewDesign->SetClickHdl(LINK(this,SdPublishingDlg,DesignHdl));
     pPage1_OldDesign->SetClickHdl(LINK(this,SdPublishingDlg,DesignHdl));
@@ -437,8 +438,6 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
 
     pPage6_DocColors->Check();
 
-    FreeResource();
-
     pPage3_Quality->InsertEntry( OUString( "25%" ) );
     pPage3_Quality->InsertEntry( OUString( "50%" ) );
     pPage3_Quality->InsertEntry( OUString( "75%" ) );
@@ -458,269 +457,189 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
 
     SetHelpId(aPageHelpIds[0]);
 
-    aNextPageButton.GrabFocus();
+    pNextPageButton->GrabFocus();
 }
 
 SdPublishingDlg::~SdPublishingDlg()
 {
-    RemovePages();
 }
 
 // Generate dialog controls and embed them in the pages
 void SdPublishingDlg::CreatePages()
 {
     // Page 1
-    aAssistentFunc.InsertControl(1,
-        pPage1_Titel = new FixedLine(this,SdResId(PAGE1_TITEL)));
-    aAssistentFunc.InsertControl(1,
-        pPage1_NewDesign = new RadioButton(this,SdResId(PAGE1_NEW_DESIGN)));
-    aAssistentFunc.InsertControl(1,
-        pPage1_OldDesign = new RadioButton(this,SdResId(PAGE1_OLD_DESIGN)));
-    aAssistentFunc.InsertControl(1,
-        pPage1_Designs = new ListBox(this,SdResId(PAGE1_DESIGNS)));
-    aAssistentFunc.InsertControl(1,
-        pPage1_DelDesign = new PushButton(this,SdResId(PAGE1_DEL_DESIGN)));
-    aAssistentFunc.InsertControl(1,
-        pPage1_Desc = new FixedText(this,SdResId(PAGE1_DESC)));
-
+    get(pPage1, "page1");
+    get(pPage1_Titel, "assignLabel");
+    get(pPage1_NewDesign, "newDesignRadiobutton");
+    get(pPage1_OldDesign, "oldDesignRadiobutton");
+    get(pPage1_Designs, "designsTreeview");
+    get(pPage1_DelDesign, "delDesingButton");
+    get(pPage1_Desc, "descLabel");
+    aAssistentFunc.InsertControl(1, pPage1);
+    aAssistentFunc.InsertControl(1, pPage1_Titel);
+    aAssistentFunc.InsertControl(1, pPage1_NewDesign);
+    aAssistentFunc.InsertControl(1, pPage1_OldDesign);
+    aAssistentFunc.InsertControl(1, pPage1_Designs);
+    aAssistentFunc.InsertControl(1, pPage1_DelDesign);
+    aAssistentFunc.InsertControl(1, pPage1_Desc);
 
     // Page 2
-    aAssistentFunc.InsertControl(2,
-        pPage2_Titel = new FixedLine(this,SdResId(PAGE2_TITEL )));
-    aAssistentFunc.InsertControl(2,
-        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,
-        pPage2_WebCast = new RadioButton(this,SdResId(PAGE2_WEBCAST)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Standard_FB = new FixedBitmap(this,SdResId(PAGE2_NOFRAMES_FB)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Frames_FB = new FixedBitmap(this,SdResId(PAGE2_FRAMES_FB)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Kiosk_FB = new FixedBitmap(this,SdResId(PAGE2_KIOSK_FB)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_WebCast_FB = new FixedBitmap(this,SdResId(PAGE2_WEBCAST_FB)));
-
-    aAssistentFunc.InsertControl(2,
-        pPage2_Titel_Html = new FixedLine(this,SdResId(PAGE2_TITEL_HTML)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Content = new CheckBox(this,SdResId(PAGE2_CONTENT)));
+    get(pPage2, "page2");
+    get(pPage2Frame2, "page2.2");
+    get(pPage2Frame3, "page2.3");
+    get(pPage2Frame4, "page2.4");
+    get(pPage2_Titel, "publicationLabel");
+    get(pPage2_Standard, "standardRadiobutton");
+    get(pPage2_Frames, "framesRadiobutton");
+    get(pPage2_SingleDocument, "singleDocumentRadiobutton");
+    get(pPage2_Kiosk, "kioskRadiobutton");
+    get(pPage2_WebCast, "webCastRadiobutton");
+    get(pPage2_Standard_FB, "standardFBImage");
+    get(pPage2_Frames_FB, "framesFBImage");
+    get(pPage2_Kiosk_FB, "kioskFBImage");
+    get(pPage2_WebCast_FB, "webCastFBImage");
+    aAssistentFunc.InsertControl(2, pPage2);
+    aAssistentFunc.InsertControl(2, pPage2Frame2);
+    aAssistentFunc.InsertControl(2, pPage2Frame3);
+    aAssistentFunc.InsertControl(2, pPage2Frame4);
+    aAssistentFunc.InsertControl(2, pPage2_Titel);
+    aAssistentFunc.InsertControl(2, pPage2_Standard);
+    aAssistentFunc.InsertControl(2, pPage2_Frames);
+    aAssistentFunc.InsertControl(2, pPage2_SingleDocument);
+    aAssistentFunc.InsertControl(2, pPage2_Kiosk);
+    aAssistentFunc.InsertControl(2, pPage2_WebCast);
+    aAssistentFunc.InsertControl(2, pPage2_Standard_FB);
+    aAssistentFunc.InsertControl(2, pPage2_Frames_FB);
+    aAssistentFunc.InsertControl(2, pPage2_Kiosk_FB);
+    aAssistentFunc.InsertControl(2, pPage2_WebCast_FB);
+
+    get(pPage2_Titel_Html, "htmlOptionsLabel");
+    get(pPage2_Content, "contentCheckbutton");
+    get(pPage2_Notes, "notesCheckbutton");
+    aAssistentFunc.InsertControl(2, pPage2_Titel_Html);
+    aAssistentFunc.InsertControl(2, pPage2_Content);
     if(m_bImpress)
-        aAssistentFunc.InsertControl(2,
-            pPage2_Notes = new CheckBox(this,SdResId(PAGE2_NOTES)));
-
-    aAssistentFunc.InsertControl(2,
-        pPage2_Titel_WebCast = new FixedLine(this,SdResId(PAGE2_TITEL_WEBCAST)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Index_txt = new FixedText(this,SdResId(PAGE2_INDEX_TXT)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Index = new Edit(this,SdResId(PAGE2_INDEX)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_ASP = new RadioButton(this,SdResId(PAGE2_ASP)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_PERL = new RadioButton(this,SdResId(PAGE2_PERL)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_URL_txt = new FixedText(this,SdResId(PAGE2_URL_TXT)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_URL = new Edit(this,SdResId(PAGE2_URL)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_CGI_txt = new FixedText(this,SdResId(PAGE2_CGI_TXT)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_CGI = new Edit(this,SdResId(PAGE2_CGI)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Vert = new FixedLine( this,SdResId( PAGE2_VERT )));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Titel_Kiosk = new FixedLine(this,SdResId(PAGE2_TITEL_KIOSK)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_ChgDefault = new RadioButton(this,SdResId(PAGE2_CHG_DEFAULT)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_ChgAuto = new RadioButton(this,SdResId(PAGE2_CHG_AUTO)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Duration_txt = new FixedText(this,SdResId(PAGE2_DURATION_TXT)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Duration = new TimeField(this,SdResId(PAGE2_DURATION_TMF)));
-    aAssistentFunc.InsertControl(2,
-        pPage2_Endless = new CheckBox(this,SdResId(PAGE2_ENDLESS)));
+        aAssistentFunc.InsertControl(2, pPage2_Notes);
+
+    get(pPage2_Titel_WebCast, "webCastLabel");
+    get(pPage2_ASP, "ASPRadiobutton");
+    get(pPage2_PERL, "perlRadiobutton");
+    get(pPage2_URL_txt, "URLTxtLabel");
+    get(pPage2_URL, "URLEntry");
+    get(pPage2_CGI_txt, "CGITxtLabel");
+    get(pPage2_CGI, "CGIEntry");
+    get(pPage2_Index_txt, "indexTxtLabel");
+    get(pPage2_Index, "indexEntry");
+    get(pPage2_Titel_Kiosk, "kioskLabel");
+    get(pPage2_ChgDefault, "chgDefaultRadiobutton");
+    get(pPage2_ChgAuto, "chgAutoRadiobutton");
+    get(pPage2_Duration_txt, "durationTxtLabel");
+    get(pPage2_Duration, "durationSpinbutton");
+    get(pPage2_Endless, "endlessCheckbutton");
+    aAssistentFunc.InsertControl(2, pPage2_Titel_WebCast);
+    aAssistentFunc.InsertControl(2, pPage2_Index_txt);
+    aAssistentFunc.InsertControl(2, pPage2_Index);
+    aAssistentFunc.InsertControl(2, pPage2_ASP);
+    aAssistentFunc.InsertControl(2, pPage2_PERL);
+    aAssistentFunc.InsertControl(2, pPage2_URL_txt);
+    aAssistentFunc.InsertControl(2, pPage2_URL);
+    aAssistentFunc.InsertControl(2, pPage2_CGI_txt);
+    aAssistentFunc.InsertControl(2, pPage2_CGI);
+    aAssistentFunc.InsertControl(2, pPage2_Titel_Kiosk);
+    aAssistentFunc.InsertControl(2, pPage2_ChgDefault);
+    aAssistentFunc.InsertControl(2, pPage2_ChgAuto);
+    aAssistentFunc.InsertControl(2, pPage2_Duration_txt);
+    aAssistentFunc.InsertControl(2, pPage2_Duration);
+    aAssistentFunc.InsertControl(2, pPage2_Endless);
 
     // Page 3
-    aAssistentFunc.InsertControl(3,
-        pPage3_Titel1 = new FixedLine(this,SdResId(PAGE3_TITEL_1)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Png = new RadioButton(this,SdResId(PAGE3_PNG)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Gif = new RadioButton(this,SdResId(PAGE3_GIF)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Jpg = new RadioButton(this,SdResId(PAGE3_JPG)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Quality_txt = new FixedText(this,SdResId(PAGE3_QUALITY_TXT)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Quality = new ComboBox(this,SdResId(PAGE3_QUALITY)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Vert = new FixedLine( this,SdResId( PAGE3_VERT )));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Titel2 = new FixedLine(this,SdResId(PAGE3_TITEL_2)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Resolution_1 = new RadioButton(this,SdResId(PAGE3_RESOLUTION_1)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Resolution_2 = new RadioButton(this,SdResId(PAGE3_RESOLUTION_2)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Resolution_3 = new RadioButton(this,SdResId(PAGE3_RESOLUTION_3)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_Titel3 = new FixedLine(this,SdResId(PAGE3_TITEL_3)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_SldSound = new CheckBox(this,SdResId(PAGE3_SLD_SOUND)));
-    aAssistentFunc.InsertControl(3,
-        pPage3_HiddenSlides = new CheckBox(this,SdResId(PAGE3_HIDDEN_SLIDES)));
+    get(pPage3, "page3");
+    get(pPage3_Titel1, "saveImgAsLabel");
+    get(pPage3_Png, "pngRadiobutton");
+    get(pPage3_Gif, "gifRadiobutton");
+    get(pPage3_Jpg, "jpgRadiobutton");
+    get(pPage3_Quality_txt, "qualityTxtLabel");
+    get(pPage3_Quality, "qualityCombobox");
+    get(pPage3_Titel2, "monitorResolutionLabel");
+    get(pPage3_Resolution_1, "resolution1Radiobutton");
+    get(pPage3_Resolution_2, "resolution2Radiobutton");
+    get(pPage3_Resolution_3, "resolution3Radiobutton");
+    get(pPage3_Titel3, "effectsLabel");
+    get(pPage3_SldSound, "sldSoundCheckbutton");
+    get(pPage3_HiddenSlides, "hiddenSlidesCheckbutton");
+    aAssistentFunc.InsertControl(3, pPage3);
+    aAssistentFunc.InsertControl(3, pPage3_Titel1);
+    aAssistentFunc.InsertControl(3, pPage3_Png);
+    aAssistentFunc.InsertControl(3, pPage3_Gif);
+    aAssistentFunc.InsertControl(3, pPage3_Jpg);
+    aAssistentFunc.InsertControl(3, pPage3_Quality_txt);
+    aAssistentFunc.InsertControl(3, pPage3_Quality);
+    aAssistentFunc.InsertControl(3, pPage3_Titel2);
+    aAssistentFunc.InsertControl(3, pPage3_Resolution_1);
+    aAssistentFunc.InsertControl(3, pPage3_Resolution_2);
+    aAssistentFunc.InsertControl(3, pPage3_Resolution_3);
+    aAssistentFunc.InsertControl(3, pPage3_Titel3);
+    aAssistentFunc.InsertControl(3, pPage3_SldSound);
+    aAssistentFunc.InsertControl(3, pPage3_HiddenSlides);
 
     // Page 4
-    aAssistentFunc.InsertControl(4,
-        pPage4_Titel1 = new FixedLine(this,SdResId(PAGE4_TITEL_1)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_Author_txt = new FixedText(this,SdResId(PAGE4_AUTHOR_TXT)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_Author = new Edit(this,SdResId(PAGE4_AUTHOR)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_Email_txt = new FixedText(this,SdResId(PAGE4_EMAIL_TXT)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_Email = new Edit(this,SdResId(PAGE4_EMAIL_EDIT)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_WWW_txt = new FixedText(this,SdResId(PAGE4_WWW_TXT)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_WWW = new Edit(this,SdResId(PAGE4_WWW_EDIT)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_Titel2 = new FixedText(this,SdResId(PAGE4_TITEL_2)));
-    aAssistentFunc.InsertControl(4,
-        pPage4_Misc = new MultiLineEdit(this,SdResId(PAGE4_MISC)));
+    get(pPage4, "page4");
+    get(pPage4_Titel1, "infTitlePageLabel");
+    get(pPage4_Author_txt, "authorTxtLabel");
+    get(pPage4_Author, "authorEntry");
+    get(pPage4_Email_txt, "emailTxtLabel");
+    get(pPage4_Email, "emailEntry");
+    get(pPage4_WWW_txt, "wwwTxtLabel");
+    get(pPage4_WWW, "wwwEntry");
+    get(pPage4_Titel2, "addInformLabel");
+    get(pPage4_Misc, "miscTextview");
+    get(pPage4_Download, "downloadCheckbutton");
+    aAssistentFunc.InsertControl(4, pPage4);
+    aAssistentFunc.InsertControl(4, pPage4_Titel1);
+    aAssistentFunc.InsertControl(4, pPage4_Author_txt);
+    aAssistentFunc.InsertControl(4, pPage4_Author);
+    aAssistentFunc.InsertControl(4, pPage4_Email_txt);
+    aAssistentFunc.InsertControl(4, pPage4_Email);
+    aAssistentFunc.InsertControl(4, pPage4_WWW_txt);
+    aAssistentFunc.InsertControl(4, pPage4_WWW);
+    aAssistentFunc.InsertControl(4, pPage4_Titel2);
+    aAssistentFunc.InsertControl(4, pPage4_Misc);
     if(m_bImpress)
-        aAssistentFunc.InsertControl(4,
-            pPage4_Download = new CheckBox(this,SdResId(PAGE4_DOWNLOAD)));
+        aAssistentFunc.InsertControl(4, pPage4_Download);
 
     // Page 5
-    aAssistentFunc.InsertControl(5,
-        pPage5_Titel = new FixedLine(this,SdResId(PAGE5_TITEL)));
-    aAssistentFunc.InsertControl(5,
-        pPage5_TextOnly = new CheckBox(this, SdResId(PAGE5_TEXTONLY)));
-    aAssistentFunc.InsertControl(5,
-        pPage5_Buttons = new ValueSet(this,SdResId(PAGE5_BUTTONS)));
+    get(pPage5, "page5");
+    get(pPage5_Titel, "buttonStyleLabel");
+    get(pPage5_TextOnly, "textOnlyCheckbutton");
+    get(pPage5_Buttons, "buttonsDrawingarea");
+    aAssistentFunc.InsertControl(5, pPage5);
+    aAssistentFunc.InsertControl(5, pPage5_Titel);
+    aAssistentFunc.InsertControl(5, pPage5_TextOnly);
+    aAssistentFunc.InsertControl(5, pPage5_Buttons);
 
     // Page 6
-    aAssistentFunc.InsertControl(6,
-        pPage6_Titel = new FixedLine(this,SdResId(PAGE6_TITEL)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_DocColors = new RadioButton(this,SdResId(PAGE6_DOCCOLORS)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_Default = new RadioButton(this,SdResId(PAGE6_DEFAULT)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_User = new RadioButton(this,SdResId(PAGE6_USER)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_Text = new PushButton(this,SdResId(PAGE6_TEXT)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_Link = new PushButton(this,SdResId(PAGE6_LINK)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_ALink = new PushButton(this,SdResId(PAGE6_ALINK)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_VLink = new PushButton(this,SdResId(PAGE6_VLINK)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_Back = new PushButton(this,SdResId(PAGE6_BACK)));
-    aAssistentFunc.InsertControl(6,
-        pPage6_Preview = new SdHtmlAttrPreview(this,SdResId(PAGE6_PREVIEW)));
-
-    InterpolateFixedBitmap(pPage2_Standard_FB);
-    InterpolateFixedBitmap(pPage2_Frames_FB);
-    InterpolateFixedBitmap(pPage2_Kiosk_FB);
-    InterpolateFixedBitmap(pPage2_WebCast_FB);
-}
-
-// Delete the controls of the dialog
-void SdPublishingDlg::RemovePages()
-{
-    delete pPage1_Titel;
-    delete pPage1_NewDesign;
-    delete pPage1_OldDesign;
-    delete pPage1_Designs;
-    delete pPage1_DelDesign;
-    delete pPage1_Desc;
-
-    delete pPage2_Titel;
-    delete pPage2_Standard;
-    delete pPage2_Frames;
-    delete pPage2_SingleDocument;
-    delete pPage2_Kiosk;
-    delete pPage2_WebCast;
-    delete pPage2_Standard_FB;
-    delete pPage2_Frames_FB;
-    delete pPage2_Kiosk_FB;
-    delete pPage2_WebCast_FB;
-
-    delete pPage2_Titel_Html;
-    delete pPage2_Content;
-    if(m_bImpress)
-        delete pPage2_Notes;
-
-    delete pPage2_Vert;
-    delete pPage2_Titel_WebCast;
-    delete pPage2_Index_txt;
-    delete pPage2_Index;
-    delete pPage2_ASP;
-    delete pPage2_PERL;
-    delete pPage2_URL_txt;
-    delete pPage2_URL;
-    delete pPage2_CGI_txt;
-    delete pPage2_CGI;
-
-    delete pPage2_Titel_Kiosk;
-    delete pPage2_ChgDefault;
-    delete pPage2_ChgAuto;
-    delete pPage2_Duration_txt;
-    delete pPage2_Duration;
-    delete pPage2_Endless;
-
-    delete pPage3_Titel1;
-    delete pPage3_Png;
-    delete pPage3_Gif;
-    delete pPage3_Jpg;
-    delete pPage3_Quality_txt;
-    delete pPage3_Quality;
-    delete pPage3_Vert;
-    delete pPage3_Titel2;
-    delete pPage3_Resolution_1;
-    delete pPage3_Resolution_2;
-    delete pPage3_Resolution_3;
-    delete pPage3_Titel3;
-    delete pPage3_SldSound;
-    delete pPage3_HiddenSlides;
-
-    delete pPage4_Titel1;
-    delete pPage4_Author_txt;
-    delete pPage4_Author;
-    delete pPage4_Email_txt;
-    delete pPage4_Email;
-    delete pPage4_WWW_txt;
-    delete pPage4_WWW;
-    delete pPage4_Titel2;
-    delete pPage4_Misc;
-    if(m_bImpress)
-        delete pPage4_Download;
-
-    delete pPage5_Titel;
-    delete pPage5_TextOnly;
-    delete pPage5_Buttons;
-
-    delete pPage6_Titel;
-    delete pPage6_Default;
-    delete pPage6_User;
-    delete pPage6_Back;
-    delete pPage6_Text;
-    delete pPage6_Link;
-    delete pPage6_VLink;
-    delete pPage6_ALink;
-    delete pPage6_DocColors;
-    delete pPage6_Preview;
+    get(pPage6, "page6");
+    get(pPage6_Titel, "selectColorLabel");
+    get(pPage6_Default, "defaultRadiobutton");
+    get(pPage6_User, "userRadiobutton");
+    get(pPage6_Back, "backButton");
+    get(pPage6_Text, "textButton");
+    get(pPage6_Link, "linkButton");
+    get(pPage6_VLink, "vLinkButton");
+    get(pPage6_ALink, "aLinkButton");
+    get(pPage6_DocColors, "docColorsRadiobutton");
+    get(pPage6_Preview, "previewDrawingarea");
+    aAssistentFunc.InsertControl(6, pPage6);
+    aAssistentFunc.InsertControl(6, pPage6_Titel);
+    aAssistentFunc.InsertControl(6, pPage6_DocColors);
+    aAssistentFunc.InsertControl(6, pPage6_Default);
+    aAssistentFunc.InsertControl(6, pPage6_User);
+    aAssistentFunc.InsertControl(6, pPage6_Text);
+    aAssistentFunc.InsertControl(6, pPage6_Link);
+    aAssistentFunc.InsertControl(6, pPage6_ALink);
+    aAssistentFunc.InsertControl(6, pPage6_VLink);
+    aAssistentFunc.InsertControl(6, pPage6_Back);
+    aAssistentFunc.InsertControl(6, pPage6_Preview);
 }
 
 // Initialize dialog with default-values
@@ -1191,16 +1110,16 @@ void SdPublishingDlg::ChangePage()
 
     UpdatePage();
 
-    if( aNextPageButton.IsEnabled() )
-        aNextPageButton.GrabFocus();
+    if( pNextPageButton->IsEnabled() )
+        pNextPageButton->GrabFocus();
     else
-        aFinishButton.GrabFocus();
+        pFinishButton->GrabFocus();
 }
 
 void SdPublishingDlg::UpdatePage()
 {
-    aNextPageButton.Enable(!aAssistentFunc.IsLastPage());
-    aLastPageButton.Enable(!aAssistentFunc.IsFirstPage());
+    pNextPageButton->Enable(!aAssistentFunc.IsLastPage());
+    pLastPageButton->Enable(!aAssistentFunc.IsFirstPage());
 
     int nPage = aAssistentFunc.GetCurrentPage();
 
@@ -1224,6 +1143,7 @@ void SdPublishingDlg::UpdatePage()
 
         if( pPage2_WebCast->IsChecked() )
         {
+            pPage2Frame4->Show();
             pPage2_Titel_WebCast->Show();
             pPage2_ASP->Show();
             pPage2_PERL->Show();
@@ -1244,6 +1164,7 @@ void SdPublishingDlg::UpdatePage()
         }
         else
         {
+            pPage2Frame4->Hide();
             pPage2_Titel_WebCast->Hide();
             pPage2_ASP->Hide();
             pPage2_PERL->Hide();
@@ -1257,6 +1178,7 @@ void SdPublishingDlg::UpdatePage()
 
         if( pPage2_Kiosk->IsChecked() )
         {
+            pPage2Frame3->Show();
             pPage2_Titel_Kiosk->Show();
             pPage2_ChgDefault->Show();
             pPage2_ChgAuto->Show();
@@ -1269,6 +1191,7 @@ void SdPublishingDlg::UpdatePage()
         }
         else
         {
+            pPage2Frame3->Hide();
             pPage2_Titel_Kiosk->Hide();
             pPage2_ChgDefault->Hide();
             pPage2_ChgAuto->Hide();
@@ -1279,6 +1202,7 @@ void SdPublishingDlg::UpdatePage()
 
         if( pPage2_Standard->IsChecked() || pPage2_Frames->IsChecked() )
         {
+            pPage2Frame2->Show();
             pPage2_Titel_Html->Show();
             pPage2_Content->Show();
             if(m_bImpress)
@@ -1286,6 +1210,7 @@ void SdPublishingDlg::UpdatePage()
         }
         else
         {
+            pPage2Frame2->Hide();
             pPage2_Titel_Html->Hide();
             pPage2_Content->Hide();
             if(m_bImpress)
@@ -1294,7 +1219,7 @@ void SdPublishingDlg::UpdatePage()
         break;
     case 3:
         if( pPage2_Kiosk->IsChecked() || pPage2_WebCast->IsChecked() )
-            aNextPageButton.Disable();
+            pNextPageButton->Disable();
 
         if( pPage2_WebCast->IsChecked() )
             pPage3_SldSound->Disable();
diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src
deleted file mode 100644
index 7bfc21ecc31d..000000000000
--- a/sd/source/filter/html/pubdlg.src
+++ /dev/null
@@ -1,703 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpids.h"
-#include "pubdlg.hrc"
-
-ModalDialog DLG_PUBLISHING
-{
-    HelpID = "sd:ModalDialog:DLG_PUBLISHING";
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 272 , 161 ) ;
-    Text [ en-US ] = "HTML Export" ;
-    Moveable = TRUE ;
-
-    // Page 1, choose a design
-    FixedLine PAGE1_TITEL
-    {
-        Pos = MAP_APPFONT ( 6 , 9 ) ;
-        Size = MAP_APPFONT ( 258 , 8 ) ;
-        Text [ en-US ] = "Assign Design";
-    };
-
-    RadioButton PAGE1_NEW_DESIGN
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN";
-        Pos = MAP_APPFONT( 12, 21 );
-        Size = MAP_APPFONT( 153, 10 );
-        Text [ en-US ] = "New Design";
-    };
-
-    RadioButton PAGE1_OLD_DESIGN
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN";
-        Pos = MAP_APPFONT( 12, 34 );
-        Size = MAP_APPFONT( 153, 10 );
-        Text [ en-US ] = "Existing Design";
-    };
-
-    ListBox PAGE1_DESIGNS
-    {
-        HelpID = "sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 21 , 46 ) ;
-        Size = MAP_APPFONT ( 144 , 63 ) ;
-        TabStop = TRUE ;
-        VScroll = TRUE ;
-    };
-
-    PushButton PAGE1_DEL_DESIGN
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN";
-        Pos = MAP_APPFONT ( 168 , 46 ) ;
-        Size = MAP_APPFONT ( 92 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-        Text [ en-US ] = "Delete Selected Design";
-    };
-
-    FixedText PAGE1_DESC
-    {
-        Pos = MAP_APPFONT ( 12 , 113 ) ;
-        Size = MAP_APPFONT ( 258 , 8 ) ;
-        Text [ en-US ] = "Select an existing design or create a new one";
-    };
-
-    // Page 2, type of publishing
-    FixedLine PAGE2_TITEL
-    {
-        Pos = MAP_APPFONT ( 6, 9 ) ;
-        Size = MAP_APPFONT ( 124, 8 ) ;
-        Text [ en-US ] = "Publication type";
-    };
-
-    RadioButton PAGE2_STANDARD
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD";
-        Pos = MAP_APPFONT( 12, 21 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "Standard H~TML format";
-    };
-
-    RadioButton PAGE2_FRAMES
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES";
-        Pos = MAP_APPFONT( 12, 34 );
-        Size = MAP_APPFONT( 116, 10 );
-        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, 60 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "~Automatic";
-    };
-
-    RadioButton PAGE2_WEBCAST
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST";
-        Pos = MAP_APPFONT( 12, 73 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "~WebCast";
-    };
-
-    FixedBitmap PAGE2_NOFRAMES_FB
-    {
-        Pos = MAP_APPFONT( 61, 60 );
-        Scale = TRUE;
-        Size = MAP_APPFONT( 60, 50 );
-        Fixed = Bitmap { File = "pubdes.bmp"; };
-        OutputSize = TRUE ;
-        Border = TRUE;
-    };
-
-    FixedBitmap PAGE2_FRAMES_FB
-    {
-        Pos = MAP_APPFONT( 61, 60 );
-        Scale = TRUE;
-        Size = MAP_APPFONT( 60, 50 );
-        Fixed = Bitmap { File = "pubdes2.bmp"; };
-        OutputSize = TRUE ;
-        Border = TRUE;
-    };
-
-    FixedBitmap PAGE2_KIOSK_FB
-    {
-        Pos = MAP_APPFONT( 61, 60 );
-        Scale = TRUE;
-        Size = MAP_APPFONT( 60, 50 );
-        Fixed = Bitmap { File = "pubdes3.bmp"; };
-        OutputSize = TRUE ;
-        Border = TRUE;
-    };
-
-    FixedBitmap PAGE2_WEBCAST_FB
-    {
-        Pos = MAP_APPFONT( 61, 60 );
-        Scale = TRUE;
-        Size = MAP_APPFONT( 60, 50 );
-        Fixed = Bitmap { File = "pubdes4.bmp"; };
-        OutputSize = TRUE ;
-        Border = TRUE;
-    };
-
-    // Special options for html
-    FixedLine PAGE2_TITEL_HTML
-    {
-        Pos = MAP_APPFONT( 138, 9 );
-        Size = MAP_APPFONT( 128, 8 );
-        Text [ en-US ] = "Options";
-    };
-
-    CheckBox PAGE2_CONTENT
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT";
-        Pos = MAP_APPFONT( 144, 20 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "Create title page";
-    };
-
-    FixedLine PAGE2_VERT
-    {
-        Pos = MAP_APPFONT ( 132 , 20  ) ;
-        Size = MAP_APPFONT ( 4, 109 ) ;
-        Vert = TRUE;
-    };
-
-    CheckBox PAGE2_NOTES
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES";
-        Pos = MAP_APPFONT( 144, 34 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "Show notes";
-    };
-
-    // Special options for kiosk
-    FixedLine PAGE2_TITEL_KIOSK
-    {
-        Pos = MAP_APPFONT( 138, 9 );
-        Size = MAP_APPFONT( 128, 8 );
-        Text [ en-US ] = "Advance slides" ;
-    };
-
-    RadioButton PAGE2_CHG_DEFAULT
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT";
-        Pos = MAP_APPFONT ( 144 , 20 ) ;
-        Size = MAP_APPFONT ( 116 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~As stated in document" ;
-    };
-
-    RadioButton PAGE2_CHG_AUTO
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO";
-        Pos = MAP_APPFONT ( 144 , 34 ) ;
-        Size = MAP_APPFONT ( 116 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Automatic" ;
-    };
-
-    FixedText PAGE2_DURATION_TXT
-    {
-        Pos = MAP_APPFONT ( 154, 48 ) ;
-        Size = MAP_APPFONT ( 40, 10 ) ;
-        Text [ en-US ] = "~Slide view time:" ;
-    };
-
-    TimeField PAGE2_DURATION_TMF
-    {
-        HelpID = "sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF";
-        Pos = MAP_APPFONT ( 196, 47 ) ;
-        Size = MAP_APPFONT ( 48, 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Duration = TRUE ;
-        StrictFormat = TRUE ;
-        Maximum = Time
-        {
-            Hour = 23 ;
-            Minute = 59 ;
-            Second = 59 ;
-        };
-        Last = Time
-        {
-            Hour = 23 ;
-            Minute = 59 ;
-            Second = 59 ;
-        };
-        QuickHelpText [ en-US ] = "~Duration of page";
-    };
-
-    CheckBox PAGE2_ENDLESS
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS";
-        Pos = MAP_APPFONT ( 154, 62 );
-        Size = MAP_APPFONT ( 108, 10 );
-        Text [ en-US ] = "~Endless" ;
-    };
-
-    // Special options for WebCast
-    FixedLine PAGE2_TITEL_WEBCAST
-    {
-        Pos = MAP_APPFONT( 138, 9 );
-        Size = MAP_APPFONT( 128, 8 );
-        Text [ en-US ] = "WebCast" ;
-    };
-
-    RadioButton PAGE2_ASP
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP";
-        Pos = MAP_APPFONT( 144, 20 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "~Active Server Pages (ASP)";
-    };
-
-    RadioButton PAGE2_PERL
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL";
-        Pos = MAP_APPFONT( 144, 34 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "Perl" ;
-    };
-
-    FixedText PAGE2_INDEX_TXT
-    {
-        Pos = MAP_APPFONT( 154, 47 );
-        Size = MAP_APPFONT( 105, 10 );
-        Text [ en-US ] = "~URL for listeners";
-    };
-
-    Edit PAGE2_INDEX
-    {
-        HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_INDEX";
-        BORDER = TRUE;
-        Pos = MAP_APPFONT( 154, 59 );
-        Size  = MAP_APPFONT( 105, 12 );
-        Left = TRUE;
-    };
-
-    FixedText PAGE2_URL_TXT
-    {
-        Pos  = MAP_APPFONT( 154, 75 );
-        Size = MAP_APPFONT( 105, 10 );
-        Text [ en-US ] = "URL for ~presentation:";
-    };
-
-    Edit PAGE2_URL
-    {
-        HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_URL";
-        BORDER = TRUE;
-        Pos = MAP_APPFONT( 154, 87 );
-        Size = MAP_APPFONT( 105, 12 );
-        LEFT = TRUE;
-    };
-
-    FixedText PAGE2_CGI_TXT
-    {
-        Pos  = MAP_APPFONT( 154, 103 );
-        Size = MAP_APPFONT( 105, 10 );
-        Text [ en-US ] = "URL for ~Perl scripts:";
-    };
-
-    Edit PAGE2_CGI
-    {
-        HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_CGI";
-        BORDER = TRUE;
-        Pos = MAP_APPFONT( 154, 115 );
-        Size = MAP_APPFONT( 105, 12 );
-        LEFT = TRUE;
-    };
-
-    // Page 3, Misc Options, Picture Format and Resolution
-
-    // Picture Format
-    FixedLine PAGE3_TITEL_1
-    {
-        Pos = MAP_APPFONT ( 6, 9 ) ;
-        Size = MAP_APPFONT ( 124, 8 ) ;
-        Text [ en-US ] = "Save Images as";
-    };
-
-    RadioButton PAGE3_PNG
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG";
-        Pos = MAP_APPFONT( 12, 20 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "~PNG";
-    };
-
-    RadioButton PAGE3_GIF
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF";
-        Pos = MAP_APPFONT( 12, 34 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "~GIF";
-    };
-
-    RadioButton PAGE3_JPG
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG";
-        Pos = MAP_APPFONT( 12, 48 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "~JPG";
-    };
-
-    ComboBox PAGE3_QUALITY
-    {
-        HelpID = "sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY";
-        Pos = MAP_APPFONT( 18, 62 );
-        Size = MAP_APPFONT( 28, 70 );
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    FixedText PAGE3_QUALITY_TXT
-    {
-        Pos = MAP_APPFONT( 49, 64 );
-        Size = MAP_APPFONT( 79, 10 );
-        Text [ en-US ] = "Quality";
-    };
-
-    FixedLine PAGE3_VERT
-    {
-        Pos = MAP_APPFONT ( 132, 20 ) ;
-        Size = MAP_APPFONT ( 4, 65 ) ;
-        Vert = TRUE;
-    };
-
-    // Resolution
-    FixedLine PAGE3_TITEL_2
-    {
-        Pos = MAP_APPFONT( 138, 9 );
-        Size = MAP_APPFONT( 128, 8 );
-        Text [ en-US ] = "Monitor resolution";
-    };
-
-    RadioButton PAGE3_RESOLUTION_1
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1";
-        Pos = MAP_APPFONT( 144, 20 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "Low resolution (~640x480 pixels)";
-    };
-
-    RadioButton PAGE3_RESOLUTION_2
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2";
-        Pos = MAP_APPFONT( 144, 34 );
-        Size = MAP_APPFONT( 116, 10 );
-        Text [ en-US ] = "Medium resolution (~800x600 pixels)";
-    };
-
-    RadioButton PAGE3_RESOLUTION_3
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3";
-        Pos = MAP_APPFONT ( 144, 48 ) ;
-        Size = MAP_APPFONT ( 116 , 10 ) ;
-        Text [ en-US ] = "High resolution (~1024x768 pixels)";
-    };
-
-    // Resolution
-    FixedLine PAGE3_TITEL_3
-    {
-        Pos = MAP_APPFONT( 6, 85 );
-        Size = MAP_APPFONT( 258, 8 );
-        Text [ en-US ] = "Effects";
-    };
-
-    CheckBox PAGE3_SLD_SOUND
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND";
-        Pos = MAP_APPFONT ( 12, 96 );
-        Size = MAP_APPFONT ( 252, 10 );
-        Text [ en-US ] = "~Export sounds when slide advances" ;
-    };
-
-    CheckBox PAGE3_HIDDEN_SLIDES
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_HIDDEN_SLIDES";
-        Pos = MAP_APPFONT ( 12, 109 );
-        Size = MAP_APPFONT ( 252, 10 );
-        Text [ en-US ] = "Export ~hidden slides" ;
-    };
-
-    // Page 4, information for title page
-    FixedLine PAGE4_TITEL_1
-    {
-        Pos = MAP_APPFONT ( 6 , 9 ) ;
-        Size = MAP_APPFONT ( 258 , 8 ) ;
-        Text [ en-US ] = "Information for the title page";
-    };
-
-    FixedText PAGE4_AUTHOR_TXT
-    {
-        Pos = MAP_APPFONT ( 12, 22 );
-        Size = MAP_APPFONT ( 121, 8 );
-        Text [ en-US ] = "~Author";
-    };
-
-    Edit PAGE4_AUTHOR
-    {
-        HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR";
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 136, 20 );
-        Size = MAP_APPFONT ( 128, 12 );
-        LEFT = TRUE;
-    };
-
-    FixedText PAGE4_EMAIL_TXT
-    {
-        Pos = MAP_APPFONT ( 12, 38 );
-        Size = MAP_APPFONT ( 121, 8 );
-        Text [ en-US ] = "E-~mail address";
-    };
-
-    Edit PAGE4_EMAIL_EDIT
-    {
-        HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT";
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 136 , 36 ) ;
-        Size = MAP_APPFONT ( 128 , 12 ) ;
-        LEFT = TRUE ;
-    };
-
-    FixedText PAGE4_WWW_TXT
-    {
-        Pos = MAP_APPFONT ( 12, 54 );
-        Size = MAP_APPFONT ( 121, 8 );
-        Text [ en-US ] = "Your hom~epage";
-    };
-
-    Edit PAGE4_WWW_EDIT
-    {
-        HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT";
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 136, 52 ) ;
-        Size = MAP_APPFONT ( 128, 12 ) ;
-        LEFT = TRUE ;
-    };
-
-    FixedText PAGE4_TITEL_2
-    {
-        Pos = MAP_APPFONT ( 12 , 70 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-        Text [ en-US ] = "Additional ~information";
-    };
-
-    MultiLineEdit PAGE4_MISC
-    {
-        HelpID = "sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 136, 68 ) ;
-        Size = MAP_APPFONT ( 128 , 45 ) ;
-        TabStop = TRUE ;
-        VScroll = TRUE ;
-        IgnoreTab = TRUE ;
-    };
-
-    CheckBox PAGE4_DOWNLOAD
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD";
-        Pos = MAP_APPFONT ( 12 , 120 ) ;
-        Size = MAP_APPFONT ( 252 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Link to a copy of the ~original presentation";
-    };
-
-    CheckBox PAGE4_CREATED
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_CREATED";
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 252 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Note: 'Created with %PRODUCTNAME'";
-    };
-
-    // Page 5, Buttons
-    FixedLine PAGE5_TITEL
-    {
-        Pos = MAP_APPFONT ( 6 , 9 ) ;
-        Size = MAP_APPFONT ( 258 , 8 ) ;
-        Text [ en-US ] = "Select button style";
-    };
-
-    CheckBox PAGE5_TEXTONLY
-    {
-        HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY";
-        Pos = MAP_APPFONT ( 12, 21 );
-        Size = MAP_APPFONT ( 243, 10 );
-        Text [ en-US ] = "~Text only";
-    };
-
-    Control PAGE5_BUTTONS
-    {
-        Border = TRUE ;
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 12, 34 ) ;
-        Size = MAP_APPFONT ( 243, 95 ) ;
-    };
-
-    // Page 6, colorscheme
-    FixedLine PAGE6_TITEL
-    {
-        Pos = MAP_APPFONT ( 6 , 9 ) ;
-        Size = MAP_APPFONT ( 258 , 8 ) ;
-        Text [ en-US ] = "Select color scheme";
-    };
-
-    RadioButton PAGE6_DOCCOLORS
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS";
-        Pos = MAP_APPFONT( 12, 21 );
-        Size = MAP_APPFONT( 246, 10 );
-        Text [ en-US ] = "~Apply color scheme from document";
-    };
-
-    RadioButton PAGE6_DEFAULT
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT";
-        Pos = MAP_APPFONT( 12, 34 );
-        Size = MAP_APPFONT( 246, 10 );
-        Text [ en-US ] = "Use ~browser colors";
-    };
-
-    RadioButton PAGE6_USER
-    {
-        HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_USER";
-        Pos = MAP_APPFONT( 12, 47 );
-        Size = MAP_APPFONT( 246, 10 );
-        Text [ en-US ] = "~Use custom color scheme";
-    };
-
-    PushButton PAGE6_TEXT
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT";
-        Pos = MAP_APPFONT( 21, 60 );
-        Size = MAP_APPFONT( 72, 14 );
-        Text [ en-US ] = "Text";
-    };
-
-    PushButton PAGE6_LINK
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_LINK";
-        Pos = MAP_APPFONT( 21, 77 );
-        Size = MAP_APPFONT( 72, 14 );
-        Text [ en-US ] = "Hyper~link";
-    };
-
-    PushButton PAGE6_ALINK
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK";
-        Pos = MAP_APPFONT( 21, 94 );
-        Size = MAP_APPFONT( 72, 14 );
-        Text [ en-US ] = "Active Li~nk";
-    };
-
-    PushButton PAGE6_VLINK
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK";
-        Pos = MAP_APPFONT( 21, 111 );
-        Size = MAP_APPFONT( 72, 14 );
-        Text [ en-US ] = "~Visited Link";
-    };
-
-    Control PAGE6_PREVIEW
-    {
-        Pos = MAP_APPFONT( 96, 60 );
-        Size = MAP_APPFONT( 100, 64 );
-        Border = TRUE;
-    };
-
-    PushButton PAGE6_BACK
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_BACK";
-        Pos = MAP_APPFONT( 199, 60 );
-        Size = MAP_APPFONT( 60, 14 );
-        Text [ en-US ] = "Bac~kground";
-    };
-
-    // general
-
-    FixedLine BOTTOM_LINE
-    {
-        Pos = MAP_APPFONT ( 1 , 133 ) ;
-        Size = MAP_APPFONT ( 272, 4) ;
-    };
-
-    PushButton BUT_LAST
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_LAST";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 141 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "<< Back" ;
-    };
-
-    PushButton BUT_NEXT
-    {
-        HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_NEXT";
-        DefButton = TRUE ;
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 165 , 141 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Next >>" ;
-    };
-
-    OKButton BUT_FINISH
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 141 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Create" ;
-    };
-
-    CancelButton BUT_CANCEL
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 59 , 141 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BUT_HELP
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 141 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx
index c23004ac22f6..a80f78302621 100644
--- a/sd/source/ui/dlg/assclass.cxx
+++ b/sd/source/ui/dlg/assclass.cxx
@@ -35,7 +35,7 @@ Assistent::Assistent(int nNoOfPages)
         mpPageStatus[i] = true;
 }
 
-bool Assistent::InsertControl(int nDestPage,Control* pUsedControl)
+bool Assistent::InsertControl(int nDestPage,Window* pUsedControl)
 {
     DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!");
 
@@ -89,8 +89,8 @@ bool Assistent::GotoPage(const int nPageToGo)
     {
         int nIndex=mnCurrentPage-1;
 
-        std::vector<Control*>::iterator iter = maPages[nIndex].begin();
-        std::vector<Control*>::iterator iterEnd = maPages[nIndex].end();
+        std::vector<Window*>::iterator iter = maPages[nIndex].begin();
+        std::vector<Window*>::iterator iterEnd = maPages[nIndex].end();
 
         for(; iter != iterEnd; ++iter)
         {
diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx
index c8bd3092fcd0..cb04ba7c952b 100644
--- a/sd/source/ui/inc/assclass.hxx
+++ b/sd/source/ui/inc/assclass.hxx
@@ -27,13 +27,13 @@
 
 #define MAX_PAGES 10
 
-class Control;
+class Window;
 
 class SD_DLLPUBLIC Assistent
 {
     /** contains for every page the controls, which have to be
         connected? correctly */
-    std::vector<Control*> maPages[MAX_PAGES];
+    std::vector<Window*> maPages[MAX_PAGES];
 
     /// number of pages
     int mnPages;
@@ -51,7 +51,7 @@ public:
     void DisablePage( int nPage );
 
     /// adds a control to the specified page
-    bool InsertControl(int nDestPage,Control* pUsedControl);
+    bool InsertControl(int nDestPage,Window* pUsedControl);
 
     bool NextPage();
 
diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc
deleted file mode 100644
index 9e2ea15ddf46..000000000000
--- a/sd/source/ui/inc/pubdlg.hrc
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define PAGE1_TITEL         2
-#define PAGE1_NEW_DESIGN    3
-#define PAGE1_OLD_DESIGN    4
-#define PAGE1_DESIGNS       5
-#define PAGE1_DEL_DESIGN    6
-#define PAGE1_DESC          7
-
-#define PAGE2_TITEL         21
-#define PAGE2_STANDARD      22
-#define PAGE2_FRAMES        23
-#define PAGE2_KIOSK         24
-#define PAGE2_WEBCAST       25
-#define PAGE2_SINGLE_DOCUMENT 26
-
-#define PAGE2_NOFRAMES_FB   27
-#define PAGE2_FRAMES_FB     28
-#define PAGE2_KIOSK_FB      29
-#define PAGE2_WEBCAST_FB    30
-
-#define PAGE2_TITEL_HTML    31
-#define PAGE2_CONTENT       32
-#define PAGE2_NOTES         33
-
-#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
-#define PAGE2_PERL          42
-#define PAGE2_INDEX_TXT     43
-#define PAGE2_INDEX         44
-#define PAGE2_URL_TXT       45
-#define PAGE2_URL           46
-#define PAGE2_CGI_TXT       47
-#define PAGE2_CGI           48
-#define PAGE2_VERT          49
-
-#define PAGE3_TITEL_1       51
-#define PAGE3_PNG           51
-#define PAGE3_GIF           52
-#define PAGE3_JPG           53
-#define PAGE3_QUALITY_TXT   54
-#define PAGE3_QUALITY       55
-#define PAGE3_TITEL_2       56
-#define PAGE3_RESOLUTION_1  57
-#define PAGE3_RESOLUTION_2  58
-#define PAGE3_RESOLUTION_3  59
-#define PAGE3_TITEL_3       60
-#define PAGE3_SLD_SOUND     61
-#define PAGE3_VERT          62
-#define PAGE3_HIDDEN_SLIDES 63
-
-#define PAGE4_TITEL_1       66
-#define PAGE4_AUTHOR_TXT    67
-#define PAGE4_AUTHOR        68
-#define PAGE4_EMAIL_TXT     69
-#define PAGE4_EMAIL_EDIT    70
-#define PAGE4_WWW_TXT       71
-#define PAGE4_WWW_EDIT      72
-#define PAGE4_TITEL_2       73
-#define PAGE4_MISC          74
-#define PAGE4_DOWNLOAD      75
-#define PAGE4_CREATED       76
-
-#define PAGE5_TITEL         81
-#define PAGE5_TEXTONLY      82
-#define PAGE5_BUTTONS       83
-
-#define PAGE6_TITEL         101
-#define PAGE6_DEFAULT       102
-#define PAGE6_USER          103
-#define PAGE6_BACK          104
-#define PAGE6_TEXT          105
-#define PAGE6_LINK          106
-#define PAGE6_VLINK         107
-#define PAGE6_ALINK         108
-#define PAGE6_DOCCOLORS     109
-#define PAGE6_PREVIEW       111
-
-#define BUT_LAST 200
-#define BUT_NEXT 201
-#define BUT_FINISH 202
-#define BUT_CANCEL 203
-#define BUT_HELP 204
-#define BOTTOM_LINE 205
-
-#define DLG_PUBLISHING 739
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 74f11d545f2c..91ff008cfd38 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -26,6 +26,7 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/dialog.hxx>
+#include <vcl/layout.hxx>
 #include "resltn.hxx"
 #include "pres.hxx"
 #include "assclass.hxx"
@@ -52,7 +53,8 @@ class SdPublishingDlg : public ModalDialog
 {
 private:
     // page 1 controls
-    FixedLine*      pPage1_Titel;
+    VclContainer*   pPage1;
+    FixedText*      pPage1_Titel;
     RadioButton*    pPage1_NewDesign;
     RadioButton*    pPage1_OldDesign;
     ListBox*        pPage1_Designs;
@@ -60,22 +62,26 @@ private:
     FixedText*      pPage1_Desc;
 
     // page 2 controls
-    FixedLine*      pPage2_Titel;
+    VclContainer*   pPage2;
+    VclContainer*   pPage2Frame2;
+    VclContainer*   pPage2Frame3;
+    VclContainer*   pPage2Frame4;
+    FixedText*      pPage2_Titel;
     RadioButton*    pPage2_Standard;
     RadioButton*    pPage2_Frames;
     RadioButton*    pPage2_SingleDocument;
     RadioButton*    pPage2_Kiosk;
     RadioButton*    pPage2_WebCast;
-    FixedBitmap*    pPage2_Standard_FB;
-    FixedBitmap*    pPage2_Frames_FB;
-    FixedBitmap*    pPage2_Kiosk_FB;
-    FixedBitmap*    pPage2_WebCast_FB;
+    FixedImage*    pPage2_Standard_FB;
+    FixedImage*    pPage2_Frames_FB;
+    FixedImage*    pPage2_Kiosk_FB;
+    FixedImage*    pPage2_WebCast_FB;
 
-    FixedLine*      pPage2_Titel_Html;
+    FixedText*      pPage2_Titel_Html;
     CheckBox*       pPage2_Content;
     CheckBox*       pPage2_Notes;
 
-    FixedLine*      pPage2_Titel_WebCast;
+    FixedText*      pPage2_Titel_WebCast;
     RadioButton*    pPage2_ASP;
     RadioButton*    pPage2_PERL;
     FixedText*      pPage2_URL_txt;
@@ -84,8 +90,7 @@ private:
     Edit*           pPage2_CGI;
     FixedText*      pPage2_Index_txt;
     Edit*           pPage2_Index;
-    FixedLine*      pPage2_Vert;
-    FixedLine*      pPage2_Titel_Kiosk;
+    FixedText*      pPage2_Titel_Kiosk;
     RadioButton*    pPage2_ChgDefault;
     RadioButton*    pPage2_ChgAuto;
     FixedText*      pPage2_Duration_txt;
@@ -93,23 +98,24 @@ private:
     CheckBox*       pPage2_Endless;
 
     // page 3 controls
-    FixedLine*      pPage3_Titel1;
+    VclContainer*   pPage3;
+    FixedText*      pPage3_Titel1;
     RadioButton*    pPage3_Png;
     RadioButton*    pPage3_Gif;
     RadioButton*    pPage3_Jpg;
     FixedText*      pPage3_Quality_txt;
     ComboBox*       pPage3_Quality;
-    FixedLine*      pPage3_Vert;
-    FixedLine*      pPage3_Titel2;
+    FixedText*      pPage3_Titel2;
     RadioButton*    pPage3_Resolution_1;
     RadioButton*    pPage3_Resolution_2;
     RadioButton*    pPage3_Resolution_3;
-    FixedLine*      pPage3_Titel3;
+    FixedText*      pPage3_Titel3;
     CheckBox*       pPage3_SldSound;
     CheckBox*       pPage3_HiddenSlides;
-    // page 4 controls
 
-    FixedLine*      pPage4_Titel1;
+    // page 4 controls
+    VclContainer*   pPage4;
+    FixedText*      pPage4_Titel1;
     FixedText*      pPage4_Author_txt;
     Edit*           pPage4_Author;
     FixedText*      pPage4_Email_txt;
@@ -117,18 +123,18 @@ private:
     FixedText*      pPage4_WWW_txt;
     Edit*           pPage4_WWW;
     FixedText*      pPage4_Titel2;
-    MultiLineEdit*  pPage4_Misc;
+    VclMultiLineEdit*  pPage4_Misc;
     CheckBox*       pPage4_Download;
 
     // page 5 controls
-
-    FixedLine*      pPage5_Titel;
+    VclContainer*   pPage5;
+    FixedText*      pPage5_Titel;
     CheckBox*       pPage5_TextOnly;
     ValueSet*       pPage5_Buttons;
 
     // page 6 controls
-
-    FixedLine*      pPage6_Titel;
+    VclContainer*   pPage6;
+    FixedText*      pPage6_Titel;
     RadioButton*    pPage6_Default;
     RadioButton*    pPage6_User;
     PushButton*     pPage6_Back;
@@ -142,12 +148,9 @@ private:
     boost::scoped_ptr< ButtonSet > mpButtonSet;
 
     // standard controls
-    FixedLine       aBottomLine;
-    HelpButton      aHelpButton;
-    CancelButton    aCancelButton;
-    PushButton      aLastPageButton;
-    PushButton      aNextPageButton;
-    OKButton        aFinishButton;
+    PushButton*     pLastPageButton;
+    PushButton*     pNextPageButton;
+    PushButton*     pFinishButton;
 
     Assistent       aAssistentFunc;
 
@@ -156,7 +159,6 @@ private:
 
     void SetDefaults();
     void CreatePages();
-    void RemovePages();
 
     Color m_aBackColor, m_aTextColor, m_aLinkColor;
     Color m_aVLinkColor, m_aALinkColor;