summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/backgrnd.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-02-06 14:13:40 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-02-07 16:57:50 +0100
commit0d47e4c4949edfd2be6af733c43d93aef6978fb6 (patch)
treecee04777364f435d05874af299eea8f15b2277d8 /cui/source/tabpages/backgrnd.cxx
parent57151df80eb2d347a38263d8d40ca7968a2acb84 (diff)
SvxBackgroundTabPage: don't hide items in Show() methods
Change-Id: Icac851be692837873b177b4bd9a7c47d3d785702
Diffstat (limited to 'cui/source/tabpages/backgrnd.cxx')
-rw-r--r--cui/source/tabpages/backgrnd.cxx32
1 files changed, 21 insertions, 11 deletions
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 )