Kaydet (Commit) 0d47e4c4 authored tarafından Miklos Vajna's avatar Miklos Vajna

SvxBackgroundTabPage: don't hide items in Show() methods

Change-Id: Icac851be692837873b177b4bd9a7c47d3d785702
üst 57151df8
...@@ -125,7 +125,9 @@ private: ...@@ -125,7 +125,9 @@ private:
#ifdef _SVX_BACKGRND_CXX #ifdef _SVX_BACKGRND_CXX
void FillColorValueSets_Impl(); void FillColorValueSets_Impl();
void ShowColorUI_Impl(); void ShowColorUI_Impl();
void HideColorUI_Impl();
void ShowBitmapUI_Impl(); void ShowBitmapUI_Impl();
void HideBitmapUI_Impl();
sal_Bool LoadLinkedGraphic_Impl(); sal_Bool LoadLinkedGraphic_Impl();
void RaiseLoadError_Impl(); void RaiseLoadError_Impl();
void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); void SetGraphicPosition_Impl( SvxGraphicPosition ePos );
......
...@@ -1165,18 +1165,9 @@ void SvxBackgroundTabPage::ShowColorUI_Impl() ...@@ -1165,18 +1165,9 @@ void SvxBackgroundTabPage::ShowColorUI_Impl()
{ {
if (!m_pBackGroundColorFrame->IsVisible()) if (!m_pBackGroundColorFrame->IsVisible())
{ {
HideBitmapUI_Impl();
m_pBackGroundColorFrame->Show(); m_pBackGroundColorFrame->Show();
m_pBtnPreview->Hide();
m_pFileFrame->Hide();
m_pTypeFrame->Hide();
m_pPreviewWin2->Hide();
m_pGraphTransFrame->Hide();
if(bColTransparency) if(bColTransparency)
{ {
m_pColTransFT->Show(); m_pColTransFT->Show();
...@@ -1185,6 +1176,11 @@ void SvxBackgroundTabPage::ShowColorUI_Impl() ...@@ -1185,6 +1176,11 @@ void SvxBackgroundTabPage::ShowColorUI_Impl()
} }
} }
void SvxBackgroundTabPage::HideColorUI_Impl()
{
m_pBackGroundColorFrame->Hide();
}
//------------------------------------------------------------------------ //------------------------------------------------------------------------
void SvxBackgroundTabPage::ShowBitmapUI_Impl() void SvxBackgroundTabPage::ShowBitmapUI_Impl()
...@@ -1199,7 +1195,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl() ...@@ -1199,7 +1195,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
if (m_pLbSelect->IsVisible() && if (m_pLbSelect->IsVisible() &&
(m_pBackGroundColorFrame->IsVisible() || !m_pFileFrame->IsVisible())) (m_pBackGroundColorFrame->IsVisible() || !m_pFileFrame->IsVisible()))
{ {
m_pBackGroundColorFrame->Hide(); HideColorUI_Impl();
m_pBtnPreview->Show(); m_pBtnPreview->Show();
...@@ -1216,6 +1212,20 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl() ...@@ -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 ) void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment