hide the manage cond format dialog when opening the cond format dlg

Change-Id: Iee1e8344610e42f22c405c698fdfd82d59ca836e

sc/source/ui/condformat/condformatmgr.cxx

@@ -226,7 +226,7 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl)
     pScMod->SetRefDialog( nId, true );
     boost::scoped_ptr<ScCondFormatDlg> pDlg(new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(),
                                                pFormat->GetRange().GetTopLeftCorner(), condformat::dialog::NONE));
-    Disable();
+    Show(false, 0);
     if(pDlg->Execute() == RET_OK)
     {
         sal_Int32 nKey = pFormat->GetKey();
@@ -241,7 +241,7 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl)
         maCtrlManager.Update();
         mbModified = true;
     }
-    Enable();
+    Show(true, 0);
 
     pScMod->SetRefDialog( nId, false );
 
@@ -272,7 +272,7 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl)
     pScMod->SetRefDialog( nId, true );
     boost::scoped_ptr<ScCondFormatDlg> pDlg(new ScCondFormatDlg(this, mpDoc, NULL, ScRangeList(),
                                                maPos, condformat::dialog::CONDITION));
-    Disable();
+    Show(false, 0);
     if(pDlg->Execute() == RET_OK)
     {
         ScConditionalFormat* pNewFormat = pDlg->GetConditionalFormat();
@@ -285,7 +285,7 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl)
 
         mbModified = true;
     }
-    Enable();
+    Show(true, 0);
     pScMod->SetRefDialog( nId, false );
 
     return 0;

vcl/inc/vcl/dialog.hxx

@@ -154,12 +154,14 @@ public:
                     ModalDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
                     ModalDialog( Window* pParent, const ResId& rResId );
 
-private:
+protected:
     using Window::Show;
     void            Show( sal_Bool bVisible = sal_True );
     using Window::Hide;
     void            Hide();
 
+private:
+
     // Copy assignment is forbidden and not implemented.
     SAL_DLLPRIVATE         ModalDialog (const ModalDialog &);
     SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &);