Hi,
in addition to my last patch for sd_unomodel.cxx I've removed an
unnecessary comment, more blank lines and reordered the #include lines.
There are at least three different stlpool.hxx in different directories
of LO, but it is included just as "#include <stlpool.hxx>". I think that
../../../../inc/bf_sd/stlpool.hxx is the one which is included, but I am
not sure. Shouldn't the line be changed to "#include
<bf_sd/stlpool.hxx>" then?
It's LGPLv3+/MPL.
Christina Rossmanith
>From 8e9393be1090319e41265c4b3f1a496184c8782a Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <chrrossman...@web.de>
Date: Mon, 7 Feb 2011 08:47:26 +0100
Subject: [PATCH] removed more blank lines/reordered #include's
---
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 40 ++++++++-------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 8ad5457..8d6bf07 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -28,10 +28,8 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-
#include <rtl/uuid.h>
#include <rtl/memory.h>
-
#include <bf_svx/unofield.hxx>
#include <bf_svx/UnoForbiddenCharsTable.hxx>
#include <bf_svx/forbiddencharacterstable.hxx>
@@ -39,41 +37,33 @@
#include <bf_svx/unoapi.hxx>
#include <bf_svx/unofill.hxx>
#include <bf_svx/svdorect.hxx>
-
-#include <toolkit/awt/vclxdevice.hxx>
-
-#include <bf_svtools/unoimap.hxx>
-
#include <bf_svx/unolingu.hxx>
#include <bf_svx/svdpagv.hxx>
#include <bf_svx/unoshape.hxx>
#include <bf_svx/unonrule.hxx>
-// #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
#include <bf_svx/xmleohlp.hxx>
#include <bf_svx/xmlgrhlp.hxx>
-
-#include "bf_sd/docshell.hxx"
-
-#include <UnoDocumentSettings.hxx>
-
+#include <bf_svtools/unoimap.hxx>
+#include <bf_sd/docshell.hxx>
+#include <toolkit/awt/vclxdevice.hxx>
#include <glob.hrc>
#include <sdresid.hxx>
#include <sdpage.hxx>
-
-#include "unohelp.hxx"
-#include <unolayer.hxx>
-#include <unopage.hxx>
-#include <unopres.hxx>
-#include <unocpres.hxx>
-#include <unoobj.hxx>
-#include <unostyls.hxx>
#include <stlpool.hxx>
-#include <unopback.hxx>
-#include <unogstyl.hxx>
-#include <unokywds.hxx>
#include <frmview.hxx>
-
+#include <unokywds.hxx>
+#include "UnoDocumentSettings.hxx"
+#include "unohelp.hxx"
+#include "unolayer.hxx"
+#include "unopage.hxx"
+#include "unopres.hxx"
+#include "unocpres.hxx"
+#include "unoobj.hxx"
+#include "unostyls.hxx"
+#include "unopback.hxx"
+#include "unogstyl.hxx"
#include <legacysmgr/legacy_binfilters_smgr.hxx>
+
namespace binfilter {
using namespace ::osl;
--
1.7.0.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice