[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2021-02-19 Thread Caolán McNamara (via logerrit) 
 sd/inc/bitmaps.hlst |5 
 sd/inc/strings.hrc  |7 
 sd/source/ui/slideshow/slideshowimpl.cxx|  202 
 sd/source/ui/slideshow/slideshowimpl.hxx|2 
 sd/uiconfig/simpress/ui/slidecontextmenu.ui |  120 ++--
 5 files changed, 146 insertions(+), 190 deletions(-)

New commits:
commit e872d77cc0e5dc1571df4559101d0b80e40097c2
Author: Caolán McNamara 
AuthorDate: Fri Feb 19 16:13:36 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 19 21:05:57 2021 +0100

weld slidecontextmenu

Change-Id: Ia3fea3ddf920c45daa244826dffb7effa58c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111238
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 6186abcab3c1..6986085a8992 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -204,6 +204,11 @@
 #define BMP_CUSTOMANIMATION_MEDIA_PAUSE 
"sd/res/breakplayingblue_16.png"
 #define BMP_CUSTOMANIMATION_MEDIA_STOP  
"sd/res/stopplayingblue_16.png"
 
+#define BMP_MENU_NEXT   
"cmd/sc_nextrecord.png"
+#define BMP_MENU_PREV   
"cmd/sc_prevrecord.png"
+#define BMP_MENU_FIRST  
"cmd/sc_firstrecord.png"
+#define BMP_MENU_LAST   
"cmd/sc_lastrecord.png"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index ec8222b8bd15..183324d2679a 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -478,7 +478,12 @@
 
 #define STR_ANIMATION_DIALOG_TITLE  
NC_("STR_ANIMATION_DIALOG_TITLE", "Animation")
 
-#define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
+#define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
+
+#define RID_SVXSTR_MENU_NEXT
NC_("RID_SVXSTR_MENU_NEXT", "~Next")
+#define RID_SVXSTR_MENU_PREV
NC_("RID_SVXSTR_MENU_NEXT", "~Previous")
+#define RID_SVXSTR_MENU_FIRST   
NC_("RID_SVXSTR_MENU_FIRST", "~First Slide")
+#define RID_SVXSTR_MENU_LAST
NC_("RID_SVXSTR_MENU_LAST", "~Last Slide")
 
 #endif
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 22893cf34a3a..b9639f184cb9 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -67,10 +67,12 @@
 #include "PaneHider.hxx"
 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1942,119 +1944,102 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, 
void)
 if( !mbWasPaused )
 pause();
 
-VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), 
"modules/simpress/ui/slidecontextmenu.ui", "");
-VclPtr pMenu(aBuilder.get_menu("menu"));
+std::unique_ptr 
xBuilder(Application::CreateBuilder(nullptr, 
"modules/simpress/ui/slidecontextmenu.ui"));
+std::unique_ptr xMenu(xBuilder->weld_menu("menu"));
+OUString sNextImage(BMP_MENU_NEXT), sPrevImage(BMP_MENU_PREV);
+xMenu->insert(0, "next", SdResId(RID_SVXSTR_MENU_NEXT), , 
nullptr, nullptr, TRISTATE_INDET);
+xMenu->insert(1, "prev", SdResId(RID_SVXSTR_MENU_PREV), , 
nullptr, nullptr, TRISTATE_INDET);
 
 // Adding button to display if in Pen  mode
-pMenu->CheckItem("pen", mbUsePen);
+xMenu->set_active("pen", mbUsePen);
 
 const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
