[Libreoffice-commits] .: icon-themes/galaxy sd/source

Fridrich Strba fridrich at kemper.freedesktop.org
Fri Jun 15 06:06:19 PDT 2012


 dev/null                         |binary
 sd/source/filter/html/pubdlg.cxx |  188 +++++++---------------------
 sd/source/filter/html/pubdlg.src |  253 ++++++++++++---------------------------
 sd/source/ui/inc/pubdlg.hrc      |    6 
 sd/source/ui/inc/pubdlg.hxx      |    6 
 5 files changed, 126 insertions(+), 327 deletions(-)

New commits:
commit d7262f4472341cdcb85de414453b67ab0e853627
Author: Rob Snelders <ertai at Obelix.(none)>
Date:   Sun Jun 10 11:53:04 2012 +0200

    fdo#48874 - remove html export dialog artwork
    
    Change-Id: I13266d4edbd48742f3e96ff45fbd4f1c3cd25629

diff --git a/icon-themes/galaxy/sd/res/pubdlg1.png b/icon-themes/galaxy/sd/res/pubdlg1.png
deleted file mode 100644
index e86e892..0000000
Binary files a/icon-themes/galaxy/sd/res/pubdlg1.png and /dev/null differ
diff --git a/icon-themes/galaxy/sd/res/pubdlg2.png b/icon-themes/galaxy/sd/res/pubdlg2.png
deleted file mode 100644
index 676fb37..0000000
Binary files a/icon-themes/galaxy/sd/res/pubdlg2.png and /dev/null differ
diff --git a/icon-themes/galaxy/sd/res/pubdlg3.png b/icon-themes/galaxy/sd/res/pubdlg3.png
deleted file mode 100644
index fdc362b..0000000
Binary files a/icon-themes/galaxy/sd/res/pubdlg3.png and /dev/null differ
diff --git a/icon-themes/galaxy/sd/res/pubdlg4.png b/icon-themes/galaxy/sd/res/pubdlg4.png
deleted file mode 100644
index c1a1fb2..0000000
Binary files a/icon-themes/galaxy/sd/res/pubdlg4.png and /dev/null differ
diff --git a/icon-themes/galaxy/sd/res/pubdlg5.png b/icon-themes/galaxy/sd/res/pubdlg5.png
deleted file mode 100644
index 23043f0..0000000
Binary files a/icon-themes/galaxy/sd/res/pubdlg5.png and /dev/null differ
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index b799fed..bf19bb6 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -72,13 +72,13 @@ using ::rtl::OUString;
 
 extern void InterpolateFixedBitmap( FixedBitmap * pBitmap );
 
-// Kennung fuer die Config Datei mit den Html Einstellungen
+//ID for the config-data with the HTML-settings
 const sal_uInt16 nMagic = (sal_uInt16)0x1977;
 
-// Key fuer die soffice.ini
+// Key for the soffice.ini
 #define KEY_QUALITY     "JPG-EXPORT-QUALITY"
 
-// Die Help Ids der einzelnen Seiten
+// The Help-IDs of the pages
 const char* aPageHelpIds[NOOFPAGES] =
 {
     HID_SD_HTMLEXPORT_PAGE1,
@@ -89,9 +89,7 @@ const char* aPageHelpIds[NOOFPAGES] =
     HID_SD_HTMLEXPORT_PAGE6
 };
 
-// *********************************************************************
-// Diese Klasse enthaelt alle Einstellungen des Html-Export Autopiloten
-// *********************************************************************
+// This class has all the settings for the HTML-export autopilot
 class SdPublishingDesign
 {
 public:
@@ -146,9 +144,7 @@ public:
     friend SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign);
 };
 
-// =====================================================================
-// Default Einstellungen erzeugen
-// =====================================================================
+// load Default-settings
 SdPublishingDesign::SdPublishingDesign()
 {
     m_eMode = PUBLISH_HTML;
@@ -157,7 +153,7 @@ SdPublishingDesign::SdPublishingDesign()
 
     m_eFormat = FORMAT_PNG;
 
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) );
+    String  aFilterConfigPath( "Office.Common/Filter/Graphic/Export/JPG" );
     FilterConfigItem aFilterConfigItem( aFilterConfigPath );
     sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
     m_aCompression = UniString::CreateFromInt32( nCompression );
@@ -194,9 +190,7 @@ SdPublishingDesign::SdPublishingDesign()
     m_bHiddenSlides  = sal_False;
 }
 
-// =====================================================================
-// Vergleicht die Member ohne den Namen zu beachten
-// =====================================================================
+// Compares the values without paying attention to the name
 int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const
 {
     return
@@ -258,9 +252,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const
     );
 }
 
-// =====================================================================
-// Dieses Design aus Stream laden
-// =====================================================================
+// Load the design from the stream
 SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
 {
     SdIOCompat aIO(rIn, STREAM_READ);
@@ -314,12 +306,10 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
     return rIn;
 }
 
-// =====================================================================
-// Dieses Design in Stream speichern
-// =====================================================================
+// Set the design to the stream
 SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
 {
-    // Letzter Parameter ist die aktuelle Versionsnummer des Codes
+    // The last parameter is the versionnumber of the code
     SdIOCompat aIO(rOut, STREAM_WRITE, 0);
 
     // Name
@@ -368,9 +358,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
     return rOut;
 }
 
-// *********************************************************************
-// Dialog zur eingabe eines Namens fuer ein Design
-// *********************************************************************
+// Dialog for the entry of the name of the design
 class SdDesignNameDlg : public ModalDialog
 {
 private:
@@ -385,13 +373,8 @@ public:
     DECL_LINK(ModifyHdl, void *);
 };
 
-// *********************************************************************
-// SdPublishingDlg Methoden
-// *********************************************************************
+// SdPublishingDlg Methods
 
-// =====================================================================
-// Konstruktor des Dialogs
-// =====================================================================
 SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
 :   ModalDialog(pWindow, SdResId( DLG_PUBLISHING ))
 ,   mpButtonSet( new ButtonSet() )
@@ -491,23 +474,16 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
     aNextPageButton.GrabFocus();
 }
 
-// =====================================================================
-// Destruktor
-// =====================================================================
 SdPublishingDlg::~SdPublishingDlg()
 {
     RemovePages();
 }
 
-// =====================================================================
-// Dialog Controls erzeugen und in die Seiten des Assistenten einbinden
-// =====================================================================
+// Generate dialog controls and embed them in the pages
 void SdPublishingDlg::CreatePages()
 {
     // Page 1
     aAssistentFunc.InsertControl(1,
-        pPage1_Bmp = new FixedBitmap(this,SdResId(PAGE1_BMP)));
-    aAssistentFunc.InsertControl(1,
         pPage1_Titel = new FixedLine(this,SdResId(PAGE1_TITEL)));
     aAssistentFunc.InsertControl(1,
         pPage1_NewDesign = new RadioButton(this,SdResId(PAGE1_NEW_DESIGN)));
@@ -523,8 +499,6 @@ void SdPublishingDlg::CreatePages()
 
     // Page 2
     aAssistentFunc.InsertControl(2,
-        pPage2_Bmp = new FixedBitmap(this,SdResId(PAGE2_BMP)));
-    aAssistentFunc.InsertControl(2,
         pPage2_Titel = new FixedLine(this,SdResId(PAGE2_TITEL )));
     aAssistentFunc.InsertControl(2,
         pPage2_Standard = new RadioButton(this,SdResId(PAGE2_STANDARD)));
@@ -586,8 +560,6 @@ void SdPublishingDlg::CreatePages()
 
     // Page 3
     aAssistentFunc.InsertControl(3,
-        pPage3_Bmp = new FixedBitmap(this,SdResId(PAGE3_BMP)));
-    aAssistentFunc.InsertControl(3,
         pPage3_Titel1 = new FixedLine(this,SdResId(PAGE3_TITEL_1)));
     aAssistentFunc.InsertControl(3,
         pPage3_Png = new RadioButton(this,SdResId(PAGE3_PNG)));
@@ -616,9 +588,7 @@ void SdPublishingDlg::CreatePages()
     aAssistentFunc.InsertControl(3,
         pPage3_HiddenSlides = new CheckBox(this,SdResId(PAGE3_HIDDEN_SLIDES)));
 
-    // Seite 4
-    aAssistentFunc.InsertControl(4,
-        pPage4_Bmp = new FixedBitmap(this,SdResId(PAGE4_BMP)));
+    // Page 4
     aAssistentFunc.InsertControl(4,
         pPage4_Titel1 = new FixedLine(this,SdResId(PAGE4_TITEL_1)));
     aAssistentFunc.InsertControl(4,
@@ -641,9 +611,7 @@ void SdPublishingDlg::CreatePages()
         aAssistentFunc.InsertControl(4,
             pPage4_Download = new CheckBox(this,SdResId(PAGE4_DOWNLOAD)));
 
-    // Seite 5
-    aAssistentFunc.InsertControl(5,
-        pPage5_Bmp = new FixedBitmap(this,SdResId(PAGE5_BMP)));
+    // Page 5
     aAssistentFunc.InsertControl(5,
         pPage5_Titel = new FixedLine(this,SdResId(PAGE5_TITEL)));
     aAssistentFunc.InsertControl(5,
@@ -651,9 +619,7 @@ void SdPublishingDlg::CreatePages()
     aAssistentFunc.InsertControl(5,
         pPage5_Buttons = new ValueSet(this,SdResId(PAGE5_BUTTONS)));
 
-    // Seite 6
-    aAssistentFunc.InsertControl(6,
-        pPage6_Bmp = new FixedBitmap(this,SdResId(PAGE6_BMP)));
+    // Page 6
     aAssistentFunc.InsertControl(6,
         pPage6_Titel = new FixedLine(this,SdResId(PAGE6_TITEL)));
     aAssistentFunc.InsertControl(6,
@@ -675,27 +641,15 @@ void SdPublishingDlg::CreatePages()
     aAssistentFunc.InsertControl(6,
         pPage6_Preview = new SdHtmlAttrPreview(this,SdResId(PAGE6_PREVIEW)));
 
-    InterpolateFixedBitmap(pPage1_Bmp);
-
-    InterpolateFixedBitmap(pPage2_Bmp);
     InterpolateFixedBitmap(pPage2_Standard_FB);
     InterpolateFixedBitmap(pPage2_Frames_FB);
     InterpolateFixedBitmap(pPage2_Kiosk_FB);
     InterpolateFixedBitmap(pPage2_WebCast_FB);
-
-    InterpolateFixedBitmap(pPage3_Bmp);
-    InterpolateFixedBitmap(pPage4_Bmp);
-
-    InterpolateFixedBitmap(pPage5_Bmp);
-    InterpolateFixedBitmap(pPage6_Bmp);
 }
 
-// =====================================================================
-// Dialog Controls wieder entfernen
-// =====================================================================
+// Delete the controls of the dialog
 void SdPublishingDlg::RemovePages()
 {
-    delete pPage1_Bmp;
     delete pPage1_Titel;
     delete pPage1_NewDesign;
     delete pPage1_OldDesign;
@@ -703,7 +657,6 @@ void SdPublishingDlg::RemovePages()
     delete pPage1_DelDesign;
     delete pPage1_Desc;
 
-    delete pPage2_Bmp;
     delete pPage2_Titel;
     delete pPage2_Standard;
     delete pPage2_Frames;
@@ -737,7 +690,6 @@ void SdPublishingDlg::RemovePages()
     delete pPage2_Duration;
     delete pPage2_Endless;
 
-    delete pPage3_Bmp;
     delete pPage3_Titel1;
     delete pPage3_Png;
     delete pPage3_Gif;
@@ -753,7 +705,6 @@ void SdPublishingDlg::RemovePages()
     delete pPage3_SldSound;
     delete pPage3_HiddenSlides;
 
-    delete pPage4_Bmp;
     delete pPage4_Titel1;
     delete pPage4_Author_txt;
     delete pPage4_Author;
@@ -766,12 +717,10 @@ void SdPublishingDlg::RemovePages()
     if(m_bImpress)
         delete pPage4_Download;
 
-    delete pPage5_Bmp;
     delete pPage5_Titel;
     delete pPage5_TextOnly;
     delete pPage5_Buttons;
 
-    delete pPage6_Bmp;
     delete pPage6_Titel;
     delete pPage6_Default;
     delete pPage6_User;
@@ -784,9 +733,7 @@ void SdPublishingDlg::RemovePages()
     delete pPage6_Preview;
 }
 
-// =====================================================================
-// Dialog mit defaultwerten initialisieren
-// =====================================================================
+// Initialize dialog with default-values
 void SdPublishingDlg::SetDefaults()
 {
     SdPublishingDesign aDefault;
@@ -797,9 +744,7 @@ void SdPublishingDlg::SetDefaults()
     UpdatePage();
 }
 
-// =====================================================================
-// Das SfxItemSet mit den Einstellungen des Dialogs fuettern
-// =====================================================================
+// Feed the SfxItemSet with the settings of the dialog
 void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
 {
     std::vector< PropertyValue > aProps;
@@ -961,9 +906,6 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
         aProps.push_back( aValue );
     }
 
-    // Seite 6
-
-
     rParams.realloc( aProps.size() );
     PropertyValue* pParams = rParams.getArray();
 
@@ -973,14 +915,12 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
     }
 }
 
-// =====================================================================
-// Clickhandler fuer die Radiobuttons zur Designauswahl
-// =====================================================================
+// Clickhandler for the radiobuttons of the design-selection
 IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
 {
     if(pButton == pPage1_NewDesign)
     {
-        pPage1_NewDesign->Check(sal_True); // wegen DesignDeleteHdl
+        pPage1_NewDesign->Check(sal_True); // because of DesignDeleteHdl
         pPage1_OldDesign->Check(sal_False);
         pPage1_Designs->Disable();
         pPage1_DelDesign->Disable();
@@ -1000,7 +940,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
 
         sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
         m_pDesign = &m_aDesignList[nPos];
-        DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)");
+        DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)");
 
         if(m_pDesign)
             SetDesign(m_pDesign);
@@ -1009,14 +949,12 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer die auswahl eines Designs
-// =====================================================================
+// Clickhandler for the choise of one design
 IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
 {
     sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
     m_pDesign = &m_aDesignList[nPos];
-    DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)");
+    DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)");
 
     if(m_pDesign)
         SetDesign(m_pDesign);
@@ -1026,16 +964,14 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer das loeschen eines Designs
-// =====================================================================
+// Clickhandler for the delete of one design
 IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl)
 {
     sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
 
     boost::ptr_vector<SdPublishingDesign>::iterator iter = m_aDesignList.begin()+nPos;
 
-    DBG_ASSERT(iter != m_aDesignList.end(), "Kein Design? Das darf nicht sein! (CL)");
+    DBG_ASSERT(iter != m_aDesignList.end(), "No Design? That's not allowed (CL)");
 
     pPage1_Designs->RemoveEntry(nPos);
 
@@ -1051,9 +987,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl)
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer das �ndern des Servertyps
-// =====================================================================
+// Clickhandler for the other servertypess
 IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton )
 {
     sal_Bool bASP = pButton == pPage2_ASP;
@@ -1065,9 +999,7 @@ IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton )
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer die Radiobuttons der Auswahl des Grafikformates
-// =====================================================================
+// Clickhandler for the Radiobuttons of the graphicformat choice
 IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton )
 {
     pPage3_Png->Check( pButton == pPage3_Png );
@@ -1077,9 +1009,7 @@ IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton )
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer die Radiobuttons Stanrard/Frames
-// =====================================================================
+// Clickhandler for the Radiobuttons Standard/Frames
 IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl)
 {
     UpdatePage();
@@ -1087,9 +1017,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl)
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer die CheckBox der Titelseite
-// =====================================================================
+// Clickhandler for the Checkbox of the Title page
 IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl)
 {
     if(pPage2_Content->IsChecked())
@@ -1111,9 +1039,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl)
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer die Radiobuttons Aufloesung
-// =====================================================================
+// Clickhandler for the Resolution Radiobuttons
 IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton )
 {
     pPage3_Resolution_1->Check(pButton == pPage3_Resolution_1);
@@ -1123,19 +1049,15 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton )
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer das ValueSet mit den Bitmap Schaltflaechen
-// =====================================================================
+// Clickhandler for the ValueSet with the bitmap-buttons
 IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl)
 {
-    // wird eine Bitmap Schaltflaeche gewaehlt, TexOnly ausschalten
+    // if one bitmap-button is chosen, then disable TextOnly
     pPage5_TextOnly->Check(sal_False);
     return 0;
 }
 
-// =====================================================================
-// Das SfxItemSet mit den Einstellungen des Dialogs fuettern
-// =====================================================================
+// Fill the SfxItemSet with the settings of the dialog
 IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton)
 {
     SvColorDialog aDlg(this);
@@ -1184,12 +1106,10 @@ IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl)
     return 0;
 }
 
-// =====================================================================
-// Clickhandler fuer den Ok Button
-// =====================================================================
+// Clickhandler for the Ok Button
 IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
 {
-    //Ende
+    //End
     SdPublishingDesign* pDesign = new SdPublishingDesign();
     GetDesign(pDesign);
 
@@ -1197,7 +1117,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
 
     if(pPage1_OldDesign->IsChecked() && m_pDesign)
     {
-        // aenderungen??
+        // are there changes?
         if(!(*pDesign == *m_pDesign))
             bSave = sal_True;
     }
@@ -1262,9 +1182,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
     return 0;
 }
 
-// =====================================================================
-// Refresh des Dialogs beim wechsel der Seite
-// =====================================================================
+// Refresh the dialogs when changing from pages
 void SdPublishingDlg::ChangePage()
 {
     int nPage = aAssistentFunc.GetCurrentPage();
@@ -1433,9 +1351,7 @@ void SdPublishingDlg::LoadPreviewButtons()
     }
 }
 
-// =====================================================================
-// Clickhandler fuer den Weiter Button
-// =====================================================================
+// Clickhandler for the Forward Button
 IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl)
 {
     aAssistentFunc.NextPage();
@@ -1443,9 +1359,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl)
     return 0;
 }
 
-// =====================================================================
-// Setzt die Controlls im Dialog gemaess den Einstellungen im Design
-// =====================================================================
+// Sets the Controlls in the dialog to the settings in the design
 void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign )
 {
     if(!pDesign)
@@ -1525,9 +1439,7 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign )
     UpdatePage();
 }
 
-// =====================================================================
-// Uebertraegt den Status der Dialog Controlls in das Design
-// =====================================================================
+// Transfer the status of the Design Dialog Controls
 void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
 {
     if(!pDesign)
@@ -1586,9 +1498,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
     pDesign->m_bEndless = pPage2_Endless->IsChecked();
 }
 
