diff options
Diffstat (limited to 'sw/source/uibase/inc/swuicnttab.hxx')
| -rw-r--r-- | sw/source/uibase/inc/swuicnttab.hxx | 73 |
1 files changed, 40 insertions, 33 deletions
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 16756594f82b..103f65e7cb93 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -52,7 +52,7 @@ struct SwIndexSections_Impl css::uno::Reference< css::text::XDocumentIndex > xDocumentIndex; }; -class SwMultiTOXTabDialog : public SfxTabDialogController +class SwMultiTOXTabDialog final : public SfxTabDialogController { std::unique_ptr<SwTOXMgr> m_pMgr; SwWrtShell& m_rWrtShell; @@ -61,7 +61,7 @@ class SwMultiTOXTabDialog : public SfxTabDialogController { std::unique_ptr<SwForm> m_pForm; std::unique_ptr<SwTOXDescription> m_pDescription; - std::unique_ptr<SwIndexSections_Impl> m_pxIndexSections; + std::optional<SwIndexSections_Impl> m_oIndexSections; }; std::vector<TypeData> m_vTypeData; @@ -82,9 +82,10 @@ class SwMultiTOXTabDialog : public SfxTabDialogController virtual short Ok() override; std::unique_ptr<SwTOXDescription> CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); + void ShowPreview(); DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void); - DECL_LINK(ShowPreviewHdl, weld::ToggleButton&, void); + DECL_LINK(ShowPreviewHdl, weld::Toggleable&, void); public: SwMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet& rSet, @@ -93,7 +94,7 @@ public: bool bGlobal); virtual ~SwMultiTOXTabDialog() override; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; SwForm* GetForm(CurTOXType eType); @@ -114,17 +115,17 @@ public: static bool IsNoNum(SwWrtShell& rSh, const OUString& rName); }; -class SwTOXSelectTabPage : public SfxTabPage +class SwTOXSelectTabPage final : public SfxTabPage { - std::unique_ptr<IndexEntryResource> pIndexRes; + std::unique_ptr<IndexEntryResource> m_pIndexRes; - OUString aStyleArr[MAXLEVEL]; - OUString sAutoMarkURL; - OUString sAutoMarkType; - OUString sAddStyleUser; - OUString sAddStyleContent; + OUString m_aStyleArr[MAXLEVEL]; + OUString m_sAutoMarkURL; + OUString m_sAutoMarkType; + OUString m_sAddStyleUser; + OUString m_sAddStyleContent; - std::unique_ptr<const IndexEntrySupplierWrapper> pIndexEntryWrapper; + std::unique_ptr<const IndexEntrySupplierWrapper> m_pIndexEntryWrapper; bool m_bWaitingInitialSettings; @@ -160,6 +161,8 @@ class SwTOXSelectTabPage : public SfxTabPage std::unique_ptr<weld::ComboBox> m_xCaptionSequenceLB; std::unique_ptr<weld::Label> m_xDisplayTypeFT; std::unique_ptr<weld::ComboBox> m_xDisplayTypeLB; + std::unique_ptr<weld::CheckButton> m_xParaStyleCB; + std::unique_ptr<weld::ComboBox> m_xParaStyleLB; //all but illustration and table std::unique_ptr<weld::CheckButton> m_xTOXMarksCB; @@ -190,12 +193,12 @@ class SwTOXSelectTabPage : public SfxTabPage DECL_LINK(TOXTypeHdl, weld::ComboBox&, void ); DECL_LINK(AddStylesHdl, weld::Button&, void ); - DECL_LINK(MenuEnableHdl, weld::ToggleButton&, void); - DECL_LINK(MenuExecuteHdl, const OString&, void); + DECL_LINK(MenuEnableHdl, weld::Toggleable&, void); + DECL_LINK(MenuExecuteHdl, const OUString&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(const weld::ComboBox*); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void ); - DECL_LINK(RadioButtonHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void ); + DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); DECL_LINK(ModifyEntryHdl, weld::Entry&, void); DECL_LINK(ModifySpinHdl, weld::SpinButton&, void); DECL_LINK(ModifyListBoxHdl, weld::ComboBox&, void); @@ -301,17 +304,17 @@ private: sal_uInt32 GetControlIndex(FormTokenType eType) const; }; -class SwTOXEntryTabPage : public SfxTabPage +class SwTOXEntryTabPage final : public SfxTabPage { - OUString sDelimStr; - OUString sLevelStr; - OUString sAuthTypeStr; + OUString m_sDelimStr; + OUString m_sLevelStr; + OUString m_sAuthTypeStr; - OUString sNoCharStyle; + OUString m_sNoCharStyle; SwForm* m_pCurrentForm; - CurTOXType aLastTOXType; - bool bInLevelHdl; + CurTOXType m_aLastTOXType; + bool m_bInLevelHdl; std::unique_ptr<weld::Label> m_xTypeFT; std::unique_ptr<weld::Label> m_xLevelFT; @@ -323,6 +326,7 @@ class SwTOXEntryTabPage : public SfxTabPage std::unique_ptr<weld::Button> m_xChapterInfoPB; std::unique_ptr<weld::Button> m_xPageNoPB; std::unique_ptr<weld::Button> m_xHyperLinkPB; + std::unique_ptr<weld::Widget> m_xFieldBox; std::unique_ptr<weld::ComboBox> m_xAuthFieldsLB; std::unique_ptr<weld::Button> m_xAuthInsertPB; std::unique_ptr<weld::Button> m_xAuthRemovePB; @@ -350,29 +354,30 @@ class SwTOXEntryTabPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xSortContentRB; std::unique_ptr<weld::Widget> m_xSortKeyFrame; std::unique_ptr<weld::ComboBox> m_xFirstKeyLB; - std::unique_ptr<weld::RadioButton> m_xFirstSortUpRB; - std::unique_ptr<weld::RadioButton> m_xFirstSortDownRB; + std::unique_ptr<weld::ToggleButton> m_xFirstSortUpRB; + std::unique_ptr<weld::ToggleButton> m_xFirstSortDownRB; std::unique_ptr<weld::ComboBox> m_xSecondKeyLB; - std::unique_ptr<weld::RadioButton> m_xSecondSortUpRB; - std::unique_ptr<weld::RadioButton> m_xSecondSortDownRB; + std::unique_ptr<weld::ToggleButton> m_xSecondSortUpRB; + std::unique_ptr<weld::ToggleButton> m_xSecondSortDownRB; std::unique_ptr<weld::ComboBox> m_xThirdKeyLB; - std::unique_ptr<weld::RadioButton> m_xThirdSortUpRB; - std::unique_ptr<weld::RadioButton> m_xThirdSortDownRB; + std::unique_ptr<weld::ToggleButton> m_xThirdSortUpRB; + std::unique_ptr<weld::ToggleButton> m_xThirdSortDownRB; std::unique_ptr<SwTokenWindow> m_xTokenWIN; DECL_LINK(StyleSelectHdl, weld::ComboBox&, void); DECL_LINK(EditStyleHdl, weld::Button&, void); DECL_LINK(InsertTokenHdl, weld::Button&, void); DECL_LINK(LevelHdl, weld::TreeView&, void); - DECL_LINK(AutoRightHdl, weld::ToggleButton&, void); + DECL_LINK(AutoRightHdl, weld::Toggleable&, void); DECL_LINK(TokenSelectedHdl, SwFormToken&, void); DECL_LINK(TabPosHdl, weld::MetricSpinButton&, void); DECL_LINK(FillCharHdl, weld::ComboBox&, void); DECL_LINK(RemoveInsertAuthHdl, weld::Button&, void); - DECL_LINK(SortKeyHdl, weld::ToggleButton&, void); + DECL_LINK(SortKeyHdl, weld::Toggleable&, void); DECL_LINK(ChapterInfoHdl, weld::ComboBox&, void); DECL_LINK(ChapterInfoOutlineHdl, weld::SpinButton&, void); DECL_LINK(NumberFormatHdl, weld::ComboBox&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(AllLevelsHdl, weld::Button&, void); @@ -380,7 +385,9 @@ class SwTOXEntryTabPage : public SfxTabPage void UpdateDescriptor(); DECL_LINK(ModifyHdl, LinkParamNone*, void); void OnModify(bool bAllLevels); - DECL_LINK(ModifyClickHdl, weld::ToggleButton&, void); + DECL_LINK(ModifyClickHdl, weld::Toggleable&, void); + + void ShowHideControls(int eType); public: SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); @@ -399,7 +406,7 @@ public: void SetFocus2theAllBtn(); }; -class SwTOXStylesTabPage : public SfxTabPage +class SwTOXStylesTabPage final : public SfxTabPage { std::unique_ptr<SwForm> m_pCurrentForm; |