[Libreoffice-commits] core.git: editeng/source include/editeng

[Bjoern Michaelsen]

 editeng/source/editeng/editdoc.cxx  |    2 +-
 editeng/source/editeng/editview.cxx |    2 +-
 editeng/source/editeng/impedit2.cxx |    4 ++--
 include/editeng/eerdll.hxx          |    2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 93412700af6a6f6b6caa645434b7f40c92a7615b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Mar 17 15:38:49 2017 +0100

    get rid of pointless EE_DLL macro
    
    Change-Id: Ide055b4c1c6d26e4ade1ceed0f3669c4cb7d8392
    Reviewed-on: https://gerrit.libreoffice.org/35369
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index b2b43909a160..86b9e89cb9bb 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -3075,7 +3075,7 @@ EditEngineItemPool::EditEngineItemPool( bool bPersistenRefCounts )
     SetVersionMap( 5, 3994, 4037, aV5Map );
     SetVersionMap( 6, 3994, 4038, aV6Map );
 
-    std::vector<SfxPoolItem*>* ppDefItems = EE_DLL().GetGlobalData()->GetDefItems();
+    std::vector<SfxPoolItem*>* ppDefItems = EditDLL::Get().GetGlobalData()->GetDefItems();
     SetDefaults( ppDefItems );
 }
 
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index ff4af8aef83a..07523d0220b9 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -854,7 +854,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
         Reference< linguistic2::XSpellAlternatives >  xSpellAlt =
                 xSpeller->spell( aSelected, pImpEditView->pEditEngine->pImpEditEngine->GetLanguage( aPaM2 ), aPropVals );
 
-        Reference< linguistic2::XLanguageGuessing >  xLangGuesser( EE_DLL().GetGlobalData()->GetLanguageGuesser() );
+        Reference< linguistic2::XLanguageGuessing >  xLangGuesser( EditDLL::Get().GetGlobalData()->GetLanguageGuesser() );
 
         // check if text might belong to a different language...
         LanguageType nGuessLangWord = LANGUAGE_NONE;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index d016813ec853..37cd711b5bad 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4295,13 +4295,13 @@ rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTabl
 {
     rtl::Reference<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
     if ( !xF.is() )
-        xF = EE_DLL().GetGlobalData()->GetForbiddenCharsTable();
+        xF = EditDLL::Get().GetGlobalData()->GetForbiddenCharsTable();
     return xF;
 }
 
 void ImpEditEngine::SetForbiddenCharsTable( const rtl::Reference<SvxForbiddenCharactersTable>& xForbiddenChars )
 {
-    EE_DLL().GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars );
+    EditDLL::Get().GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars );
 }
 
 svtools::ColorConfig& ImpEditEngine::GetColorConfig()
diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index 928f5603f96a..add71ce5adac 100644
--- a/include/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
@@ -51,8 +51,6 @@ public:
     static EditDLL& Get();
 };
 
-#define EE_DLL() EditDLL::Get()
-
 #define EE_RESSTR(x) EditResId(x).toString()
 
 #endif // INCLUDED_EDITENG_EERDLL_HXX