-// =====================================================================
-// Clickhandler fuer den Zurueck Button
-// =====================================================================
+// Clickhandler for the back Button
 IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl)
 {
     aAssistentFunc.PreviousPage();
@@ -1596,9 +1506,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl)
     return 0;
 }
 
-// =====================================================================
-// Designs laden
-// =====================================================================
+// Load Designs
 sal_Bool SdPublishingDlg::Load()
 {
     m_bDesignListDirty = sal_False;
@@ -1651,9 +1559,7 @@ sal_Bool SdPublishingDlg::Load()
     return( pStream->GetError() == SVSTREAM_OK );
 }
 
-// =====================================================================
-// Designs speichern
-// =====================================================================
+// Save Designs
 sal_Bool SdPublishingDlg::Save()
 {
     INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
@@ -1669,7 +1575,7 @@ sal_Bool SdPublishingDlg::Save()
     sal_uInt16 aCheck = nMagic;
     *pStream << aCheck;
 
-    // damit SdIOCompat vor dem Stream destruiert wird
+    // Destroys the SdIOCompat before the Stream is being destributed
     {
         SdIOCompat aIO(*pStream, STREAM_WRITE, 0);
 
@@ -1688,9 +1594,7 @@ sal_Bool SdPublishingDlg::Save()
     return( aMedium.GetError() == 0 );
 }
 
-// *********************************************************************
-// SdDesignNameDlg Methoden
-// *********************************************************************
+// SdDesignNameDlg Methods
 SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName):
                 ModalDialog             (pWindow, SdResId( DLG_DESIGNNAME )),
                 m_aEdit                 (this, SdResId(EDT_NAME)),
diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src
index 9aabf8f..5846376 100644
--- a/sd/source/filter/html/pubdlg.src
+++ b/sd/source/filter/html/pubdlg.src
@@ -33,27 +33,14 @@ ModalDialog DLG_PUBLISHING
     HelpID = "sd:ModalDialog:DLG_PUBLISHING";
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 272 , 190 ) ;
+    Size = MAP_APPFONT ( 272 , 161 ) ;
     Text [ en-US ] = "HTML Export" ;
     Moveable = TRUE ;
 
-    /////////////////////////////
     // Page 1, choose a design //
-    /////////////////////////////
-
-    FixedBitmap PAGE1_BMP
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4 ) ;
-        Size = MAP_APPFONT ( 256 , 29 ) ;
-        Fixed = Bitmap { File = "pubdlg1.bmp" ; };
-    };
-
     FixedLine PAGE1_TITEL
     {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
+        Pos = MAP_APPFONT ( 6 , 9 ) ;
         Size = MAP_APPFONT ( 258 , 8 ) ;
         Text [ en-US ] = "Assign design";
     };
@@ -61,7 +48,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE1_NEW_DESIGN
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN";
-        Pos = MAP_APPFONT( 12, 50 );
+        Pos = MAP_APPFONT( 12, 21 );
         Size = MAP_APPFONT( 153, 10 );
         Text [ en-US ] = "New design";
     };
@@ -69,7 +56,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE1_OLD_DESIGN
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN";
-        Pos = MAP_APPFONT( 12, 63 );
+        Pos = MAP_APPFONT( 12, 34 );
         Size = MAP_APPFONT( 153, 10 );
         Text [ en-US ] = "Existing design";
     };
@@ -78,7 +65,7 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 21 , 75 ) ;
+        Pos = MAP_APPFONT ( 21 , 46 ) ;
         Size = MAP_APPFONT ( 144 , 63 ) ;
         TabStop = TRUE ;
         VScroll = TRUE ;
@@ -87,7 +74,7 @@ ModalDialog DLG_PUBLISHING
     PushButton PAGE1_DEL_DESIGN
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN";
-        Pos = MAP_APPFONT ( 168 , 75 ) ;
+        Pos = MAP_APPFONT ( 168 , 46 ) ;
         Size = MAP_APPFONT ( 92 , 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
@@ -96,29 +83,16 @@ ModalDialog DLG_PUBLISHING
 
     FixedText PAGE1_DESC
     {
-        Pos = MAP_APPFONT ( 12 , 142 ) ;
+        Pos = MAP_APPFONT ( 12 , 113 ) ;
         Size = MAP_APPFONT ( 258 , 8 ) ;
         Text [ en-US ] = "Select an existing design or create a new one";
     };
 
 
-    ////////////////////////////////
     // Page 2, type of publishing //
-    ////////////////////////////////
-
-    FixedBitmap PAGE2_BMP
-    {
-        OutputSize = TRUE ;
-        Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4 ) ;
-        Size = MAP_APPFONT ( 256 , 29 ) ;
-        Fixed = Bitmap { File = "pubdlg1.bmp" ; };
-    };
-
     FixedLine PAGE2_TITEL
     {
-        Pos = MAP_APPFONT ( 6, 38 ) ;
+        Pos = MAP_APPFONT ( 6, 9 ) ;
         Size = MAP_APPFONT ( 124, 8 ) ;
         Text [ en-US ] = "Publication type";
     };
@@ -126,7 +100,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_STANDARD
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD";
-        Pos = MAP_APPFONT( 12, 50 );
+        Pos = MAP_APPFONT( 12, 21 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Standard H~TML format";
     };
@@ -134,7 +108,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_FRAMES
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES";
-        Pos = MAP_APPFONT( 12, 63 );
+        Pos = MAP_APPFONT( 12, 34 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Standard HTML with ~frames";
     };
@@ -142,7 +116,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_KIOSK
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK";
-        Pos = MAP_APPFONT( 12, 76 );
+        Pos = MAP_APPFONT( 12, 47 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "~Automatic";
     };
@@ -150,14 +124,14 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_WEBCAST
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST";
-        Pos = MAP_APPFONT( 12, 89 );
+        Pos = MAP_APPFONT( 12, 60 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "~WebCast";
     };
 
     FixedBitmap PAGE2_NOFRAMES_FB
     {
-        Pos = MAP_APPFONT( 21, 102 );
+        Pos = MAP_APPFONT( 21, 73 );
         Scale = TRUE;
         Size = MAP_APPFONT( 60, 50 );
         Fixed = Bitmap { File = "pubdes.bmp"; };
@@ -167,7 +141,7 @@ ModalDialog DLG_PUBLISHING
 
     FixedBitmap PAGE2_FRAMES_FB
     {
-        Pos = MAP_APPFONT( 21, 102 );
+        Pos = MAP_APPFONT( 21, 73 );
         Scale = TRUE;
         Size = MAP_APPFONT( 60, 50 );
         Fixed = Bitmap { File = "pubdes2.bmp"; };
@@ -177,7 +151,7 @@ ModalDialog DLG_PUBLISHING
 
     FixedBitmap PAGE2_KIOSK_FB
     {
-        Pos = MAP_APPFONT( 21, 102 );
+        Pos = MAP_APPFONT( 21, 73 );
         Scale = TRUE;
         Size = MAP_APPFONT( 60, 50 );
         Fixed = Bitmap { File = "pubdes3.bmp"; };
@@ -187,7 +161,7 @@ ModalDialog DLG_PUBLISHING
 
     FixedBitmap PAGE2_WEBCAST_FB
     {
-        Pos = MAP_APPFONT( 21, 102 );
+        Pos = MAP_APPFONT( 21, 73 );
         Scale = TRUE;
         Size = MAP_APPFONT( 60, 50 );
         Fixed = Bitmap { File = "pubdes4.bmp"; };
@@ -195,13 +169,10 @@ ModalDialog DLG_PUBLISHING
         Border = TRUE;
     };
 
-    //////////////////////////////
     // Special options for html //
-    //////////////////////////////
-
     FixedLine PAGE2_TITEL_HTML
     {
-        Pos = MAP_APPFONT( 138, 38 );
+        Pos = MAP_APPFONT( 138, 9 );
         Size = MAP_APPFONT( 128, 8 );
         Text [ en-US ] = "Options";
     };
@@ -209,14 +180,14 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE2_CONTENT
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT";
-        Pos = MAP_APPFONT( 144, 49 );
+        Pos = MAP_APPFONT( 144, 20 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Create title page";
     };
 
     FixedLine PAGE2_VERT
     {
-        Pos = MAP_APPFONT ( 132 , 49  ) ;
+        Pos = MAP_APPFONT ( 132 , 20  ) ;
         Size = MAP_APPFONT ( 4, 109 ) ;
         Vert = TRUE;
     };
@@ -224,18 +195,15 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE2_NOTES
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES";
-        Pos = MAP_APPFONT( 144, 63 );
+        Pos = MAP_APPFONT( 144, 34 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Show notes";
     };
 
-    ///////////////////////////////
     // Special options for kiosk //
-    ///////////////////////////////
-
     FixedLine PAGE2_TITEL_KIOSK
     {
-        Pos = MAP_APPFONT( 138, 38 );
+        Pos = MAP_APPFONT( 138, 9 );
         Size = MAP_APPFONT( 128, 8 );
         Text [ en-US ] = "Advance slides" ;
     };
@@ -243,7 +211,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_CHG_DEFAULT
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT";
-        Pos = MAP_APPFONT ( 144 , 49 ) ;
+        Pos = MAP_APPFONT ( 144 , 20 ) ;
         Size = MAP_APPFONT ( 116 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~As stated in document" ;
@@ -252,7 +220,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_CHG_AUTO
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO";
-        Pos = MAP_APPFONT ( 144 , 63 ) ;
+        Pos = MAP_APPFONT ( 144 , 34 ) ;
         Size = MAP_APPFONT ( 116 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Automatic" ;
@@ -260,7 +228,7 @@ ModalDialog DLG_PUBLISHING
 
     FixedText PAGE2_DURATION_TXT
     {
-        Pos = MAP_APPFONT ( 154, 77 ) ;
+        Pos = MAP_APPFONT ( 154, 48 ) ;
         Size = MAP_APPFONT ( 40, 10 ) ;
         Text [ en-US ] = "~Slide view time:" ;
     };
@@ -268,7 +236,7 @@ ModalDialog DLG_PUBLISHING
     TimeField PAGE2_DURATION_TMF
     {
         HelpID = "sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF";
-        Pos = MAP_APPFONT ( 196, 76 ) ;
+        Pos = MAP_APPFONT ( 196, 47 ) ;
         Size = MAP_APPFONT ( 48, 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
@@ -294,18 +262,15 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE2_ENDLESS
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS";
-        Pos = MAP_APPFONT ( 154, 91 );
+        Pos = MAP_APPFONT ( 154, 62 );
         Size = MAP_APPFONT ( 108, 10 );
         Text [ en-US ] = "~Endless" ;
     };
 
-    /////////////////////////////////
     // Special options for WebCast //
-    /////////////////////////////////
-
     FixedLine PAGE2_TITEL_WEBCAST
     {
-        Pos = MAP_APPFONT( 138, 38 );
+        Pos = MAP_APPFONT( 138, 9 );
         Size = MAP_APPFONT( 128, 8 );
         Text [ en-US ] = "WebCast" ;
     };
@@ -313,7 +278,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_ASP
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP";
-        Pos = MAP_APPFONT( 144, 49 );
+        Pos = MAP_APPFONT( 144, 20 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "~Active Server Pages (ASP)";
     };
@@ -321,14 +286,14 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE2_PERL
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL";
-        Pos = MAP_APPFONT( 144, 63 );
+        Pos = MAP_APPFONT( 144, 34 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Perl" ;
     };
 
     FixedText PAGE2_INDEX_TXT
     {
-        Pos = MAP_APPFONT( 154, 76 );
+        Pos = MAP_APPFONT( 154, 47 );
         Size = MAP_APPFONT( 105, 10 );
         Text [ en-US ] = "~URL for listeners";
     };
@@ -337,14 +302,14 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_INDEX";
         BORDER = TRUE;
-        Pos = MAP_APPFONT( 154, 88 );
+        Pos = MAP_APPFONT( 154, 59 );
         Size  = MAP_APPFONT( 105, 12 );
         Left = TRUE;
     };
 
     FixedText PAGE2_URL_TXT
     {
-        Pos  = MAP_APPFONT( 154, 104 );
+        Pos  = MAP_APPFONT( 154, 75 );
         Size = MAP_APPFONT( 105, 10 );
         Text [ en-US ] = "URL for ~presentation:";
     };
@@ -353,14 +318,14 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_URL";
         BORDER = TRUE;
-        Pos = MAP_APPFONT( 154, 116 );
+        Pos = MAP_APPFONT( 154, 87 );
         Size = MAP_APPFONT( 105, 12 );
         LEFT = TRUE;
     };
 
     FixedText PAGE2_CGI_TXT
     {
-        Pos  = MAP_APPFONT( 154, 132 );
+        Pos  = MAP_APPFONT( 154, 103 );
         Size = MAP_APPFONT( 105, 10 );
         Text [ en-US ] = "URL for ~Perl scripts:";
     };
@@ -369,33 +334,17 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_CGI";
         BORDER = TRUE;
-        Pos = MAP_APPFONT( 154, 144 );
+        Pos = MAP_APPFONT( 154, 115 );
         Size = MAP_APPFONT( 105, 12 );
         LEFT = TRUE;
     };
 
-
-    /////////////////////////////////////////////////////////
     // Page 3, Misc Options, Picture Format and Resolution //
-    /////////////////////////////////////////////////////////
 
-    FixedBitmap PAGE3_BMP
-    {
-        OutputSize = TRUE ;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4 ) ;
-        Size = MAP_APPFONT ( 256 , 29 ) ;
-        Scale = TRUE;
-        Fixed = Bitmap { File = "pubdlg2.bmp" ; };
-    };
-
-    ////////////////////
     // Picture Format //
-    ////////////////////
-
     FixedLine PAGE3_TITEL_1
     {
-        Pos = MAP_APPFONT ( 6, 38 ) ;
+        Pos = MAP_APPFONT ( 6, 9 ) ;
         Size = MAP_APPFONT ( 124, 8 ) ;
         Text [ en-US ] = "Save graphics as";
     };
@@ -403,7 +352,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE3_PNG
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG";
-        Pos = MAP_APPFONT( 12, 49 );
+        Pos = MAP_APPFONT( 12, 20 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "~PNG";
     };
@@ -411,7 +360,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE3_GIF
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF";
-        Pos = MAP_APPFONT( 12, 63 );
+        Pos = MAP_APPFONT( 12, 34 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "~GIF";
     };
@@ -419,7 +368,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE3_JPG
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG";
-        Pos = MAP_APPFONT( 12, 77 );
+        Pos = MAP_APPFONT( 12, 48 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "~JPG";
     };
@@ -427,7 +376,7 @@ ModalDialog DLG_PUBLISHING
     ComboBox PAGE3_QUALITY
     {
         HelpID = "sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY";
-        Pos = MAP_APPFONT( 18, 91 );
+        Pos = MAP_APPFONT( 18, 62 );
         Size = MAP_APPFONT( 28, 70 );
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -435,25 +384,22 @@ ModalDialog DLG_PUBLISHING
 
     FixedText PAGE3_QUALITY_TXT
     {
-        Pos = MAP_APPFONT( 49, 93 );
+        Pos = MAP_APPFONT( 49, 64 );
         Size = MAP_APPFONT( 79, 10 );
         Text [ en-US ] = "Quality";
     };
 
     FixedLine PAGE3_VERT
     {
-        Pos = MAP_APPFONT ( 132 , 49  ) ;
+        Pos = MAP_APPFONT ( 132, 20 ) ;
         Size = MAP_APPFONT ( 4, 65 ) ;
         Vert = TRUE;
     };
 
-    ////////////////
     // Resolution //
-    ////////////////
-
     FixedLine PAGE3_TITEL_2
     {
-        Pos = MAP_APPFONT( 138, 38 );
+        Pos = MAP_APPFONT( 138, 9 );
         Size = MAP_APPFONT( 128, 8 );
         Text [ en-US ] = "Monitor resolution";
     };
@@ -461,7 +407,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE3_RESOLUTION_1
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1";
-        Pos = MAP_APPFONT( 144, 49 );
+        Pos = MAP_APPFONT( 144, 20 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Low resolution (~640x480 pixels)";
     };
@@ -469,7 +415,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE3_RESOLUTION_2
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2";
-        Pos = MAP_APPFONT( 144, 63 );
+        Pos = MAP_APPFONT( 144, 34 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Medium resolution (~800x600 pixels)";
     };
@@ -477,18 +423,15 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE3_RESOLUTION_3
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3";
-        Pos = MAP_APPFONT ( 144, 77 ) ;
+        Pos = MAP_APPFONT ( 144, 48 ) ;
         Size = MAP_APPFONT ( 116 , 10 ) ;
         Text [ en-US ] = "High resolution (~1024x768 pixels)";
     };
 
-    ////////////////
     // Resolution //
-    ////////////////
-
     FixedLine PAGE3_TITEL_3
     {
-        Pos = MAP_APPFONT( 6, 114 );
+        Pos = MAP_APPFONT( 6, 85 );
         Size = MAP_APPFONT( 258, 8 );
         Text [ en-US ] = "Effects";
     };
@@ -496,7 +439,7 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE3_SLD_SOUND
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND";
-        Pos = MAP_APPFONT ( 12, 125 );
+        Pos = MAP_APPFONT ( 12, 96 );
         Size = MAP_APPFONT ( 252, 10 );
         Text [ en-US ] = "~Export sounds when slide advances" ;
     };
@@ -504,34 +447,22 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE3_HIDDEN_SLIDES
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_HIDDEN_SLIDES";
-        Pos = MAP_APPFONT ( 12, 138 );
+        Pos = MAP_APPFONT ( 12, 109 );
         Size = MAP_APPFONT ( 252, 10 );
         Text [ en-US ] = "Export ~hidden slides" ;
     };
 
