From 35ec23fa290c877153cbf832526fa4d051a6981d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 23 Jun 2014 16:16:45 +0100
Subject: rename and rework SetCtrlPos to SetCtrlStyle

Change-Id: I5720f5f27ea5e7e9eefb6bfb53c30a52146c689e
---
 cui/source/dialogs/iconcdlg.cxx | 15 ++++-----------
 cui/source/inc/iconcdlg.hxx     |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index adc34ce3ee1b..a66bf09b730b 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -223,8 +223,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
     get(m_pIconCtrl, "icon_control");
     get(m_pTabContainer, "tab");
 
-    m_pIconCtrl->SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
-    SetCtrlPos();
+    SetCtrlStyle();
     m_pIconCtrl->SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
     m_pIconCtrl->Show();
     m_pIconCtrl->SetChoiceWithCursor ( true );
@@ -249,11 +248,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
     m_pCancelBtn->Show();
     m_pHelpBtn->Show();
     m_pResetBtn->Show();
-
-    m_pIconCtrl->ArrangeIcons();
 }
 
-
 IconChoiceDialog ::~IconChoiceDialog ()
 {
     // save configuration at INI-Manager
@@ -352,13 +348,10 @@ void IconChoiceDialog::Paint( const Rectangle& rRect )
     }
 }
 
-void IconChoiceDialog::SetCtrlPos()
+void IconChoiceDialog::SetCtrlStyle()
 {
-    WinBits aWinBits = m_pIconCtrl->GetStyle ();
-    aWinBits &= ~WB_ALIGN_TOP & ~WB_NOVSCROLL;
-    aWinBits |= WB_ALIGN_LEFT | WB_NOHSCROLL;
-    m_pIconCtrl->SetStyle ( aWinBits );
-
+    WinBits aWinBits = WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN | WB_ALIGN_LEFT | WB_NOHSCROLL;
+    m_pIconCtrl->SetStyle(aWinBits);
     m_pIconCtrl->ArrangeIcons();
 }
 
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 5cac100c5df5..8bc677c6af9e 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -217,7 +217,7 @@ public :
 
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
 
-    void                SetCtrlPos();
+    void                SetCtrlStyle();
 };
 
 #endif // INCLUDED_CUI_SOURCE_INC_ICONCDLG_HXX
-- 
cgit v1.2.3