diff options
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/align.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/border.hxx | 12 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 10 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/labdlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/numpages.hxx | 16 |
7 files changed, 26 insertions, 26 deletions
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 857ade2cc7b7..43c2fe0ee9eb 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -79,7 +79,7 @@ private: weld::TriStateEnabled m_aHyphenState; weld::TriStateEnabled m_aShrinkState; - SvtValueSet m_aVsRefEdge; + ValueSet m_aVsRefEdge; std::unique_ptr<weld::ComboBox> m_xLbHorAlign; std::unique_ptr<weld::Label> m_xFtIndent; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index a138620017e1..7af464924259 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -41,7 +41,7 @@ namespace editeng class ShadowControlsWrapper { public: - explicit ShadowControlsWrapper(SvtValueSet& rVsPos, weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor); + explicit ShadowControlsWrapper(ValueSet& rVsPos, weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor); SvxShadowItem GetControlValue(const SvxShadowItem& rItem) const; void SetControlValue(const SvxShadowItem& rItem); @@ -50,7 +50,7 @@ public: bool get_value_changed_from_saved() const; private: - SvtValueSet& mrVsPos; + ValueSet& mrVsPos; weld::MetricSpinButton& mrMfSize; ColorListBox& mrLbColor; }; @@ -121,7 +121,7 @@ private: // Controls svx::FrameSelector m_aFrameSel; - std::unique_ptr<SvtValueSet> m_xWndPresets; + std::unique_ptr<ValueSet> m_xWndPresets; std::unique_ptr<weld::CustomWeld> m_xWndPresetsWin; std::unique_ptr<weld::Label> m_xUserDefFT; std::unique_ptr<weld::CustomWeld> m_xFrameSelWin; @@ -142,7 +142,7 @@ private: std::unique_ptr<weld::CheckButton> m_xSynchronizeCB; std::unique_ptr<weld::Container> m_xShadowFrame; - std::unique_ptr<SvtValueSet> m_xWndShadows; + std::unique_ptr<ValueSet> m_xWndShadows; std::unique_ptr<weld::CustomWeld> m_xWndShadowsWin; std::unique_ptr<weld::Label> m_xFtShadowSize; std::unique_ptr<weld::MetricSpinButton> m_xEdShadowSize; @@ -161,8 +161,8 @@ private: // Handler DECL_LINK(SelStyleHdl_Impl, SvtLineListBox&, void); DECL_LINK(SelColHdl_Impl, ColorListBox&, void); - DECL_LINK(SelPreHdl_Impl, SvtValueSet*, void); - DECL_LINK(SelSdwHdl_Impl, SvtValueSet*, void); + DECL_LINK(SelPreHdl_Impl, ValueSet*, void); + DECL_LINK(SelSdwHdl_Impl, ValueSet*, void); DECL_LINK(LinesChanged_Impl, LinkParamNone*, void); DECL_LINK(ModifyDistanceHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ModifyWidthHdl_Impl, weld::MetricSpinButton&, void); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index d6ad837edc84..f413495a17ff 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -632,7 +632,7 @@ private: std::vector<css::uno::Reference<css::graphic::XGraphic>> m_aGraphics; - std::unique_ptr<SvtValueSet> m_xTbSymbol; + std::unique_ptr<ValueSet> m_xTbSymbol; std::unique_ptr<weld::CustomWeld> m_xTbSymbolWin; std::unique_ptr<weld::Label> m_xFtNote; std::unique_ptr<weld::Button> m_xBtnImport; @@ -656,7 +656,7 @@ public: css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); - DECL_LINK(SelectHdl, SvtValueSet*, void); + DECL_LINK(SelectHdl, ValueSet*, void); DECL_LINK(ImportHdl, weld::Button&, void); DECL_LINK(DeleteHdl, weld::Button&, void); }; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 9ccac256260c..849b009c35df 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -379,7 +379,7 @@ private: DECL_LINK( ClickAddHdl_Impl, weld::Button&, void ); DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void ); - DECL_LINK( ChangeGradientHdl, SvtValueSet*, void ); + DECL_LINK( ChangeGradientHdl, ValueSet*, void ); void ChangeGradientHdl_Impl(); DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); @@ -446,7 +446,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xHatchLBWin; std::unique_ptr<weld::CustomWeld> m_xCtlPreview; - DECL_LINK(ChangeHatchHdl, SvtValueSet*, void); + DECL_LINK(ChangeHatchHdl, ValueSet*, void); void ChangeHatchHdl_Impl(); DECL_LINK( ModifiedEditHdl_Impl, weld::MetricSpinButton&, void ); DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void ); @@ -527,7 +527,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xCtlBitmapPreview; std::unique_ptr<weld::CustomWeld> m_xBitmapLBWin; - DECL_LINK( ModifyBitmapHdl, SvtValueSet*, void ); + DECL_LINK( ModifyBitmapHdl, ValueSet*, void ); DECL_LINK( ClickScaleHdl, weld::Button&, void ); DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void ); DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void ); @@ -589,7 +589,7 @@ private: DECL_LINK( ClickAddHdl_Impl, weld::Button&, void ); DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void ); - DECL_LINK( ChangePatternHdl_Impl, SvtValueSet*, void ); + DECL_LINK( ChangePatternHdl_Impl, ValueSet*, void ); DECL_LINK( ChangeColorHdl_Impl, ColorListBox&, void ); DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); @@ -695,7 +695,7 @@ private: DECL_LINK(ClickDeleteHdl_Impl, weld::Button&, void); DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void); - DECL_LINK( SelectValSetHdl_Impl, SvtValueSet*, void ); + DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void ); DECL_LINK( SelectColorModeHdl_Impl, weld::ToggleButton&, void ); void ChangeColor(const Color &rNewColor, bool bUpdatePreset = true); void SetColorModel(ColorModel eModel); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 9754b36b7c81..056aee15977d 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -33,7 +33,7 @@ namespace svx { - class SuggestionSet : public SvtValueSet + class SuggestionSet : public ValueSet { public: SuggestionSet(std::unique_ptr<weld::ScrolledWindow> xScrolledWindow); @@ -60,7 +60,7 @@ namespace svx OUString GetSelectedEntry() const; DECL_LINK( SelectSuggestionListBoxHdl, weld::TreeView&, void ); - DECL_LINK( SelectSuggestionValueSetHdl, SvtValueSet*, void ); + DECL_LINK( SelectSuggestionValueSetHdl, ValueSet*, void ); void SelectSuggestionHdl(bool bListBox); void SetHelpIds(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 792ce61fc1a0..d759df2e6e06 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -67,7 +67,7 @@ private: std::unique_ptr<weld::Label> m_xFT_LENGTHFT; std::unique_ptr<weld::MetricSpinButton> m_xMF_LENGTH; std::unique_ptr<weld::CheckButton> m_xCB_OPTIMAL; - std::unique_ptr<SvtValueSet> m_xCT_CAPTTYPE; + std::unique_ptr<ValueSet> m_xCT_CAPTTYPE; std::unique_ptr<weld::CustomWeld> m_xCT_CAPTTYPEWin; void SetupExtension_Impl( sal_uInt16 nType ); @@ -75,7 +75,7 @@ private: DECL_LINK(ExtensionSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(PositionSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(LineOptHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(SelectCaptTypeHdl_Impl, SvtValueSet*, void); + DECL_LINK(SelectCaptTypeHdl_Impl, ValueSet*, void); public: SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 01eb4af82c3c..abce15b97d42 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -69,8 +69,8 @@ class SvxSingleNumPickTabPage final : public SfxTabPage std::unique_ptr<SvxNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -99,8 +99,8 @@ class SvxBulletPickTabPage final : public SfxTabPage std::unique_ptr<SvxNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage() override; @@ -136,8 +136,8 @@ class SvxNumPickTabPage final : public SfxTabPage std::unique_ptr<SvxNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -174,8 +174,8 @@ class SvxBitmapPickTabPage final : public SfxTabPage std::unique_ptr<SvxBmpNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); DECL_LINK(ClickAddBrowseHdl_Impl, weld::Button&, void); public: |