tweak things to allow switching between small and large toolbar icons

Change-Id: Ife4da4c6f4acc3b3f9fde18cdfc09635cf9b6776

6 files changed, 12 insertions, 14 deletions

diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index c8bb5cff7de4..1b447be68c85 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -490,12 +490,12 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
     return 0L;
 }
 
-ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
+void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet)
 {
     sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
         nN = IMG_ADDFIELD_DLG_LC;
-    return ImageList(ModuleRes(nN));
+    m_aActions.SetImageList(ImageList(ModuleRes(nN)));
 }
 
 void OAddFieldWindow::resizeControls(const Size& _rDiff)
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 3d22579bdd14..d41009d02d3a 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -365,7 +365,6 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
     return 0L;
 }
 
-
 void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
 {
     if ( _nCommandId == SID_ATTR_CHAR_COLOR2 )
@@ -376,12 +375,12 @@ void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
     m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor );
 }
 
-ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
+void Condition::setImageList(sal_Int16 _eBitmapSet)
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
         nN = IMG_CONDFORMAT_DLG_LC;
-    return ImageList(ModuleRes(nN));
+    m_aActions.SetImageList(ImageList(ModuleRes(nN)));
 }
 
 void Condition::resizeControls(const Size& _rDiff)
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 2e1b66db3e46..b28b43ab3537 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -98,11 +98,11 @@ namespace rptui
         Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
         virtual ~Condition();
 
-        /** will be called when the id of the image list is needed.
+        /** will be called when the id of the image list needs to change.
             @param  _eBitmapSet
                 <svtools/imgdef.hxx>
         */
-        virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE;
+        virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
 
         /** will be called when the controls need to be resized.
         */
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index c25262f56c70..a77fcadb1cc8 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1404,15 +1404,14 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
     }
 }
 
-ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const
+void OGroupsSortingDialog::setImageList(sal_Int16 _eBitmapSet)
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
         nN = IMG_CONDFORMAT_DLG_LC;
-    return ImageList(ModuleRes( nN ));
+    m_aToolBox.SetImageList(ImageList(ModuleRes(nN)));
 }
 
-
 void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
 {
     // we use large images so we must change them
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 524c08abe87c..3c188f925d4c 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -94,11 +94,11 @@ public:
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getSelectedFieldDescriptors();
 
-    /** will be called when the id of the image list is needed.
+    /** will be called when the id of the image list needs to change.
         @param  _eBitmapSet
             <svtools/imgdef.hxx>
     */
-    virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE;
+    virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
 
     /** will be called when the controls need to be resized.
     */
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index a36d64e6594c..feb4d4d42436 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -172,11 +172,11 @@ public:
         */
         virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE;
 
-        /** will be called when the image list is needed.
+        /** will be called when the image list needs to change
             @param  _eSymbolsSize
                 <svtools/imgdef.hxx>
         */
-    virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const SAL_OVERRIDE;
+    virtual void setImageList(sal_Int16 _eSymbolsSize) SAL_OVERRIDE;
 
     // ImageListProvider interface
     virtual ImageList getImageList(vcl::ImageListType) SAL_OVERRIDE;