diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-01 13:02:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-01 13:02:41 +0000 |
| commit | 9a39b4c946f59981975d3cd4556185168192874b (patch) | |
| tree | 0a0b39a27836650e8fa05d2cbbcfb93e310477c8 /starmath | |
| parent | d9edcfa76c3f46d94bf5adfd9e18655c4cac12b1 (diff) | |
unroll SmEditWindow::GetEditEngineItemPool
Change-Id: Iaf7a7c65109864f429ab5cc6848a12a37421afa1
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/edit.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/edit.cxx | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 286078af3e1b..5fb4ec1dcdaa 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -82,8 +82,6 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper void InvalidateSlots(); void UpdateStatus(bool bSetDocModified); - SfxItemPool* GetEditEngineItemPool(); - public: explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); virtual ~SmEditWindow() override; diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 47ecd52d58ec..89275bb3dceb 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -199,13 +199,6 @@ EditEngine * SmEditWindow::GetEditEngine() return pEditEng; } - -SfxItemPool * SmEditWindow::GetEditEngineItemPool() -{ - SmDocShell *pDoc = GetDoc(); - return pDoc ? &pDoc->GetEditEngineItemPool() : nullptr; -} - void SmEditWindow::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ) { // Note: SetBackground still done in SmEditWindow::DataChanged @@ -226,10 +219,10 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) // the application font thus we use this one too SetPointFont(*this, aSettings.GetFieldFont() /*aSettings.GetAppFont()*/); - EditEngine *pEditEngine = GetEditEngine(); - SfxItemPool *pEditEngineItemPool = GetEditEngineItemPool(); + EditEngine *pEditEngine = GetEditEngine(); + SmDocShell *pDoc = GetDoc(); - if (pEditEngine && pEditEngineItemPool) + if (pEditEngine && pDoc) { //! //! see also SmDocShell::GetEditEngine() ! @@ -237,7 +230,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) pEditEngine->SetDefTab(sal_uInt16(GetTextWidth("XXXX"))); - SetEditEngineDefaultFonts(*pEditEngineItemPool); + SetEditEngineDefaultFonts(pDoc->GetEditEngineItemPool()); // forces new settings to be used // unfortunately this resets the whole edit engine |