3 files changed, 17 insertions, 18 deletions
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 3df94b9e6e31..b6fd12cfc497 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -50,9 +50,9 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svx/unolingu.hxx>
-#include <svx/langitem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <hhcwrp.hxx>
@@ -106,12 +106,12 @@ public:
         //!! hack to transport the current conversion direction state settings
         //!! into the next incarnation that iterates over the drawing objets
         //!! ( see SwHHCWrapper::~SwHHCWrapper() )
-        svx::HangulHanjaConversion::SetUseSavedConversionDirectionState( sal_True );
+        editeng::HangulHanjaConversion::SetUseSavedConversionDirectionState( sal_True );
     }
 
     ~SwKeepConversionDirectionStateContext()
     {
-        svx::HangulHanjaConversion::SetUseSavedConversionDirectionState( sal_False );
+        editeng::HangulHanjaConversion::SetUseSavedConversionDirectionState( sal_False );
     }
 };
 
@@ -126,7 +126,7 @@ SwHHCWrapper::SwHHCWrapper(
         sal_Int32 nConvOptions,
         sal_Bool bIsInteractive,
         sal_Bool bStart, sal_Bool bOther, sal_Bool bSelection ) :
-    svx::HangulHanjaConversion( &pSwView->GetEditWin(), rxMSF,
+    editeng::HangulHanjaConversion( &pSwView->GetEditWin(), rxMSF,
                                 SvxCreateLocale( nSourceLanguage ),
                                 SvxCreateLocale( nTargetLanguage ),
                                 pTargetFont,
@@ -651,7 +651,7 @@ void SwHHCWrapper::Convert()
             // at the begin of the paragraph to solve the problem, i.e. have the
             // TextConversion service get those charcters together in the same call.
             xub_StrLen nStartIdx = STRING_MAXLEN;
-            if (svx::HangulHanjaConversion::IsChinese( GetSourceLanguage() ) )
+            if (editeng::HangulHanjaConversion::IsChinese( GetSourceLanguage() ) )
                 nStartIdx = 0;
             else
             {
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index be469f14db1b..6e26cea883b5 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -40,8 +40,7 @@
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
 #include <svtools/filter.hxx>
-#include <svx/impgrf.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/imagemgr.hxx>
 #include <osl/file.hxx>
@@ -51,7 +50,7 @@
 #include <linguistic/lngprops.hxx>
 #include <linguistic/misc.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
@@ -65,12 +64,12 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/dlgutil.hxx>
 #include <svl/itemset.hxx>
-#include <svx/langitem.hxx>
-#include <svx/splwrap.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/splwrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
-#include <svx/acorrcfg.hxx>
+#include <editeng/acorrcfg.hxx>
 #include <swmodule.hxx>
 #include <cmdid.h>
 #include <helpid.h>
@@ -100,7 +99,7 @@
 #include <sfx2/sfxdlg.hxx>
 #include "swabstdlg.hxx"
 #include "chrdlg.hrc"
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svl/stritem.hxx>
 #include <viewopt.hxx>
 #include <uitool.hxx>
@@ -358,7 +357,7 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
 #endif
     Graphic aGraphic;
     const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
-    if( GRFILTER_OK == LoadGraphic( aTmp, aFilterName, aGraphic ) )
+    if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
     {
         aRes = Image( aGraphic.GetBitmapEx() );
     }
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index 46d38f53cad0..b7b5d133b9bb 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -33,17 +33,17 @@
 #include <hintids.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <sfx2/printer.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <linguistic/lngprops.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <svx/svdview.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <sdrhhcwrap.hxx>
 #include <frmfmt.hxx>