diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-19 04:37:03 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-23 06:25:32 +0100 |
commit | b3d22ae4ca7ad191f6f807c72660b78d3ac6e833 (patch) | |
tree | a650871e7329c5af11996d387c36ffcf2c965e3f /sc/source/ui/view | |
parent | 1e6ad2af4bfd14f96926cd976fb2edb626de3d10 (diff) |
ManageNames: make Define Name dialog work again
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r-- | sc/source/ui/view/cellsh.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 11 | ||||
-rw-r--r-- | sc/source/ui/view/formatsh.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/reffact.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwshc.cxx | 21 |
6 files changed, 39 insertions, 3 deletions
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index ac2bdccfae55..e781ffa69ca7 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -979,6 +979,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) case FID_DEFINE_NAME: case FID_INSERT_NAME: + case FID_ADD_NAME: case SID_DEFINE_COLROWNAMERANGES: { if ( pDocSh && pDocSh->IsDocShared() ) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index ea4be5ef9659..a9ca03b794b7 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -143,6 +143,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) switch ( nSlot ) { case FID_DEFINE_NAME: + case FID_ADD_NAME: case FID_USE_NAME: case FID_INSERT_NAME: case SID_SPELL_DIALOG: @@ -1744,6 +1745,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); } break; + case FID_ADD_NAME: + { + std::cout << "temp" << std::endl; + sal_uInt16 nId = ScNameDefDlgWrapper::GetChildWindowId(); + SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); + SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); + + pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + } + break; case SID_DEFINE_COLROWNAMERANGES: { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index a4193f9d1b25..092a619e735c 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -929,6 +929,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) case SID_NUMBER_INCDEC: case SID_NUMBER_DECDEC: case FID_DEFINE_NAME: + case FID_ADD_NAME: case FID_USE_NAME: case FID_INSERT_NAME: case SID_SPELL_DIALOG: diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 5d3a99226d05..17410c0cc46f 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -50,6 +50,7 @@ // ----------------------------------------------------------------------- SFX_IMPL_MODELESSDIALOG(ScNameDlgWrapper, FID_DEFINE_NAME ) +SFX_IMPL_MODELESSDIALOG(ScNameDefDlgWrapper, FID_ADD_NAME ) SFX_IMPL_MODELESSDIALOG(ScSolverDlgWrapper, SID_OPENDLG_SOLVE ) SFX_IMPL_MODELESSDIALOG(ScOptSolverDlgWrapper, SID_OPENDLG_OPTSOLVER ) SFX_IMPL_MODELESSDIALOG(ScPivotLayoutWrapper, SID_OPENDLG_PIVOTTABLE ) @@ -120,6 +121,12 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); } //------------------------------------------------------------------------- IMPL_CHILD_CTOR( ScNameDlgWrapper, FID_DEFINE_NAME ) + // +//------------------------------------------------------------------------- +// ScNameDlgWrapper +//------------------------------------------------------------------------- + +IMPL_CHILD_CTOR( ScNameDefDlgWrapper, FID_ADD_NAME ) //------------------------------------------------------------------------- // ScSolverDlgWrapper diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 2c26815a01dc..f029ec75832c 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -70,6 +70,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId()); + SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScPivotLayoutWrapper::GetChildWindowId()); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index b337a4269531..2dca9766a0ee 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -49,6 +49,7 @@ #include "uiitems.hxx" #include "pivot.hxx" #include "namedlg.hxx" +#include "namedefdlg.hxx" #include "solvrdlg.hxx" #include "optsolver.hxx" #include "tabopdlg.hxx" @@ -70,6 +71,8 @@ #include "funcdesc.hxx" #include "dpobject.hxx" +#include <iostream> + //------------------------------------------------------------------ void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew ) @@ -109,9 +112,21 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( { case FID_DEFINE_NAME: pResult = new ScNameDlg( pB, pCW, pParent, GetViewData(), - ScAddress( GetViewData()->GetCurX(), - GetViewData()->GetCurY(), - GetViewData()->GetTabNo() ) ); + ScAddress( GetViewData()->GetCurX(), + GetViewData()->GetCurY(), + GetViewData()->GetTabNo() ) ); + break; + + case FID_ADD_NAME: + { + std::cout << "tabvwsh" << std::endl; + std::map<rtl::OUString, ScRangeName*> aRangeMap; + pDoc->GetRangeNameMap(aRangeMap); + pResult = new ScNameDefDlg( pB, pCW, pParent, GetViewData()->GetDocument(), aRangeMap, + ScAddress( GetViewData()->GetCurX(), + GetViewData()->GetCurY(), + GetViewData()->GetTabNo() ), true ); + } break; case SID_DEFINE_COLROWNAMERANGES: |