LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-08-15 20:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

calc: Make the GotoSheet dialog async

Browse Source 
Also enable the JSDialog

Signed-off-by: Hubert Figuière <hub@collabora.com>
Change-Id: Ibc6a54ad685052cf904032e6606f506332db6806
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188017
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 4ff3274972)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188037
Tested-by: Jenkins
This commit is contained in:
Hubert Figuière
2025-07-17 12:07:10 -04:00
committed by Miklos Vajna
parent adc6db8376
commit 46c2581503
3 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/source/ui/inc/tabvwsh.hxx
View File

@ -421,6 +421,8 @@ public:
void FinishProtectTable();
void ExecProtectTable( SfxRequest& rReq );
void ExecGoToTab( SfxRequest& rReq, SfxBindings& rBindings );
using ScTabView::ShowCursor;
bool IsActive() const { return bIsActive; }

122
sc/source/ui/view/tabvwsh3.cxx
View File

@ -171,6 +171,77 @@ namespace
}
}
void ScTabViewShell::ExecGoToTab( SfxRequest& rReq, SfxBindings& rBindings )
{
SCTAB nTab;
ScViewData& rViewData = GetViewData();
ScDocument& rDoc = rViewData.GetDocument();
SCTAB nTabCount = rDoc.GetTableCount();
const SfxItemSet* pReqArgs = rReq.GetArgs();
sal_uInt16 nSlot = rReq.GetSlot();
if ( pReqArgs ) // command from Navigator with nTab
{
// sheet for basic is one-based
nTab = static_cast<const SfxUInt16Item&>(pReqArgs->Get(nSlot)).GetValue() - 1;
if ( nTab < nTabCount )
{
SetTabNo( nTab );
rBindings.Update( nSlot );
if( ! rReq.IsAPI() )
rReq.Done();
}
}
else // command from Menu: ask for nTab
{
auto xRequest = std::make_shared<SfxRequest>(rReq);
rReq.Ignore();
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
VclPtr<AbstractScGoToTabDlg> pDlg(pFact->CreateScGoToTabDlg(GetFrameWeld()));
pDlg->SetDescription(
ScResId( STR_DLG_SELECTTABLE_TITLE ),
ScResId( STR_DLG_SELECTTABLE_MASK ),
ScResId( STR_DLG_SELECTTABLE_LBNAME ),
GetStaticInterface()->GetSlot(SID_CURRENTTAB)->GetCommand(), HID_GOTOTABLEMASK, HID_GOTOTABLE );
// fill all table names and select current tab
OUString aTabName;
for( nTab = 0; nTab < nTabCount; ++nTab )
{
if( rDoc.IsVisible( nTab ) )
{
rDoc.GetName( nTab, aTabName );
pDlg->Insert( aTabName, rViewData.GetTabNo() == nTab );
}
}
pDlg->StartExecuteAsync([this, nTab, nTabCount, pDlg,
xRequest=std::move(xRequest)](sal_Int32 response) {
if( response == RET_OK )
{
auto nTab2 = nTab;
if( !GetViewData().GetDocument().GetTable( pDlg->GetSelectedEntry(), nTab2 ) )
nTab2 = nTabCount;
if ( nTab2 < nTabCount )
{
SetTabNo( nTab2 );
if ( !xRequest->IsAPI() )
xRequest->Done();
}
}
else
{
xRequest->Ignore();
}
pDlg->disposeOnce();
});
}
}
void ScTabViewShell::FinishProtectTable()
{
TabChanged();
@ -638,56 +709,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_CURRENTTAB:
{
SCTAB nTab;
ScViewData& rViewData = GetViewData();
ScDocument& rDoc = rViewData.GetDocument();
SCTAB nTabCount = rDoc.GetTableCount();
if ( pReqArgs ) // command from Navigator with nTab
{
// sheet for basic is one-based
nTab = static_cast<const SfxUInt16Item&>(pReqArgs->Get(nSlot)).GetValue() - 1;
}
else // command from Menu: ask for nTab
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
ScopedVclPtr<AbstractScGoToTabDlg> pDlg(pFact->CreateScGoToTabDlg(GetFrameWeld()));
pDlg->SetDescription(
ScResId( STR_DLG_SELECTTABLE_TITLE ),
ScResId( STR_DLG_SELECTTABLE_MASK ),
ScResId( STR_DLG_SELECTTABLE_LBNAME ),
GetStaticInterface()->GetSlot(SID_CURRENTTAB)->GetCommand(), HID_GOTOTABLEMASK, HID_GOTOTABLE );
// fill all table names and select current tab
OUString aTabName;
for( nTab = 0; nTab < nTabCount; ++nTab )
{
if( rDoc.IsVisible( nTab ) )
{
rDoc.GetName( nTab, aTabName );
pDlg->Insert( aTabName, rViewData.GetTabNo() == nTab );
}
}
if( pDlg->Execute() == RET_OK )
{
if( !rDoc.GetTable( pDlg->GetSelectedEntry(), nTab ) )
nTab = nTabCount;
pDlg.disposeAndClear();
}
else
{
rReq.Ignore();
}
}
if ( nTab < nTabCount )
{
SetTabNo( nTab );
rBindings.Update( nSlot );
if( ! rReq.IsAPI() )
rReq.Done();
}
ExecGoToTab( rReq, rBindings );
//! otherwise an error ?
}
break;

1
vcl/jsdialog/enabled.cxx
View File

@ -155,6 +155,7 @@ constexpr auto ScalcDialogList
{ u"modules/scalc/ui/formatcellsdialog.ui" },
{ u"modules/scalc/ui/fourieranalysisdialog.ui" },
{ u"modules/scalc/ui/goalseekdlg.ui" },
{ u"modules/scalc/ui/gotosheetdialog.ui" },
{ u"modules/scalc/ui/groupdialog.ui" },
{ u"modules/scalc/ui/headerfootercontent.ui" },
{ u"modules/scalc/ui/headerfooterdialog.ui" },