Kaydet (Commit) c986c885 authored tarafından Caolán McNamara's avatar Caolán McNamara

weld writer char style dialog

Change-Id: Iaa61260e3d59dad782b32304aabe4e2d25069559
Reviewed-on: https://gerrit.libreoffice.org/63716Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst b78edeca
...@@ -1008,11 +1008,11 @@ VclPtr<SfxAbstractApplyTabDialog> SwAbstractDialogFactory_Impl::CreateTemplateDi ...@@ -1008,11 +1008,11 @@ VclPtr<SfxAbstractApplyTabDialog> SwAbstractDialogFactory_Impl::CreateTemplateDi
SwWrtShell* pActShell, SwWrtShell* pActShell,
bool bNew ) bool bNew )
{ {
if (nRegion == SfxStyleFamily::Page || nRegion == SfxStyleFamily::Pseudo || nRegion == SfxStyleFamily::Para) if (nRegion != SfxStyleFamily::Frame)
{ {
return VclPtr<AbstractApplyTabController_Impl>::Create(o3tl::make_unique<SwTemplateDlgController>(pParent ? pParent->GetFrameWeld() : nullptr, rBase, nRegion, sPage, pActShell, bNew)); return VclPtr<AbstractApplyTabController_Impl>::Create(o3tl::make_unique<SwTemplateDlgController>(pParent ? pParent->GetFrameWeld() : nullptr, rBase, nRegion, sPage, pActShell, bNew));
} }
VclPtr<SfxTabDialog> pDlg = VclPtr<SwTemplateDlg>::Create(pParent, rBase, nRegion, sPage, pActShell, bNew); VclPtr<SfxTabDialog> pDlg = VclPtr<SwTemplateDlg>::Create(pParent, rBase, nRegion, sPage, pActShell);
return VclPtr<AbstractApplyTabDialog_Impl>::Create(pDlg); return VclPtr<AbstractApplyTabDialog_Impl>::Create(pDlg);
} }
......
This diff is collapsed.
...@@ -31,28 +31,15 @@ class SwTemplateDlg: public SfxStyleDialog ...@@ -31,28 +31,15 @@ class SwTemplateDlg: public SfxStyleDialog
SfxStyleFamily const nType; SfxStyleFamily const nType;
sal_uInt16 nHtmlMode; sal_uInt16 nHtmlMode;
SwWrtShell* pWrtShell; SwWrtShell* pWrtShell;
bool const bNewStyle;
sal_uInt16 m_nIndentsId;
sal_uInt16 m_nAlignId;
sal_uInt16 m_nFontId;
sal_uInt16 m_nFontEffectId;
sal_uInt16 m_nPositionId;
sal_uInt16 m_nAsianLayoutId;
sal_uInt16 m_nOutlineId;
sal_uInt16 m_nBackgroundId;
sal_uInt16 m_nAreaId; sal_uInt16 m_nAreaId;
sal_uInt16 m_nTransparenceId; sal_uInt16 m_nTransparenceId;
sal_uInt16 m_nBorderId; sal_uInt16 m_nBorderId;
sal_uInt16 m_nConditionId;
sal_uInt16 m_nTypeId; sal_uInt16 m_nTypeId;
sal_uInt16 m_nOptionsId; sal_uInt16 m_nOptionsId;
sal_uInt16 m_nWrapId; sal_uInt16 m_nWrapId;
sal_uInt16 m_nColumnId; sal_uInt16 m_nColumnId;
sal_uInt16 m_nMacroId; sal_uInt16 m_nMacroId;
sal_uInt16 m_nHeaderId;
sal_uInt16 m_nFooterId;
sal_uInt16 m_nPageId;
public: public:
/// @param sPage /// @param sPage
...@@ -61,8 +48,7 @@ public: ...@@ -61,8 +48,7 @@ public:
SfxStyleSheetBase& rBase, SfxStyleSheetBase& rBase,
SfxStyleFamily nRegion, SfxStyleFamily nRegion,
const OString& sPage, const OString& sPage,
SwWrtShell* pActShell, SwWrtShell* pActShell );
bool bNew );
virtual void RefreshInputSet() override; virtual void RefreshInputSet() override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment