Rename BorderColorStatus to ColorStatus

Next commit will use this for all color status updates,
not just for borders.

Change-Id: Ibd95d755a33bfc079fcbffabfd8896b6b777609f
Reviewed-on: https://gerrit.libreoffice.org/63498
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>

6 files changed, 29 insertions, 29 deletions

diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index 67e26e652576..0a62fafceacc 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -42,7 +42,7 @@ private:
     sal_uInt16 m_nSlotId;
     bool m_bShowNoneButton;
     std::shared_ptr<PaletteManager> m_xPaletteManager;
-    BorderColorStatus m_aBorderColorStatus;
+    ColorStatus m_aColorStatus;
 
     DECL_LINK(MenuActivateHdl, MenuButton *, void);
     void Selected(const NamedColor& rNamedColor);
@@ -104,7 +104,7 @@ private:
     sal_uInt16 m_nSlotId;
     bool m_bShowNoneButton;
     std::shared_ptr<PaletteManager> m_xPaletteManager;
-    BorderColorStatus m_aBorderColorStatus;
+    ColorStatus m_aColorStatus;
 
     void Selected(const NamedColor& rNamedColor);
     void createColorWindow();
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index f5de49f7fd9a..5611e4d3e2bd 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -32,14 +32,14 @@
 
 #include <functional>
 
-class SVX_DLLPUBLIC BorderColorStatus
+class SVX_DLLPUBLIC ColorStatus
 {
     Color maColor;
     Color maTLBRColor;
     Color maBLTRColor;
 public:
-    BorderColorStatus();
-    ~BorderColorStatus();
+    ColorStatus();
+    ~ColorStatus();
     bool statusChanged( const css::frame::FeatureStateEvent& rEvent );
     Color GetColor();
 };
@@ -66,7 +66,7 @@ private:
 
     VclPtr<vcl::Window> mxParentWindow;
     std::shared_ptr<PaletteManager> mxPaletteManager;
-    BorderColorStatus&  mrBorderColorStatus;
+    ColorStatus&  mrColorStatus;
 
     ColorSelectFunction const maColorSelectFunction;
     bool const mbReuseParentForPicker;
