Kaydet (Commit) 9a39b4c9 authored tarafından Caolán McNamara's avatar Caolán McNamara

unroll SmEditWindow::GetEditEngineItemPool

Change-Id: Iaf7a7c65109864f429ab5cc6848a12a37421afa1
üst d9edcfa7
...@@ -82,8 +82,6 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper ...@@ -82,8 +82,6 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
void InvalidateSlots(); void InvalidateSlots();
void UpdateStatus(bool bSetDocModified); void UpdateStatus(bool bSetDocModified);
SfxItemPool* GetEditEngineItemPool();
public: public:
explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
virtual ~SmEditWindow() override; virtual ~SmEditWindow() override;
......
...@@ -199,13 +199,6 @@ EditEngine * SmEditWindow::GetEditEngine() ...@@ -199,13 +199,6 @@ EditEngine * SmEditWindow::GetEditEngine()
return pEditEng; return pEditEng;
} }
SfxItemPool * SmEditWindow::GetEditEngineItemPool()
{
SmDocShell *pDoc = GetDoc();
return pDoc ? &pDoc->GetEditEngineItemPool() : nullptr;
}
void SmEditWindow::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ) void SmEditWindow::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg )
{ {
// Note: SetBackground still done in SmEditWindow::DataChanged // Note: SetBackground still done in SmEditWindow::DataChanged
...@@ -226,10 +219,10 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) ...@@ -226,10 +219,10 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
// the application font thus we use this one too // the application font thus we use this one too
SetPointFont(*this, aSettings.GetFieldFont() /*aSettings.GetAppFont()*/); SetPointFont(*this, aSettings.GetFieldFont() /*aSettings.GetAppFont()*/);
EditEngine *pEditEngine = GetEditEngine(); EditEngine *pEditEngine = GetEditEngine();
SfxItemPool *pEditEngineItemPool = GetEditEngineItemPool(); SmDocShell *pDoc = GetDoc();
if (pEditEngine && pEditEngineItemPool) if (pEditEngine && pDoc)
{ {
//! //!
//! see also SmDocShell::GetEditEngine() ! //! see also SmDocShell::GetEditEngine() !
...@@ -237,7 +230,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) ...@@ -237,7 +230,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
pEditEngine->SetDefTab(sal_uInt16(GetTextWidth("XXXX"))); pEditEngine->SetDefTab(sal_uInt16(GetTextWidth("XXXX")));
SetEditEngineDefaultFonts(*pEditEngineItemPool); SetEditEngineDefaultFonts(pDoc->GetEditEngineItemPool());
// forces new settings to be used // forces new settings to be used
// unfortunately this resets the whole edit engine // unfortunately this resets the whole edit engine
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment