refactor ValueSet to use RenderContext

Change-Id: I3985804f8cfd1b6807bc02bef5af3e24e5cb3cbf

5 files changed, 16 insertions, 10 deletions

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index acfd88125efc..e7e003356a7d 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1349,9 +1349,9 @@ void SwColumnPage::SetInSection(bool bSet)
     m_pTextDirectionLB->Show(bSet);
 }
 
-void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+void ColumnValueSet::UserDraw(const UserDrawEvent& rUDEvt)
 {
-    OutputDevice*  pDev = rUDEvt.GetDevice();
+    OutputDevice* pDev = rUDEvt.GetDevice();
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
     Rectangle aRect = rUDEvt.GetRect();
@@ -1419,7 +1419,8 @@ void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
          (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
     {
-        Format();
+        SetFormat();
+        Invalidate();
     }
     ValueSet::DataChanged( rDCEvt );
 }
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index db1c85693c66..2c37741b69f0 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -66,7 +66,8 @@ PageColumnControl::PageColumnControl(
     mpColumnValueSet->SetSelectHdl( LINK(this, PageColumnControl,ImplColumnHdl ) );
     mpColumnValueSet->Show();
     mpColumnValueSet->SelectItem( mnColumnType );
-    mpColumnValueSet->Format();
+    mpColumnValueSet->SetFormat();
+    mpColumnValueSet->Invalidate();
     mpColumnValueSet->StartSelection();
 
     maMoreButton->SetClickHdl( LINK( this, PageColumnControl, MoreButtonClickHdl_Impl ) );
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 4293b0376ebf..5a806688e75a 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -318,8 +318,8 @@ void PageMarginControl::SelectValueSetItem()
     {
         mpMarginValueSet->SelectItem(0);
     }
-
-    mpMarginValueSet->Format();
+    mpMarginValueSet->SetFormat();
+    mpMarginValueSet->Invalidate();
     mpMarginValueSet->StartSelection();
 };
 
@@ -405,7 +405,8 @@ IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
-    mpMarginValueSet->Format();
+    mpMarginValueSet->SetFormat();
+    mpMarginValueSet->Invalidate();
     mpMarginValueSet->StartSelection();
 
     mnPageLeftMargin = GetCoreValue( *maLeftMarginEdit.get(), meUnit );
@@ -419,7 +420,8 @@ IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
-    mpMarginValueSet->Format();
+    mpMarginValueSet->SetFormat();
+    mpMarginValueSet->Invalidate();
     mpMarginValueSet->StartSelection();
 
     mnPageTopMargin = GetCoreValue( *maTopMarginEdit.get(), meUnit );
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 3bc07bbbdaf4..1c3dc3566cd5 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -55,7 +55,8 @@ PageOrientationControl::PageOrientationControl(
     mpOrientationValueSet->Show();
     mpOrientationValueSet->SelectItem( mbLandscape ? 2 : 1 );
     mpOrientationValueSet->GrabFocus();
-    mpOrientationValueSet->Format();
+    mpOrientationValueSet->SetFormat();
+    mpOrientationValueSet->Invalidate();
     mpOrientationValueSet->StartSelection();
 
     FreeResource();
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 0b287f8a5299..48f1b0a6d6c1 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -132,7 +132,8 @@ PageSizeControl::PageSizeControl(
     mpSizeValueSet->Show();
 
     mpSizeValueSet->SelectItem( nSelectedItem );
-    mpSizeValueSet->Format();
+    mpSizeValueSet->SetFormat();
+    mpSizeValueSet->Invalidate();
     mpSizeValueSet->StartSelection();
 
     maMoreButton->SetClickHdl( LINK( this, PageSizeControl, MoreButtonClickHdl_Impl ) );