sw/inc/swabstdlg.hxx | 2 +-
sw/source/ui/dialog/swdlgfact.cxx | 2 +-
sw/source/ui/dialog/swdlgfact.hxx | 2 +-
sw/source/ui/utlui/swrenamexnameddlg.cxx | 4 ++--
sw/source/uibase/inc/swrenamexnameddlg.hxx | 2 +-
sw/source/uibase/utlui/content.cxx | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c6dbd2d0ff3b2adf3fd16221187c4091637b0848
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 5 19:07:02 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Mar 6 11:47:36 2021 +0100
allow a widget as a parent, not just a window
Change-Id: I83c3c5a69c0badac7998dfb88107978eee7cdcd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112032
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c29b98214281..b96fc4b8c463 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -433,7 +433,7 @@ public:
virtual VclPtr<AbstractSwFieldDlg> CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, weld::Window *pParent) = 0;
virtual VclPtr<SfxAbstractDialog> CreateSwFieldEditDlg ( SwView& rVw ) =
0;
- virtual VclPtr<AbstractSwRenameXNamedDlg>
CreateSwRenameXNamedDlg(weld::Window* pParent,
+ virtual VclPtr<AbstractSwRenameXNamedDlg>
CreateSwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess) = 0;
virtual VclPtr<AbstractSwModalRedlineAcceptDlg>
CreateSwModalRedlineAcceptDlg(weld::Window *pParent) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 4f1b7e3316d0..56709f9646ce 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -987,7 +987,7 @@ VclPtr<SfxAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg(SwV
return
VclPtr<SwAbstractSfxController_Impl>::Create(std::make_unique<SwFieldEditDlg>(rVw));
}
-VclPtr<AbstractSwRenameXNamedDlg>
SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(weld::Window* pParent,
+VclPtr<AbstractSwRenameXNamedDlg>
SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
{
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 65870505bda5..15a668c6ea78 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -703,7 +703,7 @@ public:
const SfxItemSet* pItemSet, SwWrtShell* pSh) override;
virtual VclPtr<AbstractSwFieldDlg> CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, weld::Window *pParent) override;
virtual VclPtr<SfxAbstractDialog> CreateSwFieldEditDlg ( SwView& rVw )
override;
- virtual VclPtr<AbstractSwRenameXNamedDlg>
CreateSwRenameXNamedDlg(weld::Window* pParent,
+ virtual VclPtr<AbstractSwRenameXNamedDlg>
CreateSwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
override;
virtual VclPtr<AbstractSwModalRedlineAcceptDlg>
CreateSwModalRedlineAcceptDlg(weld::Window *pParent) override;
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx
b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 73993a68f539..bbba12a203a8 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -23,10 +23,10 @@
using namespace ::com::sun::star;
-SwRenameXNamedDlg::SwRenameXNamedDlg(weld::Window* pWin,
+SwRenameXNamedDlg::SwRenameXNamedDlg(weld::Widget* pParent,
uno::Reference< container::XNamed > & xN,
uno::Reference< container::XNameAccess > & xNA )
- : GenericDialogController(pWin,
"modules/swriter/ui/renameobjectdialog.ui", "RenameObjectDialog")
+ : GenericDialogController(pParent,
"modules/swriter/ui/renameobjectdialog.ui", "RenameObjectDialog")
, xNamed(xN)
, xNameAccess(xNA)
, m_xNewNameED(m_xBuilder->weld_entry("entry"))
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx
b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index c8ed7dc52536..fee64c7d6681 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -40,7 +40,7 @@ class SwRenameXNamedDlg : public weld::GenericDialogController
DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
- SwRenameXNamedDlg(weld::Window* pParent,
+ SwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > &
xNameAccess );
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 605831d3b360..ea338a0a00e8 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4323,7 +4323,7 @@ void SwContentTree::EditEntry(const weld::TreeIter&
rEntry, EditEntryMode nMode)
aObj >>= xTmp;
uno::Reference< container::XNamed > xNamed(xTmp, uno::UNO_QUERY);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractSwRenameXNamedDlg>
pDlg(pFact->CreateSwRenameXNamedDlg(GetParentWindow()->GetFrameWeld(), xNamed,
xNameAccess));
+ ScopedVclPtr<AbstractSwRenameXNamedDlg>
pDlg(pFact->CreateSwRenameXNamedDlg(m_xTreeView.get(), xNamed, xNameAccess));
if(xSecond.is())
pDlg->SetAlternativeAccess( xSecond, xThird);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
