[Libreoffice-commits] core.git: extras/source sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk

Palenik Mihály palenik.mihaly at gmail.com
Mon Jun 23 05:14:35 PDT 2014


 extras/source/glade/libreoffice-catalog.xml.in |   10 
 sd/AllLangResTarget_sd.mk                      |    1 
 sd/UIConfig_simpress.mk                        |    1 
 sd/source/ui/dlg/dlgass.cxx                    |  498 ++++-----
 sd/source/ui/dlg/dlgass.src                    |  572 -----------
 sd/source/ui/dlg/dlgassim.cxx                  |   14 
 sd/source/ui/dlg/dlgassim.hxx                  |    2 
 sd/source/ui/dlg/dlgctrls.cxx                  |   16 
 sd/source/ui/dlg/docprev.cxx                   |   21 
 sd/source/ui/inc/dlgass.hrc                    |   83 -
 sd/source/ui/inc/dlgctrls.hxx                  |    4 
 sd/source/ui/inc/docprev.hxx                   |    4 
 sd/uiconfig/simpress/ui/assistentdialog.ui     | 1253 +++++++++++++++++++++++++
 13 files changed, 1537 insertions(+), 942 deletions(-)

New commits:
commit 9701a7ca9858f6a286a7c75fa83dcb5d89cb5033
Author: Palenik Mihály <palenik.mihaly at gmail.com>
Date:   Fri Jun 20 02:35:05 2014 +0200

    Convert DLG_ASS to .ui
    
    Change-Id: I29ee55654391f24399aea24fc02c49c430c4e839
    Reviewed-on: https://gerrit.libreoffice.org/9834
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index b33f32a..88e0d4a 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -289,6 +289,9 @@
     <glade-widget-class title="Html Attribute Preview" name="sduilo-SdHtmlAttrPreview"
                         generic-name="Html Attribute Preview" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Document Preview Window" name="sdlo-SdDocPreviewWin"
+                        generic-name="Document Preview Window" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Writer Number Preview" name="swuilo-NumberingPreview"
                         generic-name="Writer Number Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
@@ -540,6 +543,9 @@
     <glade-widget-class title="Page Objs ListBox" name="sdlo-SdPageObjsTLB"
                         generic-name="SdPageObjsTLB" parent="svtlo-SvTreeListBox"
                         icon-name="widget-gtk-treeview"/>
+    <glade-widget-class title="Page List Control" name="sduilo-SdPageListControl"
+                        generic-name="Page List Control" parent="svtlo-SvTreeListBox"
+                        icon-name="widget-gtk-treeview"/>
     <glade-widget-class title="Checked Tree List" name="svxlo-SvxCheckListBox"
                         generic-name="Checked Tree List" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>
@@ -657,6 +663,10 @@
     <glade-widget-class title="Open Document ListBox" name="dbulo-OpenDocumentListBox"
                         generic-name="Open Document ListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
+                        
+    <glade-widget-class title="Fade Effect ListBox" name="sdlo-FadeEffectLB"
+                        generic-name="Fade Effect ListBox" parent="GtkComboBox"
+                        icon-name="widget-gtk-combobox"/>
 
     <glade-widget-class title="Open Document Button" name="dbulo-OpenDocumentButton"
                         generic-name="Open Document Button" parent="GtkButton"
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 7d71111..1c4ad6f 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/ui/app/strings.src \
     sd/source/ui/app/toolbox.src \
     sd/source/ui/dlg/animobjs.src \
-    sd/source/ui/dlg/dlgass.src \
     sd/source/ui/dlg/navigatr.src \
     sd/source/ui/dlg/PaneDockingWindow.src \
     sd/source/ui/slideshow/slideshow.src \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 091b290..a087873 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
+	sd/uiconfig/simpress/ui/assistentdialog \
 	sd/uiconfig/simpress/ui/customanimationcreatedialog \
 	sd/uiconfig/simpress/ui/customanimationcreatetab \
 	sd/uiconfig/simpress/ui/customanimationspanel \
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 269b52a..1f919c1 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -23,6 +23,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/layout.hxx>
 #include <sfx2/doctempl.hxx>
 #include <svl/lstner.hxx>
 #include <sfx2/objsh.hxx>
@@ -58,7 +59,6 @@
 #include "sdpage.hxx"
 #include "helpids.h"
 #include "assclass.hxx"
-#include "dlgass.hrc"
 #include "dlgass.hxx"
 #include "dlgctrls.hxx"
 #include "strings.hrc"
@@ -76,17 +76,6 @@ using namespace ::sd;
 
 using ::std::vector;
 
