[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - svx/inc sw/inc sw/source
Jürgen Schmidt
jsc at apache.org
Thu Mar 20 11:07:42 PDT 2014
svx/inc/svx/xflbmpit.hxx | 2 ++
sw/inc/fillattributes.hxx | 2 ++
sw/source/core/attr/format.cxx | 1 +
sw/source/core/attr/swatrset.cxx | 1 +
sw/source/core/bastyp/init.cxx | 1 +
sw/source/core/doc/docfly.cxx | 4 ++++
sw/source/core/doc/poolfmt.cxx | 1 +
sw/source/core/inc/frame.hxx | 1 +
sw/source/core/layout/atrfrm.cxx | 1 +
sw/source/core/layout/fillattributes.cxx | 2 ++
sw/source/core/layout/wsfrm.cxx | 2 +-
sw/source/core/unocore/unobrushitemhelper.cxx | 3 +++
sw/source/core/unocore/unoframe.cxx | 4 ++++
sw/source/core/unocore/unomap.cxx | 1 +
sw/source/core/unocore/unostyle.cxx | 1 +
sw/source/ui/app/docst.cxx | 1 +
sw/source/ui/app/docstyle.cxx | 5 +----
sw/source/ui/frmdlg/frmmgr.cxx | 1 +
sw/source/ui/shells/basesh.cxx | 1 +
19 files changed, 30 insertions(+), 5 deletions(-)
New commits:
commit 99a53df2de56dffb1cb46d1938b77aede8806cc1
Author: Jürgen Schmidt <jsc at apache.org>
Date: Thu Mar 20 16:31:01 2014 +0000
fix build breaker, missing includes
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index 299285d..08c589a 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -26,6 +26,8 @@
#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
+#include "svx/rectenum.hxx"
+
/*************************************************************************
|*
commit 58c90346f59a1db03e1d33db64c6793a33fc1228
Author: Jürgen Schmidt <jsc at apache.org>
Date: Thu Mar 20 16:30:37 2014 +0000
fix build breaker, missing includes
diff --git a/sw/inc/fillattributes.hxx b/sw/inc/fillattributes.hxx
index 33ec929..c9626ab 100755
--- a/sw/inc/fillattributes.hxx
+++ b/sw/inc/fillattributes.hxx
@@ -26,6 +26,8 @@
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <boost/shared_ptr.hpp>
+#include <tools/color.hxx>
+#include <svl/itemset.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index ee822e7..2a3d5f0 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -32,6 +32,7 @@
#include <fmtcolfunc.hxx>
//UUUU
#include <unobrushitemhelper.hxx>
+#include <svx/xdef.hxx>
TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 2dd4a38..ef4fa8a 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -45,6 +45,7 @@
#include <svx/svdpool.hxx>
#include <svx/sxenditm.hxx>
#include <svx/sdsxyitm.hxx>
+#include <editeng/editeng.hxx>
SwAttrPool::SwAttrPool( SwDoc* pD )
: SfxItemPool( String::CreateFromAscii(
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 066d0e8..44b623d 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -65,6 +65,7 @@
#ifndef _SVX_DIALOGS_HRC
#include <svx/dialogs.hrc>
#endif
+#include <svx/xdef.hxx>
#include <editeng/swafopt.hxx>
#include <editeng/svxacorr.hxx>
#include <unotools/charclass.hxx>
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 301b2ea..dca4c70 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -31,6 +31,10 @@
#include <svx/svdmodel.hxx>
#include <svx/svdocapt.hxx>
#include <svx/svdmark.hxx>
+#include <svx/xlndsit.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnedit.hxx>
+#include <svx/xflhtit.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
#include <fmtsrnd.hxx>
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 9a99bfd..55bb550 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -27,6 +27,7 @@
#include <hintids.hxx>
#include <i18npool/mslangid.hxx>
#include <unotools/localedatawrapper.hxx>
+#include <svx/xdef.hxx>
#include <editeng/paperinf.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/fontitem.hxx>
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 477d8bf..861b8d7 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -23,6 +23,7 @@
#ifndef SW_FRAME_HXX
#define SW_FRAME_HXX
+#include "boost/shared_ptr.hpp"
#include <svl/svarray.hxx>
#include "swtypes.hxx" // fuer SwTwips
#include "swrect.hxx"
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4ae107d..64d9aa8 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -51,6 +51,7 @@
#include <editeng/lrspitem.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
+#include <svl/itemiter.hxx>
#include <unosett.hxx>
#include <unostyle.hxx>
#include <fmtclds.hxx>
diff --git a/sw/source/core/layout/fillattributes.cxx b/sw/source/core/layout/fillattributes.cxx
index 33a2ba0..e8d1877 100755
--- a/sw/source/core/layout/fillattributes.cxx
+++ b/sw/source/core/layout/fillattributes.cxx
@@ -31,6 +31,8 @@
#include <drawinglayer/attribute/fillhatchattribute.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <svx/xfillit0.hxx>
+#include <vcl/graph.hxx>
+
//////////////////////////////////////////////////////////////////////////////
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index acba487..6489498 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -70,8 +70,8 @@
#include <cellfrm.hxx>
#include <dbg_lay.hxx>
#include <editeng/frmdiritem.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
+#include <svx/xdef.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/unocore/unobrushitemhelper.cxx b/sw/source/core/unocore/unobrushitemhelper.cxx
index 65ab4df..4fb8a5f 100644
--- a/sw/source/core/unocore/unobrushitemhelper.cxx
+++ b/sw/source/core/unocore/unobrushitemhelper.cxx
@@ -37,6 +37,9 @@
#include <svx/xflbstit.hxx>
#include <svx/xflboxy.hxx>
#include <svx/xflbckit.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xfltrit.hxx>
+#include <svx/xflhtit.hxx>
#include <svx/unoshape.hxx>
#include <hintids.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index e0237e9..25e0017 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -30,7 +30,11 @@
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/drawing/BitmapMode.hpp>
#include <svx/svxids.hrc>
+#include <svx/xflclit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xfltrit.hxx>
#include <editeng/memberids.hrc>
#include <swtypes.hxx>
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index a9fa159..85ca8e7 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -26,6 +26,7 @@
#include <hintids.hxx>
#include <svx/svxids.hrc>
+#include <svx/xdef.hxx>
#include <comphelper/TypeGeneration.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/text/PageNumberType.hpp>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 23c0f56..6b4f94f 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -69,6 +69,7 @@
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/drawing/BitmapMode.hpp>
#include <istyleaccess.hxx>
#include <GetMetricVal.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 8eb1932..de2d047 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -43,6 +43,7 @@
#include <svl/languageoptions.hxx>
#include <editeng/eeitem.hxx>
#include <svx/htmlmode.hxx>
+#include <svx/xdef.hxx>
#include <swmodule.hxx>
#include <wdocsh.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index b303634..204c7db 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -30,12 +30,11 @@
#include <hintids.hxx>
#include <svl/itemiter.hxx>
#include <svl/eitem.hxx>
+#include <svx/xdef.hxx>
#include <unotools/syslocale.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/numitem.hxx>
-// --> OD 2008-02-13 #newlistlevelattrs#
#include <editeng/lrspitem.hxx>
-// <--
#include <fmtcol.hxx>
#include <uitool.hxx>
#include <swmodule.hxx>
@@ -63,9 +62,7 @@
#include <numrule.hxx>
#include <fmthdft.hxx>
#include <svx/svxids.hrc>
-// --> OD 2008-02-12 #newlistlevelattrs#
#include <SwRewriter.hxx>
-// <--
// MD 06.02.95: Die Formatnamen in der Liste aller Namen haben als
// erstes Zeichen die Familie:
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index e1840cc..83e2249 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -35,6 +35,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/shaditem.hxx>
#include <svx/swframevalidation.hxx>
+#include <svx/xdef.hxx>
#include <fmtclds.hxx>
#include "wrtsh.hxx"
#include "view.hxx"
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 1442721..7068593 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -33,6 +33,7 @@
#include <sfx2/linkmgr.hxx>
#include <svx/htmlmode.hxx>
#include <svx/imapdlg.hxx>
+#include <svx/xflclit.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
More information about the Libreoffice-commits
mailing list