Kaydet (Commit) 67340db6 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

Related: fdo#84844 Prepare border color status update

The Sidebar button handles also the color of diagonal lines.

Change-Id: I26d75472a8c9ca482274797127994d4546b1b3e8
üst 4d447ebc
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
SvxColorToolBoxControl SvxColorToolBoxControl
---------------------- ----------------------
Item type: SvxColorItem Item type: SvxColorItem
SvxLineItem
SfxBoolItem SfxBoolItem
XLineColorItem XLineColorItem
and XFillColorItem and XFillColorItem
...@@ -216,6 +217,19 @@ public: ...@@ -216,6 +217,19 @@ public:
}; };
class BorderColorStatus
{
Color maColor;
Color maTLBRColor;
Color maBLTRColor;
public:
BorderColorStatus();
~BorderColorStatus();
void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
Color GetColor();
};
// class SvxColorToolBoxControl -------------------------------------- // class SvxColorToolBoxControl --------------------------------------
class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
...@@ -224,6 +238,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl ...@@ -224,6 +238,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater; ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater;
PaletteManager mPaletteManager; PaletteManager mPaletteManager;
BorderColorStatus maBorderColorStatus;
bool bSidebarType; bool bSidebarType;
DECL_LINK( SelectedHdl, Color* ); DECL_LINK( SelectedHdl, Color* );
public: public:
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include <svx/PaletteManager.hxx> #include <svx/PaletteManager.hxx>
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>
class BorderColorStatus;
class SvxColorWindow_Impl : public SfxPopupWindow class SvxColorWindow_Impl : public SfxPopupWindow
{ {
using FloatingWindow::StateChanged; using FloatingWindow::StateChanged;
...@@ -46,6 +48,7 @@ private: ...@@ -46,6 +48,7 @@ private:
Link maSelectedLink; Link maSelectedLink;
PaletteManager& mrPaletteManager; PaletteManager& mrPaletteManager;
BorderColorStatus& mrBorderColorStatus;
DECL_LINK( SelectHdl, SvxColorValueSet* ); DECL_LINK( SelectHdl, SvxColorValueSet* );
DECL_LINK( SelectPaletteHdl, void *); DECL_LINK( SelectPaletteHdl, void *);
...@@ -59,6 +62,7 @@ protected: ...@@ -59,6 +62,7 @@ protected:
public: public:
SvxColorWindow_Impl( const OUString& rCommand, SvxColorWindow_Impl( const OUString& rCommand,
PaletteManager& rPaletteManager, PaletteManager& rPaletteManager,
BorderColorStatus& rBorderColorStatus,
sal_uInt16 nSlotId, sal_uInt16 nSlotId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const OUString& rWndTitle, const OUString& rWndTitle,
......
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