diff options
Diffstat (limited to 'svx/source/sidebar')
9 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 2cda7a14cd82..b5e54801dde7 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -46,8 +46,8 @@ using namespace svx; -ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) - : SfxPopupWindow(nId, "ParaLineSpacingControl", "svx/ui/paralinespacingcontrol.ui") +ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId, vcl::Window* pParent) + : SfxPopupWindow(nId, pParent, "ParaLineSpacingControl", "svx/ui/paralinespacingcontrol.ui") { mpSpacing1Button = get<PushButton>("spacing_1"); mpSpacing115Button = get<PushButton>("spacing_115"); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index e467392bf6a9..2816916002fe 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -30,7 +30,7 @@ namespace svx { class ParaLineSpacingControl : public SfxPopupWindow { public: - explicit ParaLineSpacingControl(sal_uInt16 nId); + explicit ParaLineSpacingControl(sal_uInt16 nId, vcl::Window* pParent); virtual ~ParaLineSpacingControl() override; virtual void dispose() override; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index d8c549f0d31f..4920c79c3b1d 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -39,7 +39,7 @@ ParaLineSpacingPopup::~ParaLineSpacingPopup() VclPtr<SfxPopupWindow> ParaLineSpacingPopup::CreatePopupWindow() { - VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId()); + VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId(), &GetToolBox()); pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index f1b8ae5d45ff..e43c423fc694 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -39,8 +39,8 @@ namespace svx { -TextCharacterSpacingControl::TextCharacterSpacingControl(sal_uInt16 nId) - : SfxPopupWindow(nId, "TextCharacterSpacingControl", "svx/ui/textcharacterspacingcontrol.ui") +TextCharacterSpacingControl::TextCharacterSpacingControl(sal_uInt16 nId, vcl::Window* pParent) + : SfxPopupWindow(nId, pParent, "TextCharacterSpacingControl", "svx/ui/textcharacterspacingcontrol.ui") , mnId(nId) , mnCustomKern(0) , mnLastCus(SPACING_NOCUSTOM) diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 9035c71290ad..1008441ada24 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -34,7 +34,7 @@ namespace svx { class TextCharacterSpacingControl : public SfxPopupWindow { public: - explicit TextCharacterSpacingControl(sal_uInt16 nId); + explicit TextCharacterSpacingControl(sal_uInt16 nId, vcl::Window* pParent); virtual ~TextCharacterSpacingControl() override; virtual void dispose() override; diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 7ce654fe3009..cdf0f99b8bb9 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -38,7 +38,7 @@ TextCharacterSpacingPopup::~TextCharacterSpacingPopup() VclPtr<SfxPopupWindow> TextCharacterSpacingPopup::CreatePopupWindow() { - VclPtr<TextCharacterSpacingControl> pControl = VclPtr<TextCharacterSpacingControl>::Create(GetSlotId()); + VclPtr<TextCharacterSpacingControl> pControl = VclPtr<TextCharacterSpacingControl>::Create(GetSlotId(), &GetToolBox()); pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus); diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index aaf5f82d3dee..1e2870f80503 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -29,8 +29,8 @@ namespace svx { -TextUnderlineControl::TextUnderlineControl(sal_uInt16 nId) -: SfxPopupWindow(nId, "TextUnderlineControl", "svx/ui/textunderlinecontrol.ui") +TextUnderlineControl::TextUnderlineControl(sal_uInt16 nId, vcl::Window* pParent) +: SfxPopupWindow(nId, pParent, "TextUnderlineControl", "svx/ui/textunderlinecontrol.ui") { get(maNone, "none"); get(maSingle, "single"); diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index db9cfe8bdcf2..ec1df4bbb696 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -31,7 +31,7 @@ namespace svx { class TextUnderlineControl : public SfxPopupWindow { public: - explicit TextUnderlineControl(sal_uInt16 nId); + explicit TextUnderlineControl(sal_uInt16 nId, vcl::Window* pParent); virtual ~TextUnderlineControl() override; virtual void dispose() override; diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 5b2645f7234f..b55e2d4032a3 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -43,7 +43,7 @@ void TextUnderlinePopup::initialize( const css::uno::Sequence< css::uno::Any >& VclPtr<SfxPopupWindow> TextUnderlinePopup::CreatePopupWindow() { - VclPtr<TextUnderlineControl> pControl = VclPtr<TextUnderlineControl>::Create(GetSlotId()); + VclPtr<TextUnderlineControl> pControl = VclPtr<TextUnderlineControl>::Create(GetSlotId(), &GetToolBox()); pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus); SetPopupWindow(pControl); |