1 files changed, 15 insertions, 19 deletions

diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 771836c6ccd56..3519990157111 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olmenu.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,13 +32,12 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#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 +47,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>
@@ -64,13 +60,13 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/dlgutil.hxx>
-#include <svtools/itemset.hxx>
-#include <svx/langitem.hxx>
-#include <svx/splwrap.hxx>
+#include <svl/itemset.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/splwrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svx/acorrcfg.hxx>
+#include <unotools/lingucfg.hxx>
+#include <editeng/acorrcfg.hxx>
 #include <swmodule.hxx>
 #include <cmdid.h>
 #include <helpid.h>
@@ -92,7 +88,7 @@
 // <- #111827#
 
 #include <unomid.h>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <map>
 #include <svtools/langtab.hxx>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
@@ -100,8 +96,8 @@
 #include <sfx2/sfxdlg.hxx>
 #include "swabstdlg.hxx"
 #include "chrdlg.hrc"
-#include <svx/brshitem.hxx>
-#include <svtools/stritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <svl/stritem.hxx>
 #include <viewopt.hxx>
 #include <uitool.hxx>
 
@@ -358,7 +354,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() );
     }