@@ -83,7 +83,7 @@ private:
 public:
     SvxColorWindow(const OUString& rCommand,
                    std::shared_ptr<PaletteManager> const & rPaletteManager,
-                   BorderColorStatus& rBorderColorStatus,
+                   ColorStatus& rColorStatus,
                    sal_uInt16 nSlotId,
                    const css::uno::Reference< css::frame::XFrame >& rFrame,
                    vcl::Window* pParentWindow,
@@ -118,7 +118,7 @@ private:
     weld::Window* const mpParentWindow;
     weld::MenuButton* mpMenuButton;
     std::shared_ptr<PaletteManager> mxPaletteManager;
-    BorderColorStatus&  mrBorderColorStatus;
+    ColorStatus&  mrColorStatus;
     ColorSelectFunction const maColorSelectFunction;
 
     std::unique_ptr<ColorValueSet> mxColorSet;
@@ -144,7 +144,7 @@ private:
 
 public:
     ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager,
-                BorderColorStatus& rBorderColorStatus,
+                ColorStatus& rColorStatus,
                 sal_uInt16 nSlotId,
                 const css::uno::Reference< css::frame::XFrame >& rFrame,
                 weld::Window* pParentWindow, weld::MenuButton* pMenuButton,
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index ded664983f21..afa61b9b38b1 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -210,7 +210,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public cppu::ImplInheritanceHelper<
 {
     std::unique_ptr<svx::ToolboxButtonColorUpdater> m_xBtnUpdater;
     std::shared_ptr<PaletteManager> m_xPaletteManager;
-    BorderColorStatus m_aBorderColorStatus;
+    ColorStatus m_aColorStatus;
     bool m_bSplitButton;
     sal_uInt16 m_nSlotId;
     ColorSelectFunction m_aColorSelectFunction;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 5e8194fd7214..48f2a5c3c26c 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -227,7 +227,7 @@ IMPL_LINK(Condition, DropdownClick, ToolBox*, pToolBox, void)
     m_pColorFloat = VclPtr<SvxColorWindow>::Create(
                            OUString() /*m_aCommandURL*/,
                            m_xPaletteManager,
-                           m_aBorderColorStatus,
+                           m_aColorStatus,
                            nSlotId,
                            nullptr,
                            pToolBox,
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index ceca03281ecc..d94804d35c24 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -88,7 +88,7 @@ namespace rptui
         sal_uInt16                  m_nFontColorId;
         sal_uInt16                  m_nFontDialogId;
         std::shared_ptr<PaletteManager> m_xPaletteManager;
-        BorderColorStatus           m_aBorderColorStatus;
+        ColorStatus                 m_aColorStatus;
         ConditionColorWrapper       m_aColorWrapper;
 
         ::rptui::OReportController& m_rController;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f4d85d734526..6a3e96edb831 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1255,7 +1255,7 @@ void SvxFontNameBox_Impl::Select()
 
 SvxColorWindow::SvxColorWindow(const OUString&            rCommand,
                                std::shared_ptr<PaletteManager> const & rPaletteManager,
-                               BorderColorStatus&         rBorderColorStatus,
+                               ColorStatus&               rColorStatus,
                                sal_uInt16                 nSlotId,
                                const Reference< XFrame >& rFrame,
                                vcl::Window*               pParentWindow,
@@ -1267,7 +1267,7 @@ SvxColorWindow::SvxColorWindow(const OUString&            rCommand,
     maCommand( rCommand ),
     mxParentWindow(pParentWindow),
     mxPaletteManager( rPaletteManager ),
-    mrBorderColorStatus( rBorderColorStatus ),
+    mrColorStatus( rColorStatus ),
     maColorSelectFunction(aFunction),
     mbReuseParentForPicker(bReuseParentForPicker)
 {
@@ -1367,7 +1367,7 @@ SvxColorWindow::SvxColorWindow(const OUString&            rCommand,
 }
 
 ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager,
-                         BorderColorStatus&         rBorderColorStatus,
+                         ColorStatus&               rColorStatus,
                          sal_uInt16                 nSlotId,
                          const Reference< XFrame >& rFrame,
                          weld::Window*              pParentWindow,
@@ -1381,7 +1381,7 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager
     , mpParentWindow(pParentWindow)
     , mpMenuButton(pMenuButton)
     , mxPaletteManager(rPaletteManager)
-    , mrBorderColorStatus(rBorderColorStatus)
+    , mrColorStatus(rColorStatus)
     , maColorSelectFunction(aFunction)
     , mxColorSet(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
     , mxRecentColorSet(new ColorValueSet(nullptr))
@@ -1774,9 +1774,9 @@ void SvxColorWindow::statusChanged( const css::frame::FeatureStateEvent& rEvent
     {
         Color aColor(COL_TRANSPARENT);
 
-        if (mrBorderColorStatus.statusChanged(rEvent))
+        if (mrColorStatus.statusChanged(rEvent))
         {
-            aColor = mrBorderColorStatus.GetColor();
+            aColor = mrColorStatus.GetColor();
         }
         else if (rEvent.IsEnabled)
         {
@@ -1803,9 +1803,9 @@ void ColorWindow::statusChanged( const css::frame::FeatureStateEvent& rEvent )
     {
         Color aColor(COL_TRANSPARENT);
 
-        if (mrBorderColorStatus.statusChanged(rEvent))
+        if (mrColorStatus.statusChanged(rEvent))
         {
-            aColor = mrBorderColorStatus.GetColor();
+            aColor = mrColorStatus.GetColor();
         }
         else if (rEvent.IsEnabled)
         {
@@ -1926,18 +1926,18 @@ void ColorWindow::SelectEntry(const Color& rColor)
     ColorWindow::SelectEntry(std::make_pair(rColor, sColorName));
 }
 
-BorderColorStatus::BorderColorStatus() :
+ColorStatus::ColorStatus() :
     maColor( COL_TRANSPARENT ),
     maTLBRColor( COL_TRANSPARENT ),
     maBLTRColor( COL_TRANSPARENT )
 {
 }
 
-BorderColorStatus::~BorderColorStatus()
+ColorStatus::~ColorStatus()
 {
 }
 
-bool BorderColorStatus::statusChanged( const css::frame::FeatureStateEvent& rEvent )
+bool ColorStatus::statusChanged( const css::frame::FeatureStateEvent& rEvent )
 {
     Color aColor( COL_TRANSPARENT );
 
@@ -1975,7 +1975,7 @@ bool BorderColorStatus::statusChanged( const css::frame::FeatureStateEvent& rEve
     return false;
 }
 
-Color BorderColorStatus::GetColor()
+Color ColorStatus::GetColor()
 {
     bool bHasColor = maColor != COL_TRANSPARENT;
     bool bHasTLBRColor = maTLBRColor != COL_TRANSPARENT;
@@ -3172,7 +3172,7 @@ VclPtr<vcl::Window> SvxColorToolBoxControl::createPopupWindow( vcl::Window* pPar
     VclPtrInstance<SvxColorWindow> pColorWin(
                             m_aCommandURL,
                             m_xPaletteManager,
-                            m_aBorderColorStatus,
+                            m_aColorStatus,
                             m_nSlotId,
                             m_xFrame,
                             pParent,
@@ -3207,9 +3207,9 @@ void SvxColorToolBoxControl::statusChanged( const css::frame::FeatureStateEvent&
     {
         Color aColor( COL_TRANSPARENT );
 
-        if ( m_aBorderColorStatus.statusChanged( rEvent ) )
+        if ( m_aColorStatus.statusChanged( rEvent ) )
         {
-            aColor = m_aBorderColorStatus.GetColor();
+            aColor = m_aColorStatus.GetColor();
         }
         else if ( rEvent.IsEnabled )
         {
@@ -3710,7 +3710,7 @@ void SvxColorListBox::createColorWindow()
     m_xColorWindow = VclPtr<SvxColorWindow>::Create(
                             OUString() /*m_aCommandURL*/,
                             m_xPaletteManager,
-                            m_aBorderColorStatus,
+                            m_aColorStatus,
                             m_nSlotId,
                             xFrame,
                             this,
@@ -3810,7 +3810,7 @@ void ColorListBox::createColorWindow()
 
     m_xColorWindow.reset(new ColorWindow(
                             m_xPaletteManager,
-                            m_aBorderColorStatus,
+                            m_aColorStatus,
                             m_nSlotId,
                             xFrame,
                             m_pTopLevel,