diff options
-rw-r--r-- | cui/source/inc/align.hxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/align.cxx | 2 | ||||
-rw-r--r-- | include/svx/frmdirlbox.hxx | 8 | ||||
-rw-r--r-- | svx/source/dialog/frmdirlbox.cxx | 10 |
4 files changed, 10 insertions, 12 deletions
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index c70e95cf544d..1a90d4a21542 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -99,7 +99,7 @@ private: VclPtr<TriStateBox> m_pBtnWrap; VclPtr<TriStateBox> m_pBtnHyphen; VclPtr<TriStateBox> m_pBtnShrink; - VclPtr<FrameDirListBox> m_pLbFrameDir; + VclPtr<FrameDirectionListBox> m_pLbFrameDir; // hidden labels/string VclPtr<FixedText> m_pFtBotLock; diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 327201ca8f85..373d96c0f8e5 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -236,7 +236,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_ALIGN_HYPHENATION, *m_pBtnHyphen, ItemConnFlags::HideUnknown ) ); AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_ALIGN_SHRINKTOFIT, *m_pBtnShrink, ItemConnFlags::HideUnknown ) ); AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_FRAMEDIRECTION, *m_pBoxDirection, ItemConnFlags::HideUnknown ) ); - AddItemConnection( new FrameDirListBoxConnection( SID_ATTR_FRAMEDIRECTION, *m_pLbFrameDir, ItemConnFlags::HideUnknown ) ); + AddItemConnection( new FrameDirectionListBoxConnection( SID_ATTR_FRAMEDIRECTION, *m_pLbFrameDir, ItemConnFlags::HideUnknown ) ); } diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 6fe30a571457..9c065160cb17 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -53,14 +53,12 @@ public: SvxFrameDirection GetSelectEntryValue() const; }; -typedef FrameDirectionListBox FrameDirListBox; - /** Wrapper for usage of a FrameDirectionListBox in item connections. */ -class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection > +class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirectionListBoxWrapper : public sfx::SingleControlWrapper< FrameDirectionListBox, SvxFrameDirection > { public: - explicit FrameDirListBoxWrapper( FrameDirListBox& rListBox ); + explicit FrameDirectionListBoxWrapper( FrameDirectionListBox& rListBox ); virtual bool IsControlDontKnow() const override; virtual void SetControlDontKnow( bool bSet ) override; @@ -73,7 +71,7 @@ public: typedef sfx::ValueItemWrapper< SvxFrameDirectionItem, SvxFrameDirection > FrameDirItemWrapper; /** An item<->control connection for a FrameDirectionListBox. */ -typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper > FrameDirListBoxConnection; +typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirectionListBoxWrapper > FrameDirectionListBoxConnection; } diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 827276e947ca..11e3d8bcf46e 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -79,28 +79,28 @@ SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const } -FrameDirListBoxWrapper::FrameDirListBoxWrapper( FrameDirListBox& rListBox ) : +FrameDirectionListBoxWrapper::FrameDirectionListBoxWrapper( FrameDirectionListBox& rListBox ) : SingleControlWrapperType( rListBox ) { } -bool FrameDirListBoxWrapper::IsControlDontKnow() const +bool FrameDirectionListBoxWrapper::IsControlDontKnow() const { return GetControl().GetSelectedEntryCount() == 0; } -void FrameDirListBoxWrapper::SetControlDontKnow( bool bSet ) +void FrameDirectionListBoxWrapper::SetControlDontKnow( bool bSet ) { if( bSet ) GetControl().SetNoSelection(); } -SvxFrameDirection FrameDirListBoxWrapper::GetControlValue() const +SvxFrameDirection FrameDirectionListBoxWrapper::GetControlValue() const { return GetControl().GetSelectEntryValue(); } -void FrameDirListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) +void FrameDirectionListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) { GetControl().SelectEntryValue( eValue ); } |