From 0d47e4c4949edfd2be6af733c43d93aef6978fb6 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Wed, 6 Feb 2013 14:13:40 +0100
Subject: SvxBackgroundTabPage: don't hide items in Show() methods

Change-Id: Icac851be692837873b177b4bd9a7c47d3d785702
---
 cui/source/inc/backgrnd.hxx      |  2 ++
 cui/source/tabpages/backgrnd.cxx | 32 +++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'cui')

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 42975d96ece1..b70732bfce69 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -125,7 +125,9 @@ private:
 #ifdef _SVX_BACKGRND_CXX
     void                FillColorValueSets_Impl();
     void                ShowColorUI_Impl();
+    void                HideColorUI_Impl();
     void                ShowBitmapUI_Impl();
+    void                HideBitmapUI_Impl();
     sal_Bool                LoadLinkedGraphic_Impl();
     void                RaiseLoadError_Impl();
     void                SetGraphicPosition_Impl( SvxGraphicPosition ePos );
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 4f3f0ff37646..6715f6f02e7e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1165,18 +1165,9 @@ void SvxBackgroundTabPage::ShowColorUI_Impl()
 {
     if (!m_pBackGroundColorFrame->IsVisible())
     {
+        HideBitmapUI_Impl();
         m_pBackGroundColorFrame->Show();
 
-        m_pBtnPreview->Hide();
-
-        m_pFileFrame->Hide();
-
-        m_pTypeFrame->Hide();
-
-        m_pPreviewWin2->Hide();
-
-        m_pGraphTransFrame->Hide();
-
         if(bColTransparency)
         {
             m_pColTransFT->Show();
@@ -1185,6 +1176,11 @@ void SvxBackgroundTabPage::ShowColorUI_Impl()
     }
 }
 
+void SvxBackgroundTabPage::HideColorUI_Impl()
+{
+        m_pBackGroundColorFrame->Hide();
+}
+
 //------------------------------------------------------------------------
 
 void SvxBackgroundTabPage::ShowBitmapUI_Impl()
@@ -1199,7 +1195,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
     if (m_pLbSelect->IsVisible() &&
          (m_pBackGroundColorFrame->IsVisible() || !m_pFileFrame->IsVisible()))
     {
-        m_pBackGroundColorFrame->Hide();
+        HideColorUI_Impl();
 
         m_pBtnPreview->Show();
 
@@ -1216,6 +1212,20 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
     }
 }
 
+void SvxBackgroundTabPage::HideBitmapUI_Impl()
+{
+        m_pBtnPreview->Hide();
+
+        m_pFileFrame->Hide();
+
+        m_pTypeFrame->Hide();
+
+        m_pPreviewWin2->Hide();
+
+        m_pGraphTransFrame->Hide();
+}
+
+
 //------------------------------------------------------------------------
 
 void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
-- 
cgit v1.2.3