diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-14 21:15:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-16 14:50:22 +0200 |
| commit | 77a59cabf33d5d6ccc80ea62ee07162abc1b4e52 (patch) | |
| tree | 57124d72a996510b4f6ab3f39a3732a9d4dfeff6 /sc | |
| parent | a9a94b744e9d61a3ff56c0b1830a56145607758f (diff) | |
weld SvxPostItDialog
Change-Id: I0aa88270aa604180223f2b35829b45e5828f792a
Reviewed-on: https://gerrit.libreoffice.org/52896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/redcom.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/redcom.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index e59bf0ea2d3c..4ec58646fc21 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -630,7 +630,7 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const OUString& rCom } } -void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Window* pParent, bool bPrevNext) +void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, weld::Window* pParent, bool bPrevNext) { if (!pAction) return; // without action is nothing.. diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 8b53fa802fed..bad57292ce9e 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -237,7 +237,7 @@ public: ScChangeAction* GetChangeAction( const ScAddress& rPos ); void SetChangeComment( ScChangeAction* pAction, const OUString& rComment ); - void ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Window* pParent, bool bPrevNext = true ); + void ExecuteChangeCommentDialog( ScChangeAction* pAction, weld::Window* pParent, bool bPrevNext = true ); /// Protect/unprotect ChangeTrack and return <TRUE/> if /// protection was successfully changed. /// If bJustQueryIfProtected==sal_True protection is not diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index 622ac2ea7e02..245e25915851 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_REDCOM_HXX #define INCLUDED_SC_SOURCE_UI_INC_REDCOM_HXX -#include <vcl/dialog.hxx> +#include <vcl/weld.hxx> #include <chgtrack.hxx> class ScDocShell; @@ -44,7 +44,7 @@ class ScRedComDialog final public: - ScRedComDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, + ScRedComDialog( weld::Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext); ~ScRedComDialog(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 03f89b69f955..b40d198397fa 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1692,7 +1692,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl, SvSimpleTable*, void) ScChangeAction* pScChangeAction= static_cast<ScChangeAction*>(pEntryData->pData); - pViewData->GetDocShell()->ExecuteChangeCommentDialog( pScChangeAction, this,false); + pViewData->GetDocShell()->ExecuteChangeCommentDialog(pScChangeAction, GetFrameWeld(), false); } } } diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 45c90f0f9680..9753c2e8306d 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -25,7 +25,7 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -ScRedComDialog::ScRedComDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, +ScRedComDialog::ScRedComDialog( weld::Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext) : pChangeAction(nullptr) , pDocShell(nullptr) diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index a31a91fc538d..5c4d1b0bbdb2 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -1016,7 +1016,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } else { - pDocSh->ExecuteChangeCommentDialog( pAction, GetDialogParent() ); + pDocSh->ExecuteChangeCommentDialog(pAction, GetFrameWeld()); rReq.Done(); } } |