diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-09-05 11:57:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-06 12:45:15 +0200 |
commit | 587899f9ced03d02fbf8ffa9a3f52ba31be30818 (patch) | |
tree | 75b303c67aad161a1f9ac571bbb51f9536f9ab25 /include/svtools | |
parent | 83f12a2d4e410014c70844085f19190a50e83429 (diff) |
weld SwColumnPage and SwColumnDialog
Change-Id: Ia649785047db2551044b4d765881309f83b5c838
Reviewed-on: https://gerrit.libreoffice.org/60044
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
-rw-r--r-- | include/svtools/ctrlbox.hxx | 7 | ||||
-rw-r--r-- | include/svtools/valueset.hxx | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 8df5dfdadc2b..c1cc78eb7e9f 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -294,13 +294,15 @@ public: ~SvtLineListBox(); /** Set the width in Twips */ - void SetWidth( long nWidth ) + void SetWidth(long nWidth) { m_nWidth = nWidth; UpdateEntries(); UpdatePreview(); } + long GetWidth() const { return m_nWidth; } + /** Insert a listbox entry with all widths in Twips. */ void InsertEntry(const BorderWidthImpl& rWidthImpl, SvxBorderLineStyle nStyle, long nMinWidth = 0, @@ -317,12 +319,15 @@ public: { aColor = rColor; UpdateEntries(); + UpdatePreview(); } const Color& GetColor() const { return aColor; } void SetSelectHdl(const Link<SvtLineListBox&,void>& rLink) { maSelectHdl = rLink; } + void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } + private: SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index fa4b3994de86..b1d8596eced6 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -495,9 +495,11 @@ public: virtual void LoseFocus() override; virtual void Resize() override; virtual void StyleUpdated() override; - virtual void Select(); virtual OUString RequestHelp(tools::Rectangle& rHelpRect) override; + virtual void Select(); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + OUString const & GetText() const { return maText; } void SetText(const OUString& rText) { maText = rText; } void SetStyle(WinBits nStyle); @@ -513,6 +515,8 @@ public: const OUString& rStr); /// Insert an User Drawn item. void InsertItem(sal_uInt16 nItemId, size_t nPos = VALUESET_APPEND); + /// Insert an User Drawn item with @rStr tooltip. + void InsertItem(sal_uInt16 nItemId, const OUString& rStr, size_t nPos); void RemoveItem(sal_uInt16 nItemId); void Clear(); @@ -560,6 +564,7 @@ public: void SetExtraSpacing( sal_uInt16 nNewSpacing ); void Format(vcl::RenderContext const & rRenderContext); + void SetFormat(); Size CalcWindowSizePixel(const Size& rItemSize, sal_uInt16 nCalcCols = 0, |