-    ////////////////////////////////////////
     // Page 4, information for titel page //
-    ////////////////////////////////////////
-
-    FixedBitmap PAGE4_BMP
-    {
-        OutputSize = TRUE ;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4 ) ;
-        Size = MAP_APPFONT ( 256 , 29 ) ;
-        Fixed = Bitmap { File = "pubdlg3.bmp" ; };
-    };
-
     FixedLine PAGE4_TITEL_1
     {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
+        Pos = MAP_APPFONT ( 6 , 9 ) ;
         Size = MAP_APPFONT ( 258 , 8 ) ;
         Text [ en-US ] = "Information for the title page";
     };
 
     FixedText PAGE4_AUTHOR_TXT
     {
-        Pos = MAP_APPFONT ( 12, 51 );
+        Pos = MAP_APPFONT ( 12, 22 );
         Size = MAP_APPFONT ( 121, 8 );
         Text [ en-US ] = "~Author";
     };
@@ -540,14 +471,14 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR";
         BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 136, 49 );
+        Pos = MAP_APPFONT ( 136, 20 );
         Size = MAP_APPFONT ( 128, 12 );
         LEFT = TRUE;
     };
 
     FixedText PAGE4_EMAIL_TXT
     {
-        Pos = MAP_APPFONT ( 12, 67 );
+        Pos = MAP_APPFONT ( 12, 38 );
         Size = MAP_APPFONT ( 121, 8 );
         Text [ en-US ] = "E-~mail address";
     };
@@ -556,14 +487,14 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT";
         BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 136 , 65 ) ;
+        Pos = MAP_APPFONT ( 136 , 36 ) ;
         Size = MAP_APPFONT ( 128 , 12 ) ;
         LEFT = TRUE ;
     };
 
     FixedText PAGE4_WWW_TXT
     {
-        Pos = MAP_APPFONT ( 12, 83 );
+        Pos = MAP_APPFONT ( 12, 54 );
         Size = MAP_APPFONT ( 121, 8 );
         Text [ en-US ] = "Your hom~epage";
     };
@@ -572,14 +503,14 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT";
         BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 136, 81 ) ;
+        Pos = MAP_APPFONT ( 136, 52 ) ;
         Size = MAP_APPFONT ( 128, 12 ) ;
         LEFT = TRUE ;
     };
 
     FixedText PAGE4_TITEL_2
     {
-        Pos = MAP_APPFONT ( 12 , 99 ) ;
+        Pos = MAP_APPFONT ( 12 , 70 ) ;
         Size = MAP_APPFONT ( 121 , 8 ) ;
         Text [ en-US ] = "Additional ~information";
     };
@@ -588,7 +519,7 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 136, 97 ) ;
+        Pos = MAP_APPFONT ( 136, 68 ) ;
         Size = MAP_APPFONT ( 128 , 45 ) ;
         TabStop = TRUE ;
         VScroll = TRUE ;
@@ -598,7 +529,7 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE4_DOWNLOAD
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD";
-        Pos = MAP_APPFONT ( 12 , 149 ) ;
+        Pos = MAP_APPFONT ( 12 , 120 ) ;
         Size = MAP_APPFONT ( 252 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Link to a copy of the ~original presentation";
@@ -607,28 +538,16 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE4_CREATED
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_CREATED";
-        Pos = MAP_APPFONT ( 12 , 152 ) ;
+        Pos = MAP_APPFONT ( 12 , 123 ) ;
         Size = MAP_APPFONT ( 252 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Note: 'Created with %PRODUCTNAME'";
     };
 
-    /////////////////////
     // Page 5, Buttons //
-    /////////////////////
-
-    FixedBitmap PAGE5_BMP
-    {
-        OutputSize = TRUE ;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4 ) ;
-        Size = MAP_APPFONT ( 256 , 29 ) ;
-        Fixed = Bitmap { File = "pubdlg4.bmp" ; };
-    };
-
     FixedLine PAGE5_TITEL
     {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
+        Pos = MAP_APPFONT ( 6 , 9 ) ;
         Size = MAP_APPFONT ( 258 , 8 ) ;
         Text [ en-US ] = "Select button style";
     };
@@ -636,7 +555,7 @@ ModalDialog DLG_PUBLISHING
     CheckBox PAGE5_TEXTONLY
     {
         HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY";
-        Pos = MAP_APPFONT ( 12, 50 );
+        Pos = MAP_APPFONT ( 12, 21 );
         Size = MAP_APPFONT ( 243, 10 );
         Text [ en-US ] = "~Text only";
     };
@@ -645,26 +564,14 @@ ModalDialog DLG_PUBLISHING
     {
         Border = TRUE ;
         TabStop = TRUE;
-        Pos = MAP_APPFONT ( 12, 63 ) ;
+        Pos = MAP_APPFONT ( 12, 34 ) ;
         Size = MAP_APPFONT ( 243, 95 ) ;
     };
 
-    /////////////////////////
     // Page 6, colorscheme //
-    /////////////////////////
-
-    FixedBitmap PAGE6_BMP
-    {
-        OutputSize = TRUE ;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4 ) ;
-        Size = MAP_APPFONT ( 256 , 29 ) ;
-        Fixed = Bitmap { File = "pubdlg5.bmp" ; };
-    };
-
     FixedLine PAGE6_TITEL
     {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
+        Pos = MAP_APPFONT ( 6 , 9 ) ;
         Size = MAP_APPFONT ( 258 , 8 ) ;
         Text [ en-US ] = "Select color scheme";
     };
@@ -672,7 +579,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE6_DOCCOLORS
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS";
-        Pos = MAP_APPFONT( 12, 50 );
+        Pos = MAP_APPFONT( 12, 21 );
         Size = MAP_APPFONT( 246, 10 );
         Text [ en-US ] = "~Apply color scheme from document";
     };
@@ -680,7 +587,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE6_DEFAULT
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT";
-        Pos = MAP_APPFONT( 12, 63 );
+        Pos = MAP_APPFONT( 12, 34 );
         Size = MAP_APPFONT( 246, 10 );
         Text [ en-US ] = "Use ~browser colors";
     };
@@ -688,7 +595,7 @@ ModalDialog DLG_PUBLISHING
     RadioButton PAGE6_USER
     {
         HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_USER";
-        Pos = MAP_APPFONT( 12, 76 );
+        Pos = MAP_APPFONT( 12, 47 );
         Size = MAP_APPFONT( 246, 10 );
         Text [ en-US ] = "~Use custom color scheme";
     };
@@ -696,7 +603,7 @@ ModalDialog DLG_PUBLISHING
     PushButton PAGE6_TEXT
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT";
-        Pos = MAP_APPFONT( 21, 89 );
+        Pos = MAP_APPFONT( 21, 60 );
         Size = MAP_APPFONT( 72, 14 );
         Text [ en-US ] = "Text";
     };
@@ -704,7 +611,7 @@ ModalDialog DLG_PUBLISHING
     PushButton PAGE6_LINK
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_LINK";
-        Pos = MAP_APPFONT( 21, 106 );
+        Pos = MAP_APPFONT( 21, 77 );
         Size = MAP_APPFONT( 72, 14 );
         Text [ en-US ] = "Hyper~link";
     };
@@ -712,7 +619,7 @@ ModalDialog DLG_PUBLISHING
     PushButton PAGE6_ALINK
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK";
-        Pos = MAP_APPFONT( 21, 123 );
+        Pos = MAP_APPFONT( 21, 94 );
         Size = MAP_APPFONT( 72, 14 );
         Text [ en-US ] = "Active Li~nk";
     };
@@ -720,14 +627,14 @@ ModalDialog DLG_PUBLISHING
     PushButton PAGE6_VLINK
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK";
-        Pos = MAP_APPFONT( 21, 140 );
+        Pos = MAP_APPFONT( 21, 111 );
         Size = MAP_APPFONT( 72, 14 );
         Text [ en-US ] = "~Visited Link";
     };
 
     Control PAGE6_PREVIEW
     {
-        Pos = MAP_APPFONT( 96, 89 );
+        Pos = MAP_APPFONT( 96, 60 );
         Size = MAP_APPFONT( 100, 64 );
         Border = TRUE;
     };
@@ -735,16 +642,16 @@ ModalDialog DLG_PUBLISHING
     PushButton PAGE6_BACK
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_BACK";
-        Pos = MAP_APPFONT( 199, 89 );
+        Pos = MAP_APPFONT( 199, 60 );
         Size = MAP_APPFONT( 60, 14 );
         Text [ en-US ] = "Bac~kground";
     };
 
-    // generell
+    // general
 
     FixedLine BOTTOM_LINE
     {
-        Pos = MAP_APPFONT ( 1 , 162 ) ;
+        Pos = MAP_APPFONT ( 1 , 133 ) ;
         Size = MAP_APPFONT ( 272, 4) ;
     };
 
@@ -752,7 +659,7 @@ ModalDialog DLG_PUBLISHING
     {
         HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_LAST";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 170 ) ;
+        Pos = MAP_APPFONT ( 112 , 141 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "<< Back" ;
@@ -763,7 +670,7 @@ ModalDialog DLG_PUBLISHING
         HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_NEXT";
         DefButton = TRUE ;
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 165 , 170 ) ;
+        Pos = MAP_APPFONT ( 165 , 141 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Next >>" ;
@@ -772,7 +679,7 @@ ModalDialog DLG_PUBLISHING
     OKButton BUT_FINISH
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 170 ) ;
+        Pos = MAP_APPFONT ( 218 , 141 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Create" ;
@@ -781,14 +688,14 @@ ModalDialog DLG_PUBLISHING
     CancelButton BUT_CANCEL
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 59 , 170 ) ;
+        Pos = MAP_APPFONT ( 59 , 141 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     HelpButton BUT_HELP
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 170 ) ;
+        Pos = MAP_APPFONT ( 6 , 141 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc
index 8e3c1be..321f0df 100644
--- a/sd/source/ui/inc/pubdlg.hrc
+++ b/sd/source/ui/inc/pubdlg.hrc
@@ -26,7 +26,6 @@
  ************************************************************************/
 
 
-#define PAGE1_BMP           1
 #define PAGE1_TITEL         2
 #define PAGE1_NEW_DESIGN    3
 #define PAGE1_OLD_DESIGN    4
@@ -36,7 +35,6 @@
 
 //////////////////////////////
 
-#define PAGE2_BMP           20
 #define PAGE2_TITEL         21
 #define PAGE2_STANDARD      22
 #define PAGE2_FRAMES        23
@@ -72,7 +70,6 @@
 
 //////////////////////////////
 
-#define PAGE3_BMP           50
 #define PAGE3_TITEL_1       51
 #define PAGE3_PNG           51
 #define PAGE3_GIF           52
@@ -90,7 +87,6 @@
 
 //////////////////////////////
 
-#define PAGE4_BMP           65
 #define PAGE4_TITEL_1       66
 #define PAGE4_AUTHOR_TXT    67
 #define PAGE4_AUTHOR        68
@@ -105,7 +101,6 @@
 
 //////////////////////////////
 
-#define PAGE5_BMP           80
 #define PAGE5_TITEL         81
 #define PAGE5_TEXTONLY      82
 #define PAGE5_BUTTONS       83
@@ -115,7 +110,6 @@
 
 //////////////////////////////
 
-#define PAGE6_BMP           100
 #define PAGE6_TITEL         101
 #define PAGE6_DEFAULT       102
 #define PAGE6_USER          103
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 8407843..db3694b 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -67,7 +67,6 @@ class SdPublishingDlg : public ModalDialog
 {
 private:
     // page 1 controls
-    FixedBitmap*    pPage1_Bmp;
     FixedLine*      pPage1_Titel;
     RadioButton*    pPage1_NewDesign;
     RadioButton*    pPage1_OldDesign;
@@ -76,7 +75,6 @@ private:
     FixedText*      pPage1_Desc;
 
     // page 2 controls
-    FixedBitmap*    pPage2_Bmp;
     FixedLine*      pPage2_Titel;
     RadioButton*    pPage2_Standard;
     RadioButton*    pPage2_Frames;
@@ -109,7 +107,6 @@ private:
     CheckBox*       pPage2_Endless;
 
     // page 3 controls
-    FixedBitmap*    pPage3_Bmp;
     FixedLine*      pPage3_Titel1;
     RadioButton*    pPage3_Png;
     RadioButton*    pPage3_Gif;
@@ -126,7 +123,6 @@ private:
     CheckBox*       pPage3_HiddenSlides;
     // page 4 controls
 
-    FixedBitmap*    pPage4_Bmp;
     FixedLine*      pPage4_Titel1;
     FixedText*      pPage4_Author_txt;
     Edit*           pPage4_Author;
@@ -140,14 +136,12 @@ private:
 
     // page 5 controls
 
-    FixedBitmap*    pPage5_Bmp;
     FixedLine*      pPage5_Titel;
     CheckBox*       pPage5_TextOnly;
     ValueSet*       pPage5_Buttons;
 
     // page 6 controls
 
-    FixedBitmap*    pPage6_Bmp;
     FixedLine*      pPage6_Titel;
     RadioButton*    pPage6_Default;
     RadioButton*    pPage6_User;


More information about the Libreoffice-commits mailing list