-pMenu->EnableItem(pMenu->GetItemId("next"), 
mpSlideController->getNextSlideIndex() != -1);
-pMenu->EnableItem(pMenu->GetItemId("prev"), 
(mpSlideController->getPreviousSlideIndex() != -1 ) || (eMode == 
SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == 
SHOWWINDOWMODE_BLANK));
-pMenu->EnableItem(pMenu->GetItemId("edit"), 
mpViewShell->GetDoc()->IsStartWithPresentation());
+xMenu->set_visible("next", mpSlideController->getNextSlideIndex() != -1);
+xMenu->set_visible("prev", (mpSlideController->getPreviousSlideIndex() != 
-1 ) || (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || 
(eMode == SHOWWINDOWMODE_BLANK));
+xMenu->set_visible("edit", 
mpViewShell->GetDoc()->IsStartWithPresentation());
 
-PopupMenu* pPageMenu = pMenu->GetPopupMenu(pMenu->GetItemId("goto"));
+std::unique_ptr xPageMenu(xBuilder->weld_menu("gotomenu"));
+OUString sFirstImage(BMP_MENU_FIRST), sLastImage(BMP_MENU_LAST);
+xPageMenu->insert(0, "first", SdResId(RID_SVXSTR_MENU_FIRST), 
, nullptr, nullptr, TRISTATE_INDET);
+xPageMenu->insert(1, "last", SdResId(RID_SVXSTR_MENU_LAST), , 
nullptr, nullptr, TRISTATE_INDET);

[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2020-01-28 Thread Caolán McNamara (via logerrit) 
 sd/inc/strings.hrc  |2 
 sd/source/ui/dlg/animobjs.cxx   |  378 ++---
 sd/source/ui/inc/animobjs.hxx   |   79 +-
 sd/uiconfig/simpress/ui/dockinganimation.ui |  775 
 4 files changed, 580 insertions(+), 654 deletions(-)

New commits:
commit cad2485d924a9f766a8e65379bdcd7a42c0228ee
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 14:29:11 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 20:56:33 2020 +0100

weld AnimationWindow

Change-Id: I66bcd02a5fc98fff4d2fb0fcd24d702ff894d536
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87638
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 9c645f7a6250..3d1d90273395 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -487,6 +487,8 @@
 
 #define STR_SD_NONE NC_("STR_SD_NONE", "- 
None -")
 
+#define STR_ANIMATION_DIALOG_TITLE  
NC_("STR_ANIMATION_DIALOG_TITLE", "Animation")
+
 #define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
 
 #endif
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f2807c71e570..b3f21c63a75a 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -53,13 +54,9 @@ namespace sd {
 /**
  *  SdDisplay - Control
  */
-SdDisplay::SdDisplay(vcl::Window* pWin)
-: Control(pWin, 0)
-, aScale(1, 1)
+SdDisplay::SdDisplay()
+: aScale(1, 1)
 {
-SetMapMode(MapMode(MapUnit::MapPixel));
-const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
-SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
 }
 
 SdDisplay::~SdDisplay()
@@ -80,10 +77,18 @@ void SdDisplay::SetBitmapEx( BitmapEx const * pBmpEx )
 }
 }
 
-void SdDisplay::Paint( vcl::RenderContext& /*rRenderContext*/, const 
::tools::Rectangle& )
+void SdDisplay::Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle&)
 {
+rRenderContext.Push(PushFlags::MAPMODE);
+
+rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
+const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
+rRenderContext.SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
+rRenderContext.Erase();
+
 Point aPt;
-Size aSize = GetOutputSize();
+Size aSize = GetOutputSizePixel();
+
 Size aBmpSize = aBitmapEx.GetBitmap().GetSizePixel();
 aBmpSize.setWidth( static_cast( 
static_cast(aBmpSize.Width()) * static_cast(aScale) ) );
 aBmpSize.setHeight( static_cast( 
static_cast(aBmpSize.Height()) * static_cast(aScale) ) );
@@ -93,7 +98,9 @@ void SdDisplay::Paint( vcl::RenderContext& 
/*rRenderContext*/, const ::tools::Re
 if( aBmpSize.Height() < aSize.Height() )
 aPt.setY( ( aSize.Height() - aBmpSize.Height() ) / 2 );
 
-aBitmapEx.Draw( this, aPt, aBmpSize );
+aBitmapEx.Draw(, aPt, aBmpSize);
+
+rRenderContext.Pop();
 }
 
 void SdDisplay::SetScale( const Fraction& rFrac )
@@ -101,23 +108,12 @@ void SdDisplay::SetScale( const Fraction& rFrac )
 aScale = rFrac;
 }
 
-Size SdDisplay::GetOptimalSize() const
+void SdDisplay::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
-return LogicToPixel(Size(147, 87), MapMode(MapUnit::MapAppFont));
-}
-
-void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
-{
-Control::DataChanged( rDCEvt );
-
-if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && 
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
-{
-const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
-SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
-SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode()
-? sd::OUTPUT_DRAWMODE_CONTRAST
-: sd::OUTPUT_DRAWMODE_COLOR );
-}
+CustomWidgetController::SetDrawingArea(pDrawingArea);
+Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(147, 87), 
MapMode(MapUnit::MapAppFont)));
+pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
+SetOutputSizePixel(aSize);
 }
 
 const size_t AnimationWindow::EMPTY_FRAMELIST = 
