diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-11-15 13:50:26 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-16 14:09:38 +0100 |
commit | f5f5a17be7bdcd0adb3928631bdeac275a5abdd9 (patch) | |
tree | 61f7e2f050c961a87cc512a11cdf3d0aaebed955 | |
parent | 12e460d99988a66179381fe40185978450ea0ea0 (diff) |
entirity of writer rebuilding when vcl widget headers change
which seems a bit excessive
Change-Id: If0ab5a33bfbbd399e270f3e140c9d44d843985aa
Reviewed-on: https://gerrit.libreoffice.org/63422
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
39 files changed, 121 insertions, 56 deletions
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index b1133825b842..14135e2f30d6 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -25,7 +25,7 @@ #include <tools/color.hxx> #include <svl/poolitem.hxx> #include <editeng/editengdllapi.h> -#include <svtools/ctrlbox.hxx> +#include <svtools/borderline.hxx> // Line defaults in twips (former Writer defaults): diff --git a/include/svtools/borderline.hxx b/include/svtools/borderline.hxx new file mode 100644 index 000000000000..d4811ffa267c --- /dev/null +++ b/include/svtools/borderline.hxx @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SVTOOLS_BORDERLINE_HXX +#define INCLUDED_SVTOOLS_BORDERLINE_HXX + +#include <svtools/svtdllapi.h> +#include <o3tl/typed_flags_set.hxx> +#include <memory> + +/** + Class computing border widths shared between Line style listbox and the + SvxBorderLine implementation. + + This class doesn't know anything about units: it all depends on the different + values set. A border is composed of 2 lines separated by a gap. The computed + widths are the ones of each line and the gap and they can either be fix or vary. + + The #m_nflags member will define which widths will vary (value 0 means that all + widths are fixed). The available flags are: + - CHANGE_LINE1 + - CHANGE_LINE2 + - CHANGE_DIST + + For each line, the rate member is used as a multiplication factor is the width + isn't fixed. Otherwise it is the width in the unit expected by the client code. + */ +enum class BorderWidthImplFlags +{ + FIXED = 0, + CHANGE_LINE1 = 1, + CHANGE_LINE2 = 2, + CHANGE_DIST = 4, +}; +namespace o3tl +{ + template<> struct typed_flags<BorderWidthImplFlags> : is_typed_flags<BorderWidthImplFlags, 0x07> {}; +} +class SVT_DLLPUBLIC BorderWidthImpl +{ + BorderWidthImplFlags m_nFlags; + double m_nRate1; + double m_nRate2; + double m_nRateGap; + +public: + + BorderWidthImpl( BorderWidthImplFlags nFlags = BorderWidthImplFlags::CHANGE_LINE1, double nRate1 = 0.0, + double nRate2 = 0.0, double nRateGap = 0.0 ); + + bool operator== ( const BorderWidthImpl& r ) const; + + long GetLine1 ( long nWidth ) const; + long GetLine2( long nWidth ) const; + long GetGap( long nWidth ) const; + + long GuessWidth( long nLine1, long nLine2, long nGap ); + + bool IsEmpty( ) const { return (0 == m_nRate1) && (0 == m_nRate2); } + bool IsDouble( ) const { return (0 != m_nRate1) && (0 != m_nRate2); } +}; + +#endif // INCLUDED_SVTOOLS_BORDERLINE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index d6e8f8f8ae63..ef2687cc24b0 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -32,9 +32,9 @@ #include <vcl/weld.hxx> #include <com/sun/star/table/BorderLineStyle.hpp> -#include <o3tl/typed_flags_set.hxx> #include <memory> +class BorderWidthImpl; class FontList; class ImpLineListData; enum class SvxBorderLineStyle : sal_Int16; @@ -131,58 +131,6 @@ FontList; FontNameBox; FontStyleBox; FontSizeMenu *************************************************************************/ -/** - Class computing border widths shared between Line style listbox and the - SvxBorderLine implementation. - - This class doesn't know anything about units: it all depends on the different - values set. A border is composed of 2 lines separated by a gap. The computed - widths are the ones of each line and the gap and they can either be fix or vary. - - The #m_nflags member will define which widths will vary (value 0 means that all - widths are fixed). The available flags are: - - CHANGE_LINE1 - - CHANGE_LINE2 - - CHANGE_DIST - - For each line, the rate member is used as a multiplication factor is the width - isn't fixed. Otherwise it is the width in the unit expected by the client code. - */ -enum class BorderWidthImplFlags -{ - FIXED = 0, - CHANGE_LINE1 = 1, - CHANGE_LINE2 = 2, - CHANGE_DIST = 4, -}; -namespace o3tl -{ - template<> struct typed_flags<BorderWidthImplFlags> : is_typed_flags<BorderWidthImplFlags, 0x07> {}; -} -class SVT_DLLPUBLIC BorderWidthImpl -{ - BorderWidthImplFlags m_nFlags; - double m_nRate1; - double m_nRate2; - double m_nRateGap; - -public: - - BorderWidthImpl( BorderWidthImplFlags nFlags = BorderWidthImplFlags::CHANGE_LINE1, double nRate1 = 0.0, - double nRate2 = 0.0, double nRateGap = 0.0 ); - - bool operator== ( const BorderWidthImpl& r ) const; - - long GetLine1 ( long nWidth ) const; - long GetLine2( long nWidth ) const; - long GetGap( long nWidth ) const; - - long GuessWidth( long nLine1, long nLine2, long nGap ); - - bool IsEmpty( ) const { return (0 == m_nRate1) && (0 == m_nRate2); } - bool IsDouble( ) const { return (0 != m_nRate1) && (0 != m_nRate2); } -}; - inline Color sameColor( Color rMain ) { return rMain; diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index ab4a63e2a215..18aa7aaa855b 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/sheet/DataPilotOutputRangeType.hpp> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> +#include <comphelper/sequence.hxx> #include "address.hxx" diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index ed59c0c5a451..ae181b7381fc 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -25,6 +25,7 @@ #include <editeng/shaditem.hxx> #include <editeng/editobj.hxx> #include <editeng/justifyitem.hxx> +#include <osl/diagnose.h> #include <svl/poolcach.hxx> #include <global.hxx> diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c53e2774b0d5..067fb3ca871e 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -19,6 +19,7 @@ #include <formula/token.hxx> #include <o3tl/make_unique.hxx> +#include <vcl/bitmapex.hxx> #include <algorithm> #include <cassert> diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 534d90cf3ef6..dd8d5a1e1e36 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -21,6 +21,7 @@ #include <editeng/boxitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/justifyitem.hxx> +#include <osl/diagnose.h> #include <svl/itemset.hxx> #include <dpoutput.hxx> diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 80488b8def97..9f6b737b039e 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -27,6 +27,7 @@ #include <editeng/sizeitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> +#include <o3tl/make_unique.hxx> #include <vcl/svapp.hxx> #include <htmlimp.hxx> diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 5546d98d6037..6c380aba533f 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -30,6 +30,7 @@ #include <editeng/boxitem.hxx> #include <editeng/editobj.hxx> #include <svl/eitem.hxx> +#include <osl/diagnose.h> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index e8701b7aa2ec..6d39a82d0bcd 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -57,6 +57,7 @@ #include <rtl/tencinfo.h> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/binaryinputstream.hxx> diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index b772bb90c30f..c5ada4123716 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -32,6 +32,7 @@ #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> #include <svl/zforlist.hxx> +#include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/strings.hrc> diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 1aff21e72fdb..1292b4678ada 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -19,6 +19,7 @@ #include <scitems.hxx> #include <editeng/memberids.h> +#include <osl/diagnose.h> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index e8bc0fc4e5dc..e7a12ffa330b 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7021,6 +7021,7 @@ include/svtools/asynclink.hxx include/svtools/autocmpledit.hxx include/svtools/bindablecontrolhelper.hxx include/svtools/borderhelper.hxx +include/svtools/borderline.hxx include/svtools/breadcrumb.hxx include/svtools/brwbox.hxx include/svtools/brwhead.hxx diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 8061558284a5..112ce7ea2da2 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -33,6 +33,7 @@ #include <unotools/charclass.hxx> #include <unotools/fontoptions.hxx> +#include <svtools/borderline.hxx> #include <svtools/sampletext.hxx> #include <svtools/svtresid.hxx> #include <svtools/strings.hrc> diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 6bb50990660f..e5432b543a10 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -21,6 +21,7 @@ #include <editeng/borderline.hxx> #include <tools/color.hxx> +#include <tools/solar.h> #include <svl/poolitem.hxx> #include "swdllapi.h" #include "hintids.hxx" diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx index 24e413d34839..4ab997dc48a3 100644 --- a/sw/source/core/crsr/annotationmark.cxx +++ b/sw/source/core/crsr/annotationmark.cxx @@ -31,6 +31,7 @@ #include <UndoBookmark.hxx> #include <ndtxt.hxx> #include <txtfld.hxx> +#include <o3tl/make_unique.hxx> namespace sw { namespace mark { diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 65d70390df0c..ae1d7fcab7f5 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -54,6 +54,7 @@ #include <ndindex.hxx> #include <pam.hxx> #include <o3tl/deleter.hxx> +#include <o3tl/make_unique.hxx> #include <unotools/transliterationwrapper.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index cf4333877032..867bb5d62555 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -30,7 +30,6 @@ #include <fmtcntnt.hxx> #include <fmtcnct.hxx> #include <ndole.hxx> -#include <com/sun/star/embed/EmbedStates.hpp> #include <fmtanchr.hxx> #include <txtflcnt.hxx> #include <fmtflcnt.hxx> @@ -41,6 +40,8 @@ #include <textboxhelper.hxx> #include <ndindex.hxx> #include <pam.hxx> +#include <o3tl/make_unique.hxx> +#include <com/sun/star/embed/EmbedStates.hpp> using namespace ::com::sun::star; diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 452112cc7073..1d8048619ca0 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -62,6 +62,7 @@ #include <undoflystrattr.hxx> #include <calbck.hxx> #include <memory> +#include <o3tl/make_unique.hxx> #include <svx/xbtmpit.hxx> #include <svx/xflftrit.hxx> #include <svx/xlndsit.hxx> diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 2b911947ab53..3b8948ceb6ef 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -36,6 +36,7 @@ #include <ndtxt.hxx> #include <poolfmt.hxx> #include <ftninfo.hxx> +#include <o3tl/make_unique.hxx> SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo) { diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 58491be5e587..508ff29ecd91 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -57,6 +57,7 @@ #include <comphelper/string.hxx> #include <comphelper/random.hxx> #include <tools/datetimeutils.hxx> +#include <o3tl/make_unique.hxx> #include <cstdlib> #include <map> diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index 660324549c21..e6daaaebf136 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -18,10 +18,11 @@ */ #include <hintids.hxx> -#include <editeng/boxitem.hxx> #include <tblrwcl.hxx> #include <swtblfmt.hxx> #include <algorithm> +#include <editeng/boxitem.hxx> +#include <osl/diagnose.h> using namespace ::editeng; diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index e14ffc63506c..aaefcce05412 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -58,6 +58,7 @@ #include <hints.hxx> #include <memory> #include "ndsect.hxx" +#include <o3tl/make_unique.hxx> #include <tools/datetimeutils.hxx> // #i21457# - new implementation of local method <lcl_IsInSameTableBox(..)>. diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index bc4535be0d23..af3d4313a03d 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -93,6 +93,7 @@ #include <fldupde.hxx> #include <calbck.hxx> #include <fntcache.hxx> +#include <o3tl/make_unique.hxx> #include <o3tl/numeric.hxx> #include <tools/datetimeutils.hxx> #include <sal/log.hxx> diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index a95bde0b4144..0fa554afb4be 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -60,6 +60,7 @@ #include <sortedobjs.hxx> #include <flyfrms.hxx> #include <UndoManager.hxx> +#include <o3tl/make_unique.hxx> using namespace com::sun::star; diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx index fc7d8b241b89..ec14ef48661d 100644 --- a/sw/source/core/edit/edglbldc.cxx +++ b/sw/source/core/edit/edglbldc.cxx @@ -30,6 +30,7 @@ #include <section.hxx> #include <doctxm.hxx> #include <edglbldc.hxx> +#include <o3tl/make_unique.hxx> bool SwEditShell::IsGlobalDoc() const { diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 268e74e6d379..1d3defae80da 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -31,6 +31,7 @@ #include <IDocumentDrawModelAccess.hxx> #include <com/sun/star/style/TabStop.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <vcl/outdev.hxx> #include <memory> diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 5b1195ff9846..8151736c7184 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -45,6 +45,7 @@ #include <dview.hxx> #include <rootfrm.hxx> #include <viewsh.hxx> +#include <o3tl/make_unique.hxx> struct SwUndoGroupObjImpl { diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 8f59781ae009..1a40d6c5b424 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -40,6 +40,7 @@ /// OD 04.10.2002 #102894# /// class Calc needed for calculation of the hidden condition of a section. #include <calc.hxx> +#include <o3tl/make_unique.hxx> static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect ) { diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index cf8c34db8972..e0a675911ef3 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -59,6 +59,7 @@ #include <swerror.h> #include <paratr.hxx> #include <pausethreadstarting.hxx> +#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 290289dc8281..3d74a9e7976e 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -66,6 +66,7 @@ #include "htmlatr.hxx" #include "htmlfly.hxx" #include "htmlreqifreader.hxx" +#include <o3tl/make_unique.hxx> using namespace css; diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 251d871acebf..f0d42826a9df 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -30,6 +30,7 @@ #include <fmtornt.hxx> #include <frmatr.hxx> #include <htmltbl.hxx> +#include <osl/diagnose.h> using ::editeng::SvxBorderLine; using namespace ::com::sun::star; diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index f14ee98e868e..6627b352a9c8 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -27,6 +27,7 @@ #include <editeng/borderline.hxx> #include <filter/msfilter/util.hxx> +#include <i18nlangtag/lang.h> #include <tools/color.hxx> #ifdef _WIN32 diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 577936ae59f2..6daec44d8e37 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -53,6 +53,7 @@ #include "xmlithlp.hxx" #include <fmtrowsplt.hxx> +#include <osl/diagnose.h> using ::editeng::SvxBorderLine; using namespace ::com::sun::star; diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index bbc59643506b..c8aa5a172691 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include "xmlexp.hxx" #include <SwStyleNameMapper.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index afc3cd64d3d3..578d07d0face 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -51,6 +51,7 @@ #include <xmloff/xmlprhdl.hxx> #include "xmlithlp.hxx" #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> using ::editeng::SvxBorderLine; using namespace ::com::sun::star; diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 56cd728628ae..6dc8f3830e77 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -35,6 +35,7 @@ #include <fmtlsplt.hxx> #include <xmloff/xmluconv.hxx> +#include <osl/diagnose.h> using ::editeng::SvxBorderLine; using namespace ::xmloff::token; diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx index 0a38bc2e44bd..c2ff97fe7145 100644 --- a/sw/source/uibase/frmdlg/colmgr.cxx +++ b/sw/source/uibase/frmdlg/colmgr.cxx @@ -19,6 +19,7 @@ #include <hintids.hxx> #include <editeng/lrspitem.hxx> +#include <osl/diagnose.h> #include <frmmgr.hxx> #include <frmfmt.hxx> diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 8c7c515796af..585d48820b88 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -29,6 +29,7 @@ #include <numrule.hxx> #include <editeng/eerdll.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; |