sc/source/ui/condformat/condformatdlgentry.cxx | 4 ++-- sc/source/ui/condformat/condformatmgr.cxx | 8 ++++---- vcl/inc/vcl/dialog.hxx | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-)
New commits: commit 4dead7b1e54d3a0441a1eb6a7c067e3c8a9d9f5b Author: Markus Mohrhard <[email protected]> Date: Mon Dec 3 21:02:50 2012 +0100 hide the manage cond format dialog when opening the cond format dlg Change-Id: Iee1e8344610e42f22c405c698fdfd82d59ca836e diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 295a83e..5a5ea1b 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/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; diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 69ba0b5..3700c8b 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/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 &); commit 2b9ba386d897e1ee53589b5a4a22918f6b5fd5e7 Author: Markus Mohrhard <[email protected]> Date: Mon Dec 3 21:02:05 2012 +0100 workaround strange crash in dynamically created ref edit fields Change-Id: I8fc509e2e7f6e52209d49d7c866744dd2d3ba000 diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index f648bea..fe2d0e3 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -162,8 +162,8 @@ void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), - maEdVal1( this, static_cast<ScAnyRefDlg*>(pParent->GetParent()), ScResId( ED_VAL1 ) ), - maEdVal2( this, static_cast<ScAnyRefDlg*>(pParent->GetParent()), ScResId( ED_VAL2 ) ), + maEdVal1( this, NULL, ScResId( ED_VAL1 ) ), + maEdVal2( this, NULL, ScResId( ED_VAL2 ) ), maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), maWdPreview( this, ScResId( WD_PREVIEW ) ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
