summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-04-06 17:28:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-04-06 21:46:05 +0200
commitc2c5b1f7558004aa0d3541b7c4ffadc5d6bad331 (patch)
tree9e378ae5f69e27d354b01d1f63e23014493c6513 /include
parentb5b27f017b08ad4fbc67222a36f71933aa5a47dd (diff)
remove Application::GetDefDialogParent call in editeng
and pass in an explicit parent to use Change-Id: I1aa768ec5ac13b2097b78499f964a3590a0ac14e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113695 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/editeng/editview.hxx6
-rw-r--r--include/editeng/edtdlg.hxx2
-rw-r--r--include/editeng/outliner.hxx7
-rw-r--r--include/editeng/splwrap.hxx6
4 files changed, 11 insertions, 10 deletions
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 97b7bb2df3c5..41cf529a81a2 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -287,12 +287,12 @@ public:
void CompleteAutoCorrect( vcl::Window const * pFrameWin = nullptr );
- EESpellState StartSpeller( bool bMultipleDoc = false );
- EESpellState StartThesaurus();
+ EESpellState StartSpeller(weld::Widget* pDialogParent, bool bMultipleDoc = false);
+ EESpellState StartThesaurus(weld::Widget* pDialogParent);
sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem );
// for text conversion
- void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
+ void StartTextConversion(weld::Widget* pDialogParent, LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc);
void TransliterateText( TransliterationFlags nTransliterationMode );
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index a9f616627aa3..15b591a41ff9 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -97,7 +97,7 @@ public:
css::uno::Reference<css::linguistic2::XThesaurus> xThesaurus,
const OUString &rWord, LanguageType nLanguage) = 0;
- virtual VclPtr<AbstractHyphenWordDialog> CreateHyphenWordDialog(weld::Window*,
+ virtual VclPtr<AbstractHyphenWordDialog> CreateHyphenWordDialog(weld::Widget*,
const OUString &rWord, LanguageType nLang,
css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper) = 0;
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index cf92acfbf283..870719fb89ce 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -55,6 +55,7 @@ class SvStream;
class SvxSearchItem;
class SvxFieldItem;
namespace vcl { class Window; }
+namespace weld { class Widget; }
class KeyEvent;
class MouseEvent;
class CommandEvent;
@@ -278,12 +279,12 @@ public:
PointerStyle GetPointer( const Point& rPosPixel );
bool Command(const CommandEvent& rCEvt);
- void StartSpeller();
- EESpellState StartThesaurus();
+ void StartSpeller(weld::Widget* pDialogParent);
+ EESpellState StartThesaurus(weld::Widget* pDialogParent);
sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem );
// for text conversion
- void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
+ void StartTextConversion(weld::Widget* pDialogParent, LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc);
void TransliterateText( TransliterationFlags nTransliterationMode );
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index e9c719d45364..79d55d179be1 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -48,7 +48,7 @@ private:
friend class SvxHyphenWordDialog;
friend struct SvxHyphenWordDialog_Impl;
- weld::Window* pWin;
+ weld::Widget* pWin;
std::unique_ptr<weld::WaitObject> xWait;
css::uno::Reference<
css::uno::XInterface > xLast; // result of last spelling/hyphenation attempt
@@ -70,9 +70,9 @@ private:
void operator =(SvxSpellWrapper const &) = delete;
public:
- SvxSpellWrapper( weld::Window* pWn,
+ SvxSpellWrapper( weld::Widget* pWn,
const bool bStart, const bool bIsAllRight );
- SvxSpellWrapper( weld::Window* pWn,
+ SvxSpellWrapper( weld::Widget* pWn,
css::uno::Reference< css::linguistic2::XHyphenator > const &xHyphenator,
const bool bStart, const bool bOther );