-void InterpolateFixedBitmap( FixedBitmap * pBitmap )
-{
-    Bitmap aBmp( pBitmap->GetBitmap() );
-    Size aSize = pBitmap->GetSizePixel();
-    aBmp.Scale( aSize, BMP_SCALE_BESTQUALITY );
-    pBitmap->SetBitmap( aBmp );
-}
-
-
-
-
 
 const char* PageHelpIds[] =
 {
@@ -117,7 +106,7 @@ public:
 class NextButton
 {
 public:
-    NextButton (::Window* pParent, const ResId& rResId);
+    NextButton (::Window* pParent);
 
     void ForceFocusEventBroadcast (void);
     void SetClickHdl (const Link& rLink);
@@ -125,8 +114,8 @@ public:
     void Enable (bool bEnable);
 
 private:
-    PushButton maNextButton1;
-    PushButton maNextButton2;
+    PushButton* mpNextButton1;
+    PushButton* mpNextButton2;
     bool mbIsFirstButtonActive;
 };
 
@@ -273,21 +262,18 @@ public:
 
     // Common
     Assistent           maAssistentFunc;
-    CheckBox            maPreviewFlag;
-    CheckBox            maStartWithFlag;
-    HelpButton          maHelpButton;
-    CancelButton        maCancelButton;
-    PushButton          maLastPageButton;
-    NextButton          maNextPageButton;
-    OKButton            maFinishButton;
-    SdDocPreviewWin     maPreview;
-
-    OUString            maCreateStr;
-    OUString            maOpenStr;
+    CheckBox*           mpPreviewFlag;
+    CheckBox*           mpStartWithFlag;
+    PushButton*         mpLastPageButton;
+    NextButton*         mpNextPageButton;
+    PushButton*         mpFinishButton;
+    SdDocPreviewWin*    mpPreview;
+    VclContainer*       mpPage1235;
 
     // page 1
-    FixedBitmap*        mpPage1FB;
-    FixedLine*          mpPage1ArtFL;
+    VclContainer*       mpPage1;
+    FixedImage*         mpPage1FB;
+    FixedText*          mpPage1ArtFL;
     RadioButton*        mpPage1EmptyRB;
     RadioButton*        mpPage1TemplateRB;
     ListBox*            mpPage1RegionLB;
@@ -297,11 +283,12 @@ public:
     PushButton*         mpPage1OpenPB;
 
     // page 2
-    FixedBitmap*        mpPage2FB;
-    FixedLine*          mpPage2LayoutFL;
+    VclContainer*       mpPage2;
+    FixedImage*         mpPage2FB;
+    FixedText*          mpPage2LayoutFL;
     ListBox*            mpPage2RegionLB;
     ListBox*            mpPage2LayoutLB;
-    FixedLine*          mpPage2OutTypesFL;
+    FixedText*          mpPage2OutTypesFL;
     RadioButton*        mpPage2Medium1RB;
     RadioButton*        mpPage2Medium2RB;
     RadioButton*        mpPage2Medium3RB;
@@ -310,13 +297,14 @@ public:
     RadioButton*        mpPage2Medium6RB;
 
     // page 3
-    FixedBitmap*        mpPage3FB;
-    FixedLine*          mpPage3EffectFL;
+    VclContainer*       mpPage3;
+    FixedImage*         mpPage3FB;
+    FixedText*          mpPage3EffectFL;
     FixedText*          mpPage3EffectFT;
     FadeEffectLB*       mpPage3EffectLB;
     FixedText*          mpPage3SpeedFT;
     ListBox*            mpPage3SpeedLB;
-    FixedLine*          mpPage3PresTypeFL;
+    FixedText*          mpPage3PresTypeFL;
     RadioButton*        mpPage3PresTypeLiveRB;
     RadioButton*        mpPage3PresTypeKioskRB;
     FixedText*          mpPage3PresTimeFT;
@@ -326,17 +314,19 @@ public:
     CheckBox*           mpPage3LogoCB;
 
     // page 4
-    FixedBitmap*        mpPage4FB;
-    FixedLine*          mpPage4PersonalFL;
+    VclContainer*       mpPage4;
+    FixedImage*         mpPage4FB;
+    FixedText*          mpPage4PersonalFL;
     FixedText*          mpPage4AskNameFT;
     Edit*               mpPage4AskNameEDT;
     FixedText*          mpPage4AskTopicFT;
     Edit*               mpPage4AskTopicEDT;
     FixedText*          mpPage4AskInfoFT;
-    MultiLineEdit*      mpPage4AskInfoEDT;
+    VclMultiLineEdit*      mpPage4AskInfoEDT;
 
     // page 5
-    FixedBitmap*        mpPage5FB;
+    VclContainer*       mpPage5;
+    FixedImage*         mpPage5FB;
     FixedText*          mpPage5PageListFT;
     SdPageListControl*  mpPage5PageListCT;
     CheckBox*           mpPage5SummaryCB;
@@ -356,18 +346,46 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mbPreview(true),
     mnShowPage(0),
     mbDocPreview(false),
-    maAssistentFunc(5),
-    maPreviewFlag(pWindow,SdResId(CB_PREVIEW)),
-    maStartWithFlag(pWindow,SdResId(CB_STARTWITH)),
-    maHelpButton(pWindow,SdResId(BUT_HELP)),
-    maCancelButton(pWindow,SdResId(BUT_CANCEL)),
-    maLastPageButton(pWindow,SdResId(BUT_LAST)),
-    maNextPageButton(pWindow,SdResId(BUT_NEXT)),
-    maFinishButton(pWindow,SdResId(BUT_FINISH)),
-    maPreview(pWindow,SdResId(CT_PREVIEW)),
-    maCreateStr(SdResId(STR_CREATE)),
-    maOpenStr(SdResId(STR_OPEN))
-{
+    maAssistentFunc(5)
+{
+    AssistentDlg* assDlg = static_cast<AssistentDlg*>(pWindow);
+    assDlg->get(mpPreviewFlag, "previewCheckbutton");
+    assDlg->get(mpStartWithFlag, "startWithCheckbutton");
+    assDlg->get(mpLastPageButton, "lastPageButton");
+    assDlg->get(mpFinishButton, "finishButton");
+    assDlg->get(mpPreview, "previewControl");
+    assDlg->get(mpPage1235, "page1235Box");
+    mpNextPageButton = new NextButton( pWindow );
+
+    //Lock down the preferred size based on the
+    //initial max-size configuration
+    assDlg->get(mpPage1TemplateLB, "templatesTreeview");
+    assDlg->get(mpPage1OpenLB, "openTreeview");
+    long nHeight = mpPage1TemplateLB->GetTextHeight() * 7;
+    mpPage1TemplateLB->set_height_request(nHeight);
+    mpPage1OpenLB->set_height_request(nHeight);
+
+    assDlg->get(mpPage1, "page1Box");
+    assDlg->get(mpPage2, "page2Box");
+    assDlg->get(mpPage3, "page3Box");
+    assDlg->get(mpPage4, "page4Frame");
+    assDlg->get(mpPage5, "page5Box");
+    Size aSize(mpPage1->get_preferred_size());
+    mpPage1->set_height_request(aSize.Height());
+    mpPage2->set_height_request(aSize.Height());
+    mpPage3->set_height_request(aSize.Height());
+    mpPage4->set_height_request(aSize.Height());
+    mpPage5->set_height_request(aSize.Height());
+    mpPage1->set_width_request(aSize.Width());
+    mpPage2->set_width_request(aSize.Width());
+    mpPage3->set_width_request(aSize.Width());
+    mpPage4->set_width_request(aSize.Width());
+    mpPage5->set_width_request(aSize.Width());
+
+    aSize = assDlg->get_preferred_size();
+    assDlg->set_width_request(aSize.Width());
+    assDlg->set_height_request(aSize.Height());
+
     maPageListFile = "?";
     mbRecentDocumentsReady = false;
     mbTemplatesReady = false;
@@ -375,47 +393,32 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
 
     mpWindow = pWindow;
 
-    if(bAutoPilot)
-        maStartWithFlag.Hide();
+    if (bAutoPilot)
+        mpStartWithFlag->Hide();
     else
-        maAssistentFunc.InsertControl(1, &maStartWithFlag );
+        maAssistentFunc.InsertControl(1, mpStartWithFlag );
 
     // initialize page1 and give it to the assistant functionality
-    maAssistentFunc.InsertControl(1, &maPreview );
-    maAssistentFunc.InsertControl(1, &maPreviewFlag );
-    maAssistentFunc.InsertControl(1,
-        mpPage1FB = new FixedBitmap(pWindow,SdResId(FB_PAGE1)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1ArtFL = new FixedLine(pWindow,SdResId(FL_PAGE1_ARTGROUP)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1EmptyRB=new RadioButton(pWindow,SdResId(RB_PAGE1_EMPTY)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1TemplateRB=new RadioButton(pWindow,SdResId(RB_PAGE1_TEMPLATE)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1OpenRB=new RadioButton(pWindow,SdResId(RB_PAGE1_OPEN)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1RegionLB = new ListBox(pWindow,SdResId(LB_PAGE1_REGION)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1TemplateLB=new ListBox(pWindow,SdResId(LB_PAGE1_TEMPLATES)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1OpenPB=new PushButton(pWindow,SdResId(PB_PAGE1_OPEN)));
-    maAssistentFunc.InsertControl(1,
-        mpPage1OpenLB=new ListBox(pWindow,SdResId(LB_PAGE1_OPEN)));
-
-    // Align the button and list box displayed for the "open existing file"
-    // radio button with the text of that radio button.
-    {
-        RadioButton aEmptyRB (mpWindow);
-        sal_Int32 nIndent (aEmptyRB.CalcMinimumSize(0).Width());
-        sal_Int32 nLeft (mpPage1OpenRB->GetPosPixel().X() + nIndent);
-        sal_Int32 nWidth (mpPage1OpenRB->GetSizePixel().Width() - nIndent);
-        mpPage1OpenPB->SetPosSizePixel(
-            Point(nLeft, mpPage1OpenPB->GetPosPixel().Y()),
-            Size(mpPage1OpenPB->GetSizePixel()));
-        mpPage1OpenLB->SetPosSizePixel(
-            Point(nLeft, mpPage1OpenLB->GetPosPixel().Y()),
-            Size(nWidth, mpPage1OpenLB->GetSizePixel().Height()));
-    }
+    assDlg->get(mpPage1FB, "header1Image");
+    assDlg->get(mpPage1ArtFL, "typeLabel");
+    assDlg->get(mpPage1EmptyRB, "emptyRadiobutton");
+    assDlg->get(mpPage1TemplateRB, "templateRadiobutton");
+    assDlg->get(mpPage1OpenRB, "openRadiobutton");
+    assDlg->get(mpPage1RegionLB, "regionCombobox");
+    assDlg->get(mpPage1OpenPB, "openButton");
+    maAssistentFunc.InsertControl(1, mpPage1 );
+    maAssistentFunc.InsertControl(1, mpPage1235 );
+    maAssistentFunc.InsertControl(1, mpPreview );
+    maAssistentFunc.InsertControl(1, mpPreviewFlag );
+    maAssistentFunc.InsertControl(1, mpPage1FB );
+    maAssistentFunc.InsertControl(1, mpPage1ArtFL );
+    maAssistentFunc.InsertControl(1, mpPage1EmptyRB);
+    maAssistentFunc.InsertControl(1, mpPage1TemplateRB );
+    maAssistentFunc.InsertControl(1, mpPage1OpenRB );
+    maAssistentFunc.InsertControl(1, mpPage1RegionLB );
+    maAssistentFunc.InsertControl(1, mpPage1TemplateLB );
+    maAssistentFunc.InsertControl(1, mpPage1OpenPB );
+    maAssistentFunc.InsertControl(1, mpPage1OpenLB );
 
     // Set text and icon of the 'Open...' button.
     {
@@ -450,31 +453,33 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage1OpenPB->SetClickHdl(LINK(this,AssistentDlgImpl,OpenButtonHdl));
 
     // page 2
-    maAssistentFunc.InsertControl(2, &maPreview );
-    maAssistentFunc.InsertControl(2, &maPreviewFlag );
-    maAssistentFunc.InsertControl(2,
-        mpPage2FB = new FixedBitmap(pWindow,SdResId(FB_PAGE2)));
-    maAssistentFunc.InsertControl(2,
-        mpPage2LayoutFL = new FixedLine( pWindow, SdResId(FL_PAGE2_LAYOUT) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2RegionLB = new ListBox(pWindow,SdResId(LB_PAGE2_REGION) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2LayoutLB = new ListBox(pWindow,SdResId(LB_PAGE2_LAYOUT) ));
-
-    maAssistentFunc.InsertControl(2,
-        mpPage2OutTypesFL = new FixedLine( pWindow, SdResId(FL_PAGE2_OUTPUTTYPES) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2Medium5RB = new RadioButton( pWindow, SdResId(RB_PAGE2_MEDIUM5) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2Medium3RB = new RadioButton( pWindow, SdResId(RB_PAGE2_MEDIUM3) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2Medium4RB = new RadioButton( pWindow, SdResId(RB_PAGE2_MEDIUM4) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2Medium1RB = new RadioButton( pWindow, SdResId(RB_PAGE2_MEDIUM1) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2Medium2RB = new RadioButton( pWindow, SdResId(RB_PAGE2_MEDIUM2) ));
-    maAssistentFunc.InsertControl(2,
-        mpPage2Medium6RB = new RadioButton( pWindow, SdResId(RB_PAGE2_MEDIUM6) ));
+    assDlg->get(mpPage2FB, "header2Image");
+    assDlg->get(mpPage2LayoutFL, "layout2Label");
+    assDlg->get(mpPage2RegionLB, "page2RegionCombobox");
+    assDlg->get(mpPage2LayoutLB, "layoutTreeview");
+    maAssistentFunc.InsertControl(2, mpPage2 );
+    maAssistentFunc.InsertControl(2, mpPage1235 );
+    maAssistentFunc.InsertControl(2, mpPreview );
+    maAssistentFunc.InsertControl(2, mpPreviewFlag );
+    maAssistentFunc.InsertControl(2, mpPage2FB );
+    maAssistentFunc.InsertControl(2, mpPage2LayoutFL );
+    maAssistentFunc.InsertControl(2, mpPage2RegionLB );
+    maAssistentFunc.InsertControl(2, mpPage2LayoutLB );
+
+    assDlg->get(mpPage2OutTypesFL, "outTypesLabel");
+    assDlg->get(mpPage2Medium5RB, "medium5Radiobutton");
+    assDlg->get(mpPage2Medium3RB, "medium3Radiobutton");
+    assDlg->get(mpPage2Medium4RB, "medium4Radiobutton");
+    assDlg->get(mpPage2Medium1RB, "medium1Radiobutton");
+    assDlg->get(mpPage2Medium2RB, "medium2Radiobutton");
+    assDlg->get(mpPage2Medium6RB, "medium6Radiobutton");
+    maAssistentFunc.InsertControl(2, mpPage2OutTypesFL );
+    maAssistentFunc.InsertControl(2, mpPage2Medium5RB );
+    maAssistentFunc.InsertControl(2, mpPage2Medium3RB );
+    maAssistentFunc.InsertControl(2, mpPage2Medium4RB );
+    maAssistentFunc.InsertControl(2, mpPage2Medium1RB );
+    maAssistentFunc.InsertControl(2, mpPage2Medium2RB );
+    maAssistentFunc.InsertControl(2, mpPage2Medium6RB );
     mpPage2Medium5RB->Check();
 
     mpPage2RegionLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectRegionHdl));
@@ -484,36 +489,39 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage2LayoutLB->InsertEntry(SD_RESSTR(STR_ISLOADING));
 
     // page 3
-    maAssistentFunc.InsertControl(3, &maPreview );
-    maAssistentFunc.InsertControl(3, &maPreviewFlag );
-    maAssistentFunc.InsertControl(3,
-        mpPage3FB = new FixedBitmap(pWindow,SdResId(FB_PAGE3)));
-    maAssistentFunc.InsertControl(3,
-        mpPage3EffectFL = new FixedLine( pWindow, SdResId(FL_PAGE3_EFFECT) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3EffectFT = new FixedText( pWindow, SdResId(FT_PAGE3_EFFECT) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3EffectLB = new FadeEffectLB( pWindow, SdResId(LB_PAGE3_EFFECT) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3SpeedFT = new FixedText( pWindow, SdResId(FT_PAGE3_SPEED) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3SpeedLB = new FadeEffectLB( pWindow, SdResId(LB_PAGE3_SPEED) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3PresTypeFL = new FixedLine( pWindow, SdResId(FL_PAGE3_PRESTYPE) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3PresTypeLiveRB = new RadioButton( pWindow, SdResId(RB_PAGE3_LIVE) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3PresTypeKioskRB = new RadioButton( pWindow, SdResId(RB_PAGE3_KIOSK) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3PresTimeFT = new FixedText( pWindow, SdResId( FT_PAGE3_TIME) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3PresTimeTMF = new TimeField( pWindow, SdResId( TMF_PAGE3_TIME) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3BreakFT = new FixedText( pWindow, SdResId( FT_PAGE3_BREAK) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3BreakTMF = new TimeField( pWindow, SdResId( TMF_PAGE3_BREAK) ));
-    maAssistentFunc.InsertControl(3,
-        mpPage3LogoCB = new CheckBox( pWindow, SdResId( CB_PAGE3_LOGO) ));
+    assDlg->get(mpPage3FB, "header3Image");
+    assDlg->get(mpPage3EffectFL, "page3EffectLabel");
+    assDlg->get(mpPage3EffectFT, "effectLabel");
+    assDlg->get(mpPage3EffectLB, "effectCombobox");
+    assDlg->get(mpPage3SpeedFT, "speedLabel");
+    assDlg->get(mpPage3SpeedLB, "speedCombobox");
+    assDlg->get(mpPage3PresTypeFL, "presTypeLabel");
+    assDlg->get(mpPage3PresTypeLiveRB, "liveRadiobutton");
+    assDlg->get(mpPage3PresTypeKioskRB, "kioskRadiobutton");
+    assDlg->get(mpPage3PresTimeFT, "presTimeLabel");
+    assDlg->get(mpPage3PresTimeTMF, "timeSpinbutton");
+    assDlg->get(mpPage3BreakFT, "breakLabel");
+    assDlg->get(mpPage3BreakTMF, "breakSpinbutton");
+    assDlg->get(mpPage3LogoCB, "logoCheckbutton");
+
+    maAssistentFunc.InsertControl(3, mpPage3 );
+    maAssistentFunc.InsertControl(3, mpPage1235 );
+    maAssistentFunc.InsertControl(3, mpPreview );
+    maAssistentFunc.InsertControl(3, mpPreviewFlag );
+    maAssistentFunc.InsertControl(3, mpPage3FB );
+    maAssistentFunc.InsertControl(3, mpPage3EffectFL );
+    maAssistentFunc.InsertControl(3, mpPage3EffectFT );
+    maAssistentFunc.InsertControl(3, mpPage3EffectLB );
+    maAssistentFunc.InsertControl(3, mpPage3SpeedFT );
+    maAssistentFunc.InsertControl(3, mpPage3SpeedLB );
+    maAssistentFunc.InsertControl(3, mpPage3PresTypeFL );
+    maAssistentFunc.InsertControl(3, mpPage3PresTypeLiveRB );
+    maAssistentFunc.InsertControl(3, mpPage3PresTypeKioskRB );
+    maAssistentFunc.InsertControl(3, mpPage3PresTimeFT );
+    maAssistentFunc.InsertControl(3, mpPage3PresTimeTMF );
+    maAssistentFunc.InsertControl(3, mpPage3BreakFT );
+    maAssistentFunc.InsertControl(3, mpPage3BreakTMF );
+    maAssistentFunc.InsertControl(3, mpPage3LogoCB );
 
     mpPage3EffectLB->Fill();
     mpPage3EffectLB->SetSelectHdl( LINK(this,AssistentDlgImpl,SelectEffectHdl ));
@@ -544,59 +552,56 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     pEditPage3BreakTMF->SetSelection( aSel2 );
 
     // page 4
-    maAssistentFunc.InsertControl(4,
-        mpPage4FB = new FixedBitmap(pWindow,SdResId(FB_PAGE4)));
-    maAssistentFunc.InsertControl(4,
-        mpPage4PersonalFL = new FixedLine( pWindow, SdResId(FL_PAGE4_PERSONAL) ));
-    maAssistentFunc.InsertControl(4,
-        mpPage4AskNameFT   = new FixedText( pWindow, SdResId(FT_PAGE4_ASKNAME) ));
-    maAssistentFunc.InsertControl(4,
-        mpPage4AskNameEDT  = new Edit( pWindow, SdResId(EDT_PAGE4_ASKNAME) ));
-    maAssistentFunc.InsertControl(4,
-        mpPage4AskTopicFT= new FixedText( pWindow, SdResId(FT_PAGE4_ASKTOPIC) ));
-    maAssistentFunc.InsertControl(4,
-        mpPage4AskTopicEDT = new Edit( pWindow, SdResId(EDT_PAGE4_ASKTOPIC) ));
-    maAssistentFunc.InsertControl(4,
-        mpPage4AskInfoFT   = new FixedText( pWindow, SdResId(FT_PAGE4_ASKINFORMATION) ));
-    maAssistentFunc.InsertControl(4,
-        mpPage4AskInfoEDT  = new MultiLineEdit( pWindow, SdResId(EDT_PAGE4_ASKINFORMATION) ));
+    assDlg->get(mpPage4FB, "header4Image");
+    assDlg->get(mpPage4PersonalFL, "personalLabel");
+    assDlg->get(mpPage4AskNameFT, "askNameLabel");
+    assDlg->get(mpPage4AskNameEDT, "askNameEntry");
+    assDlg->get(mpPage4AskTopicFT, "askTopicLabel");
+    assDlg->get(mpPage4AskTopicEDT, "askTopicEntry");
+    assDlg->get(mpPage4AskInfoFT, "askInfoLabel");
+    assDlg->get(mpPage4AskInfoEDT, "askInformationTextview");
+    maAssistentFunc.InsertControl(4, mpPage4 );
+    maAssistentFunc.InsertControl(4, mpPage4FB );
+    maAssistentFunc.InsertControl(4, mpPage4PersonalFL );
+    maAssistentFunc.InsertControl(4, mpPage4AskNameFT );
+    maAssistentFunc.InsertControl(4, mpPage4AskNameEDT );
+    maAssistentFunc.InsertControl(4, mpPage4AskTopicFT);
+    maAssistentFunc.InsertControl(4, mpPage4AskTopicEDT );
+    maAssistentFunc.InsertControl(4, mpPage4AskInfoFT );
+    maAssistentFunc.InsertControl(4, mpPage4AskInfoEDT );
 
     mpPage4AskNameEDT->SetModifyHdl(LINK(this,AssistentDlgImpl,UpdateUserDataHdl));
     mpPage4AskTopicEDT->SetModifyHdl(LINK(this,AssistentDlgImpl,UpdateUserDataHdl));
     mpPage4AskInfoEDT->SetModifyHdl(LINK(this,AssistentDlgImpl,UpdateUserDataHdl));
 
     // page 5
-    maAssistentFunc.InsertControl(5, &maPreview );
-    maAssistentFunc.InsertControl(5, &maPreviewFlag );
-    maAssistentFunc.InsertControl(5,
-        mpPage5FB = new FixedBitmap(pWindow,SdResId(FB_PAGE5)));
-    maAssistentFunc.InsertControl(5,
-        mpPage5PageListFT = new FixedText( pWindow, SdResId( FT_PAGE5_PAGELIST ) ));
-    maAssistentFunc.InsertControl(5,
-        mpPage5PageListCT = new SdPageListControl( pWindow, SdResId( CT_PAGE5_PAGELIST ) ));
-    maAssistentFunc.InsertControl(5,
-        mpPage5SummaryCB  = new CheckBox( pWindow, SdResId( CB_PAGE5_SUMMARY ) ));
+    assDlg->get(mpPage5FB, "header5Image");
+    assDlg->get(mpPage5PageListFT, "pageListLabel");
+    assDlg->get(mpPage5PageListCT, "TreeListBox");
+    assDlg->get(mpPage5SummaryCB, "summaryCheckbutton");
+    maAssistentFunc.InsertControl(5, mpPage5 );
+    maAssistentFunc.InsertControl(5, mpPage1235 );
+    maAssistentFunc.InsertControl(5, mpPreview );
+    maAssistentFunc.InsertControl(5, mpPreviewFlag );
+    maAssistentFunc.InsertControl(5, mpPage5FB );
+    maAssistentFunc.InsertControl(5, mpPage5PageListFT );
+    maAssistentFunc.InsertControl(5, mpPage5PageListCT );
+    maAssistentFunc.InsertControl(5, mpPage5SummaryCB );
 
     mpPage5PageListCT->SetSelectHdl(LINK(this,AssistentDlgImpl, PageSelectHdl));
 
 
     // general
-    InterpolateFixedBitmap( mpPage1FB );
-    InterpolateFixedBitmap( mpPage2FB );
-    InterpolateFixedBitmap( mpPage3FB );
-    InterpolateFixedBitmap( mpPage4FB );
-    InterpolateFixedBitmap( mpPage5FB );
-
-    maLastPageButton.SetClickHdl(LINK(this,AssistentDlgImpl, LastPageHdl ));
-    maNextPageButton.SetClickHdl(LINK(this,AssistentDlgImpl, NextPageHdl ));
+    mpLastPageButton->SetClickHdl(LINK(this,AssistentDlgImpl, LastPageHdl ));
+    mpNextPageButton->SetClickHdl(LINK(this,AssistentDlgImpl, NextPageHdl ));
 
-    maPreviewFlag.Check( mbPreview );
-    maPreviewFlag.SetClickHdl(LINK(this, AssistentDlgImpl, PreviewFlagHdl ));
-    maPreview.SetClickHdl(LINK(this,AssistentDlgImpl, EffectPreviewHdl ));
+    mpPreviewFlag->Check( mbPreview );
+    mpPreviewFlag->SetClickHdl(LINK(this, AssistentDlgImpl, PreviewFlagHdl ));
+    mpPreview->SetClickHdl(LINK(this,AssistentDlgImpl, EffectPreviewHdl ));
 
     // sets the exit page
     maAssistentFunc.GotoPage(1);
-    maLastPageButton.Disable();
+    mpLastPageButton->Disable();
 
     maPrevTimer.SetTimeout( 200 );
     maPrevTimer.SetTimeoutHdl( LINK( this, AssistentDlgImpl, UpdatePreviewHdl));
@@ -611,7 +616,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
 
     ChangePage();
 
-    mpWindowUpdater->RegisterWindow (&maPreview);
+    mpWindowUpdater->RegisterWindow (mpPreview);
 
     UpdatePreview( true );
 
@@ -674,62 +679,6 @@ AssistentDlgImpl::~AssistentDlgImpl()
             delete (*J);
         delete (*I);
     }
-
-    // page 1
-    delete mpPage1FB;
-    delete mpPage1ArtFL;
-    delete mpPage1EmptyRB;
-    delete mpPage1TemplateRB;
-    delete mpPage1TemplateLB;
-    delete mpPage1RegionLB;
-    delete mpPage1OpenRB;
-    delete mpPage1OpenLB;
-    delete mpPage1OpenPB;
-
-    // page 2
-    delete mpPage2FB;
-    delete mpPage2LayoutFL;
-    delete mpPage2RegionLB;
-    delete mpPage2LayoutLB;
-    delete mpPage2OutTypesFL;
-    delete mpPage2Medium1RB;
-    delete mpPage2Medium2RB;
-    delete mpPage2Medium3RB;
-    delete mpPage2Medium4RB;
-    delete mpPage2Medium5RB;
-    delete mpPage2Medium6RB;
-
-    // page 3
-    delete mpPage3FB;
-    delete mpPage3EffectFL;
-    delete mpPage3EffectFT;
-    delete mpPage3EffectLB;
-    delete mpPage3SpeedFT;
-    delete mpPage3SpeedLB;
-    delete mpPage3PresTypeFL;
-    delete mpPage3PresTypeLiveRB;
-    delete mpPage3PresTypeKioskRB;
-    delete mpPage3PresTimeFT;
-    delete mpPage3PresTimeTMF;
-    delete mpPage3BreakFT;
-    delete mpPage3BreakTMF;
-    delete mpPage3LogoCB;
-
-    // page 4
-    delete mpPage4FB;
-    delete mpPage4PersonalFL;
-    delete mpPage4AskNameFT;
-    delete mpPage4AskNameEDT;
-    delete mpPage4AskTopicFT;
-    delete mpPage4AskTopicEDT;
-    delete mpPage4AskInfoFT;
-    delete mpPage4AskInfoEDT;
-
-    // page 5
-    delete mpPage5FB;
-    delete mpPage5PageListFT;
-    delete mpPage5PageListCT;
-    delete mpPage5SummaryCB;
 }
 
 void AssistentDlgImpl::CloseDocShell()
@@ -937,7 +886,7 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1EmptyRB->SetState( eType == ST_EMPTY );
     mpPage1TemplateRB->SetState( eType == ST_TEMPLATE );
     mpPage1OpenRB->SetState( eType == ST_OPEN );
-    maNextPageButton.Enable( eType != ST_OPEN );
+    mpNextPageButton->Enable( eType != ST_OPEN );
 
     mpPage1RegionLB->Show(eType == ST_TEMPLATE);
     mpPage1TemplateLB->Show(eType == ST_TEMPLATE);
@@ -945,9 +894,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1OpenPB->Show(eType == ST_OPEN);
 
     if (eType == ST_OPEN)
-        maFinishButton.SetText(maOpenStr);
+        mpFinishButton->SetText("~Open");
     else
-        maFinishButton.SetText(maCreateStr);
+        mpFinishButton->SetText("~Create");
 }
 
 StartType AssistentDlgImpl::GetStartType()
@@ -1084,8 +1033,8 @@ void AssistentDlgImpl::LeavePage()
 
 void AssistentDlgImpl::ChangePage()
 {
-    maNextPageButton.Enable(!maAssistentFunc.IsLastPage());
-    maLastPageButton.Enable(!maAssistentFunc.IsFirstPage());
+    mpNextPageButton->Enable(!maAssistentFunc.IsLastPage());
+    mpLastPageButton->Enable(!maAssistentFunc.IsFirstPage());
 
     sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage();
 
@@ -1096,12 +1045,12 @@ void AssistentDlgImpl::ChangePage()
 
     UpdatePage();
 
-    if( maNextPageButton.IsEnabled() )
+    if( mpNextPageButton->IsEnabled() )
     {
-      maNextPageButton.ForceFocusEventBroadcast();
+      mpNextPageButton->ForceFocusEventBroadcast();
     }
     else
-        maFinishButton.GrabFocus();
+        mpFinishButton->GrabFocus();
 }
 
 void AssistentDlgImpl::UpdatePage()
@@ -1148,7 +1097,7 @@ void AssistentDlgImpl::UpdatePage()
     case 3:
         {
             if(GetStartType() != ST_TEMPLATE)
-                maNextPageButton.Enable(false);
+                mpNextPageButton->Enable(false);
 
             bool bKiosk = mpPage3PresTypeKioskRB->IsChecked();
             mpPage3PresTimeFT->Enable(bKiosk);
@@ -1210,7 +1159,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewHdl)
                     mpPage3EffectLB->applySelected(pPage);
             }
         }
-        maPreview.startPreview();
+        mpPreview->startPreview();
     }
     return 0;
 }
@@ -1218,9 +1167,9 @@ IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewHdl)
 IMPL_LINK_NOARG(AssistentDlgImpl, PreviewFlagHdl)
 
 {
-    if( maPreviewFlag.IsChecked() != mbPreview )
+    if( mpPreviewFlag->IsChecked() != mbPreview )
     {
-        mbPreview = maPreviewFlag.IsChecked();
+        mbPreview = mpPreviewFlag->IsChecked();
         UpdatePreview(true);
     }
     return 0;
@@ -1322,7 +1271,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl)
 {
     if (maDocFile.isEmpty())
     {
-        maNextPageButton.Enable(false);
+        mpNextPageButton->Enable(false);
     }
 
     bool bKiosk = mpPage3PresTypeKioskRB->IsChecked();
@@ -1485,8 +1434,8 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
 
     if(!mbPreview && bDocPreview)
     {
-        maPreview.Invalidate();
-        maPreview.SetObjectShell(0);
+        mpPreview->Invalidate();
+        mpPreview->SetObjectShell(0);
         mbPreviewUpdating = false;
         return;
     }
@@ -1627,10 +1576,10 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
         UpdateUserData();
 
     if ( !xDocShell.Is() || !mbPreview )
-        maPreview.SetObjectShell( 0 );
+        mpPreview->SetObjectShell( 0 );
     else
     {
-        maPreview.SetObjectShell( xDocShell, mnShowPage );
+        mpPreview->SetObjectShell( xDocShell, mnShowPage );
     }
 
     mbPreviewUpdating = false;
@@ -1820,15 +1769,13 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL)
 
 
 AssistentDlg::AssistentDlg(Window* pParent, bool bAutoPilot) :
-    ModalDialog(pParent,SdResId(DLG_ASS))
+    ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui")
 {
     Link aFinishLink = LINK(this,AssistentDlg, FinishHdl);
     mpImpl = new AssistentDlgImpl( this, aFinishLink, bAutoPilot );
 
     // button assigmnent
-    mpImpl->maFinishButton.SetClickHdl(LINK(this,AssistentDlg,FinishHdl));
-
-    FreeResource();
+    mpImpl->mpFinishButton->SetClickHdl(LINK(this,AssistentDlg,FinishHdl));
 }
 
 IMPL_LINK_NOARG(AssistentDlg, FinishHdl)
@@ -1911,7 +1858,7 @@ OUString AssistentDlg::GetDocPath() const
 
 bool AssistentDlg::GetStartWithFlag() const
 {
-    return !mpImpl->maStartWithFlag.IsChecked();
+    return !mpImpl->mpStartWithFlag->IsChecked();
 }
 
 bool AssistentDlg::IsDocEmpty() const
@@ -1930,13 +1877,14 @@ uno::Sequence< beans::NamedValue > AssistentDlg::GetPassword()
 
 //===== NextButton ============================================================
 
-NextButton::NextButton (::Window* pParent, const ResId& rResId)
-    : maNextButton1(pParent, rResId),
-      maNextButton2(pParent, rResId),
+NextButton::NextButton (::Window* pParent) :
       mbIsFirstButtonActive(true)
 {
+    AssistentDlg* assDlg = static_cast<AssistentDlg*>(pParent);
+    assDlg->get(mpNextButton1, "nextPage1Button");
+    assDlg->get(mpNextButton2, "nextPage2Button");
     // Hide the unused button.
-    maNextButton2.Hide();
+    mpNextButton2->Hide();
 }
 
 
@@ -1948,16 +1896,16 @@ void NextButton::ForceFocusEventBroadcast (void)
     if (mbIsFirstButtonActive)
     {
         mbIsFirstButtonActive = false;
-        maNextButton2.Show();
-        maNextButton2.GrabFocus();
-        maNextButton1.Hide();
+        mpNextButton2->Show();
+        mpNextButton2->GrabFocus();
+        mpNextButton1->Hide();
     }
     else
     {
         mbIsFirstButtonActive = true;
-        maNextButton1.Show();
-        maNextButton1.GrabFocus();
-        maNextButton2.Hide();
+        mpNextButton1->Show();
+        mpNextButton1->GrabFocus();
+        mpNextButton2->Hide();
     }
 }
 
@@ -1968,8 +1916,8 @@ void NextButton::SetClickHdl (const Link& rLink)
 {
     // Forward the setting of the click handler to the two buttons
     // regardless of which one is currently visible.
-    maNextButton1.SetClickHdl(rLink);
-    maNextButton2.SetClickHdl(rLink);
+    mpNextButton1->SetClickHdl(rLink);
+    mpNextButton2->SetClickHdl(rLink);
 }
 
 
@@ -1979,7 +1927,7 @@ bool NextButton::IsEnabled (void)
 {
     // Because the buttons are both either enabled or disabled, it is
     // sufficient to ask one to determine the state.
-    return maNextButton1.IsEnabled();
+    return mpNextButton1->IsEnabled();
 }
 
 
@@ -1988,8 +1936,8 @@ bool NextButton::IsEnabled (void)
 void NextButton::Enable (bool bEnable)
 {
     // Enable or disable both buttons but do not change visibility or focus.
-    maNextButton1.Enable(bEnable);
-    maNextButton2.Enable(bEnable);
+    mpNextButton1->Enable(bEnable);
+    mpNextButton2->Enable(bEnable);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
deleted file mode 100644
index fbe6a30..0000000
--- a/sd/source/ui/dlg/dlgass.src
+++ /dev/null
@@ -1,572 +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 "dlgass.hrc"
-#include "helpids.h"
-ModalDialog DLG_ASS
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 272 , 190 ) ;
-    Text[ en-US ] = "Presentation Wizard";
-
-    HelpId = HID_SD_AUTOPILOT_PAGE1 ;
-    Moveable = TRUE ;
-    Closeable = FALSE;
-
-    Control CT_PREVIEW
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 144 , 40  ) ;
-        Size = MAP_APPFONT ( 122 , 96 ) ;
-        SVLook = FALSE ;
-    };
-
-    CheckBox CB_PREVIEW
-    {
-        HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW";
-        Pos = MAP_APPFONT ( 144 , 140  );
-        Size = MAP_APPFONT ( 122 , 10 );
-        TabStop = TRUE;
-        Text [ en-US ] = "Previe~w";
-    };
-
-    CheckBox CB_STARTWITH
-    {
-        HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH";
-        Pos = MAP_APPFONT ( 144 , 154  );
-        Size = MAP_APPFONT ( 122 , 10 );
-        TabStop = TRUE;
-        Text [ en-US ] = "~Do not show this wizard again" ;
-    };
-
-    // page 1
-
-    FixedBitmap FB_PAGE1
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass1.bmp" ; };
-    };
-
-    FixedLine FL_PAGE1_ARTGROUP
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 6 , 37  );
-        Size =MAP_APPFONT ( 132 , 8 );
-        Text [ en-US ] = "Type";
-    };
-
-    RadioButton RB_PAGE1_EMPTY
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY";
-        Pos = MAP_APPFONT ( 12 , 48  );
-        Size = MAP_APPFONT ( 130 , 10 );
-        TabStop = TRUE;
-        Text [ en-US ] = "~Empty presentation";
-    };
-
-    RadioButton RB_PAGE1_TEMPLATE
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE";
-        Pos = MAP_APPFONT ( 12 , 62  );
-        Size = MAP_APPFONT ( 130 , 10 );
-        Text [ en-US ] = "~From template";
-    };
-
-    RadioButton RB_PAGE1_OPEN
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN";
-        Pos = MAP_APPFONT ( 12 , 76  );
-        Size = MAP_APPFONT ( 130 , 10 );
-        Text [ en-US ] = "O~pen existing presentation";
-    };
-
-    PushButton PB_PAGE1_OPEN
-    {
-        HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 18 , 89 ) ;
-        Size = MAP_APPFONT ( 50 , 18 ) ;
-        TabStop = TRUE ;
-    };
-
-    ListBox LB_PAGE1_REGION
-    {
-        Pos = MAP_APPFONT ( 12 , 90  );
-        Size = MAP_APPFONT ( 120 , 12 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-        HelpId = HID_SD_AUTOPILOT_REGION ;
-    };
-
-    ListBox LB_PAGE1_TEMPLATES
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 106  ) ;
-        Size = MAP_APPFONT ( 120 , 59 ) ;
-        HelpId = HID_SD_AUTOPILOT_TEMPLATES ;
-    };
-
-    ListBox LB_PAGE1_OPEN
-    {
-        Pos = MAP_APPFONT ( 18 , 110  );
-        Size = MAP_APPFONT ( 120 , 55 );
-        TabStop = TRUE;
-        Border = TRUE;
-        HelpId = HID_SD_AUTOPILOT_OPEN ;
-        AutoHScroll = TRUE;
-    };
-
-    // page 2
-    FixedBitmap FB_PAGE2
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass2.bmp" ; };
-    };
-
-    FixedLine FL_PAGE2_LAYOUT
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 37  ) ;
-        Size = MAP_APPFONT ( 132 , 8 ) ;
-        Text [ en-US ] = "~Select a slide design" ;
-    };
-
-    ListBox LB_PAGE2_REGION
-    {
-        Pos = MAP_APPFONT ( 12 , 48  );
-        Size = MAP_APPFONT ( 120 , 12 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-        HelpId = HID_SD_AUTOPILOT_PAGETEMPLATES ;
-    };
-
-    ListBox LB_PAGE2_LAYOUT
-    {
-        HelpID = "sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 64  ) ;
-        Size = MAP_APPFONT ( 120 , 40 ) ;
-    };
-
-    FixedLine FL_PAGE2_OUTPUTTYPES
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 110  ) ;
-        Size = MAP_APPFONT ( 132 , 8 ) ;
-        Text [ en-US ] = "Select an output medium" ;
-    };
-
-    RadioButton RB_PAGE2_MEDIUM5
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 121  );
-        Size = MAP_APPFONT ( 59 , 10 );
-        Text [ en-US ] = "~Original";
-    };
-
-    RadioButton RB_PAGE2_MEDIUM1
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 121  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
-        Text [ en-US ] = "Sc~reen";
-    };
-
-    RadioButton RB_PAGE2_MEDIUM2
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 135  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Sli~de" ;
-    };
-
-    RadioButton RB_PAGE2_MEDIUM3
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 135  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "O~verhead sheet" ;
-    };
-
-    RadioButton RB_PAGE2_MEDIUM4
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 149  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "P~aper" ;
-    };
-
-    RadioButton RB_PAGE2_MEDIUM6
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM6";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 149  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "W~idescreen" ;
-    };
-
-    // page 3
-    FixedBitmap FB_PAGE3
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass3.bmp" ; };
-    };
-
-    FixedLine FL_PAGE3_EFFECT
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 37  );
-        Size = MAP_APPFONT ( 132 , 8 );
-        Text [ en-US ] = "Select a slide transition";
-    };
-
-    FixedText FT_PAGE3_EFFECT
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 49  );
-        Size = MAP_APPFONT ( 60 , 10 );
-        Text [ en-US ] = "~Effect";
-    };
-
-    ListBox LB_PAGE3_EFFECT
-    {
-        HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 48  );
-        Size = MAP_APPFONT ( 60 , 12 );
-        TabStop = TRUE;
-        Border = TRUE;
-        DropDown = TRUE;
-    };
-
-    FixedText FT_PAGE3_SPEED
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 65  );
-        Size = MAP_APPFONT ( 60 , 10 );
-        Text [ en-US ] = "~Speed";
-    };
-
-    ListBox LB_PAGE3_SPEED
-    {
-        HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_SPEED";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 64  );
-        Size = MAP_APPFONT ( 60 , 12 );
-        TabStop = TRUE;
-        Border = TRUE;
-        DropDown = TRUE;
-    };
-
-    FixedLine FL_PAGE3_PRESTYPE
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 6 , 83  );
-        Size = MAP_APPFONT ( 132 , 8 );
-        Text [ en-US ] = "Select the presentation type";
-    };
-
-    RadioButton RB_PAGE3_LIVE
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 94  );
-        Size = MAP_APPFONT ( 120 , 10 );
-        Text [ en-US ] = "~Default";
-    };
-
-    RadioButton RB_PAGE3_KIOSK
-    {
-        HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 108  );
-        Size = MAP_APPFONT ( 120 , 10 );
-        Text [ en-US ] = "~Automatic";
-    };
-
-    FixedText FT_PAGE3_TIME
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 21 , 123  );
-        Size = MAP_APPFONT ( 55 , 10 );
-        Text [ en-US ] = "D~uration of page";
-    };
-
-    TimeField TMF_PAGE3_TIME
-    {
-        HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_TIME";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 77 , 122  ) ;
-        Size = MAP_APPFONT ( 55 , 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 ;
-        };
-    };
-
-    FixedText FT_PAGE3_BREAK
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 21 , 139  );
-        Size = MAP_APPFONT ( 55 , 10 );
-        Text [ en-US ] = "Du~ration of pause";
-    };
-
-    TimeField TMF_PAGE3_BREAK
-    {
-        HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 77 , 138  ) ;
-        Size = MAP_APPFONT ( 55 , 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 ;
-        };
-    };
-
-    CheckBox CB_PAGE3_LOGO
-    {
-        HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 21 , 154  );
-        Size = MAP_APPFONT ( 111 , 10 );
-        TabStop = TRUE;
-        Text [ en-US ] = "Sh~ow logo";
-    };
-
-    // page 4
-    FixedBitmap FB_PAGE4
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass4.bmp" ; };
-    };
-
-    FixedLine FL_PAGE4_PERSONAL
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 37  );
-        Size = MAP_APPFONT ( 260 , 8 );
-        Text [ en-US ] = "Describe your basic ideas" ;
-    };
-
-    FixedText FT_PAGE4_ASKNAME
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 48 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "What is your name or the name of your company?" ;
-
-    };
-    Edit EDT_PAGE4_ASKNAME
-    {
-        HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME";
-        OutputSize = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
-        Size = MAP_APPFONT ( 248 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_PAGE4_ASKTOPIC
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "What is the subject of your presentation?" ;
-    };
-    Edit EDT_PAGE4_ASKTOPIC
-    {
-        HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC";
-        OutputSize = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 88 ) ;
-        Size = MAP_APPFONT ( 248 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_PAGE4_ASKINFORMATION
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 106 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Further ideas to be presented?" ;
-    };
-    MultiLineEdit EDT_PAGE4_ASKINFORMATION
-    {
-        HelpID = "sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION";
-        OutputSize = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 117  ) ;
-        Size = MAP_APPFONT ( 248 , 47 ) ;
-        TabStop = TRUE ;
-        IgnoreTab = TRUE ;
-        VSCROLL = TRUE ;
-    };
-
-    // page 5
-    FixedBitmap FB_PAGE5
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass5.bmp" ; };
-    };
-
-    FixedText FT_PAGE5_PAGELIST
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 39 );
-        Size = MAP_APPFONT ( 132 , 8 );
-        Text [ en-US ] = "Ch~oose your pages";
-    };
-
-    Control CT_PAGE5_PAGELIST
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 50 );
-        Size = MAP_APPFONT ( 132 , 100 );
-        Border = TRUE;
-        TabStop = TRUE ;
-    };
-
-    CheckBox CB_PAGE5_SUMMARY
-    {
-        HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY";
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 6 , 154  );
-        Size = MAP_APPFONT ( 132 , 10 );
-        TabStop = TRUE ;
-        Text [ en-US ] = "C~reate summary";
-    };
-
-    // general
-    HelpButton BUT_HELP
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    CancelButton BUT_CANCEL
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 59 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    PushButton BUT_LAST
-    {
-        HelpID = "sd:PushButton:DLG_ASS:BUT_LAST";
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "<< ~Back" ;
-    };
-
-    PushButton BUT_NEXT
-    {
-        HelpID = "sd:PushButton:DLG_ASS:BUT_NEXT";
-        DefButton = TRUE ;
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 165 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Next >>" ;
-    };
-
-    OKButton BUT_FINISH
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Create" ;
-    };
-
-    String STR_OPEN
-    {
-        Text [ en-US ] = "~Open";
-    };
-
-    String STR_CREATE
-    {
-        Text [ en-US ] = "~Create" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index a2283ce..9ffff9b 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -25,6 +25,7 @@
 #include "res_bmp.hrc"
 
 #include <vcl/svapp.hxx>
+#include <vcl/builder.hxx>
 #include "svtools/svlbitm.hxx"
 #include "svtools/treelistentry.hxx"
 
@@ -32,8 +33,8 @@
 
 SdPageListControl::SdPageListControl(
     ::Window* pParent,
-    const ResId& rResId )
-    : SvTreeListBox(pParent, rResId)
+    const WinBits nStyle )
+    : SvTreeListBox(pParent, nStyle)
 {
     // add lines to tree listbox
     SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
@@ -48,6 +49,15 @@ SdPageListControl::SdPageListControl(
     SetCheckButtonHdl( LINK(this,SdPageListControl,CheckButtonClickHdl) );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeSdPageListControl(::Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nWinStyle = WB_TABSTOP;
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+    return new SdPageListControl(pParent, nWinStyle);
+}
+
 IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)
 {
     SvTreeList* pTreeModel = GetModel();
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index d3012b9..bb96813 100644
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -35,7 +35,7 @@ private:
     void InsertTitle( SvTreeListEntry* pEntry, const OUString& rTitle );
 
 public:
-    SdPageListControl( Window* pParent, const ResId& rResId );
+    SdPageListControl( Window* pParent, const WinBits nStyle );
     virtual ~SdPageListControl();
 
     void Fill( SdDrawDocument* pDoc );
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index 07608e3..e0fcd21 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/builder.hxx>
 
 #include "strings.hrc"
 #include "dlgctrls.hxx"
@@ -32,9 +33,9 @@ struct FadeEffectLBImpl
     std::vector< TransitionPresetPtr > maPresets;
 };
 
-FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id )
-:   ListBox( pParent, Id ),
-    mpImpl( new FadeEffectLBImpl )
+FadeEffectLB::FadeEffectLB(Window* pParent, WinBits nStyle)
+    : ListBox(pParent, nStyle)
+    , mpImpl(new FadeEffectLBImpl)
 {
 }
 
@@ -66,8 +67,17 @@ void FadeEffectLB::Fill()
     SelectEntryPos(0);
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFadeEffectLB(Window* pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
+
+    bool bDropdown = VclBuilder::extractDropdown(rMap);
 
+    if (bDropdown)
+        nBits |= WB_DROPDOWN;
 
+    return new FadeEffectLB(pParent, nBits);
+}
 
 void FadeEffectLB::applySelected( SdPage* pSlide ) const
 {
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index c939d18..6c15a68 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <fadedef.h>
 #include <vcl/ctrl.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/settings.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
@@ -60,8 +61,19 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage
     updateViewSettings();
 }
 
-SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId )
-: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdDocPreviewWin(Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nWinStyle = 0;
+
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+
+    return new SdDocPreviewWin(pParent, nWinStyle);
+}
+
+SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const WinBits nStyle )
+: Control(pParent, nStyle), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0)
 {
     SetBorderStyle( WINDOW_BORDER_MONO );
     svtools::ColorConfig aColorConfig;
@@ -74,6 +86,11 @@ SdDocPreviewWin::~SdDocPreviewWin()
     delete pMetaFile;
 }
 
+Size SdDocPreviewWin::GetOptimalSize() const
+{
+    return LogicToPixel(Size(122, 96), MAP_APPFONT);
+}
+
 void SdDocPreviewWin::Resize()
 {
     Invalidate();
diff --git a/sd/source/ui/inc/dlgass.hrc b/sd/source/ui/inc/dlgass.hrc
deleted file mode 100644
index d2c1c6d..0000000
--- a/sd/source/ui/inc/dlgass.hrc
+++ /dev/null
@@ -1,83 +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 BUT_FINISH 1
-#define BUT_CANCEL 2
-#define BUT_LAST 3
-#define BUT_NEXT 4
-#define BUT_HELP 5
-#define CT_PREVIEW 6
-#define CB_PREVIEW 7
-#define CB_STARTWITH 8
-
-#define FB_PAGE1            9
-#define FL_PAGE1_ARTGROUP   10
-#define RB_PAGE1_EMPTY      11
-#define RB_PAGE1_TEMPLATE   12
-#define LB_PAGE1_REGION     13
-#define LB_PAGE1_TEMPLATES  14
-#define RB_PAGE1_OPEN       15
-#define LB_PAGE1_OPEN       16
-#define PB_PAGE1_OPEN       17
-
-#define FB_PAGE2                    30
-#define FL_PAGE2_LAYOUT         31
-#define LB_PAGE2_REGION             32
-#define LB_PAGE2_LAYOUT             33
-#define FL_PAGE2_OUTPUTTYPES        34
-#define RB_PAGE2_MEDIUM1            35
-#define RB_PAGE2_MEDIUM2            36
-#define RB_PAGE2_MEDIUM3            37
-#define RB_PAGE2_MEDIUM4            38
-#define RB_PAGE2_MEDIUM5            39
-#define RB_PAGE2_MEDIUM6            66
-
-#define FB_PAGE3                    40
-#define FL_PAGE3_EFFECT         41
-#define FT_PAGE3_EFFECT             42
-#define LB_PAGE3_EFFECT             43
-#define FT_PAGE3_SPEED              44
-#define LB_PAGE3_SPEED              45
-#define FL_PAGE3_PRESTYPE           46
-#define RB_PAGE3_LIVE               47
-#define RB_PAGE3_KIOSK              48
-#define FT_PAGE3_TIME               49
-#define TMF_PAGE3_TIME              50
-#define FT_PAGE3_BREAK              51
-#define TMF_PAGE3_BREAK             52
-#define CB_PAGE3_LOGO               53
-
-#define FB_PAGE4                    20
-#define FL_PAGE4_PERSONAL           21
-#define FT_PAGE4_ASKNAME            22
-#define EDT_PAGE4_ASKNAME           23
-#define FT_PAGE4_ASKTOPIC           24
-#define EDT_PAGE4_ASKTOPIC          25
-#define FT_PAGE4_ASKINFORMATION     26
-#define EDT_PAGE4_ASKINFORMATION    27
-
-#define FB_PAGE5                    60
-#define FT_PAGE5_PAGELIST           61
-#define CT_PAGE5_PAGELIST           62
-#define CB_PAGE5_SUMMARY            63
-
-#define STR_CREATE                  64
-#define STR_OPEN                    65
-#define DLG_ASS 900
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx
index 0ec249b..c4235df 100644
--- a/sd/source/ui/inc/dlgctrls.hxx
+++ b/sd/source/ui/inc/dlgctrls.hxx
@@ -36,8 +36,8 @@ struct FadeEffectLBImpl;
 class SD_DLLPUBLIC FadeEffectLB : public ListBox
 {
 public:
-                                FadeEffectLB( Window* pParent, SdResId Id );
-                                virtual ~FadeEffectLB();
+    FadeEffectLB(Window* pParent, WinBits nStyle);
+    virtual ~FadeEffectLB();
     virtual void                Fill();
 
 /*  void                        selectEffectFromPage( SdPage* pPage ); */
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 4a8efe3..3155bd9 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <vcl/window.hxx>
 #include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
 
 #include <rtl/ref.hxx>
 
@@ -49,6 +50,7 @@ protected:
     rtl::Reference< sd::SlideShow > mxSlideShow;
 
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual Size    GetOptimalSize() const SAL_OVERRIDE;
     static void     CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint );
     void            ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev );
 
@@ -61,7 +63,7 @@ protected:
     void updateViewSettings();
 
 public:
-                    SdDocPreviewWin( Window* pParent, const ResId& rResId );
+                    SdDocPreviewWin( Window* pParent, const WinBits nStyle );
                     virtual ~SdDocPreviewWin();
     void            SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 );
     virtual void    Resize() SAL_OVERRIDE;
diff --git a/sd/uiconfig/simpress/ui/assistentdialog.ui b/sd/uiconfig/simpress/ui/assistentdialog.ui
new file mode 100644
index 0000000..8ba229d
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/assistentdialog.ui
@@ -0,0 +1,1253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkDialog" id="Assistent">
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Presentation Wizard</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="lastPageButton">
+                <property name="label" translatable="yes"><< _Back</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="nextPage1Button">
+                <property name="label" translatable="yes">_Next >></property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="nextPage2Button">
+                <property name="label" translatable="yes">Next >></property>
+                <property name="use_action_appearance">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="no_show_all">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="finishButton">
+                <property name="label" translatable="yes">_Create</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkBox" id="box8">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkImage" id="header1Image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="pixbuf">sd/res/dlgass1.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="header2Image">
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="pixbuf">sd/res/dlgass2.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="header3Image">
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="pixbuf">sd/res/dlgass3.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="header4Image">
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="pixbuf">sd/res/dlgass4.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="header5Image">
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="pixbuf">sd/res/dlgass5.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="page1235Box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkBox" id="box4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkBox" id="page1Box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkFrame" id="frame1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="top_padding">6</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <object class="GtkBox" id="box5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="emptyRadiobutton">
+                                        <property name="label" translatable="yes">_Empty presentation</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">templateRadiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="templateRadiobutton">
+                                        <property name="label" translatable="yes">_From template</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">emptyRadiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="openRadiobutton">
+                                        <property name="label" translatable="yes">O_pen existing presentation</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">emptyRadiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBox" id="regionCombobox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeView" id="templatesTreeview:border">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="margin_top">6</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="treeview-selection"/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="openButton">
+                                        <property name="label" translatable="yes">Open...</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="halign">start</property>
+                                        <property name="margin_left">12</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">5</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeView" id="openTreeview:border">
+                                        <property name="can_focus">True</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="margin_left">12</property>
+                                        <property name="margin_top">6</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">6</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="typeLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Type</property>
+                                <attributes>
+                                  <attribute name="weight" value="semibold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="page2Box">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkFrame" id="frame2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="top_padding">6</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <object class="GtkBox" id="box6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkComboBox" id="page2RegionCombobox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeView" id="layoutTreeview:border">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="treeview-selection2"/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="layout2Label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Select a slide design</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">page2RegionCombobox</property>
+                                <attributes>
+                                  <attribute name="weight" value="semibold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="top_padding">6</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <object class="GtkGrid" id="grid1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="row_spacing">6</property>
+                                    <property name="column_spacing">12</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="medium5Radiobutton">
+                                        <property name="label" translatable="yes">_Original</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">medium3Radiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="medium3Radiobutton">
+                                        <property name="label" translatable="yes">O_verhead sheet</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">medium5Radiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="medium4Radiobutton">
+                                        <property name="label" translatable="yes">P_aper</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">medium5Radiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="medium1Radiobutton">
+                                        <property name="label" translatable="yes">Sc_reen</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">medium5Radiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="medium2Radiobutton">
+                                        <property name="label" translatable="yes">Sli_de</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">medium5Radiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="medium6Radiobutton">
+                                        <property name="label" translatable="yes">W_idescreen</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">medium5Radiobutton</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="outTypesLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Select an output medium</property>
+                                <attributes>
+                                  <attribute name="weight" value="semibold"/>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list