move SvColorDialog to welded arguments

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

2 files changed, 8 insertions, 8 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index cf6d21f88559..538eb71e57bd 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1060,36 +1060,36 @@ IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, ValueSet*, void)
 // Fill the SfxItemSet with the settings of the dialog
 IMPL_LINK( SdPublishingDlg, ColorHdl, Button *, pButton, void)
 {
-    SvColorDialog aDlg(this);
+    SvColorDialog aDlg;
 
     if(pButton == pPage6_Back)
     {
         aDlg.SetColor( m_aBackColor );
-        if(aDlg.Execute() == RET_OK )
+        if(aDlg.Execute(GetFrameWeld()) == RET_OK )
             m_aBackColor = aDlg.GetColor();
     }
     else if(pButton == pPage6_Text)
     {
         aDlg.SetColor( m_aTextColor );
-        if(aDlg.Execute() == RET_OK )
+        if(aDlg.Execute(GetFrameWeld()) == RET_OK )
             m_aTextColor = aDlg.GetColor();
     }
     else if(pButton == pPage6_Link)
     {
         aDlg.SetColor( m_aLinkColor );
-        if(aDlg.Execute() == RET_OK )
+        if(aDlg.Execute(GetFrameWeld()) == RET_OK )
             m_aLinkColor = aDlg.GetColor();
     }
     else if(pButton == pPage6_VLink)
     {
         aDlg.SetColor( m_aVLinkColor );
-        if(aDlg.Execute() == RET_OK )
+        if(aDlg.Execute(GetFrameWeld()) == RET_OK )
             m_aVLinkColor = aDlg.GetColor();
     }
     else if(pButton == pPage6_ALink)
     {
         aDlg.SetColor( m_aALinkColor );
-        if(aDlg.Execute() == RET_OK )
+        if(aDlg.Execute(GetFrameWeld()) == RET_OK )
             m_aALinkColor = aDlg.GetColor();
     }
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index b3c78d89978e..0ab2165262e3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2100,10 +2100,10 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
     {
         //Open a color picker based on SvColorDialog
         ::Color aColor( mnUserPaintColor );
-        SvColorDialog aColorDlg( mpShowWindow);
+        SvColorDialog aColorDlg;
         aColorDlg.SetColor( aColor );
 
-        if (aColorDlg.Execute() )
+        if (aColorDlg.Execute(mpShowWindow->GetFrameWeld()))
         {
             aColor = aColorDlg.GetColor();
             setPenColor(sal_Int32(aColor));