diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-22 15:59:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-24 18:19:29 +0100 |
| commit | f920e86fbf3968104e1dfc0e9934e80652ed0837 (patch) | |
| tree | 01f8ed9c445821739b9709c5fee6e51eab0ae24d /sw | |
| parent | da881f38c088c439f034e340bbbb4ca53e67389f (diff) | |
weld SvxSearchDialog
I have to use the other way to specify an a11y role, both are implemented in
the vcl parser, but in my gtk3-3.24.7 the role tag crashes the gtk parser,
while the other route works fine.
The CONTENT_FLOWS_TO accessibility relation is another additional complexity
over the norm
Change-Id: Ia096bcbe9f00f9944e4e4d5ad9bb1a52d19c7b3f
Reviewed-on: https://gerrit.libreoffice.org/69569
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/fldui/fldtdlg.cxx | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 672184d863a6..72ccc90b7acd 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -655,7 +655,7 @@ SwCursor* SwShellCursor::Create( SwPaM* pRing ) const short SwShellCursor::MaxReplaceArived() { short nRet = RET_YES; - vcl::Window* pDlg = SwView::GetSearchDialog(); + SvxSearchDialog* pDlg = SwView::GetSearchDialog(); if( pDlg ) { // Terminate old actions. The table-frames get constructed and @@ -671,7 +671,7 @@ short SwShellCursor::MaxReplaceArived() } vActionCounts.push_back(nActCnt); } - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pDlg->GetFrameWeld(), "modules/swriter/ui/asksearchdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pDlg->getDialog(), "modules/swriter/ui/asksearchdialog.ui")); std::unique_ptr<weld::MessageDialog> xDialog(xBuilder->weld_message_dialog("AskSearchDialog")); nRet = xDialog->run(); auto pActionCount = vActionCounts.begin(); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index cade4bbc0bd1..d7acc4f5aa0b 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -204,8 +204,6 @@ void SwFieldDlg::ReInitTabPage(const OString& rPageId, bool bOnlyActivate) // newly initialise after activation of a few TabPages void SwFieldDlg::Activate() { - fprintf(stderr, "SwFieldDlg::Activate()\n"); - SwView* pView = ::GetActiveView(); if( pView ) { |