fdo#62699 drop pass-through header svx/svdattrx.hxx

includes some sorting of the includes

Change-Id: Iba41991552674f76b902dbc7b4b3ada992aee69e
Reviewed-on: https://gerrit.libreoffice.org/4626
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>

3 files changed, 46 insertions, 30 deletions

diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 1b691830f0b1..2db5c338fea7 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -17,26 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
-#include <tools/shl.hxx>
-#include "svx/ofaitem.hxx"
 #include <sfx2/request.hxx>
-#include <svx/dialogs.hrc>
+#include <tools/shl.hxx>
 
-#include <svx/svdoedge.hxx>
+#include <svx/connctrl.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dlgutil.hxx>
+#include <svx/ofaitem.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
+#include <svx/svdoedge.hxx>
 #include <svx/svdview.hxx>
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxenditm.hxx>
 
-#include "svx/connctrl.hxx"
-#include "connect.hxx"
 #include "connect.hrc"
-#include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
-
+#include "connect.hxx"
 #include "paragrph.hrc"
-#include <cuires.hrc>
 
 static sal_uInt16 pRanges[] =
 {
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 819dd2a2d1e8..0f3720a3c455 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -18,20 +18,25 @@
  */
 
 #include <comphelper/string.hxx>
-#include <tools/shl.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <swpossizetabpage.hxx>
+#include <tools/shl.hxx>
+
 #include <svx/dialogs.hrc>
+#include <svx/svddef.hxx>
+#include <svx/sxcaitm.hxx>
+#include <svx/sxcecitm.hxx>
+#include <svx/sxcgitm.hxx>
+#include <svx/sxcllitm.hxx>
+#include <svx/sxctitm.hxx>
 
-#include <svx/svdattrx.hxx>
-#include <cuires.hrc>
-#include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
-#include "transfrm.hxx"
-
 #include "labdlg.hrc"
 #include "labdlg.hxx"
+#include "transfrm.hxx"
 
 // define ----------------------------------------------------------------
 
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9575041e4d15..96d05dbe27ef 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -17,26 +17,36 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
+#include <sfx2/request.hxx>
 #include <tools/shl.hxx>
 
-#include <cuires.hrc>
-
-#include <svx/svdomeas.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dlgutil.hxx>
+#include <svx/measctrl.hxx>
+#include <svx/ofaitem.hxx>
+#include <svx/strarray.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
+#include <svx/svdomeas.hxx>
 #include <svx/svdview.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
-#include "svx/measctrl.hxx"
-#include "measure.hxx"
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxenditm.hxx>
+#include <svx/sxmbritm.hxx>
+#include <svx/sxmfsitm.hxx>
+#include <svx/sxmlhitm.hxx>
+#include <svx/sxmsuitm.hxx>
+#include <svx/sxmtfitm.hxx>
+#include <svx/sxmtpitm.hxx>
+#include <svx/sxmtritm.hxx>
+#include <svx/sxmuitm.hxx>
+
 #include "measure.hrc"
-#include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
-#include <svx/strarray.hxx>
-#include <sfx2/request.hxx>
-#include "svx/ofaitem.hxx"
+#include "measure.hxx"
 
 static sal_uInt16 pRanges[] =
 {