std::numeric_limits::max();
@@ -127,37 +123,33 @@ const size_t AnimationWindow::EMPTY_FRAMELIST = 
std::numeric_limits::max
  */
 AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow 
*pCW, vcl::Window* pParent)
 : SfxDockingWindow(pInBindings, pCW, pParent,
-"DockingAnimation", "modules/simpress/ui/dockinganimation.ui")
+"DockingAnimation", "modules/simpress/ui/dockinganimation.ui", true)
+, m_xCtlDisplay(new SdDisplay)
+, m_xCtlDisplayWin(new weld::CustomWeld(*m_xBuilder, "preview", 
*m_xCtlDisplay))
+, m_xBtnFirst(m_xBuilder->weld_button("first"))
+,

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

2020-01-27 Thread Caolán McNamara (via logerrit) 
 sd/UIConfig_simpress.mk   |1 
 sd/inc/strings.hrc|2 
 sd/source/ui/controller/displaymodecontroller.cxx |  147 +-
 sd/uiconfig/simpress/ui/displaywindow.ui  |  134 
 4 files changed, 197 insertions(+), 87 deletions(-)

New commits:
commit f6154457c704f75d37ed216d7ac2dbda8fa0c5c4
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 10:57:31 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 27 20:25:31 2020 +0100

weld DisplayModeToolbarMenu

Change-Id: I210c608d2493c5b8b1ccf32af39c51b144bb45e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87509
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 09d97c63..fe0dcce15873 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/customanimationtexttab \
sd/uiconfig/simpress/ui/customslideshows \
sd/uiconfig/simpress/ui/definecustomslideshow \
+   sd/uiconfig/simpress/ui/displaywindow \
sd/uiconfig/simpress/ui/dlgfield \
sd/uiconfig/simpress/ui/dockinganimation \
sd/uiconfig/simpress/ui/effectmenu \
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index fe3e182f2b2f..9c645f7a6250 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -62,8 +62,6 @@
 #define STR_AUTOLAYOUT_HANDOUT4 
NC_("STR_AUTOLAYOUT_HANDOUT4", "Four Slides")
 #define STR_AUTOLAYOUT_HANDOUT6 
NC_("STR_AUTOLAYOUT_HANDOUT6", "Six Slides")
 #define STR_AUTOLAYOUT_HANDOUT9 
NC_("STR_AUTOLAYOUT_HANDOUT9", "Nine Slides")
-#define STR_DISPLAYMODE_EDITMODES   
NC_("STR_DISPLAYMODE_EDITMODES", "Edit Modes")
-#define STR_DISPLAYMODE_MASTERMODES 
NC_("STR_DISPLAYMODE_MASTERMODES", "Master Modes")
 #define STR_AUTOLAYOUT_NOTES
NC_("STR_AUTOLAYOUT_NOTES", "Notes")
 #define STR_TRANSFORM   NC_("STR_TRANSFORM", 
"Transform")
 #define STR_LINEEND NC_("STR_LINEEND", 
"Line Ends")
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx 
b/sd/source/ui/controller/displaymodecontroller.cxx
index 7fc63d053e4d..1513e543fbb9 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -36,6 +36,7 @@ class DisplayModeController : public 
svt::PopupWindowController
 public:
 explicit DisplayModeController( const css::uno::Reference< 
css::uno::XComponentContext >& rxContext );
 
+virtual std::unique_ptr weldPopupWindow() override;
 virtual VclPtr createVclPopupWindow( vcl::Window* pParent ) 
override;
 
 // XInitialization
@@ -48,22 +49,25 @@ public:
 void setToolboxItemImage(const OUString& rImage);
 };
 
-class DisplayModeToolbarMenu : public svtools::ToolbarMenu
+class DisplayModeToolbarMenu final : public WeldToolbarPopup
 {
 public:
-DisplayModeToolbarMenu( DisplayModeController& rController, vcl::Window* 
pParent );
-virtual ~DisplayModeToolbarMenu() override;
-virtual void dispose() override;
-
-protected:
-DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
-DECL_LINK( SelectValueSetHdl, ValueSet*, void );
-void SelectHdl(void const *);
+DisplayModeToolbarMenu(DisplayModeController* pControl, weld::Widget* 
pParent);
+virtual void GrabFocus() override
+{
+mxDisplayModeSet1->GrabFocus();
+}
 
 private:
-DisplayModeController& mrController;
-VclPtr mpDisplayModeSet1;
-VclPtr mpDisplayModeSet2;
+rtl::Reference mxControl;
+std::unique_ptr mxFrame1;
+std::unique_ptr mxDisplayModeSet1;
+std::unique_ptr mxDisplayModeSetWin1;
+std::unique_ptr mxFrame2;
+std::unique_ptr mxDisplayModeSet2;
+std::unique_ptr mxDisplayModeSetWin2;
+
+DECL_LINK(SelectValueSetHdl, SvtValueSet*, void);
 };
 
 struct snewfoil_value_info
@@ -115,7 +119,7 @@ static const snewfoil_value_info mastermodes[] =
 };
 
 
-static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* 
pInfo )
+static void fillLayoutValueSet(SvtValueSet* pValue, const snewfoil_value_info* 
pInfo)
 {
 Size aLayoutItemSize;
 for( ; pInfo->mnId; pInfo++ )
@@ -130,97 +134,60 @@ static void fillLayoutValueSet( ValueSet* pValue, const 
snewfoil_value_info* pIn
 }
 
 aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize );
-pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) );
-}
+Size aSize(pValue->CalcWindowSizePixel(aLayoutItemSize));
 
-DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& 
rController, vcl::Window* pParent )
-: svtools::ToolbarMenu( rController.getFrameInterface(), pParent, 
WB_CLIPCHILDREN )
-,

[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2018-12-06 Thread Libreoffice Gerrit user 
 sd/inc/pageformatpanel.hrc|   41 ++
 sd/source/ui/sidebar/SlideBackground.cxx  |   21 +++
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui |9 
 3 files changed, 62 insertions(+), 9 deletions(-)

New commits:
commit cc797cd31e99d47db5b2815a0a86c96204a65e62
Author: Xisco Fauli 
AuthorDate: Wed Dec 5 18:54:22 2018 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 6 13:19:42 2018 +0100

tdf#121926: Take metrics into account

Similar to 6d9a2557a0f0366fff169f3c3581414b3cec80bd

Change-Id: Ifecc3f86a3da8fdd4b0535cb67c6315e0d418f5a
Reviewed-on: https://gerrit.libreoffice.org/64645
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
new file mode 100644
index ..23325e26ac2f
--- /dev/null
+++ b/sd/inc/pageformatpanel.hrc
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_SD_INC_PAGEFORMATPANEL_HRC
+#define INCLUDED_SD_INC_PAGEFORMATPANEL_HRC
+
+#define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
+
+// To translators: this is a listbox labelled by "Margins:", inch units
+const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
+{
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"),
+};
+
+// To translators: this is a listbox labelled by "Margins:", cm units
+const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
+{
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index f3ba7365cbfe..e1958c1927ad 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -29,8 +29,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include "PageMarginUtils.hxx"
 #include 
+#include 
 #include "DocumentHelper.hxx"
 #include "MasterPagesSelector.hxx"
 #include 
@@ -152,6 +155,24 @@ SlideBackground::SlideBackground(
 get(mpMasterLabel, "masterlabel");
 get(mpMarginSelectBox, "marginLB");
 
+::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( 
SfxObjectShell::Current() );
+SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
+SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType());
+if (pOptions)
+{
+FieldUnit eMetric = static_cast(pOptions->GetMetric());
+if (IsInch(eMetric))
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
+
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
+}
+else
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i)
+
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
+}
+}
+
 maCustomEntry = get("customlabel")->GetText();
 
 addListener();
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui 
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index aa9183067e8d..256f06935ee4 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -244,15 +244,6 @@
   
 True
 False
-
-  None
-  Narrow
-  Moderate
-  Normal 0.75"
-  Normal 1"
-  Normal 1.25"
-  Wide
-
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2018-04-02 Thread Caolán McNamara 
 sd/inc/sdabstdlg.hxx|2 
 sd/source/ui/dlg/brkdlg.cxx |  106 +---
 sd/source/ui/dlg/sddlgfact.cxx  |   14 
 sd/source/ui/dlg/sddlgfact.hxx  |   11 +++
 sd/source/ui/inc/BreakDlg.hxx   |   53 ++
 sd/source/ui/view/drviews2.cxx  |2 
 sd/uiconfig/sdraw/ui/breakdialog.ui |   33 ---
 7 files changed, 97 insertions(+), 124 deletions(-)

New commits:
commit 50d9f1508709e0849e8ecabfe04ac9281160d9e0
Author: Caolán McNamara 
Date:   Mon Apr 2 12:29:05 2018 +0100

weld Break dialog

Change-Id: I1657a02c775cf08e0888ba4cc9f9ae3b06550020
Reviewed-on: https://gerrit.libreoffice.org/52256
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 9582ea377530..35b7233eea73 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -178,7 +178,7 @@ class SdAbstractDialogFactory
 public:
 SD_DLLPUBLIC static SdAbstractDialogFactory* Create();
 
-virtual VclPtr  CreateBreakDlg(vcl::Window* 
pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong 
nSumActionCount, sal_uLong nObjCount ) = 0;
+virtual VclPtr  CreateBreakDlg(weld::Window* 
pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong 
nSumActionCount, sal_uLong nObjCount ) = 0;
 virtual VclPtrCreateCopyDlg(vcl::Window* 
pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
 virtual VclPtr
CreateSdCustomShowDlg(vcl::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
 virtual VclPtr   
CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, 
SfxObjectShell* pDocShell) = 0;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 724df7d201cb..80e8fb8f6a8f 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -38,59 +38,34 @@ namespace sd {
  * dialog to split metafiles
  */
 
-BreakDlg::BreakDlg(
-vcl::Window* pWindow,
-DrawView* _pDrView,
-DrawDocShell* pShell,
-sal_uLong nSumActionCount,
-sal_uLong nObjCount )
-: SfxModalDialog(pWindow, "BreakDialog", "modules/sdraw/ui/breakdialog.ui")
-, mpProgress( nullptr )
+BreakDlg::BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* 
pShell,
+sal_uLong nSumActionCount, sal_uLong nObjCount)
+: GenericDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui", 
"BreakDialog")
+, m_xFiObjInfo(m_xBuilder->weld_label("metafiles"))
+, m_xFiActInfo(m_xBuilder->weld_label("metaobjects"))
+, m_xFiInsInfo(m_xBuilder->weld_label("drawingobjects"))
+, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+, m_pDrView(pDrView)
+, m_bCancel(false)
 {
 m_aUpdateIdle.SetPriority( TaskPriority::REPAINT );
 m_aUpdateIdle.SetInvokeHandler( LINK( this, BreakDlg, InitialUpdate ) );
 m_aUpdateIdle.SetDebugName( "sd::BreakDlg m_aUpdateIdle" );
 
-get(m_pFiObjInfo, "metafiles");
-get(m_pFiActInfo, "metaobjects");
-get(m_pFiInsInfo, "drawingobjects");
-get(m_pBtnCancel, "cancel");
+m_xBtnCancel->connect_clicked(LINK(this, BreakDlg, CancelButtonHdl));
 
-m_pBtnCancel->SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
+m_xProgress.reset(new SfxProgress(pShell, SdResId(STR_BREAK_METAFILE), 
nSumActionCount*3));
 
-mpProgress = new SfxProgress( pShell, SdResId(STR_BREAK_METAFILE), 
nSumActionCount*3 );
-
-pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) );
+m_xProgrInfo.reset(new SvdProgressInfo(LINK(this, BreakDlg, UpDate)));
 // every action is edited 3 times in DoImport()
-pProgrInfo->Init( nObjCount );
-
-pDrView = _pDrView;
-bCancel = false;
-}
-
-BreakDlg::~BreakDlg()
-{
-disposeOnce();
-}
-
-void BreakDlg::dispose()
-{
-delete mpProgress;
-mpProgress = nullptr;
-delete pProgrInfo;
-pProgrInfo = nullptr;
-m_pFiObjInfo.clear();
-m_pFiActInfo.clear();
-m_pFiInsInfo.clear();
-m_pBtnCancel.clear();
-SfxModalDialog::dispose();
+m_xProgrInfo->Init( nObjCount );
 }
 
 // Control-Handler for cancel button
-IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, Button*, void)
+IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, weld::Button&, void)
 {
-bCancel = true;
-m_pBtnCancel->Disable();
+m_bCancel = true;
+m_xBtnCancel->set_sensitive(false);
 }
 
 /**
@@ -101,73 +76,72 @@ IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, Button*, void)
  */
 IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
 {
-if(pProgrInfo == nullptr)
+if (!m_xProgrInfo)
   return true;
 
 // update status bar or show a error message?
 if(nInit == reinterpret_cast(1))
 {
-std::unique_ptr 
xErrBox(Application::CreateMessageDialog(GetFrameWeld(),
+std::unique_ptr

[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2017-12-07 Thread Yousuf Philips 
 sd/inc/strings.hrc|2 ++
 sd/source/ui/sidebar/SlideBackground.cxx  |6 +++---
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui |6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c5505f5a22917c339af4e4c840a6a1ae20e2503f
Author: Yousuf Philips 
Date:   Wed Dec 6 18:01:03 2017 +0400

tdf#89466 Fix minor localization bugs

Change-Id: I1ee93f81dcd83b5a9277ea444ec8e10db7d790df
Reviewed-on: https://gerrit.libreoffice.org/45958
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 924bc5acdc42..52b5d6796cdd 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -280,7 +280,9 @@
 #define STR_PAGE_NAME   NC_("STR_PAGE_NAME", 
"Page" )
 #define STR_SLIDE_NAME  NC_("STR_SLIDE_NAME", 
"Slide" )
 #define STR_MASTERSLIDE_NAME
NC_("STR_MASTERSLIDE_NAME", "Master Slide")
+#define STR_MASTERSLIDE_LABEL   
NC_("STR_MASTERSLIDE_LABEL", "Master Slide:")
 #define STR_MASTERPAGE_NAME 
NC_("STR_MASTERPAGE_NAME", "Master Page")
+#define STR_MASTERPAGE_LABEL
NC_("STR_MASTERPAGE_LABEL", "Master Page:")
 #define STR_NOTES   NC_("STR_NOTES", 
"(Notes)" )
 #define STR_HANDOUT NC_("STR_HANDOUT", 
"Handouts" )
 #define STR_PRESOBJ_MPTITLE 
NC_("STR_PRESOBJ_MPTITLE", "Click to edit the title text format" )
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 8b2e15dc7671..9c94a208b2cb 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -239,7 +239,7 @@ void SlideBackground::HandleContextChange(
 
 if ( IsImpress() )
 {
-mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
 mpMarginSelectBox->Hide();
 
 if ( maContext == maImpressMasterContext )
@@ -294,7 +294,7 @@ void SlideBackground::HandleContextChange(
 }
 else if ( IsDraw() )
 {
-mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_LABEL));
 }
 }
 
@@ -558,7 +558,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
 }
 else if ( maContext == maImpressNotesContext )
 {
-mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
 ViewShell* pMainViewShell = 
mrBase.GetMainViewShell().get();
 
 if (pMainViewShell)
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui 
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 70bccb25c7c8..55783273dfe7 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -194,7 +194,7 @@
 True
 False
 end
-Orientation: 
+Orientation:
   
   
 0
@@ -209,7 +209,7 @@
 True
 
   
-Master Slide
+Master View
 True
 True
 True
@@ -264,7 +264,7 @@
 True
 False
 end
-Margin: 
+Margin:
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2016-02-03 Thread Bryan Quigley 
 sd/inc/drawdoc.hxx|1 
 sd/source/core/drawdoc.cxx|6 -
 sd/source/ui/dlg/present.cxx  |4 -
 sd/source/ui/func/fusldlg.cxx |8 --
 sd/source/ui/slideshow/slideshow.cxx  |   25 ---
 sd/source/ui/slideshow/slideshowimpl.cxx  |   85 --
 sd/source/ui/view/drviewsd.cxx|   41 ++--
 sd/uiconfig/simpress/ui/presentationdialog.ui |   15 
 8 files changed, 10 insertions(+), 175 deletions(-)

New commits:
commit 2503a1e99df463aef1bf87c94b7b4a8ee3554efe
Author: Bryan Quigley 
Date:   Wed Jan 27 12:19:28 2016 -0500

tdf#96414 Remove showing navigator during slideshow

This isn't very user-friendly and the presenter console
does a much better job of this.

Change-Id: I621863b585d763fb65ed8637c3dab7b7f5ea7aed
Reviewed-on: https://gerrit.libreoffice.org/22062
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 9208e6c..f3a599a 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -126,7 +126,6 @@ namespace sd
 bool mbAnimationAllowed;
 sal_Int32 mnPauseTimeout;
 bool mbShowPauseLogo;
-bool mbStartWithNavigator;
 
 PresentationSettings();
 PresentationSettings( const PresentationSettings& r );
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 6702e9d..62235b5 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -126,8 +126,7 @@ PresentationSettings::PresentationSettings()
 mbFullScreen( true ),
 mbAnimationAllowed( true ),
 mnPauseTimeout( 10 ),
-mbShowPauseLogo( false ),
-mbStartWithNavigator(false)
+mbShowPauseLogo( false )
 {
 }
 
@@ -144,8 +143,7 @@ PresentationSettings::PresentationSettings( const 
PresentationSettings& r )
 mbFullScreen( r.mbFullScreen ),
 mbAnimationAllowed( r.mbAnimationAllowed ),
 mnPauseTimeout( r.mnPauseTimeout ),
-mbShowPauseLogo( r.mbShowPauseLogo ),
-mbStartWithNavigator( r.mbStartWithNavigator )
+mbShowPauseLogo( r.mbShowPauseLogo )
 {
 }
 
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 3fe2206..14ee529 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -58,7 +58,6 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* 
pWindow,
 get( aCbxManuel,"manualslides"  );
 get( aCbxMousepointer,  "pointervisible");
 get( aCbxPen,   "pointeraspen"  );
-get( aCbxNavigator, "navigatorvisible"  );
 get( aCbxAnimationAllowed,  "animationsallowed" );
 get( aCbxChangePage,"changeslidesbyclick"   );
 get( aCbxAlwaysOnTop,   "alwaysontop"   );
@@ -118,7 +117,6 @@ SdStartPresentationDlg::SdStartPresentationDlg( 
vcl::Window* pWindow,
 aCbxManuel->Check( static_cast( rOutAttrs.Get( 
ATTR_PRESENT_MANUEL ) ).GetValue() );
 aCbxMousepointer->Check( static_cast( rOutAttrs.Get( 
ATTR_PRESENT_MOUSE ) ).GetValue() );
 aCbxPen->Check( static_cast( rOutAttrs.Get( 
ATTR_PRESENT_PEN ) ).GetValue() );
-aCbxNavigator->Check( static_cast( rOutAttrs.Get( 
ATTR_PRESENT_NAVIGATOR ) ).GetValue() );
 aCbxAnimationAllowed->Check( static_cast( 
rOutAttrs.Get( ATTR_PRESENT_ANIMATION_ALLOWED ) ).GetValue() );
 aCbxChangePage->Check( static_cast( rOutAttrs.Get( 
ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() );
 aCbxAlwaysOnTop->Check( static_cast( rOutAttrs.Get( 
ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() );
@@ -170,7 +168,6 @@ void SdStartPresentationDlg::dispose()
 aCbxManuel.clear();
 aCbxMousepointer.clear();
 aCbxPen.clear();
-aCbxNavigator.clear();
 aCbxAnimationAllowed.clear();
 aCbxChangePage.clear();
 aCbxAlwaysOnTop.clear();
@@ -301,7 +298,6 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
 rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) );
 rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked() 
) );
 rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) );
-rAttr.Put( SfxBoolItem ( ATTR_PRESENT_NAVIGATOR, 
aCbxNavigator->IsChecked() ) );
 rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED, 
aCbxAnimationAllowed->IsChecked() ) );
 rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE, 
aCbxChangePage->IsChecked() ) );
 rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP, 
aCbxAlwaysOnTop->IsChecked() ) );
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index f3c2f09..8cf501b 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -97,7 +97,6 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
 aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_MANUEL, 
rPresentationSettings.mbManual ) );

[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

2014-06-23 Thread Caolán McNamara 
 sd/inc/helpids.h   |   11 ---
 sd/source/ui/dlg/dlgass.cxx|   28 +++-
 sd/uiconfig/simpress/ui/assistentdialog.ui |   18 +-
 3 files changed, 24 insertions(+), 33 deletions(-)

New commits:
commit 43b0a48596b5ad25dfdb2020a28580a41b7a05f0
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 23 13:36:37 2014 +0100

can't have bare english strings in .cxx

Change-Id: I1a14e37f3362c082bc460895ffd0b949c636b8ea

diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 2641b1a..51421d0 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -24,12 +24,6 @@
 #define HID_SDGRAPHICVIEWSHELL  
SD_HID_SDGRAPHICVIEWSHELL
 #define HID_SDOUTLINEVIEWSHELL  
SD_HID_SDOUTLINEVIEWSHELL
 #define HID_SD_OPTIONS_SNAP 
SD_HID_SD_OPTIONS_SNAP
-#define HID_SD_AUTOPILOT_PAGE1  
SD_HID_SD_AUTOPILOT_PAGE1
-#define HID_SD_AUTOPILOT_PAGE2  
SD_HID_SD_AUTOPILOT_PAGE2
-#define HID_SD_AUTOPILOT_PAGE3  
SD_HID_SD_AUTOPILOT_PAGE3
-#define HID_SD_AUTOPILOT_PAGE4  
SD_HID_SD_AUTOPILOT_PAGE4
-#define HID_SD_AUTOPILOT_PAGE5  
SD_HID_SD_AUTOPILOT_PAGE5
-#define HID_SD_AUTOPILOT_PAGE6  
SD_HID_SD_AUTOPILOT_PAGE6
 #define HID_SD_CBX_ONLYSELECTED 
SD_HID_SD_CBX_ONLYSELECTED
 #define HID_SD_BTN_FILTERDIALOG 
SD_HID_SD_BTN_FILTERDIALOG
 #define HID_SD_BTN_PAGE 
SD_HID_SD_BTN_PAGE
@@ -87,11 +81,6 @@
 
 #define HID_FM_CTL_SELECTION
SD_HID_FM_CTL_SELECTION
 
-#define HID_SD_AUTOPILOT_REGION 
SD_HID_SD_AUTOPILOT_REGION
-#define HID_SD_AUTOPILOT_TEMPLATES  
SD_HID_SD_AUTOPILOT_TEMPLATES
-#define HID_SD_AUTOPILOT_OPEN   
SD_HID_SD_AUTOPILOT_OPEN
-#define HID_SD_AUTOPILOT_PAGETEMPLATES  
SD_HID_SD_AUTOPILOT_PAGETEMPLATES
-
 #define HID_SD_TABBAR_PAGES 
SD_HID_SD_TABBAR_PAGES
 #define HID_SD_TABBAR_LAYERS
SD_HID_SD_TABBAR_LAYERS
 
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 1f919c1..0837eb5 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -77,17 +77,6 @@ using namespace ::sd;
 using ::std::vector;
 
 
-const char* PageHelpIds[] =
-{
-HID_SD_AUTOPILOT_PAGE1,
-HID_SD_AUTOPILOT_PAGE2,
-HID_SD_AUTOPILOT_PAGE3,
-HID_SD_AUTOPILOT_PAGE4,
-HID_SD_AUTOPILOT_PAGE5
-};
-
-
-
 class PasswordEntry
 {
 public:
@@ -260,6 +249,9 @@ public:
 DECL_LINK( SelectEffectHdl, void* );
 DECL_LINK( OpenButtonHdl, Button * );
 
+OUStringmaCreateStr;
+OUStringmaOpenStr;
+
 // Common
 Assistent   maAssistentFunc;
 CheckBox*   mpPreviewFlag;
@@ -353,6 +345,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, 
const Link rFinishLink,
 assDlg-get(mpStartWithFlag, startWithCheckbutton);
 assDlg-get(mpLastPageButton, lastPageButton);
 assDlg-get(mpFinishButton, finishButton);
+maCreateStr = mpFinishButton-GetText();
+maOpenStr = assDlg-getPushButton(open)-GetText();
 assDlg-get(mpPreview, previewControl);
 assDlg-get(mpPage1235, page1235Box);
 mpNextPageButton = new NextButton( pWindow );
@@ -894,9 +888,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
 mpPage1OpenPB-Show(eType == ST_OPEN);
 
 if (eType == ST_OPEN)
-mpFinishButton-SetText(~Open);
+mpFinishButton-SetText(maOpenStr);
 else
-mpFinishButton-SetText(~Create);
+mpFinishButton-SetText(maCreateStr);
 }
 
 StartType AssistentDlgImpl::GetStartType()
@@ -1036,13 +1030,6 @@ void AssistentDlgImpl::ChangePage()
 mpNextPageButton-Enable(!maAssistentFunc.IsLastPage());
 mpLastPageButton-Enable(!maAssistentFunc.IsFirstPage());
 
-sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage();
-
-if( mpWindow )
-{
-mpWindow-SetHelpId( PageHelpIds[nPage-1]);
-}
-
 UpdatePage();
 
 if( mpNextPageButton-IsEnabled() )
@@ -1819,7 +1806,6 @@ AssistentDlg::~AssistentDlg()
 delete mpImpl;
 }
 
-
 SfxObjectShellLock AssistentDlg::GetDocument()
 {
 return mpImpl-GetDocument();
diff --git a/sd/uiconfig/simpress/ui/assistentdialog.ui 
b/sd/uiconfig/simpress/ui/assistentdialog.ui
index 8ba229d..5c1dc0b 100644
--- a/sd/uiconfig/simpress/ui/assistentdialog.ui
+++ b/sd/uiconfig/simpress/ui/assistentdialog.ui
@@ -113,6 +113,22 @@
 property name=position5/property
   /packing
 /child
+child
+